diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
new file mode 100644
index 00000000000..dd3b6445edd
--- /dev/null
+++ b/.claude/CLAUDE.md
@@ -0,0 +1,108 @@
+# Bitwarden Clients - Claude Code Configuration
+
+## Project Context Files
+
+**Read these files before reviewing to ensure that you fully understand the project and contributing guidelines**
+
+1. @README.md
+2. @CONTRIBUTING.md
+3. @.github/PULL_REQUEST_TEMPLATE.md
+
+## Critical Rules
+
+- **NEVER** use code regions: If complexity suggests regions, refactor for better readability
+
+- **CRITICAL**: new encryption logic should not be added to this repo.
+
+- **NEVER** send unencrypted vault data to API services
+
+- **NEVER** commit secrets, credentials, or sensitive information.
+
+- **NEVER** log decrypted data, encryption keys, or PII
+  - No vault data in error messages or console logs
+
+- **ALWAYS** Respect configuration files at the root and within each app/library (e.g., `eslint.config.mjs`, `jest.config.js`, `tsconfig.json`).
+
+## Mono-Repo Architecture
+
+This repository is organized as a **monorepo** containing multiple applications and libraries. The
+main directories are:
+
+- `apps/` – Contains all application projects (e.g., browser, cli, desktop, web). Each app is
+  self-contained with its own configuration, source code, and tests.
+- `libs/` – Contains shared libraries and modules used across multiple apps. Libraries are organized
+  by team name, domain, functionality (e.g., common, ui, platform, key-management).
+
+**Strict boundaries** must be maintained between apps and libraries. Do not introduce
+cross-dependencies that violate the intended modular structure. Always consult and respect the
+dependency rules defined in `eslint.config.mjs`, `nx.json`, and other configuration files.
+
+## Angular Architecture Patterns
+
+**Observable Data Services (ADR-0003):**
+
+- Services expose RxJS Observable streams for state management
+- Components subscribe using `async` pipe (NOT explicit subscriptions in most cases)
+  Pattern:
+
+```typescript
+// Service
+private _folders = new BehaviorSubject<Folder[]>([]);
+readonly folders$ = this._folders.asObservable();
+
+// Component
+folders$ = this.folderService.folders$;
+// Template: <div *ngFor="let folder of folders$ | async">
+```
+
+For explicit subscriptions, MUST use `takeUntilDestroyed()`:
+
+```typescript
+constructor() {
+  this.observable$.pipe(takeUntilDestroyed()).subscribe(...);
+}
+```
+
+**Angular Signals (ADR-0027):**
+
+Encourage the use of Signals **only** in Angular components and presentational services.
+
+Use **RxJS** for:
+
+- Services used across Angular and non-Angular clients
+- Complex reactive workflows
+- Interop with existing Observable-based code
+
+**NO TypeScript Enums (ADR-0025):**
+
+- Use const objects with type aliases instead
+- Legacy enums exist but don't add new ones
+
+Pattern:
+
+```typescript
+// ✅ DO
+export const CipherType = Object.freeze({
+  Login: 1,
+  SecureNote: 2,
+} as const);
+export type CipherType = (typeof CipherType)[keyof typeof CipherType];
+
+// ❌ DON'T
+enum CipherType {
+  Login = 1,
+  SecureNote = 2,
+}
+```
+
+Example: `/libs/common/src/vault/enums/cipher-type.ts`
+
+## References
+
+- [Web Clients Architecture](https://contributing.bitwarden.com/architecture/clients)
+- [Architectural Decision Records (ADRs)](https://contributing.bitwarden.com/architecture/adr/)
+- [Contributing Guide](https://contributing.bitwarden.com/)
+- [Web Clients Setup Guide](https://contributing.bitwarden.com/getting-started/clients/)
+- [Code Style](https://contributing.bitwarden.com/contributing/code-style/)
+- [Security Whitepaper](https://bitwarden.com/help/bitwarden-security-white-paper/)
+- [Security Definitions](https://contributing.bitwarden.com/architecture/security/definitions)
diff --git a/.claude/prompts/review-code.md b/.claude/prompts/review-code.md
new file mode 100644
index 00000000000..1888b7cd503
--- /dev/null
+++ b/.claude/prompts/review-code.md
@@ -0,0 +1,57 @@
+# Bitwarden Clients Repo Code Review - Careful Consideration Required
+
+## Think Twice Before Recommending
+
+Angular has multiple valid patterns. Before suggesting changes:
+
+- **Consider the context** - Is this code part of an active modernization effort?
+- **Check for established patterns** - Look for similar implementations in the codebase
+- **Avoid premature optimization** - Don't suggest refactoring stable, working code without clear benefit
+- **Respect incremental progress** - Teams may be modernizing gradually with feature flags
+
+## Angular Modernization - Handle with Care
+
+**Control Flow Syntax (@if, @for, @switch):**
+
+- When you see legacy structural directives (*ngIf, *ngFor), consider whether modernization is in scope
+- Do not mandate changes to stable code unless part of the PR's objective
+- If suggesting modernization, acknowledge it's optional unless required by PR goals
+
+**Standalone Components:**
+
+- New components should be standalone whenever feasible, but do not flag existing NgModule components as issues
+- Legacy patterns exist for valid reasons - consider modernization effort vs benefit
+
+**Typed Forms:**
+
+- Recommend typed forms for NEW form code
+- Don't suggest rewriting working untyped forms unless they're being modified
+
+## Tailwind CSS - Critical Pattern
+
+**tw- prefix is mandatory** - This is non-negotiable and should be flagged as ❌ major finding:
+
+- Missing tw- prefix breaks styling completely
+- Check ALL Tailwind classes in modified files
+
+## Rust SDK Adoption - Tread Carefully
+
+When reviewing cipher operations:
+
+- Look for breaking changes in the TypeScript → Rust boundary
+- Verify error handling matches established patterns
+- Don't suggest alternative SDK patterns without strong justification
+
+## Component Library First
+
+Before suggesting custom implementations:
+
+- Check if Bitwarden's component library already provides the functionality
+- Prefer existing components over custom Tailwind styling
+- Don't add UI complexity that the component library already solves
+
+## When in Doubt
+
+- **Ask questions** (💭) rather than making definitive recommendations
+- **Flag for human review** (⚠️) if you're uncertain
+- **Acknowledge alternatives** exist when suggesting improvements
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 892fe0f5c0d..b58d1511dca 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,6 +8,7 @@
 apps/desktop/desktop_native @bitwarden/team-platform-dev
 apps/desktop/desktop_native/objc/src/native/autofill @bitwarden/team-autofill-desktop-dev
 apps/desktop/desktop_native/core/src/autofill @bitwarden/team-autofill-desktop-dev
+apps/desktop/desktop_native/core/src/secure_memory @bitwarden/team-key-management-dev
 ## No ownership for Cargo.lock and Cargo.toml to allow dependency updates
 apps/desktop/desktop_native/Cargo.lock
 apps/desktop/desktop_native/Cargo.toml
@@ -28,8 +29,9 @@ libs/common/src/auth @bitwarden/team-auth-dev
 ## Tools team files ##
 apps/browser/src/tools @bitwarden/team-tools-dev
 apps/cli/src/tools @bitwarden/team-tools-dev
+apps/desktop/desktop_native/bitwarden_chromium_import_helper @bitwarden/team-tools-dev
+apps/desktop/desktop_native/chromium_importer @bitwarden/team-tools-dev
 apps/desktop/src/app/tools @bitwarden/team-tools-dev
-apps/desktop/desktop_native/bitwarden_chromium_importer @bitwarden/team-tools-dev
 apps/web/src/app/tools @bitwarden/team-tools-dev
 libs/angular/src/tools @bitwarden/team-tools-dev
 libs/common/src/models/export @bitwarden/team-tools-dev
@@ -45,12 +47,12 @@ bitwarden_license/bit-web/src/app/dirt @bitwarden/team-data-insights-and-reporti
 libs/dirt @bitwarden/team-data-insights-and-reporting-dev
 libs/common/src/dirt @bitwarden/team-data-insights-and-reporting-dev
 
-## Localization/Crowdin (Platform and Tools team)
-apps/browser/src/_locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
-apps/browser/store/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
-apps/cli/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
-apps/desktop/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
-apps/web/src/locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
+## Localization/Crowdin (Platform team)
+apps/browser/src/_locales @bitwarden/team-platform-dev
+apps/browser/store/locales @bitwarden/team-platform-dev
+apps/cli/src/locales @bitwarden/team-platform-dev
+apps/desktop/src/locales @bitwarden/team-platform-dev
+apps/web/src/locales @bitwarden/team-platform-dev
 
 ## Vault team files ##
 apps/browser/src/vault @bitwarden/team-vault-dev
@@ -162,6 +164,7 @@ apps/desktop/desktop_native/core/src/ssh_agent @bitwarden/team-autofill-desktop-
 libs/components @bitwarden/team-ui-foundation
 libs/assets @bitwarden/team-ui-foundation
 libs/ui @bitwarden/team-ui-foundation
+libs/angular/src/scss @bitwarden/team-ui-foundation
 apps/browser/src/platform/popup/layout @bitwarden/team-ui-foundation
 apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-ui-foundation
 apps/browser/src/popup/components/extension-anon-layout-wrapper @bitwarden/team-ui-foundation
@@ -172,6 +175,7 @@ apps/desktop/src/key-management @bitwarden/team-key-management-dev
 apps/web/src/app/key-management @bitwarden/team-key-management-dev
 apps/browser/src/key-management @bitwarden/team-key-management-dev
 apps/cli/src/key-management @bitwarden/team-key-management-dev
+bitwarden_license/bit-web/src/app/key-management @bitwarden/team-key-management-dev
 libs/key-management @bitwarden/team-key-management-dev
 libs/key-management-ui @bitwarden/team-key-management-dev
 libs/common/src/key-management @bitwarden/team-key-management-dev
@@ -179,10 +183,15 @@ libs/common/src/key-management @bitwarden/team-key-management-dev
 libs/node @bitwarden/team-key-management-dev
 
 apps/desktop/desktop_native/core/src/biometric/ @bitwarden/team-key-management-dev
+apps/desktop/desktop_native/core/src/biometric_v2/ @bitwarden/team-key-management-dev
+apps/desktop/desktop_native/core/src/secure_memory/ @bitwarden/team-key-management-dev
 apps/desktop/src/services/native-messaging.service.ts @bitwarden/team-key-management-dev
 apps/browser/src/background/nativeMessaging.background.ts @bitwarden/team-key-management-dev
 apps/desktop/src/services/biometric-message-handler.service.ts @bitwarden/team-key-management-dev
 
+## Architecture
+libs/playwright-helpers @bitwarden/team-architecture
+
 ## Locales ##
 apps/browser/src/_locales/en/messages.json
 apps/browser/store/locales/en
@@ -219,4 +228,8 @@ apps/web/src/locales/en/messages.json
 **/jest.config.js @bitwarden/team-platform-dev
 **/project.jsons @bitwarden/team-platform-dev
 libs/pricing @bitwarden/team-billing-dev
-libs/playwright-helpers @bitwarden/team-architecture
+
+# Claude related files
+.claude/ @bitwarden/team-ai-sme
+.github/workflows/respond.yml @bitwarden/team-ai-sme
+.github/workflows/review-code.yml @bitwarden/team-ai-sme
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 8e31ab7a384..6e142edf8a7 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -139,6 +139,7 @@
         "@babel/core",
         "@babel/preset-env",
         "@bitwarden/sdk-internal",
+        "@bitwarden/commercial-sdk-internal",
         "@electron/fuses",
         "@electron/notarize",
         "@electron/rebuild",
@@ -147,6 +148,7 @@
         "@nx/eslint",
         "@nx/jest",
         "@nx/js",
+        "@nx/webpack",
         "@types/chrome",
         "@types/firefox-webext-browser",
         "@types/glob",
@@ -185,7 +187,6 @@
         "json5",
         "keytar",
         "libc",
-        "log",
         "lowdb",
         "mini-css-extract-plugin",
         "napi",
@@ -214,6 +215,8 @@
         "simplelog",
         "style-loader",
         "sysinfo",
+        "tracing",
+        "tracing-subscriber",
         "ts-node",
         "ts-loader",
         "tsconfig-paths-webpack-plugin",
@@ -228,6 +231,7 @@
         "webpack-node-externals",
         "widestring",
         "windows",
+        "windows-core",
         "windows-future",
         "windows-registry",
         "zbus",
@@ -252,6 +256,11 @@
       groupName: "zbus",
       matchPackageNames: ["zbus", "zbus_polkit"],
     },
+    {
+      // We need to group all windows-related packages together to avoid build errors caused by version incompatibilities.
+      groupName: "windows",
+      matchPackageNames: ["windows", "windows-core", "windows-future", "windows-registry"],
+    },
     {
       // We group all webpack build-related minor and patch updates together to reduce PR noise.
       // We include patch updates here because we want PRs for webpack patch updates and it's in this group.
@@ -323,6 +332,7 @@
         "storybook",
         "tailwindcss",
         "zone.js",
+        "@tailwindcss/container-queries",
       ],
       description: "UI Foundation owned dependencies",
       commitMessagePrefix: "[deps] UI Foundation:",
@@ -353,6 +363,8 @@
         "@types/jsdom",
         "@types/papaparse",
         "@types/zxcvbn",
+        "async-trait",
+        "clap",
         "jsdom",
         "jszip",
         "oidc-client-ts",
@@ -398,7 +410,16 @@
       reviewers: ["team:team-vault-dev"],
     },
     {
-      matchPackageNames: ["aes", "big-integer", "cbc", "rsa", "russh-cryptovec", "sha2"],
+      matchPackageNames: [
+        "aes",
+        "big-integer",
+        "cbc",
+        "rsa",
+        "russh-cryptovec",
+        "sha2",
+        "memsec",
+        "linux-keyutils",
+      ],
       description: "Key Management owned dependencies",
       commitMessagePrefix: "[deps] KM:",
       reviewers: ["team:team-key-management-dev"],
@@ -416,5 +437,11 @@
       description: "Higher versions of lowdb do not need separate types",
     },
   ],
-  ignoreDeps: ["@types/koa-bodyparser", "bootstrap", "node-ipc", "@bitwarden/sdk-internal"],
+  ignoreDeps: [
+    "@types/koa-bodyparser",
+    "bootstrap",
+    "node-ipc",
+    "@bitwarden/sdk-internal",
+    "@bitwarden/commercial-sdk-internal",
+  ],
 }
diff --git a/.github/workflows/alert-ddg-files-modified.yml b/.github/workflows/alert-ddg-files-modified.yml
index c341de045eb..90c055a97b8 100644
--- a/.github/workflows/alert-ddg-files-modified.yml
+++ b/.github/workflows/alert-ddg-files-modified.yml
@@ -14,9 +14,10 @@ jobs:
       pull-requests: write
     steps:
     - name: Checkout code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
       with:
         fetch-depth: 0
+        persist-credentials: false
 
     - name: Get changed files
       id: changed-files
@@ -30,7 +31,7 @@ jobs:
             - 'apps/desktop/src/services/encrypted-message-handler.service.ts'
 
     - name: Remove past BIT status comments
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
       with:
         script: |
           // Note: should match the first line of `message` in the communication steps
@@ -67,10 +68,12 @@ jobs:
 
     - name: Comment on PR if monitored files changed
       if: steps.changed-files.outputs.monitored == 'true'
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      env:
+        _MONITORED_FILES: ${{ steps.changed-files.outputs.monitored_files }}
       with:
         script: |
-          const changedFiles = `${{ steps.changed-files.outputs.monitored_files }}`.split(' ').filter(file => file.trim() !== '');
+          const changedFiles = `$_MONITORED_FILES`.split(' ').filter(file => file.trim() !== '');
 
           const message = `<!-- comment_tag: ddg-test-warning -->
           ⚠️🦆 **DuckDuckGo Integration files have been modified in this PR:**
diff --git a/.github/workflows/auto-branch-updater.yml b/.github/workflows/auto-branch-updater.yml
index 3f67388fd0c..02176b3169e 100644
--- a/.github/workflows/auto-branch-updater.yml
+++ b/.github/workflows/auto-branch-updater.yml
@@ -27,17 +27,20 @@ jobs:
     steps:
       - name: Setup
         id: setup
-        run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+        run: echo "branch=${GITHUB_REF#refs/heads/}" >> "$GITHUB_OUTPUT"
 
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: 'eu-web-${{ steps.setup.outputs.branch }}'
           fetch-depth: 0
+          persist-credentials: true
 
       - name: Merge ${{ steps.setup.outputs.branch }}
+        env:
+          _BRANCH: ${{ steps.setup.outputs.branch }}
         run: |
-          git config --local user.email "${{ env._BOT_EMAIL }}"
-          git config --local user.name "${{ env._BOT_NAME }}"
-          git merge origin/${{ steps.setup.outputs.branch }}
+          git config --local user.email "$_BOT_EMAIL"
+          git config --local user.name "$_BOT_NAME"
+          git merge "origin/$_BRANCH"
           git push
diff --git a/.github/workflows/auto-reply-discussions.yml b/.github/workflows/auto-reply-discussions.yml
index 83970ab3619..a6d7e9c6dcf 100644
--- a/.github/workflows/auto-reply-discussions.yml
+++ b/.github/workflows/auto-reply-discussions.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Get discussion label and template name
         id: discussion-label
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const discussion = context.payload.discussion;
@@ -29,7 +29,7 @@ jobs:
 
       - name: Get selected topic
         id: get_selected_topic
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           result-encoding: string
           script: |
@@ -45,7 +45,7 @@ jobs:
             }
 
       - name: Reply or close Discussion
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
           TEMPLATE_NAME: ${{ steps.discussion-label.outputs.template_name }}
           TOPIC: ${{ steps.get_selected_topic.outputs.result }}
diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
index 823cb7e25e0..ab932c561ba 100644
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -55,18 +55,19 @@ jobs:
       has_secrets: ${{ steps.check-secrets.outputs.has_secrets }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Get Package Version
         id: gen_vars
         run: |
-          repo_url=https://github.com/$GITHUB_REPOSITORY.git
+          repo_url="https://github.com/$GITHUB_REPOSITORY.git"
           adj_build_num=${GITHUB_SHA:0:7}
 
-          echo "repo_url=$repo_url" >> $GITHUB_OUTPUT
-          echo "adj_build_number=$adj_build_num" >> $GITHUB_OUTPUT
+          echo "repo_url=$repo_url" >> "$GITHUB_OUTPUT"
+          echo "adj_build_number=$adj_build_num" >> "$GITHUB_OUTPUT"
 
       - name: Get Node Version
         id: retrieve-node-version
@@ -74,13 +75,13 @@ jobs:
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Check secrets
         id: check-secrets
         run: |
           has_secrets=${{ secrets.AZURE_CLIENT_ID != '' }}
-          echo "has_secrets=$has_secrets" >> $GITHUB_OUTPUT
+          echo "has_secrets=$has_secrets" >> "$GITHUB_OUTPUT"
 
 
   locales-test:
@@ -93,9 +94,10 @@ jobs:
         working-directory: apps/browser
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Testing locales - extName length
         run: |
@@ -105,12 +107,14 @@ jobs:
          echo "============"
          echo "extName string must be 40 characters or less"
          echo
-         for locale in $(ls src/_locales/); do
-           string_length=$(jq '.extName.message | length' src/_locales/$locale/messages.json)
-           if [[ $string_length -gt 40 ]]; then
-             echo "$locale: $string_length"
-             found_error=true
-           fi
+
+         for locale_path in src/_locales/*/messages.json; do
+          locale=$(basename "$(dirname "$locale_path")")
+          string_length=$(jq '.extName.message | length' "$locale_path")
+          if [ "$string_length" -gt 40 ]; then
+            echo "$locale: $string_length"
+            found_error=true
+          fi
          done
 
          if $found_error; then
@@ -142,12 +146,13 @@ jobs:
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -188,7 +193,7 @@ jobs:
           zip -r browser-source.zip browser-source
 
       - name: Upload browser source
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{matrix.license_type.archive_name_prefix}}browser-source-${{ env._BUILD_NUMBER }}.zip
           path: browser-source.zip
@@ -213,18 +218,24 @@ jobs:
             source_archive_name_prefix: ""
             archive_name_prefix: ""
             npm_command_prefix: "dist:"
+            npm_package_dev_prefix: "package:dev:"
             readable: "open source license"
+            type: "oss"
           - build_prefix: "bit-"
             artifact_prefix: "bit-"
             source_archive_name_prefix: "bit-"
             archive_name_prefix: "bit-"
             npm_command_prefix: "dist:bit:"
+            npm_package_dev_prefix: "package:bit:dev:"
             readable: "commercial license"
+            type: "commercial"
         browser:
           - name: "chrome"
             npm_command_suffix: "chrome"
             archive_name: "dist-chrome.zip"
             artifact_name: "dist-chrome-MV3"
+            artifact_name_dev: "dev-chrome-MV3"
+            archive_name_dev: "dev-chrome.zip"
           - name: "edge"
             npm_command_suffix: "edge"
             archive_name: "dist-edge.zip"
@@ -243,12 +254,13 @@ jobs:
             artifact_name: "dist-opera-MV3"
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -260,7 +272,7 @@ jobs:
           npm --version
 
       - name: Download browser source
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: ${{matrix.license_type.source_archive_name_prefix}}browser-source-${{ env._BUILD_NUMBER }}.zip
 
@@ -273,6 +285,11 @@ jobs:
         run: npm ci
         working-directory: browser-source/
 
+      - name: Remove commercial packages
+        if: ${{ matrix.license_type.type == 'oss' }}
+        run: rm -rf node_modules/@bitwarden/commercial-sdk-internal
+        working-directory: browser-source/
+
       - name: Download SDK artifacts
         if: ${{ inputs.sdk_branch != '' }}
         uses: bitwarden/gh-actions/download-artifacts@main
@@ -301,13 +318,13 @@ jobs:
           TARGET_DIR='./browser-source/apps/browser'
           while IFS=' ' read -r RESULT; do
               FILES+=("$RESULT")
-          done < <(find $TARGET_DIR -size +5M)
+          done < <(find "$TARGET_DIR" -size +5M)
 
           # Validate results and provide messaging
           if [[ ${#FILES[@]} -ne 0 ]]; then
               echo "File(s) exceeds size limit: 5MB"
-              for FILE in ${FILES[@]}; do
-                  echo "- $(du --si $FILE)"
+              for FILE in "${FILES[@]}"; do
+                  echo "- $(du --si "$FILE")"
               done
               echo "ERROR Firefox rejects extension uploads that contain files larger than 5MB"
               # Invoke failure
@@ -319,16 +336,29 @@ jobs:
         working-directory: browser-source/apps/browser
 
       - name: Upload extension artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{ matrix.license_type.artifact_prefix }}${{ matrix.browser.artifact_name }}-${{ env._BUILD_NUMBER }}.zip
           path: browser-source/apps/browser/dist/${{matrix.license_type.archive_name_prefix}}${{ matrix.browser.archive_name }}
           if-no-files-found: error
 
+      - name: Package dev extension
+        if: ${{ matrix.browser.archive_name_dev != '' }}
+        run: npm run ${{ matrix.license_type.npm_package_dev_prefix }}${{ matrix.browser.npm_command_suffix }}
+        working-directory: browser-source/apps/browser
+
+      - name: Upload dev extension artifact
+        if: ${{ matrix.browser.archive_name_dev != '' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: ${{ matrix.license_type.artifact_prefix }}${{ matrix.browser.artifact_name_dev }}-${{ env._BUILD_NUMBER }}.zip
+          path: browser-source/apps/browser/dist/${{matrix.license_type.archive_name_prefix}}${{ matrix.browser.archive_name_dev }}
+          if-no-files-found: error
+
 
   build-safari:
     name: Build Safari - ${{ matrix.license_type.readable }}
-    runs-on: macos-13
+    runs-on: macos-15
     permissions:
       contents: read
       id-token: write
@@ -344,22 +374,25 @@ jobs:
             archive_name_prefix: ""
             npm_command_prefix: "dist:"
             readable: "open source license"
+            type: "oss"
           - build_prefix: "bit-"
             artifact_prefix: "bit-"
             archive_name_prefix: "bit-"
             npm_command_prefix: "dist:bit:"
             readable: "commercial license"
+            type: "commercial"
     env:
       _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -389,34 +422,34 @@ jobs:
           ACCOUNT_NAME: bitwardenci
           CONTAINER_NAME: profiles
         run: |
-          mkdir -p $HOME/secrets
+          mkdir -p "$HOME/secrets"
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+          az storage blob download --account-name "$ACCOUNT_NAME" --container-name "$CONTAINER_NAME" \
             --name bitwarden_desktop_appstore.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
+            --file "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \
             --output none
 
       - name: Get certificates
         run: |
-          mkdir -p $HOME/certificates
+          mkdir -p "$HOME/certificates"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
-            jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
+            jq -r .value | base64 -d > "$HOME/certificates/bitwarden-desktop-key.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/appstore-app-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-installer-cert |
-            jq -r .value | base64 -d > $HOME/certificates/appstore-installer-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/appstore-installer-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-app-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-installer-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-installer-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-installer-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/macdev-cert |
-            jq -r .value | base64 -d > $HOME/certificates/macdev-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/macdev-cert.p12"
 
       - name: Log out from Azure
         uses: bitwarden/gh-actions/azure-logout@main
@@ -425,9 +458,9 @@ jobs:
         env:
           KEYCHAIN_PASSWORD: ${{ steps.get-kv-secrets.outputs.KEYCHAIN-PASSWORD }}
         run: |
-          security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security default-keychain -s build.keychain
-          security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security set-keychain-settings -lut 1200 build.keychain
 
           security import "$HOME/certificates/bitwarden-desktop-key.p12" -k build.keychain -P "" \
@@ -448,12 +481,17 @@ jobs:
           security import "$HOME/certificates/macdev-cert.p12" -k build.keychain -P "" \
             -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild
 
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
 
       - name: NPM setup
         run: npm ci
         working-directory: ./
 
+      - name: Remove commercial packages
+        if: ${{ matrix.license_type.type == 'oss' }}
+        run: rm -rf node_modules/@bitwarden/commercial-sdk-internal
+        working-directory: ./
+
       - name: Download SDK Artifacts
         if: ${{ inputs.sdk_branch != '' }}
         uses: bitwarden/gh-actions/download-artifacts@main
@@ -485,7 +523,7 @@ jobs:
           ls -la
 
       - name: Upload Safari artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{matrix.license_type.archive_name_prefix}}dist-safari-${{ env._BUILD_NUMBER }}.zip
           path: apps/browser/dist/${{matrix.license_type.archive_name_prefix}}dist-safari.zip
@@ -504,9 +542,10 @@ jobs:
       - build-safari
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Log in to Azure
         uses: bitwarden/gh-actions/azure-login@main
@@ -526,7 +565,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Upload Sources
-        uses: crowdin/github-action@f214c8723025f41fc55b2ad26e67b60b80b1885d # v2.7.1
+        uses: crowdin/github-action@08713f00a50548bfe39b37e8f44afb53e7a802d4 # v2.12.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
index 22ba3a3e7be..964cbc834c5 100644
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -59,29 +59,30 @@ jobs:
       has_secrets: ${{ steps.check-secrets.outputs.has_secrets }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Get Package Version
         id: retrieve-package-version
         run: |
           PKG_VERSION=$(jq -r .version package.json)
-          echo "package_version=$PKG_VERSION" >> $GITHUB_OUTPUT
+          echo "package_version=$PKG_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Get Node Version
         id: retrieve-node-version
         working-directory: ./
         run: |
           NODE_NVMRC=$(cat .nvmrc)
-          NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          NODE_VERSION="${NODE_NVMRC/v/''}"
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Check secrets
         id: check-secrets
         run: |
           has_secrets=${{ secrets.AZURE_CLIENT_ID != '' }}
-          echo "has_secrets=$has_secrets" >> $GITHUB_OUTPUT
+          echo "has_secrets=$has_secrets" >> "$GITHUB_OUTPUT"
 
 
   cli:
@@ -92,13 +93,13 @@ jobs:
           [
             { base: "linux", distro: "ubuntu-22.04", target_suffix: "" },
             { base: "linux", distro: "ubuntu-22.04-arm", target_suffix: "-arm64" },
-            { base: "mac", distro: "macos-13", target_suffix: "" },
-            { base: "mac", distro: "macos-14", target_suffix: "-arm64" }
+            { base: "mac", distro: "macos-15-intel", target_suffix: "" },
+            { base: "mac", distro: "macos-15", target_suffix: "-arm64" }
           ]
         license_type:
           [
-            { build_prefix: "oss", artifact_prefix: "-oss", readable: "open source license" },
-            { build_prefix: "bit", artifact_prefix: "", readable: "commercial license" }
+            { type: "oss", build_prefix: "oss", artifact_prefix: "-oss", readable: "open source license" },
+            { type: "commercial", build_prefix: "bit", artifact_prefix: "", readable: "commercial license" }
           ]
     runs-on: ${{ matrix.os.distro }}
     needs: setup
@@ -113,18 +114,23 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Setup Unix Vars
         run: |
-          echo "LOWER_RUNNER_OS=$(echo $RUNNER_OS | awk '{print tolower($0)}')" >> $GITHUB_ENV
-          echo "SHORT_RUNNER_OS=$(echo $RUNNER_OS | awk '{print substr($0, 1, 3)}' | \
-            awk '{print tolower($0)}')" >> $GITHUB_ENV
+          LOWER_RUNNER_OS="$(printf '%s' "$RUNNER_OS" | awk '{print tolower($0)}')"
+          SHORT_RUNNER_OS="$(printf '%s' "$RUNNER_OS" | awk '{print substr($0, 1, 3)}' | awk '{print tolower($0)}')"
+
+          {
+            echo "LOWER_RUNNER_OS=$LOWER_RUNNER_OS"
+            echo "SHORT_RUNNER_OS=$SHORT_RUNNER_OS"
+          } >> "$GITHUB_ENV"
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -134,6 +140,11 @@ jobs:
         run: npm ci
         working-directory: ./
 
+      - name: Remove commercial packages
+        if: ${{ matrix.license_type.type == 'oss' }}
+        run: rm -rf node_modules/@bitwarden/commercial-sdk-internal
+        working-directory: ./
+
       - name: Download SDK Artifacts
         if: ${{ inputs.sdk_branch != '' && needs.setup.outputs.has_secrets == 'true' }}
         uses: bitwarden/gh-actions/download-artifacts@main
@@ -155,7 +166,9 @@ jobs:
           npm link ../sdk-internal
 
       - name: Build & Package Unix
-        run: npm run dist:${{ matrix.license_type.build_prefix }}:${{ env.SHORT_RUNNER_OS }}${{ matrix.os.target_suffix }} --quiet
+        env:
+          _SHORT_RUNNER_OS: ${{ env.SHORT_RUNNER_OS }}
+        run: npm run "dist:${{ matrix.license_type.build_prefix }}:$_SHORT_RUNNER_OS${{ matrix.os.target_suffix }}" --quiet
 
       - name: Login to Azure
         if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
@@ -168,10 +181,10 @@ jobs:
       - name: Get certificates
         if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
         run: |
-          mkdir -p $HOME/certificates
+          mkdir -p "$HOME/certificates"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-app-cert.p12"
 
       - name: Get Azure Key Vault secrets
         id: get-kv-secrets
@@ -189,33 +202,39 @@ jobs:
         env:
           KEYCHAIN_PASSWORD: ${{ steps.get-kv-secrets.outputs.KEYCHAIN-PASSWORD }}
         run: |
-          security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security default-keychain -s build.keychain
-          security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security set-keychain-settings -lut 1200 build.keychain
 
           security import "$HOME/certificates/devid-app-cert.p12" -k build.keychain -P "" \
             -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild
 
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
 
       - name: Sign binary
         if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
         env:
           MACOS_CERTIFICATE_NAME: "Developer ID Application: 8bit Solutions LLC"
-        run: codesign --sign "$MACOS_CERTIFICATE_NAME" --verbose=3 --force --options=runtime --entitlements ./entitlements.plist --timestamp ./dist/${{ matrix.license_type.build_prefix }}/${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}/bw
+          _LOWER_RUNNER_OS: ${{ env.LOWER_RUNNER_OS }}
+        run: codesign --sign "$MACOS_CERTIFICATE_NAME" --verbose=3 --force --options=runtime --entitlements ./entitlements.plist --timestamp "./dist/${{ matrix.license_type.build_prefix }}/$_LOWER_RUNNER_OS${{ matrix.os.target_suffix }}/bw"
 
       - name: Zip Unix
+        env:
+          _LOWER_RUNNER_OS: ${{ env.LOWER_RUNNER_OS }}
+          _PACKAGE_VERSION: ${{ env._PACKAGE_VERSION }}
         run: |
-          cd ./dist/${{ matrix.license_type.build_prefix }}/${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}
-          zip ../../bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip ./bw
+          cd "./dist/${{ matrix.license_type.build_prefix }}/$_LOWER_RUNNER_OS${{ matrix.os.target_suffix }}"
+          zip "../../bw${{ matrix.license_type.artifact_prefix }}-$_LOWER_RUNNER_OS${{ matrix.os.target_suffix }}-$_PACKAGE_VERSION.zip" ./bw
 
       - name: Set up private auth key
         if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
+        env:
+          _APP_STORE_CONNECT_AUTH_KEY: ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-AUTH-KEY }}
         run: |
           mkdir ~/private_keys
           cat << EOF > ~/private_keys/AuthKey_6TV9MKN3GP.p8
-          ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-AUTH-KEY }}
+          $_APP_STORE_CONNECT_AUTH_KEY
           EOF
 
       - name: Notarize app
@@ -224,28 +243,32 @@ jobs:
           APP_STORE_CONNECT_TEAM_ISSUER: ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-TEAM-ISSUER }}
           APP_STORE_CONNECT_AUTH_KEY: 6TV9MKN3GP
           APP_STORE_CONNECT_AUTH_KEY_PATH: ~/private_keys/AuthKey_6TV9MKN3GP.p8
+          _LOWER_RUNNER_OS: ${{ env.LOWER_RUNNER_OS }}
         run: |
           echo "Create keychain profile"
           xcrun notarytool store-credentials "notarytool-profile" --key-id "$APP_STORE_CONNECT_AUTH_KEY" --key "$APP_STORE_CONNECT_AUTH_KEY_PATH" --issuer "$APP_STORE_CONNECT_TEAM_ISSUER"
 
-          codesign --sign "Developer ID Application: 8bit Solutions LLC" --verbose=3 --force --options=runtime --timestamp ./dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip
+          codesign --sign "Developer ID Application: 8bit Solutions LLC" --verbose=3 --force --options=runtime --timestamp "./dist/bw${{ matrix.license_type.artifact_prefix }}-$_LOWER_RUNNER_OS${{ matrix.os.target_suffix }}-$_PACKAGE_VERSION.zip"
 
           echo "Notarize app"
-          xcrun notarytool submit ./dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip --keychain-profile "notarytool-profile" --wait
+          xcrun notarytool submit "./dist/bw${{ matrix.license_type.artifact_prefix }}-$_LOWER_RUNNER_OS${{ matrix.os.target_suffix }}-$_PACKAGE_VERSION.zip" --keychain-profile "notarytool-profile" --wait
 
       - name: Version Test
+        env:
+          _PACKAGE_VERSION: ${{ env._PACKAGE_VERSION }}
+          _LOWER_RUNNER_OS: ${{ env.LOWER_RUNNER_OS }}
         run: |
-          unzip "./dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip" -d "./test"
+          unzip "./dist/bw${{ matrix.license_type.artifact_prefix }}-$_LOWER_RUNNER_OS${{ matrix.os.target_suffix }}-$_PACKAGE_VERSION.zip" -d "./test"
           testVersion=$(./test/bw -v)
           echo "version: $_PACKAGE_VERSION"
           echo "testVersion: $testVersion"
-          if [[ $testVersion != $_PACKAGE_VERSION ]]; then
+          if [[ $testVersion != "$_PACKAGE_VERSION" ]]; then
             echo "Version test failed."
             exit 1
           fi
 
       - name: Upload unix zip asset
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip
           path: apps/cli/dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip
@@ -273,8 +296,8 @@ jobs:
       matrix:
         license_type:
           [
-            { build_prefix: "oss", artifact_prefix: "-oss", readable: "open source license" },
-            { build_prefix: "bit", artifact_prefix: "", readable: "commercial license" }
+            { type: "oss", build_prefix: "oss", artifact_prefix: "-oss", readable: "open source license" },
+            { type: "commercial", build_prefix: "bit", artifact_prefix: "", readable: "commercial license" }
           ]
     runs-on: windows-2022
     permissions:
@@ -288,9 +311,10 @@ jobs:
       _WIN_PKG_VERSION: 3.5
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Install AST
         run: dotnet tool install --global AzureSignTool --version 4.0.1
@@ -302,7 +326,7 @@ jobs:
           choco install nasm --no-progress
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -391,6 +415,11 @@ jobs:
         run: npm ci
         working-directory: ./
 
+      - name: Remove commercial packages
+        if: ${{ matrix.license_type.type == 'oss' }}
+        run: Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "node_modules/@bitwarden/commercial-sdk-internal"
+        working-directory: ./
+
       - name: Download SDK Artifacts
         if: ${{ inputs.sdk_branch != '' && needs.setup.outputs.has_secrets == 'true' }}
         uses: bitwarden/gh-actions/download-artifacts@main
@@ -429,11 +458,13 @@ jobs:
       - name: Package Chocolatey
         shell: pwsh
         if: ${{ matrix.license_type.build_prefix == 'bit' }}
+        env:
+          _PACKAGE_VERSION: ${{ env._PACKAGE_VERSION }}
         run: |
           Copy-Item -Path stores/chocolatey -Destination dist/chocolatey -Recurse
           Copy-Item dist/${{ matrix.license_type.build_prefix }}/windows/bw.exe -Destination dist/chocolatey/tools
           Copy-Item ${{ github.workspace }}/LICENSE.txt -Destination dist/chocolatey/tools
-          choco pack dist/chocolatey/bitwarden-cli.nuspec --version ${{ env._PACKAGE_VERSION }} --out dist/chocolatey
+          choco pack dist/chocolatey/bitwarden-cli.nuspec --version "$env:_PACKAGE_VERSION" --out dist/chocolatey
 
       - name: Zip Windows
         shell: cmd
@@ -451,7 +482,7 @@ jobs:
           }
 
       - name: Upload windows zip asset
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bw${{ matrix.license_type.artifact_prefix }}-windows-${{ env._PACKAGE_VERSION }}.zip
           path: apps/cli/dist/bw${{ matrix.license_type.artifact_prefix }}-windows-${{ env._PACKAGE_VERSION }}.zip
@@ -459,18 +490,20 @@ jobs:
 
       - name: Upload Chocolatey asset
         if: matrix.license_type.build_prefix == 'bit'
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
           path: apps/cli/dist/chocolatey/bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
           if-no-files-found: error
 
       - name: Zip NPM Build Artifact
-        run: Get-ChildItem -Path .\build | Compress-Archive -DestinationPath .\bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip
+        env:
+          _PACKAGE_VERSION: ${{ env._PACKAGE_VERSION }}
+        run: Get-ChildItem -Path .\build | Compress-Archive -DestinationPath ".\bitwarden-cli-${env:_PACKAGE_VERSION}-npm-build.zip"
 
       - name: Upload NPM Build Directory asset
         if: matrix.license_type.build_prefix == 'bit'
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip
           path: apps/cli/bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip
@@ -487,11 +520,14 @@ jobs:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Print environment
+        env:
+          _PACKAGE_VERSION: ${{ env._PACKAGE_VERSION }}
         run: |
           whoami
           echo "GitHub ref: $GITHUB_REF"
@@ -499,15 +535,17 @@ jobs:
           echo "BW Package Version: $_PACKAGE_VERSION"
 
       - name: Get bw linux cli
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: bw-linux-${{ env._PACKAGE_VERSION }}.zip
           path: apps/cli/dist/snap
 
       - name: Setup Snap Package
+        env:
+          _PACKAGE_VERSION: ${{ env._PACKAGE_VERSION }}
         run: |
           cp -r stores/snap/* -t dist/snap
-          sed -i s/__version__/${{ env._PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
+          sed -i "s/__version__/$_PACKAGE_VERSION/g" "dist/snap/snapcraft.yaml"
           cd dist/snap
           ls -alth
 
@@ -534,7 +572,7 @@ jobs:
         run: sudo snap remove bw
 
       - name: Upload snap asset
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bw_${{ env._PACKAGE_VERSION }}_amd64.snap
           path: apps/cli/dist/snap/bw_${{ env._PACKAGE_VERSION }}_amd64.snap
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 49d9d4c079f..03a09ac8c48 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -55,9 +55,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Verify
         run: |
@@ -87,38 +88,41 @@ jobs:
         working-directory: apps/desktop
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: true
 
       - name: Get Package Version
         id: retrieve-version
         run: |
           PKG_VERSION=$(jq -r .version src/package.json)
           echo "Setting version number to $PKG_VERSION"
-          echo "package_version=$PKG_VERSION" >> $GITHUB_OUTPUT
+          echo "package_version=$PKG_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Increment Version
         id: increment-version
         run: |
-          BUILD_NUMBER=$(expr 3000 + $GITHUB_RUN_NUMBER)
+          BUILD_NUMBER=$((3000 + GITHUB_RUN_NUMBER))
           echo "Setting build number to $BUILD_NUMBER"
-          echo "build_number=$BUILD_NUMBER" >> $GITHUB_OUTPUT
+          echo "build_number=$BUILD_NUMBER" >> "$GITHUB_OUTPUT"
 
       - name: Get Version Channel
         id: release-channel
+        env:
+          _PACKAGE_VERSION: ${{ steps.retrieve-version.outputs.package_version }}
         run: |
-          case "${{ steps.retrieve-version.outputs.package_version }}" in
+          case "$_PACKAGE_VERSION" in
             *"alpha"*)
-              echo "channel=alpha" >> $GITHUB_OUTPUT
+              echo "channel=alpha" >> "$GITHUB_OUTPUT"
               echo "[!] We do not yet support 'alpha'"
               exit 1
               ;;
             *"beta"*)
-              echo "channel=beta" >> $GITHUB_OUTPUT
+              echo "channel=beta" >> "$GITHUB_OUTPUT"
               ;;
             *)
-              echo "channel=latest" >> $GITHUB_OUTPUT
+              echo "channel=latest" >> "$GITHUB_OUTPUT"
               ;;
           esac
 
@@ -126,15 +130,15 @@ jobs:
         id: branch-check
         run: |
           if [[ $(git ls-remote --heads origin rc) ]]; then
-            echo "rc_branch_exists=1" >> $GITHUB_OUTPUT
+            echo "rc_branch_exists=1" >> "$GITHUB_OUTPUT"
           else
-            echo "rc_branch_exists=0" >> $GITHUB_OUTPUT
+            echo "rc_branch_exists=0" >> "$GITHUB_OUTPUT"
           fi
 
           if [[ $(git ls-remote --heads origin hotfix-rc-desktop) ]]; then
-            echo "hotfix_branch_exists=1" >> $GITHUB_OUTPUT
+            echo "hotfix_branch_exists=1" >> "$GITHUB_OUTPUT"
           else
-            echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
+            echo "hotfix_branch_exists=0" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Get Node Version
@@ -143,13 +147,13 @@ jobs:
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Check secrets
         id: check-secrets
         run: |
           has_secrets=${{ secrets.AZURE_CLIENT_ID != '' }}
-          echo "has_secrets=$has_secrets" >> $GITHUB_OUTPUT
+          echo "has_secrets=$has_secrets" >> "$GITHUB_OUTPUT"
 
   linux:
     name: Linux Build
@@ -169,17 +173,25 @@ jobs:
         working-directory: apps/desktop
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+        with:
+          workspaces: |
+            apps/desktop/desktop_native -> target
+          cache-targets: "true"
+
       - name: Set up environment
         run: |
           sudo apt-get update
@@ -220,7 +232,7 @@ jobs:
           npm link ../sdk-internal
 
       - name: Cache Native Module
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: |
@@ -239,48 +251,48 @@ jobs:
           TARGET: musl
         run: |
           rustup target add x86_64-unknown-linux-musl
-          node build.js --target=x86_64-unknown-linux-musl --release
+          node build.js --target=x86_64-unknown-linux-musl
 
       - name: Build application
         run: npm run dist:lin
 
+      - name: Upload tar.gz artifact
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: bitwarden_${{ env._PACKAGE_VERSION }}_x64.tar.gz
+          path: apps/desktop/dist/bitwarden_desktop_x64.tar.gz
+          if-no-files-found: error
+
       - name: Upload .deb artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-amd64.deb
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-amd64.deb
           if-no-files-found: error
 
       - name: Upload .rpm artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.rpm
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.rpm
           if-no-files-found: error
 
-      - name: Upload .freebsd artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        with:
-          name: Bitwarden-${{ env._PACKAGE_VERSION }}-x64.freebsd
-          path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x64.freebsd
-          if-no-files-found: error
-
       - name: Upload .snap artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bitwarden_${{ env._PACKAGE_VERSION }}_amd64.snap
           path: apps/desktop/dist/bitwarden_${{ env._PACKAGE_VERSION }}_amd64.snap
           if-no-files-found: error
 
       - name: Upload .AppImage artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.AppImage
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.AppImage
           if-no-files-found: error
 
       - name: Upload auto-update artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{ needs.setup.outputs.release_channel }}-linux.yml
           path: apps/desktop/dist/${{ needs.setup.outputs.release_channel }}-linux.yml
@@ -293,13 +305,12 @@ jobs:
           sudo npm run pack:lin:flatpak
 
       - name: Upload flatpak artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: com.bitwarden.desktop.flatpak
           path: apps/desktop/dist/com.bitwarden.desktop.flatpak
           if-no-files-found: error
 
-
   linux-arm64:
     name: Linux ARM64 Build
     # Note, before updating the ubuntu version of the workflow, ensure the snap base image
@@ -318,28 +329,46 @@ jobs:
         working-directory: apps/desktop
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+        with:
+          workspaces: |
+            apps/desktop/desktop_native -> target
+          cache-targets: "true"
+
       - name: Set up environment
         run: |
           sudo apt-get update
-          sudo apt-get -y install pkg-config libxss-dev rpm musl-dev musl-tools flatpak flatpak-builder
+          sudo apt-get -y install pkg-config libxss-dev rpm musl-dev musl-tools flatpak flatpak-builder squashfs-tools ruby ruby-dev rubygems build-essential
+          sudo gem install --no-document fpm
+
+      - name: Set up Snap
+        run: sudo snap install snapcraft --classic
+
+      - name: Install snaps required by snapcraft in destructive mode
+        run: |
+          sudo snap install core22
+          sudo snap install gtk-common-themes
+          sudo snap install gnome-3-28-1804
 
       - name: Print environment
         run: |
           node --version
           npm --version
           snap --version
-          snapcraft --version || echo 'snapcraft unavailable'
+          snapcraft --version
 
       - name: Install Node dependencies
         run: npm ci
@@ -366,7 +395,7 @@ jobs:
           npm link ../sdk-internal
 
       - name: Cache Native Module
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: |
@@ -385,7 +414,7 @@ jobs:
           TARGET: musl
         run: |
           rustup target add aarch64-unknown-linux-musl
-          node build.js --target=aarch64-unknown-linux-musl --release
+          node build.js --target=aarch64-unknown-linux-musl
 
       - name: Check index.d.ts generated
         if: github.event_name == 'pull_request' && steps.cache.outputs.cache-hit != 'true'
@@ -397,23 +426,47 @@ jobs:
           fi
 
       - name: Build application
+        env:
+          # Snapcraft environment variables to bypass LXD requirement on ARM64
+          SNAPCRAFT_BUILD_ENVIRONMENT: host
+          USE_SYSTEM_FPM: true
         run: npm run dist:lin:arm64
 
+      - name: Upload .snap artifact
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: bitwarden_${{ env._PACKAGE_VERSION }}_arm64.snap
+          path: apps/desktop/dist/bitwarden_${{ env._PACKAGE_VERSION }}_arm64.snap
+          if-no-files-found: error
+
       - name: Upload tar.gz artifact
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bitwarden_${{ env._PACKAGE_VERSION }}_arm64.tar.gz
           path: apps/desktop/dist/bitwarden_desktop_arm64.tar.gz
           if-no-files-found: error
 
+      - name: Build flatpak
+        working-directory: apps/desktop
+        run: |
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo npm run pack:lin:flatpak
+
+      - name: Upload flatpak artifact
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: com.bitwarden.desktop-arm64.flatpak
+          path: apps/desktop/dist/com.bitwarden.desktop.flatpak
+          if-no-files-found: error
+
   windows:
     name: Windows Build
     runs-on: windows-2022
     needs:
       - setup
     permissions:
-        contents: read
-        id-token: write
+      contents: read
+      id-token: write
     defaults:
       run:
         shell: pwsh
@@ -424,17 +477,25 @@ jobs:
       NODE_OPTIONS: --max_old_space_size=4096
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+        with:
+          workspaces: |
+            apps/desktop/desktop_native -> target
+          cache-targets: "true"
+
       - name: Install AST
         run: dotnet tool install --global AzureSignTool --version 4.0.1
 
@@ -497,7 +558,7 @@ jobs:
           npm link ../sdk-internal
 
       - name: Cache Native Module
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: |
@@ -533,21 +594,21 @@ jobs:
       - name: Rename appx files for store
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         run: |
-          Copy-Item "./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-ia32.appx" `
-            -Destination "./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-ia32-store.appx"
-          Copy-Item "./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x64.appx" `
-            -Destination "./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x64-store.appx"
-          Copy-Item "./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.appx" `
-            -Destination "./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64-store.appx"
+          Copy-Item "./dist/Bitwarden-$env:_PACKAGE_VERSION-ia32.appx" `
+            -Destination "./dist/Bitwarden-$env:_PACKAGE_VERSION-ia32-store.appx"
+          Copy-Item "./dist/Bitwarden-$env:_PACKAGE_VERSION-x64.appx" `
+            -Destination "./dist/Bitwarden-$env:_PACKAGE_VERSION-x64-store.appx"
+          Copy-Item "./dist/Bitwarden-$env:_PACKAGE_VERSION-arm64.appx" `
+            -Destination "./dist/Bitwarden-$env:_PACKAGE_VERSION-arm64-store.appx"
 
       - name: Package for Chocolatey
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         run: |
           Copy-Item -Path ./stores/chocolatey -Destination ./dist/chocolatey -Recurse
-          Copy-Item -Path ./dist/nsis-web/Bitwarden-Installer-${{ env._PACKAGE_VERSION }}.exe `
+          Copy-Item -Path ./dist/nsis-web/Bitwarden-Installer-$env:_PACKAGE_VERSION.exe `
           -Destination ./dist/chocolatey
 
-          $checksum = checksum -t sha256 ./dist/chocolatey/Bitwarden-Installer-${{ env._PACKAGE_VERSION }}.exe
+          $checksum = checksum -t sha256 ./dist/chocolatey/Bitwarden-Installer-$env:_PACKAGE_VERSION.exe
           $chocoInstall = "./dist/chocolatey/tools/chocolateyinstall.ps1"
           (Get-Content $chocoInstall).replace('__version__', "$env:_PACKAGE_VERSION").replace('__checksum__', $checksum) | Set-Content $chocoInstall
           choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:_PACKAGE_VERSION" --out ./dist/chocolatey
@@ -555,15 +616,15 @@ jobs:
       - name: Fix NSIS artifact names for auto-updater
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         run: |
-          Rename-Item -Path .\dist\nsis-web\Bitwarden-${{ env._PACKAGE_VERSION }}-ia32.nsis.7z `
-            -NewName bitwarden-${{ env._PACKAGE_VERSION }}-ia32.nsis.7z
-          Rename-Item -Path .\dist\nsis-web\Bitwarden-${{ env._PACKAGE_VERSION }}-x64.nsis.7z `
-            -NewName bitwarden-${{ env._PACKAGE_VERSION }}-x64.nsis.7z
-          Rename-Item -Path .\dist\nsis-web\Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.nsis.7z `
-            -NewName bitwarden-${{ env._PACKAGE_VERSION }}-arm64.nsis.7z
+          Rename-Item -Path .\dist\nsis-web\Bitwarden-$env:_PACKAGE_VERSION-ia32.nsis.7z `
+            -NewName bitwarden-$env:_PACKAGE_VERSION-ia32.nsis.7z
+          Rename-Item -Path .\dist\nsis-web\Bitwarden-$env:_PACKAGE_VERSION-x64.nsis.7z `
+            -NewName bitwarden-$env:_PACKAGE_VERSION-x64.nsis.7z
+          Rename-Item -Path .\dist\nsis-web\Bitwarden-$env:_PACKAGE_VERSION-arm64.nsis.7z `
+            -NewName bitwarden-$env:_PACKAGE_VERSION-arm64.nsis.7z
 
       - name: Upload portable exe artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-Portable-${{ env._PACKAGE_VERSION }}.exe
           path: apps/desktop/dist/Bitwarden-Portable-${{ env._PACKAGE_VERSION }}.exe
@@ -571,7 +632,7 @@ jobs:
 
       - name: Upload installer exe artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-Installer-${{ env._PACKAGE_VERSION }}.exe
           path: apps/desktop/dist/nsis-web/Bitwarden-Installer-${{ env._PACKAGE_VERSION }}.exe
@@ -579,7 +640,7 @@ jobs:
 
       - name: Upload appx ia32 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-ia32.appx
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-ia32.appx
@@ -587,7 +648,7 @@ jobs:
 
       - name: Upload store appx ia32 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-ia32-store.appx
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-ia32-store.appx
@@ -595,7 +656,7 @@ jobs:
 
       - name: Upload NSIS ia32 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bitwarden-${{ env._PACKAGE_VERSION }}-ia32.nsis.7z
           path: apps/desktop/dist/nsis-web/bitwarden-${{ env._PACKAGE_VERSION }}-ia32.nsis.7z
@@ -603,7 +664,7 @@ jobs:
 
       - name: Upload appx x64 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-x64.appx
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x64.appx
@@ -611,7 +672,7 @@ jobs:
 
       - name: Upload store appx x64 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-x64-store.appx
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x64-store.appx
@@ -619,7 +680,7 @@ jobs:
 
       - name: Upload NSIS x64 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bitwarden-${{ env._PACKAGE_VERSION }}-x64.nsis.7z
           path: apps/desktop/dist/nsis-web/bitwarden-${{ env._PACKAGE_VERSION }}-x64.nsis.7z
@@ -627,7 +688,7 @@ jobs:
 
       - name: Upload appx ARM64 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.appx
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.appx
@@ -635,7 +696,7 @@ jobs:
 
       - name: Upload store appx ARM64 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-arm64-store.appx
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64-store.appx
@@ -643,7 +704,7 @@ jobs:
 
       - name: Upload NSIS ARM64 artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bitwarden-${{ env._PACKAGE_VERSION }}-arm64.nsis.7z
           path: apps/desktop/dist/nsis-web/bitwarden-${{ env._PACKAGE_VERSION }}-arm64.nsis.7z
@@ -651,7 +712,7 @@ jobs:
 
       - name: Upload nupkg artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: bitwarden.${{ env._PACKAGE_VERSION }}.nupkg
           path: apps/desktop/dist/chocolatey/bitwarden.${{ env._PACKAGE_VERSION }}.nupkg
@@ -659,21 +720,263 @@ jobs:
 
       - name: Upload auto-update artifact
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{ needs.setup.outputs.release_channel }}.yml
           path: apps/desktop/dist/nsis-web/${{ needs.setup.outputs.release_channel }}.yml
           if-no-files-found: error
 
+  windows-beta:
+    name: Windows Beta Build
+    runs-on: windows-2022
+    needs: setup
+    permissions:
+      contents: read
+      id-token: write
+    defaults:
+      run:
+        shell: pwsh
+        working-directory: apps/desktop
+    env:
+      _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
+      _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
+      NODE_OPTIONS: --max_old_space_size=4096
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
+
+      - name: Set up Node
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        with:
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: ${{ env._NODE_VERSION }}
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+        with:
+          workspaces: |
+            apps/desktop/desktop_native -> target
+          cache-targets: "true"
+
+      - name: Install AST
+        run: dotnet tool install --global AzureSignTool --version 4.0.1
+
+      - name: Print environment
+        run: |
+          node --version
+          npm --version
+          choco --version
+          rustup show
+
+      - name: Log in to Azure
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: bitwarden/gh-actions/azure-login@main
+        with:
+          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
+          client_id: ${{ secrets.AZURE_CLIENT_ID }}
+
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: "bitwarden-ci"
+          secrets: "code-signing-vault-url,
+            code-signing-client-id,
+            code-signing-tenant-id,
+            code-signing-client-secret,
+            code-signing-cert-name"
+
+      - name: Log out from Azure
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: bitwarden/gh-actions/azure-logout@main
+
+      - name: Install Node dependencies
+        run: npm ci
+        working-directory: ./
+
+      - name: Download SDK Artifacts
+        if: ${{ inputs.sdk_branch != '' && needs.setup.outputs.has_secrets == 'true' }}
+        uses: bitwarden/gh-actions/download-artifacts@main
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          workflow: build-wasm-internal.yml
+          workflow_conclusion: success
+          branch: ${{ inputs.sdk_branch }}
+          artifacts: sdk-internal
+          repo: bitwarden/sdk-internal
+          path: ../sdk-internal
+          if_no_artifact_found: fail
+
+      - name: Override SDK
+        if: ${{ inputs.sdk_branch != '' && needs.setup.outputs.has_secrets == 'true' }}
+        working-directory: ./
+        run: |
+          ls -l ../
+          npm link ../sdk-internal
+
+      - name: Cache Native Module
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        id: cache
+        with:
+          path: |
+            apps/desktop/desktop_native/napi/*.node
+            apps/desktop/desktop_native/dist/*
+          key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
+
+      - name: Build Native Module
+        if: steps.cache.outputs.cache-hit != 'true'
+        working-directory: apps/desktop/desktop_native
+        run: node build.js cross-platform
+
+      - name: Build
+        run: npm run build
+
+      - name: Pack
+        if: ${{ needs.setup.outputs.has_secrets == 'false' }}
+        run: npm run pack:win:beta
+
+      - name: Pack & Sign
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        env:
+          ELECTRON_BUILDER_SIGN: 1
+          SIGNING_VAULT_URL: ${{ steps.retrieve-secrets.outputs.code-signing-vault-url }}
+          SIGNING_CLIENT_ID: ${{ steps.retrieve-secrets.outputs.code-signing-client-id }}
+          SIGNING_TENANT_ID: ${{ steps.retrieve-secrets.outputs.code-signing-tenant-id }}
+          SIGNING_CLIENT_SECRET: ${{ steps.retrieve-secrets.outputs.code-signing-client-secret }}
+          SIGNING_CERT_NAME: ${{ steps.retrieve-secrets.outputs.code-signing-cert-name }}
+        run: npm run pack:win:beta
+
+      - name: Rename appx files for store
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        run: |
+          Copy-Item "./dist/Bitwarden-Beta-$env:_PACKAGE_VERSION-ia32.appx" `
+            -Destination "./dist/Bitwarden-Beta-$env:_PACKAGE_VERSION-ia32-store.appx"
+          Copy-Item "./dist/Bitwarden-Beta-$env:_PACKAGE_VERSION-x64.appx" `
+            -Destination "./dist/Bitwarden-Beta-$env:_PACKAGE_VERSION-x64-store.appx"
+          Copy-Item "./dist/Bitwarden-Beta-$env:_PACKAGE_VERSION-arm64.appx" `
+            -Destination "./dist/Bitwarden-Beta-$env:_PACKAGE_VERSION-arm64-store.appx"
+
+      - name: Fix NSIS artifact names for auto-updater
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        run: |
+          Rename-Item -Path .\dist\nsis-web\Bitwarden-Beta-$env:_PACKAGE_VERSION-ia32.nsis.7z `
+            -NewName bitwarden-beta-$env:_PACKAGE_VERSION-ia32.nsis.7z
+          Rename-Item -Path .\dist\nsis-web\Bitwarden-Beta-$env:_PACKAGE_VERSION-x64.nsis.7z `
+            -NewName bitwarden-beta-$env:_PACKAGE_VERSION-x64.nsis.7z
+          Rename-Item -Path .\dist\nsis-web\Bitwarden-Beta-$env:_PACKAGE_VERSION-arm64.nsis.7z `
+            -NewName bitwarden-beta-$env:_PACKAGE_VERSION-arm64.nsis.7z
+          Rename-Item -Path .\dist\nsis-web\latest.yml `
+            -NewName latest-beta.yml
+
+      - name: Upload portable exe artifact
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: Bitwarden-Beta-Portable-${{ env._PACKAGE_VERSION }}.exe
+          path: apps/desktop/dist/Bitwarden-Beta-Portable-${{ env._PACKAGE_VERSION }}.exe
+          if-no-files-found: error
+
+      - name: Upload installer exe artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: Bitwarden-Beta-Installer-${{ env._PACKAGE_VERSION }}.exe
+          path: apps/desktop/dist/nsis-web/Bitwarden-Beta-Installer-${{ env._PACKAGE_VERSION }}.exe
+          if-no-files-found: error
+
+      - name: Upload appx ia32 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-ia32.appx
+          path: apps/desktop/dist/Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-ia32.appx
+          if-no-files-found: error
+
+      - name: Upload store appx ia32 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-ia32-store.appx
+          path: apps/desktop/dist/Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-ia32-store.appx
+          if-no-files-found: error
+
+      - name: Upload NSIS ia32 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: bitwarden-beta-${{ env._PACKAGE_VERSION }}-ia32.nsis.7z
+          path: apps/desktop/dist/nsis-web/bitwarden-beta-${{ env._PACKAGE_VERSION }}-ia32.nsis.7z
+          if-no-files-found: error
+
+      - name: Upload appx x64 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-x64.appx
+          path: apps/desktop/dist/Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-x64.appx
+          if-no-files-found: error
+
+      - name: Upload store appx x64 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-x64-store.appx
+          path: apps/desktop/dist/Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-x64-store.appx
+          if-no-files-found: error
+
+      - name: Upload NSIS x64 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: bitwarden-beta-${{ env._PACKAGE_VERSION }}-x64.nsis.7z
+          path: apps/desktop/dist/nsis-web/bitwarden-beta-${{ env._PACKAGE_VERSION }}-x64.nsis.7z
+          if-no-files-found: error
+
+      - name: Upload appx ARM64 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-arm64.appx
+          path: apps/desktop/dist/Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-arm64.appx
+          if-no-files-found: error
+
+      - name: Upload store appx ARM64 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-arm64-store.appx
+          path: apps/desktop/dist/Bitwarden-Beta-${{ env._PACKAGE_VERSION }}-arm64-store.appx
+          if-no-files-found: error
+
+      - name: Upload NSIS ARM64 artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: bitwarden-beta-${{ env._PACKAGE_VERSION }}-arm64.nsis.7z
+          path: apps/desktop/dist/nsis-web/bitwarden-beta-${{ env._PACKAGE_VERSION }}-arm64.nsis.7z
+          if-no-files-found: error
+
+      - name: Upload auto-update artifact
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: latest-beta.yml
+          path: apps/desktop/dist/nsis-web/latest-beta.yml
+          if-no-files-found: error
 
   macos-build:
     name: MacOS Build
-    runs-on: macos-13
+    runs-on: macos-15
     needs:
       - setup
     permissions:
-        contents: read
-        id-token: write
+      contents: read
+      id-token: write
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
@@ -683,20 +986,33 @@ jobs:
         working-directory: apps/desktop
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
 
+      - name: Set up Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: '3.14'
+
       - name: Set up Node-gyp
         run: python3 -m pip install setuptools
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+        with:
+          workspaces: |
+            apps/desktop/desktop_native -> target
+          cache-targets: "true"
+
       - name: Print environment
         run: |
           node --version
@@ -707,14 +1023,14 @@ jobs:
 
       - name: Cache Build
         id: build-cache
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: apps/desktop/build
           key: ${{ runner.os }}-${{ github.run_id }}-build
 
       - name: Cache Safari
         id: safari-cache
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: apps/browser/dist/Safari
           key: ${{ runner.os }}-${{ github.run_id }}-safari-extension
@@ -741,40 +1057,40 @@ jobs:
           ACCOUNT_NAME: bitwardenci
           CONTAINER_NAME: profiles
         run: |
-          mkdir -p $HOME/secrets
+          mkdir -p "$HOME/secrets"
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+          az storage blob download --account-name "$ACCOUNT_NAME" --container-name "$CONTAINER_NAME" \
             --name bitwarden_desktop_appstore.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
+            --file "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \
             --output none
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+          az storage blob download --account-name "$ACCOUNT_NAME" --container-name "$CONTAINER_NAME" \
             --name bitwarden_desktop_autofill_app_store_2024.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \
+            --file "$HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile" \
             --output none
 
       - name: Get certificates
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         run: |
-          mkdir -p $HOME/certificates
+          mkdir -p "$HOME/certificates"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
-            jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
+            jq -r .value | base64 -d > "$HOME/certificates/bitwarden-desktop-key.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/appstore-app-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-installer-cert |
-            jq -r .value | base64 -d > $HOME/certificates/appstore-installer-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/appstore-installer-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-app-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-installer-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-installer-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-installer-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/macdev-cert |
-            jq -r .value | base64 -d > $HOME/certificates/macdev-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/macdev-cert.p12"
 
       - name: Log out from Azure
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
@@ -785,9 +1101,9 @@ jobs:
         env:
           KEYCHAIN_PASSWORD: ${{ steps.get-kv-secrets.outputs.KEYCHAIN-PASSWORD }}
         run: |
-          security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security default-keychain -s build.keychain
-          security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security set-keychain-settings -lut 1200 build.keychain
 
           security import "$HOME/certificates/bitwarden-desktop-key.p12" -k build.keychain -P "" \
@@ -808,22 +1124,22 @@ jobs:
           security import "$HOME/certificates/macdev-cert.p12" -k build.keychain -P "" \
             -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild
 
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
 
       - name: Set up provisioning profiles
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         run: |
-          cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
-            $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile
+          cp "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \
+            "$GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile"
 
-          mkdir -p $HOME/Library/MobileDevice/Provisioning\ Profiles
-          export APP_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_appstore.provisionprofile | grep -io "[-A-Z0-9]\{36\}"`
-          export AUTOFILL_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile | grep -io "[-A-Z0-9]\{36\}"`
+          mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+          APP_UUID=$(grep UUID -A1 -a "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" | grep -io "[-A-Z0-9]\{36\}")
+          AUTOFILL_UUID=$(grep UUID -A1 -a "$HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile" | grep -io "[-A-Z0-9]\{36\}")
 
-          cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
-            $HOME/Library/MobileDevice/Provisioning\ Profiles/$APP_UUID.provisionprofile
-          cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \
-            $HOME/Library/MobileDevice/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile
+          cp "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \
+            "$HOME/Library/MobileDevice/Provisioning Profiles/$APP_UUID.provisionprofile"
+          cp "$HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile" \
+            "$HOME/Library/MobileDevice/Provisioning Profiles/$AUTOFILL_UUID.provisionprofile"
 
       - name: Increment version
         shell: pwsh
@@ -860,7 +1176,7 @@ jobs:
           npm link ../sdk-internal
 
       - name: Cache Native Module
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: |
@@ -876,7 +1192,6 @@ jobs:
       - name: Build application (dev)
         run: npm run build
 
-
   browser-build:
     name: Browser Build
     needs: setup
@@ -888,18 +1203,17 @@ jobs:
       pull-requests: write
       id-token: write
 
-
   macos-package-github:
     name: MacOS Package GitHub Release Assets
-    runs-on: macos-13
+    runs-on: macos-15
     if: ${{ needs.setup.outputs.has_secrets == 'true' }}
     needs:
       - browser-build
       - macos-build
       - setup
     permissions:
-        contents: read
-        id-token: write
+      contents: read
+      id-token: write
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
@@ -909,20 +1223,33 @@ jobs:
         working-directory: apps/desktop
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
 
+      - name: Set up Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: '3.14'
+
       - name: Set up Node-gyp
         run: python3 -m pip install setuptools
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+        with:
+          workspaces: |
+            apps/desktop/desktop_native -> target
+          cache-targets: "true"
+
       - name: Print environment
         run: |
           node --version
@@ -933,14 +1260,14 @@ jobs:
 
       - name: Get Build Cache
         id: build-cache
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: apps/desktop/build
           key: ${{ runner.os }}-${{ github.run_id }}-build
 
       - name: Setup Safari Cache
         id: safari-cache
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: apps/browser/dist/Safari
           key: ${{ runner.os }}-${{ github.run_id }}-safari-extension
@@ -964,39 +1291,39 @@ jobs:
           ACCOUNT_NAME: bitwardenci
           CONTAINER_NAME: profiles
         run: |
-          mkdir -p $HOME/secrets
+          mkdir -p "$HOME/secrets"
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+          az storage blob download --account-name "$ACCOUNT_NAME" --container-name "$CONTAINER_NAME" \
             --name bitwarden_desktop_developer_id.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_developer_id.provisionprofile \
+            --file "$HOME/secrets/bitwarden_desktop_developer_id.provisionprofile" \
             --output none
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+          az storage blob download --account-name "$ACCOUNT_NAME" --container-name "$CONTAINER_NAME" \
             --name bitwarden_desktop_autofill_developer_id.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_autofill_developer_id.provisionprofile \
+            --file "$HOME/secrets/bitwarden_desktop_autofill_developer_id.provisionprofile" \
             --output none
 
       - name: Get certificates
         run: |
-          mkdir -p $HOME/certificates
+          mkdir -p "$HOME/certificates"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
-            jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
+            jq -r .value | base64 -d > "$HOME/certificates/bitwarden-desktop-key.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/appstore-app-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-installer-cert |
-            jq -r .value | base64 -d > $HOME/certificates/appstore-installer-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/appstore-installer-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-app-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-installer-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-installer-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-installer-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/macdev-cert |
-            jq -r .value | base64 -d > $HOME/certificates/macdev-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/macdev-cert.p12"
 
       - name: Log out from Azure
         uses: bitwarden/gh-actions/azure-logout@main
@@ -1005,9 +1332,9 @@ jobs:
         env:
           KEYCHAIN_PASSWORD: ${{ steps.get-kv-secrets.outputs.KEYCHAIN-PASSWORD }}
         run: |
-          security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security default-keychain -s build.keychain
-          security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security set-keychain-settings -lut 1200 build.keychain
 
           security import "$HOME/certificates/bitwarden-desktop-key.p12" -k build.keychain -P "" \
@@ -1019,21 +1346,21 @@ jobs:
           security import "$HOME/certificates/devid-installer-cert.p12" -k build.keychain -P "" \
             -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild
 
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
 
       - name: Set up provisioning profiles
         run: |
-          cp $HOME/secrets/bitwarden_desktop_developer_id.provisionprofile \
-            $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_developer_id.provisionprofile
+          cp "$HOME/secrets/bitwarden_desktop_developer_id.provisionprofile" \
+            "$GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_developer_id.provisionprofile"
 
-          mkdir -p $HOME/Library/MobileDevice/Provisioning\ Profiles
-          export APP_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_developer_id.provisionprofile | grep -io "[-A-Z0-9]\{36\}"`
-          export AUTOFILL_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_autofill_developer_id.provisionprofile | grep -io "[-A-Z0-9]\{36\}"`
+          mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+          APP_UUID=$(grep UUID -A1 -a "$HOME/secrets/bitwarden_desktop_developer_id.provisionprofile" | grep -io "[-A-Z0-9]\{36\}")
+          AUTOFILL_UUID=$(grep UUID -A1 -a "$HOME/secrets/bitwarden_desktop_autofill_developer_id.provisionprofile" | grep -io "[-A-Z0-9]\{36\}")
 
-          cp $HOME/secrets/bitwarden_desktop_developer_id.provisionprofile \
-            $HOME/Library/MobileDevice/Provisioning\ Profiles/$APP_UUID.provisionprofile
-          cp $HOME/secrets/bitwarden_desktop_autofill_developer_id.provisionprofile \
-            $HOME/Library/MobileDevice/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile
+          cp "$HOME/secrets/bitwarden_desktop_developer_id.provisionprofile" \
+            "$HOME/Library/MobileDevice/Provisioning Profiles/$APP_UUID.provisionprofile"
+          cp "$HOME/secrets/bitwarden_desktop_autofill_developer_id.provisionprofile" \
+            "$HOME/Library/MobileDevice/Provisioning Profiles/$AUTOFILL_UUID.provisionprofile"
 
       - name: Increment version
         shell: pwsh
@@ -1070,7 +1397,7 @@ jobs:
           npm link ../sdk-internal
 
       - name: Cache Native Module
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: |
@@ -1088,26 +1415,28 @@ jobs:
         run: npm run build
 
       - name: Download Browser artifact
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Unzip Safari artifact
         run: |
-          SAFARI_DIR=$(find $GITHUB_WORKSPACE/browser-build-artifacts -name 'dist-safari-*.zip')
-          echo $SAFARI_DIR
-          unzip $SAFARI_DIR/dist-safari.zip -d $GITHUB_WORKSPACE/browser-build-artifacts
+          SAFARI_DIR=$(find "$GITHUB_WORKSPACE/browser-build-artifacts" -name 'dist-safari-*.zip')
+          echo "$SAFARI_DIR"
+          unzip "$SAFARI_DIR/dist-safari.zip" -d "$GITHUB_WORKSPACE/browser-build-artifacts"
 
       - name: Load Safari extension for .dmg
         run: |
           mkdir PlugIns
-          cp -r $GITHUB_WORKSPACE/browser-build-artifacts/Safari/dmg/build/Release/safari.appex PlugIns/safari.appex
+          cp -r "$GITHUB_WORKSPACE/browser-build-artifacts/Safari/dmg/build/Release/safari.appex" PlugIns/safari.appex
 
       - name: Set up private auth key
+        env:
+          _APP_STORE_CONNECT_AUTH_KEY: ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-AUTH-KEY }}
         run: |
           mkdir ~/private_keys
           cat << EOF > ~/private_keys/AuthKey_6TV9MKN3GP.p8
-          ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-AUTH-KEY }}
+          $_APP_STORE_CONNECT_AUTH_KEY
           EOF
 
       - name: Build application (dist)
@@ -1119,45 +1448,44 @@ jobs:
         run: npm run pack:mac
 
       - name: Upload .zip artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-universal-mac.zip
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-universal-mac.zip
           if-no-files-found: error
 
       - name: Upload .dmg artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg
           if-no-files-found: error
 
       - name: Upload .dmg blockmap artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg.blockmap
           path: apps/desktop/dist/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg.blockmap
           if-no-files-found: error
 
       - name: Upload auto-update artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{ needs.setup.outputs.release_channel }}-mac.yml
           path: apps/desktop/dist/${{ needs.setup.outputs.release_channel }}-mac.yml
           if-no-files-found: error
 
-
   macos-package-mas:
     name: MacOS Package Prod Release Asset
-    runs-on: macos-13
+    runs-on: macos-15
     if: ${{ needs.setup.outputs.has_secrets == 'true' }}
     needs:
       - browser-build
       - macos-build
       - setup
     permissions:
-        contents: read
-        id-token: write
+      contents: read
+      id-token: write
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
@@ -1167,20 +1495,33 @@ jobs:
         working-directory: apps/desktop
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
 
+      - name: Set up Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: '3.14'
+
       - name: Set up Node-gyp
         run: python3 -m pip install setuptools
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+        with:
+          workspaces: |
+            apps/desktop/desktop_native -> target
+          cache-targets: "true"
+
       - name: Print environment
         run: |
           node --version
@@ -1191,14 +1532,14 @@ jobs:
 
       - name: Get Build Cache
         id: build-cache
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: apps/desktop/build
           key: ${{ runner.os }}-${{ github.run_id }}-build
 
       - name: Setup Safari Cache
         id: safari-cache
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: apps/browser/dist/Safari
           key: ${{ runner.os }}-${{ github.run_id }}-safari-extension
@@ -1229,39 +1570,39 @@ jobs:
           ACCOUNT_NAME: bitwardenci
           CONTAINER_NAME: profiles
         run: |
-          mkdir -p $HOME/secrets
+          mkdir -p "$HOME/secrets"
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+          az storage blob download --account-name "$ACCOUNT_NAME" --container-name "$CONTAINER_NAME" \
             --name bitwarden_desktop_appstore.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
+            --file "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \
             --output none
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+          az storage blob download --account-name "$ACCOUNT_NAME" --container-name "$CONTAINER_NAME" \
             --name bitwarden_desktop_autofill_app_store_2024.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \
+            --file "$HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile" \
             --output none
 
       - name: Get certificates
         run: |
-          mkdir -p $HOME/certificates
+          mkdir -p "$HOME/certificates"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/bitwarden-desktop-key |
-            jq -r .value | base64 -d > $HOME/certificates/bitwarden-desktop-key.p12
+            jq -r .value | base64 -d > "$HOME/certificates/bitwarden-desktop-key.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/appstore-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/appstore-app-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/appstore-installer-cert |
-            jq -r .value | base64 -d > $HOME/certificates/appstore-installer-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/appstore-installer-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-app-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-app-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-app-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-installer-cert |
-            jq -r .value | base64 -d > $HOME/certificates/devid-installer-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/devid-installer-cert.p12"
 
           az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/macdev-cert |
-            jq -r .value | base64 -d > $HOME/certificates/macdev-cert.p12
+            jq -r .value | base64 -d > "$HOME/certificates/macdev-cert.p12"
 
       - name: Log out from Azure
         uses: bitwarden/gh-actions/azure-logout@main
@@ -1270,9 +1611,9 @@ jobs:
         env:
           KEYCHAIN_PASSWORD: ${{ steps.get-kv-secrets.outputs.KEYCHAIN-PASSWORD }}
         run: |
-          security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security default-keychain -s build.keychain
-          security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security set-keychain-settings -lut 1200 build.keychain
 
           security import "$HOME/certificates/bitwarden-desktop-key.p12" -k build.keychain -P "" \
@@ -1284,21 +1625,21 @@ jobs:
           security import "$HOME/certificates/appstore-installer-cert.p12" -k build.keychain -P "" \
             -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild
 
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
 
       - name: Set up provisioning profiles
         run: |
-          cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
-            $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile
+          cp "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \
+            "$GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile"
 
-          mkdir -p $HOME/Library/MobileDevice/Provisioning\ Profiles
-          export APP_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_appstore.provisionprofile | grep -io "[-A-Z0-9]\{36\}"`
-          export AUTOFILL_UUID=`grep UUID -A1 -a $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile | grep -io "[-A-Z0-9]\{36\}"`
+          mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+          APP_UUID=$(grep UUID -A1 -a "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" | grep -io "[-A-Z0-9]\{36\}")
+          AUTOFILL_UUID=$(grep UUID -A1 -a "$HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile" | grep -io "[-A-Z0-9]\{36\}")
 
-          cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
-            $HOME/Library/MobileDevice/Provisioning\ Profiles/$APP_UUID.provisionprofile
-          cp $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \
-            $HOME/Library/MobileDevice/Provisioning\ Profiles/$AUTOFILL_UUID.provisionprofile
+          cp "$HOME/secrets/bitwarden_desktop_appstore.provisionprofile" \
+            "$HOME/Library/MobileDevice/Provisioning Profiles/$APP_UUID.provisionprofile"
+          cp "$HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile" \
+            "$HOME/Library/MobileDevice/Provisioning Profiles/$AUTOFILL_UUID.provisionprofile"
 
       - name: Increment version
         shell: pwsh
@@ -1336,7 +1677,7 @@ jobs:
           npm link ../sdk-internal
 
       - name: Cache Native Module
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: |
@@ -1354,26 +1695,28 @@ jobs:
         run: npm run build
 
       - name: Download Browser artifact
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Unzip Safari artifact
         run: |
-          SAFARI_DIR=$(find $GITHUB_WORKSPACE/browser-build-artifacts -name 'dist-safari-*.zip')
-          echo $SAFARI_DIR
-          unzip $SAFARI_DIR/dist-safari.zip -d $GITHUB_WORKSPACE/browser-build-artifacts
+          SAFARI_DIR=$(find "$GITHUB_WORKSPACE/browser-build-artifacts" -name 'dist-safari-*.zip')
+          echo "$SAFARI_DIR"
+          unzip "$SAFARI_DIR/dist-safari.zip" -d "$GITHUB_WORKSPACE/browser-build-artifacts"
 
       - name: Load Safari extension for App Store
         run: |
           mkdir PlugIns
-          cp -r $GITHUB_WORKSPACE/browser-build-artifacts/Safari/mas/build/Release/safari.appex PlugIns/safari.appex
+          cp -r "$GITHUB_WORKSPACE/browser-build-artifacts/Safari/mas/build/Release/safari.appex" "PlugIns/safari.appex"
 
       - name: Set up private auth key
+        env:
+          _APP_STORE_CONNECT_AUTH_KEY: ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-AUTH-KEY }}
         run: |
           mkdir ~/private_keys
           cat << EOF > ~/private_keys/AuthKey_6TV9MKN3GP.p8
-          ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-AUTH-KEY }}
+          $_APP_STORE_CONNECT_AUTH_KEY
           EOF
 
       - name: Build application for App Store
@@ -1395,14 +1738,14 @@ jobs:
           $buildInfo | ConvertTo-Json | Set-Content -Path dist/macos-build-number.json
 
       - name: Upload MacOS App Store build number artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: macos-build-number.json
           path: apps/desktop/dist/macos-build-number.json
           if-no-files-found: error
 
       - name: Upload .pkg artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Bitwarden-${{ env._PACKAGE_VERSION }}-universal.pkg
           path: apps/desktop/dist/mas-universal/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.pkg
@@ -1412,6 +1755,8 @@ jobs:
         if: |
           github.event_name != 'pull_request_target'
           && (inputs.testflight_distribute || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc-desktop')
+        env:
+          _APP_STORE_CONNECT_TEAM_ISSUER: ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-TEAM-ISSUER }}
         run: |
           brew install gsed
 
@@ -1419,7 +1764,7 @@ jobs:
 
           cat << EOF > ~/secrets/appstoreconnect-fastlane.json
           {
-            "issuer_id": "${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-TEAM-ISSUER }}",
+            "issuer_id": "$_APP_STORE_CONNECT_TEAM_ISSUER",
             "key_id": "6TV9MKN3GP",
             "key": "$KEY_WITHOUT_NEWLINES"
           }
@@ -1438,14 +1783,14 @@ jobs:
 
           GIT_CHANGE="$(git show -s --format=%s)"
 
-          BRANCH=$(echo $BRANCH | sed 's/refs\/heads\///')
+          BRANCH=$(echo "$BRANCH" | sed 's/refs\/heads\///')
 
           CHANGELOG="$BRANCH: $GIT_CHANGE"
 
           fastlane pilot upload \
             --app_identifier "com.bitwarden.desktop" \
             --changelog "$CHANGELOG" \
-            --api_key_path $HOME/secrets/appstoreconnect-fastlane.json \
+            --api_key_path "$HOME/secrets/appstoreconnect-fastlane.json" \
             --pkg "$(find ./dist/mas-universal/Bitwarden*.pkg)"
 
       - name: Post message to a Slack channel
@@ -1453,7 +1798,7 @@ jobs:
         if: |
           github.event_name != 'pull_request_target'
           && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc-desktop')
-        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
+        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # v2.1.1
         with:
           channel-id: C074F5UESQ0
           method: chat.postMessage
@@ -1482,15 +1827,16 @@ jobs:
       - macos-package-github
       - macos-package-mas
     permissions:
-        contents: write
-        pull-requests: write
-        id-token: write
+      contents: write
+      pull-requests: write
+      id-token: write
     runs-on: ubuntu-22.04
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Log in to Azure
         uses: bitwarden/gh-actions/azure-login@main
@@ -1510,7 +1856,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Upload Sources
-        uses: crowdin/github-action@f214c8723025f41fc55b2ad26e67b60b80b1885d # v2.7.1
+        uses: crowdin/github-action@08713f00a50548bfe39b37e8f44afb53e7a802d4 # v2.12.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -1521,7 +1867,6 @@ jobs:
           upload_sources: true
           upload_translations: false
 
-
   check-failures:
     name: Check for failures
     if: always()
@@ -1537,8 +1882,8 @@ jobs:
       - macos-package-mas
       - crowdin-push
     permissions:
-        contents: read
-        id-token: write
+      contents: read
+      id-token: write
     steps:
       - name: Check if any job failed
         if: |
@@ -1573,4 +1918,3 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}
         with:
           status: ${{ job.status }}
-
diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index 18887ce8fbc..02ab7727c24 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -64,26 +64,27 @@ jobs:
       has_secrets: ${{ steps.check-secrets.outputs.has_secrets }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Get GitHub sha as version
         id: version
-        run: echo "value=${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
+        run: echo "value=${GITHUB_SHA:0:7}" >> "$GITHUB_OUTPUT"
 
       - name: Get Node Version
         id: retrieve-node-version
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Check secrets
         id: check-secrets
         run: |
           has_secrets=${{ secrets.AZURE_CLIENT_ID != '' }}
-          echo "has_secrets=$has_secrets" >> $GITHUB_OUTPUT
+          echo "has_secrets=$has_secrets" >> "$GITHUB_OUTPUT"
 
 
   build-containers:
@@ -98,34 +99,43 @@ jobs:
       matrix:
         include:
           - artifact_name: selfhosted-open-source
+            license_type: "oss"
             image_name: web-oss
             npm_command: dist:oss:selfhost
           - artifact_name: cloud-COMMERCIAL
+            license_type: "commercial"
             image_name: web-cloud
             npm_command: dist:bit:cloud
           - artifact_name: selfhosted-COMMERCIAL
+            license_type: "commercial"
             image_name: web
             npm_command: dist:bit:selfhost
           - artifact_name: selfhosted-DEV
+            license_type: "commercial"
             image_name: web
             npm_command: build:bit:selfhost:dev
             git_metadata: true
           - artifact_name: cloud-QA
+            license_type: "commercial"
             image_name: web-qa-cloud
             npm_command: build:bit:qa
             git_metadata: true
           - artifact_name: ee
+            license_type: "commercial"
             image_name: web-ee
             npm_command: build:bit:ee
             git_metadata: true
           - artifact_name: cloud-euprd
+            license_type: "commercial"
             image_name: web-euprd
             npm_command: build:bit:euprd
           - artifact_name: cloud-euqa
+            license_type: "commercial"
             image_name: web-euqa
             npm_command: build:bit:euqa
             git_metadata: true
           - artifact_name: cloud-usdev
+            license_type: "commercial"
             image_name: web-usdev
             npm_command: build:bit:usdev
             git_metadata: true
@@ -134,9 +144,10 @@ jobs:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Get Latest Server Version
         id: latest-server-version
@@ -147,8 +158,10 @@ jobs:
 
       - name: Set Server Ref
         id: set-server-ref
+        env:
+          _SERVER_VERSION: ${{ steps.latest-server-version.outputs.version }}
         run: |
-          SERVER_REF="${{ steps.latest-server-version.outputs.version }}"
+          SERVER_REF="$_SERVER_VERSION"
           echo "Latest server release version: $SERVER_REF"
           if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then
             SERVER_REF="$GITHUB_REF"
@@ -158,26 +171,27 @@ jobs:
             SERVER_REF="refs/heads/main"
           fi
           echo "Server ref: $SERVER_REF"
-          echo "server_ref=$SERVER_REF" >> $GITHUB_OUTPUT
+          echo "server_ref=$SERVER_REF" >> "$GITHUB_OUTPUT"
 
       - name: Check out Server repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           path: server
           repository: bitwarden/server
           ref: ${{ steps.set-server-ref.outputs.server_ref }}
+          persist-credentials: false
 
       - name: Check Branch to Publish
         env:
           PUBLISH_BRANCHES: "main,rc,hotfix-rc-web"
         id: publish-branch-check
         run: |
-          IFS="," read -a publish_branches <<< $PUBLISH_BRANCHES
+          IFS="," read -a publish_branches <<< "$PUBLISH_BRANCHES"
 
           if [[ " ${publish_branches[*]} " =~ " ${GITHUB_REF:11} " ]]; then
-            echo "is_publish_branch=true" >> $GITHUB_ENV
+            echo "is_publish_branch=true" >> "$GITHUB_ENV"
           else
-            echo "is_publish_branch=false" >> $GITHUB_ENV
+            echo "is_publish_branch=false" >> "$GITHUB_ENV"
           fi
 
       - name: Add Git metadata to build version
@@ -190,7 +204,7 @@ jobs:
 
       ########## Set up Docker ##########
       - name: Set up Docker
-        uses: docker/setup-docker-action@b60f85385d03ac8acfca6d9996982511d8620a19 # v4.3.0
+        uses: docker/setup-docker-action@efe9e3891a4f7307e689f2100b33a155b900a608 # v4.5.0
         with:
           daemon-config: |
             {
@@ -201,10 +215,10 @@ jobs:
             }
 
       - name: Set up QEMU emulators
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       ########## ACRs ##########
       - name: Log in to Azure
@@ -217,11 +231,13 @@ jobs:
 
       - name: Log into Prod container registry
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        run: az acr login -n ${_AZ_REGISTRY%.azurecr.io}
+        run: az acr login -n "${_AZ_REGISTRY%.azurecr.io}"
 
       ########## Generate image tag and build Docker image ##########
       - name: Generate container image tag
         id: tag
+        env:
+          _TAG_EXTENSION: ${{ github.event.inputs.custom_tag_extension }}
         run: |
           if [[ "${GITHUB_EVENT_NAME}" == "pull_request" || "${GITHUB_EVENT_NAME}" == "pull_request_target" ]]; then
             IMAGE_TAG=$(echo "${GITHUB_HEAD_REF}" | sed "s/[^a-zA-Z0-9]/-/g") # Sanitize branch name to alphanumeric only
@@ -231,7 +247,7 @@ jobs:
 
           if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then
             SANITIZED_REPO_NAME=$(echo "$_GITHUB_PR_REPO_NAME" | sed "s/[^a-zA-Z0-9]/-/g") # Sanitize repo name to alphanumeric only
-            IMAGE_TAG=$SANITIZED_REPO_NAME-$IMAGE_TAG # Add repo name to the tag
+            IMAGE_TAG="$SANITIZED_REPO_NAME-$IMAGE_TAG" # Add repo name to the tag
             IMAGE_TAG=${IMAGE_TAG:0:128}  # Limit to 128 characters, as that's the max length for Docker image tags
           fi
 
@@ -239,13 +255,13 @@ jobs:
             IMAGE_TAG=dev
           fi
 
-          TAG_EXTENSION=${{ github.event.inputs.custom_tag_extension }}
+          TAG_EXTENSION="$_TAG_EXTENSION"
 
           if [[ $TAG_EXTENSION ]]; then
-            IMAGE_TAG=$IMAGE_TAG-$TAG_EXTENSION
+            IMAGE_TAG="$IMAGE_TAG-$TAG_EXTENSION"
           fi
 
-          echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "image_tag=$IMAGE_TAG" >> "$GITHUB_OUTPUT"
 
       ########## Build Image ##########
       - name: Generate image full name
@@ -253,15 +269,16 @@ jobs:
         env:
           IMAGE_TAG: ${{ steps.tag.outputs.image_tag }}
           PROJECT_NAME: ${{ matrix.image_name }}
-        run: echo "name=$_AZ_REGISTRY/${PROJECT_NAME}:${IMAGE_TAG}" >> $GITHUB_OUTPUT
+        run: echo "name=$_AZ_REGISTRY/${PROJECT_NAME}:${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
 
       - name: Build Docker image
         id: build-container
-        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           build-args: |
             NODE_VERSION=${{ env._NODE_VERSION }}
             NPM_COMMAND=${{ matrix.npm_command }}
+            LICENSE_TYPE=${{ matrix.license_type }}
           context: .
           file: apps/web/Dockerfile
           load: true
@@ -276,7 +293,7 @@ jobs:
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         env:
           IMAGE_NAME: ${{ steps.image-name.outputs.name }}
-        run: docker push $IMAGE_NAME
+        run: docker push "$IMAGE_NAME"
 
       - name: Zip project
         working-directory: apps/web
@@ -284,13 +301,13 @@ jobs:
           IMAGE_NAME: ${{ steps.image-name.outputs.name }}
         run: |
           mkdir build
-          docker run --rm --volume $(pwd)/build:/temp --entrypoint sh \
-            $IMAGE_NAME -c "cp -r ./ /temp"
+          docker run --rm --volume "$(pwd)/build":/temp --entrypoint sh \
+            "$IMAGE_NAME" -c "cp -r ./ /temp"
 
-          zip -r web-${{ env._VERSION }}-${{ matrix.artifact_name }}.zip build
+          zip -r web-$_VERSION-${{ matrix.artifact_name }}.zip build
 
       - name: Upload ${{ matrix.artifact_name }} artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: web-${{ env._VERSION }}-${{ matrix.artifact_name }}.zip
           path: apps/web/web-${{ env._VERSION }}-${{ matrix.artifact_name }}.zip
@@ -298,7 +315,7 @@ jobs:
 
       - name: Install Cosign
         if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/main'
-        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
 
       - name: Sign image with Cosign
         if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/main'
@@ -306,17 +323,18 @@ jobs:
           DIGEST: ${{ steps.build-container.outputs.digest }}
           TAGS: ${{ steps.image-name.outputs.name }}
         run: |
-          IFS="," read -a tags <<< "${TAGS}"
-          images=""
-          for tag in "${tags[@]}"; do
-            images+="${tag}@${DIGEST} "
+          IFS=',' read -r -a tags_array <<< "${TAGS}"
+          images=()
+          for tag in "${tags_array[@]}"; do
+            images+=("${tag}@${DIGEST}")
           done
-          cosign sign --yes ${images}
+          cosign sign --yes "${images[@]}"
+          echo "images=${images[*]}" >> "$GITHUB_OUTPUT"
 
       - name: Scan Docker image
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         id: container-scan
-        uses: anchore/scan-action@2c901ab7378897c01b8efaa2d0c9bf519cc64b9e # v6.2.0
+        uses: anchore/scan-action@568b89d27fc18c60e56937bff480c91c772cd993 # v7.1.0
         with:
           image: ${{ steps.image-name.outputs.name }}
           fail-build: false
@@ -324,14 +342,14 @@ jobs:
 
       - name: Upload Grype results to GitHub
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: github/codeql-action/upload-sarif@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
+        uses: github/codeql-action/upload-sarif@573acd9552f33577783abde4acb66a1058e762e5 # codeql-bundle-v2.23.1
         with:
           sarif_file: ${{ steps.container-scan.outputs.sarif }}
           sha: ${{ contains(github.event_name, 'pull_request') && github.event.pull_request.head.sha || github.sha }}
           ref: ${{ contains(github.event_name, 'pull_request') && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }}
 
       - name: Log out of Docker
-        run: docker logout $_AZ_REGISTRY
+        run: docker logout "$_AZ_REGISTRY"
 
       - name: Log out from Azure
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
@@ -349,9 +367,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
 
       - name: Log in to Azure
         uses: bitwarden/gh-actions/azure-login@main
@@ -371,7 +390,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Upload Sources
-        uses: crowdin/github-action@f214c8723025f41fc55b2ad26e67b60b80b1885d # v2.7.1
+        uses: crowdin/github-action@08713f00a50548bfe39b37e8f44afb53e7a802d4 # v2.12.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
@@ -409,7 +428,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Trigger web vault deploy using GitHub Run ID
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ steps.retrieve-secret-pat.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
           script: |
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index dc4da7d37de..677d3dfc1df 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -31,10 +31,11 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{  github.event.pull_request.head.sha }}
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Get changed files
         id: get-changed-files-for-chromatic
@@ -54,17 +55,17 @@ jobs:
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.retrieve-node-version.outputs.node_version }}
         if: steps.get-changed-files-for-chromatic.outputs.storyFiles == 'true'
 
       - name: Cache NPM
         id: npm-cache
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: "~/.npm"
           key: ${{ runner.os }}-npm-chromatic-${{ hashFiles('**/package-lock.json') }}
@@ -97,7 +98,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Publish to Chromatic
-        uses: chromaui/action@d0795df816d05c4a89c80295303970fddd247cce # v13.1.4
+        uses: chromaui/action@ac86f2ff0a458ffbce7b40698abd44c0fa34d4b6 # v13.3.3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           projectToken: ${{ steps.get-kv-secrets.outputs.CHROMATIC-PROJECT-TOKEN }}
diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml
index 0b891203855..5475c4dd692 100644
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -49,16 +49,19 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Generate GH App token
-        uses: actions/create-github-app-token@30bf6253fa41bdc8d1501d202ad15287582246b4 # v2.0.3
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         id: app-token
         with:
           app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
           private-key: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-KEY }}
+          permission-contents: write      # for creating, committing to, and pushing new branches
+          permission-pull-requests: write # for generating pull requests
 
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: false
 
       - name: Download translations
         uses: bitwarden/gh-actions/crowdin@main
diff --git a/.github/workflows/deploy-web.yml b/.github/workflows/deploy-web.yml
index d3788dc77b9..1deeea12f88 100644
--- a/.github/workflows/deploy-web.yml
+++ b/.github/workflows/deploy-web.yml
@@ -54,8 +54,7 @@ on:
         type: string
         required: false
 
-permissions:
-  deployments: write
+permissions: {}
 
 jobs:
   setup:
@@ -74,56 +73,58 @@ jobs:
     steps:
       - name: Configure
         id: config
+        env:
+          _ENVIRONMENT: ${{ inputs.environment }}
         run: |
-          ENV_NAME_LOWER=$(echo "${{ inputs.environment }}" | awk '{print tolower($0)}')
-          echo "configuring the Web deploy for ${{ inputs.environment }}"
-          echo "environment=${{ inputs.environment }}" >> $GITHUB_OUTPUT
+          ENV_NAME_LOWER=$(echo "$_ENVIRONMENT" | awk '{print tolower($0)}')
+          echo "configuring the Web deploy for _ENVIRONMENT"
+          echo "environment=$_ENVIRONMENT" >> "$GITHUB_OUTPUT"
 
-          case ${{ inputs.environment }} in
+          case $_ENVIRONMENT in
             "USQA")
-              echo "azure_login_client_key_name=AZURE_CLIENT_ID_USQA" >> $GITHUB_OUTPUT
-              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_USQA" >> $GITHUB_OUTPUT
-              echo "retrieve_secrets_keyvault=bw-webvault-rlktusqa-kv" >> $GITHUB_OUTPUT
-              echo "environment_artifact=web-*-cloud-QA.zip" >> $GITHUB_OUTPUT
-              echo "environment_name=Web Vault - US QA Cloud" >> $GITHUB_OUTPUT
-              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
-              echo "slack_channel_name=alerts-deploy-qa"  >> $GITHUB_OUTPUT
+              echo "azure_login_client_key_name=AZURE_CLIENT_ID_USQA" >> "$GITHUB_OUTPUT"
+              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_USQA" >> "$GITHUB_OUTPUT"
+              echo "retrieve_secrets_keyvault=bw-webvault-rlktusqa-kv" >> "$GITHUB_OUTPUT"
+              echo "environment_artifact=web-*-cloud-QA.zip" >> "$GITHUB_OUTPUT"
+              echo "environment_name=Web Vault - US QA Cloud" >> "$GITHUB_OUTPUT"
+              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> "$GITHUB_OUTPUT"
+              echo "slack_channel_name=alerts-deploy-qa"  >> "$GITHUB_OUTPUT"
               ;;
             "EUQA")
-              echo "azure_login_client_key_name=AZURE_CLIENT_ID_EUQA" >> $GITHUB_OUTPUT
-              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_EUQA" >> $GITHUB_OUTPUT
-              echo "retrieve_secrets_keyvault=webvaulteu-westeurope-qa" >> $GITHUB_OUTPUT
-              echo "environment_artifact=web-*-cloud-euqa.zip" >> $GITHUB_OUTPUT
-              echo "environment_name=Web Vault - EU QA Cloud" >> $GITHUB_OUTPUT
-              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
-              echo "slack_channel_name=alerts-deploy-qa"  >> $GITHUB_OUTPUT
+              echo "azure_login_client_key_name=AZURE_CLIENT_ID_EUQA" >> "$GITHUB_OUTPUT"
+              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_EUQA" >> "$GITHUB_OUTPUT"
+              echo "retrieve_secrets_keyvault=webvaulteu-westeurope-qa" >> "$GITHUB_OUTPUT"
+              echo "environment_artifact=web-*-cloud-euqa.zip" >> "$GITHUB_OUTPUT"
+              echo "environment_name=Web Vault - EU QA Cloud" >> "$GITHUB_OUTPUT"
+              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> "$GITHUB_OUTPUT"
+              echo "slack_channel_name=alerts-deploy-qa"  >> "$GITHUB_OUTPUT"
               ;;
             "USPROD")
-              echo "azure_login_client_key_name=AZURE_CLIENT_ID_USPROD" >> $GITHUB_OUTPUT
-              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_USPROD" >> $GITHUB_OUTPUT
-              echo "retrieve_secrets_keyvault=bw-webvault-klrt-kv" >> $GITHUB_OUTPUT
-              echo "environment_artifact=web-*-cloud-COMMERCIAL.zip" >> $GITHUB_OUTPUT
-              echo "environment_name=Web Vault - US Production Cloud" >> $GITHUB_OUTPUT
-              echo "environment_url=http://vault.bitwarden.com" >> $GITHUB_OUTPUT
-              echo "slack_channel_name=alerts-deploy-prd"  >> $GITHUB_OUTPUT
+              echo "azure_login_client_key_name=AZURE_CLIENT_ID_USPROD" >> "$GITHUB_OUTPUT"
+              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_USPROD" >> "$GITHUB_OUTPUT"
+              echo "retrieve_secrets_keyvault=bw-webvault-klrt-kv" >> "$GITHUB_OUTPUT"
+              echo "environment_artifact=web-*-cloud-COMMERCIAL.zip" >> "$GITHUB_OUTPUT"
+              echo "environment_name=Web Vault - US Production Cloud" >> "$GITHUB_OUTPUT"
+              echo "environment_url=http://vault.bitwarden.com" >> "$GITHUB_OUTPUT"
+              echo "slack_channel_name=alerts-deploy-prd"  >> "$GITHUB_OUTPUT"
               ;;
             "EUPROD")
-              echo "azure_login_client_key_name=AZURE_CLIENT_ID_EUPROD" >> $GITHUB_OUTPUT
-              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_EUPROD" >> $GITHUB_OUTPUT
-              echo "retrieve_secrets_keyvault=webvault-westeurope-prod" >> $GITHUB_OUTPUT
-              echo "environment_artifact=web-*-cloud-euprd.zip" >> $GITHUB_OUTPUT
-              echo "environment_name=Web Vault - EU Production Cloud" >> $GITHUB_OUTPUT
-              echo "environment_url=http://vault.bitwarden.eu" >> $GITHUB_OUTPUT
-              echo "slack_channel_name=alerts-deploy-prd"  >> $GITHUB_OUTPUT
+              echo "azure_login_client_key_name=AZURE_CLIENT_ID_EUPROD" >> "$GITHUB_OUTPUT"
+              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_EUPROD" >> "$GITHUB_OUTPUT"
+              echo "retrieve_secrets_keyvault=webvault-westeurope-prod" >> "$GITHUB_OUTPUT"
+              echo "environment_artifact=web-*-cloud-euprd.zip" >> "$GITHUB_OUTPUT"
+              echo "environment_name=Web Vault - EU Production Cloud" >> "$GITHUB_OUTPUT"
+              echo "environment_url=http://vault.bitwarden.eu" >> "$GITHUB_OUTPUT"
+              echo "slack_channel_name=alerts-deploy-prd"  >> "$GITHUB_OUTPUT"
               ;;
             "USDEV")
-              echo "azure_login_client_key_name=AZURE_CLIENT_ID_USDEV" >> $GITHUB_OUTPUT
-              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_USDEV" >> $GITHUB_OUTPUT
-              echo "retrieve_secrets_keyvault=webvault-eastus-dev" >> $GITHUB_OUTPUT
-              echo "environment_artifact=web-*-cloud-usdev.zip" >> $GITHUB_OUTPUT
-              echo "environment_name=Web Vault - US Development Cloud" >> $GITHUB_OUTPUT
-              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
-              echo "slack_channel_name=alerts-deploy-dev"  >> $GITHUB_OUTPUT
+              echo "azure_login_client_key_name=AZURE_CLIENT_ID_USDEV" >> "$GITHUB_OUTPUT"
+              echo "azure_login_subscription_id_key_name=AZURE_SUBSCRIPTION_ID_USDEV" >> "$GITHUB_OUTPUT"
+              echo "retrieve_secrets_keyvault=webvault-eastus-dev" >> "$GITHUB_OUTPUT"
+              echo "environment_artifact=web-*-cloud-usdev.zip" >> "$GITHUB_OUTPUT"
+              echo "environment_name=Web Vault - US Development Cloud" >> "$GITHUB_OUTPUT"
+              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> "$GITHUB_OUTPUT"
+              echo "slack_channel_name=alerts-deploy-dev"  >> "$GITHUB_OUTPUT"
               ;;
           esac
 
@@ -131,12 +132,14 @@ jobs:
         env:
           BUILD_WEB_RUN_ID: ${{ inputs.build-web-run-id }}
           GH_TOKEN: ${{ github.token }}
+          _ENVIRONMENT: ${{ inputs.environment }}
+          _BRANCH_OR_TAG: ${{ inputs.branch-or-tag }}
         run: |
           BRANCH_OR_TAG_LOWER=""
           if [[ "$BUILD_WEB_RUN_ID" == "" ]]; then
-            BRANCH_OR_TAG_LOWER=$(echo ${{ inputs.branch-or-tag }} | awk '{print tolower($0)}')
+            BRANCH_OR_TAG_LOWER=$(echo "$_BRANCH_OR_TAG" | awk '{print tolower($0)}')
           else
-            BRANCH_OR_TAG_LOWER=$(gh api /repos/bitwarden/clients/actions/runs/$BUILD_WEB_RUN_ID/artifacts --jq '.artifacts[0].workflow_run.head_branch' | awk '{print tolower($0)}')
+            BRANCH_OR_TAG_LOWER=$(gh api "/repos/bitwarden/clients/actions/runs/$BUILD_WEB_RUN_ID/artifacts" --jq '.artifacts[0].workflow_run.head_branch' | awk '{print tolower($0)}')
           fi
 
           echo "Branch/Tag: $BRANCH_OR_TAG_LOWER"
@@ -151,23 +154,23 @@ jobs:
           DEV_ALLOWED_TAGS_PATTERN='main'
 
           if [[ \
-              ${{ inputs.environment }} =~ \.*($PROD_ENV_PATTERN)\.* && \
+              $_ENVIRONMENT =~ \.*($PROD_ENV_PATTERN)\.* && \
               ! "$BRANCH_OR_TAG_LOWER" =~ ^($PROD_ALLOWED_TAGS_PATTERN).* \
           ]] || [[ \
-              ${{ inputs.environment }} =~ \.*($QA_ENV_PATTERN)\.* && \
+              $_ENVIRONMENT =~ \.*($QA_ENV_PATTERN)\.* && \
               ! "$BRANCH_OR_TAG_LOWER" =~ ^($QA_ALLOWED_TAGS_PATTERN).* \
           ]] || [[ \
-              ${{ inputs.environment }} =~ \.*($DEV_ENV_PATTERN)\.* && \
-              $BRANCH_OR_TAG_LOWER != $DEV_ALLOWED_TAGS_PATTERN \
+              $_ENVIRONMENT =~ \.*($DEV_ENV_PATTERN)\.* && \
+              $BRANCH_OR_TAG_LOWER != "$DEV_ALLOWED_TAGS_PATTERN" \
           ]]; then
               echo "!Deployment blocked!"
-              echo "Attempting to deploy a tag that is not allowed in ${{ inputs.environment }} environment"
+              echo "Attempting to deploy a tag that is not allowed in $_ENVIRONMENT environment"
               echo
-              echo "Environment: ${{ inputs.environment }}"
+              echo "Environment: $_ENVIRONMENT"
               echo "Tag: $BRANCH_OR_TAG_LOWER"
               exit 1
           else
-              echo "The input Branch/Tag: '$BRANCH_OR_TAG_LOWER' is allowed to deploy on ${{ inputs.environment }} environment"
+              echo "The input Branch/Tag: '$BRANCH_OR_TAG_LOWER' is allowed to deploy on $_ENVIRONMENT environment"
           fi
 
   approval:
@@ -251,19 +254,24 @@ jobs:
         id: set-artifact-commit
         env:
           GH_TOKEN: ${{ github.token }}
+          _BUILD_WEB_RUN_ID: ${{ inputs.build-web-run-id }}
+          _ARTIFACT_BUILD_COMMIT: ${{ steps.download-latest-artifacts-run-id.outputs.artifact-build-commit }}
+          _DOWNLOAD_LATEST_ARTIFACTS_OUTCOME: ${{ steps.download-latest-artifacts.outcome }}
+          _WORKFLOW_ID: ${{ steps.trigger-build-web.outputs.workflow_id}}
+          _ARTIFACT_COMMIT: ${{ steps.download-latest-artifacts.outputs.artifact-build-commit }}
         run: |
           # If run-id was used, get the commit from the download-latest-artifacts-run-id step
-          if [ "${{ inputs.build-web-run-id }}" ]; then
-            echo "commit=${{ steps.download-latest-artifacts-run-id.outputs.artifact-build-commit }}" >> $GITHUB_OUTPUT
+          if [ "$_BUILD_WEB_RUN_ID" ]; then
+            echo "commit=$_ARTIFACT_BUILD_COMMIT" >> "$GITHUB_OUTPUT"
 
-          elif [ "${{ steps.download-latest-artifacts.outcome }}" == "failure" ]; then
+          elif [ "$_DOWNLOAD_LATEST_ARTIFACTS_OUTCOME" == "failure" ]; then
             # If the download-latest-artifacts step failed, query the GH API to get the commit SHA of the artifact that was just built with trigger-build-web.
-            commit=$(gh api /repos/bitwarden/clients/actions/runs/${{ steps.trigger-build-web.outputs.workflow_id }}/artifacts --jq '.artifacts[0].workflow_run.head_sha')
-            echo "commit=$commit" >> $GITHUB_OUTPUT
+            commit=$(gh api "/repos/bitwarden/clients/actions/runs/$_WORKFLOW_ID/artifacts" --jq '.artifacts[0].workflow_run.head_sha')
+            echo "commit=$commit" >> "$GITHUB_OUTPUT"
 
           else
             # Set the commit to the output of step download-latest-artifacts.
-            echo "commit=${{ steps.download-latest-artifacts.outputs.artifact-build-commit }}" >> $GITHUB_OUTPUT
+            echo "commit=$_ARTIFACT_COMMIT" >> "$GITHUB_OUTPUT"
           fi
 
   notify-start:
@@ -299,12 +307,14 @@ jobs:
     name: Display commit
     needs: artifact-check
     runs-on: ubuntu-22.04
+    env:
+      _ARTIFACT_BUILD_COMMIT_SHA: ${{ needs.artifact-check.outputs.artifact_build_commit }}
     steps:
       - name: Display commit SHA
         run: |
           REPO_URL="https://github.com/bitwarden/clients/commit"
-          COMMIT_SHA="${{ needs.artifact-check.outputs.artifact_build_commit }}"
-          echo ":steam_locomotive: View [commit]($REPO_URL/$COMMIT_SHA)" >> $GITHUB_STEP_SUMMARY
+          COMMIT_SHA="$_ARTIFACT_BUILD_COMMIT_SHA"
+          echo ":steam_locomotive: View [commit]($REPO_URL/$COMMIT_SHA)" >> "$GITHUB_STEP_SUMMARY"
 
   azure-deploy:
     name: Deploy Web Vault to ${{ inputs.environment }} Storage Account
@@ -358,14 +368,20 @@ jobs:
 
       - name: Unzip build asset
         working-directory: apps/web
-        run: unzip ${{ env._ENVIRONMENT_ARTIFACT }}
+        run: unzip "$_ENVIRONMENT_ARTIFACT"
 
       - name: Login to Azure
         uses: bitwarden/gh-actions/azure-login@main
+        env:
+          # The following 2 values are ignored in Zizmor, because they have to be dynamically mapped from secrets
+          # The only way around this is to create separate steps per environment with static secret references, which is not maintainable
+          SUBSCRIPTION_ID: ${{ secrets[ needs.setup.outputs.azure_login_subscription_id_key_name ] }} # zizmor: ignore[overprovisioned-secrets]
+          CLIENT_ID: ${{ secrets[ needs.setup.outputs.azure_login_client_key_name ] }} # zizmor: ignore[overprovisioned-secrets]
+          TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         with:
-          subscription_id: ${{ secrets[needs.setup.outputs.azure_login_subscription_id_key_name] }}
-          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
-          client_id: ${{ secrets[needs.setup.outputs.azure_login_client_key_name] }}
+          subscription_id: ${{ env.SUBSCRIPTION_ID }}
+          tenant_id: ${{ env.TENANT_ID }}
+          client_id: ${{ env.CLIENT_ID }}
 
       - name: Retrieve Storage Account name
         id: retrieve-secrets-azcopy
@@ -379,9 +395,10 @@ jobs:
         env:
           AZCOPY_AUTO_LOGIN_TYPE: AZCLI
           AZCOPY_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          _VAULT_NAME: ${{ steps.retrieve-secrets-azcopy.outputs.sa-bitwarden-web-vault-name }}
         run: |
-          azcopy sync ./build 'https://${{ steps.retrieve-secrets-azcopy.outputs.sa-bitwarden-web-vault-name }}.blob.core.windows.net/$web/' \
-            --delete-destination=${{ inputs.force-delete-destination }} --compare-hash="MD5"
+          azcopy sync ./build "https://$_VAULT_NAME.blob.core.windows.net/\$web/" \
+            --delete-destination="${{ inputs.force-delete-destination }}" --compare-hash="MD5"
 
       - name: Log out from Azure
         uses: bitwarden/gh-actions/azure-logout@main
diff --git a/.github/workflows/lint-crowdin-config.yml b/.github/workflows/lint-crowdin-config.yml
index 38a3ef59ea7..b0efeb50823 100644
--- a/.github/workflows/lint-crowdin-config.yml
+++ b/.github/workflows/lint-crowdin-config.yml
@@ -22,9 +22,10 @@ jobs:
         ]
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           fetch-depth: 1
+          persist-credentials: false
 
       - name: Log in to Azure
         uses: bitwarden/gh-actions/azure-login@main
@@ -44,7 +45,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Lint ${{ matrix.app.name }} config
-        uses: crowdin/github-action@f214c8723025f41fc55b2ad26e67b60b80b1885d # v2.7.1
+        uses: crowdin/github-action@08713f00a50548bfe39b37e8f44afb53e7a802d4 # v2.12.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_PROJECT_ID: ${{ matrix.app.project_id }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7eab45e5b1b..48d3eca2f4e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -31,7 +31,9 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Lint filenames (no capital characters)
         run: |
@@ -49,6 +51,7 @@ jobs:
             ! -path "*/Cargo.toml" \
             ! -path "*/Cargo.lock" \
             ! -path "./apps/desktop/macos/*" \
+            ! -path "*/CLAUDE.md" \
             > tmp.txt
           diff <(sort .github/whitelist-capital-letters.txt) <(sort tmp.txt)
 
@@ -57,10 +60,10 @@ jobs:
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -72,6 +75,9 @@ jobs:
       - name: Lint unowned dependencies
         run: npm run lint:dep-ownership
 
+      - name: Lint sdk-internal versions
+        run: npm run lint:sdk-internal-versions
+
       - name: Run linter
         run: npm run lint
 
@@ -88,14 +94,31 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # stable
+        with:
+          toolchain: stable
+          components: rustfmt, clippy
+
+      - name: Install Rust nightly
+        uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # stable
+        with:
+          toolchain: nightly
+          components: rustfmt
 
       - name: Check Rust version
         run: rustup --version
 
+      - name: Cache cargo registry
+        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
+
       - name: Run cargo fmt
         working-directory: ./apps/desktop/desktop_native
-        run: cargo fmt --check
+        run: cargo +nightly fmt --check
 
       - name: Run Clippy
         working-directory: ./apps/desktop/desktop_native
@@ -109,3 +132,19 @@ jobs:
       - name: Cargo sort
         working-directory: ./apps/desktop/desktop_native
         run: cargo sort --workspace --check
+
+      - name: Install cargo-udeps
+        run: cargo install cargo-udeps --version 0.1.57 --locked
+
+      - name: Cargo udeps
+        working-directory: ./apps/desktop/desktop_native
+        run: cargo +nightly udeps --workspace --all-features --all-targets
+
+      - name: Install cargo-deny
+        uses: taiki-e/install-action@81ee1d48d9194cdcab880cbdc7d36e87d39874cb # v2.62.45
+        with:
+          tool: cargo-deny@0.18.5
+
+      - name: Run cargo deny
+        working-directory: ./apps/desktop/desktop_native
+        run: cargo deny --log-level error --all-features check all
diff --git a/.github/workflows/locales-lint.yml b/.github/workflows/locales-lint.yml
index 0c8148d4c28..8335d6aacad 100644
--- a/.github/workflows/locales-lint.yml
+++ b/.github/workflows/locales-lint.yml
@@ -17,18 +17,20 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
       - name: Checkout base branch repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ github.event.pull_request.base.sha }}
           path: base
+          persist-credentials: false
       - name: Install dependencies
         run: npm ci
       - name: Compare
         run: |
-          npm run test:locales
-          if [ $? -eq 0 ]; then
+          if npm run test:locales; then
             echo "Lint check successful."
           else
             echo "Lint check failed."
diff --git a/.github/workflows/nx.yml b/.github/workflows/nx.yml
index 9349239a134..0f01aa27899 100644
--- a/.github/workflows/nx.yml
+++ b/.github/workflows/nx.yml
@@ -12,9 +12,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           fetch-depth: 0
+          persist-credentials: false
       
       - name: Get Node Version
         id: retrieve-node-version
@@ -22,10 +23,10 @@ jobs:
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index bef686592d4..8fcd1fe7c98 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -65,14 +65,18 @@ jobs:
 
       - name: Version output
         id: version-output
+        env:
+          INPUT_VERSION: ${{ inputs.version }}
         run: |
-          if [[ "${{ inputs.version }}" == "latest" || "${{ inputs.version }}" == "" ]]; then
-            VERSION=$(curl  "https://api.github.com/repos/bitwarden/clients/releases" | jq -c '.[] | select(.tag_name | contains("cli")) | .tag_name' | head -1 | grep -ohE '20[0-9]{2}\.([1-9]|1[0-2])\.[0-9]+')
+          if [[ "$INPUT_VERSION" == "latest" || "$INPUT_VERSION" == "" ]]; then
+            TAG_NAME=$(curl -s "https://api.github.com/repos/bitwarden/clients/releases" \
+              | jq -r '.[] | select(.tag_name | contains("cli")) | .tag_name' | head -1)
+            VERSION="${TAG_NAME#cli-v}"
             echo "Latest Released Version: $VERSION"
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           else
-            echo "Release Version: ${{ inputs.version }}"
-            echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
+            echo "Release Version: $INPUT_VERSION"
+            echo "version=$INPUT_VERSION" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Create GitHub deployment
@@ -99,7 +103,9 @@ jobs:
       _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Log in to Azure
         uses: bitwarden/gh-actions/azure-login@main
@@ -119,17 +125,17 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Install Snap
-        uses: samuelmeuli/action-snapcraft@d33c176a9b784876d966f80fb1b461808edc0641  # v2.1.1
+        uses: samuelmeuli/action-snapcraft@fceeb3c308e76f3487e72ef608618de625fb7fe8  # v3.0.1
 
       - name: Download artifacts
-        run: wget https://github.com/bitwarden/clients/releases/download/cli-v${{ env._PKG_VERSION }}/bw_${{ env._PKG_VERSION }}_amd64.snap
+        run: wget "https://github.com/bitwarden/clients/releases/download/cli-v${_PKG_VERSION}/bw_${_PKG_VERSION}_amd64.snap"
 
       - name: Publish Snap & logout
         if: ${{ inputs.publish_type != 'Dry Run' }}
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
         run: |
-          snapcraft upload bw_${{ env._PKG_VERSION }}_amd64.snap --release stable
+          snapcraft upload "bw_${_PKG_VERSION}_amd64.snap" --release stable
           snapcraft logout
 
   choco:
@@ -145,7 +151,9 @@ jobs:
       _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Log in to Azure
         uses: bitwarden/gh-actions/azure-login@main
@@ -173,7 +181,7 @@ jobs:
         run: New-Item -ItemType directory -Path ./dist
 
       - name: Download artifacts
-        run: Invoke-WebRequest -Uri "https://github.com/bitwarden/clients/releases/download/cli-v${{ env._PKG_VERSION }}/bitwarden-cli.${{ env._PKG_VERSION }}.nupkg" -OutFile bitwarden-cli.${{ env._PKG_VERSION }}.nupkg
+        run: Invoke-WebRequest -Uri "https://github.com/bitwarden/clients/releases/download/cli-v$($env:_PKG_VERSION)/bitwarden-cli.$($env:_PKG_VERSION).nupkg" -OutFile bitwarden-cli.$($env:_PKG_VERSION).nupkg
         working-directory: apps/cli/dist
 
       - name: Push to Chocolatey
@@ -195,27 +203,34 @@ jobs:
       _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
+
       - name: Get Node version
         id: retrieve-node-version
+        working-directory: ./
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Set up Node
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: ${{ steps.retrieve-node-version.outputs.node_version }}
-          npm-version: "11.5.1" # FIXME: npm 11.5.1 or later is required to publish w/ OIDC; move version management to somewhere maintainable by automation
           registry-url: "https://registry.npmjs.org/"
 
+      - name: Install NPM
+        run: |
+          npm install -g npm@latest # npm 11.5.1 or later is required to publish w/ OIDC
+          npm --version
+
       - name: Download and set up artifact
         run: |
           mkdir -p build
-          wget https://github.com/bitwarden/clients/releases/download/cli-v${{ env._PKG_VERSION }}/bitwarden-cli-${{ env._PKG_VERSION }}-npm-build.zip
-          unzip bitwarden-cli-${{ env._PKG_VERSION }}-npm-build.zip -d build
+          wget "https://github.com/bitwarden/clients/releases/download/cli-v${_PKG_VERSION}/bitwarden-cli-${_PKG_VERSION}-npm-build.zip"
+          unzip "bitwarden-cli-${_PKG_VERSION}-npm-build.zip" -d build
 
       - name: Publish NPM
         if: ${{ inputs.publish_type != 'Dry Run' }}
diff --git a/.github/workflows/publish-desktop.yml b/.github/workflows/publish-desktop.yml
index 9fe8909f8d6..3d512d49559 100644
--- a/.github/workflows/publish-desktop.yml
+++ b/.github/workflows/publish-desktop.yml
@@ -72,39 +72,46 @@ jobs:
 
       - name: Check Publish Version
         id: version
+        env:
+          INPUT_VERSION: ${{ inputs.version }}
         run: |
-          if [[ "${{ inputs.version }}" == "latest" || "${{ inputs.version }}" == "" ]]; then
-            TAG_NAME=$(curl  "https://api.github.com/repos/bitwarden/clients/releases" | jq -c '.[] | select(.tag_name | contains("desktop")) | .tag_name' | head -1 | cut -d '"' -f 2)
-            VERSION=$(echo $TAG_NAME | sed "s/desktop-v//")
+          if [[ "$INPUT_VERSION" == "latest" || "$INPUT_VERSION" == "" ]]; then
+            TAG_NAME=$(curl -s "https://api.github.com/repos/bitwarden/clients/releases" \
+              | jq -r '.[] | select(.tag_name | contains("desktop")) | .tag_name' | head -1)
+            VERSION="${TAG_NAME#desktop-v}"
+
             echo "Latest Released Version: $VERSION"
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
             echo "Tag name: $TAG_NAME"
-            echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
+            echo "tag_name=$TAG_NAME" >> "$GITHUB_OUTPUT"
           else
-            echo "Release Version: ${{ inputs.version }}"
-            echo "version=${{ inputs.version }}"
+            VERSION="$INPUT_VERSION"
+            TAG_NAME="desktop-v$VERSION"
 
-            TAG_NAME="desktop-v${{ inputs.version }}"
+            echo "Release Version: $VERSION"
+            echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
             echo "Tag name: $TAG_NAME"
-            echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
+            echo "tag_name=$TAG_NAME" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Get Version Channel
         id: release_channel
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
         run: |
-          case "${{ steps.version.outputs.version }}" in
+          case "${VERSION}" in
             *"alpha"*)
-              echo "channel=alpha" >> $GITHUB_OUTPUT
+              echo "channel=alpha" >> "$GITHUB_OUTPUT"
               echo "[!] We do not yet support 'alpha'"
               exit 1
               ;;
             *"beta"*)
-              echo "channel=beta" >> $GITHUB_OUTPUT
+              echo "channel=beta" >> "$GITHUB_OUTPUT"
               ;;
             *)
-              echo "channel=latest" >> $GITHUB_OUTPUT
+              echo "channel=latest" >> "$GITHUB_OUTPUT"
               ;;
           esac
 
@@ -159,16 +166,16 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         working-directory: apps/desktop/artifacts
-        run: gh release download ${{ env._RELEASE_TAG }} -R bitwarden/clients
+        run: gh release download "$_RELEASE_TAG" -R bitwarden/clients
 
       - name: Set staged rollout percentage
         env:
           RELEASE_CHANNEL: ${{ needs.setup.outputs.release_channel }}
           ROLLOUT_PCT: ${{ inputs.electron_rollout_percentage }}
         run: |
-          echo "stagingPercentage: ${ROLLOUT_PCT}" >> apps/desktop/artifacts/${RELEASE_CHANNEL}.yml
-          echo "stagingPercentage: ${ROLLOUT_PCT}" >> apps/desktop/artifacts/${RELEASE_CHANNEL}-linux.yml
-          echo "stagingPercentage: ${ROLLOUT_PCT}" >> apps/desktop/artifacts/${RELEASE_CHANNEL}-mac.yml
+          echo "stagingPercentage: ${ROLLOUT_PCT}" >> "apps/desktop/artifacts/${RELEASE_CHANNEL}.yml"
+          echo "stagingPercentage: ${ROLLOUT_PCT}" >> "apps/desktop/artifacts/${RELEASE_CHANNEL}-linux.yml"
+          echo "stagingPercentage: ${ROLLOUT_PCT}" >> "apps/desktop/artifacts/${RELEASE_CHANNEL}-mac.yml"
 
       - name: Publish artifacts to S3
         if: ${{ inputs.publish_type != 'Dry Run' }}
@@ -179,27 +186,11 @@ jobs:
           AWS_S3_BUCKET_NAME: ${{ steps.retrieve-secrets.outputs.aws-electron-bucket-name }}
         working-directory: apps/desktop/artifacts
         run: |
-          aws s3 cp ./ $AWS_S3_BUCKET_NAME/desktop/ \
+          aws s3 cp ./ "$AWS_S3_BUCKET_NAME/desktop/" \
           --acl "public-read" \
           --recursive \
           --quiet
 
-      - name: Update deployment status to Success
-        if: ${{ inputs.publish_type != 'Dry Run' && success() }}
-        uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806 # v2.0.3
-        with:
-          token: '${{ secrets.GITHUB_TOKEN }}'
-          state: 'success'
-          deployment-id: ${{ needs.setup.outputs.deployment_id }}
-
-      - name: Update deployment status to Failure
-        if: ${{ inputs.publish_type != 'Dry Run' && failure() }}
-        uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806 # v2.0.3
-        with:
-          token: '${{ secrets.GITHUB_TOKEN }}'
-          state: 'failure'
-          deployment-id: ${{ needs.setup.outputs.deployment_id }}
-
   snap:
     name: Deploy Snap
     runs-on: ubuntu-22.04
@@ -213,7 +204,9 @@ jobs:
       _RELEASE_TAG: ${{ needs.setup.outputs.tag_name }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Log in to Azure
         uses: bitwarden/gh-actions/azure-login@main
@@ -233,7 +226,7 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Install Snap
-        uses: samuelmeuli/action-snapcraft@d33c176a9b784876d966f80fb1b461808edc0641 # v2.1.1
+        uses: samuelmeuli/action-snapcraft@fceeb3c308e76f3487e72ef608618de625fb7fe8 # v3.0.1
 
       - name: Setup
         run: mkdir dist
@@ -241,14 +234,14 @@ jobs:
 
       - name: Download artifacts
         working-directory: apps/desktop/dist
-        run: wget https://github.com/bitwarden/clients/releases/download/${{ env._RELEASE_TAG }}/bitwarden_${{ env._PKG_VERSION }}_amd64.snap
+        run: wget "https://github.com/bitwarden/clients/releases/download/${_RELEASE_TAG}/bitwarden_${_PKG_VERSION}_amd64.snap"
 
       - name: Deploy to Snap Store
         if: ${{ inputs.publish_type != 'Dry Run' }}
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }}
         run: |
-          snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable
+          snapcraft upload "bitwarden_${_PKG_VERSION}_amd64.snap" --release stable
           snapcraft logout
         working-directory: apps/desktop/dist
 
@@ -265,7 +258,9 @@ jobs:
       _RELEASE_TAG: ${{ needs.setup.outputs.tag_name }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Print Environment
         run: |
@@ -300,7 +295,7 @@ jobs:
 
       - name: Download artifacts
         working-directory: apps/desktop/dist
-        run: Invoke-WebRequest -Uri "https://github.com/bitwarden/clients/releases/download/${{ env._RELEASE_TAG }}/bitwarden.${{ env._PKG_VERSION }}.nupkg" -OutFile bitwarden.${{ env._PKG_VERSION }}.nupkg
+        run: Invoke-WebRequest -Uri "https://github.com/bitwarden/clients/releases/download/$($env:_RELEASE_TAG)/bitwarden.$($env:_PKG_VERSION).nupkg" -OutFile "bitwarden.$($env:_PKG_VERSION).nupkg"
 
       - name: Push to Chocolatey
         if: ${{ inputs.publish_type != 'Dry Run' }}
@@ -320,10 +315,12 @@ jobs:
       _RELEASE_TAG: ${{ needs.setup.outputs.tag_name }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Validate release notes for MAS
-        if: inputs.mas_publish && (inputs.release_notes == '' || inputs.release_notes == null)
+        if: inputs.release_notes == '' || inputs.release_notes == null
         run: |
           echo "❌ Release notes are required when publishing to Mac App Store"
           echo "Please provide release notes using the 'Release Notes' input field"
@@ -331,15 +328,15 @@ jobs:
 
       - name: Download MacOS App Store build number
         working-directory: apps/desktop
-        run: wget https://github.com/bitwarden/clients/releases/download/${{ env._RELEASE_TAG }}/macos-build-number.json
+        run: wget "https://github.com/bitwarden/clients/releases/download/${_RELEASE_TAG}/macos-build-number.json"
 
       - name: Setup Ruby and Install Fastlane
-        uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # v1.233.0
+        uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.4.7'
           bundler-cache: false
           working-directory: apps/desktop
-        
+
       - name: Install Fastlane
         working-directory: apps/desktop
         run: gem install fastlane
@@ -365,33 +362,35 @@ jobs:
         env:
           APP_STORE_CONNECT_TEAM_ISSUER: ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-TEAM-ISSUER }}
           APP_STORE_CONNECT_AUTH_KEY: ${{ steps.get-kv-secrets.outputs.APP-STORE-CONNECT-AUTH-KEY }}
+          CHANGELOG: ${{ inputs.release_notes }}
+          PUBLISH_TYPE: ${{ inputs.publish_type }}
         working-directory: apps/desktop
         run: |
           BUILD_NUMBER=$(jq -r '.buildNumber' macos-build-number.json)
-          CHANGELOG="${{ inputs.release_notes }}"
-          IS_DRY_RUN="${{ inputs.publish_type == 'Dry Run' }}"
-          
-          if [ "$IS_DRY_RUN" = "true" ]; then
+
+          if [ "$PUBLISH_TYPE" = "Dry Run" ]; then
             echo "🧪 DRY RUN MODE - Testing without actual App Store submission"
             echo "📦 Would publish build $BUILD_NUMBER to Mac App Store"
+            IS_DRY_RUN="true"
           else
             echo "🚀 PRODUCTION MODE - Publishing to Mac App Store"
             echo "📦 Publishing build $BUILD_NUMBER to Mac App Store"
+            IS_DRY_RUN="false"
           fi
-          
+
           echo "📝 Release notes (${#CHANGELOG} chars): ${CHANGELOG:0:100}..."
-          
+
           # Validate changelog length (App Store limit is 4000 chars)
           if [ ${#CHANGELOG} -gt 4000 ]; then
             echo "❌ Release notes too long: ${#CHANGELOG} characters (max 4000)"
             exit 1
           fi
-          
+
           fastlane publish --verbose \
-            app_version:"${{ env._PKG_VERSION }}" \
-            build_number:$BUILD_NUMBER \
+            app_version:"${_PKG_VERSION}" \
+            build_number:"$BUILD_NUMBER" \
             changelog:"$CHANGELOG" \
-            dry_run:$IS_DRY_RUN
+            dry_run:"$IS_DRY_RUN"
 
   update-deployment:
     name: Update Deployment Status
diff --git a/.github/workflows/publish-web.yml b/.github/workflows/publish-web.yml
index a6f0f1be066..62d9342cf61 100644
--- a/.github/workflows/publish-web.yml
+++ b/.github/workflows/publish-web.yml
@@ -28,7 +28,9 @@ jobs:
       contents: read
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Branch check
         if: ${{ inputs.publish_type != 'Dry Run' }}
@@ -72,7 +74,9 @@ jobs:
           echo "Github Release Option: $_RELEASE_OPTION"
 
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       ########## ACR ##########
       - name: Log in to Azure
@@ -100,33 +104,33 @@ jobs:
       - name: Pull branch image
         run: |
           if [[ "${{ inputs.publish_type }}" == "Dry Run" ]]; then
-            docker pull $_AZ_REGISTRY/web:latest
+            docker pull "$_AZ_REGISTRY/web:latest"
           else
-            docker pull $_AZ_REGISTRY/web:$_BRANCH_NAME
+            docker pull "$_AZ_REGISTRY/web:$_BRANCH_NAME"
           fi
 
       - name: Tag version
         run: |
           if [[ "${{ inputs.publish_type }}" == "Dry Run" ]]; then
-            docker tag $_AZ_REGISTRY/web:latest $_AZ_REGISTRY/web:dryrun
-            docker tag $_AZ_REGISTRY/web:latest $_AZ_REGISTRY/web-sh:dryrun
+            docker tag "$_AZ_REGISTRY/web:latest" "$_AZ_REGISTRY/web:dryrun"
+            docker tag "$_AZ_REGISTRY/web:latest" "$_AZ_REGISTRY/web-sh:dryrun"
           else
-            docker tag $_AZ_REGISTRY/web:$_BRANCH_NAME $_AZ_REGISTRY/web:$_RELEASE_VERSION
-            docker tag $_AZ_REGISTRY/web:$_BRANCH_NAME $_AZ_REGISTRY/web-sh:$_RELEASE_VERSION
-            docker tag $_AZ_REGISTRY/web:$_BRANCH_NAME $_AZ_REGISTRY/web:latest
-            docker tag $_AZ_REGISTRY/web:$_BRANCH_NAME $_AZ_REGISTRY/web-sh:latest
+            docker tag "$_AZ_REGISTRY/web:$_BRANCH_NAME" "$_AZ_REGISTRY/web:$_RELEASE_VERSION"
+            docker tag "$_AZ_REGISTRY/web:$_BRANCH_NAME" "$_AZ_REGISTRY/web-sh:$_RELEASE_VERSION"
+            docker tag "$_AZ_REGISTRY/web:$_BRANCH_NAME" "$_AZ_REGISTRY/web:latest"
+            docker tag "$_AZ_REGISTRY/web:$_BRANCH_NAME" "$_AZ_REGISTRY/web-sh:latest"
           fi
 
       - name: Push version
         run: |
           if [[ "${{ inputs.publish_type }}" == "Dry Run" ]]; then
-            docker push $_AZ_REGISTRY/web:dryrun
-            docker push $_AZ_REGISTRY/web-sh:dryrun
+            docker push "$_AZ_REGISTRY/web:dryrun"
+            docker push "$_AZ_REGISTRY/web-sh:dryrun"
           else
-            docker push $_AZ_REGISTRY/web:$_RELEASE_VERSION
-            docker push $_AZ_REGISTRY/web-sh:$_RELEASE_VERSION
-            docker push $_AZ_REGISTRY/web:latest
-            docker push $_AZ_REGISTRY/web-sh:latest
+            docker push "$_AZ_REGISTRY/web:$_RELEASE_VERSION"
+            docker push "$_AZ_REGISTRY/web-sh:$_RELEASE_VERSION"
+            docker push "$_AZ_REGISTRY/web:latest"
+            docker push "$_AZ_REGISTRY/web-sh:latest"
           fi
 
       - name: Log out from Azure
@@ -153,11 +157,10 @@ jobs:
       - name: Log out of Docker
         run: docker logout
 
-  self-host-unified-build:
-    name: Trigger self-host unified build
+  bitwarden-lite-build:
+    name: Trigger Bitwarden lite build
     runs-on: ubuntu-22.04
-    needs:
-      - setup
+    needs: setup
     permissions:
       id-token: write
     steps:
@@ -168,27 +171,35 @@ jobs:
           tenant_id: ${{ secrets.AZURE_TENANT_ID }}
           client_id: ${{ secrets.AZURE_CLIENT_ID }}
 
-      - name: Retrieve GitHub PAT secrets
-        id: retrieve-secret-pat
+      - name: Get Azure Key Vault secrets
+        id: get-kv-secrets
         uses: bitwarden/gh-actions/get-keyvault-secrets@main
         with:
-          keyvault: "bitwarden-ci"
-          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
+          keyvault: gh-org-bitwarden
+          secrets: "BW-GHAPP-ID,BW-GHAPP-KEY"
 
       - name: Log out from Azure
         uses: bitwarden/gh-actions/azure-logout@main
 
-      - name: Trigger self-host build
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      - name: Generate GH App token
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        id: app-token
         with:
-          github-token: ${{ steps.retrieve-secret-pat.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
+          app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
+          private-key: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-KEY }}
+
+      - name: Trigger Bitwarden lite build
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
           script: |
             await github.rest.actions.createWorkflowDispatch({
               owner: 'bitwarden',
               repo: 'self-host',
-              workflow_id: 'build-unified.yml',
+              workflow_id: 'build-bitwarden-lite.yml',
               ref: 'main',
               inputs: {
-                use_latest_core_version: true
+                use_latest_core_version: true,
+                web_branch: process.env.GITHUB_REF
               }
             });
diff --git a/.github/workflows/release-browser.yml b/.github/workflows/release-browser.yml
index ac79287f84d..ff5fb669faf 100644
--- a/.github/workflows/release-browser.yml
+++ b/.github/workflows/release-browser.yml
@@ -28,7 +28,9 @@ jobs:
       release_version: ${{ steps.version.outputs.version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Branch check
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -59,7 +61,9 @@ jobs:
       contents: read
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Testing locales - extName length
         run: |
@@ -69,9 +73,11 @@ jobs:
           echo "============"
           echo "extName string must be 40 characters or less"
           echo
-          for locale in $(ls src/_locales/); do
-            string_length=$(jq '.extName.message | length' src/_locales/$locale/messages.json)
-            if [[ $string_length -gt 40 ]]; then
+
+          for locale_path in src/_locales/*/messages.json; do
+            locale=$(basename "$(dirname "$locale_path")")
+            string_length=$(jq '.extName.message | length' "$locale_path")
+            if [ "$string_length" -gt 40 ]; then
               echo "$locale: $string_length"
               found_error=true
             fi
@@ -126,15 +132,15 @@ jobs:
         env:
           PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }}
         run: |
-          mv browser-source.zip browser-source-$PACKAGE_VERSION.zip
-          mv dist-chrome.zip dist-chrome-$PACKAGE_VERSION.zip
-          mv dist-opera.zip dist-opera-$PACKAGE_VERSION.zip
-          mv dist-firefox.zip dist-firefox-$PACKAGE_VERSION.zip
-          mv dist-edge.zip dist-edge-$PACKAGE_VERSION.zip
+          mv browser-source.zip "browser-source-${PACKAGE_VERSION}.zip"
+          mv dist-chrome.zip "dist-chrome-${PACKAGE_VERSION}.zip"
+          mv dist-opera.zip "dist-opera-${PACKAGE_VERSION}.zip"
+          mv dist-firefox.zip "dist-firefox-${PACKAGE_VERSION}.zip"
+          mv dist-edge.zip "dist-edge-${PACKAGE_VERSION}.zip"
 
       - name: Create release
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@cdcc88a9acf3ca41c16c37bb7d21b9ad48560d87 # v1.15.0
+        uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
         with:
           artifacts: 'browser-source-${{ needs.setup.outputs.release_version }}.zip,
                       dist-chrome-${{ needs.setup.outputs.release_version }}.zip,
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index 2d7be2e186e..08045b8d3c7 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -29,7 +29,9 @@ jobs:
       release_version: ${{ steps.version.outputs.version }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Branch check
         if: ${{ inputs.release_type != 'Dry Run' }}
@@ -78,7 +80,7 @@ jobs:
 
       - name: Create release
         if: ${{ inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@cdcc88a9acf3ca41c16c37bb7d21b9ad48560d87 # v1.15.0
+        uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
         env:
           PKG_VERSION: ${{ needs.setup.outputs.release_version }}
         with:
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index bfd6115a1a9..7f87a1e5628 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -31,7 +31,9 @@ jobs:
       release_channel: ${{ steps.release_channel.outputs.channel }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Branch check
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -55,18 +57,20 @@ jobs:
 
       - name: Get Version Channel
         id: release_channel
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
         run: |
-          case "${{ steps.version.outputs.version }}" in
+          case "$VERSION" in
             *"alpha"*)
-              echo "channel=alpha" >> $GITHUB_OUTPUT
+              echo "channel=alpha" >> "$GITHUB_OUTPUT"
               echo "[!] We do not yet support 'alpha'"
               exit 1
               ;;
             *"beta"*)
-              echo "channel=beta" >> $GITHUB_OUTPUT
+              echo "channel=beta" >> "$GITHUB_OUTPUT"
               ;;
             *)
-              echo "channel=latest" >> $GITHUB_OUTPUT
+              echo "channel=latest" >> "$GITHUB_OUTPUT"
               ;;
           esac
 
@@ -92,10 +96,10 @@ jobs:
         env:
           PKG_VERSION: ${{ steps.version.outputs.version }}
         working-directory: apps/desktop/artifacts
-        run: mv Bitwarden-${{ env.PKG_VERSION }}-universal.pkg Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive
+        run: mv "Bitwarden-${PKG_VERSION}-universal.pkg" "Bitwarden-${PKG_VERSION}-universal.pkg.archive"
 
       - name: Create Release
-        uses: ncipollo/release-action@cdcc88a9acf3ca41c16c37bb7d21b9ad48560d87 # v1.15.0
+        uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
         if: ${{ steps.release_channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' }}
         env:
           PKG_VERSION: ${{ steps.version.outputs.version }}
@@ -103,8 +107,10 @@ jobs:
         with:
           artifacts: "apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-amd64.deb,
             apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-x86_64.rpm,
-            apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-x64.freebsd,
             apps/desktop/artifacts/bitwarden_${{ env.PKG_VERSION }}_amd64.snap,
+            apps/desktop/artifacts/bitwarden_${{ env.PKG_VERSION }}_arm64.snap,
+            apps/desktop/artifacts/bitwarden_${{ env.PKG_VERSION }}_arm64.tar.gz,
+            apps/desktop/artifacts/bitwarden_${{ env.PKG_VERSION }}_x64.tar.gz,
             apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-x86_64.AppImage,
             apps/desktop/artifacts/Bitwarden-Portable-${{ env.PKG_VERSION }}.exe,
             apps/desktop/artifacts/Bitwarden-Installer-${{ env.PKG_VERSION }}.exe,
diff --git a/.github/workflows/release-web.yml b/.github/workflows/release-web.yml
index 5a3c29d29fc..fc0ac340234 100644
--- a/.github/workflows/release-web.yml
+++ b/.github/workflows/release-web.yml
@@ -25,7 +25,9 @@ jobs:
       tag_version: ${{ steps.version.outputs.tag }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Branch check
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
@@ -50,8 +52,7 @@ jobs:
   release:
     name: Create GitHub Release
     runs-on: ubuntu-22.04
-    needs:
-      - setup
+    needs: setup
     permissions:
       contents: write
     steps:
@@ -79,13 +80,15 @@ jobs:
 
       - name: Rename assets
         working-directory: apps/web/artifacts
+        env:
+          RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
         run: |
-          mv web-*-selfhosted-COMMERCIAL.zip web-${{ needs.setup.outputs.release_version }}-selfhosted-COMMERCIAL.zip
-          mv web-*-selfhosted-open-source.zip web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip
+          mv web-*-selfhosted-COMMERCIAL.zip "web-${RELEASE_VERSION}-selfhosted-COMMERCIAL.zip"
+          mv web-*-selfhosted-open-source.zip "web-${RELEASE_VERSION}-selfhosted-open-source.zip"
 
       - name: Create release
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@cdcc88a9acf3ca41c16c37bb7d21b9ad48560d87 # v1.15.0
+        uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
         with:
           name: "Web v${{ needs.setup.outputs.release_version }}"
           commit: ${{ github.sha }}
diff --git a/.github/workflows/repository-management.yml b/.github/workflows/repository-management.yml
index ecb8e448a8a..faf119cce2b 100644
--- a/.github/workflows/repository-management.yml
+++ b/.github/workflows/repository-management.yml
@@ -57,7 +57,7 @@ jobs:
             BRANCH="rc"
           fi
 
-          echo "branch=$BRANCH" >> $GITHUB_OUTPUT
+          echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
 
   bump_version:
     name: Bump Version
@@ -97,17 +97,18 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Generate GH App token
-        uses: actions/create-github-app-token@30bf6253fa41bdc8d1501d202ad15287582246b4 # v2.0.3
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         id: app-token
         with:
           app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
           private-key: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-KEY }}
 
       - name: Check out branch
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: main
           token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: true
 
       - name: Configure Git
         run: |
@@ -124,7 +125,7 @@ jobs:
         id: current-browser-version
         run: |
           CURRENT_VERSION=$(cat package.json | jq -r '.version')
-          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "version=$CURRENT_VERSION" >> "$GITHUB_OUTPUT"
         working-directory: apps/browser
 
       - name: Browser - Verify input version
@@ -140,8 +141,7 @@ jobs:
           fi
 
           # Check if version is newer.
-          printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
-          if [ $? -eq 0 ]; then
+          if printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V; then
             echo "Version check successful."
           else
             echo "Version check failed."
@@ -161,14 +161,14 @@ jobs:
         id: bump-browser-version-override
         env:
           VERSION: ${{ inputs.version_number_override }}
-        run: npm version --workspace=@bitwarden/browser $VERSION
+        run: npm version --workspace=@bitwarden/browser "$VERSION"
 
       - name: Bump Browser Version - Automatic Calculation
         if: ${{ inputs.bump_browser == true && inputs.version_number_override == '' }}
         id: bump-browser-version-automatic
         env:
           VERSION: ${{ steps.calculate-next-browser-version.outputs.version }}
-        run: npm version --workspace=@bitwarden/browser $VERSION
+        run: npm version --workspace=@bitwarden/browser "$VERSION"
 
       - name: Bump Browser Version - Manifest - Version Override
         if: ${{ inputs.bump_browser == true && inputs.version_number_override != '' }}
@@ -211,7 +211,7 @@ jobs:
         id: current-cli-version
         run: |
           CURRENT_VERSION=$(cat package.json | jq -r '.version')
-          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "version=$CURRENT_VERSION" >> "$GITHUB_OUTPUT"
         working-directory: apps/cli
 
       - name: CLI - Verify input version
@@ -227,8 +227,7 @@ jobs:
           fi
 
           # Check if version is newer.
-          printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
-          if [ $? -eq 0 ]; then
+          if printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V; then
             echo "Version check successful."
           else
             echo "Version check failed."
@@ -248,14 +247,14 @@ jobs:
         id: bump-cli-version-override
         env:
           VERSION: ${{ inputs.version_number_override }}
-        run: npm version --workspace=@bitwarden/cli $VERSION
+        run: npm version --workspace=@bitwarden/cli "$VERSION"
 
       - name: Bump CLI Version - Automatic Calculation
         if: ${{ inputs.bump_cli == true && inputs.version_number_override == '' }}
         id: bump-cli-version-automatic
         env:
           VERSION: ${{ steps.calculate-next-cli-version.outputs.version }}
-        run: npm version --workspace=@bitwarden/cli $VERSION
+        run: npm version --workspace=@bitwarden/cli "$VERSION"
 
       ### Desktop
       - name: Get current Desktop version
@@ -263,7 +262,7 @@ jobs:
         id: current-desktop-version
         run: |
           CURRENT_VERSION=$(cat package.json | jq -r '.version')
-          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "version=$CURRENT_VERSION" >> "$GITHUB_OUTPUT"
         working-directory: apps/desktop
 
       - name: Desktop - Verify input version
@@ -279,8 +278,7 @@ jobs:
           fi
 
           # Check if version is newer.
-          printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
-          if [ $? -eq 0 ]; then
+          if printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V; then
             echo "Version check successful."
           else
             echo "Version check failed."
@@ -300,27 +298,27 @@ jobs:
         id: bump-desktop-version-override
         env:
           VERSION: ${{ inputs.version_number_override }}
-        run: npm version --workspace=@bitwarden/desktop $VERSION
+        run: npm version --workspace=@bitwarden/desktop "$VERSION"
 
       - name: Bump Desktop Version - Root - Automatic Calculation
         if: ${{ inputs.bump_desktop == true && inputs.version_number_override == '' }}
         id: bump-desktop-version-automatic
         env:
           VERSION: ${{ steps.calculate-next-desktop-version.outputs.version }}
-        run: npm version --workspace=@bitwarden/desktop $VERSION
+        run: npm version --workspace=@bitwarden/desktop "$VERSION"
 
       - name: Bump Desktop Version - App - Version Override
         if: ${{ inputs.bump_desktop == true && inputs.version_number_override != '' }}
         env:
           VERSION: ${{ inputs.version_number_override }}
-        run: npm version $VERSION
+        run: npm version "$VERSION"
         working-directory: "apps/desktop/src"
 
       - name: Bump Desktop Version - App - Automatic Calculation
         if: ${{ inputs.bump_desktop == true && inputs.version_number_override == '' }}
         env:
           VERSION: ${{ steps.calculate-next-desktop-version.outputs.version }}
-        run: npm version $VERSION
+        run: npm version "$VERSION"
         working-directory: "apps/desktop/src"
 
       ### Web
@@ -329,7 +327,7 @@ jobs:
         id: current-web-version
         run: |
           CURRENT_VERSION=$(cat package.json | jq -r '.version')
-          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "version=$CURRENT_VERSION" >> "$GITHUB_OUTPUT"
         working-directory: apps/web
 
       - name: Web - Verify input version
@@ -345,8 +343,7 @@ jobs:
           fi
 
           # Check if version is newer.
-          printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
-          if [ $? -eq 0 ]; then
+          if printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V; then
             echo "Version check successful."
           else
             echo "Version check failed."
@@ -366,14 +363,14 @@ jobs:
         id: bump-web-version-override
         env:
           VERSION: ${{ inputs.version_number_override }}
-        run: npm version --workspace=@bitwarden/web-vault $VERSION
+        run: npm version --workspace=@bitwarden/web-vault "$VERSION"
 
       - name: Bump Web Version - Automatic Calculation
         if: ${{ inputs.bump_web == true && inputs.version_number_override == '' }}
         id: bump-web-version-automatic
         env:
           VERSION: ${{ steps.calculate-next-web-version.outputs.version }}
-        run: npm version --workspace=@bitwarden/web-vault $VERSION
+        run: npm version --workspace=@bitwarden/web-vault "$VERSION"
 
       ########################
 
@@ -381,38 +378,50 @@ jobs:
         id: set-final-version-output
         env:
           VERSION: ${{ inputs.version_number_override }}
+          _BUMP_BROWSER_VERSION_OVERRIDE_OUTCOME: ${{ steps.bump-browser-version-override.outcome }}
+          _BUMP_BROWSER_VERSION_AUTOMATIC_OUTCOME: ${{ steps.bump-browser-version-automatic.outcome }}
+          _CALCULATE_NEXT_BROWSER_VERSION: ${{ steps.calculate-next-browser-version.outputs.version }}
+          _BUMP_CLI_VERSION_OVERRIDE_OUTCOME: ${{ steps.bump-cli-version-override.outcome }}
+          _BUMP_CLI_VERSION_AUTOMATIC_OUTCOME: ${{ steps.bump-cli-version-automatic.outcome }}
+          _CALCULATE_NEXT_CLI_VERSION: ${{ steps.calculate-next-cli-version.outputs.version }}
+          _BUMP_DESKTOP_VERSION_OVERRIDE_OUTCOME: ${{ steps.bump-desktop-version-override.outcome }}
+          _BUMP_DESKTOP_VERSION_AUTOMATIC_OUTCOME: ${{ steps.bump-desktop-version-automatic.outcome }}
+          _CALCULATE_NEXT_DESKTOP_VERSION: ${{ steps.calculate-next-desktop-version.outputs.version }}
+          _BUMP_WEB_VERSION_OVERRIDE_OUTCOME: ${{ steps.bump-web-version-override.outcome }}
+          _BUMP_WEB_VERSION_AUTOMATIC_OUTCOME: ${{ steps.bump-web-version-automatic.outcome }}
+          _CALCULATE_NEXT_WEB_VERSION: ${{ steps.calculate-next-web-version.outputs.version }}
         run: |
-          if [[ "${{ steps.bump-browser-version-override.outcome }}" = "success" ]]; then
-            echo "version_browser=$VERSION" >> $GITHUB_OUTPUT
-          elif [[ "${{ steps.bump-browser-version-automatic.outcome }}" = "success" ]]; then
-            echo "version_browser=${{ steps.calculate-next-browser-version.outputs.version }}" >> $GITHUB_OUTPUT
+          if [[ "$_BUMP_BROWSER_VERSION_OVERRIDE_OUTCOME" = "success" ]]; then
+            echo "version_browser=$VERSION" >> "$GITHUB_OUTPUT"
+          elif [[ "$_BUMP_BROWSER_VERSION_AUTOMATIC_OUTCOME" = "success" ]]; then
+            echo "version_browser=$_CALCULATE_NEXT_BROWSER_VERSION" >> "$GITHUB_OUTPUT"
           fi
 
-          if [[ "${{ steps.bump-cli-version-override.outcome }}" = "success" ]]; then
-            echo "version_cli=$VERSION" >> $GITHUB_OUTPUT
-          elif [[ "${{ steps.bump-cli-version-automatic.outcome }}" = "success" ]]; then
-            echo "version_cli=${{ steps.calculate-next-cli-version.outputs.version }}" >> $GITHUB_OUTPUT
+          if [[ "$_BUMP_CLI_VERSION_OVERRIDE_OUTCOME" = "success" ]]; then
+            echo "version_cli=$VERSION" >> "$GITHUB_OUTPUT"
+          elif [[ "$_BUMP_CLI_VERSION_AUTOMATIC_OUTCOME" = "success" ]]; then
+            echo "version_cli=$_CALCULATE_NEXT_CLI_VERSION" >> "$GITHUB_OUTPUT"
           fi
 
-          if [[ "${{ steps.bump-desktop-version-override.outcome }}" = "success" ]]; then
-            echo "version_desktop=$VERSION" >> $GITHUB_OUTPUT
-          elif [[ "${{ steps.bump-desktop-version-automatic.outcome }}" = "success" ]]; then
-            echo "version_desktop=${{ steps.calculate-next-desktop-version.outputs.version }}" >> $GITHUB_OUTPUT
+          if [[ "$_BUMP_DESKTOP_VERSION_OVERRIDE_OUTCOME" = "success" ]]; then
+            echo "version_desktop=$VERSION" >> "$GITHUB_OUTPUT"
+          elif [[ "$_BUMP_DESKTOP_VERSION_AUTOMATIC_OUTCOME" = "success" ]]; then
+            echo "version_desktop=$_CALCULATE_NEXT_DESKTOP_VERSION" >> "$GITHUB_OUTPUT"
           fi
 
-          if [[ "${{ steps.bump-web-version-override.outcome }}" = "success" ]]; then
-            echo "version_web=$VERSION" >> $GITHUB_OUTPUT
-          elif [[ "${{ steps.bump-web-version-automatic.outcome }}" = "success" ]]; then
-            echo "version_web=${{ steps.calculate-next-web-version.outputs.version }}" >> $GITHUB_OUTPUT
+          if [[ "$_BUMP_WEB_VERSION_OVERRIDE_OUTCOME" = "success" ]]; then
+            echo "version_web=$VERSION" >> "$GITHUB_OUTPUT"
+          elif [[ "$_BUMP_WEB_VERSION_AUTOMATIC_OUTCOME" = "success" ]]; then
+            echo "version_web=$_CALCULATE_NEXT_WEB_VERSION" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Check if version changed
         id: version-changed
         run: |
           if [ -n "$(git status --porcelain)" ]; then
-            echo "changes_to_commit=TRUE" >> $GITHUB_OUTPUT
+            echo "changes_to_commit=TRUE" >> "$GITHUB_OUTPUT"
           else
-            echo "changes_to_commit=FALSE" >> $GITHUB_OUTPUT
+            echo "changes_to_commit=FALSE" >> "$GITHUB_OUTPUT"
             echo "No changes to commit!";
           fi
 
@@ -453,24 +462,25 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Generate GH App token
-        uses: actions/create-github-app-token@30bf6253fa41bdc8d1501d202ad15287582246b4 # v2.0.3
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         id: app-token
         with:
           app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
           private-key: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-KEY }}
 
       - name: Check out target ref
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ inputs.target_ref }}
           token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: true
 
       - name: Check if ${{ needs.setup.outputs.branch }} branch exists
         env:
           BRANCH_NAME: ${{ needs.setup.outputs.branch }}
         run: |
-          if [[ $(git ls-remote --heads origin $BRANCH_NAME) ]]; then
-            echo "$BRANCH_NAME already exists! Please delete $BRANCH_NAME before running again." >> $GITHUB_STEP_SUMMARY
+          if [[ $(git ls-remote --heads origin "$BRANCH_NAME") ]]; then
+            echo "$BRANCH_NAME already exists! Please delete $BRANCH_NAME before running again." >> "$GITHUB_STEP_SUMMARY"
             exit 1
           fi
 
@@ -478,5 +488,5 @@ jobs:
         env:
           BRANCH_NAME: ${{ needs.setup.outputs.branch }}
         run: |
-          git switch --quiet --create $BRANCH_NAME
-          git push --quiet --set-upstream origin $BRANCH_NAME
+          git switch --quiet --create "$BRANCH_NAME"
+          git push --quiet --set-upstream origin "$BRANCH_NAME"
diff --git a/.github/workflows/respond.yml b/.github/workflows/respond.yml
new file mode 100644
index 00000000000..d940ceee756
--- /dev/null
+++ b/.github/workflows/respond.yml
@@ -0,0 +1,28 @@
+name: Respond
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+permissions: {}
+
+jobs:
+  respond:
+    name: Respond
+    uses: bitwarden/gh-actions/.github/workflows/_respond.yml@main
+    secrets:
+      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+    permissions:
+      actions: read
+      contents: write
+      id-token: write
+      issues: write
+      pull-requests: write
diff --git a/.github/workflows/retrieve-current-desktop-rollout.yml b/.github/workflows/retrieve-current-desktop-rollout.yml
index c45453ed9d0..30aef41e649 100644
--- a/.github/workflows/retrieve-current-desktop-rollout.yml
+++ b/.github/workflows/retrieve-current-desktop-rollout.yml
@@ -39,10 +39,10 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ steps.retrieve-secrets.outputs.aws-electron-access-key }}
           AWS_DEFAULT_REGION: 'us-west-2'
           AWS_S3_BUCKET_NAME: ${{ steps.retrieve-secrets.outputs.aws-electron-bucket-name }}
-        run: aws s3 cp $AWS_S3_BUCKET_NAME/desktop/latest.yml . --quiet
+        run: aws s3 cp "$AWS_S3_BUCKET_NAME/desktop/latest.yml" . --quiet
 
       - name: Get current rollout percentage
         run: |
           CURRENT_PCT=$(sed -r -n "s/stagingPercentage:\s([0-9]+)/\1/p" latest.yml)
           CURRENT_VERSION=$(sed -r -n "s/version:\s(.*)/\1/p" latest.yml)
-          echo "Desktop ${CURRENT_VERSION} rollout percentage is ${CURRENT_PCT}%" >> $GITHUB_STEP_SUMMARY
+          echo "Desktop ${CURRENT_VERSION} rollout percentage is ${CURRENT_PCT}%" >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/review-code.yml b/.github/workflows/review-code.yml
new file mode 100644
index 00000000000..0e0597fccf0
--- /dev/null
+++ b/.github/workflows/review-code.yml
@@ -0,0 +1,21 @@
+name: Code Review
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+permissions: {}
+
+jobs:
+  review:
+    name: Review
+    uses: bitwarden/gh-actions/.github/workflows/_review-code.yml@main
+    secrets:
+      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+    permissions:
+      actions: read
+      contents: read
+      id-token: write
+      pull-requests: write
diff --git a/.github/workflows/sdk-breaking-change-check.yml b/.github/workflows/sdk-breaking-change-check.yml
new file mode 100644
index 00000000000..14547b3942f
--- /dev/null
+++ b/.github/workflows/sdk-breaking-change-check.yml
@@ -0,0 +1,166 @@
+# This workflow runs TypeScript compatibility checks when the SDK is updated.
+# Triggered automatically by the SDK repository via workflow_dispatch when SDK PRs are created/updated.
+name: SDK Breaking Change Check
+run-name: "SDK breaking change check (${{ github.event.inputs.sdk_version }})"
+on:
+  workflow_dispatch:
+    inputs:
+      sdk_version:
+        description: "SDK version being tested"
+        required: true
+        type: string
+      source_repo:
+        description: "Source repository"
+        required: true
+        type: string
+      artifacts_run_id:
+        description: "Artifacts run ID"
+        required: true
+        type: string
+      artifact_name:
+        description: "Artifact name"
+        required: true
+        type: string
+
+permissions:
+  contents: read
+  actions: read
+  id-token: write
+
+jobs:
+  type-check:
+    name: TypeScript compatibility check
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    env:
+      _SOURCE_REPO: ${{ github.event.inputs.source_repo }}
+      _SDK_VERSION: ${{ github.event.inputs.sdk_version }}
+      _ARTIFACTS_RUN_ID: ${{ github.event.inputs.artifacts_run_id }}
+      _ARTIFACT_NAME: ${{ github.event.inputs.artifact_name }}
+      
+    steps:
+      - name: Log in to Azure
+        uses: bitwarden/gh-actions/azure-login@main
+        with:
+          subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          tenant_id: ${{ secrets.AZURE_TENANT_ID }}
+          client_id: ${{ secrets.AZURE_CLIENT_ID }}
+      - name: Get Azure Key Vault secrets
+        id: get-kv-secrets
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: gh-org-bitwarden
+          secrets: "BW-GHAPP-ID,BW-GHAPP-KEY"
+
+      - name: Generate GH App token
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        id: app-token
+        with:
+          app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
+          private-key: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-KEY }}
+          permission-actions: read # for reading and downloading the artifacts for a workflow run
+
+      - name: Log out from Azure
+        uses: bitwarden/gh-actions/azure-logout@main
+
+      - name: Check out clients repository
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
+
+      - name: Get Node Version
+        id: retrieve-node-version
+        run: |
+          NODE_NVMRC=$(cat .nvmrc)
+          NODE_VERSION=${NODE_NVMRC/v/''}
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Node
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        with:
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: ${{ steps.retrieve-node-version.outputs.node_version }}
+
+      - name: Install Node dependencies
+        run: |
+          echo "📦 Installing Node dependencies with retry logic..."
+
+          RETRY_COUNT=0
+          MAX_RETRIES=3
+          while [ ${RETRY_COUNT} -lt ${MAX_RETRIES} ]; do
+            RETRY_COUNT=$((RETRY_COUNT + 1))
+            echo "🔄 npm ci attempt ${RETRY_COUNT} of ${MAX_RETRIES}..."
+
+            if npm ci; then
+              echo "✅ npm ci successful"
+              break
+            else
+              echo "❌ npm ci attempt ${RETRY_COUNT} failed"
+              [ ${RETRY_COUNT} -lt ${MAX_RETRIES} ] && sleep 5
+            fi
+          done
+
+          if [ ${RETRY_COUNT} -eq ${MAX_RETRIES} ]; then
+             echo "::error::npm ci failed after ${MAX_RETRIES} attempts"
+             exit 1
+          fi
+
+      - name: Download SDK artifacts
+        uses: bitwarden/gh-actions/download-artifacts@main
+        with:
+          github_token: ${{ steps.app-token.outputs.token }}
+          workflow: build-wasm-internal.yml
+          workflow_conclusion: success
+          run_id: ${{ env._ARTIFACTS_RUN_ID }}
+          artifacts: ${{ env._ARTIFACT_NAME }}
+          repo: ${{ env._SOURCE_REPO }}
+          path: ./sdk-internal
+          if_no_artifact_found: fail
+
+      - name: Override SDK using npm link
+        working-directory: ./
+        run: |
+          echo "🔧 Setting up SDK override using npm link..."
+          echo "📊 SDK Version: ${_SDK_VERSION}"
+          echo "📦 Artifact Source: ${_SOURCE_REPO} run ${_ARTIFACTS_RUN_ID}"
+
+          echo "📋 SDK package contents:"
+          ls -la ./sdk-internal/
+
+          echo "🔗 Creating npm link to SDK package..."
+          if ! npm link ./sdk-internal; then
+            echo "::error::Failed to link SDK package"
+            exit 1
+          fi
+
+      - name: Run TypeScript compatibility check
+        run: |
+
+          echo "🔍 Running TypeScript type checking with SDK version: ${_SDK_VERSION}"
+          echo "🎯 Type checking command: npm run test:types"
+
+          # Add GitHub Step Summary output
+          echo "## 📊 TypeScript Compatibility Check" >> $GITHUB_STEP_SUMMARY
+          echo "- **SDK Version**: ${_SDK_VERSION}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Source Repository**: ${_SOURCE_REPO}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Artifacts Run ID**: ${_ARTIFACTS_RUN_ID}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          TYPE_CHECK_START=$(date +%s)
+
+          # Run type check with timeout - exit code determines gh run watch result
+          if timeout 10m npm run test:types; then
+            TYPE_CHECK_END=$(date +%s)
+            TYPE_CHECK_DURATION=$((TYPE_CHECK_END - TYPE_CHECK_START))
+            echo "✅ TypeScript compilation successful (${TYPE_CHECK_DURATION}s)"
+            echo "✅ **Result**: TypeScript compilation successful" >> $GITHUB_STEP_SUMMARY
+            echo "No breaking changes detected for SDK version ${_SDK_VERSION}" >> $GITHUB_STEP_SUMMARY
+          else
+            TYPE_CHECK_END=$(date +%s)
+            TYPE_CHECK_DURATION=$((TYPE_CHECK_END - TYPE_CHECK_START))
+            echo "❌ TypeScript compilation failed after ${TYPE_CHECK_DURATION}s - breaking changes detected"
+            echo "❌ **Result**: TypeScript compilation failed" >> $GITHUB_STEP_SUMMARY
+            echo "Breaking changes detected for SDK version ${_SDK_VERSION}" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
diff --git a/.github/workflows/staged-rollout-desktop.yml b/.github/workflows/staged-rollout-desktop.yml
index 4adf81100bd..3d4f0376b39 100644
--- a/.github/workflows/staged-rollout-desktop.yml
+++ b/.github/workflows/staged-rollout-desktop.yml
@@ -47,11 +47,11 @@ jobs:
           AWS_DEFAULT_REGION: 'us-west-2'
           AWS_S3_BUCKET_NAME: ${{ steps.retrieve-secrets.outputs.aws-electron-bucket-name }}
         run: |
-          aws s3 cp $AWS_S3_BUCKET_NAME/desktop/latest.yml . \
+          aws s3 cp "$AWS_S3_BUCKET_NAME/desktop/latest.yml" . \
           --quiet
-          aws s3 cp $AWS_S3_BUCKET_NAME/desktop/latest-linux.yml . \
+          aws s3 cp "$AWS_S3_BUCKET_NAME/desktop/latest-linux.yml" . \
           --quiet
-          aws s3 cp $AWS_S3_BUCKET_NAME/desktop/latest-mac.yml . \
+          aws s3 cp "$AWS_S3_BUCKET_NAME/desktop/latest-mac.yml" . \
           --quiet
 
       - name: Check new rollout percentage
@@ -86,11 +86,11 @@ jobs:
           AWS_DEFAULT_REGION: 'us-west-2'
           AWS_S3_BUCKET_NAME: ${{ steps.retrieve-secrets.outputs.aws-electron-bucket-name }}
         run: |
-          aws s3 cp latest.yml $AWS_S3_BUCKET_NAME/desktop/ \
+          aws s3 cp latest.yml "$AWS_S3_BUCKET_NAME/desktop/" \
           --acl "public-read"
 
-          aws s3 cp latest-linux.yml $AWS_S3_BUCKET_NAME/desktop/ \
+          aws s3 cp latest-linux.yml "$AWS_S3_BUCKET_NAME/desktop/" \
           --acl "public-read"
 
-          aws s3 cp latest-mac.yml $AWS_S3_BUCKET_NAME/desktop/ \
+          aws s3 cp latest-mac.yml "$AWS_S3_BUCKET_NAME/desktop/" \
           --acl "public-read"
diff --git a/.github/workflows/stale-bot.yml b/.github/workflows/stale-bot.yml
index 13acde2b0fc..246e0d48c5d 100644
--- a/.github/workflows/stale-bot.yml
+++ b/.github/workflows/stale-bot.yml
@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     steps:
       - name: 'Run stale action'
-        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           stale-issue-label: 'needs-reply'
           stale-pr-label: 'needs-changes'
diff --git a/.github/workflows/test-browser-interactions.yml b/.github/workflows/test-browser-interactions.yml
index c6427b2e0d8..dfc0f28b9c6 100644
--- a/.github/workflows/test-browser-interactions.yml
+++ b/.github/workflows/test-browser-interactions.yml
@@ -11,15 +11,17 @@ jobs:
   check-files:
     name: Check files
     runs-on: ubuntu-22.04
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     permissions:
       actions: write
       contents: read
       id-token: write
     steps:
     - name: Checkout code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
       with:
         fetch-depth: 0
+        persist-credentials: false
 
     - name: Check for job requirements
       if: ${{ !github.event.workflow_run.pull_requests || !github.event.workflow_run.head_branch }}
@@ -47,6 +49,8 @@ jobs:
       uses: bitwarden/gh-actions/azure-logout@main
 
     - name: Generate GH App token
+      # NOTE: versions of actions/create-github-app-token after 2.0.3 break this workflow
+      # Remediation is tracked in https://bitwarden.atlassian.net/browse/PM-28174
       uses: actions/create-github-app-token@30bf6253fa41bdc8d1501d202ad15287582246b4 # v2.0.3
       id: app-token
       with:
@@ -71,7 +75,7 @@ jobs:
 
     - name: Trigger test-all workflow in browser-interactions-testing
       if: steps.changed-files.outputs.monitored == 'true'
-      uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3.0.0
+      uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f # v4.0.0
       with:
         token: ${{ steps.app-token.outputs.token }}
         repository: "bitwarden/browser-interactions-testing"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 64c4e0dff13..f53bfc39d36 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,17 +24,19 @@ jobs:
 
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Get Node Version
         id: retrieve-node-version
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
-          echo "node_version=$NODE_VERSION" >> $GITHUB_OUTPUT
+          echo "node_version=$NODE_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
@@ -60,7 +62,7 @@ jobs:
         run: npm test -- --coverage --maxWorkers=3
 
       - name: Report test results
-        uses: dorny/test-reporter@6e6a65b7a0bd2c9197df7d0ae36ac5cee784230c # v2.0.0
+        uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3 # v2.1.1
         if: ${{ github.event.pull_request.head.repo.full_name == github.repository && !cancelled() }}
         with:
           name: Test Results
@@ -69,10 +71,10 @@ jobs:
           fail-on-error: true
 
       - name: Upload results to codecov.io
-        uses: codecov/test-results-action@f2dba722c67b86c6caa034178c6e4d35335f6706 # v1.1.0
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
 
       - name: Upload test coverage
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jest-coverage
           path: ./coverage/lcov.info
@@ -101,7 +103,9 @@ jobs:
           sudo apt-get install -y gnome-keyring dbus-x11
 
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Build
         working-directory: ./apps/desktop/desktop_native
@@ -125,15 +129,17 @@ jobs:
 
       - name: Test Windows
         if: ${{ matrix.os=='windows-2022'}}
-        working-directory: ./apps/desktop/desktop_native/core
-        run: cargo test -- --test-threads=1
+        working-directory: ./apps/desktop/desktop_native
+        run: cargo test --workspace --exclude=desktop_napi -- --test-threads=1
 
   rust-coverage:
     name: Rust Coverage
     runs-on: macos-14
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Install rust
         uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
@@ -142,7 +148,7 @@ jobs:
           components: llvm-tools
 
       - name: Cache cargo registry
-        uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           workspaces: "apps/desktop/desktop_native -> target"
 
@@ -154,7 +160,7 @@ jobs:
         run: cargo llvm-cov --all-features --lcov --output-path lcov.info --workspace --no-cfg-coverage
 
       - name: Upload test coverage
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: rust-coverage
           path: ./apps/desktop/desktop_native/lcov.info
@@ -167,22 +173,24 @@ jobs:
       - rust-coverage
     steps:
       - name: Check out repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
 
       - name: Download jest coverage
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: jest-coverage
           path: ./
 
       - name: Download rust coverage
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: rust-coverage
           path: ./apps/desktop/desktop_native
 
       - name: Upload coverage to codecov.io
-        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
         with:
           files: |
             ./lcov.info
diff --git a/.github/workflows/version-auto-bump.yml b/.github/workflows/version-auto-bump.yml
index 3cb5646886a..65f004149de 100644
--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -31,17 +31,19 @@ jobs:
         uses: bitwarden/gh-actions/azure-logout@main
 
       - name: Generate GH App token
-        uses: actions/create-github-app-token@30bf6253fa41bdc8d1501d202ad15287582246b4 # v2.0.3
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         id: app-token
         with:
           app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
           private-key: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-KEY }}
+          permission-contents: write # for committing and pushing to the current branch
 
       - name: Check out target ref
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: main
           token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: true
 
       - name: Configure Git
         run: |
@@ -52,7 +54,7 @@ jobs:
         id: current-desktop-version
         run: |
           CURRENT_VERSION=$(cat package.json | jq -r '.version')
-          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "version=$CURRENT_VERSION" >> "$GITHUB_OUTPUT"
         working-directory: apps/desktop
 
       - name: Calculate next Desktop release version
@@ -65,12 +67,12 @@ jobs:
         id: bump-desktop-version-automatic
         env:
           VERSION: ${{ steps.calculate-next-desktop-version.outputs.version }}
-        run: npm version --workspace=@bitwarden/desktop $VERSION
+        run: npm version --workspace=@bitwarden/desktop "$VERSION"
 
       - name: Bump Desktop Version - App - Automatic Calculation
         env:
           VERSION: ${{ steps.calculate-next-desktop-version.outputs.version }}
-        run: npm version $VERSION
+        run: npm version "$VERSION"
         working-directory: "apps/desktop/src"
 
       - name: Commit files
diff --git a/.gitignore b/.gitignore
index 34f047f17a6..a2beeb61a08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ Thumbs.db
 *.launch
 .settings/
 *.sublime-workspace
-.claude
+.serena
 
 # Visual Studio Code
 .vscode/*
@@ -27,6 +27,7 @@ npm-debug.log
 # Build directories
 dist
 build
+target
 .angular/cache
 .flatpak
 .flatpak-repo
diff --git a/.npmrc b/.npmrc
index 421cf18217d..38a7eb153c0 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,4 +1,4 @@
 save-exact=true
 # Increase available heap size to avoid running out of memory when compiling.
 # This applies to all npm scripts in this repository.
-node-options=--max-old-space-size=8192
\ No newline at end of file
+node-options=--max-old-space-size=8192
diff --git a/.storybook/format-args-for-code-snippet.ts b/.storybook/format-args-for-code-snippet.ts
index bf36c153c0a..8fc44ebfb06 100644
--- a/.storybook/format-args-for-code-snippet.ts
+++ b/.storybook/format-args-for-code-snippet.ts
@@ -25,6 +25,11 @@ export const formatArgsForCodeSnippet = <ComponentType extends Record<string, an
         const formattedArray = value.map((v) => `'${v}'`).join(", ");
         return `[${key}]="[${formattedArray}]"`;
       }
+
+      if (typeof value === "number") {
+        return `[${key}]="${value}"`;
+      }
+
       return `${key}="${value}"`;
     })
     .join(" ");
diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
new file mode 100644
index 00000000000..85b8b839182
--- /dev/null
+++ b/.storybook/preview-head.html
@@ -0,0 +1,21 @@
+<!-- preload the inter font to avoid a flash of fallback font when first loading storybook -->
+<!-- href matches the inter build artifact from webpack -->
+<link
+  rel="preload"
+  href="/inter.0336a89fb4e7fc1d.woff2"
+  as="font"
+  type="font/woff2"
+  crossorigin="anonymous"
+/>
+
+<!-- load inter font from the source cdn so that chromatic snapshots render in the correct font -->
+<link rel="preconnect" href="https://rsms.me/" />
+<link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
+
+<!-- manually specify inter as the font here for chromatic snapshots -->
+<style>
+  :root {
+    font-family: Inter;
+    font-weight: 100 900;
+  }
+</style>
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index 59b5287f3a3..0b14f9d7444 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -4,11 +4,12 @@ import { componentWrapperDecorator } from "@storybook/angular";
 import type { Preview } from "@storybook/angular";
 
 import docJson from "../documentation.json";
+
 setCompodocJson(docJson);
 
 const wrapperDecorator = componentWrapperDecorator((story) => {
   return /*html*/ `
-    <div class="tw-bg-background tw-px-5 tw-py-10">
+    <div class="tw-bg-background tw-px-5 tw-py-10 tw-@container">
       ${story}
     </div>
   `;
diff --git a/apps/browser/CLAUDE.md b/apps/browser/CLAUDE.md
new file mode 100644
index 00000000000..a718f5bfd7c
--- /dev/null
+++ b/apps/browser/CLAUDE.md
@@ -0,0 +1,22 @@
+# Browser Extension - Critical Rules
+
+- **NEVER** use `chrome.*` or `browser.*` APIs directly in business logic
+  - Always use `BrowserApi` abstraction: `/apps/browser/src/platform/browser/browser-api.ts`
+  - Required for cross-browser compatibility (Chrome/Firefox/Safari/Opera)
+
+- **ALWAYS** use `BrowserApi.addListener()` for event listeners in popup context
+  - Safari requires manual cleanup to prevent memory leaks
+  - DON'T use native `chrome.*.addListener()` or `browser.*.addListener()` directly
+
+- **CRITICAL**: Safari has tab query bugs
+  - Use `BrowserApi.tabsQueryFirstCurrentWindowForSafari()` when querying current window tabs
+  - Safari can return tabs from multiple windows incorrectly
+
+## Manifest V3
+
+- Extension uses Web Extension API Manifest V3
+- **Service workers replace background pages**
+  - Background context runs as service worker (can be terminated anytime)
+  - DON'T assume background page persists indefinitely
+  - Use message passing for communication between contexts
+  - `chrome.extension.getBackgroundPage()` returns `null` in MV3
diff --git a/apps/browser/package.json b/apps/browser/package.json
index 24a53f43f66..cf2be624a22 100644
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -1,11 +1,13 @@
 {
   "name": "@bitwarden/browser",
-  "version": "2025.9.0",
+  "version": "2025.12.0",
   "scripts": {
     "build": "npm run build:chrome",
     "build:bit": "npm run build:bit:chrome",
     "build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",
     "build:bit:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js",
+    "build:dev:chrome": "npm run build:chrome && npm run update:dev:chrome",
+    "build:bit:dev:chrome": "npm run build:bit:chrome && npm run update:dev:chrome",
     "build:edge": "cross-env BROWSER=edge MANIFEST_VERSION=3 NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",
     "build:bit:edge": "cross-env BROWSER=edge MANIFEST_VERSION=3 NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js",
     "build:firefox": "cross-env BROWSER=firefox NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",
@@ -55,9 +57,12 @@
     "dist:bit:opera:mv3": "cross-env MANIFEST_VERSION=3 npm run dist:bit:opera",
     "dist:safari:mv3": "cross-env MANIFEST_VERSION=3 npm run dist:safari",
     "dist:bit:safari:mv3": "cross-env MANIFEST_VERSION=3 npm run dist:bit:safari",
+    "package:dev:chrome": "npm run update:dev:chrome && ./scripts/compress.sh dev-chrome.zip",
+    "package:bit:dev:chrome": "npm run update:dev:chrome && ./scripts/compress.sh bit-dev-chrome.zip",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:watch:all": "jest --watchAll",
-    "test:clearCache": "jest --clear-cache"
+    "test:clearCache": "jest --clear-cache",
+    "update:dev:chrome": "./scripts/update-manifest-dev.sh"
   }
 }
diff --git a/apps/browser/project.json b/apps/browser/project.json
new file mode 100644
index 00000000000..e0297df773b
--- /dev/null
+++ b/apps/browser/project.json
@@ -0,0 +1,383 @@
+{
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "name": "browser",
+  "projectType": "application",
+  "sourceRoot": "apps/browser/src",
+  "tags": ["scope:browser", "type:app"],
+  "targets": {
+    "build": {
+      "executor": "@nx/webpack:webpack",
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": "chrome-dev",
+      "options": {
+        "outputPath": "dist/apps/browser",
+        "webpackConfig": "apps/browser/webpack.config.js",
+        "tsConfig": "apps/browser/tsconfig.json",
+        "main": "apps/browser/src/popup/main.ts",
+        "target": "web",
+        "compiler": "tsc"
+      },
+      "configurations": {
+        "chrome": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/chrome",
+          "env": {
+            "BROWSER": "chrome",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "chrome-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/chrome-dev",
+          "env": {
+            "BROWSER": "chrome",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "edge": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/edge",
+          "env": {
+            "BROWSER": "edge",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "edge-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/edge-dev",
+          "env": {
+            "BROWSER": "edge",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "firefox": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/firefox",
+          "env": {
+            "BROWSER": "firefox",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "firefox-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/firefox-dev",
+          "env": {
+            "BROWSER": "firefox",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "firefox-mv2": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/firefox-mv2",
+          "env": {
+            "BROWSER": "firefox",
+            "MANIFEST_VERSION": "2",
+            "NODE_ENV": "production"
+          }
+        },
+        "firefox-mv2-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/firefox-mv2-dev",
+          "env": {
+            "BROWSER": "firefox",
+            "MANIFEST_VERSION": "2",
+            "NODE_ENV": "development"
+          }
+        },
+        "opera": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/opera",
+          "env": {
+            "BROWSER": "opera",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "opera-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/opera-dev",
+          "env": {
+            "BROWSER": "opera",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "safari": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/safari",
+          "env": {
+            "BROWSER": "safari",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "safari-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/safari-dev",
+          "env": {
+            "BROWSER": "safari",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "safari-mv2": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/safari-mv2",
+          "env": {
+            "BROWSER": "safari",
+            "MANIFEST_VERSION": "2",
+            "NODE_ENV": "production"
+          }
+        },
+        "safari-mv2-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/safari-mv2-dev",
+          "env": {
+            "BROWSER": "safari",
+            "MANIFEST_VERSION": "2",
+            "NODE_ENV": "development"
+          }
+        },
+        "commercial-chrome": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/commercial-chrome",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "chrome",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "commercial-chrome-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/commercial-chrome-dev",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "chrome",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "commercial-edge": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/commercial-edge",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "edge",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "commercial-edge-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/commercial-edge-dev",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "edge",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "commercial-firefox": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/commercial-firefox",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "firefox",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "commercial-firefox-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/commercial-firefox-dev",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "firefox",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "commercial-firefox-mv2": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/commercial-firefox-mv2",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "firefox",
+            "MANIFEST_VERSION": "2",
+            "NODE_ENV": "production"
+          }
+        },
+        "commercial-firefox-mv2-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/commercial-firefox-mv2-dev",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "firefox",
+            "MANIFEST_VERSION": "2",
+            "NODE_ENV": "development"
+          }
+        },
+        "commercial-opera": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/commercial-opera",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "opera",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "commercial-opera-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/commercial-opera-dev",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "opera",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "commercial-safari": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/commercial-safari",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "safari",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "production"
+          }
+        },
+        "commercial-safari-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/commercial-safari-dev",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "safari",
+            "MANIFEST_VERSION": "3",
+            "NODE_ENV": "development"
+          }
+        },
+        "commercial-safari-mv2": {
+          "mode": "production",
+          "outputPath": "dist/apps/browser/commercial-safari-mv2",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "safari",
+            "MANIFEST_VERSION": "2",
+            "NODE_ENV": "production"
+          }
+        },
+        "commercial-safari-mv2-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/browser/commercial-safari-mv2-dev",
+          "webpackConfig": "bitwarden_license/bit-browser/webpack.config.js",
+          "main": "bitwarden_license/bit-browser/src/popup/main.ts",
+          "tsConfig": "bitwarden_license/bit-browser/tsconfig.json",
+          "env": {
+            "BROWSER": "safari",
+            "MANIFEST_VERSION": "2",
+            "NODE_ENV": "development"
+          }
+        }
+      }
+    },
+    "serve": {
+      "executor": "nx:run-commands",
+      "defaultConfiguration": "chrome-dev",
+      "options": {
+        "cwd": "apps/browser"
+      },
+      "configurations": {
+        "chrome-dev": {
+          "command": "cross-env BROWSER=chrome MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack --watch --output-path=../../dist/apps/browser/chrome-dev"
+        },
+        "firefox-dev": {
+          "command": "cross-env BROWSER=firefox MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack --watch --output-path=../../dist/apps/browser/firefox-dev"
+        },
+        "firefox-mv2-dev": {
+          "command": "cross-env BROWSER=firefox MANIFEST_VERSION=2 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack --watch --output-path=../../dist/apps/browser/firefox-mv2-dev"
+        },
+        "safari-dev": {
+          "command": "cross-env BROWSER=safari MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack --watch --output-path=../../dist/apps/browser/safari-dev"
+        },
+        "safari-mv2-dev": {
+          "command": "cross-env BROWSER=safari MANIFEST_VERSION=2 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack --watch --output-path=../../dist/apps/browser/safari-mv2-dev"
+        },
+        "edge-dev": {
+          "command": "cross-env BROWSER=edge MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack --watch --output-path=../../dist/apps/browser/edge-dev"
+        },
+        "opera-dev": {
+          "command": "cross-env BROWSER=opera MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack --watch --output-path=../../dist/apps/browser/opera-dev"
+        },
+        "commercial-chrome-dev": {
+          "command": "cross-env BROWSER=chrome MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js --watch --output-path=../../dist/apps/browser/commercial-chrome-dev"
+        },
+        "commercial-firefox-dev": {
+          "command": "cross-env BROWSER=firefox MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js --watch --output-path=../../dist/apps/browser/commercial-firefox-dev"
+        },
+        "commercial-firefox-mv2-dev": {
+          "command": "cross-env BROWSER=firefox MANIFEST_VERSION=2 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js --watch --output-path=../../dist/apps/browser/commercial-firefox-mv2-dev"
+        },
+        "commercial-safari-dev": {
+          "command": "cross-env BROWSER=safari MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js --watch --output-path=../../dist/apps/browser/commercial-safari-dev"
+        },
+        "commercial-safari-mv2-dev": {
+          "command": "cross-env BROWSER=safari MANIFEST_VERSION=2 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js --watch --output-path=../../dist/apps/browser/commercial-safari-mv2-dev"
+        },
+        "commercial-edge-dev": {
+          "command": "cross-env BROWSER=edge MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js --watch --output-path=../../dist/apps/browser/commercial-edge-dev"
+        },
+        "commercial-opera-dev": {
+          "command": "cross-env BROWSER=opera MANIFEST_VERSION=3 NODE_ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-browser/webpack.config.js --watch --output-path=../../dist/apps/browser/commercial-opera-dev"
+        }
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "apps/browser/jest.config.js"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/browser/**/*.ts", "apps/browser/**/*.html"]
+      }
+    }
+  }
+}
diff --git a/apps/browser/scripts/update-manifest-dev.sh b/apps/browser/scripts/update-manifest-dev.sh
new file mode 100755
index 00000000000..2823d4cb510
--- /dev/null
+++ b/apps/browser/scripts/update-manifest-dev.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+####
+# Update the manifest key in the build directory.
+####
+
+set -e
+set -u
+set -x
+set -o pipefail
+
+SCRIPT_ROOT="$(dirname "$0")"
+BUILD_DIR="$SCRIPT_ROOT/../build"
+
+# Check if build directory exists
+if [ -d "$BUILD_DIR" ]; then
+  cd "$BUILD_DIR"
+
+  # Update manifest with dev public key
+  MANIFEST_PATH="./manifest.json"
+
+  # Generated arbitrary public key from Chrome Dev Console to pin side-loaded extension IDs during development
+  DEV_PUBLIC_KEY='MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuIvjtsAVWZM0i5jFhSZcrmwgaf3KWcxM5F16LNDNeivC1EqJ+H5xNZ5R9UN5ueHA2xyyYAOlxY07OcY6CKTGJRJyefbUhszb66sdx26SV5gVkCois99fKBlsbSbd6und/BJYmoFUWvFCNNVH+OxLMqMQWjMMhM2ItLqTYi7dxRE5qd+7LwQpnGG2vTkm/O7nu8U3CtkfcIAGLsiTd7/iuytcMDnC0qFM5tJyY/5I+9QOhpUJ7Ybj3C18BDWDORhqxutWv+MSw//SgUn2/lPQrnrKq7FIVQL7FxxEPqkv4QwFvaixps1cBbMdJ1Ygit1z5JldoSyNxzCa5vVcJLecMQIDAQAB'
+
+  MANIFEST_PATH_TMP="${MANIFEST_PATH}.tmp"
+  if jq --arg key "$DEV_PUBLIC_KEY" '.key = $key' "$MANIFEST_PATH" > "$MANIFEST_PATH_TMP"; then
+    mv "$MANIFEST_PATH_TMP" "$MANIFEST_PATH"
+    echo "Updated manifest key in $MANIFEST_PATH"
+  else
+    echo "ERROR: Failed to update manifest with jq"
+    rm -f "$MANIFEST_PATH_TMP"
+    exit 1
+  fi
+fi
diff --git a/apps/browser/spec/mock-port.spec-util.ts b/apps/browser/spec/mock-port.spec-util.ts
index b5f7825d8e9..39239ba8817 100644
--- a/apps/browser/spec/mock-port.spec-util.ts
+++ b/apps/browser/spec/mock-port.spec-util.ts
@@ -12,6 +12,13 @@ export function mockPorts() {
   (chrome.runtime.connect as jest.Mock).mockImplementation((portInfo) => {
     const port = mockDeep<chrome.runtime.Port>();
     port.name = portInfo.name;
+    port.sender = { url: chrome.runtime.getURL("") };
+
+    // convert to internal port
+    delete (port as any).tab;
+    delete (port as any).documentId;
+    delete (port as any).documentLifecycle;
+    delete (port as any).frameId;
 
     // set message broadcast
     (port.postMessage as jest.Mock).mockImplementation((message) => {
diff --git a/apps/browser/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json
index 397ea877cb5..03d5eb0a9f6 100644
--- a/apps/browser/src/_locales/ar/messages.json
+++ b/apps/browser/src/_locales/ar/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "استخدام تسجيل الدخول الأحادي"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "مرحبًا بعودتك"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "تعديل"
   },
   "view": {
     "message": "عرض"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "كلمة المرور الرئيسية غير صالحة"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "نفذ وقت الخزانة"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "عند قفل النظام"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "عند إعادة تشغيل المتصفح"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "تم تعديل العنصر"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "هل تريد حقاً أن ترسل إلى سلة المهملات؟"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "اسأل عن القياسات الحيوية عند الإطلاق"
   },
-  "premiumRequired": {
-    "message": "حساب البريميوم مطلوب"
-  },
-  "premiumRequiredDesc": {
-    "message": "هذه المِيزة متاحة فقط للعضوية المميزة."
-  },
   "authenticationTimeout": {
     "message": "مهلة المصادقة"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "قراءة مفتاح الأمان"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "في انتظار التفاعل مع مفتاح الأمن..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "يجب عليك إضافة رابط الخادم الأساسي أو على الأقل بيئة مخصصة."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "بيئة مخصصة"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "إظهار اقتراحات التعبئة التلقائية في حقول النموذج"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "عرض الهويات كاقتراحات"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "سنة الإنتهاء"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "تاريخ الانتهاء"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "تعيين كلمة مرور رئيسية"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "خطأ"
   },
   "decryptionError": {
     "message": "خطأ فك التشفير"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "تعذر على بتواردن فك تشفير العنصر (العناصر) المدرجة أدناه."
   },
@@ -3970,6 +4071,15 @@
     "message": "ملء تلقائي عند تعيين تحميل الصفحة لاستخدام الإعداد الافتراضي.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/az/messages.json b/apps/browser/src/_locales/az/messages.json
index 639e6c87d36..7dbd1ba3e7c 100644
--- a/apps/browser/src/_locales/az/messages.json
+++ b/apps/browser/src/_locales/az/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Vahid daxil olma üsulunu istifadə et"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Təşkilatınız, vahid daxil olma tələb edir."
+  },
   "welcomeBack": {
     "message": "Yenidən xoş gəlmisiniz"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Axtarışı sıfırla"
   },
-  "archive": {
-    "message": "Arxivlə"
+  "archiveNoun": {
+    "message": "Arxiv",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arxivlə",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Arxivdən çıxart"
   },
   "itemsInArchive": {
@@ -565,10 +573,10 @@
   "noItemsInArchiveDesc": {
     "message": "Arxivlənmiş elementlər burada görünəcək, ümumi axtarış nəticələrindən və avto-doldurma təkliflərindən xaric ediləcək."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Element arxivə göndərildi"
   },
-  "itemRemovedFromArchive": {
+  "itemUnarchived": {
     "message": "Element arxivdən çıxarıldı"
   },
   "archiveItem": {
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Arxivlənmiş elementlər ümumi axtarış nəticələrindən və avto-doldurma təkliflərindən xaric ediləcək. Bu elementi arxivləmək istədiyinizə əminsiniz?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Düzəliş et"
   },
   "view": {
     "message": "Bax"
   },
+  "viewAll": {
+    "message": "Hamısına bax"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "Daha azına bax"
+  },
   "viewLogin": {
     "message": "Girişə bax"
   },
@@ -614,7 +634,7 @@
     "message": "Element sevimlilərə əlavə edildi"
   },
   "itemRemovedFromFavorites": {
-    "message": "Element sevimlilərdən çıxarıldı"
+    "message": "Element sevimlilərdən xaric edildi"
   },
   "notes": {
     "message": "Notlar"
@@ -674,7 +694,7 @@
     "message": "Ayarlarda bir kilid açma üsulu qurun"
   },
   "sessionTimeoutHeader": {
-    "message": "Seans vaxt bitməsi"
+    "message": "Sessiya vaxt bitməsi"
   },
   "vaultTimeoutHeader": {
     "message": "Seyf vaxtının bitməsi"
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Yararsız ana parol"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Yararsız ana parol. E-poçtunuzun doğru olduğunu və hesabınızın $HOST$ üzərində yaradıldığını təsdiqləyin.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Seyf vaxtının bitməsi"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Sistem kilidlənəndə"
   },
+  "onIdle": {
+    "message": "Sistem boşda olduqda"
+  },
+  "onSleep": {
+    "message": "Sistem yuxu rejimində olduqda"
+  },
   "onRestart": {
     "message": "Brauzer yenidən başladılanda"
   },
@@ -896,7 +931,7 @@
     "message": "Hesabınızdan çıxış etmisiniz."
   },
   "loginExpired": {
-    "message": "Giriş seansınızın müddəti bitdi."
+    "message": "Giriş sessiyanızın müddəti bitdi."
   },
   "logIn": {
     "message": "Giriş et"
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Element saxlanıldı"
   },
+  "savedWebsite": {
+    "message": "Saxlanılan veb sayt"
+  },
+  "savedWebsites": {
+    "message": "Saxlanılan veb sayt ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Həqiqətən tullantı qutusuna göndərmək istəyirsiniz?"
   },
@@ -1207,7 +1254,7 @@
     "description": "Detailed error message shown when saving login details fails."
   },
   "changePasswordWarning": {
-    "message": "Parolunuzu dəyişdirdikdən sonra yeni parolunuzla giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saat ərzində çıxış sonlandırılacaq."
+    "message": "Parolunuzu dəyişdirdikdən sonra yeni parolunuzla giriş etməli olacaqsınız. Digər cihazlardakı aktiv sessiyalar bir saat ərzində çıxış sonlandırılacaq."
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
     "message": "Hesabın geri qaytarılması prosesini tamamlamaq üçün ana parolunuzu dəyişdirin."
@@ -1491,17 +1538,11 @@
   "enableAutoBiometricsPrompt": {
     "message": "Açılışda biometrik soruşulsun"
   },
-  "premiumRequired": {
-    "message": "Premium üzvlük lazımdır"
-  },
-  "premiumRequiredDesc": {
-    "message": "Bu özəlliyi istifadə etmək üçün premium üzvlük lazımdır."
-  },
   "authenticationTimeout": {
     "message": "Kimlik doğrulama vaxtı bitdi"
   },
   "authenticationSessionTimedOut": {
-    "message": "Kimlik doğrulama seansının vaxtı bitdi. Lütfən giriş prosesini yenidən başladın."
+    "message": "Kimlik doğrulama sessiyasının vaxtı bitdi. Lütfən giriş prosesini yenidən başladın."
   },
   "verificationCodeEmailSent": {
     "message": "Doğrulama poçtu $EMAIL$ ünvanına göndərildi.",
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Güvənlik açarını oxu"
   },
+  "readingPasskeyLoading": {
+    "message": "Keçid açarı oxunur..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Keçid açarı kimlik doğrulaması uğursuzdur"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Fərqli bir giriş üsulu istifadə edin"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Güvənlik açarı ilə əlaqə gözlənilir..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Təməl server URL-sini və ya ən azı bir özəl mühiti əlavə etməlisiniz."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL-lər, HTTPS istifadə etməlidir."
+  },
   "customEnvironment": {
     "message": "Özəl mühit"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Avto-doldurmanı söndür"
   },
+  "confirmAutofill": {
+    "message": "Avto-doldurmanı təsdiqlə"
+  },
+  "confirmAutofillDesc": {
+    "message": "Bu sayt, saxlanılmış giriş məlumatlarınızla uyuşmur. Giriş məlumatlarınızı doldurmazdan əvvəl, güvənli sayt olduğuna əmin olun."
+  },
   "showInlineMenuLabel": {
     "message": "Avto-doldurma təkliflərini form xanalarında göstər"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Bitwarden verilərinizi fişinqdən necə qoruyur?"
+  },
+  "currentWebsite": {
+    "message": "Hazırkı veb sayt"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Avto-doldur və bu veb saytı əlavə et"
+  },
+  "autofillWithoutAdding": {
+    "message": "Əlavə etmədən avto-doldur"
+  },
+  "doNotAutofill": {
+    "message": "Avto-doldurulmasın"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Kimlikləri təklif kimi göstər"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Son istifadə ili"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Bitmə vaxtı"
   },
@@ -2090,7 +2167,7 @@
     }
   },
   "passwordSafe": {
-    "message": "Bu parol, veri pozuntularında qeydə alınmayıb. Rahatlıqla istifadə edə bilərsiniz."
+    "message": "Bu parol, veri pozuntularında qeydə alınmayıb. Əmniyyətlə istifadə edə bilərsiniz."
   },
   "baseDomain": {
     "message": "Baza domeni",
@@ -2160,7 +2237,7 @@
     "message": "Təzəlikcə heç nə yaratmamısınız"
   },
   "remove": {
-    "message": "Çıxart"
+    "message": "Xaric et"
   },
   "default": {
     "message": "İlkin"
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Ana parolu ayarla"
   },
@@ -2999,10 +3079,10 @@
     "message": "Ana parolu güncəllə"
   },
   "updateMasterPasswordWarning": {
-    "message": "Ana parolunuz təzəlikcə təşkilatınızdakı bir inzibatçı tərəfindən dəyişdirildi. Seyfə erişmək üçün onu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış edəcəksiniz və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər."
+    "message": "Ana parolunuz təzəlikcə təşkilatınızdakı bir inzibatçı tərəfindən dəyişdirildi. Seyfə erişmək üçün onu indi güncəlləməlisiniz. Davam etsəniz, hazırkı sessiyadan çıxış edəcəksiniz və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv sessiyalar bir saata qədər aktiv qalmağa davam edə bilər."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "Ana parolunuz təşkilatınızdakı siyasətlərdən birinə və ya bir neçəsinə uyğun gəlmir. Seyfə erişmək üçün ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər."
+    "message": "Ana parolunuz təşkilatınızdakı siyasətlərdən birinə və ya bir neçəsinə uyğun gəlmir. Seyfə erişmək üçün ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı sessiyadan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv sessiyalar bir saata qədər aktiv qalmağa davam edə bilər."
   },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Təşkilatınız, güvənli cihaz şifrələməsini sıradan çıxartdı. Seyfinizə erişmək üçün lütfən ana parol təyin edin."
@@ -3158,7 +3238,7 @@
     "message": "Simvol sayını dəyişdir"
   },
   "sessionTimeout": {
-    "message": "Seansınızın vaxtı bitdi. Lütfən geri qayıdıb yenidən giriş etməyə cəhd edin."
+    "message": "Sessiyanızın vaxtı bitdi. Lütfən geri qayıdıb yenidən giriş etməyə cəhd edin."
   },
   "exportingPersonalVaultTitle": {
     "message": "Fərdi seyfin xaricə köçürülməsi"
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Yalnız $ORGANIZATION$ ilə əlaqələndirilmiş təşkilat seyfi xaricə köçürüləcək.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Yalnız $ORGANIZATION$ ilə əlaqələndirilmiş təşkilat seyfi xaricə köçürüləcək. Element kolleksiyalarım daxil edilməyəcək.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Xəta"
   },
   "decryptionError": {
     "message": "Şifrə açma xətası"
   },
+  "errorGettingAutoFillData": {
+    "message": "Avto-doldurma verilərini alma xətası"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden, aşağıda sadalanan seyf element(lər)inin şifrəsini aça bilmədi."
   },
@@ -3643,7 +3744,7 @@
     "message": "Cihazları idarə et"
   },
   "currentSession": {
-    "message": "Hazırkı seans"
+    "message": "Hazırkı sessiya"
   },
   "mobile": {
     "message": "Mobil",
@@ -3840,7 +3941,7 @@
     "message": "İstifadəçiyə güvən"
   },
   "sendsTitleNoItems": {
-    "message": "Send, həssas məlumatlar təhlükəsizdir",
+    "message": "Send ilə həssas məlumatlar əmniyyətdədir",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
@@ -3970,6 +4071,15 @@
     "message": "\"Səhifə yüklənəndə avto-doldurma\" özəlliyi ilkin ayarı istifadə etmək üzrə ayarlandı.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Avto-doldurula bilmir"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Oldu"
+  },
   "toggleSideNavigation": {
     "message": "Yan naviqasiyanı aç/bağla"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Ödənişsiz təşkilatlar qoşmaları istifadə edə bilməz"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "İlkin ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "$WEBSITE$ ilə uyuşma aşkarlamasını göstər",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Seyfinizə xoş gəlmisiniz!"
   },
-  "phishingPageTitle": {
-    "message": "Fişinq veb sayt"
+  "phishingPageTitleV2": {
+    "message": "Fişinq cəhdi aşkarlandı"
   },
-  "phishingPageCloseTab": {
-    "message": "Vərəqi bağla"
+  "phishingPageSummary": {
+    "message": "Ziyarət etməyə cəhd etdiyiniz sayt, zərərli sayt kimi tanınır və təhlükəsizlik baxımından risklidir."
   },
-  "phishingPageContinue": {
-    "message": "Davam"
+  "phishingPageCloseTabV2": {
+    "message": "Bu vərəqi bağla"
   },
-  "phishingPageLearnWhy": {
-    "message": "Bunu niyə görürürsünüz?"
+  "phishingPageContinueV2": {
+    "message": "Bu sayta davam et (tövsiyə olunmur)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Bu sayt burada üzə çıxdı ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": "Bu mənbədə fərdi və həssas məlumatların oğurlanması üçün istifadə olunan məlum fişinq saytların açıq mənbəli siyahısıdır.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Fişinq aşkarlaması haqqında daha ətraflı"
+  },
+  "protectedBy": {
+    "message": "$PRODUCT$ tərəfindən qorunur",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Hazırkı səhifə üçün elementləri avto-doldur"
@@ -5590,7 +5733,7 @@
     "message": "Kimliklərinizlə, uzun qeydiyyat və ya əlaqə xanalarını daha tez avtomatik doldurun."
   },
   "newNoteNudgeTitle": {
-    "message": "Həssas verilərinizi güvənli şəkildə saxlayın"
+    "message": "Həssas verilərinizi əmniyyətdə saxlayın"
   },
   "newNoteNudgeBody": {
     "message": "Notlarla, bankçılıq və ya sığorta təfsilatları kimi həssas veriləri təhlükəsiz saxlayın."
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Key Connector domenini təsdiqlə"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Riskli girişlərinizi güvənli hala gətirməyiniz əladır!"
+  },
+  "upgradeNow": {
+    "message": "İndi yüksəlt"
+  },
+  "builtInAuthenticator": {
+    "message": "Daxili kimlik doğrulayıcı"
+  },
+  "secureFileStorage": {
+    "message": "Güvənli fayl anbarı"
+  },
+  "emergencyAccess": {
+    "message": "Fövqəladə hal erişimi"
+  },
+  "breachMonitoring": {
+    "message": "Pozuntu monitorinqi"
+  },
+  "andMoreFeatures": {
+    "message": "Və daha çoxu!"
+  },
+  "planDescPremium": {
+    "message": "Tam onlayn təhlükəsizlik"
+  },
+  "upgradeToPremium": {
+    "message": "\"Premium\"a yüksəlt"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Premium-u kəşf et"
+  },
+  "loadingVault": {
+    "message": "Seyf yüklənir"
+  },
+  "vaultLoaded": {
+    "message": "Seyf yükləndi"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Bu ayar, təşkilatınızın siyasəti tərəfindən sıradan çıxarılıb.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Poçt kodu"
+  },
+  "cardNumberLabel": {
+    "message": "Kart nömrəsi"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Vaxt bitmə əməliyyatı"
   }
 }
diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json
index 44c82ef85b4..89651f0038e 100644
--- a/apps/browser/src/_locales/be/messages.json
+++ b/apps/browser/src/_locales/be/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Выкарыстаць аднаразовы ўваход"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "З вяртаннем"
   },
@@ -189,7 +192,7 @@
     "message": "Скапіяваць нататкі"
   },
   "copy": {
-    "message": "Copy",
+    "message": "Скапіяваць",
     "description": "Copy to clipboard"
   },
   "fill": {
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Рэдагаваць"
   },
   "view": {
     "message": "Прагляд"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Памылковы асноўны пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Час чакання сховішча"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Пры блакіраванні сістэмы"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Пры перазапуску браўзера"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Элемент адрэдагаваны"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Вы сапраўды хочаце адправіць гэты элемент у сметніцу?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Пытацца пра біяметрыю пры запуску"
   },
-  "premiumRequired": {
-    "message": "Патрабуецца прэміяльны статус"
-  },
-  "premiumRequiredDesc": {
-    "message": "Для выкарыстання гэтай функцыі патрабуецца прэміяльны статус."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Карыстальніцкае асяроддзе"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Год завяршэння"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Тэрмін дзеяння"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Прызначыць асноўны пароль"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Памылка"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/bg/messages.json b/apps/browser/src/_locales/bg/messages.json
index a440690cee1..b40f4b91cb4 100644
--- a/apps/browser/src/_locales/bg/messages.json
+++ b/apps/browser/src/_locales/bg/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Използване на еднократна идентификация"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Вашата организация изисква еднократно удостоверяване."
+  },
   "welcomeBack": {
     "message": "Добре дошли отново"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Нулиране на търсенето"
   },
-  "archive": {
-    "message": "Архивиране"
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Архивиране",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Изваждане от архива"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Архивираните елементи ще се показват тук и ще бъдат изключени от общите резултати при търсене и от предложенията за автоматично попълване."
   },
-  "itemSentToArchive": {
-    "message": "Елементът е преместен в архива"
+  "itemWasSentToArchive": {
+    "message": "Елементът беше преместен в архива"
   },
-  "itemRemovedFromArchive": {
-    "message": "Елементът е изваден от архива"
+  "itemUnarchived": {
+    "message": "Елементът беше изваден от архива"
   },
   "archiveItem": {
     "message": "Архивиране на елемента"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Архивираните елементи са изключени от общите резултати при търсене и от предложенията за автоматично попълване. Наистина ли искате да архивирате този елемент?"
   },
+  "upgradeToUseArchive": {
+    "message": "За да се възползвате от архивирането, трябва да ползвате платен абонамент."
+  },
   "edit": {
     "message": "Редактиране"
   },
   "view": {
     "message": "Преглед"
   },
+  "viewAll": {
+    "message": "Показване на всички"
+  },
+  "showAll": {
+    "message": "Показване на всички"
+  },
+  "viewLess": {
+    "message": "Преглед на по-малко"
+  },
   "viewLogin": {
     "message": "Преглед на елемента за вписване"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Грешна главна парола"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Грешна главна парола. Проверете дали е-пощата е правилна и дали акаунтът Ви е създаден в $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Време за достъп"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "При заключване на системата"
   },
+  "onIdle": {
+    "message": "При бездействие на системата"
+  },
+  "onSleep": {
+    "message": "При заспиване на системата"
+  },
   "onRestart": {
     "message": "При повторно пускане на браузъра"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Елементът е редактиран"
   },
+  "savedWebsite": {
+    "message": "Запазен уеб сайт"
+  },
+  "savedWebsites": {
+    "message": "Запазени уеб сайтове ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Наистина ли искате да изтриете елемента?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Питане за биометрични данни при пускане"
   },
-  "premiumRequired": {
-    "message": "Изисква се платен абонамент"
-  },
-  "premiumRequiredDesc": {
-    "message": "За да се възползвате от тази възможност, трябва да ползвате платен абонамент."
-  },
   "authenticationTimeout": {
     "message": "Време на давност за удостоверяването"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Прочитане на ключа за сигурност"
   },
+  "readingPasskeyLoading": {
+    "message": "Прочитане на секретния ключ…"
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Удостоверяването чрез секретен ключ беше неуспешно"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Използване на друг метод на вписване"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Изчакване на действие с ключ за сигурност…"
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Трябва да добавите или основния адрес на сървъра, или поне една специална среда."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Адресите трябва да ползват HTTPS."
+  },
   "customEnvironment": {
     "message": "Специална среда"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Изключване на автоматичното попълване"
   },
+  "confirmAutofill": {
+    "message": "Потвърждаване на автоматичното попълване"
+  },
+  "confirmAutofillDesc": {
+    "message": "Този уеб сайт не съвпада със запазените данни за вписване. Преди да попълните данните си, уверете се, че имате вяра на сайта."
+  },
   "showInlineMenuLabel": {
     "message": "Показване на предложения за авт. попълване на полетата във формуляри"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Как Битуорден защитава данните Ви от измами?"
+  },
+  "currentWebsite": {
+    "message": "Текущ уеб сайт"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Автоматично попълване и добавяне на този уеб сайт"
+  },
+  "autofillWithoutAdding": {
+    "message": "Автоматично попълване без добавяне"
+  },
+  "doNotAutofill": {
+    "message": "Да не се попълва автоматично"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Показване на идентичности като предложения"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Година на изтичане"
   },
+  "monthly": {
+    "message": "месец"
+  },
   "expiration": {
     "message": "Изтичане"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Тази страница пречи на работата на Битуорден. Вмъкнатото меню на Битуорден е временно изключено, като мярка за сигурност."
+  },
   "setMasterPassword": {
     "message": "Задаване на главна парола"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Ще бъдат изнесени само записите от трезора свързан с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Само трезорът свързан с $ORGANIZATION$ ще бъде експортиран. Моите записи няма да бъдат включени.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Грешка"
   },
   "decryptionError": {
     "message": "Грешка при дешифриране"
   },
+  "errorGettingAutoFillData": {
+    "message": "Грешка при получаването на данните за автоматично попълване"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Битоурден не може да дешифрира елементите от трезора посочени по-долу."
   },
@@ -3970,6 +4071,15 @@
     "message": "Автоматичното попълване при зареждане на страницата използва настройката си по подразбиране.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Автоматичното попълване не може да бъде извършено"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "По подразбиране е зададена настройката „Точно съвпадение“. Текущият уеб сайт не съвпада точно със запазените данни за вход в този запис."
+  },
+  "okay": {
+    "message": "Добре"
+  },
   "toggleSideNavigation": {
     "message": "Превключване на страничната навигация"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Премиум"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Отключете докладите, аварийния достъп и още функционалности свързани със сигурността, с платения план."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Безплатните организации не могат да използват прикачени файлове"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "По подразбиране ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Показване на откритото съвпадение $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Добре дошли в трезора си!"
   },
-  "phishingPageTitle": {
-    "message": "Измамен уеб сайт"
+  "phishingPageTitleV2": {
+    "message": "Засечен е опит за измама"
   },
-  "phishingPageCloseTab": {
-    "message": "Затваряне на раздела"
+  "phishingPageSummary": {
+    "message": "Уеб сайтът, който се опитвате да посетите, е известен като злонамерен и може да представлява риск за сигурността."
   },
-  "phishingPageContinue": {
-    "message": "Продължаване"
+  "phishingPageCloseTabV2": {
+    "message": "Затваряне на този раздел"
   },
-  "phishingPageLearnWhy": {
-    "message": "Защо виждате това?"
+  "phishingPageContinueV2": {
+    "message": "Продължаване към уеб сайта (не се препоръчва)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Този уеб сайт е открит в ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", отворен списък с известни измамни уеб сайтове, които могат да отмъкнат Вашите лични или поверителни данни.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Научете повече относно разпознаването на измамни уеб сайтове"
+  },
+  "protectedBy": {
+    "message": "Защитено от $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Попълвайте автоматично елементи в текущата страница"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Потвърждаване на домейна на конектора за ключове"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Добра работа с подсигуряването на данните за вписване в риск!"
+  },
+  "upgradeNow": {
+    "message": "Надграждане сега"
+  },
+  "builtInAuthenticator": {
+    "message": "Вграден удостоверител"
+  },
+  "secureFileStorage": {
+    "message": "Сигурно съхранение на файлове"
+  },
+  "emergencyAccess": {
+    "message": "Авариен достъп"
+  },
+  "breachMonitoring": {
+    "message": "Наблюдение за пробиви"
+  },
+  "andMoreFeatures": {
+    "message": "И още!"
+  },
+  "planDescPremium": {
+    "message": "Пълна сигурност в Интернет"
+  },
+  "upgradeToPremium": {
+    "message": "Надградете до Платения план"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Отключване на разширените функционалности по сигурността"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Платеният абонамент предоставя повече инструменти за защита и управление"
+  },
+  "explorePremium": {
+    "message": "Разгледайте платения план"
+  },
+  "loadingVault": {
+    "message": "Зареждане на трезора"
+  },
+  "vaultLoaded": {
+    "message": "Трезорът е зареден"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Тази настройка е изключена съгласно политиката на организацията Ви.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Пощенски код"
+  },
+  "cardNumberLabel": {
+    "message": "Номер на картата"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Действие при изтичането на времето за достъп"
   }
 }
diff --git a/apps/browser/src/_locales/bn/messages.json b/apps/browser/src/_locales/bn/messages.json
index e7c4c36bce0..4f8e7054305 100644
--- a/apps/browser/src/_locales/bn/messages.json
+++ b/apps/browser/src/_locales/bn/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "বিটওয়ার্ডেন লোগো"
   },
   "extName": {
     "message": "Bitwarden Password Manager",
@@ -23,7 +23,7 @@
     "message": "অ্যাকাউন্ট তৈরি করুন"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "বিটওয়ার্ডেনে নতুন?"
   },
   "logInWithPasskey": {
     "message": "Log in with passkey"
@@ -31,8 +31,11 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "আবারও স্বাগতম"
   },
   "setAStrongPassword": {
     "message": "Set a strong password"
@@ -276,10 +279,10 @@
     "message": "Send a verification code to your email"
   },
   "sendCode": {
-    "message": "Send code"
+    "message": "কোড পাঠান"
   },
   "codeSent": {
-    "message": "Code sent"
+    "message": "কোড পাঠানো হয়েছে"
   },
   "verificationCode": {
     "message": "যাচাইকরণ কোড"
@@ -300,7 +303,7 @@
     "message": "Continue to Help Center?"
   },
   "continueToHelpCenterDesc": {
-    "message": "Learn more about how to use Bitwarden on the Help Center."
+    "message": "সহায়তা কেন্দ্রে বিটওয়ার্ডেন কীভাবে ব্যবহার করতে হয় সে সম্পর্কে আরও জানুন।"
   },
   "continueToBrowserExtensionStore": {
     "message": "Continue to browser extension store?"
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "সম্পাদনা"
   },
   "view": {
     "message": "দেখুন"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "অবৈধ মূল পাসওয়ার্ড"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "ভল্টের সময়সীমা"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "সিস্টেম লকে"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "ব্রাউজার পুনঃসূচনাই"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "সম্পাদিত বস্তু"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "আপনি কি সত্যিই আবর্জনাতে পাঠাতে চান?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "প্রিমিয়াম আবশ্যক"
-  },
-  "premiumRequiredDesc": {
-    "message": "এই বৈশিষ্ট্যটি ব্যবহার করতে একটি প্রিমিয়াম সদস্যতার প্রয়োজন।"
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "পছন্দসই পরিবেশ"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "মেয়াদোত্তীর্ণ বছর"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "মেয়াদোত্তীর্ণতা"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "মূল পাসওয়ার্ড ধার্য করুন"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/bs/messages.json b/apps/browser/src/_locales/bs/messages.json
index d9003a749a6..9d5631c47e2 100644
--- a/apps/browser/src/_locales/bs/messages.json
+++ b/apps/browser/src/_locales/bs/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json
index 2002dfc467f..255263a6da7 100644
--- a/apps/browser/src/_locales/ca/messages.json
+++ b/apps/browser/src/_locales/ca/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Inici de sessió únic"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Benvingut/da de nou"
   },
@@ -320,7 +323,7 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "twoStepLogin": {
-    "message": "Inici de sessió en dues passes"
+    "message": "Inici de sessió en dos passos"
   },
   "logOut": {
     "message": "Tanca la sessió"
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Restableix la cerca"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edita"
   },
   "view": {
     "message": "Visualitza"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Contrasenya mestra no vàlida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Temps d'espera de la caixa forta"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "En bloquejar el sistema"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "En reiniciar el navegador"
   },
@@ -956,7 +991,7 @@
     "message": "Carpeta afegida"
   },
   "twoStepLoginConfirmation": {
-    "message": "L'inici de sessió en dues passes fa que el vostre compte siga més segur, ja que obliga a verificar el vostre inici de sessió amb un altre dispositiu, com ara una clau de seguretat, una aplicació autenticadora, un SMS, una trucada telefònica o un correu electrònic. Es pot habilitar l'inici de sessió en dues passes a la caixa forta web de bitwarden.com. Voleu visitar el lloc web ara?"
+    "message": "L'inici de sessió en dos passos fa que el vostre compte siga més segur, ja que obliga a verificar el vostre inici de sessió amb un altre dispositiu, com ara una clau de seguretat, una aplicació autenticadora, un SMS, una trucada telefònica o un correu electrònic. Es pot habilitar l'inici de sessió en dos passos a la caixa forta web de bitwarden.com. Voleu visitar el lloc web ara?"
   },
   "twoStepLoginConfirmationContent": {
     "message": "Fes que el vostre compte siga més segur configurant l'inici de sessió en dos passos a l'aplicació web de Bitwarden."
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Element guardat"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Esteu segur que voleu suprimir aquest element?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Demaneu dades biometriques en iniciar"
   },
-  "premiumRequired": {
-    "message": "Premium requerit"
-  },
-  "premiumRequiredDesc": {
-    "message": "Cal una subscripció premium per utilitzar aquesta característica."
-  },
   "authenticationTimeout": {
     "message": "Temps d'espera d'autenticació"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1541,13 +1591,13 @@
     "message": "Inici de sessió no disponible"
   },
   "noTwoStepProviders": {
-    "message": "Aquest compte té habilitat l'inici de sessió en dues passes, però aquest navegador web no admet cap dels dos proveïdors configurats."
+    "message": "Aquest compte té habilitat l'inici de sessió en dos passos, però aquest navegador web no admet cap dels dos proveïdors configurats."
   },
   "noTwoStepProviders2": {
     "message": "Utilitzeu un navegador web compatible (com ara Chrome) o afegiu proveïdors addicionals que siguen compatibles amb tots els navegadors web (com una aplicació d'autenticació)."
   },
   "twoStepOptions": {
-    "message": "Opcions d'inici de sessió en dues passes"
+    "message": "Opcions d'inici de sessió en dos passos"
   },
   "selectTwoStepLoginMethod": {
     "message": "Select two-step login method"
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Entorn personalitzat"
   },
@@ -1636,13 +1689,13 @@
     "message": "Suggeriments d'emplenament automàtic"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "Trobeu fàcilment suggeriments d'emplenament automàtic"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "Desactiveu la configuració d'emplenament automàtic del vostre navegador perquè no entren en conflicte amb Bitwarden."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Desactiveu l'emplenament automàtic de $BROWSER$",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Mostra suggeriments d'emplenament automàtic als camps del formulari"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Mostra identitats com a suggeriments"
   },
@@ -1782,7 +1856,7 @@
     "message": "Si feu clic a l'exterior de la finestra emergent per comprovar el vostre correu electrònic amb el codi de verificació, es tancarà aquesta finestra. Voleu obrir aquesta finestra emergent en una finestra nova perquè no es tanque?"
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Mostra les icones del lloc web i recupera els URL de canvi de contrasenya"
   },
   "cardholderName": {
     "message": "Nom del titular de la targeta"
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Any de venciment"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Caducitat"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Estableix la contrasenya mestra"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Error de desxifrat"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden no ha pogut desxifrar els elements de la caixa forta que s'indiquen a continuació."
   },
@@ -3640,7 +3741,7 @@
     "message": "Remember this device to make future logins seamless"
   },
   "manageDevices": {
-    "message": "Manage devices"
+    "message": "Gestiona els dispositius"
   },
   "currentSession": {
     "message": "Current session"
@@ -3683,7 +3784,7 @@
     "message": "Needs approval"
   },
   "devices": {
-    "message": "Devices"
+    "message": "Dispositius"
   },
   "accessAttemptBy": {
     "message": "Access attempt by $EMAIL$",
@@ -3970,6 +4071,15 @@
     "message": "S'ha configurat l'emplenament automàtic en carregar la pàgina perquè utilitze la configuració predeterminada.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Canvia a la navegació lateral"
   },
@@ -4772,22 +4882,22 @@
     "message": "Download Bitwarden"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Download Bitwarden on all devices"
+    "message": "Baixa Bitwarden a tots els dispositius"
   },
   "getTheMobileApp": {
     "message": "Get the mobile app"
   },
   "getTheMobileAppDesc": {
-    "message": "Access your passwords on the go with the Bitwarden mobile app."
+    "message": "Accediu a les vostres contrasenyes des de qualsevol lloc amb l'aplicació mòbil Bitwarden."
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "Obteniu l'aplicació d'escriptori"
   },
   "getTheDesktopAppDesc": {
-    "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
+    "message": "Accediu a la vostra caixa forta sense navegador i, a continuació, configureu el desbloqueig amb biometria per accelerar el desbloqueig tant a l'aplicació d'escriptori com a l'extensió del navegador."
   },
   "downloadFromBitwardenNow": {
-    "message": "Download from bitwarden.com now"
+    "message": "Baixeu ara des de bitwarden.com"
   },
   "getItOnGooglePlay": {
     "message": "Get it on Google Play"
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5257,10 +5380,10 @@
     "message": "Biometric unlock is currently unavailable for an unknown reason."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Desbloqueja la caixa forta en segons"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Podeu personalitzar la configuració de desbloqueig i temps d'espera per accedir més ràpidament a la vostra caixa forta."
   },
   "unlockPinSet": {
     "message": "Unlock PIN set"
@@ -5497,7 +5620,7 @@
     "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Benvinguts a Bitwarden"
   },
   "securityPrioritized": {
     "message": "Security, prioritized"
@@ -5536,28 +5659,48 @@
     "message": "Import now"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "Benvigut/da a la vostra caixa forta!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "Emplena automàticament els elements de la pàgina actual"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "Elements preferits per accedir fàcilment"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "Cerca altres coses a la caixa forta"
   },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
@@ -5609,20 +5752,20 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Creeu contrasenyes ràpidament"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Creeu fàcilment contrasenyes fortes i úniques fent clic a",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "per ajudar-vos a mantenir segurs els vostres inicis de sessió.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Creeu fàcilment contrasenyes fortes i úniques fent clic al botó Genera contrasenya per ajudar-vos a mantenir segurs els vostres inicis de sessió.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "aboutThisSetting": {
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json
index 0638257d687..eff2c6c0ea7 100644
--- a/apps/browser/src/_locales/cs/messages.json
+++ b/apps/browser/src/_locales/cs/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Použít jednotné přihlášení"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Vaše organizace vyžaduje jednotné přihlášení."
+  },
   "welcomeBack": {
     "message": "Vítejte zpět"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Resetovat hledání"
   },
-  "archive": {
-    "message": "Archivovat"
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archivovat",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Odebrat z archivu"
   },
   "itemsInArchive": {
@@ -565,10 +573,10 @@
   "noItemsInArchiveDesc": {
     "message": "Zde se zobrazí archivované položky a budou vyloučeny z obecných výsledků vyhledávání a návrhů automatického vyplňování."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Položka byla přesunuta do archivu"
   },
-  "itemRemovedFromArchive": {
+  "itemUnarchived": {
     "message": "Položka byla odebrána z archivu"
   },
   "archiveItem": {
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archivované položky jsou vyloučeny z obecných výsledků vyhledávání a z návrhů automatického vyplňování. Jste si jisti, že chcete tuto položku archivovat?"
   },
+  "upgradeToUseArchive": {
+    "message": "Pro použití funkce Archiv je potřebné prémiové členství."
+  },
   "edit": {
     "message": "Upravit"
   },
   "view": {
     "message": "Zobrazit"
   },
+  "viewAll": {
+    "message": "Zobrazit vše"
+  },
+  "showAll": {
+    "message": "Zobrazit vše"
+  },
+  "viewLess": {
+    "message": "Zobrazit méně"
+  },
   "viewLogin": {
     "message": "Zobrazit přihlašovací údaje"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Chybné hlavní heslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Neplatné hlavní heslo. Potvrďte správnost e-mailu a zda byl Váš účet vytvořen na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Časový limit trezoru"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Při uzamknutí systému"
   },
+  "onIdle": {
+    "message": "Při nečinnosti systému"
+  },
+  "onSleep": {
+    "message": "Při přechodu do režimu spánku"
+  },
   "onRestart": {
     "message": "Při restartu prohlížeče"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Položka byla uložena"
   },
+  "savedWebsite": {
+    "message": "Uložená webová stránka"
+  },
+  "savedWebsites": {
+    "message": "Uložené webové stránky ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Opravdu chcete položku přesunout do koše?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ověřit biometrické údaje při spuštění"
   },
-  "premiumRequired": {
-    "message": "Je vyžadováno členství Premium"
-  },
-  "premiumRequiredDesc": {
-    "message": "Pro použití této funkce je potřebné členství Premium."
-  },
   "authenticationTimeout": {
     "message": "Časový limit ověření"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Přečíst bezpečnostní klíč"
   },
+  "readingPasskeyLoading": {
+    "message": "Načítání přístupového klíče..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Ověření přístupového klíče selhalo"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Použít jinou metodu přihlášení"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Čeká se na interakci s bezpečnostním klíčem..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Musíte přidat buď základní adresu URL serveru nebo alespoň jedno vlastní prostředí."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL adresy musí používat HTTPS."
+  },
   "customEnvironment": {
     "message": "Vlastní prostředí"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Vypnout automatické vyplňování"
   },
+  "confirmAutofill": {
+    "message": "Potvrdit automatické vyplňování"
+  },
+  "confirmAutofillDesc": {
+    "message": "Tato stránka neodpovídá Vašim uloženým přihlašovacím údajům. Před vyplněním přihlašovacích údajů se ujistěte, že se jedná o důvěryhodný web."
+  },
   "showInlineMenuLabel": {
     "message": "Zobrazit návrhy automatického vyplňování v polích formuláře"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Jak Bitwarden chrání Vaše data před phishingem?"
+  },
+  "currentWebsite": {
+    "message": "Aktuální webová stránka"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Automatické vyplňování a přidání této stránky"
+  },
+  "autofillWithoutAdding": {
+    "message": "Automatické vyplňování bez přidání"
+  },
+  "doNotAutofill": {
+    "message": "Nevyplňovat automaticky"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Zobrazit identity jako návrhy"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Rok expirace"
   },
+  "monthly": {
+    "message": "měsíčně"
+  },
   "expiration": {
     "message": "Expirace"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Tato stránka narušuje zážitek z Bitwardenu. Vložené menu Bitwarden bylo dočasně vypnuto jako bezpečnostní opatření."
+  },
   "setMasterPassword": {
     "message": "Nastavit hlavní heslo"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Bude exportován jen trezor organizace přidružený k $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Bude exportován jen trezor organizace přidružený k $ORGANIZATION$. Položky mých sbírek nebudou zahrnuty.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Chyba"
   },
   "decryptionError": {
     "message": "Chyba dešifrování"
   },
+  "errorGettingAutoFillData": {
+    "message": "Chyba při načítání dat automatického vyplňování"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden nemohl dešifrovat níže uvedené položky v trezoru."
   },
@@ -3970,6 +4071,15 @@
     "message": "Automatické vyplnění při načítání stránky bylo nastaveno na výchozí nastavení.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Nelze automaticky vyplňovat"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Výchozí shoda je nastavena na \"Přesná shoda\". Aktuální web neodpovídá přesně uloženým přihlašovacím údajům pro tuto položku."
+  },
+  "okay": {
+    "message": "OK"
+  },
   "toggleSideNavigation": {
     "message": "Přepnout boční navigaci"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Odemkněte hlášení, nouzový přístup a další bezpečnostní funkce s předplatným Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Volné organizace nemohou používat přílohy"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Výchozí ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Zobrazit detekci shody $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Vítejte ve Vašem trezoru!"
   },
-  "phishingPageTitle": {
-    "message": "Phishingové webová stránka"
+  "phishingPageTitleV2": {
+    "message": "Zjištěn pokus o phishing"
   },
-  "phishingPageCloseTab": {
-    "message": "Zavřít kartu"
+  "phishingPageSummary": {
+    "message": "Stránka, kterou se pokoušíte navštívit, je známá škodlivá stránka a bezpečnostní riziko."
   },
-  "phishingPageContinue": {
-    "message": "Pokračovat"
+  "phishingPageCloseTabV2": {
+    "message": "Zavřít tuto kartu"
   },
-  "phishingPageLearnWhy": {
-    "message": "Proč to vidíte?"
+  "phishingPageContinueV2": {
+    "message": "Pokračovat na tuto stránku (nedoporučeno)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Tato stránka byla nalezena v ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", open-source seznamu známých phishingových stránek používaných pro krádež osobních a citlivých informací.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Další informace o detekci phishingu"
+  },
+  "protectedBy": {
+    "message": "Chráněno produktem $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Položky automatického vyplňování aktuální stránky"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Potvrdit doménu Key Connectoru"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Skvělá práce při zabezpečení přihlašovacích údajů v ohrožení!"
+  },
+  "upgradeNow": {
+    "message": "Aktualizovat nyní"
+  },
+  "builtInAuthenticator": {
+    "message": "Vestavěný autentifikátor"
+  },
+  "secureFileStorage": {
+    "message": "Zabezpečené úložiště souborů"
+  },
+  "emergencyAccess": {
+    "message": "Nouzový přístup"
+  },
+  "breachMonitoring": {
+    "message": "Sledování úniků"
+  },
+  "andMoreFeatures": {
+    "message": "A ještě více!"
+  },
+  "planDescPremium": {
+    "message": "Dokončit online zabezpečení"
+  },
+  "upgradeToPremium": {
+    "message": "Aktualizovat na Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Odemknout pokročilé bezpečnostní funkce"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Prémiové předplatné Vám dává více nástrojů k bezpečí a kontrole"
+  },
+  "explorePremium": {
+    "message": "Objevit Premium"
+  },
+  "loadingVault": {
+    "message": "Načítání trezoru"
+  },
+  "vaultLoaded": {
+    "message": "Trezor byl načten"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Toto nastavení je zakázáno zásadami Vaší organizace.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / PSČ"
+  },
+  "cardNumberLabel": {
+    "message": "Číslo karty"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Akce vypršení časového limitu"
   }
 }
diff --git a/apps/browser/src/_locales/cy/messages.json b/apps/browser/src/_locales/cy/messages.json
index 8756a138e81..99fcdffcc97 100644
--- a/apps/browser/src/_locales/cy/messages.json
+++ b/apps/browser/src/_locales/cy/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Croeso nôl"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Golygu"
   },
   "view": {
     "message": "Gweld"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Prif gyfrinair annilys"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Cloi'r gell"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "wrth ailgychwyn y porwr"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Eitem wedi'i chadw"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Ydych chi wir eisiau anfon i'r sbwriel?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Mae angen aelodaeth uwch"
-  },
-  "premiumRequiredDesc": {
-    "message": "Mae angen aelodaeth uwch i ddefnyddio'r nodwedd hon."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Amgylchedd addasedig"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Blwyddyn dod i ben"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Dod i ben"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Gosod prif gyfrinair"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Gwall"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/da/messages.json b/apps/browser/src/_locales/da/messages.json
index a78ff26fb0f..865e6ff7dda 100644
--- a/apps/browser/src/_locales/da/messages.json
+++ b/apps/browser/src/_locales/da/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Brug Single Sign-On"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Velkommen tilbage"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Redigér"
   },
   "view": {
     "message": "Vis"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Ugyldig hovedadgangskode"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Boks timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Når systemet låses"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Ved genstart af browseren"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Element gemt"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Er du sikker på, at du sende til papirkurven?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Bed om biometri ved start"
   },
-  "premiumRequired": {
-    "message": "Premium påkrævet"
-  },
-  "premiumRequiredDesc": {
-    "message": "Premium-medlemskab kræves for at anvende denne funktion."
-  },
   "authenticationTimeout": {
     "message": "Godkendelsestimeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Der skal tilføjes enten basis server-URL'en eller mindst ét tilpasset miljø."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Brugerdefineret miljø"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Vis autoudfyld-menu i formularfelter"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Vis identiteter som forslag"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Udløbsår"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Udløb"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Indstil hovedadgangskode"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Fejl"
   },
   "decryptionError": {
     "message": "Dekrypteringsfejl"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden kunne ikke dekryptere boks-emne(r) anført nedenfor."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autoudfyldning ved sideindlæsning sat til standardindstillingen.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Slå sidenavigering til/fra"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Gratis organisationer kan ikke bruge vedhæftninger"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Vis matchdetektion $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json
index f04ca5b11be..86f49bb875e 100644
--- a/apps/browser/src/_locales/de/messages.json
+++ b/apps/browser/src/_locales/de/messages.json
@@ -29,7 +29,10 @@
     "message": "Mit Passkey anmelden"
   },
   "useSingleSignOn": {
-    "message": "Single Sign-on verwenden"
+    "message": "Single Sign-On verwenden"
+  },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Deine Organisation erfordert Single Sign-On."
   },
   "welcomeBack": {
     "message": "Willkommen zurück"
@@ -41,7 +44,7 @@
     "message": "Schließe die Erstellung deines Kontos ab, indem du ein Passwort festlegst"
   },
   "enterpriseSingleSignOn": {
-    "message": "Enterprise Single-Sign-On"
+    "message": "Enterprise Single Sign-On"
   },
   "cancel": {
     "message": "Abbrechen"
@@ -550,32 +553,40 @@
   "resetSearch": {
     "message": "Suche zurücksetzen"
   },
-  "archive": {
-    "message": "Archivieren"
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Archivierung aufheben"
+  "archiveVerb": {
+    "message": "Archivieren",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Nicht mehr archivieren"
   },
   "itemsInArchive": {
     "message": "Einträge im Archiv"
   },
   "noItemsInArchive": {
-    "message": "Kein Eintrag im Archiv"
+    "message": "Keine Einträge im Archiv"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archivierte Einträge erscheinen hier und werden von allgemeinen Suchergebnissen und Autofill Vorschlägen ausgeschlossen."
+    "message": "Archivierte Einträge werden hier angezeigt und von allgemeinen Suchergebnissen sowie Vorschlägen zum automatischen Ausfüllen ausgeschlossen."
   },
-  "itemSentToArchive": {
-    "message": "Eintrag an das Archiv gesendet"
+  "itemWasSentToArchive": {
+    "message": "Eintrag wurde ins Archiv verschoben"
   },
-  "itemRemovedFromArchive": {
-    "message": "Eintrag aus dem Archiv entfernt"
+  "itemUnarchived": {
+    "message": "Eintrag wird nicht mehr archiviert"
   },
   "archiveItem": {
     "message": "Eintrag archivieren"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archivierte Einträge sind von allgemeinen Suchergebnissen und Autofill Vorschlägen ausgeschlossen. Sind Sie sicher, dass Sie diesen Eintrag archivieren möchten?"
+    "message": "Archivierte Einträge werden von allgemeinen Suchergebnissen sowie Vorschlägen zum automatischen Ausfüllen ausgeschlossen. Bist du sicher, dass du diesen Eintrag archivieren möchtest?"
+  },
+  "upgradeToUseArchive": {
+    "message": "Für die Nutzung des Archivs ist eine Premium-Mitgliedschaft erforderlich."
   },
   "edit": {
     "message": "Bearbeiten"
@@ -583,8 +594,17 @@
   "view": {
     "message": "Anzeigen"
   },
+  "viewAll": {
+    "message": "Alles anzeigen"
+  },
+  "showAll": {
+    "message": "Alles anzeigen"
+  },
+  "viewLess": {
+    "message": "Weniger anzeigen"
+  },
   "viewLogin": {
-    "message": "Login ansehen"
+    "message": "Zugangsdaten anzeigen"
   },
   "noItemsInList": {
     "message": "Keine Einträge zum Anzeigen vorhanden."
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Ungültiges Master-Passwort"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ungültiges Master-Passwort. Überprüfe, ob deine E-Mail-Adresse korrekt ist und dein Konto auf $HOST$ erstellt wurde.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Tresor-Timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Wenn System gesperrt"
   },
+  "onIdle": {
+    "message": "Bei Systeminaktivität"
+  },
+  "onSleep": {
+    "message": "Im Standby"
+  },
   "onRestart": {
     "message": "Bei Browser-Neustart"
   },
@@ -920,7 +955,7 @@
     "message": "Folge den Schritten unten, um die Anmeldung abzuschließen."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Folge den Schritten unten, um die Anmeldung mit deinem Sicherheitsschlüssel abzuschließen."
+    "message": "Folge den untenstehenden Schritten, um die Anmeldung mit deinem Sicherheitsschlüssel abzuschließen."
   },
   "restartRegistration": {
     "message": "Registrierung neu starten"
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Eintrag gespeichert"
   },
+  "savedWebsite": {
+    "message": "Website gespeichert"
+  },
+  "savedWebsites": {
+    "message": "Gespeicherte Websites ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Soll dieser Eintrag wirklich in den Papierkorb verschoben werden?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Beim Start nach biometrischen Daten fragen"
   },
-  "premiumRequired": {
-    "message": "Premium-Mitgliedschaft benötigt"
-  },
-  "premiumRequiredDesc": {
-    "message": "Eine Premium-Mitgliedschaft ist für diese Funktion notwendig."
-  },
   "authenticationTimeout": {
     "message": "Authentifizierungs-Timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Sicherheitsschlüssel auslesen"
   },
+  "readingPasskeyLoading": {
+    "message": "Passkey wird gelesen..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey-Authentifizierung fehlgeschlagen"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Eine andere Anmeldemethode verwenden"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Warte auf Sicherheitsschlüssel-Interaktion..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Du musst entweder die Basis-Server-URL oder mindestens eine benutzerdefinierte Umgebung hinzufügen."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs müssen HTTPS verwenden."
+  },
   "customEnvironment": {
     "message": "Benutzerdefinierte Umgebung"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Auto-Ausfüllen deaktivieren"
   },
+  "confirmAutofill": {
+    "message": "Auto-Ausfüllen bestätigen"
+  },
+  "confirmAutofillDesc": {
+    "message": "Diese Website stimmt nicht mit deinen gespeicherten Zugangsdaten überein. Bevor du deine Zugangsdaten eingibst, stelle sicher, dass es sich um eine vertrauenswürdige Website handelt."
+  },
   "showInlineMenuLabel": {
     "message": "Vorschläge zum Auto-Ausfüllen in Formularfeldern anzeigen"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Wie schützt Bitwarden deine Daten vor Phishing?"
+  },
+  "currentWebsite": {
+    "message": "Aktuelle Website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Auto-Ausfüllen und diese Website hinzufügen"
+  },
+  "autofillWithoutAdding": {
+    "message": "Auto-Ausfüllen ohne Hinzufügen"
+  },
+  "doNotAutofill": {
+    "message": "Nicht automatisch ausfüllen"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Identitäten als Vorschläge anzeigen"
   },
@@ -1782,7 +1856,7 @@
     "message": "Dieses Pop-up Fenster wird geschlossen, wenn du außerhalb des Fensters klickst um in deinen E-Mails nach dem Verifizierungscode zu suchen. Möchtest du, dass dieses Pop-up in einem separaten Fenster geöffnet wird, damit es nicht geschlossen wird?"
   },
   "showIconsChangePasswordUrls": {
-    "message": "Website Symbole anzeigen und URLs zum Ändern von Passwörtern abrufen"
+    "message": "Website-Symbole anzeigen und URLs zum Ändern von Passwörtern ermitteln"
   },
   "cardholderName": {
     "message": "Name des Karteninhabers"
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Ablaufjahr"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Gültig bis"
   },
@@ -1967,11 +2044,11 @@
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "Neuen Text senden",
+    "message": "Neues Text-Send",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "Neue Datei senden",
+    "message": "Neues Datei-Send",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
@@ -1995,11 +2072,11 @@
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Textversand bearbeiten",
+    "message": "Text-Send bearbeiten",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Dateiversand bearbeiten",
+    "message": "Datei-Send bearbeiten",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
@@ -2227,7 +2304,7 @@
     "message": "Gebe deinen PIN-Code für das Entsperren von Bitwarden ein. Deine PIN-Einstellungen werden zurückgesetzt, wenn du dich vollständig von der Anwendung abmeldest."
   },
   "setPinCode": {
-    "message": "Du kannst diese PIN verwenden, um Bitwarden zu entsperren. Deine PIN wird zurückgesetzt, wenn du dich vollständig aus der Anwendung abmeldest."
+    "message": "Du kannst diese PIN verwenden, um Bitwarden zu entsperren. Deine PIN wird zurückgesetzt, wenn du dich einmal vollständig aus der Anwendung abmeldest."
   },
   "pinRequired": {
     "message": "PIN-Code ist erforderlich."
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Diese Seite beeinträchtigt die Nutzung von Bitwarden. Das Bitwarden Inline-Menü wurde aus Sicherheitsgründen vorübergehend deaktiviert."
+  },
   "setMasterPassword": {
     "message": "Master-Passwort festlegen"
   },
@@ -2645,7 +2725,7 @@
     }
   },
   "atRiskChangePrompt": {
-    "message": "Dein Passwort für diese Website ist gefährdet. $ORGANIZATION$ hat darum gebeten, dass du es änderst.",
+    "message": "Dein Passwort für diese Website ist gefährdet. $ORGANIZATION$ hat dich aufgefordert, es zu ändern.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2655,7 +2735,7 @@
     "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
   },
   "atRiskNavigatePrompt": {
-    "message": "$ORGANIZATION$ möchte, dass du dieses Passwort änderst, da es gefährdet ist. Wechsel zu deinen Kontoeinstellungen, um das Passwort zu ändern.",
+    "message": "$ORGANIZATION$ möchte, dass du dieses Passwort änderst, da es gefährdet ist. Gehe zu deinen Kontoeinstellungen, um das Passwort zu ändern.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Nur der mit $ORGANIZATION$ verknüpfte Organisations-Tresor wird exportiert.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Nur der mit $ORGANIZATION$ verknüpfte Organisations-Tresor wird exportiert. Meine Eintrags-Sammlungen werden nicht eingeschlossen.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Fehler"
   },
   "decryptionError": {
     "message": "Entschlüsselungsfehler"
   },
+  "errorGettingAutoFillData": {
+    "message": "Fehler beim Abrufen der Auto-Ausfüllen-Daten"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden konnte folgende(n) Tresor-Eintrag/Einträge nicht entschlüsseln."
   },
@@ -3752,7 +3853,7 @@
     "message": "Anmeldung kann nicht abgeschlossen werden"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
-    "message": "Du musst dich auf einem vertrauenswürdigen Gerät anmelden oder deinem Administrator bitten, dir ein Passwort zuzuweisen."
+    "message": "Du musst dich auf einem vertrauenswürdigen Gerät anmelden oder deinen Administrator bitten, dir ein Passwort zuzuweisen."
   },
   "ssoIdentifierRequired": {
     "message": "SSO-Kennung der Organisation erforderlich."
@@ -3834,7 +3935,7 @@
     "message": "Fahre zur Sicherheit deines Kontos nur fort, wenn du ein Mitglied dieser Organisation bist, die Kontowiederherstellung aktiviert hast und der unten angezeigte Fingerabdruck mit dem Fingerabdruck der Organisation übereinstimmt."
   },
   "orgTrustWarning1": {
-    "message": "Diese Organisation hat eine Unternehmensrichtlinie, die dich für die Kontowiederherstellung registriert. Die Registrierung wird es den Administratoren der Organisation erlauben, dein Passwort zu ändern. Fahre nur fort, wenn du diese Organisation kennst und die unten angezeigte Fingerabdruck-Phrase mit der der Organisation übereinstimmt."
+    "message": "Diese Organisation hat eine Enterprise-Richtlinie, die dich für die Kontowiederherstellung registriert. Die Registrierung ermöglicht es den Organisations-Administratoren, dein Passwort zu ändern. Fahre nur fort, wenn du diese Organisation erkennst und die unten angezeigte Fingerabdruck-Phrase mit dem Fingerabdruck der Organisation übereinstimmt."
   },
   "trustUser": {
     "message": "Benutzer vertrauen"
@@ -3970,6 +4071,15 @@
     "message": "Auto-Ausfüllen beim Laden einer Seite wurde auf die Standardeinstellung gesetzt.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Kein Auto-Ausfüllen möglich"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Die Standard-Übereinstimmungserkennung steht auf \"Exakte Übereinstimmung\". Die aktuelle Website stimmt nicht genau mit den gespeicherten Zugangsdaten für diesen Eintrag überein."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Seitennavigation umschalten"
   },
@@ -4179,10 +4289,10 @@
     "message": "Sammlung auswählen"
   },
   "importTargetHintCollection": {
-    "message": "Wählen Sie diese Option, wenn der importierte Dateiinhalt in eine Sammlung verschoben werden soll"
+    "message": "Wähle diese Option, wenn der importierte Dateiinhalt in eine Sammlung verschoben werden soll"
   },
   "importTargetHintFolder": {
-    "message": "Wählen Sie diese Option, wenn der importierte Dateiinhalt in einen Ordner verschoben werden soll"
+    "message": "Wähle diese Option, wenn der importierte Dateiinhalt in einen Ordner verschoben werden soll"
   },
   "importUnassignedItemsError": {
     "message": "Die Datei enthält nicht zugewiesene Einträge."
@@ -4419,7 +4529,7 @@
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "Die URI-Übereinstimmungserkennung ist die Methode, mit der Bitwarden Auto-Ausfüllen-Vorschläge erkennt.",
+    "message": "Die URI-Übereinstimmungserkennung ist die Methode, mit der Bitwarden Vorschläge zum automatischen Ausfüllen identifiziert.",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Schalte mit Premium Berichte, Notfallzugriff und weitere Sicherheitsfunktionen frei."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Kostenlose Organisationen können Anhänge nicht verwenden"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Standard ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Übereinstimmungs-Erkennung anzeigen $WEBSITE$",
     "placeholders": {
@@ -5485,10 +5608,10 @@
     "message": "Gefährdetes Passwort ändern"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "Dieser Login ist gefährdet und es fehlt eine Website. Fügen Sie eine Website hinzu und ändern Sie das Passwort, um die Sicherheit zu erhöhen."
+    "message": "Diese Zugangsdaten sind gefährdet und es fehlt eine Website. Füge eine Website hinzu und ändere das Passwort für mehr Sicherheit."
   },
   "missingWebsite": {
-    "message": "Fehlende Webseite"
+    "message": "Fehlende Website"
   },
   "settingsVaultOptions": {
     "message": "Tresoroptionen"
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Willkommen in deinem Tresor!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing Webseite"
+  "phishingPageTitleV2": {
+    "message": "Phishing-Versuch erkannt"
   },
-  "phishingPageCloseTab": {
-    "message": "Tab schließen"
+  "phishingPageSummary": {
+    "message": "Die Website, die du versuchst zu öffnen, ist eine bekannte böswillige Website und ein Sicherheitsrisiko."
   },
-  "phishingPageContinue": {
-    "message": "Weiter"
+  "phishingPageCloseTabV2": {
+    "message": "Diesen Tab schließen"
   },
-  "phishingPageLearnWhy": {
-    "message": "Warum sehen Sie das?"
+  "phishingPageContinueV2": {
+    "message": "Weiter zu dieser Seite (nicht empfohlen)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Diese Seite wurde in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": " gefunden, einer Open-Source-Liste bekannter Phishing-Seiten, die zum Diebstahl persönlicher und vertraulicher Informationen verwendet werden.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Erfahre mehr über die Phishing-Erkennung"
+  },
+  "protectedBy": {
+    "message": "Geschützt durch $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Einträge für die aktuelle Seite automatisch ausfüllen"
@@ -5557,7 +5700,7 @@
     "message": "Favoriten-Einträge für einfachen Zugriff"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Deinen Tresor nach etwas anderem durchsuchen"
+    "message": "Durchsuche deinen Tresor nach etwas anderem"
   },
   "newLoginNudgeTitle": {
     "message": "Spare Zeit mit Auto-Ausfüllen"
@@ -5590,16 +5733,16 @@
     "message": "Mit Identitäten kannst du lange Registrierungs- oder Kontaktformulare schnell automatisch ausfüllen."
   },
   "newNoteNudgeTitle": {
-    "message": "Bewahre deine sensiblen Daten sicher auf"
+    "message": "Halte deine sensiblen Daten sicher"
   },
   "newNoteNudgeBody": {
-    "message": "Mit Notizen speicherst du sensible Daten wie Bank- oder Versicherungs-Informationen."
+    "message": "Mit Notizen kannst du sensible Daten wie Bank- oder Versicherungsinformationen sicher speichern."
   },
   "newSshNudgeTitle": {
     "message": "Entwickler-freundlicher SSH-Zugriff"
   },
   "newSshNudgeBodyOne": {
-    "message": "Speicher deine Schlüssel und verbinden dich mit dem SSH-Agenten für eine schnelle und verschlüsselte Authentifizierung.",
+    "message": "Speichere deine Schlüssel und verbinde dich mit dem SSH-Agenten für eine schnelle, verschlüsselte Authentifizierung.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
@@ -5629,10 +5772,10 @@
     "message": "Über diese Einstellung"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden wird gespeicherte Login-URIs verwenden, um zu ermitteln, welches Symbol oder welche URL zum Ändern des Passworts verwendet werden soll, um Ihr Erlebnis zu verbessern. Bei der Nutzung dieses Dienstes werden keine Informationen erfasst oder gespeichert."
+    "message": "Bitwarden verwendet gespeicherte Zugangsdaten-URIs, um zu erkennen, welches Symbol oder welche Passwort-Ändern-URL verwendet werden soll, um dein Erlebnis zu verbessern. Es werden keine Informationen erfasst oder gespeichert, wenn du diesen Dienst nutzt."
   },
   "noPermissionsViewPage": {
-    "message": "Du hast keine Berechtigung, diese Seite anzuzeigen. Versuche dich mit einem anderen Konto anzumelden."
+    "message": "Du hast keine Berechtigung, diese Seite anzuzeigen. Versuche, dich mit einem anderen Konto anzumelden."
   },
   "wasmNotSupported": {
     "message": "WebAssembly wird von deinem Browser nicht unterstützt oder ist nicht aktiviert. WebAssembly wird benötigt, um die Bitwarden-App nutzen zu können.",
@@ -5648,10 +5791,65 @@
     "message": "Weiter"
   },
   "moreBreadcrumbs": {
-    "message": "Mehr Breadcrumbs",
+    "message": "Dateipfad erweitern",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "confirmKeyConnectorDomain": {
-    "message": "Bestätige Key Connector Domäne"
+    "message": "Key Connector-Domain bestätigen"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Gute Arbeit! Du hast deine gefährdeten Zugangsdaten geschützt!"
+  },
+  "upgradeNow": {
+    "message": "Jetzt upgraden"
+  },
+  "builtInAuthenticator": {
+    "message": "Integrierter Authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Sicherer Dateispeicher"
+  },
+  "emergencyAccess": {
+    "message": "Notfallzugriff"
+  },
+  "breachMonitoring": {
+    "message": "Datendiebstahl-Überwachung"
+  },
+  "andMoreFeatures": {
+    "message": "Und mehr!"
+  },
+  "planDescPremium": {
+    "message": "Umfassende Online-Sicherheit"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade auf Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Erweiterte Sicherheitsfunktionen freischalten"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Mit einem Premium-Abonnement erhältst du mehr Werkzeuge für mehr Sicherheit und Kontrolle"
+  },
+  "explorePremium": {
+    "message": "Premium entdecken"
+  },
+  "loadingVault": {
+    "message": "Tresor wird geladen"
+  },
+  "vaultLoaded": {
+    "message": "Tresor geladen"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Diese Einstellung ist durch die Richtlinien deiner Organisation deaktiviert.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "PLZ / Postleitzahl"
+  },
+  "cardNumberLabel": {
+    "message": "Kartennummer"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout-Aktion"
   }
 }
diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json
index cce3e0ea39f..476a6165a8e 100644
--- a/apps/browser/src/_locales/el/messages.json
+++ b/apps/browser/src/_locales/el/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Χρήση ενιαίας σύνδεσης"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Καλώς ήρθατε"
   },
@@ -550,14 +553,19 @@
   "resetSearch": {
     "message": "Επαναφορά αναζήτησης"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Αρχειοθήκη",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Αρχειοθέτηση",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Στοιχεία στην αρχειοθήκη"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,14 +585,26 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Επεξεργασία"
   },
   "view": {
     "message": "Προβολή"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
-    "message": "View login"
+    "message": "Προβολή σύνδεσης"
   },
   "noItemsInList": {
     "message": "Δεν υπάρχουν στοιχεία στη λίστα."
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Μη έγκυρος κύριος κωδικός πρόσβασης"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Χρόνος Λήξης Vault"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Κατά το Κλείδωμα Συστήματος"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Κατά την Επανεκκίνηση του Browser"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Το αντικείμενο αποθηκεύτηκε"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το στοιχείο;"
   },
@@ -1199,7 +1246,7 @@
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
-    "message": "Error saving",
+    "message": "Σφάλμα αποθήκευσης",
     "description": "Error message shown when the system fails to save login details."
   },
   "saveFailureDetails": {
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ζητήστε βιομετρικά κατά την εκκίνηση"
   },
-  "premiumRequired": {
-    "message": "Απαιτείται το Premium"
-  },
-  "premiumRequiredDesc": {
-    "message": "Για να χρησιμοποιήσετε αυτή τη λειτουργία, απαιτείται συνδρομή Premium."
-  },
   "authenticationTimeout": {
     "message": "Χρονικό όριο επαλήθευσης"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Ανάγνωση κλειδιού πρόσβασης..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Πρέπει να προσθέσετε είτε το βασικό URL του διακομιστή ή τουλάχιστον ένα προσαρμοσμένο περιβάλλον."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Προσαρμοσμένο περιβάλλον"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Απενεργοποίηση αυτόματης συμπλήρωσης"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Εμφάνιση μενού αυτόματης συμπλήρωσης στα πεδία της φόρμας"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Εμφάνιση ταυτοτήτων ως προτάσεις"
   },
@@ -1756,7 +1830,7 @@
     "message": "Σύρετε για ταξινόμηση"
   },
   "dragToReorder": {
-    "message": "Drag to reorder"
+    "message": "Σύρετε για αναδιάταξη"
   },
   "cfTypeText": {
     "message": "Κείμενο"
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Έτος λήξης"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Λήξη"
   },
@@ -1842,7 +1919,7 @@
     "message": "Κωδικός ασφαλείας"
   },
   "cardNumber": {
-    "message": "card number"
+    "message": "αριθμός κάρτας"
   },
   "ex": {
     "message": "πχ."
@@ -1944,82 +2021,82 @@
     "message": "Κλειδί SSH"
   },
   "typeNote": {
-    "message": "Note"
+    "message": "Σημείωση"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "Νέα σύνδεση",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "Νέα κάρτα",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "Νέα ταυτότητα",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "Νέα σημείωση",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "Νέο κλειδί SSH",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Νέο Send κειμένου",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Νέο Send αρχείου",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "Επεξεργασία σύνδεσης",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "Επεξεργασία κάρτας",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "Επεξεργασία ταυτότητας",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "Επεξεργασία σημείωσης",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "Επεξεργασία κλειδιού SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Επεξεργασία Send κειμένου",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Επεξεργασία Send αρχείου",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Προβολή σύνδεσης",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Προβολή κάρτας",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "Προβολή ταυτότητας",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "Προβολή σημείωσης",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "Προβολή κλειδιού SSH",
     "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Ορισμός κύριου κωδικού πρόσβασης"
   },
@@ -2571,7 +2651,7 @@
     "message": "Αποκλεισμένοι τομείς"
   },
   "learnMoreAboutBlockedDomains": {
-    "message": "Learn more about blocked domains"
+    "message": "Μάθετε περισσότερα για τους αποκλεισμένους τομείς"
   },
   "excludedDomains": {
     "message": "Εξαιρούμενοι Τομείς"
@@ -2595,7 +2675,7 @@
     "message": "Αλλαγή"
   },
   "changePassword": {
-    "message": "Change password",
+    "message": "Αλλαγή κωδικού πρόσβασής",
     "description": "Change password button for browser at risk notification on login."
   },
   "changeButtonTitle": {
@@ -2608,7 +2688,7 @@
     }
   },
   "atRiskPassword": {
-    "message": "At-risk password"
+    "message": "Κωδικός πρόσβασης σε κίνδυνο"
   },
   "atRiskPasswords": {
     "message": "Κωδικοί πρόσβασης σε κίνδυνο"
@@ -2703,7 +2783,7 @@
     "message": "Illustration of the Bitwarden autofill menu displaying a generated password."
   },
   "updateInBitwarden": {
-    "message": "Update in Bitwarden"
+    "message": "Ενημέρωση στο Bitwarden"
   },
   "updateInBitwardenSlideDesc": {
     "message": "Bitwarden will then prompt you to update the password in the password manager.",
@@ -3134,7 +3214,7 @@
     "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Όνομα οργανισμού"
   },
   "keyConnectorDomain": {
     "message": "Key Connector domain"
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Σφάλμα"
   },
   "decryptionError": {
     "message": "Σφάλμα αποκρυπτογράφησης"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Το Bitwarden δεν μπόρεσε να αποκρυπτογραφήσει τα αντικείμενα θησαυ/κίου που αναφέρονται παρακάτω."
   },
@@ -3541,10 +3642,10 @@
     "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
   },
   "device": {
-    "message": "Device"
+    "message": "Συσκευή"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "Κατάσταση σύνδεσης"
   },
   "masterPasswordChanged": {
     "message": "Master password saved"
@@ -3640,17 +3741,17 @@
     "message": "Απομνημόνευση αυτής της συσκευής για την αυτόματες συνδέσεις στο μέλλον"
   },
   "manageDevices": {
-    "message": "Manage devices"
+    "message": "Διαχείριση συσκευών"
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "Τρέχουσα συνεδρία"
   },
   "mobile": {
     "message": "Mobile",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "Επέκταση",
     "description": "Browser extension/addon"
   },
   "desktop": {
@@ -3674,7 +3775,7 @@
     "message": "Request pending"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "Πρώτη σύνδεση"
   },
   "trusted": {
     "message": "Trusted"
@@ -3683,10 +3784,10 @@
     "message": "Needs approval"
   },
   "devices": {
-    "message": "Devices"
+    "message": "Συσκευές"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Απόπειρα πρόσβασης από το $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3695,31 +3796,31 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Επιβεβαίωση πρόσβασης"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Άρνηση πρόσβασης"
   },
   "time": {
-    "message": "Time"
+    "message": "Ώρα"
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "Τύπος συσκευής"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "Αίτημα σύνδεσης"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "Αυτό το αίτημα δεν είναι πλέον έγκυρο."
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "Login request has already expired."
+    "message": "Το αίτημα σύνδεσης έχει ήδη λήξει."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "Μόλις τώρα"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "Ζητήθηκε πριν από $MINUTES$ λεπτά",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -3970,6 +4071,15 @@
     "message": "Η αυτόματη συμπλήρωση κατά τη φόρτωση της σελίδας ορίστηκε να χρησιμοποιεί τις προεπιλεγμένες ρυθμίσεις.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Εναλλαγή πλευρικής πλοήγησης"
   },
@@ -4435,7 +4545,7 @@
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
-    "message": "Advanced options",
+    "message": "Σύνθετες επιλογές",
     "description": "Advanced option placeholder for uri option component"
   },
   "confirmContinueToBrowserSettingsTitle": {
@@ -4790,10 +4900,10 @@
     "message": "Download from bitwarden.com now"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "Αποκτήστε το στο Google Play"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "Λήψη στο AppStore"
   },
   "permanentlyDeleteAttachmentConfirmation": {
     "message": "Είστε σίγουροι ότι θέλετε να διαγράψετε οριστικά αυτό το συνημμένο;"
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Οι δωρεάν οργανισμοί δεν μπορούν να χρησιμοποιήσουν συνημμένα"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Εμφάνιση ανιχνεύσεων αντιστοίχισης $WEBSITE$",
     "placeholders": {
@@ -5497,7 +5620,7 @@
     "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Καλώς ορίσατε στο Bitwarden"
   },
   "securityPrioritized": {
     "message": "Security, prioritized"
@@ -5506,13 +5629,13 @@
     "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
   },
   "quickLogin": {
-    "message": "Quick and easy login"
+    "message": "Εύκολη και γρήγορη σύνδεση"
   },
   "quickLoginBody": {
     "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
   },
   "secureUser": {
-    "message": "Level up your logins"
+    "message": "Αναβαθμίστε τις συνδέσεις σας"
   },
   "secureUserBody": {
     "message": "Use the generator to create and save strong, unique passwords for all your accounts."
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Μάθετε περισσότερα για την ανίχνευση ηλεκτρονικού «ψαρέματος»"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5560,7 +5703,7 @@
     "message": "Search your vault for something else"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Εξοικονομήστε χρόνο με την αυτόματη συμπλήρωση"
   },
   "newLoginNudgeBodyOne": {
     "message": "Include a",
@@ -5639,13 +5782,13 @@
     "description": "'WebAssembly' is a technical term and should not be translated."
   },
   "showMore": {
-    "message": "Show more"
+    "message": "Εμφάνιση περισσότερων"
   },
   "showLess": {
-    "message": "Show less"
+    "message": "Εμφάνιση λιγότερων"
   },
   "next": {
-    "message": "Next"
+    "message": "Επόμενο"
   },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 72c3892af62..21149499485 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4418,7 +4528,7 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
-   "uriMatchDefaultStrategyHint": {
+  "uriMatchDefaultStrategyHint": {
     "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle":{
-    "message": "Phishing website"
+  "phishingPageTitleV2":{
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore" : {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json
index 43bb17c297f..103d45f0685 100644
--- a/apps/browser/src/_locales/en_GB/messages.json
+++ b/apps/browser/src/_locales/en_GB/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organisation requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the bin?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Auto-fill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organisations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organisation's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/en_IN/messages.json b/apps/browser/src/_locales/en_IN/messages.json
index 59c4966a48c..2713381986c 100644
--- a/apps/browser/src/_locales/en_IN/messages.json
+++ b/apps/browser/src/_locales/en_IN/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organisation requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Edited item"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Are you sure you want to delete this item?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Auto-fill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organisations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organisation's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "PIN"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/es/messages.json b/apps/browser/src/_locales/es/messages.json
index d3c6e3556a0..e19bd11ba28 100644
--- a/apps/browser/src/_locales/es/messages.json
+++ b/apps/browser/src/_locales/es/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Usar inicio de sesión único"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Bienvenido de nuevo"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Restablecer búsqueda"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Editar"
   },
   "view": {
     "message": "Ver"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Contraseña maestra no válida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Tiempo de espera de la caja fuerte"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Al bloquear el sistema"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Al reiniciar el navegador"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Elemento editado"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "¿Seguro que quieres enviarlo a la papelera?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Pedir datos biométricos al ejecutar"
   },
-  "premiumRequired": {
-    "message": "Premium requerido"
-  },
-  "premiumRequiredDesc": {
-    "message": "Una membrasía Premium es requerida para utilizar esta característica."
-  },
   "authenticationTimeout": {
     "message": "Tiempo de autenticación agotado"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Leer clave de seguridad"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Esperando interacción de la clave de seguridad..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Debes añadir la dirección URL del servidor base o al menos un entorno personalizado."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Entorno personalizado"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Desactivar autocompletado"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Mostrar sugerencias de autocompletado en campos de formulario"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Mostrar identidades como sugerencias"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Año de expiración"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiración"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Establecer contraseña maestra"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Error de descifrado"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden no pudo descifrar el/los elemento(s) de la bóveda listados a continuación."
   },
@@ -3970,6 +4071,15 @@
     "message": "El autorrellenado de la página está usando la configuración predeterminada.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Activar/desactivar navegación lateral"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Las organizaciones gratis no pueden usar archivos adjuntos"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "¡Bienvenido a tu caja fuerte!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/et/messages.json b/apps/browser/src/_locales/et/messages.json
index 5508a1cee72..7a9737f71ff 100644
--- a/apps/browser/src/_locales/et/messages.json
+++ b/apps/browser/src/_locales/et/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Tere tulemast tagasi"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Muuda"
   },
   "view": {
     "message": "Vaata"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Vale ülemparool"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Hoidla ajalõpp"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Arvutist väljalogimisel"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Brauseri taaskäivitamisel"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Kirje on muudetud"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Soovid tõesti selle kirje kustutada?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Küsi avamisel biomeetriat"
   },
-  "premiumRequired": {
-    "message": "Vajalik on Premium versioon"
-  },
-  "premiumRequiredDesc": {
-    "message": "Selle funktsiooni kasutamiseks on vajalik tasulist kontot omada."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Kohandatud keskkond"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Aegumise aasta"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Aegumine"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Määra ülemparool"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Viga"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Tere tulemast sinu hoidlasse!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/eu/messages.json b/apps/browser/src/_locales/eu/messages.json
index 93242263dc0..b61213da989 100644
--- a/apps/browser/src/_locales/eu/messages.json
+++ b/apps/browser/src/_locales/eu/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Ongi etorri berriro ere"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Editatu"
   },
   "view": {
     "message": "Erakutsi"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Pasahitz nagusi baliogabea"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Kutxa gotorraren itxaronaldia"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Sistema blokeatzean"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Nabigatzailea berrabiaraztean"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Elementua editatuta"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Ziur zaude elementu hau zakarrontzira bidali nahi duzula?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Biometria eskatu saioa hastean"
   },
-  "premiumRequired": {
-    "message": "Premium izatea beharrezkoa da"
-  },
-  "premiumRequiredDesc": {
-    "message": "Premium bazkidetza beharrezkoa da ezaugarri hau erabiltzeko."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Ingurune pertsonalizatua"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Iraungitze urtea"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Iraungitze data"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Ezarri pasahitz nagusia"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Akatsa"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/fa/messages.json b/apps/browser/src/_locales/fa/messages.json
index 129f2ee383a..550de006cf6 100644
--- a/apps/browser/src/_locales/fa/messages.json
+++ b/apps/browser/src/_locales/fa/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "استفاده از ورود تک مرحله‌ای"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "خوش آمدید"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "ویرایش"
   },
   "view": {
     "message": "مشاهده"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "کلمه عبور اصلی نامعتبر است"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "متوقف شدن گاو‌صندوق"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "هنگام قفل سیستم"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "هنگام راه‌اندازی مجدد"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "مورد ذخیره شد"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "واقعاً می‌خواهید این مورد را به سطل زباله ارسال کنید؟"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "درخواست بیومتریک هنگام راه‌اندازی"
   },
-  "premiumRequired": {
-    "message": "در نسخه پرمیوم کار می‌کند"
-  },
-  "premiumRequiredDesc": {
-    "message": "برای استفاده از این ویژگی عضویت پرمیوم لازم است."
-  },
   "authenticationTimeout": {
     "message": "پایان زمان احراز هویت"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "خواندن کلید امنیتی"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "در انتظار تعامل با کلید امنیتی..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "شما باید یا نشانی اینترنتی پایه سرور را اضافه کنید، یا حداقل یک محیط سفارشی تعریف کنید."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "محیط سفارشی"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "پر کردن خودکار را خاموش کنید"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "نمایش پیشنهادهای پر کردن خودکار روی فیلدهای فرم"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "نمایش هویت‌ها به‌عنوان پیشنهاد"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "سال انقضاء"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "انقضاء"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "تنظیم کلمه عبور اصلی"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "خطا"
   },
   "decryptionError": {
     "message": "خطای رمزگشایی"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden نتوانست مورد(های) گاوصندوق فهرست شده زیر را رمزگشایی کند."
   },
@@ -3970,6 +4071,15 @@
     "message": "پر کردن خودکار در بارگیری صفحه برای استفاده از تنظیمات پیش‌فرض تنظیم شده است.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "تغییر وضعیت ناوبری کناری"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "پرمیوم"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "سازمان‌های رایگان نمی‌توانند از پرونده‌های پیوست استفاده کنند"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "نمایش شناسایی تطابق برای $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "به گاوصندوق خود خوش آمدید!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "پر کردن خودکار موارد برای صفحه فعلی"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json
index 5de1d9fe7e4..bdf2ebd641c 100644
--- a/apps/browser/src/_locales/fi/messages.json
+++ b/apps/browser/src/_locales/fi/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Käytä kertakirjautumista"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Tervetuloa takaisin"
   },
@@ -550,39 +553,56 @@
   "resetSearch": {
     "message": "Nollaa haku"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Arkistoi",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "Arkistoi",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Poista arkistosta"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Arkistossa olevat kohteet"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Arkistossa ei ole kohteita"
   },
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Arkistoi kohde"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Muokkaa"
   },
   "view": {
     "message": "Näytä"
   },
+  "viewAll": {
+    "message": "Näytä kaikki"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Virheellinen pääsalasana"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Holvin aikakatkaisu"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Kun järjestelmä lukitaan"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Kun selain käynnistetään uudelleen"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Kohde tallennettiin"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Haluatko varmasti siirtää roskakoriin?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Pyydä Biometristä todennusta käynnistettäessä"
   },
-  "premiumRequired": {
-    "message": "Premium vaaditaan"
-  },
-  "premiumRequiredDesc": {
-    "message": "Tämä ominaisuus edellyttää Premium-jäsenyyttä."
-  },
   "authenticationTimeout": {
     "message": "Todennuksen aikakatkaisu"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Lue suojausavain"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Odotetaan suojausavaimen aktivointia..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Sinun on lisättävä joko palvelimen perusosoite tai ainakin yksi mukautettu palvelinympäristö."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Mukautettu palvelinympäristö"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Poista automaattitäyttö käytöstä"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Näytä automaattitäytön ehdotukset lomakekentissä"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Näytä identiteetit ehdotuksina"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Erääntymisvuosi"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Voimassaolo päättyy"
   },
@@ -1947,11 +2024,11 @@
     "message": "Muistiinpano"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "Uusi kirjautumistieto",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "Uusi kortti",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
@@ -1963,23 +2040,23 @@
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "Uusi SSH-avain",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Uusi teksti-Send",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Uusi tiedosto-Send",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "Muokkaa kirjautumistietoa",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "Muokkaa korttia",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
@@ -1991,23 +2068,23 @@
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "Muokkaa SSH avainta",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Muokkaa teksti-Sendiä",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Muokkaa tiedosto-Sendiä",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Näytä kirjautumistieto",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Näytä kortti",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
@@ -2019,7 +2096,7 @@
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "Näytä SSH-avain",
     "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Aseta pääsalasana"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Virhe"
   },
   "decryptionError": {
     "message": "Salauksen purkuvirhe"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden ei pystynyt purkamaan alla lueteltuja holvin kohteita."
   },
@@ -3970,6 +4071,15 @@
     "message": "Automaattitäyttö sivun avautuessa käyttää oletusasetusta.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Näytä/piilota sivuvalikko"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Ilmaiset organisaatiot eivät voi käyttää liitteitä"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Oletus  ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Näytä vastaavuuden tunnistus $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Tervetuloa holviisi!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Jatka tälle sivustolle (ei suositeltavaa)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Täytä nykyisen sivun kohteet automaattisesti"
@@ -5645,7 +5788,7 @@
     "message": "Show less"
   },
   "next": {
-    "message": "Next"
+    "message": "Seuraava"
   },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Ladataan holvia"
+  },
+  "vaultLoaded": {
+    "message": "Holvi ladattu"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postinumero"
+  },
+  "cardNumberLabel": {
+    "message": "Kortin numero"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/fil/messages.json b/apps/browser/src/_locales/fil/messages.json
index 600abfb2d4e..31284265b2e 100644
--- a/apps/browser/src/_locales/fil/messages.json
+++ b/apps/browser/src/_locales/fil/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "I-edit"
   },
   "view": {
     "message": "Tanaw"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Hindi wasto ang master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Sa pag-lock ng sistema"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Sa pag-restart ng browser"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Ang item ay nai-save"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Gusto mo bang talagang ipadala sa basura?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Mangyaring humingi ng mga biometrika sa paglunsad"
   },
-  "premiumRequired": {
-    "message": "Premium na kinakailangan"
-  },
-  "premiumRequiredDesc": {
-    "message": "Ang Premium na membership ay kinakailangan upang gamitin ang tampok na ito."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Kapaligirang Custom"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Taon ng Pag-expire"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Pag-expire"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Itakda ang master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Mali"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json
index 765ebff53c5..dadcd0c041e 100644
--- a/apps/browser/src/_locales/fr/messages.json
+++ b/apps/browser/src/_locales/fr/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Logo de Bitwarden"
+    "message": "Logo Bitwarden"
   },
   "extName": {
     "message": "Gestionnaire de mots de passe Bitwarden",
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Utiliser l'authentification unique"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Votre organisation exige l’authentification unique."
+  },
   "welcomeBack": {
     "message": "Content de vous revoir"
   },
@@ -246,7 +249,7 @@
     "message": "Connectez-vous à votre coffre"
   },
   "autoFillInfo": {
-    "message": "Il n'y a aucun identifiant disponible pour la saisie automatique concernant l'onglet actuel du navigateur."
+    "message": "Il n'y a pas d'identifiants disponibles pour la saisie automatique pour l'onglet actuel du navigateur."
   },
   "addLogin": {
     "message": "Ajouter un identifiant"
@@ -550,32 +553,40 @@
   "resetSearch": {
     "message": "Réinitialiser la recherche"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "Archiver",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Désarchiver"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Éléments dans l'archive"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Aucun élément dans l'archive"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Les éléments archivés apparaîtront ici et seront exclus des résultats de recherche généraux et des suggestions de remplissage automatique."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "L'élément a été envoyé à l'archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "L'élément a été désarchivé"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Archiver l'élément"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Les éléments archivés sont exclus des résultats de recherche généraux et des suggestions de remplissage automatique. Êtes-vous sûr de vouloir archiver cet élément ?"
+  },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
   },
   "edit": {
     "message": "Modifier"
@@ -583,8 +594,17 @@
   "view": {
     "message": "Afficher"
   },
+  "viewAll": {
+    "message": "Tout afficher"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "Afficher moins"
+  },
   "viewLogin": {
-    "message": "View login"
+    "message": "Afficher l'Identifiant"
   },
   "noItemsInList": {
     "message": "Aucun identifiant à afficher."
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Mot de passe principal invalide"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Mot de passe principal invalide. Confirmez que votre adresse courriel est correcte et que votre compte a été créé sur $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Délai d'expiration du coffre"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Au verrouillage"
   },
+  "onIdle": {
+    "message": "À l'inactivité du système"
+  },
+  "onSleep": {
+    "message": "À la mise en veille du système"
+  },
   "onRestart": {
     "message": "Au redémarrage du navigateur"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Élément enregistré"
   },
+  "savedWebsite": {
+    "message": "Site Web enregistré"
+  },
+  "savedWebsites": {
+    "message": "Sites Web enregistrés ( $COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Êtes-vous sûr de vouloir supprimer cet identifiant ?"
   },
@@ -1486,17 +1533,11 @@
     "message": "Copier le TOTP automatiquement"
   },
   "disableAutoTotpCopyDesc": {
-    "message": "Si un identifiant possède une clé d'authentification, copie le code de vérification TOTP dans votre presse-papiers lorsque vous saisissez automatiquement l'identifiant."
+    "message": "Copie le code de vérification TOTP dans votre presse-papiers lorsque vous saisissez automatiquement l'identifiant, si un identifiant possède une clé d'authentification.\n\nSi un identifiant dispose d'une clé d'authentification, copie le code de vérification TOTP dans votre presse-papiers lorsque vous saisissez automatiquement l'identifiant."
   },
   "enableAutoBiometricsPrompt": {
     "message": "Demander la biométrie au lancement"
   },
-  "premiumRequired": {
-    "message": "Premium requis"
-  },
-  "premiumRequiredDesc": {
-    "message": "Une adhésion Premium est requise pour utiliser cette fonctionnalité."
-  },
   "authenticationTimeout": {
     "message": "Délai d'authentification dépassé"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Lire la clé de sécurité"
   },
+  "readingPasskeyLoading": {
+    "message": "Lecture de la clé d'accès..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Échec de l'authentification avec clé d'accès"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Utiliser une méthode de connexion différente"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "En attente d'interaction de la clé de sécurité..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Vous devez ajouter soit l'URL du serveur de base, soit au moins un environnement personnalisé."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Les URL doivent utiliser HTTPS."
+  },
   "customEnvironment": {
     "message": "Environnement personnalisé"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Désactiver la saisie automatique"
   },
+  "confirmAutofill": {
+    "message": "Confirmer la saisie automatique"
+  },
+  "confirmAutofillDesc": {
+    "message": "Ce site ne correspond pas à vos identifiants de connexion enregistrés. Avant de remplir vos identifiants de connexion, assurez-vous que c'est un site de confiance."
+  },
   "showInlineMenuLabel": {
     "message": "Afficher les suggestions de saisie automatique dans les champs d'un formulaire"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Comment Bitwarden protège-t-il vos données contre l'hameçonnage ?"
+  },
+  "currentWebsite": {
+    "message": "Site internet actuel"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Saisir automatiquement et ajouter ce site"
+  },
+  "autofillWithoutAdding": {
+    "message": "Saisir automatiquement sans ajouter"
+  },
+  "doNotAutofill": {
+    "message": "Ne pas saisir automatiquement"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Afficher les identités sous forme de suggestions"
   },
@@ -1782,7 +1856,7 @@
     "message": "Cliquer en dehors de la fenêtre popup pour vérifier votre courriel avec le code de vérification va causer la fermeture de cette fenêtre popup. Voulez-vous ouvrir cette fenêtre popup dans une nouvelle fenêtre afin qu'elle ne se ferme pas ?"
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Afficher les icônes du site web et récupérer les URL de changement de mot de passe"
   },
   "cardholderName": {
     "message": "Nom du titulaire de la carte"
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Année d'expiration"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -1947,79 +2024,79 @@
     "message": "Note"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "Nouvel Identifiant",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "Nouvelle Carte de paiement",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "Nouvelle Identité",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "Nouvelle Note",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "Nouvelle clé SSH",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Nouveau Send de texte",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Nouveau Send de fichier",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "Modifier l'Identifiant",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "Modifier la Carte de paiement",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "Modifier l'Identité",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "Modifier la Note",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "Modifier la clé SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Modifier le Send de texte",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Modifier le Send de fichier",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Afficher l'Identifiant",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Afficher la Carte de paiement",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "Afficher l'Identité",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "Afficher la Note",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "Afficher la clé SSH",
     "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
@@ -2218,7 +2295,7 @@
     "message": "Déverrouiller avec un code PIN"
   },
   "setYourPinTitle": {
-    "message": "Définir PIN"
+    "message": "Définir NIP"
   },
   "setYourPinButton": {
     "message": "Définir PIN"
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Cette page interfère avec l'expérience Bitwarden. Le menu en ligne de Bitwarden a été temporairement désactivé en tant que mesure de sécurité."
+  },
   "setMasterPassword": {
     "message": "Définir le mot de passe principal"
   },
@@ -3193,17 +3273,38 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Seul le coffre de l'organisation associé à $ORGANIZATION$ sera exporté.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Seul le coffre de l'organisation associé à $ORGANIZATION$ sera exporté. Mes éléments de mes collections ne seront pas inclus.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Erreur"
   },
   "decryptionError": {
     "message": "Erreur de déchiffrement"
   },
+  "errorGettingAutoFillData": {
+    "message": "Erreur lors de l'obtention des données de saisie automatique"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden n’a pas pu déchiffrer le(s) élément(s) du coffre listé(s) ci-dessous."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contacter le service clientèle",
+    "message": "Contacter succès client",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
@@ -3970,6 +4071,15 @@
     "message": "La saisie automatique au chargement de la page est configuré selon les paramètres par défaut.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Impossible de saisir automatiquement"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "La correspondance par défaut est définie à 'Correspondance exacte'. Le site internet actuel ne correspond pas exactement aux informations de l'identifiant de connexion enregistrées pour cet élément."
+  },
+  "okay": {
+    "message": "Ok"
+  },
   "toggleSideNavigation": {
     "message": "Basculer la navigation latérale"
   },
@@ -4101,7 +4211,7 @@
     "message": "Vérification requise pour cette action. Définissez un code PIN pour continuer."
   },
   "setPin": {
-    "message": "Définir le code PIN"
+    "message": "Définir le code NIP"
   },
   "verifyWithBiometrics": {
     "message": "Vérifier par biométrie"
@@ -4225,7 +4335,7 @@
     "message": "Données du coffre exportées"
   },
   "typePasskey": {
-    "message": "Clé d'identification (passkey)"
+    "message": "Clé d'accès"
   },
   "accessing": {
     "message": "Accès en cours"
@@ -4267,7 +4377,7 @@
     "message": "Enregistrer la clé d'identification (passkey) comme nouvel identifiant"
   },
   "chooseCipherForPasskeySave": {
-    "message": "Choisissez un identifiant ou enregistrer cette clé d'accès"
+    "message": "Choisissez un identifiant où enregistrer cette clé d'accès"
   },
   "chooseCipherForPasskeyAuth": {
     "message": "Choisissez une clé d'accès pour vous connecter"
@@ -4285,7 +4395,7 @@
     "message": "Fonctionnalité non supportée"
   },
   "yourPasskeyIsLocked": {
-    "message": "Authentification requise pour utiliser une clé d'identification (passkey). Vérifiez votre identité pour continuer."
+    "message": "Authentification requise pour utiliser une clé d'accès. Vérifiez votre identité pour continuer."
   },
   "multifactorAuthenticationCancelled": {
     "message": "Authentification multi-facteurs annulée"
@@ -4303,7 +4413,7 @@
     "message": "Code incorrect"
   },
   "incorrectPin": {
-    "message": "Code PIN incorrect"
+    "message": "Code NIP incorrect"
   },
   "multifactorAuthenticationFailed": {
     "message": "Authentification multifacteur échouée"
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Déverrouillez la journalisation, l'accès d'urgence et plus de fonctionnalités de sécurité avec Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Les organisations gratuites ne peuvent pas utiliser de pièces jointes"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Par défaut ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Afficher la détection de correspondance $WEBSITE$",
     "placeholders": {
@@ -5149,10 +5272,10 @@
     "message": "Afficher le nombre de suggestions de saisie automatique d'identifiant sur l'icône d'extension"
   },
   "accountAccessRequested": {
-    "message": "Account access requested"
+    "message": "Accès au compte demandé"
   },
   "confirmAccessAttempt": {
-    "message": "Confirm access attempt for $EMAIL$",
+    "message": "Confirmer la tentative d’accès pour $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5263,7 +5386,7 @@
     "message": "Vous pouvez personnaliser vos paramètres de déverrouillage et de délai d'attente pour accéder plus rapidement à votre coffre-fort."
   },
   "unlockPinSet": {
-    "message": "Déverrouiller l'ensemble de codes PIN"
+    "message": "Déverrouiller l'ensemble de codes NIP"
   },
   "unlockWithBiometricSet": {
     "message": "Déverrouiller avec l'ensemble biométrique"
@@ -5485,10 +5608,10 @@
     "message": "Changer le mot de passe à risque"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Cet identifiant est à risques et manque un site web. Ajoutez un site web et changez le mot de passe pour une meilleure sécurité."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Site Web manquant"
   },
   "settingsVaultOptions": {
     "message": "Options du coffre"
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Bienvenue dans votre coffre !"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Tentative d'hameçonnage détectée"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "Le site que vous essayez de visiter est un site malveillant connu et un risque de sécurité."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Fermer cet onglet"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continuer vers ce site (non recommandé)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Ce site a été trouvé dans ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", une liste open-source de sites d'hameçonnage connus et utilisés pour voler des informations personnelles et sensibles.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "En savoir plus sur la détection d'hameçonnage"
+  },
+  "protectedBy": {
+    "message": "Protégé par $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Remplissage automatique des éléments de la page actuelle"
@@ -5626,10 +5769,10 @@
     "description": "Aria label for the body content of the generator nudge"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "À propos de ce paramètre"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden utilisera les URI de connexion enregistrées pour identifier quelle icône ou URL de changement de mot de passe doit être utilisée pour améliorer votre expérience. Aucune information n'est recueillie ou enregistrée lorsque vous utilisez ce service."
   },
   "noPermissionsViewPage": {
     "message": "Vous n'avez pas les autorisations pour consulter cette page. Essayez de vous connecter avec un autre compte."
@@ -5639,13 +5782,13 @@
     "description": "'WebAssembly' is a technical term and should not be translated."
   },
   "showMore": {
-    "message": "Show more"
+    "message": "Afficher plus"
   },
   "showLess": {
-    "message": "Show less"
+    "message": "Afficher moins"
   },
   "next": {
-    "message": "Next"
+    "message": "Suivant"
   },
   "moreBreadcrumbs": {
     "message": "Plus de fil d'Ariane",
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirmez le domaine de Key Connector"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Excellent travail pour sécuriser vos identifiants à risque !"
+  },
+  "upgradeNow": {
+    "message": "Mettre à niveau maintenant"
+  },
+  "builtInAuthenticator": {
+    "message": "Authentificateur intégré"
+  },
+  "secureFileStorage": {
+    "message": "Stockage sécurisé de fichier"
+  },
+  "emergencyAccess": {
+    "message": "Accès d'urgence"
+  },
+  "breachMonitoring": {
+    "message": "Surveillance des fuites"
+  },
+  "andMoreFeatures": {
+    "message": "Et encore plus !"
+  },
+  "planDescPremium": {
+    "message": "Sécurité en ligne complète"
+  },
+  "upgradeToPremium": {
+    "message": "Mettre à niveau vers Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explorer Premium"
+  },
+  "loadingVault": {
+    "message": "Chargement du coffre"
+  },
+  "vaultLoaded": {
+    "message": "Coffre chargé"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Ce paramètre est désactivé par la politique de sécurité de votre organisation.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Code postal"
+  },
+  "cardNumberLabel": {
+    "message": "Numéro de carte"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Action à l’expiration"
   }
 }
diff --git a/apps/browser/src/_locales/gl/messages.json b/apps/browser/src/_locales/gl/messages.json
index c2573ea6bfa..bd657b9d4b7 100644
--- a/apps/browser/src/_locales/gl/messages.json
+++ b/apps/browser/src/_locales/gl/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Usar inicio de sesión único"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Benvido de novo"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Editar"
   },
   "view": {
     "message": "Ver"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Contrasinal mestre non válido"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Tempo de espera da caixa forte"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Ó bloquear o sistema"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Ó reiniciar o navegador"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Entrada gardada"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Seguro que queres envialo ó lixo?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Requirir biometría no inicio"
   },
-  "premiumRequired": {
-    "message": "Plan Prémium requirido"
-  },
-  "premiumRequiredDesc": {
-    "message": "Requírese un plan Prémium para poder empregar esta función."
-  },
   "authenticationTimeout": {
     "message": "Tempo límite de autenticación superado"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Debes engadir ou a URL base do servidor ou, polo menos, un entorno personalizado."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Entorno personalizado"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Amosar suxestións de autoenchido en formularios"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Amosar identidades como suxestións"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Ano de vencemento"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Vencemento"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Definir contrasinal mestre"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Erro"
   },
   "decryptionError": {
     "message": "Erro de descifrado"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden non puido descifrar os seguintes elementos."
   },
@@ -3970,6 +4071,15 @@
     "message": "Axuste de autoenchido ó cargar a páxina por defecto.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Activar/desactivar navegación lateral"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Prémium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "As organizacións gratuitas non poden empregar anexos"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Mostrar detección de coincidencia $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/he/messages.json b/apps/browser/src/_locales/he/messages.json
index 38fe3618610..2e9243206b9 100644
--- a/apps/browser/src/_locales/he/messages.json
+++ b/apps/browser/src/_locales/he/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "השתמש בכניסה יחידה"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "הארגון שלך דורש כניסה יחידה."
+  },
   "welcomeBack": {
     "message": "ברוך שובך"
   },
@@ -550,32 +553,40 @@
   "resetSearch": {
     "message": "אפס חיפוש"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "ארכיון",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "העבר לארכיון",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "הסר מהארכיון"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "פריטים בארכיון"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "אין פריטים בארכיון"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "פריטים בארכיון יופיעו כאן ויוחרגו מתוצאות חיפוש כללי והצעות למילוי אוטומטי."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "הפריט נשלח לארכיון"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "הפריט הוסר מהארכיון"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "העבר פריט לארכיון"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "פריטים בארכיון מוחרגים מתוצאות חיפוש כללי והצעות למילוי אוטומטי. האם אתה בטוח שברצונך להעביר פריט זה לארכיון?"
+  },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
   },
   "edit": {
     "message": "ערוך"
@@ -583,6 +594,15 @@
   "view": {
     "message": "הצג"
   },
+  "viewAll": {
+    "message": "הצג הכל"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "הצג פחות"
+  },
   "viewLogin": {
     "message": "הצג כניסה"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "סיסמה ראשית שגויה"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "סיסמה ראשית אינה תקינה. יש לאשר שהדוא\"ל שלך נכון ושהחשבון שלך נוצר ב־$HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "פסק זמן לכספת"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "בנעילת המערכת"
   },
+  "onIdle": {
+    "message": "כשהמערכת מזהה חוסר פעילות"
+  },
+  "onSleep": {
+    "message": "כשהמערכת נכנסת למצב שינה"
+  },
   "onRestart": {
     "message": "בהפעלת הדפדפן מחדש"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "הפריט נשמר"
   },
+  "savedWebsite": {
+    "message": "אתר אינטרנט שנשמר"
+  },
+  "savedWebsites": {
+    "message": "אתרי אינטרנט שנשמרו ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "האם אתה בטוח שברצונך למחוק פריט זה?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "בקש זיהוי ביומטרי בפתיחה"
   },
-  "premiumRequired": {
-    "message": "נדרש פרימיום"
-  },
-  "premiumRequiredDesc": {
-    "message": "נדרשת חברות פרימיום כדי להשתמש בתכונה זו."
-  },
   "authenticationTimeout": {
     "message": "פסק זמן לאימות"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "קרא מפתח אבטחה"
   },
+  "readingPasskeyLoading": {
+    "message": "קורא מפתח גישה..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "אימות מפתח גישה נכשל"
+  },
+  "useADifferentLogInMethod": {
+    "message": "השתמש בשיטת כניסה אחרת"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "ממתין לאינטראקציה עם מפתח אבטחה..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "אתה מוכרח להוסיף או את בסיס ה־URL של השרת או לפחות סביבה מותאמת אישית אחת."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "כתובות URL מוכרחות להשתמש ב־HTTPS."
+  },
   "customEnvironment": {
     "message": "סביבה מותאמת אישית"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "השבת מילוי אוטומטי"
   },
+  "confirmAutofill": {
+    "message": "אשר מילוי אוטומטי"
+  },
+  "confirmAutofillDesc": {
+    "message": "אתר זה אינו תואם את פרטי הכניסה השמורה שלך. לפני שאתה ממלא את אישורי הכניסה שלך, וודא שזהו אתר מהימן."
+  },
   "showInlineMenuLabel": {
     "message": "הצג הצעות למילוי אוטומטי על שדות טופס"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "כיצד Bitwarden מגנה על הנתונים שלך מדיוג?"
+  },
+  "currentWebsite": {
+    "message": "אתר נוכחי"
+  },
+  "autofillAndAddWebsite": {
+    "message": "מלא אוטומטית והוסף אתר אינטרנט זה"
+  },
+  "autofillWithoutAdding": {
+    "message": "מלא אוטומטית מבלי להוסיף"
+  },
+  "doNotAutofill": {
+    "message": "אל תמלא אוטומטית"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "הצג זהויות כהצעות"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "שנת תפוגה"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "תוקף"
   },
@@ -1947,79 +2024,79 @@
     "message": "הערה"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "כניסה חדשה",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "כרטיס חדש",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "זהות חדשה",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "הערה חדשה",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "מפתח SSH חדש",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "סֵנְד של טקסט חדש",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "סֵנְד של קובץ חדש",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "ערוך כניסה",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "ערוך כרטיס",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "ערוך זהות",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "ערוך הערה",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "ערוך מפתח SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "ערוך סֵנְד של טקסט",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "ערוך סֵנְד של קובץ",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "הצג כניסה",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "הצג כרטיס",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "הצג זהות",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "הצג הערה",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "הצג מפתח SSH",
     "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "הגדר סיסמה ראשית"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "רק הכספת הארגונית המשויכת עם $ORGANIZATION$ תיוצא.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "רק הכספת הארגונית המשויכת עם $ORGANIZATION$ תיוצא. פריטי האוספים שלי לא יכללו.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "שגיאה"
   },
   "decryptionError": {
     "message": "שגיאת פענוח"
   },
+  "errorGettingAutoFillData": {
+    "message": "שגיאה בקבלת נתוני מילוי אוטומטי"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden לא יכל לפענח את פריט(י) הכספת המפורט(ים) להלן."
   },
@@ -3970,6 +4071,15 @@
     "message": "מילוי אוטומטי בעת טעינת הוגדר להשתמש בהגדרת ברירת מחדל.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "לא ניתן למלא אוטומטית"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "ברירת המחדל להתאמה מוגדרת כ'התאמה מדויקת'. האתר הנוכחי אינו תואם באופן מדויק את פרטי הכניסה השמורים עבור פריט זה."
+  },
+  "okay": {
+    "message": "בסדר"
+  },
   "toggleSideNavigation": {
     "message": "החלף מצב ניווט צדדי"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "פרימיום"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "ארגונים חינמיים לא יכולים להשתמש בצרופות"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "ברירת מחדל ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "הצג זיהוי התאמה $WEBSITE$",
     "placeholders": {
@@ -5494,7 +5617,7 @@
     "message": "אפשרויות כספת"
   },
   "emptyVaultDescription": {
-    "message": "הכספת מגינה על יותר מרק הסיסמאות שלך. אחסן כניסות מאובטחות, זהויות, כרטיסים והערות באופן מאובטח כאן."
+    "message": "הכספת מגנה על יותר מרק הסיסמאות שלך. אחסן כניסות מאובטחות, זהויות, כרטיסים והערות באופן מאובטח כאן."
   },
   "introCarouselLabel": {
     "message": "ברוך בואך אל Bitwarden"
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "ברוך בואך אל הכספת שלך!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "זוהה ניסיון דיוג"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "האתר שאתה מנסה לבקר הוא אתר זדוני ידוע וסכנת אבטחה."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "סגור כרטיסיה זו"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "המשך לאתר זה (לא מומלץ)"
+  },
+  "phishingPageExplanation1": {
+    "message": "אתר זה נמצא ב־",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", רשימת קוד פתוח של אתרי דיוג ידועים המשמשים לגניבת מידע אישי ורגיש.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "למד עוד על זיהוי דיוג"
+  },
+  "protectedBy": {
+    "message": "מוגן על ידי $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "פריטים למילוי אוטומטי עבור הדף הנוכחי"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "אשר דומיין של Key Connector"
+  },
+  "atRiskLoginsSecured": {
+    "message": "עבודה נהדרת באבטחת הכניסות בסיכון שלך!"
+  },
+  "upgradeNow": {
+    "message": "שדרג עכשיו"
+  },
+  "builtInAuthenticator": {
+    "message": "מאמת מובנה"
+  },
+  "secureFileStorage": {
+    "message": "אחסון קבצים מאובטח"
+  },
+  "emergencyAccess": {
+    "message": "גישת חירום"
+  },
+  "breachMonitoring": {
+    "message": "ניטור פרצות"
+  },
+  "andMoreFeatures": {
+    "message": "ועוד!"
+  },
+  "planDescPremium": {
+    "message": "השלם אבטחה מקוונת"
+  },
+  "upgradeToPremium": {
+    "message": "שדרג לפרימיום"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "טוען כספת"
+  },
+  "vaultLoaded": {
+    "message": "הכספת נטענה"
+  },
+  "settingDisabledByPolicy": {
+    "message": "הגדרה זו מושבתת על ידי מדיניות של הארגון שלך.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "מיקוד"
+  },
+  "cardNumberLabel": {
+    "message": "מספר כרטיס"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "פעולת פסק זמן"
   }
 }
diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json
index 1575543aef3..58db7ac8ad6 100644
--- a/apps/browser/src/_locales/hi/messages.json
+++ b/apps/browser/src/_locales/hi/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "सिंगल साइन-ऑन प्रयोग करें"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "आपका पुन: स्वागत है!"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "खोज रीसेट करें"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "संपादन करें"
   },
   "view": {
     "message": "देखें"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "अमान्य मास्टर पासवर्ड"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "वॉल्ट मध्यांतर"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On Locked"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On Restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "संपादित आइटम "
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "क्या आप वास्तव में थ्रैश में भेजना चाहते हैं?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "लॉन्च पर बायोमेट्रिक्स के लिए पूछें"
   },
-  "premiumRequired": {
-    "message": "Premium Required"
-  },
-  "premiumRequiredDesc": {
-    "message": "इस सुविधा का उपयोग करने के लिए प्रीमियम सदस्यता की आवश्यकता होती है।"
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom Environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration Year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "समय सीमा समाप्ति"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "मास्टर पासवर्ड सेट करें"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "एरर"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json
index 4f67de34071..8a5a09aec9c 100644
--- a/apps/browser/src/_locales/hr/messages.json
+++ b/apps/browser/src/_locales/hr/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Jedinstvena prijava (SSO)"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tvoja organizacija zahtijeva jedinstvenu prijavu."
+  },
   "welcomeBack": {
     "message": "Dobro došli natrag"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Ponovno postavljanje pretraživanja"
   },
-  "archive": {
-    "message": "Arhiviraj"
+  "archiveNoun": {
+    "message": "Arhiva",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arhiviraj",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Poništi arhiviranje"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Arhivirane stavke biti će prikazane ovdje i biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Stavka poslana u arhivu"
   },
-  "itemRemovedFromArchive": {
-    "message": "Stavka maknute iz arhive"
+  "itemUnarchived": {
+    "message": "Stavka vraćena iz arhive"
   },
   "archiveItem": {
     "message": "Arhiviraj stavku"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Arhivirane stavke biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune. Sigurno želiš arhivirati?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Uredi"
   },
   "view": {
     "message": "Prikaz"
   },
+  "viewAll": {
+    "message": "Vidi sve"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "Vidi manje"
+  },
   "viewLogin": {
     "message": "Prikaži prijavu"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Neispravna glavna lozinka"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Nevažeća glavna lozinka. Provjeri je li tvoja adresa e-pošta ispravna i je li račun kreiran na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Istek trezora"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Pri zaključavanju sustava"
   },
+  "onIdle": {
+    "message": "U stanju besposlenosti"
+  },
+  "onSleep": {
+    "message": "U stanju mirovanja sustava"
+  },
   "onRestart": {
     "message": "Pri pokretanju preglednika"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Stavka izmijenjena"
   },
+  "savedWebsite": {
+    "message": "Spremljeno mrežno mjesto"
+  },
+  "savedWebsites": {
+    "message": "Spremljena mrežna mjesta ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Želiš li zaista poslati u smeće?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Traži biometrijsku autentifikaciju pri pokretanju"
   },
-  "premiumRequired": {
-    "message": "Potrebno premium članstvo"
-  },
-  "premiumRequiredDesc": {
-    "message": "Za korištenje ove značajke potrebno je Premium članstvo."
-  },
   "authenticationTimeout": {
     "message": "Istek vremena za autentifikaciju"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Pročitaj sigurnosni ključ"
   },
+  "readingPasskeyLoading": {
+    "message": "Čitanje pristupnog ključa..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Autentifikacija pristupnog ključa nije uspjela"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Koristi drugi način prijave"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Čekanje na interakciju sa sigurnosnim ključem..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Moraš dodati ili osnovni URL poslužitelja ili barem jedno prilagođeno okruženje."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL mora koristiti HTTPS."
+  },
   "customEnvironment": {
     "message": "Prilagođeno okruženje"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Isključi auto-ispunu"
   },
+  "confirmAutofill": {
+    "message": "Potvrdi auto-ispunu"
+  },
+  "confirmAutofillDesc": {
+    "message": "Ova stranica ne odgovara tvojim spremljenim podacima za prijavu. Prije nego što uneseš svoje podatke za prijavu, provjeri je li riječ o pouzdanoj stranici."
+  },
   "showInlineMenuLabel": {
     "message": "Prikaži prijedloge auto-ispune na poljima obrazaca"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Kako Bitwarden štiti tvoje podatke od phishinga?"
+  },
+  "currentWebsite": {
+    "message": "Trenutna web stranica"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Auto-ispuni i dodaj ovu stranicu"
+  },
+  "autofillWithoutAdding": {
+    "message": "Auto-ispuni bez dodavanja"
+  },
+  "doNotAutofill": {
+    "message": "Nemoj auto-ispuniti"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Prikaži identitete kao prijedloge"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Godina isteka"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Istek"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Ova stranica ometa Bitwarden iskustvo. Kao sigurnosna mjera, Bitwarden inline izbornik je privremeno onemogućen."
+  },
   "setMasterPassword": {
     "message": "Postavi glavnu lozinku"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Izvezt će se samo trezor organizacije povezan s $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Izvezt će se samo trezor organizacije povezan s $ORGANIZATION$. Zbirka mojih stavki neće biti uključena.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Pogreška"
   },
   "decryptionError": {
     "message": "Pogreška pri dešifriranju"
   },
+  "errorGettingAutoFillData": {
+    "message": "Greška kod dohvata podataka za auto-ispunu"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden nije mogao dešifrirati sljedeće stavke trezora."
   },
@@ -3970,6 +4071,15 @@
     "message": "Auto-ispuna kod učitavanja stranice koristi zadane postavke.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Nije moguća auto-ispuna"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Zadano podudaranje postavljeno je na „Točno podudaranje”. Trenutna web-stranica ne podudara se točno sa spremljenim podacima ove stavke za prijavu."
+  },
+  "okay": {
+    "message": "U redu"
+  },
   "toggleSideNavigation": {
     "message": "U/Isključi bočnu navigaciju"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Besplatne organizacije ne mogu koristiti privitke"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Zadano ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Prikaži otkrivanje podudaranja $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Dobrodošli u svoj trezor!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing web stranica"
+  "phishingPageTitleV2": {
+    "message": "Otkriven pokušaj phishinga"
   },
-  "phishingPageCloseTab": {
-    "message": "Zatvori karticu"
+  "phishingPageSummary": {
+    "message": "Web-mjesto koje pokušavaš posjetiti poznato je kao zlonamjerno i predstavlja sigurnosni rizik."
   },
-  "phishingPageContinue": {
-    "message": "Nastavi"
+  "phishingPageCloseTabV2": {
+    "message": "Zatvori ovu karticu"
   },
-  "phishingPageLearnWhy": {
-    "message": "Zašto ovo vidiš?"
+  "phishingPageContinueV2": {
+    "message": "Nastavi na web mjesto (nije preporučljivo)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Ovo mjesto je nađeno na ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", popisu otvorenog koda poznatih phishing stranica koje se koriste za krađu osobnih i osjetljivih podataka.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Saznaj više o otkrivanju phishinga"
+  },
+  "protectedBy": {
+    "message": "Zaštićeno s $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Auto-ispuni stavke za trenutnu stranicu"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Potvrdi domenu kontektora ključa"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Rizične prijave su osigurane!"
+  },
+  "upgradeNow": {
+    "message": "Nadogradi sada"
+  },
+  "builtInAuthenticator": {
+    "message": "Ugrađeni autentifikator"
+  },
+  "secureFileStorage": {
+    "message": "Sigurna pohrana datoteka"
+  },
+  "emergencyAccess": {
+    "message": "Pristup u nuždi"
+  },
+  "breachMonitoring": {
+    "message": "Nadzor proboja"
+  },
+  "andMoreFeatures": {
+    "message": "I više!"
+  },
+  "planDescPremium": {
+    "message": "Dovrši online sigurnost"
+  },
+  "upgradeToPremium": {
+    "message": " Nadogradi na Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Provjeri Premium"
+  },
+  "loadingVault": {
+    "message": "Učitavanje trezora"
+  },
+  "vaultLoaded": {
+    "message": "Trezor učitan"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Ova je postavka onemogućena pravilima tvoje organizacije.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Poštanski broj"
+  },
+  "cardNumberLabel": {
+    "message": "Broj kartice"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Radnja kod isteka"
   }
 }
diff --git a/apps/browser/src/_locales/hu/messages.json b/apps/browser/src/_locales/hu/messages.json
index 864580a64b0..bacda584ba1 100644
--- a/apps/browser/src/_locales/hu/messages.json
+++ b/apps/browser/src/_locales/hu/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Egyszeri bejelentkezés használata"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A szervezet egyszeri bejelentkezést igényel."
+  },
   "welcomeBack": {
     "message": "Üdvözlet újra"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Keresés visszaállítása"
   },
-  "archive": {
-    "message": "Archívum"
+  "archiveNoun": {
+    "message": "Archívum",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archívum",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Visszavétel archívumból"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Az archivált elemek itt jelennek meg és kizárásra kerülnek az általános keresési eredményekből és az automatikus kitöltési javaslatokból."
   },
-  "itemSentToArchive": {
-    "message": "Archívumba küldött elemek száma"
+  "itemWasSentToArchive": {
+    "message": "Az elem az archivumba került."
   },
-  "itemRemovedFromArchive": {
-    "message": "Az elem kikerült a kedvencekből."
+  "itemUnarchived": {
+    "message": "Az elemek visszavéelre kerültek az archivumból."
   },
   "archiveItem": {
     "message": "Elem archiválása"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Az archivált elemek ki vannak zárva az általános keresési eredményekből és az automatikus kitöltési javaslatokból. Biztosan archiválni szeretnénk ezt az elemet?"
   },
+  "upgradeToUseArchive": {
+    "message": "Az Archívum használatához prémium tagság szükséges."
+  },
   "edit": {
     "message": "Szerkesztés"
   },
   "view": {
     "message": "Nézet"
   },
+  "viewAll": {
+    "message": "Összes megtekintése"
+  },
+  "showAll": {
+    "message": "Összes megjelenítése"
+  },
+  "viewLess": {
+    "message": "kevesebb megjelenítése"
+  },
   "viewLogin": {
     "message": "Bejelentkezés megtekintése"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Hibás mesterjelszó"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "A mesterjelszó érvénytelen. Erősítsük meg, hogy email cím helyes és a fiók létrehozásának helye: $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Széf időkifutás"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Rendszerzároláskor"
   },
+  "onIdle": {
+    "message": "Rendszer üresjárat esetén"
+  },
+  "onSleep": {
+    "message": "Rendszer alvó mód esetén"
+  },
   "onRestart": {
     "message": "Böngésző újraindításkor"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Az elem szerkesztésre került."
   },
+  "savedWebsite": {
+    "message": "Mentett webhely"
+  },
+  "savedWebsites": {
+    "message": "Mentett webhelyek ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Biztosan törlésre kerüljön ezt az elem?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Biometria kérése indításkor"
   },
-  "premiumRequired": {
-    "message": "Prémium funkció szükséges"
-  },
-  "premiumRequiredDesc": {
-    "message": "Prémium tagság szükséges ennek a funkciónak eléréséhez a jövőben."
-  },
   "authenticationTimeout": {
     "message": "Hitelesítési időkifutás"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Biztonsági kulcs olvasása"
   },
+  "readingPasskeyLoading": {
+    "message": "Hozzáférési kulcs beolvasása..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "A hozzáférési kulcs hitelesítés sikertelen volt."
+  },
+  "useADifferentLogInMethod": {
+    "message": "Más bejelentkezési mód használata"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Várakozás a biztonsági kulcs interakciójára..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Hozzá kell adni az alapszerver webcímét vagy legalább egy egyedi környezetet."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "A webcímeknek HTTPS-t kell használniuk."
+  },
   "customEnvironment": {
     "message": "Egyedi környezet"
   },
@@ -1653,8 +1706,29 @@
   "turnOffAutofill": {
     "message": "Automat kitöltés bekapcsolása"
   },
+  "confirmAutofill": {
+    "message": "Automatikus kitöltés megerősítése"
+  },
+  "confirmAutofillDesc": {
+    "message": "Ez a webhely nem egyezik a mentett bejelentkezési adatokkal. Mielőtt kitöltenénk a bejelentkezés hitelesítő adatokat, győződjünk meg arról, hogy megbízható webhelyről van-e szó."
+  },
   "showInlineMenuLabel": {
-    "message": "Show autofill suggestions on form fields"
+    "message": "Automatikus kitöltési javaslatok megjelenítése űrlapmezőknél"
+  },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Hogyan védi meg a Bitwarden az adathalászattól az adatokat?"
+  },
+  "currentWebsite": {
+    "message": "Jelenlegi webhely"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Automatikus kitöltés és ezen webhely hozzáadása"
+  },
+  "autofillWithoutAdding": {
+    "message": "Automatikus kitöltés hozzáadás nélkül"
+  },
+  "doNotAutofill": {
+    "message": "Ne legyen automatikus kitöltés"
   },
   "showInlineMenuIdentitiesLabel": {
     "message": "Az identitások megjelenítése javaslatként"
@@ -1663,10 +1737,10 @@
     "message": "A kártyák megjelenítése javaslatként"
   },
   "showInlineMenuOnIconSelectionLabel": {
-    "message": "Display suggestions when icon is selected"
+    "message": "Javaslatok megjelenítése a az ikon kiválasztásakor"
   },
   "showInlineMenuOnFormFieldsDescAlt": {
-    "message": "Applies to all logged in accounts."
+    "message": "Minden bejelentkezett fiókra vonatkozik."
   },
   "turnOffBrowserBuiltInPasswordManagerSettings": {
     "message": "Az ütközések elkerülése érdekében kapcsoljuk ki a böngésző beépített jelszókezelő beállításait."
@@ -1679,7 +1753,7 @@
     "description": "Overlay setting select option for disabling autofill overlay"
   },
   "autofillOverlayVisibilityOnFieldFocus": {
-    "message": "When field is selected (on focus)",
+    "message": "Amikor a mező kiválasztásra kerül (fókuszoláskor)",
     "description": "Overlay appearance select option for showing the field on focus of the input element"
   },
   "autofillOverlayVisibilityOnButtonClick": {
@@ -1687,7 +1761,7 @@
     "description": "Overlay appearance select option for showing the field on click of the overlay icon"
   },
   "enableAutoFillOnPageLoadSectionTitle": {
-    "message": "Autofill on page load"
+    "message": "Automatikus kitöltés az oldal betöltésénél"
   },
   "enableAutoFillOnPageLoad": {
     "message": "Automatikus kitöltés engedélyezése oldal betöltéskor"
@@ -1699,7 +1773,7 @@
     "message": "Az oldalbetöltésnél automatikus kitöltést a feltört vagy nem megbízhatató weboldalak kihasználhatják."
   },
   "learnMoreAboutAutofillOnPageLoadLinkText": {
-    "message": "Learn more about risks"
+    "message": "Bővebben a kockázatokról"
   },
   "learnMoreAboutAutofill": {
     "message": "További információk az automatikus kitöltésről"
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Lejárati év"
   },
+  "monthly": {
+    "message": "hónap"
+  },
   "expiration": {
     "message": "Lejárat"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Ez az oldal zavarja a Bitwarden élményt. Biztonsági intézkedésként ideiglenesen letiltásra került a Bitwarden belső menü."
+  },
   "setMasterPassword": {
     "message": "Mesterjelszó beállítása"
   },
@@ -2423,7 +2503,7 @@
     "message": "Az új mesterjelszó nem felel meg a szabály követelményeknek."
   },
   "receiveMarketingEmailsV2": {
-    "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
+    "message": "Tanácsokat, bejelentéseket, kutatási lehetőségeket kaphat a Bitwarden-től a postaládájába."
   },
   "unsubscribe": {
     "message": "Leiratkozás"
@@ -2459,10 +2539,10 @@
     "message": "Ok"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "Hozzáférési Token Frissítés Hiba"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "Nem található token vagy API kulcs. Próbáljon meg ki-, majd újra bejelentkezni."
   },
   "desktopSyncVerificationTitle": {
     "message": "Asztali szinkronizálás ellenőrzés"
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Csak a $ORGANIZATION$ szervezetehez kapcsolódó szervezeti széf kerül exportálásra.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Csak a $ORGANIZATION$ szervezethez kapcsolódó szervezeti széf kerül exportálásra. A saját elem gyűjtemények nem lesznek benne.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Hiba"
   },
   "decryptionError": {
     "message": "Visszafejtési hiba"
   },
+  "errorGettingAutoFillData": {
+    "message": "Hiba történt az automatikus kitöltési adatok beolvasásakor."
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "A Bitwarden nem tudta visszafejteni az alább felsorolt ​​széf elemeket."
   },
@@ -3583,7 +3684,7 @@
     "message": "A szervezeti szabályzat bekapcsolta az automatikus kitöltést az oldalbetöltéskor."
   },
   "autofillSelectInfoWithCommand": {
-    "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
+    "message": "Válasszon ki egy elemet a képernyőről, használja a $COMMAND$ kombinációt, vagy tekintse meg a többi lehetőséget a beállításokban.",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -3592,7 +3693,7 @@
     }
   },
   "autofillSelectInfoWithoutCommand": {
-    "message": "Select an item from this screen, or explore other options in settings."
+    "message": "Válasszon ki egy elemet a képernyőről, vagy tekintse meg a többi lehetőséget a beállításokban."
   },
   "gotIt": {
     "message": "Rendben"
@@ -3601,10 +3702,10 @@
     "message": "Automatikus kitöltés beállítások"
   },
   "autofillKeyboardShortcutSectionTitle": {
-    "message": "Autofill shortcut"
+    "message": "Automatikus kitöltés gyorselérés"
   },
   "autofillKeyboardShortcutUpdateLabel": {
-    "message": "Change shortcut"
+    "message": "Billentyűparancs változtatás"
   },
   "autofillKeyboardManagerShortcutsLabel": {
     "message": "Bullenytűparancsok kezelése"
@@ -3970,18 +4071,27 @@
     "message": "Az automatikus kitöltés az oldal betöltésekor az alapértelmezett beállítás használatára lett beállítva.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Nem lehetséges az automatikus kitöltés."
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Az alapértelmezett egyezés beállítása 'Pontos egyezés'. Az aktuális webhely nem egyezik pontosan az ezzel az elemmel mentett bejelentkezési adatokkal."
+  },
+  "okay": {
+    "message": "OK"
+  },
   "toggleSideNavigation": {
-    "message": "Toggle side navigation"
+    "message": "Oldalnavigáció váltás"
   },
   "skipToContent": {
     "message": "Ugrás a tartalomra"
   },
   "bitwardenOverlayButton": {
-    "message": "Bitwarden autofill menu button",
+    "message": "Bitwarden automatikus kitöltés menü gomb",
     "description": "Page title for the iframe containing the overlay button"
   },
   "toggleBitwardenVaultOverlay": {
-    "message": "Toggle Bitwarden autofill menu",
+    "message": "Bitwarden automatikus kitöltés menü váltás",
     "description": "Screen reader and tool tip label for the overlay button"
   },
   "bitwardenVault": {
@@ -3989,7 +4099,7 @@
     "description": "Page title in overlay"
   },
   "unlockYourAccountToViewMatchingLogins": {
-    "message": "Unlock your account to view matching logins",
+    "message": "Az összeillő belépések megtekintéséhez oldja fel fiókját",
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockYourAccountToViewAutofillSuggestions": {
@@ -4057,7 +4167,7 @@
     "description": "Screen reader text (aria-label) for new identity button within inline menu"
   },
   "bitwardenOverlayMenuAvailable": {
-    "message": "Bitwarden autofill menu available. Press the down arrow key to select.",
+    "message": "Bitwarden automatikus kitöltés menü elérhető. Nyomja meg a lefele nyilat a kiválasztáshoz.",
     "description": "Screen reader text for announcing when the overlay opens on the page"
   },
   "turnOn": {
@@ -4143,7 +4253,7 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "Hiba a Duo szolgáltatáshoz való kapcsolódáskor. Használjon másféle kétlépcsős bejelentkezést, vagy keresse fel a Duo ügyfélszolgálatot."
   },
   "duoRequiredForAccount": {
     "message": "A fiókhoz kétlépcsős DUO bejelentkezés szükséges."
@@ -4439,27 +4549,27 @@
     "description": "Advanced option placeholder for uri option component"
   },
   "confirmContinueToBrowserSettingsTitle": {
-    "message": "Continue to browser settings?",
+    "message": "Továbblépés a böngésző beállításokhoz?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
   },
   "confirmContinueToHelpCenter": {
-    "message": "Continue to Help Center?",
+    "message": "Továbblépés a Segítség Központba?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant Help Center page"
   },
   "confirmContinueToHelpCenterPasswordManagementContent": {
-    "message": "Change your browser's autofill and password management settings.",
+    "message": "A böngésző automatikus kitöltés és jelszókezelési beállításainak módosítása.",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser password management settings"
   },
   "confirmContinueToHelpCenterKeyboardShortcutsContent": {
-    "message": "You can view and set extension shortcuts in your browser's settings.",
+    "message": "Megtekintheti vagy beállíthatja a bővítmény billentyűparancsokat a böngésző beállításoknál.",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser keyboard shortcut settings"
   },
   "confirmContinueToBrowserPasswordManagementSettingsContent": {
-    "message": "Change your browser's autofill and password management settings.",
+    "message": "A böngésző automatikus kitöltési és jelszókezelési beállításainak módosítása.",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's password management settings page"
   },
   "confirmContinueToBrowserKeyboardShortcutSettingsContent": {
-    "message": "You can view and set extension shortcuts in your browser's settings.",
+    "message": "Megtekintheti vagy beállíthatja a bővítmény billentyűparancsokat a böngésző beállításoknál.",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's keyboard shortcut settings page"
   },
   "overrideDefaultBrowserAutofillTitle": {
@@ -4639,7 +4749,7 @@
     "message": "Nincsenek másolandó értékek."
   },
   "assignToCollections": {
-    "message": "Assign to collections"
+    "message": "Hozzárendelés gyűjteményhez"
   },
   "copyEmail": {
     "message": "Email cím másolása"
@@ -4702,7 +4812,7 @@
     }
   },
   "itemsWithNoFolder": {
-    "message": "Items with no folder"
+    "message": "Be nem mappázott elemek"
   },
   "itemDetails": {
     "message": "Elem részletek"
@@ -4711,7 +4821,7 @@
     "message": "Elem neve"
   },
   "organizationIsDeactivated": {
-    "message": "Organization is deactivated"
+    "message": "A szervezet deaktiválásra került"
   },
   "owner": {
     "message": "Tulajdonos"
@@ -4721,7 +4831,7 @@
     "description": "Used as a label to indicate that the user is the owner of an item."
   },
   "contactYourOrgAdmin": {
-    "message": "Items in deactivated organizations cannot be accessed. Contact your organization owner for assistance."
+    "message": "A deaktivált szervezetek elemeit nem lehet elérni. Keresse fel további segítségért a szervezet tulajdonosát."
   },
   "additionalInformation": {
     "message": "További információ"
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Prémium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "A Prémium segítségével feloldhatjuk a jelentés készítést, a vészhelyzeti hozzáférést és a további biztonsági funkciókat."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Az ingyenes szervezetek nem használhatnak mellékleteket."
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Alapértelmezett ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "$WEBSITE$ egyező érzékelés megjelenítése",
     "placeholders": {
@@ -4949,7 +5072,7 @@
     "description": "ARIA label for the inline menu button that logs in with a passkey."
   },
   "assign": {
-    "message": "Assign"
+    "message": "Hozzárendelés"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
     "message": "Csak az ezekhez a gyűjteményekhez hozzáféréssel rendelkező szervezeti tagok láthatják az elemet."
@@ -4958,7 +5081,7 @@
     "message": "Csak az ezekhez a gyűjteményekhez hozzáféréssel rendelkező szervezeti tagok láthatják az elemeket."
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "message": "$TOTAL_COUNT$ elemeket jelölt ki. Nem frissítheti a $READONLY_COUNT$ részét, mert nem rendelkezik szerkesztési jogosultsággal.",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -5056,13 +5179,13 @@
     }
   },
   "selectCollectionsToAssign": {
-    "message": "Select collections to assign"
+    "message": "A hozzárendeléshez jelöljön ki gyűjteményeket"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 elem véglegesen áthelyezésre kerül a szervezethez. Többé nem Önhöz fog tartozni az elem."
   },
   "personalItemsTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ elemek véglegesen áthelyezésre kerülnek a kiválasztott szervezethez. Többé nem Önhöz fognak tartozni az elemek.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -5071,7 +5194,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "Ez az 1 elem véglegesen áthelyezésre kerül a $ORG$ szervezethez. Többé nem az Öné lesz az elem.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -5080,7 +5203,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ elem véglegesen áthelyezésre kerül a $ORG$ szervezethez. Többé nem az Öné lesz az elem.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -5093,13 +5216,13 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Successfully assigned collections"
+    "message": "Sikerült a gyűjteményhez való hozzárendelés"
   },
   "nothingSelected": {
-    "message": "You have not selected anything."
+    "message": "Nem választott ki semmit."
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "Elemek áthelyezve a $ORGNAME$ szervezethez",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -5108,7 +5231,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "Elem áthelyezve a $ORGNAME$ szervezethez",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -5269,7 +5392,7 @@
     "message": "Feloldás biometrikusan"
   },
   "authenticating": {
-    "message": "Authenticating"
+    "message": "Hitelesítés"
   },
   "fillGeneratedPassword": {
     "message": "Generált jelszó kitöltés",
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Üdvözlet a széfben!"
   },
-  "phishingPageTitle": {
-    "message": "Adathalász webhely"
+  "phishingPageTitleV2": {
+    "message": "Adathalászati kísérlet lett észlelve."
   },
-  "phishingPageCloseTab": {
+  "phishingPageSummary": {
+    "message": "A meglátogatni kívánt webhely ismert rosszindulatú webhely és biztonsági kockázatot jelent."
+  },
+  "phishingPageCloseTabV2": {
     "message": "Fül bezárása"
   },
-  "phishingPageContinue": {
-    "message": "Folytatás"
+  "phishingPageContinueV2": {
+    "message": "Tovább erre a webhelyre (nem ajánlott)"
   },
-  "phishingPageLearnWhy": {
-    "message": "Miért látható ez?"
+  "phishingPageExplanation1": {
+    "message": "Ez a webhely megtalálható volt ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": "listán, egy személyes és érzékeny információk ellopására használt ismert adathalász webhelyek nyílt forráskódú listáján.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "További információ az adathalászat észleléséről"
+  },
+  "protectedBy": {
+    "message": "$PRODUCT$ által védett",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Az aktuális oldal elemeinek automatikus kitöltése"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "A Key Connector tartomány megerősítése"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Remek munka a kockázatos bejelentkezések biztosítása!"
+  },
+  "upgradeNow": {
+    "message": "Áttérés most"
+  },
+  "builtInAuthenticator": {
+    "message": "Beépített hitelesítő"
+  },
+  "secureFileStorage": {
+    "message": "Biztonságos fájl tárolás"
+  },
+  "emergencyAccess": {
+    "message": "Sürgősségi hozzáférés"
+  },
+  "breachMonitoring": {
+    "message": "Adatszivárgás figyelés"
+  },
+  "andMoreFeatures": {
+    "message": "És még több!"
+  },
+  "planDescPremium": {
+    "message": "Teljes körű online biztonság"
+  },
+  "upgradeToPremium": {
+    "message": "Áttérés Prémium csomagra"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Fejlett biztonsági funkciók feloldása"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A prémium előfizetés több eszközt biztosít a biztonság és az irányítás megőrzéséhez."
+  },
+  "explorePremium": {
+    "message": "Premium felfedezése"
+  },
+  "loadingVault": {
+    "message": "Széf betöltése"
+  },
+  "vaultLoaded": {
+    "message": "A széf betöltésre került."
+  },
+  "settingDisabledByPolicy": {
+    "message": "Ezt a beállítást a szervezet házirendje letiltotta.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Irányítószám"
+  },
+  "cardNumberLabel": {
+    "message": "Kártya szám"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Időkifutási művelet"
   }
 }
diff --git a/apps/browser/src/_locales/id/messages.json b/apps/browser/src/_locales/id/messages.json
index b38b6f05628..88147f804d1 100644
--- a/apps/browser/src/_locales/id/messages.json
+++ b/apps/browser/src/_locales/id/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Gunakan masuk tunggal"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Selamat datang kembali"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Atur ulang pencarian"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "Tampilan"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Sandi utama tidak valid"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Batas Waktu Brankas"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Saat Komputer Terkunci"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Saat Peramban Dimulai Ulang"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item yang Diedit"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Apakah Anda yakin ingin menghapus item ini?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Tanyakan untuk biometrik pada saat diluncurkan"
   },
-  "premiumRequired": {
-    "message": "Membutuhkan Keanggotaan Premium"
-  },
-  "premiumRequiredDesc": {
-    "message": "Keanggotaan premium diperlukan untuk menggunakan fitur ini."
-  },
   "authenticationTimeout": {
     "message": "Batas waktu otentikasi"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Baca kunci keamanan"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Menunggu interaksi kunci keamanan..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Anda harus menambahkan antara URL dasar server atau paling tidak satu lingkungan ubahsuai."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Lingkungan Khusus"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Matikan isi otomatis"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Tampilkan saran isi otomatis pada kolom formulir"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Tampilkan identitas sebagai saran"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Tahun Kedaluwarsa"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Masa Berlaku"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Atur Kata Sandi Utama"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Galat"
   },
   "decryptionError": {
     "message": "Kesalahan dekripsi"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden tidak bisa mendekripsi butir brankas yang tercantum di bawah."
   },
@@ -3970,6 +4071,15 @@
     "message": "Isi otomatis ketika halaman dimuat telah diatur untuk menggunakan pengaturan bawaan.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Saklar bilah isi navigasi"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Organisasi gratis tidak dapat menggunakan lampiran"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Tampilkan deteksi kecocokan $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Selamat datang di brankas Anda!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Benda-benda isi otomatis untuk halaman saat ini"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json
index df4411ee42b..d4d032737b8 100644
--- a/apps/browser/src/_locales/it/messages.json
+++ b/apps/browser/src/_locales/it/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Usa il Single Sign-On"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "La tua organizzazione richiede un accesso Single Sign-On (SSO)."
+  },
   "welcomeBack": {
     "message": "Bentornato/a"
   },
@@ -550,32 +553,40 @@
   "resetSearch": {
     "message": "Svuota ricerca"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archivio",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "Archivia",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Togli dall'archivio"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Elementi in archivio"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Archivio vuoto"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Gli elementi archiviati compariranno qui e saranno esclusi dai risultati di ricerca e suggerimenti di autoriempimento."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Elemento archiviato"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Elemento rimosso dall'archivio"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Archivia elemento"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Gli elementi archiviati sono esclusi dai risultati di ricerca e suggerimenti di autoriempimento. Vuoi davvero archiviare questo elemento?"
+  },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
   },
   "edit": {
     "message": "Modifica"
@@ -583,8 +594,17 @@
   "view": {
     "message": "Visualizza"
   },
+  "viewAll": {
+    "message": "Mostra tutto"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "Vedi meno"
+  },
   "viewLogin": {
-    "message": "View login"
+    "message": "Visualizza login"
   },
   "noItemsInList": {
     "message": "Non ci sono elementi da mostrare."
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Password principale errata"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Password principale errata. Conferma che l'email sia corretta e che l'account sia stato creato su $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Timeout cassaforte"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Al blocco del computer"
   },
+  "onIdle": {
+    "message": "Quando il sistema è inattivo"
+  },
+  "onSleep": {
+    "message": "Quando il sistema è sospeso"
+  },
   "onRestart": {
     "message": "Al riavvio del browser"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Elemento salvato"
   },
+  "savedWebsite": {
+    "message": "Sito Web salvato"
+  },
+  "savedWebsites": {
+    "message": "Siti Web salvati ( $COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Sei sicuro di voler eliminare questo elemento?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Richiedi dati biometrici all'avvio"
   },
-  "premiumRequired": {
-    "message": "Premium necessario"
-  },
-  "premiumRequiredDesc": {
-    "message": "Passa a Premium per utilizzare questa funzionalità."
-  },
   "authenticationTimeout": {
     "message": "Timeout autenticazione"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Leggi chiave di sicurezza"
   },
+  "readingPasskeyLoading": {
+    "message": "Lettura passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Autenticazione passkey fallita"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Usa un altro metodo di accesso"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "In attesa di interazione con la chiave di sicurezza..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Devi aggiungere lo URL del server di base o almeno un ambiente personalizzato."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Gli indirizzi devono usare il protocollo HTTPS."
+  },
   "customEnvironment": {
     "message": "Ambiente personalizzato"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Disattiva il riempimento automatico"
   },
+  "confirmAutofill": {
+    "message": "Conferma il riempimento automatico"
+  },
+  "confirmAutofillDesc": {
+    "message": "Questo sito non corrisponde ai tuoi dati di accesso salvati. Prima di compilare le credenziali di accesso, assicurati che si tratti di un sito affidabile."
+  },
   "showInlineMenuLabel": {
     "message": "Mostra suggerimenti di riempimento automatico nei campi del modulo"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "In che modo Bitwarden ti protegge dai pericoli del phising?"
+  },
+  "currentWebsite": {
+    "message": "Sito web corrente"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Compila e aggiungi questo sito"
+  },
+  "autofillWithoutAdding": {
+    "message": "Compila senza salvare"
+  },
+  "doNotAutofill": {
+    "message": "Non compilare con il riempimento automatico"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Mostra identità come consigli"
   },
@@ -1782,7 +1856,7 @@
     "message": "Cliccare fuori del pop-up per controllare il codice di verifica nella tua email chiuderà questo pop-up. Vuoi aprire questo pop-up in una nuova finestra in modo che non si chiuda?"
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Mostra le icone dei siti e recupera gli URL di cambio password"
   },
   "cardholderName": {
     "message": "Titolare della carta"
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Anno di scadenza"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Scadenza"
   },
@@ -1947,79 +2024,79 @@
     "message": "Nota"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "Nuovo Login",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "Nuova Carta",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "Nuova Identità",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "Nuova Nota",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "Nuova chiave SSH",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Nuovo Send di testo",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Nuovo Send di File",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "Modifica Login",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "Modifica Carta",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "Modifica Identità",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "Modifica Nota",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "Modifica chiave SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Modifica Send di Testo",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Modifica Send di File",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Vedi Login",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Vedi Carta",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "Vedi Identità",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "Vedi Nota",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "Vedi chiave SSH",
     "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Questa pagina sta interferendo con Bitwarden. Il menu in linea di Bitwarden è stato temporaneamente disabilitato come misura di sicurezza."
+  },
   "setMasterPassword": {
     "message": "Imposta password principale"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Solo la vault dell'organizzazione associata con $ORGANIZATION$ sarà esportata.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Solo la vault dell'organizzazione associata con $ORGANIZATION$ sarà esportata. Le tue raccolte non saranno incluse.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Errore"
   },
   "decryptionError": {
     "message": "Errore di decifrazione"
   },
+  "errorGettingAutoFillData": {
+    "message": "Errore: impossibile accedere ai dati per il riempimento automatico"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden non può decifrare gli elementi elencati di seguito."
   },
@@ -3970,6 +4071,15 @@
     "message": "Riempimento automatico al caricamento della pagina impostato con l'impostazione predefinita.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Impossibile usare il riempimento automatico"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "La corrispondenza predefinita è impostata su 'Corrispondenza esatta'. Il sito Web corrente non corrisponde esattamente ai dettagli di accesso salvati per questo elemento."
+  },
+  "okay": {
+    "message": "OK"
+  },
   "toggleSideNavigation": {
     "message": "Attiva/Disattiva navigazione laterale"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Sblocca reportistica, accesso d'emergenza e altre funzionalità di sicurezza con Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Le organizzazioni gratis non possono utilizzare gli allegati"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Predefinito ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Mostra corrispondenza $WEBSITE$",
     "placeholders": {
@@ -5485,10 +5608,10 @@
     "message": "Cambia parola d'accesso a rischio"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Questo login è a rischio e non contiene un sito web. Aggiungi un sito web e cambia la password per maggiore sicurezza."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Sito web mancante"
   },
   "settingsVaultOptions": {
     "message": "Opzioni cassaforte"
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Benvenuto nella tua cassaforte!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Tentativo di phishing rilevato"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "Stai cercando di visitare un sito dannoso noto che può mettere a rischio la tua sicurezza."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Chiudi tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Vai al sito (SCONSIGLIATO!)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Questo sito è stato trovato in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", un elenco open-source di siti di phishing noti per il furto di informazioni personali e sensibili.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Scopri di più sul rilevamento di phishing"
+  },
+  "protectedBy": {
+    "message": "Protetto da $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Riempimento automatico per questa pagina"
@@ -5626,10 +5769,10 @@
     "description": "Aria label for the body content of the generator nudge"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Riguardo questa opzione"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden userà gli URL memorizzati in ogni login per mostrare, se possibile, l'icona del sito Web e l'URL di modifica password per facilitare la modifica delle credenziali. Nessuna informazione è raccolta o archiviata per il funzionamento di questo servizio."
   },
   "noPermissionsViewPage": {
     "message": "Non hai i permessi per visualizzare questa pagina. Prova ad accedere con un altro account."
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Conferma dominio Key Connector"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Ottimo lavoro, i tuoi dati di accesso sono al sicuro!"
+  },
+  "upgradeNow": {
+    "message": "Aggiorna ora"
+  },
+  "builtInAuthenticator": {
+    "message": "App di autenticazione integrata"
+  },
+  "secureFileStorage": {
+    "message": "Archiviazione sicura di file"
+  },
+  "emergencyAccess": {
+    "message": "Accesso di emergenza"
+  },
+  "breachMonitoring": {
+    "message": "Monitoraggio delle violazioni"
+  },
+  "andMoreFeatures": {
+    "message": "E molto altro!"
+  },
+  "planDescPremium": {
+    "message": "Sicurezza online completa"
+  },
+  "upgradeToPremium": {
+    "message": "Aggiorna a Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Scopri Premium"
+  },
+  "loadingVault": {
+    "message": "Caricamento cassaforte"
+  },
+  "vaultLoaded": {
+    "message": "Cassaforte caricata"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Questa impostazione è disabilitata dalle restrizioni della tua organizzazione.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "CAP"
+  },
+  "cardNumberLabel": {
+    "message": "Numero di carta"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Azione al timeout"
   }
 }
diff --git a/apps/browser/src/_locales/ja/messages.json b/apps/browser/src/_locales/ja/messages.json
index 5305a265781..c13b139e13a 100644
--- a/apps/browser/src/_locales/ja/messages.json
+++ b/apps/browser/src/_locales/ja/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Bitwarden ロゴ"
   },
   "extName": {
     "message": "Bitwarden パスワードマネージャー",
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "シングルサインオンを使用する"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "あなたの組織ではシングルサインオン (SSO) を使用する必要があります。"
+  },
   "welcomeBack": {
     "message": "ようこそ"
   },
@@ -550,11 +553,16 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "アーカイブ",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "アーカイブ",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "アーカイブ解除"
   },
   "itemsInArchive": {
     "message": "Items in archive"
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,14 +585,26 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "編集"
   },
   "view": {
     "message": "表示"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
-    "message": "View login"
+    "message": "ログイン情報を表示"
   },
   "noItemsInList": {
     "message": "表示するアイテムがありません"
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "マスターパスワードが間違っています"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "保管庫のタイムアウト"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "ロック時"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "ブラウザ再起動時"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "編集されたアイテム"
   },
+  "savedWebsite": {
+    "message": "保存されたウェブサイト"
+  },
+  "savedWebsites": {
+    "message": "保存されたウェブサイト ($COUNT$ 件)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "このアイテムを削除しますか？"
   },
@@ -1113,10 +1160,10 @@
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "新しい通知"
   },
   "labelWithNotification": {
-    "message": "$LABEL$: New notification",
+    "message": "$LABEL$: 新しい通知",
     "description": "Label for the notification with a new login suggestion.",
     "placeholders": {
       "label": {
@@ -1158,11 +1205,11 @@
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
-    "message": "Save login",
+    "message": "ログインを保存",
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "既存のログイン情報を更新",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "起動時に生体認証を要求する"
   },
-  "premiumRequired": {
-    "message": "プレミアム会員専用"
-  },
-  "premiumRequiredDesc": {
-    "message": "この機能を使うにはプレミアム会員になってください。"
-  },
   "authenticationTimeout": {
     "message": "認証のタイムアウト"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "セキュリティキーの読み取り"
   },
+  "readingPasskeyLoading": {
+    "message": "パスキーを読み込み中…"
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "パスキー認証に失敗しました"
+  },
+  "useADifferentLogInMethod": {
+    "message": "別のログイン方法を使用する"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "セキュリティキーとの通信を待ち受け中…"
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "ベース サーバー URL または少なくとも 1 つのカスタム環境を追加する必要があります。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL は HTTPS を使用する必要があります。"
+  },
   "customEnvironment": {
     "message": "カスタム環境"
   },
@@ -1651,11 +1704,32 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "自動入力をオフにする"
+  },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
   },
   "showInlineMenuLabel": {
     "message": "フォームフィールドに自動入力の候補を表示する"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "自動入力しない"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "ID を候補として表示する"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "有効期限年"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "有効期限"
   },
@@ -1842,7 +1919,7 @@
     "message": "セキュリティコード"
   },
   "cardNumber": {
-    "message": "card number"
+    "message": "カード番号"
   },
   "ex": {
     "message": "例:"
@@ -1944,30 +2021,30 @@
     "message": "SSH 鍵"
   },
   "typeNote": {
-    "message": "Note"
+    "message": "メモ"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "新規ログイン",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "新規カード",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "新規身分証",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "新規メモ",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "新しい SSH キー",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "新しい Send テキスト",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
@@ -1975,11 +2052,11 @@
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "ログインを編集",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "カードを編集",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
@@ -1987,15 +2064,15 @@
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "メモを編集",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "SSH キーを編集",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Send テキストを編集",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
@@ -2003,11 +2080,11 @@
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "ログインを表示",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "カードを表示",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
@@ -2015,11 +2092,11 @@
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "メモを表示",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "SSH キーを表示",
     "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
@@ -2278,7 +2355,7 @@
     "message": "このパスワードを使用する"
   },
   "useThisPassphrase": {
-    "message": "Use this passphrase"
+    "message": "このパスフレーズを使用"
   },
   "useThisUsername": {
     "message": "このユーザー名を使用する"
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "マスターパスワードを設定"
   },
@@ -2595,7 +2675,7 @@
     "message": "変更"
   },
   "changePassword": {
-    "message": "Change password",
+    "message": "パスワードを変更",
     "description": "Change password button for browser at risk notification on login."
   },
   "changeButtonTitle": {
@@ -2608,7 +2688,7 @@
     }
   },
   "atRiskPassword": {
-    "message": "At-risk password"
+    "message": "リスクがあるパスワード"
   },
   "atRiskPasswords": {
     "message": "リスクがあるパスワード"
@@ -2784,7 +2864,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCountReached": {
-    "message": "Max access count reached",
+    "message": "最大アクセス数に達しました",
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "hideTextByDefault": {
@@ -3134,7 +3214,7 @@
     "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "組織名"
   },
   "keyConnectorDomain": {
     "message": "Key Connector domain"
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "エラー"
   },
   "decryptionError": {
     "message": "復号エラー"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden は以下の保管庫のアイテムを復号できませんでした。"
   },
@@ -3276,7 +3377,7 @@
     "message": "サービス"
   },
   "forwardedEmail": {
-    "message": "転送されたメールエイリアス"
+    "message": "転送されるメールエイリアス"
   },
   "forwardedEmailDesc": {
     "message": "外部転送サービスを使用してメールエイリアスを生成します。"
@@ -3525,7 +3626,7 @@
     "message": "リクエストが送信されました"
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "$EMAIL$ に $DEVICE$ でのログインを承認しました",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3538,16 +3639,16 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "別のデバイスからのログイン試行を拒否しました。自分自身である場合は、もう一度デバイスでログインしてください。"
   },
   "device": {
-    "message": "Device"
+    "message": "デバイス"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "ログイン状態"
   },
   "masterPasswordChanged": {
-    "message": "Master password saved"
+    "message": "マスターパスワードが保存されました"
   },
   "exposedMasterPassword": {
     "message": "流出したマスターパスワード"
@@ -3640,28 +3741,28 @@
     "message": "このデバイスを記憶して今後のログインをシームレスにする"
   },
   "manageDevices": {
-    "message": "Manage devices"
+    "message": "デバイスを管理"
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "現在のセッション"
   },
   "mobile": {
-    "message": "Mobile",
+    "message": "モバイル",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "拡張機能",
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "デスクトップ",
     "description": "Desktop app"
   },
   "webVault": {
-    "message": "Web vault"
+    "message": "ウェブ保管庫"
   },
   "webApp": {
-    "message": "Web app"
+    "message": "Web アプリ"
   },
   "cli": {
     "message": "CLI"
@@ -3671,22 +3772,22 @@
     "description": "Software Development Kit"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "保留中のリクエスト"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "初回ログイン"
   },
   "trusted": {
-    "message": "Trusted"
+    "message": "信頼済み"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "承認が必要"
   },
   "devices": {
-    "message": "Devices"
+    "message": "デバイス"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "$EMAIL$ によるログインの試行",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3695,31 +3796,31 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "アクセスの確認"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "アクセスを拒否"
   },
   "time": {
-    "message": "Time"
+    "message": "時間"
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "デバイス種別"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "ログインリクエスト"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "このリクエストは無効になりました。"
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "Login request has already expired."
+    "message": "ログインリクエストの有効期限が切れています。"
   },
   "justNow": {
-    "message": "Just now"
+    "message": "たった今"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "$MINUTES$ 分前に要求されました",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -3749,7 +3850,7 @@
     "message": "管理者の承認を要求する"
   },
   "unableToCompleteLogin": {
-    "message": "Unable to complete login"
+    "message": "ログインを完了できません"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
     "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
@@ -3819,13 +3920,13 @@
     "message": "Trust organization"
   },
   "trust": {
-    "message": "Trust"
+    "message": "信頼する"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "信頼しない"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "組織は信頼されていません"
   },
   "emergencyAccessTrustWarning": {
     "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
@@ -3840,11 +3941,11 @@
     "message": "Trust user"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "機密情報を安全に送信",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "どのプラットフォームでも、誰とでも安全にファイルとデータを共有できます。流出を防止しながら、あなたの情報はエンドツーエンドで暗号化されます。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3970,6 +4071,15 @@
     "message": "ページ読み込み時の自動入力はデフォルトの設定を使うよう設定しました。",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "自動入力できません"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "OK"
+  },
   "toggleSideNavigation": {
     "message": "サイドナビゲーションの切り替え"
   },
@@ -4179,10 +4289,10 @@
     "message": "コレクションを選択"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "インポートしたファイルコンテンツをコレクションに移動したい場合は、このオプションを選択してください"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "インポートしたファイルコンテンツをフォルダーに移動したい場合は、このオプションを選択してください"
   },
   "importUnassignedItemsError": {
     "message": "割り当てられていないアイテムがファイルに含まれています。"
@@ -4419,7 +4529,7 @@
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "message": "URI の一致検出方法は、Bitwarden が自動入力候補をどのように判別するかを指定します。",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
@@ -4435,7 +4545,7 @@
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
-    "message": "Advanced options",
+    "message": "高度な設定",
     "description": "Advanced option placeholder for uri option component"
   },
   "confirmContinueToBrowserSettingsTitle": {
@@ -4622,7 +4732,7 @@
     }
   },
   "copyFieldCipherName": {
-    "message": "Copy $FIELD$, $CIPHERNAME$",
+    "message": "$FIELD$ ($CIPHERNAME$) をコピー",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -4769,31 +4879,31 @@
     }
   },
   "downloadBitwarden": {
-    "message": "Download Bitwarden"
+    "message": "Bitwarden をダウンロード"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Download Bitwarden on all devices"
+    "message": "すべてのデバイスに Bitwarden をダウンロード"
   },
   "getTheMobileApp": {
-    "message": "Get the mobile app"
+    "message": "モバイルアプリを入手"
   },
   "getTheMobileAppDesc": {
     "message": "Access your passwords on the go with the Bitwarden mobile app."
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "デスクトップアプリを入手"
   },
   "getTheDesktopAppDesc": {
     "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
   },
   "downloadFromBitwardenNow": {
-    "message": "Download from bitwarden.com now"
+    "message": "bitwarden.com から今すぐダウンロード"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "Google Play で入手"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "App Store からダウンロード"
   },
   "permanentlyDeleteAttachmentConfirmation": {
     "message": "この添付ファイルを完全に削除してもよろしいですか？"
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "プレミアム"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "無料の組織は添付ファイルを使用できません"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "既定 ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "一致検出 $WEBSITE$を表示",
     "placeholders": {
@@ -5149,7 +5272,7 @@
     "message": "拡張機能アイコンにログイン自動入力の候補の数を表示する"
   },
   "accountAccessRequested": {
-    "message": "Account access requested"
+    "message": "アカウントへのアクセスが要求されました"
   },
   "confirmAccessAttempt": {
     "message": "Confirm access attempt for $EMAIL$",
@@ -5266,7 +5389,7 @@
     "message": "Unlock PIN set"
   },
   "unlockWithBiometricSet": {
-    "message": "Unlock with biometrics set"
+    "message": "生体認証でロック解除を設定しました"
   },
   "authenticating": {
     "message": "認証中"
@@ -5280,7 +5403,7 @@
     "description": "Notification message for when a password has been regenerated"
   },
   "saveToBitwarden": {
-    "message": "Save to Bitwarden",
+    "message": "Bitwarden へ保存",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
@@ -5488,13 +5611,13 @@
     "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "ウェブサイトがありません"
   },
   "settingsVaultOptions": {
     "message": "保管庫オプション"
   },
   "emptyVaultDescription": {
-    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+    "message": "保管庫はパスワードだけではなく、ログイン情報、ID、カード、メモを安全に保管できます。"
   },
   "introCarouselLabel": {
     "message": "Bitwarden へようこそ"
@@ -5524,31 +5647,51 @@
     "message": "Bitwarden のモバイル、ブラウザ、デスクトップアプリでは、保存できるパスワード数やデバイス数に制限はありません。"
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1件の通知"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "既存のパスワードをインポート"
   },
   "emptyVaultNudgeBody": {
     "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "今すぐインポート"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "保管庫へようこそ!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "このタブを閉じる"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "$PRODUCT$ によって保護されています",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5568,7 +5711,7 @@
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "ウェブサイト",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -5596,20 +5739,20 @@
     "message": "With notes, securely store sensitive data like banking or insurance details."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "開発者フレンドリーの SSH アクセス"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "SSHエージェントにキーを登録することで、高速かつ暗号化された認証が可能になります。",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "SSH エージェントに関する詳細",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "パスワードをすばやく作成"
   },
   "generatorNudgeBodyOne": {
     "message": "Easily create strong and unique passwords by clicking on",
@@ -5626,7 +5769,7 @@
     "description": "Aria label for the body content of the generator nudge"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "この設定について"
   },
   "permitCipherDetailsDescription": {
     "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
@@ -5639,13 +5782,13 @@
     "description": "'WebAssembly' is a technical term and should not be translated."
   },
   "showMore": {
-    "message": "Show more"
+    "message": "もっと見る"
   },
   "showLess": {
-    "message": "Show less"
+    "message": "隠す"
   },
   "next": {
-    "message": "Next"
+    "message": "次へ"
   },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "今すぐアップグレード"
+  },
+  "builtInAuthenticator": {
+    "message": "認証機を内蔵"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "緊急アクセス"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "プレミアムにアップグレード"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "郵便番号"
+  },
+  "cardNumberLabel": {
+    "message": "カード番号"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/ka/messages.json b/apps/browser/src/_locales/ka/messages.json
index b759d674cca..a54a0f2c657 100644
--- a/apps/browser/src/_locales/ka/messages.json
+++ b/apps/browser/src/_locales/ka/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -162,7 +165,7 @@
     "message": "Copy passport number"
   },
   "copyLicenseNumber": {
-    "message": "Copy license number"
+    "message": "დააკოპირეთ ლიცენზიის ნომერი"
   },
   "copyPrivateKey": {
     "message": "Copy private key"
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "ჩასწორება"
   },
   "view": {
     "message": "ხედი"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "ვადა"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "შეცდომა"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "პრემიუმი"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/km/messages.json b/apps/browser/src/_locales/km/messages.json
index 78a49021a0c..f829937ac51 100644
--- a/apps/browser/src/_locales/km/messages.json
+++ b/apps/browser/src/_locales/km/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/kn/messages.json b/apps/browser/src/_locales/kn/messages.json
index 1311a97df68..bd2be23828c 100644
--- a/apps/browser/src/_locales/kn/messages.json
+++ b/apps/browser/src/_locales/kn/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "ಎಡಿಟ್"
   },
   "view": {
     "message": "ವೀಕ್ಷಣೆ"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "ಅಮಾನ್ಯ ಮಾಸ್ಟರ್ ಪಾಸ್‌ವರ್ಡ್"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "ವಾಲ್ಟ್ ಕಾಲಾವಧಿ"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "ಸಿಸ್ಟಮ್ ಲಾಕ್‌ನಲ್ಲಿ"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "ಬ್ರೌಸರ್ ಮರುಪ್ರಾರಂಭದಲ್ಲಿ"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "ಐಟಂ ಸಂಪಾದಿಸಲಾಗಿದೆ"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "ನೀವು ನಿಜವಾಗಿಯೂ ಅನುಪಯುಕ್ತಕ್ಕೆ ಕಳುಹಿಸಲು ಬಯಸುವಿರಾ?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "ಪ್ರೀಮಿಯಂ ಅಗತ್ಯವಿದೆ"
-  },
-  "premiumRequiredDesc": {
-    "message": "ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲು ಪ್ರೀಮಿಯಂ ಸದಸ್ಯತ್ವ ಅಗತ್ಯವಿದೆ."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "ಕಸ್ಟಮ್ ಪರಿಸರ"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "ಮುಕ್ತಾಯ ವರ್ಷ"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "ಮುಕ್ತಾಯ"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "ಮಾಸ್ಟರ್ ಪಾಸ್ವರ್ಡ್ ಹೊಂದಿಸಿ"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/ko/messages.json b/apps/browser/src/_locales/ko/messages.json
index 06611be0282..1ad08accfc9 100644
--- a/apps/browser/src/_locales/ko/messages.json
+++ b/apps/browser/src/_locales/ko/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "통합인증(SSO) 사용하기"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "돌아온 것을 환영합니다."
   },
@@ -189,7 +192,7 @@
     "message": "노트 복사"
   },
   "copy": {
-    "message": "Copy",
+    "message": "복사",
     "description": "Copy to clipboard"
   },
   "fill": {
@@ -383,7 +386,7 @@
     "message": "폴더 편집"
   },
   "editFolderWithName": {
-    "message": "Edit folder: $FOLDERNAME$",
+    "message": "폴더 편집: $FOLDERNAME$",
     "placeholders": {
       "foldername": {
         "content": "$1",
@@ -471,10 +474,10 @@
     "message": "패스프레이즈 생성됨"
   },
   "usernameGenerated": {
-    "message": "Username generated"
+    "message": "사용자 이름 생성"
   },
   "emailGenerated": {
-    "message": "Email generated"
+    "message": "이메일 생성"
   },
   "regeneratePassword": {
     "message": "비밀번호 재생성"
@@ -548,34 +551,42 @@
     "message": "보관함 검색"
   },
   "resetSearch": {
-    "message": "Reset search"
+    "message": "검색 초기화"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "보관",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "보관",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "보관 해제"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "보관함의 항목"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "보관함의 항목"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "보관된 항목은 여기에 표시되며 일반 검색 결과 및 자동 완성 제안에서 제외됩니다."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "항목이 보관함으로 이동되었습니다"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "항목 보관 해제됨"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "항목 보관"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "보관된 항목은 일반 검색 결과와 자동 완성 제안에서 제외됩니다. 이 항목을 보관하시겠습니까?"
+  },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
   },
   "edit": {
     "message": "편집"
@@ -583,8 +594,17 @@
   "view": {
     "message": "보기"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
-    "message": "View login"
+    "message": "로그인 보기"
   },
   "noItemsInList": {
     "message": "항목이 없습니다."
@@ -689,7 +709,7 @@
     "message": "사용하고 있는 웹 브라우저가 쉬운 클립보드 복사를 지원하지 않습니다. 직접 복사하세요."
   },
   "verifyYourIdentity": {
-    "message": "Verify your identity"
+    "message": "신원을 인증하세요"
   },
   "weDontRecognizeThisDevice": {
     "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "잘못된 마스터 비밀번호"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "보관함 시간 제한"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "시스템 잠금 시"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "브라우저 재시작 시"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "항목 편집함"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "정말로 휴지통으로 이동시킬까요?"
   },
@@ -1222,7 +1269,7 @@
     "message": "웹사이트에서 변경 사항이 감지되면 로그인 비밀번호를 업데이트하라는 메시지를 표시합니다. 모든 로그인된 계정에 적용됩니다."
   },
   "enableUsePasskeys": {
-    "message": "패스키를 저장 및 사용할지 묻기"
+    "message": "패스키 저장 및 사용 확인"
   },
   "usePasskeysDesc": {
     "message": "보관함에 새 패스키를 저장하거나 로그인할지 물어봅니다. 모든 로그인된 계정에 적용됩니다."
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "실행 시 생체 인증 요구하기"
   },
-  "premiumRequired": {
-    "message": "프리미엄 멤버십 필요"
-  },
-  "premiumRequiredDesc": {
-    "message": "이 기능을 사용하려면 프리미엄 멤버십이 필요합니다."
-  },
   "authenticationTimeout": {
     "message": "인증 시간 초과"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "기본 서버 URL이나 최소한 하나의 사용자 지정 환경을 추가해야 합니다."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "사용자 지정 환경"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "양식 필드에 자동 완성 제안 표시"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "신원을 제안으로 표시"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "만료 연도"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "만료"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "마스터 비밀번호 설정"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "오류"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3840,7 +3941,7 @@
     "message": "Trust user"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "민감한 정보 안전하게 보내세요",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
@@ -3970,6 +4071,15 @@
     "message": "페이지 로드 시 자동 완성이 기본 설정을 사용하도록 설정되었습니다.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "사이드 내비게이션 전환"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "프리미엄"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "무료 조직에서는 첨부 파일을 사용할 수 없습니다."
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "$WEBSITE$ 일치 인식 보이기",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/lt/messages.json b/apps/browser/src/_locales/lt/messages.json
index 464fa5aae92..46ffb24e3df 100644
--- a/apps/browser/src/_locales/lt/messages.json
+++ b/apps/browser/src/_locales/lt/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Naudoti vieningo prisijungimo sistemą"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Sveiki sugrįžę"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Keisti"
   },
   "view": {
     "message": "Peržiūrėti"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Neteisingas pagrindinis slaptažodis"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Atsijungta nuo saugyklos"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Užrakinant sistemą"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Paleidus iš naujo naršyklę"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Redaguotas elementas"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Ar tikrai norite perkelti į šiukšlinę?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Paleidžiant patvirtinti biometrinius duomenis"
   },
-  "premiumRequired": {
-    "message": "Premium reikalinga"
-  },
-  "premiumRequiredDesc": {
-    "message": "Premium narystė reikalinga šiai funkcijai naudoti."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Individualizuota aplinka"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Galiojimo pabaigos metai"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Galiojimo pabaiga"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Pagrindinio slaptažodžio nustatymas"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Klaida"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Automatinis pildymas įkeliant puslapį nustatytas naudoti numatytąjį nustatymą.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Perjungti šoninę naršymą"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "„Premium“"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Nemokamos organizacijos negali naudoti priedų"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/lv/messages.json b/apps/browser/src/_locales/lv/messages.json
index 99edb486d9d..754781dc4f7 100644
--- a/apps/browser/src/_locales/lv/messages.json
+++ b/apps/browser/src/_locales/lv/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Izmantot vienoto pieteikšanos"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tava apvienība pieprasa vienoto pieteikšanos."
+  },
   "welcomeBack": {
     "message": "Laipni lūdzam atpakaļ"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Atiestatīt meklēšanu"
   },
-  "archive": {
-    "message": "Arhivēt"
+  "archiveNoun": {
+    "message": "Arhīvs",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arhivēt",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Atcelt arhivēšanu"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Šeit parādīsies arhivētie vienumi, un tie netiks iekļauti vispārējās meklēšanas iznākumos un automātiskās aizpildes ieteikumos."
   },
-  "itemSentToArchive": {
-    "message": "Vienums ievietots arhīvā"
+  "itemWasSentToArchive": {
+    "message": "Vienums tika ievietots arhīvā"
   },
-  "itemRemovedFromArchive": {
-    "message": "Vienums izņemts no arhīva"
+  "itemUnarchived": {
+    "message": "Vienums tika izņemts no arhīva"
   },
   "archiveItem": {
     "message": "Arhivēt vienumu"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Arhivētie vienumi netiek iekļauti vispārējās meklēšanas iznākumos un automātiskās aizpildes ieteikumos. Vai tiešām ahrivēt šo vienumu?"
   },
+  "upgradeToUseArchive": {
+    "message": "Ir nepieciešama Premium dalība, lai izmantotu arhīvu."
+  },
   "edit": {
     "message": "Labot"
   },
   "view": {
     "message": "Skatīt"
   },
+  "viewAll": {
+    "message": "Apskatīt visu"
+  },
+  "showAll": {
+    "message": "Rādīt visu"
+  },
+  "viewLess": {
+    "message": "Skatīt mazāk"
+  },
   "viewLogin": {
     "message": "Apskatīt pieteikšanās vienumu"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Nederīga galvenā parole"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Nederīga galvenā parole. Jāpārliecinās, ka e-pasta adrese ir pareiza un konts tika izveidots $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Glabātavas noildze"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Pēc sistēmas aizslēgšanas"
   },
+  "onIdle": {
+    "message": "Sistēmas dīkstāvē"
+  },
+  "onSleep": {
+    "message": "Pēc sistēmas iemigšanas"
+  },
   "onRestart": {
     "message": "Pēc pārlūka pārsāknēšanas"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Vienums labots"
   },
+  "savedWebsite": {
+    "message": "Saglabāta tīmekļvietne"
+  },
+  "savedWebsites": {
+    "message": "Saglabātas tīmekļvietnes ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Vai tiešām pārvietot uz atkritni?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Palaižot vaicāt biometriju"
   },
-  "premiumRequired": {
-    "message": "Nepieciešams Premium"
-  },
-  "premiumRequiredDesc": {
-    "message": "Ir nepieciešama Premium dalība, lai izmantotu šo iespēju."
-  },
   "authenticationTimeout": {
     "message": "Autentificēšanās noildze"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Nolasīt drošības atslēgu"
   },
+  "readingPasskeyLoading": {
+    "message": "Nolasa piekļuves atslēgu..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Autentificēšanās ar piekļuves atslēgu neizdevās"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Jāizmanto cits pieteikšanās veids"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Gaida mijiedarbību ar drošības atslēgu..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Jāpievieno vai no servera pamata URL vai vismaz viena pielāgota vide."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL ir jābūt HTTPS."
+  },
   "customEnvironment": {
     "message": "Pielāgota vide"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Izslēgt automātisko aizpildi"
   },
+  "confirmAutofill": {
+    "message": "Apstiprināt automātisko aizpildi"
+  },
+  "confirmAutofillDesc": {
+    "message": "Šī vietne neatbilst saglabātā pieteikšanās vienumam. Pirms pieteikšanās datu aizpildīšanas jāpārliecinās, ka tā ir uzticama."
+  },
   "showInlineMenuLabel": {
     "message": "Rādīt automātiskās aizpildes ieteikumuis veidlapu laukos"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Kā Bitwarden aizsargā datus no pikšķerēšanas?"
+  },
+  "currentWebsite": {
+    "message": "Pašreizējā tīmekļvietne"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Automātiski aizpildīt un pievienot šo tīmekļvietni"
+  },
+  "autofillWithoutAdding": {
+    "message": "Automātiski aizpildīt bez pievienošanas"
+  },
+  "doNotAutofill": {
+    "message": "Neaizpildīt automātiski"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Attēlot identitātes kā ieteikumus"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Derīguma gads"
   },
+  "monthly": {
+    "message": "mēnesī"
+  },
   "expiration": {
     "message": "Derīgums"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Šī lapa traucē Bitwarden darbību. Bitwarden iekļautā izvēlne ir īslaicīgi atspējot kā drošības mērs."
+  },
   "setMasterPassword": {
     "message": "Uzstādīt galveno paroli"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Tiks izgūta tikai apvienības glabātava, kas ir saistīta ar $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Tiks izgūta tikai apvienības glabātava, kas ir saistīta ar $ORGANIZATION$. Mani vienumu krājumi netiks iekļauti.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Kļūda"
   },
   "decryptionError": {
     "message": "Atšifrēšanas kļūda"
   },
+  "errorGettingAutoFillData": {
+    "message": "Kļūda automātiskās aizpildes datu iegūšanā"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden nevarēja atšifrēt zemāk uzskaitītos glabātavas vienumus."
   },
@@ -3970,6 +4071,15 @@
     "message": "Automātiskā aizpilde lapas ielādes brīdī iestatīta izmantot noklusējuma iestatījumu.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Nevar automātiski aizpildīt"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Noklusējuma atbilstības noteikšana ir iestatīta uz “Pilnīga atbilstība”. Pašreizējā tīmekļvietne pilnībā neabilst saglabātajai pieteikšanās informācijai šajā vienumā."
+  },
+  "okay": {
+    "message": "Labi"
+  },
   "toggleSideNavigation": {
     "message": "Pārslēgt sānu pārvietošanās joslu"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Iegūsti piekļuvi atskaitēm, ārkārtas piekļuvei un citām drošības iespējām ar Premium!"
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Bezmaksas apvienības nevar izmantot pielikumus"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Noklusējums ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Rādīt atbilstības noteikšanu $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Laipni lūdzam Tavā glabātavā!"
   },
-  "phishingPageTitle": {
-    "message": "Pikšķerēšanas tīmekļvietne"
+  "phishingPageTitleV2": {
+    "message": "Noteikts pikšķerēšanas mēģinājums"
   },
-  "phishingPageCloseTab": {
-    "message": "Aizvērt cilni"
+  "phishingPageSummary": {
+    "message": "Vietne, kuru mēģini apmeklēt, ir zināma ļaunprātīga vietne un drošības risks."
   },
-  "phishingPageContinue": {
-    "message": "Turpināt"
+  "phishingPageCloseTabV2": {
+    "message": "Aizvērt šo cilni"
   },
-  "phishingPageLearnWhy": {
-    "message": "Kāpēc šis ir redzams?"
+  "phishingPageContinueV2": {
+    "message": "Turpināt šīs vietnes apmeklēšanu (nav ieteicams)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Šī vietne tika atrasta ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", atvērta pirmkoda saraksts ar zināmām pikšķerēšanas vietnēm, kuras tiek izmantotas personīgas un jūtīgas informācijas zagšanai.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Uzzināt vairāk par pikšķerēšanas noteikšanu"
+  },
+  "protectedBy": {
+    "message": "Aizsargā $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Automātiska pašreizējās lapas vienumu aizpildīšana"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Apstiprināt Key Connector domēnu"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Labs darbs riskam pakļauto pieteikšanās vienumu drošības uzlabošanā!"
+  },
+  "upgradeNow": {
+    "message": "Uzlabot tagad"
+  },
+  "builtInAuthenticator": {
+    "message": "Iebūvēts autentificētājs"
+  },
+  "secureFileStorage": {
+    "message": "Droša datņu krātuve"
+  },
+  "emergencyAccess": {
+    "message": "Ārkārtas piekļuve"
+  },
+  "breachMonitoring": {
+    "message": "Noplūžu pārraudzīšana"
+  },
+  "andMoreFeatures": {
+    "message": "Un vēl!"
+  },
+  "planDescPremium": {
+    "message": "Pilnīga drošība tiešsaistē"
+  },
+  "upgradeToPremium": {
+    "message": "Uzlabot uz Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Atslēdz papildu drošības iespējas"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Premium abonements sniedz vairāk rīku drošības uzturēšanai un pārraudzībai"
+  },
+  "explorePremium": {
+    "message": "Izpētīt Premium"
+  },
+  "loadingVault": {
+    "message": "Ielādē glabātavu"
+  },
+  "vaultLoaded": {
+    "message": "Glabātava ielādēta"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Šis iestatījums ir atspējots apvienības pamatnostādnēs.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Pasta indekss"
+  },
+  "cardNumberLabel": {
+    "message": "Kartes numurs"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Noildzes darbība"
   }
 }
diff --git a/apps/browser/src/_locales/ml/messages.json b/apps/browser/src/_locales/ml/messages.json
index efe18c96a59..2f7f8d30e74 100644
--- a/apps/browser/src/_locales/ml/messages.json
+++ b/apps/browser/src/_locales/ml/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "തിരുത്തുക"
   },
   "view": {
     "message": "കാണുക"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "അസാധുവായ പ്രാഥമിക പാസ്‌വേഡ്"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "വാൾട് ടൈംഔട്ട്"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "സിസ്റ്റം ലോക്കിൽ"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "ബ്രൌസർ പുനരാരംഭിക്കുമ്പോൾ"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "തിരുത്തപ്പെട്ട ഇനം"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "ഈ ഇനം ഇല്ലാതാക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "പ്രീമിയം അംഗത്വം ആവശ്യമാണ്"
-  },
-  "premiumRequiredDesc": {
-    "message": "ഈ സവിശേഷത ഉപയോഗിക്കുന്നതിന് പ്രീമിയം അംഗത്വം ആവശ്യമാണ്."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "ഇഷ്‌ടാനുസൃത എൻവിയോണ്മെന്റ്"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "കാലാവതി കഴിയുന്ന വർഷം"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "കാലഹരണപ്പെടൽ"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "പ്രാഥമിക പാസ്‌വേഡ് സജ്ജമാക്കുക"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/mr/messages.json b/apps/browser/src/_locales/mr/messages.json
index 16ac31ff599..70f8fe5393c 100644
--- a/apps/browser/src/_locales/mr/messages.json
+++ b/apps/browser/src/_locales/mr/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "अवैध मुख्य पासवर्ड"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/my/messages.json b/apps/browser/src/_locales/my/messages.json
index 78a49021a0c..f829937ac51 100644
--- a/apps/browser/src/_locales/my/messages.json
+++ b/apps/browser/src/_locales/my/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json
index a23fd7fe4c1..0eba9c953a3 100644
--- a/apps/browser/src/_locales/nb/messages.json
+++ b/apps/browser/src/_locales/nb/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Bruk singulær pålogging"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Velkommen tilbake"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Rediger"
   },
   "view": {
     "message": "Vis"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Ugyldig hovedpassord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Tidsavbrudd i hvelvet"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Ved maskinlåsing"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Ved nettleseromstart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Redigerte elementet"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Er du sikker på at du vil slette dette elementet?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Spør om biometri ved oppstart"
   },
-  "premiumRequired": {
-    "message": "Premium er påkrevd"
-  },
-  "premiumRequiredDesc": {
-    "message": "Et Premium-medlemskap er påkrevd for å bruke denne funksjonen."
-  },
   "authenticationTimeout": {
     "message": "Tidsavbrudd for autentisering"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Les sikkerhetsnøkkel"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Tilpasset miljø"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Skru av autoutfylling"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Vis autoutfyll-forslag i tekstbokser"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Vis identiteter som forslag"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Utløpsår"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Utløp"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Angi hovedpassord"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Feil"
   },
   "decryptionError": {
     "message": "Dekrypteringsfeil"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Skru av/på sidenavigering"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Velkommen til hvelvet ditt!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/ne/messages.json b/apps/browser/src/_locales/ne/messages.json
index 78a49021a0c..f829937ac51 100644
--- a/apps/browser/src/_locales/ne/messages.json
+++ b/apps/browser/src/_locales/ne/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json
index 2562b7a1d4c..601aac16f94 100644
--- a/apps/browser/src/_locales/nl/messages.json
+++ b/apps/browser/src/_locales/nl/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Single sign-on gebruiken"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welkom terug"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Zoekopdracht resetten"
   },
-  "archive": {
-    "message": "Archiveren"
+  "archiveNoun": {
+    "message": "Archief",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archiveren",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Dearchiveren"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Gearchiveerde items verschijnen hier en worden uitgesloten van algemene zoekresultaten en automatisch invulsuggesties."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Item naar archief verzonden"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item verwijderd uit archief"
+  "itemUnarchived": {
+    "message": "Item uit het archief gehaald"
   },
   "archiveItem": {
     "message": "Item archiveren"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Gearchiveerde items worden uitgesloten van algemene zoekresultaten en automatische invulsuggesties. Weet je zeker dat je dit item wilt archiveren?"
   },
+  "upgradeToUseArchive": {
+    "message": "Je hebt een Premium-abonnement nodig om te kunnen archiveren."
+  },
   "edit": {
     "message": "Bewerken"
   },
   "view": {
     "message": "Weergeven"
   },
+  "viewAll": {
+    "message": "Alles weergeven"
+  },
+  "showAll": {
+    "message": "Alles weergeven"
+  },
+  "viewLess": {
+    "message": "Minder weergeven"
+  },
   "viewLogin": {
     "message": "Login bekijken"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Ongeldig hoofdwachtwoord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ongeldig hoofdwachtwoord. Check of je e-mailadres klopt en of je account is aangemaakt op $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Time-out van de kluis"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Bij systeemvergrendeling"
   },
+  "onIdle": {
+    "message": "Bij systeeminactiviteit"
+  },
+  "onSleep": {
+    "message": "Bij slaapmodus"
+  },
   "onRestart": {
     "message": "Bij herstart van de browser"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item is bewerkt"
   },
+  "savedWebsite": {
+    "message": "Opgeslagen website"
+  },
+  "savedWebsites": {
+    "message": "Opgeslagen websites ( $COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Weet je zeker dat je dit naar de prullenbak wilt verplaatsen?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Vraag om biometrie bij opstarten"
   },
-  "premiumRequired": {
-    "message": "Premium is vereist"
-  },
-  "premiumRequiredDesc": {
-    "message": "Je hebt een Premium-abonnement nodig om deze functie te gebruiken."
-  },
   "authenticationTimeout": {
     "message": "Authenticatie-timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Beveiligingssleutel lezen"
   },
+  "readingPasskeyLoading": {
+    "message": "Passkey uitlezen..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey-authenticatie mislukt"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Gebruik een andere loginmethode"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Wacht op interactie met beveiligingssleutel…"
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Je moet de basis URL van de server of ten minste één aangepaste omgeving toevoegen."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL's moeten HTTPS gebruiken."
+  },
   "customEnvironment": {
     "message": "Aangepaste omgeving"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Automatisch invullen uitschakelen"
   },
+  "confirmAutofill": {
+    "message": "Automatisch aanvullen bevestigen"
+  },
+  "confirmAutofillDesc": {
+    "message": "Deze website komt past niet bij je opgeslagen inloggegevens. Verzeker jezelf ervan dat het een vertrouwde website is, voordat je je inloggegevens invult."
+  },
   "showInlineMenuLabel": {
     "message": "Suggesties voor automatisch invullen op formuliervelden weergeven"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Hoe beschermt Bitwarden je gegevens tegen phishing?"
+  },
+  "currentWebsite": {
+    "message": "Huidige website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Automatisch invullen en deze website toevoegen"
+  },
+  "autofillWithoutAdding": {
+    "message": "Automatisch invullen zonder toevoegen"
+  },
+  "doNotAutofill": {
+    "message": "Niet automatisch invullen"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Identiteiten als suggesties weergeven"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Vervaljaar"
   },
+  "monthly": {
+    "message": "maand"
+  },
   "expiration": {
     "message": "Vervaldatum"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Deze pagina verstoort de Bitwarden-ervaring. Het inline-menu van Bitwarden is tijdelijk uitgeschakeld als veiligheidsmaatregel."
+  },
   "setMasterPassword": {
     "message": "Hoofdwachtwoord instellen"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Alleen de organisatiekluis die gekoppeld is aan $ORGANIZATION$ wordt geëxporteerd.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Exporteert alleen de organisatiekluis van $ORGANIZATION$. Geen persoonlijke kluis-items.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Fout"
   },
   "decryptionError": {
     "message": "Ontsleutelingsfout"
   },
+  "errorGettingAutoFillData": {
+    "message": "Fout bij ophalen van gegevens voor automatisch vullen"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden kon de onderstaande kluisitem(s) niet ontsleutelen."
   },
@@ -3432,10 +3533,10 @@
     "message": "Premium-abonnement vereist"
   },
   "organizationIsDisabled": {
-    "message": "Organisatie is uitgeschakeld."
+    "message": "Organisatie opgeschort."
   },
   "disabledOrganizationFilterError": {
-    "message": "Je kunt uitgeschakelde items in een organisatie niet benaderen. Neem contact op met de eigenaar van je organisatie voor hulp."
+    "message": "Je kunt items in opgeschorte organisaties niet benaderen. Neem contact op met de eigenaar van je organisatie voor hulp."
   },
   "loggingInTo": {
     "message": "Inloggen op $DOMAIN$",
@@ -3970,6 +4071,15 @@
     "message": "Automatisch invullen bij het laden van een pagina ingesteld op de standaardinstelling.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Kan niet automatisch invullen"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Standaard overeenkomst is ingesteld op 'Exacte Match'. De huidige website komt niet precies overeen met de opgeslagen inloggegevens voor dit item."
+  },
+  "okay": {
+    "message": "OK"
+  },
   "toggleSideNavigation": {
     "message": "Zijnavigatie schakelen"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Ontgrendel tapporteren, noodtoegang en meer beveiligingsfuncties met Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Gratis organisaties kunnen geen bijlagen gebruiken"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Standaard ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Overeenkomstdetectie weergeven $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welkom in je kluis!"
   },
-  "phishingPageTitle": {
-    "message": "Kwaadaardige website"
+  "phishingPageTitleV2": {
+    "message": "Phishing-poging gedetecteerd"
   },
-  "phishingPageCloseTab": {
-    "message": "Tabblad sluiten"
+  "phishingPageSummary": {
+    "message": "De site die je probeert te bezoeken is een bekende kwaadaardige site en een veiligheidsrisico."
   },
-  "phishingPageContinue": {
-    "message": "Doorgaan"
+  "phishingPageCloseTabV2": {
+    "message": "Dit tabblad sluiten"
   },
-  "phishingPageLearnWhy": {
-    "message": "Waarom zie je dit?"
+  "phishingPageContinueV2": {
+    "message": "Doorgaan naar deze site (niet aanbevolen)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Deze site is gevonden in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", een open-source lijst van bekende phishing-sites die worden gebruikt om persoonlijke en gevoelige informatie te stelen.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Leer meer over phishing-detectie"
+  },
+  "protectedBy": {
+    "message": "Beschermd door $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Automatisch invullen van items voor de huidige pagina"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Key Connector-domein bevestigen"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Goed gedaan, je hebt je risicovolle inloggegevens verbeterd!"
+  },
+  "upgradeNow": {
+    "message": "Nu upgraden"
+  },
+  "builtInAuthenticator": {
+    "message": "Ingebouwde authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Beveiligde bestandsopslag"
+  },
+  "emergencyAccess": {
+    "message": "Noodtoegang"
+  },
+  "breachMonitoring": {
+    "message": "Lek-monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "En meer!"
+  },
+  "planDescPremium": {
+    "message": "Online beveiliging voltooien"
+  },
+  "upgradeToPremium": {
+    "message": "Opwaarderen naar Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Geavanceerde beveiligingsfuncties ontgrendelen"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Een Premium-abonnement geeft je meer tools om veilig en in controle te blijven"
+  },
+  "explorePremium": {
+    "message": "Premium verkennen"
+  },
+  "loadingVault": {
+    "message": "Kluis laden"
+  },
+  "vaultLoaded": {
+    "message": "Kluis geladen"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Deze instelling is uitgeschakeld door het beleid van uw organisatie.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postcode"
+  },
+  "cardNumberLabel": {
+    "message": "Kaartnummer"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Time-out actie"
   }
 }
diff --git a/apps/browser/src/_locales/nn/messages.json b/apps/browser/src/_locales/nn/messages.json
index 78a49021a0c..f829937ac51 100644
--- a/apps/browser/src/_locales/nn/messages.json
+++ b/apps/browser/src/_locales/nn/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/or/messages.json b/apps/browser/src/_locales/or/messages.json
index 78a49021a0c..f829937ac51 100644
--- a/apps/browser/src/_locales/or/messages.json
+++ b/apps/browser/src/_locales/or/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json
index f24e790c9ad..9741f94da36 100644
--- a/apps/browser/src/_locales/pl/messages.json
+++ b/apps/browser/src/_locales/pl/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Użyj logowania jednokrotnego"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Twoja organizacja wymaga logowania jednokrotnego."
+  },
   "welcomeBack": {
     "message": "Witaj ponownie"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Zresetuj wyszukiwanie"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archiwum",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archiwizuj",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Usuń z archiwum"
   },
   "itemsInArchive": {
@@ -565,10 +573,10 @@
   "noItemsInArchiveDesc": {
     "message": "Zarchiwizowane elementy pojawią się tutaj i zostaną wykluczone z wyników wyszukiwania i sugestii autouzupełniania."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Element został przeniesiony do archiwum"
   },
-  "itemRemovedFromArchive": {
+  "itemUnarchived": {
     "message": "Element został usunięty z archiwum"
   },
   "archiveItem": {
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Zarchiwizowane elementy są wykluczone z wyników wyszukiwania i sugestii autouzupełniania. Czy na pewno chcesz archiwizować element?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edytuj"
   },
   "view": {
     "message": "Pokaż"
   },
+  "viewAll": {
+    "message": "Pokaż wszystko"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "Pokaż mniej"
+  },
   "viewLogin": {
     "message": "Pokaż dane logowania"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Hasło główne jest nieprawidłowe"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Nieprawidłowe hasło główne. Sprawdź, czy Twój adres e-mail jest poprawny i czy Twoje konto zostało utworzone na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Blokowanie sejfu"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Po zablokowaniu urządzenia"
   },
+  "onIdle": {
+    "message": "Podczas bezczynności systemu"
+  },
+  "onSleep": {
+    "message": "Podczas uśpienia systemu"
+  },
   "onRestart": {
     "message": "Po uruchomieniu przeglądarki"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Element został zapisany"
   },
+  "savedWebsite": {
+    "message": "Zapisana witryna"
+  },
+  "savedWebsites": {
+    "message": "Zapisane witryny ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Czy na pewno chcesz usunąć?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Wymagaj odblokowania biometrią po uruchomieniu przeglądarki"
   },
-  "premiumRequired": {
-    "message": "Konto premium jest wymagane"
-  },
-  "premiumRequiredDesc": {
-    "message": "Konto premium jest wymagane, aby skorzystać z tej funkcji."
-  },
   "authenticationTimeout": {
     "message": "Przekroczono limit czasu uwierzytelniania"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Odczytaj klucz bezpieczeństwa"
   },
+  "readingPasskeyLoading": {
+    "message": "Odczytywanie klucza dostępu..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Uwierzytelnienie za pomocą klucza nie powiodło się"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Użyj innej metody logowania"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Oczekiwanie na klucz bezpieczeństwa..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Musisz dodać podstawowy adres URL serwera lub co najmniej jedno niestandardowe środowisko."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Adresy URL muszą używać protokołu HTTPS."
+  },
   "customEnvironment": {
     "message": "Niestandardowe środowisko"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Wyłącz autouzupełnianie"
   },
+  "confirmAutofill": {
+    "message": "Potwierdź autouzupełnianie"
+  },
+  "confirmAutofillDesc": {
+    "message": "Ta witryna nie pasuje do Twoich zapisanych danych logowania. Zanim wpiszesz dane logowania, upewnij się, że jest to zaufana witryna."
+  },
   "showInlineMenuLabel": {
     "message": "Pokaż sugestie autouzupełniania na polach formularza"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "W jaki sposób Bitwarden chroni Twoje dane przed phishingiem?"
+  },
+  "currentWebsite": {
+    "message": "Aktualna witryna"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Wypełnij automatycznie i dodaj tę witrynę"
+  },
+  "autofillWithoutAdding": {
+    "message": "Automatyczne uzupełnianie bez dodawania"
+  },
+  "doNotAutofill": {
+    "message": "Nie wypełniaj automatycznie"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Pokaż tożsamości w sugestiach"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Rok wygaśnięcia"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Data wygaśnięcia"
   },
@@ -2174,7 +2251,7 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Hasło zostało zaktualizowane",
+    "message": "Ostatnia aktualizacja hasła",
     "description": "ex. Date this password was updated"
   },
   "neverLockWarning": {
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Ta strona zakłóca działanie Bitwarden. Menu Bitwarden zostało tymczasowo wyłączone ze względów bezpieczeństwa."
+  },
   "setMasterPassword": {
     "message": "Ustaw hasło główne"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Tylko sejf organizacji $ORGANIZATION$ zostanie wyeksportowany.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Tylko sejf organizacji $ORGANIZATION$ zostanie wyeksportowany. Twoje kolekcje nie zostaną uwzględnione.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Błąd"
   },
   "decryptionError": {
     "message": "Błąd odszyfrowywania"
   },
+  "errorGettingAutoFillData": {
+    "message": "Błąd podczas pobierania danych autouzupełniania"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden nie mógł odszyfrować poniższych elementów sejfu."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autouzupełnianie po załadowaniu strony zostało ustawione do domyślnych ustawień.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Nie można automatycznie wypełnić"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Domyślnie dopasowanie jest ustawione na „Dokładne dopasowanie”. Aktualna strona internetowa nie jest dokładnie taka sama jak zapisane dane logowania dla tego elementu."
+  },
+  "okay": {
+    "message": "Ok"
+  },
   "toggleSideNavigation": {
     "message": "Przełącz nawigację boczną"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Darmowe organizacje nie mogą używać załączników"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Domyślne ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Pokaż wykrywanie dopasowania $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Witaj w sejfie!"
   },
-  "phishingPageTitle": {
-    "message": "Witryna phishingowa"
+  "phishingPageTitleV2": {
+    "message": "Wykryto próbę phishingu"
   },
-  "phishingPageCloseTab": {
+  "phishingPageSummary": {
+    "message": "Witryna, którą próbujesz odwiedzić, jest znaną złośliwą witryną i zagrożeniem bezpieczeństwa."
+  },
+  "phishingPageCloseTabV2": {
     "message": "Zamknij kartę"
   },
-  "phishingPageContinue": {
-    "message": "Kontynuuj"
+  "phishingPageContinueV2": {
+    "message": "Przejdź do tej witryny (niezalecane)"
   },
-  "phishingPageLearnWhy": {
-    "message": "Dlaczego to widzę?"
+  "phishingPageExplanation1": {
+    "message": "Ta witryna została znaleziona w ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", lista znanych witryn phishingowych, które służą do kradzieży danych osobowych i poufnych.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Dowiedz się więcej o wykrywaniu phishingu"
+  },
+  "protectedBy": {
+    "message": "Chronione przez $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Uzupełniaj elementy na stronie internetowej"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Potwierdź domenę Key Connector"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Świetna robota z zabezpieczeniem Twoich zagrożonych danych logowania!"
+  },
+  "upgradeNow": {
+    "message": "Zaktualizuj teraz"
+  },
+  "builtInAuthenticator": {
+    "message": "Wbudowany uwierzytelniacz"
+  },
+  "secureFileStorage": {
+    "message": "Bezpieczne przechowywanie plików"
+  },
+  "emergencyAccess": {
+    "message": "Dostęp awaryjny"
+  },
+  "breachMonitoring": {
+    "message": "Monitorowanie naruszeń"
+  },
+  "andMoreFeatures": {
+    "message": "I jeszcze więcej!"
+  },
+  "planDescPremium": {
+    "message": "Pełne bezpieczeństwo w Internecie"
+  },
+  "upgradeToPremium": {
+    "message": "Ulepsz do Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Poznaj Premium"
+  },
+  "loadingVault": {
+    "message": "Ładowanie sejfu"
+  },
+  "vaultLoaded": {
+    "message": "Sejf załadowany"
+  },
+  "settingDisabledByPolicy": {
+    "message": "To ustawienie jest wyłączone zgodnie z zasadami polityki Twojej organizacji.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Kod pocztowy"
+  },
+  "cardNumberLabel": {
+    "message": "Numer karty"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Akcja przekroczenia limitu czasu"
   }
 }
diff --git a/apps/browser/src/_locales/pt_BR/messages.json b/apps/browser/src/_locales/pt_BR/messages.json
index 2d7dd1e42a4..a7675274eae 100644
--- a/apps/browser/src/_locales/pt_BR/messages.json
+++ b/apps/browser/src/_locales/pt_BR/messages.json
@@ -3,45 +3,48 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logo do Bitwarden"
   },
   "extName": {
-    "message": "Gerenciador de senhas Bitwarden",
+    "message": "Bitwarden Gerenciador de Senhas",
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
-    "message": "Em qual lugar for, o Bitwarden protege suas senhas, chaves de acesso, e informações confidenciais",
+    "message": "Onde quer que você esteja, o Bitwarden protege suas senhas, chaves de acesso e informações sensíveis",
     "description": "Extension description, MUST be less than 112 characters (Safari restriction)"
   },
   "loginOrCreateNewAccount": {
-    "message": "Inicie a sessão ou crie uma nova conta para acessar seu cofre seguro."
+    "message": "Conecte-se ou crie uma conta para acessar o seu cofre seguro."
   },
   "inviteAccepted": {
     "message": "Convite aceito"
   },
   "createAccount": {
-    "message": "Criar Conta"
+    "message": "Criar conta"
   },
   "newToBitwarden": {
     "message": "Novo no Bitwarden?"
   },
   "logInWithPasskey": {
-    "message": "Iniciar sessão com a chave de acesso"
+    "message": "Conectar-se com chave de acesso"
   },
   "useSingleSignOn": {
-    "message": "Usar login único"
+    "message": "Usar autenticação única"
+  },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A sua organização requer o uso da autenticação única."
   },
   "welcomeBack": {
-    "message": "Bem vindo de volta"
+    "message": "Boas-vindas de volta"
   },
   "setAStrongPassword": {
-    "message": "Defina uma senha forte"
+    "message": "Configure uma senha forte"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Termine de criar a sua conta definindo uma senha"
+    "message": "Termine de criar a sua conta configurando uma senha"
   },
   "enterpriseSingleSignOn": {
-    "message": "Iniciar Sessão Empresarial Única"
+    "message": "Autenticação única empresarial"
   },
   "cancel": {
     "message": "Cancelar"
@@ -53,16 +56,16 @@
     "message": "Enviar"
   },
   "emailAddress": {
-    "message": "Endereço de correio eletrônico"
+    "message": "Endereço de e-mail"
   },
   "masterPass": {
-    "message": "Senha Mestra"
+    "message": "Senha principal"
   },
   "masterPassDesc": {
-    "message": "A senha mestra é a senha que você usa para acessar o seu cofre. É muito importante que você não esqueça sua senha mestra. Não há maneira de recuperar a senha caso você se esqueça."
+    "message": "A senha principal é a senha que você usa para acessar o seu cofre. É muito importante que você não esqueça sua senha principal. Não há maneira de recuperar a senha caso você se esqueça."
   },
   "masterPassHintDesc": {
-    "message": "Uma dica de senha mestra pode ajudá-lo(a) a lembrá-lo(a) caso você esqueça."
+    "message": "Uma dica de senha principal pode ajudá-lo(a) a lembrá-la caso você esqueça."
   },
   "masterPassHintText": {
     "message": "Se você esquecer sua senha, a dica de senha pode ser enviada ao seu e-mail. $CURRENT$/$MAXIMUM$ caracteres máximos.",
@@ -78,13 +81,13 @@
     }
   },
   "reTypeMasterPass": {
-    "message": "Digite Novamente a Senha Mestra"
+    "message": "Digite novamente a senha principal"
   },
   "masterPassHint": {
-    "message": "Dica de Senha Mestra (opcional)"
+    "message": "Dica de senha principal (opcional)"
   },
   "passwordStrengthScore": {
-    "message": "Pontos fortes da senha: $SCORE$",
+    "message": "Pontuação de força da senha $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -96,7 +99,7 @@
     "message": "Juntar-se à organização"
   },
   "joinOrganizationName": {
-    "message": "Entrar em $ORGANIZATIONNAME$",
+    "message": "Juntar-se à $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -105,7 +108,7 @@
     }
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Termine de juntar-se nessa organização definindo uma senha mestra."
+    "message": "Termine de juntar-se à organização configurando uma senha principal."
   },
   "tab": {
     "message": "Aba"
@@ -114,10 +117,10 @@
     "message": "Cofre"
   },
   "myVault": {
-    "message": "Meu Cofre"
+    "message": "Meu cofre"
   },
   "allVaults": {
-    "message": "Todos os Cofres"
+    "message": "Todos os cofres"
   },
   "tools": {
     "message": "Ferramentas"
@@ -126,28 +129,28 @@
     "message": "Configurações"
   },
   "currentTab": {
-    "message": "Aba Atual"
+    "message": "Aba atual"
   },
   "copyPassword": {
-    "message": "Copiar Senha"
-  },
-  "copyPassphrase": {
     "message": "Copiar senha"
   },
+  "copyPassphrase": {
+    "message": "Copiar frase secreta"
+  },
   "copyNote": {
-    "message": "Copiar Nota"
+    "message": "Copiar anotação"
   },
   "copyUri": {
     "message": "Copiar URI"
   },
   "copyUsername": {
-    "message": "Copiar Nome de Usuário"
+    "message": "Copiar nome de usuário"
   },
   "copyNumber": {
-    "message": "Copiar Número"
+    "message": "Copiar número"
   },
   "copySecurityCode": {
-    "message": "Copiar Código de Segurança"
+    "message": "Copiar código de segurança"
   },
   "copyName": {
     "message": "Copiar nome"
@@ -156,13 +159,13 @@
     "message": "Copiar empresa"
   },
   "copySSN": {
-    "message": "Cadastro de Pessoas Físicas"
+    "message": "Copiar número de CPF"
   },
   "copyPassportNumber": {
     "message": "Copiar número do passaporte"
   },
   "copyLicenseNumber": {
-    "message": "Copiar número da CNH"
+    "message": "Copiar número da licença"
   },
   "copyPrivateKey": {
     "message": "Copiar chave privada"
@@ -186,7 +189,7 @@
     "message": "Copiar site"
   },
   "copyNotes": {
-    "message": "Copiar Notas"
+    "message": "Copiar anotações"
   },
   "copy": {
     "message": "Copiar",
@@ -197,10 +200,10 @@
     "description": "This string is used on the vault page to indicate autofilling. Horizontal space is limited in the interface here so try and keep translations as concise as possible."
   },
   "autoFill": {
-    "message": "Autopreencher"
+    "message": "Preenchimento automático"
   },
   "autoFillLogin": {
-    "message": "Preencher login automaticamente"
+    "message": "Preencher credencial automaticamente"
   },
   "autoFillCard": {
     "message": "Preencher cartão automaticamente"
@@ -209,29 +212,29 @@
     "message": "Preencher identidade automaticamente"
   },
   "fillVerificationCode": {
-    "message": "Preencher o código de verificação"
+    "message": "Preencher código de verificação"
   },
   "fillVerificationCodeAria": {
     "message": "Preencher código de verificação",
     "description": "Aria label for the heading displayed the inline menu for totp code autofill"
   },
   "generatePasswordCopied": {
-    "message": "Gerar Senha (copiada)"
+    "message": "Gerar senha (copiada)"
   },
   "copyElementIdentifier": {
-    "message": "Copiar Nome do Campo Personalizado"
+    "message": "Copiar nome do campo personalizado"
   },
   "noMatchingLogins": {
-    "message": "Sem credenciais correspondentes."
+    "message": "Nenhuma credencial correspondente"
   },
   "noCards": {
-    "message": "Sem cartões"
+    "message": "Nenhum cartão"
   },
   "noIdentities": {
-    "message": "Sem Identidade"
+    "message": "Nenhuma identidade"
   },
   "addLoginMenu": {
-    "message": "Adicionar login"
+    "message": "Adicionar credencial"
   },
   "addCardMenu": {
     "message": "Adicionar cartão"
@@ -243,31 +246,31 @@
     "message": "Desbloqueie seu cofre"
   },
   "loginToVaultMenu": {
-    "message": "Acesse o seu cofre"
+    "message": "Conecte-se ao seu cofre"
   },
   "autoFillInfo": {
-    "message": "Não há credenciais disponíveis para autopreenchimento para a aba do navegador atual."
+    "message": "Não há credenciais disponíveis para preencher automaticamente na aba atual do navegador."
   },
   "addLogin": {
-    "message": "Adicionar um Login"
+    "message": "Adicionar uma credencial"
   },
   "addItem": {
-    "message": "Adicionar Item"
+    "message": "Adicionar item"
   },
   "accountEmail": {
-    "message": "Correio eletrônico da conta"
+    "message": "E-mail da conta"
   },
   "requestHint": {
     "message": "Solicitar dica"
   },
   "requestPasswordHint": {
-    "message": "Dica da senha mestra"
+    "message": "Solicitar dica da senha"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Digite o endereço de seu correio eletrônico da sua conta e sua dica da senha será enviada para você"
+    "message": "Digite o endereço de e-mail da sua conta e dica da sua senha será enviada para você"
   },
   "getMasterPasswordHint": {
-    "message": "Obter dica da senha mestra"
+    "message": "Receber dica da senha principal"
   },
   "continue": {
     "message": "Continuar"
@@ -276,25 +279,25 @@
     "message": "Enviar um código de verificação para o seu e-mail"
   },
   "sendCode": {
-    "message": "Enviar Código"
+    "message": "Enviar código"
   },
   "codeSent": {
-    "message": "Código Enviado"
+    "message": "Código enviado"
   },
   "verificationCode": {
-    "message": "Código de Verificação"
+    "message": "Código de verificação"
   },
   "confirmIdentity": {
     "message": "Confirme a sua identidade para continuar."
   },
   "changeMasterPassword": {
-    "message": "Alterar senha mestra"
+    "message": "Alterar senha principal"
   },
   "continueToWebApp": {
     "message": "Continuar no aplicativo web?"
   },
   "continueToWebAppDesc": {
-    "message": "Explore mais recursos da sua conta no Bitwarden no aplicativo web."
+    "message": "Explore mais recursos da sua conta do Bitwarden no aplicativo web."
   },
   "continueToHelpCenter": {
     "message": "Continuar no Centro de Ajuda?"
@@ -303,27 +306,27 @@
     "message": "Saiba mais sobre como usar o Bitwarden no Centro de Ajuda."
   },
   "continueToBrowserExtensionStore": {
-    "message": "Continuar na extensão da loja do navegador?"
+    "message": "Continuar na loja de extensões do navegador?"
   },
   "continueToBrowserExtensionStoreDesc": {
-    "message": "Ajude outras pessoas a descobrirem se o Bitwarden é o que elas estão procurando. Visite a loja de extensões do seu navegador e deixe uma classificação agora."
+    "message": "Ajude outras pessoas a descobrirem se o Bitwarden é o que elas estão procurando. Visite a loja de extensões do seu navegador e deixe uma avaliação agora."
   },
   "changeMasterPasswordOnWebConfirmation": {
-    "message": "Você pode alterar a sua senha mestra no aplicativo web Bitwarden."
+    "message": "Você pode alterar a sua senha principal no aplicativo web do Bitwarden."
   },
   "fingerprintPhrase": {
-    "message": "Frase Biométrica",
+    "message": "Frase biométrica",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "A sua frase biométrica",
+    "message": "A frase biométrica da sua conta",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "twoStepLogin": {
-    "message": "Login em Duas Etapas"
+    "message": "Autenticação em duas etapas"
   },
   "logOut": {
-    "message": "Encerrar Sessão"
+    "message": "Desconectar"
   },
   "aboutBitwarden": {
     "message": "Sobre o Bitwarden"
@@ -335,34 +338,34 @@
     "message": "Mais do Bitwarden"
   },
   "continueToBitwardenDotCom": {
-    "message": "Continuar para bitwarden.com?"
+    "message": "Continuar em bitwarden.com?"
   },
   "bitwardenForBusiness": {
     "message": "Bitwarden para Negócios"
   },
   "bitwardenAuthenticator": {
-    "message": "Autenticador Bitwarden"
+    "message": "Bitwarden Authenticator"
   },
   "continueToAuthenticatorPageDesc": {
-    "message": "O Autenticador Bitwarden permite que você armazene as chaves do autenticador e gere códigos TOTP para fluxos de verificação de 2 etapas. Saiba mais no site bitwarden.com"
+    "message": "O Bitwarden Authenticator permite que você armazene as chaves de autenticador e gere códigos TOTP para fluxos de verificação de 2 etapas. Saiba mais no site bitwarden.com"
   },
   "bitwardenSecretsManager": {
-    "message": "Gerenciador de Segredos Bitwarden"
+    "message": "Bitwarden Gerenciador de Segredos"
   },
   "continueToSecretsManagerPageDesc": {
-    "message": "Armazene, gerencie e compartilhe senhas de desenvolvedor com o Gerenciador de segredos do Bitwarden. Saiba mais no site bitwarden.com."
+    "message": "Armazene, gerencie e compartilhe segredos de desenvolvedor com o Bitwarden Gerenciador de Segredos. Saiba mais no site bitwarden.com."
   },
   "passwordlessDotDev": {
     "message": "Passwordless.dev"
   },
   "continueToPasswordlessDotDevPageDesc": {
-    "message": "Crie experiências de login suaves e seguras, livres de senhas tradicionais com Passwordless.dev. Saiba mais no site bitwarden.com."
+    "message": "Crie experiências de autenticação seguras, simples, livres de senhas tradicionais, com o Passwordless.dev. Saiba mais no site bitwarden.com."
   },
   "freeBitwardenFamilies": {
-    "message": "Plano Familiar do Bitwarden Grátis"
+    "message": "Bitwarden Famílias grátis"
   },
   "freeBitwardenFamiliesPageDesc": {
-    "message": "Você é elegível para o plano Familiar do Bitwarden Grátis. Resgate esta oferta hoje no aplicativo web."
+    "message": "Você é elegível para o plano Bitwarden Famílias grátis. Resgate esta oferta hoje no aplicativo web."
   },
   "version": {
     "message": "Versão"
@@ -374,13 +377,13 @@
     "message": "Mover"
   },
   "addFolder": {
-    "message": "Adicionar Pasta"
+    "message": "Adicionar pasta"
   },
   "name": {
     "message": "Nome"
   },
   "editFolder": {
-    "message": "Editar Pasta"
+    "message": "Editar pasta"
   },
   "editFolderWithName": {
     "message": "Editar pasta: $FOLDERNAME$",
@@ -398,7 +401,7 @@
     "message": "Nome da pasta"
   },
   "folderHintText": {
-    "message": "Aninhe uma pasta adicionando o nome da pasta pai seguido de um \"/\". Exemplo: Social/Fóruns"
+    "message": "Agrupe uma pasta adicionando o nome da pasta mãe seguido de uma \"/\". Exemplo: Social/Fóruns"
   },
   "noFoldersAdded": {
     "message": "Nenhuma pasta adicionada"
@@ -407,40 +410,40 @@
     "message": "Crie pastas para organizar os itens do seu cofre"
   },
   "deleteFolderPermanently": {
-    "message": "Você tem certeza que deseja excluir esta pasta permanentemente?"
+    "message": "Tem certeza que quer apagar esta pasta para sempre?"
   },
   "deleteFolder": {
-    "message": "Excluir Pasta"
+    "message": "Apagar pasta"
   },
   "folders": {
     "message": "Pastas"
   },
   "noFolders": {
-    "message": "Não existem pastas para listar."
+    "message": "Não há pastas para listar."
   },
   "helpFeedback": {
-    "message": "Ajuda & Feedback"
+    "message": "Ajuda e retorno"
   },
   "helpCenter": {
-    "message": "Central de Ajuda"
+    "message": "Central de ajuda do Bitwarden"
   },
   "communityForums": {
-    "message": "Explore os fóruns da comunidade"
+    "message": "Explorar os fóruns da comunidade do Bitwarden"
   },
   "contactSupport": {
-    "message": "Contate o suporte Bitwarden"
+    "message": "Entrar em contato com o suporte do Bitwarden"
   },
   "sync": {
     "message": "Sincronizar"
   },
   "syncVaultNow": {
-    "message": "Sincronizar Cofre Agora"
+    "message": "Sincronizar cofre agora"
   },
   "lastSync": {
-    "message": "Última Sincronização:"
+    "message": "Última sincronização:"
   },
   "passGen": {
-    "message": "Gerador de Senha"
+    "message": "Gerador de senhas"
   },
   "generator": {
     "message": "Gerador",
@@ -450,16 +453,16 @@
     "message": "Gere automaticamente senhas fortes e únicas para as suas credenciais."
   },
   "bitWebVaultApp": {
-    "message": "Aplicativo Web Bitwarden"
+    "message": "Aplicativo web do Bitwarden"
   },
   "importItems": {
-    "message": "Importar Itens"
+    "message": "Importar itens"
   },
   "select": {
     "message": "Selecionar"
   },
   "generatePassword": {
-    "message": "Gerar Senha"
+    "message": "Gerar senha"
   },
   "generatePassphrase": {
     "message": "Gerar frase secreta"
@@ -468,7 +471,7 @@
     "message": "Senha gerada"
   },
   "passphraseGenerated": {
-    "message": "Senha gerada"
+    "message": "Frase secreta gerada"
   },
   "usernameGenerated": {
     "message": "Nome de usuário gerado"
@@ -477,7 +480,7 @@
     "message": "E-mail gerado"
   },
   "regeneratePassword": {
-    "message": "Gerar Nova Senha"
+    "message": "Regerar senha"
   },
   "options": {
     "message": "Opções"
@@ -510,7 +513,7 @@
     "description": "Full description for the password generator numbers checkbox"
   },
   "numbersLabel": {
-    "message": "0 – 9",
+    "message": "0-9",
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
@@ -518,64 +521,72 @@
     "description": "Full description for the password generator special characters checkbox"
   },
   "numWords": {
-    "message": "Número de Palavras"
+    "message": "Número de palavras"
   },
   "wordSeparator": {
-    "message": "Separador de Palavra"
+    "message": "Separador de palavras"
   },
   "capitalize": {
-    "message": "Iniciais em Maiúsculas",
+    "message": "Iniciais maiúsculas",
     "description": "Make the first letter of a work uppercase."
   },
   "includeNumber": {
-    "message": "Incluir Número"
+    "message": "Incluir número"
   },
   "minNumbers": {
-    "message": "Números Mínimos"
+    "message": "Mínimo de números"
   },
   "minSpecial": {
-    "message": "Especiais Mínimos"
+    "message": "Mínimo de caracteres especiais"
   },
   "avoidAmbiguous": {
     "message": "Evitar caracteres ambíguos",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
-    "message": "Os requisitos de política empresarial foram aplicados nesta configuração",
+    "message": "Os requisitos de política empresarial foram aplicados às configurações do seu gerador.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchVault": {
-    "message": "Pesquisar no Cofre"
+    "message": "Buscar no cofre"
   },
   "resetSearch": {
-    "message": "Reset search"
+    "message": "Apagar busca"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Desarquivar"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Itens no arquivo"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Nenhum item no arquivo"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Os itens arquivados aparecerão aqui e serão excluídos dos resultados gerais de busca e das sugestões de preenchimento automático."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "O item foi enviado para o arquivo"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "O item foi desarquivado"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Arquivar item"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Itens arquivados são excluídos dos resultados gerais de busca e das sugestões de preenchimento automático. Tem certeza de que deseja arquivar este item?"
+  },
+  "upgradeToUseArchive": {
+    "message": "Um plano Premium é necessário para usar o arquivamento."
   },
   "edit": {
     "message": "Editar"
@@ -583,29 +594,38 @@
   "view": {
     "message": "Ver"
   },
+  "viewAll": {
+    "message": "Ver tudo"
+  },
+  "showAll": {
+    "message": "Mostrar tudo"
+  },
+  "viewLess": {
+    "message": "Ver menos"
+  },
   "viewLogin": {
-    "message": "View login"
+    "message": "Ver credencial"
   },
   "noItemsInList": {
     "message": "Não há itens para listar."
   },
   "itemInformation": {
-    "message": "Informação do Item"
+    "message": "Informações do item"
   },
   "username": {
-    "message": "Nome de Usuário"
+    "message": "Nome de usuário"
   },
   "password": {
     "message": "Senha"
   },
   "totp": {
-    "message": "Senha do autenticador"
+    "message": "Segredo do autenticador"
   },
   "passphrase": {
-    "message": "Frase Secreta"
+    "message": "Frase secreta"
   },
   "favorite": {
-    "message": "Favorito"
+    "message": "Favoritar"
   },
   "unfavorite": {
     "message": "Desfavoritar"
@@ -617,25 +637,25 @@
     "message": "Item removido dos favoritos"
   },
   "notes": {
-    "message": "Notas"
+    "message": "Anotações"
   },
   "privateNote": {
-    "message": "Nota privada"
+    "message": "Anotação privada"
   },
   "note": {
-    "message": "Nota"
+    "message": "Anotação"
   },
   "editItem": {
-    "message": "Editar Item"
+    "message": "Editar item"
   },
   "folder": {
     "message": "Pasta"
   },
   "deleteItem": {
-    "message": "Excluir Item"
+    "message": "Apagar item"
   },
   "viewItem": {
-    "message": "Visualizar Item"
+    "message": "Ver item"
   },
   "launch": {
     "message": "Abrir"
@@ -644,7 +664,7 @@
     "message": "Abrir site"
   },
   "launchWebsiteName": {
-    "message": "Iniciar site $ITEMNAME$",
+    "message": "Abrir o site $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -656,7 +676,7 @@
     "message": "Site"
   },
   "toggleVisibility": {
-    "message": "Alternar Visibilidade"
+    "message": "Habilitar visibilidade"
   },
   "manage": {
     "message": "Gerenciar"
@@ -668,7 +688,7 @@
     "message": "Opções de desbloqueio"
   },
   "unlockMethodNeededToChangeTimeoutActionDesc": {
-    "message": "Configure um método de desbloqueio para alterar o tempo limite do cofre."
+    "message": "Configure um método de desbloqueio para alterar a ação do tempo limite do cofre."
   },
   "unlockMethodNeeded": {
     "message": "Configure um método de desbloqueio nas Configurações"
@@ -677,16 +697,16 @@
     "message": "Tempo limite da sessão"
   },
   "vaultTimeoutHeader": {
-    "message": "Tempo Limite do Cofre"
+    "message": "Tempo limite do cofre"
   },
   "otherOptions": {
     "message": "Outras opções"
   },
   "rateExtension": {
-    "message": "Avaliar a Extensão"
+    "message": "Avalie a extensão"
   },
   "browserNotSupportClipboard": {
-    "message": "O seu navegador web não suporta cópia para a área de transferência. Em alternativa, copie manualmente."
+    "message": "O seu navegador web não suporta copiar para a área de transferência. Em vez disso, copie manualmente."
   },
   "verifyYourIdentity": {
     "message": "Verifique a sua identidade"
@@ -695,10 +715,10 @@
     "message": "Não reconhecemos este dispositivo. Digite o código enviado por e-mail para verificar a sua identidade."
   },
   "continueLoggingIn": {
-    "message": "Manter sessão"
+    "message": "Continuar acessando"
   },
   "yourVaultIsLocked": {
-    "message": "Seu cofre está trancado. Verifique sua identidade para continuar."
+    "message": "Seu cofre está bloqueado. Verifique sua identidade para continuar."
   },
   "yourVaultIsLockedV2": {
     "message": "Seu cofre está bloqueado"
@@ -713,7 +733,7 @@
     "message": "Desbloquear"
   },
   "loggedInAsOn": {
-    "message": "Entrou como $EMAIL$ em $HOSTNAME$.",
+    "message": "Conectado como $EMAIL$ em $HOSTNAME$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -726,16 +746,25 @@
     }
   },
   "invalidMasterPassword": {
-    "message": "Senha mestra inválida"
+    "message": "Senha principal inválida"
+  },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Senha principal inválida. Confirme que seu e-mail está correto e sua conta foi criada em $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
   },
   "vaultTimeout": {
-    "message": "Cofre - tempo esgotado"
+    "message": "Tempo limite do cofre"
   },
   "vaultTimeout1": {
-    "message": "Tempo de espera"
+    "message": "Tempo limite"
   },
   "lockNow": {
-    "message": "Bloquear Agora"
+    "message": "Bloquear agora"
   },
   "lockAll": {
     "message": "Bloquear tudo"
@@ -774,10 +803,16 @@
     "message": "4 horas"
   },
   "onLocked": {
-    "message": "No bloqueio"
+    "message": "No bloqueio do sistema"
+  },
+  "onIdle": {
+    "message": "Na inatividade do sistema"
+  },
+  "onSleep": {
+    "message": "Na hibernação do sistema"
   },
   "onRestart": {
-    "message": "Ao Reiniciar"
+    "message": "No reinício do navegador"
   },
   "never": {
     "message": "Nunca"
@@ -786,16 +821,16 @@
     "message": "Segurança"
   },
   "confirmMasterPassword": {
-    "message": "Confirme a senha mestra"
+    "message": "Confirme a senha principal"
   },
   "masterPassword": {
-    "message": "Senha mestra"
+    "message": "Senha principal"
   },
   "masterPassImportant": {
-    "message": "Sua senha mestra não pode ser recuperada se você a esquecer!"
+    "message": "Sua senha principal não pode ser recuperada se você esquecê-la!"
   },
   "masterPassHintLabel": {
-    "message": "Dica da senha mestra"
+    "message": "Dica da senha principal"
   },
   "errorOccurred": {
     "message": "Ocorreu um erro"
@@ -807,13 +842,13 @@
     "message": "Endereço de e-mail inválido."
   },
   "masterPasswordRequired": {
-    "message": "A senha mestra é obrigatória."
+    "message": "A senha principal é necessária."
   },
   "confirmMasterPasswordRequired": {
-    "message": "É necessário redigitar a senha mestra."
+    "message": "É necessário redigitar a senha principal."
   },
   "masterPasswordMinlength": {
-    "message": "A senha mestra deve ter pelo menos $VALUE$ caracteres.",
+    "message": "A senha principal deve ter pelo menos $VALUE$ caracteres.",
     "description": "The Master Password must be at least a specific number of characters long.",
     "placeholders": {
       "value": {
@@ -823,37 +858,37 @@
     }
   },
   "masterPassDoesntMatch": {
-    "message": "A confirmação da senha mestra não corresponde."
+    "message": "A confirmação da senha principal não corresponde."
   },
   "newAccountCreated": {
-    "message": "A sua nova conta foi criada! Agora você pode iniciar a sessão."
+    "message": "A sua nova conta foi criada! Agora você pode conectar-se."
   },
   "newAccountCreated2": {
     "message": "Sua nova conta foi criada!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "Você está conectado!"
+    "message": "Você foi conectado!"
   },
   "youSuccessfullyLoggedIn": {
-    "message": "Você logou na sua conta com sucesso"
+    "message": "Você conectou-se à sua conta com sucesso"
   },
   "youMayCloseThisWindow": {
     "message": "Você pode fechar esta janela"
   },
   "masterPassSent": {
-    "message": "Enviamos um e-mail com a dica da sua senha mestra."
+    "message": "Enviamos um e-mail com a dica da sua senha principal."
   },
   "verificationCodeRequired": {
     "message": "O código de verificação é necessário."
   },
   "webauthnCancelOrTimeout": {
-    "message": "A autenticação foi cancelada ou demorou muito. Por favor tente novamente."
+    "message": "A autenticação foi cancelada ou demorou muito. Tente novamente."
   },
   "invalidVerificationCode": {
     "message": "Código de verificação inválido"
   },
   "valueCopied": {
-    "message": " copiado",
+    "message": "$VALUE$ copiado(a)",
     "description": "Value has been copied to the clipboard.",
     "placeholders": {
       "value": {
@@ -866,16 +901,16 @@
     "message": "Não é possível preencher automaticamente o item selecionado nesta página. Em vez disso, copie e cole a informação."
   },
   "totpCaptureError": {
-    "message": "Não foi possível escanear o código QR a partir da página atual"
+    "message": "Não é possível ler o código QR da página atual"
   },
   "totpCaptureSuccess": {
     "message": "Chave do autenticador adicionada"
   },
   "totpCapture": {
-    "message": "Escaneie o código QR do autenticador na página atual"
+    "message": "Ler o código QR do autenticador na página atual"
   },
   "totpHelperTitle": {
-    "message": "Tornar a verificação em duas etapas fácil"
+    "message": "Torne a verificação em 2 etapas mais simples"
   },
   "totpHelper": {
     "message": "O Bitwarden pode armazenar e preencher códigos de verificação de duas etapas. Copie e cole a chave neste campo."
@@ -887,10 +922,10 @@
     "message": "Saiba mais sobre os autenticadores"
   },
   "copyTOTP": {
-    "message": "Copiar chave de Autenticação (TOTP)"
+    "message": "Copiar chave do autenticador (TOTP)"
   },
   "loggedOut": {
-    "message": "Sessão encerrada"
+    "message": "Desconectado"
   },
   "loggedOutDesc": {
     "message": "Você foi desconectado de sua conta."
@@ -899,43 +934,43 @@
     "message": "A sua sessão expirou."
   },
   "logIn": {
-    "message": "Fazer login"
+    "message": "Conectar-se"
   },
   "logInToBitwarden": {
-    "message": "Inicie a sessão no Bitwarden"
+    "message": "Conecte-se ao Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Digite o código enviado por e-mail"
+    "message": "Digite o código enviado ao seu e-mail"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Digite o código a partir do seu autenticador"
+    "message": "Digite o código do seu autenticador"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Insira sua YubiKey para autenticar"
+    "message": "Pressione sua YubiKey para autenticar-se"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "A autenticação de dois fatores é necessária para sua conta. Siga os passos abaixo para conseguir entrar."
+    "message": "A autenticação de duas etapas do Duo é necessária para sua conta. Siga os passos abaixo para conseguir se conectar."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Siga os passos abaixo para finalizar o login."
+    "message": "Siga os passos abaixo para terminar de se conectar."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Siga os passos abaixo para finalizar de se conectar com a sua chave de segurança."
   },
   "restartRegistration": {
-    "message": "Reiniciar registro"
+    "message": "Reiniciar cadastro"
   },
   "expiredLink": {
-    "message": "Link expirado"
+    "message": "Link vencido"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Por favor, reinicie o registro ou tente fazer login."
+    "message": "Reinicie o cadastro ou tente conectar-se."
   },
   "youMayAlreadyHaveAnAccount": {
     "message": "Você pode já ter uma conta"
   },
   "logOutConfirmation": {
-    "message": "Você tem certeza que deseja sair?"
+    "message": "Tem certeza que quer se desconectar?"
   },
   "yes": {
     "message": "Sim"
@@ -956,40 +991,40 @@
     "message": "Pasta adicionada"
   },
   "twoStepLoginConfirmation": {
-    "message": "O login de duas etapas torna a sua conta mais segura ao exigir que digite um código de segurança de um aplicativo de autenticação quando for iniciar a sessão. O login de duas etapas pode ser ativado no cofre web bitwarden.com. Deseja visitar o site agora?"
+    "message": "A autenticação de duas etapas torna a sua conta mais segura ao exigir que digite um código de segurança de um aplicativo autenticador ao se conectar. A autenticação de duas etapas pode ser ativada no cofre web do bitwarden.com. Deseja visitar o site agora?"
   },
   "twoStepLoginConfirmationContent": {
-    "message": "Torne sua conta mais segura configurando o 'login' em duas etapas no aplicativo ‘web’ do Bitwarden."
+    "message": "Torne sua conta mais segura configurando a autenticação em duas etapas no aplicativo web do Bitwarden."
   },
   "twoStepLoginConfirmationTitle": {
-    "message": "Continuar para o aplicativo web?"
+    "message": "Continuar no aplicativo web?"
   },
   "editedFolder": {
-    "message": "Pasta Editada"
+    "message": "Pasta salva"
   },
   "deleteFolderConfirmation": {
-    "message": "Você tem certeza que deseja excluir esta pasta?"
+    "message": "Tem certeza que deseja apagar esta pasta?"
   },
   "deletedFolder": {
-    "message": "Pasta excluída"
+    "message": "Pasta apagada"
   },
   "gettingStartedTutorial": {
-    "message": "Tutorial de Introdução"
+    "message": "Tutorial de introdução"
   },
   "gettingStartedTutorialVideo": {
     "message": "Assista o nosso tutorial de introdução e saiba como tirar o máximo de proveito da extensão de navegador."
   },
   "syncingComplete": {
-    "message": "Sincronização completa"
+    "message": "Sincronização concluída"
   },
   "syncingFailed": {
-    "message": "A Sincronização falhou"
+    "message": "A sincronização falhou"
   },
   "passwordCopied": {
     "message": "Senha copiada"
   },
   "uri": {
-    "message": "URL"
+    "message": "URI"
   },
   "uriPosition": {
     "message": "URI $POSITION$",
@@ -1012,77 +1047,89 @@
     "message": "Item adicionado"
   },
   "editedItem": {
-    "message": "Item editado"
+    "message": "Item salvo"
+  },
+  "savedWebsite": {
+    "message": "Site salvo"
+  },
+  "savedWebsites": {
+    "message": "Sites salvos ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
   },
   "deleteItemConfirmation": {
-    "message": "Você tem certeza que deseja enviar este item para a lixeira?"
+    "message": "Tem certeza que quer enviar este item para a lixeira?"
   },
   "deletedItem": {
-    "message": "Item excluído"
+    "message": "Item enviado para a lixeira"
   },
   "overwritePassword": {
-    "message": "Sobrescrever Senha"
+    "message": "Substituir senha"
   },
   "overwritePasswordConfirmation": {
     "message": "Você tem certeza que deseja substituir a senha atual?"
   },
   "overwriteUsername": {
-    "message": "Sobrescrever Usuário"
+    "message": "Substituir nome de usuário"
   },
   "overwriteUsernameConfirmation": {
-    "message": "Tem certeza que deseja substituir o usuário atual?"
+    "message": "Tem certeza que deseja substituir o nome de usuário atual?"
   },
   "searchFolder": {
-    "message": "Pesquisar pasta"
+    "message": "Buscar na pasta"
   },
   "searchCollection": {
-    "message": "Pesquisar coleção"
+    "message": "Buscar no conjunto"
   },
   "searchType": {
-    "message": "Pesquisar tipo"
+    "message": "Buscar tipo"
   },
   "noneFolder": {
-    "message": "Nenhuma Pasta",
+    "message": "Sem pasta",
     "description": "This is the folder for uncategorized items"
   },
   "enableAddLoginNotification": {
-    "message": "Peça para adicionar login"
+    "message": "Pedir para adicionar credencial"
   },
   "vaultSaveOptionsTitle": {
-    "message": "Salvar nas opções do cofre"
+    "message": "Opções de salvar no cofre"
   },
   "addLoginNotificationDesc": {
-    "message": "A \"Notificação de Adicionar Login\" pede para salvar automaticamente novas logins para o seu cofre quando você inicia uma sessão em um site pela primeira vez."
+    "message": "Pedir para adicionar um item se um não for encontrado no seu cofre."
   },
   "addLoginNotificationDescAlt": {
-    "message": "Pedir para adicionar um item se um não for encontrado no seu cofre. Aplica-se a todas as contas logadas."
+    "message": "Pedir para adicionar um item se um não for encontrado no seu cofre. Aplica-se a todas as contas conectadas."
   },
   "showCardsInVaultViewV2": {
     "message": "Sempre mostrar cartões como sugestões de preenchimento automático na tela do Cofre"
   },
   "showCardsCurrentTab": {
-    "message": "Mostrar cartões em páginas com guias."
+    "message": "Mostrar cartões na página da aba"
   },
   "showCardsCurrentTabDesc": {
-    "message": "Exibir itens de cartão em páginas com abas para simplificar o preenchimento automático"
+    "message": "Listar itens de cartão na página da aba para preenchimento automático fácil."
   },
   "showIdentitiesInVaultViewV2": {
     "message": "Sempre mostrar identidades como sugestões de preenchimento automático na tela do Cofre"
   },
   "showIdentitiesCurrentTab": {
-    "message": "Exibir Identidades na Aba Atual"
+    "message": "Mostrar identidades na página da aba"
   },
   "showIdentitiesCurrentTabDesc": {
-    "message": "Liste os itens de identidade na aba atual  para facilitar preenchimento automático."
+    "message": "Listar as identidades na página da aba para facilitar o preenchimento automático."
   },
   "clickToAutofillOnVault": {
     "message": "Clique em itens na tela do Cofre para preencher automaticamente"
   },
   "clickToAutofill": {
-    "message": "Selecione o item para preenchê-lo automaticamente"
+    "message": "Clique em um item para preenchê-lo automaticamente"
   },
   "clearClipboard": {
-    "message": "Limpar Área de Transferência",
+    "message": "Limpar área de transferência",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
@@ -1096,7 +1143,7 @@
     "message": "Salvar"
   },
   "notificationViewAria": {
-    "message": "View $ITEMNAME$, opens in new window",
+    "message": "Ver $ITEMNAME$, abre em uma nova janela",
     "placeholders": {
       "itemName": {
         "content": "$1"
@@ -1105,18 +1152,18 @@
     "description": "Aria label for the view button in notification bar confirmation message"
   },
   "notificationNewItemAria": {
-    "message": "New Item, opens in new window",
+    "message": "Novo item, abre em uma nova janela",
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
-    "message": "Edit before saving",
+    "message": "Editar antes de salvar",
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "Nova notificação"
   },
   "labelWithNotification": {
-    "message": "$LABEL$: New notification",
+    "message": "$LABEL$: Nova notificação",
     "description": "Label for the notification with a new login suggestion.",
     "placeholders": {
       "label": {
@@ -1126,15 +1173,15 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "salvo no Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "atualizado no Bitwarden.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "Selecionar $ITEMTYPE$, $ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1146,35 +1193,35 @@
     }
   },
   "saveAsNewLoginAction": {
-    "message": "Salvar como nova sessão",
+    "message": "Salvar como nova credencial",
     "description": "Button text for saving login details as a new entry."
   },
   "updateLoginAction": {
-    "message": "Atualizar sessão",
+    "message": "Atualizar credencial",
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Desbloqueie para salvar esta credencial",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
-    "message": "Save login",
+    "message": "Salvar credencial",
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "Atualizar credencial existente",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
-    "message": "Sessão salva",
+    "message": "Credencial salva",
     "description": "Message displayed when login details are successfully saved."
   },
   "loginUpdateSuccess": {
-    "message": "Sessão atualizada",
+    "message": "Credencial atualizada",
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Great job! You took the steps to make you and $ORGANIZATION$ more secure.",
+    "message": "Ótimo trabalho! Você passou pelas etapas para tornar você e $ORGANIZATION$ mais seguros.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1183,7 +1230,7 @@
     "description": "Shown to user after login is updated."
   },
   "loginUpdateTaskSuccessAdditional": {
-    "message": "Thank you for making $ORGANIZATION$ more secure. You have $TASK_COUNT$ more passwords to update.",
+    "message": "Obrigado por tornar $ORGANIZATION$ mais seguro. Você tem mais $TASK_COUNT$ senhas para atualizar.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1195,7 +1242,7 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "Alterar próxima senha",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
@@ -1207,25 +1254,25 @@
     "description": "Detailed error message shown when saving login details fails."
   },
   "changePasswordWarning": {
-    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+    "message": "Ao alterar sua senha, você precisará se conectar com a sua senha nova. Sessões ativas em outros dispositivos serão desconectadas dentro de uma hora."
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
-    "message": "Change your master password to complete account recovery."
+    "message": "Altere a sua senha principal para concluir a recuperação da conta."
   },
   "enableChangedPasswordNotification": {
-    "message": "Pedir para atualizar os dados de login existentes"
+    "message": "Pedir para atualizar credencial existente"
   },
   "changedPasswordNotificationDesc": {
-    "message": "Peça para atualizar a senha de login quando uma mudança for detectada em um site."
+    "message": "Peça para atualizar a senha de uma credencial quando uma mudança for detectada em um site."
   },
   "changedPasswordNotificationDescAlt": {
-    "message": "Pedir para atualizar a senha de uma credencial quando uma alteração for detectada em um site. Aplica-se a todas as contas conectadas."
+    "message": "Peça para atualizar a senha de uma credencial quando uma mudança for detectada em um site. Aplica-se a todas as contas conectadas."
   },
   "enableUsePasskeys": {
     "message": "Pedir para salvar e usar chaves de acesso"
   },
   "usePasskeysDesc": {
-    "message": "Pedir para salvar novas chaves de acesso ou entrar com as mesmas armazenadas no seu cofre. Aplica-se a todas as contas conectadas."
+    "message": "Pedir para salvar novas chaves de acesso ou se conectar com as mesmas armazenadas no seu cofre. Aplica-se a todas as contas conectadas."
   },
   "notificationChangeDesc": {
     "message": "Você quer atualizar esta senha no Bitwarden?"
@@ -1243,20 +1290,20 @@
     "message": "Opções adicionais"
   },
   "enableContextMenuItem": {
-    "message": "Mostrar opções de menu de contexto"
+    "message": "Mostrar opções do menu de contexto"
   },
   "contextMenuItemDesc": {
-    "message": "Use um duplo clique para acessar a geração de usuários e senhas correspondentes para o site. "
+    "message": "Use um clique duplo para acessar a geração de senhas e credenciais correspondentes para o site."
   },
   "contextMenuItemDescAlt": {
-    "message": "Use um clique secundário para acessar a geração de senha e os logins correspondentes para o site. Aplica-se a todas as contas logadas."
+    "message": "Use um clique secundário para acessar a geração de senha e as credenciais correspondentes para o site. Aplica-se a todas as contas conectadas."
   },
   "defaultUriMatchDetection": {
-    "message": "Detecção de correspondência de URI padrão",
+    "message": "Detecção de correspondência padrão de URI",
     "description": "Default URI match detection for autofill."
   },
   "defaultUriMatchDetectionDesc": {
-    "message": "Escolha a maneira padrão pela qual a detecção de correspondência de URI é manipulada para logins ao executar ações como preenchimento automático."
+    "message": "Escolha a maneira padrão pela qual a detecção de correspondência de URI é manipulada para credenciais ao executar ações como preenchimento automático."
   },
   "theme": {
     "message": "Tema"
@@ -1265,7 +1312,7 @@
     "message": "Altere o tema de cores do aplicativo."
   },
   "themeDescAlt": {
-    "message": "Altere o tema de cores da aplicação. Aplica-se para todas as contas conectadas."
+    "message": "Altere o tema de cores do aplicativo. Aplica-se para todas as contas conectadas."
   },
   "dark": {
     "message": "Escuro",
@@ -1279,13 +1326,13 @@
     "message": "Exportar de"
   },
   "exportVault": {
-    "message": "Exportar Cofre"
+    "message": "Exportar cofre"
   },
   "fileFormat": {
-    "message": "Formato de arquivo"
+    "message": "Formato do arquivo"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "Esta arquivo de exportação será protegido por senha e precisará da mesma para ser descriptografado."
+    "message": "Este arquivo de exportação será protegido por senha e precisará da mesma para ser descriptografado."
   },
   "filePassword": {
     "message": "Senha do arquivo"
@@ -1294,22 +1341,22 @@
     "message": "Esta senha será usada para exportar e importar este arquivo"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Use sua chave criptográfica da conta, derivada do nome de usuário e senha mestra da sua conta, para criptografar a exportação e restringir importação para apenas a conta atual do Bitwarden."
+    "message": "Use a chave de criptografia da sua conta, derivada do nome de usuário e senha principal da sua conta, para criptografar a exportação e restringir a importação para apenas a conta atual do Bitwarden."
   },
   "passwordProtectedOptionDescription": {
-    "message": "Defina uma senha de arquivo para criptografar a exportação e importá-la para qualquer conta do Bitwarden usando a senha para descriptografia."
+    "message": "Configure uma senha de arquivo para criptografar a exportação e importá-la para qualquer conta do Bitwarden usando a senha para descriptografá-la."
   },
   "exportTypeHeading": {
     "message": "Tipo da exportação"
   },
   "accountRestricted": {
-    "message": "Conta restrita"
+    "message": "Restrita à conta"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "\"Senha do arquivo\" e \"Confirmação de senha\" não correspondem."
+    "message": "\"Senha do arquivo\" e \"Confirmar senha do arquivo\" não correspondem."
   },
   "warning": {
-    "message": "AVISO",
+    "message": "ALERTA",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "warningCapitalized": {
@@ -1317,10 +1364,10 @@
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "confirmVaultExport": {
-    "message": "Confirmar Exportação do Cofre"
+    "message": "Confirmar exportação do cofre"
   },
   "exportWarningDesc": {
-    "message": "Esta exportação contém os dados do seu cofre em um formato não criptografado. Você não deve armazenar ou enviar o arquivo exportado por canais inseguros (como e-mail). Exclua o arquivo imediatamente após terminar de usá-lo."
+    "message": "Esta exportação contém os dados do seu cofre em um formato não criptografado. Você não deve armazenar ou enviar o arquivo exportado por canais inseguros (como e-mail). Apague o arquivo imediatamente após terminar de usá-lo."
   },
   "encExportKeyWarningDesc": {
     "message": "Esta exportação criptografa seus dados usando a chave de criptografia da sua conta. Se você rotacionar a chave de criptografia da sua conta, você deve exportar novamente, já que você não será capaz de descriptografar este arquivo de exportação."
@@ -1329,16 +1376,16 @@
     "message": "As chaves de criptografia são únicas para cada conta de usuário do Bitwarden, então você não pode importar um arquivo de exportação criptografado para uma conta diferente."
   },
   "exportMasterPassword": {
-    "message": "Insira a sua senha mestra para exportar os dados do seu cofre."
+    "message": "Digite a sua senha principal para exportar os dados do seu cofre."
   },
   "shared": {
     "message": "Compartilhado"
   },
   "bitwardenForBusinessPageDesc": {
-    "message": "O Bitwarden para Business permite que você compartilhe os itens do seu cofre com outras pessoas usando uma organização. Saiba mais no site bitwarden.com."
+    "message": "O Bitwarden para Empresas permite que você compartilhe os itens do seu cofre com outras pessoas usando uma organização. Saiba mais no site do bitwarden.com."
   },
   "moveToOrganization": {
-    "message": "Mover para a Organização"
+    "message": "Mover para organização"
   },
   "movedItemToOrg": {
     "message": "$ITEMNAME$ movido para $ORGNAME$",
@@ -1357,37 +1404,37 @@
     "message": "Escolha uma organização para a qual deseja mover este item. Mudar para uma organização transfere a propriedade do item para essa organização. Você não será mais o proprietário direto deste item depois que ele for movido."
   },
   "learnMore": {
-    "message": "Saber mais"
+    "message": "Saiba mais"
   },
   "authenticatorKeyTotp": {
-    "message": "Chave de Autenticação (TOTP)"
+    "message": "Chave do autenticador (TOTP)"
   },
   "verificationCodeTotp": {
-    "message": "Código de Verificação (TOTP)"
+    "message": "Código de verificação (TOTP)"
   },
   "copyVerificationCode": {
-    "message": "Copiar Código de Verificação"
+    "message": "Copiar código de verificação"
   },
   "attachments": {
     "message": "Anexos"
   },
   "deleteAttachment": {
-    "message": "Excluir anexo"
+    "message": "Apagar anexo"
   },
   "deleteAttachmentConfirmation": {
-    "message": "Tem a certeza de que deseja excluir este anexo?"
+    "message": "Tem a certeza de que deseja apagar este anexo?"
   },
   "deletedAttachment": {
-    "message": "Anexo excluído"
+    "message": "Anexo apagado"
   },
   "newAttachment": {
-    "message": "Adicionar Novo Anexo"
+    "message": "Adicionar novo anexo"
   },
   "noAttachments": {
-    "message": "Sem anexos."
+    "message": "Nenhum anexo."
   },
   "attachmentSaved": {
-    "message": "O anexo foi salvo."
+    "message": "Anexo salvo"
   },
   "file": {
     "message": "Arquivo"
@@ -1396,46 +1443,46 @@
     "message": "Arquivo para compartilhar"
   },
   "selectFile": {
-    "message": "Selecione um arquivo."
+    "message": "Selecione um arquivo"
   },
   "maxFileSize": {
     "message": "O tamanho máximo do arquivo é de 500 MB."
   },
   "featureUnavailable": {
-    "message": "Funcionalidade Indisponível"
+    "message": "Recurso indisponível"
   },
   "legacyEncryptionUnsupported": {
-    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+    "message": "A criptografia legada não é mais suportada. Entre em contato com o suporte para recuperar a sua conta."
   },
   "premiumMembership": {
-    "message": "Assinatura Premium"
+    "message": "Plano Premium"
   },
   "premiumManage": {
-    "message": "Gerenciar Plano"
+    "message": "Gerenciar plano"
   },
   "premiumManageAlert": {
-    "message": "Você pode gerenciar a sua assinatura premium no cofre web em bitwarden.com. Você deseja visitar o site agora?"
+    "message": "Você pode gerenciar o seu plano no cofre web do bitwarden.com. Você deseja visitar o site agora?"
   },
   "premiumRefresh": {
-    "message": "Atualizar Assinatura"
+    "message": "Recarregar plano"
   },
   "premiumNotCurrentMember": {
     "message": "Você não é um membro Premium atualmente."
   },
   "premiumSignUpAndGet": {
-    "message": "Registre-se para uma assinatura Premium e obtenha:"
+    "message": "Inscreva-se para um plano Premium e receba:"
   },
   "ppremiumSignUpStorage": {
-    "message": "1 GB de armazenamento de arquivos encriptados."
+    "message": "1 GB de armazenamento criptografado para anexo de arquivos."
   },
   "premiumSignUpEmergency": {
     "message": "Acesso de emergência."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Opções de login em duas etapas como YubiKey e Duo."
+    "message": "Opções de autenticação em duas etapas proprietárias como YubiKey e Duo."
   },
   "ppremiumSignUpReports": {
-    "message": "Higiene de senha, saúde da conta, e relatórios sobre violação de dados para manter o seu cofre seguro."
+    "message": "Relatórios de higiene de senha, saúde da conta, e vazamentos de dados para manter o seu cofre seguro."
   },
   "ppremiumSignUpTotp": {
     "message": "Gerador de códigos de verificação TOTP (2FA) para credenciais no seu cofre."
@@ -1444,7 +1491,7 @@
     "message": "Prioridade no suporte ao cliente."
   },
   "ppremiumSignUpFuture": {
-    "message": "Todas as funcionalidades Premium no futuro. Mais em breve!"
+    "message": "Todos as recursos do Premium no futuro. Mais em breve!"
   },
   "premiumPurchase": {
     "message": "Comprar Premium"
@@ -1453,16 +1500,16 @@
     "message": "Você pode comprar Premium nas configurações de sua conta no aplicativo web do Bitwarden."
   },
   "premiumCurrentMember": {
-    "message": "Você é um membro premium!"
+    "message": "Você é um membro Premium!"
   },
   "premiumCurrentMemberThanks": {
     "message": "Obrigado por apoiar o Bitwarden."
   },
   "premiumFeatures": {
-    "message": "Atualize para a versão Premium e receba:"
+    "message": "Faça upgrade para o Premium e receba:"
   },
   "premiumPrice": {
-    "message": "Tudo por apenas %price% /ano!",
+    "message": "Tudo por apenas $PRICE$ por ano!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1480,28 +1527,22 @@
     }
   },
   "refreshComplete": {
-    "message": "Atualização completa"
+    "message": "Recarregamento concluído"
   },
   "enableAutoTotpCopy": {
     "message": "Copiar TOTP automaticamente"
   },
   "disableAutoTotpCopyDesc": {
-    "message": "Se sua credencial tiver uma chave de autenticação, copie o código de verificação TOTP quando for autopreenchê-la."
+    "message": "Se uma credencial tiver uma chave de autenticador, copie o código de verificação TOTP quando for preenchê-la automaticamente."
   },
   "enableAutoBiometricsPrompt": {
-    "message": "Pedir biometria ao iniciar"
-  },
-  "premiumRequired": {
-    "message": "Requer Assinatura Premium"
-  },
-  "premiumRequiredDesc": {
-    "message": "Uma conta premium é necessária para usar esse recurso."
+    "message": "Pedir biometria ao abrir"
   },
   "authenticationTimeout": {
-    "message": "Tempo de autenticação esgotado"
+    "message": "Tempo limite da autenticação atingido"
   },
   "authenticationSessionTimedOut": {
-    "message": "A sessão de autenticação expirou. Por favor, reinicie o processo de login."
+    "message": "A sessão de autenticação expirou. Reinicie o processo de autenticação."
   },
   "verificationCodeEmailSent": {
     "message": "E-mail de verificação enviado para $EMAIL$.",
@@ -1520,13 +1561,13 @@
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use seu código de recuperação"
+    "message": "Usar seu código de recuperação"
   },
   "insertU2f": {
-    "message": "Insira a sua chave de segurança na porta USB do seu computador. Se ele tiver um botão, toque nele."
+    "message": "Insira a sua chave de segurança na porta USB do seu computador. Se ela tiver um botão, toque nele."
   },
   "openInNewTab": {
-    "message": "Abrir numa nova aba"
+    "message": "Abrir em uma nova aba"
   },
   "webAuthnAuthenticate": {
     "message": "Autenticar WebAuthn"
@@ -1534,53 +1575,62 @@
   "readSecurityKey": {
     "message": "Ler chave de segurança"
   },
+  "readingPasskeyLoading": {
+    "message": "Lendo a chave de acesso..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Falha na autenticação da chave de acesso"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Usar um método de autenticação diferente"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Aguardando interação com a chave de segurança..."
   },
   "loginUnavailable": {
-    "message": "Sessão Indisponível"
+    "message": "Autenticação indisponível"
   },
   "noTwoStepProviders": {
-    "message": "Esta conta tem a verificação de duas etapas ativado, no entanto, nenhum dos provedores de verificação de duas etapas configurados são suportados por este navegador web."
+    "message": "Esta conta tem a autenticação de duas etapas ativada, no entanto, nenhum dos provedores configurados são suportados por este navegador web."
   },
   "noTwoStepProviders2": {
-    "message": "Por favor utilize um navegador web suportado (tal como o Chrome) e/ou inclua provedores adicionais que são melhor suportados entre navegadores web (tal como uma aplicativo de autenticação)."
+    "message": "Use um navegador web suportado (tal como o Chrome) e/ou inclua provedores adicionais que são melhor suportados entre navegadores web (tal como um aplicativo autenticator)."
   },
   "twoStepOptions": {
-    "message": "Opções de Login em Duas Etapas"
+    "message": "Opções de autenticação em duas etapas"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Escolher iniciar sessão em duas etapas"
+    "message": "Selecionar método de autenticação em duas etapas"
   },
   "recoveryCodeTitle": {
-    "message": "Código de Recuperação"
+    "message": "Código de recuperação"
   },
   "authenticatorAppTitle": {
-    "message": "Aplicativo de Autenticação"
+    "message": "Aplicativo autenticador"
   },
   "authenticatorAppDescV2": {
-    "message": "Insira um código gerado por um aplicativo autenticador como o Bitwarden Authenticator.",
+    "message": "Digite um código gerado por um aplicativo autenticador como o Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
-    "message": "Chave de Segurança Yubico OTP"
+    "message": "Chave de segurança Yubico OTP"
   },
   "yubiKeyDesc": {
-    "message": "Utilize uma YubiKey para acessar a sua conta. Funciona com YubiKey 4, 4 Nano, 4C, e dispositivos NEO."
+    "message": "Utilize uma YubiKey para acessar a sua conta. Funciona com os dispositivos YubiKey 4, 4 Nano, 4C, e NEO."
   },
   "duoDescV2": {
-    "message": "Insira um código gerado pelo Duo Security.",
+    "message": "Digite um código gerado pelo Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Verifique com o Duo Security utilizando o aplicativo Duo Mobile, SMS, chamada telefônica, ou chave de segurança U2F.",
+    "message": "Verifique com o Duo Security para a sua organização usando o aplicativo Duo Mobile, SMS, chamada telefônica, ou chave de segurança U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "webAuthnTitle": {
     "message": "WebAuthn FIDO2"
   },
   "webAuthnDesc": {
-    "message": "Utilize qualquer chave de segurança ativada por WebAuthn para acessar a sua conta."
+    "message": "Use qualquer chave de segurança compatível com WebAuthn para acessar a sua conta."
   },
   "emailTitle": {
     "message": "E-mail"
@@ -1589,60 +1639,63 @@
     "message": "Digite o código enviado para seu e-mail."
   },
   "selfHostedEnvironment": {
-    "message": "Ambiente Auto-hospedado"
+    "message": "Ambiente auto-hospedado"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Especifique a URL de base da sua instalação local do Bitwarden. Exemplo: https://bitwarden.company.com"
+    "message": "Especifique o URL de base da sua instalação local do Bitwarden. Exemplo: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "Para usuários avançados. Você pode especificar a URL de base de cada serviço independentemente."
+    "message": "Para configuração avançada, você pode especificar a URL de base de cada serviço independentemente."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "Você deve adicionar um URL do servidor de base ou pelo menos um ambiente personalizado."
+    "message": "Você deve adicionar um URL de base de um servidor ou pelo menos um ambiente personalizado."
+  },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs devem usar HTTPS."
   },
   "customEnvironment": {
-    "message": "Ambiente Personalizado"
+    "message": "Ambiente personalizado"
   },
   "baseUrl": {
-    "message": "URL do Servidor"
+    "message": "URL do servidor"
   },
   "selfHostBaseUrl": {
-    "message": "URL do servidor auto-host",
+    "message": "URL do servidor auto-hospedado",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
-    "message": "URL do Servidor da API"
+    "message": "URL do servidor da API"
   },
   "webVaultUrl": {
-    "message": "URL do Servidor do Cofre Web"
+    "message": "URL do servidor do cofre web"
   },
   "identityUrl": {
-    "message": "URL do Servidor de Identidade"
+    "message": "URL do servidor de identidade"
   },
   "notificationsUrl": {
-    "message": "URL do Servidor de Notificações"
+    "message": "URL do servidor de notificações"
   },
   "iconsUrl": {
-    "message": "URL do Servidor de Ícones"
+    "message": "URL do servidor de ícones"
   },
   "environmentSaved": {
-    "message": "As URLs do ambiente foram salvas."
+    "message": "URLs do ambiente salvas"
   },
   "showAutoFillMenuOnFormFields": {
-    "message": "Exibir o menu de preenchimento automático nos campos do formulário",
+    "message": "Mostrar o menu de preenchimento automático em campos de formulário",
     "description": "Represents the message for allowing the user to enable the autofill overlay"
   },
   "autofillSuggestionsSectionTitle": {
     "message": "Sugestões de preenchimento automático"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "Encontre sugestões de preenchimento automático com facilidade"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "Desative as configurações de preenchimento automático do seu navegador, para que elas não entrem em conflito com o Bitwarden."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Desativar o preenchimento automático do $BROWSER$",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1651,16 +1704,37 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "Desativar o preenchimento automático"
+  },
+  "confirmAutofill": {
+    "message": "Confirmar preenchimento automático"
+  },
+  "confirmAutofillDesc": {
+    "message": "Esse site não corresponde aos detalhes salvos na credencial. Antes de preencher suas credenciais de acesso, certifique-se de que é um site confiável."
   },
   "showInlineMenuLabel": {
-    "message": "Mostrar sugestões de preenchimento automático nos campos de formulários"
+    "message": "Mostrar sugestões de preenchimento automático em campos de formulário"
+  },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Como que o Bitwarden protege seus dados de phishing?"
+  },
+  "currentWebsite": {
+    "message": "Site atual"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Preencher automaticamente e adicionar este site"
+  },
+  "autofillWithoutAdding": {
+    "message": "Preencher automaticamente sem adicionar"
+  },
+  "doNotAutofill": {
+    "message": "Não preencher automaticamente"
   },
   "showInlineMenuIdentitiesLabel": {
     "message": "Exibir identidades como sugestões"
   },
   "showInlineMenuCardsLabel": {
-    "message": "Exibir cards como sugestões"
+    "message": "Exibir cartões como sugestões"
   },
   "showInlineMenuOnIconSelectionLabel": {
     "message": "Exibir sugestões quando o ícone for selecionado"
@@ -1669,13 +1743,13 @@
     "message": "Aplica-se a todas as contas conectadas."
   },
   "turnOffBrowserBuiltInPasswordManagerSettings": {
-    "message": "Desative o gerenciador de senhas padrão do seu navegador para evitar conflitos."
+    "message": "Desative o gerenciador de senhas embutido no seu navegador para evitar conflitos."
   },
   "turnOffBrowserBuiltInPasswordManagerSettingsLink": {
-    "message": "Editar configurações do navegador."
+    "message": "Edite as configurações do navegador."
   },
   "autofillOverlayVisibilityOff": {
-    "message": "Desligado",
+    "message": "Desativado",
     "description": "Overlay setting select option for disabling autofill overlay"
   },
   "autofillOverlayVisibilityOnFieldFocus": {
@@ -1687,16 +1761,16 @@
     "description": "Overlay appearance select option for showing the field on click of the overlay icon"
   },
   "enableAutoFillOnPageLoadSectionTitle": {
-    "message": "Preenchimento automático ao carregar a página"
+    "message": "Preencher automaticamente ao carregar a página"
   },
   "enableAutoFillOnPageLoad": {
     "message": "Preencher automaticamente ao carregar a página"
   },
   "enableAutoFillOnPageLoadDesc": {
-    "message": "Se um formulário de login for detectado, realizar automaticamente um auto-preenchimento quando a página web carregar."
+    "message": "Se um formulário de credencial for detectado, preencha automaticamente quando a página carregar."
   },
   "experimentalFeature": {
-    "message": "Sites comprometidos ou não confiáveis podem tomar vantagem do autopreenchimento ao carregar a página."
+    "message": "Sites comprometidos ou não confiáveis podem explorar do preenchimento automático ao carregar a página."
   },
   "learnMoreAboutAutofillOnPageLoadLinkText": {
     "message": "Saiba mais sobre riscos"
@@ -1705,7 +1779,7 @@
     "message": "Saiba mais sobre preenchimento automático"
   },
   "defaultAutoFillOnPageLoad": {
-    "message": "Configuração de autopreenchimento padrão para itens de credenciais"
+    "message": "Configuração padrão de preenchimento automático para credenciais"
   },
   "defaultAutoFillOnPageLoadDesc": {
     "message": "Você pode desativar o preenchimento automático no carregamento da página para credenciais individuais na tela de Editar do item."
@@ -1726,7 +1800,7 @@
     "message": "Abrir cofre na barra lateral"
   },
   "commandAutofillLoginDesc": {
-    "message": "Preencher automaticamente o último login utilizado para o site atual"
+    "message": "Preencher automaticamente a última credencial utilizada para o site atual"
   },
   "commandAutofillCardDesc": {
     "message": "Preencher automaticamente o último cartão utilizado para o site atual"
@@ -1735,25 +1809,25 @@
     "message": "Preencher automaticamente a última identidade usada para o site atual"
   },
   "commandGeneratePasswordDesc": {
-    "message": "Gerar e copiar uma nova senha aleatória para a área de transferência."
+    "message": "Gere e copie uma nova senha aleatória para a área de transferência"
   },
   "commandLockVaultDesc": {
     "message": "Bloquear o cofre"
   },
   "customFields": {
-    "message": "Campos Personalizados"
+    "message": "Campos personalizados"
   },
   "copyValue": {
-    "message": "Copiar Valor"
+    "message": "Copiar valor"
   },
   "value": {
     "message": "Valor"
   },
   "newCustomField": {
-    "message": "Novo Campo Personalizado"
+    "message": "Novo campo personalizado"
   },
   "dragToSort": {
-    "message": "Arrastar para ordenar"
+    "message": "Arraste para ordenar"
   },
   "dragToReorder": {
     "message": "Arraste para reorganizar"
@@ -1762,7 +1836,7 @@
     "message": "Texto"
   },
   "cfTypeHidden": {
-    "message": "Ocultado"
+    "message": "Oculto"
   },
   "cfTypeBoolean": {
     "message": "Booleano"
@@ -1779,13 +1853,13 @@
     "description": "This describes a value that is 'linked' (tied) to another value."
   },
   "popup2faCloseMessage": {
-    "message": "Ao clicar fora da janela de pop-up para verificar seu e-mail para o seu código de verificação fará com que este pop-up feche. Você deseja abrir este pop-up em uma nova janela para que ele não seja fechado?"
+    "message": "Ao clicar fora da janela de pop-up para conferir seu e-mail pelo seu código de verificação, este pop-up fechará. Você deseja abrir este pop-up em uma nova janela para que ele não seja fechado?"
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Mostrar ícones de sites e obter URLs de alteração de senha"
   },
   "cardholderName": {
-    "message": "Titular do Cartão"
+    "message": "Nome do titular do cartão"
   },
   "number": {
     "message": "Número"
@@ -1794,10 +1868,13 @@
     "message": "Bandeira"
   },
   "expirationMonth": {
-    "message": "Mês de Vencimento"
+    "message": "Mês de vencimento"
   },
   "expirationYear": {
-    "message": "Ano de Vencimento"
+    "message": "Ano de vencimento"
+  },
+  "monthly": {
+    "message": "mês"
   },
   "expiration": {
     "message": "Vencimento"
@@ -1839,13 +1916,13 @@
     "message": "Dezembro"
   },
   "securityCode": {
-    "message": "Código de Segurança"
+    "message": "Código de segurança"
   },
   "cardNumber": {
-    "message": "card number"
+    "message": "número do cartão"
   },
   "ex": {
-    "message": "ex."
+    "message": "p. ex."
   },
   "title": {
     "message": "Título"
@@ -1863,34 +1940,34 @@
     "message": "Dr"
   },
   "mx": {
-    "message": "Mx"
+    "message": "Sre"
   },
   "firstName": {
-    "message": "Primeiro Nome"
+    "message": "Primeiro nome"
   },
   "middleName": {
-    "message": "Nome do Meio"
+    "message": "Nome do meio"
   },
   "lastName": {
-    "message": "Último Nome"
+    "message": "Sobrenome"
   },
   "fullName": {
-    "message": "Nome Completo"
+    "message": "Nome completo"
   },
   "identityName": {
-    "message": "Nome de Identidade"
+    "message": "Nome na identidade"
   },
   "company": {
     "message": "Empresa"
   },
   "ssn": {
-    "message": "Número de Segurança Social"
+    "message": "Número de CPF"
   },
   "passportNumber": {
-    "message": "Número do Passaporte"
+    "message": "Número do passaporte"
   },
   "licenseNumber": {
-    "message": "Número da Licença"
+    "message": "Número da licença"
   },
   "email": {
     "message": "E-mail"
@@ -1911,13 +1988,13 @@
     "message": "Endereço 3"
   },
   "cityTown": {
-    "message": "Cidade / Localidade"
+    "message": "Cidade ou localidade"
   },
   "stateProvince": {
-    "message": "Estado / Província"
+    "message": "Estado ou província"
   },
   "zipPostalCode": {
-    "message": "CEP / Código Postal"
+    "message": "CEP / Código postal"
   },
   "country": {
     "message": "País"
@@ -1932,7 +2009,7 @@
     "message": "Credenciais"
   },
   "typeSecureNote": {
-    "message": "Nota Segura"
+    "message": "Anotação segura"
   },
   "typeCard": {
     "message": "Cartão"
@@ -1944,86 +2021,86 @@
     "message": "Chave SSH"
   },
   "typeNote": {
-    "message": "Nota"
+    "message": "Anotação"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "Nova credencial",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "Novo cartão",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "Nova identidade",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "Nova anotação",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "Nova chave SSH",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Novo Send de texto",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Novo Send de arquivo",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "Editar credencial",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "Editar cartão",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "Editar identidade",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "Editar anotação",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "Editar chave SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Editar Send de texto",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Editar Send de arquivo",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Ver credencial",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Ver cartão",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "Ver identidade",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "Ver anotação",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "Ver chave SSH",
     "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
-    "message": "Histórico de Senha"
+    "message": "Histórico de senhas"
   },
   "generatorHistory": {
     "message": "Histórico do gerador"
@@ -2032,16 +2109,16 @@
     "message": "Limpar histórico do gerador"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "Se continuar, todas as entradas serão permanentemente excluídas do histórico do gerador. Tem certeza que deseja continuar?"
+    "message": "Se continuar, todos os itens serão apagados para sempre do histórico do gerador. Tem certeza que deseja continuar?"
   },
   "back": {
     "message": "Voltar"
   },
   "collections": {
-    "message": "Coleções"
+    "message": "Conjuntos"
   },
   "nCollections": {
-    "message": "Coleções $COUNT$",
+    "message": "$COUNT$ conjuntos",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2056,7 +2133,7 @@
     "message": "Abrir em uma nova janela"
   },
   "refresh": {
-    "message": "Atualizar"
+    "message": "Recarregar"
   },
   "cards": {
     "message": "Cartões"
@@ -2068,7 +2145,7 @@
     "message": "Credenciais"
   },
   "secureNotes": {
-    "message": "Notas seguras"
+    "message": "Anotações seguras"
   },
   "sshKeys": {
     "message": "Chaves SSH"
@@ -2078,10 +2155,10 @@
     "description": "To clear something out. example: To clear browser history."
   },
   "checkPassword": {
-    "message": "Verifique se a senha foi exposta."
+    "message": "Confira se a senha foi exposta."
   },
   "passwordExposed": {
-    "message": "Esta senha foi exposta $VALUE$ vez(es) em violações de dados. Você deve alterá-la.",
+    "message": "Esta senha foi exposta $VALUE$ vez(es) em vazamentos de dados. Você deve alterá-la.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -2090,7 +2167,7 @@
     }
   },
   "passwordSafe": {
-    "message": "Esta senha não foi encontrada em violações de dados conhecidas. Deve ser seguro de usar."
+    "message": "Esta senha não foi encontrada em vazamentos de dados conhecidos. Deve ser segura de usar."
   },
   "baseDomain": {
     "message": "Domínio de base",
@@ -2127,10 +2204,10 @@
     "description": "Default URI match detection for autofill."
   },
   "toggleOptions": {
-    "message": "Alternar Opções"
+    "message": "Habilitar opções"
   },
   "toggleCurrentUris": {
-    "message": "Alternar URIs atuais",
+    "message": "Habilitar URIs atuais",
     "description": "Toggle the display of the URIs of the currently open tabs in the browser."
   },
   "currentUri": {
@@ -2145,10 +2222,10 @@
     "message": "Tipos"
   },
   "allItems": {
-    "message": "Todos os Itens"
+    "message": "Todos os itens"
   },
   "noPasswordsInList": {
-    "message": "Não existem senhas para listar."
+    "message": "Não há senhas para listar."
   },
   "clearHistory": {
     "message": "Limpar histórico"
@@ -2174,23 +2251,23 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Senha Atualizada",
+    "message": "Senha atualizada",
     "description": "ex. Date this password was updated"
   },
   "neverLockWarning": {
-    "message": "Você tem certeza que deseja usar a opção \"Nunca\"? Definir suas opções de bloqueio para \"Nunca\" armazena a chave de criptografia do seu cofre no seu dispositivo. Se você usar esta opção, você deve garantir que irá manter o seu dispositivo devidamente protegido."
+    "message": "Você tem certeza que deseja usar a opção \"Nunca\"? Configurar suas opções de bloqueio para \"Nunca\" armazena a chave de criptografia do seu cofre no seu dispositivo. Se você usar esta opção, você deve garantir que irá manter o seu dispositivo devidamente protegido."
   },
   "noOrganizationsList": {
-    "message": "Você pertence a nenhuma organização. As organizações permitem que você compartilhe itens em segurança com outros usuários."
+    "message": "Você não pertence a nenhuma organização. As organizações permitem que você compartilhe itens em segurança com outros usuários."
   },
   "noCollectionsInList": {
-    "message": "Não há coleções para listar."
+    "message": "Não há conjuntos para listar."
   },
   "ownership": {
     "message": "Propriedade"
   },
   "whoOwnsThisItem": {
-    "message": "Quem possui este item?"
+    "message": "Quem é o proprietário deste item?"
   },
   "strong": {
     "message": "Forte",
@@ -2205,29 +2282,29 @@
     "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Senha mestra fraca"
+    "message": "Senha principal fraca"
   },
   "weakMasterPasswordDesc": {
-    "message": "A senha mestra que você selecionou está fraca. Você deve usar uma senha mestra forte (ou uma frase-passe) para proteger a sua conta Bitwarden adequadamente. Tem certeza que deseja usar esta senha mestra?"
+    "message": "A senha principal que você selecionou está fraca. Você deve usar uma senha principal forte (ou uma frase secreta) para proteger a sua conta Bitwarden adequadamente. Tem certeza que deseja usar esta senha principal?"
   },
   "pin": {
     "message": "PIN",
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "unlockWithPin": {
-    "message": "Desbloquear com o PIN"
+    "message": "Desbloquear com PIN"
   },
   "setYourPinTitle": {
-    "message": "Definir PIN"
+    "message": "Configurar PIN"
   },
   "setYourPinButton": {
-    "message": "Definir PIN"
+    "message": "Configurar PIN"
   },
   "setYourPinCode": {
-    "message": "Defina o seu código PIN para desbloquear o Bitwarden. Suas configurações de PIN serão redefinidas se alguma vez você encerrar completamente toda a sessão do aplicativo."
+    "message": "Configure o seu código PIN para desbloquear o Bitwarden. Suas configurações de PIN serão reconfiguradas se você desconectar a sua conta do aplicativo."
   },
   "setPinCode": {
-    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
+    "message": "Você pode usar este PIN para desbloquear o Bitwarden. O seu PIN será reconfigurado se você desconectar a sua conta do aplicativo."
   },
   "pinRequired": {
     "message": "O código PIN é necessário."
@@ -2239,55 +2316,55 @@
     "message": "Muitas tentativas de entrada de PIN inválidas. Desconectando."
   },
   "unlockWithBiometrics": {
-    "message": "Desbloquear com a biometria"
+    "message": "Desbloquear com biometria"
   },
   "unlockWithMasterPassword": {
-    "message": "Desbloquear com a senha mestra"
+    "message": "Desbloquear com senha principal"
   },
   "awaitDesktop": {
-    "message": "Aguardando confirmação do desktop"
+    "message": "Aguardando confirmação do computador"
   },
   "awaitDesktopDesc": {
-    "message": "Por favor, confirme o uso de dados biométricos no aplicativo Bitwarden Desktop para ativar a biometria para o navegador."
+    "message": "Confirme o uso de biometria no aplicativo do Bitwarden Desktop para ativar a biometria para o navegador."
   },
   "lockWithMasterPassOnRestart": {
-    "message": "Bloquear com senha mestra ao reiniciar o navegador"
+    "message": "Bloquear com senha principal ao reiniciar o navegador"
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Exigir senha mestra ao reiniciar o navegador"
+    "message": "Exigir senha principal ao reiniciar o navegador"
   },
   "selectOneCollection": {
-    "message": "Você deve selecionar pelo menos uma coleção."
+    "message": "Você deve selecionar pelo menos um conjunto."
   },
   "cloneItem": {
-    "message": "Clonar Item"
+    "message": "Clonar item"
   },
   "clone": {
     "message": "Clonar"
   },
   "passwordGenerator": {
-    "message": "Gerador de Senha"
+    "message": "Gerador de senhas"
   },
   "usernameGenerator": {
-    "message": "Gerador de usuário"
+    "message": "Gerador de nome de usuário"
   },
   "useThisEmail": {
     "message": "Usar este e-mail"
   },
   "useThisPassword": {
-    "message": "Use esta senha"
+    "message": "Usar esta senha"
   },
   "useThisPassphrase": {
-    "message": "Use this passphrase"
+    "message": "Usar esta frase secreta"
   },
   "useThisUsername": {
-    "message": "Use este nome de usuário"
+    "message": "Usar este nome de usuário"
   },
   "securePasswordGenerated": {
-    "message": "Senha segura gerada! Não se esqueça de atualizar também sua senha no site."
+    "message": "Senha segura gerada! Não se esqueça de atualizar sua senha no site também."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Usar o gerador",
+    "message": "Use o gerador",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
@@ -2298,10 +2375,10 @@
     "message": "Personalização do cofre"
   },
   "vaultTimeoutAction": {
-    "message": "Ação de Tempo Limite do Cofre"
+    "message": "Ação do tempo limite do cofre"
   },
   "vaultTimeoutAction1": {
-    "message": "Ação do tempo"
+    "message": "Ação do tempo limite"
   },
   "lock": {
     "message": "Bloquear",
@@ -2312,31 +2389,31 @@
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "Pesquisar na lixeira"
+    "message": "Buscar na lixeira"
   },
   "permanentlyDeleteItem": {
-    "message": "Excluir o Item Permanentemente"
+    "message": "Apagar item para sempre"
   },
   "permanentlyDeleteItemConfirmation": {
-    "message": "Você tem certeza que deseja excluir permanentemente esse item?"
+    "message": "Tem certeza que deseja apagar esse item para sempre?"
   },
   "permanentlyDeletedItem": {
-    "message": "Item Permanentemente Excluído"
+    "message": "Item apagado para sempre"
   },
   "restoreItem": {
-    "message": "Restaurar Item"
+    "message": "Restaurar item"
   },
   "restoredItem": {
-    "message": "Item Restaurado"
+    "message": "Item restaurado"
   },
   "alreadyHaveAccount": {
     "message": "Já tem uma conta?"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Sair irá remover todo o acesso ao seu cofre e requer autenticação online após o período de tempo limite. Tem certeza de que deseja usar esta configuração?"
+    "message": "Desconectar-se irá remover todo o acesso ao seu cofre e requirirá autenticação online após o período de tempo limite. Tem certeza de que deseja usar esta configuração?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Confirmação de Ação de Tempo Limite"
+    "message": "Confirmação da ação do tempo limite"
   },
   "autoFillAndSave": {
     "message": "Preencher automaticamente e salvar"
@@ -2351,16 +2428,16 @@
     "message": "Item preenchido automaticamente "
   },
   "insecurePageWarning": {
-    "message": "Aviso: Esta é uma página HTTP não segura, e qualquer informação que você enviar poderá ser interceptada e modificada por outras pessoas. Este login foi originalmente salvo em uma página segura (HTTPS)."
+    "message": "Aviso: Esta é uma página HTTP sem segurança, e qualquer informação que você enviar poderá ser interceptada e modificada por outras pessoas. Esta credencial foi originalmente salvo em uma página segura (HTTPS)."
   },
   "insecurePageWarningFillPrompt": {
-    "message": "Você ainda deseja preencher esse login?"
+    "message": "Você ainda deseja preencher esta credencial?"
   },
   "autofillIframeWarning": {
-    "message": "O formulário está hospedado em um domínio diferente do URI do seu login salvo. Escolha OK para preencher automaticamente mesmo assim ou Cancelar para parar."
+    "message": "O formulário está hospedado em um domínio diferente do URI da sua credencial salva. Escolha OK para preencher automaticamente mesmo assim, ou Cancelar para parar."
   },
   "autofillIframeWarningTip": {
-    "message": "Para evitar este aviso no futuro, salve este URI, $HOSTNAME$, no seu item de login no Bitwarden para este site.",
+    "message": "Para evitar este aviso no futuro, salve este URI, $HOSTNAME$, no seu item de credencial no Bitwarden para este site.",
     "placeholders": {
       "hostname": {
         "content": "$1",
@@ -2368,20 +2445,23 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Esta página está interferindo com a experiência do Bitwarden. O menu inline do Bitwarden foi temporariamente desativado como uma medida de segurança."
+  },
   "setMasterPassword": {
-    "message": "Definir senha mestra"
+    "message": "Configurar senha principal"
   },
   "currentMasterPass": {
-    "message": "Senha mestra atual"
+    "message": "Senha principal atual"
   },
   "newMasterPass": {
-    "message": "Nova senha mestra"
+    "message": "Nova senha principal"
   },
   "confirmNewMasterPass": {
-    "message": "Confirme a nova senha mestre"
+    "message": "Confirmar nova senha principal"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "Uma ou mais políticas da organização exigem que a sua senha mestra cumpra aos seguintes requisitos:"
+    "message": "Uma ou mais políticas da organização exigem que a sua senha principal cumpra aos seguintes requisitos:"
   },
   "policyInEffectMinComplexity": {
     "message": "Pontuação mínima de complexidade de $SCORE$",
@@ -2420,13 +2500,13 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "A sua nova senha mestra não cumpre aos requisitos da política."
+    "message": "A sua nova senha principal não cumpre aos requisitos da política."
   },
   "receiveMarketingEmailsV2": {
-    "message": "Obtenha dicas, novidades e oportunidades de pesquisa do Bitwarden em sua caixa de entrada."
+    "message": "Receba conselhos, novidades, e oportunidades de pesquisa do Bitwarden em sua caixa de entrada."
   },
   "unsubscribe": {
-    "message": "Cancelar subscrição"
+    "message": "Desinscreva-se"
   },
   "atAnyTime": {
     "message": "a qualquer momento."
@@ -2450,16 +2530,16 @@
     "message": "Política de Privacidade"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Sua nova senha não pode ser a mesma que a sua atual."
+    "message": "Sua senha nova não pode ser a mesma que a sua atual."
   },
   "hintEqualsPassword": {
-    "message": "Sua dica de senha não pode ser o mesmo que sua senha."
+    "message": "A dica da sua senha não pode ser a mesma coisa que sua senha."
   },
   "ok": {
     "message": "Ok"
   },
   "errorRefreshingAccessToken": {
-    "message": "Erro ao Atualizar Token"
+    "message": "Erro ao acessar token de recarregamento"
   },
   "errorRefreshingAccessTokenDesc": {
     "message": "Nenhum token de atualização ou chave de API foi encontrado. Tente sair e entrar novamente."
@@ -2468,49 +2548,49 @@
     "message": "Verificação de sincronização do Desktop"
   },
   "desktopIntegrationVerificationText": {
-    "message": "Por favor, verifique se o aplicativo desktop mostra esta impressão digital: "
+    "message": "Verifique se o aplicativo de computador mostra esta frase biométrica: "
   },
   "desktopIntegrationDisabledTitle": {
-    "message": "A integração com o navegador não está habilitada"
+    "message": "A integração com o navegador não foi configurada"
   },
   "desktopIntegrationDisabledDesc": {
-    "message": "A integração com o navegador não está habilitada no aplicativo Bitwarden Desktop. Por favor, habilite-a nas configurações do aplicativo desktop."
+    "message": "A integração com o navegador não foi configurada no aplicativo do Bitwarden Desktop. Configure ela nas configurações do aplicativo de computador."
   },
   "startDesktopTitle": {
-    "message": "Iniciar o aplicativo Bitwarden Desktop"
+    "message": "Abrir o aplicativo Bitwarden Desktop"
   },
   "startDesktopDesc": {
-    "message": "O aplicativo Bitwarden Desktop precisa ser iniciado antes que esta função possa ser usada."
+    "message": "O aplicativo Bitwarden para computador precisa ser aberto antes que o desbloqueio com biometria possa ser usado."
   },
   "errorEnableBiometricTitle": {
-    "message": "Não foi possível ativar a biometria"
+    "message": "Não é possível ativar a biometria"
   },
   "errorEnableBiometricDesc": {
-    "message": "A ação foi cancelada pelo aplicativo desktop"
+    "message": "A ação foi cancelada pelo aplicativo de computador"
   },
   "nativeMessagingInvalidEncryptionDesc": {
-    "message": "O aplicativo desktop invalidou o canal de comunicação seguro. Por favor, tente esta operação novamente"
+    "message": "O aplicativo de computador invalidou o canal de comunicação seguro. Tente esta operação novamente"
   },
   "nativeMessagingInvalidEncryptionTitle": {
-    "message": "Comunicação com o desktop interrompida"
+    "message": "Comunicação com o computador interrompida"
   },
   "nativeMessagingWrongUserDesc": {
-    "message": "O aplicativo desktop está conectado em uma conta diferente. Por favor, certifique-se de que ambos os aplicativos estejam conectados na mesma conta."
+    "message": "O aplicativo de computador está conectado em uma conta diferente. Certifique-se de que ambos os aplicativos estejam conectados na mesma conta."
   },
   "nativeMessagingWrongUserTitle": {
-    "message": "A conta não confere"
+    "message": "Não correspondência da conta"
   },
   "nativeMessagingWrongUserKeyTitle": {
-    "message": "Falta de chave biométrica"
+    "message": "Não correspondência da chave biométrica"
   },
   "nativeMessagingWrongUserKeyDesc": {
-    "message": "O desbloqueio biométrico falhou. A chave secreta biométrica não conseguiu desbloquear o cofre. Tente configurar os dados biométricos novamente."
+    "message": "O desbloqueio biométrico falhou. A chave secreta da biometria falhou ao desbloquear o cofre. Tente configurar a biometria novamente."
   },
   "biometricsNotEnabledTitle": {
-    "message": "Biometria não ativada"
+    "message": "Biometria não configurada"
   },
   "biometricsNotEnabledDesc": {
-    "message": "A biometria com o navegador requer que a biometria de desktop seja habilitada nas configurações primeiro."
+    "message": "A biometria com o navegador requer que a biometria do desktop seja configurada nas configurações primeiro."
   },
   "biometricsNotSupportedTitle": {
     "message": "Biometria não suportada"
@@ -2522,7 +2602,7 @@
     "message": "Usuário bloqueado ou desconectado"
   },
   "biometricsNotUnlockedDesc": {
-    "message": "Por favor, desbloqueie esse usuário no aplicativo da área de trabalho e tente novamente."
+    "message": "Desbloqueie esse usuário no aplicativo de computador e tente novamente."
   },
   "biometricsNotAvailableTitle": {
     "message": "Desbloqueio biométrico indisponível"
@@ -2534,34 +2614,34 @@
     "message": "Biometria falhou"
   },
   "biometricsFailedDesc": {
-    "message": "A biometria não pode ser concluída, considere usar uma senha mestra ou desconectar. Se isso persistir, entre em contato com o suporte do Bitwarden."
+    "message": "A biometria não pode ser concluída, considere usar uma senha principal ou desconectar. Se isso persistir, entre em contato com o suporte do Bitwarden."
   },
   "nativeMessaginPermissionErrorTitle": {
     "message": "Permissão não fornecida"
   },
   "nativeMessaginPermissionErrorDesc": {
-    "message": "Sem a permissão para se comunicar com o Aplicativo Bitwarden Desktop, não podemos fornecer dados biométricos na extensão do navegador. Por favor, tente novamente."
+    "message": "Sem a permissão para se comunicar com o aplicativo do Bitwarden Desktop, não podemos fornecer a biometria na extensão do navegador. Tente novamente."
   },
   "nativeMessaginPermissionSidebarTitle": {
     "message": "Erro ao solicitar permissão"
   },
   "nativeMessaginPermissionSidebarDesc": {
-    "message": "Esta ação não pode ser feita na barra lateral. Por favor, tente novamente no pop-up ou popout."
+    "message": "Esta ação não pode ser feita na barra lateral. Tente novamente no pop-up."
   },
   "personalOwnershipSubmitError": {
-    "message": "Devido a uma Política Empresarial, você está restrito de salvar itens para seu cofre pessoal. Altere a opção de Propriedade para uma organização e escolha entre as Coleções disponíveis."
+    "message": "Devido a uma política empresarial, você não pode salvar itens no seu cofre pessoal. Altere a opção de propriedade para uma organização e escolha entre os conjuntos disponíveis."
   },
   "personalOwnershipPolicyInEffect": {
     "message": "Uma política de organização está afetando suas opções de propriedade."
   },
   "personalOwnershipPolicyInEffectImports": {
-    "message": "A política da organização bloqueou a importação de itens para o seu cofre."
+    "message": "Uma política da organização bloqueou a importação de itens em seu cofre pessoal."
   },
   "restrictCardTypeImport": {
-    "message": "Cannot import card item types"
+    "message": "Não é possível importar itens do tipo de cartão"
   },
   "restrictCardTypeImportDesc": {
-    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+    "message": "Uma política definida por 1 ou mais organizações impedem que você importe cartões em seus cofres."
   },
   "domainsTitle": {
     "message": "Domínios",
@@ -2574,28 +2654,28 @@
     "message": "Saiba mais sobre domínios bloqueados"
   },
   "excludedDomains": {
-    "message": "Domínios Excluídos"
+    "message": "Domínios excluídos"
   },
   "excludedDomainsDesc": {
     "message": "O Bitwarden não irá pedir para salvar os detalhes de credencial para estes domínios. Você deve atualizar a página para que as alterações entrem em vigor."
   },
   "excludedDomainsDescAlt": {
-    "message": "O Bitwarden não irá pedir para salvar os detalhes de credencial para estes domínios. Você deve atualizar a página para que as alterações entrem em vigor."
+    "message": "O Bitwarden não irá pedir para salvar os detalhes de credencial para estes domínios, em todas as contas. Você deve recarregar a página para que as alterações entrem em vigor."
   },
   "blockedDomainsDesc": {
-    "message": "O preenchimento automático e outros recursos podem não estar disponíveis para estes sites. Atualize a página para que as mudanças surtam efeito."
+    "message": "O preenchimento automático e outros recursos relacionados não serão oferecidos para estes sites. Recarregue a página para que as mudanças surtam efeito."
   },
   "autofillBlockedNoticeV2": {
     "message": "O preenchimento automático está bloqueado para este site."
   },
   "autofillBlockedNoticeGuidance": {
-    "message": "Altere isso em configurações"
+    "message": "Altere isso nas configurações"
   },
   "change": {
     "message": "Alterar"
   },
   "changePassword": {
-    "message": "Change password",
+    "message": "Alterar senha",
     "description": "Change password button for browser at risk notification on login."
   },
   "changeButtonTitle": {
@@ -2608,13 +2688,13 @@
     }
   },
   "atRiskPassword": {
-    "message": "At-risk password"
+    "message": "Senha em risco"
   },
   "atRiskPasswords": {
     "message": "Senhas em risco"
   },
   "atRiskPasswordDescSingleOrg": {
-    "message": "$ORGANIZATION$ solicita que altere uma senha, pois ela está vulnerável.",
+    "message": "$ORGANIZATION$ está solicitando que altere uma senha, pois ela está em risco.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2623,7 +2703,7 @@
     }
   },
   "atRiskPasswordsDescSingleOrgPlural": {
-    "message": "$ORGANIZATION$ solicita que altere $COUNT$ senhas, pois elas estão vulneráveis.",
+    "message": "$ORGANIZATION$ está solicitando que altere $COUNT$ senhas, pois elas estão em risco.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2636,7 +2716,7 @@
     }
   },
   "atRiskPasswordsDescMultiOrgPlural": {
-    "message": "Suas organizações estão solicitando que altere $COUNT$ senhas porque elas estão vulneráveis.",
+    "message": "Suas organizações estão solicitando que altere $COUNT$ senhas porque elas estão em risco.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2645,7 +2725,7 @@
     }
   },
   "atRiskChangePrompt": {
-    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "message": "Sua senha para este site está em risco. $ORGANIZATION$ solicitou que você altere ela.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2655,7 +2735,7 @@
     "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
   },
   "atRiskNavigatePrompt": {
-    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "message": "$ORGANIZATION$ quer que você altere esta senha porque está em risco. Navegue até as configurações da sua conta para alterar a senha.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2665,10 +2745,10 @@
     "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
   },
   "reviewAndChangeAtRiskPassword": {
-    "message": "Revisar e alterar uma senha vulnerável"
+    "message": "Revisar e alterar uma senha em risco"
   },
   "reviewAndChangeAtRiskPasswordsPlural": {
-    "message": "Revisar e alterar $COUNT$ senhas vulneráveis",
+    "message": "Revisar e alterar $COUNT$ senhas em risco",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2677,30 +2757,30 @@
     }
   },
   "changeAtRiskPasswordsFaster": {
-    "message": "Mude senhas vulneráveis rapidamente"
+    "message": "Altere senhas em risco mais rápido"
   },
   "changeAtRiskPasswordsFasterDesc": {
-    "message": "Atualize suas configurações para poder autopreencher ou gerar novas senhas"
+    "message": "Atualize suas configurações para poder preencher senhas automaticamente ou gerá-las automaticamente"
   },
   "reviewAtRiskLogins": {
-    "message": "Revisar logins em risco"
+    "message": "Revisar credenciais em risco"
   },
   "reviewAtRiskPasswords": {
-    "message": "Revisar senhas vulneráveis"
+    "message": "Revisar senhas em risco"
   },
   "reviewAtRiskLoginsSlideDesc": {
-    "message": "As senhas da sua organização estão vulneráveis, pois são fracas, reutilizadas e/ou comprometidas.",
+    "message": "As senhas da sua organização estão em risco, pois são fracas, foram reutilizadas e/ou comprometidas.",
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
-    "message": "Ilustração de uma lista de logins em risco."
+    "message": "Ilustração de uma lista de credenciais em risco."
   },
   "generatePasswordSlideDesc": {
-    "message": "Gere rapidamente uma senha forte e única com a opção de autopreenchimento no site vulnerável.",
+    "message": "Gere uma senha forte e única com rapidez com o menu de preenchimento automático no site em risco.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
-    "message": "Ilustração do menu de autopreenchimento do Bitwarden exibindo uma senha gerada."
+    "message": "Ilustração do menu de preenchimento automático do Bitwarden exibindo uma senha gerada."
   },
   "updateInBitwarden": {
     "message": "Atualizar no Bitwarden"
@@ -2710,16 +2790,16 @@
     "description": "Description of the update in Bitwarden slide on the at-risk password page carousel"
   },
   "updateInBitwardenSlideImgAltPeriod": {
-    "message": "Ilustração de umja notificação do Bitwarden solicitando que o usuário atualize o login."
+    "message": "Ilustração de uma notificação do Bitwarden solicitando que o usuário atualize a credencial."
   },
   "turnOnAutofill": {
     "message": "Ativar preenchimento automático"
   },
   "turnedOnAutofill": {
-    "message": "Desativar preenchimento automático"
+    "message": "Preenchimento automático ativado"
   },
   "dismiss": {
-    "message": "Dispensar"
+    "message": "Descartar"
   },
   "websiteItemLabel": {
     "message": "Site $number$ (URI)",
@@ -2743,17 +2823,17 @@
     "message": "Alterações de domínios bloqueados salvas"
   },
   "excludedDomainsSavedSuccess": {
-    "message": "Mudanças de domínios excluídos salvas"
+    "message": "Alterações de domínios excluídos salvas"
   },
   "limitSendViews": {
-    "message": "Limitar visualização"
+    "message": "Limitar visualizações"
   },
   "limitSendViewsHint": {
-    "message": "Ninguém pode visualizar este envio depois que o limite foi atingido.",
+    "message": "Ninguém poderá visualizar este Send depois que o limite foi atingido.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ Visualizações restantes",
+    "message": "$ACCESSCOUNT$ visualizações restantes",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -2767,7 +2847,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDetails": {
-    "message": "Enviar detalhes",
+    "message": "Detalhes do Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeText": {
@@ -2784,14 +2864,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCountReached": {
-    "message": "Max access count reached",
+    "message": "Número máximo de acessos atingido",
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "hideTextByDefault": {
     "message": "Ocultar texto por padrão"
   },
   "expired": {
-    "message": "Expirado"
+    "message": "Vencido"
   },
   "passwordProtected": {
     "message": "Protegido por senha"
@@ -2804,16 +2884,16 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "removePassword": {
-    "message": "Remover Senha"
+    "message": "Remover senha"
   },
   "delete": {
-    "message": "Excluir"
+    "message": "Apagar"
   },
   "removedPassword": {
-    "message": "Senha Removida"
+    "message": "Senha removida"
   },
   "deletedSend": {
-    "message": "Send Excluído",
+    "message": "Send apagado",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
@@ -2827,15 +2907,15 @@
     "message": "Você tem certeza que deseja remover a senha?"
   },
   "deleteSend": {
-    "message": "Excluir Send",
+    "message": "Apagar Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendConfirmation": {
-    "message": "Você tem certeza que deseja excluir este Send?",
+    "message": "Você tem certeza que deseja apagar este Send?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Tem certeza que deseja excluir este campo permanentemente?",
+    "message": "Tem certeza que deseja apagar este Send para sempre?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -2843,14 +2923,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
-    "message": "Data de Exclusão"
+    "message": "Data de apagamento"
   },
   "deletionDateDescV2": {
-    "message": "O envio será eliminado permanentemente na data e hora especificadas.",
+    "message": "O Send será apagado para sempre nesta data.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
-    "message": "Data de Validade"
+    "message": "Data de validade"
   },
   "oneDay": {
     "message": "1 dia"
@@ -2868,38 +2948,38 @@
     "message": "Personalizado"
   },
   "sendPasswordDescV3": {
-    "message": "Adicione uma senha opcional para os destinatários para acessar este Envio.",
+    "message": "Adicione uma senha opcional para que os destinatários acessem este Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Criar Novo Send",
+    "message": "Novo Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "newPassword": {
-    "message": "Nova Senha"
+    "message": "Senha nova"
   },
   "sendDisabled": {
-    "message": "Send Desativado",
+    "message": "Send removido",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
-    "message": "Devido a uma política corporativa, você só pode excluir um Send existente.",
+    "message": "Devido a uma política corporativa, você só pode apagar um Send existente.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Send Criado",
+    "message": "Send criado",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSendSuccessfully": {
-    "message": "Envio criado com sucesso!",
+    "message": "Send criado com sucesso!",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHoursSingle": {
-    "message": "O envio estará disponível para qualquer pessoa com o link para a próxima 1 hora.",
+    "message": "O Send estará disponível para qualquer pessoa com o link pela próxima 1 hora.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHours": {
-    "message": "O envio estará disponível para qualquer pessoa com o link para as próximas $HOURS$ horas.",
+    "message": "O Send estará disponível para qualquer pessoa com o link pelas próximas $HOURS$ horas.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "hours": {
@@ -2909,11 +2989,11 @@
     }
   },
   "sendExpiresInDaysSingle": {
-    "message": "O envio estará disponível para qualquer pessoa com o link para o próximo 1 dia.",
+    "message": "O Send estará disponível para qualquer pessoa com o link pelo próximo 1 dia.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInDays": {
-    "message": "O envio estará disponível para qualquer pessoa com o link para os próximos $DAYS$ dias.",
+    "message": "O Send estará disponível para qualquer pessoa com o link pelos próximos $DAYS$ dias.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "days": {
@@ -2923,19 +3003,19 @@
     }
   },
   "sendLinkCopied": {
-    "message": "Enviar link copiado",
+    "message": "Link do Send copiado",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Send Editado",
+    "message": "Send salvo",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogText": {
-    "message": "Mostrar extensão?",
+    "message": "Criar janela da extensão?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogDesc": {
-    "message": "Para criar um arquivo enviado, você precisa colocar a extensão em uma nova janela.",
+    "message": "Para criar um Send de arquivo, você precisa colocar a extensão em uma nova janela.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinuxChromiumFileWarning": {
@@ -2948,7 +3028,7 @@
     "message": "Para escolher um arquivo usando o Safari, abra uma nova janela clicando neste banner."
   },
   "popOut": {
-    "message": "Separar da janela"
+    "message": "Mover para janela"
   },
   "sendFileCalloutHeader": {
     "message": "Antes de começar"
@@ -2957,31 +3037,31 @@
     "message": "A data de validade fornecida não é válida."
   },
   "deletionDateIsInvalid": {
-    "message": "A data de exclusão fornecida não é válida."
+    "message": "A data de apagamento fornecida não é válida."
   },
   "expirationDateAndTimeRequired": {
-    "message": "Uma data e hora de expiração são obrigatórias."
+    "message": "Uma data e hora de validade são obrigatórias."
   },
   "deletionDateAndTimeRequired": {
-    "message": "Uma data e hora de exclusão são obrigatórias."
+    "message": "Uma data e hora de apagamento são obrigatórias."
   },
   "dateParsingError": {
-    "message": "Ocorreu um erro ao salvar as suas datas de exclusão e validade."
+    "message": "Ocorreu um erro ao salvar as suas datas de apagamento e validade."
   },
   "hideYourEmail": {
-    "message": "Ocultar meu endereço de correio eletrônico dos destinatários."
+    "message": "Oculte seu endereço de e-mail dos visualizadores."
   },
   "passwordPrompt": {
-    "message": "Solicitação nova de senha mestra"
+    "message": "Resolicitar senha principal"
   },
   "passwordConfirmation": {
-    "message": "Confirmação de senha mestra"
+    "message": "Confirmação de senha principal"
   },
   "passwordConfirmationDesc": {
-    "message": "Esta ação está protegida. Para continuar, por favor, reinsira a sua senha mestra para verificar sua identidade."
+    "message": "Esta ação está protegida. Para continuar, digite a sua senha principal novamente para verificar sua identidade."
   },
   "emailVerificationRequired": {
-    "message": "Verificação de E-mail Necessária"
+    "message": "Verificação de e-mail necessária"
   },
   "emailVerifiedV2": {
     "message": "E-mail verificado"
@@ -2990,28 +3070,28 @@
     "message": "Você precisa verificar o seu e-mail para usar este recurso. Você pode verificar seu e-mail no cofre web."
   },
   "masterPasswordSuccessfullySet": {
-    "message": "Master password successfully set"
+    "message": "Senha principal configurada com sucesso"
   },
   "updatedMasterPassword": {
-    "message": "Senha mestra atualizada"
+    "message": "Senha principal atualizada"
   },
   "updateMasterPassword": {
-    "message": "Atualizar senha mestra"
+    "message": "Atualizar senha principal"
   },
   "updateMasterPasswordWarning": {
-    "message": "Sua senha mestra foi alterada recentemente por um administrador de sua organização. Para acessar o cofre, você precisa atualizá-la agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
+    "message": "Sua senha principal foi alterada recentemente por um administrador de sua organização. Para acessar o cofre, você precisa atualizá-la agora. O processo desconectará você da sessão atual, exigindo que você se conecte novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "A sua senha mestra não atende a uma ou mais das políticas da sua organização. Para acessar o cofre, você deve atualizar a sua senha mestra agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
+    "message": "A sua senha principal não atende a uma ou mais das políticas da sua organização. Para acessar o cofre, você deve atualizar a sua senha principal agora. O processo desconectará você da sessão atual, exigindo que você se conecte novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Sua organização desativou a criptografia confiável do dispositivo. Por favor, defina uma senha mestra para acessar o seu cofre."
+    "message": "Sua organização desativou a criptografia de dispositivo confiado. Configure uma senha principal para acessar o seu cofre."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Inscrição Automática"
+    "message": "Inscrição automática"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "Esta organização possui uma política empresarial que irá inscrevê-lo automaticamente na redefinição de senha. A inscrição permitirá que os administradores da organização alterem sua senha mestra."
+    "message": "Esta organização possui uma política empresarial que irá inscrevê-lo automaticamente na reconfiguração de senha. A inscrição permitirá que os administradores da organização alterem sua senha principal."
   },
   "selectFolder": {
     "message": "Selecionar pasta..."
@@ -3021,15 +3101,15 @@
     "description": "Used as a message within the notification bar when no folders are found"
   },
   "orgPermissionsUpdatedMustSetPassword": {
-    "message": "As permissões da sua organização foram atualizadas, exigindo que você defina uma senha mestra.",
+    "message": "As permissões da sua organização foram atualizadas, exigindo que você configure uma senha principal.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "orgRequiresYouToSetPassword": {
-    "message": "Sua organização requer que você defina uma senha mestra.",
+    "message": "Sua organização requer que você configure uma senha principal.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "fora do $TOTAL$",
+    "message": "dos $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -3048,10 +3128,10 @@
     "message": "Minutos"
   },
   "vaultTimeoutPolicyAffectingOptions": {
-    "message": "Os requisitos de política empresarial foram aplicados nesta configuração"
+    "message": "Os requisitos de política empresarial foram aplicados às suas opções de tempo limite"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "As políticas da sua organização estão afetando o tempo limite do seu cofre. O Tempo Limite Máximo permitido do Cofre é $HOURS$ hora(s) e $MINUTES$ minuto(s)",
+    "message": "As políticas da sua organização configuraram o seu máximo permitido do tempo limite do cofre para $HOURS$ hora(s) e $MINUTES$ minuto(s).",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -3090,7 +3170,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "As políticas da sua organização estão afetando seu cofre tempo limite. Tempo limite máximo permitido para cofre é $HOURS$ hora(s) e $MINUTES$ minuto(s). A ação de tempo limite do seu cofre é definida como $ACTION$.",
+    "message": "As políticas da sua organização estão afetando o tempo limite do seu cofre. \nO tempo limite máximo permitido para o cofre é $HOURS$ hora(s) e $MINUTES$ minuto(s). A ação de tempo limite do seu cofre está configurada como $ACTION$.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -3107,7 +3187,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "As políticas da sua organização definiram a ação tempo limite do seu cofre para $ACTION$.",
+    "message": "As políticas da sua organização configuraram a ação do tempo limite do seu cofre para $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -3116,37 +3196,37 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Seu tempo de espera no cofre excede as restrições estabelecidas por sua organização."
+    "message": "O tempo limite do seu cofre excede as restrições estabelecidas pela sua organização."
   },
   "vaultExportDisabled": {
-    "message": "Exportação de Cofre Desativada"
+    "message": "Exportação de cofre indisponível"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "Uma ou mais políticas da organização impedem que você exporte seu cofre pessoal."
+    "message": "Uma ou mais políticas da organização impedem que você exporte seu cofre individual."
   },
   "copyCustomFieldNameInvalidElement": {
-    "message": "Não foi possível identificar um elemento de formulário válido. Em vez disso, tente inspecionar o HTML."
+    "message": "Não é possível identificar um elemento de formulário válido. Em vez disso, tente inspecionar o HTML."
   },
   "copyCustomFieldNameNotUnique": {
-    "message": "Nenhum identificador exclusivo encontrado."
+    "message": "Nenhum identificador único encontrado."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Uma senha principal não é mais necessária para os membros da seguinte organização. Confirme o domínio abaixo com o administrador da sua organização."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nome da organização"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Domínio do Key Connector"
   },
   "leaveOrganization": {
-    "message": "Sair da Organização"
+    "message": "Sair da organização"
   },
   "removeMasterPassword": {
-    "message": "Remover senha mestra"
+    "message": "Remover senha principal"
   },
   "removedMasterPassword": {
-    "message": "Senha mestra removida."
+    "message": "Senha principal removida"
   },
   "leaveOrganizationConfirmation": {
     "message": "Você tem certeza que deseja sair desta organização?"
@@ -3155,16 +3235,16 @@
     "message": "Você saiu da organização."
   },
   "toggleCharacterCount": {
-    "message": "Alternar contagem de caracteres"
+    "message": "Habilitar contagem de caracteres"
   },
   "sessionTimeout": {
-    "message": "Sua sessão expirou. Por favor, volte e tente iniciar a sessão novamente."
+    "message": "Sua sessão expirou. Volte e tente se conectar novamente."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Exportando o Cofre Pessoal"
+    "message": "Exportando cofre individual"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Apenas os itens individuais do cofre associados a $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos. Apenas as informações de item do cofre serão exportadas e não incluirão anexos associados.",
+    "message": "Apenas os itens do cofre individual associados com $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos. Apenas as informações dos itens do cofre serão exportadas e não incluirão anexos associados.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3173,7 +3253,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Apenas os itens individuais do cofre, incluindo anexos associados ao $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos",
+    "message": "Apenas os itens do cofre individual, incluindo anexos associados com $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3185,7 +3265,7 @@
     "message": "Exportando cofre da organização"
   },
   "exportingOrganizationVaultDesc": {
-    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado. Itens do cofre pessoal e itens de outras organizações não serão incluídos.",
+    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado. Itens do cofre individual e itens de outras organizações não serão incluídos.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -3193,17 +3273,38 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Somente o cofre da organização associada com $ORGANIZATION$ será exportado.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado. Os itens dos meus conjuntos não serão incluídos.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Erro"
   },
   "decryptionError": {
-    "message": "Erro ao descriptografar"
+    "message": "Erro de descriptografia"
+  },
+  "errorGettingAutoFillData": {
+    "message": "Erro ao obter dados de preenchimento automático"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "O Bitwarden não pode descriptografar o(s) item(ns) do cofre listado abaixo."
+    "message": "O Bitwarden não conseguiu descriptografar o(s) item(ns) do cofre listado abaixo."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contato com o cliente feito com sucesso",
+    "message": "Contate o costumer success",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
@@ -3211,7 +3312,7 @@
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "generateUsername": {
-    "message": "Gerar Usuário"
+    "message": "Gerar nome de usuário"
   },
   "generateEmail": {
     "message": "Gerar e-mail"
@@ -3231,7 +3332,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ caracteres ou mais para gerar uma senha forte.",
+    "message": " Utilize $RECOMMENDED$ ou mais caracteres para gerar um senha forte.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3241,7 +3342,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use palavras $RECOMMENDED$ ou mais para gerar uma frase secreta forte.",
+    "message": " Utilize $RECOMMENDED$ ou mais palavras para gerar uma frase secreta forte.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3251,17 +3352,17 @@
     }
   },
   "plusAddressedEmail": {
-    "message": "E-mail alternativo (com um +)",
+    "message": "E-mail endereçado com +",
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
     "message": "Use as capacidades de sub-endereçamento do seu provedor de e-mail."
   },
   "catchallEmail": {
-    "message": "E-mail catch-all"
+    "message": "E-mail pega-tudo"
   },
   "catchallEmailDesc": {
-    "message": "Use o catch-all configurado no seu domínio."
+    "message": "Use a caixa de entrada pega-tudo configurada no seu domínio."
   },
   "random": {
     "message": "Aleatório"
@@ -3270,27 +3371,27 @@
     "message": "Palavra aleatória"
   },
   "websiteName": {
-    "message": "Nome do Site"
+    "message": "Nome do site"
   },
   "service": {
     "message": "Serviço"
   },
   "forwardedEmail": {
-    "message": "Apelido (alias) de E-mail Encaminhado"
+    "message": "Alias de encaminhamento de e-mail"
   },
   "forwardedEmailDesc": {
-    "message": "Gere um apelido de e-mail com um serviço de encaminhamento externo."
+    "message": "Gere um alias de e-mail com um serviço externo de encaminhamento."
   },
   "forwarderDomainName": {
     "message": "Domínio de e-mail",
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Escolha um domínio que seja suportado pelo serviço selecionado",
+    "message": "Escolha um domínio suportado pelo serviço selecionado",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
-    "message": "Erro $SERVICENAME$: $ERRORMESSAGE$",
+    "message": "Erro do $SERVICENAME$: $ERRORMESSAGE$",
     "description": "Reports an error returned by a forwarding service to the user.",
     "placeholders": {
       "servicename": {
@@ -3318,7 +3419,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Token de API $SERVICENAME$ inválido",
+    "message": "Token de API do $SERVICENAME$ inválido",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3328,7 +3429,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Token de API $SERVICENAME$ inválido: $ERRORMESSAGE$",
+    "message": "Token de API da $SERVICENAME$ inválido: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3366,7 +3467,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Não foi possível obter a máscara do ID da conta de email $SERVICENAME$.",
+    "message": "Não foi possível obter o ID da conta de e-mail mascarado $SERVICENAME$.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -3376,7 +3477,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Domínio $SERVICENAME$ inválido.",
+    "message": "Domínio inválido do $SERVICENAME$.",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3386,7 +3487,7 @@
     }
   },
   "forwarderNoUrl": {
-    "message": "URL $SERVICENAME$ inválida.",
+    "message": "URL inválido do $SERVICENAME$.",
     "description": "Displayed when the url of the forwarding service wasn't supplied.",
     "placeholders": {
       "servicename": {
@@ -3396,7 +3497,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Ocorreu um erro $SERVICENAME$ desconhecido.",
+    "message": "Ocorreu um erro desconhecido do $SERVICENAME$.",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -3416,11 +3517,11 @@
     }
   },
   "hostname": {
-    "message": "Nome do host",
+    "message": "Nome do servidor",
     "description": "Part of a URL."
   },
   "apiAccessToken": {
-    "message": "Token de Acesso à API"
+    "message": "Token de acesso à API"
   },
   "apiKey": {
     "message": "Chave da API"
@@ -3429,16 +3530,16 @@
     "message": "Erro de Key Connector: certifique-se de que a Key Connector está disponível e funcionando corretamente."
   },
   "premiumSubcriptionRequired": {
-    "message": "Assinatura Premium necessária"
+    "message": "Plano Premium necessário"
   },
   "organizationIsDisabled": {
-    "message": "Organização está desabilitada."
+    "message": "Organização suspensa."
   },
   "disabledOrganizationFilterError": {
-    "message": "Itens em Organizações Desativadas não podem ser acessados. Entre em contato com o proprietário da sua Organização para obter assistência."
+    "message": "Itens em organizações suspensas não podem ser acessados. Entre em contato com o proprietário da sua Organização para obter assistência."
   },
   "loggingInTo": {
-    "message": "Fazendo login em $DOMAIN$",
+    "message": "Conectando-se a $DOMAIN$",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -3456,7 +3557,7 @@
     "message": "Terceiros"
   },
   "thirdPartyServerMessage": {
-    "message": "Conectado a implementação de servidores terceiros, $SERVERNAME$. Por favor, verifique as falhas usando o servidor oficial ou reporte-os ao servidor de terceiros.",
+    "message": "Conectado à uma implementação de terceiros do servidor, $SERVERNAME$. Verifique bugs usando o servidor oficial ou reporte-os ao servidor de terceiros.",
     "placeholders": {
       "servername": {
         "content": "$1",
@@ -3474,7 +3575,7 @@
     }
   },
   "loginWithMasterPassword": {
-    "message": "Entrar com a senha mestra"
+    "message": "Conectar-se com senha principal"
   },
   "newAroundHere": {
     "message": "Novo por aqui?"
@@ -3483,49 +3584,49 @@
     "message": "Lembrar e-mail"
   },
   "loginWithDevice": {
-    "message": "Fazer login com dispositivo"
+    "message": "Conectar-se com dispositivo"
   },
   "fingerprintPhraseHeader": {
-    "message": "Frase de impressão digital"
+    "message": "Frase biométrica"
   },
   "fingerprintMatchInfo": {
-    "message": "Certifique-se que o cofre esteja desbloqueado e que a frase de impressão digital corresponda à do outro dispositivo."
+    "message": "Certifique-se que o cofre esteja desbloqueado e que a frase biométrica corresponda à do outro dispositivo."
   },
   "resendNotification": {
     "message": "Reenviar notificação"
   },
   "viewAllLogInOptions": {
-    "message": "Visualizar todas as opções de login"
+    "message": "Ver todas as opções de autenticação"
   },
   "notificationSentDevice": {
     "message": "Uma notificação foi enviada para seu dispositivo."
   },
   "notificationSentDevicePart1": {
-    "message": "Desbloqueie o Bitwarden em seu dispositivo ou na"
+    "message": "Desbloqueie o Bitwarden no seu dispositivo ou no "
   },
   "notificationSentDeviceAnchor": {
     "message": "aplicativo web"
   },
   "notificationSentDevicePart2": {
-    "message": "Certifique-se de que a frase de biometria corresponde a frase abaixo antes de aprovar."
+    "message": "Certifique-se de que a frase biométrica corresponde a frase abaixo antes de aprovar."
   },
   "aNotificationWasSentToYourDevice": {
     "message": "Uma notificação foi enviada para o seu dispositivo"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "Você será notificado assim que a requisição for aprovada"
+    "message": "Você será notificado assim que a solicitação for aprovada"
   },
   "needAnotherOptionV1": {
     "message": "Precisa de outra opção?"
   },
   "loginInitiated": {
-    "message": "Login iniciado"
+    "message": "Autenticação iniciada"
   },
   "logInRequestSent": {
-    "message": "Pedido enviado"
+    "message": "Solicitação enviada"
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "Solicitação de autenticação aprovada para $EMAIL$ em $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3538,40 +3639,40 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "Você negou uma tentativa de autenticação de outro dispositivo. Se era você, tente se conectar com o dispositivo novamente."
   },
   "device": {
-    "message": "Device"
+    "message": "Dispositivo"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "Estado de autenticação"
   },
   "masterPasswordChanged": {
-    "message": "Master password saved"
+    "message": "Senha principal salva"
   },
   "exposedMasterPassword": {
-    "message": "Senha mestra comprometida"
+    "message": "Senha principal comprometida"
   },
   "exposedMasterPasswordDesc": {
     "message": "A senha foi encontrada em um vazamento de dados. Use uma senha única para proteger sua conta. Tem certeza de que deseja usar uma senha já exposta?"
   },
   "weakAndExposedMasterPassword": {
-    "message": "Senha mestra fraca e comprometida"
+    "message": "Senha principal fraca e comprometida"
   },
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Senha fraca identificada e encontrada em um vazamento de dados. Use uma senha forte e única para proteger a sua conta. Tem certeza de que deseja usar essa senha?"
   },
   "checkForBreaches": {
-    "message": "Verificar vazamento de dados conhecidos para esta senha"
+    "message": "Conferir vazamentos de dados conhecidos por esta senha"
   },
   "important": {
     "message": "Importante:"
   },
   "masterPasswordHint": {
-    "message": "Sua senha mestra não pode ser recuperada se você a esquecer!"
+    "message": "Sua senha principal não pode ser recuperada se você a esquecer!"
   },
   "characterMinimum": {
-    "message": "$LENGTH$ caracteres mínimos",
+    "message": "Mínimo de $LENGTH$ caracteres",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -3613,7 +3714,7 @@
     "message": "Atalho de teclado para preenchimento automático"
   },
   "autofillLoginShortcutNotSet": {
-    "message": "O atalho do preenchimento automático não está definido. Altere isso nas configurações do navegador."
+    "message": "O atalho do preenchimento automático não está configurado. Altere isso nas configurações do navegador."
   },
   "autofillLoginShortcutText": {
     "message": "O atalho de preenchimento automático é $COMMAND$. Gerencie todos os atalhos nas configurações do navegador.",
@@ -3634,34 +3735,34 @@
     }
   },
   "opensInANewWindow": {
-    "message": "Abrir em uma nova janela"
+    "message": "Abre em uma nova janela"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Lembrar deste dispositivo para permanecer conectado"
+    "message": "Lembrar deste dispositivo para tornar futuras autenticações simples"
   },
   "manageDevices": {
-    "message": "Manage devices"
+    "message": "Gerenciar dispositivos"
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "Sessão atual"
   },
   "mobile": {
-    "message": "Mobile",
+    "message": "Móvel",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "Extensão",
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "Computador",
     "description": "Desktop app"
   },
   "webVault": {
-    "message": "Web vault"
+    "message": "Cofre web"
   },
   "webApp": {
-    "message": "Web app"
+    "message": "Aplicativo web"
   },
   "cli": {
     "message": "CLI"
@@ -3671,22 +3772,22 @@
     "description": "Software Development Kit"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "Solicitação pendente"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "Primeiro acesso"
   },
   "trusted": {
-    "message": "Trusted"
+    "message": "Confiado"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "Precisa de aprovação"
   },
   "devices": {
-    "message": "Devices"
+    "message": "Dispositivos"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Tentativa de acesso por $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3695,31 +3796,31 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Confirmar acesso"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Negar acesso"
   },
   "time": {
-    "message": "Time"
+    "message": "Horário"
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "Tipo do dispositivo"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "Solicitação de autenticação"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "Esta solicitação não é mais válida."
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "Login request has already expired."
+    "message": "A solicitação de autenticação já expirou."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "Agora há pouco"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "Solicitado há $MINUTES$ minutos",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -3749,37 +3850,37 @@
     "message": "Solicitar aprovação do administrador"
   },
   "unableToCompleteLogin": {
-    "message": "Unable to complete login"
+    "message": "Não é possível concluir a autenticação"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
-    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+    "message": "Você precisa se conectar com um dispositivo confiado ou solicitar ao administrador que lhe atribua uma senha."
   },
   "ssoIdentifierRequired": {
-    "message": "Identificador SSO da organização é necessário."
+    "message": "O identificador de SSO da organização é necessário."
   },
   "creatingAccountOn": {
     "message": "Criando conta em"
   },
   "checkYourEmail": {
-    "message": "Verifique seu e-mail"
+    "message": "Confira seu e-mail"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Siga o link no e-mail enviado para"
+    "message": "Abra o link no e-mail enviado para"
   },
   "andContinueCreatingYourAccount": {
     "message": "e continue criando a sua conta."
   },
   "noEmail": {
-    "message": "Sem e-mail?"
+    "message": "Nenhum e-mail?"
   },
   "goBack": {
-    "message": "Voltar"
+    "message": "Volte"
   },
   "toEditYourEmailAddress": {
     "message": "para editar o seu endereço de e-mail."
   },
   "eu": {
-    "message": "Europa",
+    "message": "União Europeia",
     "description": "European Union"
   },
   "accessDenied": {
@@ -3789,7 +3890,7 @@
     "message": "Gerais"
   },
   "display": {
-    "message": "Exibir"
+    "message": "Exibição"
   },
   "accountSuccessfullyCreated": {
     "message": "Conta criada com sucesso!"
@@ -3798,53 +3899,53 @@
     "message": "Aprovação do administrador necessária"
   },
   "adminApprovalRequestSentToAdmins": {
-    "message": "Seu pedido foi enviado para seu administrador."
+    "message": "Sua solicitação foi enviada para seu administrador."
   },
   "troubleLoggingIn": {
-    "message": "Problemas em efetuar login?"
+    "message": "Problemas para acessar?"
   },
   "loginApproved": {
-    "message": "Login aprovado"
+    "message": "Autenticação aprovada"
   },
   "userEmailMissing": {
     "message": "E-mail do usuário ausente"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "E-mail de usuário ativo não encontrado. Desconectando."
+    "message": "E-mail do usuário ativo não encontrado. Desconectando você."
   },
   "deviceTrusted": {
-    "message": "Dispositivo confiável"
+    "message": "Dispositivo confiado"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Confiar organização"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Confiar"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Não confiar"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organização não foi confiada"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Para a segurança da sua conta, apenas confirme que você permitiu o acesso de emergência a esse usuário e se a frase biométrica dele coincide com a que é exibida na conta deles"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Para a segurança da sua conta, prossiga apenas se você for um membro dessa organização, tem a recuperação de conta ativa, e a frase biométrica exibida abaixo corresponde com a da organização."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Esta organização tem uma política empresarial que lhe inscreverá na recuperação de conta. A inscrição permitirá que os administradores da organização alterem sua senha. Prossiga somente se você reconhecer esta organização e se a frase biométrica exibida abaixo corresponde com a da organização."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Confiar no usuário"
   },
   "sendsTitleNoItems": {
     "message": "Envie informações confidenciais com segurança",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Compartilhe arquivos e dados de forma segura com qualquer pessoa, em qualquer plataforma. Suas informações permanecerão criptografadas de ponta a ponta enquanto limitam a exposição.",
+    "message": "Compartilhe dados e arquivos com segurança com qualquer pessoa, em qualquer plataforma. Suas informações permanecerão criptografadas de ponta a ponta, limitando a exposição.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3854,7 +3955,7 @@
     "message": "obrigatório"
   },
   "search": {
-    "message": "Pesquisar"
+    "message": "Buscar"
   },
   "inputMinLength": {
     "message": "A entrada deve ter pelo menos $COUNT$ caracteres.",
@@ -3924,7 +4025,7 @@
     "message": "1 campo precisa de sua atenção."
   },
   "multipleFieldsNeedAttention": {
-    "message": "Campos $COUNT$ precisam de sua atenção.",
+    "message": "$COUNT$ campos precisam da sua atenção.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3939,16 +4040,16 @@
     "message": "-- Digite para filtrar --"
   },
   "multiSelectLoading": {
-    "message": "Carrgando Opções..."
+    "message": "Carrgando opções..."
   },
   "multiSelectNotFound": {
     "message": "Nenhum item encontrado"
   },
   "multiSelectClearAll": {
-    "message": "Limpar todos"
+    "message": "Limpar tudo"
   },
   "plusNMore": {
-    "message": "+ $QUANTITY$ mais",
+    "message": "+ mais $QUANTITY$",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -3960,18 +4061,27 @@
     "message": "Submenu"
   },
   "toggleCollapse": {
-    "message": "Alternar colapso",
+    "message": "Guardar/mostrar",
     "description": "Toggling an expand/collapse state."
   },
   "aliasDomain": {
-    "message": "Alias do domínio"
+    "message": "Domínio de alias"
   },
   "autofillOnPageLoadSetToDefault": {
     "message": "O preenchimento automático ao carregar a página está usando a configuração padrão.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Não é possível preencher automaticamente"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "A correspondência padrão está configurada como 'Correspondência exata'. O site atual não corresponde exatamente aos detalhes salvos de credencial para este item."
+  },
+  "okay": {
+    "message": "Ok"
+  },
   "toggleSideNavigation": {
-    "message": "Ativar/desativar navegação lateral"
+    "message": "Habilitar navegação lateral"
   },
   "skipToContent": {
     "message": "Ir para o conteúdo"
@@ -3981,7 +4091,7 @@
     "description": "Page title for the iframe containing the overlay button"
   },
   "toggleBitwardenVaultOverlay": {
-    "message": "Ativar menu de preenchimento automático do Bitwarden",
+    "message": "Habilitar menu de preenchimento automático do Bitwarden",
     "description": "Screen reader and tool tip label for the overlay button"
   },
   "bitwardenVault": {
@@ -3989,7 +4099,7 @@
     "description": "Page title in overlay"
   },
   "unlockYourAccountToViewMatchingLogins": {
-    "message": "Desbloqueie sua conta para ver os logins correspondentes",
+    "message": "Desbloqueie sua conta para ver as credenciais correspondentes",
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockYourAccountToViewAutofillSuggestions": {
@@ -4001,7 +4111,7 @@
     "description": "Button text to display in overlay when the account is locked."
   },
   "unlockAccountAria": {
-    "message": "Desbloqueie sua conta, abra em uma nova janela",
+    "message": "Desbloquear sua conta, abre em uma nova janela",
     "description": "Screen reader text (aria-label) for unlock account button in overlay"
   },
   "totpCodeAria": {
@@ -4009,15 +4119,15 @@
     "description": "Aria label for the totp code displayed in the inline menu for autofill"
   },
   "totpSecondsSpanAria": {
-    "message": "Tempo até o código expirar",
+    "message": "Tempo até o código TOTP atual expirar",
     "description": "Aria label for the totp seconds displayed in the inline menu for autofill"
   },
   "fillCredentialsFor": {
-    "message": "Preencha as credenciais para",
+    "message": "Preencher credenciais para",
     "description": "Screen reader text for when overlay item is in focused"
   },
   "partialUsername": {
-    "message": "Nome parcial",
+    "message": "Nome de usuário parcial",
     "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username"
   },
   "noItemsToShow": {
@@ -4029,15 +4139,15 @@
     "description": "Button text to display in overlay when there are no matching items"
   },
   "addNewVaultItem": {
-    "message": "Adicionar novo item do cofre",
+    "message": "Adicionar novo item no cofre",
     "description": "Screen reader text (aria-label) for new item button in overlay"
   },
   "newLogin": {
-    "message": "Novo login",
+    "message": "Nova credencial",
     "description": "Button text to display within inline menu when there are no matching items on a login field"
   },
   "addNewLoginItemAria": {
-    "message": "Adicionar novo item de login no cofre, abre em uma nova janela",
+    "message": "Adicionar novo item de credencial no cofre, abre em uma nova janela",
     "description": "Screen reader text (aria-label) for new login button within inline menu"
   },
   "newCard": {
@@ -4045,7 +4155,7 @@
     "description": "Button text to display within inline menu when there are no matching items on a credit card field"
   },
   "addNewCardItemAria": {
-    "message": "Adicione um novo item do cartão do cofre, abre em uma nova janela",
+    "message": "Adicionar um novo item de cartão no cofre, abre em uma nova janela",
     "description": "Screen reader text (aria-label) for new card button within inline menu"
   },
   "newIdentity": {
@@ -4053,7 +4163,7 @@
     "description": "Button text to display within inline menu when there are no matching items on an identity field"
   },
   "addNewIdentityItemAria": {
-    "message": "Adicionar novo item de identidade do cofre, abre em uma nova janela",
+    "message": "Adicionar novo item de identidade no cofre, abre em uma nova janela",
     "description": "Screen reader text (aria-label) for new identity button within inline menu"
   },
   "bitwardenOverlayMenuAvailable": {
@@ -4061,7 +4171,7 @@
     "description": "Screen reader text for announcing when the overlay opens on the page"
   },
   "turnOn": {
-    "message": "Ligar"
+    "message": "Ativar"
   },
   "ignore": {
     "message": "Ignorar"
@@ -4074,7 +4184,7 @@
     "message": "Erro ao importar"
   },
   "importErrorDesc": {
-    "message": "Houve um problema com os dados que você tentou importar. Por favor, resolva os erros listados abaixo em seu arquivo de origem e tente novamente."
+    "message": "Houve um problema com os dados que você tentou importar. Resolva os erros listados abaixo em seu arquivo de origem e tente novamente."
   },
   "resolveTheErrorsBelowAndTryAgain": {
     "message": "Resolva os erros abaixo e tente novamente."
@@ -4098,25 +4208,25 @@
     "message": "Tentar novamente"
   },
   "verificationRequiredForActionSetPinToContinue": {
-    "message": "Verificação necessária para esta ação. Defina um PIN para continuar."
+    "message": "Verificação necessária para esta ação. Configure um PIN para continuar."
   },
   "setPin": {
-    "message": "Definir PIN"
+    "message": "Configurar PIN"
   },
   "verifyWithBiometrics": {
-    "message": "Verificiar com biometria"
+    "message": "Verificar com biometria"
   },
   "awaitingConfirmation": {
     "message": "Aguardando confirmação"
   },
   "couldNotCompleteBiometrics": {
-    "message": "Não foi possível completar a biometria."
+    "message": "Não foi possível concluir a biometria."
   },
   "needADifferentMethod": {
     "message": "Precisa de um método diferente?"
   },
   "useMasterPassword": {
-    "message": "Usar a senha mestra"
+    "message": "Usar senha principal"
   },
   "usePin": {
     "message": "Usar PIN"
@@ -4149,13 +4259,13 @@
     "message": "A autenticação em duas etapas do Duo é necessária para sua conta."
   },
   "popoutExtension": {
-    "message": "Extensão pop-out"
+    "message": "Criar janela da extensão"
   },
   "launchDuo": {
-    "message": "Abrir o Duo"
+    "message": "Abrir Duo"
   },
   "importFormatError": {
-    "message": "Os dados não estão formatados corretamente. Por favor, verifique o seu arquivo de importação e tente novamente."
+    "message": "Os dados não estão formatados corretamente. Verifique o seu arquivo de importação e tente novamente."
   },
   "importNothingError": {
     "message": "Nada foi importado."
@@ -4164,7 +4274,7 @@
     "message": "Erro ao descriptografar o arquivo exportado. Sua chave de criptografia não corresponde à chave de criptografia usada para exportar os dados."
   },
   "invalidFilePassword": {
-    "message": "Senha do arquivo inválida, por favor informe a senha utilizada quando criou o arquivo de exportação."
+    "message": "Senha do arquivo inválida, informe a senha utilizada quando criou o arquivo de exportação."
   },
   "destination": {
     "message": "Destino"
@@ -4176,13 +4286,13 @@
     "message": "Selecione uma pasta"
   },
   "selectImportCollection": {
-    "message": "Selecione uma coleção"
+    "message": "Selecione um conjunto"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "Selecione esta opção caso queira importar os conteúdos do arquivo para um conjunto"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "Selecione esta opção caso queira importar os conteúdos do arquivo para uma pasta"
   },
   "importUnassignedItemsError": {
     "message": "Arquivo contém itens não atribuídos."
@@ -4194,7 +4304,7 @@
     "message": "Selecione o arquivo de importação"
   },
   "chooseFile": {
-    "message": "Selecionar Arquivo"
+    "message": "Selecionar arquivo"
   },
   "noFileChosen": {
     "message": "Nenhum arquivo escolhido"
@@ -4203,7 +4313,7 @@
     "message": "ou copie/cole o conteúdo do arquivo de importação"
   },
   "instructionsFor": {
-    "message": "$NAME$ instruções",
+    "message": "Instruções para $NAME$",
     "description": "The title for the import tool instructions.",
     "placeholders": {
       "name": {
@@ -4216,7 +4326,7 @@
     "message": "Confirmar importação do cofre"
   },
   "confirmVaultImportDesc": {
-    "message": "Este arquivo é protegido por senha. Por favor, digite a senha do arquivo para importar os dados."
+    "message": "Este arquivo é protegido por senha. Digite a senha do arquivo para importar os dados."
   },
   "confirmFilePassword": {
     "message": "Confirmar senha do arquivo"
@@ -4231,7 +4341,7 @@
     "message": "Acessando"
   },
   "loggedInExclamation": {
-    "message": "Sessão Iniciada!"
+    "message": "Conectado!"
   },
   "passkeyNotCopied": {
     "message": "A chave de acesso não será copiada"
@@ -4240,7 +4350,7 @@
     "message": "A chave de acesso não será copiada para o item clonado. Deseja continuar clonando este item?"
   },
   "logInWithPasskeyQuestion": {
-    "message": "Fazer ‘login’ com chave de acesso?"
+    "message": "Conectar-se com chave de acesso?"
   },
   "passkeyAlreadyExists": {
     "message": "Uma chave de acesso já existe para este aplicativo."
@@ -4249,13 +4359,13 @@
     "message": "Nenhuma chave de acesso encontrada para este aplicativo."
   },
   "noMatchingPasskeyLogin": {
-    "message": "Você não tem um login correspondente para este site."
+    "message": "Você não tem uma credencial correspondente para este site."
   },
   "noMatchingLoginsForSite": {
     "message": "Sem credenciais correspondentes para este site"
   },
   "searchSavePasskeyNewLogin": {
-    "message": "Pesquisar ou salvar senha como novo login"
+    "message": "Buscar ou salvar chave de acesso como nova credencial"
   },
   "confirm": {
     "message": "Confirmar"
@@ -4264,19 +4374,19 @@
     "message": "Salvar chave de acesso"
   },
   "savePasskeyNewLogin": {
-    "message": "Salvar chave de acesso como um novo login"
+    "message": "Salvar chave de acesso como nova credencial"
   },
   "chooseCipherForPasskeySave": {
-    "message": "Escolha um ‘login’ para salvar com essa chave de acesso"
+    "message": "Escolha uma credencial para salvar essa chave de acesso"
   },
   "chooseCipherForPasskeyAuth": {
-    "message": "Escolha uma senha para iniciar sessão"
+    "message": "Escolha uma chave de acesso para conectar-se"
   },
   "passkeyItem": {
     "message": "Item de chave de acesso"
   },
   "overwritePasskey": {
-    "message": "Sobrescrever chave de acesso?"
+    "message": "Substituir chave de acesso?"
   },
   "overwritePasskeyAlert": {
     "message": "Este item já contém uma chave de acesso. Tem certeza que deseja substituir a atual?"
@@ -4312,19 +4422,19 @@
     "message": "Incluir pastas compartilhadas"
   },
   "lastPassEmail": {
-    "message": "LastPass Email"
+    "message": "E-mail do LastPass"
   },
   "importingYourAccount": {
     "message": "Importando sua conta..."
   },
   "lastPassMFARequired": {
-    "message": "Requer autenticação multifatores do LastPass"
+    "message": "Autenticação multifatorial do LastPass é necessária"
   },
   "lastPassMFADesc": {
-    "message": "Digite sua senha única do app de autenticação"
+    "message": "Digite sua senha única do app autenticador"
   },
   "lastPassOOBDesc": {
-    "message": "Aprove a solicitação de login no seu aplicativo de autenticação ou insira código unico."
+    "message": "Aprove a solicitação de autenticação no seu aplicativo autenticador ou digite um código único."
   },
   "passcode": {
     "message": "Código"
@@ -4336,10 +4446,10 @@
     "message": "Autenticação do LastPass necessária"
   },
   "awaitingSSO": {
-    "message": "Aguardando autenticação SSO"
+    "message": "Aguardando autenticação do SSO"
   },
   "awaitingSSODesc": {
-    "message": "Por favor, continue a iniciar a sessão usando as credenciais da sua empresa."
+    "message": "Continue conectando-se usando as credenciais da sua empresa."
   },
   "seeDetailedInstructions": {
     "message": "Veja instruções detalhadas no nosso site de ajuda em",
@@ -4355,31 +4465,31 @@
     "message": "Tente novamente ou procure um e-mail do LastPass para verificar que é você."
   },
   "collection": {
-    "message": "Coleção"
+    "message": "Conjunto"
   },
   "lastPassYubikeyDesc": {
-    "message": "Insira a YubiKey associada com a sua conta do LastPass na porta USB do seu computador, e depois toque no botão dele."
+    "message": "Insira a YubiKey associada com a sua conta do LastPass na porta USB do seu computador, e depois toque no botão dela."
   },
   "switchAccount": {
-    "message": "Trocar conta"
+    "message": "Trocar de conta"
   },
   "switchAccounts": {
-    "message": "Alternar conta"
+    "message": "Trocar de conta"
   },
   "switchToAccount": {
-    "message": "Mudar para conta"
+    "message": "Trocar para a conta"
   },
   "activeAccount": {
     "message": "Conta ativa"
   },
   "bitwardenAccount": {
-    "message": "Conta Bitwarden"
+    "message": "Conta do Bitwarden"
   },
   "availableAccounts": {
     "message": "Contas disponíveis"
   },
   "accountLimitReached": {
-    "message": "Limite de contas atingido. Termine a sessão de uma conta para adicionar outra."
+    "message": "Limite de contas atingido. Desconecte uma conta para adicionar outra."
   },
   "active": {
     "message": "ativo"
@@ -4397,7 +4507,7 @@
     "message": "hospedado em"
   },
   "useDeviceOrHardwareKey": {
-    "message": "Use o seu dispositivo ou chave de hardware"
+    "message": "Use a sua chave de dispositivo ou hardware"
   },
   "justOnce": {
     "message": "Somente uma vez"
@@ -4419,23 +4529,23 @@
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "message": "Detecção de correspondência de URI é como o Bitwarden identifica sugestões de preenchimento automático.",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
-    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "message": "\"Expressão regular\" é uma opção avançada com maior risco de exposição das credenciais.",
     "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
   },
   "startsWithAdvancedOptionWarning": {
-    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "message": "\"Começa com\" é uma opção avançada com maior risco de exposição de credenciais.",
     "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
   },
   "uriMatchWarningDialogLink": {
-    "message": "More about match detection",
+    "message": "Mais sobre a detecção de correspondência",
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
-    "message": "Advanced options",
+    "message": "Opções avançadas",
     "description": "Advanced option placeholder for uri option component"
   },
   "confirmContinueToBrowserSettingsTitle": {
@@ -4443,7 +4553,7 @@
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
   },
   "confirmContinueToHelpCenter": {
-    "message": "Continuar para o Centro de Ajuda?",
+    "message": "Continuar no Centro de Ajuda?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant Help Center page"
   },
   "confirmContinueToHelpCenterPasswordManagementContent": {
@@ -4451,7 +4561,7 @@
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser password management settings"
   },
   "confirmContinueToHelpCenterKeyboardShortcutsContent": {
-    "message": "Você pode ver e definir atalhos de extensão nas configurações do seu navegador.",
+    "message": "Você pode ver e configurar atalhos de extensão nas configurações do seu navegador.",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser keyboard shortcut settings"
   },
   "confirmContinueToBrowserPasswordManagementSettingsContent": {
@@ -4459,7 +4569,7 @@
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's password management settings page"
   },
   "confirmContinueToBrowserKeyboardShortcutSettingsContent": {
-    "message": "Você pode ver e definir atalhos de extensão nas configurações do seu navegador.",
+    "message": "Você pode ver e configurar atalhos de extensão nas configurações do seu navegador.",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's keyboard shortcut settings page"
   },
   "overrideDefaultBrowserAutofillTitle": {
@@ -4475,11 +4585,11 @@
     "description": "Label for the setting that allows overriding the default browser autofill settings"
   },
   "privacyPermissionAdditionNotGrantedTitle": {
-    "message": "Não é possível definir o Bitwarden como o gerenciador de senhas padrão",
+    "message": "Não é possível configurar o Bitwarden como o gerenciador de senhas padrão",
     "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "privacyPermissionAdditionNotGrantedDescription": {
-    "message": "Você deve conceder permissões de privacidade do navegador ao Bitwarden para defini-lo como o Gerenciador de Senhas padrão.",
+    "message": "Você deve conceder permissões de privacidade do navegador ao Bitwarden para configurá-lo como o gerenciador de senhas padrão.",
     "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "makeDefault": {
@@ -4522,19 +4632,19 @@
     "message": "Itens sugeridos"
   },
   "autofillSuggestionsTip": {
-    "message": "Salvar um item de login para este site autopreenchimento"
+    "message": "Salve um item de credencial para este site para preencher automaticamente"
   },
   "yourVaultIsEmpty": {
     "message": "Seu cofre está vazio"
   },
   "noItemsMatchSearch": {
-    "message": "Nenhum item corresponde à sua pesquisa"
+    "message": "Nenhum item corresponde à sua busca"
   },
   "clearFiltersOrTryAnother": {
-    "message": "Limpar filtros ou tentar outro termo de pesquisa"
+    "message": "Limpe os filtros ou tente outro termo de busca"
   },
   "copyInfoTitle": {
-    "message": "Copiar informação - $ITEMNAME$",
+    "message": "Copiar informações - $ITEMNAME$",
     "description": "Title for a button that opens a menu with options to copy information from an item.",
     "placeholders": {
       "itemname": {
@@ -4544,7 +4654,7 @@
     }
   },
   "copyNoteTitle": {
-    "message": "Copiar Nota - $ITEMNAME$",
+    "message": "Copiar anotação - $ITEMNAME$",
     "description": "Title for a button copies a note to the clipboard.",
     "placeholders": {
       "itemname": {
@@ -4574,7 +4684,7 @@
     }
   },
   "viewItemTitle": {
-    "message": "Visualizar item - $ITEMNAME$",
+    "message": "Ver item - $ITEMNAME$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4584,7 +4694,7 @@
     }
   },
   "viewItemTitleWithField": {
-    "message": "Visualizar item - $ITEMNAME$ - $FIELD$",
+    "message": "Ver item - $ITEMNAME$ - $FIELD$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4622,7 +4732,7 @@
     }
   },
   "copyFieldCipherName": {
-    "message": "Copy $FIELD$, $CIPHERNAME$",
+    "message": "Copiar $FIELD$, $CIPHERNAME$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -4639,7 +4749,7 @@
     "message": "Não há valores para copiar"
   },
   "assignToCollections": {
-    "message": "Atribuir à coleções"
+    "message": "Atribuir a conjuntos"
   },
   "copyEmail": {
     "message": "Copiar e-mail"
@@ -4663,13 +4773,13 @@
     "message": "Aparência"
   },
   "errorAssigningTargetCollection": {
-    "message": "Erro ao atribuir coleção de destino."
+    "message": "Erro ao atribuir conjunto de destino."
   },
   "errorAssigningTargetFolder": {
     "message": "Erro ao atribuir pasta de destino."
   },
   "viewItemsIn": {
-    "message": "Visualizar itens em $NAME$",
+    "message": "Ver itens em $NAME$",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -4705,7 +4815,7 @@
     "message": "Itens sem pasta"
   },
   "itemDetails": {
-    "message": "Detalhes dos item"
+    "message": "Detalhes do item"
   },
   "itemName": {
     "message": "Nome do item"
@@ -4724,7 +4834,7 @@
     "message": "Itens em organizações desativadas não podem ser acessados. Entre em contato com o proprietário da sua organização para obter assistência."
   },
   "additionalInformation": {
-    "message": "Informação adicional"
+    "message": "Informações adicionais"
   },
   "itemHistory": {
     "message": "Histórico do item"
@@ -4739,10 +4849,10 @@
     "message": "Vinculado"
   },
   "copySuccessful": {
-    "message": "Copiado com Sucesso"
+    "message": "Copiado com sucesso"
   },
   "upload": {
-    "message": "Fazer upload"
+    "message": "Enviar"
   },
   "addAttachment": {
     "message": "Adicionar anexo"
@@ -4751,7 +4861,7 @@
     "message": "O tamanho máximo de arquivo é de 500 MB"
   },
   "deleteAttachmentName": {
-    "message": "Excluir anexo $NAME$",
+    "message": "Apagar anexo $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4772,35 +4882,38 @@
     "message": "Baixar o Bitwarden"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Baixar o Bitwarden em todos os dispositivos"
+    "message": "Baixar o Bitwarden em tudo"
   },
   "getTheMobileApp": {
-    "message": "Baixar o aplicativo para dispositivos móveis"
+    "message": "Baixe o aplicativo para dispositivos móveis"
   },
   "getTheMobileAppDesc": {
-    "message": "Acesse as suas senhas em qualquer lugar com o aplicativo móvel Bitwarden."
+    "message": "Acesse as suas senhas em qualquer lugar com o aplicativo móvel do Bitwarden."
   },
   "getTheDesktopApp": {
-    "message": "Obter o aplicativo para desktop"
+    "message": "Baixe o aplicativo para computador"
   },
   "getTheDesktopAppDesc": {
-    "message": "Acesse o seu cofre sem um navegador e, em seguida, configure o desbloqueio com dados biométricos para facilitar o desbloqueio tanto no aplicativo desktop quanto na extensão do navegador."
+    "message": "Acesse o seu cofre sem um navegador, configure o desbloqueio com biometria para facilitar o desbloqueio tanto no aplicativo de computador quanto na extensão do navegador."
   },
   "downloadFromBitwardenNow": {
     "message": "Baixar em bitwarden.com agora"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "Baixar no Google Play"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "Baixar na App Store"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Tem certeza de que deseja excluir este anexo permanentemente?"
+    "message": "Tem certeza que quer apagar este anexo para sempre?"
   },
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Desbloqueie relatórios, acesso de emergência, e mais recursos de segurança com o Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Organizações gratuitas não podem usar anexos"
   },
@@ -4814,7 +4927,7 @@
     "message": "Um filtro aplicado"
   },
   "filterAppliedPlural": {
-    "message": "Foram aplicados $COUNT$ filtros",
+    "message": "$COUNT$ filtros aplicados",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4845,7 +4958,7 @@
     "description": "Used within the inline menu to provide an aria description when users are attempting to fill a card cipher."
   },
   "loginCredentials": {
-    "message": "Credenciais de login"
+    "message": "Credenciais de acesso"
   },
   "authenticatorKey": {
     "message": "Chave do autenticador"
@@ -4873,7 +4986,7 @@
     "message": "Adicionar site"
   },
   "deleteWebsite": {
-    "message": "Excluir site"
+    "message": "Apagar site"
   },
   "defaultLabel": {
     "message": "Padrão ($VALUE$)",
@@ -4885,8 +4998,18 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Padrão ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
-    "message": "Exibir detecção de correspondência $WEBSITE$",
+    "message": "Mostrar detecção de correspondência $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4907,7 +5030,7 @@
     "message": "Preencher automaticamente ao carregar a página?"
   },
   "cardExpiredTitle": {
-    "message": "Cartão expirado"
+    "message": "Cartão vencido"
   },
   "cardExpiredMessage": {
     "message": "Se você o renovou, atualize as informações do cartão"
@@ -4916,7 +5039,7 @@
     "message": "Detalhes do cartão"
   },
   "cardBrandDetails": {
-    "message": "Detalhes $BRAND$",
+    "message": "Detalhes da $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -4925,7 +5048,7 @@
     }
   },
   "showAnimations": {
-    "message": "Exibir animações"
+    "message": "Mostrar animações"
   },
   "addAccount": {
     "message": "Adicionar conta"
@@ -4934,10 +5057,10 @@
     "message": "Carregando"
   },
   "data": {
-    "message": "Dado"
+    "message": "Dados"
   },
   "passkeys": {
-    "message": "Senhas",
+    "message": "Chaves de acesso",
     "description": "A section header for a list of passkeys."
   },
   "passwords": {
@@ -4945,17 +5068,17 @@
     "description": "A section header for a list of passwords."
   },
   "logInWithPasskeyAriaLabel": {
-    "message": "Iniciar sessão com a chave de acesso",
+    "message": "Conectar-se com chave de acesso",
     "description": "ARIA label for the inline menu button that logs in with a passkey."
   },
   "assign": {
     "message": "Atribuir"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Apenas membros da organização com acesso a essas coleções poderão ver o item."
+    "message": "Apenas membros da organização com acesso a estes conjuntos poderão ver o item."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Apenas membros da organização com acesso à essas coleções poderão ver os itens."
+    "message": "Apenas membros da organização com acesso a estes conjuntos poderão ver os itens."
   },
   "bulkCollectionAssignmentWarning": {
     "message": "Você selecionou $TOTAL_COUNT$ itens. Você não pode atualizar $READONLY_COUNT$ destes itens porque você não tem permissão de edição.",
@@ -4982,19 +5105,19 @@
     "message": "Rótulo do campo"
   },
   "textHelpText": {
-    "message": "Utilize campos de texto para dados como questões de segurança"
+    "message": "Use campos de texto para dados como questões de segurança"
   },
   "hiddenHelpText": {
     "message": "Use campos ocultos para dados confidenciais como uma senha"
   },
   "checkBoxHelpText": {
-    "message": "Use caixas de seleção se gostaria de preencher automaticamente a caixa de seleção de um formulário, como um e-mail de lembrança"
+    "message": "Use caixas de seleção se gostaria de preencher automaticamente a caixa de seleção de um formulário, como um lembrar e-mail"
   },
   "linkedHelpText": {
     "message": "Use um campo vinculado quando estiver enfrentando problemas com o preenchimento automático com um site específico."
   },
   "linkedLabelHelpText": {
-    "message": "Digite o Id html do campo, nome, nome aria-label, ou espaço reservado."
+    "message": "Digite o ID html, nome, aria-label, ou placeholder do campo."
   },
   "editField": {
     "message": "Editar campo"
@@ -5009,7 +5132,7 @@
     }
   },
   "deleteCustomField": {
-    "message": "Excluir $LABEL$",
+    "message": "Apagar $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -5027,7 +5150,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reordene $LABEL$. Use a tecla de seta para mover o item para cima ou para baixo.",
+    "message": "Reordenar $LABEL$. Use a tecla de seta para mover o item para cima ou para baixo.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -5036,10 +5159,10 @@
     }
   },
   "reorderWebsiteUriButton": {
-    "message": "Reorganize a URI do site. Use as setas para mover o item para cima ou para baixo."
+    "message": "Reordenar a URI do site. Use as setas para mover o item para cima ou para baixo."
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ se moveu para cima, posição $INDEX$ de $LENGTH$",
+    "message": "$LABEL$ movido para cima, posição $INDEX$ de $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -5056,13 +5179,13 @@
     }
   },
   "selectCollectionsToAssign": {
-    "message": "Selecione as coleções para atribuir"
+    "message": "Selecione conjuntos a atribuir"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item será transferido permanentemente para a organização selecionada. Você não irá mais possuir este item."
+    "message": "1 item será transferido permanentemente para a organização selecionada. Você não irá mais ser o proprietário deste item."
   },
   "personalItemsTransferWarningPlural": {
-    "message": "Itens $PERSONAL_ITEMS_COUNT$ serão transferidos permanentemente para a organização selecionada. Você não irá mais possuir esses itens.",
+    "message": "$PERSONAL_ITEMS_COUNT$ itens serão transferidos permanentemente para a organização selecionada. Você não irá mais ser o proprietário desses itens.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -5071,7 +5194,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item será transferido permanentemente para $ORG$. Você não irá mais possuir este item.",
+    "message": "1 item será transferido permanentemente para $ORG$. Você não irá mais ser o proprietário deste item.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -5080,7 +5203,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "Os itens $PERSONAL_ITEMS_COUNT$ serão transferidos permanentemente para $ORG$. Você não irá mais possuir esses itens.",
+    "message": "$PERSONAL_ITEMS_COUNT$ itens serão transferidos permanentemente para $ORG$. Você não irá mais ser o proprietário desses itens.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -5093,10 +5216,10 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Coleções atribuídas com sucesso"
+    "message": "Conjuntos atribuídos com sucesso"
   },
   "nothingSelected": {
-    "message": "Você selecionou nada."
+    "message": "Você não selecionou nada."
   },
   "itemsMovedToOrg": {
     "message": "Itens movidos para $ORGNAME$",
@@ -5117,7 +5240,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ se moveu para baixo, posição $INDEX$ de $LENGTH$",
+    "message": "$LABEL$ movido para baixo, posição $INDEX$ de $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -5134,25 +5257,25 @@
     }
   },
   "itemLocation": {
-    "message": "Localização do Item"
+    "message": "Localização do item"
   },
   "fileSends": {
-    "message": "Arquivos enviados"
+    "message": "Sends de arquivo"
   },
   "textSends": {
-    "message": "Texto enviado"
+    "message": "Sends de texto"
   },
   "accountActions": {
     "message": "Ações da conta"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "Mostrar o número de sugestões de preenchimento automático de login no ícone da extensão"
+    "message": "Mostrar número de sugestões de preenchimento automático de credenciais no ícone da extensão"
   },
   "accountAccessRequested": {
-    "message": "Account access requested"
+    "message": "Acesso à conta solicitado"
   },
   "confirmAccessAttempt": {
-    "message": "Confirm access attempt for $EMAIL$",
+    "message": "Confirmar tentativa de acesso para $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5161,7 +5284,7 @@
     }
   },
   "showQuickCopyActions": {
-    "message": "Mostrar a opção de cópia rápida no Cofre"
+    "message": "Mostrar opções de cópia rápida no Cofre"
   },
   "systemDefault": {
     "message": "Padrão do sistema"
@@ -5185,28 +5308,28 @@
     "message": "ED25519"
   },
   "sshKeyAlgorithmRSA2048": {
-    "message": "RSA 2048-Bit"
+    "message": "RSA de 2048 bits"
   },
   "sshKeyAlgorithmRSA3072": {
-    "message": "RSA 3072-Bit"
+    "message": "RSA de 3072 bits"
   },
   "sshKeyAlgorithmRSA4096": {
-    "message": "RSA 4096-Bit"
+    "message": "RSA de 4096 bits"
   },
   "retry": {
-    "message": "Tente novamente"
+    "message": "Tentar novamente"
   },
   "vaultCustomTimeoutMinimum": {
     "message": "Tempo limite mínimo personalizado é 1 minuto."
   },
   "fileSavedToDevice": {
-    "message": "Arquivo salvo no dispositivo. Gerencie a partir das transferências do seu dispositivo."
+    "message": "Arquivo salvo no dispositivo. Gerencie a partir dos downloads do seu dispositivo."
   },
   "showCharacterCount": {
-    "message": "Mostrar contagem de caracteres"
+    "message": "Mostrar número de caracteres"
   },
   "hideCharacterCount": {
-    "message": "Esconder contagem de caracteres"
+    "message": "Ocultar número de caracteres"
   },
   "itemsInTrash": {
     "message": "Itens na lixeira"
@@ -5215,16 +5338,16 @@
     "message": "Nenhum item na lixeira"
   },
   "noItemsInTrashDesc": {
-    "message": "Os itens que você excluir aparecerão aqui e serão excluídos permanentemente após 30 dias"
+    "message": "Os itens que você apagar aparecerão aqui, e serão apagados para sempre depois de 30 dias"
   },
   "trashWarning": {
-    "message": "Os itens que ficarem na lixeira por mais de 30 dias serão excluídos automaticamente"
+    "message": "Os itens que ficarem na lixeira por mais de 30 dias serão apagados para sempre"
   },
   "restore": {
     "message": "Restaurar"
   },
   "deleteForever": {
-    "message": "Apagar permanentemente"
+    "message": "Apagar para sempre"
   },
   "noEditPermissions": {
     "message": "Você não tem permissão para editar este arquivo"
@@ -5236,16 +5359,16 @@
     "message": "O desbloqueio por biometria está indisponível no momento."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "O desbloqueio por biometria está indisponível devido a algum erro na configuração dos arquivos de sistema."
+    "message": "O desbloqueio por biometria está indisponível devido a algum erro na configuração dos arquivos do sistema."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "O desbloqueio por biometria está indisponível devido a algum erro na configuração dos arquivos de sistema."
+    "message": "O desbloqueio por biometria está indisponível devido a algum erro na configuração dos arquivos do sistema."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "O desbloqueio por biometria está indisponível porque o aplicativo de desktop não está aberto."
+    "message": "O desbloqueio por biometria está indisponível porque o aplicativo de computador não está aberto."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "O desbloqueio por biometria está indisponível, pois a opção não foi ativada no aplicativo de desktop de $EMAIL$.",
+    "message": "O desbloqueio por biometria está indisponível, pois a opção não foi ativada no aplicativo de computador de $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5257,30 +5380,30 @@
     "message": "O desbloqueio por biometria está indisponível por razões desconhecidas."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Desbloqueie seu cofre em segundos"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Você pode personalizar suas configurações de desbloqueio e tempo limite para acessar seu cofre mais rapidamente."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "PIN de desbloqueio configurado"
   },
   "unlockWithBiometricSet": {
-    "message": "Unlock with biometrics set"
+    "message": "Desbloqueio com biometria configurado"
   },
   "authenticating": {
     "message": "Autenticando"
   },
   "fillGeneratedPassword": {
-    "message": "Preencher a senha gerada",
+    "message": "Preencher senha gerada",
     "description": "Heading for the password generator within the inline menu"
   },
   "passwordRegenerated": {
-    "message": "Senha regenerada",
+    "message": "Senha regerada",
     "description": "Notification message for when a password has been regenerated"
   },
   "saveToBitwarden": {
-    "message": "Save to Bitwarden",
+    "message": "Salvar no Bitwarden",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
@@ -5288,11 +5411,11 @@
     "description": "Represents the space key in screen reader content as a readable word"
   },
   "tildeCharacterDescriptor": {
-    "message": "Linear",
+    "message": "Til",
     "description": "Represents the ~ key in screen reader content as a readable word"
   },
   "backtickCharacterDescriptor": {
-    "message": "Bastão",
+    "message": "Grave",
     "description": "Represents the ` key in screen reader content as a readable word"
   },
   "exclamationCharacterDescriptor": {
@@ -5308,7 +5431,7 @@
     "description": "Represents the # key in screen reader content as a readable word"
   },
   "dollarSignCharacterDescriptor": {
-    "message": "cifrão",
+    "message": "Cifrão",
     "description": "Represents the $ key in screen reader content as a readable word"
   },
   "percentSignCharacterDescriptor": {
@@ -5320,19 +5443,19 @@
     "description": "Represents the ^ key in screen reader content as a readable word"
   },
   "ampersandCharacterDescriptor": {
-    "message": "E Comercial",
+    "message": "E",
     "description": "Represents the & key in screen reader content as a readable word"
   },
   "asteriskCharacterDescriptor": {
-    "message": "Asterísco",
+    "message": "Asterisco",
     "description": "Represents the * key in screen reader content as a readable word"
   },
   "parenLeftCharacterDescriptor": {
-    "message": "Parêntese esquerdo",
+    "message": "Abre parênteses",
     "description": "Represents the ( key in screen reader content as a readable word"
   },
   "parenRightCharacterDescriptor": {
-    "message": "Parênteses direito",
+    "message": "Fecha parênteses",
     "description": "Represents the ) key in screen reader content as a readable word"
   },
   "hyphenCharacterDescriptor": {
@@ -5348,7 +5471,7 @@
     "description": "Represents the + key in screen reader content as a readable word"
   },
   "equalsCharacterDescriptor": {
-    "message": "iguais",
+    "message": "Igual",
     "description": "Represents the = key in screen reader content as a readable word"
   },
   "braceLeftCharacterDescriptor": {
@@ -5368,15 +5491,15 @@
     "description": "Represents the ] key in screen reader content as a readable word"
   },
   "pipeCharacterDescriptor": {
-    "message": "Pipe",
+    "message": "Barra vertical",
     "description": "Represents the | key in screen reader content as a readable word"
   },
   "backSlashCharacterDescriptor": {
-    "message": "Barra Invertida",
+    "message": "Barra invertida",
     "description": "Represents the back slash key in screen reader content as a readable word"
   },
   "colonCharacterDescriptor": {
-    "message": "Dois Pontos",
+    "message": "Dois pontos",
     "description": "Represents the : key in screen reader content as a readable word"
   },
   "semicolonCharacterDescriptor": {
@@ -5431,28 +5554,28 @@
     "message": "Beta"
   },
   "extensionWidth": {
-    "message": "Largura da janela"
+    "message": "Largura da extensão"
   },
   "wide": {
-    "message": "Grande"
+    "message": "Larga"
   },
   "extraWide": {
-    "message": "Extra Grande"
+    "message": "Extra larga"
   },
   "sshKeyWrongPassword": {
-    "message": "A senha está incorreta."
+    "message": "A senha que você digitou está incorreta."
   },
   "importSshKey": {
     "message": "Importar"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirme a senha"
+    "message": "Confirmar senha"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Insira a senha da chave SSH."
+    "message": "Digite a senha da chave SSH."
   },
   "enterSshKeyPassword": {
-    "message": "Insira a senha"
+    "message": "Digitar senha"
   },
   "invalidSshKey": {
     "message": "A chave SSH é inválida"
@@ -5467,7 +5590,7 @@
     "message": "Chave SSH importada com sucesso"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "Você não pode remover coleções com permissões de Somente leitura: $COLLECTIONS$",
+    "message": "Você não pode remover conjuntos com permissões de Apenas ver: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -5476,43 +5599,43 @@
     }
   },
   "updateDesktopAppOrDisableFingerprintDialogTitle": {
-    "message": "Atualize seu aplicativo de desktop"
+    "message": "Atualize seu aplicativo de computador"
   },
   "updateDesktopAppOrDisableFingerprintDialogMessage": {
-    "message": "Para usar o desbloqueio de biometria, atualize seu aplicativo de desktop ou desative a opção \"desbloqueio por biometria\"."
+    "message": "Para usar o desbloqueio biométrico, atualize seu aplicativo de computador ou desative o desbloqueio biométrico nas configurações do desktop."
   },
   "changeAtRiskPassword": {
-    "message": "Alterar senhas vulneráveis"
+    "message": "Alterar senhas em risco"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Esta credencial está em risco e está sem um site. Adicione um site e altere a senha para segurança melhor."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Site ausente"
   },
   "settingsVaultOptions": {
     "message": "Opções do cofre"
   },
   "emptyVaultDescription": {
-    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+    "message": "O cofre protege mais do que só suas senhas. Armazene credenciais, identidades, cartões, e anotações com segurança aqui."
   },
   "introCarouselLabel": {
-    "message": "Bem-vindo(a) ao Bitwarden"
+    "message": "Boas-vindas ao Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Segurança em primeiro lugar"
+    "message": "Segurança, priorizada"
   },
   "securityPrioritizedBody": {
-    "message": "Guarde suas senhas, cartões e documentos no seu cofre seguro. Bitwarden usa criptografia ponta-a-ponta de zero-knowledge, protegendo o que é valioso para você."
+    "message": "Guarde suas senhas, cartões e documentos no seu cofre seguro. Bitwarden usa criptografia de ponta a ponta de zero conhecimento, protegendo o que é valioso para você."
   },
   "quickLogin": {
-    "message": "Login rápido e fácil"
+    "message": "Autenticação rápida e fácil"
   },
   "quickLoginBody": {
-    "message": "Ative o desbloqueio por biometria e o preenchimento automático para acessar suas contas sem digitar uma única letra."
+    "message": "Configure o desbloqueio biométrico e o preenchimento automático para acessar suas contas sem digitar uma única letra."
   },
   "secureUser": {
-    "message": "Melhore seus logins de nível"
+    "message": "Dê um up nas suas credenciais"
   },
   "secureUserBody": {
     "message": "Use o gerador de senhas para criar e salvar senhas fortes e únicas para todas as suas contas."
@@ -5524,134 +5647,209 @@
     "message": "Guarde quantas senhas quiser e acesse de qualquer lugar com o Bitwarden. No seu celular, navegador e computador."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 notificação"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "Importar senhas existentes"
   },
   "emptyVaultNudgeBody": {
-    "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
+    "message": "Use o importador para transferir rapidamente as credenciais para o Bitwarden sem adicioná-las manualmente."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "Importar agora"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "Boas-vindas ao seu cofre!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Tentativa de phishing detectada"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "O site que você está tentando visitar é um site malicioso conhecido e um risco à segurança."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Fechar esta aba"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continuar para este site (não recomendado)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Este site foi encontrado em ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", uma lista de código aberto de sites de phishing conhecidos usados por roubar informações pessoais e sensíveis.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Saiba mais sobre a detecção de phishing"
+  },
+  "protectedBy": {
+    "message": "Protegido pelo $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "Preenche automaticamente itens para a página atual"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "Favorite itens para acesso rápido"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "Busque no cofre por outra coisa"
   },
   "newLoginNudgeTitle": {
-    "message": "Seja mais rápido com o preenchimento automático"
+    "message": "Economize tempo com o preenchimento automático"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Inclua um",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Site",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "para que esta credencial apareça como uma sugestão de preenchimento automático.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Pagamento on-line simplificado"
   },
   "newCardNudgeBody": {
     "message": "Preencha automaticamente formulários de pagamento com cartões de forma segura e precisa."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Simplifique a criação de contas"
   },
   "newIdentityNudgeBody": {
-    "message": "Preencha automaticamente formulários longos de registro ou contato de forma rápida."
+    "message": "Com identidades, preencha formulários de cadastro ou contato longos rapidamente, de forma automática."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Mantenha seus dados sensíveis seguros"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Com anotações, armazene com segurança dados sensíveis como detalhes de informações bancárias ou de seguro."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Acesso SSH amigável para desenvolvedores"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Armazene suas chaves e conecte com o agente SSH para uma autenticação rápida e criptografada.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Saiba mais sobre o agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Crie senhas de forma rápida"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Crie senhas únicas e fortes com facilidade clicando em",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "para ajudá-lo a manter suas credenciais seguras.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Crie senhas únicas e fortes com facilidade clicando no botão de gerar senha para ajudá-lo a manter suas credenciais seguras.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Sobre esta configuração"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "O Bitwarden usará URIs de credenciais salvas para identificar qual ícone ou URL de alteração de senha deverá ser usado para melhorar sua experiência. Nenhuma informação é coletada ou salva quando você utiliza este serviço."
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "Você não tem permissão para ver esta página. Tente se conectar com uma conta diferente."
   },
   "wasmNotSupported": {
-    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "message": "O WebAssembly não é suportado no seu navegador ou não está ativado. O WebAssembly é necessário para utilizar o aplicativo do Bitwarden.",
     "description": "'WebAssembly' is a technical term and should not be translated."
   },
   "showMore": {
-    "message": "Show more"
+    "message": "Mostrar mais"
   },
   "showLess": {
-    "message": "Show less"
+    "message": "Mostrar menos"
   },
   "next": {
-    "message": "Next"
+    "message": "Avançar"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "Mais trilhas",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Confirmar domínio do Key Connector"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Ótimo trabalho protegendo suas credenciais em risco!"
+  },
+  "upgradeNow": {
+    "message": "Faça upgrade agora"
+  },
+  "builtInAuthenticator": {
+    "message": "Autenticador integrado"
+  },
+  "secureFileStorage": {
+    "message": "Armazenamento seguro de arquivos"
+  },
+  "emergencyAccess": {
+    "message": "Acesso de emergência"
+  },
+  "breachMonitoring": {
+    "message": "Monitoramento de vazamentos"
+  },
+  "andMoreFeatures": {
+    "message": "E mais!"
+  },
+  "planDescPremium": {
+    "message": "Segurança on-line completa"
+  },
+  "upgradeToPremium": {
+    "message": "Faça upgrade para o Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Desbloqueie recursos avançados de segurança"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Um plano Premium te dá mais ferramentas para se manter seguro e em controle"
+  },
+  "explorePremium": {
+    "message": "Explorar o Premium"
+  },
+  "loadingVault": {
+    "message": "Carregando cofre"
+  },
+  "vaultLoaded": {
+    "message": "Cofre carregado"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Essa configuração está desativada pela política da sua organização.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "CEP / Código postal"
+  },
+  "cardNumberLabel": {
+    "message": "Número do cartão"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Ação do tempo limite"
   }
 }
diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json
index acc5b5332f9..6b8568ddb1b 100644
--- a/apps/browser/src/_locales/pt_PT/messages.json
+++ b/apps/browser/src/_locales/pt_PT/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Utilizar início de sessão único"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A sua organização exige o início de sessão único."
+  },
   "welcomeBack": {
     "message": "Bem-vindo de volta"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Repor pesquisa"
   },
-  "archive": {
-    "message": "Arquivar"
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Desarquivar"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Os itens arquivados aparecerão aqui e serão excluídos dos resultados gerais da pesquisa e das sugestões de preenchimento automático."
   },
-  "itemSentToArchive": {
-    "message": "Item movido para o arquivo"
+  "itemWasSentToArchive": {
+    "message": "O item foi movido para o arquivo"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removido do arquivo"
+  "itemUnarchived": {
+    "message": "O item foi desarquivado"
   },
   "archiveItem": {
     "message": "Arquivar item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Os itens arquivados são excluídos dos resultados gerais da pesquisa e das sugestões de preenchimento automático. Tem a certeza de que pretende arquivar este item?"
   },
+  "upgradeToUseArchive": {
+    "message": "É necessária uma subscrição Premium para utilizar o Arquivo."
+  },
   "edit": {
     "message": "Editar"
   },
   "view": {
     "message": "Ver"
   },
+  "viewAll": {
+    "message": "Ver tudo"
+  },
+  "showAll": {
+    "message": "Mostrar tudo"
+  },
+  "viewLess": {
+    "message": "Ver menos"
+  },
   "viewLogin": {
     "message": "Ver credencial"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Palavra-passe mestra inválida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Palavra-passe mestra inválida. Confirme se o seu e-mail está correto e se a sua conta foi criada em $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Tempo limite do cofre"
   },
@@ -774,7 +803,13 @@
     "message": "4 horas"
   },
   "onLocked": {
-    "message": "No bloqueio do sistema"
+    "message": "Ao bloquear o sistema"
+  },
+  "onIdle": {
+    "message": "Na inatividade do sistema"
+  },
+  "onSleep": {
+    "message": "Na suspensão do sistema"
   },
   "onRestart": {
     "message": "Ao reiniciar o navegador"
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item guardado"
   },
+  "savedWebsite": {
+    "message": "Site guardado"
+  },
+  "savedWebsites": {
+    "message": "Sites guardados ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Tem a certeza de que pretende eliminar este item?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Pedir biometria ao iniciar"
   },
-  "premiumRequired": {
-    "message": "É necessária uma subscrição Premium"
-  },
-  "premiumRequiredDesc": {
-    "message": "É necessária uma subscrição Premium para utilizar esta funcionalidade."
-  },
   "authenticationTimeout": {
     "message": "Tempo limite de autenticação"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Ler chave de segurança"
   },
+  "readingPasskeyLoading": {
+    "message": "A ler chave de acesso..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Falha na autenticação da chave de acesso"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Utilizar um método de início de sessão diferente"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "A aguardar interação da chave de segurança..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Deve adicionar o URL do servidor de base ou pelo menos um ambiente personalizado."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Os URLs devem usar HTTPS."
+  },
   "customEnvironment": {
     "message": "Ambiente personalizado"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Desativar o preenchimento automático"
   },
+  "confirmAutofill": {
+    "message": "Confirmar preenchimento automático"
+  },
+  "confirmAutofillDesc": {
+    "message": "Este site não corresponde às suas credenciais guardadas. Antes de preencher as suas credenciais, certifique-se de que se trata de um site fiável."
+  },
   "showInlineMenuLabel": {
     "message": "Mostrar sugestões de preenchimento automático nos campos do formulário"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Como o Bitwarden protege os seus dados contra phishing?"
+  },
+  "currentWebsite": {
+    "message": "Site atual"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Preencher automaticamente e adicionar este site"
+  },
+  "autofillWithoutAdding": {
+    "message": "Preencher automaticamente sem adicionar"
+  },
+  "doNotAutofill": {
+    "message": "Não preencher automaticamente"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Apresentar as identidades como sugestões"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Ano de validade"
   },
+  "monthly": {
+    "message": "mês"
+  },
   "expiration": {
     "message": "Prazo de validade"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Esta página está a interferir com a experiência do Bitwarden. O menu em linha do Bitwarden foi temporariamente desativado como medida de segurança."
+  },
   "setMasterPassword": {
     "message": "Definir a palavra-passe mestra"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado a $ORGANIZATION$ será exportado.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado a $ORGANIZATION$ será exportado. As coleções dos meus itens não serão incluídas.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Erro"
   },
   "decryptionError": {
     "message": "Erro de desencriptação"
   },
+  "errorGettingAutoFillData": {
+    "message": "Erro ao obter dados de preenchimento automático"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "O Bitwarden não conseguiu desencriptar o(s) item(ns) do cofre listado(s) abaixo."
   },
@@ -3970,6 +4071,15 @@
     "message": "Preencher automaticamente ao carregar a página definido para utilizar a predefinição.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Não é possível preencher automaticamente"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "A correspondência padrão está definida como \"Correspondência exata\". O site atual não corresponde exatamente às credenciais guardadas para este item."
+  },
+  "okay": {
+    "message": "OK"
+  },
   "toggleSideNavigation": {
     "message": "Ativar/desativar navegação lateral"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Desbloqueie relatórios, acesso de emergência e outras funcionalidades de segurança com o Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "As organizações gratuitas não podem utilizar anexos"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Predefinido ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Mostrar deteção de correspondência para $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Bem-vindo ao seu cofre!"
   },
-  "phishingPageTitle": {
-    "message": "Site de phishing"
+  "phishingPageTitleV2": {
+    "message": "Tentativa de phishing detetada"
   },
-  "phishingPageCloseTab": {
-    "message": "Fechar separador"
+  "phishingPageSummary": {
+    "message": "O site que está a tentar visitar é um site malicioso conhecido e um risco de segurança."
   },
-  "phishingPageContinue": {
-    "message": "Continuar"
+  "phishingPageCloseTabV2": {
+    "message": "Fechar este separador"
   },
-  "phishingPageLearnWhy": {
-    "message": "Porque é que está a ver isto?"
+  "phishingPageContinueV2": {
+    "message": "Continuar para este site (não recomendado)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Este site foi encontrado em ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", uma lista de fonte aberta de sites de phishing conhecidos, utilizados para roubar informações pessoais e sensíveis.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Saiba mais sobre a deteção de phishing"
+  },
+  "protectedBy": {
+    "message": "Protegido por $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Preenchimento automático de itens para a página atual"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirmar o domínio do Key Connector"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Excelente trabalho ao proteger as suas credenciais em risco!"
+  },
+  "upgradeNow": {
+    "message": "Atualizar agora"
+  },
+  "builtInAuthenticator": {
+    "message": "Autenticador incorporado"
+  },
+  "secureFileStorage": {
+    "message": "Armazenamento seguro de ficheiros"
+  },
+  "emergencyAccess": {
+    "message": "Acesso de emergência"
+  },
+  "breachMonitoring": {
+    "message": "Monitorização de violações"
+  },
+  "andMoreFeatures": {
+    "message": "E muito mais!"
+  },
+  "planDescPremium": {
+    "message": "Segurança total online"
+  },
+  "upgradeToPremium": {
+    "message": "Atualizar para o Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Desbloqueie funcionalidades de segurança avançadas"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Uma subscrição Premium dá-lhe ferramentas adicionais para reforçar a sua segurança e manter o controlo"
+  },
+  "explorePremium": {
+    "message": "Explorar o Premium"
+  },
+  "loadingVault": {
+    "message": "A carregar o cofre"
+  },
+  "vaultLoaded": {
+    "message": "Cofre carregado"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Esta configuração está desativada pela política da sua organização.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Código postal"
+  },
+  "cardNumberLabel": {
+    "message": "Número do cartão"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Ação de tempo limite"
   }
 }
diff --git a/apps/browser/src/_locales/ro/messages.json b/apps/browser/src/_locales/ro/messages.json
index d184460e293..db7a1b8c657 100644
--- a/apps/browser/src/_locales/ro/messages.json
+++ b/apps/browser/src/_locales/ro/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Autentificare unică"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Bine ați revenit"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Editare"
   },
   "view": {
     "message": "Afișare"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Parolă principală incorectă"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Expirare seif"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "La blocarea sistemului"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "La repornirea browserului"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Articol salvat"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Sigur doriți să trimiteți în coșul de reciclare?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Solicitați date biometrice la pornire"
   },
-  "premiumRequired": {
-    "message": "Premium necesar"
-  },
-  "premiumRequiredDesc": {
-    "message": "Pentru a utiliza această funcție este necesar un abonament Premium."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Mediu personalizat"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Anul expirării"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expirare"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Setare parolă principală"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Eroare"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Completarea automată la încărcarea paginii este setată la valoarea implicită.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/ru/messages.json b/apps/browser/src/_locales/ru/messages.json
index 17133350e3f..0535027daa9 100644
--- a/apps/browser/src/_locales/ru/messages.json
+++ b/apps/browser/src/_locales/ru/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Использовать единый вход"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Ваша организация требует единого входа."
+  },
   "welcomeBack": {
     "message": "С возвращением"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Сбросить поиск"
   },
-  "archive": {
-    "message": "Архив"
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Архивировать",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Разархивировать"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Архивированные элементы появятся здесь и будут исключены из общих результатов поиска и предложений автозаполнения."
   },
-  "itemSentToArchive": {
-    "message": "Элемент отправлен в архив"
+  "itemWasSentToArchive": {
+    "message": "Элемент был отправлен в архив"
   },
-  "itemRemovedFromArchive": {
-    "message": "Элемент удален из архива"
+  "itemUnarchived": {
+    "message": "Элемент был разархивирован"
   },
   "archiveItem": {
     "message": "Архивировать элемент"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Архивированные элементы исключены из общих результатов поиска и предложений автозаполнения. Вы уверены, что хотите архивировать этот элемент?"
   },
+  "upgradeToUseArchive": {
+    "message": "Для использования архива требуется премиум-статус."
+  },
   "edit": {
     "message": "Изменить"
   },
   "view": {
     "message": "Просмотр"
   },
+  "viewAll": {
+    "message": "Посмотреть все"
+  },
+  "showAll": {
+    "message": "Показать все"
+  },
+  "viewLess": {
+    "message": "Свернуть"
+  },
   "viewLogin": {
     "message": "Просмотр логина"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Неверный мастер-пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неверный мастер-пароль. Подтвердите, что ваш адрес email указан верно и ваш аккаунт был создан на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Тайм-аут хранилища"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Вместе с компьютером"
   },
+  "onIdle": {
+    "message": "При бездействии"
+  },
+  "onSleep": {
+    "message": "В режиме сна"
+  },
   "onRestart": {
     "message": "При перезапуске браузера"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Элемент сохранен"
   },
+  "savedWebsite": {
+    "message": "Сохраненный сайт"
+  },
+  "savedWebsites": {
+    "message": "Сохраненные сайты ( $COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Вы действительно хотите отправить в корзину?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Запрашивать биометрию при запуске"
   },
-  "premiumRequired": {
-    "message": "Требуется Премиум"
-  },
-  "premiumRequiredDesc": {
-    "message": "Для использования этой функции необходим Премиум."
-  },
   "authenticationTimeout": {
     "message": "Таймаут аутентификации"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Считать ключ безопасности"
   },
+  "readingPasskeyLoading": {
+    "message": "Чтение passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Не удалось выполнить аутентификацию с помощью passkey"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Использовать другой способ авторизации"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Ожидание взаимодействия с ключом безопасности..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Вы должны добавить либо базовый URL сервера, либо хотя бы одно пользовательское окружение."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL должны использовать HTTPS."
+  },
   "customEnvironment": {
     "message": "Пользовательское окружение"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Отключить автозаполнение"
   },
+  "confirmAutofill": {
+    "message": "Подтвердите автозаполнение"
+  },
+  "confirmAutofillDesc": {
+    "message": "Этот сайт не соответствует вашим сохраненным логинам. Прежде чем заполнять логин, убедитесь, что это надежный сайт."
+  },
   "showInlineMenuLabel": {
     "message": "Показывать предположения автозаполнения в полях формы"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Как Bitwarden защищает ваши данные от фишинга?"
+  },
+  "currentWebsite": {
+    "message": "Текущий сайт"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Заполнить и добавить этот сайт"
+  },
+  "autofillWithoutAdding": {
+    "message": "Заполнить без добавления"
+  },
+  "doNotAutofill": {
+    "message": "Не заполнять"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Показывать Личную информацию как предложения"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Год"
   },
+  "monthly": {
+    "message": "месяц"
+  },
   "expiration": {
     "message": "Срок действия"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Эта страница мешает работе Bitwarden. Встроенное меню Bitwarden было временно отключено в целях безопасности."
+  },
   "setMasterPassword": {
     "message": "Задать мастер-пароль"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$. Коллекции Мои элементы включены не будут.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Ошибка"
   },
   "decryptionError": {
     "message": "Ошибка расшифровки"
   },
+  "errorGettingAutoFillData": {
+    "message": "Ошибка получения данных автозаполнения"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden не удалось расшифровать элемент(ы) хранилища, перечисленные ниже."
   },
@@ -3970,6 +4071,15 @@
     "message": "Автозаполнение при загрузке страницы использует настройку по умолчанию.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Не удалось заполнить"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "По умолчанию установлено значение 'Точное соответствие'. Текущий сайт не полностью соответствует сохраненным для этого элемента логинам."
+  },
+  "okay": {
+    "message": "OK"
+  },
   "toggleSideNavigation": {
     "message": "Переключить боковую навигацию"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Премиум"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Разблокируйте отчеты, экстренный доступ и другие функции безопасности с помощью Премиум."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Бесплатные организации не могут использовать вложения"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "По умолчанию ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Показать обнаружение совпадений $WEBSITE$",
     "placeholders": {
@@ -5485,10 +5608,10 @@
     "message": "Изменить пароль, подверженный риску"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Этот логин подвержен риску и у него отсутствует веб-сайт. Добавьте веб-сайт и смените пароль для большей безопасности."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Отсутствует сайт"
   },
   "settingsVaultOptions": {
     "message": "Настройки хранилища"
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Добро пожаловать в ваше хранилище!"
   },
-  "phishingPageTitle": {
-    "message": "Фишинг-сайт"
+  "phishingPageTitleV2": {
+    "message": "Обнаружена попытка фишинга"
   },
-  "phishingPageCloseTab": {
-    "message": "Закрыть вкладку"
+  "phishingPageSummary": {
+    "message": "Сайт, который вы пытаетесь посетить, является заведомо вредоносным сайтом и представляет угрозу безопасности."
   },
-  "phishingPageContinue": {
-    "message": "Продолжить"
+  "phishingPageCloseTabV2": {
+    "message": "Закрыть эту вкладку"
   },
-  "phishingPageLearnWhy": {
-    "message": "Почему вы это видите?"
+  "phishingPageContinueV2": {
+    "message": "Перейти на этот сайт (не рекомендуется)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Этот сайт был найден в ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", списке известных фишинговых сайтов, используемых для кражи персональной и конфиденциальной информации.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Узнайте больше об обнаружении фишинга"
+  },
+  "protectedBy": {
+    "message": "Защищено $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Автозаполнение элементов на текущей странице"
@@ -5648,10 +5791,65 @@
     "message": "Далее"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "Дополнительная навигация",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "confirmKeyConnectorDomain": {
     "message": "Подтвердите домен соединителя ключей"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Отличная работа по защите ваших логинов, подверженных риску!"
+  },
+  "upgradeNow": {
+    "message": "Изменить сейчас"
+  },
+  "builtInAuthenticator": {
+    "message": "Встроенный аутентификатор"
+  },
+  "secureFileStorage": {
+    "message": "Защищенное хранилище файлов"
+  },
+  "emergencyAccess": {
+    "message": "Экстренный доступ"
+  },
+  "breachMonitoring": {
+    "message": "Мониторинг нарушений"
+  },
+  "andMoreFeatures": {
+    "message": "И многое другое!"
+  },
+  "planDescPremium": {
+    "message": "Полная онлайн-защищенность"
+  },
+  "upgradeToPremium": {
+    "message": "Обновить до Премиум"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Разблокировать дополнительные функции безопасности"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Премиум-подписка дает вам больше возможностей для обеспечения безопасности и контроля"
+  },
+  "explorePremium": {
+    "message": "Познакомиться с Премиум"
+  },
+  "loadingVault": {
+    "message": "Загрузка хранилища"
+  },
+  "vaultLoaded": {
+    "message": "Хранилище загружено"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Этот параметр отключен политикой вашей организации.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Почтовый индекс"
+  },
+  "cardNumberLabel": {
+    "message": "Номер карты"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Тайм-аут действия"
   }
 }
diff --git a/apps/browser/src/_locales/si/messages.json b/apps/browser/src/_locales/si/messages.json
index 2fd8f53e148..bb46b283322 100644
--- a/apps/browser/src/_locales/si/messages.json
+++ b/apps/browser/src/_locales/si/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "සංස්කරණය"
   },
   "view": {
     "message": "දකින්න"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "වලංගු නොවන ප්රධාන මුරපදය"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "සුරක්ෂිතාගාරය වේලාව"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "පද්ධතිය ලොක් මත"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "බ්රව්සරය නැවත ආරම්භ"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "සංස්කරණය කරන ලද අයිතමය"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "ඔබට ඇත්තටම කුණු කූඩයට යැවීමට අවශ්යද?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "වාරික අවශ්ය"
-  },
-  "premiumRequiredDesc": {
-    "message": "මෙම අංගය භාවිතා කිරීම සඳහා වාරික සාමාජිකත්වයක් අවශ්ය වේ."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "අභිරුචි පරිසරය"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "කල් ඉකුත්වන වසර"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "කල් ඉකුත්"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "මාස්ටර් මුරපදය සකසන්න"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/sk/messages.json b/apps/browser/src/_locales/sk/messages.json
index d0e143cce4a..283442d95da 100644
--- a/apps/browser/src/_locales/sk/messages.json
+++ b/apps/browser/src/_locales/sk/messages.json
@@ -6,7 +6,7 @@
     "message": "Logo Bitwarden"
   },
   "extName": {
-    "message": "Bitwarden – Bezplatný správca hesiel",
+    "message": "Bitwarden – správca hesiel",
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Použiť jednotné prihlásenie"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Vaša organizácia vyžaduje jednotné prihlasovanie."
+  },
   "welcomeBack": {
     "message": "Vitajte späť"
   },
@@ -53,7 +56,7 @@
     "message": "Potvrdiť"
   },
   "emailAddress": {
-    "message": "Emailová adresa"
+    "message": "E-mailová adresa"
   },
   "masterPass": {
     "message": "Hlavné heslo"
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Resetovať vyhľadávanie"
   },
-  "archive": {
-    "message": "Archivovať"
+  "archiveNoun": {
+    "message": "Archív",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archivovať",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Zrušiť archiváciu"
   },
   "itemsInArchive": {
@@ -565,10 +573,10 @@
   "noItemsInArchiveDesc": {
     "message": "Tu sa zobrazia archivované položky, ktoré budú vylúčené zo všeobecného vyhľadávania a z návrhov automatického vypĺňania."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Položka bola archivovaná"
   },
-  "itemRemovedFromArchive": {
+  "itemUnarchived": {
     "message": "Položka bola odobraná z archívu"
   },
   "archiveItem": {
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archivované položky sú vylúčené zo všeobecného vyhľadávania a z návrhov automatického vypĺňania. Naozaj chcete archivovať túto položku?"
   },
+  "upgradeToUseArchive": {
+    "message": "Na použitie archívu je potrebné prémiové členstvo."
+  },
   "edit": {
     "message": "Upraviť"
   },
   "view": {
     "message": "Zobraziť"
   },
+  "viewAll": {
+    "message": "Zobraziť všetky"
+  },
+  "showAll": {
+    "message": "Zobraziť všetko"
+  },
+  "viewLess": {
+    "message": "Zobraziť menej"
+  },
   "viewLogin": {
     "message": "Zobraziť prihlásenie"
   },
@@ -671,7 +691,7 @@
     "message": "Nastavte metódu odomknutia, aby ste zmenili akciu pri vypršaní času trezoru."
   },
   "unlockMethodNeeded": {
-    "message": "Nastavte metódu odomknutia v Nastaveniach"
+    "message": "Nastavte metódu odomknutia v nastaveniach"
   },
   "sessionTimeoutHeader": {
     "message": "Časový limit relácie"
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Neplatné hlavné heslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Neplatné hlavné heslo. Potvrďte, že váš e-mail je správny a účet bol vytvorený na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Časový limit pre trezor"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Keď je systém uzamknutý"
   },
+  "onIdle": {
+    "message": "Pri nečinnosti systému"
+  },
+  "onSleep": {
+    "message": "V režime spánku"
+  },
   "onRestart": {
     "message": "Po reštarte prehliadača"
   },
@@ -863,7 +898,7 @@
     }
   },
   "autofillError": {
-    "message": "Na tejto stránke sa nedajú automaticky vyplniť prihlasovacie údaje. Namiesto toho skopírujte/vložte prihlasovacie údaje manuálne."
+    "message": "Nie je možné automaticky vyplniť vybranú položku na tejto stránke. Namiesto toho skopírujte a vložte prihlasovacie údaje."
   },
   "totpCaptureError": {
     "message": "Nie je možné naskenovať QR kód z aktuálnej webovej stránky"
@@ -953,10 +988,10 @@
     "message": "Meno je povinné."
   },
   "addedFolder": {
-    "message": "Pridaný priečinok"
+    "message": "Priečinok bol pridaný"
   },
   "twoStepLoginConfirmation": {
-    "message": "Dvojstupňové prihlasovanie robí váš účet bezpečnejším vďaka vyžadovaniu bezpečnostného kódu z overovacej aplikácie vždy, keď sa prihlásite. Dvojstupňové prihlasovanie môžete povoliť vo webovom trezore bitwarden.com. Chcete navštíviť túto stránku teraz?"
+    "message": "Dvojstupňové prihlásenie zvyšuje bezpečnosť vášho účtu tým, že vyžaduje overenie prihlásenia pomocou iného zariadenia, napríklad bezpečnostného kľúča, overovacej aplikácie, SMS, telefonického hovoru alebo e-mailu. Dvojstupňové prihlásenie môžete nastaviť na bitwarden.com. Chcete stránku navštíviť teraz?"
   },
   "twoStepLoginConfirmationContent": {
     "message": "Zabezpečte svoj účet nastavením dvojstupňového prihlasovania vo webovej aplikácii Bitwarden."
@@ -965,22 +1000,22 @@
     "message": "Pokračovať vo webovej aplikácii?"
   },
   "editedFolder": {
-    "message": "Priečinok upravený"
+    "message": "Priečinok bol upravený"
   },
   "deleteFolderConfirmation": {
     "message": "Naozaj chcete odstrániť tento priečinok?"
   },
   "deletedFolder": {
-    "message": "Odstránený priečinok"
+    "message": "Priečinok bol odstránený"
   },
   "gettingStartedTutorial": {
-    "message": "Začiatočnícka príručka"
+    "message": "Úvodná príručka"
   },
   "gettingStartedTutorialVideo": {
     "message": "Pozrite našu príručku pre začiatočníkov, v ktorej sa dozviete, ako získať maximum z nášho rozšírenia pre prehliadač."
   },
   "syncingComplete": {
-    "message": "Synchronizácia kompletná"
+    "message": "Synchronizácia bola dokončená"
   },
   "syncingFailed": {
     "message": "Synchronizácia zlyhala"
@@ -1014,11 +1049,23 @@
   "editedItem": {
     "message": "Položka upravená"
   },
+  "savedWebsite": {
+    "message": "Uložená webstránka"
+  },
+  "savedWebsites": {
+    "message": "Uložené webstránky ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Naozaj chcete odstrániť túto položku?"
   },
   "deletedItem": {
-    "message": "Položka odstránená"
+    "message": "Položka bola presunutá do koša"
   },
   "overwritePassword": {
     "message": "Prepísať heslo"
@@ -1246,7 +1293,7 @@
     "message": "Zobraziť možnosti kontextovej ponuky"
   },
   "contextMenuItemDesc": {
-    "message": "Sekundárnym kliknutím získate prístup k vygenerovaniu hesiel a zodpovedajúcim prihláseniam pre webovú stránku. "
+    "message": "Kliknutím pravého tlačidla myši získate prístup k vygenerovaniu hesiel a zodpovedajúcim prihláseniam pre webovú stránku."
   },
   "contextMenuItemDescAlt": {
     "message": "Sekundárnym kliknutím získate prístup k vygenerovaniu hesiel a zodpovedajúcim prihláseniam pre webovú stránku. Platí pre všetky prihlásené účty."
@@ -1282,7 +1329,7 @@
     "message": "Export trezoru"
   },
   "fileFormat": {
-    "message": "Formát Súboru"
+    "message": "Formát súboru"
   },
   "fileEncryptedExportWarningDesc": {
     "message": "Tento exportovaný súbor bude chránený heslom a na dešifrovanie bude potrebné heslo súboru."
@@ -1360,7 +1407,7 @@
     "message": "Zistiť viac"
   },
   "authenticatorKeyTotp": {
-    "message": "Kľúč overovateľa (TOTP)"
+    "message": "Overovací kľúč (TOTP)"
   },
   "verificationCodeTotp": {
     "message": "Overovací kód (TOTP)"
@@ -1378,7 +1425,7 @@
     "message": "Naozaj chcete odstrániť túto prílohu?"
   },
   "deletedAttachment": {
-    "message": "Odstránená príloha"
+    "message": "Príloha bola odstránená"
   },
   "newAttachment": {
     "message": "Pridať novú prílohu"
@@ -1387,7 +1434,7 @@
     "message": "Žiadne prílohy."
   },
   "attachmentSaved": {
-    "message": "Príloha bola uložená."
+    "message": "Príloha bola uložená"
   },
   "file": {
     "message": "Súbor"
@@ -1423,13 +1470,13 @@
     "message": "Momentálne nie ste prémiovým členom."
   },
   "premiumSignUpAndGet": {
-    "message": "Zaregistrujte sa pre prémiové členstvo a získajte:"
+    "message": "Zaregistrujte sa na prémiové členstvo a získajte:"
   },
   "ppremiumSignUpStorage": {
     "message": "1 GB šifrovaného úložiska na prílohy."
   },
   "premiumSignUpEmergency": {
-    "message": "Núdzový prístup"
+    "message": "Núdzový prístup."
   },
   "premiumSignUpTwoStepOptions": {
     "message": "Proprietárne možnosti dvojstupňového prihlásenia ako napríklad YubiKey a Duo."
@@ -1459,7 +1506,7 @@
     "message": "Ďakujeme, že podporujete Bitwarden."
   },
   "premiumFeatures": {
-    "message": "Povýšte na premium a získajte:"
+    "message": "Inovujte na prémium a získajte:"
   },
   "premiumPrice": {
     "message": "Všetko len za %price% /rok!",
@@ -1480,23 +1527,17 @@
     }
   },
   "refreshComplete": {
-    "message": "Obnova kompletná"
+    "message": "Obnova bola dokončená"
   },
   "enableAutoTotpCopy": {
     "message": "Automaticky kopírovať TOTP"
   },
   "disableAutoTotpCopyDesc": {
-    "message": "Ak je kľúč overovateľa spojený s vašim prihlásením, TOTP verifikačný kód bude automaticky skopírovaný do schránky vždy, keď použijete automatické vypĺňanie."
+    "message": "Ak je overovací kľúč spojený s vašim prihlásením, overovací kód TOTP bude automaticky skopírovaný do schránky vždy, keď použijete automatické vypĺňanie."
   },
   "enableAutoBiometricsPrompt": {
     "message": "Pri spustení požiadať o biometriu"
   },
-  "premiumRequired": {
-    "message": "Vyžaduje prémiový účet"
-  },
-  "premiumRequiredDesc": {
-    "message": "Pre použitie tejto funkcie je potrebné prémiové členstvo."
-  },
   "authenticationTimeout": {
     "message": "Časový limit overenia"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Prečítať bezpečnostný kľúč"
   },
+  "readingPasskeyLoading": {
+    "message": "Načítava sa prístupový kľúč…"
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Overenie prístupovým kľúčom zlyhalo"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Použiť iný spôsob prihlásenia"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Čaká sa na interakciu s bezpečnostným kľúčom..."
   },
@@ -1553,7 +1603,7 @@
     "message": "Vyberte metódu dvojstupňového prihlásenia"
   },
   "recoveryCodeTitle": {
-    "message": "Záchranný kód"
+    "message": "Kód na obnovenie"
   },
   "authenticatorAppTitle": {
     "message": "Overovacia aplikácia"
@@ -1573,14 +1623,14 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Overiť s Duo Security vašej organizácie použitím Duo Mobile aplikácie, SMS, telefonátu alebo U2F bezpečnostným kľúčom.",
+    "message": "Overenie pomocou Duo Security pre vašu organizáciu pomocou aplikácie Duo Mobile, SMS, telefonického hovoru alebo bezpečnostného kľúča U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "webAuthnTitle": {
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "Použiť akýkoľvek WebAuthn bezpečnostný kľúč pre prístup k vášmu účtu."
+    "message": "Použiť akýkoľvek kompatibilný bezpečnostný kľúč WebAuthn na prístup k svojmu účtu."
   },
   "emailTitle": {
     "message": "Email"
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Musíte pridať buď základnú adresu URL servera, alebo aspoň jedno vlastné prostredie."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Adresy URL musia používať HTTPS."
+  },
   "customEnvironment": {
     "message": "Vlastné prostredie"
   },
@@ -1620,13 +1673,13 @@
     "message": "URL servera identít"
   },
   "notificationsUrl": {
-    "message": "URL adresa servera pre oznámenia"
+    "message": "URL servera pre upozornenia"
   },
   "iconsUrl": {
-    "message": "URL servera ikôn"
+    "message": "URL servera ikon"
   },
   "environmentSaved": {
-    "message": "URL prostredia boli uložené."
+    "message": "URL adresy prostredia boli uložené"
   },
   "showAutoFillMenuOnFormFields": {
     "message": "Zobraziť ponuku automatického vypĺňania na poliach formulára",
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Vypnúť automatické vypĺňanie"
   },
+  "confirmAutofill": {
+    "message": "Potvrdenie automatického vypĺňania"
+  },
+  "confirmAutofillDesc": {
+    "message": "Táto stránka nezodpovedá vašim uloženým prihlasovacím údajom. Pred vyplnením prihlasovacích údajov sa uistite, že ide o dôveryhodnú stránku."
+  },
   "showInlineMenuLabel": {
     "message": "Zobraziť návrhy automatického vypĺňania v poliach formulára"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Ako Bitwarden chráni vaše údaje pred phishingom?"
+  },
+  "currentWebsite": {
+    "message": "Aktuálna webstránka"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Automaticky vyplniť a pridať túto webstránku"
+  },
+  "autofillWithoutAdding": {
+    "message": "Automaticky vyplniť bez pridania"
+  },
+  "doNotAutofill": {
+    "message": "Nevyplniť automaticky"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Zobrazovať identity ako návrhy"
   },
@@ -1683,32 +1757,32 @@
     "description": "Overlay appearance select option for showing the field on focus of the input element"
   },
   "autofillOverlayVisibilityOnButtonClick": {
-    "message": "Keď je vybratá ikona automatického vypĺňania",
+    "message": "Keď je vybraná ikona automatického vypĺňania",
     "description": "Overlay appearance select option for showing the field on click of the overlay icon"
   },
   "enableAutoFillOnPageLoadSectionTitle": {
     "message": "Povoliť automatické vypĺňanie pri načítaní stránky"
   },
   "enableAutoFillOnPageLoad": {
-    "message": "Povoliť automatické vypĺňanie pri načítaní stránky"
+    "message": "Automaticky vyplniť pri načítaní stránky"
   },
   "enableAutoFillOnPageLoadDesc": {
-    "message": "Ak je detekovaný prihlasovací formulár, automaticky vykonať vypĺňanie pri načítaní stránky."
+    "message": "Ak sa zistí prihlasovací formulár, pri načítaní webovej stránky sa automaticky vyplní."
   },
   "experimentalFeature": {
-    "message": "Skompromitované alebo nedôveryhodné stránky môžu pri svojom načítaní zneužiť automatické dopĺňanie."
+    "message": "Kompromitované alebo nedôveryhodné webové lokality môžu zneužiť automatické vypĺňanie pri načítaní stránky."
   },
   "learnMoreAboutAutofillOnPageLoadLinkText": {
     "message": "Viac informácií o rizikách"
   },
   "learnMoreAboutAutofill": {
-    "message": "Dozvedieť sa viac o automatickom dopĺňaní"
+    "message": "Viac informácií o automatickom vypĺňaní"
   },
   "defaultAutoFillOnPageLoad": {
     "message": "Predvolené nastavenie automatického vypĺňania pre prihlasovacie položky"
   },
   "defaultAutoFillOnPageLoadDesc": {
-    "message": "Pri úprave položky prihlásenia môžete individuálne zapnúť alebo vypnúť automatické vypĺňanie pri načítaní stránky pre danú položku."
+    "message": "Automatické vypĺňanie pri načítaní stránky môžete vypnúť, pre jednotlivé položky prihlásenia, pri úprave položky."
   },
   "autoFillOnPageLoadUseDefault": {
     "message": "Pôvodné nastavenia"
@@ -1785,7 +1859,7 @@
     "message": "Zobraziť ikony webových stránok a načítať adresy URL na zmenu hesla"
   },
   "cardholderName": {
-    "message": "Meno vlastníka karty"
+    "message": "Meno držiteľa karty"
   },
   "number": {
     "message": "Číslo"
@@ -1794,10 +1868,13 @@
     "message": "Značka"
   },
   "expirationMonth": {
-    "message": "Mesiac expirácie"
+    "message": "Mesiac exspirácie"
   },
   "expirationYear": {
-    "message": "Rok expirácie"
+    "message": "Rok exspirácie"
+  },
+  "monthly": {
+    "message": "mesačne"
   },
   "expiration": {
     "message": "Expirácia"
@@ -1869,7 +1946,7 @@
     "message": "Krstné meno"
   },
   "middleName": {
-    "message": "Druhé meno"
+    "message": "Stredné meno"
   },
   "lastName": {
     "message": "Priezvisko"
@@ -1884,13 +1961,13 @@
     "message": "Spoločnosť"
   },
   "ssn": {
-    "message": "Číslo poistenca sociálnej poisťovne"
+    "message": "Číslo sociálneho poistenia"
   },
   "passportNumber": {
     "message": "Číslo pasu"
   },
   "licenseNumber": {
-    "message": "Číslo vodičského preukazu"
+    "message": "Licenčné číslo"
   },
   "email": {
     "message": "Email"
@@ -2127,10 +2204,10 @@
     "description": "Default URI match detection for autofill."
   },
   "toggleOptions": {
-    "message": "Voľby prepínača"
+    "message": "Zobraziť/skryť možnosti"
   },
   "toggleCurrentUris": {
-    "message": "Prepnúť zobrazovanie aktuálnej URI",
+    "message": "Prepnúť zobrazenie aktuálnej URI",
     "description": "Toggle the display of the URIs of the currently open tabs in the browser."
   },
   "currentUri": {
@@ -2321,13 +2398,13 @@
     "message": "Naozaj chcete narvalo odstrániť túto položku?"
   },
   "permanentlyDeletedItem": {
-    "message": "Natrvalo odstrániť položku"
+    "message": "Položka bola natrvalo odstránená"
   },
   "restoreItem": {
     "message": "Obnoviť položku"
   },
   "restoredItem": {
-    "message": "Obnovená položka"
+    "message": "Položka bola obnovená"
   },
   "alreadyHaveAccount": {
     "message": "Už máte účet?"
@@ -2339,13 +2416,13 @@
     "message": "Potvrdenie akcie pri vypršaní časového limitu"
   },
   "autoFillAndSave": {
-    "message": "Auto-vyplniť a Uložiť"
+    "message": "Automaticky vyplniť a uložiť"
   },
   "fillAndSave": {
     "message": "Vyplniť a uložiť"
   },
   "autoFillSuccessAndSavedUri": {
-    "message": "Automatické vypĺnenie a uloženie úspešné"
+    "message": "Položka bola automaticky vyplnená a URI uložený"
   },
   "autoFillSuccess": {
     "message": "Automaticky vyplnené"
@@ -2357,7 +2434,7 @@
     "message": "Prajete si napriek tomu vyplniť prihlasovacie údaje?"
   },
   "autofillIframeWarning": {
-    "message": "Formulár je hosťovaný inou doménou ako má URI uložených prihlasovacích údajov. Zvoľte OK ak chcete aj tak automaticky vyplniť údaje, alebo Zrušiť pre zastavenie."
+    "message": "Formulár je umiestnený na inej doméne ako URI vašich prihlasovacích údajov. Vyberte OK, ak chcete aj tak použiť automatické vyplnenie, alebo Zrušiť, ak chcete automatické vyplnenie zastaviť."
   },
   "autofillIframeWarningTip": {
     "message": "Ak chcete tomuto upozorneniu v budúcnosti zabrániť, uložte URI, $HOSTNAME$, do položky prihlásenia Bitwardenu pre túto stránku.",
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Táto stránka narúša zážitok zo Bitwardenu. Inline ponuka Bitwardenu bola dočasne vypnutá ako bezpečnostné opatrenie."
+  },
   "setMasterPassword": {
     "message": "Nastaviť hlavné heslo"
   },
@@ -2480,10 +2560,10 @@
     "message": "Spustiť desktopovú aplikáciu Bitwarden Desktop"
   },
   "startDesktopDesc": {
-    "message": "Aplikácia Bitwarden Desktop musí byť pred použitím odomknutia pomocou biometrických údajov spustená."
+    "message": "Aplikácia Bitwarden Desktop musí byť spustená pred použitím odomknutia pomocou biometrických údajov."
   },
   "errorEnableBiometricTitle": {
-    "message": "Nie je môžné povoliť biometrické údaje"
+    "message": "Nie je možné povoliť biometrické údaje"
   },
   "errorEnableBiometricDesc": {
     "message": "Akcia bola zrušená desktopovou aplikáciou"
@@ -2534,7 +2614,7 @@
     "message": "Biometria zlyhala"
   },
   "biometricsFailedDesc": {
-    "message": "Biometria nebola vykonaná. Zvážte použitie hlavného hesla, alebo sa odhláste. Ak tento problém pretrváva, kontaktujte podporu Bitwarden."
+    "message": "Biometria nebola dokončená. Zvážte použitie hlavného hesla, alebo sa odhláste. Ak tento problém pretrváva, kontaktujte podporu Bitwarden."
   },
   "nativeMessaginPermissionErrorTitle": {
     "message": "Povolenie nebolo udelené"
@@ -2810,10 +2890,10 @@
     "message": "Odstrániť"
   },
   "removedPassword": {
-    "message": "Heslo odstránené"
+    "message": "Heslo bolo odstránené"
   },
   "deletedSend": {
-    "message": "Odstrániť Send",
+    "message": "Send bol odstránený",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
@@ -2872,7 +2952,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Vytvoriť nový Send",
+    "message": "Nový Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "newPassword": {
@@ -2887,7 +2967,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Send vytvorený",
+    "message": "Send bol vytvorený",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSendSuccessfully": {
@@ -2927,7 +3007,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Send upravený",
+    "message": "Send bol upravený",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogText": {
@@ -2993,7 +3073,7 @@
     "message": "Hlavné heslo bolo úspešne nastavené"
   },
   "updatedMasterPassword": {
-    "message": "Hlavné heslo aktualizované"
+    "message": "Hlavné heslo bolo aktualizované"
   },
   "updateMasterPassword": {
     "message": "Aktualizovať hlavné heslo"
@@ -3051,7 +3131,7 @@
     "message": "Na možnosti pri vypršaní časového limitu boli uplatnené požiadavky pravidiel spoločnosti"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Zásady vašej organizácie ovplyvňujú časový limit trezoru. Maximálny povolený časový limit trezoru je $HOURS$ h a $MINUTES$ m",
+    "message": "Zásady vašej organizácie ovplyvňujú časový limit trezoru. Maximálny povolený časový limit trezoru je $HOURS$ h a $MINUTES$ m.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -3119,10 +3199,10 @@
     "message": "Časový limit vášho trezora prekračuje obmedzenia nastavené vašou organizáciou."
   },
   "vaultExportDisabled": {
-    "message": "Export trezoru je zakázaný"
+    "message": "Export trezoru nie je dostupný"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "Jedna alebo viacero zásad organizácie vám bráni exportovať váš osobný trezor."
+    "message": "Jedno alebo viacero pravidiel organizácie vám bráni exportovať váš osobný trezor."
   },
   "copyCustomFieldNameInvalidElement": {
     "message": "Nie je možné identifikovať platný prvok formulára. Skúste namiesto toho preskúmať HTML."
@@ -3146,7 +3226,7 @@
     "message": "Odstrániť hlavné heslo"
   },
   "removedMasterPassword": {
-    "message": "Hlavné heslo bolo odstránené."
+    "message": "Hlavné heslo bolo odstránené"
   },
   "leaveOrganizationConfirmation": {
     "message": "Naozaj chcete opustiť túto organizáciu?"
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Exportuje sa len trezor organizácie spojený s $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Exportuje sa len trezor organizácie spojený s $ORGANIZATION$. Moje zbierky položiek nebudú zahrnuté.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Chyba"
   },
   "decryptionError": {
     "message": "Chyba dešifrovania"
   },
+  "errorGettingAutoFillData": {
+    "message": "Chyba pri získavaní údajov automatického vypĺňania"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden nedokázal dešifrovať nižšie uvedené položky trezoru."
   },
@@ -3290,7 +3391,7 @@
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
-    "message": "$SERVICENAME$ chyba: $ERRORMESSAGE$",
+    "message": "Chyba $SERVICENAME$: $ERRORMESSAGE$",
     "description": "Reports an error returned by a forwarding service to the user.",
     "placeholders": {
       "servicename": {
@@ -3432,10 +3533,10 @@
     "message": "Vyžaduje sa Premiové predplatné"
   },
   "organizationIsDisabled": {
-    "message": "Organizácia je vypnutá."
+    "message": "Organizácia je pozastavená."
   },
   "disabledOrganizationFilterError": {
-    "message": "K položkám vo vypnutej organizácii nie je možné pristupovať. Požiadajte o pomoc vlastníka organizácie."
+    "message": "K položkám v pozastavenej organizácii nie je možné pristupovať. Požiadajte o pomoc vlastníka organizácie."
   },
   "loggingInTo": {
     "message": "Prihlásenie do $DOMAIN$",
@@ -3465,7 +3566,7 @@
     }
   },
   "lastSeenOn": {
-    "message": "naposledy videné $DATE$",
+    "message": "naposledy videný: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -3483,10 +3584,10 @@
     "message": "Zapamätať si e-mail"
   },
   "loginWithDevice": {
-    "message": "Prihlásiť pomocou zariadenia"
+    "message": "Prihlásiť sa pomocou zariadenia"
   },
   "fingerprintPhraseHeader": {
-    "message": "Fráza odtlačku prsta"
+    "message": "Jedinečný identifikátor"
   },
   "fingerprintMatchInfo": {
     "message": "Uistite sa, že je váš trezor odomknutý a fráza odtlačku prsta sa zhoduje s frázou na druhom zariadení."
@@ -3550,16 +3651,16 @@
     "message": "Hlavné heslo uložené"
   },
   "exposedMasterPassword": {
-    "message": "Odhalené hlavné heslo"
+    "message": "Uniknuté hlavné heslo"
   },
   "exposedMasterPasswordDesc": {
-    "message": "Nájdené heslo v uniknuných údajoch. Na ochranu svojho účtu používajte jedinečné heslo. Naozaj chcete používať odhalené heslo?"
+    "message": "Heslo bolo nájdené v uniknutých údajoch. Na ochranu svojho účtu používajte jedinečné heslo. Naozaj chcete používať odhalené heslo?"
   },
   "weakAndExposedMasterPassword": {
-    "message": "Slabé a odhalené hlavné heslo"
+    "message": "Slabé a uniknuté hlavné heslo"
   },
   "weakAndBreachedMasterPasswordDesc": {
-    "message": "Nájdené slabé heslo v uniknuných údajoch. Na ochranu svojho účtu používajte silné a jedinečné heslo. Naozaj chcete používať toto heslo?"
+    "message": "Nájdené slabé heslo v uniknutých údajoch. Na ochranu svojho účtu používajte silné a jedinečné heslo. Naozaj chcete používať toto heslo?"
   },
   "checkForBreaches": {
     "message": "Skontrolovať známe úniky údajov pre toto heslo"
@@ -3571,7 +3672,7 @@
     "message": "Vaše hlavné heslo sa nebude dať obnoviť, ak ho zabudnete!"
   },
   "characterMinimum": {
-    "message": "Minimálny počet znakov $LENGTH$",
+    "message": "Minimálny počet znakov: $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -3592,7 +3693,7 @@
     }
   },
   "autofillSelectInfoWithoutCommand": {
-    "message": "Vyberte položku z ponuky alebo preskúmajte ďalšie možnosti nastavenia."
+    "message": "Vyberte položku z ponuky, alebo preskúmajte ďalšie možnosti nastavenia."
   },
   "gotIt": {
     "message": "Chápem"
@@ -3967,9 +4068,18 @@
     "message": "Alias doména"
   },
   "autofillOnPageLoadSetToDefault": {
-    "message": "Automatické vypĺňanie pri načítaní stránky nastavené na pôvodnú predvoľbu.",
+    "message": "Automatické vypĺňanie pri načítaní stránky nastavené na pôvodné nastavenie.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Automatické vypĺňanie nie je možné"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Predvolená zhoda je nastavená na \"Presná zhoda\". Aktuálna webová stránka sa presne nezhoduje s uloženými prihlasovacími údajmi pre túto položku."
+  },
+  "okay": {
+    "message": "OK"
+  },
   "toggleSideNavigation": {
     "message": "Prepnúť bočnú navigáciu"
   },
@@ -4029,7 +4139,7 @@
     "description": "Button text to display in overlay when there are no matching items"
   },
   "addNewVaultItem": {
-    "message": "Pridať novú položku trezoru",
+    "message": "Pridať novú položku trezora",
     "description": "Screen reader text (aria-label) for new item button in overlay"
   },
   "newLogin": {
@@ -4234,7 +4344,7 @@
     "message": "Prihlásený!"
   },
   "passkeyNotCopied": {
-    "message": "Prístupový kód sa neskopíruje"
+    "message": "Prístupový kľúč sa neskopíruje"
   },
   "passkeyNotCopiedAlert": {
     "message": "Prístupový kľúč sa do klonovanej položky neskopíruje. Chcete pokračovať v klonovaní tejto položky?"
@@ -4264,7 +4374,7 @@
     "message": "Uložiť prístupový kľúč"
   },
   "savePasskeyNewLogin": {
-    "message": "Uložiť prístupový kľúč ako nové prihlasovacie údaje"
+    "message": "Uložiť prístupový kľúč ako nové prihlásenie"
   },
   "chooseCipherForPasskeySave": {
     "message": "Vyberte prihlasovacie údaje, do ktorých chcete uložiť prístupový kľúč"
@@ -4394,10 +4504,10 @@
     "message": "server"
   },
   "hostedAt": {
-    "message": "hotované na"
+    "message": "hostované na"
   },
   "useDeviceOrHardwareKey": {
-    "message": "Použiť vaše zariadenie alebo hardvérový kľúč"
+    "message": "Použiť svoje zariadenie alebo hardvérový kľúč"
   },
   "justOnce": {
     "message": "Iba raz"
@@ -4471,7 +4581,7 @@
     "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutoFillSettings": {
-    "message": "Nastaviť Bitwarden ako predvolený správca hesiel",
+    "message": "Nastaviť Bitwarden ako predvoleného správcu hesiel",
     "description": "Label for the setting that allows overriding the default browser autofill settings"
   },
   "privacyPermissionAdditionNotGrantedTitle": {
@@ -4775,7 +4885,7 @@
     "message": "Stiahnuť Bitwarden na všetky zariadenia"
   },
   "getTheMobileApp": {
-    "message": "Získajte mobilnú aplikáciu"
+    "message": "Získať mobilnú aplikáciu"
   },
   "getTheMobileAppDesc": {
     "message": "Majte prístup k heslám na cestách pomocou mobilnej aplikácie Bitwarden."
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Prémium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Odomknite reportovanie, núdzový prístup a ďalšie bezpečnostné funkcie s predplatným Prémium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Bezplatné organizácie nemôžu používať prílohy"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Predvolené ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Zobraziť zisťovanie zhody $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Vitajte vo svojom trezore!"
   },
-  "phishingPageTitle": {
-    "message": "Phishingová webová stránka"
+  "phishingPageTitleV2": {
+    "message": "Bol zaznamenaný pokus o phising"
   },
-  "phishingPageCloseTab": {
-    "message": "Zavrieť kartu"
+  "phishingPageSummary": {
+    "message": "Stránka, ktorú sa pokúšate navštíviť je známa ako podvodná stránka a nesie bezpečnostné riziko."
   },
-  "phishingPageContinue": {
-    "message": "Pokračovať"
+  "phishingPageCloseTabV2": {
+    "message": "Zatvoriť túto kartu"
   },
-  "phishingPageLearnWhy": {
-    "message": "Prečo to vidíte?"
+  "phishingPageContinueV2": {
+    "message": "Pokračovať na stránku (neodporúča sa)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Táto stránka sa našla v ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", otvorený zoznam známych phisingových stránok, ktoré sa používajú na krádež osobných a citlivých informácií.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Viac informácií o detekcii phishingu"
+  },
+  "protectedBy": {
+    "message": "Chráni $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Položky na automatické vypĺňanie pre aktuálnu stránku"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Potvrdiť doménu Key Connectora"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Skvelá práca pri zabezpečení vašich ohrozených prihlasovacích údajov!"
+  },
+  "upgradeNow": {
+    "message": "Upgradovať teraz"
+  },
+  "builtInAuthenticator": {
+    "message": "Zabudovaný autentifikátor"
+  },
+  "secureFileStorage": {
+    "message": "Bezpečné ukladanie súborov"
+  },
+  "emergencyAccess": {
+    "message": "Núdzový prístup"
+  },
+  "breachMonitoring": {
+    "message": "Sledovanie únikov"
+  },
+  "andMoreFeatures": {
+    "message": "A ešte viac!"
+  },
+  "planDescPremium": {
+    "message": "Úplné online zabezpečenie"
+  },
+  "upgradeToPremium": {
+    "message": "Upgradovať na Prémium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Odomknutie pokročilých funkcií zabezpečenia"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Predplatné Prémium vám poskytne viac nástrojov na zabezpečenie a kontrolu"
+  },
+  "explorePremium": {
+    "message": "Preskúmať Prémium"
+  },
+  "loadingVault": {
+    "message": "Načítava sa trezor"
+  },
+  "vaultLoaded": {
+    "message": "Trezor sa načítal"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Politika organizácie vypla toto nastavenie.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "PSČ"
+  },
+  "cardNumberLabel": {
+    "message": "Číslo karty"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Akcia pri vypršaní časového limitu"
   }
 }
diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json
index 81b1a6bb52c..2d20050d7f1 100644
--- a/apps/browser/src/_locales/sl/messages.json
+++ b/apps/browser/src/_locales/sl/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Uredi"
   },
   "view": {
     "message": "Pogled"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Napačno glavno geslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Zakleni trezor, ko preteče toliko časa:"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Ob zaklepu sistema"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Ob ponovnem zagonu brskalnika"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Element shranjen"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Ali ste prepričani, da želite to izbrisati?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ob zagonu zahtevaj biometrično preverjanje"
   },
-  "premiumRequired": {
-    "message": "Potrebno je premium članstvo"
-  },
-  "premiumRequiredDesc": {
-    "message": "Premium članstvo je potrebno za uporabo te funkcije."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Okolje po meri"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Leto poteka"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Veljavna do"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Nastavi glavno geslo"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Napaka"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json
index 269ebd41bdd..0c7562987fc 100644
--- a/apps/browser/src/_locales/sr/messages.json
+++ b/apps/browser/src/_locales/sr/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Употребити једнократну пријаву"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Ваша организација захтева јединствену пријаву."
+  },
   "welcomeBack": {
     "message": "Добродошли назад"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Ресетовати претрагу"
   },
-  "archive": {
-    "message": "Архива"
+  "archiveNoun": {
+    "message": "Архива",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Архива",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Врати из архиве"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Архивиране ставке ће се овде појавити и бити искључени из општих резултата претраге и сугестија о ауто-пуњењу."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Ставка је послата у архиву"
   },
-  "itemRemovedFromArchive": {
-    "message": "Ставка је уклоњена из архиве"
+  "itemUnarchived": {
+    "message": "Ставка враћена из архиве"
   },
   "archiveItem": {
     "message": "Архивирај ставку"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Архивиране ставке су искључене из општих резултата претраге и предлога за ауто попуњавање. Јесте ли сигурни да желите да архивирате ову ставку?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Уреди"
   },
   "view": {
     "message": "Приказ"
   },
+  "viewAll": {
+    "message": "Прегледај све"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "Преглед пријаве"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Погрешна главна лозинка"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неважећа главна лозинка. Потврдите да је ваш имејл тачан и ваш рачун је креиран на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Тајмаут сефа"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "На закључавање система"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "На покретање прегледача"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Ставка уређена"
   },
+  "savedWebsite": {
+    "message": "Сачувана веб локација"
+  },
+  "savedWebsites": {
+    "message": "Сачувана веб локација ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Сигурно послати ову ставку у отпад?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Захтевај биометрију при покретању"
   },
-  "premiumRequired": {
-    "message": "Потребан Премијум"
-  },
-  "premiumRequiredDesc": {
-    "message": "Премијум чланство је неопходно за употребу ове опције."
-  },
   "authenticationTimeout": {
     "message": "Истекло је време аутентификације"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Читај сигурносни кључ"
   },
+  "readingPasskeyLoading": {
+    "message": "Читање притупачног кључа..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Потврда приступачног кључа"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Користи други начин пријављивања"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Чека се интеракција сигурносног кључа..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Морате додати или основни УРЛ сервера или бар једно прилагођено окружење."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Везе морају да користе HTTPS."
+  },
   "customEnvironment": {
     "message": "Прилагођено окружење"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Угасити ауто-пуњење"
   },
+  "confirmAutofill": {
+    "message": "Потврди аутопуњење"
+  },
+  "confirmAutofillDesc": {
+    "message": "Овај сајт се не подудара са вашим сачуваним подацима за пријаву. Пре него што унесете своје акредитиве за пријаву, уверите се да је то поуздан сајт."
+  },
   "showInlineMenuLabel": {
     "message": "Прикажи предлоге за ауто-попуњавање у пољима обрасца"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Како Bitwarden штити ваше податке од фишинга?"
+  },
+  "currentWebsite": {
+    "message": "Тренутни сајт"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Ауто-попуни и додај овај сајт"
+  },
+  "autofillWithoutAdding": {
+    "message": "Ауто-попуни без додавања"
+  },
+  "doNotAutofill": {
+    "message": "Не попуни"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Приказати идентитете као предлоге"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Година истека"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Истек"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Постави Главну Лозинку"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Извешће се само сеф организације повезана са $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Извешће се само сеф организације повезан са $ORGANIZATION$. Колекције мојих предмета неће бити укључене.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Грешка"
   },
   "decryptionError": {
     "message": "Грешка при декрипцији"
   },
+  "errorGettingAutoFillData": {
+    "message": "Грешка при преузимању података за ауто-попуњавање"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden није могао да декриптује ставке из трезора наведене испод."
   },
@@ -3970,6 +4071,15 @@
     "message": "Ауто-попуњавање при учитавању странице је подешено да користи подразумевано подешавање.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Не може да се ауто-попуни"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Подразумевано подударање је подешено на „Тачно подударање“. Тренутна веб локација не одговара тачно сачуваним детаљима за пријаву за ову ставку."
+  },
+  "okay": {
+    "message": "У реду"
+  },
   "toggleSideNavigation": {
     "message": "Укључите бочну навигацију"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Премијум"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Бесплатне организације не могу да користе прилоге"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Подразумевано ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Прикажи откривање подударања $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Добродошли у ваш сеф!"
   },
-  "phishingPageTitle": {
-    "message": "Пронађен злонамеран сајт"
+  "phishingPageTitleV2": {
+    "message": "Откривен је покушај „пецања“"
   },
-  "phishingPageCloseTab": {
-    "message": "Затвори језичак"
+  "phishingPageSummary": {
+    "message": "Сајт који покушавате да посетите је позната злонамерна локација и представља безбедносни ризик."
   },
-  "phishingPageContinue": {
-    "message": "Настави"
+  "phishingPageCloseTabV2": {
+    "message": "Затвори ову картицу"
   },
-  "phishingPageLearnWhy": {
-    "message": "Зашто видите ово?"
+  "phishingPageContinueV2": {
+    "message": "Настави до овог сајта (не препоручује се)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Овај сајт је нађен у ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", листа отвореног кода познатих сајтова за крађу идентитета који се користе за крађу личних и осетљивих информација.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Сазнајте више о откривању „пецања“"
+  },
+  "protectedBy": {
+    "message": "Заштићено са $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Ауто-пуњење предмета за тренутну страницу"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Потврдите домен конектора кључа"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Сјајан посао обезбеђивања ваших ризичних пријава!"
+  },
+  "upgradeNow": {
+    "message": "Надогради сада"
+  },
+  "builtInAuthenticator": {
+    "message": "Уграђени аутентификатор"
+  },
+  "secureFileStorage": {
+    "message": "Сигурно складиштење датотека"
+  },
+  "emergencyAccess": {
+    "message": "Хитан приступ"
+  },
+  "breachMonitoring": {
+    "message": "Праћење повreda безбедности"
+  },
+  "andMoreFeatures": {
+    "message": "И још више!"
+  },
+  "planDescPremium": {
+    "message": "Потпуна онлајн безбедност"
+  },
+  "upgradeToPremium": {
+    "message": "Надоградите на Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Ово подешавање је онемогућено смерницама ваше организације.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP/Поштански број"
+  },
+  "cardNumberLabel": {
+    "message": "Број картице"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/sv/messages.json b/apps/browser/src/_locales/sv/messages.json
index 8b0263bf15a..2c364f20590 100644
--- a/apps/browser/src/_locales/sv/messages.json
+++ b/apps/browser/src/_locales/sv/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Använd Single Sign-On"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Din organisation kräver single sign-on."
+  },
   "welcomeBack": {
     "message": "Välkommen tillbaka"
   },
@@ -84,7 +87,7 @@
     "message": "Huvudlösenordsledtråd (valfri)"
   },
   "passwordStrengthScore": {
-    "message": "Lösenordsstyrka $SCORE$ (score)",
+    "message": "Lösenordsstyrka $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -105,7 +108,7 @@
     }
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Avsluta anslutningen till denna organisation genom att ange ett huvudlösenord."
+    "message": "Slutför anslutningen till den här organisationen genom att ställa in ett huvudlösenord."
   },
   "tab": {
     "message": "Flik"
@@ -550,11 +553,16 @@
   "resetSearch": {
     "message": "Nollställ sökning"
   },
-  "archive": {
-    "message": "Arkivera"
+  "archiveNoun": {
+    "message": "Arkiv",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Packa upp"
+  "archiveVerb": {
+    "message": "Arkivera",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Avarkivera"
   },
   "itemsInArchive": {
     "message": "Objekt i arkiv"
@@ -563,19 +571,22 @@
     "message": "Inga objekt i arkivet"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Arkiverade objekt kommer att visas här och kommer att uteslutas från allmänna sökresultat och förslag för autofyll."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Objektet skickades till arkivet"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Objektet har avarkiverats"
   },
   "archiveItem": {
     "message": "Arkivera objekt"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Arkiverade objekt är exkluderade från allmänna sökresultat och förslag för autofyll. Är du säker på att du vill arkivera detta objekt?"
+  },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
   },
   "edit": {
     "message": "Redigera"
@@ -583,6 +594,15 @@
   "view": {
     "message": "Visa"
   },
+  "viewAll": {
+    "message": "Visa alla"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "Visa mindre"
+  },
   "viewLogin": {
     "message": "Visa inloggning"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Ogiltigt huvudlösenord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ogiltigt huvudlösenord. Bekräfta att din e-postadress är korrekt och ditt konto skapades på $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Valvets tidsgräns"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Vid låsning av datorn"
   },
+  "onIdle": {
+    "message": "När systemet är overksamt"
+  },
+  "onSleep": {
+    "message": "När systemet är i strömsparläge"
+  },
   "onRestart": {
     "message": "Vid omstart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Objekt sparat"
   },
+  "savedWebsite": {
+    "message": "Sparad webbplats"
+  },
+  "savedWebsites": {
+    "message": "Sparade webbplatser ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Är du säker på att du vill radera detta objekt?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Be om biometri vid start"
   },
-  "premiumRequired": {
-    "message": "Premium krävs"
-  },
-  "premiumRequiredDesc": {
-    "message": "Ett premium-medlemskap krävs för att använda den här funktionen."
-  },
   "authenticationTimeout": {
     "message": "Timeout för autentisering"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Läs säkerhetsnyckel"
   },
+  "readingPasskeyLoading": {
+    "message": "Läser inloggningsnyckel..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Autentisering med inloggningsnyckel misslyckades"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Använd en annan inloggningsmetod"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Väntar på interaktion med säkerhetsnyckel..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Du måste lägga till antingen serverns bas-URL eller minst en anpassad miljö."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Webbadresser måste använda HTTPS."
+  },
   "customEnvironment": {
     "message": "Anpassad miljö"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Stäng av autofyll"
   },
+  "confirmAutofill": {
+    "message": "Bekräfta autofyll"
+  },
+  "confirmAutofillDesc": {
+    "message": "Denna webbplats matchar inte dina sparade inloggningsuppgifter. Innan du fyller i dina inloggningsuppgifter, se till att det är en betrodd webbplats."
+  },
   "showInlineMenuLabel": {
     "message": "Visa förslag för autofyll i formulärfält"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Hur skyddar Bitwarden dina data från nätfiske?"
+  },
+  "currentWebsite": {
+    "message": "Aktuell webbplats"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofyll och lägg till denna webbplats"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofyll utan att lägga till"
+  },
+  "doNotAutofill": {
+    "message": "Autofyll inte"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Visa identiteter som förslag"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Utgångsår"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Utgång"
   },
@@ -1967,11 +2044,11 @@
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Ny textsändning",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Ny filsändning",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
@@ -1995,11 +2072,11 @@
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Redigera textsändning",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Redigera filsändning",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Denna sida stör Bitwarden-upplevelsen. Bitwardens inbyggda meny har tillfälligt inaktiverats som en säkerhetsåtgärd."
+  },
   "setMasterPassword": {
     "message": "Ange huvudlösenord"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Endast organisationsvalvet som är associerat med $ORGANIZATION$ kommer att exporteras.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Endast organisationsvalvet som associeras med $ORGANIZATION$ kommer att exporteras. Mina objektsamlingar kommer inte att inkluderas.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Fel"
   },
   "decryptionError": {
     "message": "Dekrypteringsfel"
   },
+  "errorGettingAutoFillData": {
+    "message": "Fel vid hämtning av autofylldata"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden kunde inte dekryptera valvföremålet/valvföremålen som listas nedan."
   },
@@ -3970,6 +4071,15 @@
     "message": "Aktivera automatisk ifyllnad vid sidhämtning sattes till att använda standardinställningen.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Kan inte autofylla"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Standardmatchning är satt till 'Exakt matchning'. Den aktuella webbplatsen matchar inte exakt de sparade inloggningsuppgifterna för detta objekt."
+  },
+  "okay": {
+    "message": "Okej"
+  },
   "toggleSideNavigation": {
     "message": "Växla sidonavigering"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Lås upp rapportering, nödåtkomst och fler säkerhetsfunktioner med Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Fria organisationer kan inte använda bilagor"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Standard ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Visa matchningsdetektering $WEBSITE",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Välkommen till ditt valv!"
   },
-  "phishingPageTitle": {
-    "message": "Webbsida för nätfiske"
+  "phishingPageTitleV2": {
+    "message": "Försök till nätfiske upptäcktes"
   },
-  "phishingPageCloseTab": {
-    "message": "Stäng flik"
+  "phishingPageSummary": {
+    "message": "Webbplatsen som du försöker besöka är en känd skadlig webbplats och en säkerhetsrisk."
   },
-  "phishingPageContinue": {
-    "message": "Fortsätt"
+  "phishingPageCloseTabV2": {
+    "message": "Stäng denna flik"
   },
-  "phishingPageLearnWhy": {
-    "message": "Varför ser du detta?"
+  "phishingPageContinueV2": {
+    "message": "Fortsätt till denna webbplats (rekommenderas inte)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Denna webbplats hittades i ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", en öppen källkodslista över kända nätfiskeplatser som används för att stjäla personlig och känslig information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Läs mer om nätfiskedetektering"
+  },
+  "protectedBy": {
+    "message": "Skyddad av $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofyll objekt för den aktuella sidan"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Bekräfta Key Connector-domän"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Bra jobbat med att säkra upp dina inloggninar i riskzonen!"
+  },
+  "upgradeNow": {
+    "message": "Uppgradera nu"
+  },
+  "builtInAuthenticator": {
+    "message": "Inbyggd autenticator"
+  },
+  "secureFileStorage": {
+    "message": "Säker fillagring"
+  },
+  "emergencyAccess": {
+    "message": "Nödåtkomst"
+  },
+  "breachMonitoring": {
+    "message": "Intrångsmonitorering"
+  },
+  "andMoreFeatures": {
+    "message": "och mer!"
+  },
+  "planDescPremium": {
+    "message": "Komplett säkerhet online"
+  },
+  "upgradeToPremium": {
+    "message": "Uppgradera till Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Utforska Premium"
+  },
+  "loadingVault": {
+    "message": "Läser in valv"
+  },
+  "vaultLoaded": {
+    "message": "Valvet lästes in"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Denna inställning är inaktiverad enligt din organisations policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postnummer"
+  },
+  "cardNumberLabel": {
+    "message": "Kortnummer"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Tidsgränsåtgärd"
   }
 }
diff --git a/apps/browser/src/_locales/ta/messages.json b/apps/browser/src/_locales/ta/messages.json
index 8d2199db6ca..4d185501855 100644
--- a/apps/browser/src/_locales/ta/messages.json
+++ b/apps/browser/src/_locales/ta/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "ஒற்றை உள்நுழைவைப் பயன்படுத்தவும்"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "மீண்டும் வருக"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "தேடலை மீட்டமை"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "திருத்து"
   },
   "view": {
     "message": "காண்"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "உள்நுழைவைக் காண்க"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "தவறான முதன்மை கடவுச்சொல்"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "வால்ட் காலக்கெடு"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "சிஸ்டம் பூட்டப்பட்டவுடன்"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "உலாவி மறுதொடக்கம் செய்யப்பட்டவுடன்"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "உருப்படி சேமிக்கப்பட்டது"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "நீங்கள் உண்மையிலேயே குப்பைக்கு அனுப்ப விரும்புகிறீர்களா?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "தொடங்கும் போது பயோமெட்ரிக்ஸைக் கேட்கவும்"
   },
-  "premiumRequired": {
-    "message": "பிரீமியம் தேவை"
-  },
-  "premiumRequiredDesc": {
-    "message": "இந்த அம்சத்தைப் பயன்படுத்த ஒரு பிரீமியம் மெம்பர்ஷிப் தேவை."
-  },
   "authenticationTimeout": {
     "message": "அங்கீகரிப்பு டைம் அவுட்"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "பாதுகாப்பு விசையைப் படி"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "பாதுகாப்பு விசை தொடர்புகொள்ளக் காத்திருக்கிறது..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "நீங்கள் பேஸ் சர்வர் URL-ஐ அல்லது குறைந்தது ஒரு தனிப்பயன் சூழலைச் சேர்க்க வேண்டும்."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "தனிப்பயன் சூழல்"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "ஆட்டோஃபில்லை முடக்கு"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "படிவப் புலங்களில் ஆட்டோஃபில் பரிந்துரைகளைக் காட்டு"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "பரிந்துரைகளாக அடையாளங்களைக் காட்டு"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "காலாவதி ஆண்டு"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "காலாவதி"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "முதன்மை கடவுச்சொல்லை அமை"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "பிழை"
   },
   "decryptionError": {
     "message": "குறியாக்கம் நீக்கப் பிழை"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden கீழே பட்டியலிடப்பட்ட பெட்டக பொருளை குறியாக்கம் நீக்க முடியவில்லை."
   },
@@ -3970,6 +4071,15 @@
     "message": "பக்க ஏற்றத்தில் தானியங்கு நிரப்புதல் இயல்புநிலை அமைப்பைப் பயன்படுத்த அமைக்கப்பட்டுள்ளது.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "பக்க வழிசெலுத்தலை மாற்று"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "பிரீமியம்"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "இலவச நிறுவனங்கள் இணைப்புகளைப் பயன்படுத்த முடியாது"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "பொருத்தமான கண்டறிதலைக் காட்டு $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "உங்கள் சேமிப்பு பெட்டகத்திற்கு நல்வரவு!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "தற்போதைய பக்கத்திற்கான தானாக நிரப்பு பொருள்கள்"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Key Connector டொமைனை உறுதிப்படுத்து"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/te/messages.json b/apps/browser/src/_locales/te/messages.json
index 78a49021a0c..f829937ac51 100644
--- a/apps/browser/src/_locales/te/messages.json
+++ b/apps/browser/src/_locales/te/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Edit"
   },
   "view": {
     "message": "View"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Vault timeout"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On system lock"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On browser restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Item saved"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Do you really want to send to the trash?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Expiration"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Set master password"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/th/messages.json b/apps/browser/src/_locales/th/messages.json
index 61f97564f6a..ef6ba5b2077 100644
--- a/apps/browser/src/_locales/th/messages.json
+++ b/apps/browser/src/_locales/th/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "ใช้การลงชื่อเพียงครั้งเดียว"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "ยินดีต้อนรับกลับมา"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "แก้ไข"
   },
   "view": {
     "message": "แสดง"
   },
+  "viewAll": {
+    "message": "View all"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "View login"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "รหัสผ่านหลักไม่ถูกต้อง"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "ระยะเวลาล็อกตู้เซฟ"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "On Locked"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "On Restart"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "แก้ไขรายการแล้ว"
   },
+  "savedWebsite": {
+    "message": "Saved website"
+  },
+  "savedWebsites": {
+    "message": "Saved websites ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "คุณต้องการส่งไปยังถังขยะใช่หรือไม่?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Ask for biometrics on launch"
   },
-  "premiumRequired": {
-    "message": "Premium Required"
-  },
-  "premiumRequiredDesc": {
-    "message": "A Premium membership is required to use this feature."
-  },
   "authenticationTimeout": {
     "message": "Authentication timeout"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Read security key"
   },
+  "readingPasskeyLoading": {
+    "message": "Reading passkey..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Use a different log in method"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom Environment"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Turn off autofill"
   },
+  "confirmAutofill": {
+    "message": "Confirm autofill"
+  },
+  "confirmAutofillDesc": {
+    "message": "This site doesn't match your saved login details. Before you fill in your login credentials, make sure it's a trusted site."
+  },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "How does Bitwarden protect your data from phishing?"
+  },
+  "currentWebsite": {
+    "message": "Current website"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Autofill and add this website"
+  },
+  "autofillWithoutAdding": {
+    "message": "Autofill without adding"
+  },
+  "doNotAutofill": {
+    "message": "Do not autofill"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Display identities as suggestions"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Expiration Year"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "วันหมดอายุ"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "ตั้งรหัสผ่านหลัก"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Error"
   },
   "decryptionError": {
     "message": "Decryption error"
   },
+  "errorGettingAutoFillData": {
+    "message": "Error getting autofill data"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
   },
@@ -3970,6 +4071,15 @@
     "message": "Autofill on page load set to use default setting.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Cannot autofill"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Okay"
+  },
   "toggleSideNavigation": {
     "message": "Toggle side navigation"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Free organizations cannot use attachments"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Show match detection $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Welcome to your vault!"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "Phishing attempt detected"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "The site you are attempting to visit is a known malicious site and a security risk."
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "Close this tab"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "Continue to this site (not recommended)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Confirm Key Connector domain"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/tr/messages.json b/apps/browser/src/_locales/tr/messages.json
index 0b65ae7d476..e6004ef387f 100644
--- a/apps/browser/src/_locales/tr/messages.json
+++ b/apps/browser/src/_locales/tr/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Çoklu oturum açma kullan"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Kuruluşunuz çoklu oturum açma gerektiriyor."
+  },
   "welcomeBack": {
     "message": "Tekrar hoş geldiniz"
   },
@@ -362,7 +365,7 @@
     "message": "Ücretsiz Bitwarden Aile"
   },
   "freeBitwardenFamiliesPageDesc": {
-    "message": "Ücretsiz Bitwarden Aile Paketi’nden faydalanmaya hak kazandınız. Bu teklifi bugün web uygulaması üzerinden kullanın."
+    "message": "Ücretsiz Bitwarden Aileleri için uygunsun. Bu teklifi bugün web uygulamasında kullan."
   },
   "version": {
     "message": "Sürüm"
@@ -550,32 +553,40 @@
   "resetSearch": {
     "message": "Aramayı sıfırla"
   },
-  "archive": {
-    "message": "Arşivle"
+  "archiveNoun": {
+    "message": "Arşiv",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arşivle",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Arşivden çıkar"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Arşivdeki kayıtlar"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Arşivde kayıt yok"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Arşivlenmiş kayıtlar burada görünecek ve genel arama sonuçlarından ile otomatik doldurma önerilerinden hariç tutulacaktır."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Kayıt arşive gönderildi"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Kayıt arşivden çıkarıldı"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Kaydı arşivle"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Arşivlenmiş kayıtlar genel arama sonuçları ve otomatik doldurma önerilerinden hariç tutulur. Bu kaydı arşivlemek istediğine emin misin?"
+  },
+  "upgradeToUseArchive": {
+    "message": "Arşivi kullanmak için premium üyelik gereklidir."
   },
   "edit": {
     "message": "Düzenle"
@@ -583,6 +594,15 @@
   "view": {
     "message": "Görüntüle"
   },
+  "viewAll": {
+    "message": "Tümünü göster"
+  },
+  "showAll": {
+    "message": "Tümünü göster"
+  },
+  "viewLess": {
+    "message": "Daha az göster"
+  },
   "viewLogin": {
     "message": "Hesabı göster"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Geçersiz ana parola"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ana parola geçersiz. E-posta adresinizin doğru olduğunu ve hesabınızın $HOST$ üzerinde oluşturulduğunu kontrol edin.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Kasa zaman aşımı"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Sistem kilitlenince"
   },
+  "onIdle": {
+    "message": "Sistem boştayken"
+  },
+  "onSleep": {
+    "message": "Sistem uyuyunca"
+  },
   "onRestart": {
     "message": "Tarayıcı yeniden başlatılınca"
   },
@@ -875,13 +910,13 @@
     "message": "Mevcut web sayfasındaki kimlik doğrulayıcı QR kodunu tarayın"
   },
   "totpHelperTitle": {
-    "message": "2 adımlı doğrulamayı sorunsuz hale getirin"
+    "message": "2 adımlı doğrulamayı sorunsuz hale getir"
   },
   "totpHelper": {
-    "message": "Bitwarden, 2 adımlı doğrulama kodlarını saklayabilir ve otomatik olarak doldurabilir. Anahtarı kopyalayıp bu alana yapıştırın."
+    "message": "Bitwarden 2 adımlı doğrulama kodlarını saklayabilir ve doldurabilir. Anahtarı bu alana kopyala ve yapıştır."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden, iki adımlı doğrulama kodlarını saklayabilir ve otomatik olarak doldurabilir. Bu web sitesinin doğrulayıcı QR kodunun ekran görüntüsünü almak için kamera simgesini seçin veya anahtarı bu alana kopyalayıp yapıştırın."
+    "message": "Bitwarden 2 adımlı doğrulama kodlarını saklayabilir ve doldurabilir. Bu web sitesinin kimlik doğrulayıcı QR kodunun ekran görüntüsünü almak için kamera simgesini seç veya anahtarı bu alana kopyala ve yapıştır."
   },
   "learnMoreAboutAuthenticators": {
     "message": "Kimlik doğrulayıcılar hakkında bilgi alın"
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Hesap kaydedildi"
   },
+  "savedWebsite": {
+    "message": "Kayıtlı web sitesi"
+  },
+  "savedWebsites": {
+    "message": "Kayıtlı web siteleri ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Çöp kutusuna göndermek istediğinizden emin misiniz?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Açılışta biyometri doğrulaması iste"
   },
-  "premiumRequired": {
-    "message": "Premium gerekli"
-  },
-  "premiumRequiredDesc": {
-    "message": "Bu özelliği kullanmak için premium üyelik gereklidir."
-  },
   "authenticationTimeout": {
     "message": "Kimlik doğrulama zaman aşımı"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Güvenlik anahtarını oku"
   },
+  "readingPasskeyLoading": {
+    "message": "Geçiş anahtarı okunuyor..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Geçiş anahtarı doğrulaması başarısız oldu"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Başka bir giriş yöntemi kullan"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Güvenlik anahtarı etkileşimi bekleniyor…"
   },
@@ -1592,7 +1642,7 @@
     "message": "Şirket içinde barındırılan ortam"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Yerel sunucunuzda barındırılan Bitwarden kurulumunuzun temel URL’sini belirtin. Örnek: https://bitwarden.sirketiniz.com"
+    "message": "Şirket içinde barındırılan Bitwarden kurulumunun temel URL’sini belirt. Örnek: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
     "message": "İleri düzey yapılandırma için her hizmetin taban URL'sini bağımsız olarak belirleyebilirsiniz."
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Temel Sunucu URL’sini veya en az bir özel ortam eklemelisiniz."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL'ler HTTPS kullanmalıdır."
+  },
   "customEnvironment": {
     "message": "Özel ortam"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Otomatik doldurmayı kapat"
   },
+  "confirmAutofill": {
+    "message": "Otomatik doldurmayı onayla"
+  },
+  "confirmAutofillDesc": {
+    "message": "Bu site kayıtlı hesap bilgilerinizle eşleşmiyor. Hesap bilgilerinizi doldurmadan önce sitenin güvenilir olduğundan emin olun."
+  },
   "showInlineMenuLabel": {
     "message": "Form alanlarında otomatik doldurma önerilerini göster"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Bitwarden verilerinizi kimlik avı saldırılarından nasıl koruyor?"
+  },
+  "currentWebsite": {
+    "message": "Geçerli web sitesi"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Otomatik doldur ve bu siteyi ekle"
+  },
+  "autofillWithoutAdding": {
+    "message": "Eklemeden otomatik doldur"
+  },
+  "doNotAutofill": {
+    "message": "Otomatik doldurma"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Kimlikleri öneri olarak göster"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Son kullanma yılı"
   },
+  "monthly": {
+    "message": "ay"
+  },
   "expiration": {
     "message": "Son kullanma tarihi"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "Bu sayfa Bitwarden deneyimiyle çakışıyor. Güvenlik önlemi olarak Bitwarden satır içi menüsü geçici olarak devre dışı bırakıldı."
+  },
   "setMasterPassword": {
     "message": "Ana parolayı belirle"
   },
@@ -2558,7 +2638,7 @@
     "message": "Bir kuruluş ilkesi, kayıtları kişisel kasanıza içe aktarmayı engelledi."
   },
   "restrictCardTypeImport": {
-    "message": "Kart öge türleri içe aktarılamıyor"
+    "message": "Kart kayıt türleri içe aktarılamıyor"
   },
   "restrictCardTypeImportDesc": {
     "message": "1 veya daha fazla kuruluş tarafından belirlenen bir ilke, kasalarınıza kart aktarmanızı engelliyor."
@@ -2689,14 +2769,14 @@
     "message": "Risk altındaki parolaları inceleyin"
   },
   "reviewAtRiskLoginsSlideDesc": {
-    "message": "Organizasyonunuzun parolaları zayıf, tekrar kullanılmış ve/veya açığa çıkmış olduğu için risk altındadır.",
+    "message": "Kuruluş parolaların zayıf, yeniden kullanılmış ve/veya ele geçirilmiş olduğundan risk altındadır.",
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
     "message": "Risk altındaki hesap listesinin illüstrasyonu."
   },
   "generatePasswordSlideDesc": {
-    "message": "Risk altındaki sitede Bitwarden otomatik doldurma menüsü ile hızlıca güçlü ve benzersiz bir parola oluşturun.",
+    "message": "Riskli sitede Bitwarden otomatik doldurma menüsünü kullanarak hızlıca güçlü ve benzersiz bir parola oluştur.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Yalnızca $ORGANIZATION$ ile ilişkili kuruluş kasası dışa aktarılacaktır.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Yalnızca $ORGANIZATION$ ile ilişkili kuruluş kasası dışa aktarılacaktır. Kayıt koleksiyonlarım dahil edilmeyecektir.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Hata"
   },
   "decryptionError": {
     "message": "Şifre çözme sorunu"
   },
+  "errorGettingAutoFillData": {
+    "message": "Otomatik doldurma verileri alınırken hata oluştu"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden aşağıdaki kasa öğelerini deşifre edemedi."
   },
@@ -3970,6 +4071,15 @@
     "message": "Sayfa yüklenince otomatik doldurma, varsayılan ayarı kullanacak şekilde ayarlandı.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Otomatik doldurulamıyor"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Default matching is set to 'Exact Match'. The current website does not exactly match the saved login details for this item."
+  },
+  "okay": {
+    "message": "Tamam"
+  },
   "toggleSideNavigation": {
     "message": "Kenar menüsünü aç/kapat"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Premium"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Ücretsiz kuruluşlar dosya eklerini kullanamaz"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Varsayılan ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "$WEBSITE$ eşleşme tespitini göster",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Kasanıza hoş geldiniz!"
   },
-  "phishingPageTitle": {
-    "message": "Dolandırıcılık web sitesi"
+  "phishingPageTitleV2": {
+    "message": "Dolandırıcılık girişimi tespit edildi"
   },
-  "phishingPageCloseTab": {
-    "message": "Sekmeyi kapat"
+  "phishingPageSummary": {
+    "message": "Girmeye çalıştığınız site kötü amaçlı ve güvenlik riski taşıyan bir sitedir."
   },
-  "phishingPageContinue": {
-    "message": "Devam et"
+  "phishingPageCloseTabV2": {
+    "message": "Bu sekmeyi kapat"
   },
-  "phishingPageLearnWhy": {
-    "message": "Bunu neden görüyorsunuz?"
+  "phishingPageContinueV2": {
+    "message": "Siteye devam et (önerilmez)"
+  },
+  "phishingPageExplanation1": {
+    "message": "This site was found in ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Learn more about phishing detection"
+  },
+  "protectedBy": {
+    "message": "Protected by $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Geçerli sayfada kayıtları otomatik doldurun"
@@ -5629,7 +5772,7 @@
     "message": "Bu ayar hakkında"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden, deneyimini iyileştirmek için hangi simgenin veya parola değiştirme URL’sinin kullanılacağını belirlemek amacıyla kaydedilmiş hesap URI’lerini kullanır. Bu hizmeti kullandığında hiçbir bilgi toplanmaz veya kaydedilmez."
   },
   "noPermissionsViewPage": {
     "message": "Bu sayfayı görüntüleme izniniz yok. Farklı bir hesapla giriş yapmayı deneyin."
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Key Connector alan adını doğrulayın"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Great job securing your at-risk logins!"
+  },
+  "upgradeNow": {
+    "message": "Şimdi yükselt"
+  },
+  "builtInAuthenticator": {
+    "message": "Dahili kimlik doğrulayıcı"
+  },
+  "secureFileStorage": {
+    "message": "Güvenli dosya depolama"
+  },
+  "emergencyAccess": {
+    "message": "Acil durum erişimi"
+  },
+  "breachMonitoring": {
+    "message": "İhlal izleme"
+  },
+  "andMoreFeatures": {
+    "message": "Ve daha fazlası!"
+  },
+  "planDescPremium": {
+    "message": "Eksiksiz çevrimiçi güvenlik"
+  },
+  "upgradeToPremium": {
+    "message": "Premium'a yükselt"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Gelişmiş güvenlik özelliklerinin kilidini açın"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "Premium abonelik size daha fazla güvenlik ve kontrol olanağı sunan ek araçlara erişmenizi sağlar"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Kasa yükleniyor"
+  },
+  "vaultLoaded": {
+    "message": "Kasa yüklendi"
+  },
+  "settingDisabledByPolicy": {
+    "message": "This setting is disabled by your organization's policy.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / posta kodu"
+  },
+  "cardNumberLabel": {
+    "message": "Kart numarası"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Zaman aşımı eylemi"
   }
 }
diff --git a/apps/browser/src/_locales/uk/messages.json b/apps/browser/src/_locales/uk/messages.json
index f088e610051..a1922a5abd8 100644
--- a/apps/browser/src/_locales/uk/messages.json
+++ b/apps/browser/src/_locales/uk/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Використати єдиний вхід"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Ваша організація вимагає єдиний вхід (SSO)."
+  },
   "welcomeBack": {
     "message": "З поверненням"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Скинути пошук"
   },
-  "archive": {
-    "message": "Архівувати"
+  "archiveNoun": {
+    "message": "Архів",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Архівувати",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Видобути"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Архівовані записи з'являтимуться тут і будуть виключені з результатів звичайного пошуку та пропозицій автозаповнення."
   },
-  "itemSentToArchive": {
-    "message": "Запис переміщено до архіву"
+  "itemWasSentToArchive": {
+    "message": "Запис архівовано"
   },
-  "itemRemovedFromArchive": {
-    "message": "Запис вилучено з архіву"
+  "itemUnarchived": {
+    "message": "Запис розархівовано"
   },
   "archiveItem": {
     "message": "Архівувати запис"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Архівовані записи виключаються з результатів звичайного пошуку та пропозицій автозаповнення. Ви дійсно хочете архівувати цей запис?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Змінити"
   },
   "view": {
     "message": "Переглянути"
   },
+  "viewAll": {
+    "message": "Переглянути все"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "Переглянути запис"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Неправильний головний пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неправильний головний пароль. Перевірте правильність адреси електронної пошти та розміщення облікового запису на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Час очікування сховища"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "З блокуванням системи"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "З перезапуском браузера"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Запис збережено"
   },
+  "savedWebsite": {
+    "message": "Збережений вебсайт"
+  },
+  "savedWebsites": {
+    "message": "Збережені вебсайти ( $COUNT$ )",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Ви дійсно хочете перенести до смітника?"
   },
@@ -1408,22 +1455,22 @@
     "message": "Застаріле шифрування більше не підтримується. Зверніться до служби підтримки, щоб відновити обліковий запис."
   },
   "premiumMembership": {
-    "message": "Преміум статус"
+    "message": "Передплата Premium"
   },
   "premiumManage": {
     "message": "Керувати передплатою"
   },
   "premiumManageAlert": {
-    "message": "Ви можете керувати своїм статусом у сховищі на bitwarden.com. Хочете перейти на вебсайт зараз?"
+    "message": "Ви можете керувати передплатою у сховищі на bitwarden.com. Хочете перейти на вебсайт зараз?"
   },
   "premiumRefresh": {
     "message": "Оновити стан передплати"
   },
   "premiumNotCurrentMember": {
-    "message": "Зараз у вас немає передплати преміум."
+    "message": "Зараз у вас немає передплати Premium."
   },
   "premiumSignUpAndGet": {
-    "message": "Передплатіть преміум і отримайте:"
+    "message": "Передплатіть Premium і отримайте:"
   },
   "ppremiumSignUpStorage": {
     "message": "1 ГБ зашифрованого сховища для файлів."
@@ -1444,25 +1491,25 @@
     "message": "Пріоритетну технічну підтримку."
   },
   "ppremiumSignUpFuture": {
-    "message": "Усі майбутні преміумфункції. Їх буде більше!"
+    "message": "Усі майбутні функції Premium. Їх буде більше!"
   },
   "premiumPurchase": {
-    "message": "Придбати преміум"
+    "message": "Придбати Premium"
   },
   "premiumPurchaseAlertV2": {
-    "message": "Ви можете придбати Преміум у налаштуваннях облікового запису вебпрограмі Bitwarden."
+    "message": "Ви можете придбати Premium у налаштуваннях облікового запису вебпрограми Bitwarden."
   },
   "premiumCurrentMember": {
-    "message": "Ви користуєтеся передплатою преміум!"
+    "message": "Ви користуєтеся передплатою Premium!"
   },
   "premiumCurrentMemberThanks": {
     "message": "Дякуємо за підтримку Bitwarden."
   },
   "premiumFeatures": {
-    "message": "Передплатіть преміум та отримайте:"
+    "message": "Передплатіть Premium та отримайте:"
   },
   "premiumPrice": {
-    "message": "Всього лише $PRICE$ / за рік!",
+    "message": "Лише $PRICE$ / рік!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1471,7 +1518,7 @@
     }
   },
   "premiumPriceV2": {
-    "message": "Усе лише за $PRICE$ на рік!",
+    "message": "Лише за $PRICE$ на рік за все!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Запитувати біометрію під час запуску"
   },
-  "premiumRequired": {
-    "message": "Необхідна передплата преміум"
-  },
-  "premiumRequiredDesc": {
-    "message": "Для використання цієї функції необхідна передплата преміум."
-  },
   "authenticationTimeout": {
     "message": "Час очікування автентифікації"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Зчитати ключ безпеки"
   },
+  "readingPasskeyLoading": {
+    "message": "Читання ключа доступу..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Збій автентифікації ключа доступу"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Використати інший спосіб входу"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Очікується взаємодія з ключем безпеки..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Необхідно додати URL-адресу основного сервера, або принаймні одне користувацьке середовище."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL-адреси повинні бути HTTPS."
+  },
   "customEnvironment": {
     "message": "Власне середовище"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Вимкніть автозаповнення"
   },
+  "confirmAutofill": {
+    "message": "Підтвердити автозаповнення"
+  },
+  "confirmAutofillDesc": {
+    "message": "Адреса цього вебсайту відрізняється від збережених даних вашого запису. Перш ніж заповнити облікові дані, переконайтеся, що це надійний сайт."
+  },
   "showInlineMenuLabel": {
     "message": "Пропозиції автозаповнення на полях форм"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Як Bitwarden захищає ваші дані від шахрайства?"
+  },
+  "currentWebsite": {
+    "message": "Поточний вебсайт"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Автоматично заповнити й додати цей сайт"
+  },
+  "autofillWithoutAdding": {
+    "message": "Автоматично заповнити без додавання"
+  },
+  "doNotAutofill": {
+    "message": "Не заповнювати автоматично"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Показувати посвідчення як пропозиції"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Рік завершення"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Термін дії"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Встановити головний пароль"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Буде експортовано лише сховище організації, пов'язане з $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Буде експортовано лише сховище організації, пов'язане з $ORGANIZATION$. Записи моїх збірок не будуть включені.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Помилка"
   },
   "decryptionError": {
     "message": "Помилка розшифрування"
   },
+  "errorGettingAutoFillData": {
+    "message": "Помилка отримання даних автозаповнення"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden не зміг розшифрувати вказані нижче елементи сховища."
   },
@@ -3429,7 +3530,7 @@
     "message": "Помилка Key Connector: переконайтеся, що Key Connector доступний та працює правильно."
   },
   "premiumSubcriptionRequired": {
-    "message": "Необхідна передплата преміум"
+    "message": "Необхідна передплата Premium"
   },
   "organizationIsDisabled": {
     "message": "Організацію вимкнено."
@@ -3970,6 +4071,15 @@
     "message": "Автозаповнення на сторінці налаштовано з типовими параметрами.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Неможливо автоматично заповнити"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Типово налаштовано \"Точну відповідність\". Адреса поточного вебсайту відрізняється від збережених даних для цього запису."
+  },
+  "okay": {
+    "message": "Гаразд"
+  },
   "toggleSideNavigation": {
     "message": "Перемкнути бічну навігацію"
   },
@@ -4799,7 +4909,10 @@
     "message": "Ви дійсно хочете остаточно видалити це вкладення?"
   },
   "premium": {
-    "message": "Преміум"
+    "message": "Premium"
+  },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
   },
   "freeOrgsCannotUseAttachments": {
     "message": "Організації без передплати не можуть використовувати вкладення"
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Показати виявлення збігів $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Вітаємо у вашому сховищі!"
   },
-  "phishingPageTitle": {
-    "message": "Шахрайський вебсайт"
+  "phishingPageTitleV2": {
+    "message": "Виявлено спробу шахрайства"
   },
-  "phishingPageCloseTab": {
-    "message": "Закрити вкладку"
+  "phishingPageSummary": {
+    "message": "Ви намагаєтеся відвідати відомий зловмисний вебсайт, який має ризики безпеки."
   },
-  "phishingPageContinue": {
-    "message": "Продовжити"
+  "phishingPageCloseTabV2": {
+    "message": "Закрити цю вкладку"
   },
-  "phishingPageLearnWhy": {
-    "message": "Чому ви це бачите?"
+  "phishingPageContinueV2": {
+    "message": "Перейти на цей сайт (не рекомендується)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Цей сайт знайдено в ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": "– відкритий список відомих шахрайських сайтів, що використовуються для викрадення особистої та конфіденційної інформації.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Докладніше про виявлення шахрайства"
+  },
+  "protectedBy": {
+    "message": "Захищено $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Автозаповнення записів для поточної сторінки"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Підтвердити домен Key Connector"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Ви чудово впоралися із захистом своїх ризикованих записів!"
+  },
+  "upgradeNow": {
+    "message": "Покращити"
+  },
+  "builtInAuthenticator": {
+    "message": "Вбудований автентифікатор"
+  },
+  "secureFileStorage": {
+    "message": "Захищене сховище файлів"
+  },
+  "emergencyAccess": {
+    "message": "Екстрений доступ"
+  },
+  "breachMonitoring": {
+    "message": "Моніторинг витоків даних"
+  },
+  "andMoreFeatures": {
+    "message": "Інші можливості!"
+  },
+  "planDescPremium": {
+    "message": "Повна онлайн-безпека"
+  },
+  "upgradeToPremium": {
+    "message": "Покращити до Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Цей параметр вимкнено політикою вашої організації.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Поштовий індекс"
+  },
+  "cardNumberLabel": {
+    "message": "Номер картки"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/vi/messages.json b/apps/browser/src/_locales/vi/messages.json
index 06920433037..415cf474af0 100644
--- a/apps/browser/src/_locales/vi/messages.json
+++ b/apps/browser/src/_locales/vi/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "Dùng đăng nhập một lần"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tổ chức của bạn yêu cầu đăng nhập một lần."
+  },
   "welcomeBack": {
     "message": "Chào mừng bạn trở lại"
   },
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "Đặt lại tìm kiếm"
   },
-  "archive": {
-    "message": "Lưu trữ"
+  "archiveNoun": {
+    "message": "Lưu trữ",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Lưu trữ",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Hủy lưu trữ"
   },
   "itemsInArchive": {
@@ -565,11 +573,11 @@
   "noItemsInArchiveDesc": {
     "message": "Các mục đã lưu trữ sẽ hiển thị ở đây và sẽ bị loại khỏi kết quả tìm kiếm và gợi ý tự động điền."
   },
-  "itemSentToArchive": {
-    "message": "Mục đã được gửi đến kho lưu trữ"
+  "itemWasSentToArchive": {
+    "message": "Mục đã được chuyển vào kho lưu trữ"
   },
-  "itemRemovedFromArchive": {
-    "message": "Mục đã được gỡ khỏi kho lưu trữ"
+  "itemUnarchived": {
+    "message": "Mục đã được bỏ lưu trữ"
   },
   "archiveItem": {
     "message": "Lưu trữ mục"
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "Các mục đã lưu trữ sẽ bị loại khỏi kết quả tìm kiếm chung và gợi ý tự động điền. Bạn có chắc chắn muốn lưu trữ mục này không?"
   },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
+  },
   "edit": {
     "message": "Sửa"
   },
   "view": {
     "message": "Xem"
   },
+  "viewAll": {
+    "message": "Xem tất cả"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "View less"
+  },
   "viewLogin": {
     "message": "Xem đăng nhập"
   },
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "Mật khẩu chính không hợp lệ"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Mật khẩu chính không hợp lệ. Xác nhận email của bạn là chính xác và tài khoản được tạo trên $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "Đóng kho sau"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "Mỗi khi khóa máy"
   },
+  "onIdle": {
+    "message": "On system idle"
+  },
+  "onSleep": {
+    "message": "On system sleep"
+  },
   "onRestart": {
     "message": "Mỗi khi khởi động lại trình duyệt"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "Đã lưu mục"
   },
+  "savedWebsite": {
+    "message": "Đã lưu trang web"
+  },
+  "savedWebsites": {
+    "message": "Đã lưu trang web ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "Bạn có chắc muốn cho nó vào thùng rác?"
   },
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "Yêu cầu sinh trắc học khi khởi chạy"
   },
-  "premiumRequired": {
-    "message": "Cần có tài khoản Cao cấp"
-  },
-  "premiumRequiredDesc": {
-    "message": "Cần là thành viên Cao cấp để sử dụng tính năng này."
-  },
   "authenticationTimeout": {
     "message": "Thời gian chờ xác thực"
   },
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "Đọc khóa bảo mật"
   },
+  "readingPasskeyLoading": {
+    "message": "Đang đọc mã khoá..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Xác thực mã khóa thất bại"
+  },
+  "useADifferentLogInMethod": {
+    "message": "Dùng phương thức đăng nhập khác"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "Đang chờ tương tác với khóa bảo mật..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Bạn phải thêm URL máy chủ cơ sở hoặc ít nhất một môi trường tùy chỉnh."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL phải sử dụng HTTPS."
+  },
   "customEnvironment": {
     "message": "Môi trường tùy chỉnh"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "Tắt tự động điền"
   },
+  "confirmAutofill": {
+    "message": "Xác nhận tự động điền"
+  },
+  "confirmAutofillDesc": {
+    "message": "Trang web này không khớp với đăng nhập đã lưu của bạn. Trước khi bạn điền thông tin đăng nhập, hãy đảm bảo đây là trang web đáng tin cậy."
+  },
   "showInlineMenuLabel": {
     "message": "Hiển thị các gợi ý tự động điền trên các trường biểu mẫu"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Bitwarden bảo vệ dữ liệu của bạn khỏi lừa đảo như thế nào?"
+  },
+  "currentWebsite": {
+    "message": "Trang web hiện tại"
+  },
+  "autofillAndAddWebsite": {
+    "message": "Tự động điền và thêm trang web này"
+  },
+  "autofillWithoutAdding": {
+    "message": "Tự động điền mà không thêm"
+  },
+  "doNotAutofill": {
+    "message": "Không tự động điền"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "Hiển thị danh tính dưới dạng gợi ý"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "Năm hết hạn"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "Hết hạn"
   },
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "This page is interfering with the Bitwarden experience. The Bitwarden inline menu has been temporarily disabled as a safety measure."
+  },
   "setMasterPassword": {
     "message": "Đặt mật khẩu chính"
   },
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Chỉ kho lưu trữ tổ chức liên kết với $ORGANIZATION$ sẽ được xuất.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Chỉ kho lưu trữ tổ chức liên kết với $ORGANIZATION$ được xuất. Bộ sưu tập mục của tôi sẽ không được bao gồm.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "Lỗi"
   },
   "decryptionError": {
     "message": "Lỗi giải mã"
   },
+  "errorGettingAutoFillData": {
+    "message": "Lỗi khi lấy dữ liệu tự động điền"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden không thể giải mã các mục trong kho lưu trữ được liệt kê bên dưới."
   },
@@ -3970,6 +4071,15 @@
     "message": "Tự động điền khi tải trang được đặt thành mặc định trong cài đặt.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "Không thể tự động điền"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "Phép so khớp mặc định được đặt thành \"Khớp chính xác\". Trang web hiện tại không khớp chính xác với đăng nhập đã lưu cho mục này."
+  },
+  "okay": {
+    "message": "Đồng ý"
+  },
   "toggleSideNavigation": {
     "message": "Ẩn/hiện thanh điều hướng bên"
   },
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "Cao cấp"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "Các tổ chức miễn phí không thể sử dụng tệp đính kèm"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "Default ( $VALUE$ )",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "Hiện phát hiện trùng khớp $WEBSITE$",
     "placeholders": {
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "Chào mừng đến với kho lưu trữ của bạn!"
   },
-  "phishingPageTitle": {
-    "message": "Trang web lừa đảo"
+  "phishingPageTitleV2": {
+    "message": "Đã phát hiện nỗ lực lừa đảo"
   },
-  "phishingPageCloseTab": {
-    "message": "Đóng tab"
+  "phishingPageSummary": {
+    "message": "Trang web bạn đang cố gắng truy cập là một trang độc hại đã được báo cáo và có nguy cơ bảo mật."
   },
-  "phishingPageContinue": {
-    "message": "Tiếp tục"
+  "phishingPageCloseTabV2": {
+    "message": "Đóng thẻ này"
   },
-  "phishingPageLearnWhy": {
-    "message": "Tại sao bạn thấy điều này?"
+  "phishingPageContinueV2": {
+    "message": "Tiếp tục truy cập trang web này (không khuyến khích)"
+  },
+  "phishingPageExplanation1": {
+    "message": "Trang web này được tìm thấy trong ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": ", một danh sách nguồn mở các trang lừa đảo đã biết được sử dụng để đánh cắp thông tin cá nhân và nhạy cảm.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "Tìm hiểu thêm về phát hiện lừa đảo"
+  },
+  "protectedBy": {
+    "message": "Được bảo vệ bởi $PRODUCT$",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Tự động điền các mục cho trang hiện tại"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "Xác nhận tên miền Key Connector"
+  },
+  "atRiskLoginsSecured": {
+    "message": "Thật tuyệt khi bảo vệ các đăng nhập có nguy cơ của bạn!"
+  },
+  "upgradeNow": {
+    "message": "Nâng cấp ngay"
+  },
+  "builtInAuthenticator": {
+    "message": "Trình xác thực tích hợp"
+  },
+  "secureFileStorage": {
+    "message": "Lưu trữ tệp an toàn"
+  },
+  "emergencyAccess": {
+    "message": "Truy cập khẩn cấp"
+  },
+  "breachMonitoring": {
+    "message": "Giám sát vi phạm"
+  },
+  "andMoreFeatures": {
+    "message": "Và nhiều hơn nữa!"
+  },
+  "planDescPremium": {
+    "message": "Bảo mật trực tuyến toàn diện"
+  },
+  "upgradeToPremium": {
+    "message": "Nâng cấp lên gói Cao cấp"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "Explore Premium"
+  },
+  "loadingVault": {
+    "message": "Loading vault"
+  },
+  "vaultLoaded": {
+    "message": "Vault loaded"
+  },
+  "settingDisabledByPolicy": {
+    "message": "Cài đặt này bị vô hiệu hóa bởi chính sách tổ chức của bạn.",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Mã ZIP / Bưu điện"
+  },
+  "cardNumberLabel": {
+    "message": "Số thẻ"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
   }
 }
diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json
index eb3cf1aa901..92bcb8cb90f 100644
--- a/apps/browser/src/_locales/zh_CN/messages.json
+++ b/apps/browser/src/_locales/zh_CN/messages.json
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "使用单点登录"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "您的组织要求单点登录。"
+  },
   "welcomeBack": {
     "message": "欢迎回来"
   },
@@ -306,7 +309,7 @@
     "message": "前往浏览器扩展商店吗？"
   },
   "continueToBrowserExtensionStoreDesc": {
-    "message": "帮助别人了解 Bitwarden 是否适合他们。立即访问浏览器的扩展程序商店并留下评分。"
+    "message": "帮助别人了解 Bitwarden 是否适合他们。立即访问浏览器扩展商店并留下评分。"
   },
   "changeMasterPasswordOnWebConfirmation": {
     "message": "您可以在 Bitwarden 网页 App 上更改您的主密码。"
@@ -359,10 +362,10 @@
     "message": "使用 Passwordless.dev 摆脱传统密码束缚，打造流畅且安全的登录体验。访问 bitwarden.com 网站了解更多信息。"
   },
   "freeBitwardenFamilies": {
-    "message": "免费 Bitwarden 家庭"
+    "message": "免费的 Bitwarden 家庭版"
   },
   "freeBitwardenFamiliesPageDesc": {
-    "message": "您有资格获得免费的 Bitwarden 家庭。立即在网页 App 中兑换此优惠。"
+    "message": "您有资格获得免费的 Bitwarden 家庭版。立即在网页 App 中兑换此优惠。"
   },
   "version": {
     "message": "版本"
@@ -407,7 +410,7 @@
     "message": "创建文件夹以整理您的密码库项目"
   },
   "deleteFolderPermanently": {
-    "message": "您确定要永久删除这个文件夹吗？"
+    "message": "确定要永久删除此文件夹吗？"
   },
   "deleteFolder": {
     "message": "删除文件夹"
@@ -550,10 +553,15 @@
   "resetSearch": {
     "message": "重置搜索"
   },
-  "archive": {
-    "message": "归档"
+  "archiveNoun": {
+    "message": "归档",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "归档",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "取消归档"
   },
   "itemsInArchive": {
@@ -565,10 +573,10 @@
   "noItemsInArchiveDesc": {
     "message": "已归档的项目将显示在此处，并将被排除在一般搜索结果和自动填充建议之外。"
   },
-  "itemSentToArchive": {
-    "message": "项目已归档"
+  "itemWasSentToArchive": {
+    "message": "项目已发送到归档"
   },
-  "itemRemovedFromArchive": {
+  "itemUnarchived": {
     "message": "项目已取消归档"
   },
   "archiveItem": {
@@ -577,12 +585,24 @@
   "archiveItemConfirmDesc": {
     "message": "已归档的项目将被排除在一般搜索结果和自动填充建议之外。确定要归档此项目吗？"
   },
+  "upgradeToUseArchive": {
+    "message": "需要高级会员才能使用归档。"
+  },
   "edit": {
     "message": "编辑"
   },
   "view": {
     "message": "查看"
   },
+  "viewAll": {
+    "message": "查看全部"
+  },
+  "showAll": {
+    "message": "显示全部"
+  },
+  "viewLess": {
+    "message": "查看更少"
+  },
   "viewLogin": {
     "message": "查看登录"
   },
@@ -677,7 +697,7 @@
     "message": "会话超时"
   },
   "vaultTimeoutHeader": {
-    "message": "密码库超时时间"
+    "message": "密码库超时"
   },
   "otherOptions": {
     "message": "其他选项"
@@ -728,11 +748,20 @@
   "invalidMasterPassword": {
     "message": "无效的主密码"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "无效的主密码。请确认您的电子邮箱正确无误，以及您的账户是在 $HOST$ 上创建的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
-    "message": "密码库超时时间"
+    "message": "密码库超时"
   },
   "vaultTimeout1": {
-    "message": "超时"
+    "message": "超时时间"
   },
   "lockNow": {
     "message": "立即锁定"
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "系统锁定时"
   },
+  "onIdle": {
+    "message": "系统空闲时"
+  },
+  "onSleep": {
+    "message": "系统睡眠时"
+  },
   "onRestart": {
     "message": "浏览器重启时"
   },
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "项目已保存"
   },
+  "savedWebsite": {
+    "message": "保存的网站"
+  },
+  "savedWebsites": {
+    "message": "保存的网站 ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "您确定要将其发送到回收站吗？"
   },
@@ -1134,7 +1181,7 @@
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "选择 $ITEMTYPE$，$ITEMNAME$",
+    "message": "选择 $ITEMNAME$ 中的 $ITEMTYPE$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1207,7 +1254,7 @@
     "description": "Detailed error message shown when saving login details fails."
   },
   "changePasswordWarning": {
-    "message": "更改密码后，您需要使用新密码登录。 在其他设备上的活动会话将在一小时内注销。"
+    "message": "更改密码后，您需要使用新密码登录。在其他设备上的活动会话将在一小时内注销。"
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
     "message": "更改您的主密码以完成账户恢复。"
@@ -1444,7 +1491,7 @@
     "message": "优先客户支持。"
   },
   "ppremiumSignUpFuture": {
-    "message": "未来的更多高级功能。敬请期待！"
+    "message": "未来的更多高级版功能。敬请期待！"
   },
   "premiumPurchase": {
     "message": "购买高级版"
@@ -1491,17 +1538,11 @@
   "enableAutoBiometricsPrompt": {
     "message": "启动时提示生物识别"
   },
-  "premiumRequired": {
-    "message": "需要高级会员"
-  },
-  "premiumRequiredDesc": {
-    "message": "使用此功能需要高级会员资格。"
-  },
   "authenticationTimeout": {
     "message": "身份验证超时"
   },
   "authenticationSessionTimedOut": {
-    "message": "身份验证会话超时。请重新启动登录过程。"
+    "message": "身份验证会话超时。请重新开始登录过程。"
   },
   "verificationCodeEmailSent": {
     "message": "验证邮件已发送到 $EMAIL$。",
@@ -1534,6 +1575,15 @@
   "readSecurityKey": {
     "message": "读取安全密钥"
   },
+  "readingPasskeyLoading": {
+    "message": "正在读取通行密钥..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "通行密钥验证失败"
+  },
+  "useADifferentLogInMethod": {
+    "message": "使用其他登录方式"
+  },
   "awaitingSecurityKeyInteraction": {
     "message": "等待安全密钥交互..."
   },
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "您必须添加基础服务器 URL 或至少添加一个自定义环境。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL 必须使用 HTTPS。"
+  },
   "customEnvironment": {
     "message": "自定义环境"
   },
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "停用自动填充"
   },
+  "confirmAutofill": {
+    "message": "确认自动填充"
+  },
+  "confirmAutofillDesc": {
+    "message": "此网站与您保存的登录信息不匹配。在填写您的登录凭据之前，请确保它是一个可信的网站。"
+  },
   "showInlineMenuLabel": {
     "message": "在表单字段中显示自动填充建议"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Bitwarden 如何保护您的数据免遭网络钓鱼？"
+  },
+  "currentWebsite": {
+    "message": "当前网站"
+  },
+  "autofillAndAddWebsite": {
+    "message": "自动填充并添加此网站"
+  },
+  "autofillWithoutAdding": {
+    "message": "自动填充但不添加"
+  },
+  "doNotAutofill": {
+    "message": "不自动填充"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "将身份显示为建议"
   },
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "过期年份"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "有效期"
   },
@@ -1917,7 +1994,7 @@
     "message": "州 / 省"
   },
   "zipPostalCode": {
-    "message": "邮政编码"
+    "message": "ZIP / 邮政编码"
   },
   "country": {
     "message": "国家"
@@ -2035,7 +2112,7 @@
     "message": "若继续，所有条目将从生成器历史记录中永久删除。确定要继续吗？"
   },
   "back": {
-    "message": "后退"
+    "message": "返回"
   },
   "collections": {
     "message": "集合"
@@ -2333,7 +2410,7 @@
     "message": "已经有账户了吗？"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "超时后注销账户将解除对密码库的所有访问权限，并需要进行在线身份验证。确定使用此设置吗？"
+    "message": "超时后注销账户将解除对密码库的所有访问权限，并需要进行在线身份验证。确定要使用此设置吗？"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
     "message": "超时动作确认"
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "此页面正在干扰 Bitwarden 的使用体验。出于安全考虑，Bitwarden 内嵌菜单已被暂时禁用。"
+  },
   "setMasterPassword": {
     "message": "设置主密码"
   },
@@ -2835,7 +2915,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "您确定要永久删除这个 Send 吗？",
+    "message": "确定要永久删除这个 Send 吗？",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -2931,7 +3011,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogText": {
-    "message": "弹出扩展？",
+    "message": "弹出扩展吗？",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogDesc": {
@@ -3051,7 +3131,7 @@
     "message": "企业策略要求已应用到您的超时选项中"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "您的组织策略已将您最大允许的密码库超时时间设置为 $HOURS$ 小时 $MINUTES$ 分钟。",
+    "message": "您的组织策略已将您最大允许的密码库超时设置为 $HOURS$ 小时 $MINUTES$ 分钟。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -3077,7 +3157,7 @@
     }
   },
   "vaultTimeoutPolicyMaximumError": {
-    "message": "超时时间超出了您组织设置的限制：最多 $HOURS$ 小时 $MINUTES$ 分钟",
+    "message": "超时超出了您组织设置的限制：最多 $HOURS$ 小时 $MINUTES$ 分钟",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -3090,7 +3170,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "您的组织策略正在影响您的密码库超时时间。最大允许的密码库超时时间是 $HOURS$ 小时 $MINUTES$ 分钟。您的密码库超时动作被设置为 $ACTION$。",
+    "message": "您的组织策略正在影响您的密码库超时。最大允许的密码库超时为 $HOURS$ 小时 $MINUTES$ 分钟。您的密码库超时动作被设置为 $ACTION$。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -3107,7 +3187,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "您的组织策略已将您的密码库超时动作设置为 $ACTION$。",
+    "message": "您的组织策略已将您的密码库超时动作设置为「$ACTION$」。",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -3116,7 +3196,7 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "您的密码库超时时间超出了组织设置的限制。"
+    "message": "您的密码库超时超出了您组织设置的限制。"
   },
   "vaultExportDisabled": {
     "message": "密码库导出已禁用"
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库。不包括「我的项目」集合。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "错误"
   },
   "decryptionError": {
     "message": "解密错误"
   },
+  "errorGettingAutoFillData": {
+    "message": "获取自动填充数据时出错"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden 无法解密下列密码库项目。"
   },
@@ -3646,7 +3747,7 @@
     "message": "当前会话"
   },
   "mobile": {
-    "message": "移动",
+    "message": "移动端",
     "description": "Mobile app"
   },
   "extension": {
@@ -3970,6 +4071,15 @@
     "message": "页面加载时自动填充设置为使用默认设置。",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "无法自动填充"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "默认匹配被设置为「精确匹配」。当前网站与此项目保存的登录信息不完全匹配。"
+  },
+  "okay": {
+    "message": "确定"
+  },
   "toggleSideNavigation": {
     "message": "切换侧边导航"
   },
@@ -4622,7 +4732,7 @@
     }
   },
   "copyFieldCipherName": {
-    "message": "复制 $CIPHERNAME$ 的 $FIELD$",
+    "message": "复制 $CIPHERNAME$ 中的 $FIELD$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -4796,10 +4906,13 @@
     "message": "从 App Store 下载"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "您确定要永久删除此附件吗？"
+    "message": "确定要永久删除此附件吗？"
   },
   "premium": {
-    "message": "高级会员"
+    "message": "高级版"
+  },
+  "unlockFeaturesWithPremium": {
+    "message": "使用高级版解锁报告、紧急访问以及更多安全功能。"
   },
   "freeOrgsCannotUseAttachments": {
     "message": "免费组织无法使用附件"
@@ -4876,7 +4989,17 @@
     "message": "删除网站"
   },
   "defaultLabel": {
-    "message": "默认 ($VALUE$)",
+    "message": "默认（$VALUE$）",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
+  "defaultLabelWithValue": {
+    "message": "默认（$VALUE$）",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -5197,7 +5320,7 @@
     "message": "重试"
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "自定义超时时间最小为 1 分钟。"
+    "message": "自定义超时最少为 1 分钟。"
   },
   "fileSavedToDevice": {
     "message": "文件已保存到设备。可以在设备下载中进行管理。"
@@ -5500,7 +5623,7 @@
     "message": "欢迎使用 Bitwarden"
   },
   "securityPrioritized": {
-    "message": "安全优先"
+    "message": "以安全为首要"
   },
   "securityPrioritizedBody": {
     "message": "将登录、支付卡和身份保存到您的安全密码库。Bitwarden 使用零知识、端到端的加密来保护您的重要信息。"
@@ -5538,17 +5661,37 @@
   "hasItemsVaultNudgeTitle": {
     "message": "欢迎来到您的密码库！"
   },
-  "phishingPageTitle": {
-    "message": "钓鱼网站"
+  "phishingPageTitleV2": {
+    "message": "检测到钓鱼尝试"
   },
-  "phishingPageCloseTab": {
-    "message": "关闭标签页"
+  "phishingPageSummary": {
+    "message": "您尝试访问的网站是一个已知的恶意网站，存在安全风险。"
   },
-  "phishingPageContinue": {
-    "message": "继续"
+  "phishingPageCloseTabV2": {
+    "message": "关闭此标签页"
   },
-  "phishingPageLearnWhy": {
-    "message": "为什么您会看到这个？"
+  "phishingPageContinueV2": {
+    "message": "继续访问此网站（不推荐）"
+  },
+  "phishingPageExplanation1": {
+    "message": "该网站被发现于 ",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": "，一个已知的用于窃取个人和敏感信息的钓鱼网站的开源列表。",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "进一步了解钓鱼检测"
+  },
+  "protectedBy": {
+    "message": "受 $PRODUCT$ 保护",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "为当前页面自动填充项目"
@@ -5653,5 +5796,60 @@
   },
   "confirmKeyConnectorDomain": {
     "message": "确认 Key Connector 域名"
+  },
+  "atRiskLoginsSecured": {
+    "message": "很好地保护了存在风险的登录！"
+  },
+  "upgradeNow": {
+    "message": "立即升级"
+  },
+  "builtInAuthenticator": {
+    "message": "内置身份验证器"
+  },
+  "secureFileStorage": {
+    "message": "安全文件存储"
+  },
+  "emergencyAccess": {
+    "message": "紧急访问"
+  },
+  "breachMonitoring": {
+    "message": "数据泄露监测"
+  },
+  "andMoreFeatures": {
+    "message": "以及更多！"
+  },
+  "planDescPremium": {
+    "message": "全面的在线安全防护"
+  },
+  "upgradeToPremium": {
+    "message": "升级为高级版"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "解锁高级安全功能"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "高级版订阅为您提供更多工具，助您保持安全并掌控一切"
+  },
+  "explorePremium": {
+    "message": "探索高级版"
+  },
+  "loadingVault": {
+    "message": "正在加载密码库"
+  },
+  "vaultLoaded": {
+    "message": "密码库已加载"
+  },
+  "settingDisabledByPolicy": {
+    "message": "此设置被您组织的策略禁用了。",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / 邮政编码"
+  },
+  "cardNumberLabel": {
+    "message": "卡号"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "超时动作"
   }
 }
diff --git a/apps/browser/src/_locales/zh_TW/messages.json b/apps/browser/src/_locales/zh_TW/messages.json
index f5801fb2c7d..38fb50d6c8b 100644
--- a/apps/browser/src/_locales/zh_TW/messages.json
+++ b/apps/browser/src/_locales/zh_TW/messages.json
@@ -6,7 +6,7 @@
     "message": "Bitwarden logo"
   },
   "extName": {
-    "message": "Bitwarden - 免費密碼管理工具",
+    "message": "Bitwarden 密碼管理器",
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
@@ -31,6 +31,9 @@
   "useSingleSignOn": {
     "message": "使用單一登入"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "您的組織需要單一登入。"
+  },
   "welcomeBack": {
     "message": "歡迎回來"
   },
@@ -84,7 +87,7 @@
     "message": "主密碼提示（選用）"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "密碼強度分數 $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -255,7 +258,7 @@
     "message": "新增項目"
   },
   "accountEmail": {
-    "message": "帳戶電子郵件"
+    "message": "帳號電子郵件"
   },
   "requestHint": {
     "message": "請求提示"
@@ -294,7 +297,7 @@
     "message": "接下來造訪網頁 App 嗎？"
   },
   "continueToWebAppDesc": {
-    "message": "在 Web 應用程式上探索 Bitwarden 帳戶的更多功能。"
+    "message": "在 Web 應用程式上探索 Bitwarden 帳號的更多功能。"
   },
   "continueToHelpCenter": {
     "message": "接下來前往說明中心嗎？"
@@ -383,7 +386,7 @@
     "message": "編輯資料夾"
   },
   "editFolderWithName": {
-    "message": "Edit folder: $FOLDERNAME$",
+    "message": "編輯資料夾：$FOLDERNAME$",
     "placeholders": {
       "foldername": {
         "content": "$1",
@@ -468,7 +471,7 @@
     "message": "已產生密碼"
   },
   "passphraseGenerated": {
-    "message": "Passphrase generated"
+    "message": "已產生密碼"
   },
   "usernameGenerated": {
     "message": "已產生使用者名稱"
@@ -550,32 +553,40 @@
   "resetSearch": {
     "message": "重設搜尋"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "封存",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "封存",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "取消封存"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "封存中的項目"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "封存中沒有項目"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "封存的項目會顯示在此處，且不會出現在一般搜尋結果或自動填入建議中。"
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "項目已移至封存"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "項目取消封存"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "封存項目"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "封存的項目將不會出現在一般搜尋結果或自動填入建議中。確定要封存此項目嗎？"
+  },
+  "upgradeToUseArchive": {
+    "message": "A premium membership is required to use Archive."
   },
   "edit": {
     "message": "編輯"
@@ -583,8 +594,17 @@
   "view": {
     "message": "檢視"
   },
+  "viewAll": {
+    "message": "檢視全部"
+  },
+  "showAll": {
+    "message": "Show all"
+  },
+  "viewLess": {
+    "message": "顯示較少"
+  },
   "viewLogin": {
-    "message": "View login"
+    "message": "檢視登入"
   },
   "noItemsInList": {
     "message": "沒有可列出的項目。"
@@ -728,6 +748,15 @@
   "invalidMasterPassword": {
     "message": "無效的主密碼"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "主密碼無效。請確認你的電子郵件正確，且帳號是於 $HOST$ 建立的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "vaultTimeout": {
     "message": "密碼庫逾時時間"
   },
@@ -776,6 +805,12 @@
   "onLocked": {
     "message": "於系統鎖定時"
   },
+  "onIdle": {
+    "message": "系統閒置時"
+  },
+  "onSleep": {
+    "message": "系統睡眠時"
+  },
   "onRestart": {
     "message": "於瀏覽器重新啟動時"
   },
@@ -908,19 +943,19 @@
     "message": "輸入傳送到您電子郵件信箱的驗證碼"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "請輸入您驗證器應用程式中的代碼"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "請輕觸您的 YubiKey 以進行驗證"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "您的帳號需要使用 Duo 兩步驟登入。請依照以下步驟完成登入。"
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "請依照以下步驟完成登入"
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "請依照以下步驟使用你的安全金鑰完成登入。"
   },
   "restartRegistration": {
     "message": "重新啟動註冊"
@@ -1014,6 +1049,18 @@
   "editedItem": {
     "message": "項目已儲存"
   },
+  "savedWebsite": {
+    "message": "已儲存的網站"
+  },
+  "savedWebsites": {
+    "message": "已儲存的網站（$COUNT$）",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "deleteItemConfirmation": {
     "message": "確定要刪除此項目嗎？"
   },
@@ -1096,7 +1143,7 @@
     "message": "儲存"
   },
   "notificationViewAria": {
-    "message": "View $ITEMNAME$, opens in new window",
+    "message": "檢視 $ITEMNAME$（於新視窗中開啟）",
     "placeholders": {
       "itemName": {
         "content": "$1"
@@ -1105,18 +1152,18 @@
     "description": "Aria label for the view button in notification bar confirmation message"
   },
   "notificationNewItemAria": {
-    "message": "New Item, opens in new window",
+    "message": "新增項目（於新視窗中開啟）",
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
-    "message": "Edit before saving",
+    "message": "儲存前先編輯",
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
     "message": "新通知"
   },
   "labelWithNotification": {
-    "message": "$LABEL$: New notification",
+    "message": "$LABEL$：新通知",
     "description": "Label for the notification with a new login suggestion.",
     "placeholders": {
       "label": {
@@ -1134,7 +1181,7 @@
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "選擇 $ITEMTYPE$，$ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1146,7 +1193,7 @@
     }
   },
   "saveAsNewLoginAction": {
-    "message": "Save as new login",
+    "message": "儲存為新的登入資訊",
     "description": "Button text for saving login details as a new entry."
   },
   "updateLoginAction": {
@@ -1154,7 +1201,7 @@
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "解鎖以儲存此登入資訊",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
@@ -1162,19 +1209,19 @@
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "更新現有的登入資訊",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
-    "message": "Login saved",
+    "message": "登入資訊已儲存",
     "description": "Message displayed when login details are successfully saved."
   },
   "loginUpdateSuccess": {
-    "message": "Login updated",
+    "message": "登入資訊已更新",
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Great job! You took the steps to make you and $ORGANIZATION$ more secure.",
+    "message": "做得好！你已採取行動，讓你與 $ORGANIZATION$ 更加安全。",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1183,7 +1230,7 @@
     "description": "Shown to user after login is updated."
   },
   "loginUpdateTaskSuccessAdditional": {
-    "message": "Thank you for making $ORGANIZATION$ more secure. You have $TASK_COUNT$ more passwords to update.",
+    "message": "感謝你讓 $ORGANIZATION$ 更加安全。你還有 $TASK_COUNT$ 個密碼需要更新。",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1195,22 +1242,22 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "變更下一個密碼",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
-    "message": "Error saving",
+    "message": "儲存時發生錯誤",
     "description": "Error message shown when the system fails to save login details."
   },
   "saveFailureDetails": {
-    "message": "Oh no! We couldn't save this. Try entering the details manually.",
+    "message": "糟了！我們無法儲存此項目。請嘗試手動輸入詳細資料。",
     "description": "Detailed error message shown when saving login details fails."
   },
   "changePasswordWarning": {
-    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+    "message": "變更密碼後，你需要使用新密碼重新登入。其他裝置上的工作階段會在一小時內登出。"
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
-    "message": "Change your master password to complete account recovery."
+    "message": "變更你的主密碼以完成帳號復原。"
   },
   "enableChangedPasswordNotification": {
     "message": "詢問更新現有的登入資料"
@@ -1405,7 +1452,7 @@
     "message": "功能不可用"
   },
   "legacyEncryptionUnsupported": {
-    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+    "message": "不再支援舊版加密。請聯繫支援團隊以恢復您的帳號。"
   },
   "premiumMembership": {
     "message": "進階會員"
@@ -1491,12 +1538,6 @@
   "enableAutoBiometricsPrompt": {
     "message": "啟動時要求生物特徵辨識"
   },
-  "premiumRequired": {
-    "message": "需要進階會員資格"
-  },
-  "premiumRequiredDesc": {
-    "message": "進階會員才可使用此功能。"
-  },
   "authenticationTimeout": {
     "message": "驗證逾時"
   },
@@ -1513,7 +1554,7 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "30 天內不要再於這部裝置上詢問"
   },
   "selectAnotherMethod": {
     "message": "選擇其他方式",
@@ -1534,8 +1575,17 @@
   "readSecurityKey": {
     "message": "讀取安全金鑰"
   },
+  "readingPasskeyLoading": {
+    "message": "正在讀取通行金鑰..."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "通行金鑰驗證失敗"
+  },
+  "useADifferentLogInMethod": {
+    "message": "使用其他登入方式"
+  },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "等待安全金鑰操作中……"
   },
   "loginUnavailable": {
     "message": "登入無法使用"
@@ -1600,6 +1650,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "您必須新增伺服器網域 URL 或至少一個自訂環境。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL 必須使用 HTTPS。"
+  },
   "customEnvironment": {
     "message": "自訂環境"
   },
@@ -1636,13 +1689,13 @@
     "message": "自動填入建議"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "輕鬆找到自動填入建議"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "請關閉瀏覽器的自動填入設定，以免與 Bitwarden 發生衝突。"
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "關閉 $BROWSER$ 自動填入",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1653,9 +1706,30 @@
   "turnOffAutofill": {
     "message": "停用自動填入"
   },
+  "confirmAutofill": {
+    "message": "確認自動填入"
+  },
+  "confirmAutofillDesc": {
+    "message": "此網站與您儲存的登入資料不相符。在填入登入憑證前，請確認這是受信任的網站。"
+  },
   "showInlineMenuLabel": {
     "message": "在表單欄位上顯示自動填入選單"
   },
+  "howDoesBitwardenProtectFromPhishing": {
+    "message": "Bitwarden 如何保護您的資料免於網路釣魚攻擊？"
+  },
+  "currentWebsite": {
+    "message": "目網站"
+  },
+  "autofillAndAddWebsite": {
+    "message": "自動填充並新增此網站"
+  },
+  "autofillWithoutAdding": {
+    "message": "自動填入但不新增"
+  },
+  "doNotAutofill": {
+    "message": "不要自動填入"
+  },
   "showInlineMenuIdentitiesLabel": {
     "message": "顯示身分建議"
   },
@@ -1782,7 +1856,7 @@
     "message": "如果您點選彈出式視窗外的任意區域，將導致彈出式視窗關閉。您想在新視窗中開啟此彈出式視窗，以讓它不關閉嗎？"
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "顯示網站圖示並取得變更密碼網址"
   },
   "cardholderName": {
     "message": "持卡人姓名"
@@ -1799,6 +1873,9 @@
   "expirationYear": {
     "message": "逾期年份"
   },
+  "monthly": {
+    "message": "month"
+  },
   "expiration": {
     "message": "逾期"
   },
@@ -1842,7 +1919,7 @@
     "message": "安全代碼"
   },
   "cardNumber": {
-    "message": "card number"
+    "message": "信用卡號碼"
   },
   "ex": {
     "message": "例如"
@@ -1944,82 +2021,82 @@
     "message": "SSH 金鑰"
   },
   "typeNote": {
-    "message": "Note"
+    "message": "備註"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "新增登入資訊",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "新增支付卡",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "新增身分",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "新增備註",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "新增 SSH 金鑰",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "新增文字 Send",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "新增檔案 Send",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "編輯登入資訊",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "編輯支付卡",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "編輯身分",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "編輯備註",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "編輯 SSH 金鑰",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "編輯文字 Send",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "編輯檔案 Send",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "檢視登入資訊",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "檢視支付卡",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "檢視身分",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "檢視備註",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "檢視 SSH 金鑰",
     "description": "Header for view SSH key item type"
   },
   "passwordHistory": {
@@ -2227,7 +2304,7 @@
     "message": "設定您用來解鎖 Bitwarden 的 PIN 碼。您的 PIN 設定將在您完全登出本應用程式時被重設。"
   },
   "setPinCode": {
-    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
+    "message": "你可以使用此 PIN 來解鎖 Bitwarden。若你完全登出應用程式，PIN 將會被重設。"
   },
   "pinRequired": {
     "message": "必須填入 PIN 碼。"
@@ -2278,7 +2355,7 @@
     "message": "使用此密碼"
   },
   "useThisPassphrase": {
-    "message": "Use this passphrase"
+    "message": "使用此密碼"
   },
   "useThisUsername": {
     "message": "使用此使用者名稱"
@@ -2368,6 +2445,9 @@
       }
     }
   },
+  "topLayerHijackWarning": {
+    "message": "此頁面正在干擾 Bitwarden 的使用體驗。為了安全起見，已暫時停用 Bitwarden 的內嵌選單。"
+  },
   "setMasterPassword": {
     "message": "設定主密碼"
   },
@@ -2450,7 +2530,7 @@
     "message": "隱私權政策"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "你的新密碼不能與目前的密碼相同。"
   },
   "hintEqualsPassword": {
     "message": "密碼提示不能與您的密碼相同。"
@@ -2558,10 +2638,10 @@
     "message": "某個組織原則已禁止您將項目匯入至您的個人密碼庫。"
   },
   "restrictCardTypeImport": {
-    "message": "Cannot import card item types"
+    "message": "無法匯入卡片項目類別"
   },
   "restrictCardTypeImportDesc": {
-    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+    "message": "由於一或多個組織設有政策，您無法匯入支付卡至您的密碼庫。"
   },
   "domainsTitle": {
     "message": "網域",
@@ -2571,7 +2651,7 @@
     "message": "已封鎖的網域"
   },
   "learnMoreAboutBlockedDomains": {
-    "message": "Learn more about blocked domains"
+    "message": "瞭解更多關於被封鎖網域的資訊"
   },
   "excludedDomains": {
     "message": "排除網域"
@@ -2595,11 +2675,11 @@
     "message": "變更"
   },
   "changePassword": {
-    "message": "Change password",
+    "message": "變更密碼",
     "description": "Change password button for browser at risk notification on login."
   },
   "changeButtonTitle": {
-    "message": "Change password - $ITEMNAME$",
+    "message": "變更密碼 - $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -2608,13 +2688,13 @@
     }
   },
   "atRiskPassword": {
-    "message": "At-risk password"
+    "message": "具有風險的密碼"
   },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "具有風險的密碼"
   },
   "atRiskPasswordDescSingleOrg": {
-    "message": "$ORGANIZATION$ is requesting you change one password because it is at-risk.",
+    "message": "$ORGANIZATION$ 要求你變更一組有風險的密碼。",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2623,7 +2703,7 @@
     }
   },
   "atRiskPasswordsDescSingleOrgPlural": {
-    "message": "$ORGANIZATION$ is requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "$ORGANIZATION$ 要求你變更 $COUNT$ 組有風險的密碼。",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2636,7 +2716,7 @@
     }
   },
   "atRiskPasswordsDescMultiOrgPlural": {
-    "message": "Your organizations are requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "你的組織要求你變更 $COUNT$ 組有風險的密碼。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2645,7 +2725,7 @@
     }
   },
   "atRiskChangePrompt": {
-    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "message": "你在此網站的密碼存在風險，$ORGANIZATION$ 已要求你變更該密碼。",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2655,7 +2735,7 @@
     "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
   },
   "atRiskNavigatePrompt": {
-    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "message": "$ORGANIZATION$ 要求你變更此密碼，因為它存在風險。請前往帳號設定以變更密碼。",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2665,10 +2745,10 @@
     "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
   },
   "reviewAndChangeAtRiskPassword": {
-    "message": "Review and change one at-risk password"
+    "message": "檢視並變更一組有風險的密碼"
   },
   "reviewAndChangeAtRiskPasswordsPlural": {
-    "message": "Review and change $COUNT$ at-risk passwords",
+    "message": "檢視並變更 $COUNT$ 組有風險的密碼",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2677,49 +2757,49 @@
     }
   },
   "changeAtRiskPasswordsFaster": {
-    "message": "Change at-risk passwords faster"
+    "message": "更快速地變更有風險的密碼"
   },
   "changeAtRiskPasswordsFasterDesc": {
-    "message": "Update your settings so you can quickly autofill your passwords and generate new ones"
+    "message": "更新你的設定，以便能快速自動填入密碼並產生新密碼"
   },
   "reviewAtRiskLogins": {
-    "message": "Review at-risk logins"
+    "message": "檢視有風險的登入資訊"
   },
   "reviewAtRiskPasswords": {
-    "message": "Review at-risk passwords"
+    "message": "檢視有風險的密碼"
   },
   "reviewAtRiskLoginsSlideDesc": {
-    "message": "Your organization passwords are at-risk because they are weak, reused, and/or exposed.",
+    "message": "你的組織密碼存在風險，原因可能是密碼過於簡弱、重複使用或已外洩。",
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
-    "message": "Illustration of a list of logins that are at-risk."
+    "message": "有風險登入清單的示意圖。"
   },
   "generatePasswordSlideDesc": {
-    "message": "Quickly generate a strong, unique password with the Bitwarden autofill menu on the at-risk site.",
+    "message": "在有風險的網站上，透過 Bitwarden 自動填入選單快速產生強且唯一的密碼。",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
-    "message": "Illustration of the Bitwarden autofill menu displaying a generated password."
+    "message": "Bitwarden 自動填入選單顯示產生密碼的示意圖。"
   },
   "updateInBitwarden": {
-    "message": "Update in Bitwarden"
+    "message": "在 Bitwarden 中更新"
   },
   "updateInBitwardenSlideDesc": {
-    "message": "Bitwarden will then prompt you to update the password in the password manager.",
+    "message": "之後 Bitwarden 會提示你在密碼管理器中更新該密碼。",
     "description": "Description of the update in Bitwarden slide on the at-risk password page carousel"
   },
   "updateInBitwardenSlideImgAltPeriod": {
-    "message": "Illustration of a Bitwarden’s notification prompting the user to update the login."
+    "message": "Bitwarden 通知使用者更新登入資訊的示意圖。"
   },
   "turnOnAutofill": {
-    "message": "Turn on autofill"
+    "message": "啟用自動填入"
   },
   "turnedOnAutofill": {
-    "message": "Turned on autofill"
+    "message": "停用自動填入"
   },
   "dismiss": {
-    "message": "Dismiss"
+    "message": "忽略"
   },
   "websiteItemLabel": {
     "message": "網站 $number$ (URI)",
@@ -2784,7 +2864,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCountReached": {
-    "message": "Max access count reached",
+    "message": "已達最大存取次數",
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "hideTextByDefault": {
@@ -2990,7 +3070,7 @@
     "message": "您必須驗證您的電子郵件才能使用此功能。您可以在網頁密碼庫裡驗證您的電子郵件。"
   },
   "masterPasswordSuccessfullySet": {
-    "message": "Master password successfully set"
+    "message": "主密碼設定成功"
   },
   "updatedMasterPassword": {
     "message": "已更新主密碼"
@@ -3131,13 +3211,13 @@
     "message": "找不到唯一識別碼。"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "以下組織的成員已不再需要主密碼。請與你的組織管理員確認下方的網域。"
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "組織名稱"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Key Connector 網域"
   },
   "leaveOrganization": {
     "message": "離開組織"
@@ -3173,7 +3253,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "只會匯出與 $EMAIL$ 關聯的個人密碼庫（包含附件）。組織密碼庫的項目不包含在內。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3193,12 +3273,33 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "只會匯出與 $ORGANIZATION$ 相關的組織密碼庫。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "只會匯出與 $ORGANIZATION$ 相關的組織保險庫，「我的項目」集合將不會包含在內。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "error": {
     "message": "錯誤"
   },
   "decryptionError": {
     "message": "解密發生錯誤"
   },
+  "errorGettingAutoFillData": {
+    "message": "取得自動填入資料時發生錯誤"
+  },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden 無法解密您密碼庫中下面的項目。"
   },
@@ -3342,7 +3443,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ 拒絕了你的請求。請聯絡你的服務提供者以取得協助。",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3352,7 +3453,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ 拒絕了你的請求：$ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3501,7 +3602,7 @@
     "message": "已傳送通知至您的裝置。"
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the"
+    "message": "在你的裝置或其他裝置上解鎖 Bitwarden"
   },
   "notificationSentDeviceAnchor": {
     "message": "網頁應用程式"
@@ -3525,7 +3626,7 @@
     "message": "已傳送請求"
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "登入請求已由 $DEVICE$ 上的 $EMAIL$ 批准",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3538,16 +3639,16 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "您拒絕了來自其他裝置的登入嘗試。如果這是您本人，請嘗試再次使用該裝置登入。"
   },
   "device": {
-    "message": "Device"
+    "message": "裝置"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "登入狀態"
   },
   "masterPasswordChanged": {
-    "message": "Master password saved"
+    "message": "主密碼已儲存"
   },
   "exposedMasterPassword": {
     "message": "已洩露的主密碼"
@@ -3640,28 +3741,28 @@
     "message": "記住此裝置來讓未來的登入體驗更簡易"
   },
   "manageDevices": {
-    "message": "Manage devices"
+    "message": "管理裝置"
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "目前工作階段"
   },
   "mobile": {
-    "message": "Mobile",
+    "message": "行動裝置",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "擴充套件",
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "電腦版應用程式",
     "description": "Desktop app"
   },
   "webVault": {
-    "message": "Web vault"
+    "message": "網頁版密碼庫"
   },
   "webApp": {
-    "message": "Web app"
+    "message": "網路應用程式"
   },
   "cli": {
     "message": "CLI"
@@ -3671,22 +3772,22 @@
     "description": "Software Development Kit"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "等待請求"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "首次登入"
   },
   "trusted": {
-    "message": "Trusted"
+    "message": "已信任"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "需要批准"
   },
   "devices": {
-    "message": "Devices"
+    "message": "裝置"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "來自 $EMAIL$ 的存取嘗試",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3695,31 +3796,31 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "確認訪問"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "拒絕訪問權限"
   },
   "time": {
-    "message": "Time"
+    "message": "時間"
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "裝置類型"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "已要求登入"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "此請求已失效。"
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "Login request has already expired."
+    "message": "登入要求已逾期。"
   },
   "justNow": {
-    "message": "Just now"
+    "message": "剛剛"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "$MINUTES$ 分鐘前已發起要求",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -3749,10 +3850,10 @@
     "message": "要求管理員核准"
   },
   "unableToCompleteLogin": {
-    "message": "Unable to complete login"
+    "message": "無法完成登入"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
-    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+    "message": "你需要在受信任的裝置上登入，或請管理員為你指派密碼。"
   },
   "ssoIdentifierRequired": {
     "message": "需要組織 SSO 識別碼。"
@@ -3816,35 +3917,35 @@
     "message": "裝置已信任"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "目前組織"
   },
   "trust": {
-    "message": "Trust"
+    "message": "信任"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "不信任"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "機構不被信任"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "為了保護你的帳號安全，僅在你已授予此使用者緊急存取權，且其指紋與其帳號中顯示的指紋相符時才確認。"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "為了保護你的帳號安全，僅在你是此組織的成員、已啟用帳號復原功能，且下方顯示的指紋與組織的指紋相符時才繼續。"
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "此組織有企業政策，會將你加入帳號復原功能。加入後，組織管理員可變更你的密碼。僅在你確認此組織身份，且下方顯示的指紋詞句與該組織的指紋相符時才繼續。"
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "信任使用者"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "安全傳送機密的資訊",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "安全的和任何人及任何平臺分享檔案及資料。您的資料會受到端對端加密的保護。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3970,6 +4071,15 @@
     "message": "將頁面載入時使用自動填入功能設定為預設。",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
+  "cannotAutofill": {
+    "message": "無法自動填入"
+  },
+  "cannotAutofillExactMatch": {
+    "message": "預設比對方式為「完全相符」。目前的網站與此項目的已儲存登入資料不完全相符。"
+  },
+  "okay": {
+    "message": "確定"
+  },
   "toggleSideNavigation": {
     "message": "切換側邊欄"
   },
@@ -4179,10 +4289,10 @@
     "message": "選擇一個分類"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "若你希望將匯入檔案的內容移至集合，請選擇此選項"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "若你希望將匯入檔案的內容移至資料夾，請選擇此選項"
   },
   "importUnassignedItemsError": {
     "message": "檔案包含未指派項目。"
@@ -4373,7 +4483,7 @@
     "message": "目前帳戶"
   },
   "bitwardenAccount": {
-    "message": "Bitwarden account"
+    "message": "Bitwarden 帳號"
   },
   "availableAccounts": {
     "message": "可用帳戶"
@@ -4419,23 +4529,23 @@
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "message": "URI 匹配偵測是 Bitwarden 用來識別自動填入建議的方式。",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
-    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "message": "「正則表達式」是進階選項，可能會增加憑證外洩的風險。",
     "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
   },
   "startsWithAdvancedOptionWarning": {
-    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "message": "「開頭為」是進階選項，可能會增加憑證外洩的風險。",
     "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
   },
   "uriMatchWarningDialogLink": {
-    "message": "More about match detection",
+    "message": "深入了解匹配偵測",
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
-    "message": "Advanced options",
+    "message": "進階選項",
     "description": "Advanced option placeholder for uri option component"
   },
   "confirmContinueToBrowserSettingsTitle": {
@@ -4584,7 +4694,7 @@
     }
   },
   "viewItemTitleWithField": {
-    "message": "View item - $ITEMNAME$ - $FIELD$",
+    "message": "檢視項目 - $ITEMNAME$ - $FIELD$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4608,7 +4718,7 @@
     }
   },
   "autofillTitleWithField": {
-    "message": "Autofill - $ITEMNAME$ - $FIELD$",
+    "message": "自動填入 - $ITEMNAME$ - $FIELD$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4622,7 +4732,7 @@
     }
   },
   "copyFieldCipherName": {
-    "message": "Copy $FIELD$, $CIPHERNAME$",
+    "message": "複製 $FIELD$，$CIPHERNAME$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -4775,22 +4885,22 @@
     "message": "在所有裝置中下載 Bitwarden"
   },
   "getTheMobileApp": {
-    "message": "Get the mobile app"
+    "message": "取得手機應用程式"
   },
   "getTheMobileAppDesc": {
-    "message": "Access your passwords on the go with the Bitwarden mobile app."
+    "message": "使用 Bitwarden 行動應用程式，隨時隨地存取你的密碼。"
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "取得桌面應用程式"
   },
   "getTheDesktopAppDesc": {
-    "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
+    "message": "在不使用瀏覽器的情況下存取你的密碼庫，然後設定生物辨識解鎖，以加快在桌面應用程式和瀏覽器擴充功能中的解鎖速度。"
   },
   "downloadFromBitwardenNow": {
     "message": "立即從 bitwarden.com 下載"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "在 Google Play上取得"
   },
   "downloadOnTheAppStore": {
     "message": "從 App Store 下載"
@@ -4801,6 +4911,9 @@
   "premium": {
     "message": "進階版"
   },
+  "unlockFeaturesWithPremium": {
+    "message": "Unlock reporting, emergency access, and more security features with Premium."
+  },
   "freeOrgsCannotUseAttachments": {
     "message": "免費組織無法使用附檔"
   },
@@ -4885,6 +4998,16 @@
       }
     }
   },
+  "defaultLabelWithValue": {
+    "message": "預設 （$VALUE$）",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
   "showMatchDetection": {
     "message": "顯示偵測到的吻合 $WEBSITE$",
     "placeholders": {
@@ -5036,7 +5159,7 @@
     }
   },
   "reorderWebsiteUriButton": {
-    "message": "Reorder website URI. Use arrow key to move item up or down."
+    "message": "重新排序網站 URI。使用方向鍵可將項目上移或下移。"
   },
   "reorderFieldUp": {
     "message": "往上移動 $LABEL$，位置 $LENGTH$ 之 $INDEX$",
@@ -5149,10 +5272,10 @@
     "message": "在擴充套件圖示上顯示自動填入建議的數量"
   },
   "accountAccessRequested": {
-    "message": "Account access requested"
+    "message": "帳號存取請求"
   },
   "confirmAccessAttempt": {
-    "message": "Confirm access attempt for $EMAIL$",
+    "message": "確認 $EMAIL$ 的存取嘗試",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5257,16 +5380,16 @@
     "message": "基於不明原因，生物辨識解鎖無法使用。"
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "幾秒內解鎖你的密碼庫"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "你可以自訂解鎖與逾時設定，以更快速地存取你的密碼庫。"
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "解鎖 PIN 已設定"
   },
   "unlockWithBiometricSet": {
-    "message": "Unlock with biometrics set"
+    "message": "使用生物辨識解鎖"
   },
   "authenticating": {
     "message": "驗證中"
@@ -5280,7 +5403,7 @@
     "description": "Notification message for when a password has been regenerated"
   },
   "saveToBitwarden": {
-    "message": "Save to Bitwarden",
+    "message": "已儲存至 Bitwarden。",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
@@ -5434,37 +5557,37 @@
     "message": "擴充套件寬度"
   },
   "wide": {
-    "message": "寬度"
+    "message": "寬"
   },
   "extraWide": {
-    "message": "更寬"
+    "message": "超寬"
   },
   "sshKeyWrongPassword": {
-    "message": "The password you entered is incorrect."
+    "message": "您輸入的密碼錯誤。"
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "匯入"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "確認密碼"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Enter the password for the SSH key."
+    "message": "輸入 SSH 金鑰的密碼"
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "請輸入密碼"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "SSH 密鑰不正確"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "SSH 密鑰類型不支援"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "從剪貼簿中匯入密鑰"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "SSH 密鑰成功匯入"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "若您只有檢視權限，無法移除集合 $COLLECTIONS$。",
@@ -5482,176 +5605,251 @@
     "message": "為了使用生物辨識解鎖，請更新您的桌面應用程式，或在設定中停用指紋解鎖。"
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "變更有風險的密碼"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "此登入資訊存在風險，且缺少網站。請新增網站並變更密碼以提升安全性。"
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "缺少網站"
   },
   "settingsVaultOptions": {
     "message": "密碼庫選項"
   },
   "emptyVaultDescription": {
-    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+    "message": "除了密碼之外，您也可以儲存安全的登入資訊、身分資訊、信用卡及筆記在您的密碼庫。"
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "歡迎使用 Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Security, prioritized"
+    "message": "安全，第一優先"
   },
   "securityPrioritizedBody": {
-    "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
+    "message": "儲存登入資訊、信用卡和數位身分到您的安全密碼庫。Bitwarden 使用零知識、端對端的加密來保護您的重要資訊。"
   },
   "quickLogin": {
-    "message": "Quick and easy login"
+    "message": "快速方便的登入"
   },
   "quickLoginBody": {
-    "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
+    "message": "設定生物辨識解鎖及自動填入，不需要輸入任何字元就可以登入。"
   },
   "secureUser": {
-    "message": "Level up your logins"
+    "message": "升級您的登入體驗"
   },
   "secureUserBody": {
-    "message": "Use the generator to create and save strong, unique passwords for all your accounts."
+    "message": "使用密碼產生器來建立及儲存高強度、唯一的密碼，來保護您所有的帳號。"
   },
   "secureDevices": {
-    "message": "Your data, when and where you need it"
+    "message": "您的資料，隨時隨地都垂手可得"
   },
   "secureDevicesBody": {
-    "message": "Save unlimited passwords across unlimited devices with Bitwarden mobile, browser, and desktop apps."
+    "message": "使用 Bitwarden 行動應用程式、瀏覽器及桌面應用程式在無限制的裝置來儲存無上限的密碼。"
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 通知"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "匯入現有密碼"
   },
   "emptyVaultNudgeBody": {
-    "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
+    "message": "使用匯入工具可快速將登入資訊轉移到 Bitwarden，而不需手動新增。"
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "立即匯入"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "歡迎來到你的密碼庫！"
   },
-  "phishingPageTitle": {
-    "message": "Phishing website"
+  "phishingPageTitleV2": {
+    "message": "偵測到網路釣魚嘗試"
   },
-  "phishingPageCloseTab": {
-    "message": "Close tab"
+  "phishingPageSummary": {
+    "message": "你正要造訪的網站為已知惡意網站，存在安全風險。"
   },
-  "phishingPageContinue": {
-    "message": "Continue"
+  "phishingPageCloseTabV2": {
+    "message": "關閉此分頁"
   },
-  "phishingPageLearnWhy": {
-    "message": "Why are you seeing this?"
+  "phishingPageContinueV2": {
+    "message": "繼續前往此網站（不建議）"
+  },
+  "phishingPageExplanation1": {
+    "message": "此網站被列於",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name follows this."
+  },
+  "phishingPageExplanation2": {
+    "message": "，這是一份開源的已知網路釣魚網站清單，用於竊取個人與敏感資訊。",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence. A proper name precedes this."
+  },
+  "phishingPageLearnMore": {
+    "message": "進一步了解網路釣魚偵測"
+  },
+  "protectedBy": {
+    "message": "由 $PRODUCT$ 保護",
+    "placeholders": {
+      "product": {
+        "content": "$1",
+        "example": "Bitwarden Phishing Blocker"
+      }
+    }
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "當前頁面的自動填入項目"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "收藏項目，方便快速存取"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "在密碼庫中搜尋其他內容"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "使用自動填入節省時間"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "包含",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "網頁",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "讓此登入顯示為自動填入建議。",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "流暢的線上結帳體驗"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "使用卡片功能，安全且精準地自動填入付款表單。"
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "簡化帳號建立流程 "
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "使用身份資訊，快速自動填入冗長的註冊或聯絡表單。"
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "保護你的敏感資料安全"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "使用備註功能，安全儲存銀行或保險等敏感資料。"
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "開發者友善的 SSH 存取"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "儲存你的金鑰並透過 SSH 代理程式進行快速、加密的驗證。",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "深入了解 SSH 代理程式",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "快速建立密碼"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "點擊即可輕鬆產生強且唯一的密碼。",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "協助你維持登入資訊的安全。",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "點擊「產生密碼」按鈕即可輕鬆建立強且唯一的密碼，協助你確保登入資訊的安全。",
     "description": "Aria label for the body content of the generator nudge"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "關於此設定"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden 會使用已儲存的登入 URI 來判斷應顯示的圖示或變更密碼網址，以改善你的使用體驗。使用此服務時，不會收集或儲存任何資訊。"
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "你沒有檢視此頁面的權限。請嘗試使用其他帳號登入。"
   },
   "wasmNotSupported": {
-    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "message": "你的瀏覽器不支援或未啟用 WebAssembly。使用 Bitwarden 應用程式需要啟用 WebAssembly。",
     "description": "'WebAssembly' is a technical term and should not be translated."
   },
   "showMore": {
-    "message": "Show more"
+    "message": "顯示更多"
   },
   "showLess": {
-    "message": "Show less"
+    "message": "顯示較少"
   },
   "next": {
-    "message": "Next"
+    "message": "下一步"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "更多導覽階層",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "確認 Key Connector 網域"
+  },
+  "atRiskLoginsSecured": {
+    "message": "你已成功保護有風險的登入項目，做得好！"
+  },
+  "upgradeNow": {
+    "message": "立即升級"
+  },
+  "builtInAuthenticator": {
+    "message": "內建驗證器"
+  },
+  "secureFileStorage": {
+    "message": "安全檔案儲存"
+  },
+  "emergencyAccess": {
+    "message": "緊急存取"
+  },
+  "breachMonitoring": {
+    "message": "外洩監控"
+  },
+  "andMoreFeatures": {
+    "message": "以及其他功能功能！"
+  },
+  "planDescPremium": {
+    "message": "完整的線上安全"
+  },
+  "upgradeToPremium": {
+    "message": "升級到 Premium"
+  },
+  "unlockAdvancedSecurity": {
+    "message": "Unlock advanced security features"
+  },
+  "unlockAdvancedSecurityDesc": {
+    "message": "A Premium subscription gives you more tools to stay secure and in control"
+  },
+  "explorePremium": {
+    "message": "探索進階版"
+  },
+  "loadingVault": {
+    "message": "正在載入密碼庫"
+  },
+  "vaultLoaded": {
+    "message": "已載入密碼庫"
+  },
+  "settingDisabledByPolicy": {
+    "message": "此設定已被你的組織原則停用。",
+    "description": "This hint text is displayed when a user setting is disabled due to an organization policy."
+  },
+  "zipPostalCodeLabel": {
+    "message": "郵編 / 郵政代碼"
+  },
+  "cardNumberLabel": {
+    "message": "支付卡號碼"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "逾時後動作"
   }
 }
diff --git a/apps/browser/src/auth/popup/account-switching/account-switcher.component.html b/apps/browser/src/auth/popup/account-switching/account-switcher.component.html
index b9f9b984c69..cef2a748d58 100644
--- a/apps/browser/src/auth/popup/account-switching/account-switcher.component.html
+++ b/apps/browser/src/auth/popup/account-switching/account-switcher.component.html
@@ -41,12 +41,10 @@
     </bit-section>
   </ng-container>
 
-  <div class="tw-mt-8" *ngIf="currentAccount$ | async as currentAccount">
+  <div *ngIf="currentAccount$ | async as currentAccount">
     <bit-section>
       <bit-section-header>
-        <h2 bitTypography="h6" class="tw-font-semibold">
-          {{ "options" | i18n }}
-        </h2>
+        <h2 bitTypography="h6">{{ "options" | i18n }}</h2>
       </bit-section-header>
 
       <bit-item>
diff --git a/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts b/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts
index 48fd57431a2..d7d3c02ab14 100644
--- a/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts
+++ b/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts
@@ -33,6 +33,8 @@ import { AccountComponent } from "./account.component";
 import { CurrentAccountComponent } from "./current-account.component";
 import { AccountSwitcherService } from "./services/account-switcher.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "account-switcher.component.html",
   imports: [
@@ -120,10 +122,8 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy {
 
   async lock(userId: string) {
     this.loading = true;
-    await this.vaultTimeoutService.lock(userId);
-    // 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.router.navigate(["lock"]);
+    await this.lockService.lock(userId as UserId);
+    await this.router.navigate(["lock"]);
   }
 
   async lockAll() {
diff --git a/apps/browser/src/auth/popup/account-switching/account.component.html b/apps/browser/src/auth/popup/account-switching/account.component.html
index d22ce9c9366..90770bb8d9b 100644
--- a/apps/browser/src/auth/popup/account-switching/account.component.html
+++ b/apps/browser/src/auth/popup/account-switching/account.component.html
@@ -25,7 +25,7 @@
 
       <div class="tw-text-sm tw-italic" [attr.aria-hidden]="status.text === 'active'">
         <span class="tw-sr-only">(</span>
-        <span [ngClass]="status.text === 'active' ? 'tw-font-bold tw-text-success' : ''">{{
+        <span [ngClass]="status.text === 'active' ? 'tw-font-medium tw-text-success' : ''">{{
           status.text
         }}</span>
         <span class="tw-sr-only">)</span>
diff --git a/apps/browser/src/auth/popup/account-switching/account.component.ts b/apps/browser/src/auth/popup/account-switching/account.component.ts
index c060d9161ef..edfad2a54b3 100644
--- a/apps/browser/src/auth/popup/account-switching/account.component.ts
+++ b/apps/browser/src/auth/popup/account-switching/account.component.ts
@@ -13,13 +13,19 @@ import { BiometricsService } from "@bitwarden/key-management";
 
 import { AccountSwitcherService, AvailableAccount } from "./services/account-switcher.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-account",
   templateUrl: "account.component.html",
   imports: [CommonModule, JslibModule, AvatarModule, ItemModule],
 })
 export class AccountComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() account: AvailableAccount;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() loading = new EventEmitter<boolean>();
 
   constructor(
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 c16abdadf29..2e2440f6258 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
@@ -12,7 +12,6 @@
       [color]="currentAccount.avatarColor"
       size="small"
       aria-hidden="true"
-      class="[&>img]:tw-block"
     ></bit-avatar>
   </button>
   <ng-template #defaultButton>
diff --git a/apps/browser/src/auth/popup/account-switching/current-account.component.ts b/apps/browser/src/auth/popup/account-switching/current-account.component.ts
index 63e8481621a..2dde3b5a266 100644
--- a/apps/browser/src/auth/popup/account-switching/current-account.component.ts
+++ b/apps/browser/src/auth/popup/account-switching/current-account.component.ts
@@ -21,6 +21,8 @@ export type CurrentAccount = {
   avatarColor: string;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-current-account",
   templateUrl: "current-account.component.html",
diff --git a/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts
index 7bb12fc260d..99d2c83283e 100644
--- a/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts
+++ b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts
@@ -160,7 +160,7 @@ export class AccountSwitcherService {
             throwError(() => new Error(AccountSwitcherService.incompleteAccountSwitchError)),
         }),
       ),
-    ).catch((err) => {
+    ).catch((err): any => {
       if (
         err instanceof Error &&
         err.message === AccountSwitcherService.incompleteAccountSwitchError
diff --git a/apps/browser/src/auth/popup/accounts/foreground-lock.service.ts b/apps/browser/src/auth/popup/accounts/foreground-lock.service.ts
index 20a52a90d8b..91adecd4a03 100644
--- a/apps/browser/src/auth/popup/accounts/foreground-lock.service.ts
+++ b/apps/browser/src/auth/popup/accounts/foreground-lock.service.ts
@@ -6,10 +6,13 @@ import {
   MessageListener,
   MessageSender,
 } from "@bitwarden/common/platform/messaging";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { newGuid } from "@bitwarden/guid";
+import { UserId } from "@bitwarden/user-core";
 
 const LOCK_ALL_FINISHED = new CommandDefinition<{ requestId: string }>("lockAllFinished");
 const LOCK_ALL = new CommandDefinition<{ requestId: string }>("lockAll");
+const LOCK_USER_FINISHED = new CommandDefinition<{ requestId: string }>("lockUserFinished");
+const LOCK_USER = new CommandDefinition<{ requestId: string; userId: UserId }>("lockUser");
 
 export class ForegroundLockService implements LockService {
   constructor(
@@ -18,7 +21,7 @@ export class ForegroundLockService implements LockService {
   ) {}
 
   async lockAll(): Promise<void> {
-    const requestId = Utils.newGuid();
+    const requestId = newGuid();
     const finishMessage = firstValueFrom(
       this.messageListener
         .messages$(LOCK_ALL_FINISHED)
@@ -29,4 +32,19 @@ export class ForegroundLockService implements LockService {
 
     await finishMessage;
   }
+
+  async lock(userId: UserId): Promise<void> {
+    const requestId = newGuid();
+    const finishMessage = firstValueFrom(
+      this.messageListener
+        .messages$(LOCK_USER_FINISHED)
+        .pipe(filter((m) => m.requestId === requestId)),
+    );
+
+    this.messageSender.send(LOCK_USER, { requestId, userId });
+
+    await finishMessage;
+  }
+
+  async runPlatformOnLockActions(): Promise<void> {}
 }
diff --git a/apps/browser/src/auth/popup/components/set-pin.component.html b/apps/browser/src/auth/popup/components/set-pin.component.html
index d525f9378f1..c88274b2bf4 100644
--- a/apps/browser/src/auth/popup/components/set-pin.component.html
+++ b/apps/browser/src/auth/popup/components/set-pin.component.html
@@ -1,6 +1,6 @@
 <form [bitSubmit]="submit" [formGroup]="setPinForm">
   <bit-dialog>
-    <div class="tw-font-semibold" bitDialogTitle>
+    <div class="tw-font-medium" bitDialogTitle>
       {{ "setYourPinTitle" | i18n }}
     </div>
     <div bitDialogContent>
diff --git a/apps/browser/src/auth/popup/components/set-pin.component.ts b/apps/browser/src/auth/popup/components/set-pin.component.ts
index a9e8e1b122f..dbb71ae3b07 100644
--- a/apps/browser/src/auth/popup/components/set-pin.component.ts
+++ b/apps/browser/src/auth/popup/components/set-pin.component.ts
@@ -13,6 +13,8 @@ import {
   IconButtonModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "set-pin.component.html",
   imports: [
diff --git a/apps/browser/src/auth/popup/constants/auth-extension-route.constant.ts b/apps/browser/src/auth/popup/constants/auth-extension-route.constant.ts
new file mode 100644
index 00000000000..5ea6fac7ebb
--- /dev/null
+++ b/apps/browser/src/auth/popup/constants/auth-extension-route.constant.ts
@@ -0,0 +1,8 @@
+// Full routes that auth owns in the extension
+export const AuthExtensionRoute = Object.freeze({
+  AccountSecurity: "account-security",
+  DeviceManagement: "device-management",
+  AccountSwitcher: "account-switcher",
+} as const);
+
+export type AuthExtensionRoute = (typeof AuthExtensionRoute)[keyof typeof AuthExtensionRoute];
diff --git a/apps/browser/src/auth/popup/constants/index.ts b/apps/browser/src/auth/popup/constants/index.ts
new file mode 100644
index 00000000000..59855040fd3
--- /dev/null
+++ b/apps/browser/src/auth/popup/constants/index.ts
@@ -0,0 +1 @@
+export * from "./auth-extension-route.constant";
diff --git a/apps/browser/src/auth/popup/login/extension-login-component.service.ts b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
index 37d74616391..621c7d74876 100644
--- a/apps/browser/src/auth/popup/login/extension-login-component.service.ts
+++ b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
@@ -68,4 +68,18 @@ export class ExtensionLoginComponentService
   showBackButton(showBackButton: boolean): void {
     this.extensionAnonLayoutWrapperDataService.setAnonLayoutWrapperData({ showBackButton });
   }
+
+  /**
+   * Enable passkey login support for chromium-based browsers only.
+   * Neither Firefox nor safari support overriding the relying party ID in an extension.
+   *
+   * https://github.com/w3c/webextensions/issues/238
+   *
+   * Tracking links:
+   * https://bugzilla.mozilla.org/show_bug.cgi?id=1956484
+   * https://developer.apple.com/forums/thread/774351
+   */
+  isLoginWithPasskeySupported(): boolean {
+    return this.platformUtilsService.isChromium();
+  }
 }
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.html b/apps/browser/src/auth/popup/settings/account-security.component.html
index 3de1cc81a69..37efcee9012 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.html
+++ b/apps/browser/src/auth/popup/settings/account-security.component.html
@@ -20,9 +20,9 @@
       <bit-card>
         <bit-form-control [disableMargin]="!((pinEnabled$ | async) || this.form.value.pin)">
           <input bitCheckbox id="biometric" type="checkbox" formControlName="biometric" />
-          <bit-label for="biometric" class="tw-whitespace-normal">{{
-            "unlockWithBiometrics" | i18n
-          }}</bit-label>
+          <bit-label for="biometric" class="tw-whitespace-normal">
+            {{ "unlockWithBiometrics" | i18n }}
+          </bit-label>
           <bit-hint *ngIf="biometricUnavailabilityReason">
             {{ biometricUnavailabilityReason }}
           </bit-hint>
@@ -38,9 +38,9 @@
             type="checkbox"
             formControlName="enableAutoBiometricsPrompt"
           />
-          <bit-label for="autoBiometricsPrompt" class="tw-whitespace-normal">{{
-            "enableAutoBiometricsPrompt" | i18n
-          }}</bit-label>
+          <bit-label for="autoBiometricsPrompt" class="tw-whitespace-normal">
+            {{ "enableAutoBiometricsPrompt" | i18n }}
+          </bit-label>
         </bit-form-control>
         <bit-form-control
           [disableMargin]="!(this.form.value.pin && showMasterPasswordOnClientRestartOption)"
@@ -60,49 +60,63 @@
             type="checkbox"
             formControlName="pinLockWithMasterPassword"
           />
-          <bit-label for="pinEphemeral" class="tw-whitespace-normal">{{
-            "lockWithMasterPassOnRestart1" | i18n
-          }}</bit-label>
+          <bit-label for="pinEphemeral" class="tw-whitespace-normal">
+            {{ "lockWithMasterPassOnRestart1" | i18n }}
+          </bit-label>
         </bit-form-control>
       </bit-card>
     </bit-section>
 
     <bit-section>
-      <bit-section-header>
-        <h2 bitTypography="h6">{{ "vaultTimeoutHeader" | i18n }}</h2>
-      </bit-section-header>
+      @if (consolidatedSessionTimeoutComponent$ | async) {
+        <bit-section-header>
+          <h2 bitTypography="h6">
+            {{ "sessionTimeoutHeader" | i18n }}
+          </h2>
+        </bit-section-header>
 
-      <bit-card>
-        <auth-vault-timeout-input
-          [vaultTimeoutOptions]="vaultTimeoutOptions"
-          [formControl]="form.controls.vaultTimeout"
-          ngDefaultControl
-        >
-        </auth-vault-timeout-input>
+        <bit-card>
+          <bit-session-timeout-settings [refreshTimeoutActionSettings]="refreshTimeoutSettings$" />
+        </bit-card>
+      } @else {
+        <bit-section-header>
+          <h2 bitTypography="h6">
+            {{ "vaultTimeoutHeader" | i18n }}
+          </h2>
+        </bit-section-header>
 
-        <bit-form-field disableMargin>
-          <bit-label for="vaultTimeoutAction">{{ "vaultTimeoutAction1" | i18n }}</bit-label>
-          <bit-select id="vaultTimeoutAction" formControlName="vaultTimeoutAction">
-            <bit-option
-              *ngFor="let action of availableVaultTimeoutActions"
-              [value]="action"
-              [label]="action | i18n"
-            >
-            </bit-option>
-          </bit-select>
+        <bit-card>
+          <bit-session-timeout-input
+            [vaultTimeoutOptions]="vaultTimeoutOptions"
+            [formControl]="form.controls.vaultTimeout"
+            ngDefaultControl
+          >
+          </bit-session-timeout-input>
 
-          <bit-hint *ngIf="!availableVaultTimeoutActions.includes(VaultTimeoutAction.Lock)">
-            {{ "unlockMethodNeededToChangeTimeoutActionDesc" | i18n }}<br />
+          <bit-form-field disableMargin>
+            <bit-label for="vaultTimeoutAction">{{ "vaultTimeoutAction1" | i18n }}</bit-label>
+            <bit-select id="vaultTimeoutAction" formControlName="vaultTimeoutAction">
+              <bit-option
+                *ngFor="let action of availableVaultTimeoutActions"
+                [value]="action"
+                [label]="action | i18n"
+              >
+              </bit-option>
+            </bit-select>
+
+            <bit-hint *ngIf="!availableVaultTimeoutActions.includes(VaultTimeoutAction.Lock)">
+              {{ "unlockMethodNeededToChangeTimeoutActionDesc" | i18n }}<br />
+            </bit-hint>
+          </bit-form-field>
+
+          <bit-hint *ngIf="hasVaultTimeoutPolicy" class="tw-mt-4">
+            {{ "vaultTimeoutPolicyAffectingOptions" | i18n }}
           </bit-hint>
-        </bit-form-field>
-
-        <bit-hint *ngIf="hasVaultTimeoutPolicy" class="tw-mt-4">
-          {{ "vaultTimeoutPolicyAffectingOptions" | i18n }}
-        </bit-hint>
-      </bit-card>
+        </bit-card>
+      }
     </bit-section>
 
-    <bit-section *ngIf="extensionLoginApprovalFlagEnabled">
+    <bit-section>
       <bit-section-header>
         <h2 bitTypography="h6">{{ "manageDevices" | i18n }}</h2>
       </bit-section-header>
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.spec.ts b/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
index 63666440a76..d0ab4793301 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
@@ -1,10 +1,12 @@
 import { Component } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
+import { ActivatedRoute } from "@angular/router";
 import { mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
+import { LockService } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -15,7 +17,6 @@ import { UserVerificationService } from "@bitwarden/common/auth/abstractions/use
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import {
   VaultTimeoutSettingsService,
-  VaultTimeoutService,
   VaultTimeoutStringType,
   VaultTimeoutAction,
 } from "@bitwarden/common/key-management/vault-timeout";
@@ -41,6 +42,8 @@ import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popu
 
 import { AccountSecurityComponent } from "./account-security.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-pop-out",
   template: ` <ng-content></ng-content>`,
@@ -61,12 +64,15 @@ describe("AccountSecurityComponent", () => {
   const validationService = mock<ValidationService>();
   const dialogService = mock<DialogService>();
   const platformUtilsService = mock<PlatformUtilsService>();
+  const lockService = mock<LockService>();
+  const configService = mock<ConfigService>();
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       providers: [
         { provide: AccountService, useValue: accountService },
         { provide: AccountSecurityComponent, useValue: mock<AccountSecurityComponent>() },
+        { provide: ActivatedRoute, useValue: mock<ActivatedRoute>() },
         { provide: BiometricsService, useValue: mock<BiometricsService>() },
         { provide: BiometricStateService, useValue: biometricStateService },
         { provide: DialogService, useValue: dialogService },
@@ -80,7 +86,6 @@ describe("AccountSecurityComponent", () => {
         { provide: PopupRouterCacheService, useValue: mock<PopupRouterCacheService>() },
         { provide: ToastService, useValue: mock<ToastService>() },
         { provide: UserVerificationService, useValue: mock<UserVerificationService>() },
-        { provide: VaultTimeoutService, useValue: mock<VaultTimeoutService>() },
         { provide: VaultTimeoutSettingsService, useValue: vaultTimeoutSettingsService },
         { provide: StateProvider, useValue: mock<StateProvider>() },
         { provide: CipherService, useValue: mock<CipherService>() },
@@ -88,8 +93,9 @@ describe("AccountSecurityComponent", () => {
         { provide: LogService, useValue: mock<LogService>() },
         { provide: OrganizationService, useValue: mock<OrganizationService>() },
         { provide: CollectionService, useValue: mock<CollectionService>() },
-        { provide: ConfigService, useValue: mock<ConfigService>() },
         { provide: ValidationService, useValue: validationService },
+        { provide: LockService, useValue: lockService },
+        { provide: ConfigService, useValue: configService },
       ],
     })
       .overrideComponent(AccountSecurityComponent, {
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 72a389ecf71..e6e7be96c08 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -24,7 +24,8 @@ import {
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
 import { SpotlightComponent } from "@bitwarden/angular/vault/components/spotlight/spotlight.component";
-import { FingerprintDialogComponent, VaultTimeoutInputComponent } from "@bitwarden/auth/angular";
+import { FingerprintDialogComponent } from "@bitwarden/auth/angular";
+import { LockService } from "@bitwarden/auth/common";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/default-policy.service";
@@ -37,7 +38,6 @@ import {
   VaultTimeout,
   VaultTimeoutAction,
   VaultTimeoutOption,
-  VaultTimeoutService,
   VaultTimeoutSettingsService,
   VaultTimeoutStringType,
 } from "@bitwarden/common/key-management/vault-timeout";
@@ -69,6 +69,10 @@ import {
   BiometricStateService,
   BiometricsStatus,
 } from "@bitwarden/key-management";
+import {
+  SessionTimeoutInputComponent,
+  SessionTimeoutSettingsComponent,
+} from "@bitwarden/key-management-ui";
 
 import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
 import { BrowserApi } from "../../../platform/browser/browser-api";
@@ -80,6 +84,8 @@ import { SetPinComponent } from "../components/set-pin.component";
 
 import { AwaitDesktopDialogComponent } from "./await-desktop-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "account-security.component.html",
   imports: [
@@ -100,9 +106,10 @@ import { AwaitDesktopDialogComponent } from "./await-desktop-dialog.component";
     SectionComponent,
     SectionHeaderComponent,
     SelectModule,
+    SessionTimeoutSettingsComponent,
     SpotlightComponent,
     TypographyModule,
-    VaultTimeoutInputComponent,
+    SessionTimeoutInputComponent,
   ],
 })
 export class AccountSecurityComponent implements OnInit, OnDestroy {
@@ -115,7 +122,6 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
   biometricUnavailabilityReason: string;
   showChangeMasterPass = true;
   pinEnabled$: Observable<boolean> = of(true);
-  extensionLoginApprovalFlagEnabled = false;
 
   form = this.formBuilder.group({
     vaultTimeout: [null as VaultTimeout | null],
@@ -134,17 +140,20 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
       ),
     );
 
-  private refreshTimeoutSettings$ = new BehaviorSubject<void>(undefined);
+  protected readonly consolidatedSessionTimeoutComponent$: Observable<boolean>;
+
+  protected refreshTimeoutSettings$ = new BehaviorSubject<void>(undefined);
   private destroy$ = new Subject<void>();
 
   constructor(
     private accountService: AccountService,
+    private configService: ConfigService,
     private pinService: PinServiceAbstraction,
     private policyService: PolicyService,
     private formBuilder: FormBuilder,
     private platformUtilsService: PlatformUtilsService,
     private i18nService: I18nService,
-    private vaultTimeoutService: VaultTimeoutService,
+    private lockService: LockService,
     private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
     public messagingService: MessagingService,
     private environmentService: EnvironmentService,
@@ -157,9 +166,12 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
     private biometricsService: BiometricsService,
     private vaultNudgesService: NudgesService,
     private validationService: ValidationService,
-    private configService: ConfigService,
     private logService: LogService,
-  ) {}
+  ) {
+    this.consolidatedSessionTimeoutComponent$ = this.configService.getFeatureFlag$(
+      FeatureFlag.ConsolidatedSessionTimeoutComponent,
+    );
+  }
 
   async ngOnInit() {
     const hasMasterPassword = await this.userVerificationService.hasMasterPassword();
@@ -175,8 +187,11 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
       this.hasVaultTimeoutPolicy = true;
     }
 
+    // Determine platform-specific timeout options
     const showOnLocked =
-      !this.platformUtilsService.isFirefox() && !this.platformUtilsService.isSafari();
+      !this.platformUtilsService.isFirefox() &&
+      !this.platformUtilsService.isSafari() &&
+      !(this.platformUtilsService.isOpera() && navigator.platform === "MacIntel");
 
     this.vaultTimeoutOptions = [
       { name: this.i18nService.t("immediately"), value: 0 },
@@ -239,10 +254,6 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
     };
     this.form.patchValue(initialValues, { emitEvent: false });
 
-    this.extensionLoginApprovalFlagEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.PM14938_BrowserExtensionLoginApproval,
-    );
-
     timer(0, 1000)
       .pipe(
         switchMap(async () => {
@@ -317,12 +328,8 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
       .pipe(
         concatMap(async (value) => {
           const userId = (await firstValueFrom(this.accountService.activeAccount$)).id;
-          const pinKeyEncryptedUserKey =
-            (await this.pinService.getPinKeyEncryptedUserKeyPersistent(userId)) ||
-            (await this.pinService.getPinKeyEncryptedUserKeyEphemeral(userId));
-          await this.pinService.clearPinKeyEncryptedUserKeyPersistent(userId);
-          await this.pinService.clearPinKeyEncryptedUserKeyEphemeral(userId);
-          await this.pinService.storePinKeyEncryptedUserKey(pinKeyEncryptedUserKey, value, userId);
+          const pin = await this.pinService.getPin(userId);
+          await this.pinService.setPin(pin, value ? "EPHEMERAL" : "PERSISTENT", userId);
           this.refreshTimeoutSettings$.next();
         }),
         takeUntil(this.destroy$),
@@ -492,7 +499,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
       }
     } else {
       const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      await this.vaultTimeoutSettingsService.clear(userId);
+      await this.pinService.unsetPin(userId);
     }
   }
 
@@ -703,7 +710,8 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
   }
 
   async lock() {
-    await this.vaultTimeoutService.lock();
+    const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+    await this.lockService.lock(activeUserId);
   }
 
   async logOut() {
diff --git a/apps/browser/src/auth/popup/settings/await-desktop-dialog.component.ts b/apps/browser/src/auth/popup/settings/await-desktop-dialog.component.ts
index 11bb9683bb9..12cf669d89b 100644
--- a/apps/browser/src/auth/popup/settings/await-desktop-dialog.component.ts
+++ b/apps/browser/src/auth/popup/settings/await-desktop-dialog.component.ts
@@ -1,14 +1,23 @@
 import { Component } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
+import {
+  ButtonModule,
+  CenterPositionStrategy,
+  DialogModule,
+  DialogService,
+} from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "await-desktop-dialog.component.html",
   imports: [JslibModule, ButtonModule, DialogModule],
 })
 export class AwaitDesktopDialogComponent {
   static open(dialogService: DialogService) {
-    return dialogService.open<boolean>(AwaitDesktopDialogComponent);
+    return dialogService.open<boolean>(AwaitDesktopDialogComponent, {
+      positionStrategy: new CenterPositionStrategy(),
+    });
   }
 }
diff --git a/apps/browser/src/auth/popup/settings/extension-device-management.component.ts b/apps/browser/src/auth/popup/settings/extension-device-management.component.ts
index 793965db141..b431fc874dd 100644
--- a/apps/browser/src/auth/popup/settings/extension-device-management.component.ts
+++ b/apps/browser/src/auth/popup/settings/extension-device-management.component.ts
@@ -7,6 +7,8 @@ import { PopOutComponent } from "../../../platform/popup/components/pop-out.comp
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   selector: "extension-device-management",
diff --git a/apps/browser/src/auth/services/auth-status-badge-updater.service.ts b/apps/browser/src/auth/services/auth-status-badge-updater.service.ts
index 4205ebc665d..4f239e54939 100644
--- a/apps/browser/src/auth/services/auth-status-badge-updater.service.ts
+++ b/apps/browser/src/auth/services/auth-status-badge-updater.service.ts
@@ -17,8 +17,8 @@ export class AuthStatusBadgeUpdaterService {
     private accountService: AccountService,
     private authService: AuthService,
   ) {
-    this.accountService.activeAccount$
-      .pipe(
+    this.badgeService.setState(StateName, (_tab) =>
+      this.accountService.activeAccount$.pipe(
         switchMap((account) =>
           account
             ? this.authService.authStatusFor$(account.id)
@@ -27,30 +27,36 @@ export class AuthStatusBadgeUpdaterService {
         mergeMap(async (authStatus) => {
           switch (authStatus) {
             case AuthenticationStatus.LoggedOut: {
-              await this.badgeService.setState(StateName, BadgeStatePriority.High, {
-                icon: BadgeIcon.LoggedOut,
-                backgroundColor: Unset,
-                text: Unset,
-              });
-              break;
+              return {
+                priority: BadgeStatePriority.High,
+                state: {
+                  icon: BadgeIcon.LoggedOut,
+                  backgroundColor: Unset,
+                  text: Unset,
+                },
+              };
             }
             case AuthenticationStatus.Locked: {
-              await this.badgeService.setState(StateName, BadgeStatePriority.High, {
-                icon: BadgeIcon.Locked,
-                backgroundColor: Unset,
-                text: Unset,
-              });
-              break;
+              return {
+                priority: BadgeStatePriority.High,
+                state: {
+                  icon: BadgeIcon.Locked,
+                  backgroundColor: Unset,
+                  text: Unset,
+                },
+              };
             }
             case AuthenticationStatus.Unlocked: {
-              await this.badgeService.setState(StateName, BadgeStatePriority.Low, {
-                icon: BadgeIcon.Unlocked,
-              });
-              break;
+              return {
+                priority: BadgeStatePriority.Low,
+                state: {
+                  icon: BadgeIcon.Unlocked,
+                },
+              };
             }
           }
         }),
-      )
-      .subscribe();
+      ),
+    );
   }
 }
diff --git a/apps/browser/src/auth/services/extension-lock.service.ts b/apps/browser/src/auth/services/extension-lock.service.ts
new file mode 100644
index 00000000000..7e01e8155e7
--- /dev/null
+++ b/apps/browser/src/auth/services/extension-lock.service.ts
@@ -0,0 +1,58 @@
+import { DefaultLockService, LogoutService } from "@bitwarden/auth/common";
+import MainBackground from "@bitwarden/browser/background/main.background";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
+import { BiometricsService, KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+import { StateEventRunnerService } from "@bitwarden/state";
+
+export class ExtensionLockService extends DefaultLockService {
+  constructor(
+    accountService: AccountService,
+    biometricService: BiometricsService,
+    vaultTimeoutSettingsService: VaultTimeoutSettingsService,
+    logoutService: LogoutService,
+    messagingService: MessagingService,
+    searchService: SearchService,
+    folderService: FolderService,
+    masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    stateEventRunnerService: StateEventRunnerService,
+    cipherService: CipherService,
+    authService: AuthService,
+    systemService: SystemService,
+    processReloadService: ProcessReloadServiceAbstraction,
+    logService: LogService,
+    keyService: KeyService,
+    private readonly main: MainBackground,
+  ) {
+    super(
+      accountService,
+      biometricService,
+      vaultTimeoutSettingsService,
+      logoutService,
+      messagingService,
+      searchService,
+      folderService,
+      masterPasswordService,
+      stateEventRunnerService,
+      cipherService,
+      authService,
+      systemService,
+      processReloadService,
+      logService,
+      keyService,
+    );
+  }
+
+  async runPlatformOnLockActions(): Promise<void> {
+    await this.main.refreshMenu(true);
+  }
+}
diff --git a/apps/browser/src/auth/services/new-device-verification/extension-new-device-verification-component.service.spec.ts b/apps/browser/src/auth/services/new-device-verification/extension-new-device-verification-component.service.spec.ts
new file mode 100644
index 00000000000..7c91cae3fcb
--- /dev/null
+++ b/apps/browser/src/auth/services/new-device-verification/extension-new-device-verification-component.service.spec.ts
@@ -0,0 +1,21 @@
+import { ExtensionNewDeviceVerificationComponentService } from "./extension-new-device-verification-component.service";
+
+describe("ExtensionNewDeviceVerificationComponentService", () => {
+  let sut: ExtensionNewDeviceVerificationComponentService;
+
+  beforeEach(() => {
+    sut = new ExtensionNewDeviceVerificationComponentService();
+  });
+
+  it("should instantiate the service", () => {
+    expect(sut).not.toBeFalsy();
+  });
+
+  describe("showBackButton()", () => {
+    it("should return false", () => {
+      const result = sut.showBackButton();
+
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/apps/browser/src/auth/services/new-device-verification/extension-new-device-verification-component.service.ts b/apps/browser/src/auth/services/new-device-verification/extension-new-device-verification-component.service.ts
new file mode 100644
index 00000000000..05e60fc8dad
--- /dev/null
+++ b/apps/browser/src/auth/services/new-device-verification/extension-new-device-verification-component.service.ts
@@ -0,0 +1,13 @@
+import {
+  DefaultNewDeviceVerificationComponentService,
+  NewDeviceVerificationComponentService,
+} from "@bitwarden/auth/angular";
+
+export class ExtensionNewDeviceVerificationComponentService
+  extends DefaultNewDeviceVerificationComponentService
+  implements NewDeviceVerificationComponentService
+{
+  showBackButton() {
+    return false;
+  }
+}
diff --git a/apps/browser/src/autofill/background/abstractions/notification.background.ts b/apps/browser/src/autofill/background/abstractions/notification.background.ts
index 52720b1f9f5..e50a317e8a7 100644
--- a/apps/browser/src/autofill/background/abstractions/notification.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/notification.background.ts
@@ -35,7 +35,7 @@ interface NotificationQueueMessage {
 }
 
 type ChangePasswordNotificationData = {
-  cipherId: CipherView["id"];
+  cipherIds: CipherView["id"][];
   newPassword: string;
 };
 
@@ -147,7 +147,7 @@ type NotificationBackgroundExtensionMessageHandlers = {
   bgGetEnableChangedPasswordPrompt: () => Promise<boolean>;
   bgGetEnableAddedLoginPrompt: () => Promise<boolean>;
   bgGetExcludedDomains: () => Promise<NeverDomains>;
-  bgGetActiveUserServerConfig: () => Promise<ServerConfig>;
+  bgGetActiveUserServerConfig: () => Promise<ServerConfig | null>;
   getWebVaultUrlForNotification: () => Promise<string>;
 };
 
diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
index 6067d563db2..96809fa26b2 100644
--- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
@@ -1,19 +1,22 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+import { CipherIconDetails } from "@bitwarden/common/vault/icon/build-cipher-icon";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { InlineMenuFillType } from "../../enums/autofill-overlay.enum";
+import AutofillField from "../../models/autofill-field";
 import AutofillPageDetails from "../../models/autofill-page-details";
 import { PageDetail } from "../../services/abstractions/autofill.service";
 
 import { LockedVaultPendingNotificationsData } from "./notification.background";
 
-export type PageDetailsForTab = Record<
-  chrome.runtime.MessageSender["tab"]["id"],
-  Map<chrome.runtime.MessageSender["frameId"], PageDetail>
->;
+export type TabId = NonNullable<chrome.tabs.Tab["id"]>;
+
+export type FrameId = NonNullable<chrome.runtime.MessageSender["frameId"]>;
+
+type PageDetailsByFrame = Map<FrameId, PageDetail>;
+
+export type PageDetailsForTab = Record<TabId, PageDetailsByFrame>;
 
 export type SubFrameOffsetData = {
   top: number;
@@ -21,19 +24,14 @@ export type SubFrameOffsetData = {
   url?: string;
   frameId?: number;
   parentFrameIds?: number[];
+  isCrossOriginSubframe?: boolean;
+  isMainFrame?: boolean;
+  hasParentFrame?: boolean;
 } | null;
 
-export type SubFrameOffsetsForTab = Record<
-  chrome.runtime.MessageSender["tab"]["id"],
-  Map<chrome.runtime.MessageSender["frameId"], SubFrameOffsetData>
->;
+type SubFrameOffsetsByFrame = Map<FrameId, SubFrameOffsetData>;
 
-export type WebsiteIconData = {
-  imageEnabled: boolean;
-  image: string;
-  fallbackImage: string;
-  icon: string;
-};
+export type SubFrameOffsetsForTab = Record<TabId, SubFrameOffsetsByFrame>;
 
 export type UpdateOverlayCiphersParams = {
   updateAllCipherTypes: boolean;
@@ -49,6 +47,7 @@ export type FocusedFieldData = {
   accountCreationFieldType?: string;
   showPasskeys?: boolean;
   focusedFieldForm?: string;
+  focusedFieldOpid?: string;
 };
 
 export type InlineMenuElementPosition = {
@@ -146,7 +145,7 @@ export type OverlayBackgroundExtensionMessage = {
   isFieldCurrentlyFilling?: boolean;
   subFrameData?: SubFrameOffsetData;
   focusedFieldData?: FocusedFieldData;
-  allFieldsRect?: any;
+  allFieldsRect?: AutofillField[];
   isOpeningFullInlineMenu?: boolean;
   styles?: Partial<CSSStyleDeclaration>;
   data?: LockedVaultPendingNotificationsData;
@@ -155,13 +154,30 @@ export type OverlayBackgroundExtensionMessage = {
   ToggleInlineMenuHiddenMessage &
   UpdateInlineMenuVisibilityMessage;
 
+export type OverlayPortCommand =
+  | "fillCipher"
+  | "addNewVaultItem"
+  | "viewCipher"
+  | "redirectFocus"
+  | "updateHeight"
+  | "buttonClicked"
+  | "blurred"
+  | "updateColorScheme"
+  | "unlockVault"
+  | "refreshGeneratedPassword"
+  | "fillGeneratedPassword";
+
 export type OverlayPortMessage = {
-  [key: string]: any;
-  command: string;
-  direction?: string;
+  command: OverlayPortCommand;
+  direction?: "up" | "down" | "left" | "right";
   inlineMenuCipherId?: string;
   addNewCipherType?: CipherType;
   usePasskey?: boolean;
+  height?: number;
+  backgroundColorScheme?: "light" | "dark";
+  viewsCipherData?: InlineMenuCipherData;
+  loginUrl?: string;
+  fillGeneratedPassword?: boolean;
 };
 
 export type InlineMenuCipherData = {
@@ -170,7 +186,7 @@ export type InlineMenuCipherData = {
   type: CipherType;
   reprompt: CipherRepromptType;
   favorite: boolean;
-  icon: WebsiteIconData;
+  icon: CipherIconDetails;
   accountCreationFieldType?: string;
   login?: {
     totp?: string;
@@ -201,9 +217,14 @@ export type BuildCipherDataParams = {
 export type BackgroundMessageParam = {
   message: OverlayBackgroundExtensionMessage;
 };
+
 export type BackgroundSenderParam = {
-  sender: chrome.runtime.MessageSender;
+  sender: chrome.runtime.MessageSender & {
+    tab: NonNullable<chrome.runtime.MessageSender["tab"]>;
+    frameId: FrameId;
+  };
 };
+
 export type BackgroundOnMessageHandlerParams = BackgroundMessageParam & BackgroundSenderParam;
 
 export type OverlayBackgroundExtensionMessageHandlers = {
@@ -253,9 +274,13 @@ export type OverlayBackgroundExtensionMessageHandlers = {
 export type PortMessageParam = {
   message: OverlayPortMessage;
 };
+
 export type PortConnectionParam = {
-  port: chrome.runtime.Port;
+  port: chrome.runtime.Port & {
+    sender: NonNullable<chrome.runtime.Port["sender"]>;
+  };
 };
+
 export type PortOnMessageHandlerParams = PortMessageParam & PortConnectionParam;
 
 export type InlineMenuButtonPortMessageHandlers = {
diff --git a/apps/browser/src/autofill/background/context-menus.background.ts b/apps/browser/src/autofill/background/context-menus.background.ts
index 0db2fd59af3..8c99c0b065e 100644
--- a/apps/browser/src/autofill/background/context-menus.background.ts
+++ b/apps/browser/src/autofill/background/context-menus.background.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler";
 
@@ -17,9 +15,11 @@ export default class ContextMenusBackground {
       return;
     }
 
-    this.contextMenus.onClicked.addListener((info, tab) =>
-      this.contextMenuClickedHandler.run(info, tab),
-    );
+    this.contextMenus.onClicked.addListener((info, tab) => {
+      if (tab) {
+        return this.contextMenuClickedHandler.run(info, tab);
+      }
+    });
 
     BrowserApi.messageListener(
       "contextmenus.background",
@@ -28,18 +28,16 @@ export default class ContextMenusBackground {
         sender: chrome.runtime.MessageSender,
       ) => {
         if (msg.command === "unlockCompleted" && msg.data.target === "contextmenus.background") {
-          // 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.contextMenuClickedHandler
-            .cipherAction(
-              msg.data.commandToRetry.message.contextMenuOnClickData,
-              msg.data.commandToRetry.sender.tab,
-            )
-            .then(() => {
-              // 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.tabSendMessageData(sender.tab, "closeNotificationBar");
+          const onClickData = msg.data.commandToRetry.message.contextMenuOnClickData;
+          const senderTab = msg.data.commandToRetry.sender.tab;
+
+          if (onClickData && senderTab) {
+            void this.contextMenuClickedHandler.cipherAction(onClickData, senderTab).then(() => {
+              if (sender.tab) {
+                void BrowserApi.tabSendMessageData(sender.tab, "closeNotificationBar");
+              }
             });
+          }
         }
       },
     );
diff --git a/apps/browser/src/autofill/background/notification.background.spec.ts b/apps/browser/src/autofill/background/notification.background.spec.ts
index 032baf2e32b..8df21bc66ef 100644
--- a/apps/browser/src/autofill/background/notification.background.spec.ts
+++ b/apps/browser/src/autofill/background/notification.background.spec.ts
@@ -133,19 +133,11 @@ describe("NotificationBackground", () => {
 
       expect(cipherView.name).toEqual("example.com");
       expect(cipherView.login).toEqual({
-        autofillOnPageLoad: null,
-        fido2Credentials: null,
+        fido2Credentials: [],
         password: message.password,
-        passwordRevisionDate: null,
-        totp: null,
         uris: [
           {
-            _canLaunch: null,
-            _domain: null,
-            _host: null,
-            _hostname: null,
             _uri: message.uri,
-            match: null,
           },
         ],
         username: message.username,
@@ -289,7 +281,6 @@ describe("NotificationBackground", () => {
       let tab: chrome.tabs.Tab;
       let sender: chrome.runtime.MessageSender;
       let getEnableAddedLoginPromptSpy: jest.SpyInstance;
-      let getEnableChangedPasswordPromptSpy: jest.SpyInstance;
       let pushAddLoginToQueueSpy: jest.SpyInstance;
       let pushChangePasswordToQueueSpy: jest.SpyInstance;
       let getAllDecryptedForUrlSpy: jest.SpyInstance;
@@ -306,10 +297,7 @@ describe("NotificationBackground", () => {
           notificationBackground as any,
           "getEnableAddedLoginPrompt",
         );
-        getEnableChangedPasswordPromptSpy = jest.spyOn(
-          notificationBackground as any,
-          "getEnableChangedPasswordPrompt",
-        );
+
         pushAddLoginToQueueSpy = jest.spyOn(notificationBackground as any, "pushAddLoginToQueue");
         pushChangePasswordToQueueSpy = jest.spyOn(
           notificationBackground as any,
@@ -368,24 +356,6 @@ describe("NotificationBackground", () => {
         expect(pushChangePasswordToQueueSpy).not.toHaveBeenCalled();
       });
 
-      it("skips attempting to change the password for an existing login if the user has disabled changing the password notification", async () => {
-        const data: ModifyLoginCipherFormData = mockModifyLoginCipherFormData;
-        activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
-        getEnableAddedLoginPromptSpy.mockReturnValueOnce(true);
-        getEnableChangedPasswordPromptSpy.mockReturnValueOnce(false);
-        getAllDecryptedForUrlSpy.mockResolvedValueOnce([
-          mock<CipherView>({ login: { username: "test", password: "oldPassword" } }),
-        ]);
-
-        await notificationBackground.triggerAddLoginNotification(data, tab);
-
-        expect(getEnableAddedLoginPromptSpy).toHaveBeenCalled();
-        expect(getAllDecryptedForUrlSpy).toHaveBeenCalled();
-        expect(getEnableChangedPasswordPromptSpy).toHaveBeenCalled();
-        expect(pushAddLoginToQueueSpy).not.toHaveBeenCalled();
-        expect(pushChangePasswordToQueueSpy).not.toHaveBeenCalled();
-      });
-
       it("skips attempting to change the password for an existing login if the password has not changed", async () => {
         const data: ModifyLoginCipherFormData = mockModifyLoginCipherFormData;
         activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
@@ -445,37 +415,12 @@ describe("NotificationBackground", () => {
           sender.tab,
         );
       });
-
-      it("adds a change password message to the queue if the user has changed an existing cipher's password", async () => {
-        const data: ModifyLoginCipherFormData = {
-          ...mockModifyLoginCipherFormData,
-          username: "tEsT",
-        };
-
-        activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
-        getEnableAddedLoginPromptSpy.mockResolvedValueOnce(true);
-        getEnableChangedPasswordPromptSpy.mockResolvedValueOnce(true);
-        getAllDecryptedForUrlSpy.mockResolvedValueOnce([
-          mock<CipherView>({
-            id: "cipher-id",
-            login: { username: "test", password: "oldPassword" },
-          }),
-        ]);
-
-        await notificationBackground.triggerAddLoginNotification(data, tab);
-
-        expect(pushChangePasswordToQueueSpy).toHaveBeenCalledWith(
-          "cipher-id",
-          "example.com",
-          data.password,
-          sender.tab,
-        );
-      });
     });
 
     describe("bgTriggerChangedPasswordNotification message handler", () => {
       let tab: chrome.tabs.Tab;
       let sender: chrome.runtime.MessageSender;
+      let getEnableChangedPasswordPromptSpy: jest.SpyInstance;
       let pushChangePasswordToQueueSpy: jest.SpyInstance;
       let getAllDecryptedForUrlSpy: jest.SpyInstance;
       const mockModifyLoginCipherFormData: ModifyLoginCipherFormData = {
@@ -488,6 +433,11 @@ describe("NotificationBackground", () => {
       beforeEach(() => {
         tab = createChromeTabMock();
         sender = mock<chrome.runtime.MessageSender>({ tab });
+        getEnableChangedPasswordPromptSpy = jest.spyOn(
+          notificationBackground as any,
+          "getEnableChangedPasswordPrompt",
+        );
+
         pushChangePasswordToQueueSpy = jest.spyOn(
           notificationBackground as any,
           "pushChangePasswordToQueue",
@@ -495,6 +445,40 @@ describe("NotificationBackground", () => {
         getAllDecryptedForUrlSpy = jest.spyOn(cipherService, "getAllDecryptedForUrl");
       });
 
+      afterEach(() => {
+        getEnableChangedPasswordPromptSpy.mockRestore();
+        pushChangePasswordToQueueSpy.mockRestore();
+        getAllDecryptedForUrlSpy.mockRestore();
+      });
+
+      it("skips attempting to change the password for an existing login if the user has disabled changing the password notification", async () => {
+        const data: ModifyLoginCipherFormData = {
+          ...mockModifyLoginCipherFormData,
+        };
+        activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
+        getEnableChangedPasswordPromptSpy.mockReturnValueOnce(false);
+        getAllDecryptedForUrlSpy.mockResolvedValueOnce([
+          mock<CipherView>({ login: { username: "test", password: "oldPassword" } }),
+        ]);
+
+        await notificationBackground.triggerChangedPasswordNotification(data, tab);
+
+        expect(pushChangePasswordToQueueSpy).not.toHaveBeenCalled();
+      });
+
+      it("skips attempting to add the change password message to the queue if the user is logged out", async () => {
+        const data: ModifyLoginCipherFormData = {
+          ...mockModifyLoginCipherFormData,
+          uri: "https://example.com",
+        };
+
+        activeAccountStatusMock$.next(AuthenticationStatus.LoggedOut);
+
+        await notificationBackground.triggerChangedPasswordNotification(data, tab);
+
+        expect(pushChangePasswordToQueueSpy).not.toHaveBeenCalled();
+      });
+
       it("skips attempting to add the change password message to the queue if the passed url is not valid", async () => {
         const data: ModifyLoginCipherFormData = mockModifyLoginCipherFormData;
 
@@ -503,7 +487,92 @@ describe("NotificationBackground", () => {
         expect(pushChangePasswordToQueueSpy).not.toHaveBeenCalled();
       });
 
-      it("adds a change password message to the queue if the user does not have an unlocked account", async () => {
+      it("only only includes ciphers in notification data matching a username if username was present in the modify form data", async () => {
+        const data: ModifyLoginCipherFormData = {
+          ...mockModifyLoginCipherFormData,
+          uri: "https://example.com",
+          username: "userName",
+        };
+
+        activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
+        getAllDecryptedForUrlSpy.mockResolvedValueOnce([
+          mock<CipherView>({
+            id: "cipher-id-1",
+            login: { username: "test", password: "currentPassword" },
+          }),
+          mock<CipherView>({
+            id: "cipher-id-2",
+            login: { username: "username", password: "currentPassword" },
+          }),
+          mock<CipherView>({
+            id: "cipher-id-3",
+            login: { username: "uSeRnAmE", password: "currentPassword" },
+          }),
+        ]);
+
+        await notificationBackground.triggerChangedPasswordNotification(data, tab);
+
+        expect(pushChangePasswordToQueueSpy).toHaveBeenCalledWith(
+          ["cipher-id-2", "cipher-id-3"],
+          "example.com",
+          data?.newPassword,
+          sender.tab,
+        );
+      });
+
+      it("adds a change password message to the queue with current password, if there is a current password, but no new password", async () => {
+        const data: ModifyLoginCipherFormData = {
+          ...mockModifyLoginCipherFormData,
+          uri: "https://example.com",
+          password: "newPasswordUpdatedElsewhere",
+          newPassword: null,
+        };
+        activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
+        getAllDecryptedForUrlSpy.mockResolvedValueOnce([
+          mock<CipherView>({
+            id: "cipher-id-1",
+            login: { password: "currentPassword" },
+          }),
+        ]);
+        await notificationBackground.triggerChangedPasswordNotification(data, tab);
+
+        expect(pushChangePasswordToQueueSpy).toHaveBeenCalledWith(
+          ["cipher-id-1"],
+          "example.com",
+          data?.password,
+          sender.tab,
+        );
+      });
+
+      it("adds a change password message to the queue with new password, if new password is provided", async () => {
+        const data: ModifyLoginCipherFormData = {
+          ...mockModifyLoginCipherFormData,
+          uri: "https://example.com",
+          password: "password2",
+          newPassword: "password3",
+        };
+        activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
+        getAllDecryptedForUrlSpy.mockResolvedValueOnce([
+          mock<CipherView>({
+            id: "cipher-id-1",
+            login: { password: "password1" },
+          }),
+          mock<CipherView>({
+            id: "cipher-id-4",
+            login: { password: "password4" },
+          }),
+        ]);
+        await notificationBackground.triggerChangedPasswordNotification(data, tab);
+
+        expect(pushChangePasswordToQueueSpy).toHaveBeenCalledWith(
+          ["cipher-id-1", "cipher-id-4"],
+          "example.com",
+          data?.newPassword,
+          sender.tab,
+        );
+      });
+
+      it("adds a change password message to the queue if the user has a locked account", async () => {
         const data: ModifyLoginCipherFormData = {
           ...mockModifyLoginCipherFormData,
           uri: "https://example.com",
@@ -522,10 +591,12 @@ describe("NotificationBackground", () => {
         );
       });
 
-      it("skips adding a change password message to the queue if the multiple ciphers exist for the passed URL and the current password is not found within the list of ciphers", async () => {
+      it("doesn't add a password if there is no current or new password", async () => {
         const data: ModifyLoginCipherFormData = {
           ...mockModifyLoginCipherFormData,
           uri: "https://example.com",
+          password: null,
+          newPassword: null,
         };
         activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
         getAllDecryptedForUrlSpy.mockResolvedValueOnce([
@@ -537,23 +608,6 @@ describe("NotificationBackground", () => {
         expect(pushChangePasswordToQueueSpy).not.toHaveBeenCalled();
       });
 
-      it("skips adding a change password message if more than one existing cipher is found with a matching password ", async () => {
-        const data: ModifyLoginCipherFormData = {
-          ...mockModifyLoginCipherFormData,
-          uri: "https://example.com",
-        };
-        activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
-        getAllDecryptedForUrlSpy.mockResolvedValueOnce([
-          mock<CipherView>({ login: { username: "test", password: "password" } }),
-          mock<CipherView>({ login: { username: "test2", password: "password" } }),
-        ]);
-
-        await notificationBackground.triggerChangedPasswordNotification(data, tab);
-
-        expect(getAllDecryptedForUrlSpy).toHaveBeenCalled();
-        expect(pushChangePasswordToQueueSpy).not.toHaveBeenCalled();
-      });
-
       it("adds a change password message to the queue if a single cipher matches the passed current password", async () => {
         const data: ModifyLoginCipherFormData = {
           ...mockModifyLoginCipherFormData,
@@ -570,28 +624,39 @@ describe("NotificationBackground", () => {
         await notificationBackground.triggerChangedPasswordNotification(data, tab);
 
         expect(pushChangePasswordToQueueSpy).toHaveBeenCalledWith(
-          "cipher-id",
+          ["cipher-id"],
           "example.com",
           data?.newPassword,
           sender.tab,
         );
       });
 
-      it("skips adding a change password message if no current password is passed in the message and more than one cipher is found for a url", async () => {
+      it("adds a change password message with all matching ciphers if no current password is passed and more than one cipher is found for a url", async () => {
         const data: ModifyLoginCipherFormData = {
           ...mockModifyLoginCipherFormData,
           uri: "https://example.com",
+          password: null,
         };
         activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
         getAllDecryptedForUrlSpy.mockResolvedValueOnce([
-          mock<CipherView>({ login: { username: "test", password: "password" } }),
-          mock<CipherView>({ login: { username: "test2", password: "password" } }),
+          mock<CipherView>({
+            id: "cipher-id-1",
+            login: { username: "test", password: "password" },
+          }),
+          mock<CipherView>({
+            id: "cipher-id-2",
+            login: { username: "test2", password: "password" },
+          }),
         ]);
 
         await notificationBackground.triggerChangedPasswordNotification(data, tab);
 
-        expect(getAllDecryptedForUrlSpy).toHaveBeenCalled();
-        expect(pushChangePasswordToQueueSpy).not.toHaveBeenCalled();
+        expect(pushChangePasswordToQueueSpy).toHaveBeenCalledWith(
+          ["cipher-id-1", "cipher-id-2"],
+          "example.com",
+          data?.newPassword,
+          sender.tab,
+        );
       });
 
       it("adds a change password message to the queue if no current password is passed with the message, but a single cipher is matched for the uri", async () => {
@@ -611,7 +676,7 @@ describe("NotificationBackground", () => {
         await notificationBackground.triggerChangedPasswordNotification(data, tab);
 
         expect(pushChangePasswordToQueueSpy).toHaveBeenCalledWith(
-          "cipher-id",
+          ["cipher-id"],
           "example.com",
           data?.newPassword,
           sender.tab,
@@ -1465,5 +1530,63 @@ describe("NotificationBackground", () => {
         expect(environmentServiceSpy).toHaveBeenCalled();
       });
     });
+
+    describe("handleUnlockPopoutClosed", () => {
+      let onRemovedListeners: Array<(tabId: number, removeInfo: chrome.tabs.OnRemovedInfo) => void>;
+      let tabsQuerySpy: jest.SpyInstance;
+
+      beforeEach(() => {
+        onRemovedListeners = [];
+        chrome.tabs.onRemoved.addListener = jest.fn((listener) => {
+          onRemovedListeners.push(listener);
+        });
+        chrome.runtime.getURL = jest.fn().mockReturnValue("chrome-extension://id/popup/index.html");
+        notificationBackground.init();
+      });
+
+      const triggerTabRemoved = async (tabId: number) => {
+        onRemovedListeners[0](tabId, mock<chrome.tabs.OnRemovedInfo>());
+        await flushPromises();
+      };
+
+      it("sends abandon message when unlock popout is closed and vault is locked", async () => {
+        activeAccountStatusMock$.next(AuthenticationStatus.Locked);
+        tabsQuerySpy = jest.spyOn(BrowserApi, "tabsQuery").mockResolvedValue([]);
+
+        await triggerTabRemoved(1);
+
+        expect(tabsQuerySpy).toHaveBeenCalled();
+        expect(messagingService.send).toHaveBeenCalledWith("abandonAutofillPendingNotifications");
+      });
+
+      it("uses tracked tabId for fast lookup when available", async () => {
+        activeAccountStatusMock$.next(AuthenticationStatus.Locked);
+        tabsQuerySpy = jest.spyOn(BrowserApi, "tabsQuery").mockResolvedValue([
+          {
+            id: 123,
+            url: "chrome-extension://id/popup/index.html?singleActionPopout=auth_unlockExtension",
+          } as chrome.tabs.Tab,
+        ]);
+
+        await triggerTabRemoved(999);
+        tabsQuerySpy.mockClear();
+        messagingService.send.mockClear();
+
+        await triggerTabRemoved(123);
+
+        expect(tabsQuerySpy).not.toHaveBeenCalled();
+        expect(messagingService.send).toHaveBeenCalledWith("abandonAutofillPendingNotifications");
+      });
+
+      it("returns early when vault is unlocked", async () => {
+        activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
+        tabsQuerySpy = jest.spyOn(BrowserApi, "tabsQuery").mockResolvedValue([]);
+
+        await triggerTabRemoved(1);
+
+        expect(tabsQuerySpy).not.toHaveBeenCalled();
+        expect(messagingService.send).not.toHaveBeenCalled();
+      });
+    });
   });
 });
diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts
index d44bf2f1507..547c5ba1575 100644
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -45,7 +45,7 @@ import { SecurityTask } from "@bitwarden/common/vault/tasks/models/security-task
 
 // FIXME (PM-22628): Popup imports are forbidden in background
 // eslint-disable-next-line no-restricted-imports
-import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
+import { AuthPopoutType, openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import { BrowserApi } from "../../platform/browser/browser-api";
 // FIXME (PM-22628): Popup imports are forbidden in background
 // eslint-disable-next-line no-restricted-imports
@@ -89,6 +89,7 @@ export default class NotificationBackground {
     ExtensionCommand.AutofillCard,
     ExtensionCommand.AutofillIdentity,
   ]);
+  private unlockPopoutTabId?: number;
   private readonly extensionMessageHandlers: NotificationBackgroundExtensionMessageHandlers = {
     bgAdjustNotificationBar: ({ message, sender }) =>
       this.handleAdjustNotificationBarMessage(message, sender),
@@ -146,6 +147,7 @@ export default class NotificationBackground {
     }
 
     this.setupExtensionMessageListener();
+    this.setupUnlockPopoutCloseListener();
 
     this.cleanupNotificationQueue();
   }
@@ -213,14 +215,26 @@ export default class NotificationBackground {
       let cipherView: CipherView;
       if (cipherQueueMessage.type === NotificationType.ChangePassword) {
         const {
-          data: { cipherId },
+          data: { cipherIds },
         } = cipherQueueMessage;
-        cipherView = await this.getDecryptedCipherById(cipherId, activeUserId);
+        const cipherViews = await this.cipherService.getAllDecrypted(activeUserId);
+        return cipherViews
+          .filter((cipher) => cipherIds.includes(cipher.id))
+          .map((cipherView) => {
+            const organizationType = getOrganizationType(cipherView.organizationId);
+            return this.convertToNotificationCipherData(
+              cipherView,
+              iconsServerUrl,
+              showFavicons,
+              organizationType,
+            );
+          });
       } else {
         cipherView = this.convertAddLoginQueueMessageToCipherView(cipherQueueMessage);
       }
 
       const organizationType = getOrganizationType(cipherView.organizationId);
+
       return [
         this.convertToNotificationCipherData(
           cipherView,
@@ -555,16 +569,6 @@ export default class NotificationBackground {
       return true;
     }
 
-    const changePasswordIsEnabled = await this.getEnableChangedPasswordPrompt();
-
-    if (
-      changePasswordIsEnabled &&
-      usernameMatches.length === 1 &&
-      usernameMatches[0].login.password !== login.password
-    ) {
-      await this.pushChangePasswordToQueue(usernameMatches[0].id, loginDomain, login.password, tab);
-      return true;
-    }
     return false;
   }
 
@@ -603,45 +607,92 @@ export default class NotificationBackground {
     data: ModifyLoginCipherFormData,
     tab: chrome.tabs.Tab,
   ): Promise<boolean> {
-    const changeData = {
-      url: data.uri,
-      currentPassword: data.password,
-      newPassword: data.newPassword,
-    };
-
-    const loginDomain = Utils.getDomain(changeData.url);
-    if (loginDomain == null) {
+    const changePasswordIsEnabled = await this.getEnableChangedPasswordPrompt();
+    if (!changePasswordIsEnabled) {
       return false;
     }
-
-    if ((await this.getAuthStatus()) < AuthenticationStatus.Unlocked) {
-      await this.pushChangePasswordToQueue(null, loginDomain, changeData.newPassword, tab, true);
-      return true;
+    const authStatus = await this.getAuthStatus();
+    if (authStatus === AuthenticationStatus.LoggedOut) {
+      return false;
     }
-
-    let id: string = null;
     const activeUserId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(getOptionalUserId),
     );
-    if (activeUserId == null) {
+    if (activeUserId === null) {
+      return false;
+    }
+    const loginDomain = Utils.getDomain(data.uri);
+    if (loginDomain === null) {
       return false;
     }
 
-    const ciphers = await this.cipherService.getAllDecryptedForUrl(changeData.url, activeUserId);
-    if (changeData.currentPassword != null) {
-      const passwordMatches = ciphers.filter(
-        (c) => c.login.password === changeData.currentPassword,
-      );
-      if (passwordMatches.length === 1) {
-        id = passwordMatches[0].id;
-      }
-    } else if (ciphers.length === 1) {
-      id = ciphers[0].id;
-    }
-    if (id != null) {
-      await this.pushChangePasswordToQueue(id, loginDomain, changeData.newPassword, tab);
+    const username: string | null = data.username || null;
+    const currentPassword = data.password || null;
+    const newPassword = data.newPassword || null;
+
+    if (authStatus === AuthenticationStatus.Locked && newPassword !== null) {
+      await this.pushChangePasswordToQueue(null, loginDomain, newPassword, tab, true);
       return true;
     }
+
+    let ciphers: CipherView[] = await this.cipherService.getAllDecryptedForUrl(
+      data.uri,
+      activeUserId,
+    );
+
+    const normalizedUsername: string = username ? username.toLowerCase() : "";
+
+    const shouldMatchUsername = typeof username === "string" && username.length > 0;
+
+    if (shouldMatchUsername) {
+      // Presence of a username should filter ciphers further.
+      ciphers = ciphers.filter(
+        (cipher) =>
+          cipher.login.username !== null &&
+          cipher.login.username.toLowerCase() === normalizedUsername,
+      );
+    }
+
+    if (ciphers.length === 1) {
+      const [cipher] = ciphers;
+      if (
+        username !== null &&
+        newPassword === null &&
+        cipher.login.username === normalizedUsername &&
+        cipher.login.password === currentPassword
+      ) {
+        // Assumed to be a login
+        return false;
+      }
+    }
+
+    if (currentPassword && !newPassword) {
+      // Only use current password for change if no new password present.
+      if (ciphers.length > 0) {
+        await this.pushChangePasswordToQueue(
+          ciphers.map((cipher) => cipher.id),
+          loginDomain,
+          currentPassword,
+          tab,
+        );
+        return true;
+      }
+    }
+
+    if (newPassword) {
+      // Otherwise include all known ciphers.
+      if (ciphers.length > 0) {
+        await this.pushChangePasswordToQueue(
+          ciphers.map((cipher) => cipher.id),
+          loginDomain,
+          newPassword,
+          tab,
+        );
+
+        return true;
+      }
+    }
+
     return false;
   }
 
@@ -666,7 +717,7 @@ export default class NotificationBackground {
   }
 
   private async pushChangePasswordToQueue(
-    cipherId: string,
+    cipherIds: CipherView["id"][],
     loginDomain: string,
     newPassword: string,
     tab: chrome.tabs.Tab,
@@ -677,7 +728,7 @@ export default class NotificationBackground {
     const launchTimestamp = new Date().getTime();
     const message: AddChangePasswordNotificationQueueMessage = {
       type: NotificationType.ChangePassword,
-      data: { cipherId: cipherId, newPassword: newPassword },
+      data: { cipherIds: cipherIds, newPassword: newPassword },
       domain: loginDomain,
       tab: tab,
       launchTimestamp,
@@ -716,12 +767,12 @@ export default class NotificationBackground {
       return;
     }
 
-    await this.saveOrUpdateCredentials(sender.tab, message.edit, message.folder);
+    await this.saveOrUpdateCredentials(sender.tab, message.cipherId, message.edit, message.folder);
   }
 
   async handleCipherUpdateRepromptResponse(message: NotificationBackgroundExtensionMessage) {
     if (message.success) {
-      await this.saveOrUpdateCredentials(message.tab, false, undefined, true);
+      await this.saveOrUpdateCredentials(message.tab, message.cipherId, false, undefined, true);
     } else {
       await BrowserApi.tabSendMessageData(message.tab, "saveCipherAttemptCompleted", {
         error: "Password reprompt failed",
@@ -740,6 +791,7 @@ export default class NotificationBackground {
    */
   private async saveOrUpdateCredentials(
     tab: chrome.tabs.Tab,
+    cipherId: CipherView["id"],
     edit: boolean,
     folderId?: string,
     skipReprompt: boolean = false,
@@ -764,7 +816,7 @@ export default class NotificationBackground {
 
       if (queueMessage.type === NotificationType.ChangePassword) {
         const {
-          data: { cipherId, newPassword },
+          data: { newPassword },
         } = queueMessage;
         const cipherView = await this.getDecryptedCipherById(cipherId, activeUserId);
 
@@ -1113,6 +1165,7 @@ export default class NotificationBackground {
     message: NotificationBackgroundExtensionMessage,
     sender: chrome.runtime.MessageSender,
   ): Promise<void> {
+    this.unlockPopoutTabId = undefined;
     const messageData = message.data as LockedVaultPendingNotificationsData;
     const retryCommand = messageData.commandToRetry.message.command as ExtensionCommandType;
     if (this.allowedRetryCommands.has(retryCommand)) {
@@ -1221,7 +1274,6 @@ export default class NotificationBackground {
     cipherView.folderId = folderId;
     cipherView.type = CipherType.Login;
     cipherView.login = loginView;
-    cipherView.organizationId = null;
 
     return cipherView;
   }
@@ -1264,4 +1316,43 @@ export default class NotificationBackground {
     const tabDomain = Utils.getDomain(tab.url);
     return tabDomain === queueMessage.domain || tabDomain === Utils.getDomain(queueMessage.tab.url);
   }
+
+  private setupUnlockPopoutCloseListener() {
+    chrome.tabs.onRemoved.addListener(async (tabId: number) => {
+      await this.handleUnlockPopoutClosed(tabId);
+    });
+  }
+
+  /**
+   * If the unlock popout is closed while the vault
+   * is still locked and there are pending autofill notifications, abandon them.
+   */
+  private async handleUnlockPopoutClosed(removedTabId: number) {
+    const authStatus = await this.getAuthStatus();
+    if (authStatus >= AuthenticationStatus.Unlocked) {
+      this.unlockPopoutTabId = undefined;
+      return;
+    }
+
+    if (this.unlockPopoutTabId === removedTabId) {
+      this.unlockPopoutTabId = undefined;
+      this.messagingService.send("abandonAutofillPendingNotifications");
+      return;
+    }
+
+    if (this.unlockPopoutTabId) {
+      return;
+    }
+
+    const extensionUrl = BrowserApi.getRuntimeURL("popup/index.html");
+    const unlockPopoutTabs = (await BrowserApi.tabsQuery({ url: `${extensionUrl}*` })).filter(
+      (tab) => tab.url?.includes(`singleActionPopout=${AuthPopoutType.unlockExtension}`),
+    );
+
+    if (unlockPopoutTabs.length === 0) {
+      this.messagingService.send("abandonAutofillPendingNotifications");
+    } else if (unlockPopoutTabs[0].id) {
+      this.unlockPopoutTabId = unlockPopoutTabs[0].id;
+    }
+  }
 }
diff --git a/apps/browser/src/autofill/background/overlay-notifications.background.ts b/apps/browser/src/autofill/background/overlay-notifications.background.ts
index 4657dfb6d1f..e08fe540710 100644
--- a/apps/browser/src/autofill/background/overlay-notifications.background.ts
+++ b/apps/browser/src/autofill/background/overlay-notifications.background.ts
@@ -455,12 +455,12 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
     notificationType: NotificationType,
   ): boolean => {
     switch (notificationType) {
-      case NotificationTypes.Change:
-        return modifyLoginData?.newPassword && !modifyLoginData.username;
       case NotificationTypes.Add:
         return (
           modifyLoginData?.username && !!(modifyLoginData.password || modifyLoginData.newPassword)
         );
+      case NotificationTypes.Change:
+        return !!(modifyLoginData.password || modifyLoginData.newPassword);
       case NotificationTypes.AtRiskPassword:
         return !modifyLoginData.newPassword;
       case NotificationTypes.Unlock:
diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts
index 47a5e8fec4c..50fb291b121 100644
--- a/apps/browser/src/autofill/background/overlay.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay.background.spec.ts
@@ -1,6 +1,7 @@
 import { mock, MockProxy, mockReset } from "jest-mock-extended";
 import { BehaviorSubject, of } from "rxjs";
 
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import {
@@ -105,6 +106,7 @@ describe("OverlayBackground", () => {
   let platformUtilsService: MockProxy<BrowserPlatformUtilsService>;
   let enablePasskeysMock$: BehaviorSubject<boolean>;
   let vaultSettingsServiceMock: MockProxy<VaultSettingsService>;
+  const policyService = mock<PolicyService>();
   let fido2ActiveRequestManager: Fido2ActiveRequestManager;
   let selectedThemeMock$: BehaviorSubject<ThemeType>;
   let inlineMenuFieldQualificationService: InlineMenuFieldQualificationService;
@@ -156,7 +158,11 @@ describe("OverlayBackground", () => {
     fakeStateProvider = new FakeStateProvider(accountService);
     showFaviconsMock$ = new BehaviorSubject(true);
     neverDomainsMock$ = new BehaviorSubject({});
-    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);
+    domainSettingsService = new DefaultDomainSettingsService(
+      fakeStateProvider,
+      policyService,
+      accountService,
+    );
     domainSettingsService.showFavicons$ = showFaviconsMock$;
     domainSettingsService.neverDomains$ = neverDomainsMock$;
     logService = mock<LogService>();
@@ -3280,6 +3286,9 @@ describe("OverlayBackground", () => {
           pageDetails: [pageDetailsForTab],
           fillNewPassword: true,
           allowTotpAutofill: true,
+          focusedFieldForm: undefined,
+          focusedFieldOpid: undefined,
+          inlineMenuFillType: undefined,
         });
         expect(overlayBackground["inlineMenuCiphers"].entries()).toStrictEqual(
           new Map([
@@ -3674,6 +3683,9 @@ describe("OverlayBackground", () => {
           pageDetails: [overlayBackground["pageDetailsForTab"][sender.tab.id].get(sender.frameId)],
           fillNewPassword: true,
           allowTotpAutofill: false,
+          focusedFieldForm: undefined,
+          focusedFieldOpid: undefined,
+          inlineMenuFillType: InlineMenuFillTypes.PasswordGeneration,
         });
       });
     });
diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts
index 35585d58863..af8141f1ab8 100644
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -1176,6 +1176,8 @@ export class OverlayBackground implements OverlayBackgroundInterface {
       fillNewPassword: true,
       allowTotpAutofill: true,
       focusedFieldForm: this.focusedFieldData?.focusedFieldForm,
+      focusedFieldOpid: this.focusedFieldData?.focusedFieldOpid,
+      inlineMenuFillType: this.focusedFieldData?.inlineMenuFillType,
     });
 
     if (totpCode) {
@@ -1861,6 +1863,8 @@ export class OverlayBackground implements OverlayBackgroundInterface {
       fillNewPassword: true,
       allowTotpAutofill: false,
       focusedFieldForm: this.focusedFieldData?.focusedFieldForm,
+      focusedFieldOpid: this.focusedFieldData?.focusedFieldOpid,
+      inlineMenuFillType: InlineMenuFillTypes.PasswordGeneration,
     });
 
     globalThis.setTimeout(async () => {
@@ -2945,17 +2949,21 @@ export class OverlayBackground implements OverlayBackgroundInterface {
       (await this.checkFocusedFieldHasValue(port.sender.tab)) &&
       (await this.shouldShowSaveLoginInlineMenuList(port.sender.tab));
 
+    const iframeUrl = BrowserApi.getRuntimeURL(
+      `overlay/menu-${isInlineMenuListPort ? "list" : "button"}.html`,
+    );
+    const styleSheetUrl = BrowserApi.getRuntimeURL(
+      `overlay/menu-${isInlineMenuListPort ? "list" : "button"}.css`,
+    );
+    const extensionOrigin = iframeUrl ? new URL(iframeUrl).origin : null;
+
     this.postMessageToPort(port, {
       command: `initAutofillInlineMenu${isInlineMenuListPort ? "List" : "Button"}`,
-      iframeUrl: chrome.runtime.getURL(
-        `overlay/menu-${isInlineMenuListPort ? "list" : "button"}.html`,
-      ),
+      iframeUrl,
       pageTitle: chrome.i18n.getMessage(
         isInlineMenuListPort ? "bitwardenVault" : "bitwardenOverlayButton",
       ),
-      styleSheetUrl: chrome.runtime.getURL(
-        `overlay/menu-${isInlineMenuListPort ? "list" : "button"}.css`,
-      ),
+      styleSheetUrl,
       theme: await firstValueFrom(this.themeStateService.selectedTheme$),
       translations: this.getInlineMenuTranslations(),
       ciphers: isInlineMenuListPort ? await this.getInlineMenuCipherData() : null,
@@ -2969,6 +2977,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
       showSaveLoginMenu,
       showInlineMenuAccountCreation,
       authStatus,
+      extensionOrigin,
     });
     this.updateInlineMenuPosition(
       port.sender,
diff --git a/apps/browser/src/autofill/background/tabs.background.spec.ts b/apps/browser/src/autofill/background/tabs.background.spec.ts
index 635ab8504a1..7bfa3b83c16 100644
--- a/apps/browser/src/autofill/background/tabs.background.spec.ts
+++ b/apps/browser/src/autofill/background/tabs.background.spec.ts
@@ -39,9 +39,7 @@ describe("TabsBackground", () => {
         "handleWindowOnFocusChanged",
       );
 
-      // 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
-      tabsBackground.init();
+      void tabsBackground.init();
 
       expect(chrome.windows.onFocusChanged.addListener).toHaveBeenCalledWith(
         handleWindowOnFocusChangedSpy,
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
index c33cb6a4371..6f0979d4fd5 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -191,9 +191,11 @@ export class ContextMenuClickedHandler {
           });
         } else {
           this.copyToClipboard({ text: cipher.login.password, tab: tab });
-          // 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_ClientCopiedPassword, cipher.id);
+
+          void this.eventCollectionService.collect(
+            EventType.Cipher_ClientCopiedPassword,
+            cipher.id,
+          );
         }
 
         break;
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
index 00ff55f5517..5a47975684c 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { firstValueFrom, map } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -179,9 +177,11 @@ export class MainContextMenuHandler {
 
     try {
       const account = await firstValueFrom(this.accountService.activeAccount$);
-      const hasPremium = await firstValueFrom(
-        this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
-      );
+      const hasPremium =
+        !!account?.id &&
+        (await firstValueFrom(
+          this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
+        ));
 
       const isCardRestricted = (
         await firstValueFrom(this.restrictedItemTypesService.restricted$)
@@ -198,14 +198,16 @@ export class MainContextMenuHandler {
         if (requiresPremiumAccess && !hasPremium) {
           continue;
         }
-        if (menuItem.id.startsWith(AUTOFILL_CARD_ID) && isCardRestricted) {
+        if (menuItem.id?.startsWith(AUTOFILL_CARD_ID) && isCardRestricted) {
           continue;
         }
 
         await MainContextMenuHandler.create({ ...otherOptions, contexts: ["all"] });
       }
     } catch (error) {
-      this.logService.warning(error.message);
+      if (error instanceof Error) {
+        this.logService.warning(error.message);
+      }
     } finally {
       this.initRunning = false;
     }
@@ -318,9 +320,11 @@ export class MainContextMenuHandler {
       }
 
       const account = await firstValueFrom(this.accountService.activeAccount$);
-      const canAccessPremium = await firstValueFrom(
-        this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
-      );
+      const canAccessPremium =
+        !!account?.id &&
+        (await firstValueFrom(
+          this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
+        ));
       if (canAccessPremium && (!cipher || !Utils.isNullOrEmpty(cipher.login?.totp))) {
         await createChildItem(COPY_VERIFICATION_CODE_ID);
       }
@@ -333,7 +337,9 @@ export class MainContextMenuHandler {
         await createChildItem(AUTOFILL_IDENTITY_ID);
       }
     } catch (error) {
-      this.logService.warning(error.message);
+      if (error instanceof Error) {
+        this.logService.warning(error.message);
+      }
     }
   }
 
@@ -351,7 +357,11 @@ export class MainContextMenuHandler {
       this.loadOptions(
         this.i18nService.t(authed ? "unlockVaultMenu" : "loginToVaultMenu"),
         NOOP_COMMAND_SUFFIX,
-      ).catch((error) => this.logService.warning(error.message));
+      ).catch((error) => {
+        if (error instanceof Error) {
+          return this.logService.warning(error.message);
+        }
+      });
     }
   }
 
@@ -363,7 +373,9 @@ export class MainContextMenuHandler {
         }
       }
     } catch (error) {
-      this.logService.warning(error.message);
+      if (error instanceof Error) {
+        this.logService.warning(error.message);
+      }
     }
   }
 
@@ -373,7 +385,9 @@ export class MainContextMenuHandler {
         await MainContextMenuHandler.create(menuItem);
       }
     } catch (error) {
-      this.logService.warning(error.message);
+      if (error instanceof Error) {
+        this.logService.warning(error.message);
+      }
     }
   }
 
@@ -383,7 +397,9 @@ export class MainContextMenuHandler {
         await MainContextMenuHandler.create(menuItem);
       }
     } catch (error) {
-      this.logService.warning(error.message);
+      if (error instanceof Error) {
+        this.logService.warning(error.message);
+      }
     }
   }
 
@@ -395,7 +411,9 @@ export class MainContextMenuHandler {
 
       await this.loadOptions(this.i18nService.t("addLoginMenu"), CREATE_LOGIN_ID);
     } catch (error) {
-      this.logService.warning(error.message);
+      if (error instanceof Error) {
+        this.logService.warning(error.message);
+      }
     }
   }
 }
diff --git a/apps/browser/src/autofill/content/auto-submit-login.ts b/apps/browser/src/autofill/content/auto-submit-login.ts
index ca5c8ebee80..511d35d7a49 100644
--- a/apps/browser/src/autofill/content/auto-submit-login.ts
+++ b/apps/browser/src/autofill/content/auto-submit-login.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";
@@ -123,9 +121,9 @@ import {
    * @param fillScript - The autofill script to use
    */
   function triggerAutoSubmitOnForm(fillScript: AutofillScript) {
-    const formOpid = fillScript.autosubmit[0];
+    const formOpid = fillScript.autosubmit?.[0];
 
-    if (formOpid === null) {
+    if (!formOpid) {
       triggerAutoSubmitOnFormlessFields(fillScript);
       return;
     }
@@ -159,8 +157,11 @@ import {
       fillScript.script[fillScript.script.length - 1][1],
     );
 
-    const lastFieldIsPasswordInput =
-      elementIsInputElement(currentElement) && currentElement.type === "password";
+    const lastFieldIsPasswordInput = !!(
+      currentElement &&
+      elementIsInputElement(currentElement) &&
+      currentElement.type === "password"
+    );
 
     while (currentElement && currentElement.tagName !== "HTML") {
       if (submitElementFoundAndClicked(currentElement, lastFieldIsPasswordInput)) {
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 b43bed7f96b..73fc1e79ec5 100644
--- a/apps/browser/src/autofill/content/components/buttons/action-button.ts
+++ b/apps/browser/src/autofill/content/components/buttons/action-button.ts
@@ -68,7 +68,7 @@ const actionButtonStyles = ({
   overflow: hidden;
   text-align: center;
   text-overflow: ellipsis;
-  font-weight: 700;
+  font-weight: 500;
 
   ${disabled || isLoading
     ? `
diff --git a/apps/browser/src/autofill/content/components/cipher/cipher-action.ts b/apps/browser/src/autofill/content/components/cipher/cipher-action.ts
index 34ad5e1c9a9..7a392849996 100644
--- a/apps/browser/src/autofill/content/components/cipher/cipher-action.ts
+++ b/apps/browser/src/autofill/content/components/cipher/cipher-action.ts
@@ -4,8 +4,10 @@ import { BadgeButton } from "../../../content/components/buttons/badge-button";
 import { EditButton } from "../../../content/components/buttons/edit-button";
 import { NotificationTypes } from "../../../notification/abstractions/notification-bar";
 import { I18n } from "../common-types";
+import { selectedCipher as selectedCipherSignal } from "../signals/selected-cipher";
 
 export type CipherActionProps = {
+  cipherId: string;
   handleAction?: (e: Event) => void;
   i18n: I18n;
   itemName: string;
@@ -15,6 +17,7 @@ export type CipherActionProps = {
 };
 
 export function CipherAction({
+  cipherId,
   handleAction = () => {
     /* no-op */
   },
@@ -24,9 +27,17 @@ export function CipherAction({
   theme,
   username,
 }: CipherActionProps) {
+  const selectCipherHandleAction = (e: Event) => {
+    selectedCipherSignal.set(cipherId);
+    try {
+      handleAction(e);
+    } finally {
+      selectedCipherSignal.set(null);
+    }
+  };
   return notificationType === NotificationTypes.Change
     ? BadgeButton({
-        buttonAction: handleAction,
+        buttonAction: selectCipherHandleAction,
         buttonText: i18n.notificationUpdate,
         itemName,
         theme,
diff --git a/apps/browser/src/autofill/content/components/cipher/cipher-item.ts b/apps/browser/src/autofill/content/components/cipher/cipher-item.ts
index ab3b57f535c..3bfc44636b3 100644
--- a/apps/browser/src/autofill/content/components/cipher/cipher-item.ts
+++ b/apps/browser/src/autofill/content/components/cipher/cipher-item.ts
@@ -40,6 +40,7 @@ export function CipherItem({
   if (notificationType === NotificationTypes.Change || notificationType === NotificationTypes.Add) {
     cipherActionButton = html`<div>
       ${CipherAction({
+        cipherId: cipher.id,
         handleAction,
         i18n,
         itemName: name,
diff --git a/apps/browser/src/autofill/content/components/cipher/types.ts b/apps/browser/src/autofill/content/components/cipher/types.ts
index 590311682bf..f8b5d2b85bf 100644
--- a/apps/browser/src/autofill/content/components/cipher/types.ts
+++ b/apps/browser/src/autofill/content/components/cipher/types.ts
@@ -1,3 +1,5 @@
+import { CipherIconDetails } from "@bitwarden/common/vault/icon/build-cipher-icon";
+
 export const CipherTypes = {
   Login: 1,
   SecureNote: 2,
@@ -22,20 +24,13 @@ export const OrganizationCategories = {
   family: "family",
 } as const;
 
-export type WebsiteIconData = {
-  imageEnabled: boolean;
-  image: string;
-  fallbackImage: string;
-  icon: string;
-};
-
 type BaseCipherData<CipherTypeValue> = {
   id: string;
   name: string;
   type: CipherTypeValue;
   reprompt: CipherRepromptType;
   favorite: boolean;
-  icon: WebsiteIconData;
+  icon: CipherIconDetails;
 };
 
 export type CipherData = BaseCipherData<CipherType> & {
diff --git a/apps/browser/src/autofill/content/components/constants/styles.ts b/apps/browser/src/autofill/content/components/constants/styles.ts
index 55130781808..c1d6228459a 100644
--- a/apps/browser/src/autofill/content/components/constants/styles.ts
+++ b/apps/browser/src/autofill/content/components/constants/styles.ts
@@ -144,17 +144,17 @@ export const border = {
 export const typography = {
   body1: `
     line-height: 24px;
-    font-family: Roboto, sans-serif;
+    font-family: Inter, sans-serif;
     font-size: 16px;
   `,
   body2: `
     line-height: 20px;
-    font-family: Roboto, sans-serif;
+    font-family: Inter, sans-serif;
     font-size: 14px;
   `,
   helperMedium: `
     line-height: 16px;
-    font-family: Roboto, sans-serif;
+    font-family: Inter, sans-serif;
     font-size: 12px;
   `,
 };
diff --git a/apps/browser/src/autofill/content/components/notification/at-risk-password/message.ts b/apps/browser/src/autofill/content/components/notification/at-risk-password/message.ts
index 42d4907711d..9c55c1e7e2b 100644
--- a/apps/browser/src/autofill/content/components/notification/at-risk-password/message.ts
+++ b/apps/browser/src/autofill/content/components/notification/at-risk-password/message.ts
@@ -29,7 +29,7 @@ const baseTextStyles = css`
   text-align: left;
   text-overflow: ellipsis;
   line-height: 24px;
-  font-family: Roboto, sans-serif;
+  font-family: Inter, sans-serif;
   font-size: 16px;
 `;
 
diff --git a/apps/browser/src/autofill/content/components/notification/confirmation/message.ts b/apps/browser/src/autofill/content/components/notification/confirmation/message.ts
index 7f15d882297..36ea9c1f9d6 100644
--- a/apps/browser/src/autofill/content/components/notification/confirmation/message.ts
+++ b/apps/browser/src/autofill/content/components/notification/confirmation/message.ts
@@ -84,7 +84,7 @@ const baseTextStyles = css`
   text-align: left;
   text-overflow: ellipsis;
   line-height: 24px;
-  font-family: Roboto, sans-serif;
+  font-family: Inter, sans-serif;
   font-size: 16px;
 `;
 
@@ -115,7 +115,7 @@ const notificationConfirmationButtonTextStyles = (theme: Theme) => css`
   ${baseTextStyles}
 
   color: ${themes[theme].primary[600]};
-  font-weight: 700;
+  font-weight: 500;
   cursor: pointer;
 `;
 
diff --git a/apps/browser/src/autofill/content/components/notification/header-message.ts b/apps/browser/src/autofill/content/components/notification/header-message.ts
index 47fe8cd2828..2e51d82dd07 100644
--- a/apps/browser/src/autofill/content/components/notification/header-message.ts
+++ b/apps/browser/src/autofill/content/components/notification/header-message.ts
@@ -19,7 +19,7 @@ const notificationHeaderMessageStyles = (theme: Theme) => css`
   line-height: 28px;
   white-space: nowrap;
   color: ${themes[theme].text.main};
-  font-family: Roboto, sans-serif;
+  font-family: Inter, sans-serif;
   font-size: 18px;
-  font-weight: 600;
+  font-weight: 500;
 `;
diff --git a/apps/browser/src/autofill/content/components/option-selection/option-items.ts b/apps/browser/src/autofill/content/components/option-selection/option-items.ts
index ceb72905357..58216b6c1b2 100644
--- a/apps/browser/src/autofill/content/components/option-selection/option-items.ts
+++ b/apps/browser/src/autofill/content/components/option-selection/option-items.ts
@@ -94,7 +94,7 @@ const optionsLabelStyles = ({ theme }: { theme: Theme }) => css`
   user-select: none;
   padding: 0.375rem ${spacing["3"]};
   color: ${themes[theme].text.muted};
-  font-weight: 600;
+  font-weight: 500;
 `;
 
 export const optionsMenuItemMaxWidth = 260;
diff --git a/apps/browser/src/autofill/content/components/rows/action-row.ts b/apps/browser/src/autofill/content/components/rows/action-row.ts
index 0380f91012a..8f13b166156 100644
--- a/apps/browser/src/autofill/content/components/rows/action-row.ts
+++ b/apps/browser/src/autofill/content/components/rows/action-row.ts
@@ -34,7 +34,7 @@ const actionRowStyles = (theme: Theme) => css`
   min-height: 40px;
   text-align: left;
   color: ${themes[theme].primary["600"]};
-  font-weight: 700;
+  font-weight: 500;
 
   > span {
     display: block;
diff --git a/apps/browser/src/autofill/content/components/signals/selected-cipher.ts b/apps/browser/src/autofill/content/components/signals/selected-cipher.ts
new file mode 100644
index 00000000000..360457233f5
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/signals/selected-cipher.ts
@@ -0,0 +1,3 @@
+import { signal } from "@lit-labs/signals";
+
+export const selectedCipher = signal<string | null>(null);
diff --git a/apps/browser/src/autofill/content/content-message-handler.spec.ts b/apps/browser/src/autofill/content/content-message-handler.spec.ts
index fe023f344d6..874e1cc76ff 100644
--- a/apps/browser/src/autofill/content/content-message-handler.spec.ts
+++ b/apps/browser/src/autofill/content/content-message-handler.spec.ts
@@ -56,7 +56,11 @@ describe("ContentMessageHandler", () => {
     });
 
     it("sends an authResult message", () => {
-      postWindowMessage({ command: "authResult", lastpass: true, code: "code", state: "state" });
+      postWindowMessage(
+        { command: "authResult", lastpass: true, code: "code", state: "state" },
+        "https://localhost/",
+        window,
+      );
 
       expect(sendMessageSpy).toHaveBeenCalledWith({
         command: "authResult",
@@ -68,7 +72,11 @@ describe("ContentMessageHandler", () => {
     });
 
     it("sends a webAuthnResult message", () => {
-      postWindowMessage({ command: "webAuthnResult", data: "data", remember: true });
+      postWindowMessage(
+        { command: "webAuthnResult", data: "data", remember: true },
+        "https://localhost/",
+        window,
+      );
 
       expect(sendMessageSpy).toHaveBeenCalledWith({
         command: "webAuthnResult",
@@ -82,7 +90,7 @@ describe("ContentMessageHandler", () => {
       const mockCode = "mockCode";
       const command = "duoResult";
 
-      postWindowMessage({ command: command, code: mockCode });
+      postWindowMessage({ command: command, code: mockCode }, "https://localhost/", window);
 
       expect(sendMessageSpy).toHaveBeenCalledWith({
         command: command,
diff --git a/apps/browser/src/autofill/content/content-message-handler.ts b/apps/browser/src/autofill/content/content-message-handler.ts
index c57b2d959f3..63afc215923 100644
--- a/apps/browser/src/autofill/content/content-message-handler.ts
+++ b/apps/browser/src/autofill/content/content-message-handler.ts
@@ -86,17 +86,30 @@ function handleOpenBrowserExtensionToUrlMessage({ url }: { url?: ExtensionPageUr
 }
 
 /**
- * Handles the window message event.
+ * Handles window message events, validating source and extracting referrer for security.
  *
  * @param event - The window message event
  */
 function handleWindowMessageEvent(event: MessageEvent) {
-  const { source, data } = event;
+  const { source, data, origin } = event;
   if (source !== window || !data?.command) {
     return;
   }
 
-  const referrer = source.location.hostname;
+  // Extract hostname from event.origin for secure referrer validation in background script
+  let referrer: string;
+  // Sandboxed iframe or opaque origin support
+  if (origin === "null") {
+    referrer = "null";
+  } else {
+    try {
+      const originUrl = new URL(origin);
+      referrer = originUrl.hostname;
+    } catch {
+      return;
+    }
+  }
+
   const handler = windowMessageHandlers[data.command];
   if (handler) {
     handler({ data, referrer });
diff --git a/apps/browser/src/autofill/content/context-menu-handler.ts b/apps/browser/src/autofill/content/context-menu-handler.ts
index 82cf95afc81..d3926d57c9a 100644
--- a/apps/browser/src/autofill/content/context-menu-handler.ts
+++ b/apps/browser/src/autofill/content/context-menu-handler.ts
@@ -1,43 +1,43 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 const inputTags = ["input", "textarea", "select"];
 const labelTags = ["label", "span"];
-const attributes = ["id", "name", "label-aria", "placeholder"];
+const attributeKeys = ["id", "name", "label-aria", "placeholder"];
 const invalidElement = chrome.i18n.getMessage("copyCustomFieldNameInvalidElement");
 const noUniqueIdentifier = chrome.i18n.getMessage("copyCustomFieldNameNotUnique");
 
-let clickedEl: HTMLElement = null;
+let clickedElement: HTMLElement | null = null;
 
 // Find the best attribute to be used as the Name for an element in a custom field.
 function getClickedElementIdentifier() {
-  if (clickedEl == null) {
+  if (clickedElement == null) {
     return invalidElement;
   }
 
-  const clickedTag = clickedEl.nodeName.toLowerCase();
-  let inputEl = null;
+  const clickedTag = clickedElement.nodeName.toLowerCase();
+  let inputElement = null;
 
   // Try to identify the input element (which may not be the clicked element)
   if (labelTags.includes(clickedTag)) {
-    let inputId = null;
+    let inputId;
     if (clickedTag === "label") {
-      inputId = clickedEl.getAttribute("for");
+      inputId = clickedElement.getAttribute("for");
     } else {
-      inputId = clickedEl.closest("label")?.getAttribute("for");
+      inputId = clickedElement.closest("label")?.getAttribute("for");
     }
 
-    inputEl = document.getElementById(inputId);
+    if (inputId) {
+      inputElement = document.getElementById(inputId);
+    }
   } else {
-    inputEl = clickedEl;
+    inputElement = clickedElement;
   }
 
-  if (inputEl == null || !inputTags.includes(inputEl.nodeName.toLowerCase())) {
+  if (inputElement == null || !inputTags.includes(inputElement.nodeName.toLowerCase())) {
     return invalidElement;
   }
 
-  for (const attr of attributes) {
-    const attributeValue = inputEl.getAttribute(attr);
-    const selector = "[" + attr + '="' + attributeValue + '"]';
+  for (const attributeKey of attributeKeys) {
+    const attributeValue = inputElement.getAttribute(attributeKey);
+    const selector = "[" + attributeKey + '="' + attributeValue + '"]';
     if (!isNullOrEmpty(attributeValue) && document.querySelectorAll(selector)?.length === 1) {
       return attributeValue;
     }
@@ -45,14 +45,14 @@ function getClickedElementIdentifier() {
   return noUniqueIdentifier;
 }
 
-function isNullOrEmpty(s: string) {
+function isNullOrEmpty(s: string | null) {
   return s == null || s === "";
 }
 
 // We only have access to the element that's been clicked when the context menu is first opened.
 // Remember it for use later.
 document.addEventListener("contextmenu", (event) => {
-  clickedEl = event.target as HTMLElement;
+  clickedElement = event.target as HTMLElement;
 });
 
 // Runs when the 'Copy Custom Field Name' context menu item is actually clicked.
@@ -62,9 +62,8 @@ chrome.runtime.onMessage.addListener((event, _sender, sendResponse) => {
     if (sendResponse) {
       sendResponse(identifier);
     }
-    // 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({
+
+    void chrome.runtime.sendMessage({
       command: "getClickedElementResponse",
       sender: "contextMenuHandler",
       identifier: identifier,
diff --git a/apps/browser/src/autofill/fido2/background/abstractions/fido2.background.ts b/apps/browser/src/autofill/fido2/background/abstractions/fido2.background.ts
index 6ad069ad56e..b341be28ebb 100644
--- a/apps/browser/src/autofill/fido2/background/abstractions/fido2.background.ts
+++ b/apps/browser/src/autofill/fido2/background/abstractions/fido2.background.ts
@@ -13,6 +13,7 @@ type SharedFido2ScriptRegistrationOptions = SharedFido2ScriptInjectionDetails &
   matches: string[];
   excludeMatches: string[];
   allFrames: true;
+  world?: "MAIN" | "ISOLATED";
 };
 
 type Fido2ExtensionMessage = {
diff --git a/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts b/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts
index 752851b3d37..76ad78a6cd8 100644
--- a/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts
+++ b/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts
@@ -203,6 +203,7 @@ describe("Fido2Background", () => {
             { file: Fido2ContentScript.PageScriptDelayAppend },
             { file: Fido2ContentScript.ContentScript },
           ],
+          world: "ISOLATED",
           ...sharedRegistrationOptions,
         });
       });
diff --git a/apps/browser/src/autofill/fido2/background/fido2.background.ts b/apps/browser/src/autofill/fido2/background/fido2.background.ts
index 22ee4a1822d..0ee7a43767f 100644
--- a/apps/browser/src/autofill/fido2/background/fido2.background.ts
+++ b/apps/browser/src/autofill/fido2/background/fido2.background.ts
@@ -176,6 +176,7 @@ export class Fido2Background implements Fido2BackgroundInterface {
         { file: await this.getFido2PageScriptAppendFileName() },
         { file: Fido2ContentScript.ContentScript },
       ],
+      world: "ISOLATED",
       ...this.sharedRegistrationOptions,
     });
   }
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
index b444c967080..0b10841e390 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
@@ -29,38 +29,48 @@ describe("FIDO2 page-script for manifest v2", () => {
     expect(window.document.createElement).not.toHaveBeenCalled();
   });
 
-  it("appends the `page-script.js` file to the document head when the contentType is `text/html`", () => {
+  it("appends the `page-script.js` file to the document head when the contentType is `text/html`", async () => {
+    const scriptContents = "test-script-contents";
     jest.spyOn(window.document.head, "prepend").mockImplementation((node) => {
       createdScriptElement = node as HTMLScriptElement;
       return node;
     });
+    window.fetch = jest.fn().mockResolvedValue({
+      text: () => Promise.resolve(scriptContents),
+    } as Response);
 
     // FIXME: Remove when updating file. Eslint update
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-page-script-delay-append.mv2.ts");
+    await jest.runAllTimersAsync();
 
     expect(window.document.createElement).toHaveBeenCalledWith("script");
     expect(chrome.runtime.getURL).toHaveBeenCalledWith(Fido2ContentScript.PageScript);
     expect(window.document.head.prepend).toHaveBeenCalledWith(expect.any(HTMLScriptElement));
-    expect(createdScriptElement.src).toBe(`chrome-extension://id/${Fido2ContentScript.PageScript}`);
+    expect(createdScriptElement.innerHTML).toBe(scriptContents);
   });
 
-  it("appends the `page-script.js` file to the document element if the head is not available", () => {
+  it("appends the `page-script.js` file to the document element if the head is not available", async () => {
+    const scriptContents = "test-script-contents";
     window.document.documentElement.removeChild(window.document.head);
     jest.spyOn(window.document.documentElement, "prepend").mockImplementation((node) => {
       createdScriptElement = node as HTMLScriptElement;
       return node;
     });
+    window.fetch = jest.fn().mockResolvedValue({
+      text: () => Promise.resolve(scriptContents),
+    } as Response);
 
     // FIXME: Remove when updating file. Eslint update
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-page-script-delay-append.mv2.ts");
+    await jest.runAllTimersAsync();
 
     expect(window.document.createElement).toHaveBeenCalledWith("script");
     expect(chrome.runtime.getURL).toHaveBeenCalledWith(Fido2ContentScript.PageScript);
     expect(window.document.documentElement.prepend).toHaveBeenCalledWith(
       expect.any(HTMLScriptElement),
     );
-    expect(createdScriptElement.src).toBe(`chrome-extension://id/${Fido2ContentScript.PageScript}`);
+    expect(createdScriptElement.innerHTML).toBe(scriptContents);
   });
 });
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts
index 775bc76266d..8c0d17c7e21 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts
@@ -2,15 +2,26 @@
  * This script handles injection of the FIDO2 override page script into the document.
  * This is required for manifest v2, but will be removed when we migrate fully to manifest v3.
  */
-(function (globalContext) {
+void (async function (globalContext) {
   if (globalContext.document.contentType !== "text/html") {
     return;
   }
 
   const script = globalContext.document.createElement("script");
-  script.src = chrome.runtime.getURL("content/fido2-page-script.js");
   script.async = false;
 
+  const pageScriptUrl = chrome.runtime.getURL("content/fido2-page-script.js");
+  // Inject the script contents directly to avoid leaking the extension URL
+  try {
+    const response = await fetch(pageScriptUrl);
+    const scriptContents = await response.text();
+    script.innerHTML = scriptContents;
+  } catch {
+    // eslint-disable-next-line no-console
+    console.error("Failed to load FIDO2 page script contents. Injection failed.");
+    return;
+  }
+
   // We are ensuring that the script injection is delayed in the event that we are loading
   // within an iframe element. This prevents an issue with web mail clients that load content
   // using ajax within iframes. In particular, Zimbra web mail client was observed to have this issue.
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
index 5b9ea5e5b27..1cd614a9516 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
@@ -267,9 +267,7 @@ import { Messenger } from "./messaging/messenger";
 
       clearWaitForFocus();
       void messenger.destroy();
-      // FIXME: Remove when updating file. Eslint update
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    } catch (e) {
+    } catch {
       /** empty */
     }
   }
diff --git a/apps/browser/src/autofill/fido2/content/messaging/messenger.spec.ts b/apps/browser/src/autofill/fido2/content/messaging/messenger.spec.ts
index 5283c60882d..1aa8c27c0ae 100644
--- a/apps/browser/src/autofill/fido2/content/messaging/messenger.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/messaging/messenger.spec.ts
@@ -31,9 +31,8 @@ describe("Messenger", () => {
 
   it("should deliver message to B when sending request from A", () => {
     const request = createRequest();
-    // 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
-    messengerA.request(request);
+
+    void messengerA.request(request);
 
     const received = handlerB.receive();
 
@@ -66,14 +65,13 @@ describe("Messenger", () => {
 
   it("should deliver abort signal to B when requesting abort", () => {
     const abortController = new AbortController();
-    // 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
-    messengerA.request(createRequest(), abortController.signal);
+
+    void messengerA.request(createRequest(), abortController.signal);
     abortController.abort();
 
     const received = handlerB.receive();
 
-    expect(received[0].abortController.signal.aborted).toBe(true);
+    expect(received[0].abortController?.signal.aborted).toBe(true);
   });
 
   describe("destroy", () => {
@@ -103,29 +101,25 @@ describe("Messenger", () => {
 
     it("should dispatch the destroy event on messenger destruction", async () => {
       const request = createRequest();
-      // 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
-      messengerA.request(request);
+
+      void messengerA.request(request);
 
       const dispatchEventSpy = jest.spyOn((messengerA as any).onDestroy, "dispatchEvent");
-      // 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
-      messengerA.destroy();
+
+      void messengerA.destroy();
 
       expect(dispatchEventSpy).toHaveBeenCalledWith(expect.any(Event));
     });
 
     it("should trigger onDestroyListener when the destroy event is dispatched", async () => {
       const request = createRequest();
-      // 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
-      messengerA.request(request);
+
+      void messengerA.request(request);
 
       const onDestroyListener = jest.fn();
       (messengerA as any).onDestroy.addEventListener("destroy", onDestroyListener);
-      // 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
-      messengerA.destroy();
+
+      void messengerA.destroy();
 
       expect(onDestroyListener).toHaveBeenCalled();
       const eventArg = onDestroyListener.mock.calls[0][0];
@@ -213,7 +207,7 @@ class MockMessagePort<T> {
   remotePort: MockMessagePort<T>;
 
   postMessage(message: T, port?: MessagePort) {
-    this.remotePort.onmessage(
+    this.remotePort.onmessage?.(
       new MessageEvent("message", {
         data: message,
         ports: port ? [port] : [],
diff --git a/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts b/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
index 8de48a49a8e..5818bbf8d82 100644
--- a/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
+++ b/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
@@ -6,7 +6,7 @@ import {
   filter,
   firstValueFrom,
   fromEvent,
-  fromEventPattern,
+  map,
   merge,
   Observable,
   Subject,
@@ -28,6 +28,7 @@ import {
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
+import { fromChromeEvent } from "../../../platform/browser/from-chrome-event";
 // FIXME (PM-22628): Popup imports are forbidden in background
 // eslint-disable-next-line no-restricted-imports
 import { closeFido2Popout, openFido2Popout } from "../../../vault/popup/utils/vault-popout-window";
@@ -154,9 +155,7 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi
   }
 
   static sendMessage(msg: BrowserFido2Message) {
-    // 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.sendMessage(BrowserFido2MessageName, msg);
+    void BrowserApi.sendMessage(BrowserFido2MessageName, msg);
   }
 
   static abortPopout(sessionId: string, fallbackRequested = false) {
@@ -205,9 +204,7 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi
     fromEvent(abortController.signal, "abort")
       .pipe(takeUntil(this.destroy$))
       .subscribe(() => {
-        // 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.close();
+        void this.close();
         BrowserFido2UserInterfaceSession.sendMessage({
           type: BrowserFido2MessageTypes.AbortRequest,
           sessionId: this.sessionId,
@@ -223,21 +220,13 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi
       )
       .subscribe((msg) => {
         if (msg.type === BrowserFido2MessageTypes.AbortResponse) {
-          // 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.close();
-          // 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.abort(msg.fallbackRequested);
+          void this.close();
+          void this.abort(msg.fallbackRequested);
         }
       });
 
-    this.windowClosed$ = fromEventPattern(
-      // FIXME: Make sure that is does not cause a memory leak in Safari or use BrowserApi.AddListener
-      // and test that it doesn't break. Tracking Ticket: https://bitwarden.atlassian.net/browse/PM-4735
-      // eslint-disable-next-line no-restricted-syntax
-      (handler: any) => chrome.windows.onRemoved.addListener(handler),
-      (handler: any) => chrome.windows.onRemoved.removeListener(handler),
+    this.windowClosed$ = fromChromeEvent(chrome.windows.onRemoved).pipe(
+      map(([windowId]) => windowId),
     );
 
     BrowserFido2UserInterfaceSession.sendMessage({
@@ -391,12 +380,8 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi
         takeUntil(this.destroy$),
       )
       .subscribe(() => {
-        // 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.close();
-        // 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.abort(true);
+        void this.close();
+        void this.abort(true);
       });
 
     await connectPromise;
diff --git a/apps/browser/src/autofill/models/autofill-field.ts b/apps/browser/src/autofill/models/autofill-field.ts
index 1a8c3bb875b..9d2cf3773d4 100644
--- a/apps/browser/src/autofill/models/autofill-field.ts
+++ b/apps/browser/src/autofill/models/autofill-field.ts
@@ -1,6 +1,4 @@
 import { FieldRect } from "../background/abstractions/overlay.background";
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { AutofillFieldQualifierType } from "../enums/autofill-field.enums";
 import {
   InlineMenuAccountCreationFieldTypes,
@@ -13,34 +11,36 @@ import {
 export default class AutofillField {
   [key: string]: any;
   /**
-   * The unique identifier assigned to this field during collection of the page details
+   * Non-null asserted. The unique identifier assigned to this field during collection of the page details
    */
-  opid: string;
+  opid!: string;
   /**
-   * Sequential number assigned to each element collected, based on its position in the DOM.
+   * Non-null asserted. Sequential number assigned to each element collected, based on its position in the DOM.
    * Used to do perform proximal checks for username and password fields on the DOM.
    */
-  elementNumber: number;
+  elementNumber!: number;
   /**
-   * Designates whether the field is viewable on the current part of the DOM that the user can see
+   * Non-null asserted. Designates whether the field is viewable on the current part of the DOM that the user can see
    */
-  viewable: boolean;
+  viewable!: boolean;
   /**
-   * The HTML `id` attribute of the field
+   * Non-null asserted. The HTML `id` attribute of the field
    */
-  htmlID: string | null;
+  htmlID!: string | null;
   /**
-   * The HTML `name` attribute of the field
+   * Non-null asserted. The HTML `name` attribute of the field
    */
-  htmlName: string | null;
+  htmlName!: string | null;
   /**
-   * The HTML `class` attribute of the field
+   * Non-null asserted. The HTML `class` attribute of the field
    */
-  htmlClass: string | null;
+  htmlClass!: string | null;
 
-  tabindex: string | null;
+  /** Non-null asserted. */
+  tabindex!: string | null;
 
-  title: string | null;
+  /** Non-null asserted. */
+  title!: string | null;
   /**
    * The `tagName` for the field
    */
diff --git a/apps/browser/src/autofill/models/autofill-form.ts b/apps/browser/src/autofill/models/autofill-form.ts
index d335a81b3c4..e9161620527 100644
--- a/apps/browser/src/autofill/models/autofill-form.ts
+++ b/apps/browser/src/autofill/models/autofill-form.ts
@@ -1,28 +1,31 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 /**
  * Represents an HTML form whose elements can be autofilled
  */
 export default class AutofillForm {
   [key: string]: any;
+
   /**
-   * The unique identifier assigned to this field during collection of the page details
+   * Non-null asserted. The unique identifier assigned to this field during collection of the page details
    */
-  opid: string;
+  opid!: string;
+
   /**
-   * The HTML `name` attribute of the form field
+   * Non-null asserted. The HTML `name` attribute of the form field
    */
-  htmlName: string;
+  htmlName!: string;
+
   /**
-   * The HTML `id` attribute of the form field
+   * Non-null asserted. The HTML `id` attribute of the form field
    */
-  htmlID: string;
+  htmlID!: string;
+
   /**
-   * The HTML `action` attribute of the form field
+   * Non-null asserted. The HTML `action` attribute of the form field
    */
-  htmlAction: string;
+  htmlAction!: string;
+
   /**
-   * The HTML `method` attribute of the form field
+   * Non-null asserted. The HTML `method` attribute of the form field.
    */
-  htmlMethod: string;
+  htmlMethod!: "get" | "post" | string;
 }
diff --git a/apps/browser/src/autofill/models/autofill-page-details.ts b/apps/browser/src/autofill/models/autofill-page-details.ts
index c32dfed4e43..ca8c66a3152 100644
--- a/apps/browser/src/autofill/models/autofill-page-details.ts
+++ b/apps/browser/src/autofill/models/autofill-page-details.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import AutofillField from "./autofill-field";
 import AutofillForm from "./autofill-form";
 
@@ -7,16 +5,20 @@ import AutofillForm from "./autofill-form";
  * The details of a page that have been collected and can be used for autofill
  */
 export default class AutofillPageDetails {
-  title: string;
-  url: string;
-  documentUrl: string;
+  /** Non-null asserted. */
+  title!: string;
+  /** Non-null asserted. */
+  url!: string;
+  /** Non-null asserted. */
+  documentUrl!: string;
   /**
-   * A collection of all of the forms in the page DOM, keyed by their `opid`
+   * Non-null asserted. A collection of all of the forms in the page DOM, keyed by their `opid`
    */
-  forms: { [id: string]: AutofillForm };
+  forms!: { [id: string]: AutofillForm };
   /**
-   * A collection of all the fields in the page DOM, keyed by their `opid`
+   * Non-null asserted. A collection of all the fields in the page DOM, keyed by their `opid`
    */
-  fields: AutofillField[];
-  collectedTimestamp: number;
+  fields!: AutofillField[];
+  /** Non-null asserted. */
+  collectedTimestamp!: number;
 }
diff --git a/apps/browser/src/autofill/models/autofill-script.ts b/apps/browser/src/autofill/models/autofill-script.ts
index 1da05e07308..43c85c58c9a 100644
--- a/apps/browser/src/autofill/models/autofill-script.ts
+++ b/apps/browser/src/autofill/models/autofill-script.ts
@@ -1,26 +1,33 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-// String values affect code flow in autofill.ts and must not be changed
-export type FillScriptActions = "click_on_opid" | "focus_by_opid" | "fill_by_opid";
-
 export type FillScript = [action: FillScriptActions, opid: string, value?: string];
 
 export type AutofillScriptProperties = {
   delay_between_operations?: number;
 };
 
+export const FillScriptActionTypes = {
+  fill_by_opid: "fill_by_opid",
+  click_on_opid: "click_on_opid",
+  focus_by_opid: "focus_by_opid",
+} as const;
+
+// String values affect code flow in autofill.ts and must not be changed
+export type FillScriptActions = keyof typeof FillScriptActionTypes;
+
 export type AutofillInsertActions = {
-  fill_by_opid: ({ opid, value }: { opid: string; value: string }) => void;
-  click_on_opid: ({ opid }: { opid: string }) => void;
-  focus_by_opid: ({ opid }: { opid: string }) => void;
+  [FillScriptActionTypes.fill_by_opid]: ({ opid, value }: { opid: string; value: string }) => void;
+  [FillScriptActionTypes.click_on_opid]: ({ opid }: { opid: string }) => void;
+  [FillScriptActionTypes.focus_by_opid]: ({ opid }: { opid: string }) => void;
 };
 
 export default class AutofillScript {
   script: FillScript[] = [];
   properties: AutofillScriptProperties = {};
-  metadata: any = {}; // Unused, not written or read
-  autosubmit: string[]; // Appears to be unused, read but not written
-  savedUrls: string[];
-  untrustedIframe: boolean;
-  itemType: string; // Appears to be unused, read but not written
+  /** Non-null asserted. */
+  autosubmit!: string[] | null; // Appears to be unused, read but not written
+  /** Non-null asserted. */
+  savedUrls!: string[];
+  /** Non-null asserted. */
+  untrustedIframe!: boolean;
+  /** Non-null asserted. */
+  itemType!: string; // Appears to be unused, read but not written
 }
diff --git a/apps/browser/src/autofill/notification/abstractions/notification-bar.ts b/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
index 7881d2f1cac..b23c3c17abb 100644
--- a/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
+++ b/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
@@ -51,6 +51,7 @@ type NotificationBarWindowMessage = {
   };
   error?: string;
   initData?: NotificationBarIframeInitData;
+  parentOrigin?: string;
 };
 
 type NotificationBarWindowMessageHandlers = {
diff --git a/apps/browser/src/autofill/notification/bar.html b/apps/browser/src/autofill/notification/bar.html
index 796601057d8..8934fe6a031 100644
--- a/apps/browser/src/autofill/notification/bar.html
+++ b/apps/browser/src/autofill/notification/bar.html
@@ -4,55 +4,5 @@
     <title>Bitwarden</title>
     <meta charset="utf-8" />
   </head>
-
-  <body>
-    <div id="notification-bar-outer-wrapper" class="outer-wrapper">
-      <div class="logo-wrapper">
-        <a href="https://vault.bitwarden.com" target="_blank" id="logo-link" rel="noreferrer">
-          <img id="logo" alt="Bitwarden" />
-        </a>
-      </div>
-      <div id="content"></div>
-      <div class="notification-close">
-        <button type="button" class="neutral" id="close-button">
-          <svg id="close" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
-            <path
-              d="M14.431 13.57 8.865 8.173a.388.388 0 0 1 0-.559l5.498-5.33a.388.388 0 0 0-.005-.553.415.415 0 0 0-.572-.006l-5.498 5.33a.416.416 0 0 1-.577 0L2.196 1.72a.403.403 0 0 0-.29-.12.422.422 0 0 0-.292.115.395.395 0 0 0-.12.283.386.386 0 0 0 .125.28l5.515 5.338a.388.388 0 0 1 0 .559L1.56 13.568a.397.397 0 0 0-.12.28c0 .105.044.205.12.28a.416.416 0 0 0 .578-.001l5.574-5.395a.416.416 0 0 1 .577 0l5.567 5.395a.422.422 0 0 0 .582.005.398.398 0 0 0 .12-.282.387.387 0 0 0-.125-.281Z"
-            />
-          </svg>
-        </button>
-      </div>
-    </div>
-  </body>
-
-  <template id="template-add">
-    <div class="inner-wrapper">
-      <div id="add-text" class="notification-body"></div>
-      <div class="add-change-cipher-buttons notification-actions">
-        <button type="button" id="never-save" class="link"></button>
-        <select id="select-folder"></select>
-        <button type="button" id="add-edit" class="secondary"></button>
-        <button type="button" id="add-save" class="primary"></button>
-      </div>
-    </div>
-  </template>
-
-  <template id="template-change">
-    <div class="inner-wrapper">
-      <div id="change-text" class="notification-body"></div>
-      <div class="add-change-cipher-buttons notification-actions">
-        <button type="button" id="change-edit" class="secondary"></button>
-        <button type="button" id="change-save" class="primary"></button>
-      </div>
-    </div>
-  </template>
-
-  <template id="template-unlock">
-    <div class="inner-wrapper">
-      <div id="unlock-text" class="notification-body"></div>
-      <div class="notification-actions">
-        <button type="button" id="unlock-vault" class="primary"></button>
-      </div>
-    </div>
-  </template>
+  <body></body>
 </html>
diff --git a/apps/browser/src/autofill/notification/bar.scss b/apps/browser/src/autofill/notification/bar.scss
deleted file mode 100644
index c91c5f3ebac..00000000000
--- a/apps/browser/src/autofill/notification/bar.scss
+++ /dev/null
@@ -1,304 +0,0 @@
-@import "../shared/styles/variables";
-
-body {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-  font-size: 14px;
-  line-height: 16px;
-  font-family: $font-family-sans-serif;
-
-  @include themify($themes) {
-    color: themed("textColor");
-    background-color: themed("backgroundColor");
-  }
-}
-
-img {
-  margin: 0;
-  padding: 0;
-  border: 0;
-}
-
-button,
-select {
-  font-size: $font-size-base;
-  font-family: $font-family-sans-serif;
-}
-
-.outer-wrapper {
-  display: block;
-  position: relative;
-  padding: 8px;
-  min-height: 42px;
-  border: 1px solid transparent;
-  border-bottom: 2px solid transparent;
-  border-radius: 4px;
-  box-sizing: border-box;
-
-  @include themify($themes) {
-    border-color: themed("borderColor");
-    border-bottom-color: themed("primaryColor");
-  }
-
-  &.success-event {
-    @include themify($themes) {
-      border-bottom-color: themed("successColor");
-    }
-  }
-
-  &.error-event {
-    @include themify($themes) {
-      border-bottom-color: themed("errorColor");
-    }
-  }
-}
-
-.inner-wrapper {
-  display: grid;
-  grid-template-columns: auto max-content;
-}
-
-.outer-wrapper > *,
-.inner-wrapper > * {
-  align-self: center;
-}
-
-#logo {
-  width: 24px;
-  height: 24px;
-  display: block;
-}
-
-.logo-wrapper {
-  position: absolute;
-  top: 8px;
-  left: 10px;
-  overflow: hidden;
-}
-
-#close-button {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 30px;
-  height: 30px;
-  margin-right: 10px;
-  padding: 0;
-
-  &:hover {
-    @include themify($themes) {
-      border-color: rgba(themed("textColor"), 0.2);
-      background-color: rgba(themed("textColor"), 0.2);
-    }
-  }
-}
-
-#close {
-  display: block;
-  width: 16px;
-  height: 16px;
-
-  > path {
-    @include themify($themes) {
-      fill: themed("textColor");
-    }
-  }
-}
-
-.notification-close {
-  position: absolute;
-  top: 6px;
-  right: 6px;
-}
-
-#content .inner-wrapper {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: flex-start;
-
-  .notification-body {
-    width: 100%;
-    padding: 4px 38px 24px 42px;
-    font-weight: 400;
-  }
-
-  .notification-actions {
-    display: flex;
-    width: 100%;
-    align-items: stretch;
-    justify-content: flex-end;
-
-    #never-save {
-      margin-right: auto;
-      padding: 0;
-      font-size: 16px;
-      font-weight: 500;
-      letter-spacing: 0.5px;
-    }
-
-    #select-folder {
-      width: 125px;
-      margin-right: 6px;
-      font-size: 12px;
-      appearance: none;
-      background-repeat: no-repeat;
-      background-position: center right 4px;
-      background-size: 16px;
-
-      @include themify($themes) {
-        color: themed("mutedTextColor");
-        border-color: themed("mutedTextColor");
-      }
-
-      &:not([disabled]) {
-        display: block;
-      }
-    }
-
-    .primary,
-    .secondary {
-      font-size: 12px;
-    }
-
-    .secondary {
-      margin-right: 6px;
-      border-width: 1px;
-    }
-
-    .primary {
-      margin-right: 2px;
-    }
-
-    &.success-message,
-    &.error-message {
-      padding: 4px 36px 6px 42px;
-    }
-  }
-}
-
-button {
-  padding: 4px 8px;
-  border-radius: $border-radius;
-  border: 1px solid transparent;
-  cursor: pointer;
-}
-
-button.primary:not(.neutral) {
-  @include themify($themes) {
-    background-color: themed("primaryColor");
-    color: themed("textContrast");
-    border-color: themed("primaryColor");
-  }
-
-  &:hover {
-    @include themify($themes) {
-      background-color: darken(themed("primaryColor"), 1.5%);
-      color: darken(themed("textContrast"), 6%);
-    }
-  }
-}
-
-button.secondary:not(.neutral) {
-  @include themify($themes) {
-    background-color: themed("backgroundColor");
-    color: themed("mutedTextColor");
-    border-color: themed("mutedTextColor");
-  }
-
-  &:hover {
-    @include themify($themes) {
-      background-color: themed("backgroundOffsetColor");
-      color: darken(themed("mutedTextColor"), 6%);
-    }
-  }
-}
-
-button.link,
-button.neutral {
-  @include themify($themes) {
-    background-color: transparent;
-    color: themed("primaryColor");
-  }
-
-  &:hover {
-    text-decoration: underline;
-
-    @include themify($themes) {
-      color: darken(themed("primaryColor"), 6%);
-    }
-  }
-}
-
-select {
-  padding: 4px 6px;
-  border: 1px solid #000000;
-  border-radius: $border-radius;
-
-  @include themify($themes) {
-    color: themed("textColor");
-    background-color: themed("inputBackgroundColor");
-    border-color: themed("inputBorderColor");
-  }
-}
-
-.success-message {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  @include themify($themes) {
-    color: themed("successColor");
-  }
-
-  svg {
-    margin-right: 8px;
-
-    path {
-      @include themify($themes) {
-        fill: themed("successColor");
-      }
-    }
-  }
-}
-
-.error-message {
-  @include themify($themes) {
-    color: themed("errorColor");
-  }
-}
-
-.success-event,
-.error-event {
-  .notification-body {
-    display: none;
-  }
-}
-
-@media screen and (max-width: 768px) {
-  #select-folder {
-    display: none;
-  }
-}
-
-@media print {
-  body {
-    display: none;
-  }
-}
-
-.theme_light {
-  #content .inner-wrapper {
-    #select-folder {
-      background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHhtbG5zOnhsaW5rPSdodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rJyB3aWR0aD0nMTYnIGhlaWdodD0nMTYnIGZpbGw9J25vbmUnPjxwYXRoIHN0cm9rZT0nIzIxMjUyOScgZD0nbTUgNiAzIDMgMy0zJy8+PC9zdmc+");
-    }
-  }
-}
-
-.theme_dark {
-  #content .inner-wrapper {
-    #select-folder {
-      background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxNicgaGVpZ2h0PScxNicgZmlsbD0nbm9uZSc+PHBhdGggc3Ryb2tlPScjZmZmZmZmJyBkPSdtNSA2IDMgMyAzLTMnLz48L3N2Zz4=");
-    }
-  }
-}
diff --git a/apps/browser/src/autofill/notification/bar.spec.ts b/apps/browser/src/autofill/notification/bar.spec.ts
new file mode 100644
index 00000000000..ae60e2efc91
--- /dev/null
+++ b/apps/browser/src/autofill/notification/bar.spec.ts
@@ -0,0 +1,121 @@
+import { mock } from "jest-mock-extended";
+
+import { postWindowMessage } from "../spec/testing-utils";
+
+import { NotificationBarWindowMessage } from "./abstractions/notification-bar";
+import "./bar";
+
+jest.mock("lit", () => ({ render: jest.fn() }));
+jest.mock("@lit-labs/signals", () => ({
+  signal: jest.fn((testValue) => ({ get: (): typeof testValue => testValue })),
+}));
+jest.mock("../content/components/notification/container", () => ({
+  NotificationContainer: jest.fn(),
+}));
+
+describe("NotificationBar iframe handleWindowMessage security", () => {
+  const trustedOrigin = "http://localhost";
+  const maliciousOrigin = "https://malicious.com";
+
+  const createMessage = (
+    overrides: Partial<NotificationBarWindowMessage> = {},
+  ): NotificationBarWindowMessage => ({
+    command: "initNotificationBar",
+    ...overrides,
+  });
+
+  beforeEach(() => {
+    Object.defineProperty(globalThis, "location", {
+      value: { search: `?parentOrigin=${encodeURIComponent(trustedOrigin)}` },
+      writable: true,
+      configurable: true,
+    });
+    Object.defineProperty(globalThis, "parent", {
+      value: mock<Window>(),
+      writable: true,
+      configurable: true,
+    });
+    globalThis.dispatchEvent(new Event("load"));
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it.each([
+    {
+      description: "not from parent window",
+      message: () => createMessage(),
+      origin: trustedOrigin,
+      source: () => mock<Window>(),
+    },
+    {
+      description: "with mismatched origin",
+      message: () => createMessage(),
+      origin: maliciousOrigin,
+      source: () => globalThis.parent,
+    },
+    {
+      description: "without command field",
+      message: () => ({}),
+      origin: trustedOrigin,
+      source: () => globalThis.parent,
+    },
+    {
+      description: "initNotificationBar with mismatched parentOrigin",
+      message: () => createMessage({ parentOrigin: maliciousOrigin }),
+      origin: trustedOrigin,
+      source: () => globalThis.parent,
+    },
+    {
+      description: "when windowMessageOrigin is not set",
+      message: () => createMessage(),
+      origin: "different-origin",
+      source: () => globalThis.parent,
+      resetOrigin: true,
+    },
+    {
+      description: "with null source",
+      message: () => createMessage(),
+      origin: trustedOrigin,
+      source: (): null => null,
+    },
+    {
+      description: "with unknown command",
+      message: () => createMessage({ command: "unknownCommand" }),
+      origin: trustedOrigin,
+      source: () => globalThis.parent,
+    },
+  ])("should reject messages $description", ({ message, origin, source, resetOrigin }) => {
+    if (resetOrigin) {
+      Object.defineProperty(globalThis, "location", {
+        value: { search: "" },
+        writable: true,
+        configurable: true,
+      });
+    }
+    const spy = jest.spyOn(globalThis.parent, "postMessage").mockImplementation();
+    postWindowMessage(message(), origin, source());
+    expect(spy).not.toHaveBeenCalled();
+  });
+
+  it("should accept and handle valid trusted messages", () => {
+    const spy = jest.spyOn(globalThis.parent, "postMessage").mockImplementation();
+    spy.mockClear();
+
+    const validMessage = createMessage({
+      parentOrigin: trustedOrigin,
+      initData: {
+        type: "change",
+        isVaultLocked: false,
+        removeIndividualVault: false,
+        importType: null,
+        launchTimestamp: Date.now(),
+      },
+    });
+    postWindowMessage(validMessage, trustedOrigin, globalThis.parent);
+    expect(validMessage.command).toBe("initNotificationBar");
+    expect(validMessage.parentOrigin).toBe(trustedOrigin);
+    expect(validMessage.initData).toBeDefined();
+  });
+});
diff --git a/apps/browser/src/autofill/notification/bar.ts b/apps/browser/src/autofill/notification/bar.ts
index 9ae6fcedc8f..333f8d5e534 100644
--- a/apps/browser/src/autofill/notification/bar.ts
+++ b/apps/browser/src/autofill/notification/bar.ts
@@ -1,6 +1,7 @@
 import { render } from "lit";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import type { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { NotificationCipherData } from "../content/components/cipher/types";
@@ -8,6 +9,7 @@ import { CollectionView, I18n, OrgView } from "../content/components/common-type
 import { AtRiskNotification } from "../content/components/notification/at-risk-password/container";
 import { NotificationConfirmationContainer } from "../content/components/notification/confirmation/container";
 import { NotificationContainer } from "../content/components/notification/container";
+import { selectedCipher as selectedCipherSignal } from "../content/components/signals/selected-cipher";
 import { selectedFolder as selectedFolderSignal } from "../content/components/signals/selected-folder";
 import { selectedVault as selectedVaultSignal } from "../content/components/signals/selected-vault";
 
@@ -22,6 +24,13 @@ import {
 let notificationBarIframeInitData: NotificationBarIframeInitData = {};
 let windowMessageOrigin: string;
 
+const urlParams = new URLSearchParams(globalThis.location.search);
+const trustedParentOrigin = urlParams.get("parentOrigin");
+
+if (trustedParentOrigin) {
+  windowMessageOrigin = trustedParentOrigin;
+}
+
 const notificationBarWindowMessageHandlers: NotificationBarWindowMessageHandlers = {
   initNotificationBar: ({ message }) => initNotificationBar(message),
   saveCipherAttemptCompleted: ({ message }) => handleSaveCipherConfirmation(message),
@@ -180,18 +189,16 @@ async function initNotificationBar(message: NotificationBarWindowMessage) {
   const i18n = getI18n();
   const resolvedTheme = getResolvedTheme(theme ?? ThemeTypes.Light);
 
-  const resolvedType = resolveNotificationType(notificationBarIframeInitData);
-  const headerMessage = getNotificationHeaderMessage(i18n, resolvedType);
-  const notificationTestId = getNotificationTestId(resolvedType);
+  const notificationType = resolveNotificationType(notificationBarIframeInitData);
+  const headerMessage = getNotificationHeaderMessage(i18n, notificationType);
+  const notificationTestId = getNotificationTestId(notificationType);
   appendHeaderMessageToTitle(headerMessage);
 
-  document.body.innerHTML = "";
-
   if (isVaultLocked) {
     const notificationConfig = {
       ...notificationBarIframeInitData,
       headerMessage,
-      type: resolvedType,
+      type: notificationType,
       notificationTestId,
       theme: resolvedTheme,
       personalVaultIsAllowed: !personalVaultDisallowed,
@@ -201,7 +208,8 @@ async function initNotificationBar(message: NotificationBarWindowMessage) {
     };
 
     const handleSaveAction = () => {
-      sendSaveCipherMessage(true);
+      // cipher ID is null while vault is locked.
+      sendSaveCipherMessage(null, true);
 
       render(
         NotificationContainer({
@@ -262,7 +270,7 @@ async function initNotificationBar(message: NotificationBarWindowMessage) {
       NotificationContainer({
         ...notificationBarIframeInitData,
         headerMessage,
-        type: resolvedType,
+        type: notificationType,
         theme: resolvedTheme,
         notificationTestId,
         personalVaultIsAllowed: !personalVaultDisallowed,
@@ -276,9 +284,8 @@ async function initNotificationBar(message: NotificationBarWindowMessage) {
   });
 
   function handleEditOrUpdateAction(e: Event) {
-    const notificationType = initData?.type;
     e.preventDefault();
-    notificationType === "add" ? sendSaveCipherMessage(true) : sendSaveCipherMessage(false);
+    sendSaveCipherMessage(selectedCipherSignal.get(), notificationType === NotificationTypes.Add);
   }
 }
 
@@ -291,6 +298,7 @@ function handleCloseNotification(e: Event) {
 }
 
 function handleSaveAction(e: Event) {
+  const selectedCipher = selectedCipherSignal.get();
   const selectedVault = selectedVaultSignal.get();
   const selectedFolder = selectedFolderSignal.get();
 
@@ -304,16 +312,16 @@ function handleSaveAction(e: Event) {
   }
 
   e.preventDefault();
-
-  sendSaveCipherMessage(removeIndividualVault(), selectedFolder);
+  sendSaveCipherMessage(selectedCipher, removeIndividualVault(), selectedFolder);
   if (removeIndividualVault()) {
     return;
   }
 }
 
-function sendSaveCipherMessage(edit: boolean, folder?: string) {
+function sendSaveCipherMessage(cipherId: CipherView["id"] | null, edit: boolean, folder?: string) {
   sendPlatformMessage({
     command: "bgSaveCipher",
+    cipherId,
     folder,
     edit,
   });
@@ -394,15 +402,27 @@ function setupWindowMessageListener() {
 }
 
 function handleWindowMessage(event: MessageEvent) {
-  if (!windowMessageOrigin) {
-    windowMessageOrigin = event.origin;
-  }
-
-  if (event.origin !== windowMessageOrigin) {
+  if (event?.source !== globalThis.parent) {
     return;
   }
 
   const message = event.data as NotificationBarWindowMessage;
+  if (!message?.command) {
+    return;
+  }
+
+  if (!windowMessageOrigin || event.origin !== windowMessageOrigin) {
+    return;
+  }
+
+  if (
+    message.command === "initNotificationBar" &&
+    message.parentOrigin &&
+    message.parentOrigin !== event.origin
+  ) {
+    return;
+  }
+
   const handler = notificationBarWindowMessageHandlers[message.command];
   if (!handler) {
     return;
@@ -430,5 +450,8 @@ function getResolvedTheme(theme: Theme) {
 }
 
 function postMessageToParent(message: NotificationBarWindowMessage) {
-  globalThis.parent.postMessage(message, windowMessageOrigin || "*");
+  if (!windowMessageOrigin) {
+    return;
+  }
+  globalThis.parent.postMessage(message, windowMessageOrigin);
 }
diff --git a/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-button.ts b/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-button.ts
index 642e7dd24e9..0836ecf5ff1 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-button.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-button.ts
@@ -10,6 +10,7 @@ export type InitAutofillInlineMenuButtonMessage = UpdateAuthStatusMessage & {
   styleSheetUrl: string;
   translations: Record<string, string>;
   portKey: string;
+  token: string;
 };
 
 export type AutofillInlineMenuButtonWindowMessageHandlers = {
diff --git a/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-container.ts b/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-container.ts
index a147e0ba165..98fd84373a8 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-container.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-container.ts
@@ -5,6 +5,7 @@ import { InlineMenuCipherData } from "../../../background/abstractions/overlay.b
 export type AutofillInlineMenuContainerMessage = {
   command: string;
   portKey: string;
+  token: string;
 };
 
 export type InitAutofillInlineMenuElementMessage = AutofillInlineMenuContainerMessage & {
@@ -16,6 +17,7 @@ export type InitAutofillInlineMenuElementMessage = AutofillInlineMenuContainerMe
   translations: Record<string, string>;
   ciphers: InlineMenuCipherData[] | null;
   portName: string;
+  extensionOrigin?: string;
 };
 
 export type AutofillInlineMenuContainerWindowMessage = AutofillInlineMenuContainerMessage &
diff --git a/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-list.ts b/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-list.ts
index f5e1fe08850..cf778ef7892 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-list.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-list.ts
@@ -27,6 +27,7 @@ export type InitAutofillInlineMenuListMessage = AutofillInlineMenuListMessage &
   showInlineMenuAccountCreation?: boolean;
   showPasskeysLabels?: boolean;
   portKey: string;
+  token: string;
   generatedPassword?: string;
   showSaveLoginMenu?: boolean;
 };
diff --git a/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.spec.ts b/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.spec.ts
index f1a74556b24..b7bd24c537b 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.spec.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.spec.ts
@@ -53,13 +53,35 @@ describe("AutofillInlineMenuContentService", () => {
     });
   });
 
+  describe("messageHandlers", () => {
+    it("returns the extension message handlers", () => {
+      const handlers = autofillInlineMenuContentService.messageHandlers;
+
+      expect(handlers).toHaveProperty("closeAutofillInlineMenu");
+      expect(handlers).toHaveProperty("appendAutofillInlineMenuToDom");
+    });
+  });
+
   describe("isElementInlineMenu", () => {
-    it("returns true if the passed element is the inline menu", () => {
+    it("returns true if the passed element is the inline menu list", () => {
       const element = document.createElement("div");
       autofillInlineMenuContentService["listElement"] = element;
 
       expect(autofillInlineMenuContentService.isElementInlineMenu(element)).toBe(true);
     });
+
+    it("returns true if the passed element is the inline menu button", () => {
+      const element = document.createElement("div");
+      autofillInlineMenuContentService["buttonElement"] = element;
+
+      expect(autofillInlineMenuContentService.isElementInlineMenu(element)).toBe(true);
+    });
+
+    it("returns false if the passed element is not the inline menu", () => {
+      const element = document.createElement("div");
+
+      expect(autofillInlineMenuContentService.isElementInlineMenu(element)).toBe(false);
+    });
   });
 
   describe("extension message handlers", () => {
@@ -388,7 +410,7 @@ describe("AutofillInlineMenuContentService", () => {
     });
 
     it("closes the inline menu if the page body is not sufficiently opaque", async () => {
-      document.querySelector("html").style.opacity = "0.9";
+      document.documentElement.style.opacity = "0.9";
       document.body.style.opacity = "0";
       await autofillInlineMenuContentService["handlePageMutations"]([mockBodyMutationRecord]);
 
@@ -397,7 +419,7 @@ describe("AutofillInlineMenuContentService", () => {
     });
 
     it("closes the inline menu if the page html is not sufficiently opaque", async () => {
-      document.querySelector("html").style.opacity = "0.3";
+      document.documentElement.style.opacity = "0.3";
       document.body.style.opacity = "0.7";
       await autofillInlineMenuContentService["handlePageMutations"]([mockHTMLMutationRecord]);
 
@@ -406,7 +428,7 @@ describe("AutofillInlineMenuContentService", () => {
     });
 
     it("does not close the inline menu if the page html and body is sufficiently opaque", async () => {
-      document.querySelector("html").style.opacity = "0.9";
+      document.documentElement.style.opacity = "0.9";
       document.body.style.opacity = "1";
       await autofillInlineMenuContentService["handlePageMutations"]([mockBodyMutationRecord]);
       await waitForIdleCallback();
@@ -599,5 +621,465 @@ describe("AutofillInlineMenuContentService", () => {
         overlayElement: AutofillOverlayElement.List,
       });
     });
+
+    it("clears the persistent last child override timeout", () => {
+      jest.useFakeTimers();
+      const clearTimeoutSpy = jest.spyOn(globalThis, "clearTimeout");
+      autofillInlineMenuContentService["handlePersistentLastChildOverrideTimeout"] = setTimeout(
+        jest.fn(),
+        500,
+      );
+
+      autofillInlineMenuContentService.destroy();
+
+      expect(clearTimeoutSpy).toHaveBeenCalled();
+    });
+
+    it("unobserves page attributes", () => {
+      const disconnectSpy = jest.spyOn(
+        autofillInlineMenuContentService["htmlMutationObserver"],
+        "disconnect",
+      );
+
+      autofillInlineMenuContentService.destroy();
+
+      expect(disconnectSpy).toHaveBeenCalled();
+    });
+  });
+
+  describe("getOwnedTagNames", () => {
+    it("returns an empty array when no elements are created", () => {
+      expect(autofillInlineMenuContentService.getOwnedTagNames()).toEqual([]);
+    });
+
+    it("returns the button element tag name", () => {
+      const buttonElement = document.createElement("div");
+      autofillInlineMenuContentService["buttonElement"] = buttonElement;
+
+      const tagNames = autofillInlineMenuContentService.getOwnedTagNames();
+
+      expect(tagNames).toContain("DIV");
+    });
+
+    it("returns both button and list element tag names", () => {
+      const buttonElement = document.createElement("div");
+      const listElement = document.createElement("span");
+      autofillInlineMenuContentService["buttonElement"] = buttonElement;
+      autofillInlineMenuContentService["listElement"] = listElement;
+
+      const tagNames = autofillInlineMenuContentService.getOwnedTagNames();
+
+      expect(tagNames).toEqual(["DIV", "SPAN"]);
+    });
+  });
+
+  describe("getUnownedTopLayerItems", () => {
+    beforeEach(() => {
+      document.body.innerHTML = "";
+    });
+
+    it("returns the tag names from button and list elements", () => {
+      const buttonElement = document.createElement("div");
+      buttonElement.setAttribute("popover", "manual");
+      autofillInlineMenuContentService["buttonElement"] = buttonElement;
+
+      const listElement = document.createElement("span");
+      listElement.setAttribute("popover", "manual");
+      autofillInlineMenuContentService["listElement"] = listElement;
+
+      /** Mock querySelectorAll to avoid :modal selector issues in jsdom */
+      const querySelectorAllSpy = jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([] as any);
+
+      const items = autofillInlineMenuContentService.getUnownedTopLayerItems();
+
+      expect(querySelectorAllSpy).toHaveBeenCalled();
+      expect(items.length).toBe(0);
+    });
+
+    it("calls querySelectorAll with correct selector when includeCandidates is false", () => {
+      /** Mock querySelectorAll to avoid :modal selector issues in jsdom */
+      const querySelectorAllSpy = jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([] as any);
+
+      autofillInlineMenuContentService.getUnownedTopLayerItems(false);
+
+      const calledSelector = querySelectorAllSpy.mock.calls[0][0];
+      expect(calledSelector).toContain(":modal");
+      expect(calledSelector).toContain(":popover-open");
+    });
+
+    it("includes candidates selector when requested", () => {
+      /** Mock querySelectorAll to avoid :modal selector issues in jsdom */
+      const querySelectorAllSpy = jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([] as any);
+
+      autofillInlineMenuContentService.getUnownedTopLayerItems(true);
+
+      const calledSelector = querySelectorAllSpy.mock.calls[0][0];
+      expect(calledSelector).toContain("[popover], dialog");
+    });
+  });
+
+  describe("refreshTopLayerPosition", () => {
+    it("does nothing when inline menu is disabled", () => {
+      const getUnownedTopLayerItemsSpy = jest.spyOn(
+        autofillInlineMenuContentService,
+        "getUnownedTopLayerItems",
+      );
+
+      autofillInlineMenuContentService["inlineMenuEnabled"] = false;
+      const buttonElement = document.createElement("div");
+      autofillInlineMenuContentService["buttonElement"] = buttonElement;
+
+      autofillInlineMenuContentService.refreshTopLayerPosition();
+
+      // Should exit early and not call `getUnownedTopLayerItems`
+      expect(getUnownedTopLayerItemsSpy).not.toHaveBeenCalled();
+    });
+
+    it("does nothing when no other top layer items exist", () => {
+      const buttonElement = document.createElement("div");
+      autofillInlineMenuContentService["buttonElement"] = buttonElement;
+      jest
+        .spyOn(autofillInlineMenuContentService, "getUnownedTopLayerItems")
+        .mockReturnValue([] as any);
+
+      const getElementsByTagSpy = jest.spyOn(globalThis.document, "getElementsByTagName");
+
+      autofillInlineMenuContentService.refreshTopLayerPosition();
+
+      // Should exit early and not get inline elements to refresh
+      expect(getElementsByTagSpy).not.toHaveBeenCalled();
+    });
+
+    it("refreshes button popover when button is in document", () => {
+      jest
+        .spyOn(autofillInlineMenuContentService, "getUnownedTopLayerItems")
+        .mockReturnValue([document.createElement("div")] as any);
+
+      const buttonElement = document.createElement("div");
+      buttonElement.setAttribute("popover", "manual");
+      buttonElement.showPopover = jest.fn();
+      buttonElement.hidePopover = jest.fn();
+      document.body.appendChild(buttonElement);
+      autofillInlineMenuContentService["buttonElement"] = buttonElement;
+
+      autofillInlineMenuContentService.refreshTopLayerPosition();
+
+      expect(buttonElement.hidePopover).toHaveBeenCalled();
+      expect(buttonElement.showPopover).toHaveBeenCalled();
+    });
+
+    it("refreshes list popover when list is in document", () => {
+      jest
+        .spyOn(autofillInlineMenuContentService, "getUnownedTopLayerItems")
+        .mockReturnValue([document.createElement("div")] as any);
+
+      const listElement = document.createElement("div");
+      listElement.setAttribute("popover", "manual");
+      listElement.showPopover = jest.fn();
+      listElement.hidePopover = jest.fn();
+      document.body.appendChild(listElement);
+      autofillInlineMenuContentService["listElement"] = listElement;
+
+      autofillInlineMenuContentService.refreshTopLayerPosition();
+
+      expect(listElement.hidePopover).toHaveBeenCalled();
+      expect(listElement.showPopover).toHaveBeenCalled();
+    });
+  });
+
+  describe("checkAndUpdateRefreshCount", () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+      jest.setSystemTime(new Date("2023-01-01T00:00:00.000Z"));
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+    });
+
+    it("does nothing when inline menu is disabled", () => {
+      autofillInlineMenuContentService["inlineMenuEnabled"] = false;
+
+      autofillInlineMenuContentService["checkAndUpdateRefreshCount"]("topLayer");
+
+      expect(autofillInlineMenuContentService["refreshCountWithinTimeThreshold"].topLayer).toBe(0);
+    });
+
+    it("increments refresh count when within time threshold", () => {
+      autofillInlineMenuContentService["lastTrackedTimestamp"].topLayer = Date.now() - 1000;
+
+      autofillInlineMenuContentService["checkAndUpdateRefreshCount"]("topLayer");
+
+      expect(autofillInlineMenuContentService["refreshCountWithinTimeThreshold"].topLayer).toBe(1);
+    });
+
+    it("resets count when outside time threshold", () => {
+      autofillInlineMenuContentService["lastTrackedTimestamp"].topLayer = Date.now() - 6000;
+      autofillInlineMenuContentService["refreshCountWithinTimeThreshold"].topLayer = 5;
+
+      autofillInlineMenuContentService["checkAndUpdateRefreshCount"]("topLayer");
+
+      expect(autofillInlineMenuContentService["refreshCountWithinTimeThreshold"].topLayer).toBe(0);
+    });
+
+    it("disables inline menu and shows alert when count exceeds threshold", () => {
+      const alertSpy = jest.spyOn(globalThis.window, "alert").mockImplementation();
+      const checkPageRisksSpy = jest.spyOn(
+        autofillInlineMenuContentService as any,
+        "checkPageRisks",
+      );
+      autofillInlineMenuContentService["lastTrackedTimestamp"].topLayer = Date.now() - 1000;
+      autofillInlineMenuContentService["refreshCountWithinTimeThreshold"].topLayer = 6;
+
+      autofillInlineMenuContentService["checkAndUpdateRefreshCount"]("topLayer");
+
+      expect(autofillInlineMenuContentService["inlineMenuEnabled"]).toBe(false);
+      expect(alertSpy).toHaveBeenCalled();
+      expect(checkPageRisksSpy).toHaveBeenCalled();
+    });
+  });
+
+  describe("refreshPopoverAttribute", () => {
+    it("calls checkAndUpdateRefreshCount with popoverAttribute type", () => {
+      const checkSpy = jest.spyOn(
+        autofillInlineMenuContentService as any,
+        "checkAndUpdateRefreshCount",
+      );
+      const element = document.createElement("div");
+      element.setAttribute("popover", "auto");
+      element.showPopover = jest.fn();
+
+      autofillInlineMenuContentService["refreshPopoverAttribute"](element);
+
+      expect(checkSpy).toHaveBeenCalledWith("popoverAttribute");
+      expect(element.getAttribute("popover")).toBe("manual");
+      expect(element.showPopover).toHaveBeenCalled();
+    });
+  });
+
+  describe("handleInlineMenuElementMutationObserverUpdate - popover attribute", () => {
+    it("refreshes popover attribute when changed from manual", () => {
+      const element = document.createElement("div");
+      element.setAttribute("popover", "auto");
+      element.showPopover = jest.fn();
+      const refreshSpy = jest.spyOn(
+        autofillInlineMenuContentService as any,
+        "refreshPopoverAttribute",
+      );
+      autofillInlineMenuContentService["buttonElement"] = element;
+
+      const mockMutation = createMutationRecordMock({
+        target: element,
+        type: "attributes",
+        attributeName: "popover",
+      });
+
+      autofillInlineMenuContentService["handleInlineMenuElementMutationObserverUpdate"]([
+        mockMutation,
+      ]);
+
+      expect(refreshSpy).toHaveBeenCalledWith(element);
+    });
+
+    it("does not refresh popover attribute when already manual", () => {
+      const element = document.createElement("div");
+      element.setAttribute("popover", "manual");
+      const refreshSpy = jest.spyOn(
+        autofillInlineMenuContentService as any,
+        "refreshPopoverAttribute",
+      );
+      autofillInlineMenuContentService["buttonElement"] = element;
+
+      const mockMutation = createMutationRecordMock({
+        target: element,
+        type: "attributes",
+        attributeName: "popover",
+      });
+
+      autofillInlineMenuContentService["handleInlineMenuElementMutationObserverUpdate"]([
+        mockMutation,
+      ]);
+
+      expect(refreshSpy).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("appendInlineMenuElements when disabled", () => {
+    beforeEach(() => {
+      observeContainerMutationsSpy.mockImplementation();
+    });
+
+    it("does not append button when inline menu is disabled", async () => {
+      autofillInlineMenuContentService["inlineMenuEnabled"] = false;
+      jest.spyOn(globalThis.document.body, "appendChild");
+
+      sendMockExtensionMessage({
+        command: "appendAutofillInlineMenuToDom",
+        overlayElement: AutofillOverlayElement.Button,
+      });
+      await flushPromises();
+
+      expect(globalThis.document.body.appendChild).not.toHaveBeenCalled();
+    });
+
+    it("does not append list when inline menu is disabled", async () => {
+      autofillInlineMenuContentService["inlineMenuEnabled"] = false;
+      jest.spyOn(globalThis.document.body, "appendChild");
+
+      sendMockExtensionMessage({
+        command: "appendAutofillInlineMenuToDom",
+        overlayElement: AutofillOverlayElement.List,
+      });
+      await flushPromises();
+
+      expect(globalThis.document.body.appendChild).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("custom element creation for non-Firefox browsers", () => {
+    beforeEach(() => {
+      autofillInlineMenuContentService["isFirefoxBrowser"] = false;
+      observeContainerMutationsSpy.mockImplementation();
+    });
+
+    it("creates a custom element for button in non-Firefox browsers", () => {
+      const definespy = jest.spyOn(globalThis.customElements, "define");
+
+      sendMockExtensionMessage({
+        command: "appendAutofillInlineMenuToDom",
+        overlayElement: AutofillOverlayElement.Button,
+      });
+
+      expect(definespy).toHaveBeenCalled();
+      expect(autofillInlineMenuContentService["buttonElement"]).toBeDefined();
+      expect(autofillInlineMenuContentService["buttonElement"]?.tagName).not.toBe("DIV");
+    });
+
+    it("creates a custom element for list in non-Firefox browsers", () => {
+      const defineSpy = jest.spyOn(globalThis.customElements, "define");
+
+      sendMockExtensionMessage({
+        command: "appendAutofillInlineMenuToDom",
+        overlayElement: AutofillOverlayElement.List,
+      });
+
+      expect(defineSpy).toHaveBeenCalled();
+      expect(autofillInlineMenuContentService["listElement"]).toBeDefined();
+      expect(autofillInlineMenuContentService["listElement"]?.tagName).not.toBe("DIV");
+    });
+  });
+
+  describe("getPageIsOpaque", () => {
+    it("returns false when no page elements exist", () => {
+      jest.spyOn(globalThis.document, "querySelectorAll").mockReturnValue([] as any);
+
+      const result = autofillInlineMenuContentService["getPageIsOpaque"]();
+
+      expect(result).toBe(false);
+    });
+
+    it("returns true when all html and body nodes have sufficient opacity", () => {
+      jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([document.documentElement, document.body] as any);
+      jest
+        .spyOn(globalThis.window, "getComputedStyle")
+        .mockImplementation(() => ({ opacity: "1" }) as CSSStyleDeclaration);
+
+      const result = autofillInlineMenuContentService["getPageIsOpaque"]();
+
+      expect(result).toBe(true);
+    });
+
+    it("returns false when html opacity is below threshold", () => {
+      jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([document.documentElement, document.body] as any);
+      let callCount = 0;
+      jest.spyOn(globalThis.window, "getComputedStyle").mockImplementation(() => {
+        callCount++;
+        return { opacity: callCount === 1 ? "0.5" : "1" } as CSSStyleDeclaration;
+      });
+
+      const result = autofillInlineMenuContentService["getPageIsOpaque"]();
+
+      expect(result).toBe(false);
+    });
+
+    it("returns false when body opacity is below threshold", () => {
+      jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([document.documentElement, document.body] as any);
+      let callCount = 0;
+      jest.spyOn(globalThis.window, "getComputedStyle").mockImplementation(() => {
+        callCount++;
+        return { opacity: callCount === 1 ? "1" : "0.5" } as CSSStyleDeclaration;
+      });
+
+      const result = autofillInlineMenuContentService["getPageIsOpaque"]();
+
+      expect(result).toBe(false);
+    });
+
+    it("returns false when opacity of at least one duplicate body is below threshold", () => {
+      const duplicateBody = document.createElement("body");
+      jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([document.documentElement, document.body, duplicateBody] as any);
+      let callCount = 0;
+      jest.spyOn(globalThis.window, "getComputedStyle").mockImplementation(() => {
+        callCount++;
+
+        let opacityValue = "0.5";
+        switch (callCount) {
+          case 1:
+            opacityValue = "1";
+            break;
+          case 2:
+            opacityValue = "0.7";
+            break;
+          default:
+            break;
+        }
+
+        return { opacity: opacityValue } as CSSStyleDeclaration;
+      });
+
+      const result = autofillInlineMenuContentService["getPageIsOpaque"]();
+
+      expect(result).toBe(false);
+    });
+
+    it("returns true when opacity is above threshold", () => {
+      jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([document.documentElement, document.body] as any);
+      jest
+        .spyOn(globalThis.window, "getComputedStyle")
+        .mockImplementation(() => ({ opacity: "0.7" }) as CSSStyleDeclaration);
+
+      const result = autofillInlineMenuContentService["getPageIsOpaque"]();
+
+      expect(result).toBe(true);
+    });
+
+    it("returns false when opacity is at threshold", () => {
+      jest
+        .spyOn(globalThis.document, "querySelectorAll")
+        .mockReturnValue([document.documentElement, document.body] as any);
+      jest
+        .spyOn(globalThis.window, "getComputedStyle")
+        .mockImplementation(() => ({ opacity: "0.6" }) as CSSStyleDeclaration);
+
+      const result = autofillInlineMenuContentService["getPageIsOpaque"]();
+
+      expect(result).toBe(false);
+    });
   });
 });
diff --git a/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.ts b/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.ts
index 247104e13a5..b61e5e19d53 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.ts
@@ -22,6 +22,19 @@ import {
 import { AutofillInlineMenuButtonIframe } from "../iframe-content/autofill-inline-menu-button-iframe";
 import { AutofillInlineMenuListIframe } from "../iframe-content/autofill-inline-menu-list-iframe";
 
+const experienceValidationBackoffThresholds = {
+  topLayer: {
+    countLimit: 5,
+    timeSpanLimit: 5000,
+  },
+  popoverAttribute: {
+    countLimit: 10,
+    timeSpanLimit: 5000,
+  },
+};
+
+type BackoffCheckType = keyof typeof experienceValidationBackoffThresholds;
+
 export class AutofillInlineMenuContentService implements AutofillInlineMenuContentServiceInterface {
   private readonly sendExtensionMessage = sendExtensionMessage;
   private readonly generateRandomCustomElementName = generateRandomCustomElementName;
@@ -35,6 +48,19 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
   private bodyMutationObserver: MutationObserver;
   private inlineMenuElementsMutationObserver: MutationObserver;
   private containerElementMutationObserver: MutationObserver;
+  private refreshCountWithinTimeThreshold: { [key in BackoffCheckType]: number } = {
+    topLayer: 0,
+    popoverAttribute: 0,
+  };
+  private lastTrackedTimestamp = {
+    topLayer: Date.now(),
+    popoverAttribute: Date.now(),
+  };
+  /**
+   * Distinct from preventing inline menu script injection, this is for cases
+   * where the page is subsequently determined to be risky.
+   */
+  private inlineMenuEnabled = true;
   private mutationObserverIterations = 0;
   private mutationObserverIterationsResetTimeout: number | NodeJS.Timeout;
   private handlePersistentLastChildOverrideTimeout: number | NodeJS.Timeout;
@@ -140,6 +166,10 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
    * Updates the position of both the inline menu button and inline menu list.
    */
   private async appendInlineMenuElements({ overlayElement }: AutofillExtensionMessage) {
+    if (!this.inlineMenuEnabled) {
+      return;
+    }
+
     if (overlayElement === AutofillOverlayElement.Button) {
       return this.appendButtonElement();
     }
@@ -151,6 +181,10 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
    * Updates the position of the inline menu button.
    */
   private async appendButtonElement(): Promise<void> {
+    if (!this.inlineMenuEnabled) {
+      return;
+    }
+
     if (!this.buttonElement) {
       this.createButtonElement();
       this.updateCustomElementDefaultStyles(this.buttonElement);
@@ -167,6 +201,10 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
    * Updates the position of the inline menu list.
    */
   private async appendListElement(): Promise<void> {
+    if (!this.inlineMenuEnabled) {
+      return;
+    }
+
     if (!this.listElement) {
       this.createListElement();
       this.updateCustomElementDefaultStyles(this.listElement);
@@ -219,6 +257,10 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
    * to create the element if it already exists in the DOM.
    */
   private createButtonElement() {
+    if (!this.inlineMenuEnabled) {
+      return;
+    }
+
     if (this.isFirefoxBrowser) {
       this.buttonElement = globalThis.document.createElement("div");
       this.buttonElement.setAttribute("popover", "manual");
@@ -237,6 +279,7 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
         }
       },
     );
+
     this.buttonElement = globalThis.document.createElement(customElementName);
     this.buttonElement.setAttribute("popover", "manual");
   }
@@ -246,6 +289,10 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
    * to create the element if it already exists in the DOM.
    */
   private createListElement() {
+    if (!this.inlineMenuEnabled) {
+      return;
+    }
+
     if (this.isFirefoxBrowser) {
       this.listElement = globalThis.document.createElement("div");
       this.listElement.setAttribute("popover", "manual");
@@ -264,6 +311,7 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
         }
       },
     );
+
     this.listElement = globalThis.document.createElement(customElementName);
     this.listElement.setAttribute("popover", "manual");
   }
@@ -379,14 +427,23 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
       }
 
       const element = record.target as HTMLElement;
-      if (record.attributeName !== "style") {
-        this.removeModifiedElementAttributes(element);
+      if (record.attributeName === "popover" && this.inlineMenuEnabled) {
+        const attributeValue = element.getAttribute(record.attributeName);
+        if (attributeValue !== "manual") {
+          this.refreshPopoverAttribute(element);
+        }
 
         continue;
       }
 
-      element.removeAttribute("style");
-      this.updateCustomElementDefaultStyles(element);
+      if (record.attributeName === "style") {
+        element.removeAttribute("style");
+        this.updateCustomElementDefaultStyles(element);
+
+        continue;
+      }
+
+      this.removeModifiedElementAttributes(element);
     }
   };
 
@@ -400,7 +457,7 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
     const attributes = Array.from(element.attributes);
     for (let attributeIndex = 0; attributeIndex < attributes.length; attributeIndex++) {
       const attribute = attributes[attributeIndex];
-      if (attribute.name === "style") {
+      if (attribute.name === "style" || attribute.name === "popover") {
         continue;
       }
 
@@ -430,7 +487,7 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
   private checkPageRisks = async () => {
     const pageIsOpaque = await this.getPageIsOpaque();
 
-    const risksFound = !pageIsOpaque;
+    const risksFound = !pageIsOpaque || !this.inlineMenuEnabled;
 
     if (risksFound) {
       this.closeInlineMenu();
@@ -481,7 +538,49 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
     return otherTopLayeritems;
   };
 
+  /**
+   * Internally track owned injected experience refreshes as a side-effect
+   * of host page interference.
+   */
+  private checkAndUpdateRefreshCount = (countType: BackoffCheckType) => {
+    if (!this.inlineMenuEnabled) {
+      return;
+    }
+
+    const { countLimit, timeSpanLimit } = experienceValidationBackoffThresholds[countType];
+    const now = Date.now();
+    const timeSinceLastTrackedRefresh = now - this.lastTrackedTimestamp[countType];
+    const currentlyWithinTimeThreshold = timeSinceLastTrackedRefresh <= timeSpanLimit;
+    const withinCountThreshold = this.refreshCountWithinTimeThreshold[countType] <= countLimit;
+
+    if (currentlyWithinTimeThreshold) {
+      if (withinCountThreshold) {
+        this.refreshCountWithinTimeThreshold[countType]++;
+      } else {
+        // Set inline menu to be off; page is aggressively trying to take top position of top layer
+        this.inlineMenuEnabled = false;
+        void this.checkPageRisks();
+
+        const warningMessage = chrome.i18n.getMessage("topLayerHijackWarning");
+        globalThis.window.alert(warningMessage);
+      }
+    } else {
+      this.lastTrackedTimestamp[countType] = now;
+      this.refreshCountWithinTimeThreshold[countType] = 0;
+    }
+  };
+
+  private refreshPopoverAttribute = (element: HTMLElement) => {
+    this.checkAndUpdateRefreshCount("popoverAttribute");
+    element.setAttribute("popover", "manual");
+    element.showPopover();
+  };
+
   refreshTopLayerPosition = () => {
+    if (!this.inlineMenuEnabled) {
+      return;
+    }
+
     const otherTopLayerItems = this.getUnownedTopLayerItems();
 
     // No need to refresh if there are no other top-layer items
@@ -495,6 +594,7 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
     const listInDocument =
       this.listElement &&
       (globalThis.document.getElementsByTagName(this.listElement.tagName)[0] as HTMLElement);
+
     if (buttonInDocument) {
       buttonInDocument.hidePopover();
       buttonInDocument.showPopover();
@@ -504,6 +604,10 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
       listInDocument.hidePopover();
       listInDocument.showPopover();
     }
+
+    if (buttonInDocument || listInDocument) {
+      this.checkAndUpdateRefreshCount("topLayer");
+    }
   };
 
   /**
@@ -513,24 +617,28 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
    * `body` (enforced elsewhere).
    */
   private getPageIsOpaque = () => {
-    // These are computed style values, so we don't need to worry about non-float values
-    // for `opacity`, here
     // @TODO for definitive checks, traverse up the node tree from the inline menu container;
     // nodes can exist between `html` and `body`
-    const htmlElement = globalThis.document.querySelector("html");
-    const bodyElement = globalThis.document.querySelector("body");
+    /**
+     * `querySelectorAll` for (non-standard) cases where the page has additional copies of
+     * page nodes that should be unique
+     */
+    const pageElements = globalThis.document.querySelectorAll("html, body");
 
-    if (!htmlElement || !bodyElement) {
+    if (!pageElements.length) {
       return false;
     }
 
-    const htmlOpacity = globalThis.window.getComputedStyle(htmlElement)?.opacity || "0";
-    const bodyOpacity = globalThis.window.getComputedStyle(bodyElement)?.opacity || "0";
+    return [...pageElements].every((element) => {
+      // These are computed style values, so we don't need to worry about non-float values
+      // for `opacity`, here
+      const elementOpacity = globalThis.window.getComputedStyle(element)?.opacity || "0";
 
-    // Any value above this is considered "opaque" for our purposes
-    const opacityThreshold = 0.6;
+      // Any value above this is considered "opaque" for our purposes
+      const opacityThreshold = 0.6;
 
-    return parseFloat(htmlOpacity) > opacityThreshold && parseFloat(bodyOpacity) > opacityThreshold;
+      return parseFloat(elementOpacity) > opacityThreshold;
+    });
   };
 
   /**
diff --git a/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe-element.ts b/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe-element.ts
index 2fea65a7f01..3e2b364b17b 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe-element.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe-element.ts
@@ -8,7 +8,10 @@ export class AutofillInlineMenuIframeElement {
     iframeTitle: string,
     ariaAlert?: string,
   ) {
+    const style = this.createInternalStyleNode();
     const shadow: ShadowRoot = element.attachShadow({ mode: "closed" });
+    shadow.prepend(style);
+
     const autofillInlineMenuIframeService = new AutofillInlineMenuIframeService(
       shadow,
       portName,
@@ -18,4 +21,50 @@ export class AutofillInlineMenuIframeElement {
     );
     autofillInlineMenuIframeService.initMenuIframe();
   }
+
+  /**
+   * Builds and prepends an internal stylesheet to the container node with rules
+   * to prevent targeting by the host's global styling rules. This should only be
+   * used for pseudo elements such as `::backdrop` or `::before`. All other
+   * styles should be applied inline upon the parent container itself for improved
+   * specificity priority.
+   */
+  private createInternalStyleNode() {
+    const css = document.createTextNode(`
+      :host::backdrop,
+      :host::before,
+      :host::after {
+        all: initial !important;
+        backdrop-filter: none !important;
+        filter: none !important;
+        inset: auto !important;
+        touch-action: auto !important;
+        user-select: text !important;
+        display: none !important;
+        position: relative !important;
+        top: auto !important;
+        right: auto !important;
+        bottom: auto !important;
+        left: auto !important;
+        transform: none !important;
+        transform-origin: 50% 50% !important;
+        opacity: 1 !important;
+        mix-blend-mode: normal !important;
+        isolation: isolate !important;
+        z-index: 0 !important;
+        background: none !important;
+        background-color: transparent !important;
+        background-image: none !important;
+        width: 0 !important;
+        height: 0 !important;
+        content: "" !important;
+        pointer-events: all !important;
+      }
+    `);
+    const style = globalThis.document.createElement("style");
+    style.setAttribute("type", "text/css");
+    style.appendChild(css);
+
+    return style;
+  }
 }
diff --git a/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe.service.spec.ts b/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe.service.spec.ts
index 9f2947c2e99..3bb86ee7876 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe.service.spec.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe.service.spec.ts
@@ -191,7 +191,7 @@ describe("AutofillInlineMenuIframeService", () => {
 
         expect(
           autofillInlineMenuIframeService["iframe"].contentWindow.postMessage,
-        ).toHaveBeenCalledWith(message, "*");
+        ).toHaveBeenCalledWith(message, autofillInlineMenuIframeService["extensionOrigin"]);
       });
 
       it("handles port messages that are registered with the message handlers and does not pass the message on to the iframe", () => {
@@ -217,7 +217,7 @@ describe("AutofillInlineMenuIframeService", () => {
           expect(autofillInlineMenuIframeService["portKey"]).toBe(portKey);
           expect(
             autofillInlineMenuIframeService["iframe"].contentWindow.postMessage,
-          ).toHaveBeenCalledWith(message, "*");
+          ).toHaveBeenCalledWith(message, autofillInlineMenuIframeService["extensionOrigin"]);
         });
       });
 
@@ -242,7 +242,7 @@ describe("AutofillInlineMenuIframeService", () => {
           expect(updateElementStylesSpy).not.toHaveBeenCalled();
           expect(
             autofillInlineMenuIframeService["iframe"].contentWindow.postMessage,
-          ).toHaveBeenCalledWith(message, "*");
+          ).toHaveBeenCalledWith(message, autofillInlineMenuIframeService["extensionOrigin"]);
         });
 
         it("sets a light theme based on the user's system preferences", () => {
@@ -262,7 +262,7 @@ describe("AutofillInlineMenuIframeService", () => {
               command: "initAutofillInlineMenuList",
               theme: ThemeType.Light,
             },
-            "*",
+            autofillInlineMenuIframeService["extensionOrigin"],
           );
         });
 
@@ -283,7 +283,7 @@ describe("AutofillInlineMenuIframeService", () => {
               command: "initAutofillInlineMenuList",
               theme: ThemeType.Dark,
             },
-            "*",
+            autofillInlineMenuIframeService["extensionOrigin"],
           );
         });
 
@@ -387,7 +387,7 @@ describe("AutofillInlineMenuIframeService", () => {
             command: "updateAutofillInlineMenuColorScheme",
             colorScheme: "normal",
           },
-          "*",
+          autofillInlineMenuIframeService["extensionOrigin"],
         );
       });
 
diff --git a/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe.service.ts b/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe.service.ts
index 9a9821f643c..8b1423b1290 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe.service.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/iframe-content/autofill-inline-menu-iframe.service.ts
@@ -3,6 +3,7 @@
 import { EVENTS } from "@bitwarden/common/autofill/constants";
 import { ThemeTypes } from "@bitwarden/common/platform/enums";
 
+import { BrowserApi } from "../../../../platform/browser/browser-api";
 import { sendExtensionMessage, setElementStyles } from "../../../utils";
 import {
   BackgroundPortMessageHandlers,
@@ -15,6 +16,7 @@ export class AutofillInlineMenuIframeService implements AutofillInlineMenuIframe
   private readonly sendExtensionMessage = sendExtensionMessage;
   private port: chrome.runtime.Port | null = null;
   private portKey: string;
+  private readonly extensionOrigin: string;
   private iframeMutationObserver: MutationObserver;
   private iframe: HTMLIFrameElement;
   private ariaAlertElement: HTMLDivElement;
@@ -69,6 +71,7 @@ export class AutofillInlineMenuIframeService implements AutofillInlineMenuIframe
     private iframeTitle: string,
     private ariaAlert?: string,
   ) {
+    this.extensionOrigin = BrowserApi.getRuntimeURL("")?.slice(0, -1);
     this.iframeMutationObserver = new MutationObserver(this.handleMutations);
   }
 
@@ -81,7 +84,7 @@ export class AutofillInlineMenuIframeService implements AutofillInlineMenuIframe
    * that is declared.
    */
   initMenuIframe() {
-    this.defaultIframeAttributes.src = chrome.runtime.getURL("overlay/menu.html");
+    this.defaultIframeAttributes.src = BrowserApi.getRuntimeURL("overlay/menu.html");
     this.defaultIframeAttributes.title = this.iframeTitle;
 
     this.iframe = globalThis.document.createElement("iframe");
@@ -259,7 +262,10 @@ export class AutofillInlineMenuIframeService implements AutofillInlineMenuIframe
   }
 
   private postMessageToIFrame(message: any) {
-    this.iframe.contentWindow?.postMessage({ portKey: this.portKey, ...message }, "*");
+    this.iframe.contentWindow?.postMessage(
+      { portKey: this.portKey, ...message },
+      this.extensionOrigin,
+    );
   }
 
   /**
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/button/autofill-inline-menu-button.spec.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/button/autofill-inline-menu-button.spec.ts
index 7fa07850f00..10f6c905342 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/button/autofill-inline-menu-button.spec.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/button/autofill-inline-menu-button.spec.ts
@@ -1,5 +1,6 @@
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 
+import { BrowserApi } from "../../../../../platform/browser/browser-api";
 import { createInitAutofillInlineMenuButtonMessageMock } from "../../../../spec/autofill-mocks";
 import { flushPromises, postWindowMessage } from "../../../../spec/testing-utils";
 
@@ -10,11 +11,11 @@ describe("AutofillInlineMenuButton", () => {
 
   let autofillInlineMenuButton: AutofillInlineMenuButton;
   const portKey: string = "inlineMenuButtonPortKey";
+  const expectedOrigin = BrowserApi.getRuntimeURL("")?.slice(0, -1) || "chrome-extension://id";
 
   beforeEach(() => {
     document.body.innerHTML = `<autofill-inline-menu-button></autofill-inline-menu-button>`;
     autofillInlineMenuButton = document.querySelector("autofill-inline-menu-button");
-    autofillInlineMenuButton["messageOrigin"] = "https://localhost/";
     jest.spyOn(globalThis.document, "createElement");
     jest.spyOn(globalThis.parent, "postMessage");
   });
@@ -56,8 +57,8 @@ describe("AutofillInlineMenuButton", () => {
       autofillInlineMenuButton["buttonElement"].click();
 
       expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-        { command: "autofillInlineMenuButtonClicked", portKey },
-        "*",
+        { command: "autofillInlineMenuButtonClicked", portKey, token: "test-token" },
+        expectedOrigin,
       );
     });
   });
@@ -70,7 +71,7 @@ describe("AutofillInlineMenuButton", () => {
     it("does not post a message to close the autofill inline menu if the element is focused during the focus check", async () => {
       jest.spyOn(globalThis.document, "hasFocus").mockReturnValue(true);
 
-      postWindowMessage({ command: "checkAutofillInlineMenuButtonFocused" });
+      postWindowMessage({ command: "checkAutofillInlineMenuButtonFocused", token: "test-token" });
       await flushPromises();
 
       expect(globalThis.parent.postMessage).not.toHaveBeenCalledWith({
@@ -84,7 +85,7 @@ describe("AutofillInlineMenuButton", () => {
         .spyOn(autofillInlineMenuButton["buttonElement"], "querySelector")
         .mockReturnValue(autofillInlineMenuButton["buttonElement"]);
 
-      postWindowMessage({ command: "checkAutofillInlineMenuButtonFocused" });
+      postWindowMessage({ command: "checkAutofillInlineMenuButtonFocused", token: "test-token" });
       await flushPromises();
 
       expect(globalThis.parent.postMessage).not.toHaveBeenCalledWith({
@@ -98,7 +99,7 @@ describe("AutofillInlineMenuButton", () => {
       jest
         .spyOn(autofillInlineMenuButton["buttonElement"], "querySelector")
         .mockReturnValue(autofillInlineMenuButton["buttonElement"]);
-      postWindowMessage({ command: "checkAutofillInlineMenuButtonFocused" });
+      postWindowMessage({ command: "checkAutofillInlineMenuButtonFocused", token: "test-token" });
       await flushPromises();
 
       globalThis.document.dispatchEvent(new MouseEvent("mouseout"));
@@ -113,12 +114,12 @@ describe("AutofillInlineMenuButton", () => {
       jest.spyOn(globalThis.document, "hasFocus").mockReturnValue(false);
       jest.spyOn(autofillInlineMenuButton["buttonElement"], "querySelector").mockReturnValue(null);
 
-      postWindowMessage({ command: "checkAutofillInlineMenuButtonFocused" });
+      postWindowMessage({ command: "checkAutofillInlineMenuButtonFocused", token: "test-token" });
       await flushPromises();
 
       expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-        { command: "triggerDelayedAutofillInlineMenuClosure", portKey },
-        "*",
+        { command: "triggerDelayedAutofillInlineMenuClosure", portKey, token: "test-token" },
+        expectedOrigin,
       );
     });
 
@@ -128,6 +129,7 @@ describe("AutofillInlineMenuButton", () => {
       postWindowMessage({
         command: "updateAutofillInlineMenuButtonAuthStatus",
         authStatus: AuthenticationStatus.Unlocked,
+        token: "test-token",
       });
       await flushPromises();
 
@@ -143,6 +145,7 @@ describe("AutofillInlineMenuButton", () => {
       postWindowMessage({
         command: "updateAutofillInlineMenuColorScheme",
         colorScheme: "dark",
+        token: "test-token",
       });
       await flushPromises();
 
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/button/autofill-inline-menu-button.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/button/autofill-inline-menu-button.ts
index 4f497172b39..414673a9b81 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/button/autofill-inline-menu-button.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/button/autofill-inline-menu-button.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import "@webcomponents/custom-elements";
 import "lit/polyfill-support.js";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
@@ -103,7 +101,10 @@ export class AutofillInlineMenuButton extends AutofillInlineMenuPageElement {
    */
   private updatePageColorScheme({ colorScheme }: AutofillInlineMenuButtonMessage) {
     const colorSchemeMetaTag = globalThis.document.querySelector("meta[name='color-scheme']");
-    colorSchemeMetaTag?.setAttribute("content", colorScheme);
+
+    if (colorSchemeMetaTag && colorScheme) {
+      colorSchemeMetaTag.setAttribute("content", colorScheme);
+    }
   }
 
   /**
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts
index 36ef3897c56..dffacce0ffc 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts
@@ -1,10 +1,7 @@
 import { AutofillOverlayElement } from "../../../../enums/autofill-overlay.enum";
 
 import { AutofillInlineMenuButton } from "./autofill-inline-menu-button";
-
-// FIXME: Remove when updating file. Eslint update
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-require("./button.scss");
+import "./button.css";
 
 (function () {
   globalThis.customElements.define(AutofillOverlayElement.Button, AutofillInlineMenuButton);
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/button/button.scss b/apps/browser/src/autofill/overlay/inline-menu/pages/button/button.css
similarity index 74%
rename from apps/browser/src/autofill/overlay/inline-menu/pages/button/button.scss
rename to apps/browser/src/autofill/overlay/inline-menu/pages/button/button.css
index 64e54179893..a1fce6f14da 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/button/button.scss
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/button/button.css
@@ -1,5 +1,3 @@
-@import "../../../../shared/styles/variables";
-
 * {
   box-sizing: border-box;
 }
@@ -27,10 +25,10 @@ autofill-inline-menu-button {
   border: none;
   background: transparent;
   cursor: pointer;
-
-  .inline-menu-button-svg-icon {
-    display: block;
-    width: 100%;
-    height: auto;
-  }
+}
+
+.inline-menu-button .inline-menu-button-svg-icon {
+  display: block;
+  width: 100%;
+  height: auto;
 }
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/list/autofill-inline-menu-list.spec.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/list/autofill-inline-menu-list.spec.ts
index b4e480797da..81bf7240230 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/list/autofill-inline-menu-list.spec.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/list/autofill-inline-menu-list.spec.ts
@@ -3,6 +3,7 @@ import { mock } from "jest-mock-extended";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { CipherType } from "@bitwarden/common/vault/enums";
 
+import { BrowserApi } from "../../../../../platform/browser/browser-api";
 import { InlineMenuCipherData } from "../../../../background/abstractions/overlay.background";
 import {
   createAutofillOverlayCipherDataMock,
@@ -23,6 +24,7 @@ describe("AutofillInlineMenuList", () => {
 
   let autofillInlineMenuList: AutofillInlineMenuList | null;
   const portKey: string = "inlineMenuListPortKey";
+  const expectedOrigin = BrowserApi.getRuntimeURL("")?.slice(0, -1) || "chrome-extension://id";
   const events: { eventName: any; callback: any }[] = [];
 
   beforeEach(() => {
@@ -67,8 +69,8 @@ describe("AutofillInlineMenuList", () => {
         unlockButton.dispatchEvent(new Event("click"));
 
         expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-          { command: "unlockVault", portKey },
-          "*",
+          { command: "unlockVault", portKey, token: "test-token" },
+          expectedOrigin,
         );
       });
     });
@@ -134,8 +136,13 @@ describe("AutofillInlineMenuList", () => {
         addVaultItemButton.dispatchEvent(new Event("click"));
 
         expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-          { command: "addNewVaultItem", portKey, addNewCipherType: CipherType.Login },
-          "*",
+          {
+            command: "addNewVaultItem",
+            portKey,
+            addNewCipherType: CipherType.Login,
+            token: "test-token",
+          },
+          expectedOrigin,
         );
       });
     });
@@ -324,8 +331,9 @@ describe("AutofillInlineMenuList", () => {
                 inlineMenuCipherId: "1",
                 usePasskey: false,
                 portKey,
+                token: "test-token",
               },
-              "*",
+              expectedOrigin,
             );
           });
 
@@ -492,8 +500,13 @@ describe("AutofillInlineMenuList", () => {
           viewCipherButton.dispatchEvent(new Event("click"));
 
           expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-            { command: "viewSelectedCipher", inlineMenuCipherId: "1", portKey },
-            "*",
+            {
+              command: "viewSelectedCipher",
+              inlineMenuCipherId: "1",
+              portKey,
+              token: "test-token",
+            },
+            expectedOrigin,
           );
         });
 
@@ -581,8 +594,13 @@ describe("AutofillInlineMenuList", () => {
           newVaultItemButtonSpy.dispatchEvent(new Event("click"));
 
           expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-            { command: "addNewVaultItem", portKey, addNewCipherType: CipherType.Login },
-            "*",
+            {
+              command: "addNewVaultItem",
+              portKey,
+              addNewCipherType: CipherType.Login,
+              token: "test-token",
+            },
+            expectedOrigin,
           );
         });
 
@@ -826,8 +844,8 @@ describe("AutofillInlineMenuList", () => {
           fillGeneratedPasswordButton.dispatchEvent(new Event("click"));
 
           expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-            { command: "fillGeneratedPassword", portKey },
-            "*",
+            { command: "fillGeneratedPassword", portKey, token: "test-token" },
+            expectedOrigin,
           );
         });
 
@@ -843,7 +861,7 @@ describe("AutofillInlineMenuList", () => {
 
             expect(globalThis.parent.postMessage).not.toHaveBeenCalledWith(
               { command: "fillGeneratedPassword", portKey },
-              "*",
+              expectedOrigin,
             );
           });
 
@@ -857,8 +875,8 @@ describe("AutofillInlineMenuList", () => {
             );
 
             expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-              { command: "fillGeneratedPassword", portKey },
-              "*",
+              { command: "fillGeneratedPassword", portKey, token: "test-token" },
+              expectedOrigin,
             );
           });
 
@@ -896,8 +914,8 @@ describe("AutofillInlineMenuList", () => {
           refreshGeneratedPasswordButton.dispatchEvent(new Event("click"));
 
           expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-            { command: "refreshGeneratedPassword", portKey },
-            "*",
+            { command: "refreshGeneratedPassword", portKey, token: "test-token" },
+            expectedOrigin,
           );
         });
 
@@ -913,7 +931,7 @@ describe("AutofillInlineMenuList", () => {
 
             expect(globalThis.parent.postMessage).not.toHaveBeenCalledWith(
               { command: "refreshGeneratedPassword", portKey },
-              "*",
+              expectedOrigin,
             );
           });
 
@@ -927,8 +945,8 @@ describe("AutofillInlineMenuList", () => {
             );
 
             expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-              { command: "refreshGeneratedPassword", portKey },
-              "*",
+              { command: "refreshGeneratedPassword", portKey, token: "test-token" },
+              expectedOrigin,
             );
           });
 
@@ -972,7 +990,7 @@ describe("AutofillInlineMenuList", () => {
     it("does not post a `checkAutofillInlineMenuButtonFocused` message to the parent if the inline menu is currently focused", () => {
       jest.spyOn(globalThis.document, "hasFocus").mockReturnValue(true);
 
-      postWindowMessage({ command: "checkAutofillInlineMenuListFocused" });
+      postWindowMessage({ command: "checkAutofillInlineMenuListFocused", token: "test-token" });
 
       expect(globalThis.parent.postMessage).not.toHaveBeenCalled();
     });
@@ -983,7 +1001,7 @@ describe("AutofillInlineMenuList", () => {
         .spyOn(autofillInlineMenuList["inlineMenuListContainer"], "querySelector")
         .mockReturnValue(autofillInlineMenuList["inlineMenuListContainer"]);
 
-      postWindowMessage({ command: "checkAutofillInlineMenuListFocused" });
+      postWindowMessage({ command: "checkAutofillInlineMenuListFocused", token: "test-token" });
 
       expect(globalThis.parent.postMessage).not.toHaveBeenCalled();
     });
@@ -994,7 +1012,7 @@ describe("AutofillInlineMenuList", () => {
       jest
         .spyOn(autofillInlineMenuList["inlineMenuListContainer"], "querySelector")
         .mockReturnValue(autofillInlineMenuList["inlineMenuListContainer"]);
-      postWindowMessage({ command: "checkAutofillInlineMenuListFocused" });
+      postWindowMessage({ command: "checkAutofillInlineMenuListFocused", token: "test-token" });
       await flushPromises();
 
       globalThis.document.dispatchEvent(new MouseEvent("mouseout"));
@@ -1010,11 +1028,11 @@ describe("AutofillInlineMenuList", () => {
         .spyOn(autofillInlineMenuList["inlineMenuListContainer"], "querySelector")
         .mockReturnValue(null);
 
-      postWindowMessage({ command: "checkAutofillInlineMenuListFocused" });
+      postWindowMessage({ command: "checkAutofillInlineMenuListFocused", token: "test-token" });
 
       expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-        { command: "checkAutofillInlineMenuButtonFocused", portKey },
-        "*",
+        { command: "checkAutofillInlineMenuButtonFocused", portKey, token: "test-token" },
+        expectedOrigin,
       );
     });
 
@@ -1022,7 +1040,7 @@ describe("AutofillInlineMenuList", () => {
       postWindowMessage(createInitAutofillInlineMenuListMessageMock());
       const updateCiphersSpy = jest.spyOn(autofillInlineMenuList as any, "updateListItems");
 
-      postWindowMessage({ command: "updateAutofillInlineMenuListCiphers" });
+      postWindowMessage({ command: "updateAutofillInlineMenuListCiphers", token: "test-token" });
 
       expect(updateCiphersSpy).toHaveBeenCalled();
     });
@@ -1062,7 +1080,10 @@ describe("AutofillInlineMenuList", () => {
         postWindowMessage(createInitAutofillInlineMenuListMessageMock());
         await flushPromises();
 
-        postWindowMessage({ command: "updateAutofillInlineMenuGeneratedPassword" });
+        postWindowMessage({
+          command: "updateAutofillInlineMenuGeneratedPassword",
+          token: "test-token",
+        });
 
         expect(buildColorizedPasswordElementSpy).not.toHaveBeenCalled();
       });
@@ -1074,6 +1095,7 @@ describe("AutofillInlineMenuList", () => {
         postWindowMessage({
           command: "updateAutofillInlineMenuGeneratedPassword",
           generatedPassword,
+          token: "test-token",
         });
 
         expect(buildPasswordGeneratorSpy).toHaveBeenCalled();
@@ -1090,6 +1112,7 @@ describe("AutofillInlineMenuList", () => {
         postWindowMessage({
           command: "updateAutofillInlineMenuGeneratedPassword",
           generatedPassword,
+          token: "test-token",
         });
 
         expect(buildPasswordGeneratorSpy).toHaveBeenCalledTimes(1);
@@ -1115,7 +1138,7 @@ describe("AutofillInlineMenuList", () => {
         );
         await flushPromises();
 
-        postWindowMessage({ command: "showSaveLoginInlineMenuList" });
+        postWindowMessage({ command: "showSaveLoginInlineMenuList", token: "test-token" });
 
         expect(buildSaveLoginInlineMenuSpy).not.toHaveBeenCalled();
       });
@@ -1124,7 +1147,7 @@ describe("AutofillInlineMenuList", () => {
         postWindowMessage(createInitAutofillInlineMenuListMessageMock());
         await flushPromises();
 
-        postWindowMessage({ command: "showSaveLoginInlineMenuList" });
+        postWindowMessage({ command: "showSaveLoginInlineMenuList", token: "test-token" });
 
         expect(buildSaveLoginInlineMenuSpy).toHaveBeenCalled();
       });
@@ -1143,7 +1166,7 @@ describe("AutofillInlineMenuList", () => {
           "setAttribute",
         );
 
-        postWindowMessage({ command: "focusAutofillInlineMenuList" });
+        postWindowMessage({ command: "focusAutofillInlineMenuList", token: "test-token" });
 
         expect(inlineMenuContainerSetAttributeSpy).toHaveBeenCalledWith("role", "dialog");
         expect(inlineMenuContainerSetAttributeSpy).toHaveBeenCalledWith("aria-modal", "true");
@@ -1161,7 +1184,7 @@ describe("AutofillInlineMenuList", () => {
           autofillInlineMenuList["inlineMenuListContainer"].querySelector("#unlock-button");
         jest.spyOn(unlockButton as HTMLElement, "focus");
 
-        postWindowMessage({ command: "focusAutofillInlineMenuList" });
+        postWindowMessage({ command: "focusAutofillInlineMenuList", token: "test-token" });
 
         expect((unlockButton as HTMLElement).focus).toBeCalled();
       });
@@ -1173,7 +1196,7 @@ describe("AutofillInlineMenuList", () => {
           autofillInlineMenuList["inlineMenuListContainer"].querySelector("#new-item-button");
         jest.spyOn(newItemButton as HTMLElement, "focus");
 
-        postWindowMessage({ command: "focusAutofillInlineMenuList" });
+        postWindowMessage({ command: "focusAutofillInlineMenuList", token: "test-token" });
 
         expect((newItemButton as HTMLElement).focus).toBeCalled();
       });
@@ -1184,7 +1207,7 @@ describe("AutofillInlineMenuList", () => {
           autofillInlineMenuList["inlineMenuListContainer"].querySelector(".fill-cipher-button");
         jest.spyOn(firstCipherItem as HTMLElement, "focus");
 
-        postWindowMessage({ command: "focusAutofillInlineMenuList" });
+        postWindowMessage({ command: "focusAutofillInlineMenuList", token: "test-token" });
 
         expect((firstCipherItem as HTMLElement).focus).toBeCalled();
       });
@@ -1197,8 +1220,8 @@ describe("AutofillInlineMenuList", () => {
         globalThis.dispatchEvent(new Event("blur"));
 
         expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-          { command: "autofillInlineMenuBlurred", portKey },
-          "*",
+          { command: "autofillInlineMenuBlurred", portKey, token: "test-token" },
+          expectedOrigin,
         );
       });
     });
@@ -1220,8 +1243,13 @@ describe("AutofillInlineMenuList", () => {
         );
 
         expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-          { command: "redirectAutofillInlineMenuFocusOut", direction: "previous", portKey },
-          "*",
+          {
+            command: "redirectAutofillInlineMenuFocusOut",
+            direction: "previous",
+            portKey,
+            token: "test-token",
+          },
+          expectedOrigin,
         );
       });
 
@@ -1229,8 +1257,13 @@ describe("AutofillInlineMenuList", () => {
         globalThis.document.dispatchEvent(new KeyboardEvent("keydown", { code: "Tab" }));
 
         expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-          { command: "redirectAutofillInlineMenuFocusOut", direction: "next", portKey },
-          "*",
+          {
+            command: "redirectAutofillInlineMenuFocusOut",
+            direction: "next",
+            portKey,
+            token: "test-token",
+          },
+          expectedOrigin,
         );
       });
 
@@ -1238,8 +1271,13 @@ describe("AutofillInlineMenuList", () => {
         globalThis.document.dispatchEvent(new KeyboardEvent("keydown", { code: "Escape" }));
 
         expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-          { command: "redirectAutofillInlineMenuFocusOut", direction: "current", portKey },
-          "*",
+          {
+            command: "redirectAutofillInlineMenuFocusOut",
+            direction: "current",
+            portKey,
+            token: "test-token",
+          },
+          expectedOrigin,
         );
       });
     });
@@ -1274,8 +1312,13 @@ describe("AutofillInlineMenuList", () => {
       autofillInlineMenuList["handleResizeObserver"](entries as unknown as ResizeObserverEntry[]);
 
       expect(globalThis.parent.postMessage).toHaveBeenCalledWith(
-        { command: "updateAutofillInlineMenuListHeight", styles: { height: "300px" }, portKey },
-        "*",
+        {
+          command: "updateAutofillInlineMenuListHeight",
+          styles: { height: "300px" },
+          portKey,
+          token: "test-token",
+        },
+        expectedOrigin,
       );
     });
   });
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/list/list.scss b/apps/browser/src/autofill/overlay/inline-menu/pages/list/list.scss
index 93f5f647ffe..ee9c68ee603 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/list/list.scss
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/list/list.scss
@@ -82,7 +82,7 @@ body * {
   width: 100%;
   font-family: $font-family-sans-serif;
   font-size: 1.6rem;
-  font-weight: 700;
+  font-weight: 500;
   text-align: left;
   background: transparent;
   border: none;
@@ -187,7 +187,7 @@ body * {
   top: 0;
   z-index: 1;
   font-family: $font-family-sans-serif;
-  font-weight: 600;
+  font-weight: 500;
   font-size: 1rem;
   line-height: 1.3;
   letter-spacing: 0.025rem;
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/autofill-inline-menu-container.spec.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/autofill-inline-menu-container.spec.ts
index f7a5727e47f..e0a6e626b3c 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/autofill-inline-menu-container.spec.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/autofill-inline-menu-container.spec.ts
@@ -6,11 +6,13 @@ import { AutofillInlineMenuContainer } from "./autofill-inline-menu-container";
 
 describe("AutofillInlineMenuContainer", () => {
   const portKey = "testPortKey";
-  const iframeUrl = "https://example.com";
+  const extensionOrigin = "chrome-extension://test-extension-id";
+  const iframeUrl = `${extensionOrigin}/overlay/menu-list.html`;
   const pageTitle = "Example";
   let autofillInlineMenuContainer: AutofillInlineMenuContainer;
 
   beforeEach(() => {
+    jest.spyOn(chrome.runtime, "getURL").mockReturnValue(`${extensionOrigin}/`);
     autofillInlineMenuContainer = new AutofillInlineMenuContainer();
   });
 
@@ -28,7 +30,7 @@ describe("AutofillInlineMenuContainer", () => {
         portName: AutofillOverlayPort.List,
       };
 
-      postWindowMessage(message);
+      postWindowMessage(message, extensionOrigin);
 
       expect(autofillInlineMenuContainer["defaultIframeAttributes"].src).toBe(message.iframeUrl);
       expect(autofillInlineMenuContainer["defaultIframeAttributes"].title).toBe(message.pageTitle);
@@ -44,15 +46,48 @@ describe("AutofillInlineMenuContainer", () => {
         portName: AutofillOverlayPort.Button,
       };
 
-      postWindowMessage(message);
+      postWindowMessage(message, extensionOrigin);
 
       jest.spyOn(autofillInlineMenuContainer["inlineMenuPageIframe"].contentWindow, "postMessage");
       autofillInlineMenuContainer["inlineMenuPageIframe"].dispatchEvent(new Event("load"));
 
       expect(chrome.runtime.connect).toHaveBeenCalledWith({ name: message.portName });
+      const expectedMessage = expect.objectContaining({
+        ...message,
+        token: expect.any(String),
+      });
       expect(
         autofillInlineMenuContainer["inlineMenuPageIframe"].contentWindow.postMessage,
-      ).toHaveBeenCalledWith(message, "*");
+      ).toHaveBeenCalledWith(expectedMessage, "*");
+    });
+
+    it("ignores initialization when URLs are not from extension origin", () => {
+      const invalidIframeUrlMessage = {
+        command: "initAutofillInlineMenuList",
+        iframeUrl: "https://malicious.com/overlay/menu-list.html",
+        pageTitle,
+        portKey,
+        portName: AutofillOverlayPort.List,
+      };
+
+      postWindowMessage(invalidIframeUrlMessage, extensionOrigin);
+      expect(autofillInlineMenuContainer["inlineMenuPageIframe"]).toBeUndefined();
+      expect(autofillInlineMenuContainer["isInitialized"]).toBe(false);
+
+      autofillInlineMenuContainer = new AutofillInlineMenuContainer();
+
+      const invalidStyleSheetUrlMessage = {
+        command: "initAutofillInlineMenuList",
+        iframeUrl,
+        pageTitle,
+        portKey,
+        portName: AutofillOverlayPort.List,
+        styleSheetUrl: "https://malicious.com/styles.css",
+      };
+
+      postWindowMessage(invalidStyleSheetUrlMessage, extensionOrigin);
+      expect(autofillInlineMenuContainer["inlineMenuPageIframe"]).toBeUndefined();
+      expect(autofillInlineMenuContainer["isInitialized"]).toBe(false);
     });
   });
 
@@ -69,7 +104,7 @@ describe("AutofillInlineMenuContainer", () => {
         portName: AutofillOverlayPort.Button,
       };
 
-      postWindowMessage(message);
+      postWindowMessage(message, extensionOrigin);
 
       iframe = autofillInlineMenuContainer["inlineMenuPageIframe"];
       jest.spyOn(iframe.contentWindow, "postMessage");
@@ -112,7 +147,8 @@ describe("AutofillInlineMenuContainer", () => {
     });
 
     it("posts a message to the background from the inline menu iframe", () => {
-      const message = { command: "checkInlineMenuButtonFocused", portKey };
+      const token = autofillInlineMenuContainer["token"];
+      const message = { command: "checkInlineMenuButtonFocused", portKey, token };
 
       postWindowMessage(message, "null", iframe.contentWindow as any);
 
@@ -124,7 +160,62 @@ describe("AutofillInlineMenuContainer", () => {
 
       postWindowMessage(message);
 
-      expect(iframe.contentWindow.postMessage).toHaveBeenCalledWith(message, "*");
+      const expectedMessage = expect.objectContaining({
+        ...message,
+        token: expect.any(String),
+      });
+      expect(iframe.contentWindow.postMessage).toHaveBeenCalledWith(expectedMessage, "*");
+    });
+
+    it("ignores messages from iframe with invalid token", () => {
+      const message = { command: "checkInlineMenuButtonFocused", portKey, token: "invalid-token" };
+
+      postWindowMessage(message, "null", iframe.contentWindow as any);
+
+      expect(port.postMessage).not.toHaveBeenCalled();
+    });
+
+    it("ignores messages from iframe with commands not in the allowlist", () => {
+      const token = autofillInlineMenuContainer["token"];
+      const message = { command: "maliciousCommand", portKey, token };
+
+      postWindowMessage(message, "null", iframe.contentWindow as any);
+
+      expect(port.postMessage).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("isExtensionUrlWithOrigin", () => {
+    it("validates extension URLs with matching origin", () => {
+      const url = "chrome-extension://test-id/path/to/file.html";
+      const origin = "chrome-extension://test-id";
+
+      expect(autofillInlineMenuContainer["isExtensionUrlWithOrigin"](url, origin)).toBe(true);
+    });
+
+    it("rejects extension URLs with mismatched origin", () => {
+      const url = "chrome-extension://test-id/path/to/file.html";
+      const origin = "chrome-extension://different-id";
+
+      expect(autofillInlineMenuContainer["isExtensionUrlWithOrigin"](url, origin)).toBe(false);
+    });
+
+    it("validates extension URL against its own origin when no expectedOrigin provided", () => {
+      const url = "moz-extension://test-id/path/to/file.html";
+
+      expect(autofillInlineMenuContainer["isExtensionUrlWithOrigin"](url)).toBe(true);
+    });
+
+    it("rejects non-extension protocols", () => {
+      const url = "https://example.com/path";
+      const origin = "https://example.com";
+
+      expect(autofillInlineMenuContainer["isExtensionUrlWithOrigin"](url, origin)).toBe(false);
+    });
+
+    it("rejects empty or invalid URLs", () => {
+      expect(autofillInlineMenuContainer["isExtensionUrlWithOrigin"]("")).toBe(false);
+      expect(autofillInlineMenuContainer["isExtensionUrlWithOrigin"]("not-a-url")).toBe(false);
     });
   });
 });
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/autofill-inline-menu-container.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/autofill-inline-menu-container.ts
index 663eae9144a..6c61cfae6b4 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/autofill-inline-menu-container.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/autofill-inline-menu-container.ts
@@ -1,8 +1,7 @@
-// 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 { setElementStyles } from "../../../../utils";
+import { BrowserApi } from "../../../../../platform/browser/browser-api";
+import { generateRandomChars, setElementStyles } from "../../../../utils";
 import {
   InitAutofillInlineMenuElementMessage,
   AutofillInlineMenuContainerWindowMessageHandlers,
@@ -10,12 +9,37 @@ import {
   AutofillInlineMenuContainerPortMessage,
 } from "../../abstractions/autofill-inline-menu-container";
 
+/**
+ * Allowlist of commands that can be sent to the background script.
+ */
+const ALLOWED_BG_COMMANDS = new Set<string>([
+  "addNewVaultItem",
+  "autofillInlineMenuBlurred",
+  "autofillInlineMenuButtonClicked",
+  "checkAutofillInlineMenuButtonFocused",
+  "checkInlineMenuButtonFocused",
+  "fillAutofillInlineMenuCipher",
+  "fillGeneratedPassword",
+  "redirectAutofillInlineMenuFocusOut",
+  "refreshGeneratedPassword",
+  "refreshOverlayCiphers",
+  "triggerDelayedAutofillInlineMenuClosure",
+  "updateAutofillInlineMenuColorScheme",
+  "updateAutofillInlineMenuListHeight",
+  "unlockVault",
+  "viewSelectedCipher",
+]);
+
 export class AutofillInlineMenuContainer {
   private readonly setElementStyles = setElementStyles;
-  private readonly extensionOriginsSet: Set<string>;
   private port: chrome.runtime.Port | null = null;
-  private portName: string;
-  private inlineMenuPageIframe: HTMLIFrameElement;
+  /** Non-null asserted. */
+  private portName!: string;
+  /** Non-null asserted. */
+  private inlineMenuPageIframe!: HTMLIFrameElement;
+  private token: string;
+  private isInitialized: boolean = false;
+  private readonly extensionOrigin: string;
   private readonly iframeStyles: Partial<CSSStyleDeclaration> = {
     all: "initial",
     position: "fixed",
@@ -42,16 +66,15 @@ export class AutofillInlineMenuContainer {
     tabIndex: "-1",
   };
   private readonly windowMessageHandlers: AutofillInlineMenuContainerWindowMessageHandlers = {
-    initAutofillInlineMenuButton: (message) => this.handleInitInlineMenuIframe(message),
-    initAutofillInlineMenuList: (message) => this.handleInitInlineMenuIframe(message),
+    initAutofillInlineMenuButton: (message: InitAutofillInlineMenuElementMessage) =>
+      this.handleInitInlineMenuIframe(message),
+    initAutofillInlineMenuList: (message: InitAutofillInlineMenuElementMessage) =>
+      this.handleInitInlineMenuIframe(message),
   };
 
   constructor() {
-    this.extensionOriginsSet = new Set([
-      chrome.runtime.getURL("").slice(0, -1).toLowerCase(), // Remove the trailing slash and normalize the extension url to lowercase
-      "null",
-    ]);
-
+    this.token = generateRandomChars(32);
+    this.extensionOrigin = BrowserApi.getRuntimeURL("")?.slice(0, -1);
     globalThis.addEventListener("message", this.handleWindowMessage);
   }
 
@@ -61,9 +84,24 @@ export class AutofillInlineMenuContainer {
    * @param message - The message containing the iframe url and page title.
    */
   private handleInitInlineMenuIframe(message: InitAutofillInlineMenuElementMessage) {
+    if (this.isInitialized) {
+      return;
+    }
+
+    const expectedOrigin = message.extensionOrigin || this.extensionOrigin;
+
+    if (!this.isExtensionUrlWithOrigin(message.iframeUrl, expectedOrigin)) {
+      return;
+    }
+
+    if (message.styleSheetUrl && !this.isExtensionUrlWithOrigin(message.styleSheetUrl)) {
+      return;
+    }
+
     this.defaultIframeAttributes.src = message.iframeUrl;
     this.defaultIframeAttributes.title = message.pageTitle;
     this.portName = message.portName;
+    this.isInitialized = true;
 
     this.inlineMenuPageIframe = globalThis.document.createElement("iframe");
     this.setElementStyles(this.inlineMenuPageIframe, this.iframeStyles, true);
@@ -79,6 +117,31 @@ export class AutofillInlineMenuContainer {
     globalThis.document.body.appendChild(this.inlineMenuPageIframe);
   }
 
+  /**
+   * Validates that a URL uses an extension protocol and matches the expected extension origin.
+   * If no expectedOrigin is provided, validates against the URL's own origin.
+   *
+   * @param url - The URL to validate.
+   */
+  private isExtensionUrlWithOrigin(url: string, expectedOrigin?: string): boolean {
+    if (!url) {
+      return false;
+    }
+    try {
+      const urlObj = new URL(url);
+      const isExtensionProtocol = /^[a-z]+(-[a-z]+)?-extension:$/i.test(urlObj.protocol);
+
+      if (!isExtensionProtocol) {
+        return false;
+      }
+
+      const originToValidate = expectedOrigin ?? urlObj.origin;
+      return urlObj.origin === originToValidate || urlObj.href.startsWith(originToValidate + "/");
+    } catch {
+      return false;
+    }
+  }
+
   /**
    * Sets up the port message listener for the inline menu page.
    *
@@ -86,7 +149,8 @@ export class AutofillInlineMenuContainer {
    */
   private setupPortMessageListener = (message: InitAutofillInlineMenuElementMessage) => {
     this.port = chrome.runtime.connect({ name: this.portName });
-    this.postMessageToInlineMenuPage(message);
+    const initMessage = { ...message, token: this.token };
+    this.postMessageToInlineMenuPageUnsafe(initMessage);
   };
 
   /**
@@ -95,6 +159,22 @@ export class AutofillInlineMenuContainer {
    * @param message - The message to post.
    */
   private postMessageToInlineMenuPage(message: AutofillInlineMenuContainerWindowMessage) {
+    if (this.inlineMenuPageIframe?.contentWindow) {
+      const messageWithToken = { ...message, token: this.token };
+      this.postMessageToInlineMenuPageUnsafe(messageWithToken);
+    }
+  }
+
+  /**
+   * Posts a message to the inline menu page iframe without token validation.
+   *
+   * UNSAFE: Bypasses token authentication and sends raw messages. Only use internally
+   * when sending trusted messages (e.g., initialization) or when token validation
+   * would create circular dependencies. External callers should use postMessageToInlineMenuPage().
+   *
+   * @param message - The message to post.
+   */
+  private postMessageToInlineMenuPageUnsafe(message: Record<string, unknown>) {
     if (this.inlineMenuPageIframe?.contentWindow) {
       this.inlineMenuPageIframe.contentWindow.postMessage(message, "*");
     }
@@ -106,9 +186,15 @@ export class AutofillInlineMenuContainer {
    * @param message - The message to post.
    */
   private postMessageToBackground(message: AutofillInlineMenuContainerPortMessage) {
-    if (this.port) {
-      this.port.postMessage(message);
+    if (!this.port) {
+      return;
     }
+
+    if (message.command && !ALLOWED_BG_COMMANDS.has(message.command)) {
+      return;
+    }
+
+    this.port.postMessage(message);
   }
 
   /**
@@ -116,23 +202,42 @@ export class AutofillInlineMenuContainer {
    *
    * @param event - The message event.
    */
-  private handleWindowMessage = (event: MessageEvent) => {
+  private handleWindowMessage = (event: MessageEvent<AutofillInlineMenuContainerWindowMessage>) => {
     const message = event.data;
+    if (!message?.command) {
+      return;
+    }
     if (this.isForeignWindowMessage(event)) {
       return;
     }
 
     if (this.windowMessageHandlers[message.command]) {
+      // only accept init messages from extension origin or parent window
+      if (
+        (message.command === "initAutofillInlineMenuButton" ||
+          message.command === "initAutofillInlineMenuList") &&
+        !this.isMessageFromExtensionOrigin(event) &&
+        !this.isMessageFromParentWindow(event)
+      ) {
+        return;
+      }
       this.windowMessageHandlers[message.command](message);
       return;
     }
 
     if (this.isMessageFromParentWindow(event)) {
+      // messages from parent window are trusted and forwarded to iframe
       this.postMessageToInlineMenuPage(message);
       return;
     }
 
-    this.postMessageToBackground(message);
+    // messages from iframe to background require object identity verification with a contentWindow check and token auth
+    if (this.isMessageFromInlineMenuPageIframe(event)) {
+      if (this.isValidSessionToken(message)) {
+        this.postMessageToBackground(message);
+      }
+      return;
+    }
   };
 
   /**
@@ -142,8 +247,8 @@ export class AutofillInlineMenuContainer {
    *
    * @param event - The message event.
    */
-  private isForeignWindowMessage(event: MessageEvent) {
-    if (!event.data.portKey) {
+  private isForeignWindowMessage(event: MessageEvent<AutofillInlineMenuContainerWindowMessage>) {
+    if (!event.data?.portKey) {
       return true;
     }
 
@@ -159,7 +264,9 @@ export class AutofillInlineMenuContainer {
    *
    * @param event - The message event.
    */
-  private isMessageFromParentWindow(event: MessageEvent): boolean {
+  private isMessageFromParentWindow(
+    event: MessageEvent<AutofillInlineMenuContainerWindowMessage>,
+  ): boolean {
     return globalThis.parent === event.source;
   }
 
@@ -168,14 +275,43 @@ export class AutofillInlineMenuContainer {
    *
    * @param event - The message event.
    */
-  private isMessageFromInlineMenuPageIframe(event: MessageEvent): boolean {
+  private isMessageFromInlineMenuPageIframe(
+    event: MessageEvent<AutofillInlineMenuContainerWindowMessage>,
+  ): boolean {
     if (!this.inlineMenuPageIframe) {
       return false;
     }
+    // only trust the specific iframe we created
+    return this.inlineMenuPageIframe.contentWindow === event.source;
+  }
 
-    return (
-      this.inlineMenuPageIframe.contentWindow === event.source &&
-      this.extensionOriginsSet.has(event.origin.toLowerCase())
-    );
+  /**
+   * Validates that the message contains a valid session token.
+   * The session token is generated when the container is created and is refreshed
+   * every time the inline menu container is recreated.
+   *
+   */
+  private isValidSessionToken(message: { token: string }): boolean {
+    if (!this.token || !message?.token || !message?.token.length) {
+      return false;
+    }
+    return message.token === this.token;
+  }
+
+  /**
+   * Validates that a message event originates from the extension.
+   *
+   * @param event - The message event to validate.
+   * @returns True if the message is from the extension origin.
+   */
+  private isMessageFromExtensionOrigin(event: MessageEvent): boolean {
+    try {
+      if (event.origin === "null") {
+        return false;
+      }
+      return event.origin === this.extensionOrigin;
+    } catch {
+      return false;
+    }
   }
 }
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/shared/autofill-inline-menu-page-element.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/shared/autofill-inline-menu-page-element.ts
index 950676cf202..5df6e7cd190 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/shared/autofill-inline-menu-page-element.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/shared/autofill-inline-menu-page-element.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 { RedirectFocusDirection } from "../../../../enums/autofill-overlay.enum";
@@ -10,10 +8,15 @@ import {
 
 export class AutofillInlineMenuPageElement extends HTMLElement {
   protected shadowDom: ShadowRoot;
-  protected messageOrigin: string;
-  protected translations: Record<string, string>;
-  private portKey: string;
-  protected windowMessageHandlers: AutofillInlineMenuPageElementWindowMessageHandlers;
+  /** Non-null asserted. */
+  protected messageOrigin!: string;
+  /** Non-null asserted. */
+  protected translations!: Record<string, string>;
+  /** Non-null asserted. */
+  private portKey!: string;
+  /** Non-null asserted. */
+  protected windowMessageHandlers!: AutofillInlineMenuPageElementWindowMessageHandlers;
+  private token?: string;
 
   constructor() {
     super();
@@ -56,7 +59,16 @@ export class AutofillInlineMenuPageElement extends HTMLElement {
    * @param message - The message to post
    */
   protected postMessageToParent(message: AutofillInlineMenuPageElementWindowMessage) {
-    globalThis.parent.postMessage({ portKey: this.portKey, ...message }, "*");
+    // never send messages containing authentication tokens without a valid token and an established messageOrigin
+    if (!this.token || !this.messageOrigin) {
+      return;
+    }
+    const messageWithAuth: Record<string, unknown> = {
+      portKey: this.portKey,
+      ...message,
+      token: this.token,
+    };
+    globalThis.parent.postMessage(messageWithAuth, this.messageOrigin);
   }
 
   /**
@@ -94,6 +106,10 @@ export class AutofillInlineMenuPageElement extends HTMLElement {
       return;
     }
 
+    if (event.source !== globalThis.parent) {
+      return;
+    }
+
     if (!this.messageOrigin) {
       this.messageOrigin = event.origin;
     }
@@ -103,6 +119,26 @@ export class AutofillInlineMenuPageElement extends HTMLElement {
     }
 
     const message = event?.data;
+
+    if (!message?.command) {
+      return;
+    }
+
+    const isInitCommand =
+      message.command === "initAutofillInlineMenuButton" ||
+      message.command === "initAutofillInlineMenuList";
+
+    if (isInitCommand) {
+      if (!message?.token) {
+        return;
+      }
+      this.token = message.token;
+    } else {
+      if (!this.token || !message?.token || message.token !== this.token) {
+        return;
+      }
+    }
+
     const handler = this.windowMessageHandlers[message?.command];
     if (!handler) {
       return;
diff --git a/apps/browser/src/autofill/overlay/notifications/content/__snapshots__/overlay-notifications-content.service.spec.ts.snap b/apps/browser/src/autofill/overlay/notifications/content/__snapshots__/overlay-notifications-content.service.spec.ts.snap
index e5bafe34b5f..cfcedc9da7a 100644
--- a/apps/browser/src/autofill/overlay/notifications/content/__snapshots__/overlay-notifications-content.service.spec.ts.snap
+++ b/apps/browser/src/autofill/overlay/notifications/content/__snapshots__/overlay-notifications-content.service.spec.ts.snap
@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`OverlayNotificationsContentService opening the notification bar creates the notification bar elements and appends them to the body 1`] = `
+exports[`OverlayNotificationsContentService opening the notification bar creates the notification bar elements and appends them to the body within a shadow root 1`] = `
 <div
   id="bit-notification-bar"
   style="height: 400px !important; width: 430px !important; max-width: calc(100% - 20px) !important; min-height: initial !important; top: 10px !important; right: 0px !important; padding: 0px !important; position: fixed !important; z-index: 2147483647 !important; visibility: visible !important; border-radius: 4px !important; background-color: transparent !important; overflow: hidden !important; transition: box-shadow 0.15s ease !important; transition-delay: 0.15s;"
 >
   <iframe
     id="bit-notification-bar-iframe"
-    src="chrome-extension://id/notification/bar.html"
+    src="chrome-extension://id/notification/bar.html?parentOrigin=http%3A%2F%2Flocalhost"
     style="width: 100% !important; height: 100% !important; border: 0px !important; display: block !important; position: relative !important; transition: transform 0.15s ease-out, opacity 0.15s ease !important; border-radius: 4px !important; color-scheme: auto !important; transform: translateX(0) !important; opacity: 0;"
   />
 </div>
diff --git a/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.spec.ts b/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.spec.ts
index 9f344a92bfc..b016a91d8a4 100644
--- a/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.spec.ts
+++ b/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.spec.ts
@@ -16,10 +16,13 @@ describe("OverlayNotificationsContentService", () => {
   let domElementVisibilityService: DomElementVisibilityService;
   let autofillInit: AutofillInit;
   let bodyAppendChildSpy: jest.SpyInstance;
+  let postMessageSpy: jest.SpyInstance<void, Parameters<Window["postMessage"]>>;
 
   beforeEach(() => {
     jest.useFakeTimers();
-    jest.spyOn(utils, "sendExtensionMessage").mockImplementation(jest.fn());
+    jest.spyOn(utils, "sendExtensionMessage").mockImplementation(async () => null);
+    jest.spyOn(HTMLIFrameElement.prototype, "contentWindow", "get").mockReturnValue(window);
+    postMessageSpy = jest.spyOn(window, "postMessage").mockImplementation(jest.fn());
     domQueryService = mock<DomQueryService>();
     domElementVisibilityService = new DomElementVisibilityService();
     overlayNotificationsContentService = new OverlayNotificationsContentService();
@@ -48,7 +51,7 @@ describe("OverlayNotificationsContentService", () => {
     });
 
     it("closes the notification bar if the notification bar type has changed", async () => {
-      overlayNotificationsContentService["currentNotificationBarType"] = "add";
+      overlayNotificationsContentService["currentNotificationBarType"] = NotificationType.AddLogin;
       const closeNotificationBarSpy = jest.spyOn(
         overlayNotificationsContentService as any,
         "closeNotificationBar",
@@ -66,7 +69,7 @@ describe("OverlayNotificationsContentService", () => {
       expect(closeNotificationBarSpy).toHaveBeenCalled();
     });
 
-    it("creates the notification bar elements and appends them to the body", async () => {
+    it("creates the notification bar elements and appends them to the body within a shadow root", async () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
@@ -77,6 +80,13 @@ describe("OverlayNotificationsContentService", () => {
       await flushPromises();
 
       expect(overlayNotificationsContentService["notificationBarElement"]).toMatchSnapshot();
+
+      const rootElement = overlayNotificationsContentService["notificationBarRootElement"];
+      expect(bodyAppendChildSpy).toHaveBeenCalledWith(rootElement);
+      expect(rootElement?.tagName).toBe("BIT-NOTIFICATION-BAR-ROOT");
+
+      expect(document.getElementById("bit-notification-bar")).toBeNull();
+      expect(document.querySelector("#bit-notification-bar-iframe")).toBeNull();
     });
 
     it("sets up a slide in animation when the notification is fresh", async () => {
@@ -116,6 +126,8 @@ describe("OverlayNotificationsContentService", () => {
     });
 
     it("sends an initialization message to the notification bar iframe", async () => {
+      const addEventListenerSpy = jest.spyOn(globalThis, "addEventListener");
+
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
@@ -124,10 +136,7 @@ describe("OverlayNotificationsContentService", () => {
         },
       });
       await flushPromises();
-      const postMessageSpy = jest.spyOn(
-        overlayNotificationsContentService["notificationBarIframeElement"].contentWindow,
-        "postMessage",
-      );
+      expect(addEventListenerSpy).toHaveBeenCalledWith("message", expect.any(Function));
 
       globalThis.dispatchEvent(
         new MessageEvent("message", {
@@ -142,13 +151,13 @@ describe("OverlayNotificationsContentService", () => {
       );
       await flushPromises();
 
-      expect(postMessageSpy).toHaveBeenCalledTimes(1);
       expect(postMessageSpy).toHaveBeenCalledWith(
         {
           command: "initNotificationBar",
           initData: expect.any(Object),
+          parentOrigin: expect.any(String),
         },
-        "*",
+        overlayNotificationsContentService["extensionOrigin"],
       );
     });
   });
@@ -158,7 +167,7 @@ describe("OverlayNotificationsContentService", () => {
       sendMockExtensionMessage({
         command: "openNotificationBar",
         data: {
-          type: "change",
+          type: NotificationType.ChangePassword,
           typeData: mock<NotificationTypeData>(),
         },
       });
@@ -242,20 +251,15 @@ describe("OverlayNotificationsContentService", () => {
     });
 
     it("sends a message to the notification bar iframe indicating that the save attempt completed", () => {
-      jest.spyOn(
-        overlayNotificationsContentService["notificationBarIframeElement"].contentWindow,
-        "postMessage",
-      );
-
       sendMockExtensionMessage({
         command: "saveCipherAttemptCompleted",
         data: { error: undefined },
       });
 
-      expect(
-        overlayNotificationsContentService["notificationBarIframeElement"].contentWindow
-          .postMessage,
-      ).toHaveBeenCalledWith({ command: "saveCipherAttemptCompleted", error: undefined }, "*");
+      expect(postMessageSpy).toHaveBeenCalledWith(
+        { command: "saveCipherAttemptCompleted", error: undefined },
+        overlayNotificationsContentService["extensionOrigin"],
+      );
     });
   });
 
@@ -271,9 +275,10 @@ describe("OverlayNotificationsContentService", () => {
       await flushPromises();
     });
 
-    it("triggers a closure of the notification bar", () => {
+    it("triggers a closure of the notification bar and cleans up all shadow DOM elements", () => {
       overlayNotificationsContentService.destroy();
 
+      expect(overlayNotificationsContentService["notificationBarRootElement"]).toBeNull();
       expect(overlayNotificationsContentService["notificationBarElement"]).toBeNull();
       expect(overlayNotificationsContentService["notificationBarIframeElement"]).toBeNull();
     });
diff --git a/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.ts b/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.ts
index 4e09c3186bb..8dc08169468 100644
--- a/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.ts
+++ b/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.ts
@@ -2,6 +2,7 @@
 // @ts-strict-ignore
 import { EVENTS } from "@bitwarden/common/autofill/constants";
 
+import { BrowserApi } from "../../../../platform/browser/browser-api";
 import {
   NotificationBarIframeInitData,
   NotificationType,
@@ -17,9 +18,12 @@ import {
 export class OverlayNotificationsContentService
   implements OverlayNotificationsContentServiceInterface
 {
+  private notificationBarRootElement: HTMLElement | null = null;
   private notificationBarElement: HTMLElement | null = null;
   private notificationBarIframeElement: HTMLIFrameElement | null = null;
+  private notificationBarShadowRoot: ShadowRoot | null = null;
   private currentNotificationBarType: NotificationType | null = null;
+  private readonly extensionOrigin: string;
   private notificationBarContainerStyles: Partial<CSSStyleDeclaration> = {
     height: "400px",
     width: "430px",
@@ -59,6 +63,7 @@ export class OverlayNotificationsContentService
   };
 
   constructor() {
+    this.extensionOrigin = BrowserApi.getRuntimeURL("")?.slice(0, -1);
     void sendExtensionMessage("checkNotificationQueue");
   }
 
@@ -158,12 +163,12 @@ export class OverlayNotificationsContentService
    * @private
    */
   private openNotificationBar(initData: NotificationBarIframeInitData) {
-    if (!this.notificationBarElement && !this.notificationBarIframeElement) {
+    if (!this.notificationBarRootElement && !this.notificationBarIframeElement) {
       this.createNotificationBarIframeElement(initData);
       this.createNotificationBarElement();
 
       this.setupInitNotificationBarMessageListener(initData);
-      globalThis.document.body.appendChild(this.notificationBarElement);
+      globalThis.document.body.appendChild(this.notificationBarRootElement);
     }
   }
 
@@ -179,7 +184,10 @@ export class OverlayNotificationsContentService
     this.currentNotificationBarType = initData.type;
     this.notificationBarIframeElement = globalThis.document.createElement("iframe");
     this.notificationBarIframeElement.id = "bit-notification-bar-iframe";
-    this.notificationBarIframeElement.src = chrome.runtime.getURL("notification/bar.html");
+    const parentOrigin = globalThis.location.origin;
+    const iframeUrl = new URL(BrowserApi.getRuntimeURL("notification/bar.html"));
+    iframeUrl.searchParams.set("parentOrigin", parentOrigin);
+    this.notificationBarIframeElement.src = iframeUrl.toString();
     setElementStyles(
       this.notificationBarIframeElement,
       {
@@ -213,15 +221,25 @@ export class OverlayNotificationsContentService
   };
 
   /**
-   * Creates the container for the notification bar iframe.
+   * Creates the container for the notification bar iframe with shadow DOM.
    */
   private createNotificationBarElement() {
     if (this.notificationBarIframeElement) {
+      this.notificationBarRootElement = globalThis.document.createElement(
+        "bit-notification-bar-root",
+      );
+
+      this.notificationBarShadowRoot = this.notificationBarRootElement.attachShadow({
+        mode: "closed",
+        delegatesFocus: true,
+      });
+
       this.notificationBarElement = globalThis.document.createElement("div");
       this.notificationBarElement.id = "bit-notification-bar";
 
       setElementStyles(this.notificationBarElement, this.notificationBarContainerStyles, true);
 
+      this.notificationBarShadowRoot.appendChild(this.notificationBarElement);
       this.notificationBarElement.appendChild(this.notificationBarIframeElement);
     }
   }
@@ -242,7 +260,11 @@ export class OverlayNotificationsContentService
         return;
       }
 
-      this.sendMessageToNotificationBarIframe({ command: "initNotificationBar", initData });
+      this.sendMessageToNotificationBarIframe({
+        command: "initNotificationBar",
+        initData,
+        parentOrigin: globalThis.location.origin,
+      });
       globalThis.removeEventListener("message", handleInitNotificationBarMessage);
     };
 
@@ -258,7 +280,7 @@ export class OverlayNotificationsContentService
    * @param closedByUserAction - Whether the notification bar was closed by the user.
    */
   private closeNotificationBar(closedByUserAction: boolean = false) {
-    if (!this.notificationBarElement && !this.notificationBarIframeElement) {
+    if (!this.notificationBarRootElement && !this.notificationBarIframeElement) {
       return;
     }
 
@@ -267,6 +289,9 @@ export class OverlayNotificationsContentService
 
     this.notificationBarElement.remove();
     this.notificationBarElement = null;
+    this.notificationBarShadowRoot = null;
+    this.notificationBarRootElement.remove();
+    this.notificationBarRootElement = null;
 
     const removableNotificationTypes = new Set([
       NotificationTypes.Add,
@@ -288,7 +313,7 @@ export class OverlayNotificationsContentService
    */
   private sendMessageToNotificationBarIframe(message: Record<string, any>) {
     if (this.notificationBarIframeElement) {
-      this.notificationBarIframeElement.contentWindow.postMessage(message, "*");
+      this.notificationBarIframeElement.contentWindow.postMessage(message, this.extensionOrigin);
     }
   }
 
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.html b/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.html
index 46a03acaedb..165416f63a5 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.html
+++ b/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.html
@@ -9,15 +9,17 @@
     <app-vault-icon slot="start" [cipher]="cipher"></app-vault-icon>
     <span data-testid="item-name">
       {{ cipher.name }}
-      <i
-        *ngIf="cipher.organizationId"
-        [appA11yTitle]="'shared' | i18n"
-        class="bwi bwi-collection-shared text-muted"
-      ></i>
+      @if (cipher.organizationId) {
+        <i [appA11yTitle]="'shared' | i18n" class="bwi bwi-collection-shared tw-text-muted"></i>
+      }
     </span>
     <ng-container slot="secondary">
-      <div *ngIf="getSubName(cipher)">{{ getSubName(cipher) }}</div>
-      <div *ngIf="cipher.subTitle">{{ cipher.subTitle }}</div>
+      @if (getSubName(cipher)) {
+        <div>{{ getSubName(cipher) }}</div>
+      }
+      @if (cipher.subTitle) {
+        <div>{{ cipher.subTitle }}</div>
+      }
     </ng-container>
   </button>
 </bit-item>
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.ts b/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.ts
index 074e23d642d..adabae2c31d 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.ts
+++ b/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.ts
@@ -28,9 +28,17 @@ import {
   ],
 })
 export class Fido2CipherRowComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSelected = new EventEmitter<CipherView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cipher: CipherView;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() last: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title: string;
 
   protected selectCipher(c: CipherView) {
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.html b/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.html
index 45c0612af44..0d0d2bb017d 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.html
+++ b/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.html
@@ -1,52 +1,24 @@
-<ng-container *ngIf="(fido2PopoutSessionData$ | async).fallbackSupported">
-  <div class="useBrowserlink">
-    <button
-      type="button"
-      (click)="toggle()"
-      cdkOverlayOrigin
-      #trigger="cdkOverlayOrigin"
-      aria-haspopup="dialog"
-      aria-controls="cdk-overlay-container"
-    >
-      <span class="text-primary">
+@if ((fido2PopoutSessionData$ | async).fallbackSupported) {
+  <div class="tw-flex tw-items-center tw-justify-center tw-p-2">
+    <button type="button" [bitMenuTriggerFor]="deviceMenu">
+      <span bitTypography="body2">
         {{ "useDeviceOrHardwareKey" | i18n }}
       </span>
       <i class="bwi bwi-fw bwi-sm bwi-angle-down" aria-hidden="true"></i>
     </button>
+    <bit-menu #deviceMenu>
+      <button type="button" bitMenuItem (click)="abort(false)">
+        {{ "justOnce" | i18n }}
+      </button>
+      <button type="button" bitMenuItem (click)="abort()">
+        {{ "alwaysForThisSite" | i18n }}
+      </button>
+    </bit-menu>
   </div>
 
-  <ng-template
-    cdkConnectedOverlay
-    [cdkConnectedOverlayOrigin]="trigger"
-    [cdkConnectedOverlayOpen]="isOpen"
-    [cdkConnectedOverlayPositions]="overlayPosition"
-    [cdkConnectedOverlayHasBackdrop]="true"
-    [cdkConnectedOverlayBackdropClass]="'cdk-overlay-transparent-backdrop'"
-    (backdropClick)="isOpen = false"
-    (detach)="close()"
-  >
-    <div class="box-content">
-      <div
-        class="fido2-browser-selector-dropdown"
-        [@transformPanel]="'open'"
-        cdkTrapFocus
-        cdkTrapFocusAutoCapture
-        role="dialog"
-        aria-modal="true"
-      >
-        <button type="button" class="fido2-browser-selector-dropdown-item" (click)="abort(false)">
-          <span>{{ "justOnce" | i18n }}</span>
-        </button>
-        <br />
-        <button type="button" class="fido2-browser-selector-dropdown-item" (click)="abort()">
-          <span>{{ "alwaysForThisSite" | i18n }}</span>
-        </button>
-      </div>
-    </div>
-  </ng-template>
-
-  <div
-    *ngIf="showOverlay"
-    class="tw-absolute tw-size-full tw-bg-background-alt tw-inset-0 tw-bg-opacity-80 tw-z-50"
-  ></div>
-</ng-container>
+  @if (showOverlay) {
+    <div
+      class="tw-absolute tw-size-full tw-bg-background-alt tw-inset-0 tw-bg-opacity-80 tw-z-50"
+    ></div>
+  }
+}
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.ts b/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.ts
index 27fe88130de..9ccbce4d8e6 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.ts
+++ b/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.ts
@@ -1,8 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { animate, state, style, transition, trigger } from "@angular/animations";
-import { A11yModule } from "@angular/cdk/a11y";
-import { ConnectedPosition, CdkOverlayOrigin, CdkConnectedOverlay } from "@angular/cdk/overlay";
 import { CommonModule } from "@angular/common";
 import { Component } from "@angular/core";
 import { firstValueFrom } from "rxjs";
@@ -13,70 +8,34 @@ import { NeverDomains } from "@bitwarden/common/models/domain/domain-service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { MenuModule } from "@bitwarden/components";
 
 import { fido2PopoutSessionData$ } from "../../../vault/popup/utils/fido2-popout-session-data";
 import { BrowserFido2UserInterfaceSession } from "../../fido2/services/browser-fido2-user-interface.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-fido2-use-browser-link",
   templateUrl: "fido2-use-browser-link.component.html",
-  imports: [A11yModule, CdkConnectedOverlay, CdkOverlayOrigin, CommonModule, JslibModule],
-  animations: [
-    trigger("transformPanel", [
-      state(
-        "void",
-        style({
-          opacity: 0,
-        }),
-      ),
-      transition(
-        "void => open",
-        animate(
-          "100ms linear",
-          style({
-            opacity: 1,
-          }),
-        ),
-      ),
-      transition("* => void", animate("100ms linear", style({ opacity: 0 }))),
-    ]),
-  ],
+  imports: [CommonModule, JslibModule, MenuModule],
 })
 export class Fido2UseBrowserLinkComponent {
   showOverlay = false;
-  isOpen = false;
-  overlayPosition: ConnectedPosition[] = [
-    {
-      originX: "start",
-      originY: "bottom",
-      overlayX: "start",
-      overlayY: "top",
-      offsetY: 5,
-    },
-  ];
 
   protected fido2PopoutSessionData$ = fido2PopoutSessionData$();
 
   constructor(
-    private domainSettingsService: DomainSettingsService,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
+    private readonly domainSettingsService: DomainSettingsService,
+    private readonly platformUtilsService: PlatformUtilsService,
+    private readonly i18nService: I18nService,
   ) {}
 
-  toggle() {
-    this.isOpen = !this.isOpen;
-  }
-
-  close() {
-    this.isOpen = false;
-  }
-
   /**
    * Aborts the current FIDO2 session and fallsback to the browser.
    * @param excludeDomain - Identifies if the domain should be excluded from future FIDO2 prompts.
    */
   protected async abort(excludeDomain = true) {
-    this.close();
     const sessionData = await firstValueFrom(this.fido2PopoutSessionData$);
 
     if (!excludeDomain) {
@@ -108,7 +67,7 @@ export class Fido2UseBrowserLinkComponent {
 
     this.platformUtilsService.showToast(
       "success",
-      null,
+      "",
       this.i18nService.t("domainAddedToExcludedDomains", validDomain),
     );
   }
diff --git a/apps/browser/src/autofill/popup/fido2/fido2.component.html b/apps/browser/src/autofill/popup/fido2/fido2.component.html
index 8d8394641e9..ed851af234e 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2.component.html
+++ b/apps/browser/src/autofill/popup/fido2/fido2.component.html
@@ -1,144 +1,140 @@
-<popup-page *ngIf="data$ | async as data">
-  <popup-header
-    slot="header"
-    pageTitle="{{
-      (passkeyAction === PasskeyActions.Register ? 'savePasskey' : 'logInWithPasskeyQuestion')
-        | i18n
-    }}"
-  >
-    <button
-      *ngIf="showNewPasskeyButton"
-      bitButton
-      buttonType="primary"
-      type="button"
-      (click)="addCipher()"
-      slot="end"
+@if (data$ | async; as data) {
+  <popup-page>
+    <popup-header
+      slot="header"
+      pageTitle="{{
+        (passkeyAction === PasskeyActions.Register ? 'savePasskey' : 'logInWithPasskeyQuestion')
+          | i18n
+      }}"
     >
-      <i class="bwi bwi-plus" aria-hidden="true"></i>
-      {{ "new" | i18n }}
-    </button>
-  </popup-header>
+      @if (showNewPasskeyButton) {
+        <button bitButton buttonType="primary" type="button" (click)="addCipher()" slot="end">
+          <i class="bwi bwi-plus" aria-hidden="true"></i>
+          {{ "new" | i18n }}
+        </button>
+      }
+    </popup-header>
 
-  <div class="tw-p-2">
-    <bit-section *ngIf="passkeyAction === PasskeyActions.Register">
-      <bit-search
-        appAutofocus
-        autocomplete="off"
-        id="search"
-        placeholder="{{ 'searchVault' | i18n }}"
-        (ngModelChange)="search()"
-        [(ngModel)]="searchText"
-      ></bit-search>
-    </bit-section>
+    <div class="tw-p-2">
+      @if (passkeyAction === PasskeyActions.Register) {
+        <bit-section>
+          <bit-search
+            appAutofocus
+            autocomplete="off"
+            id="search"
+            placeholder="{{ 'searchVault' | i18n }}"
+            (ngModelChange)="search()"
+            [(ngModel)]="searchText"
+          ></bit-search>
+        </bit-section>
+      }
 
-    <!-- Display when adding a new passkey -->
-    <bit-section *ngIf="data.message.type === BrowserFido2MessageTypes.ConfirmNewCredentialRequest">
-      <!-- Display when matching ciphers (i.e. same domain, no passkeys) exist -->
-      <ng-container *ngIf="displayedCiphers.length > 0">
-        <bit-section-header>
-          <h2 bitTypography="h6">{{ "chooseCipherForPasskeySave" | i18n }}</h2>
-        </bit-section-header>
-        <app-fido2-cipher-row
-          *ngFor="let cipherItem of displayedCiphers"
-          [cipher]="cipherItem"
-          title="{{ 'passkeyItem' | i18n }}"
-          (onSelected)="handleCipherItemSelect($event)"
-        ></app-fido2-cipher-row>
-      </ng-container>
+      @switch (data.message.type) {
+        @case (BrowserFido2MessageTypes.ConfirmNewCredentialRequest) {
+          <bit-section>
+            @if (displayedCiphers.length > 0) {
+              <bit-section-header>
+                <h2 bitTypography="h6">{{ "chooseCipherForPasskeySave" | i18n }}</h2>
+              </bit-section-header>
+              @for (cipherItem of displayedCiphers; track cipherItem.id) {
+                <app-fido2-cipher-row
+                  [cipher]="cipherItem"
+                  title="{{ 'passkeyItem' | i18n }}"
+                  (onSelected)="handleCipherItemSelect($event)"
+                ></app-fido2-cipher-row>
+              }
+            }
+            @if (!displayedCiphers.length) {
+              <bit-no-items [icon]="noResultsIcon">
+                <ng-container slot="title">{{
+                  (hasSearched ? "noItemsMatchSearch" : "noMatchingLoginsForSite") | i18n
+                }}</ng-container>
+                <ng-container slot="description">{{
+                  (hasSearched ? "searchSavePasskeyNewLogin" : "clearFiltersOrTryAnother") | i18n
+                }}</ng-container>
 
-      <!-- Display when no matching ciphers exist -->
-      <ng-container *ngIf="!displayedCiphers.length">
-        <bit-no-items class="tw-text-main" [icon]="noResultsIcon">
-          <ng-container slot="title">{{
-            (hasSearched ? "noItemsMatchSearch" : "noMatchingLoginsForSite") | i18n
-          }}</ng-container>
-          <ng-container slot="description">{{
-            (hasSearched ? "searchSavePasskeyNewLogin" : "clearFiltersOrTryAnother") | i18n
-          }}</ng-container>
-
-          <button
-            bitButton
-            buttonType="primary"
-            slot="button"
-            type="button"
-            (click)="hasSearched ? clearSearch() : saveNewLogin()"
-            [loading]="loading"
-          >
-            {{ (hasSearched ? "multiSelectClearAll" : "savePasskeyNewLogin") | i18n }}
-          </button>
-        </bit-no-items>
-      </ng-container>
-    </bit-section>
-
-    <!-- Display when the passkey being saved already exists -->
-    <bit-section
-      *ngIf="data.message.type === BrowserFido2MessageTypes.InformExcludedCredentialRequest"
-    >
-      <div class="auth-flow">
-        <p class="subtitle">{{ "passkeyAlreadyExists" | i18n }}</p>
-        <div class="box list">
-          <div class="box-content">
-            <app-fido2-cipher-row
-              *ngFor="let cipherItem of displayedCiphers"
-              [cipher]="cipherItem"
-              title="{{ 'passkeyItem' | i18n }}"
-              (onSelected)="handleCipherItemSelect($event)"
-            ></app-fido2-cipher-row>
-          </div>
-        </div>
-      </div>
-    </bit-section>
-
-    <!-- Display when picking a passkey to login with -->
-    <bit-section *ngIf="data.message.type === BrowserFido2MessageTypes.PickCredentialRequest">
-      <!-- Display when matching ciphers exist -->
-      <ng-container *ngIf="displayedCiphers.length > 0">
-        <ng-container slot="title">{{ "chooseCipherForPasskeyAuth" | i18n }}</ng-container>
-        <app-fido2-cipher-row
-          *ngFor="let cipherItem of displayedCiphers"
-          [cipher]="cipherItem"
-          title="{{ 'passkeyItem' | i18n }}"
-          (onSelected)="handleCipherItemSelect($event)"
-        ></app-fido2-cipher-row>
-      </ng-container>
-
-      <!-- Display when no matching ciphers exist -->
-      <ng-container *ngIf="!displayedCiphers.length">
-        <bit-no-items class="tw-text-main" [icon]="noResultsIcon">
-          <ng-container slot="title">{{
-            (hasSearched ? "noItemsMatchSearch" : "noMatchingLoginsForSite") | i18n
-          }}</ng-container>
-          <ng-container slot="description">{{
-            (hasSearched ? "searchSavePasskeyNewLogin" : "clearFiltersOrTryAnother") | i18n
-          }}</ng-container>
-
-          <button
-            bitButton
-            buttonType="primary"
-            slot="button"
-            type="button"
-            (click)="hasSearched ? clearSearch() : saveNewLogin()"
-            [loading]="loading"
-          >
-            {{ (hasSearched ? "multiSelectClearAll" : "savePasskeyNewLogin") | i18n }}
-          </button>
-        </bit-no-items>
-      </ng-container>
-    </bit-section>
-
-    <!-- Display when initiating passkey login, but no cooresponding cipher is found in the vault -->
-    <bit-section
-      *ngIf="data.message.type === BrowserFido2MessageTypes.InformCredentialNotFoundRequest"
-    >
-      <div class="auth-flow">
-        <p class="subtitle">{{ "noPasskeysFoundForThisApplication" | i18n }}</p>
-      </div>
-      <button type="button" class="btn primary block" (click)="abort(false)">
-        <span [hidden]="loading">{{ "close" | i18n }}</span>
-        <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!loading" aria-hidden="true"></i>
-      </button>
-    </bit-section>
-
-    <app-fido2-use-browser-link></app-fido2-use-browser-link>
-  </div>
-</popup-page>
+                <button
+                  bitButton
+                  buttonType="primary"
+                  slot="button"
+                  type="button"
+                  (click)="hasSearched ? clearSearch() : saveNewLogin()"
+                  [loading]="loading"
+                >
+                  {{ (hasSearched ? "multiSelectClearAll" : "savePasskeyNewLogin") | i18n }}
+                </button>
+              </bit-no-items>
+            }
+          </bit-section>
+        }
+        @case (BrowserFido2MessageTypes.InformExcludedCredentialRequest) {
+          <bit-section>
+            <div class="tw-space-y-4">
+              <p>{{ "passkeyAlreadyExists" | i18n }}</p>
+              <div class="tw-divide-y tw-divide-secondary-300">
+                @for (cipherItem of displayedCiphers; track cipherItem.id) {
+                  <app-fido2-cipher-row
+                    [cipher]="cipherItem"
+                    title="{{ 'passkeyItem' | i18n }}"
+                    (onSelected)="handleCipherItemSelect($event)"
+                  ></app-fido2-cipher-row>
+                }
+              </div>
+            </div>
+          </bit-section>
+        }
+        @case (BrowserFido2MessageTypes.PickCredentialRequest) {
+          <bit-section>
+            @if (displayedCiphers.length > 0) {
+              <ng-container slot="title">{{ "chooseCipherForPasskeyAuth" | i18n }}</ng-container>
+              @for (cipherItem of displayedCiphers; track cipherItem.id) {
+                <app-fido2-cipher-row
+                  [cipher]="cipherItem"
+                  title="{{ 'passkeyItem' | i18n }}"
+                  (onSelected)="handleCipherItemSelect($event)"
+                ></app-fido2-cipher-row>
+              }
+            } @else {
+              <bit-no-items [icon]="noResultsIcon">
+                <ng-container slot="title">{{
+                  (hasSearched ? "noItemsMatchSearch" : "noMatchingLoginsForSite") | i18n
+                }}</ng-container>
+                <ng-container slot="description">{{
+                  (hasSearched ? "searchSavePasskeyNewLogin" : "clearFiltersOrTryAnother") | i18n
+                }}</ng-container>
+                <button
+                  bitButton
+                  buttonType="primary"
+                  slot="button"
+                  type="button"
+                  (click)="hasSearched ? clearSearch() : saveNewLogin()"
+                  [loading]="loading"
+                >
+                  {{ (hasSearched ? "multiSelectClearAll" : "savePasskeyNewLogin") | i18n }}
+                </button>
+              </bit-no-items>
+            }
+          </bit-section>
+        }
+        @case (BrowserFido2MessageTypes.InformCredentialNotFoundRequest) {
+          <bit-section>
+            <div class="tw-space-y-4">
+              <p>{{ "noPasskeysFoundForThisApplication" | i18n }}</p>
+            </div>
+            <button
+              bitButton
+              block
+              buttonType="primary"
+              type="button"
+              (click)="abort(false)"
+              [loading]="loading"
+            >
+              {{ "close" | i18n }}
+            </button>
+          </bit-section>
+        }
+      }
+      <app-fido2-use-browser-link></app-fido2-use-browser-link>
+    </div>
+  </popup-page>
+}
diff --git a/apps/browser/src/autofill/popup/fido2/fido2.component.ts b/apps/browser/src/autofill/popup/fido2/fido2.component.ts
index 11e00749bdf..c6799f93a5e 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2.component.ts
+++ b/apps/browser/src/autofill/popup/fido2/fido2.component.ts
@@ -71,6 +71,8 @@ interface ViewData {
   fallbackSupported: boolean;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-fido2",
   templateUrl: "fido2.component.html",
diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.html b/apps/browser/src/autofill/popup/settings/autofill.component.html
index 40dd013bbf4..1153ad58719 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.html
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.html
@@ -232,7 +232,7 @@
             <input formControlName="enableAutoTotpCopy" bitCheckbox id="totp" type="checkbox" />
             <bit-label for="totp">{{ "enableAutoTotpCopy" | i18n }}</bit-label>
           </bit-form-control>
-          <bit-form-field>
+          <bit-form-field [disableMargin]="isDefaultUriMatchDisabledByPolicy">
             <bit-label for="clearClipboard">{{ "clearClipboard" | i18n }}</bit-label>
             <bit-select
               formControlName="clearClipboard"
@@ -250,7 +250,7 @@
               {{ "clearClipboardDesc" | i18n }}
             </bit-hint>
           </bit-form-field>
-          <bit-form-field disableMargin>
+          <bit-form-field disableMargin *ngIf="!isDefaultUriMatchDisabledByPolicy">
             <bit-label for="defaultUriMatch">{{ "defaultUriMatchDetection" | i18n }}</bit-label>
             <bit-select
               formControlName="defaultUriMatch"
diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.ts b/apps/browser/src/autofill/popup/settings/autofill.component.ts
index 3d2d605c13f..49be3104dc1 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.ts
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.ts
@@ -26,6 +26,7 @@ import {
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
 import { SpotlightComponent } from "@bitwarden/angular/vault/components/spotlight/spotlight.component";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import {
@@ -76,6 +77,8 @@ import { PopOutComponent } from "../../../platform/popup/components/pop-out.comp
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "autofill.component.html",
   imports: [
@@ -140,6 +143,8 @@ export class AutofillComponent implements OnInit {
     defaultUriMatch: new FormControl(),
   });
 
+  protected isDefaultUriMatchDisabledByPolicy = false;
+
   advancedOptionWarningMap: Partial<Record<UriMatchStrategySetting, string>>;
   enableAutofillOnPageLoad: boolean = false;
   enableInlineMenu: boolean = false;
@@ -150,13 +155,15 @@ export class AutofillComponent implements OnInit {
   autofillOnPageLoadOptions: { name: string; value: boolean }[];
   enableContextMenuItem: boolean = false;
   enableAutoTotpCopy: boolean = false;
-  clearClipboard: ClearClipboardDelaySetting;
+  /** Non-null asserted. */
+  clearClipboard!: ClearClipboardDelaySetting;
   clearClipboardOptions: { name: string; value: ClearClipboardDelaySetting }[];
   defaultUriMatch: UriMatchStrategySetting = UriMatchStrategy.Domain;
   uriMatchOptions: { name: string; value: UriMatchStrategySetting; disabled?: boolean }[];
   showCardsCurrentTab: boolean = true;
   showIdentitiesCurrentTab: boolean = true;
-  autofillKeyboardHelperText: string;
+  /** Non-null asserted. */
+  autofillKeyboardHelperText!: string;
   accountSwitcherEnabled: boolean = false;
 
   constructor(
@@ -174,6 +181,7 @@ export class AutofillComponent implements OnInit {
     private accountService: AccountService,
     private autofillBrowserSettingsService: AutofillBrowserSettingsService,
     private restrictedItemTypesService: RestrictedItemTypesService,
+    private policyService: PolicyService,
   ) {
     this.autofillOnPageLoadOptions = [
       { name: this.i18nService.t("autoFillOnPageLoadYes"), value: true },
@@ -302,7 +310,7 @@ export class AutofillComponent implements OnInit {
     });
 
     const defaultUriMatch = await firstValueFrom(
-      this.domainSettingsService.defaultUriMatchStrategy$,
+      this.domainSettingsService.resolvedDefaultUriMatchStrategy$,
     );
     this.defaultUriMatch = defaultUriMatch == null ? UriMatchStrategy.Domain : defaultUriMatch;
 
@@ -310,6 +318,8 @@ export class AutofillComponent implements OnInit {
       emitEvent: false,
     });
 
+    this.applyUriMatchPolicy();
+
     this.additionalOptionsForm.controls.enableContextMenuItem.valueChanges
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe((value) => {
@@ -524,6 +534,20 @@ export class AutofillComponent implements OnInit {
     await this.updateDefaultBrowserAutofillDisabled();
   };
 
+  private applyUriMatchPolicy() {
+    this.domainSettingsService.defaultUriMatchStrategyPolicy$
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((value) => {
+        if (value !== null) {
+          this.isDefaultUriMatchDisabledByPolicy = true;
+          this.additionalOptionsForm.controls.defaultUriMatch.disable({ emitEvent: false });
+        } else {
+          this.isDefaultUriMatchDisabledByPolicy = false;
+          this.additionalOptionsForm.controls.defaultUriMatch.enable({ emitEvent: false });
+        }
+      });
+  }
+
   private async handleAdvancedMatch(
     previous: UriMatchStrategySetting | null,
     current: UriMatchStrategySetting | null,
diff --git a/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts b/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts
index 15379eff436..30a64e03c56 100644
--- a/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts
+++ b/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts
@@ -41,6 +41,8 @@ import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-heade
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popup-router-cache.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-blocked-domains",
   templateUrl: "blocked-domains.component.html",
@@ -66,6 +68,8 @@ import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popu
   ],
 })
 export class BlockedDomainsComponent implements AfterViewInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChildren("uriInput") uriInputElements: QueryList<ElementRef<HTMLInputElement>> =
     new QueryList();
 
diff --git a/apps/browser/src/autofill/popup/settings/excluded-domains.component.ts b/apps/browser/src/autofill/popup/settings/excluded-domains.component.ts
index a5bfad726f5..e67c826cac6 100644
--- a/apps/browser/src/autofill/popup/settings/excluded-domains.component.ts
+++ b/apps/browser/src/autofill/popup/settings/excluded-domains.component.ts
@@ -42,6 +42,8 @@ import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-heade
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popup-router-cache.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-excluded-domains",
   templateUrl: "excluded-domains.component.html",
@@ -67,6 +69,8 @@ import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popu
   ],
 })
 export class ExcludedDomainsComponent implements AfterViewInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChildren("uriInput") uriInputElements: QueryList<ElementRef<HTMLInputElement>> =
     new QueryList();
 
diff --git a/apps/browser/src/autofill/popup/settings/notifications.component.ts b/apps/browser/src/autofill/popup/settings/notifications.component.ts
index cb10dec620b..3c77d746e9c 100644
--- a/apps/browser/src/autofill/popup/settings/notifications.component.ts
+++ b/apps/browser/src/autofill/popup/settings/notifications.component.ts
@@ -21,6 +21,8 @@ import { PopOutComponent } from "../../../platform/popup/components/pop-out.comp
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "notifications.component.html",
   imports: [
diff --git a/apps/browser/src/autofill/services/abstractions/autofill-overlay-content.service.ts b/apps/browser/src/autofill/services/abstractions/autofill-overlay-content.service.ts
index 56c2d1704d2..e1d24159664 100644
--- a/apps/browser/src/autofill/services/abstractions/autofill-overlay-content.service.ts
+++ b/apps/browser/src/autofill/services/abstractions/autofill-overlay-content.service.ts
@@ -26,7 +26,7 @@ export type AutofillOverlayContentExtensionMessageHandlers = {
   destroyAutofillInlineMenuListeners: () => void;
   getInlineMenuFormFieldData: ({
     message,
-  }: AutofillExtensionMessageParam) => Promise<ModifyLoginCipherFormData>;
+  }: AutofillExtensionMessageParam) => Promise<ModifyLoginCipherFormData | void>;
 };
 
 export interface AutofillOverlayContentService {
diff --git a/apps/browser/src/autofill/services/abstractions/autofill.service.ts b/apps/browser/src/autofill/services/abstractions/autofill.service.ts
index 09e22e278be..05bfbf378a8 100644
--- a/apps/browser/src/autofill/services/abstractions/autofill.service.ts
+++ b/apps/browser/src/autofill/services/abstractions/autofill.service.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Observable } from "rxjs";
 
 import { UriMatchStrategySetting } from "@bitwarden/common/models/domain/domain-service";
@@ -8,6 +6,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { AutofillMessageCommand } from "../../enums/autofill-message.enums";
+import { InlineMenuFillType } from "../../enums/autofill-overlay.enum";
 import AutofillField from "../../models/autofill-field";
 import AutofillForm from "../../models/autofill-form";
 import AutofillPageDetails from "../../models/autofill-page-details";
@@ -31,6 +30,8 @@ export interface AutoFillOptions {
   allowTotpAutofill?: boolean;
   autoSubmitLogin?: boolean;
   focusedFieldForm?: string;
+  focusedFieldOpid?: string;
+  inlineMenuFillType?: InlineMenuFillType;
 }
 
 export interface FormData {
@@ -49,6 +50,8 @@ export interface GenerateFillScriptOptions {
   cipher: CipherView;
   tabUrl: string;
   defaultUriMatch: UriMatchStrategySetting;
+  focusedFieldOpid?: string;
+  inlineMenuFillType?: InlineMenuFillType;
 }
 
 export type CollectPageDetailsResponseMessage = {
@@ -64,29 +67,39 @@ export const COLLECT_PAGE_DETAILS_RESPONSE_COMMAND =
   );
 
 export abstract class AutofillService {
-  collectPageDetailsFromTab$: (tab: chrome.tabs.Tab) => Observable<PageDetail[]>;
-  loadAutofillScriptsOnInstall: () => Promise<void>;
-  reloadAutofillScripts: () => Promise<void>;
-  injectAutofillScripts: (
+  /** Non-null asserted. */
+  collectPageDetailsFromTab$!: (tab: chrome.tabs.Tab) => Observable<PageDetail[]>;
+  /** Non-null asserted. */
+  loadAutofillScriptsOnInstall!: () => Promise<void>;
+  /** Non-null asserted. */
+  reloadAutofillScripts!: () => Promise<void>;
+  /** Non-null asserted. */
+  injectAutofillScripts!: (
     tab: chrome.tabs.Tab,
     frameId?: number,
     triggeringOnPageLoad?: boolean,
   ) => Promise<void>;
-  getFormsWithPasswordFields: (pageDetails: AutofillPageDetails) => FormData[];
-  doAutoFill: (options: AutoFillOptions) => Promise<string | null>;
-  doAutoFillOnTab: (
+  /** Non-null asserted. */
+  getFormsWithPasswordFields!: (pageDetails: AutofillPageDetails) => FormData[];
+  /** Non-null asserted. */
+  doAutoFill!: (options: AutoFillOptions) => Promise<string | null>;
+  /** Non-null asserted. */
+  doAutoFillOnTab!: (
     pageDetails: PageDetail[],
     tab: chrome.tabs.Tab,
     fromCommand: boolean,
     autoSubmitLogin?: boolean,
   ) => Promise<string | null>;
-  doAutoFillActiveTab: (
+  /** Non-null asserted. */
+  doAutoFillActiveTab!: (
     pageDetails: PageDetail[],
     fromCommand: boolean,
     cipherType?: CipherType,
   ) => Promise<string | null>;
-  setAutoFillOnPageLoadOrgPolicy: () => Promise<void>;
-  isPasswordRepromptRequired: (
+  /** Non-null asserted. */
+  setAutoFillOnPageLoadOrgPolicy!: () => Promise<void>;
+  /** Non-null asserted. */
+  isPasswordRepromptRequired!: (
     cipher: CipherView,
     tab: chrome.tabs.Tab,
     action?: string,
diff --git a/apps/browser/src/autofill/services/abstractions/dom-query.service.ts b/apps/browser/src/autofill/services/abstractions/dom-query.service.ts
index 32809573223..da7354403e5 100644
--- a/apps/browser/src/autofill/services/abstractions/dom-query.service.ts
+++ b/apps/browser/src/autofill/services/abstractions/dom-query.service.ts
@@ -6,5 +6,5 @@ export interface DomQueryService {
     mutationObserver?: MutationObserver,
     forceDeepQueryAttempt?: boolean,
   ): T[];
-  checkPageContainsShadowDom(): boolean;
+  checkPageContainsShadowDom(): void;
 }
diff --git a/apps/browser/src/autofill/services/autofill-badge-updater.service.ts b/apps/browser/src/autofill/services/autofill-badge-updater.service.ts
index 06ddf16c8af..382c9efa7f8 100644
--- a/apps/browser/src/autofill/services/autofill-badge-updater.service.ts
+++ b/apps/browser/src/autofill/services/autofill-badge-updater.service.ts
@@ -1,4 +1,4 @@
-import { combineLatest, distinctUntilChanged, mergeMap, of, switchMap, withLatestFrom } from "rxjs";
+import { combineLatest, delay, distinctUntilChanged, mergeMap, of, switchMap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BadgeSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/badge-settings.service";
@@ -10,7 +10,7 @@ import { Tab } from "../../platform/badge/badge-browser-api";
 import { BadgeService } from "../../platform/badge/badge.service";
 import { BadgeStatePriority } from "../../platform/badge/priority";
 
-const StateName = (tabId: number) => `autofill-badge-${tabId}`;
+const StateName = "autofill-badge-updater";
 
 export class AutofillBadgeUpdaterService {
   constructor(
@@ -26,56 +26,30 @@ export class AutofillBadgeUpdaterService {
       switchMap((account) => (account?.id ? this.cipherService.ciphers$(account?.id) : of([]))),
     );
 
-    // Recalculate badges for all active tabs when ciphers or active account changes
-    combineLatest({
-      account: this.accountService.activeAccount$,
-      enableBadgeCounter:
-        this.badgeSettingsService.enableBadgeCounter$.pipe(distinctUntilChanged()),
-      ciphers: ciphers$,
-    })
-      .pipe(
+    this.badgeService.setState(StateName, (tab) => {
+      return combineLatest({
+        account: this.accountService.activeAccount$,
+        enableBadgeCounter:
+          this.badgeSettingsService.enableBadgeCounter$.pipe(distinctUntilChanged()),
+        ciphers: ciphers$.pipe(delay(100)), // Delay to allow cipherService.getAllDecryptedForUrl to pick up changes
+      }).pipe(
         mergeMap(async ({ account, enableBadgeCounter }) => {
-          if (!account) {
-            return;
-          }
-
-          const tabs = await this.badgeService.getActiveTabs();
-
-          for (const tab of tabs) {
-            if (!tab.tabId) {
-              continue;
-            }
-            if (enableBadgeCounter) {
-              await this.setTabState(tab, account.id);
-            } else {
-              await this.clearTabState(tab.tabId);
-            }
-          }
-        }),
-      )
-      .subscribe();
-
-    // Recalculate badge for a specific tab when it becomes active
-    this.badgeService.activeTabsUpdated$
-      .pipe(
-        withLatestFrom(
-          this.accountService.activeAccount$,
-          this.badgeSettingsService.enableBadgeCounter$,
-        ),
-        mergeMap(async ([tabs, account, enableBadgeCounter]) => {
           if (!account || !enableBadgeCounter) {
-            return;
+            return undefined;
           }
 
-          for (const tab of tabs) {
-            await this.setTabState(tab, account.id);
-          }
+          return {
+            state: {
+              text: await this.calculateCountText(tab, account.id),
+            },
+            priority: BadgeStatePriority.Default,
+          };
         }),
-      )
-      .subscribe();
+      );
+    });
   }
 
-  private async setTabState(tab: Tab, userId: UserId) {
+  private async calculateCountText(tab: Tab, userId: UserId) {
     if (!tab.tabId) {
       this.logService.warning("Tab event received but tab id is undefined");
       return;
@@ -85,22 +59,9 @@ export class AutofillBadgeUpdaterService {
     const cipherCount = ciphers.length;
 
     if (cipherCount === 0) {
-      await this.clearTabState(tab.tabId);
-      return;
+      return undefined;
     }
 
-    const countText = cipherCount > 9 ? "9+" : cipherCount.toString();
-    await this.badgeService.setState(
-      StateName(tab.tabId),
-      BadgeStatePriority.Default,
-      {
-        text: countText,
-      },
-      tab.tabId,
-    );
-  }
-
-  private async clearTabState(tabId: number) {
-    await this.badgeService.clearState(StateName(tabId));
+    return cipherCount > 9 ? "9+" : cipherCount.toString();
   }
 }
diff --git a/apps/browser/src/autofill/services/autofill-constants.ts b/apps/browser/src/autofill/services/autofill-constants.ts
index 92c9a508333..51d0513a7f8 100644
--- a/apps/browser/src/autofill/services/autofill-constants.ts
+++ b/apps/browser/src/autofill/services/autofill-constants.ts
@@ -59,6 +59,14 @@ export class AutoFillConstants {
     "neue e-mail",
   ];
 
+  static readonly RegistrationKeywords: string[] = [
+    "register",
+    "signup",
+    "sign-up",
+    "join",
+    "create",
+  ];
+
   static readonly NewsletterFormNames: string[] = ["newsletter"];
 
   static readonly FieldIgnoreList: string[] = ["captcha", "findanything", "forgot"];
diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts
index 96b05b81c96..3c19589afef 100644
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts
@@ -32,6 +32,17 @@ import { InlineMenuFieldQualificationService } from "./inline-menu-field-qualifi
 
 const defaultWindowReadyState = document.readyState;
 const defaultDocumentVisibilityState = document.visibilityState;
+
+const mockRect = (rect: { left: number; top: number; width: number; height: number }) =>
+  ({
+    ...rect,
+    x: rect.left,
+    y: rect.top,
+    right: rect.left + rect.width,
+    bottom: rect.top + rect.height,
+    toJSON: () => ({}),
+  }) as DOMRectReadOnly;
+
 describe("AutofillOverlayContentService", () => {
   let domQueryService: DomQueryService;
   let domElementVisibilityService: DomElementVisibilityService;
@@ -2154,6 +2165,10 @@ describe("AutofillOverlayContentService", () => {
       });
 
       it("calculates the sub frame's offsets if a single frame with the referenced url exists", async () => {
+        const iframe = document.querySelector("iframe") as HTMLIFrameElement;
+        jest
+          .spyOn(iframe, "getBoundingClientRect")
+          .mockReturnValue(mockRect({ left: 0, top: 0, width: 1, height: 1 }));
         sendMockExtensionMessage(
           {
             command: "getSubFrameOffsets",
@@ -2270,6 +2285,9 @@ describe("AutofillOverlayContentService", () => {
           });
           document.body.innerHTML = `<iframe id="subframe" src="https://example.com/"></iframe>`;
           const iframe = document.querySelector("iframe") as HTMLIFrameElement;
+          jest
+            .spyOn(iframe, "getBoundingClientRect")
+            .mockReturnValue(mockRect({ width: 1, height: 1, left: 2, top: 2 }));
           const subFrameData = {
             url: "https://example.com/",
             frameId: 10,
@@ -2305,6 +2323,9 @@ describe("AutofillOverlayContentService", () => {
         it("posts the calculated sub frame data to the background", async () => {
           document.body.innerHTML = `<iframe id="subframe" src="https://example.com/"></iframe>`;
           const iframe = document.querySelector("iframe") as HTMLIFrameElement;
+          jest
+            .spyOn(iframe, "getBoundingClientRect")
+            .mockReturnValue(mockRect({ width: 1, height: 1, left: 2, top: 2 }));
           const subFrameData = {
             url: "https://example.com/",
             frameId: 10,
@@ -2335,6 +2356,39 @@ describe("AutofillOverlayContentService", () => {
       });
     });
 
+    describe("calculateSubFrameOffsets", () => {
+      it("returns null when iframe has zero width and height", () => {
+        const iframe = document.querySelector("iframe") as HTMLIFrameElement;
+
+        jest
+          .spyOn(iframe, "getBoundingClientRect")
+          .mockReturnValue(mockRect({ left: 0, top: 0, width: 0, height: 0 }));
+
+        const result = autofillOverlayContentService["calculateSubFrameOffsets"](
+          iframe,
+          "https://example.com/",
+          10,
+        );
+
+        expect(result).toBeNull();
+      });
+
+      it("returns null when iframe is not connected to the document", () => {
+        const iframe = document.createElement("iframe") as HTMLIFrameElement;
+
+        jest
+          .spyOn(iframe, "getBoundingClientRect")
+          .mockReturnValue(mockRect({ width: 100, height: 50, left: 10, top: 20 }));
+
+        const result = autofillOverlayContentService["calculateSubFrameOffsets"](
+          iframe,
+          "https://example.com/",
+          10,
+        );
+        expect(result).toBeNull();
+      });
+    });
+
     describe("checkMostRecentlyFocusedFieldHasValue message handler", () => {
       it("returns true if the most recently focused field has a truthy value", async () => {
         autofillOverlayContentService["mostRecentlyFocusedField"] = mock<
diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
index 656516d1119..817a7cca43c 100644
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
@@ -975,6 +975,7 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
       showPasskeys: !!autofillFieldData?.showPasskeys,
       accountCreationFieldType: autofillFieldData?.accountCreationFieldType,
       focusedFieldForm: autofillFieldData?.form,
+      focusedFieldOpid: autofillFieldData?.opid,
     };
 
     const allFields = this.formFieldElements;
@@ -1085,7 +1086,15 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
         pageDetails,
       )
     ) {
-      this.setQualifiedAccountCreationFillType(autofillFieldData);
+      const hasUsernameField = [...this.formFieldElements.values()].some((field) =>
+        this.inlineMenuFieldQualificationService.isUsernameField(field),
+      );
+
+      if (hasUsernameField) {
+        void this.setQualifiedLoginFillType(autofillFieldData);
+      } else {
+        this.setQualifiedAccountCreationFillType(autofillFieldData);
+      }
       return false;
     }
 
@@ -1109,6 +1118,12 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
    * @param autofillFieldData - Autofill field data captured from the form field element.
    */
   private async setQualifiedLoginFillType(autofillFieldData: AutofillField) {
+    // Check if this is a current password field in a password change form
+    if (this.inlineMenuFieldQualificationService.isUpdateCurrentPasswordField(autofillFieldData)) {
+      autofillFieldData.inlineMenuFillType = InlineMenuFillTypes.CurrentPasswordUpdate;
+      return;
+    }
+
     autofillFieldData.inlineMenuFillType = CipherType.Login;
     autofillFieldData.showPasskeys = autofillFieldData.autoCompleteType.includes("webauthn");
 
@@ -1485,12 +1500,17 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
     frameId?: number,
   ): SubFrameOffsetData {
     const iframeRect = iframeElement.getBoundingClientRect();
+    const iframeRectHasSize = iframeRect.width > 0 && iframeRect.height > 0;
     const iframeStyles = globalThis.getComputedStyle(iframeElement);
     const paddingLeft = parseInt(iframeStyles.getPropertyValue("padding-left")) || 0;
     const paddingTop = parseInt(iframeStyles.getPropertyValue("padding-top")) || 0;
     const borderWidthLeft = parseInt(iframeStyles.getPropertyValue("border-left-width")) || 0;
     const borderWidthTop = parseInt(iframeStyles.getPropertyValue("border-top-width")) || 0;
 
+    if (!iframeRect || !iframeRectHasSize || !iframeElement.isConnected) {
+      return null;
+    }
+
     return {
       url: subFrameUrl,
       frameId,
@@ -1525,6 +1545,10 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
           subFrameData.frameId,
         );
 
+        if (!subFrameOffsets) {
+          return;
+        }
+
         subFrameData.top += subFrameOffsets.top;
         subFrameData.left += subFrameOffsets.left;
 
@@ -1657,10 +1681,6 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
     globalThis.addEventListener(EVENTS.RESIZE, repositionHandler);
   }
 
-  private shouldRepositionSubFrameInlineMenuOnScroll = async () => {
-    return await this.sendExtensionMessage("shouldRepositionSubFrameInlineMenuOnScroll");
-  };
-
   /**
    * Removes the listeners that facilitate repositioning
    * the overlay elements on scroll or resize.
diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts
index f0ae8856ecd..13e97766594 100644
--- a/apps/browser/src/autofill/services/autofill.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill.service.spec.ts
@@ -1,6 +1,7 @@
 import { mock, MockProxy, mockReset } from "jest-mock-extended";
 import { BehaviorSubject, of, Subject } from "rxjs";
 
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
@@ -43,12 +44,14 @@ import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { BrowserScriptInjectorService } from "../../platform/services/browser-script-injector.service";
 import { AutofillMessageCommand, AutofillMessageSender } from "../enums/autofill-message.enums";
+import { InlineMenuFillTypes } from "../enums/autofill-overlay.enum";
 import { AutofillPort } from "../enums/autofill-port.enum";
 import AutofillField from "../models/autofill-field";
 import AutofillPageDetails from "../models/autofill-page-details";
 import AutofillScript from "../models/autofill-script";
 import {
   createAutofillFieldMock,
+  createAutofillFormMock,
   createAutofillPageDetailsMock,
   createAutofillScriptMock,
   createChromeTabMock,
@@ -86,6 +89,7 @@ describe("AutofillService", () => {
   const totpService = mock<TotpService>();
   const eventCollectionService = mock<EventCollectionService>();
   const logService = mock<LogService>();
+  const policyService = mock<PolicyService>();
   const userVerificationService = mock<UserVerificationService>();
   const billingAccountProfileStateService = mock<BillingAccountProfileStateService>();
   const platformUtilsService = mock<PlatformUtilsService>();
@@ -100,6 +104,15 @@ describe("AutofillService", () => {
   beforeEach(() => {
     configService = mock<ConfigService>();
     configService.getFeatureFlag$.mockImplementation(() => of(false));
+
+    // Initialize domainSettingsService BEFORE it's used
+    domainSettingsService = new DefaultDomainSettingsService(
+      fakeStateProvider,
+      policyService,
+      accountService,
+    );
+    domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
+
     scriptInjectorService = new BrowserScriptInjectorService(
       domainSettingsService,
       platformUtilsService,
@@ -138,8 +151,6 @@ describe("AutofillService", () => {
       userNotificationsSettings,
       messageListener,
     );
-    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);
-    domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
     jest.spyOn(BrowserApi, "tabSendMessage");
   });
 
@@ -363,9 +374,7 @@ describe("AutofillService", () => {
       jest.spyOn(autofillService as any, "injectAutofillScriptsInAllTabs");
       jest.spyOn(autofillService, "getAutofillOnPageLoad").mockResolvedValue(true);
 
-      // 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
-      autofillService.reloadAutofillScripts();
+      void autofillService.reloadAutofillScripts();
 
       expect(port1.disconnect).toHaveBeenCalled();
       expect(port2.disconnect).toHaveBeenCalled();
@@ -674,7 +683,9 @@ describe("AutofillService", () => {
           await autofillService.doAutoFill(autofillOptions);
           triggerTestFailure();
         } catch (error) {
-          expect(error.message).toBe(nothingToAutofillError);
+          if (error instanceof Error) {
+            expect(error.message).toBe(nothingToAutofillError);
+          }
         }
       });
 
@@ -685,7 +696,9 @@ describe("AutofillService", () => {
           await autofillService.doAutoFill(autofillOptions);
           triggerTestFailure();
         } catch (error) {
-          expect(error.message).toBe(nothingToAutofillError);
+          if (error instanceof Error) {
+            expect(error.message).toBe(nothingToAutofillError);
+          }
         }
       });
 
@@ -696,7 +709,9 @@ describe("AutofillService", () => {
           await autofillService.doAutoFill(autofillOptions);
           triggerTestFailure();
         } catch (error) {
-          expect(error.message).toBe(nothingToAutofillError);
+          if (error instanceof Error) {
+            expect(error.message).toBe(nothingToAutofillError);
+          }
         }
       });
 
@@ -707,7 +722,9 @@ describe("AutofillService", () => {
           await autofillService.doAutoFill(autofillOptions);
           triggerTestFailure();
         } catch (error) {
-          expect(error.message).toBe(nothingToAutofillError);
+          if (error instanceof Error) {
+            expect(error.message).toBe(nothingToAutofillError);
+          }
         }
       });
 
@@ -721,7 +738,9 @@ describe("AutofillService", () => {
           await autofillService.doAutoFill(autofillOptions);
           triggerTestFailure();
         } catch (error) {
-          expect(error.message).toBe(didNotAutofillError);
+          if (error instanceof Error) {
+            expect(error.message).toBe(didNotAutofillError);
+          }
         }
       });
     });
@@ -760,7 +779,6 @@ describe("AutofillService", () => {
         {
           command: "fillForm",
           fillScript: {
-            metadata: {},
             properties: {
               delay_between_operations: 20,
             },
@@ -857,7 +875,9 @@ describe("AutofillService", () => {
         expect(logService.info).toHaveBeenCalledWith(
           "Autofill on page load was blocked due to an untrusted iframe.",
         );
-        expect(error.message).toBe(didNotAutofillError);
+        if (error instanceof Error) {
+          expect(error.message).toBe(didNotAutofillError);
+        }
       }
     });
 
@@ -892,7 +912,10 @@ describe("AutofillService", () => {
       } catch (error) {
         expect(autofillService["generateFillScript"]).toHaveBeenCalled();
         expect(BrowserApi.tabSendMessage).not.toHaveBeenCalled();
-        expect(error.message).toBe(didNotAutofillError);
+
+        if (error instanceof Error) {
+          expect(error.message).toBe(didNotAutofillError);
+        }
       }
     });
 
@@ -1364,7 +1387,10 @@ describe("AutofillService", () => {
         triggerTestFailure();
       } catch (error) {
         expect(BrowserApi.getTabFromCurrentWindow).toHaveBeenCalled();
-        expect(error.message).toBe("No tab found.");
+
+        if (error instanceof Error) {
+          expect(error.message).toBe("No tab found.");
+        }
       }
     });
 
@@ -1604,7 +1630,6 @@ describe("AutofillService", () => {
 
       expect(autofillService["generateLoginFillScript"]).toHaveBeenCalledWith(
         {
-          metadata: {},
           properties: {},
           script: [
             ["click_on_opid", "username-field"],
@@ -1642,7 +1667,6 @@ describe("AutofillService", () => {
 
       expect(autofillService["generateCardFillScript"]).toHaveBeenCalledWith(
         {
-          metadata: {},
           properties: {},
           script: [
             ["click_on_opid", "username-field"],
@@ -1680,7 +1704,6 @@ describe("AutofillService", () => {
 
       expect(autofillService["generateIdentityFillScript"]).toHaveBeenCalledWith(
         {
-          metadata: {},
           properties: {},
           script: [
             ["click_on_opid", "username-field"],
@@ -2058,6 +2081,193 @@ describe("AutofillService", () => {
         });
       });
 
+      describe("given password generation with inlineMenuFillType", () => {
+        beforeEach(() => {
+          pageDetails.forms = undefined;
+          pageDetails.fields = []; // Clear fields to start fresh
+          options.inlineMenuFillType = InlineMenuFillTypes.PasswordGeneration;
+          options.cipher.login.totp = null; // Disable TOTP for these tests
+        });
+
+        it("includes all password fields from the same form when filling with password generation", async () => {
+          const newPasswordField = createAutofillFieldMock({
+            opid: "new-password",
+            type: "password",
+            form: "validFormId",
+            elementNumber: 2,
+          });
+          const confirmPasswordField = createAutofillFieldMock({
+            opid: "confirm-password",
+            type: "password",
+            form: "validFormId",
+            elementNumber: 3,
+          });
+          pageDetails.fields.push(newPasswordField, confirmPasswordField);
+          options.focusedFieldOpid = newPasswordField.opid;
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(filledFields[newPasswordField.opid]).toBeDefined();
+          expect(filledFields[confirmPasswordField.opid]).toBeDefined();
+        });
+
+        it("finds username field for the first password field when generating passwords", async () => {
+          const newPasswordField = createAutofillFieldMock({
+            opid: "new-password",
+            type: "password",
+            form: "validFormId",
+            elementNumber: 2,
+          });
+          pageDetails.fields.push(newPasswordField);
+          options.focusedFieldOpid = newPasswordField.opid;
+          jest.spyOn(autofillService as any, "findUsernameField");
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(autofillService["findUsernameField"]).toHaveBeenCalledWith(
+            pageDetails,
+            expect.objectContaining({ opid: newPasswordField.opid }),
+            false,
+            false,
+            true,
+          );
+        });
+
+        it("does not include password fields from different forms", async () => {
+          const formAPasswordField = createAutofillFieldMock({
+            opid: "form-a-password",
+            type: "password",
+            form: "formA",
+            elementNumber: 1,
+          });
+          const formBPasswordField = createAutofillFieldMock({
+            opid: "form-b-password",
+            type: "password",
+            form: "formB",
+            elementNumber: 2,
+          });
+          pageDetails.fields = [formAPasswordField, formBPasswordField];
+          options.focusedFieldOpid = formAPasswordField.opid;
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(filledFields[formAPasswordField.opid]).toBeDefined();
+          expect(filledFields[formBPasswordField.opid]).toBeUndefined();
+        });
+      });
+
+      describe("given current password update with inlineMenuFillType", () => {
+        beforeEach(() => {
+          pageDetails.forms = undefined;
+          pageDetails.fields = []; // Clear fields to start fresh
+          options.inlineMenuFillType = InlineMenuFillTypes.CurrentPasswordUpdate;
+          options.cipher.login.totp = null; // Disable TOTP for these tests
+        });
+
+        it("includes all password fields from the same form when updating current password", async () => {
+          const currentPasswordField = createAutofillFieldMock({
+            opid: "current-password",
+            type: "password",
+            form: "validFormId",
+            elementNumber: 1,
+          });
+          const newPasswordField = createAutofillFieldMock({
+            opid: "new-password",
+            type: "password",
+            form: "validFormId",
+            elementNumber: 2,
+          });
+          const confirmPasswordField = createAutofillFieldMock({
+            opid: "confirm-password",
+            type: "password",
+            form: "validFormId",
+            elementNumber: 3,
+          });
+          pageDetails.fields.push(currentPasswordField, newPasswordField, confirmPasswordField);
+          options.focusedFieldOpid = currentPasswordField.opid;
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(filledFields[currentPasswordField.opid]).toBeDefined();
+          expect(filledFields[newPasswordField.opid]).toBeDefined();
+          expect(filledFields[confirmPasswordField.opid]).toBeDefined();
+        });
+
+        it("includes all password fields from the same form without TOTP", async () => {
+          const currentPasswordField = createAutofillFieldMock({
+            opid: "current-password",
+            type: "password",
+            form: "validFormId",
+            elementNumber: 1,
+          });
+          const newPasswordField = createAutofillFieldMock({
+            opid: "new-password",
+            type: "password",
+            form: "validFormId",
+            elementNumber: 2,
+          });
+          pageDetails.fields.push(currentPasswordField, newPasswordField);
+          options.focusedFieldOpid = currentPasswordField.opid;
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(filledFields[currentPasswordField.opid]).toBeDefined();
+          expect(filledFields[newPasswordField.opid]).toBeDefined();
+        });
+
+        it("does not include password fields from different forms during password update", async () => {
+          const formAPasswordField = createAutofillFieldMock({
+            opid: "form-a-password",
+            type: "password",
+            form: "formA",
+            elementNumber: 1,
+          });
+          const formBPasswordField = createAutofillFieldMock({
+            opid: "form-b-password",
+            type: "password",
+            form: "formB",
+            elementNumber: 2,
+          });
+          pageDetails.fields = [formAPasswordField, formBPasswordField];
+          options.focusedFieldOpid = formAPasswordField.opid;
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(filledFields[formAPasswordField.opid]).toBeDefined();
+          expect(filledFields[formBPasswordField.opid]).toBeUndefined();
+        });
+      });
+
       describe("given a set of page details that does not contain a password field", () => {
         let emailField: AutofillField;
         let emailFieldView: FieldView;
@@ -2273,7 +2483,7 @@ describe("AutofillService", () => {
         );
         expect(value).toStrictEqual({
           autosubmit: null,
-          metadata: {},
+          itemType: "",
           properties: { delay_between_operations: 20 },
           savedUrls: ["https://www.example.com"],
           script: [
@@ -2288,10 +2498,150 @@ describe("AutofillService", () => {
             ["fill_by_opid", "password", "password"],
             ["focus_by_opid", "password"],
           ],
-          itemType: "",
           untrustedIframe: false,
         });
       });
+
+      describe("given a focused username field", () => {
+        let focusedField: AutofillField;
+        let passwordField: AutofillField;
+
+        beforeEach(() => {
+          focusedField = createAutofillFieldMock({
+            opid: "focused-username",
+            type: "text",
+            form: "form1",
+            elementNumber: 1,
+          });
+          passwordField = createAutofillFieldMock({
+            opid: "password",
+            type: "password",
+            form: "form1",
+            elementNumber: 2,
+          });
+          pageDetails.forms = {
+            form1: createAutofillFormMock({ opid: "form1" }),
+          };
+          options.focusedFieldOpid = "focused-username";
+          jest.spyOn(autofillService as any, "inUntrustedIframe").mockResolvedValue(false);
+          jest.spyOn(AutofillService, "fillByOpid");
+        });
+
+        it("will return early when no matching password is found and set autosubmit if enabled", async () => {
+          pageDetails.fields = [focusedField];
+          options.autoSubmitLogin = true;
+
+          const value = await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(AutofillService.fillByOpid).toHaveBeenCalledTimes(1);
+          expect(AutofillService.fillByOpid).toHaveBeenCalledWith(
+            fillScript,
+            focusedField,
+            options.cipher.login.username,
+          );
+          expect(value.autosubmit).toEqual(["form1"]);
+        });
+
+        it("will prioritize focused field and skip passwords in different forms", async () => {
+          const otherUsername = createAutofillFieldMock({
+            opid: "other-username",
+            type: "text",
+            form: "form1",
+            elementNumber: 2,
+          });
+          const passwordDifferentForm = createAutofillFieldMock({
+            opid: "password-different",
+            type: "password",
+            form: "form2",
+            elementNumber: 1,
+          });
+          pageDetails.fields = [focusedField, otherUsername, passwordField, passwordDifferentForm];
+          pageDetails.forms.form2 = createAutofillFormMock({ opid: "form2" });
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(AutofillService.fillByOpid).toHaveBeenCalledWith(
+            fillScript,
+            focusedField,
+            options.cipher.login.username,
+          );
+          expect(AutofillService.fillByOpid).toHaveBeenCalledWith(
+            fillScript,
+            passwordField,
+            options.cipher.login.password,
+          );
+          expect(AutofillService.fillByOpid).not.toHaveBeenCalledWith(
+            fillScript,
+            otherUsername,
+            expect.anything(),
+          );
+          expect(AutofillService.fillByOpid).not.toHaveBeenCalledWith(
+            fillScript,
+            passwordDifferentForm,
+            expect.anything(),
+          );
+        });
+
+        it("will not fill focused field if already in filledFields", async () => {
+          pageDetails.fields = [focusedField, passwordField];
+          filledFields[focusedField.opid] = focusedField;
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(AutofillService.fillByOpid).not.toHaveBeenCalledWith(
+            fillScript,
+            focusedField,
+            expect.anything(),
+          );
+          expect(AutofillService.fillByOpid).toHaveBeenCalledWith(
+            fillScript,
+            passwordField,
+            options.cipher.login.password,
+          );
+        });
+
+        it.each([
+          ["email", "email"],
+          ["tel", "tel"],
+        ])("will treat focused %s field as username field", async (type, opid) => {
+          const focusedTypedField = createAutofillFieldMock({
+            opid: `focused-${opid}`,
+            type: type as "email" | "tel",
+            form: "form1",
+            elementNumber: 1,
+          });
+          pageDetails.fields = [focusedTypedField, passwordField];
+          options.focusedFieldOpid = `focused-${opid}`;
+
+          await autofillService["generateLoginFillScript"](
+            fillScript,
+            pageDetails,
+            filledFields,
+            options,
+          );
+
+          expect(AutofillService.fillByOpid).toHaveBeenCalledWith(
+            fillScript,
+            focusedTypedField,
+            options.cipher.login.username,
+          );
+        });
+      });
     });
   });
 
@@ -2358,11 +2708,10 @@ describe("AutofillService", () => {
     describe("given an invalid autofill field", () => {
       const unmodifiedFillScriptValues: AutofillScript = {
         autosubmit: null,
-        metadata: {},
+        itemType: "",
         properties: { delay_between_operations: 20 },
         savedUrls: [],
         script: [],
-        itemType: "",
         untrustedIframe: false,
       };
 
@@ -2549,7 +2898,6 @@ describe("AutofillService", () => {
         expect(value).toStrictEqual({
           autosubmit: null,
           itemType: "",
-          metadata: {},
           properties: {
             delay_between_operations: 20,
           },
@@ -2983,12 +3331,16 @@ describe("AutofillService", () => {
         "example.com",
         "exampleapp.com",
       ]);
-      domainSettingsService.equivalentDomains$ = of([["not-example.com"]]);
       const pageUrl = "https://subdomain.example.com";
       const tabUrl = "https://www.not-example.com";
       const generateFillScriptOptions = createGenerateFillScriptOptionsMock({ tabUrl });
       generateFillScriptOptions.cipher.login.matchesUri = jest.fn().mockReturnValueOnce(false);
 
+      // Mock getUrlEquivalentDomains to return the expected domains
+      jest
+        .spyOn(domainSettingsService, "getUrlEquivalentDomains")
+        .mockReturnValue(of(equivalentDomains));
+
       const result = await autofillService["inUntrustedIframe"](pageUrl, generateFillScriptOptions);
 
       expect(generateFillScriptOptions.cipher.login.matchesUri).toHaveBeenCalledWith(
@@ -4105,6 +4457,7 @@ describe("AutofillService", () => {
       });
 
       it("returns null if the field cannot be hidden", () => {
+        usernameField.form = "differentFormId";
         const result = autofillService["findUsernameField"](
           pageDetails,
           passwordField,
@@ -4116,6 +4469,18 @@ describe("AutofillService", () => {
         expect(result).toBe(null);
       });
 
+      it("returns the field if the username field is in the form", () => {
+        const result = autofillService["findUsernameField"](
+          pageDetails,
+          passwordField,
+          false,
+          false,
+          false,
+        );
+
+        expect(result).toBe(usernameField);
+      });
+
       it("returns the field if the field can be hidden", () => {
         const result = autofillService["findUsernameField"](
           pageDetails,
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index 0e238d14d23..010f5ea0f27 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -52,6 +52,7 @@ import { ScriptInjectorService } from "../../platform/services/abstractions/scri
 // eslint-disable-next-line no-restricted-imports
 import { openVaultItemPasswordRepromptPopout } from "../../vault/popup/utils/vault-popout-window";
 import { AutofillMessageCommand, AutofillMessageSender } from "../enums/autofill-message.enums";
+import { InlineMenuFillTypes } from "../enums/autofill-overlay.enum";
 import { AutofillPort } from "../enums/autofill-port.enum";
 import AutofillField from "../models/autofill-field";
 import AutofillPageDetails from "../models/autofill-page-details";
@@ -161,7 +162,7 @@ export default class AutofillService implements AutofillServiceInterface {
 
     // Create a timeout observable that emits an empty array if pageDetailsFromTab$ hasn't emitted within 1 second.
     const pageDetailsTimeout$ = timer(1000).pipe(
-      map(() => []),
+      map((): any => []),
       takeUntil(sharedPageDetailsFromTab$),
     );
 
@@ -400,7 +401,7 @@ export default class AutofillService implements AutofillServiceInterface {
    * Gets the default URI match strategy setting from the domain settings service.
    */
   async getDefaultUriMatchStrategy(): Promise<UriMatchStrategySetting> {
-    return await firstValueFrom(this.domainSettingsService.defaultUriMatchStrategy$);
+    return await firstValueFrom(this.domainSettingsService.resolvedDefaultUriMatchStrategy$);
   }
 
   /**
@@ -451,6 +452,8 @@ export default class AutofillService implements AutofillServiceInterface {
           cipher: options.cipher,
           tabUrl: tab.url,
           defaultUriMatch: defaultUriMatch,
+          focusedFieldOpid: options.focusedFieldOpid,
+          inlineMenuFillType: options.inlineMenuFillType,
         });
 
         if (!fillScript || !fillScript.script || !fillScript.script.length) {
@@ -837,7 +840,7 @@ export default class AutofillService implements AutofillServiceInterface {
     }
 
     const passwords: AutofillField[] = [];
-    const usernames: AutofillField[] = [];
+    const usernames = new Map<string, AutofillField>();
     const totps: AutofillField[] = [];
     let pf: AutofillField = null;
     let username: AutofillField = null;
@@ -856,27 +859,111 @@ export default class AutofillService implements AutofillServiceInterface {
       options.fillNewPassword,
     );
 
+    const loginPasswordFields: AutofillField[] = [];
+    const registrationPasswordFields: AutofillField[] = [];
+
+    passwordFields.forEach((passField) => {
+      if (this.isRegistrationPasswordField(pageDetails, passField)) {
+        registrationPasswordFields.push(passField);
+      } else {
+        loginPasswordFields.push(passField);
+      }
+    });
+
+    // Prefer login fields over registration fields
+    const prioritizedPasswordFields =
+      loginPasswordFields.length > 0 ? loginPasswordFields : registrationPasswordFields;
+
+    const focusedField =
+      options.focusedFieldOpid &&
+      pageDetails.fields.find((f) => f.opid === options.focusedFieldOpid);
+    const focusedForm = focusedField?.form;
+
+    const isFocusedTotpField =
+      focusedField &&
+      options.allowTotpAutofill &&
+      (focusedField.type === "text" ||
+        focusedField.type === "number" ||
+        focusedField.type === "tel") &&
+      (AutofillService.fieldIsFuzzyMatch(focusedField, [
+        ...AutoFillConstants.TotpFieldNames,
+        ...AutoFillConstants.AmbiguousTotpFieldNames,
+      ]) ||
+        focusedField.autoCompleteType === "one-time-code") &&
+      !AutofillService.fieldIsFuzzyMatch(focusedField, [
+        ...AutoFillConstants.RecoveryCodeFieldNames,
+      ]);
+
+    const focusedUsernameField =
+      focusedField &&
+      !isFocusedTotpField &&
+      login.username &&
+      (focusedField.type === "text" ||
+        focusedField.type === "email" ||
+        focusedField.type === "tel") &&
+      focusedField;
+
+    const passwordMatchesFocused = (pf: AutofillField): boolean =>
+      !focusedField
+        ? true
+        : focusedForm != null
+          ? pf.form === focusedForm
+          : focusedUsernameField &&
+            pf.form == null &&
+            this.findUsernameField(pageDetails, pf, false, false, true)?.opid ===
+              focusedUsernameField.opid;
+
+    const getUsernameForPassword = (
+      pf: AutofillField,
+      withoutForm: boolean,
+    ): AutofillField | null => {
+      // use focused username if it matches this password, otherwise fall back to finding username field before password
+      if (focusedUsernameField && passwordMatchesFocused(pf)) {
+        return focusedUsernameField;
+      }
+      return this.findUsernameField(pageDetails, pf, false, false, withoutForm);
+    };
+
+    if (focusedUsernameField && !prioritizedPasswordFields.some(passwordMatchesFocused)) {
+      if (!Object.prototype.hasOwnProperty.call(filledFields, focusedUsernameField.opid)) {
+        filledFields[focusedUsernameField.opid] = focusedUsernameField;
+        AutofillService.fillByOpid(fillScript, focusedUsernameField, login.username);
+        if (options.autoSubmitLogin && focusedUsernameField.form) {
+          fillScript.autosubmit = [focusedUsernameField.form];
+        }
+        return AutofillService.setFillScriptForFocus(
+          { [focusedUsernameField.opid]: focusedUsernameField },
+          fillScript,
+        );
+      }
+    }
+
     for (const formKey in pageDetails.forms) {
       // eslint-disable-next-line
       if (!pageDetails.forms.hasOwnProperty(formKey)) {
         continue;
       }
 
-      passwordFields.forEach((passField) => {
+      prioritizedPasswordFields.forEach((passField) => {
+        if (focusedField && !passwordMatchesFocused(passField)) {
+          return;
+        }
+
         pf = passField;
         passwords.push(pf);
 
         if (login.username) {
-          username = this.findUsernameField(pageDetails, pf, false, false, false);
-
+          username = getUsernameForPassword(pf, false);
           if (username) {
-            usernames.push(username);
+            usernames.set(username.opid, username);
           }
         }
 
         if (options.allowTotpAutofill && login.totp) {
-          totp = this.findTotpField(pageDetails, pf, false, false, false);
-
+          totp =
+            isFocusedTotpField && passwordMatchesFocused(passField)
+              ? focusedField
+              : this.findTotpField(pageDetails, pf, false, false, false);
           if (totp) {
             totps.push(totp);
           }
@@ -885,25 +972,57 @@ export default class AutofillService implements AutofillServiceInterface {
     }
 
     if (passwordFields.length && !passwords.length) {
-      // The page does not have any forms with password fields. Use the first password field on the page and the
-      // input field just before it as the username.
+      // in the event that password fields exist but weren't processed within form elements.
+      const isPasswordGeneration =
+        options.inlineMenuFillType === InlineMenuFillTypes.PasswordGeneration;
+      const isCurrentPasswordUpdate =
+        options.inlineMenuFillType === InlineMenuFillTypes.CurrentPasswordUpdate;
 
-      pf = passwordFields[0];
-      passwords.push(pf);
+      // For password generation or current password update, include all password fields from the same form
+      // This ensures we have access to all fields regardless of their login/registration classification
+      if ((isPasswordGeneration || isCurrentPasswordUpdate) && focusedField) {
+        // Add all password fields from the same form as the focused field
+        const focusedFieldForm = focusedField.form;
 
-      if (login.username && pf.elementNumber > 0) {
-        username = this.findUsernameField(pageDetails, pf, false, false, true);
+        // Check both login and registration fields to ensure we get all password fields
+        const allPasswordFields = [...loginPasswordFields, ...registrationPasswordFields];
+        allPasswordFields.forEach((passField) => {
+          if (passField.form === focusedFieldForm) {
+            passwords.push(passField);
+          }
+        });
+      }
 
-        if (username) {
-          usernames.push(username);
+      // If we didn't add any passwords above (either not password generation/update or no matching fields),
+      // select matching password if focused, otherwise first in prioritized list.
+      if (!passwords.length) {
+        const passwordFieldToUse = focusedField
+          ? prioritizedPasswordFields.find(passwordMatchesFocused) || prioritizedPasswordFields[0]
+          : prioritizedPasswordFields[0];
+
+        if (passwordFieldToUse) {
+          passwords.push(passwordFieldToUse);
         }
       }
 
-      if (options.allowTotpAutofill && login.totp && pf.elementNumber > 0) {
-        totp = this.findTotpField(pageDetails, pf, false, false, true);
+      // Handle username and TOTP for the first password field
+      const firstPasswordField = passwords[0];
+      if (firstPasswordField) {
+        if (login.username && firstPasswordField.elementNumber > 0) {
+          username = getUsernameForPassword(firstPasswordField, true);
+          if (username) {
+            usernames.set(username.opid, username);
+          }
+        }
 
-        if (totp) {
-          totps.push(totp);
+        if (options.allowTotpAutofill && login.totp && firstPasswordField.elementNumber > 0) {
+          totp =
+            isFocusedTotpField && passwordMatchesFocused(firstPasswordField)
+              ? focusedField
+              : this.findTotpField(pageDetails, firstPasswordField, false, false, true);
+          if (totp) {
+            totps.push(totp);
+          }
         }
       }
     }
@@ -937,7 +1056,7 @@ export default class AutofillService implements AutofillServiceInterface {
             totps.push(field);
             return;
           case isFillableUsernameField:
-            usernames.push(field);
+            usernames.set(field.opid, field);
             return;
           default:
             return;
@@ -946,9 +1065,10 @@ export default class AutofillService implements AutofillServiceInterface {
     }
 
     const formElementsSet = new Set<string>();
-    usernames.forEach((u) => {
-      // eslint-disable-next-line
-      if (filledFields.hasOwnProperty(u.opid)) {
+    const usernamesToFill = focusedUsernameField ? [focusedUsernameField] : [...usernames.values()];
+
+    usernamesToFill.forEach((u) => {
+      if (Object.prototype.hasOwnProperty.call(filledFields, u.opid)) {
         return;
       }
 
@@ -2251,6 +2371,38 @@ export default class AutofillService implements AutofillServiceInterface {
     return arr;
   }
 
+  /**
+   * Determines if a password field is part of a registration/signup form.
+   * @param {AutofillPageDetails} pageDetails
+   * @param {AutofillField} passwordField
+   * @returns {boolean}
+   * @private
+   */
+  private isRegistrationPasswordField(
+    pageDetails: AutofillPageDetails,
+    passwordField: AutofillField,
+  ): boolean {
+    if (!passwordField.form || !pageDetails.forms) {
+      return false;
+    }
+
+    const form = pageDetails.forms[passwordField.form];
+    if (!form) {
+      return false;
+    }
+
+    const formIdentifierValues = [
+      form.htmlID?.toLowerCase?.(),
+      form.htmlName?.toLowerCase?.(),
+      passwordField?.htmlID?.toLowerCase?.(),
+      passwordField?.htmlName?.toLowerCase?.(),
+    ].filter(Boolean);
+
+    return formIdentifierValues.some((value) =>
+      AutoFillConstants.RegistrationKeywords.some((keyword) => value.includes(keyword)),
+    );
+  }
+
   /**
    * Accepts a pageDetails object with a list of fields and returns a list of
    * fields that are likely to be username fields.
@@ -2270,6 +2422,8 @@ export default class AutofillService implements AutofillServiceInterface {
     withoutForm: boolean,
   ): AutofillField | null {
     let usernameField: AutofillField = null;
+    let usernameFieldInSameForm: AutofillField = null;
+
     for (let i = 0; i < pageDetails.fields.length; i++) {
       const f = pageDetails.fields[i];
       if (AutofillService.forCustomFieldsOnly(f)) {
@@ -2282,22 +2436,36 @@ export default class AutofillService implements AutofillServiceInterface {
 
       const includesUsernameFieldName =
         this.findMatchingFieldIndex(f, AutoFillConstants.UsernameFieldNames) > -1;
+      // only consider fields in same form if both have non-null form values
+      // null forms are treated as separate
+      const isInSameForm =
+        f.form != null && passwordField.form != null && f.form === passwordField.form;
+
+      // An email or tel field in the same form as the password field is likely a qualified
+      // candidate for autofill, even if visibility checks are unreliable
+      const isQualifiedUsernameField = isInSameForm && (f.type === "email" || f.type === "tel");
 
       if (
         !f.disabled &&
         (canBeReadOnly || !f.readonly) &&
-        (withoutForm || f.form === passwordField.form || includesUsernameFieldName) &&
-        (canBeHidden || f.viewable) &&
+        (withoutForm || isInSameForm || includesUsernameFieldName) &&
+        (canBeHidden || f.viewable || isQualifiedUsernameField) &&
         (f.type === "text" || f.type === "email" || f.type === "tel")
       ) {
-        usernameField = f;
-        // We found an exact match. No need to keep looking.
-        if (includesUsernameFieldName) {
-          break;
+        // Prioritize fields in the same form as the password field
+        if (isInSameForm) {
+          usernameFieldInSameForm = f;
+          if (includesUsernameFieldName) {
+            return f;
+          }
+        } else {
+          usernameField = f;
         }
       }
     }
-    return usernameField;
+
+    // Prefer username field in same form, fall back to any username field
+    return usernameFieldInSameForm || usernameField;
   }
 
   /**
diff --git a/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts b/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts
index 9ee329fa150..66a692dbe20 100644
--- a/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts
+++ b/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts
@@ -395,7 +395,7 @@ describe("CollectAutofillContentService", () => {
       });
     });
 
-    it("sets the noFieldsFound property to true if the page has no forms or fields", async function () {
+    it("sets the noFieldsFond property to true if the page has no forms or fields", async function () {
       document.body.innerHTML = "";
       collectAutofillContentService["noFieldsFound"] = false;
       jest.spyOn(collectAutofillContentService as any, "buildAutofillFormsData");
@@ -2649,33 +2649,4 @@ describe("CollectAutofillContentService", () => {
       );
     });
   });
-
-  describe("processMutations", () => {
-    beforeEach(() => {
-      jest.useFakeTimers();
-    });
-
-    afterEach(() => {
-      jest.runOnlyPendingTimers();
-      jest.useRealTimers();
-    });
-
-    it("will require an update to page details if shadow DOM is present", () => {
-      jest
-        .spyOn(domQueryService as any, "checkPageContainsShadowDom")
-        .mockImplementationOnce(() => true);
-
-      collectAutofillContentService["requirePageDetailsUpdate"] = jest.fn();
-
-      collectAutofillContentService["mutationsQueue"] = [[], []];
-
-      collectAutofillContentService["processMutations"]();
-
-      jest.runOnlyPendingTimers();
-
-      expect(domQueryService.checkPageContainsShadowDom).toHaveBeenCalled();
-      expect(collectAutofillContentService["mutationsQueue"]).toHaveLength(0);
-      expect(collectAutofillContentService["requirePageDetailsUpdate"]).toHaveBeenCalled();
-    });
-  });
 });
diff --git a/apps/browser/src/autofill/services/collect-autofill-content.service.ts b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
index 2ddee289044..6f2c00a4dd4 100644
--- a/apps/browser/src/autofill/services/collect-autofill-content.service.ts
+++ b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
@@ -433,7 +433,6 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
 
   /**
    * Caches the autofill field element and its data.
-   * Will not cache the element if the index is less than 0.
    *
    * @param index - The index of the autofill field element
    * @param element - The autofill field element to cache
@@ -444,10 +443,7 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
     element: ElementWithOpId<FormFieldElement>,
     autofillFieldData: AutofillField,
   ) {
-    if (index < 0) {
-      return;
-    }
-
+    // Always cache the element, even if index is -1 (for dynamically added fields)
     this.autofillFieldElements.set(element, autofillFieldData);
   }
 
@@ -1001,13 +997,6 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
    * within an idle callback to help with performance and prevent excessive updates.
    */
   private processMutations = () => {
-    // If the page contains shadow DOM, we require a page details update from the autofill service.
-    // Will wait for an idle moment on main thread to execute, unless timeout has passed.
-    requestIdleCallbackPolyfill(
-      () => this.domQueryService.checkPageContainsShadowDom() && this.requirePageDetailsUpdate(),
-      { timeout: 500 },
-    );
-
     const queueLength = this.mutationsQueue.length;
 
     for (let queueIndex = 0; queueIndex < queueLength; queueIndex++) {
@@ -1030,13 +1019,13 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
    * Triggers several flags that indicate that a collection of page details should
    * occur again on a subsequent call after a mutation has been observed in the DOM.
    */
-  private requirePageDetailsUpdate = () => {
+  private flagPageDetailsUpdateIsRequired() {
     this.domRecentlyMutated = true;
     if (this.autofillOverlayContentService) {
       this.autofillOverlayContentService.pageDetailsUpdateRequired = true;
     }
     this.noFieldsFound = false;
-  };
+  }
 
   /**
    * Processes all mutation records encountered by the mutation observer.
@@ -1064,7 +1053,7 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
       (this.isAutofillElementNodeMutated(mutation.removedNodes, true) ||
         this.isAutofillElementNodeMutated(mutation.addedNodes))
     ) {
-      this.requirePageDetailsUpdate();
+      this.flagPageDetailsUpdateIsRequired();
       return;
     }
 
@@ -1196,7 +1185,7 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
   private setupOverlayListenersOnMutatedElements(mutatedElements: Node[]) {
     for (let elementIndex = 0; elementIndex < mutatedElements.length; elementIndex++) {
       const node = mutatedElements[elementIndex];
-      const buildAutofillFieldItem = () => {
+      const buildAutofillFieldItem = async () => {
         if (
           !this.isNodeFormFieldElement(node) ||
           this.autofillFieldElements.get(node as ElementWithOpId<FormFieldElement>)
@@ -1206,7 +1195,17 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
 
         // We are setting this item to a -1 index because we do not know its position in the DOM.
         // This value should be updated with the next call to collect page details.
-        void this.buildAutofillFieldItem(node as ElementWithOpId<FormFieldElement>, -1);
+        const formFieldElement = node as ElementWithOpId<FormFieldElement>;
+        const autofillField = await this.buildAutofillFieldItem(formFieldElement, -1);
+
+        // Set up overlay listeners for the new field if we have the overlay service
+        if (autofillField && this.autofillOverlayContentService) {
+          this.setupOverlayOnField(formFieldElement, autofillField);
+
+          if (this.domRecentlyMutated) {
+            this.updateAutofillElementsAfterMutation();
+          }
+        }
       };
 
       requestIdleCallbackPolyfill(buildAutofillFieldItem, { timeout: 1000 });
diff --git a/apps/browser/src/autofill/services/dom-element-visibility.service.ts b/apps/browser/src/autofill/services/dom-element-visibility.service.ts
index bd75cb55ba5..21f024a510c 100644
--- a/apps/browser/src/autofill/services/dom-element-visibility.service.ts
+++ b/apps/browser/src/autofill/services/dom-element-visibility.service.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/abstractions/autofill-inline-menu-content.service";
 import { FillableFormFieldElement, FormFieldElement } from "../types";
 
@@ -202,7 +200,7 @@ class DomElementVisibilityService implements DomElementVisibilityServiceInterfac
 
     const closestParentLabel = elementAtCenterPoint?.parentElement?.closest("label");
 
-    return targetElementLabelsSet.has(closestParentLabel);
+    return closestParentLabel ? targetElementLabelsSet.has(closestParentLabel) : false;
   }
 }
 
diff --git a/apps/browser/src/autofill/services/dom-query.service.spec.ts b/apps/browser/src/autofill/services/dom-query.service.spec.ts
index 87645c98a45..53862aef735 100644
--- a/apps/browser/src/autofill/services/dom-query.service.spec.ts
+++ b/apps/browser/src/autofill/services/dom-query.service.spec.ts
@@ -72,6 +72,7 @@ describe("DomQueryService", () => {
     });
 
     it("queries form field elements that are nested within multiple ShadowDOM elements", () => {
+      domQueryService["pageContainsShadowDom"] = true;
       const root = document.createElement("div");
       const shadowRoot1 = root.attachShadow({ mode: "open" });
       const root2 = document.createElement("div");
@@ -94,6 +95,7 @@ describe("DomQueryService", () => {
     });
 
     it("will fallback to using the TreeWalker API if a depth larger than 4 ShadowDOM elements is encountered", () => {
+      domQueryService["pageContainsShadowDom"] = true;
       const root = document.createElement("div");
       const shadowRoot1 = root.attachShadow({ mode: "open" });
       const root2 = document.createElement("div");
diff --git a/apps/browser/src/autofill/services/dom-query.service.ts b/apps/browser/src/autofill/services/dom-query.service.ts
index b681e8e9fbb..932bbe47f90 100644
--- a/apps/browser/src/autofill/services/dom-query.service.ts
+++ b/apps/browser/src/autofill/services/dom-query.service.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { EVENTS, MAX_DEEP_QUERY_RECURSION_DEPTH } from "@bitwarden/common/autofill/constants";
 
 import { nodeIsElement } from "../utils";
@@ -7,7 +5,8 @@ import { nodeIsElement } from "../utils";
 import { DomQueryService as DomQueryServiceInterface } from "./abstractions/dom-query.service";
 
 export class DomQueryService implements DomQueryServiceInterface {
-  private pageContainsShadowDom: boolean;
+  /** Non-null asserted. */
+  private pageContainsShadowDom!: boolean;
   private ignoredTreeWalkerNodes = new Set([
     "svg",
     "script",
@@ -79,9 +78,8 @@ export class DomQueryService implements DomQueryServiceInterface {
   /**
    * Checks if the page contains any shadow DOM elements.
    */
-  checkPageContainsShadowDom = (): boolean => {
+  checkPageContainsShadowDom = (): void => {
     this.pageContainsShadowDom = this.queryShadowRoots(globalThis.document.body, true).length > 0;
-    return this.pageContainsShadowDom;
   };
 
   /**
@@ -110,7 +108,7 @@ export class DomQueryService implements DomQueryServiceInterface {
   ): T[] {
     let elements = this.queryElements<T>(root, queryString);
 
-    const shadowRoots = this.pageContainsShadowDom ? this.recursivelyQueryShadowRoots(root) : [];
+    const shadowRoots = this.recursivelyQueryShadowRoots(root);
     for (let index = 0; index < shadowRoots.length; index++) {
       const shadowRoot = shadowRoots[index];
       elements = elements.concat(this.queryElements<T>(shadowRoot, queryString));
@@ -153,6 +151,10 @@ export class DomQueryService implements DomQueryServiceInterface {
     root: Document | ShadowRoot | Element,
     depth: number = 0,
   ): ShadowRoot[] {
+    if (!this.pageContainsShadowDom) {
+      return [];
+    }
+
     if (depth >= MAX_DEEP_QUERY_RECURSION_DEPTH) {
       throw new Error("Max recursion depth reached");
     }
@@ -217,13 +219,12 @@ export class DomQueryService implements DomQueryServiceInterface {
     if ((chrome as any).dom?.openOrClosedShadowRoot) {
       try {
         return (chrome as any).dom.openOrClosedShadowRoot(node);
-        // FIXME: Remove when updating file. Eslint update
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      } catch (error) {
+      } catch {
         return null;
       }
     }
 
+    // Firefox-specific equivalent of `openOrClosedShadowRoot`
     return (node as any).openOrClosedShadowRoot;
   }
 
@@ -276,7 +277,7 @@ export class DomQueryService implements DomQueryServiceInterface {
         ? NodeFilter.FILTER_REJECT
         : NodeFilter.FILTER_ACCEPT,
     );
-    let currentNode = treeWalker?.currentNode;
+    let currentNode: Node | null = treeWalker?.currentNode;
 
     while (currentNode) {
       if (filterCallback(currentNode)) {
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 ed8e41df8ba..f7c46a9fa77 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
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import AutofillField from "../models/autofill-field";
 import AutofillPageDetails from "../models/autofill-page-details";
 import { getSubmitButtonKeywordsSet, sendExtensionMessage } from "../utils";
@@ -162,12 +160,14 @@ export class InlineMenuFieldQualificationService
   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]) {
+      const attributeValueToMatch = matchFieldAttributeValues[attrIndex];
+
+      if (!attributeValueToMatch) {
         continue;
       }
 
       for (let keywordIndex = 0; keywordIndex < matchFieldAttributeValues.length; keywordIndex++) {
-        if (this.newEmailFieldKeywords.has(matchFieldAttributeValues[attrIndex])) {
+        if (this.newEmailFieldKeywords.has(attributeValueToMatch)) {
           return true;
         }
       }
@@ -210,10 +210,7 @@ export class InlineMenuFieldQualificationService
   }
 
   constructor() {
-    void Promise.all([
-      sendExtensionMessage("getInlineMenuFieldQualificationFeatureFlag"),
-      sendExtensionMessage("getUserPremiumStatus"),
-    ]).then(([fieldQualificationFlag, premiumStatus]) => {
+    void sendExtensionMessage("getUserPremiumStatus").then((premiumStatus) => {
       this.premiumEnabled = !!premiumStatus?.result;
     });
   }
@@ -263,7 +260,13 @@ export class InlineMenuFieldQualificationService
       return true;
     }
 
-    const parentForm = pageDetails.forms[field.form];
+    let parentForm;
+
+    const fieldForm = field.form;
+
+    if (fieldForm) {
+      parentForm = pageDetails.forms[fieldForm];
+    }
 
     // If the field does not have a parent form
     if (!parentForm) {
@@ -321,7 +324,13 @@ export class InlineMenuFieldQualificationService
       return false;
     }
 
-    const parentForm = pageDetails.forms[field.form];
+    let parentForm;
+
+    const fieldForm = field.form;
+
+    if (fieldForm) {
+      parentForm = pageDetails.forms[fieldForm];
+    }
 
     if (!parentForm) {
       // If the field does not have a parent form, but we can identify that the page contains at least
@@ -374,7 +383,13 @@ export class InlineMenuFieldQualificationService
     field: AutofillField,
     pageDetails: AutofillPageDetails,
   ): boolean {
-    const parentForm = pageDetails.forms[field.form];
+    let parentForm;
+
+    const fieldForm = field.form;
+
+    if (fieldForm) {
+      parentForm = pageDetails.forms[fieldForm];
+    }
 
     // If the provided field is set with an autocomplete value of "current-password", we should assume that
     // the page developer intends for this field to be interpreted as a password field for a login form.
@@ -476,7 +491,13 @@ export class InlineMenuFieldQualificationService
 
     // If the field is not explicitly set as a username field, we need to qualify
     // the field based on the other fields that are present on the page.
-    const parentForm = pageDetails.forms[field.form];
+    let parentForm;
+
+    const fieldForm = field.form;
+
+    if (fieldForm) {
+      parentForm = pageDetails.forms[fieldForm];
+    }
     const passwordFieldsInPageDetails = pageDetails.fields.filter(this.isCurrentPasswordField);
 
     if (this.isNewsletterForm(parentForm)) {
@@ -919,8 +940,10 @@ export class InlineMenuFieldQualificationService
    * @param field - The field to validate
    */
   isUsernameField = (field: AutofillField): boolean => {
+    const fieldType = field.type;
     if (
-      !this.usernameFieldTypes.has(field.type) ||
+      !fieldType ||
+      !this.usernameFieldTypes.has(fieldType) ||
       this.isExcludedFieldType(field, this.excludedAutofillFieldTypesSet) ||
       this.fieldHasDisqualifyingAttributeValue(field)
     ) {
@@ -1026,7 +1049,13 @@ export class InlineMenuFieldQualificationService
 
     const testedValues = [field.htmlID, field.htmlName, field.placeholder];
     for (let i = 0; i < testedValues.length; i++) {
-      if (this.valueIsLikePassword(testedValues[i])) {
+      const attributeValueToMatch = testedValues[i];
+
+      if (!attributeValueToMatch) {
+        continue;
+      }
+
+      if (this.valueIsLikePassword(attributeValueToMatch)) {
         return true;
       }
     }
@@ -1101,7 +1130,9 @@ export class InlineMenuFieldQualificationService
    * @param excludedTypes - The set of excluded types
    */
   private isExcludedFieldType(field: AutofillField, excludedTypes: Set<string>): boolean {
-    if (excludedTypes.has(field.type)) {
+    const fieldType = field.type;
+
+    if (fieldType && excludedTypes.has(fieldType)) {
       return true;
     }
 
@@ -1116,12 +1147,14 @@ export class InlineMenuFieldQualificationService
   private isSearchField(field: AutofillField): boolean {
     const matchFieldAttributeValues = [field.type, field.htmlName, field.htmlID, field.placeholder];
     for (let attrIndex = 0; attrIndex < matchFieldAttributeValues.length; attrIndex++) {
-      if (!matchFieldAttributeValues[attrIndex]) {
+      const attributeValueToMatch = matchFieldAttributeValues[attrIndex];
+
+      if (!attributeValueToMatch) {
         continue;
       }
 
       // Separate camel case words and case them to lower case values
-      const camelCaseSeparatedFieldAttribute = matchFieldAttributeValues[attrIndex]
+      const camelCaseSeparatedFieldAttribute = attributeValueToMatch
         .replace(/([a-z])([A-Z])/g, "$1 $2")
         .toLowerCase();
       // Split the attribute by non-alphabetical characters to get the keywords
@@ -1168,7 +1201,7 @@ export class InlineMenuFieldQualificationService
       this.submitButtonKeywordsMap.set(element, Array.from(keywordsSet).join(","));
     }
 
-    return this.submitButtonKeywordsMap.get(element);
+    return this.submitButtonKeywordsMap.get(element) || "";
   }
 
   /**
@@ -1222,8 +1255,9 @@ export class InlineMenuFieldQualificationService
       ];
       const keywordsSet = new Set<string>();
       for (let i = 0; i < keywords.length; i++) {
-        if (keywords[i] && typeof keywords[i] === "string") {
-          let keywordEl = keywords[i].toLowerCase();
+        const attributeValue = keywords[i];
+        if (attributeValue && typeof attributeValue === "string") {
+          let keywordEl = attributeValue.toLowerCase();
           keywordsSet.add(keywordEl);
 
           // Remove hyphens from all potential keywords, we want to treat these as a single word.
@@ -1253,7 +1287,7 @@ export class InlineMenuFieldQualificationService
     }
 
     const mapValues = this.autofillFieldKeywordsMap.get(autofillFieldData);
-    return returnStringValue ? mapValues.stringValue : mapValues.keywordsSet;
+    return mapValues ? (returnStringValue ? mapValues.stringValue : mapValues.keywordsSet) : "";
   }
 
   /**
diff --git a/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts b/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
index 9edcdbb3a95..1f2b23021f4 100644
--- a/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
+++ b/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
@@ -2,7 +2,7 @@ import { mock } from "jest-mock-extended";
 
 import { EVENTS } from "@bitwarden/common/autofill/constants";
 
-import AutofillScript, { FillScript, FillScriptActions } from "../models/autofill-script";
+import AutofillScript, { FillScript, FillScriptActionTypes } from "../models/autofill-script";
 import { mockQuerySelectorAllDefinedCall } from "../spec/testing-utils";
 import { FillableFormFieldElement, FormElementWithAttribute, FormFieldElement } from "../types";
 
@@ -26,7 +26,6 @@ const eventsToTest = [
   EVENTS.CHANGE,
   EVENTS.INPUT,
   EVENTS.KEYDOWN,
-  EVENTS.KEYPRESS,
   EVENTS.KEYUP,
   "blur",
   "click",
@@ -95,15 +94,14 @@ describe("InsertAutofillContentService", () => {
     );
     fillScript = {
       script: [
-        ["click_on_opid", "username"],
-        ["focus_by_opid", "username"],
-        ["fill_by_opid", "username", "test"],
+        [FillScriptActionTypes.click_on_opid, "username"],
+        [FillScriptActionTypes.focus_by_opid, "username"],
+        [FillScriptActionTypes.fill_by_opid, "username", "test"],
       ],
       properties: {
         delay_between_operations: 20,
       },
-      metadata: {},
-      autosubmit: null,
+      autosubmit: [],
       savedUrls: ["https://bitwarden.com"],
       untrustedIframe: false,
       itemType: "login",
@@ -218,28 +216,18 @@ describe("InsertAutofillContentService", () => {
 
       await insertAutofillContentService.fillForm(fillScript);
 
-      expect(insertAutofillContentService["userCancelledInsecureUrlAutofill"]).toHaveBeenCalled();
-      expect(
-        insertAutofillContentService["userCancelledUntrustedIframeAutofill"],
-      ).toHaveBeenCalled();
       expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenCalledTimes(3);
       expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenNthCalledWith(
         1,
         fillScript.script[0],
-        0,
-        fillScript.script,
       );
       expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenNthCalledWith(
         2,
         fillScript.script[1],
-        1,
-        fillScript.script,
       );
       expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenNthCalledWith(
         3,
         fillScript.script[2],
-        2,
-        fillScript.script,
       );
     });
   });
@@ -384,42 +372,62 @@ describe("InsertAutofillContentService", () => {
     });
 
     it("returns early if no opid is provided", async () => {
-      const action = "fill_by_opid";
+      const action = FillScriptActionTypes.fill_by_opid;
       const opid = "";
       const value = "value";
       const scriptAction: FillScript = [action, opid, value];
       jest.spyOn(insertAutofillContentService["autofillInsertActions"], action);
 
-      await insertAutofillContentService["runFillScriptAction"](scriptAction, 0);
+      await insertAutofillContentService["runFillScriptAction"](scriptAction);
       jest.advanceTimersByTime(20);
 
       expect(insertAutofillContentService["autofillInsertActions"][action]).not.toHaveBeenCalled();
     });
 
     describe("given a valid fill script action and opid", () => {
-      const fillScriptActions: FillScriptActions[] = [
-        "fill_by_opid",
-        "click_on_opid",
-        "focus_by_opid",
-      ];
-      fillScriptActions.forEach((action) => {
-        it(`triggers a ${action} action`, () => {
-          const opid = "opid";
-          const value = "value";
-          const scriptAction: FillScript = [action, opid, value];
-          jest.spyOn(insertAutofillContentService["autofillInsertActions"], action);
+      it(`triggers a fill_by_opid action`, () => {
+        const action = FillScriptActionTypes.fill_by_opid;
+        const opid = "opid";
+        const value = "value";
+        const scriptAction: FillScript = [action, opid, value];
+        jest.spyOn(insertAutofillContentService["autofillInsertActions"], action);
 
-          // 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
-          insertAutofillContentService["runFillScriptAction"](scriptAction, 0);
-          jest.advanceTimersByTime(20);
+        void insertAutofillContentService["runFillScriptAction"](scriptAction);
+        jest.advanceTimersByTime(20);
 
-          expect(
-            insertAutofillContentService["autofillInsertActions"][action],
-          ).toHaveBeenCalledWith({
-            opid,
-            value,
-          });
+        expect(insertAutofillContentService["autofillInsertActions"][action]).toHaveBeenCalledWith({
+          opid,
+          value,
+        });
+      });
+
+      it(`triggers a click_on_opid action`, () => {
+        const action = FillScriptActionTypes.click_on_opid;
+        const opid = "opid";
+        const value = "value";
+        const scriptAction: FillScript = [action, opid, value];
+        jest.spyOn(insertAutofillContentService["autofillInsertActions"], action);
+
+        void insertAutofillContentService["runFillScriptAction"](scriptAction);
+        jest.advanceTimersByTime(20);
+
+        expect(insertAutofillContentService["autofillInsertActions"][action]).toHaveBeenCalledWith({
+          opid,
+        });
+      });
+
+      it(`triggers a focus_by_opid action`, () => {
+        const action = FillScriptActionTypes.focus_by_opid;
+        const opid = "opid";
+        const value = "value";
+        const scriptAction: FillScript = [action, opid, value];
+        jest.spyOn(insertAutofillContentService["autofillInsertActions"], action);
+
+        void insertAutofillContentService["runFillScriptAction"](scriptAction);
+        jest.advanceTimersByTime(20);
+
+        expect(insertAutofillContentService["autofillInsertActions"][action]).toHaveBeenCalledWith({
+          opid,
         });
       });
     });
@@ -623,14 +631,12 @@ describe("InsertAutofillContentService", () => {
       });
     });
 
-    it("will set the `value` attribute of any passed input or textarea elements", () => {
-      document.body.innerHTML = `<input type="text" id="username" /><textarea id="bio"></textarea>`;
+    it("will set the `value` attribute of any passed input or textarea elements if the value differs", () => {
+      document.body.innerHTML = `<input type="text" id="username" value="old" /><textarea id="bio">old</textarea>`;
       const value1 = "test";
       const value2 = "test2";
       const textInputElement = document.getElementById("username") as HTMLInputElement;
-      textInputElement.value = value1;
       const textareaElement = document.getElementById("bio") as HTMLTextAreaElement;
-      textareaElement.value = value2;
       jest.spyOn(insertAutofillContentService as any, "handleInsertValueAndTriggerSimulatedEvents");
 
       insertAutofillContentService["insertValueIntoField"](textInputElement, value1);
@@ -647,6 +653,45 @@ describe("InsertAutofillContentService", () => {
         insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"],
       ).toHaveBeenCalledWith(textareaElement, expect.any(Function));
     });
+
+    it("will NOT set the `value` attribute of any passed input or textarea elements if they already have values matching the passed value", () => {
+      document.body.innerHTML = `<input type="text" id="username" /><textarea id="bio"></textarea>`;
+      const value1 = "test";
+      const value2 = "test2";
+      const textInputElement = document.getElementById("username") as HTMLInputElement;
+      textInputElement.value = value1;
+      const textareaElement = document.getElementById("bio") as HTMLTextAreaElement;
+      textareaElement.value = value2;
+      jest.spyOn(insertAutofillContentService as any, "handleInsertValueAndTriggerSimulatedEvents");
+
+      insertAutofillContentService["insertValueIntoField"](textInputElement, value1);
+
+      expect(textInputElement.value).toBe(value1);
+      expect(
+        insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"],
+      ).not.toHaveBeenCalled();
+
+      insertAutofillContentService["insertValueIntoField"](textareaElement, value2);
+
+      expect(textareaElement.value).toBe(value2);
+      expect(
+        insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"],
+      ).not.toHaveBeenCalled();
+    });
+
+    it("skips filling when the field already has the target value", () => {
+      const value = "test";
+      document.body.innerHTML = `<input type="text" id="username" value="${value}"/>`;
+      const element = document.getElementById("username") as FillableFormFieldElement;
+      jest.spyOn(insertAutofillContentService as any, "handleInsertValueAndTriggerSimulatedEvents");
+
+      insertAutofillContentService["insertValueIntoField"](element, value);
+
+      expect(
+        insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"],
+      ).not.toHaveBeenCalled();
+      expect(element.value).toBe(value);
+    });
   });
 
   describe("handleInsertValueAndTriggerSimulatedEvents", () => {
@@ -1014,13 +1059,13 @@ describe("InsertAutofillContentService", () => {
   });
 
   describe("simulateUserKeyboardEventInteractions", () => {
-    it("will trigger `keydown`, `keypress`, and `keyup` events on the passed element", () => {
+    it("will trigger `keydown` and `keyup` events on the passed element", () => {
       const inputElement = document.querySelector('input[type="text"]') as HTMLInputElement;
       jest.spyOn(inputElement, "dispatchEvent");
 
       insertAutofillContentService["simulateUserKeyboardEventInteractions"](inputElement);
 
-      [EVENTS.KEYDOWN, EVENTS.KEYPRESS, EVENTS.KEYUP].forEach((eventName) => {
+      [EVENTS.KEYDOWN, EVENTS.KEYUP].forEach((eventName) => {
         expect(inputElement.dispatchEvent).toHaveBeenCalledWith(
           new KeyboardEvent(eventName, { bubbles: true }),
         );
diff --git a/apps/browser/src/autofill/services/insert-autofill-content.service.ts b/apps/browser/src/autofill/services/insert-autofill-content.service.ts
index 6034563a947..4b7f699fecb 100644
--- a/apps/browser/src/autofill/services/insert-autofill-content.service.ts
+++ b/apps/browser/src/autofill/services/insert-autofill-content.service.ts
@@ -1,8 +1,10 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { EVENTS, TYPE_CHECK } from "@bitwarden/common/autofill/constants";
 
-import AutofillScript, { AutofillInsertActions, FillScript } from "../models/autofill-script";
+import AutofillScript, {
+  AutofillInsertActions,
+  FillScript,
+  FillScriptActionTypes,
+} from "../models/autofill-script";
 import { FormFieldElement } from "../types";
 import {
   currentlyInSandboxedIframe,
@@ -49,8 +51,9 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
       return;
     }
 
-    const fillActionPromises = fillScript.script.map(this.runFillScriptAction);
-    await Promise.all(fillActionPromises);
+    for (let index = 0; index < fillScript.script.length; index++) {
+      await this.runFillScriptAction(fillScript.script[index]);
+    }
   }
 
   /**
@@ -115,27 +118,28 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
   /**
    * Runs the autofill action based on the action type and the opid.
    * Each action is subsequently delayed by 20 milliseconds.
-   * @param {"click_on_opid" | "focus_by_opid" | "fill_by_opid"} action
-   * @param {string} opid
-   * @param {string} value
-   * @param {number} actionIndex
+   * @param {FillScript} [action, opid, value]
    * @returns {Promise<void>}
    * @private
    */
-  private runFillScriptAction = (
-    [action, opid, value]: FillScript,
-    actionIndex: number,
-  ): Promise<void> => {
+  private runFillScriptAction = ([action, opid, value]: FillScript): Promise<void> => {
     if (!opid || !this.autofillInsertActions[action]) {
-      return;
+      return Promise.resolve();
     }
 
     const delayActionsInMilliseconds = 20;
     return new Promise((resolve) =>
       setTimeout(() => {
-        this.autofillInsertActions[action]({ opid, value });
+        if (action === FillScriptActionTypes.fill_by_opid && !!value?.length) {
+          this.autofillInsertActions.fill_by_opid({ opid, value });
+        } else if (action === FillScriptActionTypes.click_on_opid) {
+          this.autofillInsertActions.click_on_opid({ opid });
+        } else if (action === FillScriptActionTypes.focus_by_opid) {
+          this.autofillInsertActions.focus_by_opid({ opid });
+        }
+
         resolve();
-      }, delayActionsInMilliseconds * actionIndex),
+      }, delayActionsInMilliseconds),
     );
   };
 
@@ -157,7 +161,10 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
    */
   private handleClickOnFieldByOpidAction(opid: string) {
     const element = this.collectAutofillContentService.getAutofillFieldElementByOpid(opid);
-    this.triggerClickOnElement(element);
+
+    if (element) {
+      this.triggerClickOnElement(element);
+    }
   }
 
   /**
@@ -170,6 +177,10 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
   private handleFocusOnFieldByOpidAction(opid: string) {
     const element = this.collectAutofillContentService.getAutofillFieldElementByOpid(opid);
 
+    if (!element) {
+      return;
+    }
+
     if (document.activeElement === element) {
       element.blur();
     }
@@ -186,13 +197,19 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
    * @private
    */
   private insertValueIntoField(element: FormFieldElement | null, value: string) {
+    if (!element || !value) {
+      return;
+    }
+
     const elementCanBeReadonly =
       elementIsInputElement(element) || elementIsTextAreaElement(element);
     const elementCanBeFilled = elementCanBeReadonly || elementIsSelectElement(element);
+    const elementValue = (element as HTMLInputElement)?.value || element?.innerText || "";
+
+    const elementAlreadyHasTheValue = !!(elementValue?.length && elementValue === value);
 
     if (
-      !element ||
-      !value ||
+      elementAlreadyHasTheValue ||
       (elementCanBeReadonly && element.readOnly) ||
       (elementCanBeFilled && element.disabled)
     ) {
@@ -293,7 +310,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
    * @private
    */
   private triggerClickOnElement(element?: HTMLElement): void {
-    if (typeof element?.click !== TYPE_CHECK.FUNCTION) {
+    if (!element || typeof element.click !== TYPE_CHECK.FUNCTION) {
       return;
     }
 
@@ -308,7 +325,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
    * @private
    */
   private triggerFocusOnElement(element: HTMLElement | undefined, shouldResetValue = false): void {
-    if (typeof element?.focus !== TYPE_CHECK.FUNCTION) {
+    if (!element || typeof element.focus !== TYPE_CHECK.FUNCTION) {
       return;
     }
 
@@ -344,7 +361,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
    * @private
    */
   private simulateUserKeyboardEventInteractions(element: FormFieldElement): void {
-    const simulatedKeyboardEvents = [EVENTS.KEYDOWN, EVENTS.KEYPRESS, EVENTS.KEYUP];
+    const simulatedKeyboardEvents = [EVENTS.KEYDOWN, EVENTS.KEYUP];
     for (let index = 0; index < simulatedKeyboardEvents.length; index++) {
       element.dispatchEvent(new KeyboardEvent(simulatedKeyboardEvents[index], { bubbles: true }));
     }
diff --git a/apps/browser/src/autofill/shared/styles/variables.scss b/apps/browser/src/autofill/shared/styles/variables.scss
index 1e804ed8fd2..f356eb86f3a 100644
--- a/apps/browser/src/autofill/shared/styles/variables.scss
+++ b/apps/browser/src/autofill/shared/styles/variables.scss
@@ -1,6 +1,6 @@
 $dark-icon-themes: "theme_dark";
 
-$font-family-sans-serif: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-sans-serif: Inter, "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-source-code-pro: "Source Code Pro", monospace;
 $font-size-base: 14px;
 
diff --git a/apps/browser/src/autofill/spec/autofill-mocks.ts b/apps/browser/src/autofill/spec/autofill-mocks.ts
index d1e127227c6..423ba3dd0fe 100644
--- a/apps/browser/src/autofill/spec/autofill-mocks.ts
+++ b/apps/browser/src/autofill/spec/autofill-mocks.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { mock } from "jest-mock-extended";
 
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
@@ -144,7 +142,6 @@ export function createAutofillScriptMock(
 
   return {
     autosubmit: null,
-    metadata: {},
     properties: {
       delay_between_operations: 20,
     },
@@ -178,6 +175,7 @@ export function createInitAutofillInlineMenuButtonMessageMock(
     styleSheetUrl: "https://jest-testing-website.com",
     authStatus: AuthenticationStatus.Unlocked,
     portKey: "portKey",
+    token: "test-token",
     ...customFields,
   };
 }
@@ -215,6 +213,7 @@ export function createInitAutofillInlineMenuListMessageMock(
     theme: ThemeTypes.Light,
     authStatus: AuthenticationStatus.Unlocked,
     portKey: "portKey",
+    token: "test-token",
     inlineMenuFillType: CipherType.Login,
     ciphers: [
       createAutofillOverlayCipherDataMock(1, {
@@ -299,7 +298,7 @@ export function createMutationRecordMock(customFields = {}): MutationRecord {
     oldValue: "default-oldValue",
     previousSibling: null,
     removedNodes: mock<NodeList>(),
-    target: null,
+    target: mock<Node>(),
     type: "attributes",
     ...customFields,
   };
diff --git a/apps/browser/src/autofill/spec/testing-utils.ts b/apps/browser/src/autofill/spec/testing-utils.ts
index 0082f022fb6..20416413d25 100644
--- a/apps/browser/src/autofill/spec/testing-utils.ts
+++ b/apps/browser/src/autofill/spec/testing-utils.ts
@@ -1,5 +1,7 @@
 import { mock } from "jest-mock-extended";
 
+import { BrowserApi } from "../../platform/browser/browser-api";
+
 export function triggerTestFailure() {
   expect(true).toBe("Test has failed.");
 }
@@ -11,7 +13,11 @@ export function flushPromises() {
   });
 }
 
-export function postWindowMessage(data: any, origin = "https://localhost/", source = window) {
+export function postWindowMessage(
+  data: any,
+  origin: string = BrowserApi.getRuntimeURL("")?.slice(0, -1),
+  source: Window | MessageEventSource | null = window,
+) {
   globalThis.dispatchEvent(new MessageEvent("message", { data, origin, source }));
 }
 
diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts
index 3e6e86cd3d7..696fd5c4f05 100644
--- a/apps/browser/src/background/commands.background.ts
+++ b/apps/browser/src/background/commands.background.ts
@@ -1,9 +1,13 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { firstValueFrom } from "rxjs";
+
+import { LockService } from "@bitwarden/auth/common";
+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 { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ExtensionCommand, ExtensionCommandType } from "@bitwarden/common/autofill/constants";
-import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 // FIXME (PM-22628): Popup imports are forbidden in background
@@ -21,9 +25,10 @@ export default class CommandsBackground {
   constructor(
     private main: MainBackground,
     private platformUtilsService: PlatformUtilsService,
-    private vaultTimeoutService: VaultTimeoutService,
     private authService: AuthService,
     private generatePasswordToClipboard: () => Promise<void>,
+    private accountService: AccountService,
+    private lockService: LockService,
   ) {
     this.isSafari = this.platformUtilsService.isSafari();
     this.isVivaldi = this.platformUtilsService.isVivaldi();
@@ -72,9 +77,11 @@ export default class CommandsBackground {
       case "open_popup":
         await this.openPopup();
         break;
-      case "lock_vault":
-        await this.vaultTimeoutService.lock();
+      case "lock_vault": {
+        const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+        await this.lockService.lock(activeUserId);
         break;
+      }
       default:
         break;
     }
diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts
index 2de4b48a9c0..66a5604a8ba 100644
--- a/apps/browser/src/background/idle.background.ts
+++ b/apps/browser/src/background/idle.background.ts
@@ -1,5 +1,6 @@
 import { firstValueFrom } from "rxjs";
 
+import { LockService, LogoutService } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import {
   VaultTimeoutAction,
@@ -8,6 +9,7 @@ import {
   VaultTimeoutStringType,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
+import { UserId } from "@bitwarden/user-core";
 
 const IdleInterval = 60 * 5; // 5 minutes
 
@@ -21,6 +23,8 @@ export default class IdleBackground {
     private serverNotificationsService: ServerNotificationsService,
     private accountService: AccountService,
     private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
+    private lockService: LockService,
+    private logoutService: LogoutService,
   ) {
     this.idle = chrome.idle || (browser != null ? browser.idle : null);
   }
@@ -61,9 +65,9 @@ export default class IdleBackground {
                   this.vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$(userId),
                 );
                 if (action === VaultTimeoutAction.LogOut) {
-                  await this.vaultTimeoutService.logOut(userId);
+                  await this.logoutService.logout(userId as UserId, "vaultTimeout");
                 } else {
-                  await this.vaultTimeoutService.lock(userId);
+                  await this.lockService.lock(userId as UserId);
                 }
               }
             }
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 0820f605a0a..78b5e323798 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -20,8 +20,9 @@ import {
   AuthRequestService,
   AuthRequestServiceAbstraction,
   DefaultAuthRequestApiService,
-  DefaultLockService,
+  DefaultLogoutService,
   InternalUserDecryptionOptionsServiceAbstraction,
+  LockService,
   LoginEmailServiceAbstraction,
   LogoutReason,
   UserDecryptionOptionsService,
@@ -98,8 +99,11 @@ import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarde
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/services/key-connector.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { MasterPasswordService } from "@bitwarden/common/key-management/master-password/services/master-password.service";
+import { PinStateService } from "@bitwarden/common/key-management/pin/pin-state.service.implementation";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { PinService } from "@bitwarden/common/key-management/pin/pin.service.implementation";
+import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
+import { DefaultSecurityStateService } from "@bitwarden/common/key-management/security-state/services/security-state.service";
 import { DefaultProcessReloadService } from "@bitwarden/common/key-management/services/default-process-reload.service";
 import {
   DefaultVaultTimeoutSettingsService,
@@ -127,7 +131,7 @@ import {
 } from "@bitwarden/common/platform/abstractions/storage.service";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/platform/abstractions/system.service";
 import { ActionsService } from "@bitwarden/common/platform/actions/actions-service";
-import { IpcService } from "@bitwarden/common/platform/ipc";
+import { IpcService, IpcSessionRepository } from "@bitwarden/common/platform/ipc";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency creation
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
@@ -219,8 +223,10 @@ import {
   UsernameGenerationServiceAbstraction,
 } from "@bitwarden/generator-legacy";
 import {
+  DefaultImportMetadataService,
   ImportApiService,
   ImportApiServiceAbstraction,
+  ImportMetadataServiceAbstraction,
   ImportService,
   ImportServiceAbstraction,
 } from "@bitwarden/importer-core";
@@ -264,6 +270,7 @@ import {
 } from "@bitwarden/vault-export-core";
 
 import { AuthStatusBadgeUpdaterService } from "../auth/services/auth-status-badge-updater.service";
+import { ExtensionLockService } from "../auth/services/extension-lock.service";
 import { OverlayNotificationsBackground as OverlayNotificationsBackgroundInterface } from "../autofill/background/abstractions/overlay-notifications.background";
 import { OverlayBackground as OverlayBackgroundInterface } from "../autofill/background/abstractions/overlay.background";
 import { AutoSubmitLoginBackground } from "../autofill/background/auto-submit-login.background";
@@ -287,6 +294,7 @@ import { AutofillBadgeUpdaterService } from "../autofill/services/autofill-badge
 import AutofillService from "../autofill/services/autofill.service";
 import { InlineMenuFieldQualificationService } from "../autofill/services/inline-menu-field-qualification.service";
 import { SafariApp } from "../browser/safariApp";
+import { PhishingDataService } from "../dirt/phishing-detection/services/phishing-data.service";
 import { PhishingDetectionService } from "../dirt/phishing-detection/services/phishing-detection.service";
 import { BackgroundBrowserBiometricsService } from "../key-management/biometrics/background-browser-biometrics.service";
 import VaultTimeoutService from "../key-management/vault-timeout/vault-timeout.service";
@@ -294,6 +302,7 @@ import { BrowserActionsService } from "../platform/actions/browser-actions.servi
 import { DefaultBadgeBrowserApi } from "../platform/badge/badge-browser-api";
 import { BadgeService } from "../platform/badge/badge.service";
 import { BrowserApi } from "../platform/browser/browser-api";
+import BrowserPopupUtils from "../platform/browser/browser-popup-utils";
 import { flagEnabled } from "../platform/flags";
 import { IpcBackgroundService } from "../platform/ipc/ipc-background.service";
 import { IpcContentScriptManagerService } from "../platform/ipc/ipc-content-script-manager.service";
@@ -312,6 +321,7 @@ import I18nService from "../platform/services/i18n.service";
 import { LocalBackedSessionStorageService } from "../platform/services/local-backed-session-storage.service";
 import { BackgroundPlatformUtilsService } from "../platform/services/platform-utils/background-platform-utils.service";
 import { BrowserPlatformUtilsService } from "../platform/services/platform-utils/browser-platform-utils.service";
+import { PopupRouterCacheBackgroundService } from "../platform/services/popup-router-cache-background.service";
 import { PopupViewCacheBackgroundService } from "../platform/services/popup-view-cache-background.service";
 import { BrowserSdkLoadService } from "../platform/services/sdk/browser-sdk-load.service";
 import { BackgroundTaskSchedulerService } from "../platform/services/task-scheduler/background-task-scheduler.service";
@@ -354,6 +364,7 @@ export default class MainBackground {
   folderService: InternalFolderServiceAbstraction;
   userDecryptionOptionsService: InternalUserDecryptionOptionsServiceAbstraction;
   collectionService: CollectionService;
+  lockService: LockService;
   vaultTimeoutService?: VaultTimeoutService;
   vaultTimeoutSettingsService: VaultTimeoutSettingsService;
   passwordGenerationService: PasswordGenerationServiceAbstraction;
@@ -366,6 +377,7 @@ export default class MainBackground {
   authService: AuthServiceAbstraction;
   loginEmailService: LoginEmailServiceAbstraction;
   importApiService: ImportApiServiceAbstraction;
+  importMetadataService: ImportMetadataServiceAbstraction;
   importService: ImportServiceAbstraction;
   exportApiService: VaultExportApiService;
   exportService: VaultExportServiceAbstraction;
@@ -452,6 +464,7 @@ export default class MainBackground {
   taskService: TaskService;
   cipherEncryptionService: CipherEncryptionService;
   private restrictedItemTypesService: RestrictedItemTypesService;
+  private securityStateService: SecurityStateService;
 
   ipcContentScriptManagerService: IpcContentScriptManagerService;
   ipcService: IpcService;
@@ -479,18 +492,12 @@ export default class MainBackground {
   private nativeMessagingBackground: NativeMessagingBackground;
 
   private popupViewCacheBackgroundService: PopupViewCacheBackgroundService;
+  private popupRouterCacheBackgroundService: PopupRouterCacheBackgroundService;
+
+  // DIRT
+  private phishingDataService: PhishingDataService;
 
   constructor() {
-    // Services
-    const lockedCallback = async (userId: UserId) => {
-      await this.refreshMenu(true);
-      if (this.systemService != null) {
-        await this.systemService.clearPendingClipboard();
-        await this.biometricsService.setShouldAutopromptNow(false);
-        await this.processReloadService.startProcessReload(this.authService);
-      }
-    };
-
     const logoutCallback = async (logoutReason: LogoutReason, userId?: UserId) =>
       await this.logout(logoutReason, userId);
 
@@ -541,7 +548,7 @@ export default class MainBackground {
       this.memoryStorageForStateProviders = new BrowserMemoryStorageService(); // mv3 stores to storage.session
       this.memoryStorageService = this.memoryStorageForStateProviders;
     } else {
-      this.memoryStorageForStateProviders = new BackgroundMemoryStorageService(); // mv2 stores to memory
+      this.memoryStorageForStateProviders = new BackgroundMemoryStorageService(this.logService); // mv2 stores to memory
       this.memoryStorageService = this.memoryStorageForStateProviders;
     }
 
@@ -668,11 +675,16 @@ export default class MainBackground {
       logoutCallback,
     );
 
+    this.securityStateService = new DefaultSecurityStateService(this.stateProvider);
+
     this.popupViewCacheBackgroundService = new PopupViewCacheBackgroundService(
       messageListener,
       this.globalStateProvider,
       this.taskSchedulerService,
     );
+    this.popupRouterCacheBackgroundService = new PopupRouterCacheBackgroundService(
+      this.globalStateProvider,
+    );
 
     this.migrationRunner = new MigrationRunner(
       this.storageService,
@@ -689,9 +701,7 @@ export default class MainBackground {
 
     this.masterPasswordService = new MasterPasswordService(
       this.stateProvider,
-      this.stateService,
       this.keyGenerationService,
-      this.encryptService,
       this.logService,
       this.cryptoFunctionService,
       this.accountService,
@@ -701,18 +711,7 @@ export default class MainBackground {
 
     this.kdfConfigService = new DefaultKdfConfigService(this.stateProvider);
 
-    this.pinService = new PinService(
-      this.accountService,
-      this.cryptoFunctionService,
-      this.encryptService,
-      this.kdfConfigService,
-      this.keyGenerationService,
-      this.logService,
-      this.stateProvider,
-    );
-
     this.keyService = new DefaultKeyService(
-      this.pinService,
       this.masterPasswordService,
       this.keyGenerationService,
       this.cryptoFunctionService,
@@ -725,15 +724,19 @@ export default class MainBackground {
       this.kdfConfigService,
     );
 
+    const pinStateService = new PinStateService(this.stateProvider);
+
     this.appIdService = new AppIdService(this.storageService, this.logService);
 
-    this.userDecryptionOptionsService = new UserDecryptionOptionsService(this.stateProvider);
+    this.userDecryptionOptionsService = new UserDecryptionOptionsService(
+      this.singleUserStateProvider,
+    );
     this.organizationService = new DefaultOrganizationService(this.stateProvider);
     this.policyService = new DefaultPolicyService(this.stateProvider, this.organizationService);
 
     this.vaultTimeoutSettingsService = new DefaultVaultTimeoutSettingsService(
       this.accountService,
-      this.pinService,
+      pinStateService,
       this.userDecryptionOptionsService,
       this.keyService,
       this.tokenService,
@@ -744,15 +747,6 @@ export default class MainBackground {
       VaultTimeoutStringType.OnRestart, // default vault timeout
     );
 
-    this.biometricsService = new BackgroundBrowserBiometricsService(
-      runtimeNativeMessagingBackground,
-      this.logService,
-      this.keyService,
-      this.biometricStateService,
-      this.messagingService,
-      this.vaultTimeoutSettingsService,
-    );
-
     this.apiService = new ApiService(
       this.tokenService,
       this.platformUtilsService,
@@ -830,10 +824,33 @@ export default class MainBackground {
       this.accountService,
       this.kdfConfigService,
       this.keyService,
+      this.securityStateService,
+      this.apiService,
       this.stateProvider,
       this.configService,
     );
 
+    this.pinService = new PinService(
+      this.accountService,
+      this.encryptService,
+      this.kdfConfigService,
+      this.keyGenerationService,
+      this.logService,
+      this.keyService,
+      this.sdkService,
+      pinStateService,
+    );
+
+    this.biometricsService = new BackgroundBrowserBiometricsService(
+      runtimeNativeMessagingBackground,
+      this.logService,
+      this.keyService,
+      this.biometricStateService,
+      this.messagingService,
+      this.vaultTimeoutSettingsService,
+      this.pinService,
+    );
+
     this.passwordStrengthService = new PasswordStrengthService();
 
     this.passwordGenerationService = legacyPasswordGenerationServiceFactory(
@@ -844,8 +861,6 @@ export default class MainBackground {
       this.stateProvider,
     );
 
-    this.userDecryptionOptionsService = new UserDecryptionOptionsService(this.stateProvider);
-
     this.devicesApiService = new DevicesApiServiceImplementation(this.apiService);
     this.deviceTrustService = new DeviceTrustService(
       this.keyGenerationService,
@@ -861,6 +876,7 @@ export default class MainBackground {
       this.userDecryptionOptionsService,
       this.logService,
       this.configService,
+      this.accountService,
     );
 
     this.devicesService = new DevicesServiceImplementation(
@@ -879,6 +895,7 @@ export default class MainBackground {
       this.apiService,
       this.stateProvider,
       this.authRequestApiService,
+      this.accountService,
     );
 
     this.billingAccountProfileStateService = new DefaultBillingAccountProfileStateService(
@@ -908,7 +925,11 @@ export default class MainBackground {
 
     this.userVerificationApiService = new UserVerificationApiService(this.apiService);
 
-    this.domainSettingsService = new DefaultDomainSettingsService(this.stateProvider);
+    this.domainSettingsService = new DefaultDomainSettingsService(
+      this.stateProvider,
+      this.policyService,
+      this.accountService,
+    );
 
     this.themeStateService = new DefaultThemeStateService(this.globalStateProvider);
 
@@ -959,30 +980,11 @@ export default class MainBackground {
       this.restrictedItemTypesService,
     );
 
-    this.vaultTimeoutService = new VaultTimeoutService(
-      this.accountService,
-      this.masterPasswordService,
-      this.cipherService,
-      this.folderService,
-      this.collectionService,
-      this.platformUtilsService,
-      this.messagingService,
-      this.searchService,
-      this.stateService,
-      this.tokenService,
-      this.authService,
-      this.vaultTimeoutSettingsService,
-      this.stateEventRunnerService,
-      this.taskSchedulerService,
-      this.logService,
-      this.biometricsService,
-      lockedCallback,
-      logoutCallback,
-    );
     this.containerService = new ContainerService(this.keyService, this.encryptService);
 
     this.sendStateProvider = new SendStateProvider(this.stateProvider);
     this.sendService = new SendService(
+      this.accountService,
       this.keyService,
       this.i18nService,
       this.keyGenerationService,
@@ -998,7 +1000,6 @@ export default class MainBackground {
     this.avatarService = new AvatarService(this.apiService, this.stateProvider);
 
     this.providerService = new ProviderService(this.stateProvider);
-
     this.syncService = new DefaultSyncService(
       this.masterPasswordService,
       this.accountService,
@@ -1024,6 +1025,8 @@ export default class MainBackground {
       this.tokenService,
       this.authService,
       this.stateProvider,
+      this.securityStateService,
+      this.kdfConfigService,
     );
 
     this.syncServiceListener = new SyncServiceListener(
@@ -1079,6 +1082,18 @@ export default class MainBackground {
 
     this.importApiService = new ImportApiService(this.apiService);
 
+    this.importMetadataService = new DefaultImportMetadataService(
+      createSystemServiceProvider(
+        new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
+        this.stateProvider,
+        this.policyService,
+        buildExtensionRegistry(),
+        this.logService,
+        this.platformUtilsService,
+        this.configService,
+      ),
+    );
+
     this.importService = new ImportService(
       this.cipherService,
       this.folderService,
@@ -1090,15 +1105,6 @@ export default class MainBackground {
       this.pinService,
       this.accountService,
       this.restrictedItemTypesService,
-      createSystemServiceProvider(
-        new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
-        this.stateProvider,
-        this.policyService,
-        buildExtensionRegistry(),
-        this.logService,
-        this.platformUtilsService,
-        this.configService,
-      ),
     );
 
     this.individualVaultExportService = new IndividualVaultExportService(
@@ -1185,7 +1191,7 @@ export default class MainBackground {
       logoutCallback,
       this.messagingService,
       this.accountService,
-      new SignalRConnectionService(this.apiService, this.logService),
+      new SignalRConnectionService(this.apiService, this.logService, this.platformUtilsService),
       this.authService,
       this.webPushConnectionService,
       this.authRequestAnsweringService,
@@ -1214,6 +1220,12 @@ export default class MainBackground {
 
     const systemUtilsServiceReloadCallback = async () => {
       await this.taskSchedulerService.clearAllScheduledTasks();
+
+      // Close browser action popup before reloading to prevent zombie popup with invalidated context.
+      // The 'reloadProcess' message is sent by ProcessReloadService before this callback runs,
+      // and popups will close themselves upon receiving it. Poll to verify popup is actually closed.
+      await BrowserPopupUtils.waitForAllPopupsClose();
+
       BrowserApi.reloadExtension();
     };
 
@@ -1231,6 +1243,7 @@ export default class MainBackground {
       this.biometricStateService,
       this.accountService,
       this.logService,
+      this.authService,
     );
 
     // Background
@@ -1244,7 +1257,36 @@ export default class MainBackground {
       this.authService,
     );
 
-    const lockService = new DefaultLockService(this.accountService, this.vaultTimeoutService);
+    const logoutService = new DefaultLogoutService(this.messagingService);
+    this.lockService = new ExtensionLockService(
+      this.accountService,
+      this.biometricsService,
+      this.vaultTimeoutSettingsService,
+      logoutService,
+      this.messagingService,
+      this.searchService,
+      this.folderService,
+      this.masterPasswordService,
+      this.stateEventRunnerService,
+      this.cipherService,
+      this.authService,
+      this.systemService,
+      this.processReloadService,
+      this.logService,
+      this.keyService,
+      this,
+    );
+
+    this.vaultTimeoutService = new VaultTimeoutService(
+      this.accountService,
+      this.platformUtilsService,
+      this.authService,
+      this.vaultTimeoutSettingsService,
+      this.taskSchedulerService,
+      this.logService,
+      this.lockService,
+      logoutService,
+    );
 
     this.runtimeBackground = new RuntimeBackground(
       this,
@@ -1258,7 +1300,7 @@ export default class MainBackground {
       this.configService,
       messageListener,
       this.accountService,
-      lockService,
+      this.lockService,
       this.billingAccountProfileStateService,
       this.browserInitialInstallService,
     );
@@ -1278,9 +1320,10 @@ export default class MainBackground {
     this.commandsBackground = new CommandsBackground(
       this,
       this.platformUtilsService,
-      this.vaultTimeoutService,
       this.authService,
       () => this.generatePasswordToClipboard(),
+      this.accountService,
+      this.lockService,
     );
 
     this.taskService = new DefaultTaskService(
@@ -1365,6 +1408,8 @@ export default class MainBackground {
       this.serverNotificationsService,
       this.accountService,
       this.vaultTimeoutSettingsService,
+      this.lockService,
+      logoutService,
     );
 
     this.usernameGenerationService = legacyUsernameGenerationServiceFactory(
@@ -1414,17 +1459,30 @@ export default class MainBackground {
 
     this.inlineMenuFieldQualificationService = new InlineMenuFieldQualificationService();
 
-    PhishingDetectionService.initialize(
-      this.configService,
-      this.auditService,
-      this.logService,
-      this.storageService,
+    this.phishingDataService = new PhishingDataService(
+      this.apiService,
       this.taskSchedulerService,
-      this.eventCollectionService,
+      this.globalStateProvider,
+      this.logService,
+      this.platformUtilsService,
+    );
+
+    PhishingDetectionService.initialize(
+      this.accountService,
+      this.billingAccountProfileStateService,
+      this.configService,
+      this.logService,
+      this.phishingDataService,
+      messageListener,
     );
 
     this.ipcContentScriptManagerService = new IpcContentScriptManagerService(this.configService);
-    this.ipcService = new IpcBackgroundService(this.platformUtilsService, this.logService);
+    const ipcSessionRepository = new IpcSessionRepository(this.stateProvider);
+    this.ipcService = new IpcBackgroundService(
+      this.platformUtilsService,
+      this.logService,
+      ipcSessionRepository,
+    );
 
     this.endUserNotificationService = new DefaultEndUserNotificationService(
       this.stateProvider,
@@ -1435,7 +1493,6 @@ export default class MainBackground {
     );
 
     this.badgeService = new BadgeService(
-      this.stateProvider,
       new DefaultBadgeBrowserApi(this.platformUtilsService),
       this.logService,
     );
@@ -1461,6 +1518,7 @@ export default class MainBackground {
     await this.sdkLoadService.loadAndInit();
     // Only the "true" background should run migrations
     await this.migrationRunner.run();
+    this.encryptService.init(this.configService);
 
     // This is here instead of in the InitService b/c we don't plan for
     // side effects to run in the Browser InitService.
@@ -1481,6 +1539,7 @@ export default class MainBackground {
     (this.eventUploadService as EventUploadService).init(true);
 
     this.popupViewCacheBackgroundService.startObservingMessages();
+    this.popupRouterCacheBackgroundService.init();
 
     await this.vaultTimeoutService.init(true);
     this.fido2Background.init();
@@ -1664,11 +1723,10 @@ export default class MainBackground {
     await Promise.all([
       this.keyService.clearKeys(userBeingLoggedOut),
       this.cipherService.clear(userBeingLoggedOut),
-      // ! DO NOT REMOVE folderService.clear ! For more information see PM-25660
       this.folderService.clear(userBeingLoggedOut),
-      this.vaultTimeoutSettingsService.clear(userBeingLoggedOut),
       this.biometricStateService.logout(userBeingLoggedOut),
       this.popupViewCacheBackgroundService.clearState(),
+      this.pinService.logout(userBeingLoggedOut),
       /* We intentionally do not clear:
        *  - autofillSettingsService
        *  - badgeSettingsService
@@ -1704,7 +1762,7 @@ export default class MainBackground {
     }
     await this.mainContextMenuHandler?.noAccess();
     await this.systemService.clearPendingClipboard();
-    await this.processReloadService.startProcessReload(this.authService);
+    await this.processReloadService.startProcessReload();
   }
 
   private async needsStorageReseed(userId: UserId): Promise<boolean> {
@@ -1925,7 +1983,6 @@ export default class MainBackground {
       this.badgeService,
       this.accountService,
       this.cipherService,
-      this.logService,
       this.taskService,
     );
 
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index d7aef0db375..597babdc777 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -145,6 +145,7 @@ export default class RuntimeBackground {
             if (totpCode != null) {
               this.platformUtilsService.copyToClipboard(totpCode);
             }
+            await this.main.updateOverlayCiphers();
             break;
           }
           case ExtensionCommand.AutofillCard: {
@@ -255,8 +256,11 @@ export default class RuntimeBackground {
       case "addToLockedVaultPendingNotifications":
         this.lockedVaultPendingNotifications.push(msg.data);
         break;
+      case "abandonAutofillPendingNotifications":
+        this.lockedVaultPendingNotifications = [];
+        break;
       case "lockVault":
-        await this.main.vaultTimeoutService.lock(msg.userId);
+        await this.lockService.lock(msg.userId);
         break;
       case "lockAll":
         {
@@ -264,6 +268,14 @@ export default class RuntimeBackground {
           this.messagingService.send("lockAllFinished", { requestId: msg.requestId });
         }
         break;
+      case "lockUser":
+        {
+          await this.lockService.lock(msg.userId);
+          this.messagingService.send("lockUserFinished", {
+            requestId: msg.requestId,
+          });
+        }
+        break;
       case "logout":
         await this.main.logout(msg.expired, msg.userId);
         break;
@@ -281,14 +293,24 @@ export default class RuntimeBackground {
       case "openPopup":
         await this.openPopup();
         break;
-      case VaultMessages.OpenAtRiskPasswords:
+      case VaultMessages.OpenAtRiskPasswords: {
+        if (await this.shouldRejectManyOriginMessage(msg)) {
+          return;
+        }
+
         await this.main.openAtRisksPasswordsPage();
         this.announcePopupOpen();
         break;
-      case VaultMessages.OpenBrowserExtensionToUrl:
+      }
+      case VaultMessages.OpenBrowserExtensionToUrl: {
+        if (await this.shouldRejectManyOriginMessage(msg)) {
+          return;
+        }
+
         await this.main.openTheExtensionToPage(msg.url);
         this.announcePopupOpen();
         break;
+      }
       case "bgUpdateContextMenu":
       case "editedCipher":
       case "addedCipher":
@@ -300,10 +322,7 @@ export default class RuntimeBackground {
         break;
       }
       case "authResult": {
-        const env = await firstValueFrom(this.environmentService.environment$);
-        const vaultUrl = env.getWebVaultUrl();
-
-        if (msg.referrer == null || Utils.getHostname(vaultUrl) !== msg.referrer) {
+        if (!(await this.isValidVaultReferrer(msg.referrer))) {
           return;
         }
 
@@ -322,10 +341,7 @@ export default class RuntimeBackground {
         break;
       }
       case "webAuthnResult": {
-        const env = await firstValueFrom(this.environmentService.environment$);
-        const vaultUrl = env.getWebVaultUrl();
-
-        if (msg.referrer == null || Utils.getHostname(vaultUrl) !== msg.referrer) {
+        if (!(await this.isValidVaultReferrer(msg.referrer))) {
           return;
         }
 
@@ -360,6 +376,48 @@ export default class RuntimeBackground {
     }
   }
 
+  /**
+   * For messages that can originate from a vault host page or extension, validate referrer or external
+   *
+   * @param message
+   * @returns true if message fails validation
+   */
+  private async shouldRejectManyOriginMessage(message: {
+    webExtSender: chrome.runtime.MessageSender;
+  }): Promise<boolean> {
+    const isValidVaultReferrer = await this.isValidVaultReferrer(
+      Utils.getHostname(message?.webExtSender?.origin),
+    );
+
+    if (isValidVaultReferrer) {
+      return false;
+    }
+
+    return isExternalMessage(message);
+  }
+
+  /**
+   * Validates a message's referrer matches the configured web vault hostname.
+   *
+   * @param referrer - hostname from message source
+   * @returns true if referrer matches web vault
+   */
+  private async isValidVaultReferrer(referrer: string | null | undefined): Promise<boolean> {
+    if (!referrer) {
+      return false;
+    }
+
+    const env = await firstValueFrom(this.environmentService.environment$);
+    const vaultUrl = env.getWebVaultUrl();
+    const vaultHostname = Utils.getHostname(vaultUrl);
+
+    if (!vaultHostname) {
+      return false;
+    }
+
+    return vaultHostname === referrer;
+  }
+
   private async autofillPage(tabToAutoFill: chrome.tabs.Tab) {
     const totpCode = await this.autofillService.doAutoFill({
       tab: tabToAutoFill,
diff --git a/apps/browser/src/billing/popup/settings/premium-v2.component.html b/apps/browser/src/billing/popup/settings/premium-v2.component.html
index 4f87a0f6781..47d72751af3 100644
--- a/apps/browser/src/billing/popup/settings/premium-v2.component.html
+++ b/apps/browser/src/billing/popup/settings/premium-v2.component.html
@@ -6,7 +6,7 @@
   </popup-header>
 
   <div class="tw-flex tw-flex-col tw-p-2">
-    <h2 class="tw-font-bold">{{ "premiumFeatures" | i18n }}</h2>
+    <h2 class="tw-font-medium">{{ "premiumFeatures" | i18n }}</h2>
     <bit-section>
       <bit-card>
         <div class="tw-flex tw-flex-col tw-p-2">
diff --git a/apps/browser/src/billing/popup/settings/premium-v2.component.ts b/apps/browser/src/billing/popup/settings/premium-v2.component.ts
index fde44688349..b858b74242d 100644
--- a/apps/browser/src/billing/popup/settings/premium-v2.component.ts
+++ b/apps/browser/src/billing/popup/settings/premium-v2.component.ts
@@ -26,6 +26,8 @@ import { PopOutComponent } from "../../../platform/popup/components/pop-out.comp
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-premium",
   templateUrl: "premium-v2.component.html",
diff --git a/apps/browser/src/dirt/phishing-detection/pages/learn-more-component.html b/apps/browser/src/dirt/phishing-detection/pages/learn-more-component.html
deleted file mode 100644
index 5ea79c3f840..00000000000
--- a/apps/browser/src/dirt/phishing-detection/pages/learn-more-component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<span>{{ "phishingPageLearnWhy"| i18n}}</span>
-<a href="http://bitwarden.com/help/phishing-blocked/" bitLink block buttonType="primary">
-  {{ "learnMore" | i18n }}
-</a>
diff --git a/apps/browser/src/dirt/phishing-detection/pages/learn-more-component.ts b/apps/browser/src/dirt/phishing-detection/pages/learn-more-component.ts
deleted file mode 100644
index 1a1e6059204..00000000000
--- a/apps/browser/src/dirt/phishing-detection/pages/learn-more-component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { CommonModule } from "@angular/common";
-// eslint-disable-next-line no-restricted-imports
-import { Component } from "@angular/core";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ButtonModule } from "@bitwarden/components";
-
-@Component({
-  standalone: true,
-  templateUrl: "learn-more-component.html",
-  imports: [CommonModule, CommonModule, JslibModule, ButtonModule],
-})
-export class LearnMoreComponent {
-  constructor() {}
-}
diff --git a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.html b/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.html
deleted file mode 100644
index f6e3baf8766..00000000000
--- a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="tw-flex tw-flex-col tw-gap-2">
-  <bit-form-field>
-    <bit-label>{{ "phishingPageTitle" | i18n }}</bit-label>
-    <input bitInput disabled type="text" [value]="phishingHost" />
-  </bit-form-field>
-
-  <button type="button" (click)="closeTab()" bitButton buttonType="primary">
-    {{ "phishingPageCloseTab" | i18n }}
-  </button>
-  <button type="button" (click)="continueAnyway()" bitButton buttonType="danger">
-    {{ "phishingPageContinue" | i18n }}
-  </button>
-</div>
diff --git a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.ts b/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.ts
deleted file mode 100644
index dc6ab2d329e..00000000000
--- a/apps/browser/src/dirt/phishing-detection/pages/phishing-warning.component.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { CommonModule } from "@angular/common";
-// eslint-disable-next-line no-restricted-imports
-import { Component, OnDestroy } from "@angular/core";
-// eslint-disable-next-line no-restricted-imports
-import { ActivatedRoute, RouterModule } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import {
-  AsyncActionsModule,
-  ButtonModule,
-  CheckboxModule,
-  FormFieldModule,
-  IconModule,
-  LinkModule,
-} from "@bitwarden/components";
-
-import { PhishingDetectionService } from "../services/phishing-detection.service";
-
-@Component({
-  standalone: true,
-  templateUrl: "phishing-warning.component.html",
-  imports: [
-    CommonModule,
-    IconModule,
-    JslibModule,
-    LinkModule,
-    FormFieldModule,
-    AsyncActionsModule,
-    CheckboxModule,
-    ButtonModule,
-    RouterModule,
-  ],
-})
-export class PhishingWarning implements OnDestroy {
-  phishingHost = "";
-
-  private destroy$ = new Subject<void>();
-
-  constructor(private activatedRoute: ActivatedRoute) {
-    this.activatedRoute.queryParamMap.pipe(takeUntil(this.destroy$)).subscribe((params) => {
-      this.phishingHost = params.get("phishingHost") || "";
-    });
-  }
-
-  async closeTab() {
-    await PhishingDetectionService.requestClosePhishingWarningPage();
-  }
-  async continueAnyway() {
-    await PhishingDetectionService.requestContinueToDangerousUrl();
-  }
-
-  ngOnDestroy(): void {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-}
diff --git a/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.html b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.html
new file mode 100644
index 00000000000..7675add73d7
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.html
@@ -0,0 +1,46 @@
+<div class="tw-flex tw-flex-col">
+  <div class="tw-flex tw-gap-4 tw-items-baseline">
+    <bit-icon-tile size="large" icon="bwi-exclamation-triangle" variant="danger"></bit-icon-tile>
+    <h1 bitTypography="h2" noMargin class="!tw-mb-0">{{ "phishingPageTitleV2" | i18n }}</h1>
+  </div>
+
+  <hr class="!tw-mt-6 !tw-mb-4 !tw-border-secondary-100" />
+
+  <p bitTypography="body1">{{ "phishingPageSummary" | i18n }}</p>
+
+  <bit-callout class="tw-mb-0" type="danger" icon="bwi-globe" [title]="null">
+    <span class="tw-font-mono tw-break-all">{{ phishingHostname$ | async }}</span>
+  </bit-callout>
+
+  <bit-callout class="tw-mt-2" [icon]="null" type="default">
+    <p bitTypography="body2">
+      {{ "phishingPageExplanation1" | i18n }}<b>Phishing.Database</b
+      >{{ "phishingPageExplanation2" | i18n }}
+    </p>
+
+    <a
+      bitLink
+      linkType="primary"
+      rel="noreferrer"
+      target="_blank"
+      href="https://bitwarden.com/help/phishing-blocked/"
+    >
+      {{ "phishingPageLearnMore" | i18n }}<i class="bwi bwi-angle-right" aria-hidden="true"></i>
+    </a>
+  </bit-callout>
+
+  <div class="tw-flex tw-flex-col tw-gap-4 tw-items-center tw-mt-2">
+    <button type="button" (click)="closeTab()" bitButton buttonType="primary" [block]="true">
+      {{ "phishingPageCloseTabV2" | i18n }}
+    </button>
+    <button
+      class="tw-text-sm"
+      type="button"
+      (click)="continueAnyway()"
+      bitLink
+      linkType="secondary"
+    >
+      {{ "phishingPageContinueV2" | i18n }}
+    </button>
+  </div>
+</div>
diff --git a/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.ts b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.ts
new file mode 100644
index 00000000000..d8e9895237c
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.component.ts
@@ -0,0 +1,76 @@
+import { CommonModule } from "@angular/common";
+import { Component, inject } from "@angular/core";
+import { ActivatedRoute, RouterModule } from "@angular/router";
+import { firstValueFrom, map } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { BrowserApi } from "@bitwarden/browser/platform/browser/browser-api";
+import {
+  AsyncActionsModule,
+  ButtonModule,
+  CheckboxModule,
+  FormFieldModule,
+  IconModule,
+  IconTileComponent,
+  LinkModule,
+  CalloutComponent,
+  TypographyModule,
+} from "@bitwarden/components";
+import { MessageSender } from "@bitwarden/messaging";
+
+import {
+  PHISHING_DETECTION_CANCEL_COMMAND,
+  PHISHING_DETECTION_CONTINUE_COMMAND,
+} from "../services/phishing-detection.service";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "dirt-phishing-warning",
+  standalone: true,
+  templateUrl: "phishing-warning.component.html",
+  imports: [
+    CommonModule,
+    IconModule,
+    JslibModule,
+    LinkModule,
+    FormFieldModule,
+    AsyncActionsModule,
+    CheckboxModule,
+    ButtonModule,
+    RouterModule,
+    IconTileComponent,
+    CalloutComponent,
+    TypographyModule,
+  ],
+})
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
+export class PhishingWarning {
+  private activatedRoute = inject(ActivatedRoute);
+  private messageSender = inject(MessageSender);
+
+  private phishingUrl$ = this.activatedRoute.queryParamMap.pipe(
+    map((params) => params.get("phishingUrl") || ""),
+  );
+  protected phishingHostname$ = this.phishingUrl$.pipe(map((url) => new URL(url).hostname));
+
+  async closeTab() {
+    const tabId = await this.getTabId();
+    this.messageSender.send(PHISHING_DETECTION_CANCEL_COMMAND, {
+      tabId,
+    });
+  }
+  async continueAnyway() {
+    const url = await firstValueFrom(this.phishingUrl$);
+    const tabId = await this.getTabId();
+    this.messageSender.send(PHISHING_DETECTION_CONTINUE_COMMAND, {
+      tabId,
+      url,
+    });
+  }
+
+  private async getTabId() {
+    return BrowserApi.getCurrentTab()?.then((tab) => tab.id);
+  }
+}
diff --git a/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.stories.ts b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.stories.ts
new file mode 100644
index 00000000000..32b3c102c36
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/popup/phishing-warning.stories.ts
@@ -0,0 +1,130 @@
+import { ActivatedRoute, RouterModule } from "@angular/router";
+import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+import { BehaviorSubject, of } from "rxjs";
+
+import { DeactivatedOrg } from "@bitwarden/assets/svg";
+import { ClientType } from "@bitwarden/common/enums";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { AnonLayoutComponent, I18nMockService } from "@bitwarden/components";
+import { MessageSender } from "@bitwarden/messaging";
+
+import { PhishingWarning } from "./phishing-warning.component";
+import { ProtectedByComponent } from "./protected-by-component";
+
+class MockPlatformUtilsService implements Partial<PlatformUtilsService> {
+  getApplicationVersion = () => Promise.resolve("Version 2024.1.1");
+  getClientType = () => ClientType.Web;
+}
+
+/**
+ * Helper function to create ActivatedRoute mock with query parameters
+ */
+function mockActivatedRoute(queryParams: Record<string, string>) {
+  return {
+    provide: ActivatedRoute,
+    useValue: {
+      queryParamMap: of({
+        get: (key: string) => queryParams[key] || null,
+      }),
+      queryParams: of(queryParams),
+    },
+  };
+}
+
+type StoryArgs = {
+  phishingHost: string;
+};
+
+export default {
+  title: "Browser/DIRT/Phishing Warning",
+  component: PhishingWarning,
+  decorators: [
+    moduleMetadata({
+      imports: [AnonLayoutComponent, ProtectedByComponent, RouterModule],
+      providers: [
+        {
+          provide: PlatformUtilsService,
+          useClass: MockPlatformUtilsService,
+        },
+        {
+          provide: MessageSender,
+          useValue: {
+            // eslint-disable-next-line no-console
+            send: (...args: any[]) => console.debug("MessageSender called with:", args),
+          } as Partial<MessageSender>,
+        },
+        {
+          provide: I18nService,
+          useFactory: () =>
+            new I18nMockService({
+              accessing: "Accessing",
+              appLogoLabel: "Bitwarden logo",
+              phishingPageTitleV2: "Phishing attempt detected",
+              phishingPageCloseTabV2: "Close this tab",
+              phishingPageSummary:
+                "The site you are attempting to visit is a known malicious site and a security risk.",
+              phishingPageContinueV2: "Continue to this site (not recommended)",
+              phishingPageExplanation1: "This site was found in ",
+              phishingPageExplanation2:
+                ", an open-source list of known phishing sites used for stealing personal and sensitive information.",
+              phishingPageLearnMore: "Learn more about phishing detection",
+              protectedBy: (product) => `Protected by ${product}`,
+              learnMore: "Learn more",
+              danger: "error",
+            }),
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {
+            environment$: new BehaviorSubject({
+              getHostname() {
+                return "bitwarden.com";
+              },
+            }).asObservable(),
+          },
+        },
+        mockActivatedRoute({ phishingUrl: "http://malicious-example.com" }),
+      ],
+    }),
+  ],
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <auth-anon-layout
+        [icon]="null"
+        [hideBackgroundIllustration]="true"
+      >
+        <dirt-phishing-warning></dirt-phishing-warning>
+        <dirt-phishing-protected-by slot="secondary"></dirt-phishing-protected-by>
+      </auth-anon-layout>
+    `,
+  }),
+  args: {
+    pageIcon: DeactivatedOrg,
+  },
+} satisfies Meta<StoryArgs & { pageIcon: any }>;
+
+type Story = StoryObj<StoryArgs & { pageIcon: any }>;
+
+export const Default: Story = {
+  decorators: [
+    moduleMetadata({
+      providers: [mockActivatedRoute({ phishingUrl: "http://malicious-example.com" })],
+    }),
+  ],
+};
+
+export const LongHostname: Story = {
+  decorators: [
+    moduleMetadata({
+      providers: [
+        mockActivatedRoute({
+          phishingUrl:
+            "http://verylongsuspiciousphishingdomainnamethatmightwrapmaliciousexample.com",
+        }),
+      ],
+    }),
+  ],
+};
diff --git a/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.html b/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.html
new file mode 100644
index 00000000000..6c55097ade3
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.html
@@ -0,0 +1 @@
+<span class="tw-text-muted">{{ "protectedBy" | i18n: "Bitwarden phishing blocker" }}</span>
diff --git a/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.ts b/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.ts
new file mode 100644
index 00000000000..8da916af5e6
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/popup/protected-by-component.ts
@@ -0,0 +1,15 @@
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { ButtonModule, LinkModule } from "@bitwarden/components";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "dirt-phishing-protected-by",
+  standalone: true,
+  templateUrl: "protected-by-component.html",
+  imports: [CommonModule, CommonModule, JslibModule, ButtonModule, LinkModule],
+})
+export class ProtectedByComponent {}
diff --git a/apps/browser/src/dirt/phishing-detection/services/phishing-data.service.spec.ts b/apps/browser/src/dirt/phishing-detection/services/phishing-data.service.spec.ts
new file mode 100644
index 00000000000..94f3e99f8be
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/services/phishing-data.service.spec.ts
@@ -0,0 +1,158 @@
+import { MockProxy, mock } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  DefaultTaskSchedulerService,
+  TaskSchedulerService,
+} from "@bitwarden/common/platform/scheduling";
+import { FakeGlobalStateProvider } from "@bitwarden/common/spec";
+import { LogService } from "@bitwarden/logging";
+
+import { PhishingDataService, PhishingData, PHISHING_DOMAINS_KEY } from "./phishing-data.service";
+
+describe("PhishingDataService", () => {
+  let service: PhishingDataService;
+  let apiService: MockProxy<ApiService>;
+  let taskSchedulerService: TaskSchedulerService;
+  let logService: MockProxy<LogService>;
+  let platformUtilsService: MockProxy<PlatformUtilsService>;
+  const stateProvider: FakeGlobalStateProvider = new FakeGlobalStateProvider();
+
+  const setMockState = (state: PhishingData) => {
+    stateProvider.getFake(PHISHING_DOMAINS_KEY).stateSubject.next(state);
+    return state;
+  };
+
+  let fetchChecksumSpy: jest.SpyInstance;
+  let fetchDomainsSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    apiService = mock<ApiService>();
+    logService = mock<LogService>();
+
+    platformUtilsService = mock<PlatformUtilsService>();
+    platformUtilsService.getApplicationVersion.mockResolvedValue("1.0.0");
+
+    taskSchedulerService = new DefaultTaskSchedulerService(logService);
+
+    service = new PhishingDataService(
+      apiService,
+      taskSchedulerService,
+      stateProvider,
+      logService,
+      platformUtilsService,
+    );
+
+    fetchChecksumSpy = jest.spyOn(service as any, "fetchPhishingDomainsChecksum");
+    fetchDomainsSpy = jest.spyOn(service as any, "fetchPhishingDomains");
+  });
+
+  describe("isPhishingDomains", () => {
+    it("should detect a phishing domain", async () => {
+      setMockState({
+        domains: ["phish.com", "badguy.net"],
+        timestamp: Date.now(),
+        checksum: "abc123",
+        applicationVersion: "1.0.0",
+      });
+      const url = new URL("http://phish.com");
+      const result = await service.isPhishingDomain(url);
+      expect(result).toBe(true);
+    });
+
+    it("should not detect a safe domain", async () => {
+      setMockState({
+        domains: ["phish.com", "badguy.net"],
+        timestamp: Date.now(),
+        checksum: "abc123",
+        applicationVersion: "1.0.0",
+      });
+      const url = new URL("http://safe.com");
+      const result = await service.isPhishingDomain(url);
+      expect(result).toBe(false);
+    });
+
+    it("should match against root domain", async () => {
+      setMockState({
+        domains: ["phish.com", "badguy.net"],
+        timestamp: Date.now(),
+        checksum: "abc123",
+        applicationVersion: "1.0.0",
+      });
+      const url = new URL("http://phish.com/about");
+      const result = await service.isPhishingDomain(url);
+      expect(result).toBe(true);
+    });
+
+    it("should not error on empty state", async () => {
+      setMockState(undefined as any);
+      const url = new URL("http://phish.com/about");
+      const result = await service.isPhishingDomain(url);
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("getNextDomains", () => {
+    it("refetches all domains if applicationVersion has changed", async () => {
+      const prev: PhishingData = {
+        domains: ["a.com"],
+        timestamp: Date.now() - 60000,
+        checksum: "old",
+        applicationVersion: "1.0.0",
+      };
+      fetchChecksumSpy.mockResolvedValue("new");
+      fetchDomainsSpy.mockResolvedValue(["d.com", "e.com"]);
+      platformUtilsService.getApplicationVersion.mockResolvedValue("2.0.0");
+
+      const result = await service.getNextDomains(prev);
+
+      expect(result!.domains).toEqual(["d.com", "e.com"]);
+      expect(result!.checksum).toBe("new");
+      expect(result!.applicationVersion).toBe("2.0.0");
+    });
+
+    it("only updates timestamp if checksum matches", async () => {
+      const prev: PhishingData = {
+        domains: ["a.com"],
+        timestamp: Date.now() - 60000,
+        checksum: "abc",
+        applicationVersion: "1.0.0",
+      };
+      fetchChecksumSpy.mockResolvedValue("abc");
+      const result = await service.getNextDomains(prev);
+      expect(result!.domains).toEqual(prev.domains);
+      expect(result!.checksum).toBe("abc");
+      expect(result!.timestamp).not.toBe(prev.timestamp);
+    });
+
+    it("patches daily domains if cache is fresh", async () => {
+      const prev: PhishingData = {
+        domains: ["a.com"],
+        timestamp: Date.now() - 60000,
+        checksum: "old",
+        applicationVersion: "1.0.0",
+      };
+      fetchChecksumSpy.mockResolvedValue("new");
+      fetchDomainsSpy.mockResolvedValue(["b.com", "c.com"]);
+      const result = await service.getNextDomains(prev);
+      expect(result!.domains).toEqual(["a.com", "b.com", "c.com"]);
+      expect(result!.checksum).toBe("new");
+    });
+
+    it("fetches all domains if cache is old", async () => {
+      const prev: PhishingData = {
+        domains: ["a.com"],
+        timestamp: Date.now() - 2 * 24 * 60 * 60 * 1000,
+        checksum: "old",
+        applicationVersion: "1.0.0",
+      };
+      fetchChecksumSpy.mockResolvedValue("new");
+      fetchDomainsSpy.mockResolvedValue(["d.com", "e.com"]);
+      const result = await service.getNextDomains(prev);
+      expect(result!.domains).toEqual(["d.com", "e.com"]);
+      expect(result!.checksum).toBe("new");
+    });
+  });
+});
diff --git a/apps/browser/src/dirt/phishing-detection/services/phishing-data.service.ts b/apps/browser/src/dirt/phishing-detection/services/phishing-data.service.ts
new file mode 100644
index 00000000000..6e1bf07c647
--- /dev/null
+++ b/apps/browser/src/dirt/phishing-detection/services/phishing-data.service.ts
@@ -0,0 +1,223 @@
+import {
+  catchError,
+  EMPTY,
+  first,
+  firstValueFrom,
+  map,
+  retry,
+  share,
+  startWith,
+  Subject,
+  switchMap,
+  tap,
+  timer,
+} from "rxjs";
+
+import { devFlagEnabled, devFlagValue } from "@bitwarden/browser/platform/flags";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ScheduledTaskNames, TaskSchedulerService } from "@bitwarden/common/platform/scheduling";
+import { LogService } from "@bitwarden/logging";
+import { GlobalStateProvider, KeyDefinition, PHISHING_DETECTION_DISK } from "@bitwarden/state";
+
+export type PhishingData = {
+  domains: string[];
+  timestamp: number;
+  checksum: string;
+
+  /**
+   * We store the application version to refetch the entire dataset on a new client release.
+   * This counteracts daily appends updates not removing inactive or false positive domains.
+   */
+  applicationVersion: string;
+};
+
+export const PHISHING_DOMAINS_KEY = new KeyDefinition<PhishingData>(
+  PHISHING_DETECTION_DISK,
+  "phishingDomains",
+  {
+    deserializer: (value: PhishingData) =>
+      value ?? { domains: [], timestamp: 0, checksum: "", applicationVersion: "" },
+  },
+);
+
+/** Coordinates fetching, caching, and patching of known phishing domains */
+export class PhishingDataService {
+  private static readonly RemotePhishingDatabaseUrl =
+    "https://raw.githubusercontent.com/Phishing-Database/Phishing.Database/master/phishing-domains-ACTIVE.txt";
+  private static readonly RemotePhishingDatabaseChecksumUrl =
+    "https://raw.githubusercontent.com/Phishing-Database/checksums/refs/heads/master/phishing-domains-ACTIVE.txt.md5";
+  private static readonly RemotePhishingDatabaseTodayUrl =
+    "https://raw.githubusercontent.com/Phishing-Database/Phishing.Database/refs/heads/master/phishing-domains-NEW-today.txt";
+
+  private _testDomains = this.getTestDomains();
+  private _cachedState = this.globalStateProvider.get(PHISHING_DOMAINS_KEY);
+  private _domains$ = this._cachedState.state$.pipe(
+    map(
+      (state) =>
+        new Set(
+          (state?.domains?.filter((line) => line.trim().length > 0) ?? []).concat(
+            this._testDomains,
+            "phishing.testcategory.com", // Included for QA to test in prod
+          ),
+        ),
+    ),
+  );
+
+  // How often are new domains added to the remote?
+  readonly UPDATE_INTERVAL_DURATION = 24 * 60 * 60 * 1000; // 24 hours
+
+  private _triggerUpdate$ = new Subject<void>();
+  update$ = this._triggerUpdate$.pipe(
+    startWith(undefined), // Always emit once
+    tap(() => this.logService.info(`[PhishingDataService] Update triggered...`)),
+    switchMap(() =>
+      this._cachedState.state$.pipe(
+        first(), // Only take the first value to avoid an infinite loop when updating the cache below
+        switchMap(async (cachedState) => {
+          const next = await this.getNextDomains(cachedState);
+          if (next) {
+            await this._cachedState.update(() => next);
+            this.logService.info(`[PhishingDataService] cache updated`);
+          }
+        }),
+        retry({
+          count: 3,
+          delay: (err, count) => {
+            this.logService.error(
+              `[PhishingDataService] Unable to update domains. Attempt ${count}.`,
+              err,
+            );
+            return timer(5 * 60 * 1000); // 5 minutes
+          },
+          resetOnSuccess: true,
+        }),
+        catchError(
+          (
+            err: unknown /** Eslint actually crashed if you remove this type: https://github.com/cartant/eslint-plugin-rxjs/issues/122 */,
+          ) => {
+            this.logService.error(
+              "[PhishingDataService] Retries unsuccessful. Unable to update domains.",
+              err,
+            );
+            return EMPTY;
+          },
+        ),
+      ),
+    ),
+    share(),
+  );
+
+  constructor(
+    private apiService: ApiService,
+    private taskSchedulerService: TaskSchedulerService,
+    private globalStateProvider: GlobalStateProvider,
+    private logService: LogService,
+    private platformUtilsService: PlatformUtilsService,
+  ) {
+    this.taskSchedulerService.registerTaskHandler(ScheduledTaskNames.phishingDomainUpdate, () => {
+      this._triggerUpdate$.next();
+    });
+    this.taskSchedulerService.setInterval(
+      ScheduledTaskNames.phishingDomainUpdate,
+      this.UPDATE_INTERVAL_DURATION,
+    );
+  }
+
+  /**
+   * Checks if the given URL is a known phishing domain
+   *
+   * @param url The URL to check
+   * @returns True if the URL is a known phishing domain, false otherwise
+   */
+  async isPhishingDomain(url: URL): Promise<boolean> {
+    const domains = await firstValueFrom(this._domains$);
+    const result = domains.has(url.hostname);
+    if (result) {
+      return true;
+    }
+    return false;
+  }
+
+  async getNextDomains(prev: PhishingData | null): Promise<PhishingData | null> {
+    prev = prev ?? { domains: [], timestamp: 0, checksum: "", applicationVersion: "" };
+    const timestamp = Date.now();
+    const prevAge = timestamp - prev.timestamp;
+    this.logService.info(`[PhishingDataService] Cache age: ${prevAge}`);
+
+    const applicationVersion = await this.platformUtilsService.getApplicationVersion();
+
+    // If checksum matches, return existing data with new timestamp & version
+    const remoteChecksum = await this.fetchPhishingDomainsChecksum();
+    if (remoteChecksum && prev.checksum === remoteChecksum) {
+      this.logService.info(
+        `[PhishingDataService] Remote checksum matches local checksum, updating timestamp only.`,
+      );
+      return { ...prev, timestamp, applicationVersion };
+    }
+    // Checksum is different, data needs to be updated.
+
+    // Approach 1: Fetch only new domains and append
+    const isOneDayOldMax = prevAge <= this.UPDATE_INTERVAL_DURATION;
+    if (isOneDayOldMax && applicationVersion === prev.applicationVersion) {
+      const dailyDomains: string[] = await this.fetchPhishingDomains(
+        PhishingDataService.RemotePhishingDatabaseTodayUrl,
+      );
+      this.logService.info(
+        `[PhishingDataService] ${dailyDomains.length} new phishing domains added`,
+      );
+      return {
+        domains: prev.domains.concat(dailyDomains),
+        checksum: remoteChecksum,
+        timestamp,
+        applicationVersion,
+      };
+    }
+
+    // Approach 2: Fetch all domains
+    const domains = await this.fetchPhishingDomains(PhishingDataService.RemotePhishingDatabaseUrl);
+    return {
+      domains,
+      timestamp,
+      checksum: remoteChecksum,
+      applicationVersion,
+    };
+  }
+
+  private async fetchPhishingDomainsChecksum() {
+    const response = await this.apiService.nativeFetch(
+      new Request(PhishingDataService.RemotePhishingDatabaseChecksumUrl),
+    );
+    if (!response.ok) {
+      throw new Error(`[PhishingDataService] Failed to fetch checksum: ${response.status}`);
+    }
+    return response.text();
+  }
+
+  private async fetchPhishingDomains(url: string) {
+    const response = await this.apiService.nativeFetch(new Request(url));
+
+    if (!response.ok) {
+      throw new Error(`[PhishingDataService] Failed to fetch domains: ${response.status}`);
+    }
+
+    return response.text().then((text) => text.split("\n"));
+  }
+
+  private getTestDomains() {
+    const flag = devFlagEnabled("testPhishingUrls");
+    if (!flag) {
+      return [];
+    }
+
+    const domains = devFlagValue("testPhishingUrls") as unknown[];
+    if (domains && domains instanceof Array) {
+      this.logService.debug(
+        "[PhishingDetectionService] Dev flag enabled for testing phishing detection. Adding test phishing domains:",
+        domains,
+      );
+      return domains as string[];
+    }
+    return [];
+  }
+}
diff --git a/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.spec.ts b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.spec.ts
index 8d3c3ec5b31..e33b4b1b4f1 100644
--- a/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.spec.ts
+++ b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.spec.ts
@@ -1,51 +1,86 @@
-import { of } from "rxjs";
+import { mock, MockProxy } from "jest-mock-extended";
+import { Observable, of } from "rxjs";
 
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
-import { TaskSchedulerService } from "@bitwarden/common/platform/scheduling/task-scheduler.service";
+import { MessageListener } from "@bitwarden/messaging";
 
+import { PhishingDataService } from "./phishing-data.service";
 import { PhishingDetectionService } from "./phishing-detection.service";
 
 describe("PhishingDetectionService", () => {
-  let auditService: AuditService;
-  let logService: LogService;
-  let storageService: AbstractStorageService;
-  let taskSchedulerService: TaskSchedulerService;
+  let accountService: AccountService;
+  let billingAccountProfileStateService: BillingAccountProfileStateService;
   let configService: ConfigService;
-  let eventCollectionService: EventCollectionService;
+  let logService: LogService;
+  let phishingDataService: MockProxy<PhishingDataService>;
+  let messageListener: MockProxy<MessageListener>;
 
   beforeEach(() => {
-    auditService = { getKnownPhishingDomains: jest.fn() } as any;
-    logService = { info: jest.fn(), debug: jest.fn(), warning: jest.fn(), error: jest.fn() } as any;
-    storageService = { get: jest.fn(), save: jest.fn() } as any;
-    taskSchedulerService = { registerTaskHandler: jest.fn(), setInterval: jest.fn() } as any;
+    accountService = { getAccount$: jest.fn(() => of(null)) } as any;
+    billingAccountProfileStateService = {} as any;
     configService = { getFeatureFlag$: jest.fn(() => of(false)) } as any;
-    eventCollectionService = {} as any;
+    logService = { info: jest.fn(), debug: jest.fn(), warning: jest.fn(), error: jest.fn() } as any;
+    phishingDataService = mock();
+    messageListener = mock<MessageListener>({
+      messages$(_commandDefinition) {
+        return new Observable();
+      },
+    });
   });
 
   it("should initialize without errors", () => {
     expect(() => {
       PhishingDetectionService.initialize(
+        accountService,
+        billingAccountProfileStateService,
         configService,
-        auditService,
         logService,
-        storageService,
-        taskSchedulerService,
-        eventCollectionService,
+        phishingDataService,
+        messageListener,
       );
     }).not.toThrow();
   });
 
-  it("should detect phishing domains", () => {
-    PhishingDetectionService["_knownPhishingDomains"].add("phishing.com");
-    const url = new URL("https://phishing.com");
-    expect(PhishingDetectionService.isPhishingDomain(url)).toBe(true);
-    const safeUrl = new URL("https://safe.com");
-    expect(PhishingDetectionService.isPhishingDomain(safeUrl)).toBe(false);
-  });
+  // TODO
+  // it("should enable phishing detection for premium account", (done) => {
+  //   const premiumAccount = { id: "user1" };
+  //   accountService = { activeAccount$: of(premiumAccount) } as any;
+  //   configService = { getFeatureFlag$: jest.fn(() => of(true)) } as any;
+  //   billingAccountProfileStateService = {
+  //     hasPremiumFromAnySource$: jest.fn(() => of(true)),
+  //   } as any;
 
-  // Add more tests for other methods as needed
+  //   // Run the initialization
+  //   PhishingDetectionService.initialize(
+  //     accountService,
+  //     billingAccountProfileStateService,
+  //     configService,
+  //     logService,
+  //     phishingDataService,
+  //     messageListener,
+  //   );
+  // });
+
+  // TODO
+  // it("should not enable phishing detection for non-premium account", (done) => {
+  //   const nonPremiumAccount = { id: "user2" };
+  //   accountService = { activeAccount$: of(nonPremiumAccount) } as any;
+  //   configService = { getFeatureFlag$: jest.fn(() => of(true)) } as any;
+  //   billingAccountProfileStateService = {
+  //     hasPremiumFromAnySource$: jest.fn(() => of(false)),
+  //   } as any;
+
+  //   // Run the initialization
+  //   PhishingDetectionService.initialize(
+  //     accountService,
+  //     billingAccountProfileStateService,
+  //     configService,
+  //     logService,
+  //     phishingDataService,
+  //     messageListener,
+  //   );
+  // });
 });
diff --git a/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.ts b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.ts
index 1497ac96dba..4917e740be8 100644
--- a/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.ts
+++ b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.service.ts
@@ -1,685 +1,193 @@
-import { concatMap, delay, Subject, Subscription } from "rxjs";
+import {
+  combineLatest,
+  concatMap,
+  distinctUntilChanged,
+  EMPTY,
+  filter,
+  map,
+  merge,
+  of,
+  Subject,
+  switchMap,
+  tap,
+} from "rxjs";
 
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } 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 { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
-import { devFlagEnabled, devFlagValue } from "@bitwarden/common/platform/misc/flags";
-import { ScheduledTaskNames } from "@bitwarden/common/platform/scheduling";
-import { TaskSchedulerService } from "@bitwarden/common/platform/scheduling/task-scheduler.service";
+import { CommandDefinition, MessageListener } from "@bitwarden/messaging";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
 
-import {
-  CaughtPhishingDomain,
-  isPhishingDetectionMessage,
-  PhishingDetectionMessage,
-  PhishingDetectionNavigationEvent,
-  PhishingDetectionTabId,
-} from "./phishing-detection.types";
+import { PhishingDataService } from "./phishing-data.service";
+
+type PhishingDetectionNavigationEvent = {
+  tabId: number;
+  changeInfo: chrome.tabs.OnUpdatedInfo;
+  tab: chrome.tabs.Tab;
+};
+
+/**
+ * Sends a message to the phishing detection service to continue to the caught url
+ */
+export const PHISHING_DETECTION_CONTINUE_COMMAND = new CommandDefinition<{
+  tabId: number;
+  url: string;
+}>("phishing-detection-continue");
+
+/**
+ * Sends a message to the phishing detection service to close the warning page
+ */
+export const PHISHING_DETECTION_CANCEL_COMMAND = new CommandDefinition<{
+  tabId: number;
+}>("phishing-detection-cancel");
 
 export class PhishingDetectionService {
-  private static readonly _UPDATE_INTERVAL = 24 * 60 * 60 * 1000; // 24 hours in milliseconds
-  private static readonly _RETRY_INTERVAL = 5 * 60 * 1000; // 5 minutes
-  private static readonly _MAX_RETRIES = 3;
-  private static readonly _STORAGE_KEY = "phishing_domains_cache";
-  private static _auditService: AuditService;
-  private static _logService: LogService;
-  private static _storageService: AbstractStorageService;
-  private static _taskSchedulerService: TaskSchedulerService;
-  private static _updateCacheSubscription: Subscription | null = null;
-  private static _retrySubscription: Subscription | null = null;
-  private static _navigationEventsSubject = new Subject<PhishingDetectionNavigationEvent>();
-  private static _navigationEvents: Subscription | null = null;
-  private static _knownPhishingDomains = new Set<string>();
-  private static _caughtTabs: Map<PhishingDetectionTabId, CaughtPhishingDomain> = new Map();
-  private static _isInitialized = false;
-  private static _isUpdating = false;
-  private static _retryCount = 0;
-  private static _lastUpdateTime: number = 0;
+  private static _tabUpdated$ = new Subject<PhishingDetectionNavigationEvent>();
+  private static _ignoredHostnames = new Set<string>();
+  private static _didInit = false;
 
   static initialize(
+    accountService: AccountService,
+    billingAccountProfileStateService: BillingAccountProfileStateService,
     configService: ConfigService,
-    auditService: AuditService,
     logService: LogService,
-    storageService: AbstractStorageService,
-    taskSchedulerService: TaskSchedulerService,
-    eventCollectionService: EventCollectionService,
-  ): void {
-    this._auditService = auditService;
-    this._logService = logService;
-    this._storageService = storageService;
-    this._taskSchedulerService = taskSchedulerService;
+    phishingDataService: PhishingDataService,
+    messageListener: MessageListener,
+  ) {
+    if (this._didInit) {
+      logService.debug("[PhishingDetectionService] Initialize already called. Aborting.");
+      return;
+    }
 
-    logService.info("[PhishingDetectionService] Initialize called");
+    logService.debug("[PhishingDetectionService] Initialize called. Checking prerequisites...");
 
-    configService
-      .getFeatureFlag$(FeatureFlag.PhishingDetection)
+    BrowserApi.addListener(chrome.tabs.onUpdated, this._handleTabUpdated.bind(this));
+
+    const onContinueCommand$ = messageListener.messages$(PHISHING_DETECTION_CONTINUE_COMMAND).pipe(
+      tap((message) =>
+        logService.debug(`[PhishingDetectionService] user selected continue for ${message.url}`),
+      ),
+      concatMap(async (message) => {
+        const url = new URL(message.url);
+        this._ignoredHostnames.add(url.hostname);
+        await BrowserApi.navigateTabToUrl(message.tabId, url);
+      }),
+    );
+
+    const onTabUpdated$ = this._tabUpdated$.pipe(
+      filter(
+        (navEvent) =>
+          navEvent.changeInfo.status === "complete" &&
+          !!navEvent.tab.url &&
+          !this._isExtensionPage(navEvent.tab.url),
+      ),
+      map(({ tab, tabId }) => {
+        const url = new URL(tab.url!);
+        return { tabId, url, ignored: this._ignoredHostnames.has(url.hostname) };
+      }),
+      distinctUntilChanged(
+        (prev, curr) =>
+          prev.url.toString() === curr.url.toString() &&
+          prev.tabId === curr.tabId &&
+          prev.ignored === curr.ignored,
+      ),
+      tap((event) => logService.debug(`[PhishingDetectionService] processing event:`, event)),
+      concatMap(async ({ tabId, url, ignored }) => {
+        if (ignored) {
+          // The next time this host is visited, block again
+          this._ignoredHostnames.delete(url.hostname);
+          return;
+        }
+        const isPhishing = await phishingDataService.isPhishingDomain(url);
+        if (!isPhishing) {
+          return;
+        }
+
+        const phishingWarningPage = new URL(
+          BrowserApi.getRuntimeURL("popup/index.html#/security/phishing-warning") +
+            `?phishingUrl=${url.toString()}`,
+        );
+        await BrowserApi.navigateTabToUrl(tabId, phishingWarningPage);
+      }),
+    );
+
+    const onCancelCommand$ = messageListener
+      .messages$(PHISHING_DETECTION_CANCEL_COMMAND)
+      .pipe(switchMap((message) => BrowserApi.closeTab(message.tabId)));
+
+    const activeAccountHasAccess$ = combineLatest([
+      accountService.activeAccount$,
+      configService.getFeatureFlag$(FeatureFlag.PhishingDetection),
+    ]).pipe(
+      switchMap(([account, featureEnabled]) => {
+        if (!account) {
+          logService.debug("[PhishingDetectionService] No active account.");
+          return of(false);
+        }
+        return billingAccountProfileStateService
+          .hasPremiumFromAnySource$(account.id)
+          .pipe(map((hasPremium) => hasPremium && featureEnabled));
+      }),
+    );
+
+    const initSub = activeAccountHasAccess$
       .pipe(
-        concatMap(async (enabled) => {
-          if (!enabled) {
-            logService.info(
-              "[PhishingDetectionService] Phishing detection feature flag is disabled.",
+        distinctUntilChanged(),
+        switchMap((activeUserHasAccess) => {
+          if (!activeUserHasAccess) {
+            logService.debug(
+              "[PhishingDetectionService] User does not have access to phishing detection service.",
             );
-            this._cleanup();
+            return EMPTY;
           } else {
-            // Enable phishing detection service
-            logService.info("[PhishingDetectionService] Enabling phishing detection service");
-            await this._setup();
+            logService.debug("[PhishingDetectionService] Enabling phishing detection service");
+            return merge(
+              phishingDataService.update$,
+              onContinueCommand$,
+              onTabUpdated$,
+              onCancelCommand$,
+            );
           }
         }),
       )
       .subscribe();
-  }
 
-  /**
-   * Checks if the given URL is a known phishing domain
-   *
-   * @param url The URL to check
-   * @returns True if the URL is a known phishing domain, false otherwise
-   */
-  static isPhishingDomain(url: URL): boolean {
-    const result = this._knownPhishingDomains.has(url.hostname);
-    if (result) {
-      this._logService.debug("[PhishingDetectionService] Caught phishing domain:", url.hostname);
-      return true;
-    }
-    return false;
-  }
+    this._didInit = true;
+    return () => {
+      initSub.unsubscribe();
+      this._didInit = false;
 
-  /**
-   * Sends a message to the phishing detection service to close the warning page
-   */
-  static requestClosePhishingWarningPage(): void {
-    void chrome.runtime.sendMessage({ command: PhishingDetectionMessage.Close });
-  }
-
-  /**
-   * Sends a message to the phishing detection service to continue to the caught url
-   */
-  static async requestContinueToDangerousUrl() {
-    void chrome.runtime.sendMessage({ command: PhishingDetectionMessage.Continue });
-  }
-
-  /**
-   * Continues to the dangerous URL if the user has requested it
-   *
-   * @param tabId The ID of the tab to continue to the dangerous URL
-   */
-  static async _continueToDangerousUrl(tabId: PhishingDetectionTabId): Promise<void> {
-    const caughtTab = this._caughtTabs.get(tabId);
-    if (caughtTab) {
-      this._logService.info(
-        "[PhishingDetectionService] Continuing to known phishing domain: ",
-        caughtTab,
-        caughtTab.url.href,
+      // Manually type cast to satisfy the listener signature due to the mixture
+      // of static and instance methods in this class. To be fixed when refactoring
+      // this class to be instance-based while providing a singleton instance in usage
+      BrowserApi.removeListener(
+        chrome.tabs.onUpdated,
+        PhishingDetectionService._handleTabUpdated as (...args: readonly unknown[]) => unknown,
       );
-      await BrowserApi.navigateTabToUrl(tabId, caughtTab.url);
-    } else {
-      this._logService.warning("[PhishingDetectionService] No caught domain to continue to");
-    }
+    };
   }
 
-  /**
-   * Initializes the phishing detection service, setting up listeners and registering tasks
-   */
-  private static async _setup(): Promise<void> {
-    if (this._isInitialized) {
-      this._logService.info("[PhishingDetectionService] Already initialized, skipping setup.");
-      return;
-    }
-
-    this._isInitialized = true;
-    this._setupListeners();
-
-    // Register the update task
-    this._taskSchedulerService.registerTaskHandler(
-      ScheduledTaskNames.phishingDomainUpdate,
-      async () => {
-        try {
-          await this._fetchKnownPhishingDomains();
-        } catch (error) {
-          this._logService.error(
-            "[PhishingDetectionService] Failed to update phishing domains in task handler:",
-            error,
-          );
-        }
-      },
-    );
-
-    // Initial load of cached domains
-    await this._loadCachedDomains();
-
-    // Set up periodic updates every 24 hours
-    this._setupPeriodicUpdates();
-    this._logService.debug("[PhishingDetectionService] Phishing detection feature is initialized.");
-  }
-
-  /**
-   * Sets up listeners for messages from the web page and web navigation events
-   */
-  private static _setupListeners(): void {
-    // Setup listeners from web page/content script
-    BrowserApi.addListener(chrome.runtime.onMessage, this._handleExtensionMessage.bind(this));
-    BrowserApi.addListener(chrome.tabs.onReplaced, this._handleReplacementEvent.bind(this));
-    BrowserApi.addListener(chrome.tabs.onUpdated, this._handleNavigationEvent.bind(this));
-
-    // When a navigation event occurs, check if a replace event for the same tabId exists,
-    // and call the replace handler before handling navigation.
-    this._navigationEvents = this._navigationEventsSubject
-      .pipe(
-        delay(100), // Delay slightly to allow replace events to be caught
-      )
-      .subscribe(({ tabId, changeInfo, tab }) => {
-        void this._processNavigation(tabId, changeInfo, tab);
-      });
-  }
-
-  /**
-   * Handles messages from the phishing warning page
-   *
-   * @returns true if the message was handled, false otherwise
-   */
-  private static _handleExtensionMessage(
-    message: unknown,
-    sender: chrome.runtime.MessageSender,
-  ): boolean {
-    if (!isPhishingDetectionMessage(message)) {
-      return false;
-    }
-    const isValidSender = sender && sender.tab && sender.tab.id;
-    const senderTabId = isValidSender ? sender?.tab?.id : null;
-
-    // Only process messages from tab navigation
-    if (senderTabId == null) {
-      return false;
-    }
-
-    // Handle Dangerous Continue to Phishing Domain
-    if (message.command === PhishingDetectionMessage.Continue) {
-      this._logService.debug(
-        "[PhishingDetectionService] User requested continue to phishing domain on tab: ",
-        senderTabId,
-      );
-
-      this._setCaughtTabContinue(senderTabId);
-      void this._continueToDangerousUrl(senderTabId);
-      return true;
-    }
-
-    // Handle Close Phishing Warning Page
-    if (message.command === PhishingDetectionMessage.Close) {
-      this._logService.debug(
-        "[PhishingDetectionService] User requested to close phishing warning page on tab: ",
-        senderTabId,
-      );
-
-      void BrowserApi.closeTab(senderTabId);
-      this._removeCaughtTab(senderTabId);
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Filter out navigation events that are to warning pages or not complete, check for phishing domains,
-   * then handle the navigation appropriately.
-   */
-  private static async _processNavigation(
-    tabId: number,
-    changeInfo: chrome.tabs.OnUpdatedInfo,
-    tab: chrome.tabs.Tab,
-  ): Promise<void> {
-    if (changeInfo.status !== "complete" || !tab.url) {
-      // Not a complete navigation or no URL to check
-      return;
-    }
-    // Check if navigating to a warning page to ignore
-    const isWarningPage = this._isWarningPage(tabId, tab.url);
-    if (isWarningPage) {
-      this._logService.debug(
-        `[PhishingDetectionService] Ignoring navigation to warning page for tab ${tabId}: ${tab.url}`,
-      );
-      return;
-    }
-
-    // Check if tab is navigating to a phishing url and handle navigation
-    this._checkTabForPhishing(tabId, new URL(tab.url));
-    await this._handleTabNavigation(tabId);
-  }
-
-  private static _handleNavigationEvent(
+  private static _handleTabUpdated(
     tabId: number,
     changeInfo: chrome.tabs.OnUpdatedInfo,
     tab: chrome.tabs.Tab,
   ): boolean {
-    this._navigationEventsSubject.next({ tabId, changeInfo, tab });
+    this._tabUpdated$.next({ tabId, changeInfo, tab });
 
     // Return value for supporting BrowserApi event listener signature
     return true;
   }
 
-  /**
-   * Handles a replace event in Safari when redirecting to a warning page
-   *
-   * @returns true if the replacement was handled, false otherwise
-   */
-  private static _handleReplacementEvent(newTabId: number, originalTabId: number): boolean {
-    if (this._caughtTabs.has(originalTabId)) {
-      this._logService.debug(
-        `[PhishingDetectionService] Handling original tab ${originalTabId} changing to new tab ${newTabId}`,
-      );
-
-      // Handle replacement
-      const originalCaughtTab = this._caughtTabs.get(originalTabId);
-      if (originalCaughtTab) {
-        this._caughtTabs.set(newTabId, originalCaughtTab);
-        this._caughtTabs.delete(originalTabId);
-      } else {
-        this._logService.debug(
-          `[PhishingDetectionService] Original caught tab not found, ignoring replacement.`,
-        );
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Adds a tab to the caught tabs map with the requested continue status set to false
-   *
-   * @param tabId The ID of the tab that was caught
-   * @param url The URL of the tab that was caught
-   * @param redirectedTo The URL that the tab was redirected to
-   */
-  private static _addCaughtTab(tabId: PhishingDetectionTabId, url: URL) {
-    const redirectedTo = this._createWarningPageUrl(url);
-    const newTab = { url, warningPageUrl: redirectedTo, requestedContinue: false };
-
-    this._caughtTabs.set(tabId, newTab);
-    this._logService.debug("[PhishingDetectionService] Tracking new tab:", tabId, newTab);
-  }
-
-  /**
-   * Removes a tab from the caught tabs map
-   *
-   * @param tabId The ID of the tab to remove
-   */
-  private static _removeCaughtTab(tabId: PhishingDetectionTabId) {
-    this._logService.debug("[PhishingDetectionService] Removing tab from tracking: ", tabId);
-    this._caughtTabs.delete(tabId);
-  }
-
-  /**
-   * Sets the requested continue status for a caught tab
-   *
-   * @param tabId The ID of the tab to set the continue status for
-   */
-  private static _setCaughtTabContinue(tabId: PhishingDetectionTabId) {
-    const caughtTab = this._caughtTabs.get(tabId);
-    if (caughtTab) {
-      this._caughtTabs.set(tabId, {
-        url: caughtTab.url,
-        warningPageUrl: caughtTab.warningPageUrl,
-        requestedContinue: true,
-      });
-    }
-  }
-
-  /**
-   * Checks if the tab should continue to a dangerous domain
-   *
-   * @param tabId Tab to check if a domain was caught
-   * @returns True if the user requested to continue to the phishing domain
-   */
-  private static _continueToCaughtDomain(tabId: PhishingDetectionTabId) {
-    const caughtDomain = this._caughtTabs.get(tabId);
-    const hasRequestedContinue = caughtDomain?.requestedContinue;
-    return caughtDomain && hasRequestedContinue;
-  }
-
-  /**
-   * Checks if the tab is going to a phishing domain and updates the caught tabs map
-   *
-   * @param tabId Tab to check for phishing domain
-   * @param url URL of the tab to check
-   */
-  private static _checkTabForPhishing(tabId: PhishingDetectionTabId, url: URL) {
-    // Check if the tab already being tracked
-    const caughtTab = this._caughtTabs.get(tabId);
-
-    const isPhishing = this.isPhishingDomain(url);
-    this._logService.debug(
-      `[PhishingDetectionService] Checking for phishing url. Result: ${isPhishing} on ${url}`,
-    );
-
-    // Add a new caught tab
-    if (!caughtTab && isPhishing) {
-      this._addCaughtTab(tabId, url);
-    }
-
-    // The tab was caught before but has an updated url
-    if (caughtTab && caughtTab.url.href !== url.href) {
-      if (isPhishing) {
-        this._logService.debug(
-          "[PhishingDetectionService] Caught tab going to a new phishing domain:",
-          caughtTab.url,
-        );
-        // The tab can be treated as a new tab, clear the old one and reset
-        this._removeCaughtTab(tabId);
-        this._addCaughtTab(tabId, url);
-      } else {
-        this._logService.debug(
-          "[PhishingDetectionService] Caught tab navigating away from a phishing domain",
-        );
-        // The tab is safe
-        this._removeCaughtTab(tabId);
-      }
-    }
-  }
-
-  /**
-   * Handles a phishing tab for redirection to a warning page if the user has not requested to continue
-   *
-   * @param tabId Tab to handle
-   * @param url URL of the tab
-   */
-  private static async _handleTabNavigation(tabId: PhishingDetectionTabId) {
-    const caughtTab = this._caughtTabs.get(tabId);
-
-    if (caughtTab && !this._continueToCaughtDomain(tabId)) {
-      await this._redirectToWarningPage(tabId);
-    }
-  }
-
-  private static _isWarningPage(tabId: number, url: string): boolean {
-    const caughtTab = this._caughtTabs.get(tabId);
-    return !!caughtTab && caughtTab.warningPageUrl.href === url;
-  }
-
-  /**
-   * Constructs the phishing warning page URL with the caught URL as a query parameter
-   *
-   * @param caughtUrl The URL that was caught as phishing
-   * @returns The complete URL to the phishing warning page
-   */
-  private static _createWarningPageUrl(caughtUrl: URL) {
-    const phishingWarningPage = BrowserApi.getRuntimeURL(
-      "popup/index.html#/security/phishing-warning",
-    );
-    const pageWithViewData = `${phishingWarningPage}?phishingHost=${caughtUrl.hostname}`;
-    this._logService.debug(
-      "[PhishingDetectionService] Created phishing warning page url:",
-      pageWithViewData,
-    );
-    return new URL(pageWithViewData);
-  }
-
-  /**
-   * Redirects the tab to the phishing warning page
-   *
-   * @param tabId The ID of the tab to redirect
-   */
-  private static async _redirectToWarningPage(tabId: number) {
-    const tabToRedirect = this._caughtTabs.get(tabId);
-
-    if (tabToRedirect) {
-      this._logService.info("[PhishingDetectionService] Redirecting to warning page");
-      await BrowserApi.navigateTabToUrl(tabId, tabToRedirect.warningPageUrl);
-    } else {
-      this._logService.warning("[PhishingDetectionService] No caught tab found for redirection");
-    }
-  }
-
-  /**
-   * Sets up periodic updates for phishing domains
-   */
-  private static _setupPeriodicUpdates() {
-    // Clean up any existing subscriptions
-    if (this._updateCacheSubscription) {
-      this._updateCacheSubscription.unsubscribe();
-    }
-    if (this._retrySubscription) {
-      this._retrySubscription.unsubscribe();
-    }
-
-    this._updateCacheSubscription = this._taskSchedulerService.setInterval(
-      ScheduledTaskNames.phishingDomainUpdate,
-      this._UPDATE_INTERVAL,
-    );
-  }
-
-  /**
-   * Schedules a retry for updating phishing domains if the update fails
-   */
-  private static _scheduleRetry() {
-    // If we've exceeded max retries, stop retrying
-    if (this._retryCount >= this._MAX_RETRIES) {
-      this._logService.warning(
-        `[PhishingDetectionService] Max retries (${this._MAX_RETRIES}) reached for phishing domain update. Will try again in ${this._UPDATE_INTERVAL / (1000 * 60 * 60)} hours.`,
-      );
-      this._retryCount = 0;
-      if (this._retrySubscription) {
-        this._retrySubscription.unsubscribe();
-        this._retrySubscription = null;
-      }
-      return;
-    }
-
-    // Clean up existing retry subscription if any
-    if (this._retrySubscription) {
-      this._retrySubscription.unsubscribe();
-    }
-
-    // Increment retry count
-    this._retryCount++;
-
-    // Schedule a retry in 5 minutes
-    this._retrySubscription = this._taskSchedulerService.setInterval(
-      ScheduledTaskNames.phishingDomainUpdate,
-      this._RETRY_INTERVAL,
-    );
-
-    this._logService.info(
-      `[PhishingDetectionService] Scheduled retry ${this._retryCount}/${this._MAX_RETRIES} for phishing domain update in ${this._RETRY_INTERVAL / (1000 * 60)} minutes`,
-    );
-  }
-
-  /**
-   * Handles adding test phishing URLs from dev flags for testing purposes
-   */
-  private static _handleTestUrls() {
-    if (devFlagEnabled("testPhishingUrls")) {
-      const testPhishingUrls = devFlagValue("testPhishingUrls");
-      this._logService.debug(
-        "[PhishingDetectionService] Dev flag enabled for testing phishing detection. Adding test phishing domains:",
-        testPhishingUrls,
-      );
-      if (testPhishingUrls && testPhishingUrls instanceof Array) {
-        testPhishingUrls.forEach((domain) => {
-          if (domain && typeof domain === "string") {
-            this._knownPhishingDomains.add(domain);
-          }
-        });
-      }
-    }
-  }
-
-  /**
-   * Loads cached phishing domains from storage
-   * If no cache exists or it is expired, fetches the latest domains
-   */
-  private static async _loadCachedDomains() {
-    try {
-      const cachedData = await this._storageService.get<{ domains: string[]; timestamp: number }>(
-        this._STORAGE_KEY,
-      );
-      if (cachedData) {
-        this._logService.info("[PhishingDetectionService] Phishing cachedData exists");
-        const phishingDomains = cachedData.domains || [];
-
-        this._setKnownPhishingDomains(phishingDomains);
-        this._handleTestUrls();
-      }
-
-      // If cache is empty or expired, trigger an immediate update
-      if (
-        this._knownPhishingDomains.size === 0 ||
-        Date.now() - this._lastUpdateTime >= this._UPDATE_INTERVAL
-      ) {
-        await this._fetchKnownPhishingDomains();
-      }
-    } catch (error) {
-      this._logService.error(
-        "[PhishingDetectionService] Failed to load cached phishing domains:",
-        error,
-      );
-      this._handleTestUrls();
-    }
-  }
-
-  /**
-   * Fetches the latest known phishing domains from the audit service
-   * Updates the cache and handles retries if necessary
-   */
-  static async _fetchKnownPhishingDomains(): Promise<void> {
-    let domains: string[] = [];
-
-    // Prevent concurrent updates
-    if (this._isUpdating) {
-      this._logService.warning(
-        "[PhishingDetectionService] Update already in progress, skipping...",
-      );
-      return;
-    }
-
-    try {
-      this._logService.info("[PhishingDetectionService] Starting phishing domains update...");
-      this._isUpdating = true;
-      domains = await this._auditService.getKnownPhishingDomains();
-      this._setKnownPhishingDomains(domains);
-
-      await this._saveDomains();
-
-      this._resetRetry();
-      this._isUpdating = false;
-
-      this._logService.info("[PhishingDetectionService] Successfully fetched domains");
-    } catch (error) {
-      this._logService.error(
-        "[PhishingDetectionService] Failed to fetch known phishing domains.",
-        error,
-      );
-
-      this._scheduleRetry();
-      this._isUpdating = false;
-
-      throw error;
-    }
-  }
-
-  /**
-   * Saves the known phishing domains to storage
-   * Caches the updated domains and updates the last update time
-   */
-  private static async _saveDomains() {
-    try {
-      // Cache the updated domains
-      await this._storageService.save(this._STORAGE_KEY, {
-        domains: Array.from(this._knownPhishingDomains),
-        timestamp: this._lastUpdateTime,
-      });
-      this._logService.info(
-        `[PhishingDetectionService] Updated phishing domains cache with ${this._knownPhishingDomains.size} domains`,
-      );
-    } catch (error) {
-      this._logService.error(
-        "[PhishingDetectionService] Failed to save known phishing domains.",
-        error,
-      );
-      this._scheduleRetry();
-      throw error;
-    }
-  }
-
-  /**
-   * Resets the retry count and clears the retry subscription
-   */
-  private static _resetRetry(): void {
-    this._logService.info(
-      `[PhishingDetectionService] Resetting retry count and clearing retry subscription.`,
-    );
-    // Reset retry count and clear retry subscription on success
-    this._retryCount = 0;
-    if (this._retrySubscription) {
-      this._retrySubscription.unsubscribe();
-      this._retrySubscription = null;
-    }
-  }
-
-  /**
-   * Adds phishing domains to the known phishing domains set
-   * Clears old domains to prevent memory leaks
-   *
-   * @param domains Array of phishing domains to add
-   */
-  private static _setKnownPhishingDomains(domains: string[]): void {
-    this._logService.debug(
-      `[PhishingDetectionService] Tracking ${domains.length} phishing domains`,
-    );
-
-    // Clear old domains to prevent memory leaks
-    this._knownPhishingDomains.clear();
-
-    domains.forEach((domain: string) => {
-      if (domain) {
-        this._knownPhishingDomains.add(domain);
-      }
-    });
-    this._lastUpdateTime = Date.now();
-  }
-
-  /**
-   * Cleans up the phishing detection service
-   * Unsubscribes from all subscriptions and clears caches
-   */
-  private static _cleanup() {
-    if (this._updateCacheSubscription) {
-      this._updateCacheSubscription.unsubscribe();
-      this._updateCacheSubscription = null;
-    }
-    if (this._retrySubscription) {
-      this._retrySubscription.unsubscribe();
-      this._retrySubscription = null;
-    }
-    if (this._navigationEvents) {
-      this._navigationEvents.unsubscribe();
-      this._navigationEvents = null;
-    }
-    this._knownPhishingDomains.clear();
-    this._caughtTabs.clear();
-    this._lastUpdateTime = 0;
-    this._isUpdating = false;
-    this._isInitialized = false;
-    this._retryCount = 0;
-
-    // Manually type cast to satisfy the listener signature due to the mixture
-    // of static and instance methods in this class. To be fixed when refactoring
-    // this class to be instance-based while providing a singleton instance in usage
-    BrowserApi.removeListener(
-      chrome.runtime.onMessage,
-      PhishingDetectionService._handleExtensionMessage as (...args: readonly unknown[]) => unknown,
-    );
-    BrowserApi.removeListener(
-      chrome.tabs.onReplaced,
-      PhishingDetectionService._handleReplacementEvent as (...args: readonly unknown[]) => unknown,
-    );
-    BrowserApi.removeListener(
-      chrome.tabs.onUpdated,
-      PhishingDetectionService._handleNavigationEvent as (...args: readonly unknown[]) => unknown,
+  private static _isExtensionPage(url: string): boolean {
+    // Check against all common extension protocols
+    return (
+      url.startsWith("chrome-extension://") ||
+      url.startsWith("moz-extension://") ||
+      url.startsWith("safari-extension://") ||
+      url.startsWith("safari-web-extension://")
     );
   }
 }
diff --git a/apps/browser/src/dirt/phishing-detection/services/phishing-detection.types.ts b/apps/browser/src/dirt/phishing-detection/services/phishing-detection.types.ts
deleted file mode 100644
index 21793616241..00000000000
--- a/apps/browser/src/dirt/phishing-detection/services/phishing-detection.types.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-export const PhishingDetectionMessage = Object.freeze({
-  Close: "phishing-detection-close",
-  Continue: "phishing-detection-continue",
-} as const);
-
-export type PhishingDetectionMessageTypes =
-  (typeof PhishingDetectionMessage)[keyof typeof PhishingDetectionMessage];
-
-export function isPhishingDetectionMessage(
-  input: unknown,
-): input is { command: PhishingDetectionMessageTypes } {
-  if (!!input && typeof input === "object" && "command" in input) {
-    const command = (input as Record<string, unknown>)["command"];
-    if (typeof command === "string") {
-      return Object.values(PhishingDetectionMessage).includes(
-        command as PhishingDetectionMessageTypes,
-      );
-    }
-  }
-  return false;
-}
-
-export type PhishingDetectionTabId = number;
-
-export type CaughtPhishingDomain = {
-  url: URL;
-  warningPageUrl: URL;
-  requestedContinue: boolean;
-};
-
-export type PhishingDetectionNavigationEvent = {
-  tabId: number;
-  changeInfo: chrome.tabs.OnUpdatedInfo;
-  tab: chrome.tabs.Tab;
-};
diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.spec.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.spec.ts
index 4017953ee28..5bbba77d12e 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.spec.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.spec.ts
@@ -1,5 +1,6 @@
 import { mock } from "jest-mock-extended";
 
+import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -18,6 +19,7 @@ describe("background browser biometrics service tests", function () {
   const biometricStateService = mock<BiometricStateService>();
   const messagingService = mock<MessagingService>();
   const vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
+  const pinService = mock<PinServiceAbstraction>();
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -28,6 +30,7 @@ describe("background browser biometrics service tests", function () {
       biometricStateService,
       messagingService,
       vaultTimeoutSettingsService,
+      pinService,
     );
   });
 
diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
index 8f755cfeda6..c8be58b0bde 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
@@ -1,6 +1,7 @@
 import { combineLatest, timer } from "rxjs";
 import { filter, concatMap } from "rxjs/operators";
 
+import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -29,6 +30,7 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
     private biometricStateService: BiometricStateService,
     private messagingService: MessagingService,
     private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
+    private pinService: PinServiceAbstraction,
   ) {
     super();
     // Always connect to the native messaging background if biometrics are enabled, not just when it is used
@@ -101,6 +103,7 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
         if (await this.keyService.validateUserKey(userKey, userId)) {
           await this.biometricStateService.setBiometricUnlockEnabled(true);
           await this.keyService.setUserKey(userKey, userId);
+          await this.pinService.userUnlocked(userId);
           // to update badge and other things
           this.messagingService.send("switchAccount", { userId });
           return userKey;
diff --git a/apps/browser/src/key-management/key-connector/remove-password.component.ts b/apps/browser/src/key-management/key-connector/remove-password.component.ts
index 915effc8c33..c4077a1eca9 100644
--- a/apps/browser/src/key-management/key-connector/remove-password.component.ts
+++ b/apps/browser/src/key-management/key-connector/remove-password.component.ts
@@ -4,6 +4,8 @@ import { Component } from "@angular/core";
 
 import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/key-management-ui";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-remove-password",
   templateUrl: "remove-password.component.html",
diff --git a/apps/browser/src/key-management/session-timeout/services/browser-session-timeout-settings-component.service.ts b/apps/browser/src/key-management/session-timeout/services/browser-session-timeout-settings-component.service.ts
new file mode 100644
index 00000000000..297718687eb
--- /dev/null
+++ b/apps/browser/src/key-management/session-timeout/services/browser-session-timeout-settings-component.service.ts
@@ -0,0 +1,58 @@
+import { defer, Observable, of } from "rxjs";
+
+import {
+  VaultTimeout,
+  VaultTimeoutOption,
+  VaultTimeoutStringType,
+} from "@bitwarden/common/key-management/vault-timeout";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SessionTimeoutSettingsComponentService } from "@bitwarden/key-management-ui";
+
+export class BrowserSessionTimeoutSettingsComponentService
+  implements SessionTimeoutSettingsComponentService
+{
+  availableTimeoutOptions$: Observable<VaultTimeoutOption[]> = defer(() => {
+    const options: VaultTimeoutOption[] = [
+      { name: this.i18nService.t("immediately"), value: 0 },
+      { name: this.i18nService.t("oneMinute"), value: 1 },
+      { name: this.i18nService.t("fiveMinutes"), value: 5 },
+      { name: this.i18nService.t("fifteenMinutes"), value: 15 },
+      { name: this.i18nService.t("thirtyMinutes"), value: 30 },
+      { name: this.i18nService.t("oneHour"), value: 60 },
+      { name: this.i18nService.t("fourHours"), value: 240 },
+    ];
+
+    const showOnLocked =
+      !this.platformUtilsService.isFirefox() &&
+      !this.platformUtilsService.isSafari() &&
+      !(this.platformUtilsService.isOpera() && navigator.platform === "MacIntel");
+
+    if (showOnLocked) {
+      options.push({
+        name: this.i18nService.t("onLocked"),
+        value: VaultTimeoutStringType.OnLocked,
+      });
+    }
+
+    options.push(
+      { name: this.i18nService.t("onRestart"), value: VaultTimeoutStringType.OnRestart },
+      { name: this.i18nService.t("never"), value: VaultTimeoutStringType.Never },
+    );
+
+    return of(options);
+  });
+
+  constructor(
+    private readonly i18nService: I18nService,
+    private readonly platformUtilsService: PlatformUtilsService,
+    private readonly messagingService: MessagingService,
+  ) {}
+
+  onTimeoutSave(timeout: VaultTimeout): void {
+    if (timeout === VaultTimeoutStringType.Never) {
+      this.messagingService.send("bgReseedStorage");
+    }
+  }
+}
diff --git a/apps/browser/src/key-management/vault-timeout/foreground-vault-timeout.service.ts b/apps/browser/src/key-management/vault-timeout/foreground-vault-timeout.service.ts
index 5003dfd5b29..8bad50bfae9 100644
--- a/apps/browser/src/key-management/vault-timeout/foreground-vault-timeout.service.ts
+++ b/apps/browser/src/key-management/vault-timeout/foreground-vault-timeout.service.ts
@@ -2,19 +2,10 @@
 // @ts-strict-ignore
 import { VaultTimeoutService as BaseVaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout/abstractions/vault-timeout.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { UserId } from "@bitwarden/common/types/guid";
 
 export class ForegroundVaultTimeoutService implements BaseVaultTimeoutService {
   constructor(protected messagingService: MessagingService) {}
 
   // should only ever run in background
   async checkVaultTimeout(): Promise<void> {}
-
-  async lock(userId?: UserId): Promise<void> {
-    this.messagingService.send("lockVault", { userId });
-  }
-
-  async logOut(userId?: string): Promise<void> {
-    this.messagingService.send("logout", { userId });
-  }
 }
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index 2a45c846060..1651f616e03 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extName__",
   "short_name": "Bitwarden",
-  "version": "2025.9.0",
+  "version": "2025.12.0",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",
diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json
index 6eeac8c8b39..67399192b64 100644
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -3,7 +3,7 @@
   "minimum_chrome_version": "102.0",
   "name": "__MSG_extName__",
   "short_name": "Bitwarden",
-  "version": "2025.9.0",
+  "version": "2025.12.0",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",
@@ -164,7 +164,8 @@
         "overlay/menu.html",
         "popup/fonts/*"
       ],
-      "matches": ["<all_urls>"]
+      "matches": ["<all_urls>"],
+      "use_dynamic_url": true
     }
   ],
   "__firefox__browser_specific_settings": {
diff --git a/apps/browser/src/platform/badge/badge-browser-api.ts b/apps/browser/src/platform/badge/badge-browser-api.ts
index 79b50970400..80f84c3b46e 100644
--- a/apps/browser/src/platform/badge/badge-browser-api.ts
+++ b/apps/browser/src/platform/badge/badge-browser-api.ts
@@ -1,4 +1,16 @@
-import { concat, defer, filter, map, merge, Observable, shareReplay, switchMap } from "rxjs";
+import {
+  concat,
+  concatMap,
+  defer,
+  filter,
+  map,
+  merge,
+  Observable,
+  of,
+  pairwise,
+  shareReplay,
+  switchMap,
+} from "rxjs";
 
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -28,13 +40,37 @@ function tabFromChromeTab(tab: chrome.tabs.Tab): Tab {
 }
 
 export interface BadgeBrowserApi {
-  activeTabsUpdated$: Observable<Tab[]>;
+  /**
+   * An observable that emits all currently active tabs whenever one or more active tabs change.
+   */
+  activeTabs$: Observable<Tab[]>;
 
+  /**
+   * An observable that emits tab events such as updates and activations.
+   */
+  tabEvents$: Observable<TabEvent>;
+
+  /**
+   * Set the badge state for a specific tab.
+   * If the tabId is undefined the state will be applied to the browser action in general.
+   */
   setState(state: RawBadgeState, tabId?: number): Promise<void>;
-  getTabs(): Promise<number[]>;
-  getActiveTabs(): Promise<Tab[]>;
 }
 
+export type TabEvent =
+  | {
+      type: "updated";
+      tab: Tab;
+    }
+  | {
+      type: "activated";
+      tab: Tab;
+    }
+  | {
+      type: "deactivated";
+      tabId: number;
+    };
+
 export class DefaultBadgeBrowserApi implements BadgeBrowserApi {
   private badgeAction = BrowserApi.getBrowserAction();
   private sidebarAction = BrowserApi.getSidebarAction(self);
@@ -44,18 +80,25 @@ export class DefaultBadgeBrowserApi implements BadgeBrowserApi {
     shareReplay({ bufferSize: 1, refCount: true }),
   );
 
-  activeTabsUpdated$ = concat(
-    defer(async () => await this.getActiveTabs()),
+  private createdOrUpdatedTabEvents$ = concat(
+    defer(async () => await this.getActiveTabs()).pipe(
+      switchMap((activeTabs) => {
+        const tabEvents: TabEvent[] = activeTabs.map((tab) => ({
+          type: "activated",
+          tab,
+        }));
+        return of(...tabEvents);
+      }),
+    ),
     merge(
       this.onTabActivated$.pipe(
-        switchMap(async (activeInfo) => {
-          const tab = await BrowserApi.getTab(activeInfo.tabId);
-
-          if (tab == undefined || tab.id == undefined || tab.url == undefined) {
-            return [];
-          }
-
-          return [tabFromChromeTab(tab)];
+        switchMap(async (activeInfo) => await BrowserApi.getTab(activeInfo.tabId)),
+        filter(
+          (tab): tab is chrome.tabs.Tab =>
+            !(tab == undefined || tab.id == undefined || tab.url == undefined),
+        ),
+        switchMap(async (tab) => {
+          return { type: "activated", tab: tabFromChromeTab(tab) } satisfies TabEvent;
         }),
       ),
       fromChromeEvent(chrome.tabs.onUpdated).pipe(
@@ -64,22 +107,58 @@ export class DefaultBadgeBrowserApi implements BadgeBrowserApi {
             // Only emit if the url was updated
             changeInfo.url != undefined,
         ),
-        map(([_tabId, _changeInfo, tab]) => [tabFromChromeTab(tab)]),
+        map(
+          ([_tabId, _changeInfo, tab]) =>
+            ({ type: "updated", tab: tabFromChromeTab(tab) }) satisfies TabEvent,
+        ),
       ),
       fromChromeEvent(chrome.webNavigation.onCommitted).pipe(
+        filter(([details]) => details.transitionType === "reload"),
         map(([details]) => {
-          const toReturn: Tab[] =
-            details.transitionType === "reload" ? [{ tabId: details.tabId, url: details.url }] : [];
-          return toReturn;
+          return {
+            type: "updated",
+            tab: { tabId: details.tabId, url: details.url },
+          } satisfies TabEvent;
         }),
       ),
       // NOTE: We're only sharing the active tab changes, not the full list of active tabs.
       // This is so that any new subscriber will get the latest active tabs immediately, but
       // doesn't re-subscribe to chrome events.
     ).pipe(shareReplay({ bufferSize: 1, refCount: true })),
-  ).pipe(filter((tabs) => tabs.length > 0));
+  );
 
-  async getActiveTabs(): Promise<Tab[]> {
+  tabEvents$ = merge(
+    this.createdOrUpdatedTabEvents$,
+    this.createdOrUpdatedTabEvents$.pipe(
+      concatMap(async () => {
+        return this.getActiveTabs();
+      }),
+      pairwise(),
+      map(([previousTabs, currentTabs]) => {
+        const previousTabIds = previousTabs.map((t) => t.tabId);
+        const currentTabIds = currentTabs.map((t) => t.tabId);
+
+        const deactivatedTabIds = previousTabIds.filter((id) => !currentTabIds.includes(id));
+
+        return deactivatedTabIds.map(
+          (tabId) =>
+            ({
+              type: "deactivated",
+              tabId,
+            }) satisfies TabEvent,
+        );
+      }),
+      switchMap((events) => of(...events)),
+    ),
+  );
+
+  activeTabs$ = this.tabEvents$.pipe(
+    concatMap(async () => {
+      return this.getActiveTabs();
+    }),
+  );
+
+  private async getActiveTabs(): Promise<Tab[]> {
     const tabs = await BrowserApi.getActiveTabs();
     return tabs.filter((tab) => tab.id != undefined && tab.url != undefined).map(tabFromChromeTab);
   }
@@ -96,10 +175,6 @@ export class DefaultBadgeBrowserApi implements BadgeBrowserApi {
     ]);
   }
 
-  async getTabs(): Promise<number[]> {
-    return (await BrowserApi.tabsQuery({})).map((tab) => tab.id).filter((tab) => tab !== undefined);
-  }
-
   private setIcon(icon: IconPaths, tabId?: number) {
     return Promise.all([this.setActionIcon(icon, tabId), this.setSidebarActionIcon(icon, tabId)]);
   }
diff --git a/apps/browser/src/platform/badge/badge.service.spec.ts b/apps/browser/src/platform/badge/badge.service.spec.ts
index d17e5dc0b5f..815941541e6 100644
--- a/apps/browser/src/platform/badge/badge.service.spec.ts
+++ b/apps/browser/src/platform/badge/badge.service.spec.ts
@@ -1,11 +1,10 @@
 import { mock, MockProxy } from "jest-mock-extended";
-import { Subscription } from "rxjs";
+import { EMPTY, Observable, of, Subscription } from "rxjs";
 
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { FakeAccountService, FakeStateProvider } from "@bitwarden/common/spec";
 
 import { RawBadgeState } from "./badge-browser-api";
-import { BadgeService } from "./badge.service";
+import { BadgeService, BadgeStateFunction } from "./badge.service";
 import { DefaultBadgeState } from "./consts";
 import { BadgeIcon } from "./icon";
 import { BadgeStatePriority } from "./priority";
@@ -14,7 +13,6 @@ import { MockBadgeBrowserApi } from "./test/mock-badge-browser-api";
 
 describe("BadgeService", () => {
   let badgeApi: MockBadgeBrowserApi;
-  let stateProvider: FakeStateProvider;
   let logService!: MockProxy<LogService>;
   let badgeService!: BadgeService;
 
@@ -22,626 +20,834 @@ describe("BadgeService", () => {
 
   beforeEach(() => {
     badgeApi = new MockBadgeBrowserApi();
-    stateProvider = new FakeStateProvider(new FakeAccountService({}));
     logService = mock<LogService>();
 
-    badgeService = new BadgeService(stateProvider, badgeApi, logService);
+    badgeService = new BadgeService(badgeApi, logService, 0);
   });
 
   afterEach(() => {
     badgeServiceSubscription?.unsubscribe();
   });
 
-  describe("calling without tabId", () => {
-    const tabId = 1;
-
-    describe("given a single tab is open", () => {
-      beforeEach(() => {
-        badgeApi.tabs = [tabId];
-        badgeApi.setActiveTabs([tabId]);
-        badgeServiceSubscription = badgeService.startListening();
-      });
-
-      it("sets provided state when no other state has been set", async () => {
-        const state: BadgeState = {
-          text: "text",
-          backgroundColor: "color",
-          icon: BadgeIcon.Locked,
-        };
-
-        await badgeService.setState("state-name", BadgeStatePriority.Default, state);
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual(state);
-      });
-
-      it("sets default values when none are provided", async () => {
-        // This is a bit of a weird thing to do, but I don't think it's something we need to prohibit
-        const state: BadgeState = {};
-
-        await badgeService.setState("state-name", BadgeStatePriority.Default, state);
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
-      });
-
-      it("merges states when multiple same-priority states have been set", async () => {
-        await badgeService.setState("state-1", BadgeStatePriority.Default, { text: "text" });
-        await badgeService.setState("state-2", BadgeStatePriority.Default, {
-          backgroundColor: "#fff",
-        });
-        await badgeService.setState("state-3", BadgeStatePriority.Default, {
-          icon: BadgeIcon.Locked,
-        });
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        const expectedState: RawBadgeState = {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        };
-        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
-      });
-
-      it("overrides previous lower-priority state when higher-priority state is set", async () => {
-        await badgeService.setState("state-1", BadgeStatePriority.Low, {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        });
-        await badgeService.setState("state-2", BadgeStatePriority.Default, {
-          text: "override",
-        });
-        await badgeService.setState("state-3", BadgeStatePriority.High, {
-          backgroundColor: "#aaa",
-        });
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        const expectedState: RawBadgeState = {
-          text: "override",
-          backgroundColor: "#aaa",
-          icon: BadgeIcon.Locked,
-        };
-        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
-      });
-
-      it("removes override when a previously high-priority state is cleared", async () => {
-        await badgeService.setState("state-1", BadgeStatePriority.Low, {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        });
-        await badgeService.setState("state-2", BadgeStatePriority.Default, {
-          text: "override",
-        });
-        await badgeService.clearState("state-2");
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        const expectedState: RawBadgeState = {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        };
-        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
-      });
-
-      it("sets default values when all states have been cleared", async () => {
-        await badgeService.setState("state-1", BadgeStatePriority.Low, {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        });
-        await badgeService.setState("state-2", BadgeStatePriority.Default, {
-          text: "override",
-        });
-        await badgeService.setState("state-3", BadgeStatePriority.High, {
-          backgroundColor: "#aaa",
-        });
-        await badgeService.clearState("state-1");
-        await badgeService.clearState("state-2");
-        await badgeService.clearState("state-3");
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
-      });
-
-      it("sets default value high-priority state contains Unset", async () => {
-        await badgeService.setState("state-1", BadgeStatePriority.Low, {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        });
-        await badgeService.setState("state-3", BadgeStatePriority.High, {
-          icon: Unset,
-        });
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        const expectedState: RawBadgeState = {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: DefaultBadgeState.icon,
-        };
-        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
-      });
-
-      it("ignores medium-priority Unset when high-priority contains a value", async () => {
-        await badgeService.setState("state-1", BadgeStatePriority.Low, {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        });
-        await badgeService.setState("state-3", BadgeStatePriority.Default, {
-          icon: Unset,
-        });
-        await badgeService.setState("state-3", BadgeStatePriority.High, {
-          icon: BadgeIcon.Unlocked,
-        });
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        const expectedState: RawBadgeState = {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Unlocked,
-        };
-        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
-      });
-    });
-
-    describe("given multiple tabs are open, only one active", () => {
-      const tabId = 1;
-      const tabIds = [1, 2, 3];
-
-      beforeEach(() => {
-        badgeApi.tabs = tabIds;
-        badgeApi.setActiveTabs([tabId]);
-        badgeServiceSubscription = badgeService.startListening();
-      });
-
-      it("sets general state for active tab when no other state has been set", async () => {
-        const state: BadgeState = {
-          text: "text",
-          backgroundColor: "color",
-          icon: BadgeIcon.Locked,
-        };
-
-        await badgeService.setState("state-name", BadgeStatePriority.Default, state);
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates).toEqual({
-          1: state,
-          2: undefined,
-          3: undefined,
-        });
-      });
-
-      it("only updates the active tab when setting state", async () => {
-        const state: BadgeState = {
-          text: "text",
-          backgroundColor: "color",
-          icon: BadgeIcon.Locked,
-        };
-        badgeApi.setState.mockReset();
-
-        await badgeService.setState("state-1", BadgeStatePriority.Default, state, tabId);
-        await badgeService.setState("state-2", BadgeStatePriority.Default, state, 2);
-        await badgeService.setState("state-2", BadgeStatePriority.Default, state, 2);
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.setState).toHaveBeenCalledTimes(1);
-      });
-    });
-
-    describe("given multiple tabs are open and multiple are active", () => {
-      const activeTabIds = [1, 2];
-      const tabIds = [1, 2, 3];
-
-      beforeEach(() => {
-        badgeApi.tabs = tabIds;
-        badgeApi.setActiveTabs(activeTabIds);
-        badgeServiceSubscription = badgeService.startListening();
-      });
-
-      it("sets general state for active tabs when no other state has been set", async () => {
-        const state: BadgeState = {
-          text: "text",
-          backgroundColor: "color",
-          icon: BadgeIcon.Locked,
-        };
-
-        await badgeService.setState("state-name", BadgeStatePriority.Default, state);
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates).toEqual({
-          1: state,
-          2: state,
-          3: undefined,
-        });
-      });
-
-      it("only updates the active tabs when setting general state", async () => {
-        const state: BadgeState = {
-          text: "text",
-          backgroundColor: "color",
-          icon: BadgeIcon.Locked,
-        };
-        badgeApi.setState.mockReset();
-
-        await badgeService.setState("state-1", BadgeStatePriority.Default, state, 1);
-        await badgeService.setState("state-2", BadgeStatePriority.Default, state, 2);
-        await badgeService.setState("state-3", BadgeStatePriority.Default, state, 3);
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.setState).toHaveBeenCalledTimes(2);
-      });
-    });
-  });
-
-  describe("calling with tabId", () => {
-    describe("given a single tab is open", () => {
+  describe("static state", () => {
+    describe("calling without tabId", () => {
       const tabId = 1;
 
-      beforeEach(() => {
-        badgeApi.tabs = [tabId];
-        badgeApi.setActiveTabs([tabId]);
-        badgeServiceSubscription = badgeService.startListening();
-      });
-
-      it("sets provided state when no other state has been set", async () => {
-        const state: BadgeState = {
-          text: "text",
-          backgroundColor: "color",
-          icon: BadgeIcon.Locked,
-        };
-
-        await badgeService.setState("state-name", BadgeStatePriority.Default, state, tabId);
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual(state);
-      });
-
-      it("sets default values when none are provided", async () => {
-        // This is a bit of a weird thing to do, but I don't think it's something we need to prohibit
-        const state: BadgeState = {};
-
-        await badgeService.setState("state-name", BadgeStatePriority.Default, state, tabId);
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
-      });
-
-      it("merges tabId specific state with general states", async () => {
-        await badgeService.setState("general-state", BadgeStatePriority.Default, { text: "text" });
-        await badgeService.setState(
-          "specific-state",
-          BadgeStatePriority.Default,
-          {
-            backgroundColor: "#fff",
-          },
-          tabId,
-        );
-        await badgeService.setState("general-state-2", BadgeStatePriority.Default, {
-          icon: BadgeIcon.Locked,
+      describe("given a single tab is open", () => {
+        beforeEach(() => {
+          badgeApi.tabs = [tabId];
+          badgeApi.setActiveTabs([tabId]);
+          badgeServiceSubscription = badgeService.startListening();
         });
 
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual({
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        });
-      });
-
-      it("merges states when multiple same-priority states with the same tabId have been set", async () => {
-        await badgeService.setState("state-1", BadgeStatePriority.Default, { text: "text" }, tabId);
-        await badgeService.setState(
-          "state-2",
-          BadgeStatePriority.Default,
-          {
-            backgroundColor: "#fff",
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-3",
-          BadgeStatePriority.Default,
-          {
+        it("sets provided state when no other state has been set", async () => {
+          const state: BadgeState = {
+            text: "text",
+            backgroundColor: "color",
             icon: BadgeIcon.Locked,
-          },
-          tabId,
-        );
+          };
 
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        const expectedState: RawBadgeState = {
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
-        };
-        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
-      });
+          await badgeService.setState(
+            "state-name",
+            GeneralStateFunction(BadgeStatePriority.Default, state),
+          );
 
-      it("overrides previous lower-priority state when higher-priority state with the same tabId is set", async () => {
-        await badgeService.setState(
-          "state-1",
-          BadgeStatePriority.Low,
-          {
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual(state);
+        });
+
+        it("sets default values when none are provided", async () => {
+          // This is a bit of a weird thing to do, but I don't think it's something we need to prohibit
+          const state: BadgeState = {};
+
+          await badgeService.setState(
+            "state-name",
+            GeneralStateFunction(BadgeStatePriority.Default, state),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+        });
+
+        it("sets default values even if state function never emits", async () => {
+          badgeService.setState("state-name", (_tab) => EMPTY);
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+        });
+
+        it("merges states when multiple same-priority states have been set", async () => {
+          await badgeService.setState(
+            "state-1",
+            GeneralStateFunction(BadgeStatePriority.Default, { text: "text" }),
+          );
+          await badgeService.setState(
+            "state-2",
+            GeneralStateFunction(BadgeStatePriority.Default, {
+              backgroundColor: "#fff",
+            }),
+          );
+          await badgeService.setState(
+            "state-3",
+            GeneralStateFunction(BadgeStatePriority.Default, {
+              icon: BadgeIcon.Locked,
+            }),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          const expectedState: RawBadgeState = {
             text: "text",
             backgroundColor: "#fff",
             icon: BadgeIcon.Locked,
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-2",
-          BadgeStatePriority.Default,
-          {
+          };
+          expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+        });
+
+        it("overrides previous lower-priority state when higher-priority state is set", async () => {
+          await badgeService.setState(
+            "state-1",
+            GeneralStateFunction(BadgeStatePriority.Low, {
+              text: "text",
+              backgroundColor: "#fff",
+              icon: BadgeIcon.Locked,
+            }),
+          );
+          await badgeService.setState(
+            "state-2",
+            GeneralStateFunction(BadgeStatePriority.Default, {
+              text: "override",
+            }),
+          );
+          await badgeService.setState(
+            "state-3",
+            GeneralStateFunction(BadgeStatePriority.High, {
+              backgroundColor: "#aaa",
+            }),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          const expectedState: RawBadgeState = {
             text: "override",
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-3",
-          BadgeStatePriority.High,
-          {
             backgroundColor: "#aaa",
-          },
-          tabId,
-        );
+            icon: BadgeIcon.Locked,
+          };
+          expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+        });
 
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        const expectedState: RawBadgeState = {
-          text: "override",
-          backgroundColor: "#aaa",
-          icon: BadgeIcon.Locked,
-        };
-        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
-      });
+        it("removes override when a previously high-priority state is cleared", async () => {
+          await badgeService.setState(
+            "state-1",
+            GeneralStateFunction(BadgeStatePriority.Low, {
+              text: "text",
+              backgroundColor: "#fff",
+              icon: BadgeIcon.Locked,
+            }),
+          );
+          await badgeService.setState(
+            "state-2",
+            GeneralStateFunction(BadgeStatePriority.Default, {
+              text: "override",
+            }),
+          );
+          await badgeService.clearState("state-2");
 
-      it("overrides lower-priority tab-specific state when higher-priority general state is set", async () => {
-        await badgeService.setState(
-          "state-1",
-          BadgeStatePriority.Low,
-          {
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          const expectedState: RawBadgeState = {
             text: "text",
             backgroundColor: "#fff",
             icon: BadgeIcon.Locked,
-          },
-          tabId,
-        );
-        await badgeService.setState("state-2", BadgeStatePriority.Default, {
-          text: "override",
-        });
-        await badgeService.setState("state-3", BadgeStatePriority.High, {
-          backgroundColor: "#aaa",
+          };
+          expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
         });
 
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual({
-          text: "override",
-          backgroundColor: "#aaa",
-          icon: BadgeIcon.Locked,
-        });
-      });
+        it("sets default values when all states have been cleared", async () => {
+          await badgeService.setState(
+            "state-1",
+            GeneralStateFunction(BadgeStatePriority.Low, {
+              text: "text",
+              backgroundColor: "#fff",
+              icon: BadgeIcon.Locked,
+            }),
+          );
+          await badgeService.setState(
+            "state-2",
+            GeneralStateFunction(BadgeStatePriority.Default, {
+              text: "override",
+            }),
+          );
+          await badgeService.setState(
+            "state-3",
+            GeneralStateFunction(BadgeStatePriority.High, {
+              backgroundColor: "#aaa",
+            }),
+          );
+          await badgeService.clearState("state-1");
+          await badgeService.clearState("state-2");
+          await badgeService.clearState("state-3");
 
-      it("removes override when a previously high-priority state with the same tabId is cleared", async () => {
-        await badgeService.setState(
-          "state-1",
-          BadgeStatePriority.Low,
-          {
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+        });
+
+        it("sets default value high-priority state contains Unset", async () => {
+          await badgeService.setState(
+            "state-1",
+            GeneralStateFunction(BadgeStatePriority.Low, {
+              text: "text",
+              backgroundColor: "#fff",
+              icon: BadgeIcon.Locked,
+            }),
+          );
+          await badgeService.setState(
+            "state-3",
+            GeneralStateFunction(BadgeStatePriority.High, {
+              icon: Unset,
+            }),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          const expectedState: RawBadgeState = {
             text: "text",
             backgroundColor: "#fff",
-            icon: BadgeIcon.Locked,
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-2",
-          BadgeStatePriority.Default,
-          {
-            text: "override",
-          },
-          tabId,
-        );
-        await badgeService.clearState("state-2");
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual({
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Locked,
+            icon: DefaultBadgeState.icon,
+          };
+          expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
         });
-      });
 
-      it("sets default state when all states with the same tabId have been cleared", async () => {
-        await badgeService.setState(
-          "state-1",
-          BadgeStatePriority.Low,
-          {
+        it("ignores medium-priority Unset when high-priority contains a value", async () => {
+          await badgeService.setState(
+            "state-1",
+            GeneralStateFunction(BadgeStatePriority.Low, {
+              text: "text",
+              backgroundColor: "#fff",
+              icon: BadgeIcon.Locked,
+            }),
+          );
+          await badgeService.setState(
+            "state-3",
+            GeneralStateFunction(BadgeStatePriority.Default, {
+              icon: Unset,
+            }),
+          );
+          await badgeService.setState(
+            "state-3",
+            GeneralStateFunction(BadgeStatePriority.High, {
+              icon: BadgeIcon.Unlocked,
+            }),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          const expectedState: RawBadgeState = {
             text: "text",
             backgroundColor: "#fff",
-            icon: BadgeIcon.Locked,
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-2",
-          BadgeStatePriority.Default,
-          {
-            text: "override",
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-3",
-          BadgeStatePriority.High,
-          {
-            backgroundColor: "#aaa",
-          },
-          tabId,
-        );
-        await badgeService.clearState("state-1");
-        await badgeService.clearState("state-2");
-        await badgeService.clearState("state-3");
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
-      });
-
-      it("sets default value when high-priority state contains Unset", async () => {
-        await badgeService.setState(
-          "state-1",
-          BadgeStatePriority.Low,
-          {
-            text: "text",
-            backgroundColor: "#fff",
-            icon: BadgeIcon.Locked,
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-3",
-          BadgeStatePriority.High,
-          {
-            icon: Unset,
-          },
-          tabId,
-        );
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual({
-          text: "text",
-          backgroundColor: "#fff",
-          icon: DefaultBadgeState.icon,
-        });
-      });
-
-      it("ignores medium-priority Unset when high-priority contains a value", async () => {
-        await badgeService.setState(
-          "state-1",
-          BadgeStatePriority.Low,
-          {
-            text: "text",
-            backgroundColor: "#fff",
-            icon: BadgeIcon.Locked,
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-3",
-          BadgeStatePriority.Default,
-          {
-            icon: Unset,
-          },
-          tabId,
-        );
-        await badgeService.setState(
-          "state-3",
-          BadgeStatePriority.High,
-          {
             icon: BadgeIcon.Unlocked,
-          },
-          tabId,
-        );
+          };
+          expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+        });
+      });
 
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates[tabId]).toEqual({
-          text: "text",
-          backgroundColor: "#fff",
-          icon: BadgeIcon.Unlocked,
+      describe("given multiple tabs are open, only one active", () => {
+        const tabId = 1;
+        const tabIds = [1, 2, 3];
+
+        beforeEach(() => {
+          badgeApi.tabs = tabIds;
+          badgeApi.setActiveTabs([tabId]);
+          badgeServiceSubscription = badgeService.startListening();
+        });
+
+        it("sets general state for active tab when no other state has been set", async () => {
+          const state: BadgeState = {
+            text: "text",
+            backgroundColor: "color",
+            icon: BadgeIcon.Locked,
+          };
+
+          await badgeService.setState(
+            "state-name",
+            GeneralStateFunction(BadgeStatePriority.Default, state),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates).toEqual({
+            1: state,
+            2: undefined,
+            3: undefined,
+          });
+        });
+
+        it("only updates the active tab when setting state", async () => {
+          const state: BadgeState = {
+            text: "text",
+            backgroundColor: "color",
+            icon: BadgeIcon.Locked,
+          };
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(BadgeStatePriority.Default, state, tabId),
+          );
+          await badgeService.setState(
+            "state-2",
+            TabSpecificStateFunction(BadgeStatePriority.Default, state, 2),
+          );
+          await badgeService.setState(
+            "state-2",
+            TabSpecificStateFunction(BadgeStatePriority.Default, state, 2),
+          );
+          await new Promise((resolve) => setTimeout(resolve, 0));
+
+          badgeApi.setState.mockReset();
+          badgeApi.updateTab(tabId);
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.setState).toHaveBeenCalledTimes(1);
+        });
+      });
+
+      describe("given multiple tabs are open and multiple are active", () => {
+        const activeTabIds = [1, 2];
+        const tabIds = [1, 2, 3];
+
+        beforeEach(() => {
+          badgeApi.tabs = tabIds;
+          badgeApi.setActiveTabs(activeTabIds);
+          badgeServiceSubscription = badgeService.startListening();
+        });
+
+        it("sets general state for active tabs when no other state has been set", async () => {
+          const state: BadgeState = {
+            text: "text",
+            backgroundColor: "color",
+            icon: BadgeIcon.Locked,
+          };
+
+          await badgeService.setState(
+            "state-name",
+            GeneralStateFunction(BadgeStatePriority.Default, state),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates).toEqual({
+            1: state,
+            2: state,
+            3: undefined,
+          });
+        });
+
+        it("only updates the active tabs when setting general state", async () => {
+          const state: BadgeState = {
+            text: "text",
+            backgroundColor: "color",
+            icon: BadgeIcon.Locked,
+          };
+
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(BadgeStatePriority.Default, state, 1),
+          );
+          await badgeService.setState(
+            "state-2",
+            TabSpecificStateFunction(BadgeStatePriority.Default, state, 2),
+          );
+          await badgeService.setState(
+            "state-3",
+            TabSpecificStateFunction(BadgeStatePriority.Default, state, 3),
+          );
+          await new Promise((resolve) => setTimeout(resolve, 0));
+
+          badgeApi.setState.mockReset();
+          badgeApi.updateTab(activeTabIds[0]);
+          badgeApi.updateTab(activeTabIds[1]);
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.setState).toHaveBeenCalledTimes(2);
         });
       });
     });
 
-    describe("given multiple tabs are open, only one active", () => {
-      const tabId = 1;
-      const tabIds = [1, 2, 3];
+    describe("setting tab-specific states", () => {
+      describe("given a single tab is open", () => {
+        const tabId = 1;
 
-      beforeEach(() => {
-        badgeApi.tabs = tabIds;
-        badgeApi.setActiveTabs([tabId]);
-        badgeServiceSubscription = badgeService.startListening();
-      });
-
-      it("sets tab-specific state for provided tab", async () => {
-        const generalState: BadgeState = {
-          text: "general-text",
-          backgroundColor: "general-color",
-          icon: BadgeIcon.Unlocked,
-        };
-        const specificState: BadgeState = {
-          text: "tab-text",
-          icon: BadgeIcon.Locked,
-        };
-
-        await badgeService.setState("general-state", BadgeStatePriority.Default, generalState);
-        await badgeService.setState(
-          "tab-state",
-          BadgeStatePriority.Default,
-          specificState,
-          tabIds[0],
-        );
-
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates).toEqual({
-          [tabIds[0]]: { ...specificState, backgroundColor: "general-color" },
-          [tabIds[1]]: undefined,
-          [tabIds[2]]: undefined,
+        beforeEach(() => {
+          badgeApi.tabs = [tabId];
+          badgeApi.setActiveTabs([tabId]);
+          badgeServiceSubscription = badgeService.startListening();
         });
-      });
-    });
 
-    describe("given multiple tabs are open and multiple are active", () => {
-      const activeTabIds = [1, 2];
-      const tabIds = [1, 2, 3];
+        it("sets provided state when no other state has been set", async () => {
+          const state: BadgeState = {
+            text: "text",
+            backgroundColor: "color",
+            icon: BadgeIcon.Locked,
+          };
 
-      beforeEach(() => {
-        badgeApi.tabs = tabIds;
-        badgeApi.setActiveTabs(activeTabIds);
-        badgeServiceSubscription = badgeService.startListening();
-      });
+          await badgeService.setState(
+            "state-name",
+            TabSpecificStateFunction(BadgeStatePriority.Default, state, tabId),
+          );
 
-      it("sets general state for all active tabs when no other state has been set", async () => {
-        const generalState: BadgeState = {
-          text: "general-text",
-          backgroundColor: "general-color",
-          icon: BadgeIcon.Unlocked,
-        };
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual(state);
+        });
 
-        await badgeService.setState("general-state", BadgeStatePriority.Default, generalState);
+        it("sets default values when none are provided", async () => {
+          // This is a bit of a weird thing to do, but I don't think it's something we need to prohibit
+          const state: BadgeState = {};
 
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates).toEqual({
-          [tabIds[0]]: generalState,
-          [tabIds[1]]: generalState,
-          [tabIds[2]]: undefined,
+          await badgeService.setState(
+            "state-name",
+            TabSpecificStateFunction(BadgeStatePriority.Default, state, tabId),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+        });
+
+        it("merges tabId specific state with general states", async () => {
+          await badgeService.setState(
+            "general-state",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Default,
+              {
+                text: "text",
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "specific-state",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Default,
+              {
+                backgroundColor: "#fff",
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "general-state-2",
+            GeneralStateFunction(BadgeStatePriority.Default, {
+              icon: BadgeIcon.Locked,
+            }),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual({
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          });
+        });
+
+        it("merges states when multiple same-priority states with the same tabId have been set", async () => {
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(BadgeStatePriority.Default, { text: "text" }, tabId),
+          );
+          await badgeService.setState(
+            "state-2",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Default,
+              {
+                backgroundColor: "#fff",
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-3",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Default,
+              {
+                icon: BadgeIcon.Locked,
+              },
+              tabId,
+            ),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          const expectedState: RawBadgeState = {
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          };
+          expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+        });
+
+        it("overrides previous lower-priority state when higher-priority state with the same tabId is set", async () => {
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Low,
+              {
+                text: "text",
+                backgroundColor: "#fff",
+                icon: BadgeIcon.Locked,
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-2",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Default,
+              {
+                text: "override",
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-3",
+            TabSpecificStateFunction(
+              BadgeStatePriority.High,
+              {
+                backgroundColor: "#aaa",
+              },
+              tabId,
+            ),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          const expectedState: RawBadgeState = {
+            text: "override",
+            backgroundColor: "#aaa",
+            icon: BadgeIcon.Locked,
+          };
+          expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+        });
+
+        it("overrides lower-priority tab-specific state when higher-priority general state is set", async () => {
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Low,
+              {
+                text: "text",
+                backgroundColor: "#fff",
+                icon: BadgeIcon.Locked,
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-2",
+            GeneralStateFunction(BadgeStatePriority.Default, {
+              text: "override",
+            }),
+          );
+          await badgeService.setState(
+            "state-3",
+            GeneralStateFunction(BadgeStatePriority.High, {
+              backgroundColor: "#aaa",
+            }),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual({
+            text: "override",
+            backgroundColor: "#aaa",
+            icon: BadgeIcon.Locked,
+          });
+        });
+
+        it("removes override when a previously high-priority state with the same tabId is cleared", async () => {
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Low,
+              {
+                text: "text",
+                backgroundColor: "#fff",
+                icon: BadgeIcon.Locked,
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-2",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Default,
+              {
+                text: "override",
+              },
+              tabId,
+            ),
+          );
+          await badgeService.clearState("state-2");
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual({
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          });
+        });
+
+        it("sets default state when all states with the same tabId have been cleared", async () => {
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Low,
+              {
+                text: "text",
+                backgroundColor: "#fff",
+                icon: BadgeIcon.Locked,
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-2",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Default,
+              {
+                text: "override",
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-3",
+            TabSpecificStateFunction(
+              BadgeStatePriority.High,
+              {
+                backgroundColor: "#aaa",
+              },
+              tabId,
+            ),
+          );
+          await badgeService.clearState("state-1");
+          await badgeService.clearState("state-2");
+          await badgeService.clearState("state-3");
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+        });
+
+        it("sets default value when high-priority state contains Unset", async () => {
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Low,
+              {
+                text: "text",
+                backgroundColor: "#fff",
+                icon: BadgeIcon.Locked,
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-3",
+            TabSpecificStateFunction(
+              BadgeStatePriority.High,
+              {
+                icon: Unset,
+              },
+              tabId,
+            ),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual({
+            text: "text",
+            backgroundColor: "#fff",
+            icon: DefaultBadgeState.icon,
+          });
+        });
+
+        it("ignores medium-priority Unset when high-priority contains a value", async () => {
+          await badgeService.setState(
+            "state-1",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Low,
+              {
+                text: "text",
+                backgroundColor: "#fff",
+                icon: BadgeIcon.Locked,
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-3",
+            TabSpecificStateFunction(
+              BadgeStatePriority.Default,
+              {
+                icon: Unset,
+              },
+              tabId,
+            ),
+          );
+          await badgeService.setState(
+            "state-3",
+            TabSpecificStateFunction(
+              BadgeStatePriority.High,
+              {
+                icon: BadgeIcon.Unlocked,
+              },
+              tabId,
+            ),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates[tabId]).toEqual({
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Unlocked,
+          });
         });
       });
 
-      it("sets tab-specific state for provided tab", async () => {
-        const generalState: BadgeState = {
-          text: "general-text",
-          backgroundColor: "general-color",
-          icon: BadgeIcon.Unlocked,
-        };
-        const specificState: BadgeState = {
-          text: "tab-text",
-          icon: BadgeIcon.Locked,
-        };
+      describe("given multiple tabs are open, only one active", () => {
+        const tabId = 1;
+        const tabIds = [1, 2, 3];
 
-        await badgeService.setState("general-state", BadgeStatePriority.Default, generalState);
-        await badgeService.setState(
-          "tab-state",
-          BadgeStatePriority.Default,
-          specificState,
-          tabIds[0],
-        );
+        beforeEach(() => {
+          badgeApi.tabs = tabIds;
+          badgeApi.setActiveTabs([tabId]);
+          badgeServiceSubscription = badgeService.startListening();
+        });
 
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        expect(badgeApi.specificStates).toEqual({
-          [tabIds[0]]: { ...specificState, backgroundColor: "general-color" },
-          [tabIds[1]]: generalState,
-          [tabIds[2]]: undefined,
+        it("sets tab-specific state for provided tab", async () => {
+          const generalState: BadgeState = {
+            text: "general-text",
+            backgroundColor: "general-color",
+            icon: BadgeIcon.Unlocked,
+          };
+          const specificState: BadgeState = {
+            text: "tab-text",
+            icon: BadgeIcon.Locked,
+          };
+
+          await badgeService.setState(
+            "general-state",
+            GeneralStateFunction(BadgeStatePriority.Default, generalState),
+          );
+          await badgeService.setState(
+            "tab-state",
+            TabSpecificStateFunction(BadgeStatePriority.Default, specificState, tabIds[0]),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates).toEqual({
+            [tabIds[0]]: { ...specificState, backgroundColor: "general-color" },
+            [tabIds[1]]: undefined,
+            [tabIds[2]]: undefined,
+          });
+        });
+      });
+
+      describe("given multiple tabs are open and multiple are active", () => {
+        const activeTabIds = [1, 2];
+        const tabIds = [1, 2, 3];
+
+        beforeEach(() => {
+          badgeApi.tabs = tabIds;
+          badgeApi.setActiveTabs(activeTabIds);
+          badgeServiceSubscription = badgeService.startListening();
+        });
+
+        it("sets general state for all active tabs when no other state has been set", async () => {
+          const generalState: BadgeState = {
+            text: "general-text",
+            backgroundColor: "general-color",
+            icon: BadgeIcon.Unlocked,
+          };
+
+          await badgeService.setState(
+            "general-state",
+            GeneralStateFunction(BadgeStatePriority.Default, generalState),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates).toEqual({
+            [tabIds[0]]: generalState,
+            [tabIds[1]]: generalState,
+            [tabIds[2]]: undefined,
+          });
+        });
+
+        it("sets tab-specific state for provided tab", async () => {
+          const generalState: BadgeState = {
+            text: "general-text",
+            backgroundColor: "general-color",
+            icon: BadgeIcon.Unlocked,
+          };
+          const specificState: BadgeState = {
+            text: "tab-text",
+            icon: BadgeIcon.Locked,
+          };
+
+          await badgeService.setState(
+            "general-state",
+            GeneralStateFunction(BadgeStatePriority.Default, generalState),
+          );
+          await badgeService.setState(
+            "tab-state",
+            TabSpecificStateFunction(BadgeStatePriority.Default, specificState, tabIds[0]),
+          );
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(badgeApi.specificStates).toEqual({
+            [tabIds[0]]: { ...specificState, backgroundColor: "general-color" },
+            [tabIds[1]]: generalState,
+            [tabIds[2]]: undefined,
+          });
+        });
+
+        it("unsubscribes from state function when tab is deactivated", async () => {
+          let subscriptions = 0;
+          badgeService.setState("state", (tab) => {
+            return new Observable(() => {
+              subscriptions++;
+              return () => {
+                subscriptions--;
+              };
+            });
+          });
+
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(subscriptions).toBe(activeTabIds.length);
+
+          badgeApi.deactivateTab(activeTabIds[0]);
+          await new Promise((resolve) => setTimeout(resolve, 0));
+          expect(subscriptions).toBe(activeTabIds.length - 1);
         });
       });
     });
   });
 });
+
+/**
+ * Creates a dynamic state function that only provides a state for a specific tab.
+ */
+function TabSpecificStateFunction(
+  priority: BadgeStatePriority,
+  state: BadgeState,
+  tabId: number,
+): BadgeStateFunction {
+  return (tab) => {
+    if (tab.tabId === tabId) {
+      return of({
+        priority,
+        state,
+      });
+    }
+
+    return EMPTY;
+  };
+}
+
+/**
+ * Creates a dynamic state function that provides the same state for all tabs.
+ */
+function GeneralStateFunction(priority: BadgeStatePriority, state: BadgeState): BadgeStateFunction {
+  return (_tab) =>
+    of({
+      priority,
+      state,
+    });
+}
diff --git a/apps/browser/src/platform/badge/badge.service.ts b/apps/browser/src/platform/badge/badge.service.ts
index 5634aabec28..f6d799b2a80 100644
--- a/apps/browser/src/platform/badge/badge.service.ts
+++ b/apps/browser/src/platform/badge/badge.service.ts
@@ -1,69 +1,100 @@
-import { concatMap, filter, Subscription, withLatestFrom } from "rxjs";
+import {
+  BehaviorSubject,
+  combineLatest,
+  combineLatestWith,
+  concatMap,
+  debounceTime,
+  filter,
+  groupBy,
+  map,
+  mergeMap,
+  Observable,
+  of,
+  startWith,
+  Subscription,
+  switchMap,
+  takeUntil,
+} from "rxjs";
 
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import {
-  BADGE_MEMORY,
-  GlobalState,
-  KeyDefinition,
-  StateProvider,
-} from "@bitwarden/common/platform/state";
 
 import { BadgeBrowserApi, RawBadgeState, Tab } from "./badge-browser-api";
 import { DefaultBadgeState } from "./consts";
 import { BadgeStatePriority } from "./priority";
 import { BadgeState, Unset } from "./state";
 
-interface StateSetting {
+const BADGE_UPDATE_DEBOUNCE_MS = 100;
+
+export interface BadgeStateSetting {
   priority: BadgeStatePriority;
   state: BadgeState;
-  tabId?: number;
 }
 
-const BADGE_STATES = new KeyDefinition(BADGE_MEMORY, "badgeStates", {
-  deserializer: (value: Record<string, StateSetting>) => value ?? {},
-  cleanupDelayMs: 0,
-});
+/**
+ * A function that returns the badge state for a specific tab.
+ * Return `undefined` to clear any previously set state for the tab.
+ */
+export type BadgeStateFunction = (tab: Tab) => Observable<BadgeStateSetting | undefined>;
 
 export class BadgeService {
-  private serviceState: GlobalState<Record<string, StateSetting>>;
-
-  /**
-   * An observable that emits whenever one or multiple tabs are updated and might need its state updated.
-   * Use this to know exactly which tabs to calculate the badge state for.
-   * This is not the same as `onActivated` which only emits when the active tab changes.
-   */
-  activeTabsUpdated$ = this.badgeApi.activeTabsUpdated$;
-
-  getActiveTabs(): Promise<Tab[]> {
-    return this.badgeApi.getActiveTabs();
-  }
+  private stateFunctions = new BehaviorSubject<Record<string, BadgeStateFunction>>({});
 
   constructor(
-    private stateProvider: StateProvider,
     private badgeApi: BadgeBrowserApi,
     private logService: LogService,
-  ) {
-    this.serviceState = this.stateProvider.getGlobal(BADGE_STATES);
-  }
+    private debounceTimeMs: number = BADGE_UPDATE_DEBOUNCE_MS,
+  ) {}
 
   /**
    * Start listening for badge state changes.
    * Without this the service will not be able to update the badge state.
    */
   startListening(): Subscription {
-    // React to tab changes
-    return this.badgeApi.activeTabsUpdated$
+    // Default state function that always returns an empty state with lowest priority.
+    // This will ensure that there is always at least one state to consider when calculating the final badge state,
+    // so that the badge is cleared/set to default when no other states are set.
+    const defaultTabStateFunction: BadgeStateFunction = (_tab) =>
+      of({
+        priority: BadgeStatePriority.Low,
+        state: {},
+      });
+
+    return this.badgeApi.tabEvents$
       .pipe(
-        withLatestFrom(this.serviceState.state$),
-        filter(([activeTabs]) => activeTabs.length > 0),
-        concatMap(async ([activeTabs, serviceState]) => {
-          await Promise.all(activeTabs.map((tab) => this.updateBadge(serviceState, tab.tabId)));
+        groupBy((event) => (event.type === "deactivated" ? event.tabId : event.tab.tabId), {
+          duration: (group$) =>
+            // Allow clean up of group when deactivated event arrives for this tabId
+            group$.pipe(filter((evt) => evt.type === "deactivated")),
+        }),
+        mergeMap((group$) =>
+          group$.pipe(
+            // ignore deactivation events, only handle updates/activations
+            filter((evt) => evt.type !== "deactivated"),
+            map((evt) => evt.tab),
+            combineLatestWith(this.stateFunctions),
+            switchMap(([tab, dynamicStateFunctions]) => {
+              const functions = [...Object.values(dynamicStateFunctions), defaultTabStateFunction];
+
+              return combineLatest(functions.map((f) => f(tab).pipe(startWith(undefined)))).pipe(
+                map((states) => ({
+                  tab,
+                  states: states.filter((s): s is BadgeStateSetting => s !== undefined),
+                })),
+                debounceTime(this.debounceTimeMs),
+              );
+            }),
+            takeUntil(group$.pipe(filter((evt) => evt.type === "deactivated"))),
+          ),
+        ),
+
+        concatMap(async (tabUpdate) => {
+          await this.updateBadge(tabUpdate.states, tabUpdate.tab.tabId);
         }),
       )
       .subscribe({
         error: (error: unknown) => {
           this.logService.error(
-            "Fatal error in badge service observable, badge will fail to update",
+            "BadgeService: Fatal error updating badge state. Badge will no longer be updated.",
             error,
           );
         },
@@ -71,68 +102,45 @@ export class BadgeService {
   }
 
   /**
-   * Inform badge service of a new state that the badge should reflect.
+   * Register a function that takes an observable of active tab updates and returns an observable of state settings.
+   * This can be used to create dynamic badge states that react to tab changes.
+   * The returned observable should emit a new state setting whenever the badge state should be updated.
    *
-   * This will merge the new state with any existing states:
+   * This will merge all states:
    * - If the new state has a higher priority, it will override any lower priority states.
    * - If the new state has a lower priority, it will be ignored.
    * - If the name of the state is already in use, it will be updated.
    * - If the state has a `tabId` set, it will only apply to that tab.
    *   - States with `tabId` can still be overridden by states without `tabId` if they have a higher priority.
-   *
-   * @param name The name of the state. This is used to identify the state and will be used to clear it later.
-   * @param priority The priority of the state (higher numbers are higher priority, but setting arbitrary numbers is not supported).
-   * @param state The state to set.
-   * @param tabId Limit this badge state to a specific tab. If this is not set, the state will be applied to all tabs.
    */
-  async setState(name: string, priority: BadgeStatePriority, state: BadgeState, tabId?: number) {
-    const newServiceState = await this.serviceState.update((s) => ({
-      ...s,
-      [name]: { priority, state, tabId },
-    }));
-    await this.updateBadge(newServiceState, tabId);
+  setState(name: string, stateFunction: BadgeStateFunction) {
+    this.stateFunctions.next({
+      ...this.stateFunctions.value,
+      [name]: stateFunction,
+    });
   }
 
   /**
-   * Clear the state with the given name.
+   * Clear a state function previously registered with `setState`.
    *
-   * This will remove the state from the badge service and clear it from the badge.
-   * If the state is not found, nothing will happen.
+   * This will:
+   * - Stop the function from being called on future tab changes
+   * - Unsubscribe from any existing observables created by the function.
+   * - Clear any badge state previously set by the function.
    *
-   * @param name The name of the state to clear.
+   * @param name The name of the state function to clear.
    */
-  async clearState(name: string) {
-    let clearedState: StateSetting | undefined;
-
-    const newServiceState = await this.serviceState.update((s) => {
-      clearedState = s?.[name];
-
-      const newStates = { ...s };
-      delete newStates[name];
-      return newStates;
-    });
-
-    if (clearedState === undefined) {
-      return;
-    }
-    await this.updateBadge(newServiceState, clearedState.tabId);
+  clearState(name: string) {
+    const currentDynamicStateFunctions = this.stateFunctions.value;
+    const newDynamicStateFunctions = { ...currentDynamicStateFunctions };
+    delete newDynamicStateFunctions[name];
+    this.stateFunctions.next(newDynamicStateFunctions);
   }
 
-  private calculateState(states: Set<StateSetting>, tabId?: number): RawBadgeState {
-    const sortedStates = [...states].sort((a, b) => a.priority - b.priority);
+  private calculateState(states: BadgeStateSetting[]): RawBadgeState {
+    const sortedStates = states.sort((a, b) => a.priority - b.priority);
 
-    let filteredStates = sortedStates;
-    if (tabId !== undefined) {
-      // Filter out states that are not applicable to the current tab.
-      // If a state has no tabId, it is considered applicable to all tabs.
-      // If a state has a tabId, it is only applicable to that tab.
-      filteredStates = sortedStates.filter((s) => s.tabId === tabId || s.tabId === undefined);
-    } else {
-      // If no tabId is provided, we only want states that are not tab-specific.
-      filteredStates = sortedStates.filter((s) => s.tabId === undefined);
-    }
-
-    const mergedState = filteredStates
+    const mergedState = sortedStates
       .map((s) => s.state)
       .reduce<Partial<RawBadgeState>>((acc: Partial<RawBadgeState>, state: BadgeState) => {
         const newState = { ...acc };
@@ -156,43 +164,16 @@ export class BadgeService {
    * This will only update the badge if the active tab is the same as the tabId of the latest change.
    * If the active tab is not set, it will not update the badge.
    *
-   * @param activeTab The currently active tab.
    * @param serviceState The current state of the badge service. If this is null or undefined, an empty set will be assumed.
    * @param tabId Tab id for which the the latest state change applied to. Set this to activeTab.tabId to force an update.
+   * @param activeTabs The currently active tabs. If not provided, it will be fetched from the badge API.
    */
-  private async updateBadge(
-    serviceState: Record<string, StateSetting> | null | undefined,
-    tabId: number | undefined,
-  ) {
-    const activeTabs = await this.badgeApi.getActiveTabs();
-    if (tabId !== undefined && !activeTabs.some((tab) => tab.tabId === tabId)) {
-      return; // No need to update the badge if the state is not for the active tab.
-    }
-
-    const tabIdsToUpdate = tabId ? [tabId] : activeTabs.map((tab) => tab.tabId);
-
-    for (const tabId of tabIdsToUpdate) {
-      if (tabId === undefined) {
-        continue; // Skip if tab id is undefined.
-      }
-
-      const newBadgeState = this.calculateState(new Set(Object.values(serviceState ?? {})), tabId);
-      try {
-        await this.badgeApi.setState(newBadgeState, tabId);
-      } catch (error) {
-        this.logService.error("Failed to set badge state", error);
-      }
-    }
-
-    if (tabId === undefined) {
-      // If no tabId was provided we should also update the general badge state
-      const newBadgeState = this.calculateState(new Set(Object.values(serviceState ?? {})));
-
-      try {
-        await this.badgeApi.setState(newBadgeState, tabId);
-      } catch (error) {
-        this.logService.error("Failed to set general badge state", error);
-      }
+  private async updateBadge(serviceState: BadgeStateSetting[], tabId: number) {
+    const newBadgeState = this.calculateState(serviceState);
+    try {
+      await this.badgeApi.setState(newBadgeState, tabId);
+    } catch (error) {
+      this.logService.error("Failed to set badge state", error);
     }
   }
 }
diff --git a/apps/browser/src/platform/badge/scope.ts b/apps/browser/src/platform/badge/scope.ts
new file mode 100644
index 00000000000..5d6cb8dd4e7
--- /dev/null
+++ b/apps/browser/src/platform/badge/scope.ts
@@ -0,0 +1,23 @@
+export const BadgeStateScope = {
+  /**
+   * The state is global and applies to all users.
+   */
+  Global: { type: "global" } satisfies BadgeStateScope,
+  /**
+   * The state is for a specific user and only applies to that user when they are unlocked.
+   */
+  UserUnlocked: (userId: string) =>
+    ({
+      type: "user_unlocked",
+      userId,
+    }) satisfies BadgeStateScope,
+} as const;
+
+export type BadgeStateScope =
+  | {
+      type: "global";
+    }
+  | {
+      type: "user_unlocked";
+      userId: string;
+    };
diff --git a/apps/browser/src/platform/badge/state.ts b/apps/browser/src/platform/badge/state.ts
index 0731ad81f41..ea6b52b28e4 100644
--- a/apps/browser/src/platform/badge/state.ts
+++ b/apps/browser/src/platform/badge/state.ts
@@ -1,6 +1,8 @@
 import { BadgeIcon } from "./icon";
 
-export const Unset = Symbol("Unset badge state");
+const UnsetValue = Symbol("Unset badge state");
+
+export const Unset = UnsetValue as typeof UnsetValue;
 export type Unset = typeof Unset;
 
 export type BadgeState = {
diff --git a/apps/browser/src/platform/badge/test/mock-badge-browser-api.ts b/apps/browser/src/platform/badge/test/mock-badge-browser-api.ts
index a1b79c29cb8..9f8db3f23ef 100644
--- a/apps/browser/src/platform/badge/test/mock-badge-browser-api.ts
+++ b/apps/browser/src/platform/badge/test/mock-badge-browser-api.ts
@@ -1,33 +1,50 @@
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, concat, defer, of, Subject, switchMap } from "rxjs";
 
-import { BadgeBrowserApi, RawBadgeState, Tab } from "../badge-browser-api";
+import { BadgeBrowserApi, RawBadgeState, Tab, TabEvent } from "../badge-browser-api";
 
 export class MockBadgeBrowserApi implements BadgeBrowserApi {
-  private _activeTabsUpdated$ = new BehaviorSubject<Tab[]>([]);
-  activeTabsUpdated$ = this._activeTabsUpdated$.asObservable();
+  private _activeTabs$ = new BehaviorSubject<Tab[]>([]);
+  private _tabEvents$ = new Subject<TabEvent>();
+  activeTabs$ = this._activeTabs$.asObservable();
 
   specificStates: Record<number, RawBadgeState> = {};
   generalState?: RawBadgeState;
   tabs: number[] = [];
-  activeTabs: number[] = [];
 
-  getActiveTabs(): Promise<Tab[]> {
-    return Promise.resolve(
-      this.activeTabs.map(
-        (tabId) =>
-          ({
-            tabId,
-            url: `https://example.com/${tabId}`,
-          }) satisfies Tab,
-      ),
-    );
+  tabEvents$ = concat(
+    defer(() => [this.activeTabs]).pipe(
+      switchMap((activeTabs) => {
+        const tabEvents: TabEvent[] = activeTabs.map((tab) => ({
+          type: "activated",
+          tab,
+        }));
+        return of(...tabEvents);
+      }),
+    ),
+    this._tabEvents$.asObservable(),
+  );
+
+  get activeTabs() {
+    return this._activeTabs$.value;
   }
 
   setActiveTabs(tabs: number[]) {
-    this.activeTabs = tabs;
-    this._activeTabsUpdated$.next(
-      tabs.map((tabId) => ({ tabId, url: `https://example.com/${tabId}` })),
-    );
+    this._activeTabs$.next(tabs.map((tabId) => ({ tabId, url: `https://example.com/${tabId}` })));
+
+    tabs.forEach((tabId) => {
+      this._tabEvents$.next({
+        type: "activated",
+        tab: { tabId, url: `https://example.com/${tabId}` },
+      });
+    });
+  }
+
+  updateTab(tabId: number) {
+    this._tabEvents$.next({ type: "updated", tab: { tabId, url: `https://example.com/${tabId}` } });
+  }
+
+  deactivateTab(tabId: number) {
+    this._tabEvents$.next({ type: "deactivated", tabId });
   }
 
   setState = jest.fn().mockImplementation((state: RawBadgeState, tabId?: number): Promise<void> => {
@@ -39,8 +56,4 @@ export class MockBadgeBrowserApi implements BadgeBrowserApi {
 
     return Promise.resolve();
   });
-
-  getTabs(): Promise<number[]> {
-    return Promise.resolve(this.tabs);
-  }
 }
diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index 8a3dbafc5ce..cfc39fa18a1 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -5,6 +5,7 @@ import { Observable } from "rxjs";
 import { BrowserClientVendors } from "@bitwarden/common/autofill/constants";
 import { BrowserClientVendor } from "@bitwarden/common/autofill/types";
 import { DeviceType } from "@bitwarden/common/enums";
+import { LogService } from "@bitwarden/logging";
 import { isBrowserSafariApi } from "@bitwarden/platform";
 
 import { TabMessage } from "../../types/tab-messages";
@@ -32,6 +33,53 @@ export class BrowserApi {
     return BrowserApi.manifestVersion === expectedVersion;
   }
 
+  /**
+   * Helper method that attempts to distinguish whether a message sender is internal to the extension or not.
+   *
+   * Currently this is done through source origin matching, and frameId checking (only top-level frames are internal).
+   * @param sender a message sender
+   * @param logger an optional logger to log validation results
+   * @returns whether or not the sender appears to be internal to the extension
+   */
+  static senderIsInternal(
+    sender: chrome.runtime.MessageSender | undefined,
+    logger?: LogService,
+  ): boolean {
+    if (!sender?.origin) {
+      logger?.warning("[BrowserApi] Message sender has no origin");
+      return false;
+    }
+    const extensionUrl =
+      (typeof chrome !== "undefined" && chrome.runtime?.getURL("")) ||
+      (typeof browser !== "undefined" && browser.runtime?.getURL("")) ||
+      "";
+
+    if (!extensionUrl) {
+      logger?.warning("[BrowserApi] Unable to determine extension URL");
+      return false;
+    }
+
+    // Normalize both URLs by removing trailing slashes
+    const normalizedOrigin = sender.origin.replace(/\/$/, "").toLowerCase();
+    const normalizedExtensionUrl = extensionUrl.replace(/\/$/, "").toLowerCase();
+
+    if (!normalizedOrigin.startsWith(normalizedExtensionUrl)) {
+      logger?.warning(
+        `[BrowserApi] Message sender origin (${normalizedOrigin}) does not match extension URL (${normalizedExtensionUrl})`,
+      );
+      return false;
+    }
+
+    // We only send messages from the top-level frame, but frameId is only set if tab is set, which for popups it is not.
+    if ("frameId" in sender && sender.frameId !== 0) {
+      logger?.warning("[BrowserApi] Message sender is not from the top-level frame");
+      return false;
+    }
+
+    logger?.info("[BrowserApi] Message sender appears to be internal");
+    return true;
+  }
+
   /**
    * Gets all open browser windows, including their tabs.
    *
@@ -220,11 +268,11 @@ export class BrowserApi {
   static async closeTab(tabId: number): Promise<void> {
     if (tabId) {
       if (BrowserApi.isWebExtensionsApi) {
-        browser.tabs.remove(tabId).catch((error) => {
+        await browser.tabs.remove(tabId).catch((error) => {
           throw new Error("[BrowserApi] Failed to remove current tab: " + error.message);
         });
       } else if (BrowserApi.isChromeApi) {
-        chrome.tabs.remove(tabId).catch((error) => {
+        await chrome.tabs.remove(tabId).catch((error) => {
           throw new Error("[BrowserApi] Failed to remove current tab: " + error.message);
         });
       }
@@ -240,7 +288,7 @@ export class BrowserApi {
   static async navigateTabToUrl(tabId: number, url: URL): Promise<void> {
     if (tabId) {
       if (BrowserApi.isWebExtensionsApi) {
-        browser.tabs.update(tabId, { url: url.href }).catch((error) => {
+        await browser.tabs.update(tabId, { url: url.href }).catch((error) => {
           throw new Error("Failed to navigate tab to URL: " + error.message);
         });
       } else if (BrowserApi.isChromeApi) {
diff --git a/apps/browser/src/platform/browser/browser-popup-utils.spec.ts b/apps/browser/src/platform/browser/browser-popup-utils.spec.ts
index 9f9a6e313c8..6e2175e3a79 100644
--- a/apps/browser/src/platform/browser/browser-popup-utils.spec.ts
+++ b/apps/browser/src/platform/browser/browser-popup-utils.spec.ts
@@ -140,6 +140,11 @@ describe("BrowserPopupUtils", () => {
 
   describe("openPopout", () => {
     beforeEach(() => {
+      jest.spyOn(BrowserApi, "getPlatformInfo").mockResolvedValueOnce({
+        os: "linux",
+        arch: "x86-64",
+        nacl_arch: "x86-64",
+      });
       jest.spyOn(BrowserApi, "getWindow").mockResolvedValueOnce({
         id: 1,
         left: 100,
@@ -150,6 +155,8 @@ describe("BrowserPopupUtils", () => {
         width: 380,
       });
       jest.spyOn(BrowserApi, "createWindow").mockImplementation();
+      jest.spyOn(BrowserApi, "updateWindowProperties").mockImplementation();
+      jest.spyOn(BrowserApi, "getPlatformInfo").mockImplementation();
     });
 
     it("creates a window with the default window options", async () => {
@@ -267,6 +274,63 @@ describe("BrowserPopupUtils", () => {
         url: `chrome-extension://id/${url}?uilocation=popout&singleActionPopout=123`,
       });
     });
+
+    it("exits fullscreen and focuses popout window if the current window is fullscreen and platform is mac", async () => {
+      const url = "popup/index.html";
+      jest.spyOn(BrowserPopupUtils as any, "isSingleActionPopoutOpen").mockResolvedValueOnce(false);
+      jest.spyOn(BrowserApi, "getPlatformInfo").mockReset().mockResolvedValueOnce({
+        os: "mac",
+        arch: "x86-64",
+        nacl_arch: "x86-64",
+      });
+      jest.spyOn(BrowserApi, "getWindow").mockReset().mockResolvedValueOnce({
+        id: 1,
+        left: 100,
+        top: 100,
+        focused: false,
+        alwaysOnTop: false,
+        incognito: false,
+        width: 380,
+        state: "fullscreen",
+      });
+      jest
+        .spyOn(BrowserApi, "createWindow")
+        .mockResolvedValueOnce({ id: 2 } as chrome.windows.Window);
+
+      await BrowserPopupUtils.openPopout(url, { senderWindowId: 1 });
+      expect(BrowserApi.updateWindowProperties).toHaveBeenCalledWith(1, {
+        state: "maximized",
+      });
+      expect(BrowserApi.updateWindowProperties).toHaveBeenCalledWith(2, {
+        focused: true,
+      });
+    });
+
+    it("doesnt exit fullscreen if the platform is not mac", async () => {
+      const url = "popup/index.html";
+      jest.spyOn(BrowserPopupUtils as any, "isSingleActionPopoutOpen").mockResolvedValueOnce(false);
+      jest.spyOn(BrowserApi, "getPlatformInfo").mockReset().mockResolvedValueOnce({
+        os: "win",
+        arch: "x86-64",
+        nacl_arch: "x86-64",
+      });
+      jest.spyOn(BrowserApi, "getWindow").mockResolvedValueOnce({
+        id: 1,
+        left: 100,
+        top: 100,
+        focused: false,
+        alwaysOnTop: false,
+        incognito: false,
+        width: 380,
+        state: "fullscreen",
+      });
+
+      await BrowserPopupUtils.openPopout(url);
+
+      expect(BrowserApi.updateWindowProperties).not.toHaveBeenCalledWith(1, {
+        state: "maximized",
+      });
+    });
   });
 
   describe("openCurrentPagePopout", () => {
@@ -337,6 +401,68 @@ describe("BrowserPopupUtils", () => {
     });
   });
 
+  describe("waitForAllPopupsClose", () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+    });
+
+    it("should resolve immediately if no popups are open", async () => {
+      jest.spyOn(BrowserApi, "isPopupOpen").mockResolvedValue(false);
+
+      const promise = BrowserPopupUtils.waitForAllPopupsClose();
+      jest.advanceTimersByTime(100);
+
+      await expect(promise).resolves.toBeUndefined();
+      expect(BrowserApi.isPopupOpen).toHaveBeenCalledTimes(1);
+    });
+
+    it("should resolve after timeout if popup never closes when using custom timeout", async () => {
+      jest.spyOn(BrowserApi, "isPopupOpen").mockResolvedValue(true);
+
+      const promise = BrowserPopupUtils.waitForAllPopupsClose(500);
+
+      // Advance past the timeout
+      jest.advanceTimersByTime(600);
+
+      await expect(promise).resolves.toBeUndefined();
+    });
+
+    it("should resolve after timeout if popup never closes when using default timeout", async () => {
+      jest.spyOn(BrowserApi, "isPopupOpen").mockResolvedValue(true);
+
+      const promise = BrowserPopupUtils.waitForAllPopupsClose();
+
+      // Advance past the default timeout
+      jest.advanceTimersByTime(1100);
+
+      await expect(promise).resolves.toBeUndefined();
+    });
+
+    it("should stop polling after popup closes before timeout", async () => {
+      let callCount = 0;
+      jest.spyOn(BrowserApi, "isPopupOpen").mockImplementation(async () => {
+        callCount++;
+        return callCount <= 2;
+      });
+
+      const promise = BrowserPopupUtils.waitForAllPopupsClose(1000);
+
+      // Advance to when popup closes (300ms)
+      jest.advanceTimersByTime(300);
+
+      await expect(promise).resolves.toBeUndefined();
+
+      // Advance further to ensure no more calls are made
+      jest.advanceTimersByTime(1000);
+
+      expect(BrowserApi.isPopupOpen).toHaveBeenCalledTimes(3);
+    });
+  });
+
   describe("isSingleActionPopoutOpen", () => {
     const windowOptions = {
       id: 1,
diff --git a/apps/browser/src/platform/browser/browser-popup-utils.ts b/apps/browser/src/platform/browser/browser-popup-utils.ts
index aebb3e92113..8343799d0eb 100644
--- a/apps/browser/src/platform/browser/browser-popup-utils.ts
+++ b/apps/browser/src/platform/browser/browser-popup-utils.ts
@@ -1,5 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { filter, firstValueFrom, interval, of, switchMap, takeWhile, timeout } from "rxjs";
 
 import { ScrollOptions } from "./abstractions/browser-popup-utils.abstractions";
 import { BrowserApi } from "./browser-api";
@@ -167,8 +168,29 @@ export default class BrowserPopupUtils {
     ) {
       return;
     }
+    const platform = await BrowserApi.getPlatformInfo();
+    const isMacOS = platform.os === "mac";
+    const isFullscreen = senderWindow.state === "fullscreen";
+    const isFullscreenAndMacOS = isFullscreen && isMacOS;
+    //macOS specific handling for improved UX when sender in fullscreen aka green button;
+    if (isFullscreenAndMacOS) {
+      await BrowserApi.updateWindowProperties(senderWindow.id, {
+        state: "maximized",
+      });
 
-    return await BrowserApi.createWindow(popoutWindowOptions);
+      //wait for macOS animation to finish
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+    }
+
+    const newWindow = await BrowserApi.createWindow(popoutWindowOptions);
+
+    if (isFullscreenAndMacOS) {
+      await BrowserApi.updateWindowProperties(newWindow.id, {
+        focused: true,
+      });
+    }
+
+    return newWindow;
   }
 
   /**
@@ -212,6 +234,27 @@ export default class BrowserPopupUtils {
     }
   }
 
+  /**
+   * Waits for all browser action popups to close, polling up to the specified timeout.
+   * Used before extension reload to prevent zombie popups with invalidated contexts.
+   *
+   * @param timeoutMs - Maximum time to wait in milliseconds. Defaults to 1 second.
+   * @returns Promise that resolves when all popups are closed or timeout is reached.
+   */
+  static async waitForAllPopupsClose(timeoutMs = 1000): Promise<void> {
+    await firstValueFrom(
+      interval(100).pipe(
+        switchMap(() => BrowserApi.isPopupOpen()),
+        takeWhile((isOpen) => isOpen, true),
+        filter((isOpen) => !isOpen),
+        timeout({
+          first: timeoutMs,
+          with: () => of(true),
+        }),
+      ),
+    );
+  }
+
   /**
    * Identifies if a single action window is open based on the passed popoutKey.
    * Will focus the existing window, and close any other windows that might exist
diff --git a/apps/browser/src/platform/ipc/ipc-background.service.ts b/apps/browser/src/platform/ipc/ipc-background.service.ts
index 911ca931c70..9fc2ca24b6a 100644
--- a/apps/browser/src/platform/ipc/ipc-background.service.ts
+++ b/apps/browser/src/platform/ipc/ipc-background.service.ts
@@ -8,6 +8,7 @@ import {
   OutgoingMessage,
   ipcRegisterDiscoverHandler,
   IpcClient,
+  IpcSessionRepository,
 } from "@bitwarden/sdk-internal";
 
 import { BrowserApi } from "../browser/browser-api";
@@ -18,6 +19,7 @@ export class IpcBackgroundService extends IpcService {
   constructor(
     private platformUtilsService: PlatformUtilsService,
     private logService: LogService,
+    private sessionRepository: IpcSessionRepository,
   ) {
     super();
   }
@@ -70,7 +72,9 @@ export class IpcBackgroundService extends IpcService {
         );
       });
 
-      await super.initWithClient(new IpcClient(this.communicationBackend));
+      await super.initWithClient(
+        IpcClient.newWithClientManagedSessions(this.communicationBackend, this.sessionRepository),
+      );
 
       if (this.platformUtilsService.isDev()) {
         await ipcRegisterDiscoverHandler(this.client, {
diff --git a/apps/browser/src/platform/popup/components/pop-out.component.ts b/apps/browser/src/platform/popup/components/pop-out.component.ts
index 320fa6f05ab..fd2acbd8aa7 100644
--- a/apps/browser/src/platform/popup/components/pop-out.component.ts
+++ b/apps/browser/src/platform/popup/components/pop-out.component.ts
@@ -7,12 +7,16 @@ import { IconButtonModule } from "@bitwarden/components";
 
 import BrowserPopupUtils from "../../browser/browser-popup-utils";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-pop-out",
   templateUrl: "pop-out.component.html",
   imports: [CommonModule, JslibModule, IconButtonModule],
 })
 export class PopOutComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() show = true;
 
   constructor(private platformUtilsService: PlatformUtilsService) {}
diff --git a/apps/browser/src/platform/popup/layout/popup-footer.component.ts b/apps/browser/src/platform/popup/layout/popup-footer.component.ts
index 928394b0ad4..c44dfc5079f 100644
--- a/apps/browser/src/platform/popup/layout/popup-footer.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-footer.component.ts
@@ -1,5 +1,7 @@
 import { Component } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-footer",
   templateUrl: "popup-footer.component.html",
diff --git a/apps/browser/src/platform/popup/layout/popup-header.component.ts b/apps/browser/src/platform/popup/layout/popup-header.component.ts
index b580b84f39b..2e95e7ab587 100644
--- a/apps/browser/src/platform/popup/layout/popup-header.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-header.component.ts
@@ -16,6 +16,8 @@ import { PopupRouterCacheService } from "../view-cache/popup-router-cache.servic
 
 import { PopupPageComponent } from "./popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-header",
   templateUrl: "popup-header.component.html",
@@ -23,13 +25,19 @@ import { PopupPageComponent } from "./popup-page.component";
 })
 export class PopupHeaderComponent {
   private popupRouterCacheService = inject(PopupRouterCacheService);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   protected pageContentScrolled: Signal<boolean> = inject(PopupPageComponent).isScrolled;
 
   /** Background color */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   background: "default" | "alt" = "default";
 
   /** Display the back button, which uses Location.back() to go back one page in history */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get showBackButton() {
     return this._showBackButton;
@@ -41,6 +49,8 @@ export class PopupHeaderComponent {
   private _showBackButton = false;
 
   /** Title string that will be inserted as an h1 */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) pageTitle: string;
 
   /**
@@ -48,6 +58,8 @@ export class PopupHeaderComponent {
    *
    * If unset, will call `location.back()`
    **/
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   backAction: FunctionReturningAwaitable = async () => {
     return this.popupRouterCacheService.back();
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 a7103fdfd3c..c6ffe1a6414 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
+++ b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
@@ -31,6 +31,7 @@ import {
   ScrollLayoutDirective,
 } from "@bitwarden/components";
 
+import { VaultLoadingSkeletonComponent } from "../../../vault/popup/components/vault-loading-skeleton/vault-loading-skeleton.component";
 import { PopupRouterCacheService } from "../view-cache/popup-router-cache.service";
 
 import { PopupFooterComponent } from "./popup-footer.component";
@@ -38,6 +39,8 @@ import { PopupHeaderComponent } from "./popup-header.component";
 import { PopupPageComponent } from "./popup-page.component";
 import { PopupTabNavigationComponent } from "./popup-tab-navigation.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "extension-container",
   template: `
@@ -48,6 +51,8 @@ import { PopupTabNavigationComponent } from "./popup-tab-navigation.component";
 })
 class ExtensionContainerComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "extension-popped-container",
   template: `
@@ -59,6 +64,8 @@ class ExtensionContainerComponent {}
 })
 class ExtensionPoppedContainerComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-placeholder",
   template: /*html*/ `
@@ -92,6 +99,8 @@ class VaultComponent {
   protected data = Array.from(Array(20).keys());
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-add-button",
   template: `
@@ -104,6 +113,8 @@ class VaultComponent {
 })
 class MockAddButtonComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-popout-button",
   template: `
@@ -113,6 +124,8 @@ class MockAddButtonComponent {}
 })
 class MockPopoutButtonComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-current-account",
   template: `
@@ -124,6 +137,8 @@ class MockPopoutButtonComponent {}
 })
 class MockCurrentAccountComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-search",
   template: ` <bit-search placeholder="Search"> </bit-search> `,
@@ -131,6 +146,8 @@ class MockCurrentAccountComponent {}
 })
 class MockSearchComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-banner",
   template: `
@@ -142,6 +159,8 @@ class MockSearchComponent {}
 })
 class MockBannerComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-vault-page",
   template: `
@@ -169,6 +188,8 @@ class MockBannerComponent {}
 })
 class MockVaultPageComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-vault-page-popped",
   template: `
@@ -192,6 +213,8 @@ class MockVaultPageComponent {}
 })
 class MockVaultPagePoppedComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-generator-page",
   template: `
@@ -216,6 +239,8 @@ class MockVaultPagePoppedComponent {}
 })
 class MockGeneratorPageComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-send-page",
   template: `
@@ -240,6 +265,8 @@ class MockGeneratorPageComponent {}
 })
 class MockSendPageComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-settings-page",
   template: `
@@ -264,6 +291,8 @@ class MockSendPageComponent {}
 })
 class MockSettingsPageComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "mock-vault-subpage",
   template: `
@@ -335,6 +364,7 @@ export default {
         SectionComponent,
         IconButtonModule,
         BadgeModule,
+        VaultLoadingSkeletonComponent,
       ],
       providers: [
         {
@@ -594,6 +624,22 @@ export const Loading: Story = {
   }),
 };
 
+export const SkeletonLoading: Story = {
+  render: (args) => ({
+    props: { ...args, data: Array(8) },
+    template: /* HTML */ `
+      <extension-container>
+        <popup-tab-navigation>
+          <popup-page hideOverflow>
+            <popup-header slot="header" pageTitle="Page Header"></popup-header>
+            <vault-loading-skeleton></vault-loading-skeleton>
+          </popup-page>
+        </popup-tab-navigation>
+      </extension-container>
+    `,
+  }),
+};
+
 export const TransparentHeader: Story = {
   render: (args) => ({
     props: args,
diff --git a/apps/browser/src/platform/popup/layout/popup-page.component.html b/apps/browser/src/platform/popup/layout/popup-page.component.html
index b53ef6e97eb..828d9947373 100644
--- a/apps/browser/src/platform/popup/layout/popup-page.component.html
+++ b/apps/browser/src/platform/popup/layout/popup-page.component.html
@@ -1,7 +1,7 @@
 <ng-content select="[slot=header]"></ng-content>
 <main class="tw-flex-1 tw-overflow-hidden tw-flex tw-flex-col tw-relative tw-bg-background-alt">
   <ng-content select="[slot=full-width-notice]"></ng-content>
-  <!-- 
+  <!--
     x padding on this container is designed to always be a minimum of 0.75rem (equivalent to tailwind's tw-px-3), or 0.5rem (equivalent
     to tailwind's tw-px-2) in compact mode, but stretch to fill the remainder of the container when the content reaches a maximum of
     640px in width (equivalent to tailwind's `sm` breakpoint)
@@ -10,26 +10,28 @@
     #nonScrollable
     class="tw-transition-colors tw-duration-200 tw-border-0 tw-border-b tw-border-solid tw-py-3 bit-compact:tw-py-2 tw-px-[max(0.75rem,calc((100%-(var(--tw-sm-breakpoint)))/2))] bit-compact:tw-px-[max(0.5rem,calc((100%-(var(--tw-sm-breakpoint)))/2))]"
     [ngClass]="{
-      'tw-invisible !tw-p-0 !tw-border-none': loading || nonScrollable.childElementCount === 0,
+      'tw-invisible !tw-p-0 !tw-border-none': loading() || nonScrollable.childElementCount === 0,
       'tw-border-secondary-300': scrolled(),
       'tw-border-transparent': !scrolled(),
     }"
   >
     <ng-content select="[slot=above-scroll-area]"></ng-content>
   </div>
-  <!-- 
+  <!--
     x padding on this container is designed to always be a minimum of 0.75rem (equivalent to tailwind's tw-px-3), or 0.5rem (equivalent
     to tailwind's tw-px-2) in compact mode, but stretch to fill the remainder of the container when the content reaches a maximum of
     640px in width (equivalent to tailwind's `sm` breakpoint)
   -->
   <div
-    class="tw-overflow-y-auto tw-size-full tw-styled-scrollbar"
+    class="tw-size-full tw-styled-scrollbar"
     data-testid="popup-layout-scroll-region"
     (scroll)="handleScroll($event)"
     [ngClass]="{
-      'tw-invisible': loading,
-      'tw-py-3 bit-compact:tw-py-2 tw-px-[max(0.75rem,calc((100%-(var(--tw-sm-breakpoint)))/2))] bit-compact:tw-px-[max(0.5rem,calc((100%-(var(--tw-sm-breakpoint)))/2))]':
-        !disablePadding,
+      '!tw-overflow-hidden': hideOverflow(),
+      'tw-overflow-y-auto': !hideOverflow(),
+      'tw-invisible': loading(),
+      'tw-relative tw-py-3 bit-compact:tw-py-2 tw-px-[max(0.75rem,calc((100%-(var(--tw-sm-breakpoint)))/2))] bit-compact:tw-px-[max(0.5rem,calc((100%-(var(--tw-sm-breakpoint)))/2))]':
+        !disablePadding(),
     }"
     bitScrollLayoutHost
   >
@@ -37,9 +39,9 @@
   </div>
   <span
     class="tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center tw-text-main"
-    [ngClass]="{ 'tw-invisible': !loading }"
+    [ngClass]="{ 'tw-invisible': !loading() }"
   >
-    <i class="bwi bwi-spinner bwi-lg bwi-spin" [attr.aria-label]="loadingText"></i>
+    <i class="bwi bwi-spinner bwi-lg bwi-spin" [attr.aria-label]="loadingText()"></i>
   </span>
 </main>
 <ng-content select="[slot=footer]"></ng-content>
diff --git a/apps/browser/src/platform/popup/layout/popup-page.component.ts b/apps/browser/src/platform/popup/layout/popup-page.component.ts
index e7675978622..4eed322bdbd 100644
--- a/apps/browser/src/platform/popup/layout/popup-page.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-page.component.ts
@@ -1,5 +1,12 @@
 import { CommonModule } from "@angular/common";
-import { booleanAttribute, Component, inject, Input, signal } from "@angular/core";
+import {
+  booleanAttribute,
+  ChangeDetectionStrategy,
+  Component,
+  inject,
+  input,
+  signal,
+} from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ScrollLayoutHostDirective } from "@bitwarden/components";
@@ -11,20 +18,23 @@ import { ScrollLayoutHostDirective } from "@bitwarden/components";
     class: "tw-h-full tw-flex tw-flex-col tw-overflow-y-hidden",
   },
   imports: [CommonModule, ScrollLayoutHostDirective],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PopupPageComponent {
   protected i18nService = inject(I18nService);
 
-  @Input() loading = false;
+  readonly loading = input<boolean>(false);
 
-  @Input({ transform: booleanAttribute })
-  disablePadding = false;
+  readonly disablePadding = input(false, { transform: booleanAttribute });
 
-  protected scrolled = signal(false);
+  /** Hides any overflow within the page content */
+  readonly hideOverflow = input(false, { transform: booleanAttribute });
+
+  protected readonly scrolled = signal(false);
   isScrolled = this.scrolled.asReadonly();
 
   /** Accessible loading label for the spinner. Defaults to "loading" */
-  @Input() loadingText?: string = this.i18nService.t("loading");
+  readonly loadingText = input<string | undefined>(this.i18nService.t("loading"));
 
   handleScroll(event: Event) {
     this.scrolled.set((event.currentTarget as HTMLElement).scrollTop !== 0);
diff --git a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.html b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.html
index 0a52518b250..bce2b5033ae 100644
--- a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.html
+++ b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.html
@@ -8,7 +8,7 @@
         <li *ngFor="let button of navButtons" class="tw-flex-1 tw-list-none tw-relative">
           <button
             class="tw-w-full tw-flex tw-flex-col tw-items-center tw-px-0.5 tw-py-2 bit-compact:tw-py-1 tw-bg-transparent tw-no-underline hover:tw-no-underline hover:tw-text-primary-600 tw-group/tab-nav-btn hover:tw-bg-hover-default tw-border-2 tw-border-solid tw-border-transparent focus-visible:tw-rounded-lg focus-visible:tw-border-primary-600"
-            [ngClass]="rla.isActive ? 'tw-font-bold tw-text-primary-600' : 'tw-text-muted'"
+            [ngClass]="rla.isActive ? 'tw-font-medium tw-text-primary-600' : 'tw-text-muted'"
             title="{{ button.label | i18n }}"
             [routerLink]="button.page"
             [appA11yTitle]="buttonTitle(button)"
diff --git a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
index 742b12bb7ad..4abd9cd4803 100644
--- a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
@@ -15,6 +15,8 @@ export type NavButton = {
   showBerry?: boolean;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-tab-navigation",
   templateUrl: "popup-tab-navigation.component.html",
@@ -24,6 +26,8 @@ export type NavButton = {
   },
 })
 export class PopupTabNavigationComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() navButtons: NavButton[] = [];
 
   constructor(private i18nService: I18nService) {}
diff --git a/apps/browser/src/platform/popup/services/browser-file-download.service.ts b/apps/browser/src/platform/popup/services/browser-file-download.service.ts
index ec04adac2af..a30c7fe02c8 100644
--- a/apps/browser/src/platform/popup/services/browser-file-download.service.ts
+++ b/apps/browser/src/platform/popup/services/browser-file-download.service.ts
@@ -15,23 +15,9 @@ export class BrowserFileDownloadService implements FileDownloadService {
   download(request: FileDownloadRequest): void {
     const builder = new FileDownloadBuilder(request);
     if (BrowserApi.isSafariApi) {
-      let data: BlobPart = null;
-      if (builder.blobOptions.type === "text/plain" && typeof request.blobData === "string") {
-        data = request.blobData;
-      } else {
-        data = Utils.fromBufferToB64(request.blobData as ArrayBuffer);
-      }
-      // 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
-      SafariApp.sendMessageToApp(
-        "downloadFile",
-        JSON.stringify({
-          blobData: data,
-          blobOptions: request.blobOptions,
-          fileName: request.fileName,
-        }),
-        true,
-      );
+      // Handle Safari download asynchronously to allow Blob conversion
+      // This function can't be async because the interface is not async
+      void this.downloadSafari(request, builder);
     } else {
       const a = window.document.createElement("a");
       a.href = URL.createObjectURL(builder.blob);
@@ -41,4 +27,31 @@ export class BrowserFileDownloadService implements FileDownloadService {
       window.document.body.removeChild(a);
     }
   }
+
+  private async downloadSafari(
+    request: FileDownloadRequest,
+    builder: FileDownloadBuilder,
+  ): Promise<void> {
+    let data: string = null;
+    if (builder.blobOptions.type === "text/plain" && typeof request.blobData === "string") {
+      data = request.blobData;
+    } else if (request.blobData instanceof Blob) {
+      // Convert Blob to ArrayBuffer first, then to Base64
+      const arrayBuffer = await request.blobData.arrayBuffer();
+      data = Utils.fromBufferToB64(arrayBuffer);
+    } else {
+      // Already an ArrayBuffer
+      data = Utils.fromBufferToB64(request.blobData as ArrayBuffer);
+    }
+
+    await SafariApp.sendMessageToApp(
+      "downloadFile",
+      JSON.stringify({
+        blobData: data,
+        blobOptions: request.blobOptions,
+        fileName: request.fileName,
+      }),
+      true,
+    );
+  }
 }
diff --git a/apps/browser/src/platform/popup/services/browser-router.service.ts b/apps/browser/src/platform/popup/services/browser-router.service.ts
index 2d449b8a0f2..e1de1fdd29d 100644
--- a/apps/browser/src/platform/popup/services/browser-router.service.ts
+++ b/apps/browser/src/platform/popup/services/browser-router.service.ts
@@ -21,9 +21,7 @@ export class BrowserRouterService {
           child = child.firstChild;
         }
 
-        // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
-        // eslint-disable-next-line no-constant-binary-expression
-        const updateUrl = !child?.data?.doNotSaveUrl ?? true;
+        const updateUrl = !child?.data?.doNotSaveUrl;
 
         if (updateUrl) {
           this.setPreviousUrl(event.url);
diff --git a/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts b/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
index b545618c0ce..abb7c6405c2 100644
--- a/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
+++ b/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
@@ -5,6 +5,7 @@ import { Injectable, inject } from "@angular/core";
 import {
   ActivatedRouteSnapshot,
   CanActivateFn,
+  Data,
   NavigationEnd,
   Router,
   UrlSerializer,
@@ -14,7 +15,10 @@ import { filter, first, firstValueFrom, map, Observable, of, switchMap, tap } fr
 
 import { GlobalStateProvider } from "@bitwarden/common/platform/state";
 
-import { POPUP_ROUTE_HISTORY_KEY } from "../../../platform/services/popup-view-cache-background.service";
+import {
+  POPUP_ROUTE_HISTORY_KEY,
+  RouteHistoryCacheState,
+} from "../../../platform/services/popup-view-cache-background.service";
 import BrowserPopupUtils from "../../browser/browser-popup-utils";
 
 /**
@@ -42,8 +46,7 @@ export class PopupRouterCacheService {
     this.history$()
       .pipe(first())
       .subscribe(
-        (history) =>
-          Array.isArray(history) && history.forEach((location) => this.location.go(location)),
+        (history) => Array.isArray(history) && history.forEach(({ url }) => this.location.go(url)),
       );
 
     // update state when route change occurs
@@ -54,33 +57,33 @@ export class PopupRouterCacheService {
           // `Location.back()` can now be called successfully
           this.hasNavigated = true;
         }),
-        filter((_event: NavigationEnd) => {
+        map((event) => {
           const state: ActivatedRouteSnapshot = this.router.routerState.snapshot.root;
 
           let child = state.firstChild;
           while (child.firstChild) {
             child = child.firstChild;
           }
-
-          // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
-          // eslint-disable-next-line no-constant-binary-expression
-          return !child?.data?.doNotSaveUrl ?? true;
+          return { event, data: child.data };
         }),
-        switchMap((event) => this.push(event.url)),
+        filter(({ data }) => {
+          return !data?.doNotSaveUrl;
+        }),
+        switchMap(({ event, data }) => this.push(event.url, data)),
       )
       .subscribe();
   }
 
-  history$(): Observable<string[]> {
+  history$(): Observable<RouteHistoryCacheState[]> {
     return this.state.state$;
   }
 
-  async setHistory(state: string[]): Promise<string[]> {
+  async setHistory(state: RouteHistoryCacheState[]): Promise<RouteHistoryCacheState[]> {
     return this.state.update(() => state);
   }
 
   /** Get the last item from the history stack, or `null` if empty */
-  last$(): Observable<string | null> {
+  last$(): Observable<RouteHistoryCacheState | null> {
     return this.history$().pipe(
       map((history) => {
         if (!history || history.length === 0) {
@@ -94,11 +97,24 @@ export class PopupRouterCacheService {
   /**
    * If in browser popup, push new route onto history stack
    */
-  private async push(url: string) {
-    if (!BrowserPopupUtils.inPopup(window) || url === (await firstValueFrom(this.last$()))) {
+  private async push(url: string, data: Data) {
+    if (
+      !BrowserPopupUtils.inPopup(window) ||
+      url === (await firstValueFrom(this.last$().pipe(map((h) => h?.url))))
+    ) {
       return;
     }
-    await this.state.update((prevState) => (prevState == null ? [url] : prevState.concat(url)));
+
+    const routeEntry: RouteHistoryCacheState = {
+      url,
+      options: {
+        resetRouterCacheOnTabChange: data?.resetRouterCacheOnTabChange ?? false,
+      },
+    };
+
+    await this.state.update((prevState) =>
+      prevState == null ? [routeEntry] : prevState.concat(routeEntry),
+    );
   }
 
   /**
@@ -144,13 +160,13 @@ export const popupRouterCacheGuard = ((): Observable<true | UrlTree> => {
   }
 
   return popupHistoryService.last$().pipe(
-    map((url: string) => {
-      if (!url) {
+    map((entry) => {
+      if (!entry) {
         return true;
       }
 
       popupHistoryService.markCacheRestored();
-      return urlSerializer.parse(url);
+      return urlSerializer.parse(entry.url);
     }),
   );
 }) satisfies CanActivateFn;
diff --git a/apps/browser/src/platform/popup/view-cache/popup-router-cache.spec.ts b/apps/browser/src/platform/popup/view-cache/popup-router-cache.spec.ts
index 22fb7bf99b9..835a8eebd2c 100644
--- a/apps/browser/src/platform/popup/view-cache/popup-router-cache.spec.ts
+++ b/apps/browser/src/platform/popup/view-cache/popup-router-cache.spec.ts
@@ -13,6 +13,8 @@ import { PopupRouterCacheService, popupRouterCacheGuard } from "./popup-router-c
 
 const flushPromises = async () => await new Promise(process.nextTick);
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
@@ -96,11 +98,31 @@ describe("Popup router cache guard", () => {
     // wait for router events subscription
     await flushPromises();
 
-    expect(await firstValueFrom(service.history$())).toEqual(["/a", "/b"]);
+    expect(await firstValueFrom(service.history$())).toEqual([
+      {
+        options: {
+          resetRouterCacheOnTabChange: false,
+        },
+        url: "/a",
+      },
+      {
+        options: {
+          resetRouterCacheOnTabChange: false,
+        },
+        url: "/b",
+      },
+    ]);
 
     await service.back();
 
-    expect(await firstValueFrom(service.history$())).toEqual(["/a"]);
+    expect(await firstValueFrom(service.history$())).toEqual([
+      {
+        options: {
+          resetRouterCacheOnTabChange: false,
+        },
+        url: "/a",
+      },
+    ]);
   });
 
   it("does not save ignored routes", async () => {
@@ -121,6 +143,13 @@ describe("Popup router cache guard", () => {
 
     await flushPromises();
 
-    expect(await firstValueFrom(service.history$())).toEqual(["/a"]);
+    expect(await firstValueFrom(service.history$())).toEqual([
+      {
+        options: {
+          resetRouterCacheOnTabChange: false,
+        },
+        url: "/a",
+      },
+    ]);
   });
 });
diff --git a/apps/browser/src/platform/popup/view-cache/popup-view-cache.spec.ts b/apps/browser/src/platform/popup/view-cache/popup-view-cache.spec.ts
index 60baf94eeae..a18d51878ee 100644
--- a/apps/browser/src/platform/popup/view-cache/popup-view-cache.spec.ts
+++ b/apps/browser/src/platform/popup/view-cache/popup-view-cache.spec.ts
@@ -19,12 +19,16 @@ import {
 
 import { PopupViewCacheService } from "./popup-view-cache.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
 })
 export class EmptyComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
diff --git a/apps/browser/src/platform/services/browser-script-injector.service.spec.ts b/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
index e4abea1d719..f2c3fe3317e 100644
--- a/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
+++ b/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
@@ -1,6 +1,7 @@
 import { mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import {
   DomainSettingsService,
   DefaultDomainSettingsService,
@@ -57,10 +58,15 @@ describe("ScriptInjectorService", () => {
   const accountService: FakeAccountService = mockAccountServiceWith(mockUserId);
   const fakeStateProvider: FakeStateProvider = new FakeStateProvider(accountService);
   let domainSettingsService: DomainSettingsService;
+  const policyService = mock<PolicyService>();
 
   beforeEach(() => {
     jest.spyOn(BrowserApi, "getTab").mockImplementation(async () => tabMock);
-    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);
+    domainSettingsService = new DefaultDomainSettingsService(
+      fakeStateProvider,
+      policyService,
+      accountService,
+    );
     domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
     domainSettingsService.blockedInteractionsUris$ = of({});
     scriptInjectorService = new BrowserScriptInjectorService(
diff --git a/apps/browser/src/platform/services/local-backed-session-storage.service.ts b/apps/browser/src/platform/services/local-backed-session-storage.service.ts
index 9e808de0fd0..d0613ee644c 100644
--- a/apps/browser/src/platform/services/local-backed-session-storage.service.ts
+++ b/apps/browser/src/platform/services/local-backed-session-storage.service.ts
@@ -43,6 +43,9 @@ export class LocalBackedSessionStorageService
       if (port.name !== portName(chrome.storage.session)) {
         return;
       }
+      if (!BrowserApi.senderIsInternal(port.sender, this.logService)) {
+        return;
+      }
 
       this.ports.add(port);
 
diff --git a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
index 5a933d9715e..c3dd3adb8ce 100644
--- a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
+++ b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
@@ -329,6 +329,25 @@ export abstract class BrowserPlatformUtilsService implements PlatformUtilsServic
     return autofillCommand;
   }
 
+  async packageType(): Promise<string | null> {
+    switch (this.getDevice()) {
+      case DeviceType.ChromeExtension:
+        return "Chrome Extension";
+      case DeviceType.FirefoxExtension:
+        return "Firefox Extension";
+      case DeviceType.OperaExtension:
+        return "Opera Extension";
+      case DeviceType.EdgeExtension:
+        return "Edge Extension";
+      case DeviceType.VivaldiExtension:
+        return "Vivaldi Extension";
+      case DeviceType.SafariExtension:
+        return "Safari Extension";
+      default:
+        return "Unknown Browser Extension";
+    }
+  }
+
   /**
    * Triggers the offscreen document API to copy the text to the clipboard.
    */
diff --git a/apps/browser/src/platform/services/popup-router-cache-background.service.ts b/apps/browser/src/platform/services/popup-router-cache-background.service.ts
new file mode 100644
index 00000000000..37e9f7cd4a0
--- /dev/null
+++ b/apps/browser/src/platform/services/popup-router-cache-background.service.ts
@@ -0,0 +1,55 @@
+import { switchMap, filter, map, first, of } from "rxjs";
+
+import { GlobalStateProvider } from "@bitwarden/common/platform/state";
+
+import { BrowserApi } from "../browser/browser-api";
+import { fromChromeEvent } from "../browser/from-chrome-event";
+
+import { POPUP_ROUTE_HISTORY_KEY } from "./popup-view-cache-background.service";
+
+export class PopupRouterCacheBackgroundService {
+  private popupRouteHistoryState = this.globalStateProvider.get(POPUP_ROUTE_HISTORY_KEY);
+
+  constructor(private globalStateProvider: GlobalStateProvider) {}
+
+  init() {
+    fromChromeEvent(chrome.tabs.onActivated)
+      .pipe(
+        switchMap((tabs) => BrowserApi.getTab(tabs[0].tabId)!),
+        switchMap((tab) => {
+          // FireFox sets the `url` to "about:blank" and won't populate the `url` until the `onUpdated` event
+          if (tab.url !== "about:blank") {
+            return of(tab);
+          }
+
+          return fromChromeEvent(chrome.tabs.onUpdated).pipe(
+            first(),
+            switchMap(([tabId]) => BrowserApi.getTab(tabId)!),
+          );
+        }),
+        map((tab) => tab.url || tab.pendingUrl),
+        filter((url) => !url?.startsWith(chrome.runtime.getURL(""))),
+        switchMap(() =>
+          this.popupRouteHistoryState.update((state) => {
+            if (!state || state.length === 0) {
+              return state;
+            }
+
+            const lastRoute = state.at(-1);
+            if (!lastRoute) {
+              return state;
+            }
+
+            // When the last route has resetRouterCacheOnTabChange set
+            // Reset the route history to empty to force the user to the default route
+            if (lastRoute.options?.resetRouterCacheOnTabChange) {
+              return [];
+            }
+
+            return state;
+          }),
+        ),
+      )
+      .subscribe();
+  }
+}
diff --git a/apps/browser/src/platform/services/popup-view-cache-background.service.ts b/apps/browser/src/platform/services/popup-view-cache-background.service.ts
index 49eae15fbbd..576996fe53b 100644
--- a/apps/browser/src/platform/services/popup-view-cache-background.service.ts
+++ b/apps/browser/src/platform/services/popup-view-cache-background.service.ts
@@ -42,6 +42,22 @@ export type ViewCacheState = {
   options?: ViewCacheOptions;
 };
 
+export type RouteCacheOptions = {
+  /**
+   * When true, the route history will be reset on tab change and respective route was the last visited route.
+   * i.e. Upon the user re-opening the extension the route history will be empty and the user will be taken to the default route.
+   */
+  resetRouterCacheOnTabChange?: boolean;
+};
+
+export type RouteHistoryCacheState = {
+  /** Route URL */
+  url: string;
+
+  /** Options for managing the route history cache */
+  options?: RouteCacheOptions;
+};
+
 /** We cannot use `UserKeyDefinition` because we must be able to store state when there is no active user. */
 export const POPUP_VIEW_CACHE_KEY = KeyDefinition.record<ViewCacheState>(
   POPUP_VIEW_MEMORY,
@@ -51,9 +67,9 @@ export const POPUP_VIEW_CACHE_KEY = KeyDefinition.record<ViewCacheState>(
   },
 );
 
-export const POPUP_ROUTE_HISTORY_KEY = new KeyDefinition<string[]>(
+export const POPUP_ROUTE_HISTORY_KEY = new KeyDefinition<RouteHistoryCacheState[]>(
   POPUP_VIEW_MEMORY,
-  "popup-route-history",
+  "popup-route-history-details",
   {
     deserializer: (jsonValue) => jsonValue,
   },
@@ -125,7 +141,9 @@ export class PopupViewCacheBackgroundService {
     // on popup closed, with 2 minute delay that is cancelled by re-opening the popup
     fromChromeEvent(chrome.runtime.onConnect)
       .pipe(
-        filter(([port]) => port.name === popupClosedPortName),
+        filter(
+          ([port]) => port.name === popupClosedPortName && BrowserApi.senderIsInternal(port.sender),
+        ),
         switchMap(([port]) =>
           fromChromeEvent(port.onDisconnect).pipe(
             delay(
diff --git a/apps/browser/src/platform/services/task-scheduler/background-task-scheduler.service.spec.ts b/apps/browser/src/platform/services/task-scheduler/background-task-scheduler.service.spec.ts
index ded57a5e85d..46f5528d41b 100644
--- a/apps/browser/src/platform/services/task-scheduler/background-task-scheduler.service.spec.ts
+++ b/apps/browser/src/platform/services/task-scheduler/background-task-scheduler.service.spec.ts
@@ -19,6 +19,25 @@ import {
 
 import { BackgroundTaskSchedulerService } from "./background-task-scheduler.service";
 
+function createInternalPortSpyMock(name: string) {
+  return mock<chrome.runtime.Port>({
+    name,
+    onMessage: {
+      addListener: jest.fn(),
+      removeListener: jest.fn(),
+    },
+    onDisconnect: {
+      addListener: jest.fn(),
+    },
+    postMessage: jest.fn(),
+    disconnect: jest.fn(),
+    sender: {
+      url: chrome.runtime.getURL(""),
+      origin: chrome.runtime.getURL(""),
+    },
+  });
+}
+
 describe("BackgroundTaskSchedulerService", () => {
   let logService: MockProxy<LogService>;
   let stateProvider: MockProxy<StateProvider>;
@@ -35,7 +54,7 @@ describe("BackgroundTaskSchedulerService", () => {
     stateProvider = mock<StateProvider>({
       getGlobal: jest.fn(() => globalStateMock),
     });
-    portMock = createPortSpyMock(BrowserTaskSchedulerPortName);
+    portMock = createInternalPortSpyMock(BrowserTaskSchedulerPortName);
     backgroundTaskSchedulerService = new BackgroundTaskSchedulerService(logService, stateProvider);
     jest.spyOn(globalThis, "setTimeout");
   });
diff --git a/apps/browser/src/platform/services/task-scheduler/background-task-scheduler.service.ts b/apps/browser/src/platform/services/task-scheduler/background-task-scheduler.service.ts
index b09911480ab..5a18b42eb52 100644
--- a/apps/browser/src/platform/services/task-scheduler/background-task-scheduler.service.ts
+++ b/apps/browser/src/platform/services/task-scheduler/background-task-scheduler.service.ts
@@ -30,6 +30,9 @@ export class BackgroundTaskSchedulerService extends BrowserTaskSchedulerServiceI
     if (port.name !== BrowserTaskSchedulerPortName) {
       return;
     }
+    if (!BrowserApi.senderIsInternal(port.sender, this.logService)) {
+      return;
+    }
 
     this.ports.add(port);
     port.onMessage.addListener(this.handlePortMessage);
diff --git a/apps/browser/src/platform/storage/background-memory-storage.service.ts b/apps/browser/src/platform/storage/background-memory-storage.service.ts
index ec1da43391f..e4431c30db6 100644
--- a/apps/browser/src/platform/storage/background-memory-storage.service.ts
+++ b/apps/browser/src/platform/storage/background-memory-storage.service.ts
@@ -1,6 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 
+import { LogService } from "@bitwarden/logging";
 import { SerializedMemoryStorageService } from "@bitwarden/storage-core";
 
 import { BrowserApi } from "../browser/browser-api";
@@ -11,13 +12,16 @@ import { portName } from "./port-name";
 export class BackgroundMemoryStorageService extends SerializedMemoryStorageService {
   private _ports: chrome.runtime.Port[] = [];
 
-  constructor() {
+  constructor(private readonly logService: LogService) {
     super();
 
     BrowserApi.addListener(chrome.runtime.onConnect, (port) => {
       if (port.name !== portName(chrome.storage.session)) {
         return;
       }
+      if (!BrowserApi.senderIsInternal(port.sender, this.logService)) {
+        return;
+      }
 
       this._ports.push(port);
 
diff --git a/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts b/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts
index c462f24269c..8004559f57c 100644
--- a/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts
+++ b/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts
@@ -4,20 +4,26 @@
  */
 
 import { trackEmissions } from "@bitwarden/common/../spec/utils";
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { LogService } from "@bitwarden/logging";
 
 import { mockPorts } from "../../../spec/mock-port.spec-util";
 
 import { BackgroundMemoryStorageService } from "./background-memory-storage.service";
 import { ForegroundMemoryStorageService } from "./foreground-memory-storage.service";
 
-describe("foreground background memory storage interaction", () => {
+// These are succeeding individually but failing in a batch run - skipping for now
+describe.skip("foreground background memory storage interaction", () => {
   let foreground: ForegroundMemoryStorageService;
   let background: BackgroundMemoryStorageService;
+  let logService: MockProxy<LogService>;
 
   beforeEach(() => {
     mockPorts();
+    logService = mock();
 
-    background = new BackgroundMemoryStorageService();
+    background = new BackgroundMemoryStorageService(logService);
     foreground = new ForegroundMemoryStorageService();
   });
 
diff --git a/apps/browser/src/platform/system-notifications/browser-system-notification.service.ts b/apps/browser/src/platform/system-notifications/browser-system-notification.service.ts
index b835c711853..7dcd8a12392 100644
--- a/apps/browser/src/platform/system-notifications/browser-system-notification.service.ts
+++ b/apps/browser/src/platform/system-notifications/browser-system-notification.service.ts
@@ -70,8 +70,8 @@ export class BrowserSystemNotificationService implements SystemNotificationsServ
   }
 
   async clear(clearInfo: SystemNotificationClearInfo): Promise<undefined> {
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    chrome.notifications.clear(clearInfo.id);
+    await chrome.notifications.clear(clearInfo.id);
+    return undefined;
   }
 
   isSupported(): boolean {
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 501ef0ba8ff..a36396afa1a 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -2,6 +2,7 @@ import { Injectable, NgModule } from "@angular/core";
 import { ActivatedRouteSnapshot, RouteReuseStrategy, RouterModule, Routes } from "@angular/router";
 
 import { AuthenticationTimeoutComponent } from "@bitwarden/angular/auth/components/authentication-timeout.component";
+import { AuthRoute } from "@bitwarden/angular/auth/constants";
 import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/environment-selector/environment-selector.component";
 import {
   activeAuthGuard,
@@ -12,9 +13,9 @@ import {
   tdeDecryptionRequiredGuard,
   unauthGuardFn,
 } from "@bitwarden/angular/auth/guards";
+import { LoginViaWebAuthnComponent } from "@bitwarden/angular/auth/login-via-webauthn/login-via-webauthn.component";
 import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
 import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
-import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import {
   DevicesIcon,
   RegistrationUserAddIcon,
@@ -23,7 +24,8 @@ import {
   UserLockIcon,
   VaultIcon,
   LockIcon,
-  DeactivatedOrg,
+  DomainIcon,
+  TwoFactorAuthSecurityKeyIcon,
 } from "@bitwarden/assets/svg";
 import {
   LoginComponent,
@@ -40,11 +42,11 @@ import {
   TwoFactorAuthComponent,
   TwoFactorAuthGuard,
 } from "@bitwarden/auth/angular";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
 import { LockComponent, ConfirmKeyConnectorDomainComponent } from "@bitwarden/key-management-ui";
 
 import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component";
+import { AuthExtensionRoute } from "../auth/popup/constants/auth-extension-route.constant";
 import { fido2AuthGuard } from "../auth/popup/guards/fido2-auth.guard";
 import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
 import { ExtensionDeviceManagementComponent } from "../auth/popup/settings/extension-device-management.component";
@@ -54,11 +56,12 @@ import { BlockedDomainsComponent } from "../autofill/popup/settings/blocked-doma
 import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-domains.component";
 import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
 import { PremiumV2Component } from "../billing/popup/settings/premium-v2.component";
-import { LearnMoreComponent } from "../dirt/phishing-detection/pages/learn-more-component";
-import { PhishingWarning } from "../dirt/phishing-detection/pages/phishing-warning.component";
+import { PhishingWarning } from "../dirt/phishing-detection/popup/phishing-warning.component";
+import { ProtectedByComponent } from "../dirt/phishing-detection/popup/protected-by-component";
 import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
 import BrowserPopupUtils from "../platform/browser/browser-popup-utils";
 import { popupRouterCacheGuard } from "../platform/popup/view-cache/popup-router-cache.service";
+import { RouteCacheOptions } from "../platform/services/popup-view-cache-background.service";
 import { CredentialGeneratorHistoryComponent } from "../tools/popup/generator/credential-generator-history.component";
 import { CredentialGeneratorComponent } from "../tools/popup/generator/credential-generator.component";
 import { SendAddEditComponent as SendAddEditV2Component } from "../tools/popup/send-v2/add-edit/send-add-edit.component";
@@ -76,7 +79,10 @@ import { IntroCarouselComponent } from "../vault/popup/components/vault-v2/intro
 import { PasswordHistoryV2Component } from "../vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component";
 import { VaultV2Component } from "../vault/popup/components/vault-v2/vault-v2.component";
 import { ViewV2Component } from "../vault/popup/components/vault-v2/view-v2/view-v2.component";
-import { canAccessAtRiskPasswords } from "../vault/popup/guards/at-risk-passwords.guard";
+import {
+  canAccessAtRiskPasswords,
+  hasAtRiskPasswords,
+} from "../vault/popup/guards/at-risk-passwords.guard";
 import { clearVaultStateGuard } from "../vault/popup/guards/clear-vault-state.guard";
 import { IntroCarouselGuard } from "../vault/popup/guards/intro-carousel.guard";
 import { AppearanceV2Component } from "../vault/popup/settings/appearance-v2.component";
@@ -98,7 +104,7 @@ import { TabsV2Component } from "./tabs-v2.component";
 /**
  * Data properties acceptable for use in extension route objects
  */
-export interface RouteDataProperties {
+export interface RouteDataProperties extends RouteCacheOptions {
   elevation: RouteElevation;
 
   /**
@@ -144,7 +150,7 @@ const routes: Routes = [
     component: ExtensionAnonLayoutWrapperComponent,
     children: [
       {
-        path: "authentication-timeout",
+        path: AuthRoute.AuthenticationTimeout,
         canActivate: [unauthGuardFn(unauthRouteOverrides)],
         children: [
           {
@@ -163,7 +169,7 @@ const routes: Routes = [
     ],
   },
   {
-    path: "device-verification",
+    path: AuthRoute.NewDeviceVerification,
     component: ExtensionAnonLayoutWrapperComponent,
     canActivate: [unauthGuardFn(), activeAuthGuard()],
     children: [{ path: "", component: NewDeviceVerificationComponent }],
@@ -204,7 +210,7 @@ const routes: Routes = [
     path: "add-cipher",
     component: AddEditV2Component,
     canActivate: [authGuard, debounceNavigationGuard()],
-    data: { elevation: 1 } satisfies RouteDataProperties,
+    data: { elevation: 1, resetRouterCacheOnTabChange: true } satisfies RouteDataProperties,
     runGuardsAndResolvers: "always",
   },
   {
@@ -214,6 +220,7 @@ const routes: Routes = [
     data: {
       // Above "trash"
       elevation: 3,
+      resetRouterCacheOnTabChange: true,
     } satisfies RouteDataProperties,
     runGuardsAndResolvers: "always",
   },
@@ -254,15 +261,15 @@ const routes: Routes = [
     data: { elevation: 1 } satisfies RouteDataProperties,
   },
   {
-    path: "account-security",
+    path: AuthExtensionRoute.AccountSecurity,
     component: AccountSecurityComponent,
     canActivate: [authGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
   },
   {
-    path: "device-management",
+    path: AuthExtensionRoute.DeviceManagement,
     component: ExtensionDeviceManagementComponent,
-    canActivate: [canAccessFeature(FeatureFlag.PM14938_BrowserExtensionLoginApproval), authGuard],
+    canActivate: [authGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
   },
   {
@@ -336,7 +343,7 @@ const routes: Routes = [
     component: ExtensionAnonLayoutWrapperComponent,
     children: [
       {
-        path: "signup",
+        path: AuthRoute.SignUp,
         canActivate: [unauthGuardFn()],
         data: {
           elevation: 1,
@@ -356,13 +363,13 @@ const routes: Routes = [
             component: RegistrationStartSecondaryComponent,
             outlet: "secondary",
             data: {
-              loginRoute: "/login",
+              loginRoute: `/${AuthRoute.Login}`,
             } satisfies RegistrationStartSecondaryComponentData,
           },
         ],
       },
       {
-        path: "finish-signup",
+        path: AuthRoute.FinishSignUp,
         canActivate: [unauthGuardFn()],
         data: {
           pageIcon: LockIcon,
@@ -377,7 +384,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "set-initial-password",
+        path: AuthRoute.SetInitialPassword,
         canActivate: [authGuard],
         component: SetInitialPasswordComponent,
         data: {
@@ -385,7 +392,7 @@ const routes: Routes = [
         } satisfies RouteDataProperties,
       },
       {
-        path: "login",
+        path: AuthRoute.Login,
         canActivate: [unauthGuardFn(unauthRouteOverrides), IntroCarouselGuard],
         data: {
           pageIcon: VaultIcon,
@@ -406,7 +413,30 @@ const routes: Routes = [
         ],
       },
       {
-        path: "sso",
+        path: AuthRoute.LoginWithPasskey,
+        canActivate: [unauthGuardFn(unauthRouteOverrides)],
+        data: {
+          pageIcon: TwoFactorAuthSecurityKeyIcon,
+          pageTitle: {
+            key: "logInWithPasskey",
+          },
+          pageSubtitle: {
+            key: "readingPasskeyLoadingInfo",
+          },
+          elevation: 1,
+          showBackButton: true,
+        } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData,
+        children: [
+          { path: "", component: LoginViaWebAuthnComponent },
+          {
+            path: "",
+            component: EnvironmentSelectorComponent,
+            outlet: "environment-selector",
+          },
+        ],
+      },
+      {
+        path: AuthRoute.Sso,
         canActivate: [unauthGuardFn(unauthRouteOverrides)],
         data: {
           pageIcon: VaultIcon,
@@ -428,7 +458,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "login-with-device",
+        path: AuthRoute.LoginWithDevice,
         canActivate: [redirectToVaultIfUnlockedGuard()],
         data: {
           pageIcon: DevicesIcon,
@@ -451,7 +481,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "hint",
+        path: AuthRoute.PasswordHint,
         canActivate: [unauthGuardFn(unauthRouteOverrides)],
         data: {
           pageTitle: {
@@ -474,7 +504,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "admin-approval-requested",
+        path: AuthRoute.AdminApprovalRequested,
         canActivate: [redirectToVaultIfUnlockedGuard()],
         data: {
           pageIcon: DevicesIcon,
@@ -491,7 +521,7 @@ const routes: Routes = [
         children: [{ path: "", component: LoginViaAuthRequestComponent }],
       },
       {
-        path: "login-initiated",
+        path: AuthRoute.LoginInitiated,
         canActivate: [tdeDecryptionRequiredGuard()],
         data: {
           pageIcon: DevicesIcon,
@@ -529,7 +559,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "2fa",
+        path: AuthRoute.TwoFactor,
         canActivate: [unauthGuardFn(unauthRouteOverrides), TwoFactorAuthGuard],
         children: [
           {
@@ -543,13 +573,16 @@ const routes: Routes = [
             key: "verifyYourIdentity",
           },
           showBackButton: true,
+          // `TwoFactorAuthComponent` manually sets its icon based on the 2fa type
+          pageIcon: null,
         } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData,
       },
       {
-        path: "change-password",
+        path: AuthRoute.ChangePassword,
         data: {
           elevation: 1,
           hideFooter: true,
+          pageIcon: LockIcon,
         } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData,
         children: [
           {
@@ -595,9 +628,9 @@ const routes: Routes = [
         path: "",
         component: IntroCarouselComponent,
         data: {
-          hideIcon: true,
+          pageIcon: null,
           hideFooter: true,
-        },
+        } satisfies ExtensionAnonLayoutWrapperData,
       },
     ],
   },
@@ -615,6 +648,7 @@ const routes: Routes = [
             key: "confirmKeyConnectorDomain",
           },
           showBackButton: true,
+          pageIcon: DomainIcon,
         } satisfies ExtensionAnonLayoutWrapperData,
       },
     ],
@@ -663,10 +697,10 @@ const routes: Routes = [
   {
     path: "at-risk-passwords",
     component: AtRiskPasswordsComponent,
-    canActivate: [authGuard, canAccessAtRiskPasswords],
+    canActivate: [authGuard, canAccessAtRiskPasswords, hasAtRiskPasswords],
   },
   {
-    path: "account-switcher",
+    path: AuthExtensionRoute.AccountSwitcher,
     component: AccountSwitcherComponent,
     data: { elevation: 4, doNotSaveUrl: true } satisfies RouteDataProperties,
   },
@@ -695,14 +729,13 @@ const routes: Routes = [
           },
           {
             path: "",
-            component: LearnMoreComponent,
+            component: ProtectedByComponent,
             outlet: "secondary",
           },
         ],
         data: {
-          pageIcon: DeactivatedOrg,
-          pageTitle: "Bitwarden blocked it!",
-          pageSubtitle: "Bitwarden blocked a known phishing site from loading.",
+          pageIcon: null,
+          hideBackgroundIllustration: true,
           showReadonlyHostname: true,
         } satisfies AnonLayoutWrapperData,
       },
diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index 39f82622b68..8f00569b720 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -36,15 +36,14 @@ import {
   LogoutReason,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
+import { BrowserApi } from "@bitwarden/browser/platform/browser/browser-api";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthRequestAnsweringServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth-request-answering/auth-request-answering.service.abstraction";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { PendingAuthRequestsStateService } from "@bitwarden/common/auth/services/auth-request-answering/pending-auth-requests.state";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { AnimationControlService } from "@bitwarden/common/platform/abstractions/animation-control.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -60,6 +59,7 @@ import {
 } from "@bitwarden/components";
 import { BiometricsService, BiometricStateService, KeyService } from "@bitwarden/key-management";
 
+import BrowserPopupUtils from "../platform/browser/browser-popup-utils";
 import { PopupCompactModeService } from "../platform/popup/layout/popup-compact-mode.service";
 import { PopupSizeService } from "../platform/popup/layout/popup-size.service";
 import { initPopupClosedListener } from "../platform/services/popup-view-cache-background.service";
@@ -67,6 +67,8 @@ import { initPopupClosedListener } from "../platform/services/popup-view-cache-b
 import { routerTransition } from "./app-routing.animations";
 import { DesktopSyncVerificationDialogComponent } from "./components/desktop-sync-verification-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-root",
   styles: [],
@@ -82,7 +84,6 @@ export class AppComponent implements OnInit, OnDestroy {
   private activeUserId: UserId;
   private routerAnimations = false;
   private processingPendingAuth = false;
-  private extensionLoginApprovalFeatureFlag = false;
 
   private destroy$ = new Subject<void>();
 
@@ -118,7 +119,6 @@ export class AppComponent implements OnInit, OnDestroy {
     private authRequestService: AuthRequestServiceAbstraction,
     private pendingAuthRequestsState: PendingAuthRequestsStateService,
     private authRequestAnsweringService: AuthRequestAnsweringServiceAbstraction,
-    private readonly configService: ConfigService,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
 
@@ -127,10 +127,6 @@ export class AppComponent implements OnInit, OnDestroy {
   }
 
   async ngOnInit() {
-    this.extensionLoginApprovalFeatureFlag = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.PM14938_BrowserExtensionLoginApproval),
-    );
-
     initPopupClosedListener();
 
     this.compactModeService.init();
@@ -140,24 +136,22 @@ export class AppComponent implements OnInit, OnDestroy {
       this.activeUserId = account?.id;
     });
 
-    if (this.extensionLoginApprovalFeatureFlag) {
-      // Trigger processing auth requests when the active user is in an unlocked state. Runs once when
-      // the popup is open.
-      this.accountService.activeAccount$
-        .pipe(
-          map((a) => a?.id), // Extract active userId
-          distinctUntilChanged(), // Only when userId actually changes
-          filter((userId) => userId != null), // Require a valid userId
-          switchMap((userId) => this.authService.authStatusFor$(userId).pipe(take(1))), // Get current auth status once for new user
-          filter((status) => status === AuthenticationStatus.Unlocked), // Only when the new user is Unlocked
-          tap(() => {
-            // Trigger processing when switching users while popup is open
-            void this.authRequestAnsweringService.processPendingAuthRequests();
-          }),
-          takeUntil(this.destroy$),
-        )
-        .subscribe();
-    }
+    // Trigger processing auth requests when the active user is in an unlocked state. Runs once when
+    // the popup is open.
+    this.accountService.activeAccount$
+      .pipe(
+        map((a) => a?.id), // Extract active userId
+        distinctUntilChanged(), // Only when userId actually changes
+        filter((userId) => userId != null), // Require a valid userId
+        switchMap((userId) => this.authService.authStatusFor$(userId).pipe(take(1))), // Get current auth status once for new user
+        filter((status) => status === AuthenticationStatus.Unlocked), // Only when the new user is Unlocked
+        tap(() => {
+          // Trigger processing when switching users while popup is open
+          void this.authRequestAnsweringService.processPendingAuthRequests();
+        }),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
 
     this.authService.activeAccountStatus$
       .pipe(
@@ -169,24 +163,22 @@ export class AppComponent implements OnInit, OnDestroy {
       )
       .subscribe();
 
-    if (this.extensionLoginApprovalFeatureFlag) {
-      // When the popup is already open and the active account transitions to Unlocked,
-      // process any pending auth requests for the active user. The above subscription does not handle
-      // this case.
-      this.authService.activeAccountStatus$
-        .pipe(
-          startWith(null as unknown as AuthenticationStatus), // Seed previous value to handle initial emission
-          pairwise(), // Compare previous and current statuses
-          filter(
-            ([prev, curr]) =>
-              prev !== AuthenticationStatus.Unlocked && curr === AuthenticationStatus.Unlocked, // Fire on transitions into Unlocked (incl. initial)
-          ),
-          takeUntil(this.destroy$),
-        )
-        .subscribe(() => {
-          void this.authRequestAnsweringService.processPendingAuthRequests();
-        });
-    }
+    // When the popup is already open and the active account transitions to Unlocked,
+    // process any pending auth requests for the active user. The above subscription does not handle
+    // this case.
+    this.authService.activeAccountStatus$
+      .pipe(
+        startWith(null as unknown as AuthenticationStatus), // Seed previous value to handle initial emission
+        pairwise(), // Compare previous and current statuses
+        filter(
+          ([prev, curr]) =>
+            prev !== AuthenticationStatus.Unlocked && curr === AuthenticationStatus.Unlocked, // Fire on transitions into Unlocked (incl. initial)
+        ),
+        takeUntil(this.destroy$),
+      )
+      .subscribe(() => {
+        void this.authRequestAnsweringService.processPendingAuthRequests();
+      });
 
     this.ngZone.runOutsideAngular(() => {
       window.onmousedown = () => this.recordActivity();
@@ -241,10 +233,7 @@ export class AppComponent implements OnInit, OnDestroy {
             }
 
             await this.router.navigate(["lock"]);
-          } else if (
-            msg.command === "openLoginApproval" &&
-            this.extensionLoginApprovalFeatureFlag
-          ) {
+          } else if (msg.command === "openLoginApproval") {
             if (this.processingPendingAuth) {
               return;
             }
@@ -301,6 +290,13 @@ export class AppComponent implements OnInit, OnDestroy {
                 await this.biometricStateService.updateLastProcessReload();
                 window.location.reload();
               }, 2000);
+            } else {
+              // Close browser action popup before extension reload to prevent zombie popup with invalidated context.
+              // This issue occurs in Chromium-based browsers (Chrome, Vivaldi, etc.) where chrome.runtime.reload()
+              // invalidates extension contexts before popup can close naturally
+              if (BrowserPopupUtils.inPopup(window)) {
+                BrowserApi.closePopup(window);
+              }
             }
           } else if (msg.command === "reloadPopup") {
             // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index d34bef4674c..71846cc6444 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -39,7 +39,6 @@ import { FilePopoutCalloutComponent } from "../tools/popup/components/file-popou
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
 import { ExtensionAnonLayoutWrapperComponent } from "./components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
-import { UserVerificationComponent } from "./components/user-verification.component";
 import { ServicesModule } from "./services/services.module";
 import { TabsV2Component } from "./tabs-v2.component";
 
@@ -91,10 +90,9 @@ import "../platform/popup/locales";
     ColorPasswordPipe,
     ColorPasswordCountPipe,
     TabsV2Component,
-    UserVerificationComponent,
     RemovePasswordComponent,
   ],
-  exports: [],
+  exports: [CalloutModule],
   providers: [CurrencyPipe, DatePipe],
   bootstrap: [AppComponent],
 })
diff --git a/apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts b/apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts
index 2ca24da6c75..e1774dbbddd 100644
--- a/apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts
+++ b/apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts
@@ -9,12 +9,15 @@ import {
   ButtonModule,
   DialogModule,
   DialogService,
+  CenterPositionStrategy,
 } from "@bitwarden/components";
 
 export type DesktopSyncVerificationDialogParams = {
   fingerprint: string[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "desktop-sync-verification-dialog.component.html",
   imports: [JslibModule, ButtonModule, DialogModule],
@@ -47,6 +50,7 @@ export class DesktopSyncVerificationDialogComponent implements OnDestroy, OnInit
   static open(dialogService: DialogService, data: DesktopSyncVerificationDialogParams) {
     return dialogService.open(DesktopSyncVerificationDialogComponent, {
       data,
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 }
diff --git a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts
index 952c42b8367..659ab70110a 100644
--- a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts
@@ -11,13 +11,15 @@ export class ExtensionAnonLayoutWrapperDataService
   extends DefaultAnonLayoutWrapperDataService
   implements AnonLayoutWrapperDataService
 {
-  protected override anonLayoutWrapperDataSubject = new Subject<ExtensionAnonLayoutWrapperData>();
+  protected override anonLayoutWrapperDataSubject = new Subject<
+    Partial<ExtensionAnonLayoutWrapperData>
+  >();
 
-  override setAnonLayoutWrapperData(data: ExtensionAnonLayoutWrapperData): void {
+  override setAnonLayoutWrapperData(data: Partial<ExtensionAnonLayoutWrapperData>): void {
     this.anonLayoutWrapperDataSubject.next(data);
   }
 
-  override anonLayoutWrapperData$(): Observable<ExtensionAnonLayoutWrapperData> {
+  override anonLayoutWrapperData$(): Observable<Partial<ExtensionAnonLayoutWrapperData>> {
     return this.anonLayoutWrapperDataSubject.asObservable();
   }
 }
diff --git a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html
index d389fd8d783..dcd0496ed30 100644
--- a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html
@@ -23,7 +23,6 @@
     [hideLogo]="true"
     [maxWidth]="maxWidth"
     [hideFooter]="hideFooter"
-    [hideIcon]="hideIcon"
     [hideCardWrapper]="hideCardWrapper"
   >
     <router-outlet></router-outlet>
diff --git a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
index c1694d80668..3a50f03e982 100644
--- a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
@@ -27,9 +27,10 @@ export interface ExtensionAnonLayoutWrapperData extends AnonLayoutWrapperData {
   showBackButton?: boolean;
   showLogo?: boolean;
   hideFooter?: boolean;
-  hideIcon?: boolean;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "extension-anon-layout-wrapper.component.html",
   imports: [
@@ -50,7 +51,6 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
   protected showAcctSwitcher: boolean;
   protected showBackButton: boolean;
   protected showLogo: boolean = true;
-  protected hideIcon: boolean = false;
 
   protected pageTitle: string;
   protected pageSubtitle: string;
@@ -134,10 +134,6 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
       this.showLogo = Boolean(firstChildRouteData["showLogo"]);
     }
 
-    if (firstChildRouteData["hideIcon"] !== undefined) {
-      this.hideIcon = Boolean(firstChildRouteData["hideIcon"]);
-    }
-
     if (firstChildRouteData["hideCardWrapper"] !== undefined) {
       this.hideCardWrapper = Boolean(firstChildRouteData["hideCardWrapper"]);
     }
@@ -196,10 +192,6 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
     if (data.showLogo !== undefined) {
       this.showLogo = data.showLogo;
     }
-
-    if (data.hideIcon !== undefined) {
-      this.hideIcon = data.hideIcon;
-    }
   }
 
   private handleStringOrTranslation(value: string | Translation): string {
@@ -222,7 +214,6 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
     this.showLogo = null;
     this.maxWidth = null;
     this.hideFooter = null;
-    this.hideIcon = null;
     this.hideCardWrapper = null;
   }
 
diff --git a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
index 4e6f2fb452d..7a30e15582c 100644
--- a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
@@ -164,6 +164,8 @@ type Story = StoryObj<ExtensionAnonLayoutWrapperComponent>;
 
 // Default Example
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-default-primary-outlet-example-component",
   template: "<p>Primary Outlet Example: <br> your primary component goes here</p>",
@@ -171,6 +173,8 @@ type Story = StoryObj<ExtensionAnonLayoutWrapperComponent>;
 })
 class DefaultPrimaryOutletExampleComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-default-secondary-outlet-example-component",
   template: "<p>Secondary Outlet Example: <br> your secondary component goes here</p>",
@@ -178,6 +182,8 @@ class DefaultPrimaryOutletExampleComponent {}
 })
 class DefaultSecondaryOutletExampleComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-default-env-selector-outlet-example-component",
   template: "<p>Env Selector Outlet Example: <br> your env selector component goes here</p>",
@@ -208,7 +214,9 @@ export const DefaultContentExample: Story = {
         children: [
           {
             path: "default-example",
-            data: {},
+            data: {
+              pageIcon: LockIcon,
+            } satisfies ExtensionAnonLayoutWrapperData,
             children: [
               {
                 path: "",
@@ -244,7 +252,6 @@ const initialData: ExtensionAnonLayoutWrapperData = {
   showAcctSwitcher: true,
   showBackButton: true,
   showLogo: true,
-  hideIcon: false,
 };
 
 const changedData: ExtensionAnonLayoutWrapperData = {
@@ -258,9 +265,10 @@ const changedData: ExtensionAnonLayoutWrapperData = {
   showAcctSwitcher: false,
   showBackButton: false,
   showLogo: false,
-  hideIcon: false,
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-dynamic-content-example-component",
   template: `
@@ -337,9 +345,9 @@ export const HasLoggedInAccountExample: Story = {
           {
             path: "has-logged-in-account",
             data: {
-              hasLoggedInAccount: true,
               showAcctSwitcher: true,
-            },
+              pageIcon: LockIcon,
+            } satisfies ExtensionAnonLayoutWrapperData,
             children: [
               {
                 path: "",
diff --git a/apps/browser/src/popup/components/user-verification.component.html b/apps/browser/src/popup/components/user-verification.component.html
deleted file mode 100644
index 25bd81cf394..00000000000
--- a/apps/browser/src/popup/components/user-verification.component.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<ng-container *ngIf="hasMasterPassword">
-  <div class="box-content-row" appBoxRow>
-    <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-    <input
-      id="masterPassword"
-      type="password"
-      name="MasterPasswordHash"
-      aria-describedby="confirmIdentityHelp"
-      class="form-control"
-      [formControl]="secret"
-      required
-      appAutofocus
-      appInputVerbatim
-    />
-  </div>
-</ng-container>
-<ng-container *ngIf="!hasMasterPassword">
-  <div class="box-content-row" appBoxRow>
-    <label class="d-block">{{ "sendVerificationCode" | i18n }}</label>
-    <button
-      type="button"
-      class="btn btn-outline-secondary"
-      (click)="requestOTP()"
-      [disabled]="disableRequestOTP"
-    >
-      {{ "sendCode" | i18n }}
-    </button>
-    <span class="ml-2 text-success" role="alert" @sent *ngIf="sentCode">
-      <i class="bwi bwi-check-circle" aria-hidden="true"></i>
-      {{ "codeSent" | i18n }}
-    </span>
-  </div>
-
-  <div class="box-content-row" appBoxRow>
-    <label for="verificationCode">{{ "verificationCode" | i18n }}</label>
-    <input
-      id="verificationCode"
-      type="input"
-      name="verificationCode"
-      class="form-control"
-      [formControl]="secret"
-      required
-      appAutofocus
-      appInputVerbatim
-    />
-  </div>
-</ng-container>
diff --git a/apps/browser/src/popup/components/user-verification.component.ts b/apps/browser/src/popup/components/user-verification.component.ts
deleted file mode 100644
index f6cb6cdff12..00000000000
--- a/apps/browser/src/popup/components/user-verification.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { animate, style, transition, trigger } from "@angular/animations";
-import { Component } from "@angular/core";
-import { NG_VALUE_ACCESSOR } from "@angular/forms";
-
-import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/auth/components/user-verification.component";
-/**
- * @deprecated Jan 24, 2024: Use new libs/auth UserVerificationDialogComponent or UserVerificationFormInputComponent instead.
- * Each client specific component should eventually be converted over to use one of these new components.
- */
-@Component({
-  selector: "app-user-verification",
-  templateUrl: "user-verification.component.html",
-  providers: [
-    {
-      provide: NG_VALUE_ACCESSOR,
-      multi: true,
-      useExisting: UserVerificationComponent,
-    },
-  ],
-  animations: [
-    trigger("sent", [
-      transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
-    ]),
-  ],
-  standalone: false,
-})
-export class UserVerificationComponent extends BaseComponent {}
diff --git a/apps/browser/src/popup/images/loading.svg b/apps/browser/src/popup/images/loading.svg
index 5f4102a5921..e05a42f6c70 100644
--- a/apps/browser/src/popup/images/loading.svg
+++ b/apps/browser/src/popup/images/loading.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 100% 100%">
-  <text fill="%23333333" x="50%" y="50%" font-family="\'Roboto\', \'Helvetica Neue\', Helvetica, Arial, sans-serif"
+  <text fill="%23333333" x="50%" y="50%" font-family="\'Inter\', \'Helvetica Neue\', Helvetica, Arial, sans-serif"
         font-size="18" text-anchor="middle">
     Loading...
   </text>
diff --git a/apps/browser/src/popup/scss/base.scss b/apps/browser/src/popup/scss/base.scss
index b3d14e65061..01b9d3f05d5 100644
--- a/apps/browser/src/popup/scss/base.scss
+++ b/apps/browser/src/popup/scss/base.scss
@@ -382,7 +382,7 @@ app-root {
   }
 }
 
-main:not(popup-page main) {
+main:not(popup-page main):not(auth-anon-layout main) {
   position: absolute;
   top: 44px;
   bottom: 0;
diff --git a/apps/browser/src/popup/scss/pages.scss b/apps/browser/src/popup/scss/pages.scss
index 4c2daab2159..56c5f80c86c 100644
--- a/apps/browser/src/popup/scss/pages.scss
+++ b/apps/browser/src/popup/scss/pages.scss
@@ -137,3 +137,8 @@ body.body-full {
     margin-bottom: 0;
   }
 }
+
+/** Temporary fix for avatar, will not be required once we migrate to tailwind preflight **/
+bit-avatar svg {
+  display: block;
+}
diff --git a/apps/browser/src/popup/scss/variables.scss b/apps/browser/src/popup/scss/variables.scss
index aea69e26436..e57e98fd0cc 100644
--- a/apps/browser/src/popup/scss/variables.scss
+++ b/apps/browser/src/popup/scss/variables.scss
@@ -1,6 +1,6 @@
 $dark-icon-themes: "theme_dark";
 
-$font-family-sans-serif: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-sans-serif: Inter, "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
 $font-size-base: 16px;
 $font-size-large: 18px;
diff --git a/apps/browser/src/popup/services/init.service.ts b/apps/browser/src/popup/services/init.service.ts
index 1930dbd1d4b..91b6f0ff105 100644
--- a/apps/browser/src/popup/services/init.service.ts
+++ b/apps/browser/src/popup/services/init.service.ts
@@ -2,7 +2,9 @@ import { DOCUMENT } from "@angular/common";
 import { inject, Inject, Injectable } from "@angular/core";
 
 import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -29,6 +31,8 @@ export class InitService {
     private sdkLoadService: SdkLoadService,
     private viewCacheService: PopupViewCacheService,
     private readonly migrationRunner: MigrationRunner,
+    private configService: ConfigService,
+    private encryptService: EncryptService,
     @Inject(DOCUMENT) private document: Document,
   ) {}
 
@@ -40,6 +44,7 @@ export class InitService {
       this.twoFactorService.init();
       await this.viewCacheService.init();
       await this.sizeService.init();
+      this.encryptService.init(this.configService);
 
       const htmlEl = window.document.documentElement;
       this.themingService.applyThemeChangesTo(this.document);
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index d87c9417c85..c462319dc2e 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -29,13 +29,16 @@ import {
   TwoFactorAuthDuoComponentService,
   TwoFactorAuthWebAuthnComponentService,
   SsoComponentService,
+  NewDeviceVerificationComponentService,
 } from "@bitwarden/auth/angular";
 import {
   LockService,
   LoginEmailService,
   SsoUrlService,
   LogoutService,
+  UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
+import { ExtensionNewDeviceVerificationComponentService } from "@bitwarden/browser/auth/services/new-device-verification/extension-new-device-verification-component.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -73,7 +76,6 @@ import {
   InternalMasterPasswordServiceAbstraction,
   MasterPasswordServiceAbstraction,
 } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
-import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import {
   VaultTimeoutService,
   VaultTimeoutStringType,
@@ -119,10 +121,12 @@ import { SystemNotificationsService } from "@bitwarden/common/platform/system-no
 import { UnsupportedSystemNotificationsService } from "@bitwarden/common/platform/system-notifications/unsupported-system-notifications.service";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { InternalSendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service";
+import { DefaultCipherArchiveService } from "@bitwarden/common/vault/services/default-cipher-archive.service";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import {
@@ -138,15 +142,16 @@ import {
   KdfConfigService,
   KeyService,
 } from "@bitwarden/key-management";
-import { LockComponentService } from "@bitwarden/key-management-ui";
+import {
+  LockComponentService,
+  SessionTimeoutSettingsComponentService,
+} from "@bitwarden/key-management-ui";
 import { DerivedStateProvider, GlobalStateProvider, StateProvider } from "@bitwarden/state";
 import { InlineDerivedStateProvider } from "@bitwarden/state-internal";
 import {
   DefaultSshImportPromptService,
   PasswordRepromptService,
   SshImportPromptService,
-  CipherArchiveService,
-  DefaultCipherArchiveService,
 } from "@bitwarden/vault";
 
 import { AccountSwitcherService } from "../../auth/popup/account-switching/services/account-switcher.service";
@@ -164,6 +169,7 @@ import AutofillService from "../../autofill/services/autofill.service";
 import { InlineMenuFieldQualificationService } from "../../autofill/services/inline-menu-field-qualification.service";
 import { ForegroundBrowserBiometricsService } from "../../key-management/biometrics/foreground-browser-biometrics";
 import { ExtensionLockComponentService } from "../../key-management/lock/services/extension-lock-component.service";
+import { BrowserSessionTimeoutSettingsComponentService } from "../../key-management/session-timeout/services/browser-session-timeout-settings-component.service";
 import { ForegroundVaultTimeoutService } from "../../key-management/vault-timeout/foreground-vault-timeout.service";
 import { BrowserActionsService } from "../../platform/actions/browser-actions.service";
 import { BrowserApi } from "../../platform/browser/browser-api";
@@ -269,7 +275,6 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: KeyService,
     useFactory: (
-      pinService: PinServiceAbstraction,
       masterPasswordService: InternalMasterPasswordServiceAbstraction,
       keyGenerationService: KeyGenerationService,
       cryptoFunctionService: CryptoFunctionService,
@@ -282,7 +287,6 @@ const safeProviders: SafeProvider[] = [
       kdfConfigService: KdfConfigService,
     ) => {
       const keyService = new DefaultKeyService(
-        pinService,
         masterPasswordService,
         keyGenerationService,
         cryptoFunctionService,
@@ -298,7 +302,6 @@ const safeProviders: SafeProvider[] = [
       return keyService;
     },
     deps: [
-      PinServiceAbstraction,
       InternalMasterPasswordServiceAbstraction,
       KeyGenerationService,
       CryptoFunctionService,
@@ -366,7 +369,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: DomainSettingsService,
     useClass: DefaultDomainSettingsService,
-    deps: [StateProvider],
+    deps: [StateProvider, PolicyService, AccountService],
   }),
   safeProvider({
     provide: AbstractStorageService,
@@ -605,7 +608,12 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: Fido2UserVerificationService,
     useClass: Fido2UserVerificationService,
-    deps: [PasswordRepromptService, UserVerificationService, DialogService],
+    deps: [
+      PasswordRepromptService,
+      UserDecryptionOptionsServiceAbstraction,
+      DialogService,
+      AccountServiceAbstraction,
+    ],
   }),
   safeProvider({
     provide: AnimationControlService,
@@ -708,14 +716,17 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: CipherArchiveService,
     useClass: DefaultCipherArchiveService,
-    deps: [
-      CipherService,
-      ApiService,
-      DialogService,
-      PasswordRepromptService,
-      BillingAccountProfileStateService,
-      ConfigService,
-    ],
+    deps: [CipherService, ApiService, BillingAccountProfileStateService, ConfigService],
+  }),
+  safeProvider({
+    provide: NewDeviceVerificationComponentService,
+    useClass: ExtensionNewDeviceVerificationComponentService,
+    deps: [],
+  }),
+  safeProvider({
+    provide: SessionTimeoutSettingsComponentService,
+    useClass: BrowserSessionTimeoutSettingsComponentService,
+    deps: [I18nServiceAbstraction, PlatformUtilsService, MessagingServiceAbstraction],
   }),
 ];
 
diff --git a/apps/browser/src/popup/tabs-v2.component.ts b/apps/browser/src/popup/tabs-v2.component.ts
index f1e42799b35..1c409fee639 100644
--- a/apps/browser/src/popup/tabs-v2.component.ts
+++ b/apps/browser/src/popup/tabs-v2.component.ts
@@ -17,6 +17,8 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 
 import { NavButton } from "../platform/popup/layout/popup-tab-navigation.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-tabs-v2",
   templateUrl: "./tabs-v2.component.html",
diff --git a/apps/browser/src/safari/safari/SafariWebExtensionHandler.swift b/apps/browser/src/safari/safari/SafariWebExtensionHandler.swift
index 54e91611325..dad1e6855fc 100644
--- a/apps/browser/src/safari/safari/SafariWebExtensionHandler.swift
+++ b/apps/browser/src/safari/safari/SafariWebExtensionHandler.swift
@@ -69,8 +69,8 @@ class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
                 if let url = panel.url {
                     do {
                         let fileManager = FileManager.default
-                        if !fileManager.fileExists(atPath: url.absoluteString) {
-                            fileManager.createFile(atPath: url.absoluteString, contents: Data(),
+                        if !fileManager.fileExists(atPath: url.path) {
+                            fileManager.createFile(atPath: url.path, contents: Data(),
                                                    attributes: nil)
                         }
                         try data.write(to: url)
diff --git a/apps/browser/src/tools/popup/components/file-popout-callout.component.ts b/apps/browser/src/tools/popup/components/file-popout-callout.component.ts
index 25b80c82c57..33044b79351 100644
--- a/apps/browser/src/tools/popup/components/file-popout-callout.component.ts
+++ b/apps/browser/src/tools/popup/components/file-popout-callout.component.ts
@@ -1,5 +1,3 @@
-// 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 } from "@angular/core";
 
@@ -9,16 +7,18 @@ import { CalloutModule } from "@bitwarden/components";
 import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 import { FilePopoutUtilsService } from "../services/file-popout-utils.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-file-popout-callout",
   templateUrl: "file-popout-callout.component.html",
   imports: [CommonModule, JslibModule, CalloutModule],
 })
 export class FilePopoutCalloutComponent implements OnInit {
-  protected showFilePopoutMessage: boolean;
-  protected showFirefoxFileWarning: boolean;
-  protected showSafariFileWarning: boolean;
-  protected showChromiumFileWarning: boolean;
+  protected showFilePopoutMessage: boolean = false;
+  protected showFirefoxFileWarning: boolean = false;
+  protected showSafariFileWarning: boolean = false;
+  protected showChromiumFileWarning: boolean = false;
 
   constructor(private filePopoutUtilsService: FilePopoutUtilsService) {}
 
diff --git a/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts b/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts
index 441e5d6e4c6..90a23c82330 100644
--- a/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts
+++ b/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts
@@ -25,6 +25,8 @@ import { PopupFooterComponent } from "../../../platform/popup/layout/popup-foote
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-credential-generator-history",
   templateUrl: "credential-generator-history.component.html",
@@ -52,6 +54,8 @@ export class CredentialGeneratorHistoryComponent implements OnChanges, OnInit, O
     private logService: LogService,
   ) {}
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   account: Account | null;
 
@@ -60,6 +64,8 @@ export class CredentialGeneratorHistoryComponent implements OnChanges, OnInit, O
    *
    *  @warning this may reveal sensitive information in plaintext.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   debug: boolean = false;
 
diff --git a/apps/browser/src/tools/popup/generator/credential-generator.component.ts b/apps/browser/src/tools/popup/generator/credential-generator.component.ts
index b34c829b006..a69a7f52a6f 100644
--- a/apps/browser/src/tools/popup/generator/credential-generator.component.ts
+++ b/apps/browser/src/tools/popup/generator/credential-generator.component.ts
@@ -10,6 +10,8 @@ import { PopOutComponent } from "../../../platform/popup/components/pop-out.comp
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
diff --git a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html
index c6ea52aff62..a72847a5bf2 100644
--- a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html
+++ b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html
@@ -16,7 +16,7 @@
     <button bitButton type="submit" form="sendForm" buttonType="primary" #submitBtn>
       {{ "save" | i18n }}
     </button>
-    <button bitButton type="button" buttonType="secondary" popupBackAction>
+    <button bitButton type="button" buttonType="secondary" [popupBackAction]>
       {{ "cancel" | i18n }}
     </button>
     <button
diff --git a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
index 5911b3b6d89..8f30d00cc31 100644
--- a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
@@ -41,7 +41,12 @@ import { SendFilePopoutDialogContainerComponent } from "../send-file-popout-dial
 class QueryParams {
   constructor(params: Params) {
     this.sendId = params.sendId;
-    this.type = parseInt(params.type, 10);
+    const sendTypeValue = parseInt(params.type, 10);
+    if (sendTypeValue === SendType.Text || sendTypeValue === SendType.File) {
+      this.type = sendTypeValue;
+    } else {
+      throw new Error(`Invalid SendType: ${params.type}`);
+    }
   }
 
   /**
@@ -60,6 +65,8 @@ export type AddEditQueryParams = Partial<Record<keyof QueryParams, string>>;
 /**
  * Component for adding or editing a send item.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-send-add-edit",
   templateUrl: "send-add-edit.component.html",
diff --git a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html
index f0d66bd49ed..16711fabbf4 100644
--- a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html
+++ b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html
@@ -17,7 +17,7 @@
       <div class="tw-size-[95px] tw-content-center">
         <bit-icon [icon]="sendCreatedIcon"></bit-icon>
       </div>
-      <h3 tabindex="0" appAutofocus class="tw-font-semibold">
+      <h3 tabindex="0" appAutofocus class="tw-font-medium">
         {{ "createdSendSuccessfully" | i18n }}
       </h3>
       <p class="tw-text-center">
diff --git a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
index 30359e98fa0..e9109ec6c21 100644
--- a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
@@ -20,6 +20,8 @@ import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-fo
 import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send-created",
   templateUrl: "./send-created.component.html",
diff --git a/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog-container.component.ts b/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog-container.component.ts
index 251f19cf252..1f0d9f2a0c9 100644
--- a/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog-container.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog-container.component.ts
@@ -1,24 +1,26 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import { Component, Input, OnInit } from "@angular/core";
+import { Component, input, OnInit } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
-import { DialogService } from "@bitwarden/components";
+import { CenterPositionStrategy, DialogService } from "@bitwarden/components";
 import { SendFormConfig } from "@bitwarden/send-ui";
 
 import { FilePopoutUtilsService } from "../../services/file-popout-utils.service";
 
 import { SendFilePopoutDialogComponent } from "./send-file-popout-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "send-file-popout-dialog-container",
   templateUrl: "./send-file-popout-dialog-container.component.html",
   imports: [JslibModule, CommonModule],
 })
 export class SendFilePopoutDialogContainerComponent implements OnInit {
-  @Input() config: SendFormConfig;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  config = input.required<SendFormConfig>();
 
   constructor(
     private dialogService: DialogService,
@@ -27,11 +29,13 @@ export class SendFilePopoutDialogContainerComponent implements OnInit {
 
   ngOnInit() {
     if (
-      this.config?.sendType === SendType.File &&
-      this.config?.mode === "add" &&
+      this.config().sendType === SendType.File &&
+      this.config().mode === "add" &&
       this.filePopoutUtilsService.showFilePopoutMessage(window)
     ) {
-      this.dialogService.open(SendFilePopoutDialogComponent);
+      this.dialogService.open(SendFilePopoutDialogComponent, {
+        positionStrategy: new CenterPositionStrategy(),
+      });
     }
   }
 }
diff --git a/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog.component.ts b/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog.component.ts
index 64c95a2e2f7..23fa744995a 100644
--- a/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog.component.ts
@@ -6,6 +6,8 @@ import { ButtonModule, DialogModule, DialogService, TypographyModule } from "@bi
 
 import BrowserPopupUtils from "../../../../platform/browser/browser-popup-utils";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "send-file-popout-dialog",
   templateUrl: "./send-file-popout-dialog.component.html",
diff --git a/apps/browser/src/tools/popup/send-v2/send-v2.component.html b/apps/browser/src/tools/popup/send-v2/send-v2.component.html
index 997b65e9934..47ecd7564dc 100644
--- a/apps/browser/src/tools/popup/send-v2/send-v2.component.html
+++ b/apps/browser/src/tools/popup/send-v2/send-v2.component.html
@@ -1,4 +1,4 @@
-<popup-page [loading]="sendsLoading$ | async">
+<popup-page [loading]="showSpinnerLoaders$ | async" [hideOverflow]="showSkeletonsLoaders$ | async">
   <popup-header slot="header" [pageTitle]="'send' | i18n">
     <ng-container slot="end">
       <tools-new-send-dropdown *ngIf="!sendsDisabled"></tools-new-send-dropdown>
@@ -6,7 +6,7 @@
       <app-current-account></app-current-account>
     </ng-container>
   </popup-header>
-  <ng-container slot="above-scroll-area" *ngIf="!(sendsLoading$ | async)">
+  <ng-container slot="above-scroll-area">
     <bit-callout *ngIf="sendsDisabled" [title]="'sendDisabled' | i18n">
       {{ "sendDisabledWarning" | i18n }}
     </bit-callout>
@@ -34,7 +34,7 @@
     </bit-no-items>
   </div>
 
-  <ng-container *ngIf="listState !== sendState.Empty">
+  <ng-container *ngIf="listState !== sendState.Empty && !(showSkeletonsLoaders$ | async)">
     <div
       *ngIf="listState === sendState.NoResults"
       class="tw-flex tw-flex-col tw-justify-center tw-h-auto tw-pt-12"
@@ -46,4 +46,9 @@
     </div>
     <app-send-list-items-container [headerText]="title | i18n" [sends]="sends$ | async" />
   </ng-container>
+  @if (showSkeletonsLoaders$ | async) {
+    <vault-fade-in-out-skeleton>
+      <vault-loading-skeleton></vault-loading-skeleton>
+    </vault-fade-in-out-skeleton>
+  }
 </popup-page>
diff --git a/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts b/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts
index 63ede7ba357..6d79f430a37 100644
--- a/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts
@@ -37,7 +37,7 @@ import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-heade
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popup-router-cache.service";
 
-import { SendV2Component, SendState } from "./send-v2.component";
+import { SendState, SendV2Component } from "./send-v2.component";
 
 describe("SendV2Component", () => {
   let component: SendV2Component;
diff --git a/apps/browser/src/tools/popup/send-v2/send-v2.component.ts b/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
index a37c038d822..89769bdd1ce 100644
--- a/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
@@ -1,17 +1,22 @@
 import { CommonModule } from "@angular/common";
 import { Component, OnDestroy } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { combineLatest, switchMap } from "rxjs";
+import { combineLatest, distinctUntilChanged, map, shareReplay, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NoResults, NoSendsIcon } from "@bitwarden/assets/svg";
+import { VaultLoadingSkeletonComponent } from "@bitwarden/browser/vault/popup/components/vault-loading-skeleton/vault-loading-skeleton.component";
 import { BrowserPremiumUpgradePromptService } from "@bitwarden/browser/vault/popup/services/browser-premium-upgrade-prompt.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
+import { skeletonLoadingDelay } from "@bitwarden/common/vault/utils/skeleton-loading.operator";
 import {
   ButtonModule,
   CalloutModule,
@@ -31,14 +36,21 @@ import { CurrentAccountComponent } from "../../../auth/popup/account-switching/c
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
+import { VaultFadeInOutSkeletonComponent } from "../../../vault/popup/components/vault-fade-in-out-skeleton/vault-fade-in-out-skeleton.component";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum SendState {
-  Empty,
-  NoResults,
-}
+/** A state of the Send list UI. */
+export const SendState = Object.freeze({
+  /** No sends exist for the current filter (file or text). */
+  Empty: "Empty",
+  /** Sends exist, but none match the current filter/search. */
+  NoResults: "NoResults",
+} as const);
 
+/** A state of the Send list UI. */
+export type SendState = (typeof SendState)[keyof typeof SendState];
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "send-v2.component.html",
   providers: [
@@ -62,6 +74,8 @@ export enum SendState {
     SendListFiltersComponent,
     SendSearchComponent,
     TypographyModule,
+    VaultFadeInOutSkeletonComponent,
+    VaultLoadingSkeletonComponent,
   ],
 })
 export class SendV2Component implements OnDestroy {
@@ -70,18 +84,52 @@ export class SendV2Component implements OnDestroy {
 
   protected listState: SendState | null = null;
   protected sends$ = this.sendItemsService.filteredAndSortedSends$;
-  protected sendsLoading$ = this.sendItemsService.loading$;
+  private skeletonFeatureFlag$ = this.configService.getFeatureFlag$(
+    FeatureFlag.VaultLoadingSkeletons,
+  );
+  protected sendsLoading$ = this.sendItemsService.loading$.pipe(
+    distinctUntilChanged(),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
+  /** Spinner Loading State */
+  protected showSpinnerLoaders$ = combineLatest([
+    this.sendsLoading$,
+    this.skeletonFeatureFlag$,
+  ]).pipe(map(([loading, skeletonsEnabled]) => loading && !skeletonsEnabled));
+
+  /** Skeleton Loading State */
+  protected showSkeletonsLoaders$ = combineLatest([
+    this.sendsLoading$,
+    this.searchService.isSendSearching$,
+    this.skeletonFeatureFlag$,
+  ]).pipe(
+    map(
+      ([loading, cipherSearching, skeletonsEnabled]) =>
+        (loading || cipherSearching) && skeletonsEnabled,
+    ),
+    distinctUntilChanged(),
+    skeletonLoadingDelay(),
+  );
+
   protected title: string = "allSends";
   protected noItemIcon = NoSendsIcon;
   protected noResultsIcon = NoResults;
 
   protected sendsDisabled = false;
 
+  private readonly sendTypeTitles: Record<SendType, string> = {
+    [SendType.File]: "fileSends",
+    [SendType.Text]: "textSends",
+  };
+
   constructor(
     protected sendItemsService: SendItemsService,
     protected sendListFiltersService: SendListFiltersService,
     private policyService: PolicyService,
     private accountService: AccountService,
+    private configService: ConfigService,
+    private searchService: SearchService,
   ) {
     combineLatest([
       this.sendItemsService.emptyList$,
@@ -91,7 +139,7 @@ export class SendV2Component implements OnDestroy {
       .pipe(takeUntilDestroyed())
       .subscribe(([emptyList, noFilteredResults, currentFilter]) => {
         if (currentFilter?.sendType !== null) {
-          this.title = `${this.sendType[currentFilter.sendType].toLowerCase()}Sends`;
+          this.title = this.sendTypeTitles[currentFilter.sendType] ?? "allSends";
         } else {
           this.title = "allSends";
         }
diff --git a/apps/browser/src/tools/popup/settings/about-dialog/about-dialog.component.ts b/apps/browser/src/tools/popup/settings/about-dialog/about-dialog.component.ts
index 39bff089668..2fa401f0010 100644
--- a/apps/browser/src/tools/popup/settings/about-dialog/about-dialog.component.ts
+++ b/apps/browser/src/tools/popup/settings/about-dialog/about-dialog.component.ts
@@ -16,11 +16,15 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "about-dialog.component.html",
   imports: [CommonModule, JslibModule, DialogModule, ButtonModule, TypographyModule],
 })
 export class AboutDialogComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("version") protected version!: ElementRef;
 
   protected year = new Date().getFullYear();
diff --git a/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts b/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts
index 67212dc5c4a..88f6ad96807 100644
--- a/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts
@@ -7,7 +7,7 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { DeviceType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService, ItemModule } from "@bitwarden/components";
+import { CenterPositionStrategy, DialogService, ItemModule } from "@bitwarden/components";
 
 import { BrowserApi } from "../../../../platform/browser/browser-api";
 import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
@@ -29,6 +29,8 @@ const RateUrls = {
   [DeviceType.SafariExtension]: "https://apps.apple.com/app/bitwarden/id1352778147",
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "about-page-v2.component.html",
   imports: [
@@ -49,7 +51,9 @@ export class AboutPageV2Component {
   ) {}
 
   about() {
-    this.dialogService.open(AboutDialogComponent);
+    this.dialogService.open(AboutDialogComponent, {
+      positionStrategy: new CenterPositionStrategy(),
+    });
   }
 
   async launchHelp() {
diff --git a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.html b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.html
index 8493fa5fee7..d6bf3a3a253 100644
--- a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.html
+++ b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.html
@@ -23,7 +23,7 @@
     >
       {{ "exportVault" | i18n }}
     </button>
-    <button bitButton type="button" buttonType="secondary" popupBackAction>
+    <button bitButton type="button" buttonType="secondary" [popupBackAction]>
       {{ "cancel" | i18n }}
     </button>
   </popup-footer>
diff --git a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
index 5aebee3b781..584c7cd3f7c 100644
--- a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
@@ -12,6 +12,8 @@ import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-fo
 import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "export-browser-v2.component.html",
   imports: [
diff --git a/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts b/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
index 506dae2fb18..a88cc3f81dc 100644
--- a/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
@@ -4,13 +4,24 @@ import { Router } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
-import { ImportComponent } from "@bitwarden/importer-ui";
+import {
+  DefaultImportMetadataService,
+  ImportMetadataServiceAbstraction,
+} from "@bitwarden/importer-core";
+import {
+  ImportComponent,
+  ImporterProviders,
+  SYSTEM_SERVICE_PROVIDER,
+} from "@bitwarden/importer-ui";
+import { safeProvider } from "@bitwarden/ui-common";
 
 import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
 import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-footer.component";
 import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "import-browser-v2.component.html",
   imports: [
@@ -25,6 +36,14 @@ import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page
     PopupHeaderComponent,
     PopOutComponent,
   ],
+  providers: [
+    ...ImporterProviders,
+    safeProvider({
+      provide: ImportMetadataServiceAbstraction,
+      useClass: DefaultImportMetadataService,
+      deps: [SYSTEM_SERVICE_PROVIDER],
+    }),
+  ],
 })
 export class ImportBrowserV2Component {
   protected disabled = false;
diff --git a/apps/browser/src/tools/popup/settings/settings-v2.component.html b/apps/browser/src/tools/popup/settings/settings-v2.component.html
index a12c5fe005f..683b7d70ed6 100644
--- a/apps/browser/src/tools/popup/settings/settings-v2.component.html
+++ b/apps/browser/src/tools/popup/settings/settings-v2.component.html
@@ -1,4 +1,19 @@
 <popup-page>
+  <bit-spotlight *ngIf="!(hasPremium$ | async)" persistent>
+    <span class="tw-text-xs"
+      >{{ "unlockFeaturesWithPremium" | i18n }}
+      <button
+        bitLink
+        buttonType="primary"
+        class="tw-text-xs"
+        type="button"
+        (click)="openUpgradeDialog()"
+        [title]="'upgradeNow' | i18n"
+      >
+        {{ "upgradeNow" | i18n }}
+      </button>
+    </span>
+  </bit-spotlight>
   <popup-header slot="header" pageTitle="{{ 'settings' | i18n }}">
     <ng-container slot="end">
       <app-pop-out></app-pop-out>
@@ -20,7 +35,7 @@
         <div class="tw-flex tw-items-center tw-justify-center">
           <p class="tw-pr-2">{{ "autofill" | i18n }}</p>
           <span
-            *ngIf="!isBrowserAutofillSettingOverridden && (showAutofillBadge$ | async)"
+            *ngIf="!(isBrowserAutofillSettingOverridden$ | async) && (showAutofillBadge$ | async)"
             bitBadge
             variant="notification"
             [attr.aria-label]="'nudgeBadgeAria' | i18n"
diff --git a/apps/browser/src/tools/popup/settings/settings-v2.component.spec.ts b/apps/browser/src/tools/popup/settings/settings-v2.component.spec.ts
new file mode 100644
index 00000000000..f51d514289e
--- /dev/null
+++ b/apps/browser/src/tools/popup/settings/settings-v2.component.spec.ts
@@ -0,0 +1,260 @@
+import { ChangeDetectionStrategy, Component, CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
+import { TestBed, waitForAsync } from "@angular/core/testing";
+import { RouterTestingModule } from "@angular/router/testing";
+import { mock, MockProxy } from "jest-mock-extended";
+import { BehaviorSubject, firstValueFrom, of, Subject } from "rxjs";
+
+import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
+import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
+import { AutofillBrowserSettingsService } from "@bitwarden/browser/autofill/services/autofill-browser-settings.service";
+import { BrowserApi } from "@bitwarden/browser/platform/browser/browser-api";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AvatarService } from "@bitwarden/common/auth/abstractions/avatar.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { DialogService } from "@bitwarden/components";
+import { GlobalStateProvider } from "@bitwarden/state";
+import { FakeGlobalStateProvider } from "@bitwarden/state-test-utils";
+
+import { CurrentAccountComponent } from "../../../auth/popup/account-switching/current-account.component";
+
+import { SettingsV2Component } from "./settings-v2.component";
+
+@Component({
+  selector: "app-current-account",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class CurrentAccountStubComponent {}
+
+describe("SettingsV2Component", () => {
+  let account$: BehaviorSubject<Account | null>;
+  let mockAccountService: Partial<AccountService>;
+  let mockBillingState: { hasPremiumFromAnySource$: jest.Mock };
+  let mockNudges: {
+    showNudgeBadge$: jest.Mock;
+    dismissNudge: jest.Mock;
+  };
+  let mockAutofillSettings: {
+    defaultBrowserAutofillDisabled$: Subject<boolean>;
+    isBrowserAutofillSettingOverridden: jest.Mock<Promise<boolean>>;
+  };
+  let dialogService: MockProxy<DialogService>;
+  let openSpy: jest.SpyInstance;
+
+  beforeEach(waitForAsync(async () => {
+    dialogService = mock<DialogService>();
+    account$ = new BehaviorSubject<Account | null>(null);
+    mockAccountService = {
+      activeAccount$: account$ as unknown as AccountService["activeAccount$"],
+    };
+
+    mockBillingState = {
+      hasPremiumFromAnySource$: jest.fn().mockReturnValue(of(false)),
+    };
+
+    mockNudges = {
+      showNudgeBadge$: jest.fn().mockImplementation(() => of(false)),
+      dismissNudge: jest.fn().mockResolvedValue(undefined),
+    };
+
+    mockAutofillSettings = {
+      defaultBrowserAutofillDisabled$: new BehaviorSubject<boolean>(false),
+      isBrowserAutofillSettingOverridden: jest.fn().mockResolvedValue(false),
+    };
+
+    jest.spyOn(BrowserApi, "getBrowserClientVendor").mockReturnValue("Chrome");
+
+    const cfg = TestBed.configureTestingModule({
+      imports: [SettingsV2Component, RouterTestingModule],
+      providers: [
+        { provide: AccountService, useValue: mockAccountService },
+        { provide: BillingAccountProfileStateService, useValue: mockBillingState },
+        { provide: NudgesService, useValue: mockNudges },
+        { provide: AutofillBrowserSettingsService, useValue: mockAutofillSettings },
+        { provide: DialogService, useValue: dialogService },
+        { provide: I18nService, useValue: { t: jest.fn((key: string) => key) } },
+        { provide: GlobalStateProvider, useValue: new FakeGlobalStateProvider() },
+        { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
+        { provide: AvatarService, useValue: mock<AvatarService>() },
+        { provide: AuthService, useValue: mock<AuthService>() },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    });
+
+    TestBed.overrideComponent(SettingsV2Component, {
+      add: {
+        imports: [CurrentAccountStubComponent],
+        providers: [{ provide: DialogService, useValue: dialogService }],
+      },
+      remove: {
+        imports: [CurrentAccountComponent],
+      },
+    });
+
+    await cfg.compileComponents();
+  }));
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  function pushActiveAccount(id = "user-123"): Account {
+    const acct = { id } as Account;
+    account$.next(acct);
+    return acct;
+  }
+
+  it("shows the premium spotlight when user does NOT have premium", async () => {
+    mockBillingState.hasPremiumFromAnySource$.mockReturnValue(of(false));
+    pushActiveAccount();
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    const el: HTMLElement = fixture.nativeElement;
+
+    expect(el.querySelector("bit-spotlight")).toBeTruthy();
+  });
+
+  it("hides the premium spotlight when user HAS premium", async () => {
+    mockBillingState.hasPremiumFromAnySource$.mockReturnValue(of(true));
+    pushActiveAccount();
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    const el: HTMLElement = fixture.nativeElement;
+    expect(el.querySelector("bit-spotlight")).toBeFalsy();
+  });
+
+  it("openUpgradeDialog calls PremiumUpgradeDialogComponent.open with the DialogService", async () => {
+    openSpy = jest.spyOn(PremiumUpgradeDialogComponent, "open").mockImplementation();
+    mockBillingState.hasPremiumFromAnySource$.mockReturnValue(of(false));
+    pushActiveAccount();
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    const component = fixture.componentInstance;
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    component["openUpgradeDialog"]();
+    expect(openSpy).toHaveBeenCalledTimes(1);
+    expect(openSpy).toHaveBeenCalledWith(dialogService);
+  });
+
+  it("isBrowserAutofillSettingOverridden$ emits the value from the AutofillBrowserSettingsService", async () => {
+    pushActiveAccount();
+
+    mockAutofillSettings.isBrowserAutofillSettingOverridden.mockResolvedValue(true);
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    const component = fixture.componentInstance;
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    const value = await firstValueFrom(component["isBrowserAutofillSettingOverridden$"]);
+    expect(value).toBe(true);
+
+    mockAutofillSettings.isBrowserAutofillSettingOverridden.mockResolvedValue(false);
+
+    const fixture2 = TestBed.createComponent(SettingsV2Component);
+    const component2 = fixture2.componentInstance;
+    fixture2.detectChanges();
+    await fixture2.whenStable();
+
+    const value2 = await firstValueFrom(component2["isBrowserAutofillSettingOverridden$"]);
+    expect(value2).toBe(false);
+  });
+
+  it("showAutofillBadge$ emits true when default autofill is NOT disabled and nudge is true", async () => {
+    pushActiveAccount();
+
+    mockNudges.showNudgeBadge$.mockImplementation((type: NudgeType) =>
+      of(type === NudgeType.AutofillNudge),
+    );
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    const component = fixture.componentInstance;
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    mockAutofillSettings.defaultBrowserAutofillDisabled$.next(false);
+
+    const value = await firstValueFrom(component.showAutofillBadge$);
+    expect(value).toBe(true);
+  });
+
+  it("showAutofillBadge$ emits false when default autofill IS disabled even if nudge is true", async () => {
+    pushActiveAccount();
+
+    mockNudges.showNudgeBadge$.mockImplementation((type: NudgeType) =>
+      of(type === NudgeType.AutofillNudge),
+    );
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    const component = fixture.componentInstance;
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    mockAutofillSettings.defaultBrowserAutofillDisabled$.next(true);
+
+    const value = await firstValueFrom(component.showAutofillBadge$);
+    expect(value).toBe(false);
+  });
+
+  it("dismissBadge dismisses when showVaultBadge$ emits true", async () => {
+    const acct = pushActiveAccount();
+
+    mockNudges.showNudgeBadge$.mockImplementation((type: NudgeType) => {
+      return of(type === NudgeType.EmptyVaultNudge);
+    });
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    const component = fixture.componentInstance;
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    await component.dismissBadge(NudgeType.EmptyVaultNudge);
+
+    expect(mockNudges.dismissNudge).toHaveBeenCalledTimes(1);
+    expect(mockNudges.dismissNudge).toHaveBeenCalledWith(NudgeType.EmptyVaultNudge, acct.id, true);
+  });
+
+  it("dismissBadge does nothing when showVaultBadge$ emits false", async () => {
+    pushActiveAccount();
+
+    mockNudges.showNudgeBadge$.mockReturnValue(of(false));
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    const component = fixture.componentInstance;
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    await component.dismissBadge(NudgeType.EmptyVaultNudge);
+
+    expect(mockNudges.dismissNudge).not.toHaveBeenCalled();
+  });
+
+  it("showDownloadBitwardenNudge$ proxies to nudges service for the active account", async () => {
+    const acct = pushActiveAccount("user-xyz");
+
+    mockNudges.showNudgeBadge$.mockImplementation((type: NudgeType) =>
+      of(type === NudgeType.DownloadBitwarden),
+    );
+
+    const fixture = TestBed.createComponent(SettingsV2Component);
+    const component = fixture.componentInstance;
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    const val = await firstValueFrom(component.showDownloadBitwardenNudge$);
+    expect(val).toBe(true);
+    expect(mockNudges.showNudgeBadge$).toHaveBeenCalledWith(NudgeType.DownloadBitwarden, acct.id);
+  });
+});
diff --git a/apps/browser/src/tools/popup/settings/settings-v2.component.ts b/apps/browser/src/tools/popup/settings/settings-v2.component.ts
index 205d4063b59..95aeeb2f480 100644
--- a/apps/browser/src/tools/popup/settings/settings-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/settings-v2.component.ts
@@ -1,21 +1,31 @@
 import { CommonModule } from "@angular/common";
-import { Component, OnInit } from "@angular/core";
+import { ChangeDetectionStrategy, Component } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import {
   combineLatest,
   filter,
   firstValueFrom,
+  from,
   map,
   Observable,
   shareReplay,
   switchMap,
 } from "rxjs";
 
+import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
+import { SpotlightComponent } from "@bitwarden/angular/vault/components/spotlight/spotlight.component";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
 import { UserId } from "@bitwarden/common/types/guid";
-import { BadgeComponent, ItemModule } from "@bitwarden/components";
+import {
+  BadgeComponent,
+  DialogService,
+  ItemModule,
+  LinkModule,
+  TypographyModule,
+} from "@bitwarden/components";
 
 import { CurrentAccountComponent } from "../../../auth/popup/account-switching/current-account.component";
 import { AutofillBrowserSettingsService } from "../../../autofill/services/autofill-browser-settings.service";
@@ -36,18 +46,30 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
     ItemModule,
     CurrentAccountComponent,
     BadgeComponent,
+    SpotlightComponent,
+    TypographyModule,
+    LinkModule,
   ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class SettingsV2Component implements OnInit {
+export class SettingsV2Component {
   NudgeType = NudgeType;
-  activeUserId: UserId | null = null;
-  protected isBrowserAutofillSettingOverridden = false;
+
+  protected isBrowserAutofillSettingOverridden$ = from(
+    this.autofillBrowserSettingsService.isBrowserAutofillSettingOverridden(
+      BrowserApi.getBrowserClientVendor(window),
+    ),
+  );
 
   private authenticatedAccount$: Observable<Account> = this.accountService.activeAccount$.pipe(
     filter((account): account is Account => account !== null),
     shareReplay({ bufferSize: 1, refCount: true }),
   );
 
+  protected hasPremium$ = this.authenticatedAccount$.pipe(
+    switchMap((account) => this.accountProfileStateService.hasPremiumFromAnySource$(account.id)),
+  );
+
   showDownloadBitwardenNudge$: Observable<boolean> = this.authenticatedAccount$.pipe(
     switchMap((account) =>
       this.nudgesService.showNudgeBadge$(NudgeType.DownloadBitwarden, account.id),
@@ -77,13 +99,12 @@ export class SettingsV2Component implements OnInit {
     private readonly nudgesService: NudgesService,
     private readonly accountService: AccountService,
     private readonly autofillBrowserSettingsService: AutofillBrowserSettingsService,
+    private readonly accountProfileStateService: BillingAccountProfileStateService,
+    private readonly dialogService: DialogService,
   ) {}
 
-  async ngOnInit() {
-    this.isBrowserAutofillSettingOverridden =
-      await this.autofillBrowserSettingsService.isBrowserAutofillSettingOverridden(
-        BrowserApi.getBrowserClientVendor(window),
-      );
+  protected openUpgradeDialog() {
+    PremiumUpgradeDialogComponent.open(this.dialogService);
   }
 
   async dismissBadge(type: NudgeType) {
diff --git a/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.html b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.html
index 16d9b6a322a..0efe2bd14e2 100644
--- a/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.html
+++ b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.html
@@ -1,9 +1,28 @@
-<bit-callout *ngIf="(pendingTasks$ | async)?.length as taskCount" type="warning" [title]="''">
-  <i class="bwi bwi-exclamation-triangle tw-text-warning" aria-hidden="true"></i>
-  <a bitLink [routerLink]="'/at-risk-passwords'">
-    {{
-      (taskCount === 1 ? "reviewAndChangeAtRiskPassword" : "reviewAndChangeAtRiskPasswordsPlural")
-        | i18n: taskCount.toString()
-    }}
-  </a>
-</bit-callout>
+@if ((currentPendingTasks$ | async)?.length > 0) {
+  <bit-banner
+    class="-tw-m-5 tw-flex tw-flex-col tw-pt-2 tw-px-2 tw-mb-3"
+    bannerType="warning"
+    [showClose]="false"
+  >
+    <a bitLink linkType="secondary" [routerLink]="'/at-risk-passwords'">
+      {{
+        ((currentPendingTasks$ | async)?.length === 1
+          ? "reviewAndChangeAtRiskPassword"
+          : "reviewAndChangeAtRiskPasswordsPlural"
+        ) | i18n: (currentPendingTasks$ | async)?.length.toString()
+      }}
+    </a>
+  </bit-banner>
+}
+
+@if (showCompletedTasksBanner$ | async) {
+  <bit-banner
+    class="-tw-m-5 tw-flex tw-flex-col tw-pt-2 tw-px-2 tw-mb-3"
+    bannerType="info"
+    [icon]="null"
+    [showClose]="true"
+    (onClose)="successBannerDismissed()"
+  >
+    {{ "atRiskLoginsSecured" | i18n }}
+  </bit-banner>
+}
diff --git a/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
index 3c3270e557c..c37131b3ff1 100644
--- a/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
@@ -1,42 +1,49 @@
 import { CommonModule } from "@angular/common";
 import { Component, inject } from "@angular/core";
 import { RouterModule } from "@angular/router";
-import { combineLatest, map, switchMap } from "rxjs";
+import { firstValueFrom, switchMap } from "rxjs";
 
+import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
-import { AnchorLinkDirective, CalloutModule } from "@bitwarden/components";
+import { AnchorLinkDirective, CalloutModule, BannerModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
+import { AtRiskPasswordCalloutData, AtRiskPasswordCalloutService } from "@bitwarden/vault";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-at-risk-password-callout",
-  imports: [CommonModule, AnchorLinkDirective, RouterModule, CalloutModule, I18nPipe],
+  imports: [
+    AnchorLinkDirective,
+    CommonModule,
+    RouterModule,
+    CalloutModule,
+    I18nPipe,
+    BannerModule,
+    JslibModule,
+  ],
+  providers: [AtRiskPasswordCalloutService],
   templateUrl: "./at-risk-password-callout.component.html",
 })
 export class AtRiskPasswordCalloutComponent {
-  private taskService = inject(TaskService);
-  private cipherService = inject(CipherService);
   private activeAccount$ = inject(AccountService).activeAccount$.pipe(getUserId);
+  private atRiskPasswordCalloutService = inject(AtRiskPasswordCalloutService);
 
-  protected pendingTasks$ = this.activeAccount$.pipe(
-    switchMap((userId) =>
-      combineLatest([
-        this.taskService.pendingTasks$(userId),
-        this.cipherService.cipherViews$(userId),
-      ]),
-    ),
-    map(([tasks, ciphers]) =>
-      tasks.filter((t) => {
-        const associatedCipher = ciphers.find((c) => c.id === t.cipherId);
-
-        return (
-          t.type === SecurityTaskType.UpdateAtRiskCredential &&
-          associatedCipher &&
-          !associatedCipher.isDeleted
-        );
-      }),
-    ),
+  showCompletedTasksBanner$ = this.activeAccount$.pipe(
+    switchMap((userId) => this.atRiskPasswordCalloutService.showCompletedTasksBanner$(userId)),
   );
+
+  currentPendingTasks$ = this.activeAccount$.pipe(
+    switchMap((userId) => this.atRiskPasswordCalloutService.pendingTasks$(userId)),
+  );
+
+  async successBannerDismissed() {
+    const updateObject: AtRiskPasswordCalloutData = {
+      hasInteractedWithTasks: true,
+      tasksBannerDismissed: true,
+    };
+    const userId = await firstValueFrom(this.activeAccount$);
+    this.atRiskPasswordCalloutService.updateAtRiskPasswordState(userId, updateObject);
+  }
 }
diff --git a/apps/browser/src/vault/popup/components/at-risk-carousel-dialog/at-risk-carousel-dialog.component.ts b/apps/browser/src/vault/popup/components/at-risk-carousel-dialog/at-risk-carousel-dialog.component.ts
index 08c466d21a9..1b83c316f41 100644
--- a/apps/browser/src/vault/popup/components/at-risk-carousel-dialog/at-risk-carousel-dialog.component.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-carousel-dialog/at-risk-carousel-dialog.component.ts
@@ -7,6 +7,7 @@ import {
   DialogModule,
   DialogService,
   TypographyModule,
+  CenterPositionStrategy,
 } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 import { DarkImageSourceDirective, VaultCarouselModule } from "@bitwarden/vault";
@@ -17,6 +18,8 @@ export const AtRiskCarouselDialogResult = {
 
 type AtRiskCarouselDialogResult = UnionOfValues<typeof AtRiskCarouselDialogResult>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-at-risk-carousel-dialog",
   templateUrl: "./at-risk-carousel-dialog.component.html",
@@ -32,6 +35,8 @@ type AtRiskCarouselDialogResult = UnionOfValues<typeof AtRiskCarouselDialogResul
 export class AtRiskCarouselDialogComponent {
   private dialogRef = inject(DialogRef);
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   protected dismissBtnEnabled = signal(false);
 
   protected async dismiss() {
@@ -48,6 +53,7 @@ export class AtRiskCarouselDialogComponent {
   static open(dialogService: DialogService) {
     return dialogService.open<AtRiskCarouselDialogResult>(AtRiskCarouselDialogComponent, {
       disableClose: true,
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 }
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html
index 1ffb404fddb..3953d8f1eab 100644
--- a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html
@@ -53,12 +53,14 @@
             <app-vault-icon [cipher]="cipher"></app-vault-icon>
           </div>
           <span data-testid="item-name">{{ cipher.name }}</span>
-          <i
-            *ngIf="cipher.hasAttachments"
-            class="bwi bwi-paperclip bwi-sm"
-            [appA11yTitle]="'attachments' | i18n"
-          ></i>
           <span slot="secondary">{{ cipher.subTitle }}</span>
+          <div slot="default-trailing">
+            <i
+              *ngIf="cipher.hasAttachments"
+              class="bwi bwi-paperclip bwi-sm"
+              [appA11yTitle]="'attachments' | i18n"
+            ></i>
+          </div>
         </button>
         <bit-item-action slot="end">
           <button
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts
index e40ffcf31c9..9b972fd0f3e 100644
--- a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from "@angular/core";
+import { ChangeDetectionStrategy, Component, input } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { mock } from "jest-mock-extended";
@@ -14,6 +14,9 @@ import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/s
 import { InlineMenuVisibilitySetting } from "@bitwarden/common/autofill/types";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateProvider } from "@bitwarden/common/platform/state";
+import { FakeAccountService, FakeStateProvider } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { EndUserNotificationService } from "@bitwarden/common/vault/notifications";
@@ -24,6 +27,7 @@ import {
   ChangeLoginPasswordService,
   DefaultChangeLoginPasswordService,
   PasswordRepromptService,
+  AtRiskPasswordCalloutService,
 } from "@bitwarden/vault";
 
 import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
@@ -36,26 +40,31 @@ import { AtRiskPasswordsComponent } from "./at-risk-passwords.component";
 @Component({
   selector: "popup-header",
   template: `<ng-content></ng-content>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 class MockPopupHeaderComponent {
-  @Input() pageTitle: string | undefined;
-  @Input() backAction: (() => void) | undefined;
+  readonly pageTitle = input<string | undefined>(undefined);
+  readonly backAction = input<(() => void) | undefined>(undefined);
 }
 
 @Component({
   selector: "popup-page",
   template: `<ng-content></ng-content>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 class MockPopupPageComponent {
-  @Input() loading: boolean | undefined;
+  readonly loading = input<boolean | undefined>(undefined);
 }
 
 @Component({
   selector: "app-vault-icon",
   template: `<ng-content></ng-content>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
 class MockAppIcon {
-  @Input() cipher: CipherView | undefined;
+  readonly cipher = input<CipherView | undefined>(undefined);
 }
 
 describe("AtRiskPasswordsComponent", () => {
@@ -68,6 +77,9 @@ describe("AtRiskPasswordsComponent", () => {
   let mockNotifications$: BehaviorSubject<NotificationView[]>;
   let mockInlineMenuVisibility$: BehaviorSubject<InlineMenuVisibilitySetting>;
   let calloutDismissed$: BehaviorSubject<boolean>;
+  let mockAtRiskPasswordCalloutService: any;
+  let stateProvider: FakeStateProvider;
+  let mockAccountService: FakeAccountService;
   const setInlineMenuVisibility = jest.fn();
   const mockToastService = mock<ToastService>();
   const mockAtRiskPasswordPageService = mock<AtRiskPasswordPageService>();
@@ -88,11 +100,15 @@ describe("AtRiskPasswordsComponent", () => {
         id: "cipher",
         organizationId: "org",
         name: "Item 1",
+        edit: true,
+        viewPassword: true,
       } as CipherView,
       {
         id: "cipher2",
         organizationId: "org",
         name: "Item 2",
+        edit: true,
+        viewPassword: true,
       } as CipherView,
     ]);
     mockOrgs$ = new BehaviorSubject<Organization[]>([
@@ -112,6 +128,11 @@ describe("AtRiskPasswordsComponent", () => {
     mockToastService.showToast.mockClear();
     mockDialogService.open.mockClear();
     mockAtRiskPasswordPageService.isCalloutDismissed.mockReturnValue(calloutDismissed$);
+    mockAccountService = {
+      activeAccount$: of({ id: "user" as UserId }),
+      activeUserId: "user" as UserId,
+    } as unknown as FakeAccountService;
+    stateProvider = new FakeStateProvider(mockAccountService);
 
     await TestBed.configureTestingModule({
       imports: [AtRiskPasswordsComponent],
@@ -141,7 +162,7 @@ describe("AtRiskPasswordsComponent", () => {
           },
         },
         { provide: I18nService, useValue: { t: (key: string) => key } },
-        { provide: AccountService, useValue: { activeAccount$: of({ id: "user" }) } },
+        { provide: AccountService, useValue: mockAccountService },
         { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
         { provide: PasswordRepromptService, useValue: mock<PasswordRepromptService>() },
         {
@@ -152,6 +173,8 @@ describe("AtRiskPasswordsComponent", () => {
           },
         },
         { provide: ToastService, useValue: mockToastService },
+        { provide: StateProvider, useValue: stateProvider },
+        { provide: AtRiskPasswordCalloutService, useValue: mockAtRiskPasswordCalloutService },
       ],
     })
       .overrideModule(JslibModule, {
@@ -207,6 +230,38 @@ describe("AtRiskPasswordsComponent", () => {
           organizationId: "org",
           name: "Item 1",
           isDeleted: true,
+          edit: true,
+          viewPassword: true,
+        } as CipherView,
+      ]);
+
+      const items = await firstValueFrom(component["atRiskItems$"]);
+      expect(items).toHaveLength(0);
+    });
+
+    it("should not show tasks when cipher does not have edit permission", async () => {
+      mockCiphers$.next([
+        {
+          id: "cipher",
+          organizationId: "org",
+          name: "Item 1",
+          edit: false,
+          viewPassword: true,
+        } as CipherView,
+      ]);
+
+      const items = await firstValueFrom(component["atRiskItems$"]);
+      expect(items).toHaveLength(0);
+    });
+
+    it("should not show tasks when cipher does not have viewPassword permission", async () => {
+      mockCiphers$.next([
+        {
+          id: "cipher",
+          organizationId: "org",
+          name: "Item 1",
+          edit: true,
+          viewPassword: false,
         } as CipherView,
       ]);
 
@@ -260,11 +315,15 @@ describe("AtRiskPasswordsComponent", () => {
           id: "cipher",
           organizationId: "org",
           name: "Item 1",
+          edit: true,
+          viewPassword: true,
         } as CipherView,
         {
           id: "cipher2",
           organizationId: "org2",
           name: "Item 2",
+          edit: true,
+          viewPassword: true,
         } as CipherView,
       ]);
 
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
index e4a8293c52e..94fdb00f566 100644
--- a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
@@ -1,5 +1,12 @@
 import { CommonModule } from "@angular/common";
-import { Component, DestroyRef, inject, OnInit, signal } from "@angular/core";
+import {
+  Component,
+  DestroyRef,
+  inject,
+  OnInit,
+  signal,
+  ChangeDetectionStrategy,
+} from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Router } from "@angular/router";
 import {
@@ -41,6 +48,7 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 import {
+  AtRiskPasswordCalloutService,
   ChangeLoginPasswordService,
   DefaultChangeLoginPasswordService,
   PasswordRepromptService,
@@ -75,9 +83,11 @@ import { AtRiskPasswordPageService } from "./at-risk-password-page.service";
   providers: [
     AtRiskPasswordPageService,
     { provide: ChangeLoginPasswordService, useClass: DefaultChangeLoginPasswordService },
+    AtRiskPasswordCalloutService,
   ],
   selector: "vault-at-risk-passwords",
   templateUrl: "./at-risk-passwords.component.html",
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AtRiskPasswordsComponent implements OnInit {
   private taskService = inject(TaskService);
@@ -95,13 +105,14 @@ export class AtRiskPasswordsComponent implements OnInit {
   private dialogService = inject(DialogService);
   private endUserNotificationService = inject(EndUserNotificationService);
   private destroyRef = inject(DestroyRef);
+  private atRiskPasswordCalloutService = inject(AtRiskPasswordCalloutService);
 
   /**
    * The cipher that is currently being launched. Used to show a loading spinner on the badge button.
    * The UI utilize a bitBadge which does not support async actions (like bitButton does).
    * @protected
    */
-  protected launchingCipher = signal<CipherView | null>(null);
+  protected readonly launchingCipher = signal<CipherView | null>(null);
 
   private activeUserData$ = this.accountService.activeAccount$.pipe(
     filterOutNullish(),
@@ -153,6 +164,8 @@ export class AtRiskPasswordsComponent implements OnInit {
             t.type === SecurityTaskType.UpdateAtRiskCredential &&
             t.cipherId != null &&
             ciphers[t.cipherId] != null &&
+            ciphers[t.cipherId].edit &&
+            ciphers[t.cipherId].viewPassword &&
             !ciphers[t.cipherId].isDeleted,
         )
         .map((t) => ciphers[t.cipherId!]),
@@ -199,6 +212,11 @@ export class AtRiskPasswordsComponent implements OnInit {
     }
 
     this.markTaskNotificationsAsRead();
+
+    this.atRiskPasswordCalloutService.updateAtRiskPasswordState(userId, {
+      hasInteractedWithTasks: true,
+      tasksBannerDismissed: false,
+    });
   }
 
   private markTaskNotificationsAsRead() {
diff --git a/apps/browser/src/vault/popup/components/vault-fade-in-out-skeleton/vault-fade-in-out-skeleton.component.html b/apps/browser/src/vault/popup/components/vault-fade-in-out-skeleton/vault-fade-in-out-skeleton.component.html
new file mode 100644
index 00000000000..c83c1ab85c4
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-fade-in-out-skeleton/vault-fade-in-out-skeleton.component.html
@@ -0,0 +1,6 @@
+<!-- tw-p-3 matches the padding of the popup-page -->
+<div
+  class="tw-absolute tw-left-0 tw-top-0 tw-size-full tw-p-3 tw-overflow-hidden tw-bg-background-alt"
+>
+  <ng-content></ng-content>
+</div>
diff --git a/apps/browser/src/vault/popup/components/vault-fade-in-out-skeleton/vault-fade-in-out-skeleton.component.ts b/apps/browser/src/vault/popup/components/vault-fade-in-out-skeleton/vault-fade-in-out-skeleton.component.ts
new file mode 100644
index 00000000000..2426153ad68
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-fade-in-out-skeleton/vault-fade-in-out-skeleton.component.ts
@@ -0,0 +1,20 @@
+import { animate, style, transition, trigger } from "@angular/animations";
+import { ChangeDetectionStrategy, Component, HostBinding } from "@angular/core";
+
+@Component({
+  selector: "vault-fade-in-out-skeleton",
+  templateUrl: "./vault-fade-in-out-skeleton.component.html",
+  animations: [
+    trigger("fadeInOut", [
+      transition(":enter", [
+        style({ opacity: 0 }),
+        animate("100ms ease-in", style({ opacity: 1 })),
+      ]),
+      transition(":leave", [animate("300ms ease-out", style({ opacity: 0 }))]),
+    ]),
+  ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class VaultFadeInOutSkeletonComponent {
+  @HostBinding("@fadeInOut") fadeInOut = true;
+}
diff --git a/apps/browser/src/vault/popup/components/vault-fade-in-out/vault-fade-in-out.component.html b/apps/browser/src/vault/popup/components/vault-fade-in-out/vault-fade-in-out.component.html
new file mode 100644
index 00000000000..6dbc7430638
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-fade-in-out/vault-fade-in-out.component.html
@@ -0,0 +1 @@
+<ng-content></ng-content>
diff --git a/apps/browser/src/vault/popup/components/vault-fade-in-out/vault-fade-in-out.component.ts b/apps/browser/src/vault/popup/components/vault-fade-in-out/vault-fade-in-out.component.ts
new file mode 100644
index 00000000000..a30a447833b
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-fade-in-out/vault-fade-in-out.component.ts
@@ -0,0 +1,20 @@
+import { animate, style, transition, trigger } from "@angular/animations";
+import { ChangeDetectionStrategy, Component, HostBinding } from "@angular/core";
+
+@Component({
+  selector: "vault-fade-in-out",
+  templateUrl: "./vault-fade-in-out.component.html",
+  animations: [
+    trigger("fadeInOut", [
+      transition(":enter", [
+        style({ opacity: 0 }),
+        animate("100ms ease-in", style({ opacity: 1 })),
+      ]),
+      transition(":leave", [animate("300ms ease-out", style({ opacity: 0 }))]),
+    ]),
+  ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class VaultFadeInOutComponent {
+  @HostBinding("@fadeInOut") fadeInOut = true;
+}
diff --git a/apps/browser/src/vault/popup/components/vault-loading-skeleton/vault-loading-skeleton.component.html b/apps/browser/src/vault/popup/components/vault-loading-skeleton/vault-loading-skeleton.component.html
new file mode 100644
index 00000000000..c9b990c2ee4
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-loading-skeleton/vault-loading-skeleton.component.html
@@ -0,0 +1,15 @@
+<section aria-hidden="true">
+  <div class="tw-mt-1.5 tw-flex tw-flex-col tw-gap-4">
+    <bit-skeleton-text class="tw-w-[8.625rem] tw-max-w-full tw-mb-2.5"></bit-skeleton-text>
+    @for (num of numberOfItems; track $index) {
+      <bit-skeleton-group class="tw-mx-2">
+        <bit-skeleton class="tw-size-6" slot="start"></bit-skeleton>
+        <div class="tw-flex tw-flex-col tw-gap-1">
+          <bit-skeleton class="tw-w-40 tw-h-2.5 tw-max-w-full"></bit-skeleton>
+          <bit-skeleton class="tw-w-24 tw-h-2.5 tw-max-w-full"></bit-skeleton>
+        </div>
+      </bit-skeleton-group>
+      <hr class="tw-h-[1px] -tw-mr-3 tw-bg-secondary-100 tw-border-none" />
+    }
+  </div>
+</section>
diff --git a/apps/browser/src/vault/popup/components/vault-loading-skeleton/vault-loading-skeleton.component.ts b/apps/browser/src/vault/popup/components/vault-loading-skeleton/vault-loading-skeleton.component.ts
new file mode 100644
index 00000000000..23ae86387e8
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-loading-skeleton/vault-loading-skeleton.component.ts
@@ -0,0 +1,17 @@
+import { ChangeDetectionStrategy, Component } from "@angular/core";
+
+import {
+  SkeletonComponent,
+  SkeletonGroupComponent,
+  SkeletonTextComponent,
+} from "@bitwarden/components";
+
+@Component({
+  selector: "vault-loading-skeleton",
+  templateUrl: "./vault-loading-skeleton.component.html",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [SkeletonGroupComponent, SkeletonComponent, SkeletonTextComponent],
+})
+export class VaultLoadingSkeletonComponent {
+  protected readonly numberOfItems: null[] = new Array(15).fill(null);
+}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
index 463819b96e4..60e44cefbdf 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
@@ -131,6 +131,8 @@ class QueryParams {
 
 export type AddEditQueryParams = Partial<Record<keyof QueryParams, string>>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-add-edit-v2",
   templateUrl: "add-edit-v2.component.html",
diff --git a/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts b/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
index 0b7346c8613..546a352111e 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
@@ -28,6 +28,8 @@ import { PopupFooterComponent } from "../../../../../platform/popup/layout/popup
 import { PopupHeaderComponent } from "../../../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-assign-collections",
   templateUrl: "./assign-collections.component.html",
@@ -47,6 +49,8 @@ import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-p
     PopOutComponent,
   ],
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
 export class AssignCollections {
   /** Params needed to populate the assign collections component */
   params: CollectionAssignmentParams;
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.spec.ts
index 6e4215c1ec2..871163ac80b 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.spec.ts
@@ -25,20 +25,30 @@ import { PopupRouterCacheService } from "../../../../../platform/popup/view-cach
 
 import { AttachmentsV2Component } from "./attachments-v2.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-header",
   template: `<ng-content></ng-content>`,
 })
 class MockPopupHeaderComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() pageTitle: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() backAction: () => void;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-footer",
   template: `<ng-content></ng-content>`,
 })
 class MockPopupFooterComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() pageTitle: string;
 }
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts
index fc6d882dfd5..295496c701f 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts
@@ -17,6 +17,8 @@ import { PopupHeaderComponent } from "../../../../../platform/popup/layout/popup
 import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-page.component";
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-attachments-v2",
   templateUrl: "./attachments-v2.component.html",
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 a2045736ce2..459b328c44e 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
@@ -155,11 +155,12 @@ describe("OpenAttachmentsComponent", () => {
   });
 
   it("routes the user to the premium page when they cannot access premium features", async () => {
+    const premiumUpgradeService = TestBed.inject(PremiumUpgradePromptService);
     hasPremiumFromAnySource$.next(false);
 
     await component.openAttachments();
 
-    expect(router.navigate).toHaveBeenCalledWith(["/premium"]);
+    expect(premiumUpgradeService.promptForPremium).toHaveBeenCalled();
   });
 
   it("disables attachments when the edit form is disabled", () => {
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
index 26410a46187..a267e7999ab 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
@@ -19,12 +19,15 @@ import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { BadgeModule, ItemModule, ToastService, TypographyModule } from "@bitwarden/components";
 import { CipherFormContainer } from "@bitwarden/vault";
 
 import BrowserPopupUtils from "../../../../../../platform/browser/browser-popup-utils";
 import { FilePopoutUtilsService } from "../../../../../../tools/popup/services/file-popout-utils.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-open-attachments",
   templateUrl: "./open-attachments.component.html",
@@ -39,6 +42,8 @@ import { FilePopoutUtilsService } from "../../../../../../tools/popup/services/f
 })
 export class OpenAttachmentsComponent implements OnInit {
   /** Cipher `id` */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipherId: CipherId;
 
   /** True when the attachments window should be opened in a popout */
@@ -63,6 +68,7 @@ export class OpenAttachmentsComponent implements OnInit {
     private filePopoutUtilsService: FilePopoutUtilsService,
     private accountService: AccountService,
     private cipherFormContainer: CipherFormContainer,
+    private premiumUpgradeService: PremiumUpgradePromptService,
   ) {
     this.accountService.activeAccount$
       .pipe(
@@ -111,7 +117,7 @@ export class OpenAttachmentsComponent implements OnInit {
   /** Routes the user to the attachments screen, if available */
   async openAttachments() {
     if (!this.canAccessAttachments) {
-      await this.router.navigate(["/premium"]);
+      await this.premiumUpgradeService.promptForPremium();
       return;
     }
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.html b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.html
new file mode 100644
index 00000000000..88bff47191a
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.html
@@ -0,0 +1,70 @@
+<bit-dialog [title]="'confirmAutofill' | i18n">
+  <div bitDialogContent>
+    <p bitTypography="body2">
+      {{ "confirmAutofillDesc" | i18n }}
+    </p>
+    @if (savedUrls().length === 1) {
+      <p class="tw-text-muted tw-text-xs tw-uppercase tw-mt-4 tw-font-medium">
+        {{ "savedWebsite" | i18n }}
+      </p>
+      <bit-callout [title]="null" type="success" icon="bwi-globe">
+        <div class="tw-font-mono tw-line-clamp-1 tw-break-all" [appA11yTitle]="savedUrls()[0]">
+          {{ savedUrls()[0] }}
+        </div>
+      </bit-callout>
+    }
+    @if (savedUrls().length > 1) {
+      <div class="tw-flex tw-justify-between tw-items-center tw-mt-4 tw-mb-1 tw-pt-2">
+        <p class="tw-text-muted tw-text-xs tw-uppercase tw-font-medium">
+          {{ "savedWebsites" | i18n: savedUrls().length }}
+        </p>
+        <button
+          type="button"
+          bitLink
+          class="tw-text-sm tw-font-medium tw-cursor-pointer"
+          (click)="toggleSavedUrlExpandedState()"
+        >
+          {{ (savedUrlsExpanded() ? "showLess" : "showAll") | i18n }}
+        </button>
+      </div>
+      <div class="tw-pt-2" [ngClass]="savedUrlsListClass()">
+        @for (url of savedUrls(); track url) {
+          <div class="-tw-mt-2">
+            <bit-callout [title]="null" type="success" icon="bwi-globe">
+              <div class="tw-font-mono tw-line-clamp-1 tw-break-all" [appA11yTitle]="url">
+                {{ url }}
+              </div>
+            </bit-callout>
+          </div>
+        }
+      </div>
+    }
+    <p class="tw-text-muted tw-text-xs tw-uppercase tw-mt-5 tw-font-medium">
+      {{ "currentWebsite" | i18n }}
+    </p>
+    <bit-callout [title]="null" type="warning" icon="bwi-globe">
+      <div [appA11yTitle]="currentUrl()" class="tw-font-mono tw-line-clamp-1 tw-break-all">
+        {{ currentUrl() }}
+      </div>
+    </bit-callout>
+    <div class="tw-flex tw-justify-center tw-flex-col tw-gap-3 tw-mt-6">
+      @if (!viewOnly()) {
+        <button type="button" bitButton buttonType="primary" (click)="autofillAndAddUrl()">
+          {{ "autofillAndAddWebsite" | i18n }}
+        </button>
+      }
+      <button type="button" bitButton buttonType="secondary" (click)="autofillOnly()">
+        {{ (viewOnly() ? "autofill" : "autofillWithoutAdding") | i18n }}
+      </button>
+      <button
+        type="button"
+        bitLink
+        linkType="secondary"
+        (click)="close()"
+        class="tw-mt-2 tw-font-medium tw-text-sm tw-justify-center tw-text-center"
+      >
+        {{ "doNotAutofill" | i18n }}
+      </button>
+    </div>
+  </div>
+</bit-dialog>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.spec.ts
new file mode 100644
index 00000000000..a28b8730109
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.spec.ts
@@ -0,0 +1,266 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { provideNoopAnimations } from "@angular/platform-browser/animations";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { DIALOG_DATA, DialogRef, DialogService } from "@bitwarden/components";
+
+import {
+  AutofillConfirmationDialogComponent,
+  AutofillConfirmationDialogResult,
+  AutofillConfirmationDialogParams,
+} from "./autofill-confirmation-dialog.component";
+
+describe("AutofillConfirmationDialogComponent", () => {
+  let fixture: ComponentFixture<AutofillConfirmationDialogComponent>;
+  let component: AutofillConfirmationDialogComponent;
+
+  const dialogRef = {
+    close: jest.fn(),
+  } as unknown as DialogRef;
+
+  const params: AutofillConfirmationDialogParams = {
+    currentUrl: "https://example.com/path?q=1",
+    savedUrls: ["https://one.example.com/a", "https://two.example.com/b", "not-a-url.example"],
+  };
+
+  async function createFreshFixture(options?: {
+    params?: AutofillConfirmationDialogParams;
+    viewOnly?: boolean;
+  }) {
+    const base = options?.params ?? params;
+    const p: AutofillConfirmationDialogParams = {
+      ...base,
+      viewOnly: options?.viewOnly,
+    };
+
+    TestBed.resetTestingModule();
+    await TestBed.configureTestingModule({
+      imports: [AutofillConfirmationDialogComponent],
+      providers: [
+        provideNoopAnimations(),
+        { provide: DIALOG_DATA, useValue: p },
+        { provide: DialogRef, useValue: dialogRef },
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+        { provide: DialogService, useValue: {} },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    }).compileComponents();
+
+    const freshFixture = TestBed.createComponent(AutofillConfirmationDialogComponent);
+    const freshInstance = freshFixture.componentInstance;
+    freshFixture.detectChanges();
+    return { fixture: freshFixture, component: freshInstance };
+  }
+
+  beforeEach(async () => {
+    jest.spyOn(Utils, "getHostname").mockImplementation((value: string | null | undefined) => {
+      if (typeof value !== "string" || !value) {
+        return "";
+      }
+      try {
+        // handle non-URL host strings gracefully
+        if (!value.includes("://")) {
+          return value;
+        }
+        return new URL(value).hostname;
+      } catch {
+        return "";
+      }
+    });
+
+    await TestBed.configureTestingModule({
+      imports: [AutofillConfirmationDialogComponent],
+      providers: [
+        provideNoopAnimations(),
+        { provide: DIALOG_DATA, useValue: params },
+        { provide: DialogRef, useValue: dialogRef },
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+        { provide: DialogService, useValue: {} },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AutofillConfirmationDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  const findShowAll = (inFx?: ComponentFixture<AutofillConfirmationDialogComponent>) =>
+    (inFx || fixture).nativeElement.querySelector(
+      "button.tw-text-sm.tw-font-medium.tw-cursor-pointer",
+    ) as HTMLButtonElement | null;
+
+  it("normalizes currentUrl and savedUrls via Utils.getHostname", () => {
+    expect(Utils.getHostname).toHaveBeenCalledTimes(1 + (params.savedUrls?.length ?? 0));
+    expect(component.currentUrl()).toBe("example.com");
+    expect(component.savedUrls()).toEqual([
+      "one.example.com",
+      "two.example.com",
+      "not-a-url.example",
+    ]);
+  });
+
+  it("renders normalized values into the template (shallow check)", () => {
+    const text = fixture.nativeElement.textContent as string;
+    expect(text).toContain("example.com");
+    expect(text).toContain("one.example.com");
+    expect(text).toContain("two.example.com");
+    expect(text).toContain("not-a-url.example");
+  });
+
+  it("emits Canceled on close()", () => {
+    const spy = jest.spyOn(dialogRef, "close");
+    (component as any)["close"]();
+    expect(spy).toHaveBeenCalledWith(AutofillConfirmationDialogResult.Canceled);
+  });
+
+  it("emits AutofillAndUrlAdded on autofillAndAddUrl()", () => {
+    const spy = jest.spyOn(dialogRef, "close");
+    (component as any)["autofillAndAddUrl"]();
+    expect(spy).toHaveBeenCalledWith(AutofillConfirmationDialogResult.AutofillAndUrlAdded);
+  });
+
+  it("emits AutofilledOnly on autofillOnly()", () => {
+    const spy = jest.spyOn(dialogRef, "close");
+    (component as any)["autofillOnly"]();
+    expect(spy).toHaveBeenCalledWith(AutofillConfirmationDialogResult.AutofilledOnly);
+  });
+
+  it("applies collapsed list gradient class by default, then clears it after toggling", () => {
+    const initial = component.savedUrlsListClass();
+    expect(initial).toContain("gradient");
+
+    component.toggleSavedUrlExpandedState();
+    fixture.detectChanges();
+
+    const expanded = component.savedUrlsListClass();
+    expect(expanded).toBe("");
+  });
+
+  it("handles empty savedUrls gracefully", async () => {
+    const newParams: AutofillConfirmationDialogParams = {
+      currentUrl: "https://bitwarden.com/help",
+      savedUrls: [],
+    };
+
+    const { component: fresh } = await createFreshFixture({ params: newParams });
+    expect(fresh.savedUrls()).toEqual([]);
+    expect(fresh.currentUrl()).toBe("bitwarden.com");
+  });
+
+  it("handles undefined savedUrls by defaulting to [] and empty strings from Utils.getHostname", async () => {
+    const localParams: AutofillConfirmationDialogParams = {
+      currentUrl: "https://sub.domain.tld/x",
+    };
+
+    const { component: local } = await createFreshFixture({ params: localParams });
+    expect(local.savedUrls()).toEqual([]);
+    expect(local.currentUrl()).toBe("sub.domain.tld");
+  });
+
+  it("filters out falsy/invalid values from Utils.getHostname in savedUrls", async () => {
+    const hostSpy = jest.spyOn(Utils, "getHostname");
+    hostSpy.mockImplementationOnce(() => "example.com");
+    hostSpy.mockImplementationOnce(() => "ok.example");
+    hostSpy.mockImplementationOnce(() => "");
+    hostSpy.mockImplementationOnce(() => undefined as unknown as string);
+
+    const edgeParams: AutofillConfirmationDialogParams = {
+      currentUrl: "https://example.com",
+      savedUrls: ["https://ok.example", "://bad", "%%%"],
+    };
+
+    const { component: edge } = await createFreshFixture({ params: edgeParams });
+
+    expect(edge.currentUrl()).toBe("example.com");
+    expect(edge.savedUrls()).toEqual(["ok.example"]);
+  });
+
+  it("renders one current-url callout and N saved-url callouts", () => {
+    const callouts = Array.from(
+      fixture.nativeElement.querySelectorAll("bit-callout"),
+    ) as HTMLElement[];
+    expect(callouts.length).toBe(1 + params.savedUrls!.length);
+  });
+
+  it("renders normalized hostnames into the DOM text", () => {
+    const text = (fixture.nativeElement.textContent as string).replace(/\s+/g, " ");
+    expect(text).toContain("example.com");
+    expect(text).toContain("one.example.com");
+    expect(text).toContain("two.example.com");
+  });
+
+  it("shows the 'show all' button when savedUrls > 1", () => {
+    const btn = findShowAll();
+    expect(btn).toBeTruthy();
+    expect(btn!.textContent).toContain("showAll");
+  });
+
+  it('hides the "show all" button when savedUrls is empty', async () => {
+    const newParams: AutofillConfirmationDialogParams = {
+      currentUrl: "https://bitwarden.com/help",
+      savedUrls: [],
+    };
+
+    const { fixture: vf } = await createFreshFixture({ params: newParams });
+    vf.detectChanges();
+    const btn = findShowAll(vf);
+    expect(btn).toBeNull();
+  });
+
+  it("handles toggling of the 'show all' button correctly", async () => {
+    const { fixture: vf, component: vc } = await createFreshFixture();
+
+    let btn = findShowAll(vf);
+    expect(btn).toBeTruthy();
+    expect(vc.savedUrlsExpanded()).toBe(false);
+    expect(btn!.textContent).toContain("showAll");
+
+    // click to expand
+    btn!.click();
+    vf.detectChanges();
+
+    btn = findShowAll(vf);
+    expect(btn!.textContent).toContain("showLess");
+    expect(vc.savedUrlsExpanded()).toBe(true);
+
+    // click to collapse
+    btn!.click();
+    vf.detectChanges();
+
+    btn = findShowAll(vf);
+    expect(btn!.textContent).toContain("showAll");
+    expect(vc.savedUrlsExpanded()).toBe(false);
+  });
+
+  it("shows autofillWithoutAdding text on autofill button when viewOnly is false", () => {
+    fixture.detectChanges();
+    const text = fixture.nativeElement.textContent as string;
+    expect(text.includes("autofillWithoutAdding")).toBe(true);
+  });
+
+  it("does not show autofillWithoutAdding text on autofill button when viewOnly is true", async () => {
+    const { fixture: vf } = await createFreshFixture({ viewOnly: true });
+    const text = vf.nativeElement.textContent as string;
+    expect(text.includes("autofillWithoutAdding")).toBe(false);
+  });
+
+  it("shows autofill and save button when viewOnly is false", () => {
+    // default viewOnly is false
+    fixture.detectChanges();
+    const text = fixture.nativeElement.textContent as string;
+    expect(text.includes("autofillAndAddWebsite")).toBe(true);
+  });
+
+  it("does not show autofill and save button when viewOnly is true", async () => {
+    const { fixture: vf } = await createFreshFixture({ viewOnly: true });
+    const text = vf.nativeElement.textContent as string;
+    expect(text.includes("autofillAndAddWebsite")).toBe(false);
+  });
+});
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.ts b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.ts
new file mode 100644
index 00000000000..3a9f70b7c4b
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.ts
@@ -0,0 +1,92 @@
+import { CommonModule } from "@angular/common";
+import { ChangeDetectionStrategy, Component, computed, inject, signal } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
+import {
+  DIALOG_DATA,
+  DialogConfig,
+  DialogRef,
+  DialogService,
+  ButtonModule,
+  DialogModule,
+  TypographyModule,
+  CalloutComponent,
+  LinkModule,
+} from "@bitwarden/components";
+
+export interface AutofillConfirmationDialogParams {
+  savedUrls?: string[];
+  currentUrl: string;
+  viewOnly?: boolean;
+}
+
+export const AutofillConfirmationDialogResult = Object.freeze({
+  AutofillAndUrlAdded: "added",
+  AutofilledOnly: "autofilled",
+  Canceled: "canceled",
+} as const);
+
+export type AutofillConfirmationDialogResultType = UnionOfValues<
+  typeof AutofillConfirmationDialogResult
+>;
+
+@Component({
+  templateUrl: "./autofill-confirmation-dialog.component.html",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    ButtonModule,
+    CalloutComponent,
+    CommonModule,
+    DialogModule,
+    LinkModule,
+    TypographyModule,
+    JslibModule,
+  ],
+})
+export class AutofillConfirmationDialogComponent {
+  private readonly params = inject<AutofillConfirmationDialogParams>(DIALOG_DATA);
+  private readonly dialogRef = inject(DialogRef<AutofillConfirmationDialogResultType>);
+
+  readonly currentUrl = signal<string>(Utils.getHostname(this.params.currentUrl));
+  readonly savedUrls = signal<string[]>(
+    (this.params.savedUrls ?? []).map((u) => Utils.getHostname(u) ?? "").filter(Boolean),
+  );
+  readonly viewOnly = signal<boolean>(this.params.viewOnly ?? false);
+  readonly savedUrlsExpanded = signal<boolean>(false);
+
+  readonly savedUrlsListClass = computed(() =>
+    this.savedUrlsExpanded()
+      ? ""
+      : `tw-relative tw-max-h-24 tw-overflow-hidden after:tw-pointer-events-none
+         after:tw-content-[''] after:tw-absolute after:tw-inset-x-0 after:tw-bottom-0
+         after:tw-h-8 after:tw-bg-gradient-to-t after:tw-from-background after:tw-to-transparent`,
+  );
+
+  toggleSavedUrlExpandedState() {
+    this.savedUrlsExpanded.update((v) => !v);
+  }
+
+  close() {
+    this.dialogRef.close(AutofillConfirmationDialogResult.Canceled);
+  }
+
+  autofillAndAddUrl() {
+    this.dialogRef.close(AutofillConfirmationDialogResult.AutofillAndUrlAdded);
+  }
+
+  autofillOnly() {
+    this.dialogRef.close(AutofillConfirmationDialogResult.AutofilledOnly);
+  }
+
+  static open(
+    dialogService: DialogService,
+    config: DialogConfig<AutofillConfirmationDialogParams>,
+  ) {
+    return dialogService.open<AutofillConfirmationDialogResultType>(
+      AutofillConfirmationDialogComponent,
+      { ...config },
+    );
+  }
+}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
index 1eef907821d..64f662ab840 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
@@ -15,6 +15,8 @@ import { VaultPopupItemsService } from "../../../services/vault-popup-items.serv
 import { PopupCipherViewLike } from "../../../views/popup-cipher.view";
 import { VaultListItemsContainerComponent } from "../vault-list-items-container/vault-list-items-container.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [
     CommonModule,
@@ -46,7 +48,7 @@ export class AutofillVaultListItemsComponent {
       startWith(true), // Start with true to avoid flashing the fill button on first load
     );
 
-  protected groupByType = toSignal(
+  protected readonly groupByType = toSignal(
     this.vaultPopupItemsService.hasFilterApplied$.pipe(map((hasFilter) => !hasFilter)),
   );
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts b/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts
index 5824e8d97ea..44a033137de 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts
@@ -15,6 +15,8 @@ import { VaultPopupAutofillService } from "../../../services/vault-popup-autofil
 
 const blockedURISettingsRoute = "/blocked-domains";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [
     BannerModule,
@@ -28,6 +30,8 @@ const blockedURISettingsRoute = "/blocked-domains";
   selector: "blocked-injection-banner",
   templateUrl: "blocked-injection-banner.component.html",
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
 export class BlockedInjectionBanner implements OnInit {
   /**
    * Flag indicating that the banner should be shown
diff --git a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
index 94996a054e6..48c8f5682bc 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
@@ -9,6 +9,8 @@ import { VaultCarouselModule } from "@bitwarden/vault";
 
 import { IntroCarouselService } from "../../../services/intro-carousel.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-intro-carousel",
   templateUrl: "./intro-carousel.component.html",
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts
index 6c7e8bcfbc3..e24db60a55a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts
@@ -10,7 +10,7 @@ import {
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 import { IconButtonModule, ItemModule, MenuModule } from "@bitwarden/components";
 import { CopyableCipherFields } from "@bitwarden/sdk-internal";
-import { CopyAction, CopyCipherFieldDirective } from "@bitwarden/vault";
+import { CopyFieldAction, CopyCipherFieldDirective } from "@bitwarden/vault";
 
 import { VaultPopupCopyButtonsService } from "../../../services/vault-popup-copy-buttons.service";
 
@@ -18,9 +18,11 @@ type CipherItem = {
   /** Translation key for the respective value */
   key: string;
   /** Property key on `CipherView` to retrieve the copy value */
-  field: CopyAction;
+  field: CopyFieldAction;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-item-copy-actions",
   templateUrl: "item-copy-actions.component.html",
@@ -35,6 +37,8 @@ type CipherItem = {
 })
 export class ItemCopyActionsComponent {
   protected showQuickCopyActions$ = inject(VaultPopupCopyButtonsService).showQuickCopyActions$;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipher!: CipherViewLike;
 
   protected CipherViewLikeUtils = CipherViewLikeUtils;
@@ -44,7 +48,7 @@ export class ItemCopyActionsComponent {
    * singleCopyableLogin uses appCopyField instead of appCopyClick. This allows for the TOTP
    * code to be copied correctly. See #14167
    */
-  get singleCopyableLogin() {
+  get singleCopyableLogin(): CipherItem | null {
     const loginItems: CipherItem[] = [
       { key: "copyUsername", field: "username" },
       { key: "copyPassword", field: "password" },
@@ -58,7 +62,7 @@ export class ItemCopyActionsComponent {
     ) {
       return {
         key: this.i18nService.t("copyUsername"),
-        field: "username",
+        field: "username" as const,
       };
     }
     return this.findSingleCopyableItem(loginItems);
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
index 16cc04ce612..5c5171ac81d 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
@@ -13,9 +13,17 @@
         <button type="button" bitMenuItem (click)="doAutofill()">
           {{ "autofill" | i18n }}
         </button>
-        <button type="button" bitMenuItem *ngIf="canEdit && isLogin" (click)="doAutofillAndSave()">
-          {{ "fillAndSave" | i18n }}
-        </button>
+        <!-- Autofill confirmation handles both 'autofill' and 'autofill and save' so no need to show both -->
+        @if (!(autofillConfirmationFlagEnabled$ | async)) {
+          <button
+            type="button"
+            bitMenuItem
+            *ngIf="canEdit && isLogin"
+            (click)="doAutofillAndSave()"
+          >
+            {{ "fillAndSave" | i18n }}
+          </button>
+        }
       </ng-container>
     </ng-container>
     <ng-container *ngIf="showViewOption">
@@ -26,6 +34,11 @@
     <button type="button" bitMenuItem (click)="toggleFavorite()">
       {{ favoriteText | i18n }}
     </button>
+    @if (canEdit) {
+      <button type="button" bitMenuItem (click)="edit()">
+        {{ "edit" | i18n }}
+      </button>
+    }
     <ng-container *ngIf="canEdit && canViewPassword">
       <a bitMenuItem (click)="clone()" *ngIf="canClone$ | async">
         {{ "clone" | i18n }}
@@ -38,9 +51,32 @@
         {{ "assignToCollections" | i18n }}
       </a>
     </ng-container>
-    @if (canArchive$ | async) {
-      <button type="button" bitMenuItem (click)="archive()" *ngIf="canArchive$ | async">
-        {{ "archive" | i18n }}
+    @if (showArchive$ | async) {
+      @if (canArchive$ | async) {
+        <button type="button" bitMenuItem (click)="archive()">
+          {{ "archiveVerb" | i18n }}
+        </button>
+      } @else {
+        <button
+          type="button"
+          bitMenuItem
+          (click)="badge.promptForPremium($event)"
+          [attr.aria-label]="'upgradeToUseArchive' | i18n"
+        >
+          <div class="tw-flex tw-flex-nowrap tw-items-center tw-gap-2">
+            {{ "archiveVerb" | i18n }}
+            <div aria-hidden>
+              <app-premium-badge #badge></app-premium-badge>
+            </div>
+          </div>
+        </button>
+      }
+    }
+    @if (canDelete$ | async) {
+      <button type="button" bitMenuItem (click)="delete()">
+        <span class="tw-text-danger">
+          {{ "delete" | i18n }}
+        </span>
       </button>
     }
   </bit-menu>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.spec.ts
new file mode 100644
index 00000000000..577b7d96771
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.spec.ts
@@ -0,0 +1,412 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { Router } from "@angular/router";
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject, of } from "rxjs";
+
+import { CollectionService } from "@bitwarden/admin-console/common";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+import {
+  UriMatchStrategy,
+  UriMatchStrategySetting,
+} from "@bitwarden/common/models/domain/domain-service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { DialogService, ToastService } from "@bitwarden/components";
+import { PasswordRepromptService } from "@bitwarden/vault";
+
+import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
+import { VaultPopupItemsService } from "../../../services/vault-popup-items.service";
+import {
+  AutofillConfirmationDialogComponent,
+  AutofillConfirmationDialogResult,
+} from "../autofill-confirmation-dialog/autofill-confirmation-dialog.component";
+
+import { ItemMoreOptionsComponent } from "./item-more-options.component";
+
+describe("ItemMoreOptionsComponent", () => {
+  let fixture: ComponentFixture<ItemMoreOptionsComponent>;
+  let component: ItemMoreOptionsComponent;
+
+  const dialogService = {
+    openSimpleDialog: jest.fn().mockResolvedValue(true),
+    open: jest.fn(),
+  };
+  const featureFlag$ = new BehaviorSubject<boolean>(false);
+  const configService = {
+    getFeatureFlag$: jest.fn().mockImplementation(() => featureFlag$.asObservable()),
+  };
+  const cipherService = {
+    getFullCipherView: jest.fn(),
+    encrypt: jest.fn(),
+    updateWithServer: jest.fn(),
+    softDeleteWithServer: jest.fn(),
+  };
+  const autofillSvc = {
+    doAutofill: jest.fn(),
+    doAutofillAndSave: jest.fn(),
+    currentAutofillTab$: new BehaviorSubject<{ url?: string | null } | null>(null),
+    autofillAllowed$: new BehaviorSubject(true),
+  };
+
+  const passwordRepromptService = {
+    passwordRepromptCheck: jest.fn().mockResolvedValue(true),
+  };
+
+  const uriMatchStrategy$ = new BehaviorSubject<UriMatchStrategySetting>(UriMatchStrategy.Domain);
+
+  const domainSettingsService = {
+    resolvedDefaultUriMatchStrategy$: uriMatchStrategy$.asObservable(),
+  };
+
+  const baseCipher = {
+    id: "cipher-1",
+    login: {
+      uris: [
+        { uri: "https://one.example.com" },
+        { uri: "" },
+        { uri: undefined as unknown as string },
+        { uri: "https://two.example.com/a" },
+      ],
+      username: "user",
+    },
+    favorite: false,
+    reprompt: 0,
+    type: CipherType.Login,
+    viewPassword: true,
+    edit: true,
+  } as any;
+
+  beforeEach(waitForAsync(async () => {
+    jest.clearAllMocks();
+
+    cipherService.getFullCipherView.mockImplementation(async (c) => ({ ...baseCipher, ...c }));
+
+    TestBed.configureTestingModule({
+      imports: [ItemMoreOptionsComponent, NoopAnimationsModule],
+      providers: [
+        { provide: ConfigService, useValue: configService },
+        { provide: CipherService, useValue: cipherService },
+        { provide: VaultPopupAutofillService, useValue: autofillSvc },
+
+        { provide: I18nService, useValue: { t: (k: string) => k } },
+        { provide: AccountService, useValue: { activeAccount$: of({ id: "UserId" }) } },
+        { provide: OrganizationService, useValue: { hasOrganizations: () => of(false) } },
+        {
+          provide: CipherAuthorizationService,
+          useValue: { canDeleteCipher$: () => of(true), canCloneCipher$: () => of(true) },
+        },
+        { provide: CollectionService, useValue: { decryptedCollections$: () => of([]) } },
+        { provide: RestrictedItemTypesService, useValue: { restricted$: of([]) } },
+        {
+          provide: CipherArchiveService,
+          useValue: { userCanArchive$: () => of(true), hasArchiveFlagEnabled$: () => of(true) },
+        },
+        { provide: ToastService, useValue: { showToast: () => {} } },
+        { provide: Router, useValue: { navigate: () => Promise.resolve(true) } },
+        { provide: PasswordRepromptService, useValue: passwordRepromptService },
+        {
+          provide: DomainSettingsService,
+          useValue: domainSettingsService,
+        },
+        {
+          provide: VaultPopupItemsService,
+          useValue: mock<VaultPopupItemsService>({}),
+        },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    });
+    TestBed.overrideProvider(DialogService, { useValue: dialogService });
+    await TestBed.compileComponents();
+    fixture = TestBed.createComponent(ItemMoreOptionsComponent);
+    component = fixture.componentInstance;
+    component.cipher = baseCipher;
+  }));
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  function mockConfirmDialogResult(result: string) {
+    const openSpy = jest
+      .spyOn(AutofillConfirmationDialogComponent, "open")
+      .mockReturnValue({ closed: of(result) } as any);
+    return openSpy;
+  }
+
+  describe("doAutofill", () => {
+    it("calls the passwordService to passwordRepromptCheck", async () => {
+      autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+      mockConfirmDialogResult(AutofillConfirmationDialogResult.AutofilledOnly);
+
+      await component.doAutofill();
+
+      expect(passwordRepromptService.passwordRepromptCheck).toHaveBeenCalledWith(baseCipher);
+    });
+
+    it("calls the autofill service to autofill without showing the confirmation dialog when the feature flag is disabled", async () => {
+      autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+
+      await component.doAutofill();
+
+      expect(cipherService.getFullCipherView).toHaveBeenCalled();
+      expect(autofillSvc.doAutofill).toHaveBeenCalledTimes(1);
+      expect(autofillSvc.doAutofill).toHaveBeenCalledWith(
+        expect.objectContaining({ id: "cipher-1" }),
+        true,
+        true,
+      );
+      expect(autofillSvc.doAutofillAndSave).not.toHaveBeenCalled();
+      expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+    });
+
+    it("does nothing if the user fails master password reprompt", async () => {
+      baseCipher.reprompt = 2; // Master Password reprompt enabled
+      autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+      passwordRepromptService.passwordRepromptCheck.mockResolvedValue(false); // Reprompt fails
+      mockConfirmDialogResult(AutofillConfirmationDialogResult.AutofilledOnly);
+
+      await component.doAutofill();
+
+      expect(autofillSvc.doAutofill).not.toHaveBeenCalled();
+      expect(autofillSvc.doAutofillAndSave).not.toHaveBeenCalled();
+    });
+
+    it("does not show the exact match dialog when the default match strategy is Exact and autofill confirmation is not to be shown", async () => {
+      // autofill confirmation dialog is not shown when either the feature flag is disabled
+      uriMatchStrategy$.next(UriMatchStrategy.Exact);
+      autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com/path" });
+      await component.doAutofill();
+
+      expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+    });
+
+    describe("autofill confirmation dialog", () => {
+      beforeEach(() => {
+        // autofill confirmation dialog is shown when feature flag is enabled
+        featureFlag$.next(true);
+        uriMatchStrategy$.next(UriMatchStrategy.Domain);
+        passwordRepromptService.passwordRepromptCheck.mockResolvedValue(true);
+      });
+
+      it("calls the passwordService to passwordRepromptCheck", async () => {
+        autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+        mockConfirmDialogResult(AutofillConfirmationDialogResult.AutofilledOnly);
+
+        await component.doAutofill();
+
+        expect(passwordRepromptService.passwordRepromptCheck).toHaveBeenCalledWith(baseCipher);
+      });
+
+      it("opens the autofill confirmation dialog with filtered saved URLs when the feature flag is enabled", async () => {
+        autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com/path" });
+        const openSpy = mockConfirmDialogResult(AutofillConfirmationDialogResult.Canceled);
+
+        await component.doAutofill();
+
+        expect(openSpy).toHaveBeenCalledTimes(1);
+        const args = openSpy.mock.calls[0][1];
+        expect(args.data?.currentUrl).toBe("https://page.example.com/path");
+        expect(args.data?.savedUrls).toEqual([
+          "https://one.example.com",
+          "https://two.example.com/a",
+        ]);
+      });
+
+      it("does nothing when the user cancels the autofill confirmation dialog", async () => {
+        autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+        mockConfirmDialogResult(AutofillConfirmationDialogResult.Canceled);
+
+        await component.doAutofill();
+
+        expect(autofillSvc.doAutofill).not.toHaveBeenCalled();
+        expect(autofillSvc.doAutofillAndSave).not.toHaveBeenCalled();
+      });
+
+      it("calls the autofill service to autofill when the user selects 'AutofilledOnly'", async () => {
+        autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+        mockConfirmDialogResult(AutofillConfirmationDialogResult.AutofilledOnly);
+
+        await component.doAutofill();
+
+        expect(autofillSvc.doAutofill).toHaveBeenCalledWith(
+          expect.objectContaining({ id: "cipher-1" }),
+          true,
+          true,
+        );
+        expect(autofillSvc.doAutofillAndSave).not.toHaveBeenCalled();
+      });
+
+      it("calls the autofill service to doAutofillAndSave when the user selects 'AutofillAndUrlAdded'", async () => {
+        autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+        mockConfirmDialogResult(AutofillConfirmationDialogResult.AutofillAndUrlAdded);
+
+        await component.doAutofill();
+
+        expect(autofillSvc.doAutofillAndSave).toHaveBeenCalledWith(
+          expect.objectContaining({ id: "cipher-1" }),
+          false,
+          true,
+        );
+        expect(autofillSvc.doAutofillAndSave.mock.calls[0][1]).toBe(false);
+        expect(autofillSvc.doAutofill).not.toHaveBeenCalled();
+      });
+
+      describe("URI match strategy handling", () => {
+        describe("when the default URI match strategy is Exact", () => {
+          beforeEach(() => {
+            uriMatchStrategy$.next(UriMatchStrategy.Exact);
+          });
+
+          it("calls the passwordService to passwordRepromptCheck", async () => {
+            autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+            mockConfirmDialogResult(AutofillConfirmationDialogResult.AutofilledOnly);
+
+            await component.doAutofill();
+
+            expect(passwordRepromptService.passwordRepromptCheck).toHaveBeenCalledWith(baseCipher);
+          });
+
+          it("shows the exact match dialog", async () => {
+            autofillSvc.currentAutofillTab$.next({ url: "https://no-match.example.com" });
+
+            await component.doAutofill();
+
+            expect(dialogService.openSimpleDialog).toHaveBeenCalledTimes(1);
+            expect(dialogService.openSimpleDialog).toHaveBeenCalledWith(
+              expect.objectContaining({
+                title: expect.objectContaining({ key: "cannotAutofill" }),
+                content: expect.objectContaining({ key: "cannotAutofillExactMatch" }),
+                type: "info",
+              }),
+            );
+            expect(autofillSvc.doAutofill).not.toHaveBeenCalled();
+            expect(autofillSvc.doAutofillAndSave).not.toHaveBeenCalled();
+          });
+        });
+
+        describe("when the default URI match strategy is not Exact", () => {
+          beforeEach(() => {
+            mockConfirmDialogResult(AutofillConfirmationDialogResult.Canceled);
+            uriMatchStrategy$.next(UriMatchStrategy.Domain);
+          });
+          it("does not show the exact match dialog", async () => {
+            cipherService.getFullCipherView.mockImplementation(async (c) => ({
+              ...baseCipher,
+              ...c,
+              login: {
+                ...baseCipher.login,
+                uris: [
+                  { uri: "https://one.example.com", match: UriMatchStrategy.Exact },
+                  { uri: "https://page.example.com", match: UriMatchStrategy.Domain },
+                ],
+              },
+            }));
+
+            autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+
+            await component.doAutofill();
+
+            expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+          });
+
+          it("shows the exact match dialog when the cipher has a single uri with a match strategy of Exact", async () => {
+            cipherService.getFullCipherView.mockImplementation(async (c) => ({
+              ...baseCipher,
+              ...c,
+              login: {
+                ...baseCipher.login,
+                uris: [{ uri: "https://one.example.com", match: UriMatchStrategy.Exact }],
+              },
+            }));
+
+            autofillSvc.currentAutofillTab$.next({ url: "https://no-match.example.com" });
+
+            await component.doAutofill();
+
+            expect(dialogService.openSimpleDialog).toHaveBeenCalledWith(
+              expect.objectContaining({
+                title: expect.objectContaining({ key: "cannotAutofill" }),
+                content: expect.objectContaining({ key: "cannotAutofillExactMatch" }),
+                type: "info",
+              }),
+            );
+            expect(autofillSvc.doAutofill).not.toHaveBeenCalled();
+            expect(autofillSvc.doAutofillAndSave).not.toHaveBeenCalled();
+          });
+        });
+
+        it("does not show the exact match dialog when the cipher has no uris", async () => {
+          mockConfirmDialogResult(AutofillConfirmationDialogResult.Canceled);
+          cipherService.getFullCipherView.mockImplementation(async (c) => ({
+            ...baseCipher,
+            ...c,
+            login: {
+              ...baseCipher.login,
+              uris: [],
+            },
+          }));
+
+          autofillSvc.currentAutofillTab$.next({ url: "https://no-match.example.com" });
+
+          await component.doAutofill();
+
+          expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+        });
+
+        it("does not show the exact match dialog when the cipher has a uri with a match strategy of Exact and a uri with a match strategy of Domain", async () => {
+          mockConfirmDialogResult(AutofillConfirmationDialogResult.Canceled);
+          cipherService.getFullCipherView.mockImplementation(async (c) => ({
+            ...baseCipher,
+            ...c,
+            login: {
+              ...baseCipher.login,
+              uris: [
+                { uri: "https://one.example.com", match: UriMatchStrategy.Exact },
+                { uri: "https://page.example.com", match: UriMatchStrategy.Domain },
+              ],
+            },
+          }));
+
+          autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+
+          await component.doAutofill();
+
+          expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+        });
+      });
+
+      it("hides the 'Fill and Save' button when showAutofillConfirmation$ is true", async () => {
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        const fillAndSaveButton = fixture.nativeElement.querySelector(
+          "button[bitMenuItem]:not([disabled])",
+        );
+
+        const buttonText = fillAndSaveButton?.textContent?.trim().toLowerCase() ?? "";
+        expect(buttonText.includes("fillAndSave".toLowerCase())).toBe(false);
+      });
+
+      it("does nothing if the user fails master password reprompt", async () => {
+        baseCipher.reprompt = 2; // Master Password reprompt enabled
+        autofillSvc.currentAutofillTab$.next({ url: "https://page.example.com" });
+        passwordRepromptService.passwordRepromptCheck.mockResolvedValue(false); // Reprompt fails
+        mockConfirmDialogResult(AutofillConfirmationDialogResult.AutofilledOnly);
+
+        await component.doAutofill();
+
+        expect(autofillSvc.doAutofill).not.toHaveBeenCalled();
+        expect(autofillSvc.doAutofillAndSave).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
index 6979f519f2d..4dfaf7bc66f 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
@@ -1,19 +1,24 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
 import { booleanAttribute, Component, Input } from "@angular/core";
 import { Router, RouterModule } from "@angular/router";
-import { BehaviorSubject, combineLatest, firstValueFrom, map, switchMap } from "rxjs";
+import { BehaviorSubject, combineLatest, firstValueFrom, map, Observable, switchMap } from "rxjs";
 import { filter } from "rxjs/operators";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { CipherId } from "@bitwarden/common/types/guid";
+import { CipherId, UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { CipherRepromptType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
@@ -28,19 +33,40 @@ import {
   MenuModule,
   ToastService,
 } from "@bitwarden/components";
-import { CipherArchiveService, PasswordRepromptService } from "@bitwarden/vault";
+import { PasswordRepromptService } from "@bitwarden/vault";
 
+import { BrowserPremiumUpgradePromptService } from "../../../services/browser-premium-upgrade-prompt.service";
 import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
+import { VaultPopupItemsService } from "../../../services/vault-popup-items.service";
 import { AddEditQueryParams } from "../add-edit/add-edit-v2.component";
+import {
+  AutofillConfirmationDialogComponent,
+  AutofillConfirmationDialogResult,
+} from "../autofill-confirmation-dialog/autofill-confirmation-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-item-more-options",
   templateUrl: "./item-more-options.component.html",
-  imports: [ItemModule, IconButtonModule, MenuModule, CommonModule, JslibModule, RouterModule],
+  imports: [
+    ItemModule,
+    IconButtonModule,
+    MenuModule,
+    CommonModule,
+    JslibModule,
+    RouterModule,
+    PremiumBadgeComponent,
+  ],
+  providers: [
+    { provide: PremiumUpgradePromptService, useClass: BrowserPremiumUpgradePromptService },
+  ],
 })
 export class ItemMoreOptionsComponent {
-  private _cipher$ = new BehaviorSubject<CipherViewLike>(undefined);
+  private _cipher$ = new BehaviorSubject<CipherViewLike>({} as CipherViewLike);
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({
     required: true,
   })
@@ -56,18 +82,28 @@ export class ItemMoreOptionsComponent {
    * Flag to show view item menu option. Used when something else is
    * assigned as the primary action for the item, such as autofill.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: booleanAttribute })
-  showViewOption: boolean;
+  showViewOption = false;
 
   /**
    * Flag to hide the autofill menu options. Used for items that are
    * already in the autofill list suggestion.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: booleanAttribute })
-  hideAutofillOptions: boolean;
+  hideAutofillOptions = false;
 
   protected autofillAllowed$ = this.vaultPopupAutofillService.autofillAllowed$;
 
+  protected autofillConfirmationFlagEnabled$ = this.configService
+    .getFeatureFlag$(FeatureFlag.AutofillConfirmation)
+    .pipe(map((isFeatureFlagEnabled) => isFeatureFlagEnabled));
+
+  protected uriMatchStrategy$ = this.domainSettingsService.resolvedDefaultUriMatchStrategy$;
+
   /**
    * Observable that emits a boolean value indicating if the user is authorized to clone the cipher.
    * @protected
@@ -105,18 +141,15 @@ export class ItemMoreOptionsComponent {
     }),
   );
 
-  /** Observable Boolean checking if item can show Archive menu option */
-  protected canArchive$ = combineLatest([
-    this._cipher$,
-    this.accountService.activeAccount$.pipe(
-      getUserId,
-      switchMap((userId) => this.cipherArchiveService.userCanArchive$(userId)),
-    ),
-  ]).pipe(
-    filter(([cipher, userId]) => cipher != null && userId != null),
-    map(([cipher, canArchive]) => {
-      return canArchive && !CipherViewLikeUtils.isArchived(cipher) && cipher.organizationId == null;
-    }),
+  protected showArchive$: Observable<boolean> = this.cipherArchiveService.hasArchiveFlagEnabled$();
+
+  protected canArchive$: Observable<boolean> = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) => this.cipherArchiveService.userCanArchive$(userId)),
+  );
+
+  protected canDelete$ = this._cipher$.pipe(
+    switchMap((cipher) => this.cipherAuthorizationService.canDeleteCipher$(cipher)),
   );
 
   constructor(
@@ -133,6 +166,9 @@ export class ItemMoreOptionsComponent {
     private collectionService: CollectionService,
     private restrictedItemTypesService: RestrictedItemTypesService,
     private cipherArchiveService: CipherArchiveService,
+    private configService: ConfigService,
+    private vaultPopupItemsService: VaultPopupItemsService,
+    private domainSettingsService: DomainSettingsService,
   ) {}
 
   get canEdit() {
@@ -164,14 +200,75 @@ export class ItemMoreOptionsComponent {
     return this.cipher.favorite ? "unfavorite" : "favorite";
   }
 
-  async doAutofill() {
-    const cipher = await this.cipherService.getFullCipherView(this.cipher);
-    await this.vaultPopupAutofillService.doAutofill(cipher);
-  }
-
   async doAutofillAndSave() {
     const cipher = await this.cipherService.getFullCipherView(this.cipher);
-    await this.vaultPopupAutofillService.doAutofillAndSave(cipher, false);
+    await this.vaultPopupAutofillService.doAutofillAndSave(cipher);
+  }
+
+  async doAutofill() {
+    const cipher = await this.cipherService.getFullCipherView(this.cipher);
+
+    if (!(await this.passwordRepromptService.passwordRepromptCheck(this.cipher))) {
+      return;
+    }
+
+    const uris = cipher.login?.uris ?? [];
+    const cipherHasAllExactMatchLoginUris =
+      uris.length > 0 && uris.every((u) => u.uri && u.match === UriMatchStrategy.Exact);
+
+    const showAutofillConfirmation = await firstValueFrom(this.autofillConfirmationFlagEnabled$);
+    const uriMatchStrategy = await firstValueFrom(this.uriMatchStrategy$);
+
+    if (
+      showAutofillConfirmation &&
+      (cipherHasAllExactMatchLoginUris || uriMatchStrategy === UriMatchStrategy.Exact)
+    ) {
+      await this.dialogService.openSimpleDialog({
+        title: { key: "cannotAutofill" },
+        content: { key: "cannotAutofillExactMatch" },
+        type: "info",
+        acceptButtonText: { key: "okay" },
+        cancelButtonText: null,
+      });
+      return;
+    }
+
+    if (!showAutofillConfirmation) {
+      await this.vaultPopupAutofillService.doAutofill(cipher, true, true);
+      return;
+    }
+
+    const currentTab = await firstValueFrom(this.vaultPopupAutofillService.currentAutofillTab$);
+
+    if (!currentTab?.url) {
+      await this.dialogService.openSimpleDialog({
+        title: { key: "error" },
+        content: { key: "errorGettingAutoFillData" },
+        type: "danger",
+      });
+      return;
+    }
+
+    const ref = AutofillConfirmationDialogComponent.open(this.dialogService, {
+      data: {
+        currentUrl: currentTab?.url || "",
+        savedUrls: cipher.login?.uris?.filter((u) => u.uri).map((u) => u.uri!) ?? [],
+        viewOnly: !this.cipher.edit,
+      },
+    });
+
+    const result = await firstValueFrom(ref.closed);
+
+    switch (result) {
+      case AutofillConfirmationDialogResult.Canceled:
+        return;
+      case AutofillConfirmationDialogResult.AutofilledOnly:
+        await this.vaultPopupAutofillService.doAutofill(cipher, true, true);
+        return;
+      case AutofillConfirmationDialogResult.AutofillAndUrlAdded:
+        await this.vaultPopupAutofillService.doAutofillAndSave(cipher, false, true);
+        return;
+    }
   }
 
   async onView() {
@@ -191,17 +288,16 @@ export class ItemMoreOptionsComponent {
     const cipher = await this.cipherService.getFullCipherView(this.cipher);
 
     cipher.favorite = !cipher.favorite;
-    const activeUserId = await firstValueFrom(
+    const activeUserId = (await firstValueFrom(
       this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-    );
+    )) as UserId;
 
     const encryptedCipher = await this.cipherService.encrypt(cipher, activeUserId);
     await this.cipherService.updateWithServer(encryptedCipher);
     this.toastService.showToast({
       variant: "success",
-      title: null,
       message: this.i18nService.t(
-        this.cipher.favorite ? "itemAddedToFavorites" : "itemRemovedFromFavorites",
+        cipher.favorite ? "itemAddedToFavorites" : "itemRemovedFromFavorites",
       ),
     });
   }
@@ -251,7 +347,48 @@ export class ItemMoreOptionsComponent {
     });
   }
 
+  protected async edit() {
+    if (this.cipher.reprompt && !(await this.passwordRepromptService.showPasswordPrompt())) {
+      return;
+    }
+
+    await this.router.navigate(["/edit-cipher"], {
+      queryParams: { cipherId: this.cipher.id, type: CipherViewLikeUtils.getType(this.cipher) },
+    });
+  }
+
+  protected async delete() {
+    const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(this.cipher);
+    if (!repromptPassed) {
+      return;
+    }
+
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "deleteItem" },
+      content: { key: "deleteItemConfirmation" },
+      type: "warning",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+    await this.cipherService.softDeleteWithServer(this.cipher.id as CipherId, activeUserId);
+
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("deletedItem"),
+    });
+  }
+
   async archive() {
+    const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(this.cipher);
+    if (!repromptPassed) {
+      return;
+    }
+
     const confirmed = await this.dialogService.openSimpleDialog({
       title: { key: "archiveItem" },
       content: { key: "archiveItemConfirmDesc" },
@@ -266,7 +403,7 @@ export class ItemMoreOptionsComponent {
     await this.cipherArchiveService.archiveWithServer(this.cipher.id as CipherId, activeUserId);
     this.toastService.showToast({
       variant: "success",
-      message: this.i18nService.t("itemSentToArchive"),
+      message: this.i18nService.t("itemWasSentToArchive"),
     });
   }
 }
diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
index d1586bd6ad5..004980db181 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
@@ -23,6 +23,8 @@ export interface NewItemInitialValues {
   collectionId?: CollectionId;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-new-item-dropdown",
   templateUrl: "new-item-dropdown-v2.component.html",
@@ -34,6 +36,8 @@ export class NewItemDropdownV2Component implements OnInit {
   /**
    * Optional initial values to pass to the add cipher form
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   initialValues: NewItemInitialValues;
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
index b65138dac3a..8fa48dc5d79 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
@@ -18,14 +18,26 @@ import {
   VaultGeneratorDialogComponent,
 } from "./vault-generator-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-cipher-form-generator",
   template: "",
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
 class MockCipherFormGenerator {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() type: "password" | "username" = "password";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() algorithmSelected: EventEmitter<AlgorithmInfo> = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() uri: string = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() valueGenerated = new EventEmitter<string>();
 }
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.ts
index b0103aaacfb..caeebdabc09 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.ts
@@ -38,6 +38,8 @@ export const GeneratorDialogAction = {
 
 type GeneratorDialogAction = UnionOfValues<typeof GeneratorDialogAction>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-generator-dialog",
   templateUrl: "./vault-generator-dialog.component.html",
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
index 9564aeadc09..2e822d82855 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
@@ -10,6 +10,7 @@ import { CollectionService } from "@bitwarden/admin-console/common";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 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 { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -28,6 +29,7 @@ import {
   PopupListFilter,
   VaultPopupListFiltersService,
 } from "../../../../../vault/popup/services/vault-popup-list-filters.service";
+import { VaultPopupLoadingService } from "../../../services/vault-popup-loading.service";
 
 import { VaultHeaderV2Component } from "./vault-header-v2.component";
 
@@ -75,6 +77,10 @@ describe("VaultHeaderV2Component", () => {
         { provide: MessageSender, useValue: mock<MessageSender>() },
         { provide: AccountService, useValue: mock<AccountService>() },
         { provide: LogService, useValue: mock<LogService>() },
+        {
+          provide: ConfigService,
+          useValue: { getFeatureFlag$: jest.fn(() => new BehaviorSubject(true)) },
+        },
         {
           provide: VaultPopupItemsService,
           useValue: mock<VaultPopupItemsService>({ searchText$: new BehaviorSubject("") }),
@@ -99,6 +105,10 @@ describe("VaultHeaderV2Component", () => {
           provide: StateProvider,
           useValue: { getGlobal: () => ({ state$, update }) },
         },
+        {
+          provide: VaultPopupLoadingService,
+          useValue: { loading$: new BehaviorSubject(false) },
+        },
       ],
     }).compileComponents();
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
index f64b5e6b83d..6381b8be147 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
@@ -17,6 +17,8 @@ import { VaultPopupListFiltersService } from "../../../../../vault/popup/service
 import { VaultListFiltersComponent } from "../vault-list-filters/vault-list-filters.component";
 import { VaultV2SearchComponent } from "../vault-search/vault-v2-search.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-header-v2",
   templateUrl: "vault-header-v2.component.html",
@@ -31,6 +33,8 @@ import { VaultV2SearchComponent } from "../vault-search/vault-v2-search.componen
   ],
 })
 export class VaultHeaderV2Component {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(DisclosureComponent) disclosure: DisclosureComponent;
 
   /** Emits the visibility status of the disclosure component. */
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.ts
index 81fad896ad2..50da66fe5b8 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.ts
@@ -8,6 +8,8 @@ import { ChipSelectComponent } from "@bitwarden/components";
 
 import { VaultPopupListFiltersService } from "../../../services/vault-popup-list-filters.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-list-filters",
   templateUrl: "./vault-list-filters.component.html",
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
index fad5615764c..3dac158b8e1 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
@@ -84,7 +84,7 @@
   <bit-item-group>
     <ng-container *ngFor="let group of cipherGroups()">
       <ng-container *ngIf="group.subHeaderKey">
-        <h3 class="tw-text-muted tw-text-xs tw-font-semibold tw-pl-1 tw-mb-1 bit-compact:tw-m-0">
+        <h3 class="tw-text-muted tw-text-xs tw-font-medium tw-pl-1 tw-mb-1 bit-compact:tw-m-0">
           {{ group.subHeaderKey | i18n }}
         </h3>
       </ng-container>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
index 61d7815d93e..469247f9692 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
@@ -90,12 +90,18 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
   private vaultPopupSectionService = inject(VaultPopupSectionService);
   protected CipherViewLikeUtils = CipherViewLikeUtils;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(CdkVirtualScrollViewport, { static: false }) viewPort!: CdkVirtualScrollViewport;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(DisclosureComponent) disclosure!: DisclosureComponent;
 
   /**
    * Indicates whether the section should be open or closed if collapsibleKey is provided
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   protected sectionOpenState: Signal<boolean> = computed(() => {
     if (!this.collapsibleKey()) {
       return true;
@@ -130,17 +136,23 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
    */
   private viewCipherTimeout?: number;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   ciphers = input<PopupCipherViewLike[]>([]);
 
   /**
    * If true, we will group ciphers by type (Login, Card, Identity)
    * within subheadings in a single container, converted to a WritableSignal.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   groupByType = input<boolean | undefined>(false);
 
   /**
    * Computed signal for a grouped list of ciphers with an optional header
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   cipherGroups = computed<
     {
       subHeaderKey?: string;
@@ -183,6 +195,8 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
   /**
    * Title for the vault list item section.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   title = input<string | undefined>(undefined);
 
   /**
@@ -191,33 +205,45 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
    * The key must be added to the state definition in `vault-popup-section.service.ts` since the
    * collapsed state is stored locally.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   collapsibleKey = input<keyof PopupSectionOpen | undefined>(undefined);
 
   /**
    * Optional description for the vault list item section. Will be shown below the title even when
    * no ciphers are available.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   description = input<string | undefined>(undefined);
 
   /**
    * Option to show a refresh button in the section header.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   showRefresh = input(false, { transform: booleanAttribute });
 
   /**
    * Event emitted when the refresh button is clicked.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   onRefresh = new EventEmitter<void>();
 
   /**
    * Flag indicating that the current tab location is blocked
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   currentURIIsBlocked = toSignal(this.vaultPopupAutofillService.currentTabIsOnBlocklist$);
 
   /**
    * Resolved i18n key to use for suggested cipher items
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   cipherItemTitleKey = computed(() => {
     return (cipher: CipherViewLike) => {
       const login = CipherViewLikeUtils.getLogin(cipher);
@@ -233,11 +259,15 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
   /**
    * Option to show the autofill button for each item.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   showAutofillButton = input(false, { transform: booleanAttribute });
 
   /**
    * Flag indicating whether the suggested cipher item autofill button should be shown or not
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   hideAutofillButton = computed(
     () => !this.showAutofillButton() || this.currentURIIsBlocked() || this.primaryActionAutofill(),
   );
@@ -245,22 +275,30 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
   /**
    * Flag indicating whether the cipher item autofill menu options should be shown or not
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   hideAutofillMenuOptions = computed(() => this.currentURIIsBlocked() || this.showAutofillButton());
 
   /**
    * Option to perform autofill operation as the primary action for autofill suggestions.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   primaryActionAutofill = input(false, { transform: booleanAttribute });
 
   /**
    * Remove the bottom margin from the bit-section in this component
    * (used for containers at the end of the page where bottom margin is not needed)
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   disableSectionMargin = input(false, { transform: booleanAttribute });
 
   /**
    * Remove the description margin
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   disableDescriptionMargin = input(false, { transform: booleanAttribute });
 
   /**
@@ -275,6 +313,8 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
     return collections[0]?.name;
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   protected autofillShortcutTooltip = signal<string | undefined>(undefined);
 
   constructor(
@@ -388,7 +428,7 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
 
     await this.vaultPopupSectionService.updateSectionOpenStoredState(
       this.collapsibleKey()!,
-      this.disclosure.open,
+      this.disclosure.open(),
     );
   }
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
index f2764df7ba7..7b9f358c01c 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
@@ -18,6 +18,8 @@ import { PopupHeaderComponent } from "../../../../../platform/popup/layout/popup
 import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-page.component";
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-password-history-v2",
   templateUrl: "vault-password-history-v2.component.html",
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.spec.ts
new file mode 100644
index 00000000000..37c4804e600
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.spec.ts
@@ -0,0 +1,160 @@
+import { CommonModule } from "@angular/common";
+import { ComponentFixture, fakeAsync, TestBed, tick } from "@angular/core/testing";
+import { FormsModule } from "@angular/forms";
+import { BehaviorSubject } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SearchTextDebounceInterval } from "@bitwarden/common/vault/services/search.service";
+import { SearchModule } from "@bitwarden/components";
+
+import { VaultPopupItemsService } from "../../../services/vault-popup-items.service";
+import { VaultPopupLoadingService } from "../../../services/vault-popup-loading.service";
+
+import { VaultV2SearchComponent } from "./vault-v2-search.component";
+
+describe("VaultV2SearchComponent", () => {
+  let component: VaultV2SearchComponent;
+  let fixture: ComponentFixture<VaultV2SearchComponent>;
+
+  const searchText$ = new BehaviorSubject("");
+  const loading$ = new BehaviorSubject(false);
+  const featureFlag$ = new BehaviorSubject(true);
+  const applyFilter = jest.fn();
+
+  const createComponent = () => {
+    fixture = TestBed.createComponent(VaultV2SearchComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  };
+
+  beforeEach(async () => {
+    applyFilter.mockClear();
+    featureFlag$.next(true);
+
+    await TestBed.configureTestingModule({
+      imports: [VaultV2SearchComponent, CommonModule, SearchModule, JslibModule, FormsModule],
+      providers: [
+        {
+          provide: VaultPopupItemsService,
+          useValue: {
+            searchText$,
+            applyFilter,
+          },
+        },
+        {
+          provide: VaultPopupLoadingService,
+          useValue: {
+            loading$,
+          },
+        },
+        {
+          provide: ConfigService,
+          useValue: {
+            getFeatureFlag$: jest.fn(() => featureFlag$),
+          },
+        },
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+      ],
+    }).compileComponents();
+  });
+
+  it("subscribes to search text from service", () => {
+    createComponent();
+
+    searchText$.next("test search");
+    fixture.detectChanges();
+
+    expect(component.searchText).toBe("test search");
+  });
+
+  describe("debouncing behavior", () => {
+    describe("when feature flag is enabled", () => {
+      beforeEach(() => {
+        featureFlag$.next(true);
+        createComponent();
+      });
+
+      it("debounces search text changes when not loading", fakeAsync(() => {
+        loading$.next(false);
+
+        component.searchText = "test";
+        component.onSearchTextChanged();
+
+        expect(applyFilter).not.toHaveBeenCalled();
+
+        tick(SearchTextDebounceInterval);
+
+        expect(applyFilter).toHaveBeenCalledWith("test");
+        expect(applyFilter).toHaveBeenCalledTimes(1);
+      }));
+
+      it("should not debounce search text changes when loading", fakeAsync(() => {
+        loading$.next(true);
+
+        component.searchText = "test";
+        component.onSearchTextChanged();
+
+        tick(0);
+
+        expect(applyFilter).toHaveBeenCalledWith("test");
+        expect(applyFilter).toHaveBeenCalledTimes(1);
+      }));
+
+      it("cancels previous debounce when new text is entered", fakeAsync(() => {
+        loading$.next(false);
+
+        component.searchText = "test";
+        component.onSearchTextChanged();
+
+        tick(SearchTextDebounceInterval / 2);
+
+        component.searchText = "test2";
+        component.onSearchTextChanged();
+
+        tick(SearchTextDebounceInterval / 2);
+
+        expect(applyFilter).not.toHaveBeenCalled();
+
+        tick(SearchTextDebounceInterval / 2);
+
+        expect(applyFilter).toHaveBeenCalledWith("test2");
+        expect(applyFilter).toHaveBeenCalledTimes(1);
+      }));
+    });
+
+    describe("when feature flag is disabled", () => {
+      beforeEach(() => {
+        featureFlag$.next(false);
+        createComponent();
+      });
+
+      it("debounces search text changes", fakeAsync(() => {
+        component.searchText = "test";
+        component.onSearchTextChanged();
+
+        expect(applyFilter).not.toHaveBeenCalled();
+
+        tick(SearchTextDebounceInterval);
+
+        expect(applyFilter).toHaveBeenCalledWith("test");
+        expect(applyFilter).toHaveBeenCalledTimes(1);
+      }));
+
+      it("ignores loading state and always debounces", fakeAsync(() => {
+        loading$.next(true);
+
+        component.searchText = "test";
+        component.onSearchTextChanged();
+
+        expect(applyFilter).not.toHaveBeenCalled();
+
+        tick(SearchTextDebounceInterval);
+
+        expect(applyFilter).toHaveBeenCalledWith("test");
+        expect(applyFilter).toHaveBeenCalledTimes(1);
+      }));
+    });
+  });
+});
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
index 72df3cba41a..154cd49c5a3 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
@@ -2,14 +2,30 @@ import { CommonModule } from "@angular/common";
 import { Component, NgZone } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormsModule } from "@angular/forms";
-import { Subject, Subscription, debounceTime, distinctUntilChanged, filter } from "rxjs";
+import {
+  Subject,
+  Subscription,
+  combineLatest,
+  debounce,
+  debounceTime,
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  timer,
+} from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SearchTextDebounceInterval } from "@bitwarden/common/vault/services/search.service";
 import { SearchModule } from "@bitwarden/components";
 
 import { VaultPopupItemsService } from "../../../services/vault-popup-items.service";
+import { VaultPopupLoadingService } from "../../../services/vault-popup-loading.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [CommonModule, SearchModule, JslibModule, FormsModule],
   selector: "app-vault-v2-search",
@@ -20,8 +36,11 @@ export class VaultV2SearchComponent {
 
   private searchText$ = new Subject<string>();
 
+  protected loading$ = this.vaultPopupLoadingService.loading$;
   constructor(
     private vaultPopupItemsService: VaultPopupItemsService,
+    private vaultPopupLoadingService: VaultPopupLoadingService,
+    private configService: ConfigService,
     private ngZone: NgZone,
   ) {
     this.subscribeToLatestSearchText();
@@ -43,13 +62,38 @@ export class VaultV2SearchComponent {
       });
   }
 
-  subscribeToApplyFilter(): Subscription {
-    return this.searchText$
-      .pipe(debounceTime(SearchTextDebounceInterval), distinctUntilChanged(), takeUntilDestroyed())
-      .subscribe((data) => {
+  subscribeToApplyFilter(): void {
+    this.configService
+      .getFeatureFlag$(FeatureFlag.VaultLoadingSkeletons)
+      .pipe(
+        switchMap((enabled) => {
+          if (!enabled) {
+            return this.searchText$.pipe(
+              debounceTime(SearchTextDebounceInterval),
+              distinctUntilChanged(),
+            );
+          }
+
+          return combineLatest([this.searchText$, this.loading$]).pipe(
+            debounce(([_, isLoading]) => {
+              // If loading apply immediately to avoid stale searches.
+              // After loading completes, debounce to avoid excessive searches.
+              const delayTime = isLoading ? 0 : SearchTextDebounceInterval;
+              return timer(delayTime);
+            }),
+            distinctUntilChanged(
+              ([prevText, prevLoading], [newText, newLoading]) =>
+                prevText === newText && prevLoading === newLoading,
+            ),
+            map(([text, _]) => text),
+          );
+        }),
+        takeUntilDestroyed(),
+      )
+      .subscribe((text) => {
         this.ngZone.runOutsideAngular(() => {
           this.ngZone.run(() => {
-            this.vaultPopupItemsService.applyFilter(data);
+            this.vaultPopupItemsService.applyFilter(text);
           });
         });
       });
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
index a56eef4dfc1..347c5fe6286 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
@@ -1,4 +1,4 @@
-<popup-page [loading]="loading$ | async">
+<popup-page [loading]="showSpinnerLoaders$ | async" [hideOverflow]="showSkeletonsLoaders$ | async">
   <popup-header slot="header" [pageTitle]="'vault' | i18n">
     <ng-container slot="end">
       <app-new-item-dropdown [initialValues]="newItemItemValues$ | async"></app-new-item-dropdown>
@@ -8,20 +8,32 @@
     </ng-container>
   </popup-header>
 
-  <div
-    *ngIf="vaultState === VaultStateEnum.Empty"
-    class="tw-flex tw-flex-col tw-h-full tw-justify-center"
-  >
-    <bit-no-items [icon]="vaultIcon">
-      <ng-container slot="title">{{ "yourVaultIsEmpty" | i18n }}</ng-container>
-      <ng-container slot="description">
-        <p bitTypography="body2" class="tw-mx-6 tw-mt-2">{{ "emptyVaultDescription" | i18n }}</p>
-      </ng-container>
-      <a slot="button" bitButton buttonType="secondary" [routerLink]="['/add-cipher']">
-        {{ "newLogin" | i18n }}
-      </a>
-    </bit-no-items>
-  </div>
+  <ng-template #emptyVaultTemplate>
+    <div
+      *ngIf="vaultState === VaultStateEnum.Empty"
+      class="tw-flex tw-flex-col tw-h-full tw-justify-center"
+    >
+      <bit-no-items [icon]="vaultIcon">
+        <ng-container slot="title">{{ "yourVaultIsEmpty" | i18n }}</ng-container>
+        <ng-container slot="description">
+          <p bitTypography="body2" class="tw-mx-6 tw-mt-2">
+            {{ "emptyVaultDescription" | i18n }}
+          </p>
+        </ng-container>
+        <a slot="button" bitButton buttonType="secondary" [routerLink]="['/add-cipher']">
+          {{ "newLogin" | i18n }}
+        </a>
+      </bit-no-items>
+    </div>
+  </ng-template>
+
+  @if (skeletonFeatureFlag$ | async) {
+    <vault-fade-in-out *ngIf="vaultState === VaultStateEnum.Empty">
+      <ng-container *ngTemplateOutlet="emptyVaultTemplate"></ng-container>
+    </vault-fade-in-out>
+  } @else {
+    <ng-container *ngTemplateOutlet="emptyVaultTemplate"></ng-container>
+  }
 
   <blocked-injection-banner
     *ngIf="vaultState !== VaultStateEnum.Empty"
@@ -30,6 +42,15 @@
 
   <!-- Show search & filters outside of the scroll area of the page -->
   <ng-container slot="above-scroll-area">
+    <ng-container *ngIf="showPremiumSpotlight$ | async">
+      <bit-spotlight
+        [title]="'unlockAdvancedSecurity' | i18n"
+        [subtitle]="'unlockAdvancedSecurityDesc' | i18n"
+        [buttonText]="'explorePremium' | i18n"
+        (onButtonClick)="showPremiumDialog()"
+        (onDismiss)="dismissVaultNudgeSpotlight(NudgeType.PremiumUpgrade)"
+      ></bit-spotlight>
+    </ng-container>
     <ng-container *ngIf="vaultState === VaultStateEnum.Empty && showEmptyVaultSpotlight$ | async">
       <bit-spotlight
         [title]="'emptyVaultNudgeTitle' | i18n"
@@ -41,6 +62,9 @@
       </bit-spotlight>
     </ng-container>
     <ng-container *ngIf="vaultState !== VaultStateEnum.Empty">
+      <!-- At-Risk callout displays as a banner and should always remain visually above all other callouts -->
+      <vault-at-risk-password-callout></vault-at-risk-password-callout>
+
       <div class="tw-mb-4" *ngIf="showHasItemsVaultSpotlight$ | async">
         <bit-spotlight
           [title]="'hasItemsVaultNudgeTitle' | i18n"
@@ -53,7 +77,6 @@
           </ul>
         </bit-spotlight>
       </div>
-      <vault-at-risk-password-callout></vault-at-risk-password-callout>
       <app-vault-header-v2></app-vault-header-v2>
     </ng-container>
   </ng-container>
@@ -84,21 +107,37 @@
       </div>
     </div>
 
-    <ng-container *ngIf="vaultState === null">
-      <app-autofill-vault-list-items></app-autofill-vault-list-items>
-      <app-vault-list-items-container
-        [title]="'favorites' | i18n"
-        [ciphers]="(favoriteCiphers$ | async) || []"
-        id="favorites"
-        collapsibleKey="favorites"
-      ></app-vault-list-items-container>
-      <app-vault-list-items-container
-        [title]="'allItems' | i18n"
-        [ciphers]="(remainingCiphers$ | async) || []"
-        id="allItems"
-        disableSectionMargin
-        collapsibleKey="allItems"
-      ></app-vault-list-items-container>
-    </ng-container>
+    <ng-template #vaultContentTemplate>
+      <ng-container *ngIf="vaultState === null">
+        <app-autofill-vault-list-items></app-autofill-vault-list-items>
+        <app-vault-list-items-container
+          [title]="'favorites' | i18n"
+          [ciphers]="(favoriteCiphers$ | async) || []"
+          id="favorites"
+          collapsibleKey="favorites"
+        ></app-vault-list-items-container>
+        <app-vault-list-items-container
+          [title]="'allItems' | i18n"
+          [ciphers]="(remainingCiphers$ | async) || []"
+          id="allItems"
+          disableSectionMargin
+          collapsibleKey="allItems"
+        ></app-vault-list-items-container>
+      </ng-container>
+    </ng-template>
+
+    @if (skeletonFeatureFlag$ | async) {
+      <vault-fade-in-out *ngIf="vaultState === null">
+        <ng-container *ngTemplateOutlet="vaultContentTemplate"></ng-container>
+      </vault-fade-in-out>
+    } @else {
+      <ng-container *ngTemplateOutlet="vaultContentTemplate"></ng-container>
+    }
   </ng-container>
+
+  @if (showSkeletonsLoaders$ | async) {
+    <vault-fade-in-out-skeleton>
+      <vault-loading-skeleton></vault-loading-skeleton>
+    </vault-fade-in-out-skeleton>
+  }
 </popup-page>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.spec.ts
new file mode 100644
index 00000000000..5563cd3033b
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.spec.ts
@@ -0,0 +1,569 @@
+import { CdkVirtualScrollableElement } from "@angular/cdk/scrolling";
+import { ChangeDetectionStrategy, Component, input, NO_ERRORS_SCHEMA } from "@angular/core";
+import { TestBed, fakeAsync, flush, tick } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+import { ActivatedRoute, Router } from "@angular/router";
+import { RouterTestingModule } from "@angular/router/testing";
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject, Observable, Subject, of } from "rxjs";
+
+import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
+import { NudgeType, NudgesService } from "@bitwarden/angular/vault";
+import { VaultProfileService } from "@bitwarden/angular/vault/services/vault-profile.service";
+import { CurrentAccountComponent } from "@bitwarden/browser/auth/popup/account-switching/current-account.component";
+import AutofillService from "@bitwarden/browser/autofill/services/autofill.service";
+import { PopOutComponent } from "@bitwarden/browser/platform/popup/components/pop-out.component";
+import { PopupHeaderComponent } from "@bitwarden/browser/platform/popup/layout/popup-header.component";
+import { PopupRouterCacheService } from "@bitwarden/browser/platform/popup/view-cache/popup-router-cache.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AvatarService } from "@bitwarden/common/auth/abstractions/avatar.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { TaskService } from "@bitwarden/common/vault/tasks";
+import { DialogService } from "@bitwarden/components";
+import { StateProvider } from "@bitwarden/state";
+import { DecryptionFailureDialogComponent } from "@bitwarden/vault";
+
+import { BrowserApi } from "../../../../platform/browser/browser-api";
+import BrowserPopupUtils from "../../../../platform/browser/browser-popup-utils";
+import { IntroCarouselService } from "../../services/intro-carousel.service";
+import { VaultPopupAutofillService } from "../../services/vault-popup-autofill.service";
+import { VaultPopupCopyButtonsService } from "../../services/vault-popup-copy-buttons.service";
+import { VaultPopupItemsService } from "../../services/vault-popup-items.service";
+import { VaultPopupListFiltersService } from "../../services/vault-popup-list-filters.service";
+import { VaultPopupScrollPositionService } from "../../services/vault-popup-scroll-position.service";
+import { AtRiskPasswordCalloutComponent } from "../at-risk-callout/at-risk-password-callout.component";
+
+import { AutofillVaultListItemsComponent } from "./autofill-vault-list-items/autofill-vault-list-items.component";
+import { BlockedInjectionBanner } from "./blocked-injection-banner/blocked-injection-banner.component";
+import { NewItemDropdownV2Component } from "./new-item-dropdown/new-item-dropdown-v2.component";
+import { VaultHeaderV2Component } from "./vault-header/vault-header-v2.component";
+import { VaultListItemsContainerComponent } from "./vault-list-items-container/vault-list-items-container.component";
+import { VaultV2Component } from "./vault-v2.component";
+
+@Component({
+  selector: "popup-header",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class PopupHeaderStubComponent {
+  readonly pageTitle = input("");
+}
+
+@Component({
+  selector: "app-vault-header-v2",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class VaultHeaderV2StubComponent {}
+
+@Component({
+  selector: "app-current-account",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class CurrentAccountStubComponent {}
+
+@Component({
+  selector: "app-new-item-dropdown",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class NewItemDropdownStubComponent {
+  readonly initialValues = input();
+}
+
+@Component({
+  selector: "app-pop-out",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class PopOutStubComponent {}
+
+@Component({
+  selector: "blocked-injection-banner",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class BlockedInjectionBannerStubComponent {}
+
+@Component({
+  selector: "vault-at-risk-password-callout",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class VaultAtRiskCalloutStubComponent {}
+
+@Component({
+  selector: "app-autofill-vault-list-items",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class AutofillVaultListItemsStubComponent {}
+
+@Component({
+  selector: "app-vault-list-items-container",
+  standalone: true,
+  template: "",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class VaultListItemsContainerStubComponent {
+  readonly title = input<string>();
+  readonly ciphers = input<any[]>();
+  readonly id = input<string>();
+  readonly disableSectionMargin = input<boolean>();
+  readonly collapsibleKey = input<string>();
+}
+
+const mockDialogRef = {
+  close: jest.fn(),
+  afterClosed: jest.fn().mockReturnValue(of(undefined)),
+} as unknown as import("@bitwarden/components").DialogRef<any, any>;
+
+jest
+  .spyOn(PremiumUpgradeDialogComponent, "open")
+  .mockImplementation((_: DialogService) => mockDialogRef as any);
+
+jest
+  .spyOn(DecryptionFailureDialogComponent, "open")
+  .mockImplementation((_: DialogService, _params: any) => mockDialogRef as any);
+jest.spyOn(BrowserApi, "isPopupOpen").mockResolvedValue(false);
+jest.spyOn(BrowserPopupUtils, "openCurrentPagePopout").mockResolvedValue();
+
+describe("VaultV2Component", () => {
+  let component: VaultV2Component;
+
+  interface FakeAccount {
+    id: string;
+  }
+
+  function queryAllSpotlights(fixture: any): HTMLElement[] {
+    return Array.from(fixture.nativeElement.querySelectorAll("bit-spotlight")) as HTMLElement[];
+  }
+
+  const itemsSvc: any = {
+    emptyVault$: new BehaviorSubject<boolean>(false),
+    noFilteredResults$: new BehaviorSubject<boolean>(false),
+    showDeactivatedOrg$: new BehaviorSubject<boolean>(false),
+    favoriteCiphers$: new BehaviorSubject<any[]>([]),
+    remainingCiphers$: new BehaviorSubject<any[]>([]),
+    cipherCount$: new BehaviorSubject<number>(0),
+    loading$: new BehaviorSubject<boolean>(true),
+  } as Partial<VaultPopupItemsService>;
+
+  const filtersSvc = {
+    allFilters$: new Subject<any>(),
+    filters$: new BehaviorSubject<any>({}),
+    filterVisibilityState$: new BehaviorSubject<any>({}),
+  } as Partial<VaultPopupListFiltersService>;
+
+  const accountActive$ = new BehaviorSubject<FakeAccount | null>({ id: "user-1" });
+
+  const cipherSvc = {
+    failedToDecryptCiphers$: jest.fn().mockReturnValue(of([])),
+  } as Partial<CipherService>;
+
+  const nudgesSvc = {
+    showNudgeSpotlight$: jest.fn().mockImplementation((_type: NudgeType) => of(false)),
+    dismissNudge: jest.fn().mockResolvedValue(undefined),
+  } as Partial<NudgesService>;
+
+  const dialogSvc = {} as Partial<DialogService>;
+
+  const introSvc = {
+    setIntroCarouselDismissed: jest.fn().mockResolvedValue(undefined),
+  } as Partial<IntroCarouselService>;
+
+  const scrollSvc = {
+    start: jest.fn(),
+    stop: jest.fn(),
+  } as Partial<VaultPopupScrollPositionService>;
+
+  function getObs<T = unknown>(cmp: any, key: string): Observable<T> {
+    return cmp[key] as Observable<T>;
+  }
+
+  const hasPremiumFromAnySource$ = new BehaviorSubject<boolean>(false);
+
+  const billingSvc = {
+    hasPremiumFromAnySource$: (_: string) => hasPremiumFromAnySource$,
+  };
+
+  const vaultProfileSvc = {
+    getProfileCreationDate: jest
+      .fn()
+      .mockResolvedValue(new Date(Date.now() - 8 * 24 * 60 * 60 * 1000)), // 8 days ago
+  };
+
+  beforeEach(async () => {
+    jest.clearAllMocks();
+    await TestBed.configureTestingModule({
+      imports: [VaultV2Component, RouterTestingModule],
+      providers: [
+        { provide: VaultPopupItemsService, useValue: itemsSvc },
+        { provide: VaultPopupListFiltersService, useValue: filtersSvc },
+        { provide: VaultPopupScrollPositionService, useValue: scrollSvc },
+        {
+          provide: AccountService,
+          useValue: { activeAccount$: accountActive$ },
+        },
+        { provide: CipherService, useValue: cipherSvc },
+        { provide: DialogService, useValue: dialogSvc },
+        { provide: IntroCarouselService, useValue: introSvc },
+        { provide: NudgesService, useValue: nudgesSvc },
+        {
+          provide: VaultProfileService,
+          useValue: vaultProfileSvc,
+        },
+        {
+          provide: VaultPopupCopyButtonsService,
+          useValue: { showQuickCopyActions$: new BehaviorSubject<boolean>(false) },
+        },
+        {
+          provide: BillingAccountProfileStateService,
+          useValue: billingSvc,
+        },
+        {
+          provide: I18nService,
+          useValue: { translate: (key: string) => key, t: (key: string) => key },
+        },
+        { provide: PopupRouterCacheService, useValue: mock<PopupRouterCacheService>() },
+        { provide: RestrictedItemTypesService, useValue: { restricted$: new BehaviorSubject([]) } },
+        { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
+        { provide: AvatarService, useValue: mock<AvatarService>() },
+        { provide: ActivatedRoute, useValue: mock<ActivatedRoute>() },
+        { provide: AuthService, useValue: mock<AuthService>() },
+        { provide: AutofillService, useValue: mock<AutofillService>() },
+        {
+          provide: VaultPopupAutofillService,
+          useValue: mock<VaultPopupAutofillService>(),
+        },
+        { provide: TaskService, useValue: mock<TaskService>() },
+        { provide: StateProvider, useValue: mock<StateProvider>() },
+        {
+          provide: ConfigService,
+          useValue: {
+            getFeatureFlag$: (_: string) => of(false),
+          },
+        },
+        {
+          provide: SearchService,
+          useValue: { isCipherSearching$: of(false) },
+        },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+
+    TestBed.overrideComponent(VaultV2Component, {
+      remove: {
+        imports: [
+          PopupHeaderComponent,
+          VaultHeaderV2Component,
+          CurrentAccountComponent,
+          NewItemDropdownV2Component,
+          PopOutComponent,
+          BlockedInjectionBanner,
+          AtRiskPasswordCalloutComponent,
+          AutofillVaultListItemsComponent,
+          VaultListItemsContainerComponent,
+        ],
+      },
+      add: {
+        imports: [
+          PopupHeaderStubComponent,
+          VaultHeaderV2StubComponent,
+          CurrentAccountStubComponent,
+          NewItemDropdownStubComponent,
+          PopOutStubComponent,
+          BlockedInjectionBannerStubComponent,
+          VaultAtRiskCalloutStubComponent,
+          AutofillVaultListItemsStubComponent,
+          VaultListItemsContainerStubComponent,
+        ],
+      },
+    });
+
+    const fixture = TestBed.createComponent(VaultV2Component);
+    component = fixture.componentInstance;
+  });
+
+  describe("vaultState", () => {
+    type ExpectedKey = "Empty" | "DeactivatedOrg" | "NoResults" | null;
+
+    const cases: [string, boolean, boolean, boolean, ExpectedKey][] = [
+      ["null when none true", false, false, false, null],
+      ["Empty when empty true only", true, false, false, "Empty"],
+      ["DeactivatedOrg when only deactivated true", false, false, true, "DeactivatedOrg"],
+      ["NoResults when only noResults true", false, true, false, "NoResults"],
+    ];
+
+    it.each(cases)(
+      "%s",
+      fakeAsync(
+        (
+          _label: string,
+          empty: boolean,
+          noResults: boolean,
+          deactivated: boolean,
+          expectedKey: ExpectedKey,
+        ) => {
+          const empty$ = itemsSvc.emptyVault$ as BehaviorSubject<boolean>;
+          const noResults$ = itemsSvc.noFilteredResults$ as BehaviorSubject<boolean>;
+          const deactivated$ = itemsSvc.showDeactivatedOrg$ as BehaviorSubject<boolean>;
+
+          empty$.next(empty);
+          noResults$.next(noResults);
+          deactivated$.next(deactivated);
+          tick();
+
+          const expectedValue =
+            expectedKey === null ? null : (component as any).VaultStateEnum[expectedKey];
+
+          expect((component as any).vaultState).toBe(expectedValue);
+        },
+      ),
+    );
+  });
+
+  it("loading$ is true when items loading or filters missing; false when both ready", () => {
+    const itemsLoading$ = itemsSvc.loading$ as unknown as BehaviorSubject<boolean>;
+    const allFilters$ = filtersSvc.allFilters$ as unknown as Subject<any>;
+
+    const values: boolean[] = [];
+    getObs<boolean>(component, "loading$").subscribe((v) => values.push(!!v));
+
+    itemsLoading$.next(true);
+
+    allFilters$.next({});
+
+    itemsLoading$.next(false);
+
+    expect(values[values.length - 1]).toBe(false);
+  });
+
+  it("ngAfterViewInit waits for allFilters$ then starts scroll position service", fakeAsync(() => {
+    const allFilters$ = filtersSvc.allFilters$ as unknown as Subject<any>;
+
+    (component as any).virtualScrollElement = {} as CdkVirtualScrollableElement;
+
+    component.ngAfterViewInit();
+    expect(scrollSvc.start).not.toHaveBeenCalled();
+
+    allFilters$.next({ any: true });
+    tick();
+
+    expect(scrollSvc.start).toHaveBeenCalledTimes(1);
+    expect(scrollSvc.start).toHaveBeenCalledWith((component as any).virtualScrollElement);
+
+    flush();
+  }));
+
+  it("showPremiumDialog opens PremiumUpgradeDialogComponent", () => {
+    component["showPremiumDialog"]();
+    expect(PremiumUpgradeDialogComponent.open).toHaveBeenCalledTimes(1);
+  });
+
+  it("navigateToImport navigates and opens popout if popup is open", fakeAsync(async () => {
+    (BrowserApi.isPopupOpen as jest.Mock).mockResolvedValueOnce(true);
+
+    const ngRouter = TestBed.inject(Router);
+    jest.spyOn(ngRouter, "navigate").mockResolvedValue(true as any);
+
+    await component["navigateToImport"]();
+
+    expect(ngRouter.navigate).toHaveBeenCalledWith(["/import"]);
+
+    expect(BrowserPopupUtils.openCurrentPagePopout).toHaveBeenCalled();
+  }));
+
+  it("navigateToImport does not popout when popup is not open", fakeAsync(async () => {
+    (BrowserApi.isPopupOpen as jest.Mock).mockResolvedValueOnce(false);
+
+    const ngRouter = TestBed.inject(Router);
+    jest.spyOn(ngRouter, "navigate").mockResolvedValue(true as any);
+
+    await component["navigateToImport"]();
+
+    expect(ngRouter.navigate).toHaveBeenCalledWith(["/import"]);
+    expect(BrowserPopupUtils.openCurrentPagePopout).not.toHaveBeenCalled();
+  }));
+
+  it("ngOnInit dismisses intro carousel and opens decryption dialog for non-deleted failures", fakeAsync(() => {
+    (cipherSvc.failedToDecryptCiphers$ as any).mockReturnValue(
+      of([
+        { id: "a", isDeleted: false },
+        { id: "b", isDeleted: true },
+        { id: "c", isDeleted: false },
+      ]),
+    );
+
+    void component.ngOnInit();
+    tick();
+
+    expect(introSvc.setIntroCarouselDismissed).toHaveBeenCalled();
+
+    expect(DecryptionFailureDialogComponent.open).toHaveBeenCalledWith(expect.any(Object), {
+      cipherIds: ["a", "c"],
+    });
+
+    flush();
+  }));
+
+  it("dismissVaultNudgeSpotlight forwards to NudgesService with active user id", fakeAsync(() => {
+    const spy = jest.spyOn(nudgesSvc, "dismissNudge").mockResolvedValue(undefined);
+
+    accountActive$.next({ id: "user-xyz" });
+
+    void component.ngOnInit();
+    tick();
+
+    void component["dismissVaultNudgeSpotlight"](NudgeType.HasVaultItems);
+    tick();
+
+    expect(spy).toHaveBeenCalledWith(NudgeType.HasVaultItems, "user-xyz");
+  }));
+
+  it("accountAgeInDays$ computes integer days since creation", (done) => {
+    getObs<number | null>(component, "accountAgeInDays$").subscribe((days) => {
+      if (days !== null) {
+        expect(days).toBeGreaterThanOrEqual(7);
+        done();
+      }
+    });
+
+    void component.ngOnInit();
+  });
+
+  it("renders Premium spotlight when eligible and opens dialog on click", fakeAsync(() => {
+    itemsSvc.cipherCount$.next(10);
+
+    hasPremiumFromAnySource$.next(false);
+
+    (nudgesSvc.showNudgeSpotlight$ as jest.Mock).mockImplementation((type: NudgeType) =>
+      of(type === NudgeType.PremiumUpgrade),
+    );
+
+    const fixture = TestBed.createComponent(VaultV2Component);
+    const component = fixture.componentInstance;
+
+    void component.ngOnInit();
+
+    fixture.detectChanges();
+    tick();
+
+    fixture.detectChanges();
+
+    const spotlights = Array.from(
+      fixture.nativeElement.querySelectorAll("bit-spotlight"),
+    ) as HTMLElement[];
+    expect(spotlights.length).toBe(1);
+
+    const spotDe = fixture.debugElement.query(By.css("bit-spotlight"));
+    expect(spotDe).toBeTruthy();
+
+    spotDe.triggerEventHandler("onButtonClick", undefined);
+    fixture.detectChanges();
+
+    expect(PremiumUpgradeDialogComponent.open).toHaveBeenCalledTimes(1);
+  }));
+
+  it("renders Empty-Vault spotlight when vaultState is Empty and nudge is on", fakeAsync(() => {
+    itemsSvc.emptyVault$.next(true);
+
+    (nudgesSvc.showNudgeSpotlight$ as jest.Mock).mockImplementation((type: NudgeType) => {
+      return of(type === NudgeType.EmptyVaultNudge);
+    });
+
+    const fixture = TestBed.createComponent(VaultV2Component);
+    fixture.detectChanges();
+    tick();
+
+    const spotlights = queryAllSpotlights(fixture);
+    expect(spotlights.length).toBe(1);
+
+    expect(fixture.nativeElement.textContent).toContain("emptyVaultNudgeTitle");
+  }));
+
+  it("renders Has-Items spotlight when vault has items and nudge is on", fakeAsync(() => {
+    itemsSvc.emptyVault$.next(false);
+
+    (nudgesSvc.showNudgeSpotlight$ as jest.Mock).mockImplementation((type: NudgeType) => {
+      return of(type === NudgeType.HasVaultItems);
+    });
+
+    const fixture = TestBed.createComponent(VaultV2Component);
+    fixture.detectChanges();
+    tick();
+
+    const spotlights = queryAllSpotlights(fixture);
+    expect(spotlights.length).toBe(1);
+
+    expect(fixture.nativeElement.textContent).toContain("hasItemsVaultNudgeTitle");
+  }));
+
+  it("does not render Premium spotlight when account is less than a week old", fakeAsync(() => {
+    itemsSvc.cipherCount$.next(10);
+    hasPremiumFromAnySource$.next(false);
+
+    vaultProfileSvc.getProfileCreationDate = jest
+      .fn()
+      .mockResolvedValue(new Date(Date.now() - 3 * 24 * 60 * 60 * 1000)); // 3 days ago
+
+    (nudgesSvc.showNudgeSpotlight$ as jest.Mock).mockImplementation((type: NudgeType) => {
+      return of(type === NudgeType.PremiumUpgrade);
+    });
+
+    const fixture = TestBed.createComponent(VaultV2Component);
+    fixture.detectChanges();
+    tick();
+
+    const spotlights = queryAllSpotlights(fixture);
+    expect(spotlights.length).toBe(0);
+  }));
+
+  it("does not render Premium spotlight when vault has less than 5 items", fakeAsync(() => {
+    itemsSvc.cipherCount$.next(3);
+    hasPremiumFromAnySource$.next(false);
+
+    (nudgesSvc.showNudgeSpotlight$ as jest.Mock).mockImplementation((type: NudgeType) => {
+      return of(type === NudgeType.PremiumUpgrade);
+    });
+
+    const fixture = TestBed.createComponent(VaultV2Component);
+    fixture.detectChanges();
+    tick();
+
+    const spotlights = queryAllSpotlights(fixture);
+    expect(spotlights.length).toBe(0);
+  }));
+
+  it("does not render Premium spotlight when user already has premium", fakeAsync(() => {
+    itemsSvc.cipherCount$.next(10);
+    hasPremiumFromAnySource$.next(true);
+
+    (nudgesSvc.showNudgeSpotlight$ as jest.Mock).mockImplementation((type: NudgeType) => {
+      return of(type === NudgeType.PremiumUpgrade);
+    });
+
+    const fixture = TestBed.createComponent(VaultV2Component);
+    fixture.detectChanges();
+    tick();
+
+    const spotlights = queryAllSpotlights(fixture);
+    expect(spotlights.length).toBe(0);
+  }));
+});
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
index 604cc6b73ef..9cee4f66b67 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
@@ -1,3 +1,4 @@
+import { LiveAnnouncer } from "@angular/cdk/a11y";
 import { CdkVirtualScrollableElement, ScrollingModule } from "@angular/cdk/scrolling";
 import { CommonModule } from "@angular/common";
 import { AfterViewInit, Component, DestroyRef, OnDestroy, OnInit, ViewChild } from "@angular/core";
@@ -5,27 +6,36 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Router, RouterModule } from "@angular/router";
 import {
   combineLatest,
+  distinctUntilChanged,
   filter,
   firstValueFrom,
+  from,
   map,
   Observable,
   shareReplay,
-  startWith,
   switchMap,
   take,
+  tap,
 } from "rxjs";
 
+import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
 import { SpotlightComponent } from "@bitwarden/angular/vault/components/spotlight/spotlight.component";
+import { VaultProfileService } from "@bitwarden/angular/vault/services/vault-profile.service";
 import { DeactivatedOrg, NoResults, VaultOpen } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { BillingAccountProfileStateService } 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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
+import { skeletonLoadingDelay } from "@bitwarden/common/vault/utils/skeleton-loading.operator";
 import {
   ButtonModule,
   DialogService,
@@ -41,11 +51,14 @@ import { PopOutComponent } from "../../../../platform/popup/components/pop-out.c
 import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
 import { IntroCarouselService } from "../../services/intro-carousel.service";
-import { VaultPopupCopyButtonsService } from "../../services/vault-popup-copy-buttons.service";
 import { VaultPopupItemsService } from "../../services/vault-popup-items.service";
 import { VaultPopupListFiltersService } from "../../services/vault-popup-list-filters.service";
+import { VaultPopupLoadingService } from "../../services/vault-popup-loading.service";
 import { VaultPopupScrollPositionService } from "../../services/vault-popup-scroll-position.service";
 import { AtRiskPasswordCalloutComponent } from "../at-risk-callout/at-risk-password-callout.component";
+import { VaultFadeInOutComponent } from "../vault-fade-in-out/vault-fade-in-out.component";
+import { VaultFadeInOutSkeletonComponent } from "../vault-fade-in-out-skeleton/vault-fade-in-out-skeleton.component";
+import { VaultLoadingSkeletonComponent } from "../vault-loading-skeleton/vault-loading-skeleton.component";
 
 import { BlockedInjectionBanner } from "./blocked-injection-banner/blocked-injection-banner.component";
 import {
@@ -64,6 +77,8 @@ const VaultState = {
 
 type VaultState = UnionOfValues<typeof VaultState>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault",
   templateUrl: "vault-v2.component.html",
@@ -86,9 +101,14 @@ type VaultState = UnionOfValues<typeof VaultState>;
     SpotlightComponent,
     RouterModule,
     TypographyModule,
+    VaultLoadingSkeletonComponent,
+    VaultFadeInOutSkeletonComponent,
+    VaultFadeInOutComponent,
   ],
 })
 export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(CdkVirtualScrollableElement) virtualScrollElement?: CdkVirtualScrollableElement;
 
   NudgeType = NudgeType;
@@ -104,19 +124,80 @@ export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
   );
 
   activeUserId: UserId | null = null;
+
+  private loading$ = this.vaultPopupLoadingService.loading$.pipe(
+    distinctUntilChanged(),
+    tap((loading) => {
+      const key = loading ? "loadingVault" : "vaultLoaded";
+      void this.liveAnnouncer.announce(this.i18nService.translate(key), "polite");
+    }),
+  );
+
+  protected skeletonFeatureFlag$ = this.configService.getFeatureFlag$(
+    FeatureFlag.VaultLoadingSkeletons,
+  );
+
+  private showPremiumNudgeSpotlight$ = this.activeUserId$.pipe(
+    switchMap((userId) => this.nudgesService.showNudgeSpotlight$(NudgeType.PremiumUpgrade, userId)),
+  );
+
   protected favoriteCiphers$ = this.vaultPopupItemsService.favoriteCiphers$;
   protected remainingCiphers$ = this.vaultPopupItemsService.remainingCiphers$;
   protected allFilters$ = this.vaultPopupListFiltersService.allFilters$;
+  protected cipherCount$ = this.vaultPopupItemsService.cipherCount$;
+  protected hasPremium$ = this.activeUserId$.pipe(
+    switchMap((userId) => this.billingAccountService.hasPremiumFromAnySource$(userId)),
+  );
+  protected accountAgeInDays$ = this.activeUserId$.pipe(
+    switchMap((userId) => {
+      const creationDate$ = from(this.vaultProfileService.getProfileCreationDate(userId));
+      return creationDate$.pipe(
+        map((creationDate) => {
+          if (!creationDate) {
+            return 0;
+          }
+          const ageInMilliseconds = Date.now() - creationDate.getTime();
+          return Math.floor(ageInMilliseconds / (1000 * 60 * 60 * 24));
+        }),
+      );
+    }),
+  );
 
-  protected loading$ = combineLatest([
-    this.vaultPopupItemsService.loading$,
-    this.allFilters$,
-    // Added as a dependency to avoid flashing the copyActions on slower devices
-    this.vaultCopyButtonsService.showQuickCopyActions$,
+  protected showPremiumSpotlight$ = combineLatest([
+    this.showPremiumNudgeSpotlight$,
+    this.showHasItemsVaultSpotlight$,
+    this.hasPremium$,
+    this.cipherCount$,
+    this.accountAgeInDays$,
   ]).pipe(
-    map(([itemsLoading, filters]) => itemsLoading || !filters),
+    map(
+      ([showPremiumNudge, showHasItemsNudge, hasPremium, count, age]) =>
+        showPremiumNudge && !showHasItemsNudge && !hasPremium && count >= 5 && age >= 7,
+    ),
     shareReplay({ bufferSize: 1, refCount: true }),
-    startWith(true),
+  );
+
+  showPremiumDialog() {
+    PremiumUpgradeDialogComponent.open(this.dialogService);
+  }
+
+  /** When true, show spinner loading state */
+  protected showSpinnerLoaders$ = combineLatest([this.loading$, this.skeletonFeatureFlag$]).pipe(
+    map(([loading, skeletonsEnabled]) => loading && !skeletonsEnabled),
+  );
+
+  /** When true, show skeleton loading state with debouncing to prevent flicker */
+  protected showSkeletonsLoaders$ = combineLatest([
+    this.loading$,
+    this.searchService.isCipherSearching$,
+    this.skeletonFeatureFlag$,
+  ]).pipe(
+    map(
+      ([loading, cipherSearching, skeletonsEnabled]) =>
+        (loading || cipherSearching) && skeletonsEnabled,
+    ),
+    distinctUntilChanged(),
+    skeletonLoadingDelay(),
   );
 
   protected newItemItemValues$: Observable<NewItemInitialValues> =
@@ -146,14 +227,20 @@ export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
     private vaultPopupItemsService: VaultPopupItemsService,
     private vaultPopupListFiltersService: VaultPopupListFiltersService,
     private vaultScrollPositionService: VaultPopupScrollPositionService,
+    private vaultPopupLoadingService: VaultPopupLoadingService,
     private accountService: AccountService,
     private destroyRef: DestroyRef,
     private cipherService: CipherService,
     private dialogService: DialogService,
-    private vaultCopyButtonsService: VaultPopupCopyButtonsService,
     private introCarouselService: IntroCarouselService,
     private nudgesService: NudgesService,
     private router: Router,
+    private vaultProfileService: VaultProfileService,
+    private billingAccountService: BillingAccountProfileStateService,
+    private liveAnnouncer: LiveAnnouncer,
+    private i18nService: I18nService,
+    private configService: ConfigService,
+    private searchService: SearchService,
   ) {
     combineLatest([
       this.vaultPopupItemsService.emptyVault$,
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
index 915a27e4fd1..1dea91c0b9f 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
@@ -76,6 +76,8 @@ type LoadAction =
   | typeof COPY_VERIFICATION_CODE_ID
   | typeof UPDATE_PASSWORD;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-view-v2",
   templateUrl: "view-v2.component.html",
@@ -328,6 +330,7 @@ export class ViewV2Component {
         const tab = await BrowserApi.getTab(senderTabId);
         await sendExtensionMessage("bgHandleReprompt", {
           tab,
+          cipherId: cipher.id,
           success: repromptSuccess,
         });
 
diff --git a/apps/browser/src/vault/popup/guards/at-risk-passwords.guard.ts b/apps/browser/src/vault/popup/guards/at-risk-passwords.guard.ts
index fc302dd6c36..03111859165 100644
--- a/apps/browser/src/vault/popup/guards/at-risk-passwords.guard.ts
+++ b/apps/browser/src/vault/popup/guards/at-risk-passwords.guard.ts
@@ -1,10 +1,11 @@
 import { inject } from "@angular/core";
 import { CanActivateFn, Router } from "@angular/router";
-import { map, switchMap } from "rxjs";
+import { combineLatest, map, switchMap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { TaskService } from "@bitwarden/common/vault/tasks";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
 import { filterOutNullish } from "@bitwarden/common/vault/utils/observable-utilities";
 import { ToastService } from "@bitwarden/components";
 
@@ -32,3 +33,38 @@ export const canAccessAtRiskPasswords: CanActivateFn = () => {
     }),
   );
 };
+
+export const hasAtRiskPasswords: CanActivateFn = () => {
+  const accountService = inject(AccountService);
+  const taskService = inject(TaskService);
+  const cipherService = inject(CipherService);
+  const router = inject(Router);
+
+  return accountService.activeAccount$.pipe(
+    filterOutNullish(),
+    switchMap((user) =>
+      combineLatest([
+        taskService.pendingTasks$(user.id),
+        cipherService.cipherViews$(user.id).pipe(
+          filterOutNullish(),
+          map((ciphers) => Object.fromEntries(ciphers.map((c) => [c.id, c]))),
+        ),
+      ]).pipe(
+        map(([tasks, ciphers]) => {
+          const hasAtRiskCiphers = tasks.some(
+            (t) =>
+              t.type === SecurityTaskType.UpdateAtRiskCredential &&
+              t.cipherId != null &&
+              ciphers[t.cipherId] != null &&
+              !ciphers[t.cipherId].isDeleted,
+          );
+
+          if (!hasAtRiskCiphers) {
+            return router.createUrlTree(["/tabs/vault"]);
+          }
+          return true;
+        }),
+      ),
+    ),
+  );
+};
diff --git a/apps/browser/src/vault/popup/guards/clear-vault-state.guard.spec.ts b/apps/browser/src/vault/popup/guards/clear-vault-state.guard.spec.ts
new file mode 100644
index 00000000000..7ead8576b37
--- /dev/null
+++ b/apps/browser/src/vault/popup/guards/clear-vault-state.guard.spec.ts
@@ -0,0 +1,77 @@
+import { TestBed } from "@angular/core/testing";
+import { RouterStateSnapshot } from "@angular/router";
+
+import { VaultV2Component } from "../components/vault-v2/vault-v2.component";
+import { VaultPopupItemsService } from "../services/vault-popup-items.service";
+import { VaultPopupListFiltersService } from "../services/vault-popup-list-filters.service";
+
+import { clearVaultStateGuard } from "./clear-vault-state.guard";
+
+describe("clearVaultStateGuard", () => {
+  let applyFilterSpy: jest.Mock;
+  let resetFilterFormSpy: jest.Mock;
+
+  beforeEach(() => {
+    applyFilterSpy = jest.fn();
+    resetFilterFormSpy = jest.fn();
+
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: VaultPopupItemsService,
+          useValue: { applyFilter: applyFilterSpy },
+        },
+        {
+          provide: VaultPopupListFiltersService,
+          useValue: { resetFilterForm: resetFilterFormSpy },
+        },
+      ],
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it.each([
+    "/view-cipher?cipherId=123",
+    "/edit-cipher?cipherId=123",
+    "/clone-cipher?cipherId=123",
+    "/assign-collections?cipherId=123",
+  ])("should not clear vault state when viewing or editing a cipher: %s", (url) => {
+    const nextState = { url } as RouterStateSnapshot;
+
+    const result = TestBed.runInInjectionContext(() =>
+      clearVaultStateGuard({} as VaultV2Component, null, null, nextState),
+    );
+
+    expect(result).toBe(true);
+    expect(applyFilterSpy).not.toHaveBeenCalled();
+    expect(resetFilterFormSpy).not.toHaveBeenCalled();
+  });
+
+  it.each(["/settings", "/tabs/settings"])(
+    "should clear vault state when navigating to non-cipher routes: %s",
+    (url) => {
+      const nextState = { url } as RouterStateSnapshot;
+
+      const result = TestBed.runInInjectionContext(() =>
+        clearVaultStateGuard({} as VaultV2Component, null, null, nextState),
+      );
+
+      expect(result).toBe(true);
+      expect(applyFilterSpy).toHaveBeenCalledWith("");
+      expect(resetFilterFormSpy).toHaveBeenCalled();
+    },
+  );
+
+  it("should not clear vault state when not changing states", () => {
+    const result = TestBed.runInInjectionContext(() =>
+      clearVaultStateGuard({} as VaultV2Component, null, null, null),
+    );
+
+    expect(result).toBe(true);
+    expect(applyFilterSpy).not.toHaveBeenCalled();
+    expect(resetFilterFormSpy).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts b/apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
index e27090180d6..2a87db6e903 100644
--- a/apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
+++ b/apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
@@ -7,7 +7,8 @@ import { VaultPopupListFiltersService } from "../services/vault-popup-list-filte
 
 /**
  * Guard to clear the vault state (search and filter) when navigating away from the vault view.
- * This ensures the search and filter state is reset when navigating between different tabs, except viewing a cipher.
+ * This ensures the search and filter state is reset when navigating between different tabs,
+ * except viewing or editing a cipher.
  */
 export const clearVaultStateGuard: CanDeactivateFn<VaultV2Component> = (
   component: VaultV2Component,
@@ -17,7 +18,7 @@ export const clearVaultStateGuard: CanDeactivateFn<VaultV2Component> = (
 ) => {
   const vaultPopupItemsService = inject(VaultPopupItemsService);
   const vaultPopupListFiltersService = inject(VaultPopupListFiltersService);
-  if (nextState && !isViewingCipher(nextState.url)) {
+  if (nextState && !isCipherOpen(nextState.url)) {
     vaultPopupItemsService.applyFilter("");
     vaultPopupListFiltersService.resetFilterForm();
   }
@@ -25,4 +26,8 @@ export const clearVaultStateGuard: CanDeactivateFn<VaultV2Component> = (
   return true;
 };
 
-const isViewingCipher = (url: string): boolean => url.includes("view-cipher");
+const isCipherOpen = (url: string): boolean =>
+  url.includes("view-cipher") ||
+  url.includes("assign-collections") ||
+  url.includes("edit-cipher") ||
+  url.includes("clone-cipher");
diff --git a/apps/browser/src/vault/popup/services/browser-premium-upgrade-prompt.service.spec.ts b/apps/browser/src/vault/popup/services/browser-premium-upgrade-prompt.service.spec.ts
index 9a00bacd6b0..bf63cf1f668 100644
--- a/apps/browser/src/vault/popup/services/browser-premium-upgrade-prompt.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/browser-premium-upgrade-prompt.service.spec.ts
@@ -2,25 +2,69 @@ import { TestBed } from "@angular/core/testing";
 import { Router } from "@angular/router";
 import { mock, MockProxy } from "jest-mock-extended";
 
+import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
+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 { BrowserPremiumUpgradePromptService } from "./browser-premium-upgrade-prompt.service";
 
 describe("BrowserPremiumUpgradePromptService", () => {
   let service: BrowserPremiumUpgradePromptService;
   let router: MockProxy<Router>;
+  let configService: MockProxy<ConfigService>;
+  let dialogService: MockProxy<DialogService>;
 
   beforeEach(async () => {
     router = mock<Router>();
+    configService = mock<ConfigService>();
+    dialogService = mock<DialogService>();
+
     await TestBed.configureTestingModule({
-      providers: [BrowserPremiumUpgradePromptService, { provide: Router, useValue: router }],
+      providers: [
+        BrowserPremiumUpgradePromptService,
+        { provide: Router, useValue: router },
+        { provide: ConfigService, useValue: configService },
+        { provide: DialogService, useValue: dialogService },
+      ],
     }).compileComponents();
 
     service = TestBed.inject(BrowserPremiumUpgradePromptService);
   });
 
   describe("promptForPremium", () => {
-    it("navigates to the premium update screen", async () => {
+    let openSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      openSpy = jest.spyOn(PremiumUpgradeDialogComponent, "open").mockImplementation();
+    });
+
+    afterEach(() => {
+      openSpy.mockRestore();
+    });
+
+    it("opens the new premium upgrade dialog when feature flag is enabled", async () => {
+      configService.getFeatureFlag.mockResolvedValue(true);
+
       await service.promptForPremium();
+
+      expect(configService.getFeatureFlag).toHaveBeenCalledWith(
+        FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
+      );
+      expect(openSpy).toHaveBeenCalledWith(dialogService);
+      expect(router.navigate).not.toHaveBeenCalled();
+    });
+
+    it("navigates to the premium update screen when feature flag is disabled", async () => {
+      configService.getFeatureFlag.mockResolvedValue(false);
+
+      await service.promptForPremium();
+
+      expect(configService.getFeatureFlag).toHaveBeenCalledWith(
+        FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
+      );
       expect(router.navigate).toHaveBeenCalledWith(["/premium"]);
+      expect(openSpy).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/apps/browser/src/vault/popup/services/browser-premium-upgrade-prompt.service.ts b/apps/browser/src/vault/popup/services/browser-premium-upgrade-prompt.service.ts
index 2909e3b3bd6..53f7ffd5f5a 100644
--- a/apps/browser/src/vault/popup/services/browser-premium-upgrade-prompt.service.ts
+++ b/apps/browser/src/vault/popup/services/browser-premium-upgrade-prompt.service.ts
@@ -1,18 +1,32 @@
 import { inject } from "@angular/core";
 import { Router } from "@angular/router";
 
+import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+import { DialogService } from "@bitwarden/components";
 
 /**
  * This class handles the premium upgrade process for the browser extension.
  */
 export class BrowserPremiumUpgradePromptService implements PremiumUpgradePromptService {
   private router = inject(Router);
+  private configService = inject(ConfigService);
+  private dialogService = inject(DialogService);
 
   async promptForPremium() {
-    /**
-     * Navigate to the premium update screen.
-     */
-    await this.router.navigate(["/premium"]);
+    const showNewDialog = await this.configService.getFeatureFlag(
+      FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
+    );
+
+    if (showNewDialog) {
+      PremiumUpgradeDialogComponent.open(this.dialogService);
+    } else {
+      /**
+       * Navigate to the premium update screen.
+       */
+      await this.router.navigate(["/premium"]);
+    }
   }
 }
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
index f271b255c3e..5818c6e32ff 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
@@ -204,6 +204,7 @@ describe("VaultPopupAutofillService", () => {
 
     describe("doAutofill()", () => {
       it("should return true if autofill is successful", async () => {
+        mockCipher.id = "test-cipher-id";
         mockAutofillService.doAutoFill.mockResolvedValue(null);
         const result = await service.doAutofill(mockCipher);
         expect(result).toBe(true);
@@ -251,6 +252,7 @@ describe("VaultPopupAutofillService", () => {
       });
 
       it("should copy TOTP code to clipboard if available", async () => {
+        mockCipher.id = "test-cipher-id-with-totp";
         const totpCode = "123456";
         mockAutofillService.doAutoFill.mockResolvedValue(totpCode);
         await service.doAutofill(mockCipher);
@@ -260,6 +262,18 @@ describe("VaultPopupAutofillService", () => {
         );
       });
 
+      it("skips password prompt when skipPasswordReprompt is true", async () => {
+        mockCipher.id = "cipher-with-reprompt";
+        mockCipher.reprompt = CipherRepromptType.Password;
+        mockAutofillService.doAutoFill.mockResolvedValue(null);
+
+        const result = await service.doAutofill(mockCipher, true, true);
+
+        expect(result).toBe(true);
+        expect(mockPasswordRepromptService.showPasswordPrompt).not.toHaveBeenCalled();
+        expect(mockAutofillService.doAutoFill).toHaveBeenCalled();
+      });
+
       describe("closePopup", () => {
         beforeEach(() => {
           jest.spyOn(BrowserApi, "closePopup").mockImplementation();
@@ -405,5 +419,26 @@ describe("VaultPopupAutofillService", () => {
         });
       });
     });
+    describe("handleAutofillSuggestionUsed", () => {
+      const cipherId = "cipher-123";
+
+      beforeEach(() => {
+        mockCipherService.updateLastUsedDate.mockResolvedValue(undefined);
+      });
+
+      it("updates last used date when there is an active user", async () => {
+        await service.handleAutofillSuggestionUsed({ cipherId });
+
+        expect(mockCipherService.updateLastUsedDate).toHaveBeenCalledTimes(1);
+        expect(mockCipherService.updateLastUsedDate).toHaveBeenCalledWith(cipherId, mockUserId);
+      });
+
+      it("does nothing when there is no active user", async () => {
+        accountService.activeAccount$ = of(null);
+        await service.handleAutofillSuggestionUsed({ cipherId });
+
+        expect(mockCipherService.updateLastUsedDate).not.toHaveBeenCalled();
+      });
+    });
   });
 });
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
index 2d30e857573..6feeec29efc 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
@@ -16,6 +16,7 @@ import {
 } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getOptionalUserId } from "@bitwarden/common/auth/services/account.service";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { isUrlInList } from "@bitwarden/common/autofill/utils";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -230,8 +231,10 @@ export class VaultPopupAutofillService {
     cipher: CipherView,
     tab: chrome.tabs.Tab,
     pageDetails: PageDetail[],
+    skipPasswordReprompt = false,
   ): Promise<boolean> {
     if (
+      !skipPasswordReprompt &&
       cipher.reprompt !== CipherRepromptType.None &&
       !(await this.passwordRepromptService.showPasswordPrompt())
     ) {
@@ -268,6 +271,7 @@ export class VaultPopupAutofillService {
       });
       return false;
     }
+    await this.handleAutofillSuggestionUsed({ cipherId: cipher.id });
 
     return true;
   }
@@ -312,12 +316,22 @@ export class VaultPopupAutofillService {
    * Will copy any TOTP code to the clipboard if available after successful autofill.
    * @param cipher
    * @param closePopup If true, will close the popup window after successful autofill. Defaults to true.
+   * @param skipPasswordReprompt If true, skips the master password reprompt even if the cipher requires it. Defaults to false.
    */
-  async doAutofill(cipher: CipherView, closePopup = true): Promise<boolean> {
+  async doAutofill(
+    cipher: CipherView,
+    closePopup = true,
+    skipPasswordReprompt = false,
+  ): Promise<boolean> {
     const tab = await firstValueFrom(this.currentAutofillTab$);
     const pageDetails = await firstValueFrom(this._currentPageDetails$);
 
-    const didAutofill = await this._internalDoAutofill(cipher, tab, pageDetails);
+    const didAutofill = await this._internalDoAutofill(
+      cipher,
+      tab,
+      pageDetails,
+      skipPasswordReprompt,
+    );
 
     if (didAutofill && closePopup) {
       await this._closePopup(cipher, tab);
@@ -326,6 +340,21 @@ export class VaultPopupAutofillService {
     return didAutofill;
   }
 
+  /**
+   * When a user autofills with an autofill suggestion outside of the inline menu,
+   * update the cipher's last used date.
+   *
+   * @param message - The message containing the cipher ID that was used
+   */
+  async handleAutofillSuggestionUsed(message: { cipherId: string }) {
+    const activeUserId = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(getOptionalUserId),
+    );
+    if (activeUserId) {
+      await this.cipherService.updateLastUsedDate(message.cipherId, activeUserId);
+    }
+  }
+
   /**
    * Attempts to autofill the given cipher and, upon successful autofill, saves the URI to the cipher.
    * Will copy any TOTP code to the clipboard if available after successful autofill.
@@ -333,7 +362,11 @@ export class VaultPopupAutofillService {
    * @param closePopup If true, will close the popup window after successful autofill.
    * If false, will show a success toast instead. Defaults to true.
    */
-  async doAutofillAndSave(cipher: CipherView, closePopup = true): Promise<boolean> {
+  async doAutofillAndSave(
+    cipher: CipherView,
+    closePopup = true,
+    skipPasswordReprompt = false,
+  ): Promise<boolean> {
     // We can only save URIs for login ciphers
     if (cipher.type !== CipherType.Login) {
       return false;
@@ -342,7 +375,12 @@ export class VaultPopupAutofillService {
     const pageDetails = await firstValueFrom(this._currentPageDetails$);
     const tab = await firstValueFrom(this.currentAutofillTab$);
 
-    const didAutofill = await this._internalDoAutofill(cipher, tab, pageDetails);
+    const didAutofill = await this._internalDoAutofill(
+      cipher,
+      tab,
+      pageDetails,
+      skipPasswordReprompt,
+    );
 
     if (!didAutofill) {
       return false;
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
index 6499719b64f..513e159f7aa 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
@@ -14,6 +14,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { mockAccountServiceWith, ObservableTracker } from "@bitwarden/common/spec";
 import { CipherId, UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
@@ -26,7 +27,6 @@ import {
   RestrictedItemTypesService,
 } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { CipherViewLikeUtils } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
-import { CipherArchiveService } from "@bitwarden/vault";
 
 import { InlineMenuFieldQualificationService } from "../../../autofill/services/inline-menu-field-qualification.service";
 import { BrowserApi } from "../../../platform/browser/browser-api";
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
index 3e4b793737e..321d7936806 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
@@ -26,6 +26,7 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
@@ -35,7 +36,6 @@ import {
   CipherViewLike,
   CipherViewLikeUtils,
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
-import { CipherArchiveService } from "@bitwarden/vault";
 
 import { runInsideAngular } from "../../../platform/browser/run-inside-angular.operator";
 import { PopupViewCacheService } from "../../../platform/popup/view-cache/popup-view-cache.service";
@@ -120,7 +120,7 @@ export class VaultPopupItemsService {
                 .cipherListViews$(userId)
                 .pipe(filter((ciphers) => ciphers != null)),
               this.cipherService.failedToDecryptCiphers$(userId),
-              this.restrictedItemTypesService.restricted$.pipe(startWith([])),
+              this.restrictedItemTypesService.restricted$,
             ]),
           ),
           map(([ciphers, failedToDecryptCiphers, restrictions]) => {
@@ -261,6 +261,13 @@ export class VaultPopupItemsService {
     this.remainingCiphers$.pipe(map(() => false)),
   ).pipe(startWith(true), distinctUntilChanged(), shareReplay({ refCount: false, bufferSize: 1 }));
 
+  /** Observable that indicates whether there is search text present.
+   */
+  hasSearchText$: Observable<boolean> = this._hasSearchText.pipe(
+    distinctUntilChanged(),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
   /**
    * Observable that indicates whether a filter or search text is currently applied to the ciphers.
    */
@@ -281,6 +288,11 @@ export class VaultPopupItemsService {
     map((ciphers) => !ciphers.length),
   );
 
+  /**
+   * Observable that contains the count of ciphers in the active filtered list.
+   */
+  cipherCount$: Observable<number> = this._activeCipherList$.pipe(map((ciphers) => ciphers.length));
+
   /**
    * Observable that indicates whether there are no ciphers to show with the current filter.
    */
diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
index eecd1f2fd68..692e21d0084 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
@@ -761,11 +761,13 @@ function createSeededVaultPopupListFiltersService(
   const collectionServiceMock = {
     decryptedCollections$: () => seededCollections$,
     getAllNested: () =>
-      seededCollections$.value.map((c) => ({
-        children: [],
-        node: c,
-        parent: null,
-      })),
+      seededCollections$.value.map(
+        (c): TreeNode<CollectionView> => ({
+          children: [],
+          node: c,
+          parent: null as any,
+        }),
+      ),
   } as any;
 
   const folderServiceMock = {
diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
index 05d0ea8d444..08db7d5d4ab 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
@@ -14,7 +14,11 @@ import {
   take,
 } from "rxjs";
 
-import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
+import {
+  CollectionService,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
 import { DynamicTreeNode } from "@bitwarden/angular/vault/vault-filter/models/dynamic-tree-node.model";
 import { sortDefaultCollections } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
@@ -473,7 +477,14 @@ export class VaultPopupListFiltersService {
         });
       }),
       map((tree) =>
-        tree.nestedList.map((c) => this.convertToChipSelectOption(c, "bwi-collection-shared")),
+        tree.nestedList.map((c) =>
+          this.convertToChipSelectOption(
+            c,
+            c.node.type === CollectionTypes.DefaultUserCollection
+              ? "bwi-user"
+              : "bwi-collection-shared",
+          ),
+        ),
       ),
       shareReplay({ bufferSize: 1, refCount: true }),
     );
diff --git a/apps/browser/src/vault/popup/services/vault-popup-loading.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-loading.service.spec.ts
new file mode 100644
index 00000000000..4b9c284b3b7
--- /dev/null
+++ b/apps/browser/src/vault/popup/services/vault-popup-loading.service.spec.ts
@@ -0,0 +1,72 @@
+import { TestBed } from "@angular/core/testing";
+import { firstValueFrom, skip, Subject } from "rxjs";
+
+import { VaultPopupCopyButtonsService } from "./vault-popup-copy-buttons.service";
+import { VaultPopupItemsService } from "./vault-popup-items.service";
+import { VaultPopupListFiltersService } from "./vault-popup-list-filters.service";
+import { VaultPopupLoadingService } from "./vault-popup-loading.service";
+
+describe("VaultPopupLoadingService", () => {
+  let service: VaultPopupLoadingService;
+  let itemsLoading$: Subject<boolean>;
+  let allFilters$: Subject<any>;
+  let showQuickCopyActions$: Subject<boolean>;
+
+  beforeEach(() => {
+    itemsLoading$ = new Subject<boolean>();
+    allFilters$ = new Subject<any>();
+    showQuickCopyActions$ = new Subject<boolean>();
+
+    TestBed.configureTestingModule({
+      providers: [
+        VaultPopupLoadingService,
+        { provide: VaultPopupItemsService, useValue: { loading$: itemsLoading$ } },
+        { provide: VaultPopupListFiltersService, useValue: { allFilters$: allFilters$ } },
+        {
+          provide: VaultPopupCopyButtonsService,
+          useValue: { showQuickCopyActions$: showQuickCopyActions$ },
+        },
+      ],
+    });
+
+    service = TestBed.inject(VaultPopupLoadingService);
+  });
+
+  it("emits true initially", async () => {
+    const loading = await firstValueFrom(service.loading$);
+
+    expect(loading).toBe(true);
+  });
+
+  it("emits false when items are loaded and filters are available", async () => {
+    const loadingPromise = firstValueFrom(service.loading$.pipe(skip(1)));
+
+    itemsLoading$.next(false);
+    allFilters$.next({});
+    showQuickCopyActions$.next(true);
+
+    expect(await loadingPromise).toBe(false);
+  });
+
+  it("emits true when filters are not available", async () => {
+    const loadingPromise = firstValueFrom(service.loading$.pipe(skip(2)));
+
+    itemsLoading$.next(false);
+    allFilters$.next({});
+    showQuickCopyActions$.next(true);
+    allFilters$.next(null);
+
+    expect(await loadingPromise).toBe(true);
+  });
+
+  it("emits true when items are loading", async () => {
+    const loadingPromise = firstValueFrom(service.loading$.pipe(skip(2)));
+
+    itemsLoading$.next(false);
+    allFilters$.next({});
+    showQuickCopyActions$.next(true);
+    itemsLoading$.next(true);
+
+    expect(await loadingPromise).toBe(true);
+  });
+});
diff --git a/apps/browser/src/vault/popup/services/vault-popup-loading.service.ts b/apps/browser/src/vault/popup/services/vault-popup-loading.service.ts
new file mode 100644
index 00000000000..f56f2b8d8ee
--- /dev/null
+++ b/apps/browser/src/vault/popup/services/vault-popup-loading.service.ts
@@ -0,0 +1,27 @@
+import { inject, Injectable } from "@angular/core";
+import { combineLatest, map, shareReplay, startWith } from "rxjs";
+
+import { VaultPopupCopyButtonsService } from "./vault-popup-copy-buttons.service";
+import { VaultPopupItemsService } from "./vault-popup-items.service";
+import { VaultPopupListFiltersService } from "./vault-popup-list-filters.service";
+
+@Injectable({
+  providedIn: "root",
+})
+export class VaultPopupLoadingService {
+  private vaultPopupItemsService = inject(VaultPopupItemsService);
+  private vaultPopupListFiltersService = inject(VaultPopupListFiltersService);
+  private vaultCopyButtonsService = inject(VaultPopupCopyButtonsService);
+
+  /** Loading state of the vault */
+  loading$ = combineLatest([
+    this.vaultPopupItemsService.loading$,
+    this.vaultPopupListFiltersService.allFilters$,
+    // Added as a dependency to avoid flashing the copyActions on slower devices
+    this.vaultCopyButtonsService.showQuickCopyActions$,
+  ]).pipe(
+    map(([itemsLoading, filters]) => itemsLoading || !filters),
+    shareReplay({ bufferSize: 1, refCount: true }),
+    startWith(true),
+  );
+}
diff --git a/apps/browser/src/vault/popup/services/vault-popup-section.service.ts b/apps/browser/src/vault/popup/services/vault-popup-section.service.ts
index ed641e0cdf7..b93eda72506 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-section.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-section.service.ts
@@ -31,7 +31,7 @@ export class VaultPopupSectionService {
   private vaultPopupItemsService = inject(VaultPopupItemsService);
   private stateProvider = inject(StateProvider);
 
-  private hasFilterOrSearchApplied = toSignal(
+  private readonly hasFilterOrSearchApplied = toSignal(
     this.vaultPopupItemsService.hasFilterApplied$.pipe(map((hasFilter) => hasFilter)),
   );
 
@@ -40,7 +40,7 @@ export class VaultPopupSectionService {
    * application-applied overrides.
    * `null` means there is no current override
    */
-  private temporaryStateOverride = signal<Partial<PopupSectionOpen> | null>(null);
+  private readonly temporaryStateOverride = signal<Partial<PopupSectionOpen> | null>(null);
 
   constructor() {
     effect(
@@ -71,7 +71,7 @@ export class VaultPopupSectionService {
    * Stored disk state for the open/close state of the sections, with an initial value provided
    * if the stored disk state does not yet exist.
    */
-  private sectionOpenStoredState = toSignal<PopupSectionOpen | null>(
+  private readonly sectionOpenStoredState = toSignal<PopupSectionOpen | null>(
     this.sectionOpenStateProvider.state$.pipe(map((sectionOpen) => sectionOpen ?? INITIAL_OPEN)),
     // Indicates that the state value is loading
     { initialValue: null },
@@ -81,7 +81,7 @@ export class VaultPopupSectionService {
    * Indicates the current open/close display state of each section, accounting for temporary
    * non-persisted overrides.
    */
-  sectionOpenDisplayState: Signal<Partial<PopupSectionOpen>> = computed(() => ({
+  readonly sectionOpenDisplayState: Signal<Partial<PopupSectionOpen>> = computed(() => ({
     ...this.sectionOpenStoredState(),
     ...this.temporaryStateOverride(),
   }));
diff --git a/apps/browser/src/vault/popup/settings/appearance-v2.component.html b/apps/browser/src/vault/popup/settings/appearance-v2.component.html
index c9598c76db0..b58316a8d64 100644
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.html
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.html
@@ -41,7 +41,7 @@
         <bit-label>{{ "showAnimations" | i18n }}</bit-label>
       </bit-form-control>
     </bit-card>
-    <h2 bitTypography="h6" class="tw-font-bold tw-mt-4">{{ "vaultCustomization" | i18n }}</h2>
+    <h2 bitTypography="h6" class="tw-font-medium tw-mt-4">{{ "vaultCustomization" | i18n }}</h2>
     <bit-card>
       <bit-form-control>
         <input bitCheckbox formControlName="enableFavicon" type="checkbox" />
diff --git a/apps/browser/src/vault/popup/settings/appearance-v2.component.spec.ts b/apps/browser/src/vault/popup/settings/appearance-v2.component.spec.ts
index 738ec3ae1ff..9e1beab5787 100644
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.spec.ts
@@ -22,20 +22,30 @@ import { VaultPopupCopyButtonsService } from "../services/vault-popup-copy-butto
 
 import { AppearanceV2Component } from "./appearance-v2.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-header",
   template: `<ng-content></ng-content>`,
 })
 class MockPopupHeaderComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() pageTitle: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() backAction: () => void;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-page",
   template: `<ng-content></ng-content>`,
 })
 class MockPopupPageComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() loading: boolean;
 }
 
diff --git a/apps/browser/src/vault/popup/settings/appearance-v2.component.ts b/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
index 23a609bd008..e6515ae7461 100644
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
@@ -33,6 +33,8 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 import { PopupSizeService } from "../../../platform/popup/layout/popup-size.service";
 import { VaultPopupCopyButtonsService } from "../services/vault-popup-copy-buttons.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./appearance-v2.component.html",
   imports: [
diff --git a/apps/browser/src/vault/popup/settings/archive.component.html b/apps/browser/src/vault/popup/settings/archive.component.html
index 5fb57814fff..a7b23dc5122 100644
--- a/apps/browser/src/vault/popup/settings/archive.component.html
+++ b/apps/browser/src/vault/popup/settings/archive.component.html
@@ -1,5 +1,5 @@
 <popup-page [loading]="loading$ | async">
-  <popup-header slot="header" [pageTitle]="'archive' | i18n" showBackButton>
+  <popup-header slot="header" [pageTitle]="'archiveNoun' | i18n" showBackButton>
     <ng-container slot="end">
       <app-pop-out></app-pop-out>
     </ng-container>
@@ -27,10 +27,10 @@
                   <app-vault-icon [cipher]="cipher"></app-vault-icon>
                 </div>
                 <span data-testid="item-name">{{ cipher.name }}</span>
-                @if (cipher.hasAttachments) {
+                @if (CipherViewLikeUtils.hasAttachments(cipher)) {
                   <i class="bwi bwi-paperclip bwi-sm" [appA11yTitle]="'attachments' | i18n"></i>
                 }
-                <span slot="secondary">{{ cipher.subTitle }}</span>
+                <span slot="secondary">{{ CipherViewLikeUtils.subtitle(cipher) }}</span>
               </button>
               <bit-item-action slot="end">
                 <button
@@ -49,7 +49,7 @@
                     {{ "clone" | i18n }}
                   </button>
                   <button type="button" bitMenuItem (click)="unarchive(cipher)">
-                    {{ "unarchive" | i18n }}
+                    {{ "unArchive" | i18n }}
                   </button>
                   <button
                     type="button"
diff --git a/apps/browser/src/vault/popup/settings/archive.component.ts b/apps/browser/src/vault/popup/settings/archive.component.ts
index c3e078a9274..b1c78444a3f 100644
--- a/apps/browser/src/vault/popup/settings/archive.component.ts
+++ b/apps/browser/src/vault/popup/settings/archive.component.ts
@@ -9,8 +9,12 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { CipherId, UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import {
+  CipherViewLike,
+  CipherViewLikeUtils,
+} from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 import {
   DialogService,
   IconButtonModule,
@@ -22,12 +26,18 @@ import {
   ToastService,
   TypographyModule,
 } from "@bitwarden/components";
-import { CanDeleteCipherDirective, CipherArchiveService } from "@bitwarden/vault";
+import {
+  CanDeleteCipherDirective,
+  DecryptionFailureDialogComponent,
+  PasswordRepromptService,
+} from "@bitwarden/vault";
 
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "archive.component.html",
   standalone: true,
@@ -56,6 +66,7 @@ export class ArchiveComponent {
   private toastService = inject(ToastService);
   private i18nService = inject(I18nService);
   private cipherArchiveService = inject(CipherArchiveService);
+  private passwordRepromptService = inject(PasswordRepromptService);
 
   private userId$: Observable<UserId> = this.accountService.activeAccount$.pipe(getUserId);
 
@@ -63,13 +74,15 @@ export class ArchiveComponent {
     switchMap((userId) => this.cipherArchiveService.archivedCiphers$(userId)),
   );
 
+  protected CipherViewLikeUtils = CipherViewLikeUtils;
+
   protected loading$ = this.archivedCiphers$.pipe(
     map(() => false),
     startWith(true),
   );
 
-  async view(cipher: CipherView) {
-    if (!(await this.cipherArchiveService.canInteract(cipher))) {
+  async view(cipher: CipherViewLike) {
+    if (!(await this.canInteract(cipher))) {
       return;
     }
 
@@ -78,8 +91,8 @@ export class ArchiveComponent {
     });
   }
 
-  async edit(cipher: CipherView) {
-    if (!(await this.cipherArchiveService.canInteract(cipher))) {
+  async edit(cipher: CipherViewLike) {
+    if (!(await this.canInteract(cipher))) {
       return;
     }
 
@@ -88,8 +101,8 @@ export class ArchiveComponent {
     });
   }
 
-  async delete(cipher: CipherView) {
-    if (!(await this.cipherArchiveService.canInteract(cipher))) {
+  async delete(cipher: CipherViewLike) {
+    if (!(await this.canInteract(cipher))) {
       return;
     }
     const confirmed = await this.dialogService.openSimpleDialog({
@@ -105,7 +118,7 @@ export class ArchiveComponent {
     const activeUserId = await firstValueFrom(this.userId$);
 
     try {
-      await this.cipherService.softDeleteWithServer(cipher.id, activeUserId);
+      await this.cipherService.softDeleteWithServer(cipher.id as string, activeUserId);
     } catch (e) {
       this.logService.error(e);
       return;
@@ -117,26 +130,29 @@ export class ArchiveComponent {
     });
   }
 
-  async unarchive(cipher: CipherView) {
-    if (!(await this.cipherArchiveService.canInteract(cipher))) {
+  async unarchive(cipher: CipherViewLike) {
+    if (!(await this.canInteract(cipher))) {
       return;
     }
     const activeUserId = await firstValueFrom(this.userId$);
 
-    await this.cipherArchiveService.unarchiveWithServer(cipher.id as CipherId, activeUserId);
+    await this.cipherArchiveService.unarchiveWithServer(
+      cipher.id as unknown as CipherId,
+      activeUserId,
+    );
 
     this.toastService.showToast({
       variant: "success",
-      message: this.i18nService.t("itemRemovedFromArchive"),
+      message: this.i18nService.t("itemUnarchived"),
     });
   }
 
-  async clone(cipher: CipherView) {
-    if (!(await this.cipherArchiveService.canInteract(cipher))) {
+  async clone(cipher: CipherViewLike) {
+    if (!(await this.canInteract(cipher))) {
       return;
     }
 
-    if (cipher.login?.hasFido2Credentials) {
+    if (CipherViewLikeUtils.hasFido2Credentials(cipher)) {
       const confirmed = await this.dialogService.openSimpleDialog({
         title: { key: "passkeyNotCopied" },
         content: { key: "passkeyNotCopiedAlert" },
@@ -156,4 +172,21 @@ export class ArchiveComponent {
       },
     });
   }
+
+  /**
+   * Check if the user is able to interact with the cipher
+   * (password re-prompt / decryption failure checks).
+   * @param cipher
+   * @private
+   */
+  private canInteract(cipher: CipherViewLike) {
+    if (CipherViewLikeUtils.decryptionFailure(cipher)) {
+      DecryptionFailureDialogComponent.open(this.dialogService, {
+        cipherIds: [cipher.id as CipherId],
+      });
+      return false;
+    }
+
+    return this.passwordRepromptService.passwordRepromptCheck(cipher);
+  }
 }
diff --git a/apps/browser/src/vault/popup/settings/download-bitwarden.component.ts b/apps/browser/src/vault/popup/settings/download-bitwarden.component.ts
index d23d00a1ad7..109f3ea0404 100644
--- a/apps/browser/src/vault/popup/settings/download-bitwarden.component.ts
+++ b/apps/browser/src/vault/popup/settings/download-bitwarden.component.ts
@@ -13,6 +13,8 @@ import { PopOutComponent } from "../../../platform/popup/components/pop-out.comp
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "download-bitwarden.component.html",
   imports: [
diff --git a/apps/browser/src/vault/popup/settings/folders-v2.component.spec.ts b/apps/browser/src/vault/popup/settings/folders-v2.component.spec.ts
index d1450667fa8..3cb5503ed89 100644
--- a/apps/browser/src/vault/popup/settings/folders-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/settings/folders-v2.component.spec.ts
@@ -21,20 +21,30 @@ import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-heade
 
 import { FoldersV2Component } from "./folders-v2.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-header",
   template: `<ng-content></ng-content>`,
 })
 class MockPopupHeaderComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() pageTitle: string = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() backAction: () => void = () => {};
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "popup-footer",
   template: `<ng-content></ng-content>`,
 })
 class MockPopupFooterComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() pageTitle: string = "";
 }
 
diff --git a/apps/browser/src/vault/popup/settings/folders-v2.component.ts b/apps/browser/src/vault/popup/settings/folders-v2.component.ts
index b749f651d53..20a816e7297 100644
--- a/apps/browser/src/vault/popup/settings/folders-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/folders-v2.component.ts
@@ -22,6 +22,8 @@ import { PopOutComponent } from "../../../platform/popup/components/pop-out.comp
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./folders-v2.component.html",
   imports: [
diff --git a/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.html b/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.html
index a2d01ce752e..a8ed75b5de6 100644
--- a/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.html
+++ b/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.html
@@ -6,12 +6,6 @@
   </popup-header>
 
   <bit-item-group>
-    <bit-item *ngIf="!(canAccessPremium$ | async)">
-      <a type="button" bit-item-content routerLink="/premium">
-        {{ "premiumMembership" | i18n }}
-        <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
-      </a>
-    </bit-item>
     <bit-item
       *ngIf="
         (familySponsorshipAvailable$ | async) &&
diff --git a/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.ts b/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.ts
index ec7a73a3bc3..0b896547008 100644
--- a/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.ts
@@ -1,13 +1,12 @@
 import { CommonModule } from "@angular/common";
 import { Component } from "@angular/core";
 import { RouterModule } from "@angular/router";
-import { Observable, firstValueFrom, of, switchMap } from "rxjs";
+import { Observable, firstValueFrom, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { DialogService, ItemModule } from "@bitwarden/components";
 
@@ -17,6 +16,8 @@ import { PopOutComponent } from "../../../platform/popup/components/pop-out.comp
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "more-from-bitwarden-page-v2.component.html",
   imports: [
@@ -30,14 +31,12 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
   ],
 })
 export class MoreFromBitwardenPageV2Component {
-  canAccessPremium$: Observable<boolean>;
   protected familySponsorshipAvailable$: Observable<boolean>;
   protected isFreeFamilyPolicyEnabled$: Observable<boolean>;
   protected hasSingleEnterpriseOrg$: Observable<boolean>;
 
   constructor(
     private dialogService: DialogService,
-    private billingAccountProfileStateService: BillingAccountProfileStateService,
     private environmentService: EnvironmentService,
     private organizationService: OrganizationService,
     private familiesPolicyService: FamiliesPolicyService,
@@ -46,13 +45,6 @@ export class MoreFromBitwardenPageV2Component {
     this.familySponsorshipAvailable$ = getUserId(this.accountService.activeAccount$).pipe(
       switchMap((userId) => this.organizationService.familySponsorshipAvailable$(userId)),
     );
-    this.canAccessPremium$ = this.accountService.activeAccount$.pipe(
-      switchMap((account) =>
-        account
-          ? this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id)
-          : of(false),
-      ),
-    );
     this.hasSingleEnterpriseOrg$ = this.familiesPolicyService.hasSingleEnterpriseOrg$();
     this.isFreeFamilyPolicyEnabled$ = this.familiesPolicyService.isFreeFamilyPolicyEnabled$();
   }
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
index d1e70390844..eff8a04b966 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
@@ -25,11 +25,11 @@
           [appA11yTitle]="orgIconTooltip(cipher)"
         ></i>
         <i
-          *ngIf="cipher.hasAttachments"
+          *ngIf="hasAttachments(cipher)"
           class="bwi bwi-paperclip bwi-sm"
           [appA11yTitle]="'attachments' | i18n"
         ></i>
-        <span slot="secondary">{{ cipher.subTitle }}</span>
+        <span slot="secondary">{{ getSubtitle(cipher) }}</span>
       </button>
       <ng-container slot="end" *ngIf="cipher.permissions.restore">
         <bit-item-action>
@@ -45,7 +45,7 @@
               type="button"
               bitMenuItem
               (click)="restore(cipher)"
-              *ngIf="!cipher.decryptionFailure"
+              *ngIf="!hasDecryptionFailure(cipher)"
             >
               {{ "restore" | i18n }}
             </button>
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
index 1676fea3c01..bad6011b2d8 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
@@ -12,7 +12,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { CipherId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
   DialogService,
   IconButtonModule,
@@ -53,9 +52,13 @@ export class TrashListItemsContainerComponent {
   /**
    * The list of trashed items to display.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   ciphers: PopupCipherViewLike[] = [];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   headerText: string;
 
@@ -81,10 +84,40 @@ export class TrashListItemsContainerComponent {
     return collections[0]?.name;
   }
 
-  async restore(cipher: CipherView) {
+  /**
+   * Check if a cipher has attachments. CipherView has a hasAttachments getter,
+   * while CipherListView has an attachments count property.
+   */
+  hasAttachments(cipher: PopupCipherViewLike): boolean {
+    if ("hasAttachments" in cipher) {
+      return cipher.hasAttachments;
+    }
+    return cipher.attachments > 0;
+  }
+
+  /**
+   * Get the subtitle for a cipher. CipherView has a subTitle getter,
+   * while CipherListView has a subtitle property.
+   */
+  getSubtitle(cipher: PopupCipherViewLike): string | undefined {
+    if ("subTitle" in cipher) {
+      return cipher.subTitle;
+    }
+    return cipher.subtitle;
+  }
+
+  /**
+   * Check if a cipher has a decryption failure. CipherView has this property,
+   * while CipherListView does not.
+   */
+  hasDecryptionFailure(cipher: PopupCipherViewLike): boolean {
+    return "decryptionFailure" in cipher && cipher.decryptionFailure;
+  }
+
+  async restore(cipher: PopupCipherViewLike) {
     try {
       const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      await this.cipherService.restoreWithServer(cipher.id, activeUserId);
+      await this.cipherService.restoreWithServer(cipher.id as string, activeUserId);
 
       await this.router.navigate(["/trash"]);
       this.toastService.showToast({
@@ -97,7 +130,7 @@ export class TrashListItemsContainerComponent {
     }
   }
 
-  async delete(cipher: CipherView) {
+  async delete(cipher: PopupCipherViewLike) {
     const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
 
     if (!repromptPassed) {
@@ -116,7 +149,7 @@ export class TrashListItemsContainerComponent {
 
     try {
       const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      await this.cipherService.deleteWithServer(cipher.id, activeUserId);
+      await this.cipherService.deleteWithServer(cipher.id as string, activeUserId);
 
       await this.router.navigate(["/trash"]);
       this.toastService.showToast({
@@ -129,8 +162,9 @@ export class TrashListItemsContainerComponent {
     }
   }
 
-  async onViewCipher(cipher: CipherView) {
-    if (cipher.decryptionFailure) {
+  async onViewCipher(cipher: PopupCipherViewLike) {
+    // CipherListView doesn't have decryptionFailure, so we use optional chaining
+    if ("decryptionFailure" in cipher && cipher.decryptionFailure) {
       DecryptionFailureDialogComponent.open(this.dialogService, {
         cipherIds: [cipher.id as CipherId],
       });
@@ -143,7 +177,7 @@ export class TrashListItemsContainerComponent {
     }
 
     await this.router.navigate(["/view-cipher"], {
-      queryParams: { cipherId: cipher.id, type: cipher.type },
+      queryParams: { cipherId: cipher.id as string, type: cipher.type },
     });
   }
 }
diff --git a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
index 630c55d0038..225640137e8 100644
--- a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
+++ b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
@@ -34,13 +34,27 @@
         <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
       </a>
     </bit-item>
-    @if (userCanArchive() || showArchiveFilter()) {
-      <bit-item>
-        <a bit-item-content routerLink="/archive">
-          {{ "archive" | i18n }}
-          <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
-        </a>
-      </bit-item>
+    @if (showArchiveItem()) {
+      @if (userCanArchive()) {
+        <bit-item>
+          <a bit-item-content routerLink="/archive">
+            {{ "archiveNoun" | i18n }}
+            <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
+          </a>
+        </bit-item>
+      } @else {
+        <bit-item>
+          <a bit-item-content [routerLink]="userHasArchivedItems() ? '/archive' : '/premium'">
+            <span class="tw-flex tw-items-center tw-gap-2">
+              {{ "archiveNoun" | i18n }}
+              @if (!userHasArchivedItems()) {
+                <app-premium-badge></app-premium-badge>
+              }
+            </span>
+            <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
+          </a>
+        </bit-item>
+      }
     }
     <bit-item>
       <a bit-item-content routerLink="/trash">
diff --git a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.ts b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.ts
index 4e8a49b2591..c6db820c232 100644
--- a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.ts
@@ -2,23 +2,28 @@ import { CommonModule } from "@angular/common";
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
 import { Router, RouterModule } from "@angular/router";
-import { firstValueFrom, switchMap } from "rxjs";
+import { firstValueFrom, map, switchMap } from "rxjs";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
 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 { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { BadgeComponent, ItemModule, ToastOptions, ToastService } from "@bitwarden/components";
-import { CipherArchiveService } from "@bitwarden/vault";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
 import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
+import { BrowserPremiumUpgradePromptService } from "../services/browser-premium-upgrade-prompt.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "vault-settings-v2.component.html",
   imports: [
@@ -30,20 +35,28 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
     PopOutComponent,
     ItemModule,
     BadgeComponent,
+    PremiumBadgeComponent,
+  ],
+  providers: [
+    { provide: PremiumUpgradePromptService, useClass: BrowserPremiumUpgradePromptService },
   ],
 })
 export class VaultSettingsV2Component implements OnInit, OnDestroy {
   lastSync = "--";
   private userId$ = this.accountService.activeAccount$.pipe(getUserId);
 
-  // Check if user is premium user, they will be able to archive items
-  protected userCanArchive = toSignal(
+  protected readonly userCanArchive = toSignal(
     this.userId$.pipe(switchMap((userId) => this.cipherArchiveService.userCanArchive$(userId))),
   );
 
-  // Check if user has archived items (does not check if user is premium)
-  protected showArchiveFilter = toSignal(
-    this.userId$.pipe(switchMap((userId) => this.cipherArchiveService.showArchiveVault$(userId))),
+  protected readonly showArchiveItem = toSignal(this.cipherArchiveService.hasArchiveFlagEnabled$());
+
+  protected readonly userHasArchivedItems = toSignal(
+    this.userId$.pipe(
+      switchMap((userId) =>
+        this.cipherArchiveService.archivedCiphers$(userId).pipe(map((c) => c.length > 0)),
+      ),
+    ),
   );
 
   protected emptyVaultImportBadge$ = this.accountService.activeAccount$.pipe(
diff --git a/apps/browser/src/vault/services/at-risk-cipher-badge-updater.service.spec.ts b/apps/browser/src/vault/services/at-risk-cipher-badge-updater.service.spec.ts
index f2567ef4267..b84d17a8375 100644
--- a/apps/browser/src/vault/services/at-risk-cipher-badge-updater.service.spec.ts
+++ b/apps/browser/src/vault/services/at-risk-cipher-badge-updater.service.spec.ts
@@ -1,12 +1,11 @@
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { SecurityTask, TaskService } from "@bitwarden/common/vault/tasks";
-import { LogService } from "@bitwarden/logging";
-import { UserId } from "@bitwarden/user-core";
+import { SecurityTask, SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
 
-import { BadgeService } from "../../platform/badge/badge.service";
+import { Tab } from "../../platform/badge/badge-browser-api";
+import { BadgeService, BadgeStateFunction } from "../../platform/badge/badge.service";
 import { BadgeIcon } from "../../platform/badge/icon";
 import { BadgeStatePriority } from "../../platform/badge/priority";
 import { Unset } from "../../platform/badge/state";
@@ -18,34 +17,32 @@ describe("AtRiskCipherBadgeUpdaterService", () => {
   let service: AtRiskCipherBadgeUpdaterService;
 
   let setState: jest.Mock;
-  let clearState: jest.Mock;
-  let warning: jest.Mock;
   let getAllDecryptedForUrl: jest.Mock;
   let getTab: jest.Mock;
   let addListener: jest.Mock;
 
-  const activeAccount$ = new BehaviorSubject({ id: "test-account-id" });
-  const cipherViews$ = new BehaviorSubject([]);
-  const pendingTasks$ = new BehaviorSubject<SecurityTask[]>([]);
-  const userId = "test-user-id" as UserId;
+  let activeAccount$: BehaviorSubject<{ id: string }>;
+  let cipherViews$: BehaviorSubject<Array<{ id: string; isDeleted?: boolean }>>;
+  let pendingTasks$: BehaviorSubject<SecurityTask[]>;
 
   beforeEach(async () => {
     setState = jest.fn().mockResolvedValue(undefined);
-    clearState = jest.fn().mockResolvedValue(undefined);
-    warning = jest.fn();
     getAllDecryptedForUrl = jest.fn().mockResolvedValue([]);
     getTab = jest.fn();
     addListener = jest.fn();
 
+    activeAccount$ = new BehaviorSubject({ id: "test-account-id" });
+    cipherViews$ = new BehaviorSubject<Array<{ id: string; isDeleted?: boolean }>>([]);
+    pendingTasks$ = new BehaviorSubject<SecurityTask[]>([]);
+
     jest.spyOn(BrowserApi, "addListener").mockImplementation(addListener);
     jest.spyOn(BrowserApi, "getTab").mockImplementation(getTab);
 
     service = new AtRiskCipherBadgeUpdaterService(
-      { setState, clearState } as unknown as BadgeService,
+      { setState } as unknown as BadgeService,
       { activeAccount$ } as unknown as AccountService,
-      { cipherViews$, getAllDecryptedForUrl } as unknown as CipherService,
-      { warning } as unknown as LogService,
-      { pendingTasks$ } as unknown as TaskService,
+      { cipherViews$: () => cipherViews$, getAllDecryptedForUrl } as unknown as CipherService,
+      { pendingTasks$: () => pendingTasks$ } as unknown as TaskService,
     );
 
     await service.init();
@@ -55,30 +52,41 @@ describe("AtRiskCipherBadgeUpdaterService", () => {
     jest.restoreAllMocks();
   });
 
+  it("registers dynamic state function on init", () => {
+    expect(setState).toHaveBeenCalledWith("at-risk-cipher-badge", expect.any(Function));
+  });
+
   it("clears the tab state when there are no ciphers and no pending tasks", async () => {
-    const tab = { id: 1 } as chrome.tabs.Tab;
+    const tab: Tab = { tabId: 1, url: "https://bitwarden.com" };
+    const stateFunction = setState.mock.calls[0][1];
 
-    await service["setTabState"](tab, userId, []);
+    const state = await firstValueFrom(stateFunction(tab));
 
-    expect(clearState).toHaveBeenCalledWith("at-risk-cipher-badge-1");
+    expect(state).toBeUndefined();
   });
 
   it("sets state when there are pending tasks for the tab", async () => {
-    const tab = { id: 3, url: "https://bitwarden.com" } as chrome.tabs.Tab;
-    const pendingTasks: SecurityTask[] = [{ id: "task1", cipherId: "cipher1" } as SecurityTask];
+    const tab: Tab = { tabId: 3, url: "https://bitwarden.com" };
+    const stateFunction: BadgeStateFunction = setState.mock.calls[0][1];
+    const pendingTasks: SecurityTask[] = [
+      {
+        id: "task1",
+        cipherId: "cipher1",
+        type: SecurityTaskType.UpdateAtRiskCredential,
+      } as SecurityTask,
+    ];
+    pendingTasks$.next(pendingTasks);
     getAllDecryptedForUrl.mockResolvedValueOnce([{ id: "cipher1" }]);
 
-    await service["setTabState"](tab, userId, pendingTasks);
+    const state = await firstValueFrom(stateFunction(tab));
 
-    expect(setState).toHaveBeenCalledWith(
-      "at-risk-cipher-badge-3",
-      BadgeStatePriority.High,
-      {
+    expect(state).toEqual({
+      priority: BadgeStatePriority.High,
+      state: {
         icon: BadgeIcon.Berry,
         text: Unset,
         backgroundColor: Unset,
       },
-      3,
-    );
+    });
   });
 });
diff --git a/apps/browser/src/vault/services/at-risk-cipher-badge-updater.service.ts b/apps/browser/src/vault/services/at-risk-cipher-badge-updater.service.ts
index 47364958ad8..a06c208ebe2 100644
--- a/apps/browser/src/vault/services/at-risk-cipher-badge-updater.service.ts
+++ b/apps/browser/src/vault/services/at-risk-cipher-badge-updater.service.ts
@@ -1,26 +1,18 @@
-import { combineLatest, map, mergeMap, of, Subject, switchMap } from "rxjs";
+import { combineLatest, concatMap, map, of, switchMap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { SecurityTask, SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
+import { SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
 import { filterOutNullish } from "@bitwarden/common/vault/utils/observable-utilities";
 
 import { BadgeService } from "../../platform/badge/badge.service";
 import { BadgeIcon } from "../../platform/badge/icon";
 import { BadgeStatePriority } from "../../platform/badge/priority";
 import { Unset } from "../../platform/badge/state";
-import { BrowserApi } from "../../platform/browser/browser-api";
 
-const StateName = (tabId: number) => `at-risk-cipher-badge-${tabId}`;
+const StateName = "at-risk-cipher-badge";
 
 export class AtRiskCipherBadgeUpdaterService {
-  private tabReplaced$ = new Subject<{ addedTab: chrome.tabs.Tab; removedTabId: number }>();
-  private tabUpdated$ = new Subject<chrome.tabs.Tab>();
-  private tabRemoved$ = new Subject<number>();
-  private tabActivated$ = new Subject<chrome.tabs.Tab>();
-
   private activeUserData$ = this.accountService.activeAccount$.pipe(
     filterOutNullish(),
     switchMap((user) =>
@@ -40,124 +32,36 @@ export class AtRiskCipherBadgeUpdaterService {
     private badgeService: BadgeService,
     private accountService: AccountService,
     private cipherService: CipherService,
-    private logService: LogService,
     private taskService: TaskService,
-  ) {
-    combineLatest({
-      replaced: this.tabReplaced$,
-      activeUserData: this.activeUserData$,
-    })
-      .pipe(
-        mergeMap(async ({ replaced, activeUserData: [userId, pendingTasks] }) => {
-          await this.clearTabState(replaced.removedTabId);
-          await this.setTabState(replaced.addedTab, userId, pendingTasks);
-        }),
-      )
-      .subscribe(() => {});
-
-    combineLatest({
-      tab: this.tabActivated$,
-      activeUserData: this.activeUserData$,
-    })
-      .pipe(
-        mergeMap(async ({ tab, activeUserData: [userId, pendingTasks] }) => {
-          await this.setTabState(tab, userId, pendingTasks);
-        }),
-      )
-      .subscribe();
-
-    combineLatest({
-      tab: this.tabUpdated$,
-      activeUserData: this.activeUserData$,
-    })
-      .pipe(
-        mergeMap(async ({ tab, activeUserData: [userId, pendingTasks] }) => {
-          await this.setTabState(tab, userId, pendingTasks);
-        }),
-      )
-      .subscribe();
-
-    this.tabRemoved$
-      .pipe(
-        mergeMap(async (tabId) => {
-          await this.clearTabState(tabId);
-        }),
-      )
-      .subscribe();
-  }
+  ) {}
 
   init() {
-    BrowserApi.addListener(chrome.tabs.onReplaced, async (addedTabId, removedTabId) => {
-      const newTab = await BrowserApi.getTab(addedTabId);
-      if (!newTab) {
-        this.logService.warning(
-          `Tab replaced event received but new tab not found (id: ${addedTabId})`,
-        );
-        return;
-      }
+    this.badgeService.setState(StateName, (tab) => {
+      return this.activeUserData$.pipe(
+        concatMap(async ([userId, pendingTasks]) => {
+          const ciphers = tab.url
+            ? await this.cipherService.getAllDecryptedForUrl(tab.url, userId, [], undefined, true)
+            : [];
 
-      this.tabReplaced$.next({
-        removedTabId,
-        addedTab: newTab,
-      });
+          const hasPendingTasksForTab = pendingTasks.some((task) =>
+            ciphers.some((cipher) => cipher.id === task.cipherId && !cipher.isDeleted),
+          );
+
+          if (!hasPendingTasksForTab) {
+            return undefined;
+          }
+
+          return {
+            priority: BadgeStatePriority.High,
+            state: {
+              icon: BadgeIcon.Berry,
+              // Unset text and background color to use default badge appearance
+              text: Unset,
+              backgroundColor: Unset,
+            },
+          };
+        }),
+      );
     });
-
-    BrowserApi.addListener(chrome.tabs.onUpdated, (_, changeInfo, tab) => {
-      if (changeInfo.url) {
-        this.tabUpdated$.next(tab);
-      }
-    });
-
-    BrowserApi.addListener(chrome.tabs.onActivated, async (activeInfo) => {
-      const tab = await BrowserApi.getTab(activeInfo.tabId);
-      if (!tab) {
-        this.logService.warning(
-          `Tab activated event received but tab not found (id: ${activeInfo.tabId})`,
-        );
-        return;
-      }
-
-      this.tabActivated$.next(tab);
-    });
-
-    BrowserApi.addListener(chrome.tabs.onRemoved, (tabId, _) => this.tabRemoved$.next(tabId));
-  }
-
-  /** Sets the pending task state for the tab */
-  private async setTabState(tab: chrome.tabs.Tab, userId: UserId, pendingTasks: SecurityTask[]) {
-    if (!tab.id) {
-      this.logService.warning("Tab event received but tab id is undefined");
-      return;
-    }
-
-    const ciphers = tab.url
-      ? await this.cipherService.getAllDecryptedForUrl(tab.url, userId, [], undefined, true)
-      : [];
-
-    const hasPendingTasksForTab = pendingTasks.some((task) =>
-      ciphers.some((cipher) => cipher.id === task.cipherId && !cipher.isDeleted),
-    );
-
-    if (!hasPendingTasksForTab) {
-      await this.clearTabState(tab.id);
-      return;
-    }
-
-    await this.badgeService.setState(
-      StateName(tab.id),
-      BadgeStatePriority.High,
-      {
-        icon: BadgeIcon.Berry,
-        // Unset text and background color to use default badge appearance
-        text: Unset,
-        backgroundColor: Unset,
-      },
-      tab.id,
-    );
-  }
-
-  /** Clears the pending task state from a tab */
-  private async clearTabState(tabId: number) {
-    await this.badgeService.clearState(StateName(tabId));
   }
 }
diff --git a/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts b/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
index 97a22bb2cf3..e55e3091244 100644
--- a/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
+++ b/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
@@ -1,11 +1,15 @@
 import { MockProxy, mock } from "jest-mock-extended";
+import { of } from "rxjs";
 
 import { UserVerificationDialogComponent } from "@bitwarden/auth/angular";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
 import { CipherRepromptType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
+import { newGuid } from "@bitwarden/guid";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
 // FIXME (PM-22628): Popup imports are forbidden in background
@@ -31,21 +35,24 @@ describe("Fido2UserVerificationService", () => {
   let fido2UserVerificationService: Fido2UserVerificationService;
 
   let passwordRepromptService: MockProxy<PasswordRepromptService>;
-  let userVerificationService: MockProxy<UserVerificationService>;
+  let userDecryptionOptionsService: MockProxy<UserDecryptionOptionsServiceAbstraction>;
   let dialogService: MockProxy<DialogService>;
+  let accountService: FakeAccountService;
   let cipher: CipherView;
 
   beforeEach(() => {
     passwordRepromptService = mock<PasswordRepromptService>();
-    userVerificationService = mock<UserVerificationService>();
+    userDecryptionOptionsService = mock<UserDecryptionOptionsServiceAbstraction>();
     dialogService = mock<DialogService>();
+    accountService = mockAccountServiceWith(newGuid() as UserId);
 
     cipher = createCipherView();
 
     fido2UserVerificationService = new Fido2UserVerificationService(
       passwordRepromptService,
-      userVerificationService,
+      userDecryptionOptionsService,
       dialogService,
+      accountService,
     );
 
     (UserVerificationDialogComponent.open as jest.Mock).mockResolvedValue({
@@ -67,7 +74,7 @@ describe("Fido2UserVerificationService", () => {
 
       it("should call master password reprompt dialog if user is redirected from lock screen, has master password and master password reprompt is required", async () => {
         cipher.reprompt = CipherRepromptType.Password;
-        userVerificationService.hasMasterPassword.mockResolvedValue(true);
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(true));
         passwordRepromptService.showPasswordPrompt.mockResolvedValue(true);
 
         const result = await fido2UserVerificationService.handleUserVerification(
@@ -82,7 +89,7 @@ describe("Fido2UserVerificationService", () => {
 
       it("should call user verification dialog if user is redirected from lock screen, does not have a master password and master password reprompt is required", async () => {
         cipher.reprompt = CipherRepromptType.Password;
-        userVerificationService.hasMasterPassword.mockResolvedValue(false);
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(false));
 
         const result = await fido2UserVerificationService.handleUserVerification(
           true,
@@ -98,7 +105,7 @@ describe("Fido2UserVerificationService", () => {
 
       it("should call user verification dialog if user is not redirected from lock screen, does not have a master password and master password reprompt is required", async () => {
         cipher.reprompt = CipherRepromptType.Password;
-        userVerificationService.hasMasterPassword.mockResolvedValue(false);
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(false));
 
         const result = await fido2UserVerificationService.handleUserVerification(
           true,
@@ -114,7 +121,7 @@ describe("Fido2UserVerificationService", () => {
 
       it("should call master password reprompt dialog if user is not redirected from lock screen, has a master password and master password reprompt is required", async () => {
         cipher.reprompt = CipherRepromptType.Password;
-        userVerificationService.hasMasterPassword.mockResolvedValue(false);
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(false));
         passwordRepromptService.showPasswordPrompt.mockResolvedValue(true);
 
         const result = await fido2UserVerificationService.handleUserVerification(
@@ -176,7 +183,7 @@ describe("Fido2UserVerificationService", () => {
 
       it("should call master password reprompt dialog if user is redirected from lock screen, has master password and master password reprompt is required", async () => {
         cipher.reprompt = CipherRepromptType.Password;
-        userVerificationService.hasMasterPassword.mockResolvedValue(true);
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(true));
         passwordRepromptService.showPasswordPrompt.mockResolvedValue(true);
 
         const result = await fido2UserVerificationService.handleUserVerification(
@@ -191,7 +198,7 @@ describe("Fido2UserVerificationService", () => {
 
       it("should call user verification dialog if user is redirected from lock screen, does not have a master password and master password reprompt is required", async () => {
         cipher.reprompt = CipherRepromptType.Password;
-        userVerificationService.hasMasterPassword.mockResolvedValue(false);
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(false));
 
         const result = await fido2UserVerificationService.handleUserVerification(
           false,
@@ -207,7 +214,7 @@ describe("Fido2UserVerificationService", () => {
 
       it("should call user verification dialog if user is not redirected from lock screen, does not have a master password and master password reprompt is required", async () => {
         cipher.reprompt = CipherRepromptType.Password;
-        userVerificationService.hasMasterPassword.mockResolvedValue(false);
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(false));
 
         const result = await fido2UserVerificationService.handleUserVerification(
           false,
@@ -223,7 +230,7 @@ describe("Fido2UserVerificationService", () => {
 
       it("should call master password reprompt dialog if user is not redirected from lock screen, has a master password and master password reprompt is required", async () => {
         cipher.reprompt = CipherRepromptType.Password;
-        userVerificationService.hasMasterPassword.mockResolvedValue(false);
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(false));
         passwordRepromptService.showPasswordPrompt.mockResolvedValue(true);
 
         const result = await fido2UserVerificationService.handleUserVerification(
diff --git a/apps/browser/src/vault/services/fido2-user-verification.service.ts b/apps/browser/src/vault/services/fido2-user-verification.service.ts
index 9bf9be70fc8..db3951d44d9 100644
--- a/apps/browser/src/vault/services/fido2-user-verification.service.ts
+++ b/apps/browser/src/vault/services/fido2-user-verification.service.ts
@@ -3,7 +3,8 @@
 import { firstValueFrom } from "rxjs";
 
 import { UserVerificationDialogComponent } from "@bitwarden/auth/angular";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
@@ -15,8 +16,9 @@ import { SetPinComponent } from "../../auth/popup/components/set-pin.component";
 export class Fido2UserVerificationService {
   constructor(
     private passwordRepromptService: PasswordRepromptService,
-    private userVerificationService: UserVerificationService,
+    private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private dialogService: DialogService,
+    private accountService: AccountService,
   ) {}
 
   /**
@@ -78,7 +80,15 @@ export class Fido2UserVerificationService {
   }
 
   private async handleMasterPasswordReprompt(): Promise<boolean> {
-    const hasMasterPassword = await this.userVerificationService.hasMasterPassword();
+    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+
+    if (!activeAccount?.id) {
+      return false;
+    }
+
+    const hasMasterPassword = await firstValueFrom(
+      this.userDecryptionOptionsService.hasMasterPasswordById$(activeAccount.id),
+    );
 
     // TDE users have no master password, so we need to use the UserVerification prompt
     return hasMasterPassword
diff --git a/apps/browser/store/locales/fr/copy.resx b/apps/browser/store/locales/fr/copy.resx
index 327d39a23c4..3ccb9c26b71 100644
--- a/apps/browser/store/locales/fr/copy.resx
+++ b/apps/browser/store/locales/fr/copy.resx
@@ -168,7 +168,8 @@ Applications multiplateformes
 Sécurisez et partagez des données sensibles dans votre coffre Bitwarden à partir de n'importe quel navigateur, appareil mobile ou système d'exploitation de bureau, et plus encore.
 
 Bitwarden sécurise bien plus que les mots de passe
-Les solutions de gestion de bout en bout des identifiants chiffrés de Bitwarden permettent aux organisations de tout sécuriser, y compris les secrets des développeurs et les expériences de clés de passe. Visitez Bitwarden.com pour en savoir plus sur Bitwarden Secrets Manager et Bitwarden Passwordless.dev !</value>
+Les solutions de gestion de bout en bout des identifiants chiffrés de Bitwarden permettent aux organisations de tout sécuriser, y compris les secrets des développeurs et les expériences de clés d'accès. Visitez Bitwarden.com pour en savoir plus sur Bitwarden Secrets Manager et Bitwarden Passwordless.dev !
+</value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
     <value>À la maison, au travail ou en déplacement, Bitwarden sécurise facilement tous vos mots de passe, clés d'accès et informations sensibles.</value>
diff --git a/apps/browser/store/locales/hu/copy.resx b/apps/browser/store/locales/hu/copy.resx
index 814ebabaada..e3a5c733eb5 100644
--- a/apps/browser/store/locales/hu/copy.resx
+++ b/apps/browser/store/locales/hu/copy.resx
@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>Bitwarden Password Manager</value>
+    <value>Bitwarden Jelszókezelő</value>
   </data>
   <data name="Summary" xml:space="preserve">
-    <value>At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information.</value>
+    <value>Legyen otthon, munkában, vagy úton, a Bitwarden könnyen biztosítja jelszavát, kulcsait, és kényes információit.</value>
   </data>
   <data name="Description" xml:space="preserve">
     <value>Recognized as the best password manager by PCMag, WIRED, The Verge, CNET, G2, and more!
@@ -169,7 +169,7 @@ End-to-end encrypted credential management solutions from Bitwarden empower orga
 </value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
-    <value>At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information.</value>
+    <value>Legyen otthon, munkában, vagy úton, a Bitwarden könnyen biztosítja jelszavát, kulcsait, és kényes információit.</value>
   </data>
   <data name="ScreenshotSync" xml:space="preserve">
     <value>A széf szinkronizálása és elérése több eszközön.</value>
diff --git a/apps/browser/store/locales/pt_BR/copy.resx b/apps/browser/store/locales/pt_BR/copy.resx
index edf2351c92d..09855fd5798 100644
--- a/apps/browser/store/locales/pt_BR/copy.resx
+++ b/apps/browser/store/locales/pt_BR/copy.resx
@@ -118,66 +118,66 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>Gerenciador de Senhas Bitwarden</value>
+    <value>Bitwarden Gerenciador de Senhas</value>
   </data>
   <data name="Summary" xml:space="preserve">
-    <value>Em casa, no trabalho, ou em qualquer lugar, o Bitwarden protege facilmente todas as suas senhas, chaves de acesso e informações sensíveis.</value>
+    <value>Onde quer que você esteja, a Bitwarden protege facilmente todas as suas senhas, chaves de acesso e informações sensíveis.</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Reconhecido como o melhor gerenciador de senhas por "PCMag", 'WIRED', 'The Verge', 'CNET', 'G2', entre outros!
+    <value>Reconhecido como o melhor gerenciador de senhas por PCMag, WIRED, The Verge, CNET, G2, e outros!
 
 PROTEJA A SUA VIDA DIGITAL
-Deixe a sua vida digital segura e se proteja contra violações de dados gerando e salvando senhas únicas e fortes para cada conta pessoal. Mantendo tudo isso em um cofre criptografado de ponta a ponta em que apenas você pode acessar.
+Proteja a sua vida digital e proteja-se de vazamentos de dados gerando e salvando senhas únicas e seguras, para cada conta. Mantenha tudo em um cofre criptografado de ponta a ponta, que só você pode acessar.
 
-ACESSE OS SEUS DADOS, EM QUALQUER LUGAR, HORA E DISPOSITIVO
-Gerencie, armazene, proteja e compartilhe senhas facilmente entre dispositivos ilimitados e sem restrições.
+ACESSE SEUS DADOS, DE QUALQUER LUGAR, QUALQUER HORA, EM QUALQUER DISPOSITIVO
+Gerencie, armazene, proteja, e compartilhe senhas ilimitadas entre dispositivos ilimitados, sem restrições. Tudo de forma fácil.
 
-TODOS DEVERIAM TEM FERRAMENTAS PARA SE PROTEGER ONLINE
-Utilize Bitwarden de graça sem anúncios ou venda dos seus dados. A Bitwarden acredita que todos deveriam ter a opção de estar seguro online. Nossos planos Premium oferecem recursos mais avançados.
+TODOS DEVERIAM TER AS FERRAMENTAS PARA SE PROTEGER ON-LINE
+Utilize o Bitwarden de graça, sem anúncios, e sem venda de dados. O Bitwarden acredita que todos deveriam ter a possibilidade de se proteger on-line. O plano Premium oferece acesso a recursos avançados.
 
-EMPODERE O SEUS TIMES COM BITWARDEN
-Os planos para times e empresas vêm com recursos profissionais para negócios. Alguns exemplos incluem integração SSO, auto-hospedagem, integração de diretório e provisionamento SCIM, políticas globais, acesso API, registro de eventos e mais.
+EMPODERE SUAS EQUIPES COM O BITWARDEN
+Os planos para Equipes e o Empresarial vêm com recursos empresariais profisionais. Alguns exemplos incluem integração com SSO, auto-hospedagem, integração de diretório e provisionamento de SCIM, políticas globais, acesso à API, registros de eventos, e mais.
 
-Utilize o Bitwarden para proteger os seus colaboradores e compartilhar informações sensíveis com seus colegas.
+Use o Bitwarden para protejer a sua força de trabalho e compartilhe informações sensíveis com colegas.
 
-Mais razões para escolher Bitwarden:
+Mais motivos para escolher o Bitwarden:
 
-Criptografia mundialmente reconhecida
-Suas senhas são protegidas com avançada criptografia ponta a ponta (AES-256, salted hashing, e PBKDF2 SHA-256) para que os seus dados estejam seguros e privados.
+Criptografia reconhecida mundialmente
+As senhas são protegidas com criptografia avançada de ponta a ponta (AES de 256 bits, hashing com salting, e PBKDF2 SHA-256) para que seus dados continuem seguros e privados.
 
-Auditoria de Terceiros
-A Bitwarden regularmente conduz auditorias de terceiros com notáveis empresas de segurança. Essas auditorias anuais incluem qualificação do código fonte e testes de invasão contra os IPs da Bitwarden, servidores e aplicações web.
+Auditoria por terceiros
+O Bitwarden conduz auditorias abrangentes de terceiros periodicamente com firmas de segurança nótaveis. Essas auditorias anuais incluem análise do código-fonte e teste de penetração entre IPs, servidores, e aplicativos web do Bitwarden.
 
-2FA Avançado
-Proteja o seu login com um autenticador de dois fatores, códigos de email ou credenciais FIDO2 WebAuthn como chave de segurança por hardware ou chave de acesso.
+Autenticação de duas etapas avançada
+Proteja sua autenticação com um autenticador de terceiros, códigos enviados por e-mail, ou credenciais de WebAuthn FIDO2, como uma chave de segurança física ou uma chave de acesso.
 
-Envio Bitwarden
-Transmita dados diretamente para outras pessoas enquanto mantém a segurança da criptografia ponta a ponta para limitar sua exposição.
+Bitwarden Send
+Transmita dados diretamente para outros enquanto mantém a segurança da criptografia de ponta a ponta, limitando exposição.
 
-Gerador integrado
-Crie diferentes senhas fortes e complexas e nomes de usuário únicos para cada site que visitar. Integre com provedores de email para privacidade adicional.
+Gerador embutido
+Crie senhas longas, complexas, e distintas, e nomes de usuário únicos para cada site que visita. Integre com provedores de alias de email para privacidade adicional.
 
-Tradutores globais
-As traduções da Bitwarden estão disponíveis para mais de 60 línguas, traduzidas pela comunidade global através do Crowdin.
+Traduções globais
+O Bitwarden tem traduções para mais de 60 idiomas, traduzidos pela comunidade global, pelo Crowdin.
 
-Aplicações Multi-Plataforma
-Proteja e compartilhe conteúdo confidencial dentro do Vault da Bitwarden de qualquer navegador, dispositivo móvel, desktop, entre outros.
+Aplicativos multiplataforma
+Proteja e compartilhe dados sensíveis dentro do seu cofre do Bitwarden de qualquer navegador, dispositivo móvel, sistema operacional de computador, e mais.
 
-Bitwarden protege mais do que apenas senhas
-Com nossas soluções em gerenciamento de credenciais criptografadas ponta a ponta, a Bitwarden empodera organizações para proteger qualquer informação, incluindo senhas de desenvolvedor e chaves de acesso. Visite Bitwarden.com para aprender mais sobre Bitwarden Secrets Manager e Bitwarden Passwordless.dev!
+O Bitwarden protege mais do que só senhas
+As soluções criptografadas de ponta a ponta de gerenciamento de credenciaisdo Bitwarden empoderam organizações a proteger tudo, incluindo segredos de desenvolvedor, e experiências com chaves de acesso. Visite bitwarden.com para aprender mais sobre o Bitwarden Gerenciador de Segredos e o Bitwarden Passworldless.dev!
 </value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
-    <value>Onde quer que você esteja, a Bitwarden protege facilmente todas as suas senha, chaves de acesso e informações sensíveis.</value>
+    <value>Onde quer que você esteja, a Bitwarden protege facilmente todas as suas senhas, chaves de acesso e informações sensíveis.</value>
   </data>
   <data name="ScreenshotSync" xml:space="preserve">
-    <value>Sincronize e acesse o seu cofre através de múltiplos dispositivos</value>
+    <value>Sincronize e acesse o seu cofre entre vários dispositivos</value>
   </data>
   <data name="ScreenshotVault" xml:space="preserve">
     <value>Gerencie todas as suas credenciais a partir de um cofre seguro</value>
   </data>
   <data name="ScreenshotAutofill" xml:space="preserve">
-    <value>Autopreencha rapidamente as suas credenciais dentro de qualquer site que visitar</value>
+    <value>Preencha automaticamente as suas credenciais dentro de qualquer site que visitar</value>
   </data>
   <data name="ScreenshotMenu" xml:space="preserve">
     <value>O seu cofre é também acessível a partir do menu de contexto pelo clique no botão direito do mouse</value>
@@ -186,6 +186,6 @@ Com nossas soluções em gerenciamento de credenciais criptografadas ponta a pon
     <value>Gera automaticamente senhas fortes, aleatórias e seguras</value>
   </data>
   <data name="ScreenshotEdit" xml:space="preserve">
-    <value>A sua informação é gerenciada com segurança utilizando encriptação AES-256 bits</value>
+    <value>A sua informação é gerenciada com segurança utilizando criptografia de AES de 256 bits</value>
   </data>
 </root>
diff --git a/apps/browser/store/locales/sk/copy.resx b/apps/browser/store/locales/sk/copy.resx
index 2b7e903fe52..816f1bf7e8c 100644
--- a/apps/browser/store/locales/sk/copy.resx
+++ b/apps/browser/store/locales/sk/copy.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>Bitwarden – Bezplatný správca hesiel</value>
+    <value>Bitwarden – správca hesiel</value>
   </data>
   <data name="Summary" xml:space="preserve">
     <value>Bitwarden zabezpečí všetky vaše heslá, prístupové kľúče a citlivé informácie doma, v práci alebo na cestách.</value>
diff --git a/apps/browser/tailwind.config.js b/apps/browser/tailwind.config.js
index 1ad56562bb3..134001bbf13 100644
--- a/apps/browser/tailwind.config.js
+++ b/apps/browser/tailwind.config.js
@@ -10,6 +10,7 @@ config.content = [
   "../../libs/vault/src/**/*.{html,ts}",
   "../../libs/angular/src/**/*.{html,ts}",
   "../../libs/vault/src/**/*.{html,ts}",
+  "../../libs/pricing/src/**/*.{html,ts}",
 ];
 
 module.exports = config;
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index 0fd6cac4230..6fb9dfbe46b 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -1,5 +1,8 @@
 {
   "extends": "../../tsconfig.base",
+  "angularCompilerOptions": {
+    "strictTemplates": true
+  },
   "include": [
     "src",
     "../../libs/common/src/autofill/constants",
diff --git a/apps/browser/webpack.base.js b/apps/browser/webpack.base.js
index 872da6600b4..4bc2a90c4ff 100644
--- a/apps/browser/webpack.base.js
+++ b/apps/browser/webpack.base.js
@@ -10,14 +10,18 @@ const configurator = require("./config/config");
 const manifest = require("./webpack/manifest");
 const AngularCheckPlugin = require("./webpack/angular-check");
 
-module.exports.getEnv = function getEnv() {
-  const ENV = (process.env.ENV = process.env.NODE_ENV);
+module.exports.getEnv = function getEnv(params) {
+  const ENV = params.env || (process.env.ENV = process.env.NODE_ENV);
   const manifestVersion = process.env.MANIFEST_VERSION == 3 ? 3 : 2;
   const browser = process.env.BROWSER ?? "chrome";
 
   return { ENV, manifestVersion, browser };
 };
 
+const DEFAULT_PARAMS = {
+  outputPath: path.resolve(__dirname, "build"),
+};
+
 /**
  * @param {{
  *  configName: string;
@@ -29,15 +33,21 @@ module.exports.getEnv = function getEnv() {
  *    entry: string;
  *  };
  *  tsConfig: string;
- *  additionalEntries?: { [outputPath: string]: string }
+ *  outputPath?: string;
+ *  mode?: string;
+ *  env?: string;
+ *  additionalEntries?: { [outputPath: string]: string };
+ *  importAliases?: import("webpack").ResolveOptions["alias"];
  * }} params - The input parameters for building the config.
  */
 module.exports.buildConfig = function buildConfig(params) {
+  params = { ...DEFAULT_PARAMS, ...params };
+
   if (process.env.NODE_ENV == null) {
     process.env.NODE_ENV = "development";
   }
 
-  const { ENV, manifestVersion, browser } = module.exports.getEnv();
+  const { ENV, manifestVersion, browser } = module.exports.getEnv(params);
 
   console.log(`Building Manifest Version ${manifestVersion} app - ${params.configName} version`);
 
@@ -103,7 +113,7 @@ module.exports.buildConfig = function buildConfig(params) {
         {
           loader: "babel-loader",
           options: {
-            configFile: "../../babel.config.json",
+            configFile: path.resolve(__dirname, "../../babel.config.json"),
             cacheDirectory: ENV === "development",
             compact: ENV !== "development",
           },
@@ -130,43 +140,52 @@ module.exports.buildConfig = function buildConfig(params) {
 
   const plugins = [
     new HtmlWebpackPlugin({
-      template: "./src/popup/index.ejs",
+      template: path.resolve(__dirname, "src/popup/index.ejs"),
       filename: "popup/index.html",
       chunks: ["popup/polyfills", "popup/vendor-angular", "popup/vendor", "popup/main"],
       browser: browser,
     }),
     new HtmlWebpackPlugin({
-      template: "./src/autofill/notification/bar.html",
+      template: path.resolve(__dirname, "src/autofill/notification/bar.html"),
       filename: "notification/bar.html",
       chunks: ["notification/bar"],
     }),
     new HtmlWebpackPlugin({
-      template: "./src/autofill/overlay/inline-menu/pages/button/button.html",
+      template: path.resolve(
+        __dirname,
+        "src/autofill/overlay/inline-menu/pages/button/button.html",
+      ),
       filename: "overlay/menu-button.html",
       chunks: ["overlay/menu-button"],
     }),
     new HtmlWebpackPlugin({
-      template: "./src/autofill/overlay/inline-menu/pages/list/list.html",
+      template: path.resolve(__dirname, "src/autofill/overlay/inline-menu/pages/list/list.html"),
       filename: "overlay/menu-list.html",
       chunks: ["overlay/menu-list"],
     }),
     new HtmlWebpackPlugin({
-      template: "./src/autofill/overlay/inline-menu/pages/menu-container/menu-container.html",
+      template: path.resolve(
+        __dirname,
+        "src/autofill/overlay/inline-menu/pages/menu-container/menu-container.html",
+      ),
       filename: "overlay/menu.html",
       chunks: ["overlay/menu"],
     }),
     new CopyWebpackPlugin({
       patterns: [
         {
-          from: manifestVersion == 3 ? "./src/manifest.v3.json" : "./src/manifest.json",
+          from:
+            manifestVersion == 3
+              ? path.resolve(__dirname, "src/manifest.v3.json")
+              : path.resolve(__dirname, "src/manifest.json"),
           to: "manifest.json",
           transform: manifest.transform(browser),
         },
-        { from: "./src/managed_schema.json", to: "managed_schema.json" },
-        { from: "./src/_locales", to: "_locales" },
-        { from: "./src/images", to: "images" },
-        { from: "./src/popup/images", to: "popup/images" },
-        { from: "./src/autofill/content/autofill.css", to: "content" },
+        { from: path.resolve(__dirname, "src/managed_schema.json"), to: "managed_schema.json" },
+        { from: path.resolve(__dirname, "src/_locales"), to: "_locales" },
+        { from: path.resolve(__dirname, "src/images"), to: "images" },
+        { from: path.resolve(__dirname, "src/popup/images"), to: "popup/images" },
+        { from: path.resolve(__dirname, "src/autofill/content/autofill.css"), to: "content" },
       ],
     }),
     new MiniCssExtractPlugin({
@@ -196,33 +215,76 @@ module.exports.buildConfig = function buildConfig(params) {
     name: "main",
     mode: ENV,
     devtool: false,
+
     entry: {
-      "popup/polyfills": "./src/popup/polyfills.ts",
+      "popup/polyfills": path.resolve(__dirname, "src/popup/polyfills.ts"),
       "popup/main": params.popup.entry,
-      "content/trigger-autofill-script-injection":
-        "./src/autofill/content/trigger-autofill-script-injection.ts",
-      "content/bootstrap-autofill": "./src/autofill/content/bootstrap-autofill.ts",
-      "content/bootstrap-autofill-overlay": "./src/autofill/content/bootstrap-autofill-overlay.ts",
-      "content/bootstrap-autofill-overlay-menu":
-        "./src/autofill/content/bootstrap-autofill-overlay-menu.ts",
-      "content/bootstrap-autofill-overlay-notifications":
-        "./src/autofill/content/bootstrap-autofill-overlay-notifications.ts",
-      "content/autofiller": "./src/autofill/content/autofiller.ts",
-      "content/auto-submit-login": "./src/autofill/content/auto-submit-login.ts",
-      "content/contextMenuHandler": "./src/autofill/content/context-menu-handler.ts",
-      "content/content-message-handler": "./src/autofill/content/content-message-handler.ts",
-      "content/fido2-content-script": "./src/autofill/fido2/content/fido2-content-script.ts",
-      "content/fido2-page-script": "./src/autofill/fido2/content/fido2-page-script.ts",
-      "content/ipc-content-script": "./src/platform/ipc/content/ipc-content-script.ts",
-      "notification/bar": "./src/autofill/notification/bar.ts",
-      "overlay/menu-button":
-        "./src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts",
-      "overlay/menu-list":
-        "./src/autofill/overlay/inline-menu/pages/list/bootstrap-autofill-inline-menu-list.ts",
-      "overlay/menu":
-        "./src/autofill/overlay/inline-menu/pages/menu-container/bootstrap-autofill-inline-menu-container.ts",
-      "content/send-on-installed-message": "./src/vault/content/send-on-installed-message.ts",
-      "content/send-popup-open-message": "./src/vault/content/send-popup-open-message.ts",
+      "content/trigger-autofill-script-injection": path.resolve(
+        __dirname,
+        "src/autofill/content/trigger-autofill-script-injection.ts",
+      ),
+      "content/bootstrap-autofill": path.resolve(
+        __dirname,
+        "src/autofill/content/bootstrap-autofill.ts",
+      ),
+      "content/bootstrap-autofill-overlay": path.resolve(
+        __dirname,
+        "src/autofill/content/bootstrap-autofill-overlay.ts",
+      ),
+      "content/bootstrap-autofill-overlay-menu": path.resolve(
+        __dirname,
+        "src/autofill/content/bootstrap-autofill-overlay-menu.ts",
+      ),
+      "content/bootstrap-autofill-overlay-notifications": path.resolve(
+        __dirname,
+        "src/autofill/content/bootstrap-autofill-overlay-notifications.ts",
+      ),
+      "content/autofiller": path.resolve(__dirname, "src/autofill/content/autofiller.ts"),
+      "content/auto-submit-login": path.resolve(
+        __dirname,
+        "src/autofill/content/auto-submit-login.ts",
+      ),
+      "content/contextMenuHandler": path.resolve(
+        __dirname,
+        "src/autofill/content/context-menu-handler.ts",
+      ),
+      "content/content-message-handler": path.resolve(
+        __dirname,
+        "src/autofill/content/content-message-handler.ts",
+      ),
+      "content/fido2-content-script": path.resolve(
+        __dirname,
+        "src/autofill/fido2/content/fido2-content-script.ts",
+      ),
+      "content/fido2-page-script": path.resolve(
+        __dirname,
+        "src/autofill/fido2/content/fido2-page-script.ts",
+      ),
+      "content/ipc-content-script": path.resolve(
+        __dirname,
+        "src/platform/ipc/content/ipc-content-script.ts",
+      ),
+      "notification/bar": path.resolve(__dirname, "src/autofill/notification/bar.ts"),
+      "overlay/menu-button": path.resolve(
+        __dirname,
+        "src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts",
+      ),
+      "overlay/menu-list": path.resolve(
+        __dirname,
+        "src/autofill/overlay/inline-menu/pages/list/bootstrap-autofill-inline-menu-list.ts",
+      ),
+      "overlay/menu": path.resolve(
+        __dirname,
+        "src/autofill/overlay/inline-menu/pages/menu-container/bootstrap-autofill-inline-menu-container.ts",
+      ),
+      "content/send-on-installed-message": path.resolve(
+        __dirname,
+        "src/vault/content/send-on-installed-message.ts",
+      ),
+      "content/send-popup-open-message": path.resolve(
+        __dirname,
+        "src/vault/content/send-popup-open-message.ts",
+      ),
       ...params.additionalEntries,
     },
     cache:
@@ -291,7 +353,7 @@ module.exports.buildConfig = function buildConfig(params) {
     resolve: {
       extensions: [".ts", ".js"],
       symlinks: false,
-      modules: [path.resolve("../../node_modules")],
+      modules: [path.resolve(__dirname, "../../node_modules")],
       fallback: {
         assert: false,
         buffer: require.resolve("buffer/"),
@@ -301,12 +363,13 @@ module.exports.buildConfig = function buildConfig(params) {
         path: require.resolve("path-browserify"),
       },
       cache: true,
+      alias: params.importAliases,
     },
     output: {
       filename: "[name].js",
       chunkFilename: "assets/[name].js",
       webassemblyModuleFilename: "assets/[modulehash].wasm",
-      path: path.resolve(__dirname, "build"),
+      path: params.outputPath,
       clean: true,
     },
     module: {
@@ -335,7 +398,7 @@ module.exports.buildConfig = function buildConfig(params) {
     // Manifest V2 uses Background Pages which requires a html page.
     mainConfig.plugins.push(
       new HtmlWebpackPlugin({
-        template: "./src/platform/background.html",
+        template: path.resolve(__dirname, "src/platform/background.html"),
         filename: "background.html",
         chunks: ["vendor", "background"],
       }),
@@ -344,19 +407,23 @@ module.exports.buildConfig = function buildConfig(params) {
     // Manifest V2 background pages can be run through the regular build pipeline.
     // Since it's a standard webpage.
     mainConfig.entry.background = params.background.entry;
-    mainConfig.entry["content/fido2-page-script-delay-append-mv2"] =
-      "./src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts";
+    mainConfig.entry["content/fido2-page-script-delay-append-mv2"] = path.resolve(
+      __dirname,
+      "src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts",
+    );
 
     configs.push(mainConfig);
   } else {
     // Firefox does not use the offscreen API
     if (browser !== "firefox") {
-      mainConfig.entry["offscreen-document/offscreen-document"] =
-        "./src/platform/offscreen-document/offscreen-document.ts";
+      mainConfig.entry["offscreen-document/offscreen-document"] = path.resolve(
+        __dirname,
+        "src/platform/offscreen-document/offscreen-document.ts",
+      );
 
       mainConfig.plugins.push(
         new HtmlWebpackPlugin({
-          template: "./src/platform/offscreen-document/index.html",
+          template: path.resolve(__dirname, "src/platform/offscreen-document/index.html"),
           filename: "offscreen-document/index.html",
           chunks: ["offscreen-document/offscreen-document"],
         }),
@@ -372,11 +439,12 @@ module.exports.buildConfig = function buildConfig(params) {
       name: "background",
       mode: ENV,
       devtool: false,
+
       entry: params.background.entry,
       target: target,
       output: {
         filename: "background.js",
-        path: path.resolve(__dirname, "build"),
+        path: params.outputPath,
       },
       module: {
         rules: [
@@ -409,13 +477,14 @@ module.exports.buildConfig = function buildConfig(params) {
       resolve: {
         extensions: [".ts", ".js"],
         symlinks: false,
-        modules: [path.resolve("../../node_modules")],
+        modules: [path.resolve(__dirname, "../../node_modules")],
         plugins: [new TsconfigPathsPlugin()],
         fallback: {
           fs: false,
           path: require.resolve("path-browserify"),
         },
         cache: true,
+        alias: params.importAliases,
       },
       dependencies: ["main"],
       plugins: [...requiredPlugins, new AngularCheckPlugin()],
@@ -428,8 +497,11 @@ module.exports.buildConfig = function buildConfig(params) {
       backgroundConfig.plugins.push(
         new CopyWebpackPlugin({
           patterns: [
-            { from: "./src/safari/mv3/fake-background.html", to: "background.html" },
-            { from: "./src/safari/mv3/fake-vendor.js", to: "vendor.js" },
+            {
+              from: path.resolve(__dirname, "src/safari/mv3/fake-background.html"),
+              to: "background.html",
+            },
+            { from: path.resolve(__dirname, "src/safari/mv3/fake-vendor.js"), to: "vendor.js" },
           ],
         }),
       );
diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js
index 9eac990ab61..cb0761c859b 100644
--- a/apps/browser/webpack.config.js
+++ b/apps/browser/webpack.config.js
@@ -1,13 +1,54 @@
+const path = require("path");
 const { buildConfig } = require("./webpack.base");
 
-module.exports = buildConfig({
-  configName: "OSS",
-  popup: {
-    entry: "./src/popup/main.ts",
-    entryModule: "src/popup/app.module#AppModule",
-  },
-  background: {
-    entry: "./src/platform/background.ts",
-  },
-  tsConfig: "tsconfig.json",
-});
+module.exports = (webpackConfig, context) => {
+  // Detect if called by Nx (context parameter exists)
+  const isNxBuild = context && context.options;
+
+  if (isNxBuild) {
+    // Nx build configuration
+    const mode = context.options.mode || "development";
+    if (process.env.NODE_ENV == null) {
+      process.env.NODE_ENV = mode;
+    }
+    const ENV = (process.env.ENV = process.env.NODE_ENV);
+
+    // Set environment variables from Nx context
+    if (context.options.env) {
+      Object.keys(context.options.env).forEach((key) => {
+        process.env[key] = context.options.env[key];
+      });
+    }
+
+    return buildConfig({
+      configName: "OSS",
+      popup: {
+        entry: path.resolve(__dirname, "src/popup/main.ts"),
+        entryModule: "src/popup/app.module#AppModule",
+      },
+      background: {
+        entry: path.resolve(__dirname, "src/platform/background.ts"),
+      },
+      tsConfig: path.resolve(__dirname, "tsconfig.json"),
+      outputPath:
+        context.context && context.context.root
+          ? path.resolve(context.context.root, context.options.outputPath)
+          : context.options.outputPath,
+      mode: mode,
+      env: ENV,
+    });
+  } else {
+    // npm build configuration
+    return buildConfig({
+      configName: "OSS",
+      popup: {
+        entry: path.resolve(__dirname, "src/popup/main.ts"),
+        entryModule: "src/popup/app.module#AppModule",
+      },
+      background: {
+        entry: path.resolve(__dirname, "src/platform/background.ts"),
+      },
+      tsConfig: "tsconfig.json",
+    });
+  }
+};
diff --git a/apps/cli/CLAUDE.md b/apps/cli/CLAUDE.md
new file mode 100644
index 00000000000..72ec31eaaf5
--- /dev/null
+++ b/apps/cli/CLAUDE.md
@@ -0,0 +1,13 @@
+# CLI - Critical Rules
+
+- **ALWAYS** output structured JSON when `process.env.BW_RESPONSE === "true"`
+  - Use Response objects (MessageResponse, ListResponse, etc.) from `/apps/cli/src/models/response/`
+  - DON'T write free-form text that breaks JSON parsing
+
+- **NEVER** use `console.log()` for output
+  - Use `CliUtils.writeLn()` to respect `BW_QUIET` and `BW_RESPONSE` environment variables
+  - Use the `ConsoleLogService` from the `ServiceContainer`
+
+- **ALWAYS** respect `BW_CLEANEXIT` environment variable
+  - Exit code 0 even on errors when `BW_CLEANEXIT` is set
+  - Required for scripting environments that need clean exits
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 659a68d13a5..adddc99b4d7 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/cli",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.9.0",
+  "version": "2025.12.0",
   "keywords": [
     "bitwarden",
     "password",
@@ -13,7 +13,7 @@
   "homepage": "https://bitwarden.com",
   "repository": {
     "type": "git",
-    "url": "https://github.com/bitwarden/clients"
+    "url": "git+https://github.com/bitwarden/clients.git"
   },
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
@@ -75,20 +75,20 @@
     "inquirer": "8.2.6",
     "jsdom": "26.1.0",
     "jszip": "3.10.1",
-    "koa": "2.16.1",
+    "koa": "2.16.3",
     "koa-bodyparser": "4.4.1",
     "koa-json": "2.0.2",
     "lowdb": "1.0.0",
     "lunr": "2.3.9",
     "multer": "2.0.2",
     "node-fetch": "2.6.12",
-    "node-forge": "1.3.1",
+    "node-forge": "1.3.2",
     "open": "10.1.2",
     "papaparse": "5.5.3",
     "proper-lockfile": "4.1.2",
     "rxjs": "7.8.1",
-    "semver": "7.7.2",
-    "tldts": "7.0.1",
+    "semver": "7.7.3",
+    "tldts": "7.0.18",
     "zxcvbn": "4.4.2"
   }
 }
diff --git a/apps/cli/project.json b/apps/cli/project.json
new file mode 100644
index 00000000000..229738818a7
--- /dev/null
+++ b/apps/cli/project.json
@@ -0,0 +1,86 @@
+{
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "name": "cli",
+  "projectType": "application",
+  "sourceRoot": "apps/cli/src",
+  "tags": ["scope:cli", "type:app"],
+  "targets": {
+    "build": {
+      "executor": "@nx/webpack:webpack",
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": "oss-dev",
+      "options": {
+        "outputPath": "dist/apps/cli",
+        "webpackConfig": "apps/cli/webpack.config.js",
+        "tsConfig": "apps/cli/tsconfig.json",
+        "main": "apps/cli/src/bw.ts",
+        "target": "node",
+        "compiler": "tsc"
+      },
+      "configurations": {
+        "oss": {
+          "mode": "production",
+          "outputPath": "dist/apps/cli/oss"
+        },
+        "oss-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/cli/oss-dev"
+        },
+        "commercial": {
+          "mode": "production",
+          "outputPath": "dist/apps/cli/commercial",
+          "webpackConfig": "bitwarden_license/bit-cli/webpack.config.js",
+          "main": "bitwarden_license/bit-cli/src/bw.ts",
+          "tsConfig": "bitwarden_license/bit-cli/tsconfig.json"
+        },
+        "commercial-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/cli/commercial-dev",
+          "webpackConfig": "bitwarden_license/bit-cli/webpack.config.js",
+          "main": "bitwarden_license/bit-cli/src/bw.ts",
+          "tsConfig": "bitwarden_license/bit-cli/tsconfig.json"
+        }
+      }
+    },
+    "serve": {
+      "executor": "@nx/webpack:webpack",
+      "defaultConfiguration": "oss-dev",
+      "options": {
+        "outputPath": "dist/apps/cli",
+        "webpackConfig": "apps/cli/webpack.config.js",
+        "tsConfig": "apps/cli/tsconfig.json",
+        "main": "apps/cli/src/bw.ts",
+        "target": "node",
+        "compiler": "tsc",
+        "watch": true
+      },
+      "configurations": {
+        "oss-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/cli/oss-dev"
+        },
+        "commercial-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/cli/commercial-dev",
+          "webpackConfig": "bitwarden_license/bit-cli/webpack.config.js",
+          "main": "bitwarden_license/bit-cli/src/bw.ts",
+          "tsConfig": "bitwarden_license/bit-cli/tsconfig.json"
+        }
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "apps/cli/jest.config.js"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/cli/**/*.ts"]
+      }
+    }
+  }
+}
diff --git a/apps/cli/src/auth/commands/lock.command.ts b/apps/cli/src/auth/commands/lock.command.ts
index f3b8018f40e..eef85980d58 100644
--- a/apps/cli/src/auth/commands/lock.command.ts
+++ b/apps/cli/src/auth/commands/lock.command.ts
@@ -1,16 +1,22 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
+import { firstValueFrom } from "rxjs";
+
+import { LockService } from "@bitwarden/auth/common";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 
 import { Response } from "../../models/response";
 import { MessageResponse } from "../../models/response/message.response";
 
 export class LockCommand {
-  constructor(private vaultTimeoutService: VaultTimeoutService) {}
+  constructor(
+    private lockService: LockService,
+    private accountService: AccountService,
+  ) {}
 
   async run() {
-    await this.vaultTimeoutService.lock();
-    process.env.BW_SESSION = null;
+    const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+    await this.lockService.lock(activeUserId);
+    process.env.BW_SESSION = undefined;
     const res = new MessageResponse("Your vault is locked.", null);
     return Response.success(res);
   }
diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts
index 133c9658ae7..d0ab062d0b3 100644
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -14,14 +14,12 @@ import {
   SsoUrlService,
   UserApiLoginCredentials,
 } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
@@ -29,11 +27,13 @@ import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/ide
 import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
 import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
 import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request";
+import { TwoFactorService, TwoFactorApiService } from "@bitwarden/common/auth/two-factor";
 import { ClientType } from "@bitwarden/common/enums";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -61,7 +61,7 @@ export class LoginCommand {
   constructor(
     protected loginStrategyService: LoginStrategyServiceAbstraction,
     protected authService: AuthService,
-    protected apiService: ApiService,
+    protected twoFactorApiService: TwoFactorApiService,
     protected masterPasswordApiService: MasterPasswordApiService,
     protected cryptoFunctionService: CryptoFunctionService,
     protected environmentService: EnvironmentService,
@@ -278,7 +278,7 @@ export class LoginCommand {
           const emailReq = new TwoFactorEmailRequest();
           emailReq.email = await this.loginStrategyService.getEmail();
           emailReq.masterPasswordHash = await this.loginStrategyService.getMasterPasswordHash();
-          await this.apiService.postTwoFactorEmail(emailReq);
+          await this.twoFactorApiService.postTwoFactorEmail(emailReq);
         }
 
         if (twoFactorToken == null) {
@@ -369,6 +369,15 @@ export class LoginCommand {
 
       return await this.handleSuccessResponse(response);
     } catch (e) {
+      if (
+        e instanceof ErrorResponse &&
+        e.message === "Username or password is incorrect. Try again."
+      ) {
+        const env = await firstValueFrom(this.environmentService.environment$);
+        const host = Utils.getHost(env.getWebVaultUrl());
+        return Response.error(this.i18nService.t("invalidMasterPasswordConfirmEmailAndHost", host));
+      }
+
       return Response.error(e);
     }
   }
@@ -611,7 +620,7 @@ export class LoginCommand {
     const newPasswordHash = await this.keyService.hashMasterKey(masterPassword, newMasterKey);
 
     // Grab user key
-    const userKey = await this.keyService.getUserKey();
+    const userKey = await firstValueFrom(this.keyService.userKey$(userId));
     if (!userKey) {
       throw new Error("User key not found.");
     }
diff --git a/apps/cli/src/base-program.ts b/apps/cli/src/base-program.ts
index 5957f08de89..69a5e4e1bde 100644
--- a/apps/cli/src/base-program.ts
+++ b/apps/cli/src/base-program.ts
@@ -7,7 +7,7 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authenticatio
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { UserId } from "@bitwarden/common/types/guid";
 
-import { UnlockCommand } from "./auth/commands/unlock.command";
+import { UnlockCommand } from "./key-management/commands/unlock.command";
 import { Response } from "./models/response";
 import { ListResponse } from "./models/response/list.response";
 import { MessageResponse } from "./models/response/message.response";
@@ -182,6 +182,8 @@ export abstract class BaseProgram {
         this.serviceContainer.organizationApiService,
         this.serviceContainer.logout,
         this.serviceContainer.i18nService,
+        this.serviceContainer.masterPasswordUnlockService,
+        this.serviceContainer.configService,
       );
       const response = await command.run(null, null);
       if (!response.success) {
diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts
index 92674aa3dcd..14a218c7141 100644
--- a/apps/cli/src/commands/edit.command.ts
+++ b/apps/cli/src/commands/edit.command.ts
@@ -1,5 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import * as inquirer from "inquirer";
 import { firstValueFrom, map, switchMap } from "rxjs";
 
 import { UpdateCollectionRequest } from "@bitwarden/admin-console/common";
@@ -9,6 +10,7 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
 import { CollectionExport } from "@bitwarden/common/models/export/collection.export";
@@ -40,6 +42,7 @@ export class EditCommand {
     private accountService: AccountService,
     private cliRestrictedItemTypesService: CliRestrictedItemTypesService,
     private policyService: PolicyService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
   ) {}
 
   async run(
@@ -92,6 +95,10 @@ export class EditCommand {
   private async editCipher(id: string, req: CipherExport) {
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     const cipher = await this.cipherService.get(id, activeUserId);
+    const hasPremium = await firstValueFrom(
+      this.billingAccountProfileStateService.hasPremiumFromAnySource$(activeUserId),
+    );
+
     if (cipher == null) {
       return Response.notFound();
     }
@@ -102,6 +109,17 @@ export class EditCommand {
     }
     cipherView = CipherExport.toView(req, cipherView);
 
+    // When a user is editing an archived cipher and does not have premium, automatically unarchive it
+    if (cipherView.isArchived && !hasPremium) {
+      const acceptedPrompt = await this.promptForArchiveEdit();
+
+      if (!acceptedPrompt) {
+        return Response.error("Edit cancelled.");
+      }
+
+      cipherView.archivedDate = null;
+    }
+
     const isCipherRestricted =
       await this.cliRestrictedItemTypesService.isCipherRestricted(cipherView);
     if (isCipherRestricted) {
@@ -240,6 +258,43 @@ export class EditCommand {
       return Response.error(e);
     }
   }
+
+  /** Prompt the user to accept movement of their cipher back to the their vault. */
+  private async promptForArchiveEdit(): Promise<boolean> {
+    // When user has disabled interactivity or does not have the ability to prompt,
+    // automatically move the item back to the vault and inform them.
+    if (
+      process.env.BW_SERVE === "true" ||
+      process.env.BW_NOINTERACTION === "true" ||
+      !process.stdin.isTTY
+    ) {
+      CliUtils.writeLn(
+        "Archive is only available with a Premium subscription, which has ended. Your edit was saved and the item was moved back to your vault.",
+      );
+      return true;
+    }
+
+    const answer: inquirer.Answers = await inquirer.createPromptModule({
+      output: process.stderr,
+    })({
+      type: "list",
+      name: "confirm",
+      message:
+        "When you edit and save details for an archived item without a Premium subscription, it'll be moved from your archive back to your vault.",
+      choices: [
+        {
+          name: "Move now",
+          value: "confirmed",
+        },
+        {
+          name: "Cancel",
+          value: "cancel",
+        },
+      ],
+    });
+
+    return answer.confirm === "confirmed";
+  }
 }
 
 class Options {
diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts
index a994ad3117c..93e711d748f 100644
--- a/apps/cli/src/commands/get.command.ts
+++ b/apps/cli/src/commands/get.command.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { firstValueFrom, map, switchMap } from "rxjs";
+import { filter, firstValueFrom, map, switchMap } from "rxjs";
 
 import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -448,7 +448,9 @@ export class GetCommand extends DownloadCommand {
         this.collectionService.encryptedCollections$(activeUserId).pipe(getById(id)),
       );
       if (collection != null) {
-        const orgKeys = await firstValueFrom(this.keyService.activeUserOrgKeys$);
+        const orgKeys = await firstValueFrom(
+          this.keyService.orgKeys$(activeUserId).pipe(filter((orgKeys) => orgKeys != null)),
+        );
         decCollection = await collection.decrypt(
           orgKeys[collection.organizationId as OrganizationId],
           this.encryptService,
diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts
index d8b4cfcfd10..ff210cf222d 100644
--- a/apps/cli/src/commands/list.command.ts
+++ b/apps/cli/src/commands/list.command.ts
@@ -16,6 +16,7 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { EventType } from "@bitwarden/common/enums";
 import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/list.response";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
@@ -45,6 +46,7 @@ export class ListCommand {
     private accountService: AccountService,
     private keyService: KeyService,
     private cliRestrictedItemTypesService: CliRestrictedItemTypesService,
+    private cipherArchiveService: CipherArchiveService,
   ) {}
 
   async run(object: string, cmdOptions: Record<string, any>): Promise<Response> {
@@ -71,8 +73,13 @@ export class ListCommand {
     let ciphers: CipherView[];
 
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const userCanArchive = await firstValueFrom(
+      this.cipherArchiveService.userCanArchive$(activeUserId),
+    );
 
     options.trash = options.trash || false;
+    options.archived = userCanArchive && options.archived;
+
     if (options.url != null && options.url.trim() !== "") {
       ciphers = await this.cipherService.getAllDecryptedForUrl(options.url, activeUserId);
     } else {
@@ -85,14 +92,17 @@ export class ListCommand {
       options.organizationId != null
     ) {
       ciphers = ciphers.filter((c) => {
-        if (options.trash !== c.isDeleted) {
+        const matchesStateOptions = this.matchesStateOptions(c, options);
+
+        if (!matchesStateOptions) {
           return false;
         }
+
         if (options.folderId != null) {
           if (options.folderId === "notnull" && c.folderId != null) {
             return true;
           }
-          const folderId = options.folderId === "null" ? null : options.folderId;
+          const folderId = options.folderId === "null" ? undefined : options.folderId;
           if (folderId === c.folderId) {
             return true;
           }
@@ -102,7 +112,8 @@ export class ListCommand {
           if (options.organizationId === "notnull" && c.organizationId != null) {
             return true;
           }
-          const organizationId = options.organizationId === "null" ? null : options.organizationId;
+          const organizationId =
+            options.organizationId === "null" ? undefined : options.organizationId;
           if (organizationId === c.organizationId) {
             return true;
           }
@@ -131,11 +142,16 @@ export class ListCommand {
         return false;
       });
     } else if (options.search == null || options.search.trim() === "") {
-      ciphers = ciphers.filter((c) => options.trash === c.isDeleted);
+      ciphers = ciphers.filter((c) => this.matchesStateOptions(c, options));
     }
 
     if (options.search != null && options.search.trim() !== "") {
-      ciphers = this.searchService.searchCiphersBasic(ciphers, options.search, options.trash);
+      ciphers = this.searchService.searchCiphersBasic(
+        ciphers,
+        options.search,
+        options.trash,
+        options.archived,
+      );
     }
 
     ciphers = await this.cliRestrictedItemTypesService.filterRestrictedCiphers(ciphers);
@@ -287,6 +303,17 @@ export class ListCommand {
     const res = new ListResponse(organizations.map((o) => new OrganizationResponse(o)));
     return Response.success(res);
   }
+
+  /**
+   * Checks if the cipher passes the state filter options.
+   * @returns true if the cipher matches the requested state
+   */
+  private matchesStateOptions(c: CipherView, options: Options): boolean {
+    const passesTrashFilter = options.trash === c.isDeleted;
+    const passesArchivedFilter = options.archived === c.isArchived;
+
+    return passesTrashFilter && passesArchivedFilter;
+  }
 }
 
 class Options {
@@ -296,6 +323,7 @@ class Options {
   search: string;
   url: string;
   trash: boolean;
+  archived: boolean;
 
   constructor(passedOptions: Record<string, any>) {
     this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
@@ -304,5 +332,6 @@ class Options {
     this.search = passedOptions?.search;
     this.url = passedOptions?.url;
     this.trash = CliUtils.convertBooleanOption(passedOptions?.trash);
+    this.archived = CliUtils.convertBooleanOption(passedOptions?.archived);
   }
 }
diff --git a/apps/cli/src/commands/restore.command.ts b/apps/cli/src/commands/restore.command.ts
index 0b30193ffd4..d8cefdfce5d 100644
--- a/apps/cli/src/commands/restore.command.ts
+++ b/apps/cli/src/commands/restore.command.ts
@@ -2,8 +2,14 @@ import { firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { CipherId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+import { UserId } from "@bitwarden/user-core";
 
 import { Response } from "../models/response";
 
@@ -12,6 +18,8 @@ export class RestoreCommand {
     private cipherService: CipherService,
     private accountService: AccountService,
     private cipherAuthorizationService: CipherAuthorizationService,
+    private cipherArchiveService: CipherArchiveService,
+    private configService: ConfigService,
   ) {}
 
   async run(object: string, id: string): Promise<Response> {
@@ -30,10 +38,23 @@ export class RestoreCommand {
   private async restoreCipher(id: string) {
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     const cipher = await this.cipherService.get(id, activeUserId);
+    const isArchivedVaultEnabled = await firstValueFrom(
+      this.configService.getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive),
+    );
 
     if (cipher == null) {
       return Response.notFound();
     }
+
+    if (cipher.archivedDate && isArchivedVaultEnabled) {
+      return this.restoreArchivedCipher(cipher, activeUserId);
+    } else {
+      return this.restoreDeletedCipher(cipher, activeUserId);
+    }
+  }
+
+  /** Restores a cipher from the trash. */
+  private async restoreDeletedCipher(cipher: Cipher, userId: UserId) {
     if (cipher.deletedDate == null) {
       return Response.badRequest("Cipher is not in trash.");
     }
@@ -47,7 +68,17 @@ export class RestoreCommand {
     }
 
     try {
-      await this.cipherService.restoreWithServer(id, activeUserId);
+      await this.cipherService.restoreWithServer(cipher.id, userId);
+      return Response.success();
+    } catch (e) {
+      return Response.error(e);
+    }
+  }
+
+  /** Restore a cipher from the archive vault */
+  private async restoreArchivedCipher(cipher: Cipher, userId: UserId) {
+    try {
+      await this.cipherArchiveService.unarchiveWithServer(cipher.id as CipherId, userId);
       return Response.success();
     } catch (e) {
       return Response.error(e);
diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts
index c0ec37d3c9c..5bf19333f35 100644
--- a/apps/cli/src/commands/serve.command.ts
+++ b/apps/cli/src/commands/serve.command.ts
@@ -51,7 +51,7 @@ export class ServeCommand {
       .use(koaBodyParser())
       .use(koaJson({ pretty: false, param: "pretty" }));
 
-    this.serveConfigurator.configureRouter(router);
+    await this.serveConfigurator.configureRouter(router);
 
     server.use(router.routes()).use(router.allowedMethods());
 
diff --git a/apps/cli/src/key-management/cli-process-reload.service.ts b/apps/cli/src/key-management/cli-process-reload.service.ts
new file mode 100644
index 00000000000..243de7cae43
--- /dev/null
+++ b/apps/cli/src/key-management/cli-process-reload.service.ts
@@ -0,0 +1,10 @@
+import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+
+/**
+ * CLI implementation of ProcessReloadServiceAbstraction.
+ * This is NOOP since there is no effective way to process reload the CLI.
+ */
+export class CliProcessReloadService extends ProcessReloadServiceAbstraction {
+  async startProcessReload(): Promise<void> {}
+  async cancelProcessReload(): Promise<void> {}
+}
diff --git a/apps/cli/src/key-management/commands/unlock.command.spec.ts b/apps/cli/src/key-management/commands/unlock.command.spec.ts
new file mode 100644
index 00000000000..928a750dca6
--- /dev/null
+++ b/apps/cli/src/key-management/commands/unlock.command.spec.ts
@@ -0,0 +1,318 @@
+import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
+import { MasterPasswordVerificationResponse } from "@bitwarden/common/auth/types/verification";
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
+import { MasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/abstractions/master-password-unlock.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+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 { MasterKey, UserKey } from "@bitwarden/common/types/key";
+import { KeyService } from "@bitwarden/key-management";
+import { ConsoleLogService } from "@bitwarden/logging";
+import { UserId } from "@bitwarden/user-core";
+
+import { MessageResponse } from "../../models/response/message.response";
+import { I18nService } from "../../platform/services/i18n.service";
+import { ConvertToKeyConnectorCommand } from "../convert-to-key-connector.command";
+
+import { UnlockCommand } from "./unlock.command";
+
+describe("UnlockCommand", () => {
+  let command: UnlockCommand;
+
+  const accountService = mock<AccountService>();
+  const masterPasswordService = mock<InternalMasterPasswordServiceAbstraction>();
+  const keyService = mock<KeyService>();
+  const userVerificationService = mock<UserVerificationService>();
+  const cryptoFunctionService = mock<CryptoFunctionService>();
+  const logService = mock<ConsoleLogService>();
+  const keyConnectorService = mock<KeyConnectorService>();
+  const environmentService = mock<EnvironmentService>();
+  const organizationApiService = mock<OrganizationApiServiceAbstraction>();
+  const logout = jest.fn();
+  const i18nService = mock<I18nService>();
+  const masterPasswordUnlockService = mock<MasterPasswordUnlockService>();
+  const configService = mock<ConfigService>();
+
+  const mockMasterPassword = "testExample";
+  const activeAccount: Account = {
+    id: "user-id" as UserId,
+    email: "user@example.com",
+    emailVerified: true,
+    name: "User",
+  };
+  const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+  const mockSessionKey = new Uint8Array(64) as CsprngArray;
+  const b64sessionKey = Utils.fromBufferToB64(mockSessionKey);
+  const expectedSuccessMessage = new MessageResponse(
+    "Your vault is now unlocked!",
+    "\n" +
+      "To unlock your vault, set your session key to the `BW_SESSION` environment variable. ex:\n" +
+      '$ export BW_SESSION="' +
+      b64sessionKey +
+      '"\n' +
+      '> $env:BW_SESSION="' +
+      b64sessionKey +
+      '"\n\n' +
+      "You can also pass the session key to any command with the `--session` option. ex:\n" +
+      "$ bw list items --session " +
+      b64sessionKey,
+  );
+  expectedSuccessMessage.raw = b64sessionKey;
+
+  // Legacy test data
+  const mockMasterKey = new SymmetricCryptoKey(new Uint8Array(32)) as MasterKey;
+
+  beforeEach(async () => {
+    jest.clearAllMocks();
+
+    i18nService.t.mockImplementation((key: string) => key);
+    accountService.activeAccount$ = of(activeAccount);
+    keyConnectorService.convertAccountRequired$ = of(false);
+    cryptoFunctionService.randomBytes.mockResolvedValue(mockSessionKey);
+
+    command = new UnlockCommand(
+      accountService,
+      masterPasswordService,
+      keyService,
+      userVerificationService,
+      cryptoFunctionService,
+      logService,
+      keyConnectorService,
+      environmentService,
+      organizationApiService,
+      logout,
+      i18nService,
+      masterPasswordUnlockService,
+      configService,
+    );
+  });
+
+  describe("run", () => {
+    test.each([null as unknown as Account, undefined as unknown as Account])(
+      "returns error response when the active account is %s",
+      async (account) => {
+        accountService.activeAccount$ = of(account);
+
+        const response = await command.run(mockMasterPassword, {});
+
+        expect(response).not.toBeNull();
+        expect(response.success).toEqual(false);
+        expect(response.message).toEqual("No active account found");
+        expect(keyService.setUserKey).not.toHaveBeenCalled();
+      },
+    );
+
+    test.each([null as unknown as string, undefined as unknown as string, ""])(
+      "returns error response when the provided password is %s",
+      async (mockMasterPassword) => {
+        process.env.BW_NOINTERACTION = "true";
+
+        const response = await command.run(mockMasterPassword, {});
+
+        expect(response).not.toBeNull();
+        expect(response.success).toEqual(false);
+        expect(response.message).toEqual(
+          "Master password is required. Try again in interactive mode or provide a password file or environment variable.",
+        );
+        expect(keyService.setUserKey).not.toHaveBeenCalled();
+      },
+    );
+
+    describe("UnlockWithMasterPasswordUnlockData feature flag enabled", () => {
+      beforeEach(() => {
+        configService.getFeatureFlag$.mockReturnValue(of(true));
+      });
+
+      it("calls masterPasswordUnlockService successfully", async () => {
+        masterPasswordUnlockService.unlockWithMasterPassword.mockResolvedValue(mockUserKey);
+
+        const response = await command.run(mockMasterPassword, {});
+
+        expect(response).not.toBeNull();
+        expect(response.success).toEqual(true);
+        expect(response.data).toEqual(expectedSuccessMessage);
+        expect(masterPasswordUnlockService.unlockWithMasterPassword).toHaveBeenCalledWith(
+          mockMasterPassword,
+          activeAccount.id,
+        );
+        expect(keyService.setUserKey).toHaveBeenCalledWith(mockUserKey, activeAccount.id);
+      });
+
+      it("returns error response if unlockWithMasterPassword fails", async () => {
+        masterPasswordUnlockService.unlockWithMasterPassword.mockRejectedValue(
+          new Error("Unlock failed"),
+        );
+
+        const response = await command.run(mockMasterPassword, {});
+
+        expect(response).not.toBeNull();
+        expect(response.success).toEqual(false);
+        expect(response.message).toEqual("Unlock failed");
+        expect(masterPasswordUnlockService.unlockWithMasterPassword).toHaveBeenCalledWith(
+          mockMasterPassword,
+          activeAccount.id,
+        );
+        expect(keyService.setUserKey).not.toHaveBeenCalled();
+      });
+    });
+
+    describe("unlock with feature flag off", () => {
+      beforeEach(() => {
+        configService.getFeatureFlag$.mockReturnValue(of(false));
+      });
+
+      it("calls decryptUserKeyWithMasterKey successfully", async () => {
+        userVerificationService.verifyUserByMasterPassword.mockResolvedValue({
+          masterKey: mockMasterKey,
+        } as MasterPasswordVerificationResponse);
+        masterPasswordService.decryptUserKeyWithMasterKey.mockResolvedValue(mockUserKey);
+
+        const response = await command.run(mockMasterPassword, {});
+
+        expect(response).not.toBeNull();
+        expect(response.success).toEqual(true);
+        expect(response.data).toEqual(expectedSuccessMessage);
+        expect(userVerificationService.verifyUserByMasterPassword).toHaveBeenCalledWith(
+          {
+            type: VerificationType.MasterPassword,
+            secret: mockMasterPassword,
+          },
+          activeAccount.id,
+          activeAccount.email,
+        );
+        expect(masterPasswordService.decryptUserKeyWithMasterKey).toHaveBeenCalledWith(
+          mockMasterKey,
+          activeAccount.id,
+        );
+        expect(keyService.setUserKey).toHaveBeenCalledWith(mockUserKey, activeAccount.id);
+      });
+
+      it("returns error response when verifyUserByMasterPassword throws", async () => {
+        userVerificationService.verifyUserByMasterPassword.mockRejectedValue(
+          new Error("Verification failed"),
+        );
+
+        const response = await command.run(mockMasterPassword, {});
+
+        expect(response).not.toBeNull();
+        expect(response.success).toEqual(false);
+        expect(response.message).toEqual("Verification failed");
+        expect(userVerificationService.verifyUserByMasterPassword).toHaveBeenCalledWith(
+          {
+            type: VerificationType.MasterPassword,
+            secret: mockMasterPassword,
+          },
+          activeAccount.id,
+          activeAccount.email,
+        );
+        expect(masterPasswordService.decryptUserKeyWithMasterKey).not.toHaveBeenCalled();
+        expect(keyService.setUserKey).not.toHaveBeenCalled();
+      });
+    });
+
+    describe("calls convertToKeyConnectorCommand if required", () => {
+      let convertToKeyConnectorSpy: jest.SpyInstance;
+      beforeEach(() => {
+        keyConnectorService.convertAccountRequired$ = of(true);
+
+        // Feature flag on
+        masterPasswordUnlockService.unlockWithMasterPassword.mockResolvedValue(mockUserKey);
+
+        // Feature flag off
+        userVerificationService.verifyUserByMasterPassword.mockResolvedValue({
+          masterKey: mockMasterKey,
+        } as MasterPasswordVerificationResponse);
+        masterPasswordService.decryptUserKeyWithMasterKey.mockResolvedValue(mockUserKey);
+      });
+
+      test.each([true, false])("returns failure when feature flag is %s", async (flagValue) => {
+        configService.getFeatureFlag$.mockReturnValue(of(flagValue));
+
+        // Mock the ConvertToKeyConnectorCommand
+        const mockRun = jest.fn().mockResolvedValue({ success: false, message: "convert failed" });
+        convertToKeyConnectorSpy = jest
+          .spyOn(ConvertToKeyConnectorCommand.prototype, "run")
+          .mockImplementation(mockRun);
+
+        const response = await command.run(mockMasterPassword, {});
+
+        expect(response).not.toBeNull();
+        expect(response.success).toEqual(false);
+        expect(response.message).toEqual("convert failed");
+        expect(keyService.setUserKey).toHaveBeenCalledWith(mockUserKey, activeAccount.id);
+        expect(convertToKeyConnectorSpy).toHaveBeenCalled();
+
+        if (flagValue === true) {
+          expect(masterPasswordUnlockService.unlockWithMasterPassword).toHaveBeenCalledWith(
+            mockMasterPassword,
+            activeAccount.id,
+          );
+        } else {
+          expect(userVerificationService.verifyUserByMasterPassword).toHaveBeenCalledWith(
+            {
+              type: VerificationType.MasterPassword,
+              secret: mockMasterPassword,
+            },
+            activeAccount.id,
+            activeAccount.email,
+          );
+          expect(masterPasswordService.decryptUserKeyWithMasterKey).toHaveBeenCalledWith(
+            mockMasterKey,
+            activeAccount.id,
+          );
+        }
+      });
+
+      test.each([true, false])(
+        "returns expected success when feature flag is %s",
+        async (flagValue) => {
+          configService.getFeatureFlag$.mockReturnValue(of(flagValue));
+
+          // Mock the ConvertToKeyConnectorCommand
+          const mockRun = jest.fn().mockResolvedValue({ success: true });
+          const convertToKeyConnectorSpy = jest
+            .spyOn(ConvertToKeyConnectorCommand.prototype, "run")
+            .mockImplementation(mockRun);
+
+          const response = await command.run(mockMasterPassword, {});
+
+          expect(response).not.toBeNull();
+          expect(response.success).toEqual(true);
+          expect(response.data).toEqual(expectedSuccessMessage);
+          expect(keyService.setUserKey).toHaveBeenCalledWith(mockUserKey, activeAccount.id);
+          expect(convertToKeyConnectorSpy).toHaveBeenCalled();
+
+          if (flagValue === true) {
+            expect(masterPasswordUnlockService.unlockWithMasterPassword).toHaveBeenCalledWith(
+              mockMasterPassword,
+              activeAccount.id,
+            );
+          } else {
+            expect(userVerificationService.verifyUserByMasterPassword).toHaveBeenCalledWith(
+              {
+                type: VerificationType.MasterPassword,
+                secret: mockMasterPassword,
+              },
+              activeAccount.id,
+              activeAccount.email,
+            );
+            expect(masterPasswordService.decryptUserKeyWithMasterKey).toHaveBeenCalledWith(
+              mockMasterKey,
+              activeAccount.id,
+            );
+          }
+        },
+      );
+    });
+  });
+});
diff --git a/apps/cli/src/auth/commands/unlock.command.ts b/apps/cli/src/key-management/commands/unlock.command.ts
similarity index 69%
rename from apps/cli/src/auth/commands/unlock.command.ts
rename to apps/cli/src/key-management/commands/unlock.command.ts
index 812a89ed889..4ae8ce823a4 100644
--- a/apps/cli/src/auth/commands/unlock.command.ts
+++ b/apps/cli/src/key-management/commands/unlock.command.ts
@@ -1,26 +1,29 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { firstValueFrom, map } from "rxjs";
+import { firstValueFrom } from "rxjs";
 
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import { MasterPasswordVerification } from "@bitwarden/common/auth/types/verification";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
+import { MasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/abstractions/master-password-unlock.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { MasterKey } from "@bitwarden/common/types/key";
 import { KeyService } from "@bitwarden/key-management";
 
-import { ConvertToKeyConnectorCommand } from "../../key-management/convert-to-key-connector.command";
 import { Response } from "../../models/response";
 import { MessageResponse } from "../../models/response/message.response";
 import { I18nService } from "../../platform/services/i18n.service";
 import { CliUtils } from "../../utils";
+import { ConvertToKeyConnectorCommand } from "../convert-to-key-connector.command";
 
 export class UnlockCommand {
   constructor(
@@ -35,6 +38,8 @@ export class UnlockCommand {
     private organizationApiService: OrganizationApiServiceAbstraction,
     private logout: () => Promise<void>,
     private i18nService: I18nService,
+    private masterPasswordUnlockService: MasterPasswordUnlockService,
+    private configService: ConfigService,
   ) {}
 
   async run(password: string, cmdOptions: Record<string, any>) {
@@ -48,30 +53,53 @@ export class UnlockCommand {
     }
 
     await this.setNewSessionKey();
-    const [userId, email] = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((a) => [a?.id, a?.email])),
-    );
-
-    const verification = {
-      type: VerificationType.MasterPassword,
-      secret: password,
-    } as MasterPasswordVerification;
-
-    let masterKey: MasterKey;
-    try {
-      const response = await this.userVerificationService.verifyUserByMasterPassword(
-        verification,
-        userId,
-        email,
-      );
-      masterKey = response.masterKey;
-    } catch (e) {
-      // verification failure throws
-      return Response.error(e.message);
+    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+    if (activeAccount == null) {
+      return Response.error("No active account found");
     }
+    const userId = activeAccount.id;
 
-    const userKey = await this.masterPasswordService.decryptUserKeyWithMasterKey(masterKey, userId);
-    await this.keyService.setUserKey(userKey, userId);
+    if (
+      await firstValueFrom(
+        this.configService.getFeatureFlag$(FeatureFlag.UnlockWithMasterPasswordUnlockData),
+      )
+    ) {
+      try {
+        const userKey = await this.masterPasswordUnlockService.unlockWithMasterPassword(
+          password,
+          userId,
+        );
+
+        await this.keyService.setUserKey(userKey, userId);
+      } catch (e) {
+        return Response.error(e.message);
+      }
+    } else {
+      const email = activeAccount.email;
+      const verification = {
+        type: VerificationType.MasterPassword,
+        secret: password,
+      } as MasterPasswordVerification;
+
+      let masterKey: MasterKey;
+      try {
+        const response = await this.userVerificationService.verifyUserByMasterPassword(
+          verification,
+          userId,
+          email,
+        );
+        masterKey = response.masterKey;
+      } catch (e) {
+        // verification failure throws
+        return Response.error(e.message);
+      }
+
+      const userKey = await this.masterPasswordService.decryptUserKeyWithMasterKey(
+        masterKey,
+        userId,
+      );
+      await this.keyService.setUserKey(userKey, userId);
+    }
 
     if (await firstValueFrom(this.keyConnectorService.convertAccountRequired$)) {
       const convertToKeyConnectorCommand = new ConvertToKeyConnectorCommand(
diff --git a/apps/cli/src/locales/en/messages.json b/apps/cli/src/locales/en/messages.json
index 4a8c774ea42..18079bd2409 100644
--- a/apps/cli/src/locales/en/messages.json
+++ b/apps/cli/src/locales/en/messages.json
@@ -41,6 +41,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password."
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "sessionTimeout": {
     "message": "Your session has timed out. Please go back and try logging in again."
   },
diff --git a/apps/cli/src/oss-serve-configurator.ts b/apps/cli/src/oss-serve-configurator.ts
index 6ae2776eae7..bd51cf4dd91 100644
--- a/apps/cli/src/oss-serve-configurator.ts
+++ b/apps/cli/src/oss-serve-configurator.ts
@@ -5,15 +5,17 @@ import * as koaRouter from "@koa/router";
 import * as koa from "koa";
 import { firstValueFrom, map } from "rxjs";
 
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+
 import { ConfirmCommand } from "./admin-console/commands/confirm.command";
 import { ShareCommand } from "./admin-console/commands/share.command";
 import { LockCommand } from "./auth/commands/lock.command";
-import { UnlockCommand } from "./auth/commands/unlock.command";
 import { EditCommand } from "./commands/edit.command";
 import { GetCommand } from "./commands/get.command";
 import { ListCommand } from "./commands/list.command";
 import { RestoreCommand } from "./commands/restore.command";
 import { StatusCommand } from "./commands/status.command";
+import { UnlockCommand } from "./key-management/commands/unlock.command";
 import { Response } from "./models/response";
 import { FileResponse } from "./models/response/file.response";
 import { ServiceContainer } from "./service-container/service-container";
@@ -26,6 +28,7 @@ import {
   SendListCommand,
   SendRemovePasswordCommand,
 } from "./tools/send";
+import { ArchiveCommand } from "./vault/archive.command";
 import { CreateCommand } from "./vault/create.command";
 import { DeleteCommand } from "./vault/delete.command";
 import { SyncCommand } from "./vault/sync.command";
@@ -40,6 +43,7 @@ export class OssServeConfigurator {
   private statusCommand: StatusCommand;
   private syncCommand: SyncCommand;
   private deleteCommand: DeleteCommand;
+  private archiveCommand: ArchiveCommand;
   private confirmCommand: ConfirmCommand;
   private restoreCommand: RestoreCommand;
   private lockCommand: LockCommand;
@@ -81,6 +85,7 @@ export class OssServeConfigurator {
       this.serviceContainer.accountService,
       this.serviceContainer.keyService,
       this.serviceContainer.cliRestrictedItemTypesService,
+      this.serviceContainer.cipherArchiveService,
     );
     this.createCommand = new CreateCommand(
       this.serviceContainer.cipherService,
@@ -104,6 +109,7 @@ export class OssServeConfigurator {
       this.serviceContainer.accountService,
       this.serviceContainer.cliRestrictedItemTypesService,
       this.serviceContainer.policyService,
+      this.serviceContainer.billingAccountProfileStateService,
     );
     this.generateCommand = new GenerateCommand(
       this.serviceContainer.passwordGenerationService,
@@ -127,6 +133,13 @@ export class OssServeConfigurator {
       this.serviceContainer.accountService,
       this.serviceContainer.cliRestrictedItemTypesService,
     );
+    this.archiveCommand = new ArchiveCommand(
+      this.serviceContainer.cipherService,
+      this.serviceContainer.accountService,
+      this.serviceContainer.configService,
+      this.serviceContainer.cipherArchiveService,
+      this.serviceContainer.billingAccountProfileStateService,
+    );
     this.confirmCommand = new ConfirmCommand(
       this.serviceContainer.apiService,
       this.serviceContainer.keyService,
@@ -140,12 +153,17 @@ export class OssServeConfigurator {
       this.serviceContainer.cipherService,
       this.serviceContainer.accountService,
       this.serviceContainer.cipherAuthorizationService,
+      this.serviceContainer.cipherArchiveService,
+      this.serviceContainer.configService,
     );
     this.shareCommand = new ShareCommand(
       this.serviceContainer.cipherService,
       this.serviceContainer.accountService,
     );
-    this.lockCommand = new LockCommand(this.serviceContainer.vaultTimeoutService);
+    this.lockCommand = new LockCommand(
+      serviceContainer.lockService,
+      serviceContainer.accountService,
+    );
     this.unlockCommand = new UnlockCommand(
       this.serviceContainer.accountService,
       this.serviceContainer.masterPasswordService,
@@ -158,6 +176,8 @@ export class OssServeConfigurator {
       this.serviceContainer.organizationApiService,
       async () => await this.serviceContainer.logout(),
       this.serviceContainer.i18nService,
+      this.serviceContainer.masterPasswordUnlockService,
+      this.serviceContainer.configService,
     );
 
     this.sendCreateCommand = new SendCreateCommand(
@@ -196,10 +216,11 @@ export class OssServeConfigurator {
       this.serviceContainer.sendService,
       this.serviceContainer.sendApiService,
       this.serviceContainer.environmentService,
+      this.serviceContainer.accountService,
     );
   }
 
-  configureRouter(router: koaRouter) {
+  async configureRouter(router: koaRouter) {
     router.get("/generate", async (ctx, next) => {
       const response = await this.generateCommand.run(ctx.request.query);
       this.processResponse(ctx.response, response);
@@ -401,6 +422,23 @@ export class OssServeConfigurator {
       this.processResponse(ctx.response, response);
       await next();
     });
+
+    const isArchivedEnabled = await this.serviceContainer.configService.getFeatureFlag(
+      FeatureFlag.PM19148_InnovationArchive,
+    );
+
+    if (isArchivedEnabled) {
+      router.post("/archive/:object/:id", async (ctx, next) => {
+        if (await this.errorIfLocked(ctx.response)) {
+          await next();
+          return;
+        }
+        let response: Response = null;
+        response = await this.archiveCommand.run(ctx.params.object, ctx.params.id);
+        this.processResponse(ctx.response, response);
+        await next();
+      });
+    }
   }
 
   protected processResponse(res: koa.Response, commandResponse: Response) {
diff --git a/apps/cli/src/platform/services/cli-platform-utils.service.ts b/apps/cli/src/platform/services/cli-platform-utils.service.ts
index 27f8e5268bd..acd2009a6d9 100644
--- a/apps/cli/src/platform/services/cli-platform-utils.service.ts
+++ b/apps/cli/src/platform/services/cli-platform-utils.service.ts
@@ -152,4 +152,8 @@ export class CliPlatformUtilsService implements PlatformUtilsService {
   getAutofillKeyboardShortcut(): Promise<string> {
     return null;
   }
+
+  async packageType(): Promise<string | null> {
+    return null;
+  }
 }
diff --git a/apps/cli/src/platform/services/cli-system.service.ts b/apps/cli/src/platform/services/cli-system.service.ts
new file mode 100644
index 00000000000..5f647a0f88c
--- /dev/null
+++ b/apps/cli/src/platform/services/cli-system.service.ts
@@ -0,0 +1,10 @@
+import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
+
+/**
+ * CLI implementation of SystemService.
+ * The implementation is NOOP since these functions are meant for GUI clients.
+ */
+export class CliSystemService extends SystemService {
+  async clearClipboard(clipboardValue: string, timeoutMs?: number): Promise<void> {}
+  async clearPendingClipboard(): Promise<any> {}
+}
diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts
index 4d541739aab..a5f12b34035 100644
--- a/apps/cli/src/program.ts
+++ b/apps/cli/src/program.ts
@@ -5,16 +5,17 @@ import { program, Command, OptionValues } from "commander";
 import { firstValueFrom, of, switchMap } from "rxjs";
 
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { LockCommand } from "./auth/commands/lock.command";
 import { LoginCommand } from "./auth/commands/login.command";
 import { LogoutCommand } from "./auth/commands/logout.command";
-import { UnlockCommand } from "./auth/commands/unlock.command";
 import { BaseProgram } from "./base-program";
 import { CompletionCommand } from "./commands/completion.command";
 import { EncodeCommand } from "./commands/encode.command";
 import { StatusCommand } from "./commands/status.command";
 import { UpdateCommand } from "./commands/update.command";
+import { UnlockCommand } from "./key-management/commands/unlock.command";
 import { Response } from "./models/response";
 import { MessageResponse } from "./models/response/message.response";
 import { ConfigCommand } from "./platform/commands/config.command";
@@ -26,6 +27,10 @@ const writeLn = CliUtils.writeLn;
 
 export class Program extends BaseProgram {
   async register() {
+    const isArchivedEnabled = await this.serviceContainer.configService.getFeatureFlag(
+      FeatureFlag.PM19148_InnovationArchive,
+    );
+
     program
       .option("--pretty", "Format output. JSON is tabbed with two spaces.")
       .option("--raw", "Return raw output instead of a descriptive message.")
@@ -94,6 +99,9 @@ export class Program extends BaseProgram {
         "    bw edit folder c7c7b60b-9c61-40f2-8ccd-36c49595ed72 eyJuYW1lIjoiTXkgRm9sZGVyMiJ9Cg==",
       );
       writeLn("    bw delete item 99ee88d2-6046-4ea7-92c2-acac464b1412");
+      if (isArchivedEnabled) {
+        writeLn("    bw archive item 99ee88d2-6046-4ea7-92c2-acac464b1412");
+      }
       writeLn("    bw generate -lusn --length 18");
       writeLn("    bw config server https://bitwarden.example.com");
       writeLn("    bw send -f ./file.ext");
@@ -167,7 +175,7 @@ export class Program extends BaseProgram {
           const command = new LoginCommand(
             this.serviceContainer.loginStrategyService,
             this.serviceContainer.authService,
-            this.serviceContainer.apiService,
+            this.serviceContainer.twoFactorApiService,
             this.serviceContainer.masterPasswordApiService,
             this.serviceContainer.cryptoFunctionService,
             this.serviceContainer.environmentService,
@@ -242,7 +250,10 @@ export class Program extends BaseProgram {
           return;
         }
 
-        const command = new LockCommand(this.serviceContainer.vaultTimeoutService);
+        const command = new LockCommand(
+          this.serviceContainer.lockService,
+          this.serviceContainer.accountService,
+        );
         const response = await command.run();
         this.processResponse(response);
       });
@@ -295,6 +306,8 @@ export class Program extends BaseProgram {
             this.serviceContainer.organizationApiService,
             async () => await this.serviceContainer.logout(),
             this.serviceContainer.i18nService,
+            this.serviceContainer.masterPasswordUnlockService,
+            this.serviceContainer.configService,
           );
           const response = await command.run(password, cmd);
           this.processResponse(response);
diff --git a/apps/cli/src/register-oss-programs.ts b/apps/cli/src/register-oss-programs.ts
index 1fc1f0119d2..71d7aaa0d52 100644
--- a/apps/cli/src/register-oss-programs.ts
+++ b/apps/cli/src/register-oss-programs.ts
@@ -15,7 +15,7 @@ export async function registerOssPrograms(serviceContainer: ServiceContainer) {
   await program.register();
 
   const vaultProgram = new VaultProgram(serviceContainer);
-  vaultProgram.register();
+  await vaultProgram.register();
 
   const sendProgram = new SendProgram(serviceContainer);
   sendProgram.register();
diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index 7b148b2a3d5..122dd6ea052 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -20,6 +20,9 @@ import {
   SsoUrlService,
   AuthRequestApiServiceAbstraction,
   DefaultAuthRequestApiService,
+  DefaultLockService,
+  DefaultLogoutService,
+  LockService,
 } from "@bitwarden/auth/common";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
@@ -46,9 +49,14 @@ import { DefaultActiveUserAccessor } from "@bitwarden/common/auth/services/defau
 import { DevicesApiServiceImplementation } from "@bitwarden/common/auth/services/devices-api.service.implementation";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/services/master-password/master-password-api.service.implementation";
 import { TokenService } from "@bitwarden/common/auth/services/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service";
 import { UserVerificationApiService } from "@bitwarden/common/auth/services/user-verification/user-verification-api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
+import {
+  DefaultTwoFactorService,
+  TwoFactorService,
+  TwoFactorApiService,
+  DefaultTwoFactorApiService,
+} from "@bitwarden/common/auth/two-factor";
 import {
   AutofillSettingsService,
   AutofillSettingsServiceAbstraction,
@@ -69,10 +77,15 @@ import { EncryptServiceImplementation } from "@bitwarden/common/key-management/c
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { DeviceTrustService } from "@bitwarden/common/key-management/device-trust/services/device-trust.service.implementation";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/services/key-connector.service";
+import { MasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/abstractions/master-password-unlock.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { DefaultMasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/services/default-master-password-unlock.service";
 import { MasterPasswordService } from "@bitwarden/common/key-management/master-password/services/master-password.service";
+import { PinStateService } from "@bitwarden/common/key-management/pin/pin-state.service.implementation";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { PinService } from "@bitwarden/common/key-management/pin/pin.service.implementation";
+import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
+import { DefaultSecurityStateService } from "@bitwarden/common/key-management/security-state/services/security-state.service";
 import {
   DefaultVaultTimeoutService,
   DefaultVaultTimeoutSettingsService,
@@ -88,7 +101,7 @@ import {
 } from "@bitwarden/common/platform/abstractions/environment.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
-import { KeySuffixOptions, LogLevelType } from "@bitwarden/common/platform/enums";
+import { LogLevelType } from "@bitwarden/common/platform/enums";
 import { MessageSender } from "@bitwarden/common/platform/messaging";
 import {
   TaskSchedulerService,
@@ -125,6 +138,7 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
 import { SendStateProvider } from "@bitwarden/common/tools/send/services/send-state.provider";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service";
 import { UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherEncryptionService } from "@bitwarden/common/vault/abstractions/cipher-encryption.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import {
@@ -132,6 +146,7 @@ import {
   DefaultCipherAuthorizationService,
 } from "@bitwarden/common/vault/services/cipher-authorization.service";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
+import { DefaultCipherArchiveService } from "@bitwarden/common/vault/services/default-cipher-archive.service";
 import { DefaultCipherEncryptionService } from "@bitwarden/common/vault/services/default-cipher-encryption.service";
 import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
@@ -144,8 +159,10 @@ import {
   PasswordGenerationServiceAbstraction,
 } from "@bitwarden/generator-legacy";
 import {
+  DefaultImportMetadataService,
   ImportApiService,
   ImportApiServiceAbstraction,
+  ImportMetadataServiceAbstraction,
   ImportService,
   ImportServiceAbstraction,
 } from "@bitwarden/importer-core";
@@ -189,9 +206,11 @@ import {
 } from "@bitwarden/vault-export-core";
 
 import { CliBiometricsService } from "../key-management/cli-biometrics-service";
+import { CliProcessReloadService } from "../key-management/cli-process-reload.service";
 import { flagEnabled } from "../platform/flags";
 import { CliPlatformUtilsService } from "../platform/services/cli-platform-utils.service";
 import { CliSdkLoadService } from "../platform/services/cli-sdk-load.service";
+import { CliSystemService } from "../platform/services/cli-system.service";
 import { ConsoleLogService } from "../platform/services/console-log.service";
 import { I18nService } from "../platform/services/i18n.service";
 import { LowdbStorageService } from "../platform/services/lowdb-storage.service";
@@ -224,6 +243,7 @@ export class ServiceContainer {
   tokenService: TokenService;
   appIdService: AppIdService;
   apiService: NodeApiService;
+  twoFactorApiService: TwoFactorApiService;
   hibpApiService: HibpApiService;
   environmentService: EnvironmentService;
   cipherService: CipherService;
@@ -244,6 +264,7 @@ export class ServiceContainer {
   auditService: AuditService;
   importService: ImportServiceAbstraction;
   importApiService: ImportApiServiceAbstraction;
+  importMetadataService: ImportMetadataServiceAbstraction;
   exportService: VaultExportServiceAbstraction;
   vaultExportApiService: VaultExportApiService;
   individualExportService: IndividualVaultExportServiceAbstraction;
@@ -303,6 +324,10 @@ export class ServiceContainer {
   cipherEncryptionService: CipherEncryptionService;
   restrictedItemTypesService: RestrictedItemTypesService;
   cliRestrictedItemTypesService: CliRestrictedItemTypesService;
+  securityStateService: SecurityStateService;
+  masterPasswordUnlockService: MasterPasswordUnlockService;
+  cipherArchiveService: CipherArchiveService;
+  lockService: LockService;
 
   constructor() {
     let p = null;
@@ -403,6 +428,8 @@ export class ServiceContainer {
       this.derivedStateProvider,
     );
 
+    this.securityStateService = new DefaultSecurityStateService(this.stateProvider);
+
     this.environmentService = new DefaultEnvironmentService(
       this.stateProvider,
       this.accountService,
@@ -438,26 +465,13 @@ export class ServiceContainer {
     this.kdfConfigService = new DefaultKdfConfigService(this.stateProvider);
     this.masterPasswordService = new MasterPasswordService(
       this.stateProvider,
-      this.stateService,
       this.keyGenerationService,
-      this.encryptService,
       this.logService,
       this.cryptoFunctionService,
       this.accountService,
     );
 
-    this.pinService = new PinService(
-      this.accountService,
-      this.cryptoFunctionService,
-      this.encryptService,
-      this.kdfConfigService,
-      this.keyGenerationService,
-      this.logService,
-      this.stateProvider,
-    );
-
     this.keyService = new KeyService(
-      this.pinService,
       this.masterPasswordService,
       this.keyGenerationService,
       this.cryptoFunctionService,
@@ -470,6 +484,24 @@ export class ServiceContainer {
       this.kdfConfigService,
     );
 
+    const pinStateService = new PinStateService(this.stateProvider);
+    this.pinService = new PinService(
+      this.accountService,
+      this.encryptService,
+      this.kdfConfigService,
+      this.keyGenerationService,
+      this.logService,
+      this.keyService,
+      this.sdkService,
+      pinStateService,
+    );
+
+    this.masterPasswordUnlockService = new DefaultMasterPasswordUnlockService(
+      this.masterPasswordService,
+      this.keyService,
+      this.logService,
+    );
+
     this.appIdService = new AppIdService(this.storageService, this.logService);
 
     const customUserAgent =
@@ -480,7 +512,9 @@ export class ServiceContainer {
       ")";
 
     this.biometricStateService = new DefaultBiometricStateService(this.stateProvider);
-    this.userDecryptionOptionsService = new UserDecryptionOptionsService(this.stateProvider);
+    this.userDecryptionOptionsService = new UserDecryptionOptionsService(
+      this.singleUserStateProvider,
+    );
     this.ssoUrlService = new SsoUrlService();
 
     this.organizationService = new DefaultOrganizationService(this.stateProvider);
@@ -488,7 +522,7 @@ export class ServiceContainer {
 
     this.vaultTimeoutSettingsService = new DefaultVaultTimeoutSettingsService(
       this.accountService,
-      this.pinService,
+      pinStateService,
       this.userDecryptionOptionsService,
       this.keyService,
       this.tokenService,
@@ -520,6 +554,8 @@ export class ServiceContainer {
 
     this.configApiService = new ConfigApiService(this.apiService);
 
+    this.twoFactorApiService = new DefaultTwoFactorApiService(this.apiService);
+
     this.authService = new AuthService(
       this.accountService,
       this.messagingService,
@@ -537,13 +573,18 @@ export class ServiceContainer {
       this.authService,
     );
 
-    this.domainSettingsService = new DefaultDomainSettingsService(this.stateProvider);
+    this.domainSettingsService = new DefaultDomainSettingsService(
+      this.stateProvider,
+      this.policyService,
+      this.accountService,
+    );
 
     this.fileUploadService = new FileUploadService(this.logService, this.apiService);
 
     this.sendStateProvider = new SendStateProvider(this.stateProvider);
 
     this.sendService = new SendService(
+      this.accountService,
       this.keyService,
       this.i18nService,
       this.keyGenerationService,
@@ -592,10 +633,11 @@ export class ServiceContainer {
       this.stateProvider,
     );
 
-    this.twoFactorService = new TwoFactorService(
+    this.twoFactorService = new DefaultTwoFactorService(
       this.i18nService,
       this.platformUtilsService,
       this.globalStateProvider,
+      this.twoFactorApiService,
     );
 
     const sdkClientFactory = flagEnabled("sdk")
@@ -609,6 +651,8 @@ export class ServiceContainer {
       this.accountService,
       this.kdfConfigService,
       this.keyService,
+      this.securityStateService,
+      this.apiService,
       this.stateProvider,
       this.configService,
       customUserAgent,
@@ -634,6 +678,7 @@ export class ServiceContainer {
       this.apiService,
       this.stateProvider,
       this.authRequestApiService,
+      this.accountService,
     );
 
     this.billingAccountProfileStateService = new DefaultBillingAccountProfileStateService(
@@ -659,6 +704,7 @@ export class ServiceContainer {
       this.userDecryptionOptionsService,
       this.logService,
       this.configService,
+      this.accountService,
     );
 
     this.loginStrategyService = new LoginStrategyService(
@@ -730,6 +776,13 @@ export class ServiceContainer {
       this.messagingService,
     );
 
+    this.cipherArchiveService = new DefaultCipherArchiveService(
+      this.cipherService,
+      this.apiService,
+      this.billingAccountProfileStateService,
+      this.configService,
+    );
+
     this.folderService = new FolderService(
       this.keyService,
       this.encryptService,
@@ -740,9 +793,6 @@ export class ServiceContainer {
 
     this.folderApiService = new FolderApiService(this.folderService, this.apiService);
 
-    const lockedCallback = async (userId: UserId) =>
-      await this.keyService.clearStoredUserKey(KeySuffixOptions.Auto, userId);
-
     this.userVerificationApiService = new UserVerificationApiService(this.apiService);
 
     this.userVerificationService = new UserVerificationService(
@@ -758,25 +808,35 @@ export class ServiceContainer {
     );
 
     const biometricService = new CliBiometricsService();
+    const logoutService = new DefaultLogoutService(this.messagingService);
+    const processReloadService = new CliProcessReloadService();
+    const systemService = new CliSystemService();
+    this.lockService = new DefaultLockService(
+      this.accountService,
+      biometricService,
+      this.vaultTimeoutSettingsService,
+      logoutService,
+      this.messagingService,
+      this.searchService,
+      this.folderService,
+      this.masterPasswordService,
+      this.stateEventRunnerService,
+      this.cipherService,
+      this.authService,
+      systemService,
+      processReloadService,
+      this.logService,
+      this.keyService,
+    );
 
     this.vaultTimeoutService = new DefaultVaultTimeoutService(
       this.accountService,
-      this.masterPasswordService,
-      this.cipherService,
-      this.folderService,
-      this.collectionService,
       this.platformUtilsService,
-      this.messagingService,
-      this.searchService,
-      this.stateService,
-      this.tokenService,
       this.authService,
       this.vaultTimeoutSettingsService,
-      this.stateEventRunnerService,
       this.taskSchedulerService,
       this.logService,
-      biometricService,
-      lockedCallback,
+      this.lockService,
       undefined,
     );
 
@@ -807,12 +867,26 @@ export class ServiceContainer {
       this.tokenService,
       this.authService,
       this.stateProvider,
+      this.securityStateService,
+      this.kdfConfigService,
     );
 
     this.totpService = new TotpService(this.sdkService);
 
     this.importApiService = new ImportApiService(this.apiService);
 
+    this.importMetadataService = new DefaultImportMetadataService(
+      createSystemServiceProvider(
+        new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
+        this.stateProvider,
+        this.policyService,
+        buildExtensionRegistry(),
+        this.logService,
+        this.platformUtilsService,
+        this.configService,
+      ),
+    );
+
     this.importService = new ImportService(
       this.cipherService,
       this.folderService,
@@ -824,15 +898,6 @@ export class ServiceContainer {
       this.pinService,
       this.accountService,
       this.restrictedItemTypesService,
-      createSystemServiceProvider(
-        new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
-        this.stateProvider,
-        this.policyService,
-        buildExtensionRegistry(),
-        this.logService,
-        this.platformUtilsService,
-        this.configService,
-      ),
     );
 
     this.individualExportService = new IndividualVaultExportService(
@@ -917,7 +982,6 @@ export class ServiceContainer {
       this.eventUploadService.uploadEvents(userId as UserId),
       this.keyService.clearKeys(userId),
       this.cipherService.clear(userId),
-      // ! DO NOT REMOVE folderService.clear ! For more information see PM-25660
       this.folderService.clear(userId),
     ]);
 
@@ -943,6 +1007,7 @@ export class ServiceContainer {
     this.containerService.attachToGlobal(global);
     await this.i18nService.init();
     this.twoFactorService.init();
+    this.encryptService.init(this.configService);
 
     // If a user has a BW_SESSION key stored in their env (not process.env.BW_SESSION),
     // this should set the user key to unlock the vault on init.
diff --git a/apps/cli/src/tools/send/commands/create.command.ts b/apps/cli/src/tools/send/commands/create.command.ts
index d4f544d39b7..7803f6f94d4 100644
--- a/apps/cli/src/tools/send/commands/create.command.ts
+++ b/apps/cli/src/tools/send/commands/create.command.ts
@@ -6,6 +6,7 @@ import * as path from "path";
 import { firstValueFrom, switchMap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
@@ -142,7 +143,8 @@ export class SendCreateCommand {
 
       await this.sendApiService.save([encSend, fileData]);
       const newSend = await this.sendService.getFromState(encSend.id);
-      const decSend = await newSend.decrypt();
+      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+      const decSend = await newSend.decrypt(activeUserId);
       const env = await firstValueFrom(this.environmentService.environment$);
       const res = new SendResponse(decSend, env.getWebVaultUrl());
       return Response.success(res);
diff --git a/apps/cli/src/tools/send/commands/edit.command.ts b/apps/cli/src/tools/send/commands/edit.command.ts
index 09f89041cc5..bf53c8a5cb9 100644
--- a/apps/cli/src/tools/send/commands/edit.command.ts
+++ b/apps/cli/src/tools/send/commands/edit.command.ts
@@ -3,6 +3,7 @@
 import { firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
@@ -83,7 +84,8 @@ export class SendEditCommand {
       return Response.error("Premium status is required to use this feature.");
     }
 
-    let sendView = await send.decrypt();
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    let sendView = await send.decrypt(activeUserId);
     sendView = SendResponse.toView(req, sendView);
 
     try {
diff --git a/apps/cli/src/tools/send/commands/get.command.ts b/apps/cli/src/tools/send/commands/get.command.ts
index 2d6cc93c781..d5248733490 100644
--- a/apps/cli/src/tools/send/commands/get.command.ts
+++ b/apps/cli/src/tools/send/commands/get.command.ts
@@ -12,6 +12,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
+import { isGuid } from "@bitwarden/guid";
 
 import { DownloadCommand } from "../../../commands/download.command";
 import { Response } from "../../../models/response";
@@ -74,13 +75,13 @@ export class SendGetCommand extends DownloadCommand {
   }
 
   private async getSendView(id: string): Promise<SendView | SendView[]> {
-    if (Utils.isGuid(id)) {
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    if (isGuid(id)) {
       const send = await this.sendService.getFromState(id);
       if (send != null) {
-        return await send.decrypt();
+        return await send.decrypt(activeUserId);
       }
     } else if (id.trim() !== "") {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
       let sends = await this.sendService.getAllDecryptedFromState(activeUserId);
       sends = this.searchService.searchSends(sends, id);
       if (sends.length > 1) {
diff --git a/apps/cli/src/tools/send/commands/remove-password.command.ts b/apps/cli/src/tools/send/commands/remove-password.command.ts
index 4f7add366be..74676d84a77 100644
--- a/apps/cli/src/tools/send/commands/remove-password.command.ts
+++ b/apps/cli/src/tools/send/commands/remove-password.command.ts
@@ -2,6 +2,8 @@
 // @ts-strict-ignore
 import { firstValueFrom } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { SendService } from "@bitwarden/common/tools/send/services//send.service.abstraction";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
@@ -14,6 +16,7 @@ export class SendRemovePasswordCommand {
     private sendService: SendService,
     private sendApiService: SendApiService,
     private environmentService: EnvironmentService,
+    private accountService: AccountService,
   ) {}
 
   async run(id: string) {
@@ -21,7 +24,8 @@ export class SendRemovePasswordCommand {
       await this.sendApiService.removePassword(id);
 
       const updatedSend = await firstValueFrom(this.sendService.get$(id));
-      const decSend = await updatedSend.decrypt();
+      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+      const decSend = await updatedSend.decrypt(activeUserId);
       const env = await firstValueFrom(this.environmentService.environment$);
       const webVaultUrl = env.getWebVaultUrl();
       const res = new SendResponse(decSend, webVaultUrl);
diff --git a/apps/cli/src/tools/send/send.program.ts b/apps/cli/src/tools/send/send.program.ts
index 2ea73f8c5c8..33bf4518ccd 100644
--- a/apps/cli/src/tools/send/send.program.ts
+++ b/apps/cli/src/tools/send/send.program.ts
@@ -297,6 +297,7 @@ export class SendProgram extends BaseProgram {
           this.serviceContainer.sendService,
           this.serviceContainer.sendApiService,
           this.serviceContainer.environmentService,
+          this.serviceContainer.accountService,
         );
         const response = await cmd.run(id);
         this.processResponse(response);
@@ -307,7 +308,7 @@ export class SendProgram extends BaseProgram {
     let sendFile = null;
     let sendText = null;
     let name = Utils.newGuid();
-    let type = SendType.Text;
+    let type: SendType = SendType.Text;
     if (options.file != null) {
       data = path.resolve(data);
       if (!fs.existsSync(data)) {
diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts
index 5b35f6b0499..21f87feab00 100644
--- a/apps/cli/src/vault.program.ts
+++ b/apps/cli/src/vault.program.ts
@@ -2,6 +2,8 @@
 // @ts-strict-ignore
 import { program, Command } from "commander";
 
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+
 import { ConfirmCommand } from "./admin-console/commands/confirm.command";
 import { ShareCommand } from "./admin-console/commands/share.command";
 import { BaseProgram } from "./base-program";
@@ -13,25 +15,34 @@ import { Response } from "./models/response";
 import { ExportCommand } from "./tools/export.command";
 import { ImportCommand } from "./tools/import.command";
 import { CliUtils } from "./utils";
+import { ArchiveCommand } from "./vault/archive.command";
 import { CreateCommand } from "./vault/create.command";
 import { DeleteCommand } from "./vault/delete.command";
 
 const writeLn = CliUtils.writeLn;
 
 export class VaultProgram extends BaseProgram {
-  register() {
+  async register() {
+    const isArchivedEnabled = await this.serviceContainer.configService.getFeatureFlag(
+      FeatureFlag.PM19148_InnovationArchive,
+    );
+
     program
-      .addCommand(this.listCommand())
+      .addCommand(this.listCommand(isArchivedEnabled))
       .addCommand(this.getCommand())
       .addCommand(this.createCommand())
       .addCommand(this.editCommand())
       .addCommand(this.deleteCommand())
-      .addCommand(this.restoreCommand())
+      .addCommand(this.restoreCommand(isArchivedEnabled))
       .addCommand(this.shareCommand("move", false))
       .addCommand(this.confirmCommand())
       .addCommand(this.importCommand())
       .addCommand(this.exportCommand())
       .addCommand(this.shareCommand("share", true));
+
+    if (isArchivedEnabled) {
+      program.addCommand(this.archiveCommand());
+    }
   }
 
   private validateObject(requestedObject: string, validObjects: string[]): boolean {
@@ -42,7 +53,7 @@ export class VaultProgram extends BaseProgram {
         Response.badRequest(
           'Unknown object "' +
             requestedObject +
-            '". Allowed objects are ' +
+            '". Allowed objects are: ' +
             validObjects.join(", ") +
             ".",
         ),
@@ -51,7 +62,7 @@ export class VaultProgram extends BaseProgram {
     return success;
   }
 
-  private listCommand(): Command {
+  private listCommand(isArchivedEnabled: boolean): Command {
     const listObjects = [
       "items",
       "folders",
@@ -61,7 +72,7 @@ export class VaultProgram extends BaseProgram {
       "organizations",
     ];
 
-    return new Command("list")
+    const command = new Command("list")
       .argument("<object>", "Valid objects are: " + listObjects.join(", "))
       .description("List an array of objects from the vault.")
       .option("--search <search>", "Perform a search on the listed objects.")
@@ -94,6 +105,9 @@ export class VaultProgram extends BaseProgram {
           "    bw list items --folderid 60556c31-e649-4b5d-8daf-fc1c391a1bf2 --organizationid notnull",
         );
         writeLn("    bw list items --trash");
+        if (isArchivedEnabled) {
+          writeLn("    bw list items --archived");
+        }
         writeLn("    bw list folders --search email");
         writeLn("    bw list org-members --organizationid 60556c31-e649-4b5d-8daf-fc1c391a1bf2");
         writeLn("", true);
@@ -116,11 +130,18 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.accountService,
           this.serviceContainer.keyService,
           this.serviceContainer.cliRestrictedItemTypesService,
+          this.serviceContainer.cipherArchiveService,
         );
         const response = await command.run(object, cmd);
 
         this.processResponse(response);
       });
+
+    if (isArchivedEnabled) {
+      command.option("--archived", "Filter items that are archived.");
+    }
+
+    return command;
   }
 
   private getCommand(): Command {
@@ -286,6 +307,7 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.accountService,
           this.serviceContainer.cliRestrictedItemTypesService,
           this.serviceContainer.policyService,
+          this.serviceContainer.billingAccountProfileStateService,
         );
         const response = await command.run(object, id, encodedJson, cmd);
         this.processResponse(response);
@@ -336,12 +358,41 @@ export class VaultProgram extends BaseProgram {
       });
   }
 
-  private restoreCommand(): Command {
+  private archiveCommand(): Command {
+    const archiveObjects = ["item"];
+    return new Command("archive")
+      .argument("<object>", "Valid objects are: " + archiveObjects.join(", "))
+      .argument("<id>", "Object's globally unique `id`.")
+      .description("Archive an object from the vault.")
+      .on("--help", () => {
+        writeLn("\n  Examples:");
+        writeLn("");
+        writeLn("    bw archive item 7063feab-4b10-472e-b64c-785e2b870b92");
+        writeLn("", true);
+      })
+      .action(async (object, id) => {
+        if (!this.validateObject(object, archiveObjects)) {
+          return;
+        }
+
+        await this.exitIfLocked();
+        const command = new ArchiveCommand(
+          this.serviceContainer.cipherService,
+          this.serviceContainer.accountService,
+          this.serviceContainer.configService,
+          this.serviceContainer.cipherArchiveService,
+          this.serviceContainer.billingAccountProfileStateService,
+        );
+        const response = await command.run(object, id);
+        this.processResponse(response);
+      });
+  }
+
+  private restoreCommand(isArchivedEnabled: boolean): Command {
     const restoreObjects = ["item"];
-    return new Command("restore")
+    const command = new Command("restore")
       .argument("<object>", "Valid objects are: " + restoreObjects.join(", "))
       .argument("<id>", "Object's globally unique `id`.")
-      .description("Restores an object from the trash.")
       .on("--help", () => {
         writeLn("\n  Examples:");
         writeLn("");
@@ -358,10 +409,20 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.cipherService,
           this.serviceContainer.accountService,
           this.serviceContainer.cipherAuthorizationService,
+          this.serviceContainer.cipherArchiveService,
+          this.serviceContainer.configService,
         );
         const response = await command.run(object, id);
         this.processResponse(response);
       });
+
+    if (isArchivedEnabled) {
+      command.description("Restores an object from the trash or archive.");
+    } else {
+      command.description("Restores an object from the trash.");
+    }
+
+    return command;
   }
 
   private shareCommand(commandName: string, deprecated: boolean): Command {
diff --git a/apps/cli/src/vault/archive.command.ts b/apps/cli/src/vault/archive.command.ts
new file mode 100644
index 00000000000..5ced2282c6d
--- /dev/null
+++ b/apps/cli/src/vault/archive.command.ts
@@ -0,0 +1,109 @@
+import { firstValueFrom } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { BillingAccountProfileStateService } 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 { CipherId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { CipherViewLikeUtils } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+import { UserId } from "@bitwarden/user-core";
+
+import { Response } from "../models/response";
+
+export class ArchiveCommand {
+  constructor(
+    private cipherService: CipherService,
+    private accountService: AccountService,
+    private configService: ConfigService,
+    private cipherArchiveService: CipherArchiveService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
+  ) {}
+
+  async run(object: string, id: string): Promise<Response> {
+    const featureFlagEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM19148_InnovationArchive,
+    );
+
+    if (!featureFlagEnabled) {
+      return Response.notFound();
+    }
+
+    if (id != null) {
+      id = id.toLowerCase();
+    }
+
+    const normalizedObject = object.toLowerCase();
+
+    if (normalizedObject === "item") {
+      return this.archiveCipher(id);
+    }
+
+    return Response.badRequest("Unknown object.");
+  }
+
+  private async archiveCipher(cipherId: string) {
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const cipher = await this.cipherService.get(cipherId, activeUserId);
+
+    if (cipher == null) {
+      return Response.notFound();
+    }
+
+    const cipherView = await this.cipherService.decrypt(cipher, activeUserId);
+
+    const { canArchive, errorMessage } = await this.userCanArchiveCipher(cipherView, activeUserId);
+
+    if (!canArchive) {
+      return Response.error(errorMessage);
+    }
+
+    try {
+      await this.cipherArchiveService.archiveWithServer(cipherView.id as CipherId, activeUserId);
+      return Response.success();
+    } catch (e) {
+      return Response.error(e);
+    }
+  }
+
+  /**
+   * Determines if the user can archive the given cipher.
+   * When the user cannot archive the cipher, an appropriate error message is provided.
+   */
+  private async userCanArchiveCipher(
+    cipher: CipherView,
+    userId: UserId,
+  ): Promise<
+    { canArchive: true; errorMessage?: never } | { canArchive: false; errorMessage: string }
+  > {
+    const hasPremiumFromAnySource = await firstValueFrom(
+      this.billingAccountProfileStateService.hasPremiumFromAnySource$(userId),
+    );
+
+    switch (true) {
+      case !hasPremiumFromAnySource: {
+        return {
+          canArchive: false,
+          errorMessage: "Premium status is required to use this feature.",
+        };
+      }
+      case CipherViewLikeUtils.isArchived(cipher): {
+        return { canArchive: false, errorMessage: "Item is already archived." };
+      }
+      case CipherViewLikeUtils.isDeleted(cipher): {
+        return {
+          canArchive: false,
+          errorMessage: "Item is in the trash, the item must be restored before archiving.",
+        };
+      }
+      case cipher.organizationId != null: {
+        return { canArchive: false, errorMessage: "Cannot archive items in an organization." };
+      }
+      default:
+        return { canArchive: true };
+    }
+  }
+}
diff --git a/apps/cli/src/vault/create.command.ts b/apps/cli/src/vault/create.command.ts
index 0892bb42214..5602c593942 100644
--- a/apps/cli/src/vault/create.command.ts
+++ b/apps/cli/src/vault/create.command.ts
@@ -20,6 +20,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { Folder } from "@bitwarden/common/vault/models/domain/folder";
 import { KeyService } from "@bitwarden/key-management";
 
 import { OrganizationCollectionRequest } from "../admin-console/models/request/organization-collection.request";
@@ -91,18 +92,18 @@ export class CreateCommand {
   }
 
   private async createCipher(req: CipherExport) {
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-
-    const cipherView = CipherExport.toView(req);
-    const isCipherTypeRestricted =
-      await this.cliRestrictedItemTypesService.isCipherRestricted(cipherView);
-
-    if (isCipherTypeRestricted) {
-      return Response.error("Creating this item type is restricted by organizational policy.");
-    }
-
-    const cipher = await this.cipherService.encrypt(CipherExport.toView(req), activeUserId);
     try {
+      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+      const cipherView = CipherExport.toView(req);
+      const isCipherTypeRestricted =
+        await this.cliRestrictedItemTypesService.isCipherRestricted(cipherView);
+
+      if (isCipherTypeRestricted) {
+        return Response.error("Creating this item type is restricted by organizational policy.");
+      }
+
+      const cipher = await this.cipherService.encrypt(CipherExport.toView(req), activeUserId);
       const newCipher = await this.cipherService.createWithServer(cipher);
       const decCipher = await this.cipherService.decrypt(newCipher, activeUserId);
       const res = new CipherResponse(decCipher);
@@ -183,8 +184,8 @@ export class CreateCommand {
     const userKey = await this.keyService.getUserKey(activeUserId);
     const folder = await this.folderService.encrypt(FolderExport.toView(req), userKey);
     try {
-      await this.folderApiService.save(folder, activeUserId);
-      const newFolder = await this.folderService.get(folder.id, activeUserId);
+      const folderData = await this.folderApiService.save(folder, activeUserId);
+      const newFolder = new Folder(folderData);
       const decFolder = await newFolder.decrypt();
       const res = new FolderResponse(decFolder);
       return Response.success(res);
diff --git a/apps/cli/webpack.base.js b/apps/cli/webpack.base.js
new file mode 100644
index 00000000000..532b0a747a0
--- /dev/null
+++ b/apps/cli/webpack.base.js
@@ -0,0 +1,126 @@
+const path = require("path");
+const webpack = require("webpack");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const nodeExternals = require("webpack-node-externals");
+const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
+const config = require("./config/config");
+
+module.exports.getEnv = function getEnv() {
+  const ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
+  return { ENV };
+};
+
+const DEFAULT_PARAMS = {
+  localesPath: "./src/locales",
+  modulesPath: [path.resolve("../../node_modules")],
+  externalsModulesDir: "../../node_modules",
+  outputPath: path.resolve(__dirname, "build"),
+  watch: false,
+};
+
+/**
+ *
+ * @param {{
+ *  configName: string;
+ *  entry: string;
+ *  tsConfig: string;
+ *  outputPath?: string;
+ *  mode?: string;
+ *  env?: string;
+ *  modulesPath?: string[];
+ *  localesPath?: string;
+ *  externalsModulesDir?: string;
+ *  watch?: boolean;
+ *  importAliases?: import("webpack").ResolveOptions["alias"];
+ * }} params
+ */
+module.exports.buildConfig = function buildConfig(params) {
+  params = { ...DEFAULT_PARAMS, ...params };
+  const ENV = params.env || module.exports.getEnv().ENV;
+
+  const envConfig = config.load(ENV);
+  config.log(`Building CLI - ${params.configName} version`);
+  config.log(envConfig);
+
+  const moduleRules = [
+    {
+      test: /\.ts$/,
+      use: "ts-loader",
+      exclude: path.resolve(__dirname, "node_modules"),
+    },
+  ];
+
+  const plugins = [
+    new CopyWebpackPlugin({
+      patterns: [{ from: params.localesPath, to: "locales" }],
+    }),
+    new webpack.DefinePlugin({
+      "process.env.BWCLI_ENV": JSON.stringify(ENV),
+    }),
+    new webpack.BannerPlugin({
+      banner: "#!/usr/bin/env node",
+      raw: true,
+    }),
+    new webpack.IgnorePlugin({
+      resourceRegExp: /^encoding$/,
+      contextRegExp: /node-fetch/,
+    }),
+    new webpack.EnvironmentPlugin({
+      ENV: ENV,
+      BWCLI_ENV: ENV,
+      FLAGS: envConfig.flags,
+      DEV_FLAGS: envConfig.devFlags,
+    }),
+    new webpack.IgnorePlugin({
+      resourceRegExp: /canvas/,
+      contextRegExp: /jsdom$/,
+    }),
+  ];
+
+  const webpackConfig = {
+    mode: params.mode || ENV,
+    target: "node",
+    devtool: ENV === "development" ? "eval-source-map" : "source-map",
+    node: {
+      __dirname: false,
+      __filename: false,
+    },
+    entry: {
+      bw: params.entry,
+    },
+    optimization: {
+      minimize: false,
+    },
+    resolve: {
+      extensions: [".ts", ".js"],
+      symlinks: false,
+      modules: params.modulesPath,
+      plugins: [new TsconfigPathsPlugin({ configFile: params.tsConfig })],
+      alias: params.importAliases,
+    },
+    output: {
+      filename: "[name].js",
+      path: path.resolve(params.outputPath),
+      clean: true,
+    },
+    module: { rules: moduleRules },
+    plugins: plugins,
+    externals: [
+      nodeExternals({
+        modulesDir: params.externalsModulesDir,
+        allowlist: [/@bitwarden/],
+      }),
+    ],
+    experiments: {
+      asyncWebAssembly: true,
+    },
+  };
+  if (params.watch) {
+    webpackConfig.watch = true;
+    webpackConfig.watchOptions = {
+      ignored: /node_modules/,
+      poll: 1000,
+    };
+  }
+  return webpackConfig;
+};
diff --git a/apps/cli/webpack.config.js b/apps/cli/webpack.config.js
index d5f66af73ec..b8eae3dce4d 100644
--- a/apps/cli/webpack.config.js
+++ b/apps/cli/webpack.config.js
@@ -1,89 +1,48 @@
 const path = require("path");
-const webpack = require("webpack");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const nodeExternals = require("webpack-node-externals");
-const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
-const config = require("./config/config");
+const { buildConfig } = require("./webpack.base");
 
-if (process.env.NODE_ENV == null) {
-  process.env.NODE_ENV = "development";
-}
-const ENV = (process.env.ENV = process.env.NODE_ENV);
+module.exports = (webpackConfig, context) => {
+  // Detect if called by Nx (context parameter exists)
+  const isNxBuild = context && context.options;
 
-const envConfig = config.load(ENV);
-config.log(envConfig);
+  if (isNxBuild) {
+    // Nx build configuration
+    const mode = context.options.mode || "development";
+    if (process.env.NODE_ENV == null) {
+      process.env.NODE_ENV = mode;
+    }
+    const ENV = (process.env.ENV = process.env.NODE_ENV);
 
-const moduleRules = [
-  {
-    test: /\.ts$/,
-    use: "ts-loader",
-    exclude: path.resolve(__dirname, "node_modules"),
-  },
-];
+    return buildConfig({
+      configName: "OSS",
+      entry: context.options.main || "apps/cli/src/bw.ts",
+      tsConfig: "tsconfig.base.json",
+      outputPath: path.resolve(context.context.root, context.options.outputPath),
+      mode: mode,
+      env: ENV,
+      modulesPath: [path.resolve("node_modules")],
+      localesPath: "apps/cli/src/locales",
+      externalsModulesDir: "node_modules",
+      watch: context.options.watch || false,
+    });
+  } else {
+    // npm build configuration
+    if (process.env.NODE_ENV == null) {
+      process.env.NODE_ENV = "development";
+    }
+    const ENV = (process.env.ENV = process.env.NODE_ENV);
+    const mode = ENV;
 
-const plugins = [
-  new CopyWebpackPlugin({
-    patterns: [{ from: "./src/locales", to: "locales" }],
-  }),
-  new webpack.DefinePlugin({
-    "process.env.BWCLI_ENV": JSON.stringify(ENV),
-  }),
-  new webpack.BannerPlugin({
-    banner: "#!/usr/bin/env node",
-    raw: true,
-  }),
-  new webpack.IgnorePlugin({
-    resourceRegExp: /^encoding$/,
-    contextRegExp: /node-fetch/,
-  }),
-  new webpack.EnvironmentPlugin({
-    ENV: ENV,
-    BWCLI_ENV: ENV,
-    FLAGS: envConfig.flags,
-    DEV_FLAGS: envConfig.devFlags,
-  }),
-  new webpack.IgnorePlugin({
-    resourceRegExp: /canvas/,
-    contextRegExp: /jsdom$/,
-  }),
-];
-
-const webpackConfig = {
-  mode: ENV,
-  target: "node",
-  devtool: ENV === "development" ? "eval-source-map" : "source-map",
-  node: {
-    __dirname: false,
-    __filename: false,
-  },
-  entry: {
-    bw: "./src/bw.ts",
-  },
-  optimization: {
-    minimize: false,
-  },
-  resolve: {
-    extensions: [".ts", ".js"],
-    symlinks: false,
-    modules: [path.resolve("../../node_modules")],
-    plugins: [new TsconfigPathsPlugin({ configFile: "./tsconfig.json" })],
-  },
-  output: {
-    filename: "[name].js",
-    path: path.resolve(__dirname, "build"),
-    clean: true,
-  },
-  module: { rules: moduleRules },
-  plugins: plugins,
-  externals: [
-    nodeExternals({
-      modulesDir: "../../node_modules",
-      allowlist: [/@bitwarden/],
-    }),
-  ],
-  experiments: {
-    asyncWebAssembly: true,
-  },
+    return buildConfig({
+      configName: "OSS",
+      entry: "./src/bw.ts",
+      tsConfig: "./tsconfig.json",
+      outputPath: path.resolve(__dirname, "build"),
+      mode: mode,
+      env: ENV,
+      modulesPath: [path.resolve("../../node_modules")],
+      localesPath: "./src/locales",
+      externalsModulesDir: "../../node_modules",
+    });
+  }
 };
-
-module.exports = webpackConfig;
diff --git a/apps/desktop/CLAUDE.md b/apps/desktop/CLAUDE.md
new file mode 100644
index 00000000000..65b1952851a
--- /dev/null
+++ b/apps/desktop/CLAUDE.md
@@ -0,0 +1,11 @@
+# Desktop (Electron) - Critical Rules
+
+- **CRITICAL**: Separate main process vs renderer process contexts
+  - Main process: Node.js + Electron APIs (files in `/apps/desktop/src/main/`)
+  - Renderer process: Browser-like environment (Angular app files)
+  - Use IPC (Inter-Process Communication) for cross-process communication
+
+- **NEVER** import Node.js modules directly in renderer process
+- **NEVER** import Angular modules in the main process
+  - Use preload scripts or IPC to access Node.js functionality
+  - See `/apps/desktop/src/*/preload.ts` files for patterns
diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index ca9965e5e18..f6380c747d8 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -120,9 +120,9 @@ checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "arboard"
-version = "3.6.0"
+version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55f533f8e0af236ffe5eb979b99381df3258853f00ba2e44b6e1955292c75227"
+checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
 dependencies = [
  "clipboard-win",
  "log",
@@ -131,6 +131,7 @@ dependencies = [
  "objc2-foundation",
  "parking_lot",
  "percent-encoding",
+ "windows-sys 0.60.2",
  "wl-clipboard-rs",
  "x11rb",
 ]
@@ -317,9 +318,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.88"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -342,6 +343,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 name = "autotype"
 version = "0.0.0"
 dependencies = [
+ "anyhow",
+ "mockall",
+ "serial_test",
  "tracing",
  "windows 0.61.1",
  "windows-core 0.61.0",
@@ -438,27 +442,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "bitwarden_chromium_importer"
+name = "bitwarden_chromium_import_helper"
 version = "0.0.0"
 dependencies = [
- "aes",
  "aes-gcm",
  "anyhow",
- "async-trait",
  "base64",
- "cbc",
- "hex",
- "homedir",
- "oo7",
- "pbkdf2",
- "rand 0.9.1",
- "rusqlite",
- "security-framework",
- "serde",
- "serde_json",
- "sha1",
+ "chacha20poly1305",
+ "chromium_importer",
+ "clap",
+ "embed-resource",
+ "scopeguard",
+ "sysinfo",
  "tokio",
- "winapi",
+ "tracing",
+ "tracing-subscriber",
  "windows 0.61.1",
 ]
 
@@ -558,10 +556,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.4"
+version = "1.2.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
+checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36"
 dependencies = [
+ "find-msvc-tools",
  "shlex",
 ]
 
@@ -588,6 +587,45 @@ dependencies = [
  "cpufeatures",
 ]
 
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
+[[package]]
+name = "chromium_importer"
+version = "0.0.0"
+dependencies = [
+ "aes",
+ "aes-gcm",
+ "anyhow",
+ "async-trait",
+ "base64",
+ "cbc",
+ "dirs",
+ "hex",
+ "oo7",
+ "pbkdf2",
+ "rand 0.9.1",
+ "rusqlite",
+ "security-framework",
+ "serde",
+ "serde_json",
+ "sha1",
+ "tokio",
+ "tracing",
+ "verifysign",
+ "windows 0.61.1",
+]
+
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -601,9 +639,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -611,9 +649,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
 dependencies = [
  "anstream",
  "anstyle",
@@ -623,9 +661,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -648,17 +686,6 @@ dependencies = [
  "error-code",
 ]
 
-[[package]]
-name = "codespan-reporting"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
-dependencies = [
- "serde",
- "termcolor",
- "unicode-width",
-]
-
 [[package]]
 name = "colorchoice"
 version = "1.0.3"
@@ -753,6 +780,22 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67773048316103656a637612c4a62477603b777d91d9c62ff2290f9cde178fdb"
+dependencies = [
+ "ctor-proc-macro",
+ "dtor",
+]
+
+[[package]]
+name = "ctor-proc-macro"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2"
+
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -789,78 +832,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "cxx"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a71ea7f29c73f7ffa64c50b83c9fe4d3a6d4be89a86b009eb80d5a6d3429d741"
-dependencies = [
- "cc",
- "cxxbridge-cmd",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "foldhash",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a8232661d66dcf713394726157d3cfe0a89bfc85f52d6e9f9bbc2306797fe7"
-dependencies = [
- "cc",
- "codespan-reporting",
- "proc-macro2",
- "quote",
- "scratch",
- "syn",
-]
-
-[[package]]
-name = "cxxbridge-cmd"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f44296c8693e9ea226a48f6a122727f77aa9e9e338380cb021accaeeb7ee279"
-dependencies = [
- "clap",
- "codespan-reporting",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f69c181c176981ae44ba9876e2ea41ce8e574c296b38d06925ce9214fb8e4"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8faff5d4467e0709448187df29ccbf3b0982cc426ee444a193f87b11afb565a8"
-dependencies = [
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
 [[package]]
 name = "der"
 version = "0.7.10"
@@ -872,15 +843,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "deranged"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
-dependencies = [
- "powerfmt",
-]
-
 [[package]]
 name = "desktop_core"
 version = "0.0.0"
@@ -891,35 +853,32 @@ dependencies = [
  "ashpd",
  "base64",
  "bitwarden-russh",
- "byteorder",
  "bytes",
  "cbc",
+ "chacha20poly1305",
  "core-foundation",
  "desktop_objc",
  "dirs",
- "ed25519",
  "futures",
  "homedir",
  "interprocess",
- "keytar",
  "libc",
+ "linux-keyutils",
+ "memsec",
  "oo7",
  "pin-project",
- "pkcs8",
  "rand 0.9.1",
- "rsa",
- "russh-cryptovec",
  "scopeguard",
  "secmem-proc",
  "security-framework",
  "security-framework-sys",
+ "serde",
+ "serde_json",
  "sha2",
- "ssh-encoding",
  "ssh-key",
  "sysinfo",
  "thiserror 2.0.12",
  "tokio",
- "tokio-stream",
  "tokio-util",
  "tracing",
  "typenum",
@@ -937,18 +896,14 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "autotype",
- "base64",
- "bitwarden_chromium_importer",
+ "chromium_importer",
  "desktop_core",
- "hex",
  "napi",
  "napi-build",
  "napi-derive",
  "serde",
  "serde_json",
  "tokio",
- "tokio-stream",
- "tokio-util",
  "tracing",
  "tracing-subscriber",
  "windows-registry",
@@ -961,9 +916,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "cc",
- "core-foundation",
  "glob",
- "thiserror 2.0.12",
  "tokio",
  "tracing",
 ]
@@ -972,14 +925,13 @@ dependencies = [
 name = "desktop_proxy"
 version = "0.0.0"
 dependencies = [
- "anyhow",
  "desktop_core",
  "embed_plist",
  "futures",
- "log",
- "simplelog",
  "tokio",
  "tokio-util",
+ "tracing",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -1012,7 +964,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1042,12 +994,33 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
 
+[[package]]
+name = "downcast"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
+[[package]]
+name = "dtor"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934"
+dependencies = [
+ "dtor-proc-macro",
+]
+
+[[package]]
+name = "dtor-proc-macro"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
+
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
@@ -1108,6 +1081,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "embed-resource"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55a075fc573c64510038d7ee9abc7990635863992f83ebc52c8b433b8411a02e"
+dependencies = [
+ "cc",
+ "memchr",
+ "rustc_version",
+ "toml 0.9.5",
+ "vswhom",
+ "winreg",
+]
+
 [[package]]
 name = "embed_plist"
 version = "1.2.2"
@@ -1218,6 +1205,12 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -1245,6 +1238,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fragile"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
+
 [[package]]
 name = "fs-err"
 version = "2.11.0"
@@ -1444,12 +1443,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
 [[package]]
 name = "hashbrown"
 version = "0.15.3"
@@ -1465,7 +1458,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1630,7 +1623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1670,27 +1663,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
-[[package]]
-name = "keytar"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d361c55fba09829ac620b040f5425bf239b1030c3d6820a84acac8da867dca4d"
-dependencies = [
- "keytar-sys",
-]
-
-[[package]]
-name = "keytar-sys"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe908c6896705a1cb516cd6a5d956c63f08d95ace81b93253a98cd93e1e6a65a"
-dependencies = [
- "cc",
- "cxx",
- "cxx-build",
- "pkg-config",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1702,9 +1674,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "libloading"
@@ -1744,12 +1716,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "link-cplusplus"
-version = "1.0.10"
+name = "linux-keyutils"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a6f6da007f968f9def0d65a05b187e2960183de70c160204ecfccf0ee330212"
+checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e"
 dependencies = [
- "cc",
+ "bitflags",
+ "libc",
 ]
 
 [[package]]
@@ -1792,13 +1765,12 @@ version = "0.0.0"
 dependencies = [
  "desktop_core",
  "futures",
- "log",
- "oslog",
  "serde",
  "serde_json",
  "tokio",
- "tokio-util",
  "tracing",
+ "tracing-oslog",
+ "tracing-subscriber",
  "uniffi",
 ]
 
@@ -1836,6 +1808,17 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memsec"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c797b9d6bb23aab2fc369c65f871be49214f5c759af65bde26ffaaa2b646b492"
+dependencies = [
+ "getrandom 0.2.16",
+ "libc",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -1878,6 +1861,32 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "mockall"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2"
+dependencies = [
+ "cfg-if",
+ "downcast",
+ "fragile",
+ "mockall_derive",
+ "predicates",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall_derive"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898"
+dependencies = [
+ "cfg-if",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "napi"
 version = "2.16.17"
@@ -1885,7 +1894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55740c4ae1d8696773c78fdafd5d0e5fe9bc9f1b071c7ba493ba5c413a9184f3"
 dependencies = [
  "bitflags",
- "ctor",
+ "ctor 0.2.9",
  "napi-derive",
  "napi-sys",
  "once_cell",
@@ -2040,12 +2049,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -2087,15 +2090,6 @@ dependencies = [
  "libm",
 ]
 
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "objc2"
 version = "0.6.1"
@@ -2257,17 +2251,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "oslog"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969"
-dependencies = [
- "cc",
- "dashmap",
- "log",
-]
-
 [[package]]
 name = "p256"
 version = "0.13.2"
@@ -2430,21 +2413,6 @@ dependencies = [
  "spki",
 ]
 
-[[package]]
-name = "pkcs5"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6"
-dependencies = [
- "aes",
- "cbc",
- "der",
- "pbkdf2",
- "scrypt",
- "sha2",
- "spki",
-]
-
 [[package]]
 name = "pkcs8"
 version = "0.10.2"
@@ -2452,8 +2420,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
  "der",
- "pkcs5",
- "rand_core 0.6.4",
  "spki",
 ]
 
@@ -2516,12 +2482,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.21"
@@ -2531,6 +2491,32 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "predicates"
+version = "3.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
+dependencies = [
+ "anstyle",
+ "predicates-core",
+]
+
+[[package]]
+name = "predicates-core"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
+
+[[package]]
+name = "predicates-tree"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
+dependencies = [
+ "predicates-core",
+ "termtree",
+]
+
 [[package]]
 name = "primeorder"
 version = "0.13.6"
@@ -2558,6 +2544,16 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "process_isolation"
+version = "0.0.0"
+dependencies = [
+ "ctor 0.5.0",
+ "desktop_core",
+ "libc",
+ "tracing",
+]
+
 [[package]]
 name = "quick-xml"
 version = "0.37.5"
@@ -2802,12 +2798,6 @@ dependencies = [
  "rustix 1.0.7",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
-
 [[package]]
 name = "ryu"
 version = "1.0.20"
@@ -2815,12 +2805,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
-name = "salsa20"
-version = "0.10.2"
+name = "scc"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"
 dependencies = [
- "cipher",
+ "sdd",
 ]
 
 [[package]]
@@ -2829,12 +2819,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "scratch"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f6280af86e5f559536da57a45ebc84948833b3bee313a7dd25232e09c878a52"
-
 [[package]]
 name = "scroll"
 version = "0.12.0"
@@ -2856,15 +2840,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "scrypt"
-version = "0.11.0"
+name = "sdd"
+version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
-dependencies = [
- "pbkdf2",
- "salsa20",
- "sha2",
-]
+checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
 
 [[package]]
 name = "sec1"
@@ -2970,6 +2949,40 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serial_test"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
+dependencies = [
+ "futures",
+ "log",
+ "once_cell",
+ "parking_lot",
+ "scc",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -3026,17 +3039,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "simplelog"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
-dependencies = [
- "log",
- "termcolor",
- "time",
-]
-
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@@ -3212,13 +3214,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "termcolor"
-version = "1.4.1"
+name = "termtree"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
+checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
 
 [[package]]
 name = "textwrap"
@@ -3278,39 +3277,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "time"
-version = "0.3.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
-dependencies = [
- "deranged",
- "itoa",
- "libc",
- "num-conv",
- "num_threads",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
-
-[[package]]
-name = "time-macros"
-version = "0.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.1"
@@ -3351,17 +3317,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tokio-stream"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.13"
@@ -3384,12 +3339,36 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.26"
@@ -3397,10 +3376,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap",
- "toml_datetime",
+ "toml_datetime 0.6.9",
  "winnow",
 ]
 
+[[package]]
+name = "toml_parser"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -3444,6 +3438,18 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-oslog"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d76902d2a8d5f9f55a81155c08971734071968c90f2d9bfe645fe700579b2950"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.20"
@@ -3477,9 +3483,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "uds_windows"
@@ -3510,12 +3516,6 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
-[[package]]
-name = "unicode-width"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
-
 [[package]]
 name = "uniffi"
 version = "0.28.3"
@@ -3550,7 +3550,7 @@ dependencies = [
  "paste",
  "serde",
  "textwrap",
- "toml",
+ "toml 0.5.11",
  "uniffi_meta",
  "uniffi_udl",
 ]
@@ -3604,7 +3604,7 @@ dependencies = [
  "quote",
  "serde",
  "syn",
- "toml",
+ "toml 0.5.11",
  "uniffi_meta",
 ]
 
@@ -3692,12 +3692,44 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
+[[package]]
+name = "verifysign"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ebfe12e38930c3b851aea35e93fab1a6c29279cad7e8e273f29a21678fee8c0"
+dependencies = [
+ "core-foundation",
+ "sha1",
+ "sha2",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
+[[package]]
+name = "vswhom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
+dependencies = [
+ "libc",
+ "vswhom-sys",
+]
+
+[[package]]
+name = "vswhom-sys"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb067e4cbd1ff067d1df46c9194b5de0e98efd2810bbc95c5d5e5f25a3231150"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -3814,15 +3846,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
-[[package]]
-name = "winapi-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -3848,7 +3871,7 @@ dependencies = [
  "windows-collections",
  "windows-core 0.61.0",
  "windows-future",
- "windows-link",
+ "windows-link 0.1.3",
  "windows-numerics",
 ]
 
@@ -3881,9 +3904,9 @@ checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
 dependencies = [
  "windows-implement 0.60.0",
  "windows-interface 0.59.1",
- "windows-link",
+ "windows-link 0.1.3",
  "windows-result 0.3.4",
- "windows-strings",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
@@ -3893,7 +3916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
 dependencies = [
  "windows-core 0.61.0",
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -3946,6 +3969,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-numerics"
 version = "0.2.0"
@@ -3953,18 +3982,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
  "windows-core 0.61.0",
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
 name = "windows-registry"
-version = "0.5.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
 dependencies = [
- "windows-link",
- "windows-result 0.3.4",
- "windows-strings",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
 ]
 
 [[package]]
@@ -3982,7 +4011,16 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -3991,7 +4029,25 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
@@ -4021,6 +4077,30 @@ dependencies = [
  "windows-targets 0.53.3",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -4058,7 +4138,7 @@ version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
  "windows_i686_gnu 0.53.0",
@@ -4069,6 +4149,12 @@ dependencies = [
  "windows_x86_64_msvc 0.53.0",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -4087,6 +4173,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -4105,6 +4197,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -4135,6 +4233,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -4162,6 +4266,12 @@ dependencies = [
  "windows-core 0.61.0",
 ]
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -4180,6 +4290,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -4198,6 +4314,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -4225,6 +4347,16 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.55.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.39.0"
@@ -4417,9 +4549,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml
index 0a637b12de9..0b09daa9bdd 100644
--- a/apps/desktop/desktop_native/Cargo.toml
+++ b/apps/desktop/desktop_native/Cargo.toml
@@ -2,10 +2,12 @@
 resolver = "2"
 members = [
     "autotype",
-    "bitwarden_chromium_importer",
+    "bitwarden_chromium_import_helper",
+    "chromium_importer",
     "core",
     "macos_provider",
     "napi",
+    "process_isolation",
     "proxy",
     "windows_plugin_authenticator"
 ]
@@ -18,15 +20,18 @@ publish = false
 
 [workspace.dependencies]
 aes = "=0.8.4"
+aes-gcm = "=0.10.3"
 anyhow = "=1.0.94"
-arboard = { version = "=3.6.0", default-features = false }
+arboard = { version = "=3.6.1", default-features = false }
 ashpd = "=0.11.0"
 base64 = "=0.22.1"
 bitwarden-russh = { git = "https://github.com/bitwarden/bitwarden-russh.git", rev = "a641316227227f8777fdf56ac9fa2d6b5f7fe662" }
 byteorder = "=1.5.0"
 bytes = "=1.10.1"
 cbc = "=0.1.2"
+chacha20poly1305 = "=0.10.1"
 core-foundation = "=0.10.1"
+ctor = "=0.5.0"
 dirs = "=6.0.0"
 ed25519 = "=2.2.3"
 embed_plist = "=1.2.2"
@@ -34,14 +39,13 @@ futures = "=0.3.31"
 hex = "=0.4.3"
 homedir = "=0.3.4"
 interprocess = "=2.2.1"
-keytar = "=0.1.6"
-libc = "=0.2.172"
-log = "=0.4.25"
+libc = "=0.2.177"
+linux-keyutils = "=0.2.4"
+memsec = "=0.7.0"
 napi = "=2.16.17"
 napi-build = "=2.2.0"
 napi-derive = "=2.16.13"
 oo7 = "=0.4.3"
-oslog = "=0.2.0"
 pin-project = "=1.1.10"
 pkcs8 = "=0.10.2"
 rand = "=0.9.1"
@@ -54,28 +58,37 @@ security-framework-sys = "=2.15.0"
 serde = "=1.0.209"
 serde_json = "=1.0.127"
 sha2 = "=0.10.8"
-simplelog = "=0.12.2"
 ssh-encoding = "=0.2.0"
 ssh-key = { version = "=0.6.7", default-features = false }
 sysinfo = "=0.35.0"
 thiserror = "=2.0.12"
 tokio = "=1.45.0"
-tokio-stream = "=0.1.15"
 tokio-util = "=0.7.13"
 tracing = "=0.1.41"
-tracing-subscriber = { version = "=0.3.20", features = ["fmt", "env-filter"] }
-typenum = "=1.18.0"
+tracing-subscriber = { version = "=0.3.20", features = [
+    "fmt",
+    "env-filter",
+    "tracing-log",
+] }
+typenum = "=1.19.0"
 uniffi = "=0.28.3"
 widestring = "=1.2.0"
 windows = "=0.61.1"
 windows-core = "=0.61.0"
 windows-future = "=0.2.0"
-windows-registry = "=0.5.3"
+windows-registry = "=0.6.1"
 zbus = "=5.11.0"
 zbus_polkit = "=5.0.0"
 zeroizing-alloc = "=0.1.0"
 
 [workspace.lints.clippy]
+disallowed-macros = "deny"
+
+# Dis-allow println and eprintln, which are typically used in debugging.
+# Use `tracing` and `tracing-subscriber` crates for observability needs.
+print_stderr = "deny"
+print_stdout = "deny"
+
+string_slice = "warn"
 unused_async = "deny"
 unwrap_used = "deny"
-string_slice = "warn"
diff --git a/apps/desktop/desktop_native/autotype/Cargo.toml b/apps/desktop/desktop_native/autotype/Cargo.toml
index ceccd0c890a..267074d0bc8 100644
--- a/apps/desktop/desktop_native/autotype/Cargo.toml
+++ b/apps/desktop/desktop_native/autotype/Cargo.toml
@@ -5,7 +5,12 @@ license.workspace = true
 edition.workspace = true
 publish.workspace = true
 
+[dependencies]
+anyhow = { workspace = true }
+
 [target.'cfg(windows)'.dependencies]
+mockall = "=0.13.1"
+serial_test = "=3.2.0"
 tracing.workspace = true
 windows = { workspace = true, features = [
     "Win32_UI_Input_KeyboardAndMouse",
diff --git a/apps/desktop/desktop_native/autotype/src/lib.rs b/apps/desktop/desktop_native/autotype/src/lib.rs
index f1aab2ba164..c87fea23b60 100644
--- a/apps/desktop/desktop_native/autotype/src/lib.rs
+++ b/apps/desktop/desktop_native/autotype/src/lib.rs
@@ -1,22 +1,33 @@
+use anyhow::Result;
+
 #[cfg_attr(target_os = "linux", path = "linux.rs")]
 #[cfg_attr(target_os = "macos", path = "macos.rs")]
-#[cfg_attr(target_os = "windows", path = "windows.rs")]
+#[cfg_attr(target_os = "windows", path = "windows/mod.rs")]
 mod windowing;
 
 /// Gets the title bar string for the foreground window.
 ///
-/// TODO: The error handling will be improved in a future PR: PM-23615
-#[allow(clippy::result_unit_err)]
-pub fn get_foreground_window_title() -> std::result::Result<String, ()> {
+/// # Errors
+///
+/// This function returns an `anyhow::Error` if there is any
+/// issue obtaining the window title. Detailed reasons will
+/// vary based on platform implementation.
+pub fn get_foreground_window_title() -> Result<String> {
     windowing::get_foreground_window_title()
 }
 
 /// Attempts to type the input text wherever the user's cursor is.
 ///
-/// `input` must be an array of utf-16 encoded characters to insert.
+/// # Arguments
 ///
-/// TODO: The error handling will be improved in a future PR: PM-23615
-#[allow(clippy::result_unit_err)]
-pub fn type_input(input: Vec<u16>, keyboard_shortcut: Vec<String>) -> std::result::Result<(), ()> {
+/// * `input` an array of utf-16 encoded characters to insert.
+/// * `keyboard_shortcut` a vector of valid shortcut keys: Control, Alt, Super, Shift, letters a - Z
+///
+/// # Errors
+///
+/// This function returns an `anyhow::Error` if there is any
+/// issue in typing the input. Detailed reasons will
+/// vary based on platform implementation.
+pub fn type_input(input: Vec<u16>, keyboard_shortcut: Vec<String>) -> Result<()> {
     windowing::type_input(input, keyboard_shortcut)
 }
diff --git a/apps/desktop/desktop_native/autotype/src/linux.rs b/apps/desktop/desktop_native/autotype/src/linux.rs
index 148b1aab6eb..9fda0ed9e33 100644
--- a/apps/desktop/desktop_native/autotype/src/linux.rs
+++ b/apps/desktop/desktop_native/autotype/src/linux.rs
@@ -1,10 +1,7 @@
-pub fn get_foreground_window_title() -> std::result::Result<String, ()> {
+pub fn get_foreground_window_title() -> anyhow::Result<String> {
     todo!("Bitwarden does not yet support Linux autotype");
 }
 
-pub fn type_input(
-    _input: Vec<u16>,
-    _keyboard_shortcut: Vec<String>,
-) -> std::result::Result<(), ()> {
+pub fn type_input(_input: Vec<u16>, _keyboard_shortcut: Vec<String>) -> anyhow::Result<()> {
     todo!("Bitwarden does not yet support Linux autotype");
 }
diff --git a/apps/desktop/desktop_native/autotype/src/macos.rs b/apps/desktop/desktop_native/autotype/src/macos.rs
index 5542e7a3a6b..c6681a3291e 100644
--- a/apps/desktop/desktop_native/autotype/src/macos.rs
+++ b/apps/desktop/desktop_native/autotype/src/macos.rs
@@ -1,10 +1,7 @@
-pub fn get_foreground_window_title() -> std::result::Result<String, ()> {
+pub fn get_foreground_window_title() -> anyhow::Result<String> {
     todo!("Bitwarden does not yet support macOS autotype");
 }
 
-pub fn type_input(
-    _input: Vec<u16>,
-    _keyboard_shortcut: Vec<String>,
-) -> std::result::Result<(), ()> {
+pub fn type_input(_input: Vec<u16>, _keyboard_shortcut: Vec<String>) -> anyhow::Result<()> {
     todo!("Bitwarden does not yet support macOS autotype");
 }
diff --git a/apps/desktop/desktop_native/autotype/src/windows/mod.rs b/apps/desktop/desktop_native/autotype/src/windows/mod.rs
new file mode 100644
index 00000000000..3ea63b2b8f4
--- /dev/null
+++ b/apps/desktop/desktop_native/autotype/src/windows/mod.rs
@@ -0,0 +1,41 @@
+use anyhow::Result;
+use tracing::debug;
+use windows::Win32::Foundation::{GetLastError, SetLastError, WIN32_ERROR};
+
+mod type_input;
+mod window_title;
+
+/// The error code from Win32 API that represents a non-error.
+const WIN32_SUCCESS: WIN32_ERROR = WIN32_ERROR(0);
+
+/// `ErrorOperations` provides an interface to the Win32 API for dealing with
+/// win32 errors.
+#[cfg_attr(test, mockall::automock)]
+trait ErrorOperations {
+    /// https://learn.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-setlasterror
+    fn set_last_error(err: u32) {
+        debug!(err, "Calling SetLastError");
+        unsafe {
+            SetLastError(WIN32_ERROR(err));
+        }
+    }
+
+    /// https://learn.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-getlasterror
+    fn get_last_error() -> WIN32_ERROR {
+        let last_err = unsafe { GetLastError() };
+        debug!("GetLastError(): {}", last_err.to_hresult().message());
+        last_err
+    }
+}
+
+/// Default implementation for Win32 API errors.
+struct Win32ErrorOperations;
+impl ErrorOperations for Win32ErrorOperations {}
+
+pub fn get_foreground_window_title() -> Result<String> {
+    window_title::get_foreground_window_title()
+}
+
+pub fn type_input(input: Vec<u16>, keyboard_shortcut: Vec<String>) -> Result<()> {
+    type_input::type_input(input, keyboard_shortcut)
+}
diff --git a/apps/desktop/desktop_native/autotype/src/windows.rs b/apps/desktop/desktop_native/autotype/src/windows/type_input.rs
similarity index 50%
rename from apps/desktop/desktop_native/autotype/src/windows.rs
rename to apps/desktop/desktop_native/autotype/src/windows/type_input.rs
index 1d39d3f7ae5..10f30f5ee4f 100644
--- a/apps/desktop/desktop_native/autotype/src/windows.rs
+++ b/apps/desktop/desktop_native/autotype/src/windows/type_input.rs
@@ -1,69 +1,85 @@
-use std::ffi::OsString;
-use std::os::windows::ffi::OsStringExt;
-
-use tracing::debug;
-use windows::Win32::Foundation::{GetLastError, HWND};
+use anyhow::{anyhow, Result};
+use tracing::{debug, error};
 use windows::Win32::UI::Input::KeyboardAndMouse::{
     SendInput, INPUT, INPUT_0, INPUT_KEYBOARD, KEYBDINPUT, KEYEVENTF_KEYUP, KEYEVENTF_UNICODE,
     VIRTUAL_KEY,
 };
-use windows::Win32::UI::WindowsAndMessaging::{
-    GetForegroundWindow, GetWindowTextLengthW, GetWindowTextW,
-};
 
-/// Gets the title bar string for the foreground window.
-pub fn get_foreground_window_title() -> std::result::Result<String, ()> {
-    let Ok(window_handle) = get_foreground_window() else {
-        return Err(());
-    };
-    let Ok(Some(window_title)) = get_window_title(window_handle) else {
-        return Err(());
-    };
+use super::{ErrorOperations, Win32ErrorOperations};
 
-    Ok(window_title)
+/// `InputOperations` provides an interface to Window32 API for
+/// working with inputs.
+#[cfg_attr(test, mockall::automock)]
+trait InputOperations {
+    /// Attempts to type the provided input wherever the user's cursor is.
+    ///
+    /// https://learn.microsoft.com/en-in/windows/win32/api/winuser/nf-winuser-sendinput
+    fn send_input(inputs: &[INPUT]) -> u32;
+}
+
+struct Win32InputOperations;
+
+impl InputOperations for Win32InputOperations {
+    fn send_input(inputs: &[INPUT]) -> u32 {
+        const INPUT_STRUCT_SIZE: i32 = std::mem::size_of::<INPUT>() as i32;
+        let insert_count = unsafe { SendInput(inputs, INPUT_STRUCT_SIZE) };
+
+        debug!(insert_count, "SendInput() called.");
+
+        insert_count
+    }
 }
 
 /// Attempts to type the input text wherever the user's cursor is.
 ///
 /// `input` must be a vector of utf-16 encoded characters to insert.
-/// `keyboard_shortcut` must be a vector of Strings, where valid shortcut keys: Control, Alt, Super, Shift, letters a - Z
+/// `keyboard_shortcut` must be a vector of Strings, where valid shortcut keys: Control, Alt, Super,
+/// Shift, letters a - Z
 ///
 /// https://learn.microsoft.com/en-in/windows/win32/api/winuser/nf-winuser-sendinput
-pub fn type_input(input: Vec<u16>, keyboard_shortcut: Vec<String>) -> Result<(), ()> {
-    const TAB_KEY: u8 = 9;
+pub(super) fn type_input(input: Vec<u16>, keyboard_shortcut: Vec<String>) -> Result<()> {
+    // the length of this vec is always shortcut keys to release + (2x length of input chars)
+    let mut keyboard_inputs: Vec<INPUT> =
+        Vec::with_capacity(keyboard_shortcut.len() + (input.len() * 2));
 
-    let mut keyboard_inputs: Vec<INPUT> = Vec::new();
+    debug!(?keyboard_shortcut, "Converting keyboard shortcut to input.");
 
     // Add key "up" inputs for the shortcut
     for key in keyboard_shortcut {
         keyboard_inputs.push(convert_shortcut_key_to_up_input(key)?);
     }
 
-    // Add key "down" and "up" inputs for the input
-    // (currently in this form: {username}/t{password})
+    add_input(&input, &mut keyboard_inputs);
+
+    send_input::<Win32InputOperations, Win32ErrorOperations>(keyboard_inputs)
+}
+
+// Add key "down" and "up" inputs for the input
+// (currently in this form: {username}/t{password})
+fn add_input(input: &[u16], keyboard_inputs: &mut Vec<INPUT>) {
+    const TAB_KEY: u8 = 9;
+
     for i in input {
-        let next_down_input = if i == TAB_KEY.into() {
-            build_virtual_key_input(InputKeyPress::Down, i as u8)
+        let next_down_input = if *i == TAB_KEY.into() {
+            build_virtual_key_input(InputKeyPress::Down, *i as u8)
         } else {
-            build_unicode_input(InputKeyPress::Down, i)
+            build_unicode_input(InputKeyPress::Down, *i)
         };
-        let next_up_input = if i == TAB_KEY.into() {
-            build_virtual_key_input(InputKeyPress::Up, i as u8)
+        let next_up_input = if *i == TAB_KEY.into() {
+            build_virtual_key_input(InputKeyPress::Up, *i as u8)
         } else {
-            build_unicode_input(InputKeyPress::Up, i)
+            build_unicode_input(InputKeyPress::Up, *i)
         };
 
         keyboard_inputs.push(next_down_input);
         keyboard_inputs.push(next_up_input);
     }
-
-    send_input(keyboard_inputs)
 }
 
 /// Converts a valid shortcut key to an "up" keyboard input.
 ///
 /// `input` must be a valid shortcut key: Control, Alt, Super, Shift, letters [a-z][A-Z]
-fn convert_shortcut_key_to_up_input(key: String) -> Result<INPUT, ()> {
+fn convert_shortcut_key_to_up_input(key: String) -> Result<INPUT> {
     const SHIFT_KEY: u8 = 0x10;
     const SHIFT_KEY_STR: &str = "Shift";
     const CONTROL_KEY: u8 = 0x11;
@@ -89,9 +105,15 @@ fn convert_shortcut_key_to_up_input(key: String) -> Result<INPUT, ()> {
 /// Because we only accept [a-z][A-Z], the decimal u16
 /// cast of the letter is safe because the unicode code point
 /// of these characters fits in a u16.
-fn get_alphabetic_hotkey(letter: String) -> Result<u16, ()> {
+fn get_alphabetic_hotkey(letter: String) -> Result<u16> {
     if letter.len() != 1 {
-        return Err(());
+        error!(
+            len = letter.len(),
+            "Final keyboard shortcut key should be a single character."
+        );
+        return Err(anyhow!(
+            "Final keyboard shortcut key should be a single character: {letter}"
+        ));
     }
 
     let c = letter.chars().next().expect("letter is size 1");
@@ -99,65 +121,20 @@ fn get_alphabetic_hotkey(letter: String) -> Result<u16, ()> {
     // is_ascii_alphabetic() checks for:
     // U+0041 `A` ..= U+005A `Z`, or  U+0061 `a` ..= U+007A `z`
     if !c.is_ascii_alphabetic() {
-        return Err(());
+        error!(letter = %c, "Letter is not ASCII Alphabetic ([a-z][A-Z]).");
+        return Err(anyhow!(
+            "Letter is not ASCII Alphabetic ([a-z][A-Z]): '{letter}'",
+        ));
     }
 
-    Ok(c as u16)
+    let c = c as u16;
+
+    debug!(c, letter, "Got alphabetic hotkey.");
+
+    Ok(c)
 }
 
-/// Gets the foreground window handle.
-///
-/// https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getforegroundwindow
-fn get_foreground_window() -> Result<HWND, ()> {
-    let foreground_window_handle = unsafe { GetForegroundWindow() };
-
-    if foreground_window_handle.is_invalid() {
-        return Err(());
-    }
-
-    Ok(foreground_window_handle)
-}
-
-/// Gets the length of the window title bar text.
-///
-/// https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowtextlengthw
-fn get_window_title_length(window_handle: HWND) -> Result<usize, ()> {
-    if window_handle.is_invalid() {
-        return Err(());
-    }
-
-    match usize::try_from(unsafe { GetWindowTextLengthW(window_handle) }) {
-        Ok(length) => Ok(length),
-        Err(_) => Err(()),
-    }
-}
-
-/// Gets the window title bar title.
-///
-/// https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowtextw
-fn get_window_title(window_handle: HWND) -> Result<Option<String>, ()> {
-    if window_handle.is_invalid() {
-        return Err(());
-    }
-
-    let window_title_length = get_window_title_length(window_handle)?;
-    if window_title_length == 0 {
-        return Ok(None);
-    }
-
-    let mut buffer: Vec<u16> = vec![0; window_title_length + 1]; // add extra space for the null character
-
-    let window_title_length = unsafe { GetWindowTextW(window_handle, &mut buffer) };
-    if window_title_length == 0 {
-        return Ok(None);
-    }
-
-    let window_title = OsString::from_wide(&buffer);
-
-    Ok(Some(window_title.to_string_lossy().into_owned()))
-}
-
-/// Used in build_input() to specify if an input key is being pressed (down) or released (up).
+/// An input key can be either pressed (down), or released (up).
 enum InputKeyPress {
     Down,
     Up,
@@ -230,19 +207,27 @@ fn build_virtual_key_input(key_press: InputKeyPress, virtual_key: u8) -> INPUT {
     }
 }
 
-/// Attempts to type the provided input wherever the user's cursor is.
-///
-/// https://learn.microsoft.com/en-in/windows/win32/api/winuser/nf-winuser-sendinput
-fn send_input(inputs: Vec<INPUT>) -> Result<(), ()> {
-    let insert_count = unsafe { SendInput(&inputs, std::mem::size_of::<INPUT>() as i32) };
-
-    let e = unsafe { GetLastError().to_hresult().message() };
-    debug!("type_input() called, GetLastError() is: {:?}", e);
+fn send_input<I, E>(inputs: Vec<INPUT>) -> Result<()>
+where
+    I: InputOperations,
+    E: ErrorOperations,
+{
+    let insert_count = I::send_input(&inputs);
 
     if insert_count == 0 {
-        return Err(()); // input was blocked by another thread
+        let last_err = E::get_last_error().to_hresult().message();
+        error!(GetLastError = %last_err, "SendInput sent 0 inputs. Input was blocked by another thread.");
+
+        return Err(anyhow!("SendInput sent 0 inputs. Input was blocked by another thread. GetLastError: {last_err}"));
     } else if insert_count != inputs.len() as u32 {
-        return Err(()); // input insertion not completed
+        let last_err = E::get_last_error().to_hresult().message();
+        error!(sent = %insert_count, expected = inputs.len(), GetLastError = %last_err,
+            "SendInput sent does not match expected."
+        );
+        return Err(anyhow!(
+            "SendInput does not match expected. sent: {insert_count}, expected: {}",
+            inputs.len()
+        ));
     }
 
     Ok(())
@@ -250,29 +235,85 @@ fn send_input(inputs: Vec<INPUT>) -> Result<(), ()> {
 
 #[cfg(test)]
 mod tests {
+    //! For the mocking of the traits that are static methods, we need to use the `serial_test`
+    //! crate in order to mock those, since the mock expectations set have to be global in
+    //! absence of a `self`. More info: https://docs.rs/mockall/latest/mockall/#static-methods
+
+    use serial_test::serial;
+    use windows::Win32::Foundation::WIN32_ERROR;
+
     use super::*;
+    use crate::windowing::MockErrorOperations;
 
     #[test]
-    fn get_alphabetic_hot_key_happy() {
+    fn get_alphabetic_hot_key_succeeds() {
         for c in ('a'..='z').chain('A'..='Z') {
             let letter = c.to_string();
-            println!("{}", letter);
             let converted = get_alphabetic_hotkey(letter).unwrap();
             assert_eq!(converted, c as u16);
         }
     }
 
     #[test]
-    #[should_panic = ""]
+    #[should_panic = "Final keyboard shortcut key should be a single character: foo"]
     fn get_alphabetic_hot_key_fail_not_single_char() {
         let letter = String::from("foo");
         get_alphabetic_hotkey(letter).unwrap();
     }
 
     #[test]
-    #[should_panic = ""]
+    #[should_panic = "Letter is not ASCII Alphabetic ([a-z][A-Z]): '}'"]
     fn get_alphabetic_hot_key_fail_not_alphabetic() {
-        let letter = String::from("🚀");
+        let letter = String::from("}");
         get_alphabetic_hotkey(letter).unwrap();
     }
+
+    #[test]
+    #[serial]
+    fn send_input_succeeds() {
+        let ctxi = MockInputOperations::send_input_context();
+        ctxi.expect().returning(|_| 1);
+
+        send_input::<MockInputOperations, MockErrorOperations>(vec![build_unicode_input(
+            InputKeyPress::Up,
+            0,
+        )])
+        .unwrap();
+    }
+
+    #[test]
+    #[serial]
+    #[should_panic(
+        expected = "SendInput sent 0 inputs. Input was blocked by another thread. GetLastError:"
+    )]
+    fn send_input_fails_sent_zero() {
+        let ctxi = MockInputOperations::send_input_context();
+        ctxi.expect().returning(|_| 0);
+
+        let ctxge = MockErrorOperations::get_last_error_context();
+        ctxge.expect().returning(|| WIN32_ERROR(1));
+
+        send_input::<MockInputOperations, MockErrorOperations>(vec![build_unicode_input(
+            InputKeyPress::Up,
+            0,
+        )])
+        .unwrap();
+    }
+
+    #[test]
+    #[serial]
+    #[should_panic(expected = "SendInput does not match expected. sent: 2, expected: 1")]
+    fn send_input_fails_sent_mismatch() {
+        let ctxi = MockInputOperations::send_input_context();
+        ctxi.expect().returning(|_| 2);
+
+        let ctxge = MockErrorOperations::get_last_error_context();
+        ctxge.expect().returning(|| WIN32_ERROR(1));
+
+        send_input::<MockInputOperations, MockErrorOperations>(vec![build_unicode_input(
+            InputKeyPress::Up,
+            0,
+        )])
+        .unwrap();
+    }
 }
diff --git a/apps/desktop/desktop_native/autotype/src/windows/window_title.rs b/apps/desktop/desktop_native/autotype/src/windows/window_title.rs
new file mode 100644
index 00000000000..d56a811ab5c
--- /dev/null
+++ b/apps/desktop/desktop_native/autotype/src/windows/window_title.rs
@@ -0,0 +1,298 @@
+use std::{ffi::OsString, os::windows::ffi::OsStringExt};
+
+use anyhow::{anyhow, Result};
+use tracing::{debug, error, warn};
+use windows::Win32::{
+    Foundation::HWND,
+    UI::WindowsAndMessaging::{GetForegroundWindow, GetWindowTextLengthW, GetWindowTextW},
+};
+
+use super::{ErrorOperations, Win32ErrorOperations, WIN32_SUCCESS};
+
+#[cfg_attr(test, mockall::automock)]
+trait WindowHandleOperations {
+    // https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowtextlengthw
+    fn get_window_text_length_w(&self) -> Result<i32>;
+
+    // https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowtextw
+    fn get_window_text_w(&self, buffer: &mut Vec<u16>) -> Result<i32>;
+}
+
+/// `WindowHandle` provides a light wrapper over the `HWND` (which is just a void *).
+/// The raw pointer can become invalid during runtime so it's validity must be checked
+/// before usage.
+struct WindowHandle {
+    handle: HWND,
+}
+
+impl WindowHandle {
+    /// Create a new `WindowHandle`
+    fn new(handle: HWND) -> Self {
+        Self { handle }
+    }
+
+    /// Assert that the raw pointer is valid.
+    fn validate(&self) -> Result<()> {
+        if self.handle.is_invalid() {
+            error!("Window handle is invalid.");
+            return Err(anyhow!("Window handle is invalid."));
+        }
+        Ok(())
+    }
+}
+
+impl WindowHandleOperations for WindowHandle {
+    fn get_window_text_length_w(&self) -> Result<i32> {
+        self.validate()?;
+        let length = unsafe { GetWindowTextLengthW(self.handle) };
+        Ok(length)
+    }
+
+    fn get_window_text_w(&self, buffer: &mut Vec<u16>) -> Result<i32> {
+        self.validate()?;
+        let len_written = unsafe { GetWindowTextW(self.handle, buffer) };
+        Ok(len_written)
+    }
+}
+
+/// Gets the title bar string for the foreground window.
+pub(super) fn get_foreground_window_title() -> Result<String> {
+    let window_handle = get_foreground_window_handle()?;
+
+    let expected_window_title_length =
+        get_window_title_length::<WindowHandle, Win32ErrorOperations>(&window_handle)?;
+
+    get_window_title::<WindowHandle, Win32ErrorOperations>(
+        &window_handle,
+        expected_window_title_length,
+    )
+}
+
+/// Retrieves the foreground window handle and validates it.
+fn get_foreground_window_handle() -> Result<WindowHandle> {
+    // https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getforegroundwindow
+    let handle = unsafe { GetForegroundWindow() };
+
+    debug!("GetForegroundWindow() called.");
+
+    let window_handle = WindowHandle::new(handle);
+    window_handle.validate()?;
+
+    Ok(window_handle)
+}
+
+/// # Returns
+///
+/// The length of the window title.
+///
+/// # Errors
+///
+/// - If the length zero and GetLastError() != 0, return the GetLastError() message.
+fn get_window_title_length<H, E>(window_handle: &H) -> Result<usize>
+where
+    H: WindowHandleOperations,
+    E: ErrorOperations,
+{
+    // GetWindowTextLengthW does not itself clear the last error so we must do it ourselves.
+    E::set_last_error(0);
+
+    let length = window_handle.get_window_text_length_w()?;
+
+    let length = usize::try_from(length)?;
+
+    debug!(length, "window text length retrieved from handle.");
+
+    if length == 0 {
+        // attempt to retreive win32 error
+        let last_err = E::get_last_error();
+        if last_err != WIN32_SUCCESS {
+            let last_err = last_err.to_hresult().message();
+            error!(last_err, "Error getting window text length.");
+            return Err(anyhow!("Error getting window text length: {last_err}"));
+        }
+    }
+
+    Ok(length)
+}
+
+/// Gets the window title bar title using the expected length to determine size of buffer
+/// to store it.
+///
+/// # Returns
+///
+/// If the `expected_title_length` is zero, return an Ok result containing empty string. It
+/// Isn't considered an error by the Win32 API.
+///
+/// Otherwise, return the retrieved window title string.
+///
+/// # Errors
+///
+/// - If the actual window title length (what the win32 API declares was written into the buffer),
+///   is length zero and GetLastError() != 0 , return the GetLastError() message.
+fn get_window_title<H, E>(window_handle: &H, expected_title_length: usize) -> Result<String>
+where
+    H: WindowHandleOperations,
+    E: ErrorOperations,
+{
+    if expected_title_length == 0 {
+        // This isn't considered an error by the windows API, but in practice it means we can't
+        // match against the title so we'll stop here.
+        // The upstream will make a contains comparison on what we return, so an empty string
+        // will not result on a match.
+        warn!("Window title length is zero.");
+        return Ok(String::from(""));
+    }
+
+    let mut buffer: Vec<u16> = vec![0; expected_title_length + 1]; // add extra space for the null character
+
+    let actual_window_title_length = window_handle.get_window_text_w(&mut buffer)?;
+
+    debug!(actual_window_title_length, "window title retrieved.");
+
+    if actual_window_title_length == 0 {
+        // attempt to retreive win32 error
+        let last_err = E::get_last_error();
+        if last_err != WIN32_SUCCESS {
+            let last_err = last_err.to_hresult().message();
+            error!(last_err, "Error retrieving window title.");
+            return Err(anyhow!("Error retrieving window title: {last_err}"));
+        }
+        // in practice, we should not get to the below code, since we asserted the len > 0
+        // above. but it is an extra protection in case the windows API didn't set an error.
+        warn!(expected_title_length, "No window title retrieved.");
+    }
+
+    let window_title = OsString::from_wide(&buffer);
+
+    Ok(window_title.to_string_lossy().into_owned())
+}
+
+#[cfg(test)]
+mod tests {
+    //! For the mocking of the traits that are static methods, we need to use the `serial_test`
+    //! crate in order to mock those, since the mock expectations set have to be global in
+    //! absence of a `self`. More info: https://docs.rs/mockall/latest/mockall/#static-methods
+
+    use mockall::predicate;
+    use serial_test::serial;
+    use windows::Win32::Foundation::WIN32_ERROR;
+
+    use super::*;
+    use crate::windowing::MockErrorOperations;
+
+    #[test]
+    #[serial]
+    fn get_window_title_length_can_be_zero() {
+        let mut mock_handle = MockWindowHandleOperations::new();
+
+        let ctxse = MockErrorOperations::set_last_error_context();
+        ctxse
+            .expect()
+            .once()
+            .with(predicate::eq(0))
+            .returning(|_| {});
+
+        mock_handle
+            .expect_get_window_text_length_w()
+            .once()
+            .returning(|| Ok(0));
+
+        let ctxge = MockErrorOperations::get_last_error_context();
+        ctxge.expect().returning(|| WIN32_ERROR(0));
+
+        let len = get_window_title_length::<MockWindowHandleOperations, MockErrorOperations>(
+            &mock_handle,
+        )
+        .unwrap();
+
+        assert_eq!(len, 0);
+    }
+
+    #[test]
+    #[serial]
+    #[should_panic(expected = "Error getting window text length:")]
+    fn get_window_title_length_fails() {
+        let mut mock_handle = MockWindowHandleOperations::new();
+
+        let ctxse = MockErrorOperations::set_last_error_context();
+        ctxse.expect().with(predicate::eq(0)).returning(|_| {});
+
+        mock_handle
+            .expect_get_window_text_length_w()
+            .once()
+            .returning(|| Ok(0));
+
+        let ctxge = MockErrorOperations::get_last_error_context();
+        ctxge.expect().returning(|| WIN32_ERROR(1));
+
+        get_window_title_length::<MockWindowHandleOperations, MockErrorOperations>(&mock_handle)
+            .unwrap();
+    }
+
+    #[test]
+    fn get_window_title_succeeds() {
+        let mut mock_handle = MockWindowHandleOperations::new();
+
+        mock_handle
+            .expect_get_window_text_w()
+            .once()
+            .returning(|buffer| {
+                buffer.fill_with(|| 42); // because why not
+                Ok(42)
+            });
+
+        let title =
+            get_window_title::<MockWindowHandleOperations, MockErrorOperations>(&mock_handle, 42)
+                .unwrap();
+
+        assert_eq!(title.len(), 43); // That extra slot in the buffer for null char
+
+        assert_eq!(title, "*******************************************");
+    }
+
+    #[test]
+    fn get_window_title_returns_empty_string() {
+        let mock_handle = MockWindowHandleOperations::new();
+
+        let title =
+            get_window_title::<MockWindowHandleOperations, MockErrorOperations>(&mock_handle, 0)
+                .unwrap();
+
+        assert_eq!(title, "");
+    }
+
+    #[test]
+    #[serial]
+    #[should_panic(expected = "Error retrieving window title:")]
+    fn get_window_title_fails_with_last_error() {
+        let mut mock_handle = MockWindowHandleOperations::new();
+
+        mock_handle
+            .expect_get_window_text_w()
+            .once()
+            .returning(|_| Ok(0));
+
+        let ctxge = MockErrorOperations::get_last_error_context();
+        ctxge.expect().returning(|| WIN32_ERROR(1));
+
+        get_window_title::<MockWindowHandleOperations, MockErrorOperations>(&mock_handle, 42)
+            .unwrap();
+    }
+
+    #[test]
+    #[serial]
+    fn get_window_title_doesnt_fail_but_reads_zero() {
+        let mut mock_handle = MockWindowHandleOperations::new();
+
+        mock_handle
+            .expect_get_window_text_w()
+            .once()
+            .returning(|_| Ok(0));
+
+        let ctxge = MockErrorOperations::get_last_error_context();
+        ctxge.expect().returning(|| WIN32_ERROR(0));
+
+        get_window_title::<MockWindowHandleOperations, MockErrorOperations>(&mock_handle, 42)
+            .unwrap();
+    }
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/Cargo.toml b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/Cargo.toml
new file mode 100644
index 00000000000..ff641731661
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "bitwarden_chromium_import_helper"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+
+[target.'cfg(target_os = "windows")'.dependencies]
+aes-gcm = { workspace = true }
+chacha20poly1305 = { workspace = true }
+chromium_importer = { path = "../chromium_importer" }
+clap = { version = "=4.5.53", features = ["derive"] }
+scopeguard = { workspace = true }
+sysinfo = { workspace = true }
+windows = { workspace = true, features = [
+    "Win32_System_Pipes",
+] }
+anyhow = { workspace = true }
+base64 = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+
+[build-dependencies]
+embed-resource = "=3.0.6"
+
+[lints]
+workspace = true
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/build.rs b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/build.rs
new file mode 100644
index 00000000000..326929ec7c8
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/build.rs
@@ -0,0 +1,9 @@
+fn main() {
+    if std::env::var("CARGO_CFG_TARGET_OS").expect("to be set by cargo") == "windows" {
+        println!("cargo:rerun-if-changed=resources.rc");
+
+        embed_resource::compile("resources.rc", embed_resource::NONE)
+            .manifest_optional()
+            .expect("to compile resources");
+    }
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/resources.rc b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/resources.rc
new file mode 100644
index 00000000000..c300cc5d77f
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/resources.rc
@@ -0,0 +1 @@
+1 ICON "../../resources/icon.ico"
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/main.rs b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/main.rs
new file mode 100644
index 00000000000..036e04de16b
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/main.rs
@@ -0,0 +1,13 @@
+#[cfg(target_os = "windows")]
+mod windows;
+
+#[cfg(target_os = "windows")]
+#[tokio::main]
+async fn main() {
+    windows::main().await;
+}
+
+#[cfg(not(target_os = "windows"))]
+fn main() {
+    // Empty
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/config.rs b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/config.rs
new file mode 100644
index 00000000000..cf05b4de524
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/config.rs
@@ -0,0 +1,2 @@
+// List of SYSTEM process names to try to impersonate
+pub(crate) const SYSTEM_PROCESS_NAMES: [&str; 2] = ["services.exe", "winlogon.exe"];
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/crypto.rs b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/crypto.rs
new file mode 100644
index 00000000000..c335a4b296a
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/crypto.rs
@@ -0,0 +1,279 @@
+use aes_gcm::{aead::Aead, Aes256Gcm, Key, KeyInit};
+use anyhow::{anyhow, Result};
+use base64::{engine::general_purpose, Engine as _};
+use chacha20poly1305::ChaCha20Poly1305;
+use chromium_importer::chromium::crypt_unprotect_data;
+use scopeguard::defer;
+use tracing::debug;
+use windows::{
+    core::w,
+    Win32::Security::Cryptography::{
+        self, NCryptOpenKey, NCryptOpenStorageProvider, CERT_KEY_SPEC, CRYPTPROTECT_UI_FORBIDDEN,
+        NCRYPT_FLAGS, NCRYPT_KEY_HANDLE, NCRYPT_PROV_HANDLE, NCRYPT_SILENT_FLAG,
+    },
+};
+
+use super::impersonate::{start_impersonating, stop_impersonating};
+
+//
+// Base64
+//
+
+pub(crate) fn decode_base64(data_base64: &str) -> Result<Vec<u8>> {
+    debug!("Decoding base64 data: {}", data_base64);
+
+    let data = general_purpose::STANDARD.decode(data_base64).map_err(|e| {
+        debug!("Failed to decode base64: {}", e);
+        e
+    })?;
+
+    Ok(data)
+}
+
+pub(crate) fn encode_base64(data: &[u8]) -> String {
+    general_purpose::STANDARD.encode(data)
+}
+
+//
+// DPAPI decryption
+//
+
+pub(crate) fn decrypt_with_dpapi_as_system(encrypted: &[u8]) -> Result<Vec<u8>> {
+    // Impersonate a SYSTEM process to be able to decrypt data encrypted for the machine
+    let system_token = start_impersonating()?;
+    defer! {
+        debug!("Stopping impersonation");
+        _ = stop_impersonating(system_token);
+    }
+
+    decrypt_with_dpapi_as_user(encrypted, true)
+}
+
+pub(crate) fn decrypt_with_dpapi_as_user(encrypted: &[u8], expect_appb: bool) -> Result<Vec<u8>> {
+    let system_decrypted = decrypt_with_dpapi(encrypted, expect_appb)?;
+    debug!(
+        "Decrypted data with SYSTEM {} bytes",
+        system_decrypted.len()
+    );
+
+    Ok(system_decrypted)
+}
+
+fn decrypt_with_dpapi(data: &[u8], expect_appb: bool) -> Result<Vec<u8>> {
+    if expect_appb && (data.len() < 5 || !data.starts_with(b"APPB")) {
+        const ERR_MSG: &str = "Ciphertext is too short or does not start with 'APPB'";
+        debug!("{}", ERR_MSG);
+        return Err(anyhow!(ERR_MSG));
+    }
+
+    let data = if expect_appb { &data[4..] } else { data };
+
+    crypt_unprotect_data(data, CRYPTPROTECT_UI_FORBIDDEN)
+}
+
+//
+// Chromium key decoding
+//
+
+pub(crate) fn decode_abe_key_blob(blob_data: &[u8]) -> Result<Vec<u8>> {
+    // Parse and skip the header
+    let header_len = u32::from_le_bytes(get_safe(blob_data, 0, 4)?.try_into()?) as usize;
+    debug!("ABE key blob header length: {}", header_len);
+
+    // Parse content length
+    let content_len_offset = 4 + header_len;
+    let content_len =
+        u32::from_le_bytes(get_safe(blob_data, content_len_offset, 4)?.try_into()?) as usize;
+    debug!("ABE key blob content length: {}", content_len);
+
+    if content_len < 32 {
+        return Err(anyhow!(
+            "Corrupted ABE key blob: content length is less than 32"
+        ));
+    }
+
+    let content_offset = content_len_offset + 4;
+    let content = get_safe(blob_data, content_offset, content_len)?;
+
+    // When the size is exactly 32 bytes, it's a plain key. It's used in unbranded Chromium builds,
+    // Brave, possibly Edge
+    if content_len == 32 {
+        return Ok(content.to_vec());
+    }
+
+    let version = content[0];
+    debug!("ABE key blob version: {}", version);
+
+    let key_blob = &content[1..];
+    match version {
+        // Google Chrome v1 key encrypted with a hardcoded AES key
+        1_u8 => decrypt_abe_key_blob_chrome_aes(key_blob),
+        // Google Chrome v2 key encrypted with a hardcoded ChaCha20 key
+        2_u8 => decrypt_abe_key_blob_chrome_chacha20(key_blob),
+        // Google Chrome v3 key encrypted with CNG APIs
+        3_u8 => decrypt_abe_key_blob_chrome_cng(key_blob),
+        v => Err(anyhow!("Unsupported ABE key blob version: {}", v)),
+    }
+}
+
+fn get_safe(data: &[u8], start: usize, len: usize) -> Result<&[u8]> {
+    let end = start + len;
+    data.get(start..end).ok_or_else(|| {
+        anyhow!(
+            "Corrupted ABE key blob: expected bytes {}..{}, got {}",
+            start,
+            end,
+            data.len()
+        )
+    })
+}
+
+fn decrypt_abe_key_blob_chrome_aes(blob: &[u8]) -> Result<Vec<u8>> {
+    const GOOGLE_AES_KEY: &[u8] = &[
+        0xB3, 0x1C, 0x6E, 0x24, 0x1A, 0xC8, 0x46, 0x72, 0x8D, 0xA9, 0xC1, 0xFA, 0xC4, 0x93, 0x66,
+        0x51, 0xCF, 0xFB, 0x94, 0x4D, 0x14, 0x3A, 0xB8, 0x16, 0x27, 0x6B, 0xCC, 0x6D, 0xA0, 0x28,
+        0x47, 0x87,
+    ];
+    let aes_key = Key::<Aes256Gcm>::from_slice(GOOGLE_AES_KEY);
+    let cipher = Aes256Gcm::new(aes_key);
+
+    decrypt_abe_key_blob_with_aead(blob, &cipher, "v1 (AES flavor)")
+}
+
+fn decrypt_abe_key_blob_chrome_chacha20(blob: &[u8]) -> Result<Vec<u8>> {
+    const GOOGLE_CHACHA20_KEY: &[u8] = &[
+        0xE9, 0x8F, 0x37, 0xD7, 0xF4, 0xE1, 0xFA, 0x43, 0x3D, 0x19, 0x30, 0x4D, 0xC2, 0x25, 0x80,
+        0x42, 0x09, 0x0E, 0x2D, 0x1D, 0x7E, 0xEA, 0x76, 0x70, 0xD4, 0x1F, 0x73, 0x8D, 0x08, 0x72,
+        0x96, 0x60,
+    ];
+
+    let chacha20_key = chacha20poly1305::Key::from_slice(GOOGLE_CHACHA20_KEY);
+    let cipher = ChaCha20Poly1305::new(chacha20_key);
+
+    decrypt_abe_key_blob_with_aead(blob, &cipher, "v2 (ChaCha20 flavor)")
+}
+
+fn decrypt_abe_key_blob_with_aead<C>(blob: &[u8], cipher: &C, version: &str) -> Result<Vec<u8>>
+where
+    C: Aead,
+{
+    if blob.len() < 60 {
+        return Err(anyhow!(
+            "Corrupted ABE key blob: expected at least 60 bytes, got {} bytes",
+            blob.len()
+        ));
+    }
+
+    let iv = &blob[0..12];
+    let ciphertext = &blob[12..12 + 48];
+
+    debug!("Google ABE {} detected: {:?} {:?}", version, iv, ciphertext);
+
+    let decrypted = cipher
+        .decrypt(iv.into(), ciphertext)
+        .map_err(|e| anyhow!("Failed to decrypt v20 key with {}: {}", version, e))?;
+
+    Ok(decrypted)
+}
+
+fn decrypt_abe_key_blob_chrome_cng(blob: &[u8]) -> Result<Vec<u8>> {
+    if blob.len() < 92 {
+        return Err(anyhow!(
+            "Corrupted ABE key blob: expected at least 92 bytes, got {} bytes",
+            blob.len()
+        ));
+    }
+
+    let encrypted_aes_key: [u8; 32] = blob[0..32].try_into()?;
+    let iv: [u8; 12] = blob[32..32 + 12].try_into()?;
+    let ciphertext: [u8; 48] = blob[44..44 + 48].try_into()?;
+
+    debug!(
+        "Google ABE v3 (CNG flavor) detected: {:?} {:?} {:?}",
+        encrypted_aes_key, iv, ciphertext
+    );
+
+    // First, decrypt the AES key with CNG API
+    let decrypted_aes_key: Vec<u8> = {
+        let system_token = start_impersonating()?;
+        defer! {
+            debug!("Stopping impersonation");
+            _ = stop_impersonating(system_token);
+        }
+        decrypt_with_cng(&encrypted_aes_key)?
+    };
+
+    const GOOGLE_XOR_KEY: [u8; 32] = [
+        0xCC, 0xF8, 0xA1, 0xCE, 0xC5, 0x66, 0x05, 0xB8, 0x51, 0x75, 0x52, 0xBA, 0x1A, 0x2D, 0x06,
+        0x1C, 0x03, 0xA2, 0x9E, 0x90, 0x27, 0x4F, 0xB2, 0xFC, 0xF5, 0x9B, 0xA4, 0xB7, 0x5C, 0x39,
+        0x23, 0x90,
+    ];
+
+    // XOR the decrypted AES key with the hardcoded key
+    let aes_key: Vec<u8> = decrypted_aes_key
+        .into_iter()
+        .zip(GOOGLE_XOR_KEY)
+        .map(|(a, b)| a ^ b)
+        .collect();
+
+    // Decrypt the actual ABE key with the decrypted AES key
+    let cipher = Aes256Gcm::new(aes_key.as_slice().into());
+    let key = cipher
+        .decrypt((&iv).into(), ciphertext.as_ref())
+        .map_err(|e| anyhow!("Failed to decrypt v20 key with AES-GCM: {}", e))?;
+
+    Ok(key)
+}
+
+fn decrypt_with_cng(ciphertext: &[u8]) -> Result<Vec<u8>> {
+    // 1. Open the cryptographic provider
+    let mut provider = NCRYPT_PROV_HANDLE::default();
+    unsafe {
+        NCryptOpenStorageProvider(
+            &mut provider,
+            w!("Microsoft Software Key Storage Provider"),
+            0,
+        )?;
+    };
+
+    // Don't forget to free the provider
+    defer!(unsafe {
+        _ = Cryptography::NCryptFreeObject(provider.into());
+    });
+
+    // 2. Open the key
+    let mut key = NCRYPT_KEY_HANDLE::default();
+    unsafe {
+        NCryptOpenKey(
+            provider,
+            &mut key,
+            w!("Google Chromekey1"),
+            CERT_KEY_SPEC::default(),
+            NCRYPT_FLAGS::default(),
+        )?;
+    };
+
+    // Don't forget to free the key
+    defer!(unsafe {
+        _ = Cryptography::NCryptFreeObject(key.into());
+    });
+
+    // 3. Decrypt the data (assume the plaintext is not larger than the ciphertext)
+    let mut plaintext = vec![0; ciphertext.len()];
+    let mut plaintext_len = 0;
+    unsafe {
+        Cryptography::NCryptDecrypt(
+            key,
+            ciphertext.into(),
+            None,
+            Some(&mut plaintext),
+            &mut plaintext_len,
+            NCRYPT_SILENT_FLAG,
+        )?;
+    };
+
+    // In case the plaintext is smaller than the ciphertext
+    plaintext.truncate(plaintext_len as usize);
+
+    Ok(plaintext)
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/impersonate.rs b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/impersonate.rs
new file mode 100644
index 00000000000..22006b8db14
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/impersonate.rs
@@ -0,0 +1,140 @@
+use anyhow::{anyhow, Result};
+use sysinfo::System;
+use tracing::debug;
+use windows::{
+    core::BOOL,
+    Wdk::System::SystemServices::SE_DEBUG_PRIVILEGE,
+    Win32::{
+        Foundation::{CloseHandle, HANDLE, NTSTATUS, STATUS_SUCCESS},
+        Security::{
+            self, DuplicateToken, ImpersonateLoggedOnUser, RevertToSelf, TOKEN_DUPLICATE,
+            TOKEN_QUERY,
+        },
+        System::Threading::{OpenProcess, OpenProcessToken, PROCESS_QUERY_LIMITED_INFORMATION},
+    },
+};
+
+use super::config::SYSTEM_PROCESS_NAMES;
+
+#[link(name = "ntdll")]
+unsafe extern "system" {
+    unsafe fn RtlAdjustPrivilege(
+        privilege: i32,
+        enable: BOOL,
+        current_thread: BOOL,
+        previous_value: *mut BOOL,
+    ) -> NTSTATUS;
+}
+
+pub(crate) fn start_impersonating() -> Result<HANDLE> {
+    // Need to enable SE_DEBUG_PRIVILEGE to enumerate and open SYSTEM processes
+    enable_debug_privilege()?;
+
+    // Find a SYSTEM process and get its token. Not every SYSTEM process allows token duplication,
+    // so try several.
+    let (token, pid, name) = find_system_process_with_token(get_system_pid_list())?;
+
+    // Impersonate the SYSTEM process
+    unsafe {
+        ImpersonateLoggedOnUser(token)?;
+    };
+    debug!("Impersonating system process '{}' (PID: {})", name, pid);
+
+    Ok(token)
+}
+
+pub(crate) fn stop_impersonating(token: HANDLE) -> Result<()> {
+    unsafe {
+        RevertToSelf()?;
+        CloseHandle(token)?;
+    };
+    Ok(())
+}
+
+fn find_system_process_with_token(
+    pids: Vec<(u32, &'static str)>,
+) -> Result<(HANDLE, u32, &'static str)> {
+    for (pid, name) in pids {
+        match get_system_token_from_pid(pid) {
+            Err(_) => {
+                debug!(
+                    "Failed to open process handle '{}' (PID: {}), skipping",
+                    name, pid
+                );
+                continue;
+            }
+            Ok(system_handle) => {
+                return Ok((system_handle, pid, name));
+            }
+        }
+    }
+    Err(anyhow!("Failed to get system token from any process"))
+}
+
+fn get_system_token_from_pid(pid: u32) -> Result<HANDLE> {
+    let handle = get_process_handle(pid)?;
+    let token = get_system_token(handle)?;
+    unsafe {
+        CloseHandle(handle)?;
+    };
+    Ok(token)
+}
+
+fn get_system_token(handle: HANDLE) -> Result<HANDLE> {
+    let token_handle = unsafe {
+        let mut token_handle = HANDLE::default();
+        OpenProcessToken(handle, TOKEN_DUPLICATE | TOKEN_QUERY, &mut token_handle)?;
+        token_handle
+    };
+
+    let duplicate_token = unsafe {
+        let mut duplicate_token = HANDLE::default();
+        DuplicateToken(
+            token_handle,
+            Security::SECURITY_IMPERSONATION_LEVEL(2),
+            &mut duplicate_token,
+        )?;
+        CloseHandle(token_handle)?;
+        duplicate_token
+    };
+
+    Ok(duplicate_token)
+}
+
+fn get_system_pid_list() -> Vec<(u32, &'static str)> {
+    let sys = System::new_all();
+    SYSTEM_PROCESS_NAMES
+        .iter()
+        .flat_map(|&name| {
+            sys.processes_by_exact_name(name.as_ref())
+                .map(move |process| (process.pid().as_u32(), name))
+        })
+        .collect()
+}
+
+fn get_process_handle(pid: u32) -> Result<HANDLE> {
+    let hprocess = unsafe { OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, false, pid) }?;
+    Ok(hprocess)
+}
+
+fn enable_debug_privilege() -> Result<()> {
+    let mut previous_value = BOOL(0);
+    let status = unsafe {
+        debug!("Setting SE_DEBUG_PRIVILEGE to 1 via RtlAdjustPrivilege");
+        RtlAdjustPrivilege(SE_DEBUG_PRIVILEGE, BOOL(1), BOOL(0), &mut previous_value)
+    };
+
+    match status {
+        STATUS_SUCCESS => {
+            debug!(
+                "SE_DEBUG_PRIVILEGE set to 1, was {} before",
+                previous_value.as_bool()
+            );
+            Ok(())
+        }
+        _ => {
+            debug!("RtlAdjustPrivilege failed with status: 0x{:X}", status.0);
+            Err(anyhow!("Failed to adjust privilege"))
+        }
+    }
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/log.rs b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/log.rs
new file mode 100644
index 00000000000..aa00a2f61b7
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/log.rs
@@ -0,0 +1,29 @@
+use chromium_importer::config::{ENABLE_DEVELOPER_LOGGING, LOG_FILENAME};
+use tracing::{error, level_filters::LevelFilter};
+use tracing_subscriber::{
+    fmt, layer::SubscriberExt as _, util::SubscriberInitExt as _, EnvFilter, Layer as _,
+};
+
+pub(crate) fn init_logging() {
+    if ENABLE_DEVELOPER_LOGGING {
+        // We only log to a file. It's impossible to see stdout/stderr when this exe is launched
+        // from ShellExecuteW.
+        match std::fs::File::create(LOG_FILENAME) {
+            Ok(file) => {
+                let file_filter = EnvFilter::builder()
+                    .with_default_directive(LevelFilter::DEBUG.into())
+                    .from_env_lossy();
+
+                let file_layer = fmt::layer()
+                    .with_writer(file)
+                    .with_ansi(false)
+                    .with_filter(file_filter);
+
+                tracing_subscriber::registry().with(file_layer).init();
+            }
+            Err(error) => {
+                error!(%error, ?LOG_FILENAME, "Could not create log file.");
+            }
+        }
+    }
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/main.rs b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/main.rs
new file mode 100644
index 00000000000..560135b8ce4
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/main.rs
@@ -0,0 +1,225 @@
+use std::{
+    ffi::OsString,
+    os::windows::{ffi::OsStringExt as _, io::AsRawHandle},
+    path::PathBuf,
+    time::Duration,
+};
+
+use anyhow::{anyhow, Result};
+use chromium_importer::chromium::{verify_signature, ADMIN_TO_USER_PIPE_NAME};
+use clap::Parser;
+use scopeguard::defer;
+use tokio::{
+    io::{AsyncReadExt, AsyncWriteExt},
+    net::windows::named_pipe::{ClientOptions, NamedPipeClient},
+    time,
+};
+use tracing::{debug, error};
+use windows::Win32::{
+    Foundation::{CloseHandle, ERROR_PIPE_BUSY, HANDLE},
+    System::{
+        Pipes::GetNamedPipeServerProcessId,
+        Threading::{
+            OpenProcess, QueryFullProcessImageNameW, PROCESS_NAME_WIN32,
+            PROCESS_QUERY_LIMITED_INFORMATION,
+        },
+    },
+    UI::Shell::IsUserAnAdmin,
+};
+
+use super::{
+    crypto::{
+        decode_abe_key_blob, decode_base64, decrypt_with_dpapi_as_system,
+        decrypt_with_dpapi_as_user, encode_base64,
+    },
+    log::init_logging,
+};
+
+#[derive(Parser)]
+#[command(name = "bitwarden_chromium_import_helper")]
+#[command(about = "Admin tool for ABE service management")]
+struct Args {
+    #[arg(long, help = "Base64 encoded encrypted data string")]
+    encrypted: String,
+}
+
+async fn open_pipe_client(pipe_name: &'static str) -> Result<NamedPipeClient> {
+    let max_attempts = 5;
+    for _ in 0..max_attempts {
+        match ClientOptions::new().open(pipe_name) {
+            Ok(client) => {
+                debug!("Successfully connected to the pipe!");
+                return Ok(client);
+            }
+            Err(e) if e.raw_os_error() == Some(ERROR_PIPE_BUSY.0 as i32) => {
+                debug!("Pipe is busy, retrying in 50ms...");
+            }
+            Err(e) => {
+                debug!("Failed to connect to pipe: {}", &e);
+                return Err(e.into());
+            }
+        }
+
+        time::sleep(Duration::from_millis(50)).await;
+    }
+
+    Err(anyhow!(
+        "Failed to connect to pipe after {} attempts",
+        max_attempts
+    ))
+}
+
+async fn send_message_with_client(client: &mut NamedPipeClient, message: &str) -> Result<String> {
+    client.write_all(message.as_bytes()).await?;
+
+    // Try to receive a response for this message
+    let mut buffer = vec![0u8; 64 * 1024];
+    match client.read(&mut buffer).await {
+        Ok(0) => Err(anyhow!(
+            "Server closed the connection (0 bytes read) on message"
+        )),
+        Ok(bytes_received) => {
+            let response = String::from_utf8_lossy(&buffer[..bytes_received]);
+            Ok(response.to_string())
+        }
+        Err(e) => Err(anyhow!("Failed to receive response for message: {}", e)),
+    }
+}
+
+fn get_named_pipe_server_pid(client: &NamedPipeClient) -> Result<u32> {
+    let handle = HANDLE(client.as_raw_handle() as _);
+    let mut pid: u32 = 0;
+    unsafe { GetNamedPipeServerProcessId(handle, &mut pid) }?;
+    Ok(pid)
+}
+
+fn resolve_process_executable_path(pid: u32) -> Result<PathBuf> {
+    debug!("Resolving process executable path for PID {}", pid);
+
+    // Open the process handle
+    let hprocess = unsafe { OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, false, pid) }?;
+    debug!("Opened process handle for PID {}", pid);
+
+    // Close when no longer needed
+    defer! {
+        debug!("Closing process handle for PID {}", pid);
+        unsafe {
+            _ = CloseHandle(hprocess);
+        }
+    };
+
+    let mut exe_name = vec![0u16; 32 * 1024];
+    let mut exe_name_length = exe_name.len() as u32;
+    unsafe {
+        QueryFullProcessImageNameW(
+            hprocess,
+            PROCESS_NAME_WIN32,
+            windows::core::PWSTR(exe_name.as_mut_ptr()),
+            &mut exe_name_length,
+        )
+    }?;
+    debug!(
+        "QueryFullProcessImageNameW returned {} bytes",
+        exe_name_length
+    );
+
+    exe_name.truncate(exe_name_length as usize);
+    Ok(PathBuf::from(OsString::from_wide(&exe_name)))
+}
+
+async fn send_error_to_user(client: &mut NamedPipeClient, error_message: &str) {
+    _ = send_to_user(client, &format!("!{}", error_message)).await
+}
+
+async fn send_to_user(client: &mut NamedPipeClient, message: &str) -> Result<()> {
+    let _ = send_message_with_client(client, message).await?;
+    Ok(())
+}
+
+fn is_admin() -> bool {
+    unsafe { IsUserAnAdmin().as_bool() }
+}
+
+async fn open_and_validate_pipe_server(pipe_name: &'static str) -> Result<NamedPipeClient> {
+    let client = open_pipe_client(pipe_name).await?;
+
+    let server_pid = get_named_pipe_server_pid(&client)?;
+    debug!("Connected to pipe server PID {}", server_pid);
+
+    // Validate the server end process signature
+    let exe_path = resolve_process_executable_path(server_pid)?;
+
+    debug!("Pipe server executable path: {}", exe_path.display());
+
+    if !verify_signature(&exe_path)? {
+        return Err(anyhow!("Pipe server signature is not valid"));
+    }
+
+    debug!("Pipe server signature verified for PID {}", server_pid);
+
+    Ok(client)
+}
+
+fn run() -> Result<String> {
+    debug!("Starting bitwarden_chromium_import_helper.exe");
+
+    let args = Args::try_parse()?;
+
+    if !is_admin() {
+        return Err(anyhow!("Expected to run with admin privileges"));
+    }
+
+    debug!("Running as ADMINISTRATOR");
+
+    let encrypted = decode_base64(&args.encrypted)?;
+    debug!(
+        "Decoded encrypted data [{}] {:?}",
+        encrypted.len(),
+        encrypted
+    );
+
+    let system_decrypted = decrypt_with_dpapi_as_system(&encrypted)?;
+    debug!(
+        "Decrypted data with DPAPI as SYSTEM {} {:?}",
+        system_decrypted.len(),
+        system_decrypted
+    );
+
+    let user_decrypted = decrypt_with_dpapi_as_user(&system_decrypted, false)?;
+    debug!(
+        "Decrypted data with DPAPI as USER {} {:?}",
+        user_decrypted.len(),
+        user_decrypted
+    );
+
+    let key = decode_abe_key_blob(&user_decrypted)?;
+    debug!("Decoded ABE key blob {} {:?}", key.len(), key);
+
+    Ok(encode_base64(&key))
+}
+
+pub(crate) async fn main() {
+    init_logging();
+
+    let mut client = match open_and_validate_pipe_server(ADMIN_TO_USER_PIPE_NAME).await {
+        Ok(client) => client,
+        Err(e) => {
+            error!(
+                "Failed to open pipe {} to send result/error: {}",
+                ADMIN_TO_USER_PIPE_NAME, e
+            );
+            return;
+        }
+    };
+
+    match run() {
+        Ok(system_decrypted_base64) => {
+            debug!("Sending response back to user");
+            let _ = send_to_user(&mut client, &system_decrypted_base64).await;
+        }
+        Err(e) => {
+            debug!("Error: {}", e);
+            send_error_to_user(&mut client, &format!("{}", e)).await;
+        }
+    }
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/mod.rs b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/mod.rs
new file mode 100644
index 00000000000..d745dc27618
--- /dev/null
+++ b/apps/desktop/desktop_native/bitwarden_chromium_import_helper/src/windows/mod.rs
@@ -0,0 +1,7 @@
+mod config;
+mod crypto;
+mod impersonate;
+mod log;
+mod main;
+
+pub(crate) use main::main;
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/README.md b/apps/desktop/desktop_native/bitwarden_chromium_importer/README.md
deleted file mode 100644
index 498dd3ac67d..00000000000
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/README.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# Windows ABE Architecture
-
-## Overview
-
-The Windows Application Bound Encryption (ABE) consists of three main components that work together:
-
-- **client library** -- Library that is part of the desktop client application
-- **admin.exe** -- Service launcher running as ADMINISTRATOR
-- **service.exe** -- Background Windows service running as SYSTEM
-
-_(The names of the binaries will be changed for the released product.)_
-
-## The goal
-
-The goal of this subsystem is to decrypt the master encryption key with which the login information
-is encrypted on the local system in Windows. This applies to the most recent versions of Chrome and
-Edge (untested yet) that are using the ABE/v20 encryption scheme for some of the local profiles.
-
-The general idea of this encryption scheme is that Chrome generates a unique random encryption key,
-then encrypts it at the user level with a fixed key. It then sends it to the Windows Data Protection
-API at the user level, and then, using an installed service, encrypts it with the Windows Data
-Protection API at the system level on top of that. This triply encrypted key is later stored in the
-`Local State` file.
-
-The next paragraphs describe what is done at each level to decrypt the key.
-
-## 1. Client library
-
-This is a Rust module that is part of the Chromium importer. It only compiles and runs on Windows
-(see `abe.rs` and `abe_config.rs`). Its main task is to launch `admin.exe` with elevated privileges
-by presenting the user with the UAC screen. See the `abe::decrypt_with_admin_and_service` invocation
-in `windows.rs`.
-
-This function takes three arguments:
-
-1. Absolute path to `admin.exe`
-2. Absolute path to `service.exe`
-3. Base64 string of the ABE key extracted from the browser's local state
-
-It's not possible to install the service from the user-level executable. So first, we have to
-elevate the privileges and run `admin.exe` as ADMINISTRATOR. This is done by calling `ShellExecute`
-with the `runas` verb. Since it's not trivial to read the standard output from an application
-launched in this way, a named pipe server is created at the user level, which waits for the response
-from `admin.exe` after it has been launched.
-
-The name of the service executable and the data to be decrypted are passed via the command line to
-`admin.exe` like this:
-
-```bat
-admin.exe --service-exe "c:\temp\service.exe" --encrypted "QVBQQgEAAADQjJ3fARXREYx6AMBPwpfrAQAAA..."
-```
-
-**At this point, the user must permit the action to be performed on the UAC screen.**
-
-## 2. Admin executable
-
-This executable receives the full path of `service.exe` and the data to be decrypted.
-
-First, it installs the service to run as SYSTEM and waits for it to start running. The service
-creates a named pipe server that the admin-level executable communicates with (see the `service.exe`
-description further down).
-
-It sends the base64 string to the pipe server in a raw message and waits for the answer. The answer
-could be a success or a failure. In case of success, it's a base64 string decrypted at the system
-level. In case of failure, it's an error message prefixed with an `!`. In either case, the response
-is sent to the named pipe server created by the user. The user responds with `ok` (ignored).
-
-After that, the executable stops and uninstalls the service and then exits.
-
-## 3. System service
-
-The service starts and creates a named pipe server for communication between `admin.exe` and the
-system service. Please note that it is not possible to communicate between the user and the system
-service directly via a named pipe. Thus, this three-layered approach is necessary.
-
-Once the service is started, it waits for the incoming message via the named pipe. The expected
-message is a base64 string to be decrypted. The data is decrypted via the Windows Data Protection
-API `CryptUnprotectData` and sent back in response to this incoming message in base64 encoding. In
-case of an error, the error message is sent back prefixed with an `!`.
-
-The service keeps running and servicing more requests if there are any, until it's stopped and
-removed from the system. Even though we send only one request, the service is designed to handle as
-many clients with as many messages as needed and could be installed on the system permanently if
-necessary.
-
-## 4. Back to client library
-
-The decrypted base64-encoded string comes back from the admin executable to the named pipe server at
-the user level. At this point, it has been decrypted only once at the system level.
-
-In the next step, the string is decrypted at the user level with the same Windows Data Protection
-API.
-
-And as the third step, it's decrypted with a hard-coded key found in the `elevation_service.exe`
-from the Chrome installation. Based on the version of the encrypted string (encoded in the string
-itself), it's either AES-256-GCM or ChaCha20Poly1305 encryption scheme. The details can be found in
-`windows.rs`.
-
-After all of these steps, we have the master key which can be used to decrypt the password
-information stored in the local database.
-
-## Summary
-
-The Windows ABE decryption process involves a three-tier architecture with named pipe communication:
-
-```mermaid
-sequenceDiagram
-    participant Client as Client Library (User)
-    participant Admin as admin.exe (Administrator)
-    participant Service as service.exe (System)
-
-    Client->>Client: Create named pipe server
-    Note over Client: \\.\pipe\BitwardenEncryptionService-admin-user
-
-    Client->>Admin: Launch with UAC elevation
-    Note over Client,Admin: --service-exe c:\path\to\service.exe
-    Note over Client,Admin: --encrypted QVBQQgEAAADQjJ3fARXRE...
-
-    Client->>Client: Wait for response
-
-    Admin->>Service: Install & start service
-    Note over Admin,Service: c:\path\to\service.exe
-
-    Service->>Service: Create named pipe server
-    Note over Service: \\.\pipe\BitwardenEncryptionService-service-admin
-
-    Service->>Service: Wait for message
-
-    Admin->>Service: Send encrypted data via admin-service pipe
-    Note over Admin,Service: QVBQQgEAAADQjJ3fARXRE...
-
-    Admin->>Admin: Wait for response
-
-    Service->>Service: Decrypt with system-level DPAPI
-
-    Service->>Admin: Return decrypted data via admin-service pipe
-    Note over Service,Admin: EjRWeXN0ZW0gU2VydmljZQ...
-
-    Admin->>Client: Send result via named user-admin pipe
-    Note over Client,Admin: EjRWeXN0ZW0gU2VydmljZQ...
-
-    Client->>Admin: Send ACK to admin
-    Note over Client,Admin: ok
-
-    Admin->>Service: Stop & uninstall service
-    Service-->>Admin: Exit
-
-    Admin-->>Client: Exit
-
-    Client->>Client: Decrypt with user-level DPAPI
-
-    Client->>Client: Decrypt with hardcoded key
-    Note over Client: AES-256-GCM or ChaCha20Poly1305
-
-    Client->>Client: Done
-```
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs
deleted file mode 100644
index e6442e21742..00000000000
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-//! Cryptographic primitives used in the SDK
-
-use anyhow::{anyhow, Result};
-
-use aes::cipher::{
-    block_padding::Pkcs7, generic_array::GenericArray, typenum::U32, BlockDecryptMut, KeyIvInit,
-};
-
-pub fn decrypt_aes256(iv: &[u8; 16], data: &[u8], key: GenericArray<u8, U32>) -> Result<Vec<u8>> {
-    let iv = GenericArray::from_slice(iv);
-    let mut data = data.to_vec();
-    cbc::Decryptor::<aes::Aes256>::new(&key, iv)
-        .decrypt_padded_mut::<Pkcs7>(&mut data)
-        .map_err(|_| anyhow!("Failed to decrypt data"))?;
-
-    Ok(data)
-}
-
-#[cfg(test)]
-mod tests {
-    use aes::cipher::{
-        generic_array::{sequence::GenericSequence, GenericArray},
-        ArrayLength,
-    };
-    use base64::{engine::general_purpose::STANDARD, Engine};
-
-    pub fn generate_vec(length: usize, offset: u8, increment: u8) -> Vec<u8> {
-        (0..length).map(|i| offset + i as u8 * increment).collect()
-    }
-    pub fn generate_generic_array<N: ArrayLength<u8>>(
-        offset: u8,
-        increment: u8,
-    ) -> GenericArray<u8, N> {
-        GenericArray::generate(|i| offset + i as u8 * increment)
-    }
-
-    #[test]
-    fn test_decrypt_aes256() {
-        let iv = generate_vec(16, 0, 1);
-        let iv: &[u8; 16] = iv.as_slice().try_into().unwrap();
-        let key = generate_generic_array(0, 1);
-        let data: Vec<u8> = STANDARD.decode("ByUF8vhyX4ddU9gcooznwA==").unwrap();
-
-        let decrypted = super::decrypt_aes256(iv, &data, key).unwrap();
-
-        assert_eq!(String::from_utf8(decrypted).unwrap(), "EncryptMe!\u{6}\u{6}\u{6}\u{6}\u{6}\u{6}");
-    }
-}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/lib.rs b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/lib.rs
deleted file mode 100644
index b0a399d6321..00000000000
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/lib.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod chromium;
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/windows.rs b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/windows.rs
deleted file mode 100644
index e7dffe93dba..00000000000
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/windows.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use aes_gcm::aead::Aead;
-use aes_gcm::{Aes256Gcm, Key, KeyInit, Nonce};
-use anyhow::{anyhow, Result};
-use async_trait::async_trait;
-use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine as _};
-use winapi::shared::minwindef::{BOOL, BYTE, DWORD};
-use winapi::um::{dpapi::CryptUnprotectData, wincrypt::DATA_BLOB};
-use windows::Win32::Foundation::{LocalFree, HLOCAL};
-
-use crate::chromium::{BrowserConfig, CryptoService, LocalState};
-
-#[allow(dead_code)]
-mod util;
-
-//
-// Public API
-//
-
-pub const SUPPORTED_BROWSERS: [BrowserConfig; 6] = [
-    BrowserConfig {
-        name: "Chrome",
-        data_dir: "AppData/Local/Google/Chrome/User Data",
-    },
-    BrowserConfig {
-        name: "Chromium",
-        data_dir: "AppData/Local/Chromium/User Data",
-    },
-    BrowserConfig {
-        name: "Microsoft Edge",
-        data_dir: "AppData/Local/Microsoft/Edge/User Data",
-    },
-    BrowserConfig {
-        name: "Brave",
-        data_dir: "AppData/Local/BraveSoftware/Brave-Browser/User Data",
-    },
-    BrowserConfig {
-        name: "Opera",
-        data_dir: "AppData/Roaming/Opera Software/Opera Stable",
-    },
-    BrowserConfig {
-        name: "Vivaldi",
-        data_dir: "AppData/Local/Vivaldi/User Data",
-    },
-];
-
-pub fn get_crypto_service(
-    _browser_name: &str,
-    local_state: &LocalState,
-) -> Result<Box<dyn CryptoService>> {
-    Ok(Box::new(WindowsCryptoService::new(local_state)))
-}
-
-//
-// CryptoService
-//
-struct WindowsCryptoService {
-    master_key: Option<Vec<u8>>,
-    encrypted_key: Option<String>,
-}
-
-impl WindowsCryptoService {
-    pub(crate) fn new(local_state: &LocalState) -> Self {
-        Self {
-            master_key: None,
-            encrypted_key: local_state
-                .os_crypt
-                .as_ref()
-                .and_then(|c| c.encrypted_key.clone()),
-        }
-    }
-}
-
-#[async_trait]
-impl CryptoService for WindowsCryptoService {
-    async fn decrypt_to_string(&mut self, encrypted: &[u8]) -> Result<String> {
-        if encrypted.is_empty() {
-            return Ok(String::new());
-        }
-
-        // On Windows only v10 and v20 are supported at the moment
-        let (version, no_prefix) =
-            util::split_encrypted_string_and_validate(encrypted, &["v10", "v20"])?;
-
-        // v10 is already stripped; Windows Chrome uses AES-GCM: [12 bytes IV][ciphertext][16 bytes auth tag]
-        const IV_SIZE: usize = 12;
-        const TAG_SIZE: usize = 16;
-        const MIN_LENGTH: usize = IV_SIZE + TAG_SIZE;
-
-        if no_prefix.len() < MIN_LENGTH {
-            return Err(anyhow!(
-                "Corrupted entry: expected at least {} bytes, got {} bytes",
-                MIN_LENGTH,
-                no_prefix.len()
-            ));
-        }
-
-        // Allow empty passwords
-        if no_prefix.len() == MIN_LENGTH {
-            return Ok(String::new());
-        }
-
-        if self.master_key.is_none() {
-            self.master_key = Some(self.get_master_key(version)?);
-        }
-
-        let key = self
-            .master_key
-            .as_ref()
-            .ok_or_else(|| anyhow!("Failed to retrieve key"))?;
-        let key = Key::<Aes256Gcm>::from_slice(key);
-        let cipher = Aes256Gcm::new(key);
-        let nonce = Nonce::from_slice(&no_prefix[..IV_SIZE]);
-
-        let decrypted_bytes = cipher
-            .decrypt(nonce, no_prefix[IV_SIZE..].as_ref())
-            .map_err(|e| anyhow!("Decryption failed: {}", e))?;
-
-        let plaintext = String::from_utf8(decrypted_bytes)
-            .map_err(|e| anyhow!("Failed to convert decrypted data to UTF-8: {}", e))?;
-
-        Ok(plaintext)
-    }
-}
-
-impl WindowsCryptoService {
-    fn get_master_key(&mut self, version: &str) -> Result<Vec<u8>> {
-        match version {
-            "v10" => self.get_master_key_v10(),
-            _ => Err(anyhow!("Unsupported version: {}", version)),
-        }
-    }
-
-    fn get_master_key_v10(&mut self) -> Result<Vec<u8>> {
-        if self.encrypted_key.is_none() {
-            return Err(anyhow!(
-                "Encrypted master key is not found in the local browser state"
-            ));
-        }
-
-        let key = self
-            .encrypted_key
-            .as_ref()
-            .ok_or_else(|| anyhow!("Failed to retrieve key"))?;
-        let key_bytes = BASE64_STANDARD
-            .decode(key)
-            .map_err(|e| anyhow!("Encrypted master key is not a valid base64 string: {}", e))?;
-
-        if key_bytes.len() <= 5 || &key_bytes[..5] != b"DPAPI" {
-            return Err(anyhow!("Encrypted master key is not encrypted with DPAPI"));
-        }
-
-        let key = unprotect_data_win(&key_bytes[5..])
-            .map_err(|e| anyhow!("Failed to unprotect the master key: {}", e))?;
-
-        Ok(key)
-    }
-}
-
-fn unprotect_data_win(data: &[u8]) -> Result<Vec<u8>> {
-    if data.is_empty() {
-        return Ok(Vec::new());
-    }
-
-    let mut data_in = DATA_BLOB {
-        cbData: data.len() as DWORD,
-        pbData: data.as_ptr() as *mut BYTE,
-    };
-
-    let mut data_out = DATA_BLOB {
-        cbData: 0,
-        pbData: std::ptr::null_mut(),
-    };
-
-    let result: BOOL = unsafe {
-        // BOOL from winapi (i32)
-        CryptUnprotectData(
-            &mut data_in,
-            std::ptr::null_mut(), // ppszDataDescr: *mut LPWSTR (*mut *mut u16)
-            std::ptr::null_mut(), // pOptionalEntropy: *mut DATA_BLOB
-            std::ptr::null_mut(), // pvReserved: LPVOID (*mut c_void)
-            std::ptr::null_mut(), // pPromptStruct: *mut CRYPTPROTECT_PROMPTSTRUCT
-            0,                    // dwFlags: DWORD
-            &mut data_out,
-        )
-    };
-
-    if result == 0 {
-        return Err(anyhow!("CryptUnprotectData failed"));
-    }
-
-    if data_out.pbData.is_null() || data_out.cbData == 0 {
-        return Ok(Vec::new());
-    }
-
-    let output_slice =
-        unsafe { std::slice::from_raw_parts(data_out.pbData, data_out.cbData as usize) };
-
-    unsafe {
-        if !data_out.pbData.is_null() {
-            LocalFree(Some(HLOCAL(data_out.pbData as *mut std::ffi::c_void)));
-        }
-    }
-
-    Ok(output_slice.to_vec())
-}
diff --git a/apps/desktop/desktop_native/build.js b/apps/desktop/desktop_native/build.js
index 125cb1bb567..a7ed89a9c17 100644
--- a/apps/desktop/desktop_native/build.js
+++ b/apps/desktop/desktop_native/build.js
@@ -45,6 +45,39 @@ function buildProxyBin(target, release = true) {
     }
 }
 
+function buildImporterBinaries(target, release = true) {
+    // These binaries are only built for Windows, so we can skip them on other platforms
+    if (process.platform !== "win32") {
+        return;
+    }
+
+    const bin = "bitwarden_chromium_import_helper";
+    const targetArg = target ? `--target ${target}` : "";
+    const releaseArg = release ? "--release" : "";
+    child_process.execSync(`cargo build --bin ${bin} ${releaseArg} ${targetArg}`);
+
+    if (target) {
+        // Copy the resulting binary to the dist folder
+        const targetFolder = release ? "release" : "debug";
+        const nodeArch = rustTargetsMap[target].nodeArch;
+        fs.copyFileSync(path.join(__dirname, "target", target, targetFolder, `${bin}.exe`), path.join(__dirname, "dist", `${bin}.${process.platform}-${nodeArch}.exe`));
+    }
+}
+
+function buildProcessIsolation() {
+    if (process.platform !== "linux") {
+        return;
+    }
+
+    child_process.execSync(`cargo build --release`, {
+        stdio: 'inherit',
+        cwd: path.join(__dirname, "process_isolation")
+    });
+
+    console.log("Copying process isolation library to dist folder");
+    fs.copyFileSync(path.join(__dirname, "target", "release", "libprocess_isolation.so"), path.join(__dirname, "dist", `libprocess_isolation.so`));
+}
+
 function installTarget(target) {
     child_process.execSync(`rustup target add ${target}`, { stdio: 'inherit', cwd: __dirname });
 }
@@ -53,6 +86,8 @@ if (!crossPlatform && !target) {
     console.log(`Building native modules in ${mode} mode for the native architecture`);
     buildNapiModule(false, mode === "release");
     buildProxyBin(false, mode === "release");
+    buildImporterBinaries(false, mode === "release");
+    buildProcessIsolation();
     return;
 }
 
@@ -61,6 +96,8 @@ if (target) {
     installTarget(target);
     buildNapiModule(target, mode === "release");
     buildProxyBin(target, mode === "release");
+    buildImporterBinaries(false, mode === "release");
+    buildProcessIsolation();
     return;
 }
 
@@ -78,4 +115,6 @@ platformTargets.forEach(([target, _]) => {
     installTarget(target);
     buildNapiModule(target);
     buildProxyBin(target);
+    buildImporterBinaries(target);
+    buildProcessIsolation();
 });
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml b/apps/desktop/desktop_native/chromium_importer/Cargo.toml
similarity index 63%
rename from apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml
rename to apps/desktop/desktop_native/chromium_importer/Cargo.toml
index d1efbd006f0..9e9a9e0fee8 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml
+++ b/apps/desktop/desktop_native/chromium_importer/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bitwarden_chromium_importer"
+name = "chromium_importer"
 edition = { workspace = true }
 license = { workspace = true }
 version = { workspace = true }
@@ -7,31 +7,38 @@ publish = { workspace = true }
 
 [dependencies]
 aes = { workspace = true }
-aes-gcm = "=0.10.3"
 anyhow = { workspace = true }
-async-trait = "=0.1.88"
-base64 = { workspace = true }
-cbc = { workspace = true, features = ["alloc"] }
+async-trait = "=0.1.89"
+dirs = { workspace = true }
 hex = { workspace = true }
-homedir = { workspace = true }
-pbkdf2 = "=0.12.2"
 rand = { workspace = true }
 rusqlite = { version = "=0.37.0", features = ["bundled"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-sha1 = "=0.10.6"
 
 [target.'cfg(target_os = "macos")'.dependencies]
+cbc = { workspace = true, features = ["alloc"] }
+pbkdf2 = "=0.12.2"
 security-framework = { workspace = true }
+sha1 = "=0.10.6"
 
 [target.'cfg(target_os = "windows")'.dependencies]
+aes-gcm = { workspace = true }
+base64 = { workspace = true }
+windows = { workspace = true, features = [
+    "Win32_Security_Cryptography",
+    "Win32_UI_Shell",
+    "Win32_UI_WindowsAndMessaging",
+] }
+verifysign = "=0.2.4"
 tokio = { workspace = true, features = ["full"] }
-winapi = { version = "=0.3.9", features = ["dpapi", "memoryapi"] }
-windows = { workspace = true, features = ["Win32_Security", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_IO", "Win32_System_Memory", "Win32_System_Pipes", "Win32_System_Services", "Win32_System_Threading", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] }
+tracing = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
+cbc = { workspace = true, features = ["alloc"] }
 oo7 = { workspace = true }
+pbkdf2 = "=0.12.2"
+sha1 = "=0.10.6"
 
 [lints]
 workspace = true
-
diff --git a/apps/desktop/desktop_native/chromium_importer/README.md b/apps/desktop/desktop_native/chromium_importer/README.md
new file mode 100644
index 00000000000..2a708ea572c
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/README.md
@@ -0,0 +1,140 @@
+# Chromium Direct Importer
+
+A rust library that allows you to directly import credentials from Chromium-based browsers.
+
+## Windows ABE Architecture
+
+On Windows Chrome has additional protection measurements which needs to be circumvented in order to
+get access to the passwords.
+
+### Overview
+
+The Windows **Application Bound Encryption (ABE)** subsystem consists of two main components that work together:
+
+- **client library** — a library that is part of the desktop client application
+- **bitwarden_chromium_import_helper.exe** — a password decryptor running as **ADMINISTRATOR** and later as **SYSTEM**
+
+See the last section for a concise summary of the entire process.
+
+### Goal
+
+The goal of this subsystem is to decrypt the master encryption key used to encrypt login information on the local
+Windows system. This applies to the most recent versions of Chrome, Brave, and (untested) Edge that use the ABE/v20
+encryption scheme for some local profiles.
+
+The general idea of this encryption scheme is as follows:
+
+1. Chrome generates a unique random encryption key.
+2. This key is first encrypted at the **user level** with a fixed key for v1/v2 of ABE. For ABE v3 a more complicated
+   scheme is used that encrypts the key with a combination of a fixed key and a randomly generated key at the **system
+   level** via Windows CNG API.
+3. It is then encrypted at the **user level** again using the Windows **Data Protection API (DPAPI)**.
+4. Finally, it is sent to a special service that encrypts it with DPAPI at the **system level**.
+
+This triply encrypted key is stored in the `Local State` file.
+
+The following sections describe how the key is decrypted at each level.
+
+### 1. Client Library
+
+This is a Rust module that is part of the Chromium importer. It compiles and runs only on Windows (see `abe.rs` and
+`abe_config.rs`). Its main task is to launch `bitwarden_chromium_import_helper.exe` with elevated privileges, presenting
+the user with the UAC prompt. See the `abe::decrypt_with_admin` call in `platform/windows/mod.rs`.
+
+This function takes two arguments:
+
+1. Absolute path to `bitwarden_chromium_import_helper.exe`
+2. Base64 string of the ABE key extracted from the browser's local state
+
+First, `bitwarden_chromium_import_helper.exe` is launched by calling a variant of `ShellExecute` with the `runas` verb.
+This displays the UAC screen. If the user accepts, `bitwarden_chromium_import_helper.exe` starts with **ADMINISTRATOR**
+privileges.
+
+> **The user must approve the UAC prompt or the process is aborted.**
+
+Because it is not possible to read the standard output of an application launched in this way, a named pipe server is
+created at the user level before `bitwarden_chromium_import_helper.exe` is launched. This pipe is used to send the
+decryption result from `bitwarden_chromium_import_helper.exe` back to the client.
+
+The data to be decrypted are passed via the command line to `bitwarden_chromium_import_helper.exe` like this:
+
+```bat
+bitwarden_chromium_import_helper.exe --encrypted "QVBQQgEAAADQjJ3fARXREYx6AMBPwpfrAQAAA..."
+```
+
+### 2. Admin Executable
+
+Although the process starts with **ADMINISTRATOR** privileges, its ultimate goal is to elevate to **SYSTEM**. To achieve
+this, it uses a technique to impersonate a system-level process.
+
+First, `bitwarden_chromium_import_helper.exe` ensures that the `SE_DEBUG_PRIVILEGE` privilege is enabled by calling
+`RtlAdjustPrivilege`. This allows it to enumerate running system-level processes.
+
+Next, it finds an instance of `services.exe` or `winlogon.exe`, which are known to run at the **SYSTEM** level. Once a
+system process is found, its token is duplicated by calling `DuplicateToken`.
+
+With the duplicated token, `ImpersonateLoggedOnUser` is called to impersonate a system-level process.
+
+> **At this point `bitwarden_chromium_import_helper.exe` is running as SYSTEM.**
+
+The received encryption key can now be decrypted using DPAPI at the **system level**.
+
+Next, the impersonation is stopped and the feshly decrypted key is decrypted at the **user level** with DPAPI one more
+time.
+
+At this point, for browsers not using the custom encryption/obfuscation layer like unbranded Chromium, the twice
+decrypted key is the actual encryption key that could be used to decrypt the stored passwords.
+
+For other browsers like Google Chrome, some additional processing is required. The decrypted key is actually a blob of structured data that could take multiple forms:
+
+1. exactly 32 bytes: plain key, nothing to be done more in this case
+2. blob starts with 0x01: the key is encrypted with a fixed AES key found in Google Chrome binary, a random IV is stored
+   in the blob as well
+3. blob starts with 0x02: the key is encrypted with a fixed ChaCha20 key found in Google Chrome binary, a random IV is
+   stored in the blob as well
+4. blob starts with 0x03: the blob contains a random key, encrypted with CNG API with a random key stored in the
+   **system keychain** under the name `Google Chromekey1`. After that key is decryped (under **system level** impersonation again), the key is xor'ed with a fixed key from the Chrome binary and the it is used to decrypt the key from the last DPAPI decryption stage.
+
+The decrypted key is sent back to the client via the named pipe. `bitwarden_chromium_import_helper.exe` connects to the
+pipe and writes the result.
+
+The response can indicate success or failure:
+
+- On success: a Base64-encoded string.
+- On failure: an error message prefixed with `!`.
+
+In either case, the response is sent to the named pipe server created by the client. The client responds with `ok`
+(ignored).
+
+Finally, `bitwarden_chromium_import_helper.exe` exits.
+
+### 3. Back to the Client Library
+
+The decrypted Base64-encoded key is returned from `bitwarden_chromium_import_helper.exe` to the named pipe server at the
+user level. The key is used to decrypt the stored passwords and notes.
+
+### TL;DR Steps
+
+1. **Client side:**
+
+    1. Extract the encrypted key from Chrome’s settings.
+    2. Create a named pipe server.
+    3. Launch `bitwarden_chromium_import_helper.exe` with **ADMINISTRATOR** privileges, passing the key to be decrypted
+       via CLI arguments.
+    4. Wait for the response from `bitwarden_chromium_import_helper.exe`.
+
+2. **Admin side:**
+
+    1. Start.
+    2. Ensure `SE_DEBUG_PRIVILEGE` is enabled (not strictly necessary in tests).
+    3. Impersonate a system process such as `services.exe` or `winlogon.exe`.
+    4. Decrypt the key using DPAPI at the **SYSTEM** level.
+    5. Decrypt it again with DPAPI at the **USER** level.
+    6. (For Chrome only) Decrypt again with the hard-coded key, possibly at the **system level** again (see above).
+    5. Send the result or error back via the named pipe.
+    6. Exit.
+
+3. **Back on the client side:**
+    1. Receive the master key.
+    2. Shutdown the pipe server.
+    3. Use the master key to read and decrypt stored passwords from Chrome, Brave, Edge, etc.
diff --git a/apps/desktop/desktop_native/chromium_importer/build.rs b/apps/desktop/desktop_native/chromium_importer/build.rs
new file mode 100644
index 00000000000..5791e63f036
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/build.rs
@@ -0,0 +1,15 @@
+include!("config_constants.rs");
+
+fn main() {
+    println!("cargo:rerun-if-changed=config_constants.rs");
+
+    if cfg!(not(debug_assertions)) {
+        if ENABLE_DEVELOPER_LOGGING {
+            panic!("ENABLE_DEVELOPER_LOGGING must be false in release builds");
+        }
+
+        if !ENABLE_SIGNATURE_VALIDATION {
+            panic!("ENABLE_SIGNATURE_VALIDATION must be true in release builds");
+        }
+    }
+}
diff --git a/apps/desktop/desktop_native/chromium_importer/config_constants.rs b/apps/desktop/desktop_native/chromium_importer/config_constants.rs
new file mode 100644
index 00000000000..26397b13714
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/config_constants.rs
@@ -0,0 +1,12 @@
+// Enable this to log to a file. The way this executable is used, it's not easy to debug and the stdout gets lost.
+// This is intended for development time only.
+pub const ENABLE_DEVELOPER_LOGGING: bool = false;
+
+// The absolute path to log file when developer logging is enabled
+// Change this to a suitable path for your environment
+pub const LOG_FILENAME: &str = "c:\\path\\to\\log.txt";
+
+/// Ensure the signature of the helper and main binary is validated in production builds
+///
+/// This must be true in release builds but may be disabled in debug builds for testing.
+pub const ENABLE_SIGNATURE_VALIDATION: bool = true;
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/chromium.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/mod.rs
similarity index 58%
rename from apps/desktop/desktop_native/bitwarden_chromium_importer/src/chromium.rs
rename to apps/desktop/desktop_native/chromium_importer/src/chromium/mod.rs
index 8179a10213d..e57b40b5778 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/chromium.rs
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/mod.rs
@@ -1,18 +1,21 @@
-use std::path::{Path, PathBuf};
-use std::sync::LazyLock;
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+    sync::LazyLock,
+};
 
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
+use dirs;
 use hex::decode;
-use homedir::my_home;
 use rusqlite::{params, Connection};
 
-// Platform-specific code
-#[cfg_attr(target_os = "linux", path = "linux.rs")]
-#[cfg_attr(target_os = "windows", path = "windows.rs")]
-#[cfg_attr(target_os = "macos", path = "macos.rs")]
 mod platform;
 
+pub(crate) use platform::SUPPORTED_BROWSERS as PLATFORM_SUPPORTED_BROWSERS;
+#[cfg(target_os = "windows")]
+pub use platform::*;
+
 //
 // Public API
 //
@@ -22,10 +25,7 @@ pub struct ProfileInfo {
     pub name: String,
     pub folder: String,
 
-    #[allow(dead_code)]
     pub account_name: Option<String>,
-
-    #[allow(dead_code)]
     pub account_email: Option<String>,
 }
 
@@ -50,21 +50,27 @@ pub enum LoginImportResult {
     Failure(LoginImportFailure),
 }
 
-// TODO: Make thus async
-pub fn get_installed_browsers() -> Result<Vec<String>> {
-    let mut browsers = Vec::with_capacity(SUPPORTED_BROWSER_MAP.len());
-
-    for (browser, config) in SUPPORTED_BROWSER_MAP.iter() {
-        let data_dir = get_browser_data_dir(config)?;
-        if data_dir.exists() {
-            browsers.push((*browser).to_string());
-        }
-    }
-
-    Ok(browsers)
+pub trait InstalledBrowserRetriever {
+    fn get_installed_browsers() -> Result<Vec<String>>;
+}
+
+pub struct DefaultInstalledBrowserRetriever {}
+
+impl InstalledBrowserRetriever for DefaultInstalledBrowserRetriever {
+    fn get_installed_browsers() -> Result<Vec<String>> {
+        let mut browsers = Vec::with_capacity(SUPPORTED_BROWSER_MAP.len());
+
+        for (browser, config) in SUPPORTED_BROWSER_MAP.iter() {
+            let data_dir = get_browser_data_dir(config)?;
+            if data_dir.exists() {
+                browsers.push((*browser).to_string());
+            }
+        }
+
+        Ok(browsers)
+    }
 }
 
-// TODO: Make thus async
 pub fn get_available_profiles(browser_name: &String) -> Result<Vec<ProfileInfo>> {
     let (_, local_state) = load_local_state_for_browser(browser_name)?;
     Ok(get_profile_info(&local_state))
@@ -82,14 +88,15 @@ pub async fn import_logins(
     let local_logins = get_logins(&data_dir, profile_id, "Login Data")
         .map_err(|e| anyhow!("Failed to query logins: {}", e))?;
 
-    // This is not available in all browsers, but there's no harm in trying. If the file doesn't exist we just get an empty vector.
+    // This is not available in all browsers, but there's no harm in trying. If the file doesn't
+    // exist we just get an empty vector.
     let account_logins = get_logins(&data_dir, profile_id, "Login Data For Account")
         .map_err(|e| anyhow!("Failed to query logins: {}", e))?;
 
     // TODO: Do we need a better merge strategy? Maybe ignore duplicates at least?
-    // TODO: Should we also ignore an error from one of the two imports? If one is successful and the other fails,
-    //       should we still return the successful ones? At the moment it doesn't fail for a missing file, only when
-    //       something goes really wrong.
+    // TODO: Should we also ignore an error from one of the two imports? If one is successful and
+    // the other fails, should we still return the successful ones? At the moment it
+    // doesn't fail for a missing file, only when something goes really wrong.
     let all_logins = local_logins
         .into_iter()
         .chain(account_logins.into_iter())
@@ -104,13 +111,13 @@ pub async fn import_logins(
 // Private
 //
 
-#[derive(Debug)]
-struct BrowserConfig {
-    name: &'static str,
-    data_dir: &'static str,
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct BrowserConfig {
+    pub name: &'static str,
+    pub data_dir: &'static str,
 }
 
-static SUPPORTED_BROWSER_MAP: LazyLock<
+pub(crate) static SUPPORTED_BROWSER_MAP: LazyLock<
     std::collections::HashMap<&'static str, &'static BrowserConfig>,
 > = LazyLock::new(|| {
     platform::SUPPORTED_BROWSERS
@@ -120,8 +127,7 @@ static SUPPORTED_BROWSER_MAP: LazyLock<
 });
 
 fn get_browser_data_dir(config: &BrowserConfig) -> Result<PathBuf> {
-    let dir = my_home()
-        .map_err(|_| anyhow!("Home directory not found"))?
+    let dir = dirs::home_dir()
         .ok_or_else(|| anyhow!("Home directory not found"))?
         .join(config.data_dir);
     Ok(dir)
@@ -132,12 +138,12 @@ fn get_browser_data_dir(config: &BrowserConfig) -> Result<PathBuf> {
 //
 
 #[async_trait]
-trait CryptoService: Send {
+pub(crate) trait CryptoService: Send {
     async fn decrypt_to_string(&mut self, encrypted: &[u8]) -> Result<String>;
 }
 
 #[derive(serde::Deserialize, Clone)]
-struct LocalState {
+pub(crate) struct LocalState {
     profile: AllProfiles,
     #[allow(dead_code)]
     os_crypt: Option<OsCrypt>,
@@ -145,13 +151,13 @@ struct LocalState {
 
 #[derive(serde::Deserialize, Clone)]
 struct AllProfiles {
-    info_cache: std::collections::HashMap<String, OneProfile>,
+    info_cache: HashMap<String, OneProfile>,
 }
 
 #[derive(serde::Deserialize, Clone)]
 struct OneProfile {
     name: String,
-    gaia_name: Option<String>,
+    gaia_id: Option<String>,
     user_name: Option<String>,
 }
 
@@ -190,16 +196,21 @@ fn load_local_state(browser_dir: &Path) -> Result<LocalState> {
 }
 
 fn get_profile_info(local_state: &LocalState) -> Vec<ProfileInfo> {
-    let mut profile_infos = Vec::new();
-    for (name, info) in local_state.profile.info_cache.iter() {
-        profile_infos.push(ProfileInfo {
-            name: info.name.clone(),
-            folder: name.clone(),
-            account_name: info.gaia_name.clone(),
+    local_state
+        .profile
+        .info_cache
+        .iter()
+        .map(|(folder, info)| ProfileInfo {
+            name: if !info.name.trim().is_empty() {
+                info.name.clone()
+            } else {
+                folder.clone()
+            },
+            folder: folder.clone(),
+            account_name: info.gaia_id.clone(),
             account_email: info.user_name.clone(),
-        });
-    }
-    profile_infos
+        })
+        .collect()
 }
 
 struct EncryptedLogin {
@@ -256,17 +267,16 @@ fn hex_to_bytes(hex: &str) -> Vec<u8> {
     decode(hex).unwrap_or_default()
 }
 
-fn does_table_exist(conn: &Connection, table_name: &str) -> Result<bool, rusqlite::Error> {
-    let mut stmt = conn.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name=?1")?;
-    let exists = stmt.exists(params![table_name])?;
-    Ok(exists)
+fn table_exist(conn: &Connection, table_name: &str) -> Result<bool, rusqlite::Error> {
+    conn.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name=?1")?
+        .exists(params![table_name])
 }
 
 fn query_logins(db_path: &str) -> Result<Vec<EncryptedLogin>, rusqlite::Error> {
     let conn = Connection::open(db_path)?;
 
-    let have_logins = does_table_exist(&conn, "logins")?;
-    let have_password_notes = does_table_exist(&conn, "password_notes")?;
+    let have_logins = table_exist(&conn, "logins")?;
+    let have_password_notes = table_exist(&conn, "password_notes")?;
     if !have_logins || !have_password_notes {
         return Ok(vec![]);
     }
@@ -300,10 +310,7 @@ fn query_logins(db_path: &str) -> Result<Vec<EncryptedLogin>, rusqlite::Error> {
         })
     })?;
 
-    let mut logins = Vec::new();
-    for login in logins_iter {
-        logins.push(login?);
-    }
+    let logins = logins_iter.collect::<Result<Vec<_>, _>>()?;
 
     Ok(logins)
 }
@@ -348,3 +355,111 @@ async fn decrypt_login(
         }),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn make_local_state(profiles: Vec<(&str, &str, Option<&str>, Option<&str>)>) -> LocalState {
+        let info_cache = profiles
+            .into_iter()
+            .map(|(folder, name, gaia_id, user_name)| {
+                (
+                    folder.to_string(),
+                    OneProfile {
+                        name: name.to_string(),
+                        gaia_id: gaia_id.map(|s| s.to_string()),
+                        user_name: user_name.map(|s| s.to_string()),
+                    },
+                )
+            })
+            .collect::<HashMap<_, _>>();
+
+        LocalState {
+            profile: AllProfiles { info_cache },
+            os_crypt: None,
+        }
+    }
+
+    #[test]
+    fn test_get_profile_info_basic() {
+        let local_state = make_local_state(vec![
+            (
+                "Profile 1",
+                "User 1",
+                Some("Account 1"),
+                Some("email1@example.com"),
+            ),
+            (
+                "Profile 2",
+                "User 2",
+                Some("Account 2"),
+                Some("email2@example.com"),
+            ),
+        ]);
+        let infos = get_profile_info(&local_state);
+        assert_eq!(infos.len(), 2);
+
+        let profile1 = infos.iter().find(|p| p.folder == "Profile 1").unwrap();
+        assert_eq!(profile1.name, "User 1");
+        assert_eq!(profile1.account_name.as_deref(), Some("Account 1"));
+        assert_eq!(
+            profile1.account_email.as_deref(),
+            Some("email1@example.com")
+        );
+
+        let profile2 = infos.iter().find(|p| p.folder == "Profile 2").unwrap();
+        assert_eq!(profile2.name, "User 2");
+        assert_eq!(profile2.account_name.as_deref(), Some("Account 2"));
+        assert_eq!(
+            profile2.account_email.as_deref(),
+            Some("email2@example.com")
+        );
+    }
+
+    #[test]
+    fn test_get_profile_info_empty_name() {
+        let local_state = make_local_state(vec![(
+            "ProfileX",
+            "",
+            Some("AccountX"),
+            Some("emailx@example.com"),
+        )]);
+        let infos = get_profile_info(&local_state);
+        assert_eq!(infos.len(), 1);
+        assert_eq!(infos[0].name, "ProfileX");
+        assert_eq!(infos[0].folder, "ProfileX");
+    }
+
+    #[test]
+    fn test_get_profile_info_none_fields() {
+        let local_state = make_local_state(vec![("ProfileY", "NameY", None, None)]);
+        let infos = get_profile_info(&local_state);
+        assert_eq!(infos.len(), 1);
+        assert_eq!(infos[0].name, "NameY");
+        assert_eq!(infos[0].account_name, None);
+        assert_eq!(infos[0].account_email, None);
+    }
+
+    #[test]
+    fn test_get_profile_info_multiple_profiles() {
+        let local_state = make_local_state(vec![
+            ("P1", "N1", Some("A1"), Some("E1")),
+            ("P2", "", None, None),
+            ("P3", "N3", Some("A3"), None),
+        ]);
+        let infos = get_profile_info(&local_state);
+        assert_eq!(infos.len(), 3);
+
+        let p1 = infos.iter().find(|p| p.folder == "P1").unwrap();
+        assert_eq!(p1.name, "N1");
+
+        let p2 = infos.iter().find(|p| p.folder == "P2").unwrap();
+        assert_eq!(p2.name, "P2");
+
+        let p3 = infos.iter().find(|p| p.folder == "P3").unwrap();
+        assert_eq!(p3.name, "N3");
+        assert_eq!(p3.account_name.as_deref(), Some("A3"));
+        assert_eq!(p3.account_email, None);
+    }
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/linux.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/linux.rs
similarity index 93%
rename from apps/desktop/desktop_native/bitwarden_chromium_importer/src/linux.rs
rename to apps/desktop/desktop_native/chromium_importer/src/chromium/platform/linux.rs
index 0ead034a4b2..14e38797640 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/linux.rs
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/linux.rs
@@ -4,16 +4,18 @@ use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use oo7::XDG_SCHEMA_ATTRIBUTE;
 
-use crate::chromium::{BrowserConfig, CryptoService, LocalState};
-
-mod util;
+use crate::{
+    chromium::{BrowserConfig, CryptoService, LocalState},
+    util,
+};
 
 //
 // Public API
 //
 
-// TODO: It's possible that there might be multiple possible data directories, depending on the installation method (e.g., snap, flatpak, etc.).
-pub const SUPPORTED_BROWSERS: [BrowserConfig; 4] = [
+// TODO: It's possible that there might be multiple possible data directories, depending on the
+// installation method (e.g., snap, flatpak, etc.).
+pub(crate) const SUPPORTED_BROWSERS: &[BrowserConfig] = &[
     BrowserConfig {
         name: "Chrome",
         data_dir: ".config/google-chrome",
@@ -32,7 +34,7 @@ pub const SUPPORTED_BROWSERS: [BrowserConfig; 4] = [
     },
 ];
 
-pub fn get_crypto_service(
+pub(crate) fn get_crypto_service(
     browser_name: &String,
     _local_state: &LocalState,
 ) -> Result<Box<dyn CryptoService>> {
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/macos.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/macos.rs
similarity index 95%
rename from apps/desktop/desktop_native/bitwarden_chromium_importer/src/macos.rs
rename to apps/desktop/desktop_native/chromium_importer/src/chromium/platform/macos.rs
index d9aeff68f2b..5d0b4f0c75c 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/macos.rs
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/macos.rs
@@ -2,15 +2,16 @@ use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use security_framework::passwords::get_generic_password;
 
-use crate::chromium::{BrowserConfig, CryptoService, LocalState};
-
-mod util;
+use crate::{
+    chromium::{BrowserConfig, CryptoService, LocalState},
+    util,
+};
 
 //
 // Public API
 //
 
-pub const SUPPORTED_BROWSERS: [BrowserConfig; 7] = [
+pub(crate) const SUPPORTED_BROWSERS: &[BrowserConfig] = &[
     BrowserConfig {
         name: "Chrome",
         data_dir: "Library/Application Support/Google/Chrome",
@@ -41,7 +42,7 @@ pub const SUPPORTED_BROWSERS: [BrowserConfig; 7] = [
     },
 ];
 
-pub fn get_crypto_service(
+pub(crate) fn get_crypto_service(
     browser_name: &String,
     _local_state: &LocalState,
 ) -> Result<Box<dyn CryptoService>> {
diff --git a/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/mod.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/mod.rs
new file mode 100644
index 00000000000..fe497de0773
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/mod.rs
@@ -0,0 +1,9 @@
+// Platform-specific code
+#[cfg_attr(target_os = "linux", path = "linux.rs")]
+#[cfg_attr(target_os = "windows", path = "windows/mod.rs")]
+#[cfg_attr(target_os = "macos", path = "macos.rs")]
+mod native;
+
+// Windows exposes public const
+#[allow(unused_imports)]
+pub use native::*;
diff --git a/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/abe.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/abe.rs
new file mode 100644
index 00000000000..a76f7b95e5c
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/abe.rs
@@ -0,0 +1,180 @@
+use std::{ffi::OsStr, os::windows::ffi::OsStrExt};
+
+use anyhow::{anyhow, Result};
+use tokio::{
+    io::{self, AsyncReadExt, AsyncWriteExt},
+    net::windows::named_pipe::{NamedPipeServer, ServerOptions},
+    sync::mpsc::channel,
+    task::JoinHandle,
+    time::{timeout, Duration},
+};
+use tracing::debug;
+use windows::{
+    core::PCWSTR,
+    Win32::UI::{Shell::ShellExecuteW, WindowsAndMessaging::SW_HIDE},
+};
+
+use super::abe_config;
+
+const WAIT_FOR_ADMIN_MESSAGE_TIMEOUT_SECS: u64 = 30;
+
+fn start_tokio_named_pipe_server<F>(
+    pipe_name: &'static str,
+    process_message: F,
+) -> Result<JoinHandle<Result<(), io::Error>>>
+where
+    F: Fn(&str) -> String + Send + Sync + Clone + 'static,
+{
+    debug!("Starting Tokio named pipe server on: {}", pipe_name);
+
+    // The first server needs to be constructed early so that clients can be correctly
+    // connected. Otherwise calling .wait will cause the client to error.
+    // Here we also make use of `first_pipe_instance`, which will ensure that
+    // there are no other servers up and running already.
+    let mut server = ServerOptions::new()
+        .first_pipe_instance(true)
+        .create(pipe_name)?;
+
+    debug!("Named pipe server created and listening...");
+
+    // Spawn the server loop.
+    let server_task = tokio::spawn(async move {
+        loop {
+            // Wait for a client to connect.
+            match server.connect().await {
+                Ok(_) => {
+                    debug!("Client connected to named pipe");
+                    let connected_client = server;
+
+                    // Construct the next server to be connected before sending the one
+                    // we already have off to a task. This ensures that the server
+                    // isn't closed (after it's done in the task) before a new one is
+                    // available. Otherwise the client might error with
+                    // `io::ErrorKind::NotFound`.
+                    server = ServerOptions::new().create(pipe_name)?;
+
+                    // Handle the connected client in a separate task
+                    let process_message_clone = process_message.clone();
+                    let _client_task = tokio::spawn(async move {
+                        if let Err(e) = handle_client(connected_client, process_message_clone).await
+                        {
+                            debug!("Error handling client: {}", e);
+                        }
+                    });
+                }
+                Err(e) => {
+                    debug!("Failed to connect to client: {}", e);
+                    continue;
+                }
+            }
+        }
+    });
+
+    Ok(server_task)
+}
+
+async fn handle_client<F>(mut client: NamedPipeServer, process_message: F) -> Result<()>
+where
+    F: Fn(&str) -> String,
+{
+    debug!("Handling new client connection");
+
+    loop {
+        // Read a message from the client
+        let mut buffer = vec![0u8; 64 * 1024];
+        match client.read(&mut buffer).await {
+            Ok(0) => {
+                debug!("Client disconnected (0 bytes read)");
+                return Ok(());
+            }
+            Ok(bytes_read) => {
+                let message = String::from_utf8_lossy(&buffer[..bytes_read]);
+                let preview = message.chars().take(16).collect::<String>();
+                debug!(
+                    "Received from client: '{}...' ({} bytes)",
+                    preview, bytes_read,
+                );
+
+                let response = process_message(&message);
+                match client.write_all(response.as_bytes()).await {
+                    Ok(_) => {
+                        debug!("Sent response to client ({} bytes)", response.len());
+                    }
+                    Err(e) => {
+                        return Err(anyhow!("Failed to send response to client: {}", e));
+                    }
+                }
+            }
+            Err(e) => {
+                return Err(anyhow!("Failed to read from client: {}", e));
+            }
+        }
+    }
+}
+
+pub(crate) async fn decrypt_with_admin_exe(admin_exe: &str, encrypted: &str) -> Result<String> {
+    let (tx, mut rx) = channel::<String>(1);
+
+    debug!(
+        "Starting named pipe server at '{}'...",
+        abe_config::ADMIN_TO_USER_PIPE_NAME
+    );
+
+    let server = match start_tokio_named_pipe_server(
+        abe_config::ADMIN_TO_USER_PIPE_NAME,
+        move |message: &str| {
+            let _ = tx.try_send(message.to_string());
+            "ok".to_string()
+        },
+    ) {
+        Ok(server) => server,
+        Err(e) => return Err(anyhow!("Failed to start named pipe server: {}", e)),
+    };
+
+    debug!("Launching '{}' as ADMINISTRATOR...", admin_exe);
+    decrypt_with_admin_exe_internal(admin_exe, encrypted);
+
+    debug!("Waiting for message from {}...", admin_exe);
+    let message = match timeout(
+        Duration::from_secs(WAIT_FOR_ADMIN_MESSAGE_TIMEOUT_SECS),
+        rx.recv(),
+    )
+    .await
+    {
+        Ok(Some(msg)) => msg,
+        Ok(None) => return Err(anyhow!("Channel closed without message from {}", admin_exe)),
+        Err(_) => return Err(anyhow!("Timeout waiting for message from {}", admin_exe)),
+    };
+
+    debug!("Shutting down the pipe server...");
+    server.abort();
+
+    Ok(message)
+}
+
+fn decrypt_with_admin_exe_internal(admin_exe: &str, encrypted: &str) {
+    // Convert strings to wide strings for Windows API
+    let exe_wide = OsStr::new(admin_exe)
+        .encode_wide()
+        .chain(std::iter::once(0))
+        .collect::<Vec<u16>>();
+    let runas_wide = OsStr::new("runas")
+        .encode_wide()
+        .chain(std::iter::once(0))
+        .collect::<Vec<u16>>();
+    let parameters = OsStr::new(&format!(r#"--encrypted "{}""#, encrypted))
+        .encode_wide()
+        .chain(std::iter::once(0))
+        .collect::<Vec<u16>>();
+
+    unsafe {
+        ShellExecuteW(
+            None,
+            PCWSTR(runas_wide.as_ptr()),
+            PCWSTR(exe_wide.as_ptr()),
+            PCWSTR(parameters.as_ptr()),
+            None,
+            SW_HIDE,
+        );
+    }
+}
diff --git a/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/abe_config.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/abe_config.rs
new file mode 100644
index 00000000000..66b1d3b8435
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/abe_config.rs
@@ -0,0 +1,2 @@
+pub const ADMIN_TO_USER_PIPE_NAME: &str =
+    r"\\.\pipe\bitwarden-to-bitwarden-chromium-importer-helper";
diff --git a/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/crypto.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/crypto.rs
new file mode 100644
index 00000000000..60f7b806033
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/crypto.rs
@@ -0,0 +1,54 @@
+use anyhow::{anyhow, Result};
+use windows::Win32::{
+    Foundation::{LocalFree, HLOCAL},
+    Security::Cryptography::{CryptUnprotectData, CRYPT_INTEGER_BLOB},
+};
+
+/// Rust friendly wrapper around CryptUnprotectData
+///
+/// Decrypts the data passed in using the `CryptUnprotectData` api.
+pub fn crypt_unprotect_data(data: &[u8], flags: u32) -> Result<Vec<u8>> {
+    if data.is_empty() {
+        return Ok(Vec::new());
+    }
+
+    let data_in = CRYPT_INTEGER_BLOB {
+        cbData: data.len() as u32,
+        pbData: data.as_ptr() as *mut u8,
+    };
+
+    let mut data_out = CRYPT_INTEGER_BLOB::default();
+
+    let result = unsafe {
+        CryptUnprotectData(
+            &data_in,
+            None,  // ppszDataDescr: Option<*mut PWSTR>
+            None,  // pOptionalEntropy: Option<*const CRYPT_INTEGER_BLOB>
+            None,  // pvReserved: Option<*const std::ffi::c_void>
+            None,  // pPromptStruct: Option<*const CRYPTPROTECT_PROMPTSTRUCT>
+            flags, // dwFlags: u32
+            &mut data_out,
+        )
+    };
+
+    if result.is_err() {
+        return Err(anyhow!("CryptUnprotectData failed"));
+    }
+
+    if data_out.pbData.is_null() || data_out.cbData == 0 {
+        return Ok(Vec::new());
+    }
+
+    let output_slice =
+        unsafe { std::slice::from_raw_parts(data_out.pbData, data_out.cbData as usize) };
+
+    // SAFETY: Must copy data before calling LocalFree() below.
+    // Calling to_vec() after LocalFree() causes use-after-free bugs.
+    let output = output_slice.to_vec();
+
+    unsafe {
+        LocalFree(Some(HLOCAL(data_out.pbData as *mut _)));
+    }
+
+    Ok(output)
+}
diff --git a/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/mod.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/mod.rs
new file mode 100644
index 00000000000..9cc89ed2161
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/mod.rs
@@ -0,0 +1,274 @@
+use std::path::{Path, PathBuf};
+
+use aes_gcm::{aead::Aead, Aes256Gcm, Key, KeyInit, Nonce};
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine as _};
+
+use crate::{
+    chromium::{BrowserConfig, CryptoService, LocalState},
+    util,
+};
+mod abe;
+mod abe_config;
+mod crypto;
+mod signature;
+
+pub use abe_config::ADMIN_TO_USER_PIPE_NAME;
+pub use crypto::*;
+pub use signature::*;
+
+//
+// Public API
+//
+
+pub(crate) const SUPPORTED_BROWSERS: &[BrowserConfig] = &[
+    BrowserConfig {
+        name: "Brave",
+        data_dir: "AppData/Local/BraveSoftware/Brave-Browser/User Data",
+    },
+    BrowserConfig {
+        name: "Chrome",
+        data_dir: "AppData/Local/Google/Chrome/User Data",
+    },
+    BrowserConfig {
+        name: "Chromium",
+        data_dir: "AppData/Local/Chromium/User Data",
+    },
+    BrowserConfig {
+        name: "Microsoft Edge",
+        data_dir: "AppData/Local/Microsoft/Edge/User Data",
+    },
+    BrowserConfig {
+        name: "Opera",
+        data_dir: "AppData/Roaming/Opera Software/Opera Stable",
+    },
+    BrowserConfig {
+        name: "Vivaldi",
+        data_dir: "AppData/Local/Vivaldi/User Data",
+    },
+];
+
+pub(crate) fn get_crypto_service(
+    _browser_name: &str,
+    local_state: &LocalState,
+) -> Result<Box<dyn CryptoService>> {
+    Ok(Box::new(WindowsCryptoService::new(local_state)))
+}
+
+//
+// Private
+//
+
+const ADMIN_EXE_FILENAME: &str = "bitwarden_chromium_import_helper.exe";
+
+//
+// CryptoService
+//
+struct WindowsCryptoService {
+    master_key: Option<Vec<u8>>,
+    encrypted_key: Option<String>,
+    app_bound_encrypted_key: Option<String>,
+}
+
+impl WindowsCryptoService {
+    pub(crate) fn new(local_state: &LocalState) -> Self {
+        Self {
+            master_key: None,
+            encrypted_key: local_state
+                .os_crypt
+                .as_ref()
+                .and_then(|c| c.encrypted_key.clone()),
+            app_bound_encrypted_key: local_state
+                .os_crypt
+                .as_ref()
+                .and_then(|c| c.app_bound_encrypted_key.clone()),
+        }
+    }
+}
+
+#[async_trait]
+impl CryptoService for WindowsCryptoService {
+    async fn decrypt_to_string(&mut self, encrypted: &[u8]) -> Result<String> {
+        if encrypted.is_empty() {
+            return Ok(String::new());
+        }
+
+        // On Windows only v10 and v20 are supported at the moment
+        let (version, no_prefix) =
+            util::split_encrypted_string_and_validate(encrypted, &["v10", "v20"])?;
+
+        // v10 is already stripped; Windows Chrome uses AES-GCM: [12 bytes IV][ciphertext][16 bytes
+        // auth tag]
+        const IV_SIZE: usize = 12;
+        const TAG_SIZE: usize = 16;
+        const MIN_LENGTH: usize = IV_SIZE + TAG_SIZE;
+
+        if no_prefix.len() < MIN_LENGTH {
+            return Err(anyhow!(
+                "Corrupted entry: expected at least {} bytes, got {} bytes",
+                MIN_LENGTH,
+                no_prefix.len()
+            ));
+        }
+
+        // Allow empty passwords
+        if no_prefix.len() == MIN_LENGTH {
+            return Ok(String::new());
+        }
+
+        if self.master_key.is_none() {
+            self.master_key = Some(self.get_master_key(version).await?);
+        }
+
+        let key = self
+            .master_key
+            .as_ref()
+            .ok_or_else(|| anyhow!("Failed to retrieve key"))?;
+        let key = Key::<Aes256Gcm>::from_slice(key);
+        let cipher = Aes256Gcm::new(key);
+        let nonce = Nonce::from_slice(&no_prefix[..IV_SIZE]);
+
+        let decrypted_bytes = cipher
+            .decrypt(nonce, no_prefix[IV_SIZE..].as_ref())
+            .map_err(|e| anyhow!("Decryption failed: {}", e))?;
+
+        let plaintext = String::from_utf8(decrypted_bytes)
+            .map_err(|e| anyhow!("Failed to convert decrypted data to UTF-8: {}", e))?;
+
+        Ok(plaintext)
+    }
+}
+
+impl WindowsCryptoService {
+    async fn get_master_key(&mut self, version: &str) -> Result<Vec<u8>> {
+        match version {
+            "v10" => self.get_master_key_v10(),
+            "v20" => self.get_master_key_v20().await,
+            _ => Err(anyhow!("Unsupported version: {}", version)),
+        }
+    }
+
+    fn get_master_key_v10(&mut self) -> Result<Vec<u8>> {
+        if self.encrypted_key.is_none() {
+            return Err(anyhow!(
+                "Encrypted master key is not found in the local browser state"
+            ));
+        }
+
+        let key = self
+            .encrypted_key
+            .as_ref()
+            .ok_or_else(|| anyhow!("Failed to retrieve key"))?;
+        let key_bytes = BASE64_STANDARD
+            .decode(key)
+            .map_err(|e| anyhow!("Encrypted master key is not a valid base64 string: {}", e))?;
+
+        if key_bytes.len() <= 5 || &key_bytes[..5] != b"DPAPI" {
+            return Err(anyhow!("Encrypted master key is not encrypted with DPAPI"));
+        }
+
+        let key = crypt_unprotect_data(&key_bytes[5..], 0)
+            .map_err(|e| anyhow!("Failed to unprotect the master key: {}", e))?;
+
+        Ok(key)
+    }
+
+    async fn get_master_key_v20(&mut self) -> Result<Vec<u8>> {
+        if self.app_bound_encrypted_key.is_none() {
+            return Err(anyhow!(
+                "Encrypted master key is not found in the local browser state"
+            ));
+        }
+
+        let admin_exe_path = get_admin_exe_path()?;
+
+        if !verify_signature(&admin_exe_path)? {
+            return Err(anyhow!("Helper executable signature is not valid"));
+        }
+
+        let admin_exe_str = admin_exe_path
+            .to_str()
+            .ok_or_else(|| anyhow!("Failed to convert {} path to string", ADMIN_EXE_FILENAME))?;
+
+        let key_base64 = abe::decrypt_with_admin_exe(
+            admin_exe_str,
+            self.app_bound_encrypted_key
+                .as_ref()
+                .expect("app_bound_encrypted_key should not be None"),
+        )
+        .await?;
+
+        if let Some(error_message) = key_base64.strip_prefix('!') {
+            return Err(anyhow!(
+                "Failed to decrypt the master key: {}",
+                error_message
+            ));
+        }
+
+        let key = BASE64_STANDARD.decode(&key_base64)?;
+        Ok(key)
+    }
+}
+
+fn get_admin_exe_path() -> Result<PathBuf> {
+    let current_exe_full_path = std::env::current_exe()
+        .map_err(|e| anyhow!("Failed to get current executable path: {}", e))?;
+
+    let exe_name = current_exe_full_path
+        .file_name()
+        .ok_or_else(|| anyhow!("Failed to get file name from current executable path"))?;
+
+    let admin_exe_full_path = if exe_name.eq_ignore_ascii_case("electron.exe") {
+        get_debug_admin_exe_path()?
+    } else {
+        get_dist_admin_exe_path(&current_exe_full_path)?
+    };
+
+    // check if bitwarden_chromium_import_helper.exe exists
+    if !admin_exe_full_path.exists() {
+        return Err(anyhow!(
+            "{} not found at path: {:?}",
+            ADMIN_EXE_FILENAME,
+            admin_exe_full_path
+        ));
+    }
+
+    Ok(admin_exe_full_path)
+}
+
+fn get_dist_admin_exe_path(current_exe_full_path: &Path) -> Result<PathBuf> {
+    let admin_exe = current_exe_full_path
+        .parent()
+        .map(|p| p.join(ADMIN_EXE_FILENAME))
+        .ok_or_else(|| anyhow!("Failed to get parent directory of current executable"))?;
+
+    Ok(admin_exe)
+}
+
+// Try to find bitwarden_chromium_import_helper.exe in debug build folders. This might not cover all
+// the cases. Tested on `npm run electron` from apps/desktop and apps/desktop/desktop_native.
+fn get_debug_admin_exe_path() -> Result<PathBuf> {
+    let current_dir = std::env::current_dir()?;
+    let folder_name = current_dir
+        .file_name()
+        .ok_or_else(|| anyhow!("Failed to get folder name from current directory"))?;
+    match folder_name.to_str() {
+        Some("desktop") => Ok(get_target_admin_exe_path(
+            current_dir.join("desktop_native"),
+        )),
+        Some("desktop_native") => Ok(get_target_admin_exe_path(current_dir)),
+        _ => Err(anyhow!(
+            "Cannot determine {} path from current directory: {}",
+            ADMIN_EXE_FILENAME,
+            current_dir.display()
+        )),
+    }
+}
+
+fn get_target_admin_exe_path(desktop_native_dir: PathBuf) -> PathBuf {
+    desktop_native_dir
+        .join("target")
+        .join("debug")
+        .join(ADMIN_EXE_FILENAME)
+}
diff --git a/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/signature.rs b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/signature.rs
new file mode 100644
index 00000000000..97cf57935b2
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/src/chromium/platform/windows/signature.rs
@@ -0,0 +1,39 @@
+use std::path::Path;
+
+use anyhow::{anyhow, Result};
+use tracing::{debug, info};
+use verifysign::CodeSignVerifier;
+
+use crate::config::ENABLE_SIGNATURE_VALIDATION;
+
+pub const EXPECTED_SIGNATURE_SHA256_THUMBPRINT: &str =
+    "9f6680c4720dbf66d1cb8ed6e328f58e42523badc60d138c7a04e63af14ea40d";
+
+pub fn verify_signature(path: &Path) -> Result<bool> {
+    if !ENABLE_SIGNATURE_VALIDATION {
+        info!(
+            "Signature validation is disabled. Skipping verification for: {}",
+            path.display()
+        );
+        return Ok(true);
+    }
+
+    info!("verifying signature of: {}", path.display());
+
+    let verifier = CodeSignVerifier::for_file(path)
+        .map_err(|e| anyhow!("verifysign init failed for {}: {:?}", path.display(), e))?;
+
+    let signature = verifier
+        .verify()
+        .map_err(|e| anyhow!("verifysign verify failed for {}: {:?}", path.display(), e))?;
+
+    // Dump signature fields for debugging/inspection
+    debug!("Signature fields:");
+    debug!("  Subject Name: {:?}", signature.subject_name());
+    debug!("  Issuer Name: {:?}", signature.issuer_name());
+    debug!("  SHA1 Thumbprint: {:?}", signature.sha1_thumbprint());
+    debug!("  SHA256 Thumbprint: {:?}", signature.sha256_thumbprint());
+    debug!("  Serial Number: {:?}", signature.serial());
+
+    Ok(signature.sha256_thumbprint() == EXPECTED_SIGNATURE_SHA256_THUMBPRINT)
+}
diff --git a/apps/desktop/desktop_native/chromium_importer/src/lib.rs b/apps/desktop/desktop_native/chromium_importer/src/lib.rs
new file mode 100644
index 00000000000..d03e4cdf496
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/src/lib.rs
@@ -0,0 +1,9 @@
+#![doc = include_str!("../README.md")]
+
+pub mod config {
+    include!("../config_constants.rs");
+}
+
+pub mod chromium;
+pub mod metadata;
+mod util;
diff --git a/apps/desktop/desktop_native/chromium_importer/src/metadata.rs b/apps/desktop/desktop_native/chromium_importer/src/metadata.rs
new file mode 100644
index 00000000000..114c9f8df84
--- /dev/null
+++ b/apps/desktop/desktop_native/chromium_importer/src/metadata.rs
@@ -0,0 +1,209 @@
+use std::collections::{HashMap, HashSet};
+
+use crate::chromium::{InstalledBrowserRetriever, PLATFORM_SUPPORTED_BROWSERS};
+
+/// Mechanisms that load data into the importer
+pub struct NativeImporterMetadata {
+    /// Identifies the importer
+    pub id: String,
+    /// Describes the strategies used to obtain imported data
+    pub loaders: Vec<&'static str>,
+    /// Identifies the instructions for the importer
+    pub instructions: &'static str,
+}
+
+/// Returns a map of supported importers based on the current platform.
+///
+/// Only browsers listed in PLATFORM_SUPPORTED_BROWSERS will have the "chromium" loader.
+/// All importers will have the "file" loader.
+pub fn get_supported_importers<T: InstalledBrowserRetriever>(
+) -> HashMap<String, NativeImporterMetadata> {
+    let mut map = HashMap::new();
+
+    // Check for installed browsers
+    let installed_browsers = T::get_installed_browsers().unwrap_or_default();
+
+    const IMPORTERS: &[(&str, &str)] = &[
+        ("chromecsv", "Chrome"),
+        ("chromiumcsv", "Chromium"),
+        ("bravecsv", "Brave"),
+        ("operacsv", "Opera"),
+        ("vivaldicsv", "Vivaldi"),
+        ("edgecsv", "Microsoft Edge"),
+    ];
+
+    let supported: HashSet<&'static str> =
+        PLATFORM_SUPPORTED_BROWSERS.iter().map(|b| b.name).collect();
+
+    for (id, browser_name) in IMPORTERS {
+        let mut loaders: Vec<&'static str> = vec!["file"];
+        if supported.contains(browser_name) {
+            loaders.push("chromium");
+        }
+
+        if installed_browsers.contains(&browser_name.to_string()) {
+            map.insert(
+                id.to_string(),
+                NativeImporterMetadata {
+                    id: id.to_string(),
+                    loaders,
+                    instructions: "chromium",
+                },
+            );
+        }
+    }
+
+    map
+}
+
+// Tests are cfg-gated based upon OS, and must be compiled/run on each OS for full coverage
+#[cfg(test)]
+mod tests {
+    use std::collections::HashSet;
+
+    use super::*;
+    use crate::chromium::{InstalledBrowserRetriever, SUPPORTED_BROWSER_MAP};
+
+    pub struct MockInstalledBrowserRetriever {}
+
+    impl InstalledBrowserRetriever for MockInstalledBrowserRetriever {
+        fn get_installed_browsers() -> Result<Vec<String>, anyhow::Error> {
+            Ok(SUPPORTED_BROWSER_MAP
+                .keys()
+                .map(|browser| browser.to_string())
+                .collect())
+        }
+    }
+
+    fn map_keys(map: &HashMap<String, NativeImporterMetadata>) -> HashSet<String> {
+        map.keys().cloned().collect()
+    }
+
+    fn get_loaders(
+        map: &HashMap<String, NativeImporterMetadata>,
+        id: &str,
+    ) -> HashSet<&'static str> {
+        map.get(id)
+            .map(|m| m.loaders.iter().copied().collect::<HashSet<_>>())
+            .unwrap_or_default()
+    }
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn macos_returns_all_known_importers() {
+        let map = get_supported_importers::<MockInstalledBrowserRetriever>();
+
+        let expected: HashSet<String> = HashSet::from([
+            "chromecsv".to_string(),
+            "chromiumcsv".to_string(),
+            "bravecsv".to_string(),
+            "operacsv".to_string(),
+            "vivaldicsv".to_string(),
+            "edgecsv".to_string(),
+        ]);
+        assert_eq!(map.len(), expected.len());
+        assert_eq!(map_keys(&map), expected);
+
+        for (key, meta) in map.iter() {
+            assert_eq!(&meta.id, key);
+            assert_eq!(meta.instructions, "chromium");
+            assert!(meta.loaders.iter().any(|l| *l == "file"));
+        }
+    }
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn macos_specific_loaders_match_const_array() {
+        let map = get_supported_importers::<MockInstalledBrowserRetriever>();
+        let ids = [
+            "chromecsv",
+            "chromiumcsv",
+            "bravecsv",
+            "operacsv",
+            "vivaldicsv",
+            "edgecsv",
+        ];
+        for id in ids {
+            let loaders = get_loaders(&map, id);
+            assert!(loaders.contains("file"));
+            assert!(loaders.contains("chromium"), "missing chromium for {id}");
+        }
+    }
+
+    #[cfg(target_os = "linux")]
+    #[test]
+    fn returns_all_known_importers() {
+        let map = get_supported_importers::<MockInstalledBrowserRetriever>();
+
+        let expected: HashSet<String> = HashSet::from([
+            "chromecsv".to_string(),
+            "chromiumcsv".to_string(),
+            "bravecsv".to_string(),
+            "operacsv".to_string(),
+        ]);
+        assert_eq!(map.len(), expected.len());
+        assert_eq!(map_keys(&map), expected);
+
+        for (key, meta) in map.iter() {
+            assert_eq!(&meta.id, key);
+            assert_eq!(meta.instructions, "chromium");
+            assert!(meta.loaders.iter().any(|l| *l == "file"));
+        }
+    }
+
+    #[cfg(target_os = "linux")]
+    #[test]
+    fn linux_specific_loaders_match_const_array() {
+        let map = get_supported_importers::<MockInstalledBrowserRetriever>();
+        let ids = ["chromecsv", "chromiumcsv", "bravecsv", "operacsv"];
+
+        for id in ids {
+            let loaders = get_loaders(&map, id);
+            assert!(loaders.contains("file"));
+            assert!(loaders.contains("chromium"), "missing chromium for {id}");
+        }
+    }
+
+    #[cfg(target_os = "windows")]
+    #[test]
+    fn returns_all_known_importers() {
+        let map = get_supported_importers::<MockInstalledBrowserRetriever>();
+
+        let expected: HashSet<String> = HashSet::from([
+            "bravecsv".to_string(),
+            "chromecsv".to_string(),
+            "chromiumcsv".to_string(),
+            "edgecsv".to_string(),
+            "operacsv".to_string(),
+            "vivaldicsv".to_string(),
+        ]);
+        assert_eq!(map.len(), expected.len());
+        assert_eq!(map_keys(&map), expected);
+
+        for (key, meta) in map.iter() {
+            assert_eq!(&meta.id, key);
+            assert_eq!(meta.instructions, "chromium");
+            assert!(meta.loaders.iter().any(|l| *l == "file"));
+        }
+    }
+
+    #[cfg(target_os = "windows")]
+    #[test]
+    fn windows_specific_loaders_match_const_array() {
+        let map = get_supported_importers::<MockInstalledBrowserRetriever>();
+        let ids = [
+            "bravecsv",
+            "chromecsv",
+            "chromiumcsv",
+            "edgecsv",
+            "operacsv",
+            "vivaldicsv",
+        ];
+
+        for id in ids {
+            let loaders = get_loaders(&map, id);
+            assert!(loaders.contains("file"));
+            assert!(loaders.contains("chromium"), "missing chromium for {id}");
+        }
+    }
+}
diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/util.rs b/apps/desktop/desktop_native/chromium_importer/src/util.rs
similarity index 68%
rename from apps/desktop/desktop_native/bitwarden_chromium_importer/src/util.rs
rename to apps/desktop/desktop_native/chromium_importer/src/util.rs
index e9c20ab621d..2dbc6ed005b 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/util.rs
+++ b/apps/desktop/desktop_native/chromium_importer/src/util.rs
@@ -1,9 +1,6 @@
-use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, KeyIvInit};
 use anyhow::{anyhow, Result};
-use pbkdf2::{hmac::Hmac, pbkdf2};
-use sha1::Sha1;
 
-pub fn split_encrypted_string(encrypted: &[u8]) -> Result<(&str, &[u8])> {
+fn split_encrypted_string(encrypted: &[u8]) -> Result<(&str, &[u8])> {
     if encrypted.len() < 3 {
         return Err(anyhow!(
             "Corrupted entry: invalid encrypted string length, expected at least 3 bytes, got {}",
@@ -15,7 +12,14 @@ pub fn split_encrypted_string(encrypted: &[u8]) -> Result<(&str, &[u8])> {
     Ok((std::str::from_utf8(version)?, password))
 }
 
-pub fn split_encrypted_string_and_validate<'a>(
+/// A Chromium password consists of three parts:
+/// - Version (3 bytes): "v10", "v11", etc.
+/// - Cipher text (chunks of 16 bytes)
+/// - Padding (1-15 bytes)
+///
+/// This function splits the encrypted byte slice into version and cipher text.
+/// Padding is included and handled by the underlying cryptographic library.
+pub(crate) fn split_encrypted_string_and_validate<'a>(
     encrypted: &'a [u8],
     supported_versions: &[&str],
 ) -> Result<(&'a str, &'a [u8])> {
@@ -27,15 +31,23 @@ pub fn split_encrypted_string_and_validate<'a>(
     Ok((version, password))
 }
 
-pub fn decrypt_aes_128_cbc(key: &[u8], iv: &[u8], ciphertext: &[u8]) -> Result<Vec<u8>> {
-    let decryptor = cbc::Decryptor::<aes::Aes128>::new_from_slices(key, iv)?;
-    let plaintext: Vec<u8> = decryptor
+/// Decrypt using AES-128 in CBC mode.
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+pub(crate) fn decrypt_aes_128_cbc(key: &[u8], iv: &[u8], ciphertext: &[u8]) -> Result<Vec<u8>> {
+    use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, KeyIvInit};
+
+    cbc::Decryptor::<aes::Aes128>::new_from_slices(key, iv)?
         .decrypt_padded_vec_mut::<Pkcs7>(ciphertext)
-        .map_err(|e| anyhow!("Failed to decrypt: {}", e))?;
-    Ok(plaintext)
+        .map_err(|e| anyhow!("Failed to decrypt: {}", e))
 }
 
-pub fn derive_saltysalt(password: &[u8], iterations: u32) -> Result<Vec<u8>> {
+/// Derives a PBKDF2 key from the static "saltysalt" salt with the given password and iteration
+/// count.
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+pub(crate) fn derive_saltysalt(password: &[u8], iterations: u32) -> Result<Vec<u8>> {
+    use pbkdf2::{hmac::Hmac, pbkdf2};
+    use sha1::Sha1;
+
     let mut key = vec![0u8; 16];
     pbkdf2::<Hmac<Sha1>>(password, b"saltysalt", iterations, &mut key)
         .map_err(|e| anyhow!("Failed to derive master key: {}", e))?;
@@ -44,23 +56,6 @@ pub fn derive_saltysalt(password: &[u8], iterations: u32) -> Result<Vec<u8>> {
 
 #[cfg(test)]
 mod tests {
-    pub fn generate_vec(length: usize, offset: u8, increment: u8) -> Vec<u8> {
-        (0..length).map(|i| offset + i as u8 * increment).collect()
-    }
-    pub fn generate_generic_array<N: ArrayLength<u8>>(
-        offset: u8,
-        increment: u8,
-    ) -> GenericArray<u8, N> {
-        GenericArray::generate(|i| offset + i as u8 * increment)
-    }
-
-    use aes::cipher::{
-        block_padding::Pkcs7,
-        generic_array::{sequence::GenericSequence, GenericArray},
-        ArrayLength, BlockEncryptMut, KeyIvInit,
-    };
-
-    const LENGTH16: usize = 16;
     const LENGTH10: usize = 10;
     const LENGTH0: usize = 0;
 
@@ -132,8 +127,28 @@ mod tests {
         run_split_encrypted_string_and_validate_test(false, "v10EncryptMe!", &[]);
     }
 
+    #[cfg(any(target_os = "linux", target_os = "macos"))]
     #[test]
     fn test_decrypt_aes_128_cbc() {
+        use aes::cipher::{
+            block_padding::Pkcs7,
+            generic_array::{sequence::GenericSequence, GenericArray},
+            ArrayLength, BlockEncryptMut, KeyIvInit,
+        };
+
+        const LENGTH16: usize = 16;
+
+        fn generate_generic_array<N: ArrayLength<u8>>(
+            offset: u8,
+            increment: u8,
+        ) -> GenericArray<u8, N> {
+            GenericArray::generate(|i| offset + i as u8 * increment)
+        }
+
+        fn generate_vec(length: usize, offset: u8, increment: u8) -> Vec<u8> {
+            (0..length).map(|i| offset + i as u8 * increment).collect()
+        }
+
         let offset = 0;
         let increment = 1;
 
diff --git a/apps/desktop/desktop_native/clippy.toml b/apps/desktop/desktop_native/clippy.toml
index a29e019ac02..4441a038635 100644
--- a/apps/desktop/desktop_native/clippy.toml
+++ b/apps/desktop/desktop_native/clippy.toml
@@ -1,2 +1,10 @@
 allow-unwrap-in-tests=true
 allow-expect-in-tests=true
+
+disallowed-macros = [
+  { path = "log::trace", reason = "Use tracing for logging needs", replacement = "tracing::trace" },
+  { path = "log::debug", reason = "Use tracing for logging needs", replacement = "tracing::debug" },
+  { path = "log::info", reason = "Use tracing for logging needs", replacement = "tracing::info" },
+  { path = "log::warn", reason = "Use tracing for logging needs", replacement = "tracing::warn" },
+  { path = "log::error", reason = "Use tracing for logging needs", replacement = "tracing::error" },
+]
diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml
index 36e1a85abc0..dc9246f55c6 100644
--- a/apps/desktop/desktop_native/core/Cargo.toml
+++ b/apps/desktop/desktop_native/core/Cargo.toml
@@ -23,23 +23,15 @@ anyhow = { workspace = true }
 arboard = { workspace = true, features = ["wayland-data-control"] }
 base64 = { workspace = true }
 bitwarden-russh = { workspace = true }
-byteorder = { workspace = true }
 bytes = { workspace = true }
 cbc = { workspace = true, features = ["alloc"] }
+chacha20poly1305 = { workspace = true }
 dirs = { workspace = true }
-ed25519 = { workspace = true, features = ["pkcs8"] }
 futures = { workspace = true }
-homedir = { workspace = true }
 interprocess = { workspace = true, features = ["tokio"] }
-pin-project = { workspace = true }
-pkcs8 = { workspace = true, features = ["alloc", "encryption", "pem"] }
+memsec = { workspace = true, features = ["alloc_ext"] }
 rand = { workspace = true }
-rsa = { workspace = true }
-russh-cryptovec = { workspace = true }
-scopeguard = { workspace = true }
-secmem-proc = { workspace = true }
 sha2 = { workspace = true }
-ssh-encoding = { workspace = true }
 ssh-key = { workspace = true, features = [
     "encryption",
     "ed25519",
@@ -49,13 +41,17 @@ ssh-key = { workspace = true, features = [
 sysinfo = { workspace = true, features = ["windows"] }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["io-util", "sync", "macros", "net"] }
-tokio-stream = { workspace = true, features = ["net"] }
 tokio-util = { workspace = true, features = ["codec"] }
 tracing = { workspace = true }
 typenum = { workspace = true }
 zeroizing-alloc = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
+pin-project = { workspace = true }
+scopeguard = { workspace = true }
+secmem-proc = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 widestring = { workspace = true, optional = true }
 windows = { workspace = true, features = [
     "Foundation",
@@ -64,6 +60,7 @@ windows = { workspace = true, features = [
     "Storage_Streams",
     "Win32_Foundation",
     "Win32_Security_Credentials",
+    "Win32_Security_Cryptography",
     "Win32_System_WinRT",
     "Win32_UI_Input_KeyboardAndMouse",
     "Win32_UI_WindowsAndMessaging",
@@ -71,20 +68,20 @@ windows = { workspace = true, features = [
 ], optional = true }
 windows-future = { workspace = true }
 
-[target.'cfg(windows)'.dev-dependencies]
-keytar = { workspace = true }
-
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = { workspace = true, optional = true }
+homedir = { workspace = true }
+secmem-proc = { workspace = true }
 security-framework = { workspace = true, optional = true }
 security-framework-sys = { workspace = true, optional = true }
 desktop_objc = { path = "../objc" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-oo7 = { workspace = true }
-libc = { workspace = true }
 ashpd = { workspace = true }
-
+homedir = { workspace = true }
+libc = { workspace = true }
+linux-keyutils = { workspace = true }
+oo7 = { workspace = true }
 zbus = { workspace = true, optional = true }
 zbus_polkit = { workspace = true, optional = true }
 
diff --git a/apps/desktop/desktop_native/core/src/biometric/mod.rs b/apps/desktop/desktop_native/core/src/biometric/mod.rs
index e4d51f5da9a..6ed5fbe08a7 100644
--- a/apps/desktop/desktop_native/core/src/biometric/mod.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/mod.rs
@@ -3,16 +3,12 @@ use anyhow::{anyhow, Result};
 
 #[allow(clippy::module_inception)]
 #[cfg_attr(target_os = "linux", path = "unix.rs")]
-#[cfg_attr(target_os = "macos", path = "macos.rs")]
-#[cfg_attr(target_os = "windows", path = "windows.rs")]
+#[cfg_attr(target_os = "macos", path = "unimplemented.rs")]
+#[cfg_attr(target_os = "windows", path = "unimplemented.rs")]
 mod biometric;
 
-pub use biometric::Biometric;
-
-#[cfg(target_os = "windows")]
-pub mod windows_focus;
-
 use base64::{engine::general_purpose::STANDARD as base64_engine, Engine};
+pub use biometric::Biometric;
 use sha2::{Digest, Sha256};
 
 use crate::crypto::{self, CipherString};
@@ -86,11 +82,15 @@ impl KeyMaterial {
 
 #[cfg(test)]
 mod tests {
-    use crate::biometric::{decrypt, encrypt, KeyMaterial};
-    use crate::crypto::CipherString;
-    use base64::{engine::general_purpose::STANDARD as base64_engine, Engine};
     use std::str::FromStr;
 
+    use base64::{engine::general_purpose::STANDARD as base64_engine, Engine};
+
+    use crate::{
+        biometric::{decrypt, encrypt, KeyMaterial},
+        crypto::CipherString,
+    };
+
     fn key_material() -> KeyMaterial {
         KeyMaterial {
             os_key_part_b64: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned(),
diff --git a/apps/desktop/desktop_native/core/src/biometric/macos.rs b/apps/desktop/desktop_native/core/src/biometric/unimplemented.rs
similarity index 94%
rename from apps/desktop/desktop_native/core/src/biometric/macos.rs
rename to apps/desktop/desktop_native/core/src/biometric/unimplemented.rs
index ec09d566e1f..3f3d034924a 100644
--- a/apps/desktop/desktop_native/core/src/biometric/macos.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/unimplemented.rs
@@ -2,7 +2,7 @@ use anyhow::{bail, Result};
 
 use crate::biometric::{KeyMaterial, OsDerivedKey};
 
-/// The MacOS implementation of the biometric trait.
+/// Unimplemented stub for unsupported platforms
 pub struct Biometric {}
 
 impl super::BiometricTrait for Biometric {
diff --git a/apps/desktop/desktop_native/core/src/biometric/unix.rs b/apps/desktop/desktop_native/core/src/biometric/unix.rs
index 0f6ff8f33dc..3f4f10a1fcf 100644
--- a/apps/desktop/desktop_native/core/src/biometric/unix.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/unix.rs
@@ -1,18 +1,18 @@
 use std::str::FromStr;
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use base64::Engine;
 use rand::RngCore;
 use sha2::{Digest, Sha256};
 use tracing::error;
-
-use crate::biometric::{base64_engine, KeyMaterial, OsDerivedKey};
 use zbus::Connection;
 use zbus_polkit::policykit1::*;
 
 use super::{decrypt, encrypt};
-use crate::crypto::CipherString;
-use anyhow::anyhow;
+use crate::{
+    biometric::{base64_engine, KeyMaterial, OsDerivedKey},
+    crypto::CipherString,
+};
 
 /// The Unix implementation of the biometric trait.
 pub struct Biometric {}
diff --git a/apps/desktop/desktop_native/core/src/biometric/windows.rs b/apps/desktop/desktop_native/core/src/biometric/windows.rs
deleted file mode 100644
index 8013c21bf9a..00000000000
--- a/apps/desktop/desktop_native/core/src/biometric/windows.rs
+++ /dev/null
@@ -1,241 +0,0 @@
-use std::{ffi::c_void, str::FromStr};
-
-use anyhow::{anyhow, Result};
-use base64::{engine::general_purpose::STANDARD as base64_engine, Engine};
-use rand::RngCore;
-use sha2::{Digest, Sha256};
-use windows::{
-    core::{factory, HSTRING},
-    Security::Credentials::UI::{
-        UserConsentVerificationResult, UserConsentVerifier, UserConsentVerifierAvailability,
-    },
-    Win32::{
-        Foundation::HWND, System::WinRT::IUserConsentVerifierInterop,
-        UI::WindowsAndMessaging::GetForegroundWindow,
-    },
-};
-use windows_future::IAsyncOperation;
-
-use crate::{
-    biometric::{KeyMaterial, OsDerivedKey},
-    crypto::CipherString,
-};
-
-use super::{decrypt, encrypt, windows_focus::set_focus};
-
-/// The Windows OS implementation of the biometric trait.
-pub struct Biometric {}
-
-impl super::BiometricTrait for Biometric {
-    // FIXME: Remove unwraps! They panic and terminate the whole application.
-    #[allow(clippy::unwrap_used)]
-    async fn prompt(hwnd: Vec<u8>, message: String) -> Result<bool> {
-        let h = isize::from_le_bytes(hwnd.clone().try_into().unwrap());
-
-        let h = h as *mut c_void;
-        let window = HWND(h);
-
-        // The Windows Hello prompt is displayed inside the application window. For best result we
-        //  should set the window to the foreground and focus it.
-        set_focus(window);
-
-        // Windows Hello prompt must be in foreground, focused, otherwise the face or fingerprint
-        //  unlock will not work. We get the current foreground window, which will either be the
-        //  Bitwarden desktop app or the browser extension.
-        let foreground_window = unsafe { GetForegroundWindow() };
-
-        let interop = factory::<UserConsentVerifier, IUserConsentVerifierInterop>()?;
-        let operation: IAsyncOperation<UserConsentVerificationResult> = unsafe {
-            interop.RequestVerificationForWindowAsync(foreground_window, &HSTRING::from(message))?
-        };
-        let result = operation.get()?;
-
-        match result {
-            UserConsentVerificationResult::Verified => Ok(true),
-            _ => Ok(false),
-        }
-    }
-
-    async fn available() -> Result<bool> {
-        let ucv_available = UserConsentVerifier::CheckAvailabilityAsync()?.get()?;
-
-        match ucv_available {
-            UserConsentVerifierAvailability::Available => Ok(true),
-            UserConsentVerifierAvailability::DeviceBusy => Ok(true), // TODO: Look into removing this and making the check more ad-hoc
-            _ => Ok(false),
-        }
-    }
-
-    fn derive_key_material(challenge_str: Option<&str>) -> Result<OsDerivedKey> {
-        let challenge: [u8; 16] = match challenge_str {
-            Some(challenge_str) => base64_engine
-                .decode(challenge_str)?
-                .try_into()
-                .map_err(|e: Vec<_>| anyhow!("Expect length {}, got {}", 16, e.len()))?,
-            None => random_challenge(),
-        };
-
-        // Uses a key derived from the iv. This key is not intended to add any security
-        // but only a place-holder
-        let key = Sha256::digest(challenge);
-        let key_b64 = base64_engine.encode(key);
-        let iv_b64 = base64_engine.encode(challenge);
-        Ok(OsDerivedKey { key_b64, iv_b64 })
-    }
-
-    async fn set_biometric_secret(
-        service: &str,
-        account: &str,
-        secret: &str,
-        key_material: Option<KeyMaterial>,
-        iv_b64: &str,
-    ) -> Result<String> {
-        let key_material = key_material.ok_or(anyhow!(
-            "Key material is required for Windows Hello protected keys"
-        ))?;
-
-        let encrypted_secret = encrypt(secret, &key_material, iv_b64)?;
-        crate::password::set_password(service, account, &encrypted_secret).await?;
-        Ok(encrypted_secret)
-    }
-
-    async fn get_biometric_secret(
-        service: &str,
-        account: &str,
-        key_material: Option<KeyMaterial>,
-    ) -> Result<String> {
-        let key_material = key_material.ok_or(anyhow!(
-            "Key material is required for Windows Hello protected keys"
-        ))?;
-
-        let encrypted_secret = crate::password::get_password(service, account).await?;
-        match CipherString::from_str(&encrypted_secret) {
-            Ok(secret) => {
-                // If the secret is a CipherString, it is encrypted and we need to decrypt it.
-                let secret = decrypt(&secret, &key_material)?;
-                Ok(secret)
-            }
-            Err(_) => {
-                // If the secret is not a CipherString, it is not encrypted and we can return it
-                //  directly.
-                Ok(encrypted_secret)
-            }
-        }
-    }
-}
-
-fn random_challenge() -> [u8; 16] {
-    let mut challenge = [0u8; 16];
-    rand::rng().fill_bytes(&mut challenge);
-    challenge
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::biometric::BiometricTrait;
-
-    #[test]
-    fn test_derive_key_material() {
-        let iv_input = "l9fhDUP/wDJcKwmEzcb/3w==";
-        let result = <Biometric as BiometricTrait>::derive_key_material(Some(iv_input)).unwrap();
-        let key = base64_engine.decode(result.key_b64).unwrap();
-        assert_eq!(key.len(), 32);
-        assert_eq!(result.iv_b64, iv_input)
-    }
-
-    #[test]
-    fn test_derive_key_material_no_iv() {
-        let result = <Biometric as BiometricTrait>::derive_key_material(None).unwrap();
-        let key = base64_engine.decode(result.key_b64).unwrap();
-        assert_eq!(key.len(), 32);
-        let iv = base64_engine.decode(result.iv_b64).unwrap();
-        assert_eq!(iv.len(), 16);
-    }
-
-    #[tokio::test]
-    #[cfg(feature = "manual_test")]
-    async fn test_prompt() {
-        <Biometric as BiometricTrait>::prompt(
-            vec![0, 0, 0, 0, 0, 0, 0, 0],
-            String::from("Hello from Rust"),
-        )
-        .await
-        .unwrap();
-    }
-
-    #[tokio::test]
-    #[cfg(feature = "manual_test")]
-    async fn test_available() {
-        assert!(<Biometric as BiometricTrait>::available().await.unwrap())
-    }
-
-    #[tokio::test]
-    #[cfg(feature = "manual_test")]
-    async fn get_biometric_secret_requires_key() {
-        let result = <Biometric as BiometricTrait>::get_biometric_secret("", "", None).await;
-        assert!(result.is_err());
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            "Key material is required for Windows Hello protected keys"
-        );
-    }
-
-    #[tokio::test]
-    #[cfg(feature = "manual_test")]
-    async fn get_biometric_secret_handles_unencrypted_secret() {
-        let test = "test";
-        let secret = "password";
-        let key_material = KeyMaterial {
-            os_key_part_b64: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned(),
-            client_key_part_b64: Some("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned()),
-        };
-        crate::password::set_password(test, test, secret)
-            .await
-            .unwrap();
-        let result =
-            <Biometric as BiometricTrait>::get_biometric_secret(test, test, Some(key_material))
-                .await
-                .unwrap();
-        crate::password::delete_password("test", "test")
-            .await
-            .unwrap();
-        assert_eq!(result, secret);
-    }
-
-    #[tokio::test]
-    #[cfg(feature = "manual_test")]
-    async fn get_biometric_secret_handles_encrypted_secret() {
-        let test = "test";
-        let secret =
-            CipherString::from_str("0.l9fhDUP/wDJcKwmEzcb/3w==|uP4LcqoCCj5FxBDP77NV6Q==").unwrap(); // output from test_encrypt
-        let key_material = KeyMaterial {
-            os_key_part_b64: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned(),
-            client_key_part_b64: Some("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned()),
-        };
-        crate::password::set_password(test, test, &secret.to_string())
-            .await
-            .unwrap();
-
-        let result =
-            <Biometric as BiometricTrait>::get_biometric_secret(test, test, Some(key_material))
-                .await
-                .unwrap();
-        crate::password::delete_password("test", "test")
-            .await
-            .unwrap();
-        assert_eq!(result, "secret");
-    }
-
-    #[tokio::test]
-    async fn set_biometric_secret_requires_key() {
-        let result =
-            <Biometric as BiometricTrait>::set_biometric_secret("", "", "", None, "").await;
-        assert!(result.is_err());
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            "Key material is required for Windows Hello protected keys"
-        );
-    }
-}
diff --git a/apps/desktop/desktop_native/core/src/biometric/windows_focus.rs b/apps/desktop/desktop_native/core/src/biometric/windows_focus.rs
deleted file mode 100644
index ce51f82862d..00000000000
--- a/apps/desktop/desktop_native/core/src/biometric/windows_focus.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use windows::{
-    core::s,
-    Win32::{
-        Foundation::HWND,
-        UI::{
-            Input::KeyboardAndMouse::SetFocus,
-            WindowsAndMessaging::{FindWindowA, SetForegroundWindow},
-        },
-    },
-};
-
-/// Searches for a window that looks like a security prompt and set it as focused.
-/// Only works when the process has permission to foreground, either by being in foreground
-/// Or by being given foreground permission https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setforegroundwindow#remarks
-pub fn focus_security_prompt() {
-    let class_name = s!("Credential Dialog Xaml Host");
-    let hwnd = unsafe { FindWindowA(class_name, None) };
-    if let Ok(hwnd) = hwnd {
-        set_focus(hwnd);
-    }
-}
-
-pub(crate) fn set_focus(window: HWND) {
-    unsafe {
-        let _ = SetForegroundWindow(window);
-        let _ = SetFocus(Some(window));
-    }
-}
diff --git a/apps/desktop/desktop_native/core/src/biometric_v2/linux.rs b/apps/desktop/desktop_native/core/src/biometric_v2/linux.rs
new file mode 100644
index 00000000000..ff2abc0686b
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/biometric_v2/linux.rs
@@ -0,0 +1,144 @@
+//! This file implements Polkit based system unlock.
+//!
+//! # Security
+//! This section describes the assumed security model and security guarantees achieved. In the
+//! required security guarantee is that a locked vault - a running app - cannot be unlocked when the
+//! device (user-space) is compromised in this state.
+//!
+//! When first unlocking the app, the app sends the user-key to this module, which holds it in
+//! secure memory, protected by memfd_secret. This makes it inaccessible to other processes, even if
+//! they compromise root, a kernel compromise has circumventable best-effort protections. While the
+//! app is running this key is held in memory, even if locked. When unlocking, the app will prompt
+//! the user via `polkit` to get a yes/no decision on whether to release the key to the app.
+
+use std::sync::Arc;
+
+use anyhow::{anyhow, Result};
+use tokio::sync::Mutex;
+use tracing::{debug, warn};
+use zbus::Connection;
+use zbus_polkit::policykit1::{AuthorityProxy, CheckAuthorizationFlags, Subject};
+
+use crate::secure_memory::*;
+
+pub struct BiometricLockSystem {
+    // The userkeys that are held in memory MUST be protected from memory dumping attacks, to
+    // ensure locked vaults cannot be unlocked
+    secure_memory: Arc<Mutex<crate::secure_memory::encrypted_memory_store::EncryptedMemoryStore>>,
+}
+
+impl BiometricLockSystem {
+    pub fn new() -> Self {
+        Self {
+            secure_memory: Arc::new(Mutex::new(
+                crate::secure_memory::encrypted_memory_store::EncryptedMemoryStore::new(),
+            )),
+        }
+    }
+}
+
+impl Default for BiometricLockSystem {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl super::BiometricTrait for BiometricLockSystem {
+    async fn authenticate(&self, _hwnd: Vec<u8>, _message: String) -> Result<bool> {
+        polkit_authenticate_bitwarden_policy().await
+    }
+
+    async fn authenticate_available(&self) -> Result<bool> {
+        polkit_is_bitwarden_policy_available().await
+    }
+
+    async fn enroll_persistent(&self, _user_id: &str, _key: &[u8]) -> Result<()> {
+        // Not implemented
+        Ok(())
+    }
+
+    async fn provide_key(&self, user_id: &str, key: &[u8]) {
+        self.secure_memory
+            .lock()
+            .await
+            .put(user_id.to_string(), key);
+    }
+
+    async fn unlock(&self, user_id: &str, _hwnd: Vec<u8>) -> Result<Vec<u8>> {
+        if !polkit_authenticate_bitwarden_policy().await? {
+            return Err(anyhow!("Authentication failed"));
+        }
+
+        self.secure_memory
+            .lock()
+            .await
+            .get(user_id)
+            .ok_or(anyhow!("No key found"))
+    }
+
+    async fn unlock_available(&self, user_id: &str) -> Result<bool> {
+        Ok(self.secure_memory.lock().await.has(user_id))
+    }
+
+    async fn has_persistent(&self, _user_id: &str) -> Result<bool> {
+        Ok(false)
+    }
+
+    async fn unenroll(&self, user_id: &str) -> Result<(), anyhow::Error> {
+        self.secure_memory.lock().await.remove(user_id);
+        Ok(())
+    }
+}
+
+/// Perform a polkit authorization against the bitwarden unlock policy. Note: This relies on no
+/// custom rules in the system skipping the authorization check, in which case this counts as UV /
+/// authentication.
+async fn polkit_authenticate_bitwarden_policy() -> Result<bool> {
+    debug!("[Polkit] Authenticating / performing UV");
+
+    let connection = Connection::system().await?;
+    let proxy = AuthorityProxy::new(&connection).await?;
+    let subject = Subject::new_for_owner(std::process::id(), None, None)?;
+    let details = std::collections::HashMap::new();
+    let authorization_result = proxy
+        .check_authorization(
+            &subject,
+            "com.bitwarden.Bitwarden.unlock",
+            &details,
+            CheckAuthorizationFlags::AllowUserInteraction.into(),
+            "",
+        )
+        .await;
+
+    match authorization_result {
+        Ok(result) => Ok(result.is_authorized),
+        Err(e) => {
+            warn!("[Polkit] Error performing authentication: {:?}", e);
+            Ok(false)
+        }
+    }
+}
+
+async fn polkit_is_bitwarden_policy_available() -> Result<bool> {
+    let connection = Connection::system().await?;
+    let proxy = AuthorityProxy::new(&connection).await?;
+    let actions = proxy.enumerate_actions("en").await?;
+    for action in actions {
+        if action.action_id == "com.bitwarden.Bitwarden.unlock" {
+            return Ok(true);
+        }
+    }
+    Ok(false)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    #[ignore]
+    async fn test_polkit_authenticate() {
+        let result = polkit_authenticate_bitwarden_policy().await;
+        assert!(result.is_ok());
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/biometric_v2/mod.rs b/apps/desktop/desktop_native/core/src/biometric_v2/mod.rs
new file mode 100644
index 00000000000..55aee27dd33
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/biometric_v2/mod.rs
@@ -0,0 +1,34 @@
+use anyhow::Result;
+
+#[allow(clippy::module_inception)]
+#[cfg_attr(target_os = "linux", path = "linux.rs")]
+#[cfg_attr(target_os = "macos", path = "unimplemented.rs")]
+#[cfg_attr(target_os = "windows", path = "windows.rs")]
+mod biometric_v2;
+
+#[cfg(target_os = "windows")]
+pub mod windows_focus;
+
+pub use biometric_v2::BiometricLockSystem;
+
+#[allow(async_fn_in_trait)]
+pub trait BiometricTrait: Send + Sync {
+    /// Authenticate the user
+    async fn authenticate(&self, hwnd: Vec<u8>, message: String) -> Result<bool>;
+    /// Check if biometric authentication is available
+    async fn authenticate_available(&self) -> Result<bool>;
+    /// Enroll a key for persistent unlock. If the implementation does not support persistent
+    /// enrollment, this function should do nothing.
+    async fn enroll_persistent(&self, user_id: &str, key: &[u8]) -> Result<()>;
+    /// Clear the persistent and ephemeral keys
+    async fn unenroll(&self, user_id: &str) -> Result<()>;
+    /// Check if a persistent (survives app restarts and reboots) key is set for a user
+    async fn has_persistent(&self, user_id: &str) -> Result<bool>;
+    /// Provide a key to be ephemerally held. This should be called on every unlock.
+    async fn provide_key(&self, user_id: &str, key: &[u8]);
+    /// Perform biometric unlock and return the key
+    async fn unlock(&self, user_id: &str, hwnd: Vec<u8>) -> Result<Vec<u8>>;
+    /// Check if biometric unlock is available based on whether a key is present and whether
+    /// authentication is possible
+    async fn unlock_available(&self, user_id: &str) -> Result<bool>;
+}
diff --git a/apps/desktop/desktop_native/core/src/biometric_v2/unimplemented.rs b/apps/desktop/desktop_native/core/src/biometric_v2/unimplemented.rs
new file mode 100644
index 00000000000..1503cfea89c
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/biometric_v2/unimplemented.rs
@@ -0,0 +1,47 @@
+pub struct BiometricLockSystem {}
+
+impl BiometricLockSystem {
+    pub fn new() -> Self {
+        Self {}
+    }
+}
+
+impl Default for BiometricLockSystem {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl super::BiometricTrait for BiometricLockSystem {
+    async fn authenticate(&self, _hwnd: Vec<u8>, _message: String) -> Result<bool, anyhow::Error> {
+        unimplemented!()
+    }
+
+    async fn authenticate_available(&self) -> Result<bool, anyhow::Error> {
+        unimplemented!()
+    }
+
+    async fn enroll_persistent(&self, _user_id: &str, _key: &[u8]) -> Result<(), anyhow::Error> {
+        unimplemented!()
+    }
+
+    async fn provide_key(&self, _user_id: &str, _key: &[u8]) {
+        unimplemented!()
+    }
+
+    async fn unlock(&self, _user_id: &str, _hwnd: Vec<u8>) -> Result<Vec<u8>, anyhow::Error> {
+        unimplemented!()
+    }
+
+    async fn unlock_available(&self, _user_id: &str) -> Result<bool, anyhow::Error> {
+        unimplemented!()
+    }
+
+    async fn has_persistent(&self, _user_id: &str) -> Result<bool, anyhow::Error> {
+        unimplemented!()
+    }
+
+    async fn unenroll(&self, _user_id: &str) -> Result<(), anyhow::Error> {
+        unimplemented!()
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/biometric_v2/windows.rs b/apps/desktop/desktop_native/core/src/biometric_v2/windows.rs
new file mode 100644
index 00000000000..32d2eb7e6e6
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/biometric_v2/windows.rs
@@ -0,0 +1,511 @@
+//! This file implements Windows-Hello based biometric unlock.
+//!
+//! There are two paths implemented here.
+//! The former via UV + ephemerally (but protected) keys. This only works after first unlock.
+//! The latter via a signing API, that deterministically signs a challenge, from which a windows
+//! hello key is derived. This key is used to encrypt the protected key.
+//!
+//! # Security
+//! The security goal is that a locked vault - a running app - cannot be unlocked when the device
+//! (user-space) is compromised in this state.
+//!
+//! ## UV path
+//! When first unlocking the app, the app sends the user-key to this module, which holds it in
+//! secure memory, protected by DPAPI. This makes it inaccessible to other processes, unless they
+//! compromise the system administrator, or kernel. While the app is running this key is held in
+//! memory, even if locked. When unlocking, the app will prompt the user via
+//! `windows_hello_authenticate` to get a yes/no decision on whether to release the key to the app.
+//! Note: Further process isolation is needed here so that code cannot be injected into the running
+//! process, which may circumvent DPAPI.
+//!
+//! ## Sign path
+//! In this scenario, when enrolling, the app sends the user-key to this module, which derives the
+//! windows hello key with the Windows Hello prompt. This is done by signing a per-user challenge,
+//! which produces a deterministic signature which is hashed to obtain a key. This key is used to
+//! encrypt and persist the vault unlock key (user key).
+//!
+//! Since the keychain can be accessed by all user-space processes, the challenge is known to all
+//! userspace processes. Therefore, to circumvent the security measure, the attacker would need to
+//! create a fake Windows-Hello prompt, and get the user to confirm it.
+
+use std::sync::{atomic::AtomicBool, Arc};
+
+use aes::cipher::KeyInit;
+use anyhow::{anyhow, Result};
+use chacha20poly1305::{aead::Aead, XChaCha20Poly1305, XNonce};
+use sha2::{Digest, Sha256};
+use tokio::sync::Mutex;
+use tracing::{debug, warn};
+use windows::{
+    core::{factory, h, Interface, HSTRING},
+    Security::{
+        Credentials::{
+            KeyCredentialCreationOption, KeyCredentialManager, KeyCredentialStatus,
+            UI::{
+                UserConsentVerificationResult, UserConsentVerifier, UserConsentVerifierAvailability,
+            },
+        },
+        Cryptography::CryptographicBuffer,
+    },
+    Storage::Streams::IBuffer,
+    Win32::{
+        System::WinRT::{IBufferByteAccess, IUserConsentVerifierInterop},
+        UI::WindowsAndMessaging::GetForegroundWindow,
+    },
+};
+use windows_future::IAsyncOperation;
+
+use super::windows_focus::{focus_security_prompt, restore_focus};
+use crate::{
+    password::{self, PASSWORD_NOT_FOUND},
+    secure_memory::*,
+};
+
+const KEYCHAIN_SERVICE_NAME: &str = "BitwardenBiometricsV2";
+const CREDENTIAL_NAME: &HSTRING = h!("BitwardenBiometricsV2");
+const CHALLENGE_LENGTH: usize = 16;
+const XCHACHA20POLY1305_NONCE_LENGTH: usize = 24;
+const XCHACHA20POLY1305_KEY_LENGTH: usize = 32;
+
+#[derive(serde::Serialize, serde::Deserialize)]
+struct WindowsHelloKeychainEntry {
+    nonce: [u8; XCHACHA20POLY1305_NONCE_LENGTH],
+    challenge: [u8; CHALLENGE_LENGTH],
+    wrapped_key: Vec<u8>,
+}
+
+/// The Windows OS implementation of the biometric trait.
+pub struct BiometricLockSystem {
+    // The userkeys that are held in memory MUST be protected from memory dumping attacks, to
+    // ensure locked vaults cannot be unlocked
+    secure_memory: Arc<Mutex<crate::secure_memory::dpapi::DpapiSecretKVStore>>,
+}
+
+impl BiometricLockSystem {
+    pub fn new() -> Self {
+        Self {
+            secure_memory: Arc::new(Mutex::new(
+                crate::secure_memory::dpapi::DpapiSecretKVStore::new(),
+            )),
+        }
+    }
+}
+
+impl Default for BiometricLockSystem {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl super::BiometricTrait for BiometricLockSystem {
+    async fn authenticate(&self, _hwnd: Vec<u8>, message: String) -> Result<bool> {
+        windows_hello_authenticate(message).await
+    }
+
+    async fn authenticate_available(&self) -> Result<bool> {
+        match UserConsentVerifier::CheckAvailabilityAsync()?.await? {
+            UserConsentVerifierAvailability::Available
+            | UserConsentVerifierAvailability::DeviceBusy => Ok(true),
+            _ => Ok(false),
+        }
+    }
+
+    async fn unenroll(&self, user_id: &str) -> Result<()> {
+        self.secure_memory.lock().await.remove(user_id);
+        delete_keychain_entry(user_id).await
+    }
+
+    async fn enroll_persistent(&self, user_id: &str, key: &[u8]) -> Result<()> {
+        // Enrollment works by first generating a random challenge unique to the user / enrollment.
+        // Then, with the challenge and a Windows-Hello prompt, the "windows hello key" is
+        // derived. The windows hello key is used to encrypt the key to store with
+        // XChaCha20Poly1305. The bundle of nonce, challenge and wrapped-key are stored to
+        // the keychain
+
+        // Each enrollment (per user) has a unique challenge, so that the windows-hello key is
+        // unique
+        let challenge: [u8; CHALLENGE_LENGTH] = rand::random();
+
+        // This key is unique to the challenge
+        let windows_hello_key = windows_hello_authenticate_with_crypto(&challenge).await?;
+        let (wrapped_key, nonce) = encrypt_data(&windows_hello_key, key)?;
+
+        set_keychain_entry(
+            user_id,
+            &WindowsHelloKeychainEntry {
+                nonce,
+                challenge,
+                wrapped_key,
+            },
+        )
+        .await
+    }
+
+    async fn provide_key(&self, user_id: &str, key: &[u8]) {
+        self.secure_memory
+            .lock()
+            .await
+            .put(user_id.to_string(), key);
+    }
+
+    async fn unlock(&self, user_id: &str, _hwnd: Vec<u8>) -> Result<Vec<u8>> {
+        // Allow restoring focus to the previous window (browser)
+        let previous_active_window = super::windows_focus::get_active_window();
+        let _focus_scopeguard = scopeguard::guard((), |_| {
+            if let Some(hwnd) = previous_active_window {
+                debug!("Restoring focus to previous window");
+                restore_focus(hwnd.0);
+            }
+        });
+
+        let mut secure_memory = self.secure_memory.lock().await;
+        // If the key is held ephemerally, always use UV API. Only use signing API if the key is not
+        // held ephemerally but the keychain holds it persistently.
+        if secure_memory.has(user_id) {
+            if windows_hello_authenticate("Unlock your vault".to_string()).await? {
+                secure_memory
+                    .get(user_id)
+                    .clone()
+                    .ok_or_else(|| anyhow!("No key found for user"))
+            } else {
+                Err(anyhow!("Authentication failed"))
+            }
+        } else {
+            let keychain_entry = get_keychain_entry(user_id).await?;
+            let windows_hello_key =
+                windows_hello_authenticate_with_crypto(&keychain_entry.challenge).await?;
+            let decrypted_key = decrypt_data(
+                &windows_hello_key,
+                &keychain_entry.wrapped_key,
+                &keychain_entry.nonce,
+            )?;
+            // The first unlock already sets the key for subsequent unlocks. The key may again be
+            // set externally after unlock finishes.
+            secure_memory.put(user_id.to_string(), &decrypted_key.clone());
+            Ok(decrypted_key)
+        }
+    }
+
+    async fn unlock_available(&self, user_id: &str) -> Result<bool> {
+        let secure_memory = self.secure_memory.lock().await;
+        let has_key =
+            secure_memory.has(user_id) || has_keychain_entry(user_id).await.unwrap_or(false);
+        Ok(has_key && self.authenticate_available().await.unwrap_or(false))
+    }
+
+    async fn has_persistent(&self, user_id: &str) -> Result<bool> {
+        Ok(get_keychain_entry(user_id).await.is_ok())
+    }
+}
+
+/// Get a yes/no authorization without any cryptographic backing.
+/// This API has better focusing behavior
+async fn windows_hello_authenticate(message: String) -> Result<bool> {
+    debug!(
+        "[Windows Hello] Authenticating to perform UV with message: {}",
+        message
+    );
+
+    let userconsent_result: IAsyncOperation<UserConsentVerificationResult> = unsafe {
+        // Windows Hello prompt must be in foreground, focused, otherwise the face or fingerprint
+        // unlock will not work. We get the current foreground window, which will either be the
+        // Bitwarden desktop app or the browser extension.
+        let foreground_window = GetForegroundWindow();
+        factory::<UserConsentVerifier, IUserConsentVerifierInterop>()?
+            .RequestVerificationForWindowAsync(foreground_window, &HSTRING::from(message))?
+    };
+
+    match userconsent_result.await? {
+        UserConsentVerificationResult::Verified => Ok(true),
+        _ => Ok(false),
+    }
+}
+
+/// Derive the symmetric encryption key from the Windows Hello signature.
+///
+/// This works by signing a static challenge string with Windows Hello protected key store. The
+/// signed challenge is then hashed using SHA-256 and used as the symmetric encryption key for the
+/// Windows Hello protected keys.
+///
+/// Windows will only sign the challenge if the user has successfully authenticated with Windows,
+/// ensuring user presence.
+///
+/// Note: This API has inconsistent focusing behavior when called from another window
+async fn windows_hello_authenticate_with_crypto(
+    challenge: &[u8; CHALLENGE_LENGTH],
+) -> Result<[u8; XCHACHA20POLY1305_KEY_LENGTH]> {
+    debug!("[Windows Hello] Authenticating to sign challenge");
+
+    // Ugly hack: We need to focus the window via window focusing APIs until Microsoft releases a
+    // new API. This is unreliable, and if it does not work, the operation may fail
+    let stop_focusing = Arc::new(AtomicBool::new(false));
+    let stop_focusing_clone = stop_focusing.clone();
+    let _ = std::thread::spawn(move || loop {
+        if !stop_focusing_clone.load(std::sync::atomic::Ordering::Relaxed) {
+            focus_security_prompt();
+            std::thread::sleep(std::time::Duration::from_millis(500));
+        } else {
+            break;
+        }
+    });
+    // Only stop focusing once this function exits. The focus MUST run both during the initial
+    // creation with RequestCreateAsync, and also with the subsequent use with RequestSignAsync.
+    let _guard = scopeguard::guard((), |_| {
+        stop_focusing.store(true, std::sync::atomic::Ordering::Relaxed);
+    });
+
+    // First create or replace the Bitwarden Biometrics signing key
+    let credential = {
+        let key_credential_creation_result = KeyCredentialManager::RequestCreateAsync(
+            CREDENTIAL_NAME,
+            KeyCredentialCreationOption::FailIfExists,
+        )?
+        .await?;
+        match key_credential_creation_result.Status()? {
+            KeyCredentialStatus::CredentialAlreadyExists => {
+                KeyCredentialManager::OpenAsync(CREDENTIAL_NAME)?.await?
+            }
+            KeyCredentialStatus::Success => key_credential_creation_result,
+            _ => return Err(anyhow!("Failed to create key credential")),
+        }
+    }
+    .Credential()?;
+
+    let signature = {
+        let sign_operation = credential.RequestSignAsync(
+            &CryptographicBuffer::CreateFromByteArray(challenge.as_slice())?,
+        )?;
+
+        // We need to drop the credential here to avoid holding it across an await point.
+        drop(credential);
+        sign_operation.await?
+    };
+
+    if signature.Status()? != KeyCredentialStatus::Success {
+        return Err(anyhow!("Failed to sign data"));
+    }
+
+    let signature_buffer = signature.Result()?;
+    let signature_value = unsafe { as_mut_bytes(&signature_buffer)? };
+
+    // The signature is deterministic based on the challenge and keychain key. Thus, it can be
+    // hashed to a key. It is unclear what entropy this key provides.
+    let windows_hello_key = Sha256::digest(signature_value).into();
+    Ok(windows_hello_key)
+}
+
+async fn set_keychain_entry(user_id: &str, entry: &WindowsHelloKeychainEntry) -> Result<()> {
+    password::set_password(
+        KEYCHAIN_SERVICE_NAME,
+        user_id,
+        &serde_json::to_string(entry)?,
+    )
+    .await
+}
+
+async fn get_keychain_entry(user_id: &str) -> Result<WindowsHelloKeychainEntry> {
+    serde_json::from_str(&password::get_password(KEYCHAIN_SERVICE_NAME, user_id).await?)
+        .map_err(|e| anyhow!(e))
+}
+
+async fn delete_keychain_entry(user_id: &str) -> Result<()> {
+    password::delete_password(KEYCHAIN_SERVICE_NAME, user_id)
+        .await
+        .or_else(|e| {
+            if e.to_string() == PASSWORD_NOT_FOUND {
+                debug!(
+                    "[Windows Hello] No keychain entry found for user {}, nothing to delete",
+                    user_id
+                );
+                Ok(())
+            } else {
+                Err(e)
+            }
+        })
+}
+
+async fn has_keychain_entry(user_id: &str) -> Result<bool> {
+    password::get_password(KEYCHAIN_SERVICE_NAME, user_id)
+        .await
+        .map(|entry| !entry.is_empty())
+        .or_else(|e| {
+            if e.to_string() == PASSWORD_NOT_FOUND {
+                Ok(false)
+            } else {
+                warn!(
+                    "[Windows Hello] Error checking keychain entry for user {}: {}",
+                    user_id, e
+                );
+                Err(e)
+            }
+        })
+}
+
+/// Encrypt data with XChaCha20Poly1305
+fn encrypt_data(
+    key: &[u8; XCHACHA20POLY1305_KEY_LENGTH],
+    plaintext: &[u8],
+) -> Result<(Vec<u8>, [u8; XCHACHA20POLY1305_NONCE_LENGTH])> {
+    let cipher = XChaCha20Poly1305::new(key.into());
+    let mut nonce = [0u8; XCHACHA20POLY1305_NONCE_LENGTH];
+    rand::fill(&mut nonce);
+    let ciphertext = cipher
+        .encrypt(XNonce::from_slice(&nonce), plaintext)
+        .map_err(|e| anyhow!(e))?;
+    Ok((ciphertext, nonce))
+}
+
+/// Decrypt data with XChaCha20Poly1305
+fn decrypt_data(
+    key: &[u8; XCHACHA20POLY1305_KEY_LENGTH],
+    ciphertext: &[u8],
+    nonce: &[u8; XCHACHA20POLY1305_NONCE_LENGTH],
+) -> Result<Vec<u8>> {
+    let cipher = XChaCha20Poly1305::new(key.into());
+    let plaintext = cipher
+        .decrypt(XNonce::from_slice(nonce), ciphertext)
+        .map_err(|e| anyhow!(e))?;
+    Ok(plaintext)
+}
+
+unsafe fn as_mut_bytes(buffer: &IBuffer) -> Result<&mut [u8]> {
+    let interop = buffer.cast::<IBufferByteAccess>()?;
+
+    unsafe {
+        let data = interop.Buffer()?;
+        Ok(std::slice::from_raw_parts_mut(
+            data,
+            buffer.Length()? as usize,
+        ))
+    }
+}
+
+#[cfg(test)]
+#[allow(clippy::print_stdout)]
+mod tests {
+    use crate::biometric_v2::{
+        biometric_v2::{
+            decrypt_data, encrypt_data, has_keychain_entry, windows_hello_authenticate,
+            windows_hello_authenticate_with_crypto, CHALLENGE_LENGTH, XCHACHA20POLY1305_KEY_LENGTH,
+        },
+        BiometricLockSystem, BiometricTrait,
+    };
+
+    #[test]
+    fn test_encrypt_decrypt() {
+        let key = [0u8; 32];
+        let plaintext = b"Test data";
+        let (ciphertext, nonce) = encrypt_data(&key, plaintext).unwrap();
+        let decrypted = decrypt_data(&key, &ciphertext, &nonce).unwrap();
+        assert_eq!(plaintext.to_vec(), decrypted);
+    }
+
+    #[tokio::test]
+    async fn test_has_keychain_entry_no_entry() {
+        let user_id = "test_user";
+        let has_entry = has_keychain_entry(user_id).await.unwrap();
+        assert!(!has_entry);
+    }
+
+    // Note: These tests are ignored because they require manual intervention to run
+
+    #[tokio::test]
+    #[ignore]
+    async fn test_windows_hello_authenticate_with_crypto_manual() {
+        let challenge = [0u8; CHALLENGE_LENGTH];
+        let windows_hello_key = windows_hello_authenticate_with_crypto(&challenge)
+            .await
+            .unwrap();
+        println!(
+            "Windows hello key {:?} for challenge {:?}",
+            windows_hello_key, challenge
+        );
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn test_windows_hello_authenticate() {
+        let authenticated =
+            windows_hello_authenticate("Test Windows Hello authentication".to_string())
+                .await
+                .unwrap();
+        println!("Windows Hello authentication result: {:?}", authenticated);
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn test_double_unenroll() {
+        let user_id = "test_user";
+        let mut key = [0u8; XCHACHA20POLY1305_KEY_LENGTH];
+        rand::fill(&mut key);
+
+        let windows_hello_lock_system = BiometricLockSystem::new();
+
+        println!("Enrolling user");
+        windows_hello_lock_system
+            .enroll_persistent(user_id, &key)
+            .await
+            .unwrap();
+        assert!(windows_hello_lock_system
+            .has_persistent(user_id)
+            .await
+            .unwrap());
+
+        println!("Unlocking user");
+        let key_after_unlock = windows_hello_lock_system
+            .unlock(user_id, Vec::new())
+            .await
+            .unwrap();
+        assert_eq!(key_after_unlock, key);
+
+        println!("Unenrolling user");
+        windows_hello_lock_system.unenroll(user_id).await.unwrap();
+        assert!(!windows_hello_lock_system
+            .has_persistent(user_id)
+            .await
+            .unwrap());
+
+        println!("Unenrolling user again");
+
+        // This throws PASSWORD_NOT_FOUND but our code should handle that and not throw.
+        windows_hello_lock_system.unenroll(user_id).await.unwrap();
+        assert!(!windows_hello_lock_system
+            .has_persistent(user_id)
+            .await
+            .unwrap());
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn test_enroll_unlock_unenroll() {
+        let user_id = "test_user";
+        let mut key = [0u8; XCHACHA20POLY1305_KEY_LENGTH];
+        rand::fill(&mut key);
+
+        let windows_hello_lock_system = BiometricLockSystem::new();
+
+        println!("Enrolling user");
+        windows_hello_lock_system
+            .enroll_persistent(user_id, &key)
+            .await
+            .unwrap();
+        assert!(windows_hello_lock_system
+            .has_persistent(user_id)
+            .await
+            .unwrap());
+
+        println!("Unlocking user");
+        let key_after_unlock = windows_hello_lock_system
+            .unlock(user_id, Vec::new())
+            .await
+            .unwrap();
+        assert_eq!(key_after_unlock, key);
+
+        println!("Unenrolling user");
+        windows_hello_lock_system.unenroll(user_id).await.unwrap();
+        assert!(!windows_hello_lock_system
+            .has_persistent(user_id)
+            .await
+            .unwrap());
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/biometric_v2/windows_focus.rs b/apps/desktop/desktop_native/core/src/biometric_v2/windows_focus.rs
new file mode 100644
index 00000000000..bf303c88e01
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/biometric_v2/windows_focus.rs
@@ -0,0 +1,104 @@
+use windows::{
+    core::s,
+    Win32::{
+        Foundation::HWND,
+        System::Threading::{AttachThreadInput, GetCurrentThreadId},
+        UI::{
+            Input::KeyboardAndMouse::{EnableWindow, SetActiveWindow, SetCapture, SetFocus},
+            WindowsAndMessaging::{
+                BringWindowToTop, FindWindowA, GetForegroundWindow, GetWindowThreadProcessId,
+                SetForegroundWindow, SwitchToThisWindow, SystemParametersInfoW, SPIF_SENDCHANGE,
+                SPIF_UPDATEINIFILE, SPI_GETFOREGROUNDLOCKTIMEOUT, SPI_SETFOREGROUNDLOCKTIMEOUT,
+            },
+        },
+    },
+};
+
+pub(crate) struct HwndHolder(pub(crate) HWND);
+unsafe impl Send for HwndHolder {}
+
+pub(crate) fn get_active_window() -> Option<HwndHolder> {
+    unsafe { Some(HwndHolder(GetForegroundWindow())) }
+}
+
+/// Searches for a window that looks like a security prompt and set it as focused.
+/// Only works when the process has permission to foreground, either by being in foreground
+/// Or by being given foreground permission https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setforegroundwindow#remarks
+pub fn focus_security_prompt() {
+    let hwnd_result = unsafe { FindWindowA(s!("Credential Dialog Xaml Host"), None) };
+    if let Ok(hwnd) = hwnd_result {
+        set_focus(hwnd);
+    }
+}
+
+/// Sets focus to a window using a few unstable methods
+fn set_focus(hwnd: HWND) {
+    unsafe {
+        // Windows REALLY does not like apps stealing focus, even if it is for fixing Windows-Hello
+        // bugs. The windows hello signing prompt NEEDS to be focused instantly, or it will
+        // error, but it does not focus itself.
+
+        // This function implements forced focusing of windows using a few hacks.
+        // The conditions to successfully foreground a window are:
+        // All of the following conditions are true:
+        //   - The calling process belongs to a desktop application, not a UWP app or a Windows
+        //     Store app designed for Windows 8 or 8.1.
+        //  - The foreground process has not disabled calls to SetForegroundWindow by a previous
+        //    call to the LockSetForegroundWindow function.
+        //   - The foreground lock time-out has expired (see SPI_GETFOREGROUNDLOCKTIMEOUT in
+        //     SystemParametersInfo). No menus are active.
+        // Additionally, at least one of the following conditions is true:
+        //   - The calling process is the foreground process.
+        //   - The calling process was started by the foreground process.
+        //   - There is currently no foreground window, and thus no foreground process.
+        //   - The calling process received the last input event.
+        //   - Either the foreground process or the calling process is being debugged.
+
+        // Update the foreground lock timeout temporarily
+        let mut old_timeout = 0;
+        let _ = SystemParametersInfoW(
+            SPI_GETFOREGROUNDLOCKTIMEOUT,
+            0,
+            Some(&mut old_timeout as *mut _ as *mut std::ffi::c_void),
+            windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS(0),
+        );
+        let _ = SystemParametersInfoW(
+            SPI_SETFOREGROUNDLOCKTIMEOUT,
+            0,
+            None,
+            SPIF_UPDATEINIFILE | SPIF_SENDCHANGE,
+        );
+        let _scopeguard = scopeguard::guard((), |_| {
+            let _ = SystemParametersInfoW(
+                SPI_SETFOREGROUNDLOCKTIMEOUT,
+                old_timeout,
+                None,
+                SPIF_UPDATEINIFILE | SPIF_SENDCHANGE,
+            );
+        });
+
+        // Attach to the foreground thread once attached, we can foreground, even if in the
+        // background
+        let dw_current_thread = GetCurrentThreadId();
+        let dw_fg_thread = GetWindowThreadProcessId(GetForegroundWindow(), None);
+
+        let _ = AttachThreadInput(dw_current_thread, dw_fg_thread, true);
+        let _ = SetForegroundWindow(hwnd);
+        SetCapture(hwnd);
+        let _ = SetFocus(Some(hwnd));
+        let _ = SetActiveWindow(hwnd);
+        let _ = EnableWindow(hwnd, true);
+        let _ = BringWindowToTop(hwnd);
+        SwitchToThisWindow(hwnd, true);
+        let _ = AttachThreadInput(dw_current_thread, dw_fg_thread, false);
+    }
+}
+
+/// When restoring focus to the application window, we need a less aggressive method so the electron
+/// window doesn't get frozen.
+pub(crate) fn restore_focus(hwnd: HWND) {
+    unsafe {
+        let _ = SetForegroundWindow(hwnd);
+        let _ = SetFocus(Some(hwnd));
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/crypto/crypto.rs b/apps/desktop/desktop_native/core/src/crypto/crypto.rs
index d9e2aec3046..7991c87ca28 100644
--- a/apps/desktop/desktop_native/core/src/crypto/crypto.rs
+++ b/apps/desktop/desktop_native/core/src/crypto/crypto.rs
@@ -5,9 +5,8 @@ use aes::cipher::{
     BlockEncryptMut, KeyIvInit,
 };
 
-use crate::error::{CryptoError, Result};
-
 use super::CipherString;
+use crate::error::{CryptoError, Result};
 
 pub fn decrypt_aes256(iv: &[u8; 16], data: &[u8], key: GenericArray<u8, U32>) -> Result<Vec<u8>> {
     let iv = GenericArray::from_slice(iv);
@@ -16,7 +15,8 @@ pub fn decrypt_aes256(iv: &[u8; 16], data: &[u8], key: GenericArray<u8, U32>) ->
         .decrypt_padded_mut::<Pkcs7>(&mut data)
         .map_err(|_| CryptoError::KeyDecrypt)?;
 
-    // Data is decrypted in place and returns a subslice of the original Vec, to avoid cloning it, we truncate to the subslice length
+    // Data is decrypted in place and returns a subslice of the original Vec, to avoid cloning it,
+    // we truncate to the subslice length
     let decrypted_len = decrypted_key_slice.len();
     data.truncate(decrypted_len);
 
diff --git a/apps/desktop/desktop_native/core/src/error.rs b/apps/desktop/desktop_native/core/src/error.rs
index d70d8624018..c8d3ec02332 100644
--- a/apps/desktop/desktop_native/core/src/error.rs
+++ b/apps/desktop/desktop_native/core/src/error.rs
@@ -35,15 +35,4 @@ pub enum KdfParamError {
     InvalidParams(String),
 }
 
-// Ensure that the error messages implement Send and Sync
-#[cfg(test)]
-const _: () = {
-    fn assert_send<T: Send>() {}
-    fn assert_sync<T: Sync>() {}
-    fn assert_all() {
-        assert_send::<Error>();
-        assert_sync::<Error>();
-    }
-};
-
 pub type Result<T, E = Error> = std::result::Result<T, E>;
diff --git a/apps/desktop/desktop_native/core/src/ipc/mod.rs b/apps/desktop/desktop_native/core/src/ipc/mod.rs
index 41215b3a0ee..f806e395d10 100644
--- a/apps/desktop/desktop_native/core/src/ipc/mod.rs
+++ b/apps/desktop/desktop_native/core/src/ipc/mod.rs
@@ -35,7 +35,7 @@ fn internal_ipc_codec<T: AsyncRead + AsyncWrite>(inner: T) -> Framed<T, LengthDe
 pub fn path(name: &str) -> std::path::PathBuf {
     #[cfg(target_os = "windows")]
     {
-        // Use a unique IPC pipe //./pipe/xxxxxxxxxxxxxxxxx.app.bitwarden per user.
+        // Use a unique IPC pipe //./pipe/xxxxxxxxxxxxxxxxx.s.bw per user (s for socket).
         // Hashing prevents problems with reserved characters and file length limitations.
         use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
         use sha2::Digest;
@@ -43,13 +43,14 @@ pub fn path(name: &str) -> std::path::PathBuf {
         let hash = sha2::Sha256::digest(home.as_os_str().as_encoded_bytes());
         let hash_b64 = URL_SAFE_NO_PAD.encode(hash.as_slice());
 
-        format!(r"\\.\pipe\{hash_b64}.app.{name}").into()
+        format!(r"\\.\pipe\{hash_b64}.s.{name}").into()
     }
 
     #[cfg(target_os = "macos")]
     {
         // When running in an unsandboxed environment, path is: /Users/<user>/
-        // While running sandboxed, it's different: /Users/<user>/Library/Containers/com.bitwarden.desktop/Data
+        // While running sandboxed, it's different:
+        // /Users/<user>/Library/Containers/com.bitwarden.desktop/Data
         let mut home = dirs::home_dir().unwrap();
 
         // Check if the app is sandboxed by looking for the Containers directory
@@ -59,17 +60,18 @@ pub fn path(name: &str) -> std::path::PathBuf {
 
         // If the app is sanboxed, we need to use the App Group directory
         if let Some(position) = containers_position {
-            // We want to use App Groups in /Users/<user>/Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop,
-            // so we need to remove all the components after the user. We can use the previous position to do this.
+            // We want to use App Groups in /Users/<user>/Library/Group
+            // Containers/LTZ2PFU5D6.com.bitwarden.desktop, so we need to remove all the
+            // components after the user. We can use the previous position to do this.
             while home.components().count() > position - 1 {
                 home.pop();
             }
 
-            let tmp = home.join("Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop/tmp");
+            let tmp = home.join("Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop");
 
             // The tmp directory might not exist, so create it
             let _ = std::fs::create_dir_all(&tmp);
-            return tmp.join(format!("app.{name}"));
+            return tmp.join(format!("s.{name}"));
         }
     }
 
@@ -81,6 +83,6 @@ pub fn path(name: &str) -> std::path::PathBuf {
 
         // The cache directory might not exist, so create it
         let _ = std::fs::create_dir_all(&path_dir);
-        path_dir.join(format!("app.{name}"))
+        path_dir.join(format!("s.{name}"))
     }
 }
diff --git a/apps/desktop/desktop_native/core/src/ipc/server.rs b/apps/desktop/desktop_native/core/src/ipc/server.rs
index 2762a832ac6..a65638303f1 100644
--- a/apps/desktop/desktop_native/core/src/ipc/server.rs
+++ b/apps/desktop/desktop_native/core/src/ipc/server.rs
@@ -3,9 +3,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use futures::{SinkExt, StreamExt, TryFutureExt};
-
 use anyhow::Result;
+use futures::{SinkExt, StreamExt, TryFutureExt};
 use interprocess::local_socket::{tokio::prelude::*, GenericFilePath, ListenerOptions};
 use tokio::{
     io::{AsyncRead, AsyncWrite},
@@ -42,14 +41,17 @@ impl Server {
     ///
     /// # Parameters
     ///
-    /// - `name`: The endpoint name to listen on. This name uniquely identifies the IPC connection and must be the same for both the server and client.
-    /// - `client_to_server_send`: This [`mpsc::Sender<Message>`] will receive all the [`Message`]'s that the clients send to this server.
+    /// - `name`: The endpoint name to listen on. This name uniquely identifies the IPC connection
+    ///   and must be the same for both the server and client.
+    /// - `client_to_server_send`: This [`mpsc::Sender<Message>`] will receive all the [`Message`]'s
+    ///   that the clients send to this server.
     pub fn start(
         path: &Path,
         client_to_server_send: mpsc::Sender<Message>,
     ) -> Result<Self, Box<dyn Error>> {
-        // If the unix socket file already exists, we get an error when trying to bind to it. So we remove it first.
-        // Any processes that were using the old socket should remain connected to it but any new connections will use the new socket.
+        // If the unix socket file already exists, we get an error when trying to bind to it. So we
+        // remove it first. Any processes that were using the old socket should remain
+        // connected to it but any new connections will use the new socket.
         if !cfg!(windows) {
             let _ = std::fs::remove_file(path);
         }
@@ -58,8 +60,9 @@ impl Server {
         let opts = ListenerOptions::new().name(name);
         let listener = opts.create_tokio()?;
 
-        // This broadcast channel is used for sending messages to all connected clients, and so the sender
-        // will be stored in the server while the receiver will be cloned and passed to each client handler.
+        // This broadcast channel is used for sending messages to all connected clients, and so the
+        // sender will be stored in the server while the receiver will be cloned and passed
+        // to each client handler.
         let (server_to_clients_send, server_to_clients_recv) =
             broadcast::channel::<String>(MESSAGE_CHANNEL_BUFFER);
 
diff --git a/apps/desktop/desktop_native/core/src/lib.rs b/apps/desktop/desktop_native/core/src/lib.rs
index a72ec04e9c2..668badb95ed 100644
--- a/apps/desktop/desktop_native/core/src/lib.rs
+++ b/apps/desktop/desktop_native/core/src/lib.rs
@@ -1,13 +1,15 @@
 pub mod autofill;
 pub mod autostart;
 pub mod biometric;
+pub mod biometric_v2;
 pub mod clipboard;
-pub mod crypto;
+pub(crate) mod crypto;
 pub mod error;
 pub mod ipc;
 pub mod password;
 pub mod powermonitor;
 pub mod process_isolation;
+pub(crate) mod secure_memory;
 pub mod ssh_agent;
 
 use zeroizing_alloc::ZeroAlloc;
diff --git a/apps/desktop/desktop_native/core/src/password/macos.rs b/apps/desktop/desktop_native/core/src/password/macos.rs
index 4f3a16ba4be..72d8ebeb425 100644
--- a/apps/desktop/desktop_native/core/src/password/macos.rs
+++ b/apps/desktop/desktop_native/core/src/password/macos.rs
@@ -1,9 +1,10 @@
-use crate::password::PASSWORD_NOT_FOUND;
 use anyhow::Result;
 use security_framework::passwords::{
     delete_generic_password, get_generic_password, set_generic_password,
 };
 
+use crate::password::PASSWORD_NOT_FOUND;
+
 #[allow(clippy::unused_async)]
 pub async fn get_password(service: &str, account: &str) -> Result<String> {
     let password = get_generic_password(service, account).map_err(convert_error)?;
diff --git a/apps/desktop/desktop_native/core/src/password/unix.rs b/apps/desktop/desktop_native/core/src/password/unix.rs
index b7595dca287..57b71adefed 100644
--- a/apps/desktop/desktop_native/core/src/password/unix.rs
+++ b/apps/desktop/desktop_native/core/src/password/unix.rs
@@ -1,9 +1,11 @@
-use crate::password::PASSWORD_NOT_FOUND;
+use std::collections::HashMap;
+
 use anyhow::{anyhow, Result};
 use oo7::dbus::{self};
-use std::collections::HashMap;
 use tracing::info;
 
+use crate::password::PASSWORD_NOT_FOUND;
+
 pub async fn get_password(service: &str, account: &str) -> Result<String> {
     match get_password_new(service, account).await {
         Ok(res) => Ok(res),
diff --git a/apps/desktop/desktop_native/core/src/password/windows.rs b/apps/desktop/desktop_native/core/src/password/windows.rs
index ad09019f014..645620b444e 100644
--- a/apps/desktop/desktop_native/core/src/password/windows.rs
+++ b/apps/desktop/desktop_native/core/src/password/windows.rs
@@ -1,4 +1,3 @@
-use crate::password::PASSWORD_NOT_FOUND;
 use anyhow::{anyhow, Result};
 use widestring::{U16CString, U16String};
 use windows::{
@@ -12,6 +11,8 @@ use windows::{
     },
 };
 
+use crate::password::PASSWORD_NOT_FOUND;
+
 const CRED_FLAGS_NONE: u32 = 0;
 
 #[allow(clippy::unused_async)]
diff --git a/apps/desktop/desktop_native/core/src/process_isolation/linux.rs b/apps/desktop/desktop_native/core/src/process_isolation/linux.rs
index 395d722ea01..263cc10b716 100644
--- a/apps/desktop/desktop_native/core/src/process_isolation/linux.rs
+++ b/apps/desktop/desktop_native/core/src/process_isolation/linux.rs
@@ -2,16 +2,17 @@ use anyhow::Result;
 #[cfg(target_env = "gnu")]
 use libc::c_uint;
 use libc::{self, c_int};
+use tracing::info;
 
-// RLIMIT_CORE is the maximum size of a core dump file. Setting both to 0 disables core dumps, on crashes
-// https://github.com/torvalds/linux/blob/1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0/include/uapi/asm-generic/resource.h#L20
+// RLIMIT_CORE is the maximum size of a core dump file. Setting both to 0 disables core dumps, on
+// crashes https://github.com/torvalds/linux/blob/1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0/include/uapi/asm-generic/resource.h#L20
 #[cfg(target_env = "musl")]
 const RLIMIT_CORE: c_int = 4;
 #[cfg(target_env = "gnu")]
 const RLIMIT_CORE: c_uint = 4;
 
-// PR_SET_DUMPABLE makes it so no other running process (root or same user) can dump the memory of this process
-// or attach a debugger to it.
+// PR_SET_DUMPABLE makes it so no other running process (root or same user) can dump the memory of
+// this process or attach a debugger to it.
 // https://github.com/torvalds/linux/blob/a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6/include/uapi/linux/prctl.h#L14
 const PR_SET_DUMPABLE: c_int = 4;
 
@@ -20,7 +21,7 @@ pub fn disable_coredumps() -> Result<()> {
         rlim_cur: 0,
         rlim_max: 0,
     };
-    println!("[Process Isolation] Disabling core dumps via setrlimit");
+    info!("Disabling core dumps via setrlimit.");
 
     if unsafe { libc::setrlimit(RLIMIT_CORE, &rlimit) } != 0 {
         let e = std::io::Error::last_os_error();
@@ -48,9 +49,9 @@ pub fn is_core_dumping_disabled() -> Result<bool> {
 
 pub fn isolate_process() -> Result<()> {
     let pid = std::process::id();
-    println!(
-        "[Process Isolation] Disabling ptrace and memory access for main ({}) via PR_SET_DUMPABLE",
-        pid
+    info!(
+        pid,
+        "Disabling ptrace and memory access for main via PR_SET_DUMPABLE."
     );
 
     if unsafe { libc::prctl(PR_SET_DUMPABLE, 0) } != 0 {
diff --git a/apps/desktop/desktop_native/core/src/process_isolation/macos.rs b/apps/desktop/desktop_native/core/src/process_isolation/macos.rs
index ce42e06a832..928eac749c0 100644
--- a/apps/desktop/desktop_native/core/src/process_isolation/macos.rs
+++ b/apps/desktop/desktop_native/core/src/process_isolation/macos.rs
@@ -1,4 +1,5 @@
 use anyhow::{bail, Result};
+use tracing::info;
 
 pub fn disable_coredumps() -> Result<()> {
     bail!("Not implemented on Mac")
@@ -10,10 +11,7 @@ pub fn is_core_dumping_disabled() -> Result<bool> {
 
 pub fn isolate_process() -> Result<()> {
     let pid: u32 = std::process::id();
-    println!(
-        "[Process Isolation] Disabling ptrace on main process ({}) via PT_DENY_ATTACH",
-        pid
-    );
+    info!(pid, "Disabling ptrace on main process via PT_DENY_ATTACH.");
 
     secmem_proc::harden_process().map_err(|e| {
         anyhow::anyhow!(
diff --git a/apps/desktop/desktop_native/core/src/process_isolation/windows.rs b/apps/desktop/desktop_native/core/src/process_isolation/windows.rs
index dc1092f9131..fddea8bc53a 100644
--- a/apps/desktop/desktop_native/core/src/process_isolation/windows.rs
+++ b/apps/desktop/desktop_native/core/src/process_isolation/windows.rs
@@ -1,4 +1,5 @@
 use anyhow::{bail, Result};
+use tracing::info;
 
 pub fn disable_coredumps() -> Result<()> {
     bail!("Not implemented on Windows")
@@ -10,10 +11,7 @@ pub fn is_core_dumping_disabled() -> Result<bool> {
 
 pub fn isolate_process() -> Result<()> {
     let pid: u32 = std::process::id();
-    println!(
-        "[Process Isolation] Isolating main process via DACL {}",
-        pid
-    );
+    info!(pid, "Isolating main process via DACL.");
 
     secmem_proc::harden_process().map_err(|e| {
         anyhow::anyhow!(
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/dpapi.rs b/apps/desktop/desktop_native/core/src/secure_memory/dpapi.rs
new file mode 100644
index 00000000000..8d8e10d92c4
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/dpapi.rs
@@ -0,0 +1,135 @@
+use std::collections::HashMap;
+
+use windows::Win32::Security::Cryptography::{
+    CryptProtectMemory, CryptUnprotectMemory, CRYPTPROTECTMEMORY_BLOCK_SIZE,
+    CRYPTPROTECTMEMORY_SAME_PROCESS,
+};
+
+use crate::secure_memory::SecureMemoryStore;
+
+/// https://learn.microsoft.com/en-us/windows/win32/api/dpapi/nf-dpapi-cryptprotectdata
+/// The DPAPI store encrypts data using the Windows Data Protection API (DPAPI). The key is bound
+/// to the current process, and cannot be decrypted by other user-mode processes.
+///
+/// Note: Admin processes can still decrypt this memory:
+/// https://blog.slowerzs.net/posts/cryptdecryptmemory/
+pub(crate) struct DpapiSecretKVStore {
+    map: HashMap<String, Vec<u8>>,
+}
+
+impl DpapiSecretKVStore {
+    pub(crate) fn new() -> Self {
+        DpapiSecretKVStore {
+            map: HashMap::new(),
+        }
+    }
+}
+
+impl SecureMemoryStore for DpapiSecretKVStore {
+    fn put(&mut self, key: String, value: &[u8]) {
+        let length_header_len = std::mem::size_of::<usize>();
+
+        // The allocated data has to be a multiple of CRYPTPROTECTMEMORY_BLOCK_SIZE, so we pad it
+        // and write the length in front We are storing LENGTH|DATA|00..00, where LENGTH is
+        // the length of DATA, the total length is a multiple
+        // of CRYPTPROTECTMEMORY_BLOCK_SIZE, and the padding is filled with zeros.
+
+        let data_len = value.len();
+        let len_with_header = data_len + length_header_len;
+        let padded_length = len_with_header + CRYPTPROTECTMEMORY_BLOCK_SIZE as usize
+            - (len_with_header % CRYPTPROTECTMEMORY_BLOCK_SIZE as usize);
+        let mut padded_data = vec![0u8; padded_length];
+        padded_data[..length_header_len].copy_from_slice(&data_len.to_le_bytes());
+        padded_data[length_header_len..][..data_len].copy_from_slice(value);
+
+        // Protect the memory using DPAPI
+        unsafe {
+            CryptProtectMemory(
+                padded_data.as_mut_ptr() as *mut core::ffi::c_void,
+                padded_length as u32,
+                CRYPTPROTECTMEMORY_SAME_PROCESS,
+            )
+        }
+        .expect("crypt_protect_memory should work");
+
+        self.map.insert(key, padded_data);
+    }
+
+    fn get(&mut self, key: &str) -> Option<Vec<u8>> {
+        self.map.get(key).map(|data| {
+            // A copy is created, that is then mutated by the DPAPI unprotect function.
+            let mut data = data.clone();
+            unsafe {
+                CryptUnprotectMemory(
+                    data.as_mut_ptr() as *mut core::ffi::c_void,
+                    data.len() as u32,
+                    CRYPTPROTECTMEMORY_SAME_PROCESS,
+                )
+            }
+            .expect("crypt_unprotect_memory should work");
+
+            // Unpad the data to retrieve the original value
+            let length_header_size = std::mem::size_of::<usize>();
+            let length_bytes = &data[..length_header_size];
+            let data_length = usize::from_le_bytes(
+                length_bytes
+                    .try_into()
+                    .expect("length header should be usize"),
+            );
+
+            data[length_header_size..length_header_size + data_length].to_vec()
+        })
+    }
+
+    fn has(&self, key: &str) -> bool {
+        self.map.contains_key(key)
+    }
+
+    fn remove(&mut self, key: &str) {
+        self.map.remove(key);
+    }
+
+    fn clear(&mut self) {
+        self.map.clear();
+    }
+}
+
+impl Drop for DpapiSecretKVStore {
+    fn drop(&mut self) {
+        self.clear();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_dpapi_secret_kv_store_various_sizes() {
+        let mut store = DpapiSecretKVStore::new();
+        for size in 0..=2048 {
+            let key = format!("test_key_{}", size);
+            let value: Vec<u8> = (0..size).map(|i| (i % 256) as u8).collect();
+            store.put(key.clone(), &value);
+            assert!(store.has(&key), "Store should have key for size {}", size);
+            assert_eq!(
+                store.get(&key),
+                Some(value),
+                "Value mismatch for size {}",
+                size
+            );
+        }
+    }
+
+    #[test]
+    fn test_dpapi_crud() {
+        let mut store = DpapiSecretKVStore::new();
+        let key = "test_key".to_string();
+        let value = vec![1, 2, 3, 4, 5];
+        store.put(key.clone(), &value);
+        assert!(store.has(&key));
+        assert_eq!(store.get(&key), Some(value));
+        store.remove(&key);
+        assert!(!store.has(&key));
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/encrypted_memory_store.rs b/apps/desktop/desktop_native/core/src/secure_memory/encrypted_memory_store.rs
new file mode 100644
index 00000000000..d116e564bc8
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/encrypted_memory_store.rs
@@ -0,0 +1,105 @@
+use tracing::error;
+
+use crate::secure_memory::{
+    secure_key::{EncryptedMemory, SecureMemoryEncryptionKey},
+    SecureMemoryStore,
+};
+
+/// An encrypted memory store holds a platform protected symmetric encryption key, and uses it
+/// to encrypt all items it stores. The ciphertexts for the items are not specially protected. This
+/// allows circumventing length and amount limitations on platform specific secure memory APIs since
+/// only a single short item needs to be protected.
+///
+/// The key is briefly in process memory during encryption and decryption, in memory that is
+/// protected from swapping to disk via mlock, and then zeroed out immediately after use.
+#[allow(unused)]
+pub(crate) struct EncryptedMemoryStore {
+    map: std::collections::HashMap<String, EncryptedMemory>,
+    memory_encryption_key: SecureMemoryEncryptionKey,
+}
+
+impl EncryptedMemoryStore {
+    #[allow(unused)]
+    pub(crate) fn new() -> Self {
+        EncryptedMemoryStore {
+            map: std::collections::HashMap::new(),
+            memory_encryption_key: SecureMemoryEncryptionKey::new(),
+        }
+    }
+}
+
+impl SecureMemoryStore for EncryptedMemoryStore {
+    fn put(&mut self, key: String, value: &[u8]) {
+        let encrypted_value = self.memory_encryption_key.encrypt(value);
+        self.map.insert(key, encrypted_value);
+    }
+
+    fn get(&mut self, key: &str) -> Option<Vec<u8>> {
+        let encrypted_memory = self.map.get(key);
+        if let Some(encrypted_memory) = encrypted_memory {
+            match self.memory_encryption_key.decrypt(encrypted_memory) {
+                Ok(plaintext) => Some(plaintext),
+                Err(_) => {
+                    error!("In memory store, decryption failed for key {}. The memory may have been tampered with. re-keying.", key);
+                    self.memory_encryption_key = SecureMemoryEncryptionKey::new();
+                    self.clear();
+                    None
+                }
+            }
+        } else {
+            None
+        }
+    }
+
+    fn has(&self, key: &str) -> bool {
+        self.map.contains_key(key)
+    }
+
+    fn remove(&mut self, key: &str) {
+        self.map.remove(key);
+    }
+
+    fn clear(&mut self) {
+        self.map.clear();
+    }
+}
+
+impl Drop for EncryptedMemoryStore {
+    fn drop(&mut self) {
+        self.clear();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_secret_kv_store_various_sizes() {
+        let mut store = EncryptedMemoryStore::new();
+        for size in 0..=2048 {
+            let key = format!("test_key_{}", size);
+            let value: Vec<u8> = (0..size).map(|i| (i % 256) as u8).collect();
+            store.put(key.clone(), &value);
+            assert!(store.has(&key), "Store should have key for size {}", size);
+            assert_eq!(
+                store.get(&key),
+                Some(value),
+                "Value mismatch for size {}",
+                size
+            );
+        }
+    }
+
+    #[test]
+    fn test_crud() {
+        let mut store = EncryptedMemoryStore::new();
+        let key = "test_key".to_string();
+        let value = vec![1, 2, 3, 4, 5];
+        store.put(key.clone(), &value);
+        assert!(store.has(&key));
+        assert_eq!(store.get(&key), Some(value));
+        store.remove(&key);
+        assert!(!store.has(&key));
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/mod.rs b/apps/desktop/desktop_native/core/src/secure_memory/mod.rs
new file mode 100644
index 00000000000..d4323ce40dd
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/mod.rs
@@ -0,0 +1,27 @@
+#[cfg(target_os = "windows")]
+pub(crate) mod dpapi;
+
+pub(crate) mod encrypted_memory_store;
+mod secure_key;
+
+/// The secure memory store provides an ephemeral key-value store for sensitive data.
+/// Data stored in this store is prevented from being swapped to disk and zeroed out. Additionally,
+/// platform-specific protections are applied to prevent memory dumps or debugger access from
+/// reading the stored values.
+#[allow(unused)]
+pub(crate) trait SecureMemoryStore {
+    /// Stores a copy of the provided value in secure memory.
+    fn put(&mut self, key: String, value: &[u8]);
+    /// Retrieves a copy of the value associated with the given key from secure memory.
+    /// This copy does not have additional memory protections applied, and should be zeroed when no
+    /// longer needed.
+    ///
+    /// Note: If memory was tampered with, this will re-key the store and return None.
+    fn get(&mut self, key: &str) -> Option<Vec<u8>>;
+    /// Checks if a value is stored under the given key.
+    fn has(&self, key: &str) -> bool;
+    /// Removes the value associated with the given key from secure memory.
+    fn remove(&mut self, key: &str);
+    /// Clears all values stored in secure memory.
+    fn clear(&mut self);
+}
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/secure_key/crypto.rs b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/crypto.rs
new file mode 100644
index 00000000000..7e2917ade6d
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/crypto.rs
@@ -0,0 +1,96 @@
+use std::ptr::NonNull;
+
+use chacha20poly1305::{aead::Aead, Key, KeyInit};
+use rand::{rng, Rng};
+
+pub(super) const KEY_SIZE: usize = 32;
+pub(super) const NONCE_SIZE: usize = 24;
+
+/// The encryption performed here is xchacha-poly1305. Any tampering with the key or the ciphertexts
+/// will result in a decryption failure and panic. The key's memory contents are protected from
+/// being swapped to disk via mlock.
+pub(super) struct MemoryEncryptionKey(NonNull<[u8]>);
+
+/// An encrypted memory blob that must be decrypted using the same key that it was encrypted with.
+pub struct EncryptedMemory {
+    nonce: [u8; NONCE_SIZE],
+    ciphertext: Vec<u8>,
+}
+
+impl MemoryEncryptionKey {
+    pub fn new() -> Self {
+        let mut key = [0u8; KEY_SIZE];
+        rng().fill(&mut key);
+        MemoryEncryptionKey::from(&key)
+    }
+
+    /// Encrypts the given plaintext using the key.
+    #[allow(unused)]
+    pub(super) fn encrypt(&self, plaintext: &[u8]) -> EncryptedMemory {
+        let cipher = chacha20poly1305::XChaCha20Poly1305::new(Key::from_slice(self.as_ref()));
+        let mut nonce = [0u8; NONCE_SIZE];
+        rng().fill(&mut nonce);
+        let ciphertext = cipher
+            .encrypt(chacha20poly1305::XNonce::from_slice(&nonce), plaintext)
+            .expect("encryption should not fail");
+        EncryptedMemory { nonce, ciphertext }
+    }
+
+    /// Decrypts the given encrypted memory using the key. A decryption failure will panic. This is
+    /// okay because neither the keys nor ciphertexts should ever fail to decrypt, and doing so
+    /// indicates that the process memory was tampered with.
+    #[allow(unused)]
+    pub(super) fn decrypt(&self, encrypted: &EncryptedMemory) -> Result<Vec<u8>, DecryptionError> {
+        let cipher = chacha20poly1305::XChaCha20Poly1305::new(Key::from_slice(self.as_ref()));
+        cipher
+            .decrypt(
+                chacha20poly1305::XNonce::from_slice(&encrypted.nonce),
+                encrypted.ciphertext.as_ref(),
+            )
+            .map_err(|_| DecryptionError::CouldNotDecrypt)
+    }
+}
+
+impl Drop for MemoryEncryptionKey {
+    fn drop(&mut self) {
+        unsafe {
+            memsec::free(self.0);
+        }
+    }
+}
+
+impl From<&[u8; KEY_SIZE]> for MemoryEncryptionKey {
+    fn from(value: &[u8; KEY_SIZE]) -> Self {
+        let mut ptr: NonNull<[u8]> =
+            unsafe { memsec::malloc_sized(KEY_SIZE).expect("malloc_sized should work") };
+        unsafe {
+            std::ptr::copy_nonoverlapping(value.as_ptr(), ptr.as_mut().as_mut_ptr(), KEY_SIZE);
+        }
+        MemoryEncryptionKey(ptr)
+    }
+}
+
+impl AsRef<[u8]> for MemoryEncryptionKey {
+    fn as_ref(&self) -> &[u8] {
+        unsafe { self.0.as_ref() }
+    }
+}
+
+#[derive(Debug)]
+pub(crate) enum DecryptionError {
+    CouldNotDecrypt,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_memory_encryption_key() {
+        let key = MemoryEncryptionKey::new();
+        let data = b"Hello, world!";
+        let encrypted = key.encrypt(data);
+        let decrypted = key.decrypt(&encrypted).unwrap();
+        assert_eq!(data.as_ref(), decrypted.as_slice());
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/secure_key/dpapi.rs b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/dpapi.rs
new file mode 100644
index 00000000000..52b75d94a09
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/dpapi.rs
@@ -0,0 +1,96 @@
+use windows::Win32::Security::Cryptography::{
+    CryptProtectMemory, CryptUnprotectMemory, CRYPTPROTECTMEMORY_BLOCK_SIZE,
+    CRYPTPROTECTMEMORY_SAME_PROCESS,
+};
+
+use super::{
+    crypto::{MemoryEncryptionKey, KEY_SIZE},
+    SecureKeyContainer,
+};
+
+/// https://learn.microsoft.com/en-us/windows/win32/api/dpapi/nf-dpapi-cryptprotectdata
+/// The DPAPI store encrypts data using the Windows Data Protection API (DPAPI). The key is bound
+/// to the current process, and cannot be decrypted by other user-mode processes.
+///
+/// Note: Admin processes can still decrypt this memory:
+/// https://blog.slowerzs.net/posts/cryptdecryptmemory/
+pub(super) struct DpapiSecureKeyContainer {
+    dpapi_encrypted_key: [u8; KEY_SIZE + CRYPTPROTECTMEMORY_BLOCK_SIZE as usize],
+}
+
+// SAFETY: The encrypted data is fully owned by this struct, and not exposed outside or cloned,
+// and is disposed on drop of this struct.
+unsafe impl Send for DpapiSecureKeyContainer {}
+// SAFETY: The container is non-mutable and thus safe to share between threads.
+unsafe impl Sync for DpapiSecureKeyContainer {}
+
+impl SecureKeyContainer for DpapiSecureKeyContainer {
+    fn as_key(&self) -> MemoryEncryptionKey {
+        let mut decrypted_key = self.dpapi_encrypted_key;
+        unsafe {
+            CryptUnprotectMemory(
+                decrypted_key.as_mut_ptr() as *mut core::ffi::c_void,
+                decrypted_key.len() as u32,
+                CRYPTPROTECTMEMORY_SAME_PROCESS,
+            )
+        }
+        .expect("crypt_unprotect_memory should work");
+        let mut key = [0u8; KEY_SIZE];
+        key.copy_from_slice(&decrypted_key[..KEY_SIZE]);
+        MemoryEncryptionKey::from(&key)
+    }
+
+    fn from_key(key: MemoryEncryptionKey) -> Self {
+        let mut padded_key = [0u8; KEY_SIZE + CRYPTPROTECTMEMORY_BLOCK_SIZE as usize];
+        padded_key[..KEY_SIZE].copy_from_slice(key.as_ref());
+        unsafe {
+            CryptProtectMemory(
+                padded_key.as_mut_ptr() as *mut core::ffi::c_void,
+                padded_key.len() as u32,
+                CRYPTPROTECTMEMORY_SAME_PROCESS,
+            )
+        }
+        .expect("crypt_protect_memory should work");
+        DpapiSecureKeyContainer {
+            dpapi_encrypted_key: padded_key,
+        }
+    }
+
+    fn is_supported() -> bool {
+        // DPAPI is supported on all Windows versions that we support.
+        true
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_multiple_keys() {
+        let key1 = MemoryEncryptionKey::new();
+        let key2 = MemoryEncryptionKey::new();
+        let container1 = DpapiSecureKeyContainer::from_key(key1);
+        let container2 = DpapiSecureKeyContainer::from_key(key2);
+
+        // Capture at time 1
+        let data_1_1 = container1.as_key();
+        let data_2_1 = container2.as_key();
+        // Capture at time 2
+        let data_1_2 = container1.as_key();
+        let data_2_2 = container2.as_key();
+
+        // Same keys should be equal
+        assert_eq!(data_1_1.as_ref(), data_1_2.as_ref());
+        assert_eq!(data_2_1.as_ref(), data_2_2.as_ref());
+
+        // Different keys should be different
+        assert_ne!(data_1_1.as_ref(), data_2_1.as_ref());
+        assert_ne!(data_1_2.as_ref(), data_2_2.as_ref());
+    }
+
+    #[test]
+    fn test_is_supported() {
+        assert!(DpapiSecureKeyContainer::is_supported());
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/secure_key/keyctl.rs b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/keyctl.rs
new file mode 100644
index 00000000000..29c62759740
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/keyctl.rs
@@ -0,0 +1,99 @@
+use linux_keyutils::{KeyRing, KeyRingIdentifier};
+
+use super::{crypto::KEY_SIZE, SecureKeyContainer};
+use crate::secure_memory::secure_key::crypto::MemoryEncryptionKey;
+
+/// The keys are bound to the process keyring.
+const KEY_RING_IDENTIFIER: KeyRingIdentifier = KeyRingIdentifier::Process;
+/// This is an atomic global counter used to help generate unique key IDs
+static COUNTER: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
+/// Generates a unique ID for the key in the kernel keyring.
+/// SAFETY: This function is safe to call from multiple threads because it uses an atomic counter.
+fn make_id() -> String {
+    let counter = COUNTER.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+    // In case multiple processes are running, include the PID in the key ID.
+    let pid = std::process::id();
+    format!("bitwarden_desktop_{}_{}", pid, counter)
+}
+
+/// A secure key container that uses the Linux kernel keyctl API to store the key.
+/// `https://man7.org/linux/man-pages/man1/keyctl.1.html`. The kernel enforces only
+/// the correct process can read them, and they do not live in process memory space
+/// and cannot be dumped.
+pub(super) struct KeyctlSecureKeyContainer {
+    /// The kernel has an identifier for the key. This is randomly generated on construction.
+    id: String,
+}
+
+// SAFETY: The key id is fully owned by this struct and not exposed or cloned, and cleaned up on
+// drop. Further, since we use `KeyRingIdentifier::Process` and not `KeyRingIdentifier::Thread`, the
+// key is accessible across threads within the same process bound.
+unsafe impl Send for KeyctlSecureKeyContainer {}
+// SAFETY: The container is non-mutable and thus safe to share between threads.
+unsafe impl Sync for KeyctlSecureKeyContainer {}
+
+impl SecureKeyContainer for KeyctlSecureKeyContainer {
+    fn as_key(&self) -> MemoryEncryptionKey {
+        let ring = KeyRing::from_special_id(KEY_RING_IDENTIFIER, false)
+            .expect("should get process keyring");
+        let key = ring.search(&self.id).expect("should find key");
+        let mut buffer = [0u8; KEY_SIZE];
+        key.read(&mut buffer).expect("should read key");
+        MemoryEncryptionKey::from(&buffer)
+    }
+
+    fn from_key(data: MemoryEncryptionKey) -> Self {
+        let ring = KeyRing::from_special_id(KEY_RING_IDENTIFIER, true)
+            .expect("should get process keyring");
+        let id = make_id();
+        ring.add_key(&id, &data).expect("should add key");
+        KeyctlSecureKeyContainer { id }
+    }
+
+    fn is_supported() -> bool {
+        KeyRing::from_special_id(KEY_RING_IDENTIFIER, true).is_ok()
+    }
+}
+
+impl Drop for KeyctlSecureKeyContainer {
+    fn drop(&mut self) {
+        let ring = KeyRing::from_special_id(KEY_RING_IDENTIFIER, false)
+            .expect("should get process keyring");
+        if let Ok(key) = ring.search(&self.id) {
+            let _ = key.invalidate();
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_multiple_keys() {
+        let key1 = MemoryEncryptionKey::new();
+        let key2 = MemoryEncryptionKey::new();
+        let container1 = KeyctlSecureKeyContainer::from_key(key1);
+        let container2 = KeyctlSecureKeyContainer::from_key(key2);
+
+        // Capture at time 1
+        let data_1_1 = container1.as_key();
+        let data_2_1 = container2.as_key();
+        // Capture at time 2
+        let data_1_2 = container1.as_key();
+        let data_2_2 = container2.as_key();
+
+        // Same keys should be equal
+        assert_eq!(data_1_1.as_ref(), data_1_2.as_ref());
+        assert_eq!(data_2_1.as_ref(), data_2_2.as_ref());
+
+        // Different keys should be different
+        assert_ne!(data_1_1.as_ref(), data_2_1.as_ref());
+        assert_ne!(data_1_2.as_ref(), data_2_2.as_ref());
+    }
+
+    #[test]
+    fn test_is_supported() {
+        assert!(KeyctlSecureKeyContainer::is_supported());
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/secure_key/memfd_secret.rs b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/memfd_secret.rs
new file mode 100644
index 00000000000..e9f96db3148
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/memfd_secret.rs
@@ -0,0 +1,110 @@
+use std::{ptr::NonNull, sync::LazyLock};
+
+use super::{
+    crypto::{MemoryEncryptionKey, KEY_SIZE},
+    SecureKeyContainer,
+};
+
+/// https://man.archlinux.org/man/memfd_secret.2.en
+/// The memfd_secret store protects the data using the `memfd_secret` syscall. The
+/// data is inaccessible to other user-mode processes, and even to root in most cases.
+/// If arbitrary data can be executed in the kernel, the data can still be retrieved:
+/// https://github.com/JonathonReinhart/nosecmem
+pub(super) struct MemfdSecretSecureKeyContainer {
+    ptr: NonNull<[u8]>,
+}
+// SAFETY: The pointers in this struct are allocated by `memfd_secret`, and we have full ownership.
+// They are never exposed outside or cloned, and are cleaned up by drop.
+unsafe impl Send for MemfdSecretSecureKeyContainer {}
+// SAFETY: The container is non-mutable and thus safe to share between threads. Further,
+// memfd-secret is accessible across threads within the same process bound.
+unsafe impl Sync for MemfdSecretSecureKeyContainer {}
+
+impl SecureKeyContainer for MemfdSecretSecureKeyContainer {
+    fn as_key(&self) -> MemoryEncryptionKey {
+        MemoryEncryptionKey::from(
+            &unsafe { self.ptr.as_ref() }
+                .try_into()
+                .expect("slice should be KEY_SIZE"),
+        )
+    }
+
+    fn from_key(key: MemoryEncryptionKey) -> Self {
+        let mut ptr: NonNull<[u8]> = unsafe {
+            memsec::memfd_secret_sized(KEY_SIZE).expect("memfd_secret_sized should work")
+        };
+        unsafe {
+            std::ptr::copy_nonoverlapping(
+                key.as_ref().as_ptr(),
+                ptr.as_mut().as_mut_ptr(),
+                KEY_SIZE,
+            );
+        }
+        MemfdSecretSecureKeyContainer { ptr }
+    }
+
+    /// Note, `memfd_secret` is only available since Linux 6.5, so fallbacks are needed.
+    fn is_supported() -> bool {
+        // To test if memfd_secret is supported, we try to allocate a 1 byte and see if that
+        // succeeds.
+        static IS_SUPPORTED: LazyLock<bool> = LazyLock::new(|| {
+            let Some(ptr): Option<NonNull<[u8]>> = (unsafe { memsec::memfd_secret_sized(1) })
+            else {
+                return false;
+            };
+
+            // Check that the pointer is readable and writable
+            let result = unsafe {
+                let ptr = ptr.as_ptr() as *mut u8;
+                *ptr = 30;
+                *ptr += 107;
+                *ptr == 137
+            };
+
+            unsafe { memsec::free_memfd_secret(ptr) };
+            result
+        });
+        *IS_SUPPORTED
+    }
+}
+
+impl Drop for MemfdSecretSecureKeyContainer {
+    fn drop(&mut self) {
+        unsafe {
+            memsec::free_memfd_secret(self.ptr);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_multiple_keys() {
+        let key1 = MemoryEncryptionKey::new();
+        let key2 = MemoryEncryptionKey::new();
+        let container1 = MemfdSecretSecureKeyContainer::from_key(key1);
+        let container2 = MemfdSecretSecureKeyContainer::from_key(key2);
+
+        // Capture at time 1
+        let data_1_1 = container1.as_key();
+        let data_2_1 = container2.as_key();
+        // Capture at time 2
+        let data_1_2 = container1.as_key();
+        let data_2_2 = container2.as_key();
+
+        // Same keys should be equal
+        assert_eq!(data_1_1.as_ref(), data_1_2.as_ref());
+        assert_eq!(data_2_1.as_ref(), data_2_2.as_ref());
+
+        // Different keys should be different
+        assert_ne!(data_1_1.as_ref(), data_2_1.as_ref());
+        assert_ne!(data_1_2.as_ref(), data_2_2.as_ref());
+    }
+
+    #[test]
+    fn test_is_supported() {
+        assert!(MemfdSecretSecureKeyContainer::is_supported());
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/secure_key/mlock.rs b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/mlock.rs
new file mode 100644
index 00000000000..961988c1d40
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/mlock.rs
@@ -0,0 +1,84 @@
+use std::ptr::NonNull;
+
+use super::{
+    crypto::{MemoryEncryptionKey, KEY_SIZE},
+    SecureKeyContainer,
+};
+
+/// A SecureKeyContainer that uses mlock to prevent the memory from being swapped to disk.
+/// This does not provide as strong protections as other methods, but is always supported.
+pub(super) struct MlockSecureKeyContainer {
+    ptr: NonNull<[u8]>,
+}
+// SAFETY: The pointers in this struct are allocated by `malloc_sized`, and we have full ownership.
+// They are never exposed outside or cloned, and are cleaned up by drop.
+unsafe impl Send for MlockSecureKeyContainer {}
+// SAFETY: The container is non-mutable and thus safe to share between threads.
+unsafe impl Sync for MlockSecureKeyContainer {}
+
+impl SecureKeyContainer for MlockSecureKeyContainer {
+    fn as_key(&self) -> MemoryEncryptionKey {
+        MemoryEncryptionKey::from(
+            &unsafe { self.ptr.as_ref() }
+                .try_into()
+                .expect("slice should be KEY_SIZE"),
+        )
+    }
+    fn from_key(key: MemoryEncryptionKey) -> Self {
+        let mut ptr: NonNull<[u8]> =
+            unsafe { memsec::malloc_sized(KEY_SIZE).expect("malloc_sized should work") };
+        unsafe {
+            std::ptr::copy_nonoverlapping(
+                key.as_ref().as_ptr(),
+                ptr.as_mut().as_mut_ptr(),
+                KEY_SIZE,
+            );
+        }
+        MlockSecureKeyContainer { ptr }
+    }
+
+    fn is_supported() -> bool {
+        true
+    }
+}
+
+impl Drop for MlockSecureKeyContainer {
+    fn drop(&mut self) {
+        unsafe {
+            memsec::free(self.ptr);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_multiple_keys() {
+        let key1 = MemoryEncryptionKey::new();
+        let key2 = MemoryEncryptionKey::new();
+        let container1 = MlockSecureKeyContainer::from_key(key1);
+        let container2 = MlockSecureKeyContainer::from_key(key2);
+
+        // Capture at time 1
+        let data_1_1 = container1.as_key();
+        let data_2_1 = container2.as_key();
+        // Capture at time 2
+        let data_1_2 = container1.as_key();
+        let data_2_2 = container2.as_key();
+
+        // Same keys should be equal
+        assert_eq!(data_1_1.as_ref(), data_1_2.as_ref());
+        assert_eq!(data_2_1.as_ref(), data_2_2.as_ref());
+
+        // Different keys should be different
+        assert_ne!(data_1_1.as_ref(), data_2_1.as_ref());
+        assert_ne!(data_1_2.as_ref(), data_2_2.as_ref());
+    }
+
+    #[test]
+    fn test_is_supported() {
+        assert!(MlockSecureKeyContainer::is_supported());
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/secure_memory/secure_key/mod.rs b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/mod.rs
new file mode 100644
index 00000000000..26e72f7d581
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/secure_memory/secure_key/mod.rs
@@ -0,0 +1,247 @@
+//! This module provides hardened storage for single cryptographic keys. These are meant for
+//! encrypting large amounts of memory. Some platforms restrict how many keys can be protected by
+//! their APIs, which necessitates this layer of indirection. This significantly reduces the
+//! complexity of each platform specific implementation, since all that's needed is implementing
+//! protecting a single fixed sized key instead of protecting many arbitrarily sized secrets. This
+//! significantly lowers the effort to maintain each implementation.
+//!
+//! The implementations include DPAPI on Windows, `keyctl` on Linux, and `memfd_secret` on Linux,
+//! and a fallback implementation using mlock.
+
+use tracing::info;
+
+mod crypto;
+#[cfg(target_os = "windows")]
+mod dpapi;
+#[cfg(target_os = "linux")]
+mod keyctl;
+#[cfg(target_os = "linux")]
+mod memfd_secret;
+mod mlock;
+
+pub use crypto::EncryptedMemory;
+
+use crate::secure_memory::secure_key::crypto::DecryptionError;
+
+/// An ephemeral key that is protected using a platform mechanism. It is generated on construction
+/// freshly, and can be used to encrypt and decrypt segments of memory. Since the key is ephemeral,
+/// persistent data cannot be encrypted with this key. On Linux and Windows, in most cases the
+/// protection mechanisms prevent memory dumps/debuggers from reading the key.
+///
+/// Note: This can be circumvented if code can be injected into the process and is only effective in
+/// combination with the memory isolation provided in `process_isolation`.
+/// - https://github.com/zer1t0/keydump
+#[allow(unused)]
+pub(crate) struct SecureMemoryEncryptionKey(CrossPlatformSecureKeyContainer);
+
+impl SecureMemoryEncryptionKey {
+    pub fn new() -> Self {
+        SecureMemoryEncryptionKey(CrossPlatformSecureKeyContainer::from_key(
+            crypto::MemoryEncryptionKey::new(),
+        ))
+    }
+
+    /// Encrypts the provided plaintext using the contained key, returning an EncryptedMemory blob.
+    #[allow(unused)]
+    pub fn encrypt(&self, plaintext: &[u8]) -> crypto::EncryptedMemory {
+        self.0.as_key().encrypt(plaintext)
+    }
+
+    /// Decrypts the provided EncryptedMemory blob using the contained key, returning the plaintext.
+    /// If the decryption fails, that means the memory was tampered with, and the function panics.
+    #[allow(unused)]
+    pub fn decrypt(&self, encrypted: &crypto::EncryptedMemory) -> Result<Vec<u8>, DecryptionError> {
+        self.0.as_key().decrypt(encrypted)
+    }
+}
+
+/// A platform specific implementation of a key container that protects a single encryption key
+/// from memory attacks.
+#[allow(unused)]
+trait SecureKeyContainer: Sync + Send {
+    /// Returns the key as a byte slice. This slice does not have additional memory protections
+    /// applied.
+    fn as_key(&self) -> crypto::MemoryEncryptionKey;
+    /// Creates a new SecureKeyContainer from the provided key.
+    fn from_key(key: crypto::MemoryEncryptionKey) -> Self;
+    /// Returns true if this platform supports this secure key container implementation.
+    fn is_supported() -> bool;
+}
+
+#[allow(unused)]
+enum CrossPlatformSecureKeyContainer {
+    #[cfg(target_os = "windows")]
+    Dpapi(dpapi::DpapiSecureKeyContainer),
+    #[cfg(target_os = "linux")]
+    Keyctl(keyctl::KeyctlSecureKeyContainer),
+    #[cfg(target_os = "linux")]
+    MemfdSecret(memfd_secret::MemfdSecretSecureKeyContainer),
+    Mlock(mlock::MlockSecureKeyContainer),
+}
+
+impl SecureKeyContainer for CrossPlatformSecureKeyContainer {
+    fn as_key(&self) -> crypto::MemoryEncryptionKey {
+        match self {
+            #[cfg(target_os = "windows")]
+            CrossPlatformSecureKeyContainer::Dpapi(c) => c.as_key(),
+            #[cfg(target_os = "linux")]
+            CrossPlatformSecureKeyContainer::Keyctl(c) => c.as_key(),
+            #[cfg(target_os = "linux")]
+            CrossPlatformSecureKeyContainer::MemfdSecret(c) => c.as_key(),
+            CrossPlatformSecureKeyContainer::Mlock(c) => c.as_key(),
+        }
+    }
+
+    fn from_key(key: crypto::MemoryEncryptionKey) -> Self {
+        if let Some(container) = get_env_forced_container() {
+            return container;
+        }
+
+        #[cfg(target_os = "windows")]
+        {
+            if dpapi::DpapiSecureKeyContainer::is_supported() {
+                info!("Using DPAPI for secure key storage");
+                return CrossPlatformSecureKeyContainer::Dpapi(
+                    dpapi::DpapiSecureKeyContainer::from_key(key),
+                );
+            }
+        }
+        #[cfg(target_os = "linux")]
+        {
+            // Memfd_secret is slightly better in some cases of the kernel being compromised.
+            // Note that keyctl may sometimes not be available in e.g. snap. Memfd_secret is
+            // not available on kernels older than 6.5 while keyctl is supported since 2.6.
+            //
+            // Note: This may prevent the system from hibernating but not sleeping. Hibernate
+            // would write the memory to disk, exposing the keys. If this is an issue,
+            // the environment variable `SECURE_KEY_CONTAINER_BACKEND` can be used
+            // to force the use of keyctl or mlock.
+            if memfd_secret::MemfdSecretSecureKeyContainer::is_supported() {
+                info!("Using memfd_secret for secure key storage");
+                return CrossPlatformSecureKeyContainer::MemfdSecret(
+                    memfd_secret::MemfdSecretSecureKeyContainer::from_key(key),
+                );
+            }
+            if keyctl::KeyctlSecureKeyContainer::is_supported() {
+                info!("Using keyctl for secure key storage");
+                return CrossPlatformSecureKeyContainer::Keyctl(
+                    keyctl::KeyctlSecureKeyContainer::from_key(key),
+                );
+            }
+        }
+
+        // Falling back to mlock means that the key is accessible via memory dumping.
+        info!("Falling back to mlock for secure key storage");
+        CrossPlatformSecureKeyContainer::Mlock(mlock::MlockSecureKeyContainer::from_key(key))
+    }
+
+    fn is_supported() -> bool {
+        // Mlock is always supported as a fallback.
+        true
+    }
+}
+
+fn get_env_forced_container() -> Option<CrossPlatformSecureKeyContainer> {
+    let env_var = std::env::var("SECURE_KEY_CONTAINER_BACKEND");
+    match env_var.as_deref() {
+        #[cfg(target_os = "windows")]
+        Ok("dpapi") => {
+            info!("Forcing DPAPI secure key container via environment variable");
+            Some(CrossPlatformSecureKeyContainer::Dpapi(
+                dpapi::DpapiSecureKeyContainer::from_key(crypto::MemoryEncryptionKey::new()),
+            ))
+        }
+        #[cfg(target_os = "linux")]
+        Ok("memfd_secret") => {
+            info!("Forcing memfd_secret secure key container via environment variable");
+            Some(CrossPlatformSecureKeyContainer::MemfdSecret(
+                memfd_secret::MemfdSecretSecureKeyContainer::from_key(
+                    crypto::MemoryEncryptionKey::new(),
+                ),
+            ))
+        }
+        #[cfg(target_os = "linux")]
+        Ok("keyctl") => {
+            info!("Forcing keyctl secure key container via environment variable");
+            Some(CrossPlatformSecureKeyContainer::Keyctl(
+                keyctl::KeyctlSecureKeyContainer::from_key(crypto::MemoryEncryptionKey::new()),
+            ))
+        }
+        Ok("mlock") => {
+            info!("Forcing mlock secure key container via environment variable");
+            Some(CrossPlatformSecureKeyContainer::Mlock(
+                mlock::MlockSecureKeyContainer::from_key(crypto::MemoryEncryptionKey::new()),
+            ))
+        }
+        _ => {
+            info!(
+                "{} is not a valid secure key container backend, using automatic selection",
+                env_var.unwrap_or_default()
+            );
+            None
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_multiple_keys() {
+        // Create 20 different keys
+        let original_keys: Vec<crypto::MemoryEncryptionKey> = (0..20)
+            .map(|_| crypto::MemoryEncryptionKey::new())
+            .collect();
+
+        // Store them in secure containers
+        let containers: Vec<CrossPlatformSecureKeyContainer> = original_keys
+            .iter()
+            .map(|key| {
+                let key_bytes: &[u8; crypto::KEY_SIZE] = key.as_ref().try_into().unwrap();
+                CrossPlatformSecureKeyContainer::from_key(crypto::MemoryEncryptionKey::from(
+                    key_bytes,
+                ))
+            })
+            .collect();
+
+        // Read all keys back and validate they match the originals
+        for (i, (original_key, container)) in
+            original_keys.iter().zip(containers.iter()).enumerate()
+        {
+            let retrieved_key = container.as_key();
+            assert_eq!(
+                original_key.as_ref(),
+                retrieved_key.as_ref(),
+                "Key {} should match after storage and retrieval",
+                i
+            );
+        }
+
+        // Verify all keys are different from each other
+        for i in 0..original_keys.len() {
+            for j in (i + 1)..original_keys.len() {
+                assert_ne!(
+                    original_keys[i].as_ref(),
+                    original_keys[j].as_ref(),
+                    "Keys {} and {} should be different",
+                    i,
+                    j
+                );
+            }
+        }
+
+        // Read keys back a second time to ensure consistency
+        for (i, (original_key, container)) in
+            original_keys.iter().zip(containers.iter()).enumerate()
+        {
+            let retrieved_key_again = container.as_key();
+            assert_eq!(
+                original_key.as_ref(),
+                retrieved_key_again.as_ref(),
+                "Key {} should still match on second retrieval",
+                i
+            );
+        }
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs b/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
index d038ba2277f..8ba64618ffa 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
@@ -1,16 +1,19 @@
-use std::sync::{
-    atomic::{AtomicBool, AtomicU32},
-    Arc,
+use std::{
+    collections::HashMap,
+    sync::{
+        atomic::{AtomicBool, AtomicU32},
+        Arc, RwLock,
+    },
 };
 
 use base64::{engine::general_purpose::STANDARD, Engine as _};
-use tokio::sync::Mutex;
-use tokio_util::sync::CancellationToken;
-
 use bitwarden_russh::{
     session_bind::SessionBindResult,
     ssh_agent::{self, SshKey},
 };
+use tokio::sync::Mutex;
+use tokio_util::sync::CancellationToken;
+use tracing::{error, info};
 
 #[cfg_attr(target_os = "windows", path = "windows.rs")]
 #[cfg_attr(target_os = "macos", path = "unix.rs")]
@@ -24,13 +27,14 @@ pub mod peerinfo;
 mod request_parser;
 
 #[derive(Clone)]
-pub struct BitwardenDesktopAgent<Key> {
-    keystore: ssh_agent::KeyStore<Key>,
+pub struct BitwardenDesktopAgent {
+    keystore: ssh_agent::KeyStore<BitwardenSshKey>,
     cancellation_token: CancellationToken,
     show_ui_request_tx: tokio::sync::mpsc::Sender<SshAgentUIRequest>,
     get_ui_response_rx: Arc<Mutex<tokio::sync::broadcast::Receiver<(u32, bool)>>>,
     request_id: Arc<AtomicU32>,
-    /// before first unlock, or after account switching, listing keys should require an unlock to get a list of public keys
+    /// before first unlock, or after account switching, listing keys should require an unlock to
+    /// get a list of public keys
     needs_unlock: Arc<AtomicBool>,
     is_running: Arc<AtomicBool>,
 }
@@ -76,9 +80,7 @@ impl SshKey for BitwardenSshKey {
     }
 }
 
-impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
-    for BitwardenDesktopAgent<BitwardenSshKey>
-{
+impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey> for BitwardenDesktopAgent {
     async fn confirm(
         &self,
         ssh_key: BitwardenSshKey,
@@ -86,7 +88,7 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
         info: &peerinfo::models::PeerInfo,
     ) -> bool {
         if !self.is_running() {
-            println!("[BitwardenDesktopAgent] Agent is not running, but tried to call confirm");
+            error!("Agent is not running, but tried to call confirm");
             return false;
         }
 
@@ -94,7 +96,7 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
         let request_data = match request_parser::parse_request(data) {
             Ok(data) => data,
             Err(e) => {
-                println!("[SSH Agent] Error while parsing request: {e}");
+                error!(error = %e, "Error while parsing request");
                 return false;
             }
         };
@@ -105,12 +107,12 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
             _ => None,
         };
 
-        println!(
-            "[SSH Agent] Confirming request from application: {}, is_forwarding: {}, namespace: {}, host_key: {}",
+        info!(
+            is_forwarding = %info.is_forwarding(),
+            namespace = ?namespace.as_ref(),
+            host_key = %STANDARD.encode(info.host_key()),
+            "Confirming request from application: {}",
             info.process_name(),
-            info.is_forwarding(),
-            namespace.clone().unwrap_or_default(),
-            STANDARD.encode(info.host_key())
         );
 
         let mut rx_channel = self.get_ui_response_rx.lock().await.resubscribe();
@@ -172,16 +174,32 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
                 connection_info.set_host_key(session_bind_info.host_key.clone());
             }
             SessionBindResult::SignatureFailure => {
-                println!("[BitwardenDesktopAgent] Session bind failure: Signature failure");
+                error!("Session bind failure: Signature failure");
             }
         }
     }
 }
 
-impl BitwardenDesktopAgent<BitwardenSshKey> {
+impl BitwardenDesktopAgent {
+    /// Create a new `BitwardenDesktopAgent` from the provided auth channel handles.
+    pub fn new(
+        auth_request_tx: tokio::sync::mpsc::Sender<SshAgentUIRequest>,
+        auth_response_rx: Arc<Mutex<tokio::sync::broadcast::Receiver<(u32, bool)>>>,
+    ) -> Self {
+        Self {
+            keystore: ssh_agent::KeyStore(Arc::new(RwLock::new(HashMap::new()))),
+            cancellation_token: CancellationToken::new(),
+            show_ui_request_tx: auth_request_tx,
+            get_ui_response_rx: auth_response_rx,
+            request_id: Arc::new(AtomicU32::new(0)),
+            needs_unlock: Arc::new(AtomicBool::new(true)),
+            is_running: Arc::new(AtomicBool::new(false)),
+        }
+    }
+
     pub fn stop(&self) {
         if !self.is_running() {
-            println!("[BitwardenDesktopAgent] Tried to stop agent while it is not running");
+            error!("Tried to stop agent while it is not running");
             return;
         }
 
@@ -227,7 +245,7 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
                     );
                 }
                 Err(e) => {
-                    eprintln!("[SSH Agent Native Module] Error while parsing key: {e}");
+                    error!(error=%e, "Error while parsing key");
                 }
             }
         }
@@ -265,7 +283,7 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
 
     fn get_request_id(&self) -> u32 {
         if !self.is_running() {
-            println!("[BitwardenDesktopAgent] Agent is not running, but tried to get request id");
+            error!("Agent is not running, but tried to get request id");
             return 0;
         }
 
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/named_pipe_listener_stream.rs b/apps/desktop/desktop_native/core/src/ssh_agent/named_pipe_listener_stream.rs
index fccd7ca5ed6..38b2193faf5 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/named_pipe_listener_stream.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/named_pipe_listener_stream.rs
@@ -1,7 +1,6 @@
-use futures::Stream;
-use std::os::windows::prelude::AsRawHandle as _;
 use std::{
     io,
+    os::windows::prelude::AsRawHandle as _,
     pin::Pin,
     sync::{
         atomic::{AtomicBool, Ordering},
@@ -9,11 +8,14 @@ use std::{
     },
     task::{Context, Poll},
 };
+
+use futures::Stream;
 use tokio::{
     net::windows::named_pipe::{NamedPipeServer, ServerOptions},
     select,
 };
 use tokio_util::sync::CancellationToken;
+use tracing::{error, info};
 use windows::Win32::{Foundation::HANDLE, System::Pipes::GetNamedPipeClientProcessId};
 
 use crate::ssh_agent::peerinfo::{self, models::PeerInfo};
@@ -31,42 +33,38 @@ impl NamedPipeServerStream {
     pub fn new(cancellation_token: CancellationToken, is_running: Arc<AtomicBool>) -> Self {
         let (tx, rx) = tokio::sync::mpsc::channel(16);
         tokio::spawn(async move {
-            println!(
-                "[SSH Agent Native Module] Creating named pipe server on {}",
-                PIPE_NAME
-            );
+            info!("Creating named pipe server on {}", PIPE_NAME);
             let mut listener = match ServerOptions::new().create(PIPE_NAME) {
                 Ok(pipe) => pipe,
-                Err(err) => {
-                    println!("[SSH Agent Native Module] Encountered an error creating the first pipe. The system's openssh service must likely be disabled");
-                    println!("[SSH Agent Natvie Module] error: {}", err);
+                Err(e) => {
+                    error!(error = %e, "Encountered an error creating the first pipe. The system's openssh service must likely be disabled");
                     cancellation_token.cancel();
                     is_running.store(false, Ordering::Relaxed);
                     return;
                 }
             };
             loop {
-                println!("[SSH Agent Native Module] Waiting for connection");
+                info!("Waiting for connection");
                 select! {
                     _ = cancellation_token.cancelled() => {
-                        println!("[SSH Agent Native Module] Cancellation token triggered, stopping named pipe server");
+                        info!("[SSH Agent Native Module] Cancellation token triggered, stopping named pipe server");
                         break;
                     }
                     _ = listener.connect() => {
-                        println!("[SSH Agent Native Module] Incoming connection");
+                        info!("[SSH Agent Native Module] Incoming connection");
                         let handle = HANDLE(listener.as_raw_handle());
                         let mut pid = 0;
                         unsafe {
                             if let Err(e) = GetNamedPipeClientProcessId(handle, &mut pid) {
-                                println!("Error getting named pipe client process id {}", e);
+                                error!(error = %e, pid, "Faile to get named pipe client process id");
                                 continue
                             }
                         };
 
                         let peer_info = peerinfo::gather::get_peer_info(pid);
                         let peer_info = match peer_info {
-                            Err(err) => {
-                                println!("Failed getting process info for pid {} {}", pid, err);
+                            Err(e) => {
+                                error!(error = %e, pid = %pid, "Failed getting process info");
                                 continue
                             },
                             Ok(info) => info,
@@ -76,8 +74,8 @@ impl NamedPipeServerStream {
 
                         listener = match ServerOptions::new().create(PIPE_NAME) {
                             Ok(pipe) => pipe,
-                            Err(err) => {
-                                println!("[SSH Agent Native Module] Encountered an error creating a new pipe {}", err);
+                            Err(e) => {
+                                error!(error = %e, "Encountered an error creating a new pipe");
                                 cancellation_token.cancel();
                                 is_running.store(false, Ordering::Relaxed);
                                 return;
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/peercred_unix_listener_stream.rs b/apps/desktop/desktop_native/core/src/ssh_agent/peercred_unix_listener_stream.rs
index 77eec5e35c7..5b6b1d8f36b 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/peercred_unix_listener_stream.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/peercred_unix_listener_stream.rs
@@ -1,11 +1,13 @@
+use std::{
+    io,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::Stream;
-use std::io;
-use std::pin::Pin;
-use std::task::{Context, Poll};
 use tokio::net::{UnixListener, UnixStream};
 
-use super::peerinfo;
-use super::peerinfo::models::PeerInfo;
+use super::{peerinfo, peerinfo::models::PeerInfo};
 
 #[derive(Debug)]
 pub struct PeercredUnixListenerStream {
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs b/apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs
index fad535cb80e..74b909f5ce7 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs
@@ -1,9 +1,10 @@
 use std::sync::{atomic::AtomicBool, Arc, Mutex};
 
 /**
-* Peerinfo represents the information of a peer process connecting over a socket.
-* This can be later extended to include more information (icon, app name) for the corresponding application.
-*/
+ * Peerinfo represents the information of a peer process connecting over a socket.
+ * This can be later extended to include more information (icon, app name) for the corresponding
+ * application.
+ */
 #[derive(Debug, Clone)]
 pub struct PeerInfo {
     uid: u32,
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs b/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
index 53142d4c476..8623df13776 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
@@ -1,95 +1,52 @@
-use std::{
-    collections::HashMap,
-    fs,
-    os::unix::fs::PermissionsExt,
-    sync::{
-        atomic::{AtomicBool, AtomicU32},
-        Arc, RwLock,
-    },
-};
+use std::{fs, os::unix::fs::PermissionsExt, path::PathBuf, sync::Arc};
 
+use anyhow::anyhow;
 use bitwarden_russh::ssh_agent;
 use homedir::my_home;
 use tokio::{net::UnixListener, sync::Mutex};
-use tokio_util::sync::CancellationToken;
+use tracing::{error, info};
 
+use super::{BitwardenDesktopAgent, SshAgentUIRequest};
 use crate::ssh_agent::peercred_unix_listener_stream::PeercredUnixListenerStream;
 
-use super::{BitwardenDesktopAgent, BitwardenSshKey, SshAgentUIRequest};
+/// User can override the default socket path with this env var
+const ENV_BITWARDEN_SSH_AUTH_SOCK: &str = "BITWARDEN_SSH_AUTH_SOCK";
 
-impl BitwardenDesktopAgent<BitwardenSshKey> {
+const FLATPAK_DATA_DIR: &str = ".var/app/com.bitwarden.desktop/data";
+
+const SOCKFILE_NAME: &str = ".bitwarden-ssh-agent.sock";
+
+impl BitwardenDesktopAgent {
+    /// Starts the Bitwarden Desktop SSH Agent server.
+    /// # Errors
+    /// Will return `Err` if unable to create and set permissions for socket file path or
+    /// if unable to bind to the socket path.
     pub fn start_server(
         auth_request_tx: tokio::sync::mpsc::Sender<SshAgentUIRequest>,
         auth_response_rx: Arc<Mutex<tokio::sync::broadcast::Receiver<(u32, bool)>>>,
     ) -> Result<Self, anyhow::Error> {
-        let agent = BitwardenDesktopAgent {
-            keystore: ssh_agent::KeyStore(Arc::new(RwLock::new(HashMap::new()))),
-            cancellation_token: CancellationToken::new(),
-            show_ui_request_tx: auth_request_tx,
-            get_ui_response_rx: auth_response_rx,
-            request_id: Arc::new(AtomicU32::new(0)),
-            needs_unlock: Arc::new(AtomicBool::new(true)),
-            is_running: Arc::new(AtomicBool::new(false)),
-        };
-        let cloned_agent_state = agent.clone();
-        tokio::spawn(async move {
-            let ssh_path = match std::env::var("BITWARDEN_SSH_AUTH_SOCK") {
-                Ok(path) => path,
-                Err(_) => {
-                    println!("[SSH Agent Native Module] BITWARDEN_SSH_AUTH_SOCK not set, using default path");
+        let agent_state = BitwardenDesktopAgent::new(auth_request_tx, auth_response_rx);
 
-                    let ssh_agent_directory = match my_home() {
-                        Ok(Some(home)) => home,
-                        _ => {
-                            println!(
-                                "[SSH Agent Native Module] Could not determine home directory"
-                            );
-                            return;
-                        }
-                    };
+        let socket_path = get_socket_path()?;
 
-                    let is_flatpak = std::env::var("container") == Ok("flatpak".to_string());
-                    if !is_flatpak {
-                        ssh_agent_directory
-                            .join(".bitwarden-ssh-agent.sock")
-                            .to_str()
-                            .expect("Path should be valid")
-                            .to_owned()
-                    } else {
-                        ssh_agent_directory
-                            .join(".var/app/com.bitwarden.desktop/data/.bitwarden-ssh-agent.sock")
-                            .to_str()
-                            .expect("Path should be valid")
-                            .to_owned()
-                    }
-                }
-            };
+        // if the socket is already present and wasn't cleanly removed during a previous
+        // runtime, remove it before beginning anew.
+        remove_path(&socket_path)?;
 
-            println!("[SSH Agent Native Module] Starting SSH Agent server on {ssh_path:?}");
-            let sockname = std::path::Path::new(&ssh_path);
-            if let Err(e) = std::fs::remove_file(sockname) {
-                println!("[SSH Agent Native Module] Could not remove existing socket file: {e}");
-                if e.kind() != std::io::ErrorKind::NotFound {
-                    return;
-                }
-            }
+        info!(?socket_path, "Starting SSH Agent server");
 
-            match UnixListener::bind(sockname) {
-                Ok(listener) => {
-                    // Only the current user should be able to access the socket
-                    if let Err(e) = fs::set_permissions(sockname, fs::Permissions::from_mode(0o600))
-                    {
-                        println!("[SSH Agent Native Module] Could not set socket permissions: {e}");
-                        return;
-                    }
+        match UnixListener::bind(socket_path.clone()) {
+            Ok(listener) => {
+                // Only the current user should be able to access the socket
+                set_user_permissions(&socket_path)?;
 
-                    let stream = PeercredUnixListenerStream::new(listener);
+                let stream = PeercredUnixListenerStream::new(listener);
 
-                    let cloned_keystore = cloned_agent_state.keystore.clone();
-                    let cloned_cancellation_token = cloned_agent_state.cancellation_token.clone();
-                    cloned_agent_state
-                        .is_running
-                        .store(true, std::sync::atomic::Ordering::Relaxed);
+                let cloned_agent_state = agent_state.clone();
+                let cloned_keystore = cloned_agent_state.keystore.clone();
+                let cloned_cancellation_token = cloned_agent_state.cancellation_token.clone();
+
+                tokio::spawn(async move {
                     let _ = ssh_agent::serve(
                         stream,
                         cloned_agent_state.clone(),
@@ -97,17 +54,132 @@ impl BitwardenDesktopAgent<BitwardenSshKey> {
                         cloned_cancellation_token,
                     )
                     .await;
+
                     cloned_agent_state
                         .is_running
                         .store(false, std::sync::atomic::Ordering::Relaxed);
-                    println!("[SSH Agent Native Module] SSH Agent server exited");
-                }
-                Err(e) => {
-                    eprintln!("[SSH Agent Native Module] Error while starting agent server: {e}");
-                }
-            }
-        });
 
-        Ok(agent)
+                    info!("SSH Agent server exited");
+                });
+
+                agent_state
+                    .is_running
+                    .store(true, std::sync::atomic::Ordering::Relaxed);
+
+                info!(?socket_path, "SSH Agent is running.");
+            }
+            Err(error) => {
+                error!(%error, ?socket_path, "Unable to start start agent server");
+                return Err(error.into());
+            }
+        }
+
+        Ok(agent_state)
+    }
+}
+
+// one of the following:
+//   - only the env var socket path if it is defined
+//   - the $HOME path and our well known extension
+fn get_socket_path() -> Result<PathBuf, anyhow::Error> {
+    if let Ok(path) = std::env::var(ENV_BITWARDEN_SSH_AUTH_SOCK) {
+        Ok(PathBuf::from(path))
+    } else {
+        info!("BITWARDEN_SSH_AUTH_SOCK not set, using default path");
+        get_default_socket_path()
+    }
+}
+
+fn is_flatpak() -> bool {
+    std::env::var("container") == Ok("flatpak".to_string())
+}
+
+// use the $HOME directory
+fn get_default_socket_path() -> Result<PathBuf, anyhow::Error> {
+    let Ok(Some(mut ssh_agent_directory)) = my_home() else {
+        error!("Could not determine home directory");
+        return Err(anyhow!("Could not determine home directory."));
+    };
+
+    if is_flatpak() {
+        ssh_agent_directory = ssh_agent_directory.join(FLATPAK_DATA_DIR);
+    }
+
+    ssh_agent_directory = ssh_agent_directory.join(SOCKFILE_NAME);
+
+    Ok(ssh_agent_directory)
+}
+
+fn set_user_permissions(path: &PathBuf) -> Result<(), anyhow::Error> {
+    fs::set_permissions(path, fs::Permissions::from_mode(0o600))
+        .map_err(|e| anyhow!("Could not set socket permissions for {path:?}: {e}"))
+}
+
+// try to remove the given path if it exists
+fn remove_path(path: &PathBuf) -> Result<(), anyhow::Error> {
+    if let Ok(true) = std::fs::exists(path) {
+        std::fs::remove_file(path).map_err(|e| anyhow!("Error removing socket {path:?}: {e}"))?;
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use rand::{distr::Alphanumeric, Rng};
+
+    use super::*;
+
+    #[test]
+    fn test_default_socket_path_success() {
+        let path = get_default_socket_path().unwrap();
+        let expected = PathBuf::from_iter([
+            std::env::var("HOME").unwrap(),
+            ".bitwarden-ssh-agent.sock".to_string(),
+        ]);
+        assert_eq!(path, expected);
+    }
+
+    fn rand_file_in_temp() -> PathBuf {
+        let mut path = std::env::temp_dir();
+        let s: String = rand::rng()
+            .sample_iter(&Alphanumeric)
+            .take(16)
+            .map(char::from)
+            .collect();
+        path.push(s);
+        path
+    }
+
+    #[test]
+    fn test_remove_path_exists_success() {
+        let path = rand_file_in_temp();
+        fs::write(&path, "").unwrap();
+        remove_path(&path).unwrap();
+
+        assert!(!fs::exists(&path).unwrap());
+    }
+
+    // the remove_path should not fail if the path does not exist
+    #[test]
+    fn test_remove_path_not_found_success() {
+        let path = rand_file_in_temp();
+        remove_path(&path).unwrap();
+
+        assert!(!fs::exists(&path).unwrap());
+    }
+
+    #[test]
+    fn test_sock_path_file_permissions() {
+        let path = rand_file_in_temp();
+        fs::write(&path, "").unwrap();
+
+        set_user_permissions(&path).unwrap();
+
+        let metadata = fs::metadata(&path).unwrap();
+        let permissions = metadata.permissions().mode();
+
+        assert_eq!(permissions, 0o100_600);
+
+        remove_path(&path).unwrap();
     }
 }
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/windows.rs b/apps/desktop/desktop_native/core/src/ssh_agent/windows.rs
index 75c47165960..2012dab2d77 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/windows.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/windows.rs
@@ -1,32 +1,19 @@
 use bitwarden_russh::ssh_agent;
 pub mod named_pipe_listener_stream;
 
-use std::{
-    collections::HashMap,
-    sync::{
-        atomic::{AtomicBool, AtomicU32},
-        Arc, RwLock,
-    },
-};
+use std::sync::Arc;
+
 use tokio::sync::Mutex;
-use tokio_util::sync::CancellationToken;
 
-use super::{BitwardenDesktopAgent, BitwardenSshKey, SshAgentUIRequest};
+use super::{BitwardenDesktopAgent, SshAgentUIRequest};
 
-impl BitwardenDesktopAgent<BitwardenSshKey> {
+impl BitwardenDesktopAgent {
     pub fn start_server(
         auth_request_tx: tokio::sync::mpsc::Sender<SshAgentUIRequest>,
         auth_response_rx: Arc<Mutex<tokio::sync::broadcast::Receiver<(u32, bool)>>>,
     ) -> Result<Self, anyhow::Error> {
-        let agent_state = BitwardenDesktopAgent {
-            keystore: ssh_agent::KeyStore(Arc::new(RwLock::new(HashMap::new()))),
-            show_ui_request_tx: auth_request_tx,
-            get_ui_response_rx: auth_response_rx,
-            cancellation_token: CancellationToken::new(),
-            request_id: Arc::new(AtomicU32::new(0)),
-            needs_unlock: Arc::new(AtomicBool::new(true)),
-            is_running: Arc::new(AtomicBool::new(true)),
-        };
+        let agent_state = BitwardenDesktopAgent::new(auth_request_tx, auth_response_rx);
+
         let stream = named_pipe_listener_stream::NamedPipeServerStream::new(
             agent_state.cancellation_token.clone(),
             agent_state.is_running.clone(),
diff --git a/apps/desktop/desktop_native/deny.toml b/apps/desktop/desktop_native/deny.toml
new file mode 100644
index 00000000000..7d7a126f694
--- /dev/null
+++ b/apps/desktop/desktop_native/deny.toml
@@ -0,0 +1,40 @@
+# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
+[advisories]
+ignore = [
+  # Vulnerability in `rsa` crate: https://rustsec.org/advisories/RUSTSEC-2023-0071.html
+  { id = "RUSTSEC-2023-0071", reason = "There is no fix available yet." },
+  { id = "RUSTSEC-2024-0436", reason = "paste crate is unmaintained."}
+]
+
+# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
+[licenses]
+# See https://spdx.org/licenses/ for list of possible licenses
+allow = [
+  "0BSD",
+  "Apache-2.0",
+  "BSD-2-Clause",
+  "BSD-3-Clause",
+  "BSL-1.0",
+  "ISC",
+  "MIT",
+  "MPL-2.0",
+  "Unicode-3.0",
+  "Zlib",
+]
+
+
+[licenses.private]
+# If true, ignores workspace crates that aren't published, or are only
+# published to private registries.
+# To see how to mark a crate as unpublished (to the official registry),
+# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field.
+ignore = true
+
+# This section is considered when running `cargo deny check bans`.
+# More documentation about the 'bans' section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
+[bans]
+deny = [
+# TODO: enable after https://github.com/bitwarden/clients/pull/16761 is merged
+#    { name = "log", wrappers = [], reason = "Use `tracing` and `tracing-subscriber` for observability needs." },
+]
diff --git a/apps/desktop/desktop_native/macos_provider/Cargo.toml b/apps/desktop/desktop_native/macos_provider/Cargo.toml
index 9f042209b06..50f1834851d 100644
--- a/apps/desktop/desktop_native/macos_provider/Cargo.toml
+++ b/apps/desktop/desktop_native/macos_provider/Cargo.toml
@@ -14,18 +14,17 @@ crate-type = ["staticlib", "cdylib"]
 bench = false
 
 [dependencies]
-desktop_core = { path = "../core" }
-futures = { workspace = true }
-log = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
-tokio = { workspace = true, features = ["sync"] }
-tokio-util = { workspace = true }
-tracing = { workspace = true }
 uniffi = { workspace = true, features = ["cli"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-oslog = { workspace = true }
+desktop_core = { path = "../core" }
+futures = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+tokio = { workspace = true, features = ["sync"] }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tracing-oslog = "0.3.0"
 
 [build-dependencies]
 uniffi = { workspace = true, features = ["build"] }
diff --git a/apps/desktop/desktop_native/macos_provider/src/lib.rs b/apps/desktop/desktop_native/macos_provider/src/lib.rs
index ded133bcb54..a5a134b0bfe 100644
--- a/apps/desktop/desktop_native/macos_provider/src/lib.rs
+++ b/apps/desktop/desktop_native/macos_provider/src/lib.rs
@@ -1,14 +1,20 @@
 #![cfg(target_os = "macos")]
+#![allow(clippy::disallowed_macros)] // uniffi macros trip up clippy's evaluation
 
 use std::{
     collections::HashMap,
-    sync::{atomic::AtomicU32, Arc, Mutex},
+    sync::{atomic::AtomicU32, Arc, Mutex, Once},
     time::Instant,
 };
 
 use futures::FutureExt;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use tracing::{error, info};
+use tracing_subscriber::{
+    filter::{EnvFilter, LevelFilter},
+    layer::SubscriberExt,
+    util::SubscriberInitExt,
+};
 
 uniffi::setup_scaffolding!();
 
@@ -21,6 +27,8 @@ use assertion::{
 };
 use registration::{PasskeyRegistrationRequest, PreparePasskeyRegistrationCallback};
 
+static INIT: Once = Once::new();
+
 #[derive(uniffi::Enum, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum UserVerification {
@@ -65,9 +73,20 @@ impl MacOSProviderClient {
     #[allow(clippy::unwrap_used)]
     #[uniffi::constructor]
     pub fn connect() -> Self {
-        let _ = oslog::OsLogger::new("com.bitwarden.desktop.autofill-extension")
-            .level_filter(log::LevelFilter::Trace)
-            .init();
+        INIT.call_once(|| {
+            let filter = EnvFilter::builder()
+                // Everything logs at `INFO`
+                .with_default_directive(LevelFilter::INFO.into())
+                .from_env_lossy();
+
+            tracing_subscriber::registry()
+                .with(filter)
+                .with(tracing_oslog::OsLogger::new(
+                    "com.bitwarden.desktop.autofill-extension",
+                    "default",
+                ))
+                .init();
+        });
 
         let (from_server_send, mut from_server_recv) = tokio::sync::mpsc::channel(32);
         let (to_server_send, to_server_recv) = tokio::sync::mpsc::channel(32);
@@ -78,7 +97,7 @@ impl MacOSProviderClient {
             response_callbacks_queue: Arc::new(Mutex::new(HashMap::new())),
         };
 
-        let path = desktop_core::ipc::path("autofill");
+        let path = desktop_core::ipc::path("af");
 
         let queue = client.response_callbacks_queue.clone();
 
diff --git a/apps/desktop/desktop_native/napi/Cargo.toml b/apps/desktop/desktop_native/napi/Cargo.toml
index 5e2e42b463f..b5847a602d5 100644
--- a/apps/desktop/desktop_native/napi/Cargo.toml
+++ b/apps/desktop/desktop_native/napi/Cargo.toml
@@ -16,17 +16,13 @@ manual_test = []
 [dependencies]
 anyhow = { workspace = true }
 autotype = { path = "../autotype" }
-base64 = { workspace = true }
-bitwarden_chromium_importer = { path = "../bitwarden_chromium_importer" }
+chromium_importer = { path = "../chromium_importer" }
 desktop_core = { path = "../core" }
-hex = { workspace = true }
 napi = { workspace = true, features = ["async"] }
 napi-derive = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tokio-util = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 
diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts
index 030bf4c964d..01bfa65d571 100644
--- a/apps/desktop/desktop_native/napi/index.d.ts
+++ b/apps/desktop/desktop_native/napi/index.d.ts
@@ -11,7 +11,10 @@ export declare namespace passwords {
    * Throws {@link Error} with message {@link PASSWORD_NOT_FOUND} if the password does not exist.
    */
   export function getPassword(service: string, account: string): Promise<string>
-  /** Save the password to the keychain. Adds an entry if none exists otherwise updates the existing entry. */
+  /**
+   * Save the password to the keychain. Adds an entry if none exists otherwise updates the
+   * existing entry.
+   */
   export function setPassword(service: string, account: string, password: string): Promise<void>
   /**
    * Delete the stored password from the keychain.
@@ -35,7 +38,8 @@ export declare namespace biometrics {
    * base64 encoded key and the base64 encoded challenge used to create it
    * separated by a `|` character.
    *
-   * If the iv is provided, it will be used as the challenge. Otherwise a random challenge will be generated.
+   * If the iv is provided, it will be used as the challenge. Otherwise a random challenge will
+   * be generated.
    *
    * `format!("<key_base64>|<iv_base64>")`
    */
@@ -49,6 +53,18 @@ export declare namespace biometrics {
     ivB64: string
   }
 }
+export declare namespace biometrics_v2 {
+  export function initBiometricSystem(): BiometricLockSystem
+  export function authenticate(biometricLockSystem: BiometricLockSystem, hwnd: Buffer, message: string): Promise<boolean>
+  export function authenticateAvailable(biometricLockSystem: BiometricLockSystem): Promise<boolean>
+  export function enrollPersistent(biometricLockSystem: BiometricLockSystem, userId: string, key: Buffer): Promise<void>
+  export function provideKey(biometricLockSystem: BiometricLockSystem, userId: string, key: Buffer): Promise<void>
+  export function unlock(biometricLockSystem: BiometricLockSystem, userId: string, hwnd: Buffer): Promise<Buffer>
+  export function unlockAvailable(biometricLockSystem: BiometricLockSystem, userId: string): Promise<boolean>
+  export function hasPersistent(biometricLockSystem: BiometricLockSystem, userId: string): Promise<boolean>
+  export function unenroll(biometricLockSystem: BiometricLockSystem, userId: string): Promise<void>
+  export class BiometricLockSystem {   }
+}
 export declare namespace clipboards {
   export function read(): Promise<string>
   export function write(text: string, password: boolean): Promise<void>
@@ -107,8 +123,9 @@ export declare namespace ipc {
     /**
      * Create and start the IPC server without blocking.
      *
-     * @param name The endpoint name to listen on. This name uniquely identifies the IPC connection and must be the same for both the server and client.
-     * @param callback This function will be called whenever a message is received from a client.
+     * @param name The endpoint name to listen on. This name uniquely identifies the IPC
+     * connection and must be the same for both the server and client. @param callback
+     * This function will be called whenever a message is received from a client.
      */
     static listen(name: string, callback: (error: null | Error, message: IpcMessage) => void): Promise<IpcServer>
     /** Return the path to the IPC server. */
@@ -118,8 +135,9 @@ export declare namespace ipc {
     /**
      * Send a message over the IPC server to all the connected clients
      *
-     * @return The number of clients that the message was sent to. Note that the number of messages
-     * actually received may be less, as some clients could disconnect before receiving the message.
+     * @return The number of clients that the message was sent to. Note that the number of
+     * messages actually received may be less, as some clients could disconnect before
+     * receiving the message.
      */
     send(message: string): number
   }
@@ -182,8 +200,9 @@ export declare namespace autofill {
     /**
      * Create and start the IPC server without blocking.
      *
-     * @param name The endpoint name to listen on. This name uniquely identifies the IPC connection and must be the same for both the server and client.
-     * @param callback This function will be called whenever a message is received from a client.
+     * @param name The endpoint name to listen on. This name uniquely identifies the IPC
+     * connection and must be the same for both the server and client. @param callback
+     * This function will be called whenever a message is received from a client.
      */
     static listen(name: string, registrationCallback: (error: null | Error, clientId: number, sequenceNumber: number, message: PasskeyRegistrationRequest) => void, assertionCallback: (error: null | Error, clientId: number, sequenceNumber: number, message: PasskeyAssertionRequest) => void, assertionWithoutUserInterfaceCallback: (error: null | Error, clientId: number, sequenceNumber: number, message: PasskeyAssertionWithoutUserInterfaceRequest) => void): Promise<IpcServer>
     /** Return the path to the IPC server. */
@@ -228,7 +247,13 @@ export declare namespace chromium_importer {
     login?: Login
     failure?: LoginImportFailure
   }
-  export function getInstalledBrowsers(): Array<string>
+  export interface NativeImporterMetadata {
+    id: string
+    loaders: Array<string>
+    instructions: string
+  }
+  /** Returns OS aware metadata describing supported Chromium based importers as a JSON string. */
+  export function getMetadata(): Record<string, NativeImporterMetadata>
   export function getAvailableProfiles(browser: string): Array<ProfileInfo>
   export function importLogins(browser: string, profileId: string): Promise<Array<LoginImportResult>>
 }
diff --git a/apps/desktop/desktop_native/napi/index.js b/apps/desktop/desktop_native/napi/index.js
index acfd0dffb89..64819be4405 100644
--- a/apps/desktop/desktop_native/napi/index.js
+++ b/apps/desktop/desktop_native/napi/index.js
@@ -78,12 +78,6 @@ switch (platform) {
         throw new Error(`Unsupported architecture on macOS: ${arch}`);
     }
     break;
-  case "freebsd":
-    nativeBinding = loadFirstAvailable(
-      ["desktop_napi.freebsd-x64.node"],
-      "@bitwarden/desktop-napi-freebsd-x64",
-    );
-    break;
   case "linux":
     switch (arch) {
       case "x64":
diff --git a/apps/desktop/desktop_native/napi/package.json b/apps/desktop/desktop_native/napi/package.json
index d557ccfd259..ca17377c9f2 100644
--- a/apps/desktop/desktop_native/napi/package.json
+++ b/apps/desktop/desktop_native/napi/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "",
   "scripts": {
-    "build": "napi build --platform --js false",
+    "build": "node scripts/build.js",
     "test": "cargo test"
   },
   "author": "",
diff --git a/apps/desktop/desktop_native/napi/scripts/build.js b/apps/desktop/desktop_native/napi/scripts/build.js
new file mode 100644
index 00000000000..a6680f5d311
--- /dev/null
+++ b/apps/desktop/desktop_native/napi/scripts/build.js
@@ -0,0 +1,14 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { execSync } = require('child_process');
+
+const args = process.argv.slice(2);
+const isRelease = args.includes('--release');
+
+if (isRelease) {
+  console.log('Building release mode.');
+} else {
+  console.log('Building debug mode.');
+  process.env.RUST_LOG = 'debug';
+}
+
+execSync(`napi build --platform --js false`, { stdio: 'inherit', env: process.env });
diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs
index 327c7c1c8e5..c34e7574f68 100644
--- a/apps/desktop/desktop_native/napi/src/lib.rs
+++ b/apps/desktop/desktop_native/napi/src/lib.rs
@@ -19,7 +19,8 @@ pub mod passwords {
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
-    /// Save the password to the keychain. Adds an entry if none exists otherwise updates the existing entry.
+    /// Save the password to the keychain. Adds an entry if none exists otherwise updates the
+    /// existing entry.
     #[napi]
     pub async fn set_password(
         service: String,
@@ -107,7 +108,8 @@ pub mod biometrics {
     /// base64 encoded key and the base64 encoded challenge used to create it
     /// separated by a `|` character.
     ///
-    /// If the iv is provided, it will be used as the challenge. Otherwise a random challenge will be generated.
+    /// If the iv is provided, it will be used as the challenge. Otherwise a random challenge will
+    /// be generated.
     ///
     /// `format!("<key_base64>|<iv_base64>")`
     #[allow(clippy::unused_async)] // FIXME: Remove unused async!
@@ -149,6 +151,123 @@ pub mod biometrics {
     }
 }
 
+#[napi]
+pub mod biometrics_v2 {
+    use desktop_core::biometric_v2::BiometricTrait;
+
+    #[napi]
+    pub struct BiometricLockSystem {
+        inner: desktop_core::biometric_v2::BiometricLockSystem,
+    }
+
+    #[napi]
+    pub fn init_biometric_system() -> napi::Result<BiometricLockSystem> {
+        Ok(BiometricLockSystem {
+            inner: desktop_core::biometric_v2::BiometricLockSystem::new(),
+        })
+    }
+
+    #[napi]
+    pub async fn authenticate(
+        biometric_lock_system: &BiometricLockSystem,
+        hwnd: napi::bindgen_prelude::Buffer,
+        message: String,
+    ) -> napi::Result<bool> {
+        biometric_lock_system
+            .inner
+            .authenticate(hwnd.into(), message)
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+    }
+
+    #[napi]
+    pub async fn authenticate_available(
+        biometric_lock_system: &BiometricLockSystem,
+    ) -> napi::Result<bool> {
+        biometric_lock_system
+            .inner
+            .authenticate_available()
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+    }
+
+    #[napi]
+    pub async fn enroll_persistent(
+        biometric_lock_system: &BiometricLockSystem,
+        user_id: String,
+        key: napi::bindgen_prelude::Buffer,
+    ) -> napi::Result<()> {
+        biometric_lock_system
+            .inner
+            .enroll_persistent(&user_id, &key)
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+    }
+
+    #[napi]
+    pub async fn provide_key(
+        biometric_lock_system: &BiometricLockSystem,
+        user_id: String,
+        key: napi::bindgen_prelude::Buffer,
+    ) -> napi::Result<()> {
+        biometric_lock_system
+            .inner
+            .provide_key(&user_id, &key)
+            .await;
+        Ok(())
+    }
+
+    #[napi]
+    pub async fn unlock(
+        biometric_lock_system: &BiometricLockSystem,
+        user_id: String,
+        hwnd: napi::bindgen_prelude::Buffer,
+    ) -> napi::Result<napi::bindgen_prelude::Buffer> {
+        biometric_lock_system
+            .inner
+            .unlock(&user_id, hwnd.into())
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+            .map(|v| v.into())
+    }
+
+    #[napi]
+    pub async fn unlock_available(
+        biometric_lock_system: &BiometricLockSystem,
+        user_id: String,
+    ) -> napi::Result<bool> {
+        biometric_lock_system
+            .inner
+            .unlock_available(&user_id)
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+    }
+
+    #[napi]
+    pub async fn has_persistent(
+        biometric_lock_system: &BiometricLockSystem,
+        user_id: String,
+    ) -> napi::Result<bool> {
+        biometric_lock_system
+            .inner
+            .has_persistent(&user_id)
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+    }
+
+    #[napi]
+    pub async fn unenroll(
+        biometric_lock_system: &BiometricLockSystem,
+        user_id: String,
+    ) -> napi::Result<()> {
+        biometric_lock_system
+            .inner
+            .unenroll(&user_id)
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+    }
+}
+
 #[napi]
 pub mod clipboards {
     #[allow(clippy::unused_async)] // FIXME: Remove unused async!
@@ -169,7 +288,6 @@ pub mod clipboards {
 pub mod sshagent {
     use std::sync::Arc;
 
-    use desktop_core::ssh_agent::BitwardenSshKey;
     use napi::{
         bindgen_prelude::Promise,
         threadsafe_function::{ErrorStrategy::CalleeHandled, ThreadsafeFunction},
@@ -179,7 +297,7 @@ pub mod sshagent {
 
     #[napi]
     pub struct SshAgentState {
-        state: desktop_core::ssh_agent::BitwardenDesktopAgent<BitwardenSshKey>,
+        state: desktop_core::ssh_agent::BitwardenDesktopAgent,
     }
 
     #[napi(object)]
@@ -440,8 +558,9 @@ pub mod ipc {
     impl IpcServer {
         /// Create and start the IPC server without blocking.
         ///
-        /// @param name The endpoint name to listen on. This name uniquely identifies the IPC connection and must be the same for both the server and client.
-        /// @param callback This function will be called whenever a message is received from a client.
+        /// @param name The endpoint name to listen on. This name uniquely identifies the IPC
+        /// connection and must be the same for both the server and client. @param callback
+        /// This function will be called whenever a message is received from a client.
         #[allow(clippy::unused_async)] // FIXME: Remove unused async!
         #[napi(factory)]
         pub async fn listen(
@@ -482,8 +601,9 @@ pub mod ipc {
 
         /// Send a message over the IPC server to all the connected clients
         ///
-        /// @return The number of clients that the message was sent to. Note that the number of messages
-        /// actually received may be less, as some clients could disconnect before receiving the message.
+        /// @return The number of clients that the message was sent to. Note that the number of
+        /// messages actually received may be less, as some clients could disconnect before
+        /// receiving the message.
         #[napi]
         pub fn send(&self, message: String) -> napi::Result<u32> {
             self.server
@@ -627,8 +747,9 @@ pub mod autofill {
     impl IpcServer {
         /// Create and start the IPC server without blocking.
         ///
-        /// @param name The endpoint name to listen on. This name uniquely identifies the IPC connection and must be the same for both the server and client.
-        /// @param callback This function will be called whenever a message is received from a client.
+        /// @param name The endpoint name to listen on. This name uniquely identifies the IPC
+        /// connection and must be the same for both the server and client. @param callback
+        /// This function will be called whenever a message is received from a client.
         #[allow(clippy::unused_async)] // FIXME: Remove unused async!
         #[napi(factory)]
         pub async fn listen(
@@ -830,18 +951,18 @@ pub mod logging {
     //!
     //! # Example
     //!
-    //! [Elec] 14:34:03.517 › [NAPI] [INFO] desktop_core::ssh_agent::platform_ssh_agent: Starting SSH Agent server {socket=/Users/foo/.bitwarden-ssh-agent.sock}
+    //! [Elec] 14:34:03.517 › [NAPI] [INFO] desktop_core::ssh_agent::platform_ssh_agent: Starting
+    //! SSH Agent server {socket=/Users/foo/.bitwarden-ssh-agent.sock}
 
-    use std::fmt::Write;
-    use std::sync::OnceLock;
+    use std::{fmt::Write, sync::OnceLock};
 
     use napi::threadsafe_function::{
         ErrorStrategy::CalleeHandled, ThreadsafeFunction, ThreadsafeFunctionCallMode,
     };
     use tracing::Level;
-    use tracing_subscriber::fmt::format::{DefaultVisitor, Writer};
     use tracing_subscriber::{
-        filter::{EnvFilter, LevelFilter},
+        filter::EnvFilter,
+        fmt::format::{DefaultVisitor, Writer},
         layer::SubscriberExt,
         util::SubscriberInitExt,
         Layer,
@@ -928,13 +1049,25 @@ pub mod logging {
     pub fn init_napi_log(js_log_fn: ThreadsafeFunction<(LogLevel, String), CalleeHandled>) {
         let _ = JS_LOGGER.0.set(js_log_fn);
 
+        // the log level hierarchy is determined by:
+        //    - if RUST_LOG is detected at runtime
+        //    - if RUST_LOG is provided at compile time
+        //    - default to INFO
         let filter = EnvFilter::builder()
-            // set the default log level to INFO.
-            .with_default_directive(LevelFilter::INFO.into())
+            .with_default_directive(
+                option_env!("RUST_LOG")
+                    .unwrap_or("info")
+                    .parse()
+                    .expect("should provide valid log level at compile time."),
+            )
             // parse directives from the RUST_LOG environment variable,
             // overriding the default directive for matching targets.
             .from_env_lossy();
 
+        // With the `tracing-log` feature enabled for the `tracing_subscriber`,
+        // the registry below will initialize a log compatibility layer, which allows
+        // the subscriber to consume log::Records as though they were tracing Events.
+        // https://docs.rs/tracing-subscriber/latest/tracing_subscriber/util/trait.SubscriberInitExt.html#method.init
         tracing_subscriber::registry()
             .with(filter)
             .with(JsLayer)
@@ -944,8 +1077,15 @@ pub mod logging {
 
 #[napi]
 pub mod chromium_importer {
-    use bitwarden_chromium_importer::chromium::LoginImportResult as _LoginImportResult;
-    use bitwarden_chromium_importer::chromium::ProfileInfo as _ProfileInfo;
+    use std::collections::HashMap;
+
+    use chromium_importer::{
+        chromium::{
+            DefaultInstalledBrowserRetriever, LoginImportResult as _LoginImportResult,
+            ProfileInfo as _ProfileInfo,
+        },
+        metadata::NativeImporterMetadata as _NativeImporterMetadata,
+    };
 
     #[napi(object)]
     pub struct ProfileInfo {
@@ -974,6 +1114,13 @@ pub mod chromium_importer {
         pub failure: Option<LoginImportFailure>,
     }
 
+    #[napi(object)]
+    pub struct NativeImporterMetadata {
+        pub id: String,
+        pub loaders: Vec<&'static str>,
+        pub instructions: &'static str,
+    }
+
     impl From<_LoginImportResult> for LoginImportResult {
         fn from(l: _LoginImportResult) -> Self {
             match l {
@@ -1007,15 +1154,28 @@ pub mod chromium_importer {
         }
     }
 
+    impl From<_NativeImporterMetadata> for NativeImporterMetadata {
+        fn from(m: _NativeImporterMetadata) -> Self {
+            NativeImporterMetadata {
+                id: m.id,
+                loaders: m.loaders,
+                instructions: m.instructions,
+            }
+        }
+    }
+
     #[napi]
-    pub fn get_installed_browsers() -> napi::Result<Vec<String>> {
-        bitwarden_chromium_importer::chromium::get_installed_browsers()
-            .map_err(|e| napi::Error::from_reason(e.to_string()))
+    /// Returns OS aware metadata describing supported Chromium based importers as a JSON string.
+    pub fn get_metadata() -> HashMap<String, NativeImporterMetadata> {
+        chromium_importer::metadata::get_supported_importers::<DefaultInstalledBrowserRetriever>()
+            .into_iter()
+            .map(|(browser, metadata)| (browser, NativeImporterMetadata::from(metadata)))
+            .collect()
     }
 
     #[napi]
     pub fn get_available_profiles(browser: String) -> napi::Result<Vec<ProfileInfo>> {
-        bitwarden_chromium_importer::chromium::get_available_profiles(&browser)
+        chromium_importer::chromium::get_available_profiles(&browser)
             .map(|profiles| profiles.into_iter().map(ProfileInfo::from).collect())
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
@@ -1025,7 +1185,7 @@ pub mod chromium_importer {
         browser: String,
         profile_id: String,
     ) -> napi::Result<Vec<LoginImportResult>> {
-        bitwarden_chromium_importer::chromium::import_logins(&browser, &profile_id)
+        chromium_importer::chromium::import_logins(&browser, &profile_id)
             .await
             .map(|logins| logins.into_iter().map(LoginImportResult::from).collect())
             .map_err(|e| napi::Error::from_reason(e.to_string()))
diff --git a/apps/desktop/desktop_native/objc/Cargo.toml b/apps/desktop/desktop_native/objc/Cargo.toml
index fc8910bddd3..5ef791fb586 100644
--- a/apps/desktop/desktop_native/objc/Cargo.toml
+++ b/apps/desktop/desktop_native/objc/Cargo.toml
@@ -8,17 +8,13 @@ publish = { workspace = true }
 [features]
 default = []
 
-[dependencies]
+[target.'cfg(target_os = "macos")'.dependencies]
 anyhow = { workspace = true }
-thiserror = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "=0.10.1"
-
-[build-dependencies]
-cc = "=1.2.4"
+[target.'cfg(target_os = "macos")'.build-dependencies]
+cc = "=1.2.46"
 glob = "=0.3.2"
 
 [lints]
diff --git a/apps/desktop/desktop_native/process_isolation/Cargo.toml b/apps/desktop/desktop_native/process_isolation/Cargo.toml
new file mode 100644
index 00000000000..d8c6c7a618c
--- /dev/null
+++ b/apps/desktop/desktop_native/process_isolation/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "process_isolation"
+edition = { workspace = true }
+license = { workspace = true }
+version = { workspace = true }
+publish = { workspace = true }
+
+[lib]
+crate-type = ["cdylib"]
+
+[target.'cfg(target_os = "linux")'.dependencies]
+ctor = { workspace = true }
+desktop_core = { path = "../core" }
+libc = { workspace = true }
+tracing = { workspace = true }
diff --git a/apps/desktop/desktop_native/process_isolation/src/lib.rs b/apps/desktop/desktop_native/process_isolation/src/lib.rs
new file mode 100644
index 00000000000..55c5d7fafae
--- /dev/null
+++ b/apps/desktop/desktop_native/process_isolation/src/lib.rs
@@ -0,0 +1,48 @@
+#![cfg(target_os = "linux")]
+
+//! This library compiles to a pre-loadable shared object. When preloaded, it
+//! immediately isolates the process using the methods available on the platform.
+//! On Linux, this is PR_SET_DUMPABLE to prevent debuggers from attaching, the env
+//! from being read and the memory from being stolen.
+
+use std::{ffi::c_char, sync::LazyLock};
+
+use desktop_core::process_isolation;
+use tracing::info;
+
+static ORIGINAL_UNSETENV: LazyLock<unsafe extern "C" fn(*const c_char) -> i32> =
+    LazyLock::new(|| unsafe {
+        std::mem::transmute(libc::dlsym(libc::RTLD_NEXT, c"unsetenv".as_ptr()))
+    });
+
+/// Hooks unsetenv to fix a bug in zypak-wrapper.
+/// Zypak unsets the env in Flatpak as a side-effect, which means that only the top level
+/// processes would be hooked. With this work-around all processes in the tree are hooked
+#[unsafe(no_mangle)]
+unsafe extern "C" fn unsetenv(name: *const c_char) -> i32 {
+    unsafe {
+        let Ok(name_str) = std::ffi::CStr::from_ptr(name).to_str() else {
+            return ORIGINAL_UNSETENV(name);
+        };
+
+        if name_str == "LD_PRELOAD" {
+            // This env variable is provided by the flatpak configuration
+            let ld_preload = std::env::var("PROCESS_ISOLATION_LD_PRELOAD").unwrap_or_default();
+            std::env::set_var("LD_PRELOAD", ld_preload);
+            return 0;
+        }
+
+        ORIGINAL_UNSETENV(name)
+    }
+}
+
+// Hooks the shared object being loaded into the process
+#[ctor::ctor]
+fn preload_init() {
+    let pid = unsafe { libc::getpid() };
+    info!(pid, "Enabling memory security for process.");
+    unsafe {
+        process_isolation::isolate_process();
+        process_isolation::disable_coredumps();
+    }
+}
diff --git a/apps/desktop/desktop_native/process_isolation/test_isolation.sh b/apps/desktop/desktop_native/process_isolation/test_isolation.sh
new file mode 100644
index 00000000000..91f3b7933df
--- /dev/null
+++ b/apps/desktop/desktop_native/process_isolation/test_isolation.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# This script tests the memory isolation status of bitwarden-desktop processes. The script will print "isolated"
+# if the memory is not accessible by other processes.
+
+CURRENT_USER=$(whoami)
+
+# Find processes with "bitwarden" in the command
+pids=$(pgrep -f bitwarden)
+
+if [[ -z "$pids" ]]; then
+    echo "No bitwarden processes found."
+    exit 0
+fi
+
+for pid in $pids; do
+    # Get process info: command, PPID, RSS memory
+    read cmd ppid rss <<<$(ps -o comm=,ppid=,rss= -p "$pid")
+
+    # Explicitly skip if the command line does not contain "bitwarden"
+    if ! grep -q "bitwarden" <<<"$cmd"; then
+        continue
+    fi
+
+    # Check ownership of /proc/$pid/environ
+    owner=$(stat -c "%U" /proc/$pid/environ 2>/dev/null)
+
+    if [[ "$owner" == "root" ]]; then
+        status="isolated"
+    elif [[ "$owner" == "$CURRENT_USER" ]]; then
+        status="insecure"
+    else
+        status="unknown-owner:$owner"
+    fi
+
+    # Convert memory to MB 
+    mem_mb=$((rss / 1024))
+
+    echo "PID: $pid | CMD: $cmd | Mem: ${mem_mb}MB | Owner: $owner | Status: $status"
+done
diff --git a/apps/desktop/desktop_native/proxy/Cargo.toml b/apps/desktop/desktop_native/proxy/Cargo.toml
index cb1f39d9b42..25682fe2aa3 100644
--- a/apps/desktop/desktop_native/proxy/Cargo.toml
+++ b/apps/desktop/desktop_native/proxy/Cargo.toml
@@ -6,13 +6,12 @@ version = { workspace = true }
 publish = { workspace = true }
 
 [dependencies]
-anyhow = { workspace = true }
 desktop_core = { path = "../core" }
 futures = { workspace = true }
-log = { workspace = true }
-simplelog = { workspace = true }
 tokio = { workspace = true, features = ["io-std", "io-util", "macros", "rt"] }
 tokio-util = { workspace = true, features = ["codec"] }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 embed_plist = { workspace = true }
diff --git a/apps/desktop/desktop_native/proxy/src/main.rs b/apps/desktop/desktop_native/proxy/src/main.rs
index 792b1bf272d..a2a0b834bca 100644
--- a/apps/desktop/desktop_native/proxy/src/main.rs
+++ b/apps/desktop/desktop_native/proxy/src/main.rs
@@ -2,39 +2,47 @@ use std::path::Path;
 
 use desktop_core::ipc::{MESSAGE_CHANNEL_BUFFER, NATIVE_MESSAGING_BUFFER_SIZE};
 use futures::{FutureExt, SinkExt, StreamExt};
-use log::*;
 use tokio_util::codec::LengthDelimitedCodec;
-
-#[cfg(target_os = "windows")]
-mod windows;
+use tracing::{debug, error, info, level_filters::LevelFilter};
+use tracing_subscriber::{
+    fmt, layer::SubscriberExt as _, util::SubscriberInitExt as _, EnvFilter, Layer as _,
+};
 
 #[cfg(target_os = "macos")]
 embed_plist::embed_info_plist!("../../../resources/info.desktop_proxy.plist");
 
+const ENV_VAR_PROXY_LOG_LEVEL: &str = "PROXY_LOG_LEVEL";
+
 fn init_logging(log_path: &Path, console_level: LevelFilter, file_level: LevelFilter) {
-    use simplelog::{ColorChoice, CombinedLogger, Config, SharedLogger, TermLogger, TerminalMode};
+    let console_filter = EnvFilter::builder()
+        .with_default_directive(console_level.into())
+        .with_env_var(ENV_VAR_PROXY_LOG_LEVEL)
+        .from_env_lossy();
 
-    let config = Config::default();
-
-    let mut loggers: Vec<Box<dyn SharedLogger>> = Vec::new();
-    loggers.push(TermLogger::new(
-        console_level,
-        config.clone(),
-        TerminalMode::Stderr,
-        ColorChoice::Auto,
-    ));
+    let console_layer = fmt::layer()
+        .with_writer(std::io::stderr)
+        .with_filter(console_filter);
 
     match std::fs::File::create(log_path) {
         Ok(file) => {
-            loggers.push(simplelog::WriteLogger::new(file_level, config, file));
-        }
-        Err(e) => {
-            eprintln!("Can't create file: {e}");
-        }
-    }
+            let file_filter = EnvFilter::builder()
+                .with_default_directive(file_level.into())
+                .from_env_lossy();
 
-    if let Err(e) = CombinedLogger::init(loggers) {
-        eprintln!("Failed to initialize logger: {e}");
+            let file_layer = fmt::layer()
+                .with_writer(file)
+                .with_ansi(false)
+                .with_filter(file_filter);
+
+            tracing_subscriber::registry()
+                .with(console_layer)
+                .with(file_layer)
+                .init();
+        }
+        Err(error) => {
+            tracing_subscriber::registry().with(console_layer).init();
+            error!(%error, ?log_path, "Could not create log file.");
+        }
     }
 }
 
@@ -49,15 +57,11 @@ fn init_logging(log_path: &Path, console_level: LevelFilter, file_level: LevelFi
 /// a stable communication channel between the proxy and the running desktop application.
 ///
 /// Browser extension <-[native messaging]-> proxy <-[ipc]-> desktop
-///
 // FIXME: Remove unwraps! They panic and terminate the whole application.
 #[allow(clippy::unwrap_used)]
 #[tokio::main(flavor = "current_thread")]
 async fn main() {
-    #[cfg(target_os = "windows")]
-    let should_foreground = windows::allow_foreground();
-
-    let sock_path = desktop_core::ipc::path("bitwarden");
+    let sock_path = desktop_core::ipc::path("bw");
 
     let log_path = {
         let mut path = sock_path.clone();
@@ -65,20 +69,17 @@ async fn main() {
         path
     };
 
-    let level = std::env::var("PROXY_LOG_LEVEL")
-        .ok()
-        .and_then(|s| s.parse().ok())
-        .unwrap_or(LevelFilter::Info);
-
-    init_logging(&log_path, level, LevelFilter::Info);
+    init_logging(&log_path, LevelFilter::INFO, LevelFilter::INFO);
 
     info!("Starting Bitwarden IPC Proxy.");
 
     // Different browsers send different arguments when the app starts:
     //
     // Firefox:
-    // - The complete path to the app manifest. (in the form `/Users/<user>/Library/.../Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json`)
-    // - (in Firefox 55+) the ID (as given in the manifest.json) of the add-on that started it (in the form `{[UUID]}`).
+    // - The complete path to the app manifest. (in the form
+    //   `/Users/<user>/Library/.../Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json`)
+    // - (in Firefox 55+) the ID (as given in the manifest.json) of the add-on that started it (in
+    //   the form `{[UUID]}`).
     //
     // Chrome on Windows:
     // - Origin of the extension that started it (in the form `chrome-extension://[ID]`).
@@ -88,9 +89,10 @@ async fn main() {
     // - Origin of the extension that started it (in the form `chrome-extension://[ID]`).
 
     let args: Vec<_> = std::env::args().skip(1).collect();
-    info!("Process args: {:?}", args);
+    info!(?args, "Process args");
 
-    // Setup two channels, one for sending messages to the desktop application (`out`) and one for receiving messages from the desktop application (`in`)
+    // Setup two channels, one for sending messages to the desktop application (`out`) and one for
+    // receiving messages from the desktop application (`in`)
     let (in_send, in_recv) = tokio::sync::mpsc::channel(MESSAGE_CHANNEL_BUFFER);
     let (out_send, mut out_recv) = tokio::sync::mpsc::channel(MESSAGE_CHANNEL_BUFFER);
 
@@ -123,12 +125,12 @@ async fn main() {
                         info!("IPC client finished successfully.");
                         std::process::exit(0);
                     }
-                    Ok(Err(e)) => {
-                        error!("IPC client connection error: {}", e);
+                    Ok(Err(error)) => {
+                        error!(error, "IPC client connection error.");
                         std::process::exit(1);
                     }
-                    Err(e) => {
-                        error!("IPC client spawn error: {}", e);
+                    Err(error) => {
+                        error!(%error, "IPC client spawn error.");
                         std::process::exit(1);
                     }
                 }
@@ -138,7 +140,7 @@ async fn main() {
             msg = out_recv.recv() => {
                 match msg {
                     Some(msg) => {
-                        debug!("OUT: {}", msg);
+                        debug!(msg, "OUT");
                         stdout.send(msg.into()).await.unwrap();
                     }
                     None => {
@@ -150,17 +152,14 @@ async fn main() {
 
             // Listen to stdin and send messages to ipc processor.
             msg = stdin.next() => {
-                #[cfg(target_os = "windows")]
-                should_foreground.store(true, std::sync::atomic::Ordering::Relaxed);
-
                 match msg {
                     Some(Ok(msg)) => {
-                        let m = String::from_utf8(msg.to_vec()).unwrap();
-                        debug!("IN: {}", m);
-                        in_send.send(m).await.unwrap();
+                        let msg = String::from_utf8(msg.to_vec()).unwrap();
+                        debug!(msg, "IN");
+                        in_send.send(msg).await.unwrap();
                     }
-                    Some(Err(e)) => {
-                        error!("Error parsing input: {}", e);
+                    Some(Err(error)) => {
+                        error!(%error, "Error parsing input.");
                         std::process::exit(1);
                     }
                     None => {
diff --git a/apps/desktop/desktop_native/proxy/src/windows.rs b/apps/desktop/desktop_native/proxy/src/windows.rs
deleted file mode 100644
index cb0656fc7f8..00000000000
--- a/apps/desktop/desktop_native/proxy/src/windows.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::sync::{
-    atomic::{AtomicBool, Ordering},
-    Arc,
-};
-
-pub fn allow_foreground() -> Arc<AtomicBool> {
-    let should_foreground = Arc::new(AtomicBool::new(false));
-    let should_foreground_clone = should_foreground.clone();
-    let _ = std::thread::spawn(move || loop {
-        if !should_foreground_clone.load(Ordering::Relaxed) {
-            std::thread::sleep(std::time::Duration::from_millis(100));
-            continue;
-        }
-        should_foreground_clone.store(false, Ordering::Relaxed);
-
-        for _ in 0..60 {
-            desktop_core::biometric::windows_focus::focus_security_prompt();
-            std::thread::sleep(std::time::Duration::from_millis(1000));
-        }
-    });
-
-    should_foreground
-}
diff --git a/apps/desktop/desktop_native/rustfmt.toml b/apps/desktop/desktop_native/rustfmt.toml
new file mode 100644
index 00000000000..bb3baeccd76
--- /dev/null
+++ b/apps/desktop/desktop_native/rustfmt.toml
@@ -0,0 +1,7 @@
+# Wrap comments and increase the width of comments to 100
+comment_width = 100
+wrap_comments = true
+
+# Sort and group imports
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
diff --git a/apps/desktop/desktop_native/windows_plugin_authenticator/src/lib.rs b/apps/desktop/desktop_native/windows_plugin_authenticator/src/lib.rs
index 2e4f453d8f0..893fdf765fc 100644
--- a/apps/desktop/desktop_native/windows_plugin_authenticator/src/lib.rs
+++ b/apps/desktop/desktop_native/windows_plugin_authenticator/src/lib.rs
@@ -2,11 +2,12 @@
 #![allow(non_snake_case)]
 #![allow(non_camel_case_types)]
 
-use std::ffi::c_uchar;
-use std::ptr;
-use windows::Win32::Foundation::*;
-use windows::Win32::System::Com::*;
-use windows::Win32::System::LibraryLoader::*;
+use std::{ffi::c_uchar, ptr};
+
+use windows::Win32::{
+    Foundation::*,
+    System::{Com::*, LibraryLoader::*},
+};
 use windows_core::*;
 
 mod pluginauthenticator;
diff --git a/apps/desktop/electron-builder.beta.json b/apps/desktop/electron-builder.beta.json
new file mode 100644
index 00000000000..630a956560d
--- /dev/null
+++ b/apps/desktop/electron-builder.beta.json
@@ -0,0 +1,136 @@
+{
+  "extraMetadata": {
+    "name": "bitwarden-beta"
+  },
+  "productName": "Bitwarden Beta",
+  "appId": "com.bitwarden.desktop.beta",
+  "buildDependenciesFromSource": true,
+  "copyright": "Copyright © 2015-2025 Bitwarden Inc.",
+  "directories": {
+    "buildResources": "resources",
+    "output": "dist",
+    "app": "build"
+  },
+  "afterSign": "scripts/after-sign.js",
+  "afterPack": "scripts/after-pack.js",
+  "asarUnpack": ["**/*.node"],
+  "files": [
+    "**/*",
+    "!**/node_modules/@bitwarden/desktop-napi/**/*",
+    "**/node_modules/@bitwarden/desktop-napi/index.js",
+    "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
+  ],
+  "electronVersion": "36.8.1",
+  "generateUpdatesFilesForAllChannels": true,
+  "publish": {
+    "provider": "generic",
+    "url": "https://artifacts.bitwarden.com/desktop"
+  },
+  "win": {
+    "electronUpdaterCompatibility": ">=0.0.1",
+    "target": ["portable", "nsis-web", "appx"],
+    "signtoolOptions": {
+      "sign": "./sign.js"
+    },
+    "extraFiles": [
+      {
+        "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}.exe",
+        "to": "desktop_proxy.exe"
+      },
+      {
+        "from": "desktop_native/dist/bitwarden_chromium_import_helper.${platform}-${arch}.exe",
+        "to": "bitwarden_chromium_import_helper.exe"
+      }
+    ]
+  },
+  "nsisWeb": {
+    "oneClick": false,
+    "perMachine": false,
+    "allowToChangeInstallationDirectory": false,
+    "artifactName": "Bitwarden-Beta-Installer-${version}.${ext}",
+    "uninstallDisplayName": "${productName}",
+    "deleteAppDataOnUninstall": true,
+    "include": "installer.nsh"
+  },
+  "portable": {
+    "artifactName": "Bitwarden-Beta-Portable-${version}.${ext}"
+  },
+  "appx": {
+    "artifactName": "Bitwarden-Beta-${version}-${arch}.${ext}",
+    "backgroundColor": "#175DDC",
+    "applicationId": "BitwardenBeta",
+    "identityName": "8bitSolutionsLLC.BitwardenBeta",
+    "publisher": "CN=14D52771-DE3C-4886-B8BF-825BA7690418",
+    "publisherDisplayName": "Bitwarden Inc",
+    "languages": [
+      "en-US",
+      "af",
+      "ar",
+      "az-latn",
+      "be",
+      "bg",
+      "bn",
+      "bs",
+      "ca",
+      "cs",
+      "cy",
+      "da",
+      "de",
+      "el",
+      "en-gb",
+      "en-in",
+      "es",
+      "et",
+      "eu",
+      "fa",
+      "fi",
+      "fil",
+      "fr",
+      "gl",
+      "he",
+      "hi",
+      "hr",
+      "hu",
+      "id",
+      "it",
+      "ja",
+      "ka",
+      "km",
+      "kn",
+      "ko",
+      "lt",
+      "lv",
+      "ml",
+      "mr",
+      "nb",
+      "ne",
+      "nl",
+      "nn",
+      "or",
+      "pl",
+      "pt-br",
+      "pt-pt",
+      "ro",
+      "ru",
+      "si",
+      "sk",
+      "sl",
+      "sr-cyrl",
+      "sv",
+      "ta",
+      "te",
+      "th",
+      "tr",
+      "uk",
+      "vi",
+      "zh-cn",
+      "zh-tw"
+    ]
+  },
+  "protocols": [
+    {
+      "name": "Bitwarden",
+      "schemes": ["bitwarden"]
+    }
+  ]
+}
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 4d0dac1242a..6e89799e9c4 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -20,7 +20,7 @@
     "**/node_modules/@bitwarden/desktop-napi/index.js",
     "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
   ],
-  "electronVersion": "36.8.1",
+  "electronVersion": "37.7.0",
   "generateUpdatesFilesForAllChannels": true,
   "publish": {
     "provider": "generic",
@@ -96,6 +96,10 @@
       {
         "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}.exe",
         "to": "desktop_proxy.exe"
+      },
+      {
+        "from": "desktop_native/dist/bitwarden_chromium_import_helper.${platform}-${arch}.exe",
+        "to": "bitwarden_chromium_import_helper.exe"
       }
     ]
   },
@@ -106,9 +110,13 @@
       {
         "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}",
         "to": "desktop_proxy"
+      },
+      {
+        "from": "desktop_native/dist/libprocess_isolation.so",
+        "to": "libprocess_isolation.so"
       }
     ],
-    "target": ["deb", "freebsd", "rpm", "AppImage", "snap"],
+    "target": ["deb", "rpm", "AppImage", "snap"],
     "desktop": {
       "entry": {
         "Name": "Bitwarden",
@@ -244,9 +252,6 @@
     "artifactName": "${productName}-${version}-${arch}.${ext}",
     "fpm": ["--rpm-rpmbuild-define", "_build_id_links none"]
   },
-  "freebsd": {
-    "artifactName": "${productName}-${version}-${arch}.${ext}"
-  },
   "snap": {
     "summary": "Bitwarden is a secure and free password manager for all of your devices.",
     "description": "Password Manager\n**Installation**\nBitwarden requires access to the `password-manager-service`. Please enable it through permissions or by running `sudo snap connect bitwarden:password-manager-service` after installation. See https://btwrdn.com/install-snap for details.",
diff --git a/apps/desktop/fastlane/fastfile b/apps/desktop/fastlane/fastfile
index 08c35dfa7b3..134d18563de 100644
--- a/apps/desktop/fastlane/fastfile
+++ b/apps/desktop/fastlane/fastfile
@@ -21,11 +21,13 @@ platform :mac do
       .split('.')
       .map(&:strip)
       .reject(&:empty?)
-      .map { |item| "• #{item}" }
+      .map { |item| "• #{item.gsub(/\A(?:•|\u2022)\s*/, '')}" }
       .join("\n")
     
-    UI.message("Original changelog: #{changelog[0,100]}#{changelog.length > 100 ? '...' : ''}")
-    UI.message("Formatted changelog: #{formatted_changelog[0,100]}#{formatted_changelog.length > 100 ? '...' : ''}")
+    UI.message("Original changelog: ")
+    UI.message("#{changelog}")
+    UI.message("Formatted changelog: ")
+    UI.message("#{formatted_changelog}")
     
     # Create release notes directories and files for all locales
     APP_CONFIG[:locales].each do |locale|
diff --git a/apps/desktop/installer.nsh b/apps/desktop/installer.nsh
index f8939423c8d..3fe8a69b089 100644
--- a/apps/desktop/installer.nsh
+++ b/apps/desktop/installer.nsh
@@ -7,3 +7,14 @@
         ${endif}
     ${endif}
 !macroend
+
+# When the user is uninstalling the app, remove the auto-start registry entries
+!macro customUnInstall
+    ${ifNot} ${isUpdated}
+        DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "electron.app.${PRODUCT_NAME}"
+        DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "electron.app.${PRODUCT_NAME}"
+
+        DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run" "electron.app.${PRODUCT_NAME}"
+        DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run" "electron.app.${PRODUCT_NAME}"
+    ${endIf}
+!macroend
diff --git a/apps/desktop/native-messaging-test-runner/package-lock.json b/apps/desktop/native-messaging-test-runner/package-lock.json
index 718bf7efb39..9ad1ffb3ec0 100644
--- a/apps/desktop/native-messaging-test-runner/package-lock.json
+++ b/apps/desktop/native-messaging-test-runner/package-lock.json
@@ -15,11 +15,11 @@
         "@bitwarden/storage-core": "file:../../../libs/storage-core",
         "module-alias": "2.2.3",
         "ts-node": "10.9.2",
-        "uuid": "11.1.0",
+        "uuid": "13.0.0",
         "yargs": "18.0.0"
       },
       "devDependencies": {
-        "@types/node": "22.15.3",
+        "@types/node": "22.19.1",
         "typescript": "5.4.2"
       }
     },
@@ -117,10 +117,11 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.15.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
-      "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
+      "version": "22.19.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.1.tgz",
+      "integrity": "sha512-LCCV0HdSZZZb34qifBsyWlUmok6W7ouER+oQIGBScS8EsZsQbrtFTUrDX4hOl+CS6p7cnNC4td+qrSVGSCTUfQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -336,6 +337,7 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
       "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -351,16 +353,16 @@
       "license": "MIT"
     },
     "node_modules/uuid": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
-      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
+      "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
       ],
       "license": "MIT",
       "bin": {
-        "uuid": "dist/esm/bin/uuid"
+        "uuid": "dist-node/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache-lib": {
diff --git a/apps/desktop/native-messaging-test-runner/package.json b/apps/desktop/native-messaging-test-runner/package.json
index 35a110c3958..21a6ba3626a 100644
--- a/apps/desktop/native-messaging-test-runner/package.json
+++ b/apps/desktop/native-messaging-test-runner/package.json
@@ -20,11 +20,11 @@
     "@bitwarden/logging": "dist/libs/logging/src",
     "module-alias": "2.2.3",
     "ts-node": "10.9.2",
-    "uuid": "11.1.0",
+    "uuid": "13.0.0",
     "yargs": "18.0.0"
   },
   "devDependencies": {
-    "@types/node": "22.15.3",
+    "@types/node": "22.19.1",
     "typescript": "5.4.2"
   },
   "_moduleAliases": {
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index fc3e7d0cad3..bb8118cb7eb 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.9.1",
+  "version": "2025.12.0",
   "keywords": [
     "bitwarden",
     "password",
@@ -21,25 +21,26 @@
     "build-native": "cd desktop_native && node build.js",
     "build": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\" \"npm run build:preload\"",
     "build:dev": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\" \"npm run build:preload:dev\"",
-    "build:preload": "cross-env NODE_ENV=production webpack --config webpack.preload.js",
-    "build:preload:dev": "cross-env NODE_ENV=development webpack --config webpack.preload.js",
-    "build:preload:watch": "cross-env NODE_ENV=development webpack --config webpack.preload.js --watch",
+    "build:preload": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name preload",
+    "build:preload:dev": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name preload",
+    "build:preload:watch": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name preload --watch",
     "build:macos-extension:mac": "./desktop_native/macos_provider/build.sh && node scripts/build-macos-extension.js mac",
     "build:macos-extension:mas": "./desktop_native/macos_provider/build.sh && node scripts/build-macos-extension.js mas",
     "build:macos-extension:masdev": "./desktop_native/macos_provider/build.sh && node scripts/build-macos-extension.js mas-dev",
-    "build:main": "cross-env NODE_ENV=production webpack --config webpack.main.js",
-    "build:main:dev": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.main.js",
-    "build:main:watch": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.main.js --watch",
-    "build:renderer": "cross-env NODE_ENV=production webpack --config webpack.renderer.js",
-    "build:renderer:dev": "cross-env NODE_ENV=development webpack --config webpack.renderer.js",
-    "build:renderer:watch": "cross-env NODE_ENV=development webpack --config webpack.renderer.js --watch",
+    "build:main": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name main",
+    "build:main:dev": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.config.js --config-name main",
+    "build:main:watch": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.config.js --config-name main --watch",
+    "build:renderer": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name renderer",
+    "build:renderer:dev": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name renderer",
+    "build:renderer:watch": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name renderer --watch",
     "electron": "node ./scripts/start.js",
     "electron:ignore": "node ./scripts/start.js --ignore-certificate-errors",
+    "flatpak:dev": "npm run clean:dist && electron-builder --dir -p never && flatpak-builder --force-clean --install --user ../../.flatpak/ ./resources/com.bitwarden.desktop.devel.yaml && flatpak run com.bitwarden.desktop",
     "clean:dist": "rimraf ./dist",
     "pack:dir": "npm run clean:dist && electron-builder --dir -p never",
-    "pack:lin:flatpak": "npm run clean:dist && electron-builder --dir -p never && flatpak-builder  --repo=build/.repo build/.flatpak  ./resources/com.bitwarden.desktop.devel.yaml --install-deps-from=flathub --force-clean &&  flatpak build-bundle ./build/.repo/ ./dist/com.bitwarden.desktop.flatpak com.bitwarden.desktop",
-    "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never && export SNAP_FILE=$(realpath ./dist/bitwarden_*.snap) && unsquashfs -d ./dist/tmp-snap/ $SNAP_FILE && mkdir -p ./dist/tmp-snap/meta/polkit/ && cp ./resources/com.bitwarden.desktop.policy  ./dist/tmp-snap/meta/polkit/polkit.com.bitwarden.desktop.policy && rm $SNAP_FILE && snap pack --compression=lzo ./dist/tmp-snap/ && mv ./*.snap ./dist/ && rm -rf ./dist/tmp-snap/",
-    "pack:lin:arm64": "npm run clean:dist && electron-builder --dir -p never && tar -czvf ./dist/bitwarden_desktop_arm64.tar.gz -C ./dist/linux-arm64-unpacked/ .",
+    "pack:lin:flatpak": "flatpak-builder --repo=../../.flatpak-repo ../../.flatpak  ./resources/com.bitwarden.desktop.devel.yaml --install-deps-from=flathub --force-clean &&  flatpak build-bundle ../../.flatpak-repo/ ./dist/com.bitwarden.desktop.flatpak com.bitwarden.desktop",
+    "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never && export SNAP_FILE=$(realpath ./dist/bitwarden_*.snap) && unsquashfs -d ./dist/tmp-snap/ $SNAP_FILE && mkdir -p ./dist/tmp-snap/meta/polkit/ && cp ./resources/com.bitwarden.desktop.policy  ./dist/tmp-snap/meta/polkit/polkit.com.bitwarden.desktop.policy && rm $SNAP_FILE && snap pack --compression=lzo ./dist/tmp-snap/ && mv ./*.snap ./dist/ && rm -rf ./dist/tmp-snap/ && tar -czvf ./dist/bitwarden_desktop_x64.tar.gz -C ./dist/linux-unpacked/ .",
+    "pack:lin:arm64": "npm run clean:dist && electron-builder --linux --arm64 -p never && export SNAP_FILE=$(realpath ./dist/bitwarden_*.snap) && unsquashfs -d ./dist/tmp-snap/ $SNAP_FILE && mkdir -p ./dist/tmp-snap/meta/polkit/ && cp ./resources/com.bitwarden.desktop.policy  ./dist/tmp-snap/meta/polkit/polkit.com.bitwarden.desktop.policy && rm $SNAP_FILE && snap pack --compression=lzo ./dist/tmp-snap/ && mv ./*.snap ./dist/ && rm -rf ./dist/tmp-snap/ && tar -czvf ./dist/bitwarden_desktop_arm64.tar.gz -C ./dist/linux-arm64-unpacked/ .",
     "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never",
     "pack:mac:with-extension": "npm run clean:dist && npm run build:macos-extension:mac && electron-builder --mac --universal -p never",
     "pack:mac:arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never",
@@ -48,6 +49,7 @@
     "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never",
     "pack:mac:masdev:with-extension": "npm run clean:dist && npm run build:macos-extension:masdev && electron-builder --mac mas-dev --universal -p never",
     "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.signtoolOptions.certificateSubjectName=\"8bit Solutions LLC\"",
+    "pack:win:beta": "npm run clean:dist && electron-builder --config electron-builder.beta.json --win --x64 --arm64 --ia32 -p never -c.win.signtoolOptions.certificateSubjectName=\"8bit Solutions LLC\"",
     "pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never",
     "dist:dir": "npm run build && npm run pack:dir",
     "dist:lin": "npm run build && npm run pack:lin",
diff --git a/apps/desktop/project.json b/apps/desktop/project.json
new file mode 100644
index 00000000000..98f33864046
--- /dev/null
+++ b/apps/desktop/project.json
@@ -0,0 +1,115 @@
+{
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "name": "desktop",
+  "projectType": "application",
+  "sourceRoot": "apps/desktop/src",
+  "tags": ["scope:desktop", "type:app"],
+  "targets": {
+    "build-native": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "cd desktop_native && node build.js",
+        "cwd": "apps/desktop"
+      }
+    },
+    "build-main": {
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/dist/apps/desktop"],
+      "options": {
+        "command": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name main",
+        "cwd": "apps/desktop"
+      },
+      "configurations": {
+        "development": {
+          "command": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name main"
+        },
+        "production": {
+          "command": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name main"
+        }
+      }
+    },
+    "build-preload": {
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/dist/apps/desktop"],
+      "options": {
+        "command": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name preload",
+        "cwd": "apps/desktop"
+      },
+      "configurations": {
+        "development": {
+          "command": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name preload"
+        },
+        "production": {
+          "command": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name preload"
+        }
+      }
+    },
+    "build-renderer": {
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/dist/apps/desktop"],
+      "options": {
+        "command": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name renderer",
+        "cwd": "apps/desktop"
+      },
+      "configurations": {
+        "development": {
+          "command": "cross-env NODE_ENV=development webpack --config webpack.config.js --config-name renderer"
+        },
+        "production": {
+          "command": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name renderer"
+        }
+      }
+    },
+    "build": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build-native"],
+      "outputs": ["{workspaceRoot}/dist/apps/desktop"],
+      "options": {
+        "parallel": true,
+        "commands": [
+          "nx run desktop:build-main",
+          "nx run desktop:build-preload",
+          "nx run desktop:build-renderer"
+        ]
+      },
+      "configurations": {
+        "development": {
+          "commands": [
+            "nx run desktop:build-main --configuration=development",
+            "nx run desktop:build-preload --configuration=development",
+            "nx run desktop:build-renderer --configuration=development"
+          ]
+        },
+        "production": {
+          "commands": [
+            "nx run desktop:build-main --configuration=production",
+            "nx run desktop:build-preload --configuration=production",
+            "nx run desktop:build-renderer --configuration=production"
+          ]
+        }
+      }
+    },
+    "serve": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build-native"],
+      "options": {
+        "command": "node scripts/nx-serve.js",
+        "cwd": "apps/desktop"
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/apps/desktop"],
+      "options": {
+        "jestConfig": "apps/desktop/jest.config.js"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/desktop/**/*.ts", "apps/desktop/**/*.html"]
+      }
+    }
+  }
+}
diff --git a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
index 858fb6e1af2..e72df98e22b 100644
--- a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
+++ b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
@@ -46,4 +46,6 @@ modules:
         commands:
           - ulimit -c 0
           - export TMPDIR="$XDG_RUNTIME_DIR/app/$FLATPAK_ID"
+          - export ZYPAK_LD_PRELOAD="/app/bin/libprocess_isolation.so"
+          - export PROCESS_ISOLATION_LD_PRELOAD="/app/bin/libprocess_isolation.so"
           - exec zypak-wrapper /app/bin/bitwarden-app "$@"
diff --git a/apps/desktop/resources/linux-wrapper.sh b/apps/desktop/resources/linux-wrapper.sh
index dd53eb9811c..3c5d16c3a3d 100644
--- a/apps/desktop/resources/linux-wrapper.sh
+++ b/apps/desktop/resources/linux-wrapper.sh
@@ -7,9 +7,8 @@ ulimit -c 0
 RAW_PATH=$(readlink -f "$0")
 APP_PATH=$(dirname $RAW_PATH)
 
-# force use of base image libdus in snap
-if [ -e "/usr/lib/x86_64-linux-gnu/libdbus-1.so.3" ]
-then
+# force use of base image libdbus in snap
+if [ -e "/usr/lib/x86_64-linux-gnu/libdbus-1.so.3" ]; then
   export LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libdbus-1.so.3"
 fi
 
diff --git a/apps/desktop/scripts/nx-serve.js b/apps/desktop/scripts/nx-serve.js
new file mode 100644
index 00000000000..b92a045f8e8
--- /dev/null
+++ b/apps/desktop/scripts/nx-serve.js
@@ -0,0 +1,42 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
+const path = require("path");
+
+const concurrently = require("concurrently");
+const rimraf = require("rimraf");
+const args = process.argv.splice(2);
+const outputPath = path.resolve(__dirname, "../../../dist/apps/desktop");
+
+rimraf.sync(outputPath);
+require("fs").mkdirSync(outputPath, { recursive: true });
+
+concurrently(
+  [
+    {
+      name: "Main",
+      command: `cross-env NODE_ENV=development OUTPUT_PATH=${outputPath} webpack --config webpack.config.js --config-name main --watch`,
+      prefixColor: "yellow",
+    },
+    {
+      name: "Prel",
+      command: `cross-env NODE_ENV=development OUTPUT_PATH=${outputPath} webpack --config webpack.config.js --config-name preload --watch`,
+      prefixColor: "magenta",
+    },
+    {
+      name: "Rend",
+      command: `cross-env NODE_ENV=development OUTPUT_PATH=${outputPath} webpack --config webpack.config.js --config-name renderer --watch`,
+      prefixColor: "cyan",
+    },
+    {
+      name: "Elec",
+      command: `npx wait-on ${outputPath}/main.js ${outputPath}/index.html && npx electron --no-sandbox --inspect=5858 ${args.join(
+        " ",
+      )} ${outputPath} --watch`,
+      prefixColor: "green",
+    },
+  ],
+  {
+    prefix: "name",
+    outputStream: process.stdout,
+    killOthers: ["success", "failure"],
+  },
+);
diff --git a/apps/desktop/sign.js b/apps/desktop/sign.js
index f0110ea195b..6a42666c46f 100644
--- a/apps/desktop/sign.js
+++ b/apps/desktop/sign.js
@@ -13,7 +13,7 @@ exports.default = async function (configuration) {
         `-fd ${configuration.hash} ` +
         `-du ${configuration.site} ` +
         `-tr http://timestamp.digicert.com ` +
-        `${configuration.path}`,
+        `"${configuration.path}"`,
       {
         stdio: "inherit",
       },
diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index a0380a8b5ce..8abd84ee39c 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -31,36 +31,50 @@
             </h2>
             <ng-container *ngIf="showSecurity">
               <bit-section disableMargin>
-                <bit-section-header>
-                  <h2 bitTypography="h6">{{ "vaultTimeoutHeader" | i18n }}</h2>
-                </bit-section-header>
+                @if (consolidatedSessionTimeoutComponent$ | async) {
+                  <bit-section-header>
+                    <h2 bitTypography="h6">{{ "sessionTimeoutHeader" | i18n }}</h2>
+                  </bit-section-header>
 
-                <auth-vault-timeout-input
-                  [vaultTimeoutOptions]="vaultTimeoutOptions"
-                  [formControl]="form.controls.vaultTimeout"
-                  ngDefaultControl
-                >
-                </auth-vault-timeout-input>
+                  <bit-session-timeout-settings
+                    [refreshTimeoutActionSettings]="refreshTimeoutSettings$"
+                  />
+                } @else {
+                  <bit-section-header>
+                    <h2 bitTypography="h6">{{ "vaultTimeoutHeader" | i18n }}</h2>
+                  </bit-section-header>
 
-                <bit-form-field disableMargin>
-                  <bit-label for="vaultTimeoutAction">{{ "vaultTimeoutAction1" | i18n }}</bit-label>
-                  <bit-select id="vaultTimeoutAction" formControlName="vaultTimeoutAction">
-                    <bit-option
-                      *ngFor="let action of availableVaultTimeoutActions"
-                      [value]="action"
-                      [label]="action | i18n"
+                  <bit-session-timeout-input
+                    [vaultTimeoutOptions]="vaultTimeoutOptions"
+                    [formControl]="form.controls.vaultTimeout"
+                    ngDefaultControl
+                  >
+                  </bit-session-timeout-input>
+
+                  <bit-form-field disableMargin>
+                    <bit-label for="vaultTimeoutAction">{{
+                      "vaultTimeoutAction1" | i18n
+                    }}</bit-label>
+                    <bit-select id="vaultTimeoutAction" formControlName="vaultTimeoutAction">
+                      <bit-option
+                        *ngFor="let action of availableVaultTimeoutActions"
+                        [value]="action"
+                        [label]="action | i18n"
+                      >
+                      </bit-option>
+                    </bit-select>
+
+                    <bit-hint
+                      *ngIf="!availableVaultTimeoutActions.includes(VaultTimeoutAction.Lock)"
                     >
-                    </bit-option>
-                  </bit-select>
+                      {{ "unlockMethodNeededToChangeTimeoutActionDesc" | i18n }}<br />
+                    </bit-hint>
+                  </bit-form-field>
 
-                  <bit-hint *ngIf="!availableVaultTimeoutActions.includes(VaultTimeoutAction.Lock)">
-                    {{ "unlockMethodNeededToChangeTimeoutActionDesc" | i18n }}<br />
+                  <bit-hint *ngIf="hasVaultTimeoutPolicy" class="tw-mt-4">
+                    {{ "vaultTimeoutPolicyAffectingOptions" | i18n }}
                   </bit-hint>
-                </bit-form-field>
-
-                <bit-hint *ngIf="hasVaultTimeoutPolicy" class="tw-mt-4">
-                  {{ "vaultTimeoutPolicyAffectingOptions" | i18n }}
-                </bit-hint>
+                }
               </bit-section>
               <div class="form-group tw-mt-4" *ngIf="(pinEnabled$ | async) || this.form.value.pin">
                 <div class="checkbox">
@@ -81,6 +95,30 @@
                   "additionalTouchIdSettings" | i18n
                 }}</small>
               </div>
+              <div
+                class="form-group"
+                *ngIf="
+                  supportsBiometric &&
+                  form.value.biometric &&
+                  isWindows &&
+                  (userHasMasterPassword || (form.value.pin && userHasPinSet))
+                "
+              >
+                <div class="checkbox form-group-child">
+                  <label for="requireMasterPasswordOnAppRestart">
+                    <input
+                      id="requireMasterPasswordOnAppRestart"
+                      type="checkbox"
+                      formControlName="requireMasterPasswordOnAppRestart"
+                    />
+                    @if (pinEnabled$ | async) {
+                      {{ "requireMasterPasswordOrPinOnAppRestart" | i18n }}
+                    } @else {
+                      {{ "requireMasterPasswordOnAppRestart" | i18n }}
+                    }
+                  </label>
+                </div>
+              </div>
               <div
                 class="form-group"
                 *ngIf="supportsBiometric && this.form.value.biometric && this.isMac"
@@ -350,14 +388,16 @@
                 </div>
                 <small class="help-block" *ngIf="form.value.enableAutotype">
                   <b>{{ "important" | i18n }}</b>
-                  {{ "enableAutotypeDescriptionTransitionKey" | i18n }}
-                  <span
+                  {{ "enableAutotypeShortcutDescription" | i18n }}
+                  <a
                     class="settings-link"
+                    tabindex="0"
                     *ngIf="this.form.value.enableAutotype"
                     (click)="saveAutotypeShortcut()"
+                    (keydown.enter)="saveAutotypeShortcut(); $event.preventDefault()"
                   >
                     {{ "editShortcut" | i18n }}
-                  </span></small
+                  </a></small
                 >
               </div>
               <div class="form-group">
diff --git a/apps/desktop/src/app/accounts/settings.component.spec.ts b/apps/desktop/src/app/accounts/settings.component.spec.ts
index a791fd7b9a4..a424f230778 100644
--- a/apps/desktop/src/app/accounts/settings.component.spec.ts
+++ b/apps/desktop/src/app/accounts/settings.component.spec.ts
@@ -30,6 +30,7 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid
 import { ThemeType } from "@bitwarden/common/platform/enums";
 import { MessageSender } from "@bitwarden/common/platform/messaging";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -73,6 +74,9 @@ describe("SettingsComponent", () => {
   const desktopAutotypeService = mock<DesktopAutotypeService>();
   const billingAccountProfileStateService = mock<BillingAccountProfileStateService>();
   const configService = mock<ConfigService>();
+  const userVerificationService = mock<UserVerificationService>();
+
+  const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64));
 
   beforeEach(async () => {
     jest.clearAllMocks();
@@ -92,6 +96,7 @@ describe("SettingsComponent", () => {
     };
 
     i18nService.supportedTranslationLocales = [];
+    i18nService.t.mockImplementation((key: string) => key);
 
     await TestBed.configureTestingModule({
       imports: [],
@@ -124,7 +129,7 @@ describe("SettingsComponent", () => {
         { provide: PolicyService, useValue: policyService },
         { provide: StateService, useValue: mock<StateService>() },
         { provide: ThemeStateService, useValue: themeStateService },
-        { provide: UserVerificationService, useValue: mock<UserVerificationService>() },
+        { provide: UserVerificationService, useValue: userVerificationService },
         { provide: VaultTimeoutSettingsService, useValue: vaultTimeoutSettingsService },
         { provide: ValidationService, useValue: validationService },
         { provide: MessagingService, useValue: messagingService },
@@ -153,6 +158,7 @@ describe("SettingsComponent", () => {
     component = fixture.componentInstance;
     fixture.detectChanges();
 
+    desktopBiometricsService.hasPersistentKey.mockResolvedValue(false);
     vaultTimeoutSettingsService.getVaultTimeoutByUserId$.mockReturnValue(
       of(VaultTimeoutStringType.OnLocked),
     );
@@ -185,7 +191,7 @@ describe("SettingsComponent", () => {
     desktopAutotypeService.autotypeEnabledUserSetting$ = of(false);
     desktopAutotypeService.autotypeKeyboardShortcut$ = of(["Control", "Shift", "B"]);
     billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(false));
-    configService.getFeatureFlag$.mockReturnValue(of(true));
+    configService.getFeatureFlag$.mockReturnValue(of(false));
   });
 
   afterEach(() => {
@@ -302,37 +308,74 @@ describe("SettingsComponent", () => {
         component = fixture.componentInstance;
       });
 
-      it("require password or pin on app start not visible when RemoveUnlockWithPin policy is disabled and pin set and windows desktop", async () => {
-        const policy = new Policy();
-        policy.type = PolicyType.RemoveUnlockWithPin;
-        policy.enabled = false;
-        policyService.policiesByType$.mockReturnValue(of([policy]));
-        pinServiceAbstraction.isPinSet.mockResolvedValue(true);
+      test.each([true, false])(
+        `correct message display for require MP/PIN on app restart when pin is set, windows desktop, and policy is %s`,
+        async (policyEnabled) => {
+          const policy = new Policy();
+          policy.type = PolicyType.RemoveUnlockWithPin;
+          policy.enabled = policyEnabled;
+          policyService.policiesByType$.mockReturnValue(of([policy]));
+          platformUtilsService.getDevice.mockReturnValue(DeviceType.WindowsDesktop);
+          pinServiceAbstraction.isPinSet.mockResolvedValue(true);
 
-        await component.ngOnInit();
-        fixture.detectChanges();
+          await component.ngOnInit();
+          fixture.detectChanges();
 
-        const requirePasswordOnStartLabelElement = fixture.debugElement.query(
-          By.css("label[for='requirePasswordOnStart']"),
-        );
-        expect(requirePasswordOnStartLabelElement).toBeNull();
+          const textNodes = checkRequireMasterPasswordOnAppRestartElement(fixture);
+
+          if (policyEnabled) {
+            expect(textNodes).toContain("requireMasterPasswordOnAppRestart");
+          } else {
+            expect(textNodes).toContain("requireMasterPasswordOrPinOnAppRestart");
+          }
+        },
+      );
+
+      describe("users without a master password", () => {
+        beforeEach(() => {
+          userVerificationService.hasMasterPassword.mockResolvedValue(false);
+        });
+
+        it("displays require MP/PIN on app restart checkbox when pin is set", async () => {
+          pinServiceAbstraction.isPinSet.mockResolvedValue(true);
+
+          await component.ngOnInit();
+          fixture.detectChanges();
+
+          checkRequireMasterPasswordOnAppRestartElement(fixture);
+        });
+
+        it("does not display require MP/PIN on app restart checkbox when pin is not set", async () => {
+          pinServiceAbstraction.isPinSet.mockResolvedValue(false);
+
+          await component.ngOnInit();
+          fixture.detectChanges();
+
+          const requireMasterPasswordOnAppRestartLabelElement = fixture.debugElement.query(
+            By.css("label[for='requireMasterPasswordOnAppRestart']"),
+          );
+          expect(requireMasterPasswordOnAppRestartLabelElement).toBeNull();
+        });
       });
 
-      it("require password on app start not visible when RemoveUnlockWithPin policy is enabled and pin set and windows desktop", async () => {
-        const policy = new Policy();
-        policy.type = PolicyType.RemoveUnlockWithPin;
-        policy.enabled = true;
-        policyService.policiesByType$.mockReturnValue(of([policy]));
-        pinServiceAbstraction.isPinSet.mockResolvedValue(true);
-
-        await component.ngOnInit();
-        fixture.detectChanges();
-
-        const requirePasswordOnStartLabelElement = fixture.debugElement.query(
-          By.css("label[for='requirePasswordOnStart']"),
+      function checkRequireMasterPasswordOnAppRestartElement(
+        fixture: ComponentFixture<SettingsComponent>,
+      ) {
+        const requireMasterPasswordOnAppRestartLabelElement = fixture.debugElement.query(
+          By.css("label[for='requireMasterPasswordOnAppRestart']"),
         );
-        expect(requirePasswordOnStartLabelElement).toBeNull();
-      });
+        expect(requireMasterPasswordOnAppRestartLabelElement).not.toBeNull();
+        expect(requireMasterPasswordOnAppRestartLabelElement.children).toHaveLength(1);
+        expect(requireMasterPasswordOnAppRestartLabelElement.children[0].name).toBe("input");
+        expect(requireMasterPasswordOnAppRestartLabelElement.children[0].attributes).toMatchObject({
+          id: "requireMasterPasswordOnAppRestart",
+          type: "checkbox",
+        });
+        const textNodes = requireMasterPasswordOnAppRestartLabelElement.childNodes
+          .filter((node) => node.nativeNode.nodeType === Node.TEXT_NODE)
+          .map((node) => node.nativeNode.wholeText?.trim());
+        return textNodes;
+      }
     });
   });
 
@@ -362,7 +405,7 @@ describe("SettingsComponent", () => {
         await component.updatePinHandler(true);
 
         expect(component.form.controls.pin.value).toBe(false);
-        expect(vaultTimeoutSettingsService.clear).not.toHaveBeenCalled();
+        expect(pinServiceAbstraction.unsetPin).not.toHaveBeenCalled();
         expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
       });
 
@@ -378,7 +421,7 @@ describe("SettingsComponent", () => {
           await component.updatePinHandler(true);
 
           expect(component.form.controls.pin.value).toBe(dialogResult);
-          expect(vaultTimeoutSettingsService.clear).not.toHaveBeenCalled();
+          expect(pinServiceAbstraction.unsetPin).not.toHaveBeenCalled();
           expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
         },
       );
@@ -390,9 +433,145 @@ describe("SettingsComponent", () => {
         await component.updatePinHandler(false);
 
         expect(component.form.controls.pin.value).toBe(false);
-        expect(vaultTimeoutSettingsService.clear).toHaveBeenCalled();
+        expect(pinServiceAbstraction.unsetPin).toHaveBeenCalled();
         expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
       });
+
+      describe("when windows biometric v2 feature flag is enabled", () => {
+        beforeEach(() => {
+          keyService.userKey$ = jest.fn().mockReturnValue(of(mockUserKey));
+        });
+
+        test.each([false, true])(
+          "enrolls persistent biometric if needed, enrolled is %s",
+          async (enrolled) => {
+            desktopBiometricsService.hasPersistentKey.mockResolvedValue(enrolled);
+
+            await component.ngOnInit();
+            component.isWindows = true;
+            component.form.value.requireMasterPasswordOnAppRestart = true;
+            component.userHasMasterPassword = false;
+            component.supportsBiometric = true;
+            component.form.value.biometric = true;
+
+            await component.updatePinHandler(false);
+
+            expect(component.form.controls.requireMasterPasswordOnAppRestart.value).toBe(false);
+            expect(component.form.controls.pin.value).toBe(false);
+            expect(pinServiceAbstraction.unsetPin).toHaveBeenCalled();
+            expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+
+            if (enrolled) {
+              expect(desktopBiometricsService.enrollPersistent).not.toHaveBeenCalled();
+            } else {
+              expect(desktopBiometricsService.enrollPersistent).toHaveBeenCalledWith(
+                mockUserId,
+                mockUserKey,
+              );
+            }
+          },
+        );
+
+        test.each([
+          {
+            userHasMasterPassword: true,
+            supportsBiometric: false,
+            biometric: false,
+            requireMasterPasswordOnAppRestart: false,
+          },
+          {
+            userHasMasterPassword: true,
+            supportsBiometric: false,
+            biometric: false,
+            requireMasterPasswordOnAppRestart: true,
+          },
+          {
+            userHasMasterPassword: true,
+            supportsBiometric: false,
+            biometric: true,
+            requireMasterPasswordOnAppRestart: false,
+          },
+          {
+            userHasMasterPassword: true,
+            supportsBiometric: false,
+            biometric: true,
+            requireMasterPasswordOnAppRestart: true,
+          },
+          {
+            userHasMasterPassword: true,
+            supportsBiometric: true,
+            biometric: false,
+            requireMasterPasswordOnAppRestart: false,
+          },
+          {
+            userHasMasterPassword: true,
+            supportsBiometric: true,
+            biometric: false,
+            requireMasterPasswordOnAppRestart: true,
+          },
+          {
+            userHasMasterPassword: false,
+            supportsBiometric: false,
+            biometric: false,
+            requireMasterPasswordOnAppRestart: false,
+          },
+          {
+            userHasMasterPassword: false,
+            supportsBiometric: false,
+            biometric: false,
+            requireMasterPasswordOnAppRestart: true,
+          },
+          {
+            userHasMasterPassword: false,
+            supportsBiometric: false,
+            biometric: true,
+            requireMasterPasswordOnAppRestart: false,
+          },
+          {
+            userHasMasterPassword: false,
+            supportsBiometric: false,
+            biometric: true,
+            requireMasterPasswordOnAppRestart: true,
+          },
+          {
+            userHasMasterPassword: false,
+            supportsBiometric: true,
+            biometric: false,
+            requireMasterPasswordOnAppRestart: false,
+          },
+          {
+            userHasMasterPassword: false,
+            supportsBiometric: true,
+            biometric: false,
+            requireMasterPasswordOnAppRestart: true,
+          },
+        ])(
+          "does not enroll persistent biometric when conditions are not met: userHasMasterPassword=$userHasMasterPassword, supportsBiometric=$supportsBiometric, biometric=$biometric, requireMasterPasswordOnAppRestart=$requireMasterPasswordOnAppRestart",
+          async ({
+            userHasMasterPassword,
+            supportsBiometric,
+            biometric,
+            requireMasterPasswordOnAppRestart,
+          }) => {
+            desktopBiometricsService.hasPersistentKey.mockResolvedValue(false);
+
+            await component.ngOnInit();
+            component.isWindows = true;
+            component.form.value.requireMasterPasswordOnAppRestart =
+              requireMasterPasswordOnAppRestart;
+            component.userHasMasterPassword = userHasMasterPassword;
+            component.supportsBiometric = supportsBiometric;
+            component.form.value.biometric = biometric;
+
+            await component.updatePinHandler(false);
+
+            expect(component.form.controls.pin.value).toBe(false);
+            expect(pinServiceAbstraction.unsetPin).toHaveBeenCalled();
+            expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+            expect(desktopBiometricsService.enrollPersistent).not.toHaveBeenCalled();
+          },
+        );
+      });
     });
   });
 
@@ -474,22 +653,91 @@ describe("SettingsComponent", () => {
         expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
       });
 
-      it("handles windows case", async () => {
-        desktopBiometricsService.getBiometricsStatus.mockResolvedValue(BiometricsStatus.Available);
-        desktopBiometricsService.getBiometricsStatusForUser.mockResolvedValue(
-          BiometricsStatus.Available,
-        );
+      describe("windows test cases", () => {
+        beforeEach(() => {
+          platformUtilsService.getDevice.mockReturnValue(DeviceType.WindowsDesktop);
+          keyService.userKey$ = jest.fn().mockReturnValue(of(mockUserKey));
+          component.isWindows = true;
+          component.isLinux = false;
 
-        component.isWindows = true;
-        component.isLinux = false;
-        await component.updateBiometricHandler(true);
+          desktopBiometricsService.getBiometricsStatus.mockResolvedValue(
+            BiometricsStatus.Available,
+          );
+          desktopBiometricsService.getBiometricsStatusForUser.mockResolvedValue(
+            BiometricsStatus.Available,
+          );
+        });
 
-        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
-        expect(component.form.controls.autoPromptBiometrics.value).toBe(false);
-        expect(biometricStateService.setPromptAutomatically).toHaveBeenCalledWith(false);
-        expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
-        expect(component.form.controls.biometric.value).toBe(true);
-        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+        it("handles windows case", async () => {
+          await component.updateBiometricHandler(true);
+
+          expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+          expect(component.form.controls.autoPromptBiometrics.value).toBe(false);
+          expect(biometricStateService.setPromptAutomatically).toHaveBeenCalledWith(false);
+          expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
+          expect(component.form.controls.biometric.value).toBe(true);
+          expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+        });
+
+        describe("when windows v2 biometrics is enabled", () => {
+          beforeEach(() => {
+            keyService.userKey$ = jest.fn().mockReturnValue(of(mockUserKey));
+          });
+
+          it("when the user doesn't have a master password or a PIN set, allows biometric unlock on app restart", async () => {
+            component.userHasMasterPassword = false;
+            component.userHasPinSet = false;
+            desktopBiometricsService.hasPersistentKey.mockResolvedValue(false);
+
+            await component.updateBiometricHandler(true);
+
+            expect(keyService.userKey$).toHaveBeenCalledWith(mockUserId);
+            expect(desktopBiometricsService.enrollPersistent).toHaveBeenCalledWith(
+              mockUserId,
+              mockUserKey,
+            );
+            expect(component.form.controls.requireMasterPasswordOnAppRestart.value).toBe(false);
+
+            expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+            expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+            expect(component.form.controls.autoPromptBiometrics.value).toBe(false);
+            expect(biometricStateService.setPromptAutomatically).toHaveBeenCalledWith(false);
+            expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
+            expect(component.form.controls.biometric.value).toBe(true);
+            expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+          });
+
+          test.each([
+            [true, true],
+            [true, false],
+            [false, true],
+          ])(
+            "when the userHasMasterPassword is %s and userHasPinSet is %s, require master password/PIN on app restart is the default setting",
+            async (userHasMasterPassword, userHasPinSet) => {
+              component.userHasMasterPassword = userHasMasterPassword;
+              component.userHasPinSet = userHasPinSet;
+
+              await component.updateBiometricHandler(true);
+
+              expect(desktopBiometricsService.enrollPersistent).not.toHaveBeenCalled();
+              expect(component.form.controls.requireMasterPasswordOnAppRestart.value).toBe(true);
+              expect(desktopBiometricsService.deleteBiometricUnlockKeyForUser).toHaveBeenCalledWith(
+                mockUserId,
+              );
+              expect(
+                desktopBiometricsService.setBiometricProtectedUnlockKeyForUser,
+              ).toHaveBeenCalledWith(mockUserId, mockUserKey);
+
+              expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+              expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+              expect(component.form.controls.autoPromptBiometrics.value).toBe(false);
+              expect(biometricStateService.setPromptAutomatically).toHaveBeenCalledWith(false);
+              expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
+              expect(component.form.controls.biometric.value).toBe(true);
+              expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+            },
+          );
+        });
       });
 
       it("handles linux case", async () => {
@@ -553,6 +801,57 @@ describe("SettingsComponent", () => {
     });
   });
 
+  describe("updateRequireMasterPasswordOnAppRestartHandler", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+
+      keyService.userKey$ = jest.fn().mockReturnValue(of(mockUserKey));
+    });
+
+    test.each([true, false])(`handles thrown errors when updated to %s`, async (update) => {
+      const error = new Error("Test error");
+      jest.spyOn(component, "updateRequireMasterPasswordOnAppRestart").mockRejectedValue(error);
+
+      await component.ngOnInit();
+      await component.updateRequireMasterPasswordOnAppRestartHandler(update, mockUserId);
+
+      expect(logService.error).toHaveBeenCalled();
+      expect(validationService.showError).toHaveBeenCalledWith(error);
+    });
+
+    describe("when updating to true", () => {
+      it("calls the biometrics service to clear and reset biometric key", async () => {
+        await component.ngOnInit();
+        await component.updateRequireMasterPasswordOnAppRestartHandler(true, mockUserId);
+
+        expect(keyService.userKey$).toHaveBeenCalledWith(mockUserId);
+        expect(desktopBiometricsService.deleteBiometricUnlockKeyForUser).toHaveBeenCalledWith(
+          mockUserId,
+        );
+        expect(desktopBiometricsService.setBiometricProtectedUnlockKeyForUser).toHaveBeenCalledWith(
+          mockUserId,
+          mockUserKey,
+        );
+      });
+    });
+
+    describe("when updating to false", () => {
+      it("doesn't enroll persistent biometric if already enrolled", async () => {
+        biometricStateService.hasPersistentKey.mockResolvedValue(false);
+
+        await component.ngOnInit();
+        await component.updateRequireMasterPasswordOnAppRestartHandler(false, mockUserId);
+
+        expect(keyService.userKey$).toHaveBeenCalledWith(mockUserId);
+        expect(desktopBiometricsService.enrollPersistent).toHaveBeenCalledWith(
+          mockUserId,
+          mockUserKey,
+        );
+        expect(component.form.controls.requireMasterPasswordOnAppRestart.value).toBe(false);
+      });
+    });
+  });
+
   describe("saveVaultTimeout", () => {
     const DEFAULT_VAULT_TIMEOUT: VaultTimeout = 123;
     const DEFAULT_VAULT_TIMEOUT_ACTION = VaultTimeoutAction.Lock;
@@ -629,7 +928,6 @@ describe("SettingsComponent", () => {
     });
 
     it("should not save vault timeout when vault timeout is invalid", async () => {
-      i18nService.t.mockReturnValue("Number too large test error");
       component["form"].controls.vaultTimeout.setErrors({}, { emitEvent: false });
       await component.saveVaultTimeout(DEFAULT_VAULT_TIMEOUT, 999_999_999);
 
@@ -639,11 +937,6 @@ describe("SettingsComponent", () => {
         DEFAULT_VAULT_TIMEOUT_ACTION,
       );
       expect(component["form"].getRawValue().vaultTimeout).toEqual(DEFAULT_VAULT_TIMEOUT);
-      expect(platformUtilsService.showToast).toHaveBeenCalledWith(
-        "error",
-        null,
-        "Number too large test error",
-      );
     });
   });
 
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index 030027913bc..68863312ffe 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -9,7 +9,6 @@ import { concatMap, map, pairwise, startWith, switchMap, takeUntil, timeout } fr
 
 import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { VaultTimeoutInputComponent } from "@bitwarden/auth/angular";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/default-policy.service";
@@ -55,6 +54,10 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 import { KeyService, BiometricStateService, BiometricsStatus } from "@bitwarden/key-management";
+import {
+  SessionTimeoutInputComponent,
+  SessionTimeoutSettingsComponent,
+} from "@bitwarden/key-management-ui";
 import { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";
 
 import { SetPinComponent } from "../../auth/components/set-pin.component";
@@ -67,6 +70,8 @@ import { DesktopSettingsService } from "../../platform/services/desktop-settings
 import { DesktopPremiumUpgradePromptService } from "../../services/desktop-premium-upgrade-prompt.service";
 import { NativeMessagingManifestService } from "../services/native-messaging-manifest.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-settings",
   templateUrl: "settings.component.html",
@@ -92,7 +97,8 @@ import { NativeMessagingManifestService } from "../services/native-messaging-man
     SectionHeaderComponent,
     SelectModule,
     TypographyModule,
-    VaultTimeoutInputComponent,
+    SessionTimeoutInputComponent,
+    SessionTimeoutSettingsComponent,
     PermitCipherDetailsPopoverComponent,
     PremiumBadgeComponent,
   ],
@@ -143,12 +149,15 @@ export class SettingsComponent implements OnInit, OnDestroy {
 
   pinEnabled$: Observable<boolean> = of(true);
 
+  consolidatedSessionTimeoutComponent$: Observable<boolean>;
+
   form = this.formBuilder.group({
     // Security
     vaultTimeout: [null as VaultTimeout | null],
     vaultTimeoutAction: [VaultTimeoutAction.Lock],
     pin: [null as boolean | null],
     biometric: false,
+    requireMasterPasswordOnAppRestart: true,
     autoPromptBiometrics: false,
     // Account Preferences
     clearClipboard: [null],
@@ -180,7 +189,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
     locale: [null as string | null],
   });
 
-  private refreshTimeoutSettings$ = new BehaviorSubject<void>(undefined);
+  protected refreshTimeoutSettings$ = new BehaviorSubject<void>(undefined);
   private destroy$ = new Subject<void>();
 
   constructor(
@@ -278,10 +287,15 @@ export class SettingsComponent implements OnInit, OnDestroy {
         value: SshAgentPromptType.RememberUntilLock,
       },
     ];
+
+    this.consolidatedSessionTimeoutComponent$ = this.configService.getFeatureFlag$(
+      FeatureFlag.ConsolidatedSessionTimeoutComponent,
+    );
   }
 
   async ngOnInit() {
     this.vaultTimeoutOptions = await this.generateVaultTimeoutOptions();
+
     const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
 
     // Autotype is for Windows initially
@@ -372,6 +386,9 @@ export class SettingsComponent implements OnInit, OnDestroy {
       ),
       pin: this.userHasPinSet,
       biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(),
+      requireMasterPasswordOnAppRestart: !(await this.biometricsService.hasPersistentKey(
+        activeAccount.id,
+      )),
       autoPromptBiometrics: await firstValueFrom(this.biometricStateService.promptAutomatically$),
       clearClipboard: await firstValueFrom(this.autofillSettingsService.clearClipboardDelay$),
       minimizeOnCopyToClipboard: await firstValueFrom(this.desktopSettingsService.minimizeOnCopy$),
@@ -479,6 +496,15 @@ export class SettingsComponent implements OnInit, OnDestroy {
       )
       .subscribe();
 
+    this.form.controls.requireMasterPasswordOnAppRestart.valueChanges
+      .pipe(
+        concatMap(async (value) => {
+          await this.updateRequireMasterPasswordOnAppRestartHandler(value, activeAccount.id);
+        }),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
+
     this.form.controls.enableBrowserIntegration.valueChanges
       .pipe(takeUntil(this.destroy$))
       .subscribe((enabled) => {
@@ -510,16 +536,11 @@ export class SettingsComponent implements OnInit, OnDestroy {
     }
 
     // Avoid saving 0 since it's useless as a timeout value.
-    if (this.form.value.vaultTimeout === 0) {
+    if (newValue === 0) {
       return;
     }
 
     if (!this.form.controls.vaultTimeout.valid) {
-      this.platformUtilsService.showToast(
-        "error",
-        null,
-        this.i18nService.t("vaultTimeoutTooLarge"),
-      );
       return;
     }
 
@@ -593,7 +614,19 @@ export class SettingsComponent implements OnInit, OnDestroy {
       this.form.controls.pin.setValue(this.userHasPinSet, { emitEvent: false });
     } else {
       const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      await this.vaultTimeoutSettingsService.clear(userId);
+
+      // On Windows if a user turned off PIN without having a MP and has biometrics + require MP/PIN on restart enabled.
+      if (
+        this.isWindows &&
+        this.supportsBiometric &&
+        this.form.value.requireMasterPasswordOnAppRestart &&
+        this.form.value.biometric &&
+        !this.userHasMasterPassword
+      ) {
+        // Allow biometric unlock on app restart so the user doesn't get into a bad state.
+        await this.enrollPersistentBiometricIfNeeded(userId);
+      }
+      await this.pinService.unsetPin(userId);
     }
   }
 
@@ -644,6 +677,14 @@ export class SettingsComponent implements OnInit, OnDestroy {
       // Recommended settings for Windows Hello
       this.form.controls.autoPromptBiometrics.setValue(false);
       await this.biometricStateService.setPromptAutomatically(false);
+
+      // If the user doesn't have a MP or PIN then they have to use biometrics on app restart.
+      if (!this.userHasMasterPassword && !this.userHasPinSet) {
+        // Allow biometric unlock on app restart so the user doesn't get into a bad state.
+        await this.enrollPersistentBiometricIfNeeded(activeUserId);
+      } else {
+        this.form.controls.requireMasterPasswordOnAppRestart.setValue(true);
+      }
     } else if (this.isLinux) {
       // Similar to Windows
       this.form.controls.autoPromptBiometrics.setValue(false);
@@ -661,6 +702,37 @@ export class SettingsComponent implements OnInit, OnDestroy {
     }
   }
 
+  async updateRequireMasterPasswordOnAppRestartHandler(enabled: boolean, userId: UserId) {
+    try {
+      await this.updateRequireMasterPasswordOnAppRestart(enabled, userId);
+    } catch (error) {
+      this.logService.error("Error updating require master password on app restart: ", error);
+      this.validationService.showError(error);
+    }
+  }
+
+  async updateRequireMasterPasswordOnAppRestart(enabled: boolean, userId: UserId) {
+    if (enabled) {
+      // Require master password or PIN on app restart
+      const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+      await this.biometricsService.deleteBiometricUnlockKeyForUser(userId);
+      await this.biometricsService.setBiometricProtectedUnlockKeyForUser(userId, userKey);
+    } else {
+      // Allow biometric unlock on app restart
+      await this.enrollPersistentBiometricIfNeeded(userId);
+    }
+  }
+
+  private async enrollPersistentBiometricIfNeeded(userId: UserId): Promise<void> {
+    if (!(await this.biometricsService.hasPersistentKey(userId))) {
+      const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+      await this.biometricsService.enrollPersistent(userId, userKey);
+      this.form.controls.requireMasterPasswordOnAppRestart.setValue(false, {
+        emitEvent: false,
+      });
+    }
+  }
+
   async updateAutoPromptBiometrics() {
     if (this.form.value.autoPromptBiometrics) {
       await this.biometricStateService.setPromptAutomatically(true);
@@ -761,22 +833,6 @@ export class SettingsComponent implements OnInit, OnDestroy {
       ipc.platform.allowBrowserintegrationOverride || ipc.platform.isDev;
 
     if (!skipSupportedPlatformCheck) {
-      if (
-        ipc.platform.deviceType === DeviceType.MacOsDesktop &&
-        !this.platformUtilsService.isMacAppStore()
-      ) {
-        await this.dialogService.openSimpleDialog({
-          title: { key: "browserIntegrationUnsupportedTitle" },
-          content: { key: "browserIntegrationMasOnlyDesc" },
-          acceptButtonText: { key: "ok" },
-          cancelButtonText: null,
-          type: "warning",
-        });
-
-        this.form.controls.enableBrowserIntegration.setValue(false);
-        return;
-      }
-
       if (ipc.platform.isWindowsStore) {
         await this.dialogService.openSimpleDialog({
           title: { key: "browserIntegrationUnsupportedTitle" },
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index b07c1c08718..b6e86ba19ff 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { AuthenticationTimeoutComponent } from "@bitwarden/angular/auth/components/authentication-timeout.component";
+import { AuthRoute } from "@bitwarden/angular/auth/constants";
 import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/environment-selector/environment-selector.component";
 import {
   authGuard,
@@ -21,6 +22,7 @@ import {
   UserLockIcon,
   VaultIcon,
   LockIcon,
+  DomainIcon,
 } from "@bitwarden/assets/svg";
 import {
   LoginComponent,
@@ -64,7 +66,7 @@ const routes: Routes = [
     canActivate: [redirectGuard({ loggedIn: "/vault", loggedOut: "/login", locked: "/lock" })],
   },
   {
-    path: "authentication-timeout",
+    path: AuthRoute.AuthenticationTimeout,
     component: AnonLayoutWrapperComponent,
     children: [
       {
@@ -80,7 +82,7 @@ const routes: Routes = [
     } satisfies RouteDataProperties & AnonLayoutWrapperData,
   },
   {
-    path: "device-verification",
+    path: AuthRoute.NewDeviceVerification,
     component: AnonLayoutWrapperComponent,
     canActivate: [unauthGuardFn(), activeAuthGuard()],
     children: [{ path: "", component: NewDeviceVerificationComponent }],
@@ -122,7 +124,7 @@ const routes: Routes = [
     component: AnonLayoutWrapperComponent,
     children: [
       {
-        path: "signup",
+        path: AuthRoute.SignUp,
         canActivate: [unauthGuardFn()],
         data: {
           pageIcon: RegistrationUserAddIcon,
@@ -140,13 +142,13 @@ const routes: Routes = [
             component: RegistrationStartSecondaryComponent,
             outlet: "secondary",
             data: {
-              loginRoute: "/login",
+              loginRoute: `/${AuthRoute.Login}`,
             } satisfies RegistrationStartSecondaryComponentData,
           },
         ],
       },
       {
-        path: "finish-signup",
+        path: AuthRoute.FinishSignUp,
         canActivate: [unauthGuardFn()],
         data: {
           pageIcon: LockIcon,
@@ -159,7 +161,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "login",
+        path: AuthRoute.Login,
         canActivate: [maxAccountsGuardFn()],
         data: {
           pageTitle: {
@@ -178,7 +180,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "login-initiated",
+        path: AuthRoute.LoginInitiated,
         canActivate: [tdeDecryptionRequiredGuard()],
         data: {
           pageIcon: DevicesIcon,
@@ -186,7 +188,7 @@ const routes: Routes = [
         children: [{ path: "", component: LoginDecryptionOptionsComponent }],
       },
       {
-        path: "sso",
+        path: AuthRoute.Sso,
         data: {
           pageIcon: VaultIcon,
           pageTitle: {
@@ -206,7 +208,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "login-with-device",
+        path: AuthRoute.LoginWithDevice,
         data: {
           pageIcon: DevicesIcon,
           pageTitle: {
@@ -226,7 +228,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "admin-approval-requested",
+        path: AuthRoute.AdminApprovalRequested,
         data: {
           pageIcon: DevicesIcon,
           pageTitle: {
@@ -239,7 +241,7 @@ const routes: Routes = [
         children: [{ path: "", component: LoginViaAuthRequestComponent }],
       },
       {
-        path: "hint",
+        path: AuthRoute.PasswordHint,
         canActivate: [unauthGuardFn()],
         data: {
           pageTitle: {
@@ -277,7 +279,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "2fa",
+        path: AuthRoute.TwoFactor,
         canActivate: [unauthGuardFn(), TwoFactorAuthGuard],
         children: [
           {
@@ -289,20 +291,26 @@ const routes: Routes = [
           pageTitle: {
             key: "verifyYourIdentity",
           },
+          // `TwoFactorAuthComponent` manually sets its icon based on the 2fa type
+          pageIcon: null,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
       {
-        path: "set-initial-password",
+        path: AuthRoute.SetInitialPassword,
         canActivate: [authGuard],
         component: SetInitialPasswordComponent,
         data: {
           maxWidth: "lg",
+          pageIcon: LockIcon,
         } satisfies AnonLayoutWrapperData,
       },
       {
-        path: "change-password",
+        path: AuthRoute.ChangePassword,
         component: ChangePasswordComponent,
         canActivate: [authGuard],
+        data: {
+          pageIcon: LockIcon,
+        } satisfies AnonLayoutWrapperData,
       },
       {
         path: "confirm-key-connector-domain",
@@ -312,6 +320,7 @@ const routes: Routes = [
           pageTitle: {
             key: "confirmKeyConnectorDomain",
           },
+          pageIcon: DomainIcon,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
     ],
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 1c2d3aa464d..6243ba1e538 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -32,6 +32,7 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { FingerprintDialogComponent } from "@bitwarden/auth/angular";
 import {
   DESKTOP_SSO_CALLBACK,
+  LockService,
   LogoutReason,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
@@ -47,6 +48,7 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import {
   VaultTimeout,
   VaultTimeoutAction,
@@ -90,6 +92,8 @@ const BroadcasterSubscriptionId = "AppComponent";
 const IdleTimeout = 60000 * 10; // 10 minutes
 const SyncInterval = 6 * 60 * 60 * 1000; // 6 hours
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-root",
   styles: [],
@@ -114,14 +118,26 @@ const SyncInterval = 6 * 60 * 60 * 1000; // 6 hours
   standalone: false,
 })
 export class AppComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("settings", { read: ViewContainerRef, static: true }) settingsRef: ViewContainerRef;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("premium", { read: ViewContainerRef, static: true }) premiumRef: ViewContainerRef;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("passwordHistory", { read: ViewContainerRef, static: true })
   passwordHistoryRef: ViewContainerRef;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("exportVault", { read: ViewContainerRef, static: true })
   exportVaultModalRef: ViewContainerRef;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("appGenerator", { read: ViewContainerRef, static: true })
   generatorModalRef: ViewContainerRef;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("loginApproval", { read: ViewContainerRef, static: true })
   loginApprovalModalRef: ViewContainerRef;
 
@@ -177,8 +193,10 @@ export class AppComponent implements OnInit, OnDestroy {
     private readonly destroyRef: DestroyRef,
     private readonly documentLangSetter: DocumentLangSetter,
     private restrictedItemTypesService: RestrictedItemTypesService,
+    private pinService: PinServiceAbstraction,
     private readonly tokenService: TokenService,
     private desktopAutotypeDefaultSettingPolicy: DesktopAutotypeDefaultSettingPolicy,
+    private readonly lockService: LockService,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
 
@@ -229,7 +247,7 @@ export class AppComponent implements OnInit, OnDestroy {
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             this.updateAppMenu();
             await this.systemService.clearPendingClipboard();
-            await this.processReloadService.startProcessReload(this.authService);
+            await this.processReloadService.startProcessReload();
             break;
           case "authBlocked":
             // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
@@ -242,21 +260,10 @@ export class AppComponent implements OnInit, OnDestroy {
             this.loading = false;
             break;
           case "lockVault":
-            await this.vaultTimeoutService.lock(message.userId);
+            await this.lockService.lock(message.userId);
             break;
           case "lockAllVaults": {
-            const currentUser = await firstValueFrom(
-              this.accountService.activeAccount$.pipe(map((a) => a.id)),
-            );
-            const accounts = await firstValueFrom(this.accountService.accounts$);
-            await this.vaultTimeoutService.lock(currentUser);
-            for (const account of Object.keys(accounts)) {
-              if (account === currentUser) {
-                continue;
-              }
-
-              await this.vaultTimeoutService.lock(account);
-            }
+            await this.lockService.lockAll();
             break;
           }
           case "locked":
@@ -270,12 +277,12 @@ export class AppComponent implements OnInit, OnDestroy {
             }
             await this.updateAppMenu();
             await this.systemService.clearPendingClipboard();
-            await this.processReloadService.startProcessReload(this.authService);
+            await this.processReloadService.startProcessReload();
             break;
           case "startProcessReload":
             // 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.processReloadService.startProcessReload(this.authService);
+            this.processReloadService.startProcessReload();
             break;
           case "cancelProcessReload":
             this.processReloadService.cancelProcessReload();
@@ -691,10 +698,9 @@ export class AppComponent implements OnInit, OnDestroy {
       await this.eventUploadService.uploadEvents(userBeingLoggedOut);
       await this.keyService.clearKeys(userBeingLoggedOut);
       await this.cipherService.clear(userBeingLoggedOut);
-      // ! DO NOT REMOVE folderService.clear ! For more information see PM-25660
       await this.folderService.clear(userBeingLoggedOut);
-      await this.vaultTimeoutSettingsService.clear(userBeingLoggedOut);
       await this.biometricStateService.logout(userBeingLoggedOut);
+      await this.pinService.logout(userBeingLoggedOut);
 
       await this.stateEventRunnerService.handleEvent("logout", userBeingLoggedOut);
 
@@ -721,8 +727,6 @@ export class AppComponent implements OnInit, OnDestroy {
       }
     }
 
-    await this.updateAppMenu();
-
     // This must come last otherwise the logout will prematurely trigger
     // a process reload before all the state service user data can be cleaned up
     this.authService.logOut(async () => {}, userBeingLoggedOut);
@@ -799,11 +803,9 @@ export class AppComponent implements OnInit, OnDestroy {
       }
       const options = await this.getVaultTimeoutOptions(userId);
       if (options[0] === timeout) {
-        // 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
         options[1] === "logOut"
-          ? this.logOut("vaultTimeout", userId as UserId)
-          : await this.vaultTimeoutService.lock(userId);
+          ? await this.logOut("vaultTimeout", userId as UserId)
+          : await this.lockService.lock(userId as UserId);
       }
     }
   }
diff --git a/apps/desktop/src/app/components/avatar.component.ts b/apps/desktop/src/app/components/avatar.component.ts
index 1fba864686c..e94aaf83183 100644
--- a/apps/desktop/src/app/components/avatar.component.ts
+++ b/apps/desktop/src/app/components/avatar.component.ts
@@ -5,20 +5,38 @@ import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
 
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-avatar",
   template: `<img *ngIf="src" [src]="src" [ngClass]="{ 'rounded-circle': circle }" />`,
   standalone: false,
 })
 export class AvatarComponent implements OnChanges, OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() size = 45;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() charCount = 2;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() fontSize = 20;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() dynamic = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() circle = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() color?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() id?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() text?: string;
 
   private svgCharCount = 2;
@@ -114,7 +132,7 @@ export class AvatarComponent implements OnChanges, OnInit {
     textTag.setAttribute("fill", Utils.pickTextColorBasedOnBgColor(color, 135, true));
     textTag.setAttribute(
       "font-family",
-      'Roboto,"Helvetica Neue",Helvetica,Arial,' +
+      'Inter,"Helvetica Neue",Helvetica,Arial,' +
         'sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"',
     );
     textTag.textContent = character;
diff --git a/apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts b/apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts
index 713dc07e803..d65df60a8ce 100644
--- a/apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts
+++ b/apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts
@@ -1,12 +1,20 @@
 import { Component, Inject } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { DIALOG_DATA, ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
+import {
+  DIALOG_DATA,
+  ButtonModule,
+  DialogModule,
+  DialogService,
+  CenterPositionStrategy,
+} from "@bitwarden/components";
 
 export type BrowserSyncVerificationDialogParams = {
   fingerprint: string[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "browser-sync-verification-dialog.component.html",
   imports: [JslibModule, ButtonModule, DialogModule],
@@ -17,6 +25,7 @@ export class BrowserSyncVerificationDialogComponent {
   static open(dialogService: DialogService, data: BrowserSyncVerificationDialogParams) {
     return dialogService.open(BrowserSyncVerificationDialogComponent, {
       data,
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 }
diff --git a/apps/desktop/src/app/components/fido2placeholder.component.ts b/apps/desktop/src/app/components/fido2placeholder.component.ts
index b95dcc6d890..f1f52dae439 100644
--- a/apps/desktop/src/app/components/fido2placeholder.component.ts
+++ b/apps/desktop/src/app/components/fido2placeholder.component.ts
@@ -9,6 +9,8 @@ import {
 } from "../../autofill/services/desktop-fido2-user-interface.service";
 import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   imports: [CommonModule],
diff --git a/apps/desktop/src/app/components/user-verification.component.ts b/apps/desktop/src/app/components/user-verification.component.ts
index 31d38b10183..e19916c3d6b 100644
--- a/apps/desktop/src/app/components/user-verification.component.ts
+++ b/apps/desktop/src/app/components/user-verification.component.ts
@@ -11,6 +11,8 @@ import { FormFieldModule } from "@bitwarden/components";
  * @deprecated Jan 24, 2024: Use new libs/auth UserVerificationDialogComponent or UserVerificationFormInputComponent instead.
  * Each client specific component should eventually be converted over to use one of these new components.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-user-verification",
   imports: [CommonModule, JslibModule, ReactiveFormsModule, FormFieldModule, FormsModule],
diff --git a/apps/desktop/src/app/components/verify-native-messaging-dialog.component.ts b/apps/desktop/src/app/components/verify-native-messaging-dialog.component.ts
index 72284d007b6..6f9695f856a 100644
--- a/apps/desktop/src/app/components/verify-native-messaging-dialog.component.ts
+++ b/apps/desktop/src/app/components/verify-native-messaging-dialog.component.ts
@@ -1,12 +1,20 @@
 import { Component, Inject } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { DIALOG_DATA, ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
+import {
+  DIALOG_DATA,
+  ButtonModule,
+  DialogModule,
+  DialogService,
+  CenterPositionStrategy,
+} from "@bitwarden/components";
 
 export type VerifyNativeMessagingDialogData = {
   applicationName: string;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "verify-native-messaging-dialog.component.html",
   imports: [JslibModule, ButtonModule, DialogModule],
@@ -17,6 +25,7 @@ export class VerifyNativeMessagingDialogComponent {
   static open(dialogService: DialogService, data: VerifyNativeMessagingDialogData) {
     return dialogService.open<boolean>(VerifyNativeMessagingDialogComponent, {
       data,
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 }
diff --git a/apps/desktop/src/app/layout/account-switcher.component.ts b/apps/desktop/src/app/layout/account-switcher.component.ts
index a54674c3a1e..6a7e274ade4 100644
--- a/apps/desktop/src/app/layout/account-switcher.component.ts
+++ b/apps/desktop/src/app/layout/account-switcher.component.ts
@@ -31,6 +31,8 @@ type InactiveAccount = ActiveAccount & {
   authenticationStatus: AuthenticationStatus;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-account-switcher",
   templateUrl: "account-switcher.component.html",
diff --git a/apps/desktop/src/app/layout/header.component.ts b/apps/desktop/src/app/layout/header.component.ts
index 9aef093423f..9630e3b1914 100644
--- a/apps/desktop/src/app/layout/header.component.ts
+++ b/apps/desktop/src/app/layout/header.component.ts
@@ -1,5 +1,7 @@
 import { Component } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-header",
   templateUrl: "header.component.html",
diff --git a/apps/desktop/src/app/layout/nav.component.ts b/apps/desktop/src/app/layout/nav.component.ts
index bcc2b57fb17..72064a4de51 100644
--- a/apps/desktop/src/app/layout/nav.component.ts
+++ b/apps/desktop/src/app/layout/nav.component.ts
@@ -4,6 +4,8 @@ import { RouterLink, RouterLinkActive } from "@angular/router";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-nav",
   templateUrl: "nav.component.html",
diff --git a/apps/desktop/src/app/layout/search/search.component.ts b/apps/desktop/src/app/layout/search/search.component.ts
index 70196d74dda..c0b088a13d9 100644
--- a/apps/desktop/src/app/layout/search/search.component.ts
+++ b/apps/desktop/src/app/layout/search/search.component.ts
@@ -8,6 +8,8 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 
 import { SearchBarService, SearchBarState } from "./search-bar.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-search",
   templateUrl: "search.component.html",
diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts
index 6b511ff366d..73c4d38d3b2 100644
--- a/apps/desktop/src/app/services/init.service.ts
+++ b/apps/desktop/src/app/services/init.service.ts
@@ -6,9 +6,10 @@ import { AbstractThemingService } from "@bitwarden/angular/platform/services/the
 import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DefaultVaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
@@ -27,6 +28,7 @@ import { DesktopAutotypeService } from "../../autofill/services/desktop-autotype
 import { SshAgentService } from "../../autofill/services/ssh-agent.service";
 import { I18nRendererService } from "../../platform/services/i18n.renderer.service";
 import { VersionService } from "../../platform/services/version.service";
+import { BiometricMessageHandlerService } from "../../services/biometric-message-handler.service";
 import { NativeMessagingService } from "../../services/native-messaging.service";
 
 @Injectable()
@@ -37,7 +39,7 @@ export class InitService {
     private vaultTimeoutService: DefaultVaultTimeoutService,
     private i18nService: I18nServiceAbstraction,
     private eventUploadService: EventUploadServiceAbstraction,
-    private twoFactorService: TwoFactorServiceAbstraction,
+    private twoFactorService: TwoFactorService,
     private notificationsService: ServerNotificationsService,
     private platformUtilsService: PlatformUtilsServiceAbstraction,
     private stateService: StateServiceAbstraction,
@@ -52,6 +54,8 @@ export class InitService {
     private autofillService: DesktopAutofillService,
     private autotypeService: DesktopAutotypeService,
     private sdkLoadService: SdkLoadService,
+    private biometricMessageHandlerService: BiometricMessageHandlerService,
+    private configService: ConfigService,
     @Inject(DOCUMENT) private document: Document,
     private readonly migrationRunner: MigrationRunner,
   ) {}
@@ -62,6 +66,7 @@ export class InitService {
       await this.sshAgentService.init();
       this.nativeMessagingService.init();
       await this.migrationRunner.waitForCompletion(); // Desktop will run migrations in the main process
+      this.encryptService.init(this.configService);
 
       const accounts = await firstValueFrom(this.accountService.accounts$);
       const setUserKeyInMemoryPromises = [];
@@ -92,6 +97,7 @@ export class InitService {
       const containerService = new ContainerService(this.keyService, this.encryptService);
       containerService.attachToGlobal(this.win);
 
+      await this.biometricMessageHandlerService.init();
       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 9f2bb1acc90..03d6eb5c908 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -77,7 +77,10 @@ import {
   LogService as LogServiceAbstraction,
 } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  PlatformUtilsService,
+  PlatformUtilsService as PlatformUtilsServiceAbstraction,
+} from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkClientFactory } from "@bitwarden/common/platform/abstractions/sdk/sdk-client-factory";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
@@ -106,7 +109,10 @@ import {
   BiometricStateService,
   BiometricsService,
 } from "@bitwarden/key-management";
-import { LockComponentService } from "@bitwarden/key-management-ui";
+import {
+  LockComponentService,
+  SessionTimeoutSettingsComponentService,
+} from "@bitwarden/key-management-ui";
 import { SerializedMemoryStorageService } from "@bitwarden/storage-core";
 import { DefaultSshImportPromptService, SshImportPromptService } from "@bitwarden/vault";
 
@@ -122,6 +128,7 @@ import { DesktopBiometricsService } from "../../key-management/biometrics/deskto
 import { RendererBiometricsService } from "../../key-management/biometrics/renderer-biometrics.service";
 import { ElectronKeyService } from "../../key-management/electron-key.service";
 import { DesktopLockComponentService } from "../../key-management/lock/services/desktop-lock-component.service";
+import { DesktopSessionTimeoutSettingsComponentService } from "../../key-management/session-timeout/services/desktop-session-timeout-settings-component.service";
 import { flagEnabled } from "../../platform/flags";
 import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
 import { ElectronLogRendererService } from "../../platform/services/electron-log.renderer.service";
@@ -262,6 +269,7 @@ const safeProviders: SafeProvider[] = [
       BiometricStateService,
       AccountServiceAbstraction,
       LogService,
+      AuthServiceAbstraction,
     ],
   }),
   safeProvider({
@@ -306,7 +314,6 @@ const safeProviders: SafeProvider[] = [
     provide: KeyServiceAbstraction,
     useClass: ElectronKeyService,
     deps: [
-      PinServiceAbstraction,
       InternalMasterPasswordServiceAbstraction,
       KeyGenerationService,
       CryptoFunctionServiceAbstraction,
@@ -337,6 +344,7 @@ const safeProviders: SafeProvider[] = [
       ConfigService,
       Fido2AuthenticatorServiceAbstraction,
       AccountService,
+      PlatformUtilsService,
     ],
   }),
   safeProvider({
@@ -476,6 +484,11 @@ const safeProviders: SafeProvider[] = [
     useClass: DesktopAutotypeDefaultSettingPolicy,
     deps: [AccountServiceAbstraction, AuthServiceAbstraction, InternalPolicyService, ConfigService],
   }),
+  safeProvider({
+    provide: SessionTimeoutSettingsComponentService,
+    useClass: DesktopSessionTimeoutSettingsComponentService,
+    deps: [I18nServiceAbstraction],
+  }),
 ];
 
 @NgModule({
diff --git a/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.spec.ts b/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.spec.ts
index 53a1c7dbd4c..717af25a1dc 100644
--- a/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.spec.ts
+++ b/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.spec.ts
@@ -119,7 +119,9 @@ describe("DesktopSetInitialPasswordService", () => {
 
       userDecryptionOptions = new UserDecryptionOptions({ hasMasterPassword: true });
       userDecryptionOptionsSubject = new BehaviorSubject(userDecryptionOptions);
-      userDecryptionOptionsService.userDecryptionOptions$ = userDecryptionOptionsSubject;
+      userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
+        userDecryptionOptionsSubject,
+      );
 
       setPasswordRequest = new SetPasswordRequest(
         credentials.newServerMasterKeyHash,
diff --git a/apps/desktop/src/app/tools/export/export-desktop.component.ts b/apps/desktop/src/app/tools/export/export-desktop.component.ts
index 03afb154200..0adc8e758c9 100644
--- a/apps/desktop/src/app/tools/export/export-desktop.component.ts
+++ b/apps/desktop/src/app/tools/export/export-desktop.component.ts
@@ -5,6 +5,8 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { DialogRef, AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
 import { ExportComponent } from "@bitwarden/vault-export-ui";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "export-desktop.component.html",
   imports: [
diff --git a/apps/desktop/src/app/tools/generator/credential-generator.component.ts b/apps/desktop/src/app/tools/generator/credential-generator.component.ts
index 4124b2439da..42313c48f7f 100644
--- a/apps/desktop/src/app/tools/generator/credential-generator.component.ts
+++ b/apps/desktop/src/app/tools/generator/credential-generator.component.ts
@@ -13,6 +13,8 @@ import {
   GeneratorModule,
 } from "@bitwarden/generator-components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
diff --git a/apps/desktop/src/app/tools/import/chromium-importer.service.ts b/apps/desktop/src/app/tools/import/chromium-importer.service.ts
index 56f31c359db..0faff81974a 100644
--- a/apps/desktop/src/app/tools/import/chromium-importer.service.ts
+++ b/apps/desktop/src/app/tools/import/chromium-importer.service.ts
@@ -4,8 +4,8 @@ import { chromium_importer } from "@bitwarden/desktop-napi";
 
 export class ChromiumImporterService {
   constructor() {
-    ipcMain.handle("chromium_importer.getInstalledBrowsers", async (event) => {
-      return await chromium_importer.getInstalledBrowsers();
+    ipcMain.handle("chromium_importer.getMetadata", async (event) => {
+      return await chromium_importer.getMetadata();
     });
 
     ipcMain.handle("chromium_importer.getAvailableProfiles", async (event, browser: string) => {
diff --git a/apps/desktop/src/app/tools/import/desktop-import-metadata.service.ts b/apps/desktop/src/app/tools/import/desktop-import-metadata.service.ts
new file mode 100644
index 00000000000..0c29cd9f44a
--- /dev/null
+++ b/apps/desktop/src/app/tools/import/desktop-import-metadata.service.ts
@@ -0,0 +1,68 @@
+import { SystemServiceProvider } from "@bitwarden/common/tools/providers";
+import type { chromium_importer } from "@bitwarden/desktop-napi";
+import {
+  ImportType,
+  DefaultImportMetadataService,
+  ImportMetadataServiceAbstraction,
+  DataLoader,
+  ImporterMetadata,
+  InstructionLink,
+  Instructions,
+  Loader,
+} from "@bitwarden/importer-core";
+
+export class DesktopImportMetadataService
+  extends DefaultImportMetadataService
+  implements ImportMetadataServiceAbstraction
+{
+  constructor(system: SystemServiceProvider) {
+    super(system);
+  }
+
+  async init(): Promise<void> {
+    const metadata = await ipc.tools.chromiumImporter.getMetadata();
+    await this.parseNativeMetaData(metadata);
+    await super.init();
+  }
+
+  private async parseNativeMetaData(
+    raw: Record<string, chromium_importer.NativeImporterMetadata>,
+  ): Promise<void> {
+    const entries = Object.entries(raw).map(([id, meta]) => {
+      const loaders = meta.loaders.map(this.mapLoader);
+      const instructions = this.mapInstructions(meta.instructions);
+      const mapped: ImporterMetadata = {
+        type: id as ImportType,
+        loaders,
+        ...(instructions ? { instructions } : {}),
+      };
+      return [id, mapped] as const;
+    });
+
+    // Do not overwrite existing importers, just add new ones or update existing ones
+    this.importers = {
+      ...this.importers,
+      ...Object.fromEntries(entries),
+    };
+  }
+
+  private mapLoader(name: string): DataLoader {
+    switch (name) {
+      case "file":
+        return Loader.file;
+      case "chromium":
+        return Loader.chromium;
+      default:
+        throw new Error(`Unknown loader from native module: ${name}`);
+    }
+  }
+
+  private mapInstructions(name: string): InstructionLink | undefined {
+    switch (name) {
+      case "chromium":
+        return Instructions.chromium;
+      default:
+        return undefined;
+    }
+  }
+}
diff --git a/apps/desktop/src/app/tools/import/import-desktop.component.ts b/apps/desktop/src/app/tools/import/import-desktop.component.ts
index f096471f770..6b1d26562fc 100644
--- a/apps/desktop/src/app/tools/import/import-desktop.component.ts
+++ b/apps/desktop/src/app/tools/import/import-desktop.component.ts
@@ -3,8 +3,19 @@ import { Component } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { DialogRef, AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
-import { ImportComponent } from "@bitwarden/importer-ui";
+import type { chromium_importer } from "@bitwarden/desktop-napi";
+import { ImportMetadataServiceAbstraction } from "@bitwarden/importer-core";
+import {
+  ImportComponent,
+  ImporterProviders,
+  SYSTEM_SERVICE_PROVIDER,
+} from "@bitwarden/importer-ui";
+import { safeProvider } from "@bitwarden/ui-common";
 
+import { DesktopImportMetadataService } from "./desktop-import-metadata.service";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "import-desktop.component.html",
   imports: [
@@ -15,6 +26,14 @@ import { ImportComponent } from "@bitwarden/importer-ui";
     ButtonModule,
     ImportComponent,
   ],
+  providers: [
+    ...ImporterProviders,
+    safeProvider({
+      provide: ImportMetadataServiceAbstraction,
+      useClass: DesktopImportMetadataService,
+      deps: [SYSTEM_SERVICE_PROVIDER],
+    }),
+  ],
 })
 export class ImportDesktopComponent {
   protected disabled = false;
@@ -29,11 +48,14 @@ export class ImportDesktopComponent {
     this.dialogRef.close();
   }
 
-  protected onLoadProfilesFromBrowser(browser: string): Promise<any[]> {
+  protected onLoadProfilesFromBrowser(browser: string): Promise<chromium_importer.ProfileInfo[]> {
     return ipc.tools.chromiumImporter.getAvailableProfiles(browser);
   }
 
-  protected onImportFromBrowser(browser: string, profile: string): Promise<any[]> {
+  protected onImportFromBrowser(
+    browser: string,
+    profile: string,
+  ): Promise<chromium_importer.LoginImportResult[]> {
     return ipc.tools.chromiumImporter.importLogins(browser, profile);
   }
 }
diff --git a/apps/desktop/src/app/tools/preload.ts b/apps/desktop/src/app/tools/preload.ts
index 574c27ac9fd..ff0a4ffbbd8 100644
--- a/apps/desktop/src/app/tools/preload.ts
+++ b/apps/desktop/src/app/tools/preload.ts
@@ -1,11 +1,16 @@
 import { ipcRenderer } from "electron";
 
+import type { chromium_importer } from "@bitwarden/desktop-napi";
+
 const chromiumImporter = {
-  getInstalledBrowsers: (): Promise<string[]> =>
-    ipcRenderer.invoke("chromium_importer.getInstalledBrowsers"),
-  getAvailableProfiles: (browser: string): Promise<any[]> =>
+  getMetadata: (): Promise<Record<string, chromium_importer.NativeImporterMetadata>> =>
+    ipcRenderer.invoke("chromium_importer.getMetadata"),
+  getAvailableProfiles: (browser: string): Promise<chromium_importer.ProfileInfo[]> =>
     ipcRenderer.invoke("chromium_importer.getAvailableProfiles", browser),
-  importLogins: (browser: string, profileId: string): Promise<any[]> =>
+  importLogins: (
+    browser: string,
+    profileId: string,
+  ): Promise<chromium_importer.LoginImportResult[]> =>
     ipcRenderer.invoke("chromium_importer.importLogins", browser, profileId),
 };
 
diff --git a/apps/desktop/src/app/tools/send/add-edit.component.ts b/apps/desktop/src/app/tools/send/add-edit.component.ts
index 025bab66539..076b0f6c9d5 100644
--- a/apps/desktop/src/app/tools/send/add-edit.component.ts
+++ b/apps/desktop/src/app/tools/send/add-edit.component.ts
@@ -3,11 +3,13 @@
 import { CommonModule, DatePipe } from "@angular/common";
 import { Component } from "@angular/core";
 import { FormBuilder, ReactiveFormsModule } from "@angular/forms";
+import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/tools/send/add-edit.component";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -17,12 +19,23 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { CalloutModule, DialogService, ToastService } from "@bitwarden/components";
 
+import { DesktopPremiumUpgradePromptService } from "../../../services/desktop-premium-upgrade-prompt.service";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send-add-edit",
   templateUrl: "add-edit.component.html",
   imports: [CommonModule, JslibModule, ReactiveFormsModule, CalloutModule],
+  providers: [
+    {
+      provide: PremiumUpgradePromptService,
+      useClass: DesktopPremiumUpgradePromptService,
+    },
+  ],
 })
 export class AddEditComponent extends BaseAddEditComponent {
   constructor(
@@ -41,6 +54,7 @@ export class AddEditComponent extends BaseAddEditComponent {
     billingAccountProfileStateService: BillingAccountProfileStateService,
     accountService: AccountService,
     toastService: ToastService,
+    premiumUpgradePromptService: PremiumUpgradePromptService,
   ) {
     super(
       i18nService,
@@ -58,12 +72,14 @@ export class AddEditComponent extends BaseAddEditComponent {
       billingAccountProfileStateService,
       accountService,
       toastService,
+      premiumUpgradePromptService,
     );
   }
 
   async refresh() {
     const send = await this.loadSend();
-    this.send = await send.decrypt();
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    this.send = await send.decrypt(userId);
     this.updateFormValues();
     this.hasPassword = this.send.password != null && this.send.password.trim() !== "";
   }
diff --git a/apps/desktop/src/app/tools/send/send.component.ts b/apps/desktop/src/app/tools/send/send.component.ts
index 0146a5e62ea..b58c3961bde 100644
--- a/apps/desktop/src/app/tools/send/send.component.ts
+++ b/apps/desktop/src/app/tools/send/send.component.ts
@@ -25,22 +25,29 @@ import { SearchBarService } from "../../layout/search/search-bar.service";
 
 import { AddEditComponent } from "./add-edit.component";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-enum Action {
-  None = "",
-  Add = "add",
-  Edit = "edit",
-}
+const Action = Object.freeze({
+  /** No action is currently active. */
+  None: "",
+  /** The user is adding a new Send. */
+  Add: "add",
+  /** The user is editing an existing Send. */
+  Edit: "edit",
+} as const);
+
+type Action = (typeof Action)[keyof typeof Action];
 
 const BroadcasterSubscriptionId = "SendComponent";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send",
   templateUrl: "send.component.html",
   imports: [CommonModule, JslibModule, FormsModule, NavComponent, AddEditComponent],
 })
 export class SendComponent extends BaseSendComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(AddEditComponent) addEditComponent: AddEditComponent;
 
   sendId: string;
diff --git a/apps/desktop/src/auth/components/set-pin.component.html b/apps/desktop/src/auth/components/set-pin.component.html
index 6fb5829b79a..aaebf7c1cdb 100644
--- a/apps/desktop/src/auth/components/set-pin.component.html
+++ b/apps/desktop/src/auth/components/set-pin.component.html
@@ -1,6 +1,6 @@
 <form [bitSubmit]="submit" [formGroup]="setPinForm">
   <bit-dialog>
-    <div class="tw-font-semibold" bitDialogTitle>
+    <div class="tw-font-medium" bitDialogTitle>
       {{ "unlockWithPin" | i18n }}
     </div>
     <div bitDialogContent>
diff --git a/apps/desktop/src/auth/components/set-pin.component.ts b/apps/desktop/src/auth/components/set-pin.component.ts
index 93e1ea0d25c..5bb8e761b32 100644
--- a/apps/desktop/src/auth/components/set-pin.component.ts
+++ b/apps/desktop/src/auth/components/set-pin.component.ts
@@ -12,6 +12,8 @@ import {
   FormFieldModule,
   IconButtonModule,
 } from "@bitwarden/components";
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "set-pin.component.html",
   imports: [
diff --git a/apps/desktop/src/auth/delete-account.component.ts b/apps/desktop/src/auth/delete-account.component.ts
index b6c6650375d..5cd73896e07 100644
--- a/apps/desktop/src/auth/delete-account.component.ts
+++ b/apps/desktop/src/auth/delete-account.component.ts
@@ -20,6 +20,8 @@ import {
 
 import { UserVerificationComponent } from "../app/components/user-verification.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-delete-account",
   templateUrl: "delete-account.component.html",
diff --git a/apps/desktop/src/autofill/components/autotype-shortcut.component.html b/apps/desktop/src/autofill/components/autotype-shortcut.component.html
index 774c299e0b6..6f73d4006ac 100644
--- a/apps/desktop/src/autofill/components/autotype-shortcut.component.html
+++ b/apps/desktop/src/autofill/components/autotype-shortcut.component.html
@@ -1,6 +1,6 @@
 <form [bitSubmit]="submit" [formGroup]="setShortcutForm">
   <bit-dialog>
-    <div class="tw-font-semibold" bitDialogTitle>
+    <div class="tw-font-medium" bitDialogTitle>
       {{ "typeShortcut" | i18n }}
     </div>
     <div bitDialogContent>
diff --git a/apps/desktop/src/autofill/components/autotype-shortcut.component.ts b/apps/desktop/src/autofill/components/autotype-shortcut.component.ts
index 5cf1d90cb79..3c82d8297a1 100644
--- a/apps/desktop/src/autofill/components/autotype-shortcut.component.ts
+++ b/apps/desktop/src/autofill/components/autotype-shortcut.component.ts
@@ -22,6 +22,8 @@ import {
   IconButtonModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "autotype-shortcut.component.html",
   imports: [
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 09f03d2ef8e..4dcf05a4220 100644
--- a/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
+++ b/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
@@ -5,6 +5,8 @@ import { LogService } from "@bitwarden/logging";
 
 import { WindowMain } from "../../main/window.main";
 import { stringIsNotUndefinedNullAndEmpty } from "../../utils";
+import { AutotypeMatchError } from "../models/autotype-errors";
+import { AutotypeVaultData } from "../models/autotype-vault-data";
 import { AutotypeKeyboardShortcut } from "../models/main-autotype-keyboard-shortcut";
 
 export class MainDesktopAutotypeService {
@@ -47,20 +49,22 @@ export class MainDesktopAutotypeService {
       }
     });
 
-    ipcMain.on("autofill.completeAutotypeRequest", (event, data) => {
-      const { response } = data;
-
+    ipcMain.on("autofill.completeAutotypeRequest", (_event, vaultData: AutotypeVaultData) => {
       if (
-        stringIsNotUndefinedNullAndEmpty(response.username) &&
-        stringIsNotUndefinedNullAndEmpty(response.password)
+        stringIsNotUndefinedNullAndEmpty(vaultData.username) &&
+        stringIsNotUndefinedNullAndEmpty(vaultData.password)
       ) {
-        this.doAutotype(
-          response.username,
-          response.password,
-          this.autotypeKeyboardShortcut.getArrayFormat(),
-        );
+        this.doAutotype(vaultData, this.autotypeKeyboardShortcut.getArrayFormat());
       }
     });
+
+    ipcMain.on("autofill.completeAutotypeError", (_event, matchError: AutotypeMatchError) => {
+      this.logService.debug(
+        "autofill.completeAutotypeError",
+        "No match for window: " + matchError.windowTitle,
+      );
+      this.logService.error("autofill.completeAutotypeError", matchError.errorMessage);
+    });
   }
 
   disableAutotype() {
@@ -89,8 +93,9 @@ export class MainDesktopAutotypeService {
       : this.logService.info("Enabling autotype failed.");
   }
 
-  private doAutotype(username: string, password: string, keyboardShortcut: string[]) {
-    const inputPattern = username + "\t" + password;
+  private doAutotype(vaultData: AutotypeVaultData, keyboardShortcut: string[]) {
+    const TAB = "\t";
+    const inputPattern = vaultData.username + TAB + vaultData.password;
     const inputArray = new Array<number>(inputPattern.length);
 
     for (let i = 0; i < inputPattern.length; i++) {
diff --git a/apps/desktop/src/autofill/models/autotype-errors.ts b/apps/desktop/src/autofill/models/autotype-errors.ts
new file mode 100644
index 00000000000..9e59b102302
--- /dev/null
+++ b/apps/desktop/src/autofill/models/autotype-errors.ts
@@ -0,0 +1,8 @@
+/**
+ * This error is surfaced when there is no matching
+ * vault item found.
+ */
+export interface AutotypeMatchError {
+  windowTitle: string;
+  errorMessage: string;
+}
diff --git a/apps/desktop/src/autofill/models/autotype-vault-data.ts b/apps/desktop/src/autofill/models/autotype-vault-data.ts
new file mode 100644
index 00000000000..ee3db98c334
--- /dev/null
+++ b/apps/desktop/src/autofill/models/autotype-vault-data.ts
@@ -0,0 +1,8 @@
+/**
+ * Vault data used in autotype operations.
+ * `username` and `password` are guaranteed to be not null/undefined.
+ */
+export interface AutotypeVaultData {
+  username: string;
+  password: string;
+}
diff --git a/apps/desktop/src/autofill/preload.ts b/apps/desktop/src/autofill/preload.ts
index fcb2f646743..e839ac223b7 100644
--- a/apps/desktop/src/autofill/preload.ts
+++ b/apps/desktop/src/autofill/preload.ts
@@ -5,6 +5,9 @@ import type { autofill } from "@bitwarden/desktop-napi";
 import { Command } from "../platform/main/autofill/command";
 import { RunCommandParams, RunCommandResult } from "../platform/main/autofill/native-autofill.main";
 
+import { AutotypeMatchError } from "./models/autotype-errors";
+import { AutotypeVaultData } from "./models/autotype-vault-data";
+
 export default {
   runCommand: <C extends Command>(params: RunCommandParams<C>): Promise<RunCommandResult<C>> =>
     ipcRenderer.invoke("autofill.runCommand", params),
@@ -133,35 +136,31 @@ export default {
   listenAutotypeRequest: (
     fn: (
       windowTitle: string,
-      completeCallback: (
-        error: Error | null,
-        response: { username?: string; password?: string },
-      ) => void,
+      completeCallback: (error: Error | null, response: AutotypeVaultData | null) => void,
     ) => void,
   ) => {
     ipcRenderer.on(
       "autofill.listenAutotypeRequest",
       (
-        event,
+        _event,
         data: {
           windowTitle: string;
         },
       ) => {
         const { windowTitle } = data;
 
-        fn(windowTitle, (error, response) => {
+        fn(windowTitle, (error, vaultData) => {
           if (error) {
-            ipcRenderer.send("autofill.completeError", {
+            const matchError: AutotypeMatchError = {
               windowTitle,
-              error: error.message,
-            });
+              errorMessage: error.message,
+            };
+            ipcRenderer.send("autofill.completeAutotypeError", matchError);
             return;
           }
-
-          ipcRenderer.send("autofill.completeAutotypeRequest", {
-            windowTitle,
-            response,
-          });
+          if (vaultData !== null) {
+            ipcRenderer.send("autofill.completeAutotypeRequest", vaultData);
+          }
         });
       },
     );
diff --git a/apps/desktop/src/autofill/services/desktop-autofill.service.ts b/apps/desktop/src/autofill/services/desktop-autofill.service.ts
index 5500bc58f5a..18f4652d72a 100644
--- a/apps/desktop/src/autofill/services/desktop-autofill.service.ts
+++ b/apps/desktop/src/autofill/services/desktop-autofill.service.ts
@@ -13,6 +13,7 @@ import {
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getOptionalUserId } from "@bitwarden/common/auth/services/account.service";
+import { DeviceType } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -24,6 +25,7 @@ import {
   Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction,
 } from "@bitwarden/common/platform/abstractions/fido2/fido2-authenticator.service.abstraction";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { parseCredentialId } from "@bitwarden/common/platform/services/fido2/credential-id-utils";
 import { getCredentialsForAutofill } from "@bitwarden/common/platform/services/fido2/fido2-autofill-utils";
@@ -53,9 +55,15 @@ export class DesktopAutofillService implements OnDestroy {
     private configService: ConfigService,
     private fido2AuthenticatorService: Fido2AuthenticatorServiceAbstraction<NativeWindowObject>,
     private accountService: AccountService,
+    private platformUtilsService: PlatformUtilsService,
   ) {}
 
   async init() {
+    // Currently only supported for MacOS
+    if (this.platformUtilsService.getDevice() !== DeviceType.MacOsDesktop) {
+      return;
+    }
+
     this.configService
       .getFeatureFlag$(FeatureFlag.MacOsNativeCredentialSync)
       .pipe(
diff --git a/apps/desktop/src/autofill/services/desktop-autotype-policy.service.spec.ts b/apps/desktop/src/autofill/services/desktop-autotype-policy.service.spec.ts
index 7fb30333e28..555e6ceef5b 100644
--- a/apps/desktop/src/autofill/services/desktop-autotype-policy.service.spec.ts
+++ b/apps/desktop/src/autofill/services/desktop-autotype-policy.service.spec.ts
@@ -1,8 +1,10 @@
 import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject, firstValueFrom, take, timeout, TimeoutError } from "rxjs";
+import { BehaviorSubject, firstValueFrom, take } from "rxjs";
 
 import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 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";
@@ -18,10 +20,10 @@ describe("DesktopAutotypeDefaultSettingPolicy", () => {
   let policyService: MockProxy<InternalPolicyService>;
   let configService: MockProxy<ConfigService>;
 
-  let mockAccountSubject: BehaviorSubject<{ id: UserId } | null>;
+  let mockAccountSubject: BehaviorSubject<Account | null>;
   let mockFeatureFlagSubject: BehaviorSubject<boolean>;
   let mockAuthStatusSubject: BehaviorSubject<AuthenticationStatus>;
-  let mockPolicyAppliesSubject: BehaviorSubject<boolean>;
+  let mockPoliciesSubject: BehaviorSubject<Policy[]>;
 
   const mockUserId = "user-123" as UserId;
 
@@ -36,7 +38,7 @@ describe("DesktopAutotypeDefaultSettingPolicy", () => {
     mockAuthStatusSubject = new BehaviorSubject<AuthenticationStatus>(
       AuthenticationStatus.Unlocked,
     );
-    mockPolicyAppliesSubject = new BehaviorSubject<boolean>(false);
+    mockPoliciesSubject = new BehaviorSubject<Policy[]>([]);
 
     accountService = mock<AccountService>();
     authService = mock<AuthService>();
@@ -50,9 +52,7 @@ describe("DesktopAutotypeDefaultSettingPolicy", () => {
     authService.authStatusFor$ = jest
       .fn()
       .mockImplementation((_: UserId) => mockAuthStatusSubject.asObservable());
-    policyService.policyAppliesToUser$ = jest
-      .fn()
-      .mockReturnValue(mockPolicyAppliesSubject.asObservable());
+    policyService.policies$ = jest.fn().mockReturnValue(mockPoliciesSubject.asObservable());
 
     TestBed.configureTestingModule({
       providers: [
@@ -72,7 +72,7 @@ describe("DesktopAutotypeDefaultSettingPolicy", () => {
     mockAccountSubject.complete();
     mockFeatureFlagSubject.complete();
     mockAuthStatusSubject.complete();
-    mockPolicyAppliesSubject.complete();
+    mockPoliciesSubject.complete();
   });
 
   describe("autotypeDefaultSetting$", () => {
@@ -82,11 +82,20 @@ describe("DesktopAutotypeDefaultSettingPolicy", () => {
       expect(result).toBeNull();
     });
 
-    it("should not emit when no active account", async () => {
+    it("does not emit until an account appears", async () => {
       mockAccountSubject.next(null);
-      await expect(
-        firstValueFrom(service.autotypeDefaultSetting$.pipe(timeout({ first: 30 }))),
-      ).rejects.toBeInstanceOf(TimeoutError);
+
+      mockAccountSubject.next({ id: mockUserId } as Account);
+      mockAuthStatusSubject.next(AuthenticationStatus.Unlocked);
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: true,
+        } as Policy,
+      ]);
+
+      const result = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(result).toBe(true);
     });
 
     it("should emit null when user is not unlocked", async () => {
@@ -96,34 +105,56 @@ describe("DesktopAutotypeDefaultSettingPolicy", () => {
     });
 
     it("should emit null when no autotype policy exists", async () => {
-      mockPolicyAppliesSubject.next(false);
+      mockPoliciesSubject.next([]);
       const policy = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
       expect(policy).toBeNull();
     });
 
     it("should emit true when autotype policy is enabled", async () => {
-      mockPolicyAppliesSubject.next(true);
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: true,
+        } as Policy,
+      ]);
       const policyStatus = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
       expect(policyStatus).toBe(true);
     });
 
-    it("should emit false when autotype policy is disabled", async () => {
-      mockPolicyAppliesSubject.next(false);
+    it("should emit null when autotype policy is disabled", async () => {
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: false,
+        } as Policy,
+      ]);
       const policyStatus = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
       expect(policyStatus).toBeNull();
     });
 
     it("should emit null when autotype policy does not apply", async () => {
-      mockPolicyAppliesSubject.next(false);
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.RequireSso,
+          enabled: true,
+        } as Policy,
+      ]);
       const policy = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
       expect(policy).toBeNull();
     });
 
     it("should react to authentication status changes", async () => {
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: true,
+        } as Policy,
+      ]);
+
       // Expect one emission when unlocked
       mockAuthStatusSubject.next(AuthenticationStatus.Unlocked);
       const first = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
-      expect(first).toBeNull();
+      expect(first).toBe(true);
 
       // Expect null emission when locked
       mockAuthStatusSubject.next(AuthenticationStatus.Locked);
@@ -134,33 +165,131 @@ describe("DesktopAutotypeDefaultSettingPolicy", () => {
     it("should react to account changes", async () => {
       const newUserId = "user-456" as UserId;
 
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: true,
+        } as Policy,
+      ]);
+
       // First value for original user
       const firstValue = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
-      expect(firstValue).toBeNull();
+      expect(firstValue).toBe(true);
 
       // Change account and expect a new emission
       mockAccountSubject.next({
         id: newUserId,
-      });
+      } as Account);
       const secondValue = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
-      expect(secondValue).toBeNull();
+      expect(secondValue).toBe(true);
 
       // Verify the auth lookup was switched to the new user
       expect(authService.authStatusFor$).toHaveBeenCalledWith(newUserId);
+      expect(policyService.policies$).toHaveBeenCalledWith(newUserId);
     });
 
     it("should react to policy changes", async () => {
-      mockPolicyAppliesSubject.next(false);
+      mockPoliciesSubject.next([]);
       const nullValue = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
       expect(nullValue).toBeNull();
 
-      mockPolicyAppliesSubject.next(true);
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: true,
+        } as Policy,
+      ]);
       const trueValue = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
       expect(trueValue).toBe(true);
 
-      mockPolicyAppliesSubject.next(false);
+      mockPoliciesSubject.next([]);
       const nullValueAgain = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
       expect(nullValueAgain).toBeNull();
     });
+
+    it("emits null again if the feature flag turns off after emitting", async () => {
+      mockPoliciesSubject.next([
+        { type: PolicyType.AutotypeDefaultSetting, enabled: true } as Policy,
+      ]);
+      expect(await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)))).toBe(true);
+
+      mockFeatureFlagSubject.next(false);
+      expect(await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)))).toBeNull();
+    });
+
+    it("replays the latest value to late subscribers", async () => {
+      mockPoliciesSubject.next([
+        { type: PolicyType.AutotypeDefaultSetting, enabled: true } as Policy,
+      ]);
+
+      await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+
+      const late = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(late).toBe(true);
+    });
+
+    it("does not re-emit when effective value is unchanged", async () => {
+      mockAccountSubject.next({ id: mockUserId } as Account);
+      mockAuthStatusSubject.next(AuthenticationStatus.Unlocked);
+
+      const policies = [
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: true,
+        } as Policy,
+      ];
+
+      mockPoliciesSubject.next(policies);
+      const first = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(first).toBe(true);
+
+      let emissionCount = 0;
+      const subscription = service.autotypeDefaultSetting$.subscribe(() => {
+        emissionCount++;
+      });
+
+      mockPoliciesSubject.next(policies);
+
+      await new Promise((resolve) => setTimeout(resolve, 50));
+      subscription.unsubscribe();
+
+      expect(emissionCount).toBe(1);
+    });
+
+    it("does not emit policy values while locked; emits after unlocking", async () => {
+      mockAuthStatusSubject.next(AuthenticationStatus.Locked);
+      mockPoliciesSubject.next([
+        { type: PolicyType.AutotypeDefaultSetting, enabled: true } as Policy,
+      ]);
+
+      expect(await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)))).toBeNull();
+
+      mockAuthStatusSubject.next(AuthenticationStatus.Unlocked);
+      expect(await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)))).toBe(true);
+    });
+
+    it("emits correctly if auth unlocks before policies arrive", async () => {
+      mockAccountSubject.next({ id: mockUserId } as Account);
+      mockAuthStatusSubject.next(AuthenticationStatus.Unlocked);
+      mockPoliciesSubject.next([
+        {
+          type: PolicyType.AutotypeDefaultSetting,
+          enabled: true,
+        } as Policy,
+      ]);
+
+      const result = await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+      expect(result).toBe(true);
+    });
+
+    it("wires dependencies with initial user id", async () => {
+      mockPoliciesSubject.next([
+        { type: PolicyType.AutotypeDefaultSetting, enabled: true } as Policy,
+      ]);
+      await firstValueFrom(service.autotypeDefaultSetting$.pipe(take(1)));
+
+      expect(authService.authStatusFor$).toHaveBeenCalledWith(mockUserId);
+      expect(policyService.policies$).toHaveBeenCalledWith(mockUserId);
+    });
   });
 });
diff --git a/apps/desktop/src/autofill/services/desktop-autotype-policy.service.ts b/apps/desktop/src/autofill/services/desktop-autotype-policy.service.ts
index 887a30ef6f6..d3ae67d2c8d 100644
--- a/apps/desktop/src/autofill/services/desktop-autotype-policy.service.ts
+++ b/apps/desktop/src/autofill/services/desktop-autotype-policy.service.ts
@@ -34,7 +34,7 @@ export class DesktopAutotypeDefaultSettingPolicy {
         }
 
         return this.accountService.activeAccount$.pipe(
-          filter((account) => account != null),
+          filter((account) => account != null && account.id != null),
           getUserId,
           distinctUntilChanged(),
           switchMap((userId) => {
@@ -43,13 +43,16 @@ export class DesktopAutotypeDefaultSettingPolicy {
               distinctUntilChanged(),
             );
 
-            const policy$ = this.policyService
-              .policyAppliesToUser$(PolicyType.AutotypeDefaultSetting, userId)
-              .pipe(
-                map((appliesToUser) => (appliesToUser ? true : null)),
-                distinctUntilChanged(),
-                shareReplay({ bufferSize: 1, refCount: true }),
-              );
+            const policy$ = this.policyService.policies$(userId).pipe(
+              map((policies) => {
+                const autotypePolicy = policies.find(
+                  (policy) => policy.type === PolicyType.AutotypeDefaultSetting && policy.enabled,
+                );
+                return autotypePolicy ? true : null;
+              }),
+              distinctUntilChanged(),
+              shareReplay({ bufferSize: 1, refCount: true }),
+            );
 
             return isUnlocked$.pipe(switchMap((unlocked) => (unlocked ? policy$ : of(null))));
           }),
diff --git a/apps/desktop/src/autofill/services/desktop-autotype.service.spec.ts b/apps/desktop/src/autofill/services/desktop-autotype.service.spec.ts
new file mode 100644
index 00000000000..30cc800dd28
--- /dev/null
+++ b/apps/desktop/src/autofill/services/desktop-autotype.service.spec.ts
@@ -0,0 +1,50 @@
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+import { getAutotypeVaultData } from "./desktop-autotype.service";
+
+describe("getAutotypeVaultData", () => {
+  it("should return vault data when cipher has username and password", () => {
+    const cipherView = new CipherView();
+    cipherView.login.username = "foo";
+    cipherView.login.password = "bar";
+
+    const [error, vaultData] = getAutotypeVaultData(cipherView);
+
+    expect(error).toBeNull();
+    expect(vaultData?.username).toEqual("foo");
+    expect(vaultData?.password).toEqual("bar");
+  });
+
+  it("should return error when firstCipher is undefined", () => {
+    const cipherView = undefined;
+    const [error, vaultData] = getAutotypeVaultData(cipherView);
+
+    expect(vaultData).toBeNull();
+    expect(error).toBeDefined();
+    expect(error?.message).toEqual("No matching vault item.");
+  });
+
+  it("should return error when username is undefined", () => {
+    const cipherView = new CipherView();
+    cipherView.login.username = undefined;
+    cipherView.login.password = "bar";
+
+    const [error, vaultData] = getAutotypeVaultData(cipherView);
+
+    expect(vaultData).toBeNull();
+    expect(error).toBeDefined();
+    expect(error?.message).toEqual("Vault item is undefined.");
+  });
+
+  it("should return error when password is undefined", () => {
+    const cipherView = new CipherView();
+    cipherView.login.username = "foo";
+    cipherView.login.password = undefined;
+
+    const [error, vaultData] = getAutotypeVaultData(cipherView);
+
+    expect(vaultData).toBeNull();
+    expect(error).toBeDefined();
+    expect(error?.message).toEqual("Vault item is undefined.");
+  });
+});
diff --git a/apps/desktop/src/autofill/services/desktop-autotype.service.ts b/apps/desktop/src/autofill/services/desktop-autotype.service.ts
index 34f70be64cb..7ee889e7b81 100644
--- a/apps/desktop/src/autofill/services/desktop-autotype.service.ts
+++ b/apps/desktop/src/autofill/services/desktop-autotype.service.ts
@@ -1,6 +1,6 @@
 import { combineLatest, filter, firstValueFrom, map, Observable, of, switchMap } from "rxjs";
 
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { Account, 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 { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
@@ -17,6 +17,8 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { UserId } from "@bitwarden/user-core";
 
+import { AutotypeVaultData } from "../models/autotype-vault-data";
+
 import { DesktopAutotypeDefaultSettingPolicy } from "./desktop-autotype-policy.service";
 
 export const defaultWindowsAutotypeKeyboardShortcut: string[] = ["Control", "Shift", "B"];
@@ -27,6 +29,8 @@ export const AUTOTYPE_ENABLED = new KeyDefinition<boolean | null>(
   { deserializer: (b) => b },
 );
 
+export type Result<T, E = Error> = [E, null] | [null, T];
+
 /*
   Valid windows shortcut keys: Control, Alt, Super, Shift, letters A - Z
   Valid macOS shortcut keys: Control, Alt, Command, Shift, letters A - Z
@@ -63,17 +67,16 @@ export class DesktopAutotypeService {
     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,
-      });
+      const [error, vaultData] = getAutotypeVaultData(firstCipher);
+      callback(error, vaultData);
     });
   }
 
   async init() {
     this.autotypeEnabledUserSetting$ = this.autotypeEnabledState.state$;
-    this.autotypeKeyboardShortcut$ = this.autotypeKeyboardShortcut.state$;
+    this.autotypeKeyboardShortcut$ = this.autotypeKeyboardShortcut.state$.pipe(
+      map((shortcut) => shortcut ?? defaultWindowsAutotypeKeyboardShortcut),
+    );
 
     // Currently Autotype is only supported for Windows
     if (this.platformUtilsService.getDevice() === DeviceType.WindowsDesktop) {
@@ -109,9 +112,9 @@ export class DesktopAutotypeService {
           switchMap((userId) => this.authService.authStatusFor$(userId)),
         ),
         this.accountService.activeAccount$.pipe(
-          map((activeAccount) => activeAccount?.id),
-          switchMap((userId) =>
-            this.billingAccountProfileStateService.hasPremiumFromAnySource$(userId),
+          filter((account): account is Account => !!account),
+          switchMap((account) =>
+            this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
           ),
         ),
       ]).pipe(
@@ -174,3 +177,23 @@ export class DesktopAutotypeService {
     return possibleCiphers;
   }
 }
+
+/**
+ * @return an `AutotypeVaultData` object or an `Error` if the
+ * cipher or vault data within are undefined.
+ */
+export function getAutotypeVaultData(
+  cipherView: CipherView | undefined,
+): Result<AutotypeVaultData> {
+  if (!cipherView) {
+    return [Error("No matching vault item."), null];
+  } else if (cipherView.login.username === undefined || cipherView.login.password === undefined) {
+    return [Error("Vault item is undefined."), null];
+  } else {
+    const vaultData: AutotypeVaultData = {
+      username: cipherView.login.username,
+      password: cipherView.login.password,
+    };
+    return [null, vaultData];
+  }
+}
diff --git a/apps/desktop/src/billing/app/accounts/premium.component.ts b/apps/desktop/src/billing/app/accounts/premium.component.ts
index 5d0fa7a5dde..637969c1a21 100644
--- a/apps/desktop/src/billing/app/accounts/premium.component.ts
+++ b/apps/desktop/src/billing/app/accounts/premium.component.ts
@@ -10,6 +10,8 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-premium",
   templateUrl: "premium.component.html",
diff --git a/apps/desktop/src/images/loading.svg b/apps/desktop/src/images/loading.svg
index 5f4102a5921..e05a42f6c70 100644
--- a/apps/desktop/src/images/loading.svg
+++ b/apps/desktop/src/images/loading.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 100% 100%">
-  <text fill="%23333333" x="50%" y="50%" font-family="\'Roboto\', \'Helvetica Neue\', Helvetica, Arial, sans-serif"
+  <text fill="%23333333" x="50%" y="50%" font-family="\'Inter\', \'Helvetica Neue\', Helvetica, Arial, sans-serif"
         font-size="18" text-anchor="middle">
     Loading...
   </text>
diff --git a/apps/desktop/src/key-management/biometrics/desktop.biometrics.service.ts b/apps/desktop/src/key-management/biometrics/desktop.biometrics.service.ts
index 97e1d322a0e..59d9dcce7fe 100644
--- a/apps/desktop/src/key-management/biometrics/desktop.biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/desktop.biometrics.service.ts
@@ -13,4 +13,9 @@ export abstract class DesktopBiometricsService extends BiometricsService {
   ): Promise<void>;
   abstract deleteBiometricUnlockKeyForUser(userId: UserId): Promise<void>;
   abstract setupBiometrics(): Promise<void>;
+  abstract enrollPersistent(userId: UserId, key: SymmetricCryptoKey): Promise<void>;
+  abstract hasPersistentKey(userId: UserId): Promise<boolean>;
+  /* Enables the v2 biometrics re-write. This will stay enabled until the application is restarted. */
+  abstract enableLinuxV2Biometrics(): Promise<void>;
+  abstract isLinuxV2BiometricsEnabled(): Promise<boolean>;
 }
diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics-ipc.listener.ts b/apps/desktop/src/key-management/biometrics/main-biometrics-ipc.listener.ts
index d4ce01f53f4..e30e4af3bac 100644
--- a/apps/desktop/src/key-management/biometrics/main-biometrics-ipc.listener.ts
+++ b/apps/desktop/src/key-management/biometrics/main-biometrics-ipc.listener.ts
@@ -51,6 +51,17 @@ export class MainBiometricsIPCListener {
             return await this.biometricService.setShouldAutopromptNow(message.data as boolean);
           case BiometricAction.GetShouldAutoprompt:
             return await this.biometricService.getShouldAutopromptNow();
+          case BiometricAction.HasPersistentKey:
+            return await this.biometricService.hasPersistentKey(message.userId as UserId);
+          case BiometricAction.EnrollPersistent:
+            return await this.biometricService.enrollPersistent(
+              message.userId as UserId,
+              SymmetricCryptoKey.fromString(message.key as string),
+            );
+          case BiometricAction.EnableLinuxV2:
+            return await this.biometricService.enableLinuxV2Biometrics();
+          case BiometricAction.IsLinuxV2Enabled:
+            return await this.biometricService.isLinuxV2BiometricsEnabled();
           default:
             return;
         }
diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts b/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts
index bc57a7e55fb..0cbe032aa76 100644
--- a/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts
+++ b/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts
@@ -7,6 +7,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { EncryptionType } from "@bitwarden/common/platform/enums";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
+import { newGuid } from "@bitwarden/guid";
 import {
   BiometricsService,
   BiometricsStatus,
@@ -16,9 +17,9 @@ import {
 import { WindowMain } from "../../main/window.main";
 
 import { MainBiometricsService } from "./main-biometrics.service";
+import { WindowsBiometricsSystem } from "./native-v2";
 import OsBiometricsServiceLinux from "./os-biometrics-linux.service";
 import OsBiometricsServiceMac from "./os-biometrics-mac.service";
-import OsBiometricsServiceWindows from "./os-biometrics-windows.service";
 import { OsBiometricService } from "./os-biometrics.service";
 
 jest.mock("@bitwarden/desktop-napi", () => {
@@ -28,6 +29,13 @@ jest.mock("@bitwarden/desktop-napi", () => {
   };
 });
 
+jest.mock("./native-v2", () => ({
+  WindowsBiometricsSystem: jest.fn(),
+  biometrics_v2: {
+    initBiometricSystem: jest.fn(),
+  },
+}));
+
 const unlockKey = new SymmetricCryptoKey(new Uint8Array(64));
 
 describe("MainBiometricsService", function () {
@@ -38,24 +46,6 @@ describe("MainBiometricsService", function () {
   const cryptoFunctionService = mock<CryptoFunctionService>();
   const encryptService = mock<EncryptService>();
 
-  it("Should call the platformspecific methods", async () => {
-    const sut = new MainBiometricsService(
-      i18nService,
-      windowMain,
-      logService,
-      process.platform,
-      biometricStateService,
-      encryptService,
-      cryptoFunctionService,
-    );
-
-    const mockService = mock<OsBiometricService>();
-    (sut as any).osBiometricsService = mockService;
-
-    await sut.authenticateBiometric();
-    expect(mockService.authenticateBiometric).toBeCalled();
-  });
-
   describe("Should create a platform specific service", function () {
     it("Should create a biometrics service specific for Windows", () => {
       const sut = new MainBiometricsService(
@@ -70,7 +60,7 @@ describe("MainBiometricsService", function () {
 
       const internalService = (sut as any).osBiometricsService;
       expect(internalService).not.toBeNull();
-      expect(internalService).toBeInstanceOf(OsBiometricsServiceWindows);
+      expect(internalService).toBeInstanceOf(WindowsBiometricsSystem);
     });
 
     it("Should create a biometrics service specific for MacOs", () => {
@@ -207,46 +197,6 @@ describe("MainBiometricsService", function () {
     });
   });
 
-  describe("setupBiometrics", () => {
-    it("should call the platform specific setup method", async () => {
-      const sut = new MainBiometricsService(
-        i18nService,
-        windowMain,
-        logService,
-        process.platform,
-        biometricStateService,
-        encryptService,
-        cryptoFunctionService,
-      );
-      const osBiometricsService = mock<OsBiometricService>();
-      (sut as any).osBiometricsService = osBiometricsService;
-
-      await sut.setupBiometrics();
-
-      expect(osBiometricsService.runSetup).toHaveBeenCalled();
-    });
-  });
-
-  describe("authenticateWithBiometrics", () => {
-    it("should call the platform specific authenticate method", async () => {
-      const sut = new MainBiometricsService(
-        i18nService,
-        windowMain,
-        logService,
-        process.platform,
-        biometricStateService,
-        encryptService,
-        cryptoFunctionService,
-      );
-      const osBiometricsService = mock<OsBiometricService>();
-      (sut as any).osBiometricsService = osBiometricsService;
-
-      await sut.authenticateWithBiometrics();
-
-      expect(osBiometricsService.authenticateBiometric).toHaveBeenCalled();
-    });
-  });
-
   describe("unlockWithBiometricsForUser", () => {
     let sut: MainBiometricsService;
     let osBiometricsService: MockProxy<OsBiometricService>;
@@ -288,55 +238,6 @@ describe("MainBiometricsService", function () {
     });
   });
 
-  describe("setBiometricProtectedUnlockKeyForUser", () => {
-    let sut: MainBiometricsService;
-    let osBiometricsService: MockProxy<OsBiometricService>;
-
-    beforeEach(() => {
-      sut = new MainBiometricsService(
-        i18nService,
-        windowMain,
-        logService,
-        process.platform,
-        biometricStateService,
-        encryptService,
-        cryptoFunctionService,
-      );
-      osBiometricsService = mock<OsBiometricService>();
-      (sut as any).osBiometricsService = osBiometricsService;
-    });
-
-    it("should call the platform specific setBiometricKey method", async () => {
-      const userId = "test" as UserId;
-
-      await sut.setBiometricProtectedUnlockKeyForUser(userId, unlockKey);
-
-      expect(osBiometricsService.setBiometricKey).toHaveBeenCalledWith(userId, unlockKey);
-    });
-  });
-
-  describe("deleteBiometricUnlockKeyForUser", () => {
-    it("should call the platform specific deleteBiometricKey method", async () => {
-      const sut = new MainBiometricsService(
-        i18nService,
-        windowMain,
-        logService,
-        process.platform,
-        biometricStateService,
-        encryptService,
-        cryptoFunctionService,
-      );
-      const osBiometricsService = mock<OsBiometricService>();
-      (sut as any).osBiometricsService = osBiometricsService;
-
-      const userId = "test" as UserId;
-
-      await sut.deleteBiometricUnlockKeyForUser(userId);
-
-      expect(osBiometricsService.deleteBiometricKey).toHaveBeenCalledWith(userId);
-    });
-  });
-
   describe("setShouldAutopromptNow", () => {
     let sut: MainBiometricsService;
 
@@ -386,4 +287,66 @@ describe("MainBiometricsService", function () {
       expect(shouldAutoPrompt).toBe(true);
     });
   });
+
+  describe("pass through methods that call platform specific osBiometricsService methods", () => {
+    const userId = newGuid() as UserId;
+    let sut: MainBiometricsService;
+    let osBiometricsService: MockProxy<OsBiometricService>;
+
+    beforeEach(() => {
+      sut = new MainBiometricsService(
+        i18nService,
+        windowMain,
+        logService,
+        process.platform,
+        biometricStateService,
+        encryptService,
+        cryptoFunctionService,
+      );
+      osBiometricsService = mock<OsBiometricService>();
+      (sut as any).osBiometricsService = osBiometricsService;
+    });
+
+    it("calls the platform specific setBiometricKey method", async () => {
+      await sut.setBiometricProtectedUnlockKeyForUser(userId, unlockKey);
+
+      expect(osBiometricsService.setBiometricKey).toHaveBeenCalledWith(userId, unlockKey);
+    });
+
+    it("calls the platform specific enrollPersistent method", async () => {
+      await sut.enrollPersistent(userId, unlockKey);
+
+      expect(osBiometricsService.enrollPersistent).toHaveBeenCalledWith(userId, unlockKey);
+    });
+
+    it("calls the platform specific hasPersistentKey method", async () => {
+      await sut.hasPersistentKey(userId);
+
+      expect(osBiometricsService.hasPersistentKey).toHaveBeenCalledWith(userId);
+    });
+
+    it("calls the platform specific deleteBiometricUnlockKeyForUser method", async () => {
+      await sut.deleteBiometricUnlockKeyForUser(userId);
+
+      expect(osBiometricsService.deleteBiometricKey).toHaveBeenCalledWith(userId);
+    });
+
+    it("calls the platform specific authenticateWithBiometrics method", async () => {
+      await sut.authenticateWithBiometrics();
+
+      expect(osBiometricsService.authenticateBiometric).toHaveBeenCalled();
+    });
+
+    it("calls the platform specific authenticateBiometric method", async () => {
+      await sut.authenticateBiometric();
+
+      expect(osBiometricsService.authenticateBiometric).toHaveBeenCalled();
+    });
+
+    it("calls the platform specific setupBiometrics method", async () => {
+      await sut.setupBiometrics();
+
+      expect(osBiometricsService.runSetup).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts b/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
index 1de8e3cd12d..ad9ec62afcc 100644
--- a/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
@@ -10,32 +10,29 @@ import { BiometricsStatus, BiometricStateService } from "@bitwarden/key-manageme
 import { WindowMain } from "../../main/window.main";
 
 import { DesktopBiometricsService } from "./desktop.biometrics.service";
+import { LinuxBiometricsSystem, WindowsBiometricsSystem } from "./native-v2";
 import { OsBiometricService } from "./os-biometrics.service";
 
 export class MainBiometricsService extends DesktopBiometricsService {
   private osBiometricsService: OsBiometricService;
   private shouldAutoPrompt = true;
+  private linuxV2BiometricsEnabled = false;
 
   constructor(
     private i18nService: I18nService,
     private windowMain: WindowMain,
     private logService: LogService,
-    platform: NodeJS.Platform,
+    private platform: NodeJS.Platform,
     private biometricStateService: BiometricStateService,
     private encryptService: EncryptService,
     private cryptoFunctionService: CryptoFunctionService,
   ) {
     super();
     if (platform === "win32") {
-      // eslint-disable-next-line
-      const OsBiometricsServiceWindows = require("./os-biometrics-windows.service").default;
-      this.osBiometricsService = new OsBiometricsServiceWindows(
+      this.osBiometricsService = new WindowsBiometricsSystem(
         this.i18nService,
         this.windowMain,
         this.logService,
-        this.biometricStateService,
-        this.encryptService,
-        this.cryptoFunctionService,
       );
     } else if (platform === "darwin") {
       // eslint-disable-next-line
@@ -144,4 +141,24 @@ export class MainBiometricsService extends DesktopBiometricsService {
   async canEnableBiometricUnlock(): Promise<boolean> {
     return true;
   }
+
+  async enrollPersistent(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    return await this.osBiometricsService.enrollPersistent(userId, key);
+  }
+
+  async hasPersistentKey(userId: UserId): Promise<boolean> {
+    return await this.osBiometricsService.hasPersistentKey(userId);
+  }
+
+  async enableLinuxV2Biometrics(): Promise<void> {
+    if (this.platform === "linux" && !this.linuxV2BiometricsEnabled) {
+      this.logService.info("[BiometricsMain] Loading native biometrics module v2 for linux");
+      this.osBiometricsService = new LinuxBiometricsSystem();
+      this.linuxV2BiometricsEnabled = true;
+    }
+  }
+
+  async isLinuxV2BiometricsEnabled(): Promise<boolean> {
+    return this.linuxV2BiometricsEnabled;
+  }
 }
diff --git a/apps/desktop/src/key-management/biometrics/native-v2/index.ts b/apps/desktop/src/key-management/biometrics/native-v2/index.ts
new file mode 100644
index 00000000000..94de850b759
--- /dev/null
+++ b/apps/desktop/src/key-management/biometrics/native-v2/index.ts
@@ -0,0 +1,2 @@
+export { default as WindowsBiometricsSystem } from "./os-biometrics-windows.service";
+export { default as LinuxBiometricsSystem } from "./os-biometrics-linux.service";
diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.spec.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.spec.ts
new file mode 100644
index 00000000000..91e2caba0cb
--- /dev/null
+++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.spec.ts
@@ -0,0 +1,96 @@
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
+import { biometrics_v2, passwords } from "@bitwarden/desktop-napi";
+import { BiometricsStatus } from "@bitwarden/key-management";
+
+import OsBiometricsServiceLinux from "./os-biometrics-linux.service";
+
+jest.mock("@bitwarden/desktop-napi", () => ({
+  biometrics_v2: {
+    initBiometricSystem: jest.fn(() => "mockSystem"),
+    provideKey: jest.fn(),
+    unenroll: jest.fn(),
+    unlock: jest.fn(),
+    authenticate: jest.fn(),
+    authenticateAvailable: jest.fn(),
+    unlockAvailable: jest.fn(),
+  },
+  passwords: {
+    isAvailable: jest.fn(),
+  },
+}));
+
+const mockKey = new Uint8Array(64);
+
+jest.mock("../../../utils", () => ({
+  isFlatpak: jest.fn(() => false),
+  isLinux: jest.fn(() => true),
+  isSnapStore: jest.fn(() => false),
+}));
+
+describe("OsBiometricsServiceLinux", () => {
+  const userId = "user-id" as UserId;
+  const key = { toEncoded: () => ({ buffer: Buffer.from(mockKey) }) } as SymmetricCryptoKey;
+  let service: OsBiometricsServiceLinux;
+
+  beforeEach(() => {
+    service = new OsBiometricsServiceLinux();
+    jest.clearAllMocks();
+  });
+
+  it("should set biometric key", async () => {
+    await service.setBiometricKey(userId, key);
+    expect(biometrics_v2.provideKey).toHaveBeenCalled();
+  });
+
+  it("should delete biometric key", async () => {
+    await service.deleteBiometricKey(userId);
+    expect(biometrics_v2.unenroll).toHaveBeenCalled();
+  });
+
+  it("should get biometric key", async () => {
+    (biometrics_v2.unlock as jest.Mock).mockResolvedValue(mockKey);
+    const result = await service.getBiometricKey(userId);
+    expect(result).toBeInstanceOf(SymmetricCryptoKey);
+  });
+
+  it("should return null if no biometric key", async () => {
+    (biometrics_v2.unlock as jest.Mock).mockResolvedValue(null);
+    const result = await service.getBiometricKey(userId);
+    expect(result).toBeNull();
+  });
+
+  it("should authenticate biometric", async () => {
+    (biometrics_v2.authenticate as jest.Mock).mockResolvedValue(true);
+    const result = await service.authenticateBiometric();
+    expect(result).toBe(true);
+  });
+
+  it("should check if biometrics is supported", async () => {
+    (passwords.isAvailable as jest.Mock).mockResolvedValue(true);
+    const result = await service.supportsBiometrics();
+    expect(result).toBe(true);
+  });
+
+  it("should check if setup is needed", async () => {
+    (biometrics_v2.authenticateAvailable as jest.Mock).mockResolvedValue(false);
+    const result = await service.needsSetup();
+    expect(result).toBe(true);
+  });
+
+  it("should check if can auto setup", async () => {
+    const result = await service.canAutoSetup();
+    expect(result).toBe(true);
+  });
+
+  it("should get biometrics first unlock status for user", async () => {
+    (biometrics_v2.unlockAvailable as jest.Mock).mockResolvedValue(true);
+    const result = await service.getBiometricsFirstUnlockStatusForUser(userId);
+    expect(result).toBe(BiometricsStatus.Available);
+  });
+
+  it("should return false for hasPersistentKey", async () => {
+    const result = await service.hasPersistentKey(userId);
+    expect(result).toBe(false);
+  });
+});
diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts
new file mode 100644
index 00000000000..110db23ec79
--- /dev/null
+++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts
@@ -0,0 +1,118 @@
+import { spawn } from "child_process";
+
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
+import { biometrics_v2, passwords } from "@bitwarden/desktop-napi";
+import { BiometricsStatus } from "@bitwarden/key-management";
+
+import { isSnapStore, isFlatpak, isLinux } from "../../../utils";
+import { OsBiometricService } from "../os-biometrics.service";
+
+const polkitPolicy = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+    <action id="com.bitwarden.Bitwarden.unlock">
+      <description>Unlock Bitwarden</description>
+      <message>Authenticate to unlock Bitwarden</message>
+      <defaults>
+        <allow_any>no</allow_any>
+        <allow_inactive>no</allow_inactive>
+        <allow_active>auth_self</allow_active>
+      </defaults>
+    </action>
+</policyconfig>`;
+const policyFileName = "com.bitwarden.Bitwarden.policy";
+const policyPath = "/usr/share/polkit-1/actions/";
+
+export default class OsBiometricsServiceLinux implements OsBiometricService {
+  private biometricsSystem: biometrics_v2.BiometricLockSystem;
+
+  constructor() {
+    this.biometricsSystem = biometrics_v2.initBiometricSystem();
+  }
+
+  async setBiometricKey(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    await biometrics_v2.provideKey(
+      this.biometricsSystem,
+      userId,
+      Buffer.from(key.toEncoded().buffer),
+    );
+  }
+
+  async deleteBiometricKey(userId: UserId): Promise<void> {
+    await biometrics_v2.unenroll(this.biometricsSystem, userId);
+  }
+
+  async getBiometricKey(userId: UserId): Promise<SymmetricCryptoKey | null> {
+    const result = await biometrics_v2.unlock(this.biometricsSystem, userId, Buffer.from(""));
+    return result ? new SymmetricCryptoKey(Uint8Array.from(result)) : null;
+  }
+
+  async authenticateBiometric(): Promise<boolean> {
+    return await biometrics_v2.authenticate(
+      this.biometricsSystem,
+      Buffer.from(""),
+      "Authenticate to unlock",
+    );
+  }
+
+  async supportsBiometrics(): Promise<boolean> {
+    // We assume all linux distros have some polkit implementation
+    // that either has bitwarden set up or not, which is reflected in osBiomtricsNeedsSetup.
+    // Snap does not have access at the moment to polkit
+    // This could be dynamically detected on dbus in the future.
+    // We should check if a libsecret implementation is available on the system
+    // because otherwise we cannot offlod the protected userkey to secure storage.
+    return await passwords.isAvailable();
+  }
+
+  async needsSetup(): Promise<boolean> {
+    if (isSnapStore()) {
+      return false;
+    }
+
+    // check whether the polkit policy is loaded via dbus call to polkit
+    return !(await biometrics_v2.authenticateAvailable(this.biometricsSystem));
+  }
+
+  async canAutoSetup(): Promise<boolean> {
+    // We cannot auto setup on snap or flatpak since the filesystem is sandboxed.
+    // The user needs to manually set up the polkit policy outside of the sandbox
+    // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from
+    // the sandbox, once the policy is set up outside of the sandbox.
+    return isLinux() && !isSnapStore() && !isFlatpak();
+  }
+
+  async runSetup(): Promise<void> {
+    const process = spawn("pkexec", [
+      "bash",
+      "-c",
+      `echo '${polkitPolicy}' > ${policyPath + policyFileName} && chown root:root ${policyPath + policyFileName} && chcon system_u:object_r:usr_t:s0 ${policyPath + policyFileName}`,
+    ]);
+
+    await new Promise((resolve, reject) => {
+      process.on("close", (code) => {
+        if (code !== 0) {
+          reject("Failed to set up polkit policy");
+        } else {
+          resolve(null);
+        }
+      });
+    });
+  }
+
+  async getBiometricsFirstUnlockStatusForUser(userId: UserId): Promise<BiometricsStatus> {
+    return (await biometrics_v2.unlockAvailable(this.biometricsSystem, userId))
+      ? BiometricsStatus.Available
+      : BiometricsStatus.UnlockNeeded;
+  }
+
+  async enrollPersistent(userId: UserId, key: SymmetricCryptoKey): Promise<void> {}
+
+  async hasPersistentKey(userId: UserId): Promise<boolean> {
+    return false;
+  }
+}
diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.spec.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.spec.ts
new file mode 100644
index 00000000000..28b05c490b0
--- /dev/null
+++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.spec.ts
@@ -0,0 +1,126 @@
+import { mock } from "jest-mock-extended";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
+import { biometrics_v2 } from "@bitwarden/desktop-napi";
+import { BiometricsStatus } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+
+import { WindowMain } from "../../main/window.main";
+
+import OsBiometricsServiceWindows from "./os-biometrics-windows.service";
+
+jest.mock("@bitwarden/desktop-napi", () => ({
+  biometrics_v2: {
+    initBiometricSystem: jest.fn(() => "mockSystem"),
+    provideKey: jest.fn(),
+    enrollPersistent: jest.fn(),
+    unenroll: jest.fn(),
+    unlock: jest.fn(),
+    authenticate: jest.fn(),
+    authenticateAvailable: jest.fn(),
+    unlockAvailable: jest.fn(),
+    hasPersistent: jest.fn(),
+  },
+  passwords: {
+    isAvailable: jest.fn(),
+  },
+}));
+
+const mockKey = new Uint8Array(64);
+
+jest.mock("../../../utils", () => ({
+  isFlatpak: jest.fn(() => false),
+  isLinux: jest.fn(() => true),
+  isSnapStore: jest.fn(() => false),
+}));
+
+describe("OsBiometricsServiceWindows", () => {
+  const userId = "user-id" as UserId;
+
+  let service: OsBiometricsServiceWindows;
+  let i18nService: I18nService;
+  let windowMain: WindowMain;
+  let logService: LogService;
+
+  beforeEach(() => {
+    i18nService = mock<I18nService>();
+    windowMain = mock<WindowMain>();
+    logService = mock<LogService>();
+
+    windowMain.win.getNativeWindowHandle = jest.fn().mockReturnValue(Buffer.from([1, 2, 3, 4]));
+    service = new OsBiometricsServiceWindows(i18nService, windowMain, logService);
+  });
+
+  it("should enroll persistent biometric key", async () => {
+    await service.enrollPersistent("user-id" as UserId, new SymmetricCryptoKey(mockKey));
+    expect(biometrics_v2.enrollPersistent).toHaveBeenCalled();
+  });
+
+  it("should set biometric key", async () => {
+    await service.setBiometricKey(userId, new SymmetricCryptoKey(mockKey));
+    expect(biometrics_v2.provideKey).toHaveBeenCalled();
+  });
+
+  it("should delete biometric key", async () => {
+    await service.deleteBiometricKey(userId);
+    expect(biometrics_v2.unenroll).toHaveBeenCalled();
+  });
+
+  it("should get biometric key", async () => {
+    (biometrics_v2.unlock as jest.Mock).mockResolvedValue(mockKey);
+    const result = await service.getBiometricKey(userId);
+    expect(result).toBeInstanceOf(SymmetricCryptoKey);
+  });
+
+  it("should return null if no biometric key", async () => {
+    const error = new Error("No key found");
+    (biometrics_v2.unlock as jest.Mock).mockRejectedValue(error);
+    const result = await service.getBiometricKey(userId);
+    expect(result).toBeNull();
+    expect(logService.warning).toHaveBeenCalledWith(
+      `[OsBiometricsServiceWindows] Fetching the biometric key failed: ${error} returning null`,
+    );
+  });
+
+  it("should authenticate biometric", async () => {
+    (biometrics_v2.authenticate as jest.Mock).mockResolvedValue(true);
+    const result = await service.authenticateBiometric();
+    expect(result).toBe(true);
+  });
+
+  it("should check if biometrics is supported", async () => {
+    (biometrics_v2.authenticateAvailable as jest.Mock).mockResolvedValue(true);
+    const result = await service.supportsBiometrics();
+    expect(result).toBe(true);
+  });
+
+  it("should return needs setup false", async () => {
+    const result = await service.needsSetup();
+    expect(result).toBe(false);
+  });
+
+  it("should return auto setup false", async () => {
+    const result = await service.canAutoSetup();
+    expect(result).toBe(false);
+  });
+
+  it("should get biometrics first unlock status for user", async () => {
+    (biometrics_v2.unlockAvailable as jest.Mock).mockResolvedValue(true);
+    const result = await service.getBiometricsFirstUnlockStatusForUser(userId);
+    expect(result).toBe(BiometricsStatus.Available);
+  });
+
+  it("should return false for hasPersistentKey false", async () => {
+    (biometrics_v2.hasPersistent as jest.Mock).mockResolvedValue(false);
+    const result = await service.hasPersistentKey(userId);
+    expect(result).toBe(false);
+  });
+
+  it("should return false for hasPersistentKey true", async () => {
+    (biometrics_v2.hasPersistent as jest.Mock).mockResolvedValue(true);
+    const result = await service.hasPersistentKey(userId);
+    expect(result).toBe(true);
+  });
+});
diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.ts
new file mode 100644
index 00000000000..4d9794daa74
--- /dev/null
+++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-windows.service.ts
@@ -0,0 +1,91 @@
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
+import { biometrics_v2 } from "@bitwarden/desktop-napi";
+import { BiometricsStatus } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+
+import { WindowMain } from "../../../main/window.main";
+import { OsBiometricService } from "../os-biometrics.service";
+
+export default class OsBiometricsServiceWindows implements OsBiometricService {
+  private biometricsSystem: biometrics_v2.BiometricLockSystem;
+
+  constructor(
+    private i18nService: I18nService,
+    private windowMain: WindowMain,
+    private logService: LogService,
+  ) {
+    this.biometricsSystem = biometrics_v2.initBiometricSystem();
+  }
+
+  async enrollPersistent(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    await biometrics_v2.enrollPersistent(
+      this.biometricsSystem,
+      userId,
+      Buffer.from(key.toEncoded().buffer),
+    );
+  }
+
+  async hasPersistentKey(userId: UserId): Promise<boolean> {
+    return await biometrics_v2.hasPersistent(this.biometricsSystem, userId);
+  }
+
+  async supportsBiometrics(): Promise<boolean> {
+    return await biometrics_v2.authenticateAvailable(this.biometricsSystem);
+  }
+
+  async getBiometricKey(userId: UserId): Promise<SymmetricCryptoKey | null> {
+    try {
+      const key = await biometrics_v2.unlock(
+        this.biometricsSystem,
+        userId,
+        this.windowMain.win.getNativeWindowHandle(),
+      );
+      return key ? new SymmetricCryptoKey(Uint8Array.from(key)) : null;
+    } catch (error) {
+      this.logService.warning(
+        `[OsBiometricsServiceWindows] Fetching the biometric key failed: ${error} returning null`,
+      );
+      return null;
+    }
+  }
+
+  async setBiometricKey(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    await biometrics_v2.provideKey(
+      this.biometricsSystem,
+      userId,
+      Buffer.from(key.toEncoded().buffer),
+    );
+  }
+
+  async deleteBiometricKey(userId: UserId): Promise<void> {
+    await biometrics_v2.unenroll(this.biometricsSystem, userId);
+  }
+
+  async authenticateBiometric(): Promise<boolean> {
+    const hwnd = this.windowMain.win.getNativeWindowHandle();
+    return await biometrics_v2.authenticate(
+      this.biometricsSystem,
+      hwnd,
+      this.i18nService.t("windowsHelloConsentMessage"),
+    );
+  }
+
+  async needsSetup() {
+    return false;
+  }
+
+  async canAutoSetup(): Promise<boolean> {
+    return false;
+  }
+
+  async runSetup(): Promise<void> {}
+
+  async getBiometricsFirstUnlockStatusForUser(userId: UserId): Promise<BiometricsStatus> {
+    return (await biometrics_v2.hasPersistent(this.biometricsSystem, userId)) ||
+      (await biometrics_v2.unlockAvailable(this.biometricsSystem, userId))
+      ? BiometricsStatus.Available
+      : BiometricsStatus.UnlockNeeded;
+  }
+}
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
index 0ef3033b4c5..400918a69bb 100644
--- a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
@@ -47,6 +47,12 @@ export default class OsBiometricsServiceLinux implements OsBiometricService {
     private logService: LogService,
   ) {}
 
+  async enrollPersistent(userId: UserId, key: SymmetricCryptoKey): Promise<void> {}
+
+  async hasPersistentKey(userId: UserId): Promise<boolean> {
+    return false;
+  }
+
   private _iv: string | null = null;
   // Use getKeyMaterial helper instead of direct access
   private _osKeyHalf: string | null = null;
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.ts
index 1dc64f1bcd5..87d63971750 100644
--- a/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.ts
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.ts
@@ -20,6 +20,14 @@ export default class OsBiometricsServiceMac implements OsBiometricService {
     private logService: LogService,
   ) {}
 
+  async enrollPersistent(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    return await passwords.setPassword(SERVICE, getLookupKeyForUser(userId), key.toBase64());
+  }
+
+  async hasPersistentKey(userId: UserId): Promise<boolean> {
+    return (await passwords.getPassword(SERVICE, getLookupKeyForUser(userId))) != null;
+  }
+
   async supportsBiometrics(): Promise<boolean> {
     return systemPreferences.canPromptTouchID();
   }
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.spec.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.spec.ts
deleted file mode 100644
index f301efc70e7..00000000000
--- a/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.spec.ts
+++ /dev/null
@@ -1,378 +0,0 @@
-import { randomBytes } from "node:crypto";
-
-import { BrowserWindow } from "electron";
-import { mock } from "jest-mock-extended";
-
-import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { UserId } from "@bitwarden/common/types/guid";
-import { biometrics, passwords } from "@bitwarden/desktop-napi";
-import { BiometricsStatus, BiometricStateService } from "@bitwarden/key-management";
-
-import { WindowMain } from "../../main/window.main";
-
-import OsBiometricsServiceWindows from "./os-biometrics-windows.service";
-
-import OsDerivedKey = biometrics.OsDerivedKey;
-
-jest.mock("@bitwarden/desktop-napi", () => {
-  return {
-    biometrics: {
-      available: jest.fn().mockResolvedValue(true),
-      getBiometricSecret: jest.fn().mockResolvedValue(""),
-      setBiometricSecret: jest.fn().mockResolvedValue(""),
-      deleteBiometricSecret: jest.fn(),
-      deriveKeyMaterial: jest.fn().mockResolvedValue({
-        keyB64: "",
-        ivB64: "",
-      }),
-      prompt: jest.fn().mockResolvedValue(true),
-    },
-    passwords: {
-      getPassword: jest.fn().mockResolvedValue(null),
-      deletePassword: jest.fn().mockImplementation(() => {}),
-      isAvailable: jest.fn(),
-      PASSWORD_NOT_FOUND: "Password not found",
-    },
-  };
-});
-
-describe("OsBiometricsServiceWindows", function () {
-  const i18nService = mock<I18nService>();
-  const windowMain = mock<WindowMain>();
-  const browserWindow = mock<BrowserWindow>();
-  const encryptionService: EncryptService = mock<EncryptService>();
-  const cryptoFunctionService: CryptoFunctionService = mock<CryptoFunctionService>();
-  const biometricStateService: BiometricStateService = mock<BiometricStateService>();
-  const logService = mock<LogService>();
-
-  let service: OsBiometricsServiceWindows;
-
-  const key = new SymmetricCryptoKey(new Uint8Array(64));
-  const userId = "test-user-id" as UserId;
-  const serviceKey = "Bitwarden_biometric";
-  const storageKey = `${userId}_user_biometric`;
-
-  beforeEach(() => {
-    windowMain.win = browserWindow;
-
-    service = new OsBiometricsServiceWindows(
-      i18nService,
-      windowMain,
-      logService,
-      biometricStateService,
-      encryptionService,
-      cryptoFunctionService,
-    );
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe("getBiometricsFirstUnlockStatusForUser", () => {
-    const userId = "test-user-id" as UserId;
-    it("should return Available when client key half is set", async () => {
-      (service as any).clientKeyHalves = new Map<string, Uint8Array>();
-      (service as any).clientKeyHalves.set(userId, new Uint8Array([1, 2, 3, 4]));
-      const result = await service.getBiometricsFirstUnlockStatusForUser(userId);
-      expect(result).toBe(BiometricsStatus.Available);
-    });
-    it("should return UnlockNeeded when client key half is not set", async () => {
-      (service as any).clientKeyHalves = new Map<string, Uint8Array>();
-      const result = await service.getBiometricsFirstUnlockStatusForUser(userId);
-      expect(result).toBe(BiometricsStatus.UnlockNeeded);
-    });
-  });
-
-  describe("getOrCreateBiometricEncryptionClientKeyHalf", () => {
-    it("should return cached key half if already present", async () => {
-      const cachedKeyHalf = new Uint8Array([10, 20, 30]);
-      (service as any).clientKeyHalves.set(userId.toString(), cachedKeyHalf);
-      const result = await service.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
-      expect(result).toBe(cachedKeyHalf);
-    });
-
-    it("should decrypt and return existing encrypted client key half", async () => {
-      biometricStateService.getEncryptedClientKeyHalf = jest
-        .fn()
-        .mockResolvedValue(new Uint8Array([1, 2, 3]));
-      const decrypted = new Uint8Array([4, 5, 6]);
-      encryptionService.decryptBytes = jest.fn().mockResolvedValue(decrypted);
-
-      const result = await service.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
-
-      expect(biometricStateService.getEncryptedClientKeyHalf).toHaveBeenCalledWith(userId);
-      expect(encryptionService.decryptBytes).toHaveBeenCalledWith(new Uint8Array([1, 2, 3]), key);
-      expect(result).toEqual(decrypted);
-      expect((service as any).clientKeyHalves.get(userId.toString())).toEqual(decrypted);
-    });
-
-    it("should generate, encrypt, store, and cache a new key half if none exists", async () => {
-      biometricStateService.getEncryptedClientKeyHalf = jest.fn().mockResolvedValue(null);
-      const randomBytes = new Uint8Array([7, 8, 9]);
-      cryptoFunctionService.randomBytes = jest.fn().mockResolvedValue(randomBytes);
-      const encrypted = new Uint8Array([10, 11, 12]);
-      encryptionService.encryptBytes = jest.fn().mockResolvedValue(encrypted);
-      biometricStateService.setEncryptedClientKeyHalf = jest.fn().mockResolvedValue(undefined);
-
-      const result = await service.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
-
-      expect(cryptoFunctionService.randomBytes).toHaveBeenCalledWith(32);
-      expect(encryptionService.encryptBytes).toHaveBeenCalledWith(randomBytes, key);
-      expect(biometricStateService.setEncryptedClientKeyHalf).toHaveBeenCalledWith(
-        encrypted,
-        userId,
-      );
-      expect(result).toEqual(randomBytes);
-      expect((service as any).clientKeyHalves.get(userId.toString())).toEqual(randomBytes);
-    });
-  });
-
-  describe("supportsBiometrics", () => {
-    it("should return true if biometrics are available", async () => {
-      biometrics.available = jest.fn().mockResolvedValue(true);
-
-      const result = await service.supportsBiometrics();
-
-      expect(result).toBe(true);
-    });
-
-    it("should return false if biometrics are not available", async () => {
-      biometrics.available = jest.fn().mockResolvedValue(false);
-
-      const result = await service.supportsBiometrics();
-
-      expect(result).toBe(false);
-    });
-  });
-
-  describe("getBiometricKey", () => {
-    beforeEach(() => {
-      biometrics.prompt = jest.fn().mockResolvedValue(true);
-    });
-
-    it("should return null when unsuccessfully authenticated biometrics", async () => {
-      biometrics.prompt = jest.fn().mockResolvedValue(false);
-
-      const result = await service.getBiometricKey(userId);
-
-      expect(result).toBeNull();
-    });
-
-    it.each([null, undefined, ""])(
-      "should throw error when no biometric key is found '%s'",
-      async (password) => {
-        passwords.getPassword = jest.fn().mockResolvedValue(password);
-
-        await expect(service.getBiometricKey(userId)).rejects.toThrow(
-          "Biometric key not found for user",
-        );
-
-        expect(passwords.getPassword).toHaveBeenCalledWith(serviceKey, storageKey);
-      },
-    );
-
-    it.each([[false], [true]])(
-      "should return the biometricKey and setBiometricSecret called if password is not encrypted and cached clientKeyHalves is %s",
-      async (haveClientKeyHalves) => {
-        const clientKeyHalveBytes = new Uint8Array([1, 2, 3]);
-        if (haveClientKeyHalves) {
-          service["clientKeyHalves"].set(userId, clientKeyHalveBytes);
-        }
-        const biometricKey = key.toBase64();
-        passwords.getPassword = jest.fn().mockResolvedValue(biometricKey);
-        biometrics.deriveKeyMaterial = jest.fn().mockResolvedValue({
-          keyB64: "testKeyB64",
-          ivB64: "testIvB64",
-        } satisfies OsDerivedKey);
-
-        const result = await service.getBiometricKey(userId);
-
-        expect(result.toBase64()).toBe(biometricKey);
-        expect(passwords.getPassword).toHaveBeenCalledWith(serviceKey, storageKey);
-        expect(biometrics.setBiometricSecret).toHaveBeenCalledWith(
-          serviceKey,
-          storageKey,
-          biometricKey,
-          {
-            osKeyPartB64: "testKeyB64",
-            clientKeyPartB64: haveClientKeyHalves
-              ? Utils.fromBufferToB64(clientKeyHalveBytes)
-              : undefined,
-          },
-          "testIvB64",
-        );
-      },
-    );
-
-    it.each([[false], [true]])(
-      "should return the biometricKey if password is encrypted and cached clientKeyHalves is %s",
-      async (haveClientKeyHalves) => {
-        const clientKeyHalveBytes = new Uint8Array([1, 2, 3]);
-        if (haveClientKeyHalves) {
-          service["clientKeyHalves"].set(userId, clientKeyHalveBytes);
-        }
-        const biometricKey = key.toBase64();
-        const biometricKeyEncrypted = "2.testId|data|mac";
-        passwords.getPassword = jest.fn().mockResolvedValue(biometricKeyEncrypted);
-        biometrics.getBiometricSecret = jest.fn().mockResolvedValue(biometricKey);
-        biometrics.deriveKeyMaterial = jest.fn().mockResolvedValue({
-          keyB64: "testKeyB64",
-          ivB64: "testIvB64",
-        } satisfies OsDerivedKey);
-
-        const result = await service.getBiometricKey(userId);
-
-        expect(result.toBase64()).toBe(biometricKey);
-        expect(passwords.getPassword).toHaveBeenCalledWith(serviceKey, storageKey);
-        expect(biometrics.setBiometricSecret).not.toHaveBeenCalled();
-        expect(biometrics.getBiometricSecret).toHaveBeenCalledWith(serviceKey, storageKey, {
-          osKeyPartB64: "testKeyB64",
-          clientKeyPartB64: haveClientKeyHalves
-            ? Utils.fromBufferToB64(clientKeyHalveBytes)
-            : undefined,
-        });
-      },
-    );
-  });
-
-  describe("deleteBiometricKey", () => {
-    const serviceName = "Bitwarden_biometric";
-    const keyName = "test-user-id_user_biometric";
-
-    it("should delete biometric key successfully", async () => {
-      await service.deleteBiometricKey(userId);
-
-      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
-    });
-
-    it.each([[false], [true]])("should not throw error if key found: %s", async (keyFound) => {
-      if (!keyFound) {
-        passwords.deletePassword = jest
-          .fn()
-          .mockRejectedValue(new Error(passwords.PASSWORD_NOT_FOUND));
-      }
-
-      await service.deleteBiometricKey(userId);
-
-      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
-      if (!keyFound) {
-        expect(logService.debug).toHaveBeenCalledWith(
-          "[OsBiometricService] Biometric key %s not found for service %s.",
-          keyName,
-          serviceName,
-        );
-      }
-    });
-
-    it("should throw error when deletePassword for key throws unexpected errors", async () => {
-      const error = new Error("Unexpected error");
-      passwords.deletePassword = jest.fn().mockRejectedValue(error);
-
-      await expect(service.deleteBiometricKey(userId)).rejects.toThrow(error);
-
-      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
-    });
-  });
-
-  describe("authenticateBiometric", () => {
-    const hwnd = randomBytes(32).buffer;
-    const consentMessage = "Test Windows Hello Consent Message";
-
-    beforeEach(() => {
-      windowMain.win.getNativeWindowHandle = jest.fn().mockReturnValue(hwnd);
-      i18nService.t.mockReturnValue(consentMessage);
-    });
-
-    it("should return true when biometric authentication is successful", async () => {
-      const result = await service.authenticateBiometric();
-
-      expect(result).toBe(true);
-      expect(biometrics.prompt).toHaveBeenCalledWith(hwnd, consentMessage);
-    });
-
-    it("should return false when biometric authentication fails", async () => {
-      biometrics.prompt = jest.fn().mockResolvedValue(false);
-
-      const result = await service.authenticateBiometric();
-
-      expect(result).toBe(false);
-      expect(biometrics.prompt).toHaveBeenCalledWith(hwnd, consentMessage);
-    });
-  });
-
-  describe("getStorageDetails", () => {
-    it.each([
-      ["testClientKeyHalfB64", "testIvB64"],
-      [undefined, "testIvB64"],
-      ["testClientKeyHalfB64", null],
-      [undefined, null],
-    ])(
-      "should derive key material and ivB64 and return it when os key half not saved yet",
-      async (clientKeyHalfB64, ivB64) => {
-        service["setIv"](ivB64);
-
-        const derivedKeyMaterial = {
-          keyB64: "derivedKeyB64",
-          ivB64: "derivedIvB64",
-        };
-        biometrics.deriveKeyMaterial = jest.fn().mockResolvedValue(derivedKeyMaterial);
-
-        const result = await service["getStorageDetails"]({ clientKeyHalfB64 });
-
-        expect(result).toEqual({
-          key_material: {
-            osKeyPartB64: derivedKeyMaterial.keyB64,
-            clientKeyPartB64: clientKeyHalfB64,
-          },
-          ivB64: derivedKeyMaterial.ivB64,
-        });
-        expect(biometrics.deriveKeyMaterial).toHaveBeenCalledWith(ivB64);
-        expect(service["_osKeyHalf"]).toEqual(derivedKeyMaterial.keyB64);
-        expect(service["_iv"]).toEqual(derivedKeyMaterial.ivB64);
-      },
-    );
-
-    it("should throw an error when deriving key material and returned iv is null", async () => {
-      service["setIv"]("testIvB64");
-
-      const derivedKeyMaterial = {
-        keyB64: "derivedKeyB64",
-        ivB64: null as string | undefined | null,
-      };
-      biometrics.deriveKeyMaterial = jest.fn().mockResolvedValue(derivedKeyMaterial);
-
-      await expect(
-        service["getStorageDetails"]({ clientKeyHalfB64: "testClientKeyHalfB64" }),
-      ).rejects.toThrow("Initialization Vector is null");
-
-      expect(biometrics.deriveKeyMaterial).toHaveBeenCalledWith("testIvB64");
-    });
-  });
-
-  describe("setIv", () => {
-    it("should set the iv and reset the osKeyHalf", () => {
-      const iv = "testIv";
-      service["_osKeyHalf"] = "testOsKeyHalf";
-
-      service["setIv"](iv);
-
-      expect(service["_iv"]).toBe(iv);
-      expect(service["_osKeyHalf"]).toBeNull();
-    });
-
-    it("should set the iv to null when iv is undefined and reset the osKeyHalf", () => {
-      service["_osKeyHalf"] = "testOsKeyHalf";
-
-      service["setIv"](undefined);
-
-      expect(service["_iv"]).toBeNull();
-      expect(service["_osKeyHalf"]).toBeNull();
-    });
-  });
-});
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.ts
deleted file mode 100644
index 897304c9f61..00000000000
--- a/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { UserId } from "@bitwarden/common/types/guid";
-import { biometrics, passwords } from "@bitwarden/desktop-napi";
-import { BiometricsStatus, BiometricStateService } from "@bitwarden/key-management";
-
-import { WindowMain } from "../../main/window.main";
-
-import { OsBiometricService } from "./os-biometrics.service";
-
-const SERVICE = "Bitwarden_biometric";
-
-function getLookupKeyForUser(userId: UserId): string {
-  return `${userId}_user_biometric`;
-}
-
-export default class OsBiometricsServiceWindows implements OsBiometricService {
-  // Use set helper method instead of direct access
-  private _iv: string | null = null;
-  // Use getKeyMaterial helper instead of direct access
-  private _osKeyHalf: string | null = null;
-  private clientKeyHalves = new Map<UserId, Uint8Array>();
-
-  constructor(
-    private i18nService: I18nService,
-    private windowMain: WindowMain,
-    private logService: LogService,
-    private biometricStateService: BiometricStateService,
-    private encryptService: EncryptService,
-    private cryptoFunctionService: CryptoFunctionService,
-  ) {}
-
-  async supportsBiometrics(): Promise<boolean> {
-    return await biometrics.available();
-  }
-
-  async getBiometricKey(userId: UserId): Promise<SymmetricCryptoKey | null> {
-    const success = await this.authenticateBiometric();
-    if (!success) {
-      return null;
-    }
-
-    const value = await passwords.getPassword(SERVICE, getLookupKeyForUser(userId));
-    if (value == null || value == "") {
-      throw new Error("Biometric key not found for user");
-    }
-
-    let clientKeyHalfB64: string | null = null;
-    if (this.clientKeyHalves.has(userId)) {
-      clientKeyHalfB64 = Utils.fromBufferToB64(this.clientKeyHalves.get(userId)!);
-    }
-
-    if (!EncString.isSerializedEncString(value)) {
-      // Update to format encrypted with client key half
-      const storageDetails = await this.getStorageDetails({
-        clientKeyHalfB64: clientKeyHalfB64 ?? undefined,
-      });
-
-      await biometrics.setBiometricSecret(
-        SERVICE,
-        getLookupKeyForUser(userId),
-        value,
-        storageDetails.key_material,
-        storageDetails.ivB64,
-      );
-      return SymmetricCryptoKey.fromString(value);
-    } else {
-      const encValue = new EncString(value);
-      this.setIv(encValue.iv);
-      const storageDetails = await this.getStorageDetails({
-        clientKeyHalfB64: clientKeyHalfB64 ?? undefined,
-      });
-      return SymmetricCryptoKey.fromString(
-        await biometrics.getBiometricSecret(
-          SERVICE,
-          getLookupKeyForUser(userId),
-          storageDetails.key_material,
-        ),
-      );
-    }
-  }
-
-  async setBiometricKey(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
-    const clientKeyHalf = await this.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
-
-    const storageDetails = await this.getStorageDetails({
-      clientKeyHalfB64: Utils.fromBufferToB64(clientKeyHalf),
-    });
-    await biometrics.setBiometricSecret(
-      SERVICE,
-      getLookupKeyForUser(userId),
-      key.toBase64(),
-      storageDetails.key_material,
-      storageDetails.ivB64,
-    );
-  }
-
-  async deleteBiometricKey(userId: UserId): Promise<void> {
-    try {
-      await passwords.deletePassword(SERVICE, getLookupKeyForUser(userId));
-    } catch (e) {
-      if (e instanceof Error && e.message === passwords.PASSWORD_NOT_FOUND) {
-        this.logService.debug(
-          "[OsBiometricService] Biometric key %s not found for service %s.",
-          getLookupKeyForUser(userId),
-          SERVICE,
-        );
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  /**
-   * Prompts Windows Hello
-   */
-  async authenticateBiometric(): Promise<boolean> {
-    const hwnd = this.windowMain.win.getNativeWindowHandle();
-    return await biometrics.prompt(hwnd, this.i18nService.t("windowsHelloConsentMessage"));
-  }
-
-  private async getStorageDetails({
-    clientKeyHalfB64,
-  }: {
-    clientKeyHalfB64: string | undefined;
-  }): Promise<{ key_material: biometrics.KeyMaterial; ivB64: string }> {
-    if (this._osKeyHalf == null) {
-      const keyMaterial = await biometrics.deriveKeyMaterial(this._iv);
-      this._osKeyHalf = keyMaterial.keyB64;
-      this._iv = keyMaterial.ivB64;
-    }
-
-    if (this._iv == null) {
-      throw new Error("Initialization Vector is null");
-    }
-
-    const result = {
-      key_material: {
-        osKeyPartB64: this._osKeyHalf,
-        clientKeyPartB64: clientKeyHalfB64,
-      },
-      ivB64: this._iv,
-    };
-
-    // napi-rs fails to convert null values
-    if (result.key_material.clientKeyPartB64 == null) {
-      delete result.key_material.clientKeyPartB64;
-    }
-    return result;
-  }
-
-  // Nulls out key material in order to force a re-derive. This should only be used in getBiometricKey
-  // when we want to force a re-derive of the key material.
-  private setIv(iv?: string) {
-    this._iv = iv ?? null;
-    this._osKeyHalf = null;
-  }
-
-  async needsSetup() {
-    return false;
-  }
-
-  async canAutoSetup(): Promise<boolean> {
-    return false;
-  }
-
-  async runSetup(): Promise<void> {}
-
-  async getOrCreateBiometricEncryptionClientKeyHalf(
-    userId: UserId,
-    key: SymmetricCryptoKey,
-  ): Promise<Uint8Array> {
-    if (this.clientKeyHalves.has(userId)) {
-      return this.clientKeyHalves.get(userId)!;
-    }
-
-    // Retrieve existing key half if it exists
-    let clientKeyHalf: Uint8Array | null = null;
-    const encryptedClientKeyHalf =
-      await this.biometricStateService.getEncryptedClientKeyHalf(userId);
-    if (encryptedClientKeyHalf != null) {
-      clientKeyHalf = await this.encryptService.decryptBytes(encryptedClientKeyHalf, key);
-    }
-    if (clientKeyHalf == null) {
-      // Set a key half if it doesn't exist
-      clientKeyHalf = await this.cryptoFunctionService.randomBytes(32);
-      const encKey = await this.encryptService.encryptBytes(clientKeyHalf, key);
-      await this.biometricStateService.setEncryptedClientKeyHalf(encKey, userId);
-    }
-
-    this.clientKeyHalves.set(userId, clientKeyHalf);
-
-    return clientKeyHalf;
-  }
-
-  async getBiometricsFirstUnlockStatusForUser(userId: UserId): Promise<BiometricsStatus> {
-    if (this.clientKeyHalves.has(userId)) {
-      return BiometricsStatus.Available;
-    } else {
-      return BiometricsStatus.UnlockNeeded;
-    }
-  }
-}
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics.service.ts
index 63e0527c034..064b28f2ff2 100644
--- a/apps/desktop/src/key-management/biometrics/os-biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics.service.ts
@@ -25,4 +25,6 @@ export interface OsBiometricService {
   setBiometricKey(userId: UserId, key: SymmetricCryptoKey): Promise<void>;
   deleteBiometricKey(userId: UserId): Promise<void>;
   getBiometricsFirstUnlockStatusForUser(userId: UserId): Promise<BiometricsStatus>;
+  enrollPersistent(userId: UserId, key: SymmetricCryptoKey): Promise<void>;
+  hasPersistentKey(userId: UserId): Promise<boolean>;
 }
diff --git a/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.ts b/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.ts
index c7ed88d390f..8e28d3ca614 100644
--- a/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.ts
@@ -68,4 +68,20 @@ export class RendererBiometricsService extends DesktopBiometricsService {
       BiometricsStatus.ManualSetupNeeded,
     ].includes(biometricStatus);
   }
+
+  async enrollPersistent(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    return await ipc.keyManagement.biometric.enrollPersistent(userId, key.toBase64());
+  }
+
+  async hasPersistentKey(userId: UserId): Promise<boolean> {
+    return await ipc.keyManagement.biometric.hasPersistentKey(userId);
+  }
+
+  async enableLinuxV2Biometrics(): Promise<void> {
+    return await ipc.keyManagement.biometric.enableLinuxV2Biometrics();
+  }
+
+  async isLinuxV2BiometricsEnabled(): Promise<boolean> {
+    return await ipc.keyManagement.biometric.isLinuxV2BiometricsEnabled();
+  }
 }
diff --git a/apps/desktop/src/key-management/electron-key.service.spec.ts b/apps/desktop/src/key-management/electron-key.service.spec.ts
index 2d60c47217d..cc1d68ed050 100644
--- a/apps/desktop/src/key-management/electron-key.service.spec.ts
+++ b/apps/desktop/src/key-management/electron-key.service.spec.ts
@@ -4,7 +4,6 @@ import { KeyGenerationService } from "@bitwarden/common/key-management/crypto";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
-import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
@@ -26,7 +25,6 @@ import { ElectronKeyService } from "./electron-key.service";
 describe("ElectronKeyService", () => {
   let keyService: ElectronKeyService;
 
-  const pinService = mock<PinServiceAbstraction>();
   const keyGenerationService = mock<KeyGenerationService>();
   const cryptoFunctionService = mock<CryptoFunctionService>();
   const encryptService = mock<EncryptService>();
@@ -48,7 +46,6 @@ describe("ElectronKeyService", () => {
     stateProvider = new FakeStateProvider(accountService);
 
     keyService = new ElectronKeyService(
-      pinService,
       masterPasswordService,
       keyGenerationService,
       cryptoFunctionService,
diff --git a/apps/desktop/src/key-management/electron-key.service.ts b/apps/desktop/src/key-management/electron-key.service.ts
index 59295b2ca21..8de079a826b 100644
--- a/apps/desktop/src/key-management/electron-key.service.ts
+++ b/apps/desktop/src/key-management/electron-key.service.ts
@@ -3,7 +3,6 @@ import { KeyGenerationService } from "@bitwarden/common/key-management/crypto";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
-import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
@@ -22,7 +21,6 @@ import { DesktopBiometricsService } from "./biometrics/desktop.biometrics.servic
 // TODO Remove this class once biometric client key half storage is moved https://bitwarden.atlassian.net/browse/PM-22342
 export class ElectronKeyService extends DefaultKeyService {
   constructor(
-    pinService: PinServiceAbstraction,
     masterPasswordService: InternalMasterPasswordServiceAbstraction,
     keyGenerationService: KeyGenerationService,
     cryptoFunctionService: CryptoFunctionService,
@@ -37,7 +35,6 @@ export class ElectronKeyService extends DefaultKeyService {
     private biometricService: DesktopBiometricsService,
   ) {
     super(
-      pinService,
       masterPasswordService,
       keyGenerationService,
       cryptoFunctionService,
@@ -51,10 +48,6 @@ export class ElectronKeyService extends DefaultKeyService {
     );
   }
 
-  override async clearStoredUserKey(keySuffix: KeySuffixOptions, userId: UserId): Promise<void> {
-    await super.clearStoredUserKey(keySuffix, userId);
-  }
-
   protected override async storeAdditionalKeys(key: UserKey, userId: UserId) {
     await super.storeAdditionalKeys(key, userId);
 
diff --git a/apps/desktop/src/key-management/key-connector/remove-password.component.ts b/apps/desktop/src/key-management/key-connector/remove-password.component.ts
index 1b07f04ba8a..d9fea9409f8 100644
--- a/apps/desktop/src/key-management/key-connector/remove-password.component.ts
+++ b/apps/desktop/src/key-management/key-connector/remove-password.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/key-management-ui";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-remove-password",
   templateUrl: "remove-password.component.html",
diff --git a/apps/desktop/src/key-management/preload.ts b/apps/desktop/src/key-management/preload.ts
index 7f8576b8472..844a81ff8e3 100644
--- a/apps/desktop/src/key-management/preload.ts
+++ b/apps/desktop/src/key-management/preload.ts
@@ -50,6 +50,25 @@ const biometric = {
       action: BiometricAction.SetShouldAutoprompt,
       data: should,
     } satisfies BiometricMessage),
+  enrollPersistent: (userId: string, keyB64: string): Promise<void> =>
+    ipcRenderer.invoke("biometric", {
+      action: BiometricAction.EnrollPersistent,
+      userId: userId,
+      key: keyB64,
+    } satisfies BiometricMessage),
+  hasPersistentKey: (userId: string): Promise<boolean> =>
+    ipcRenderer.invoke("biometric", {
+      action: BiometricAction.HasPersistentKey,
+      userId: userId,
+    } satisfies BiometricMessage),
+  enableLinuxV2Biometrics: (): Promise<void> =>
+    ipcRenderer.invoke("biometric", {
+      action: BiometricAction.EnableLinuxV2,
+    } satisfies BiometricMessage),
+  isLinuxV2BiometricsEnabled: (): Promise<boolean> =>
+    ipcRenderer.invoke("biometric", {
+      action: BiometricAction.IsLinuxV2Enabled,
+    } satisfies BiometricMessage),
 };
 
 export default {
diff --git a/apps/desktop/src/key-management/session-timeout/services/desktop-session-timeout-settings-component.service.ts b/apps/desktop/src/key-management/session-timeout/services/desktop-session-timeout-settings-component.service.ts
new file mode 100644
index 00000000000..91c8126cdd7
--- /dev/null
+++ b/apps/desktop/src/key-management/session-timeout/services/desktop-session-timeout-settings-component.service.ts
@@ -0,0 +1,48 @@
+import { defer, from, map, Observable } from "rxjs";
+
+import {
+  VaultTimeout,
+  VaultTimeoutOption,
+  VaultTimeoutStringType,
+} from "@bitwarden/common/key-management/vault-timeout";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SessionTimeoutSettingsComponentService } from "@bitwarden/key-management-ui";
+
+export class DesktopSessionTimeoutSettingsComponentService
+  implements SessionTimeoutSettingsComponentService
+{
+  availableTimeoutOptions$: Observable<VaultTimeoutOption[]> = defer(() =>
+    from(ipc.platform.powermonitor.isLockMonitorAvailable()).pipe(
+      map((isLockMonitorAvailable) => {
+        const options: VaultTimeoutOption[] = [
+          { name: this.i18nService.t("oneMinute"), value: 1 },
+          { name: this.i18nService.t("fiveMinutes"), value: 5 },
+          { name: this.i18nService.t("fifteenMinutes"), value: 15 },
+          { name: this.i18nService.t("thirtyMinutes"), value: 30 },
+          { name: this.i18nService.t("oneHour"), value: 60 },
+          { name: this.i18nService.t("fourHours"), value: 240 },
+          { name: this.i18nService.t("onIdle"), value: VaultTimeoutStringType.OnIdle },
+          { name: this.i18nService.t("onSleep"), value: VaultTimeoutStringType.OnSleep },
+        ];
+
+        if (isLockMonitorAvailable) {
+          options.push({
+            name: this.i18nService.t("onLocked"),
+            value: VaultTimeoutStringType.OnLocked,
+          });
+        }
+
+        options.push(
+          { name: this.i18nService.t("onRestart"), value: VaultTimeoutStringType.OnRestart },
+          { name: this.i18nService.t("never"), value: VaultTimeoutStringType.Never },
+        );
+
+        return options;
+      }),
+    ),
+  );
+
+  constructor(private readonly i18nService: I18nService) {}
+
+  onTimeoutSave(_: VaultTimeout): void {}
+}
diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json
index e579c498ded..1c6a2bc49c9 100644
--- a/apps/desktop/src/locales/af/messages.json
+++ b/apps/desktop/src/locales/af/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Dien In"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Pasgemaakte omgewing"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Ongeldige hoofwagwoord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Tweestapsaantekening maak u rekening veiliger deur u aantekenpoging te bevestig met ’n ander toestel soos ’n beveiligingsleutel, waarmerktoep, SMS, telefoonoproep of e-pos. U kan tweestapsaantekening in die webkluis op bitwarden.com aktiveer. Wil u die webwerf nou besoek?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Skrap rekening"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Ongelukkig word blaaierintegrasie tans slegs in die weergawe vir die Mac-toepwinkel ondersteun."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Ongelukkig word blaaierintegrasie tans nie in die weergawe vir die Windows-winkel ondersteun nie."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Vergrendel"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/ar/messages.json b/apps/desktop/src/locales/ar/messages.json
index 4efec524886..ca404f4e179 100644
--- a/apps/desktop/src/locales/ar/messages.json
+++ b/apps/desktop/src/locales/ar/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "مرحبًا بعودتك"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "استخدام تسجيل دخول واحد"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "إرسال"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "يجب عليك إضافة رابط الخادم الأساسي أو على الأقل بيئة مخصصة."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "بيئة مخصصة"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "كلمة المرور الرئيسية غير صالحة"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "تسجيل الدخول بخطوتين يجعل حسابك أكثر أمنا من خلال مطالبتك بالتحقق من تسجيل الدخول باستخدام جهاز آخر مثل مفتاح الأمان، تطبيق المصادقة، الرسائل القصيرة، المكالمة الهاتفية، أو البريد الإلكتروني. يمكن تمكين تسجيل الدخول بخطوتين على خزانة الويب bitwarden.com. هل تريد زيارة الموقع الآن؟"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "قفل مع كلمة المرور الرئيسية عند إعادة تشغيل"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "حذف الحساب"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "حدث خطأ أثناء تمكين دمج المتصفح."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "للأسف، لا يتم دعم تكامل المتصفح إلا في إصدار متجر تطبيقات ماك في الوقت الحالي."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "للأسف، لا يتم دعم تكامل المتصفح في إصدار متجر ويندوز في الوقت الحالي."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "تم قبول الدعوة"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "مقفل"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/az/messages.json b/apps/desktop/src/locales/az/messages.json
index 9618bafca3e..55c2bdcd677 100644
--- a/apps/desktop/src/locales/az/messages.json
+++ b/apps/desktop/src/locales/az/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Bu elementə düzəliş etmə icazəniz yoxdur"
+  },
   "welcomeBack": {
     "message": "Yenidən xoş gəlmisiniz"
   },
@@ -508,7 +511,7 @@
     "description": "This describes a value that is 'linked' (related) to another value."
   },
   "remove": {
-    "message": "Çıxart"
+    "message": "Xaric et"
   },
   "nameRequired": {
     "message": "Ad lazımdır."
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Vahid daxil olma üsulunu istifadə et"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Təşkilatınız, vahid daxil olma tələb edir."
+  },
   "submit": {
     "message": "Göndər"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Təməl server URL-sini və ya ən azı bir özəl mühiti əlavə etməlisiniz."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL-lər, HTTPS istifadə etməlidir."
+  },
   "customEnvironment": {
     "message": "Özəl mühit"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Yararsız ana parol"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Yararsız ana parol. E-poçtunuzun doğru olduğunu və hesabınızın $HOST$ üzərində yaradıldığını təsdiqləyin.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "İki addımlı giriş, güvənlik açarı, kimlik doğrulayıcı tətbiq, SMS, telefon zəngi və ya e-poçt kimi digər cihazlarla girişinizi doğrulamanızı tələb edərək hesabınızı daha da güvənli edir. İki addımlı giriş, bitwarden.com veb seyfində qurula bilər. Veb saytı indi ziyarət etmək istəyirsiniz?"
   },
@@ -1641,7 +1659,7 @@
     }
   },
   "passwordSafe": {
-    "message": "Bu parol, veri pozuntularında qeydə alınmayıb. Rahatlıqla istifadə edə bilərsiniz."
+    "message": "Bu parol, veri pozuntularında qeydə alınmayıb. Əmniyyətlə istifadə edə bilərsiniz."
   },
   "baseDomain": {
     "message": "Baza domeni",
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Yenidən başladılanda ana parol ilə kilidlə"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Tətbiq yenidən başladıqda ana parol və ya PIN tələb edilsin"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Tətbiq yenidən başladıqda ana parol tələb edilsin"
+  },
   "deleteAccount": {
     "message": "Hesabı sil"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Brauzer inteqrasiyasını fəallaşdırarkən bir xəta baş verdi."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Təəssüf ki, brauzer inteqrasiyası indilik yalnız Mac App Store versiyasında dəstəklənir."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Təəssüf ki, brauzer inteqrasiyası hal-hazırda Windows Store versiyasında dəstəklənmir."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum özəl bitmə vaxtı 1 dəqiqədir."
+  },
   "inviteAccepted": {
     "message": "Dəvət qəbul edildi"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Yalnız $ORGANIZATION$ ilə əlaqələndirilmiş təşkilat seyfi xaricə köçürüləcək.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Yalnız $ORGANIZATION$ ilə əlaqələndirilmiş təşkilat seyfi xaricə köçürüləcək. Element kolleksiyalarım daxil edilməyəcək.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Kilidli"
   },
@@ -3861,7 +3903,7 @@
     "message": "Ana qovluğun adından sonra \"/\" əlavə edərək qovluğu ardıcıl yerləşdirin. Nümunə: Social/Forums"
   },
   "sendsTitleNoItems": {
-    "message": "Send, həssas məlumatlar təhlükəsizdir",
+    "message": "Send ilə həssas məlumatlar əmniyyətdədir",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
@@ -3916,7 +3958,7 @@
     "message": "Kimliklərinizlə, uzun qeydiyyat və ya əlaqə xanalarını daha tez avtomatik doldurun."
   },
   "newNoteNudgeTitle": {
-    "message": "Həssas verilərinizi güvənli şəkildə saxlayın"
+    "message": "Həssas verilərinizi əmniyyətdə saxlayın"
   },
   "newNoteNudgeBody": {
     "message": "Notlarla, bankçılıq və ya sığorta təfsilatları kimi həssas veriləri təhlükəsiz saxlayın."
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Daha az göstər"
   },
-  "enableAutotype": {
-    "message": "Avto-yazmanı fəallaşdır"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden, giriş yerlərini doğrulamır, qısayolu istifadə etməzdən əvvəl doğru pəncərədə və xanada olduğunuza əmin olun."
   },
+  "typeShortcut": {
+    "message": "Yazma qısayolu"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Aşağıdakı dəyişdiricilərdən birini və ya ikisini daxil edin: Ctrl, Alt, Win və ya Shift və bir hərf."
+  },
+  "invalidShortcut": {
+    "message": "Yararsız qısayol"
+  },
   "moreBreadcrumbs": {
     "message": "Daha çox naviqasiya yolu",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Təsdiqlə"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Avto-yazma qısayolunu fəallaşdır"
+  "enableAutotypeShortcutPreview": {
+    "message": "Avto-yazma qısayolunu fəallaşdır (Özəllik önizləməsi)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Veriləri yanlış yerə doldurmamaq üçün qısayolu istifadə etməzdən əvvəl doğru xanada olduğunuza əmin olun."
   },
   "editShortcut": {
     "message": "Qısayola düzəliş et"
   },
-  "archive": {
-    "message": "Arxivlə"
+  "archiveNoun": {
+    "message": "Arxiv",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arxivlə",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Arxivdən çıxart"
   },
   "itemsInArchive": {
@@ -4123,10 +4176,10 @@
   "noItemsInArchiveDesc": {
     "message": "Arxivlənmiş elementlər burada görünəcək, ümumi axtarış nəticələrindən və avto-doldurma təkliflərindən xaric ediləcək."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Element arxivə göndərildi"
   },
-  "itemRemovedFromArchive": {
+  "itemWasUnarchived": {
     "message": "Element arxivdən çıxarıldı"
   },
   "archiveItem": {
@@ -4134,5 +4187,41 @@
   },
   "archiveItemConfirmDesc": {
     "message": "Arxivlənmiş elementlər ümumi axtarış nəticələrindən və avto-doldurma təkliflərindən xaric ediləcək. Bu elementi arxivləmək istədiyinizə əminsiniz?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Poçt kodu"
+  },
+  "cardNumberLabel": {
+    "message": "Kart nömrəsi"
+  },
+  "upgradeNow": {
+    "message": "İndi yüksəlt"
+  },
+  "builtInAuthenticator": {
+    "message": "Daxili kimlik doğrulayıcı"
+  },
+  "secureFileStorage": {
+    "message": "Güvənli fayl anbarı"
+  },
+  "emergencyAccess": {
+    "message": "Fövqəladə hal erişimi"
+  },
+  "breachMonitoring": {
+    "message": "Pozuntu monitorinqi"
+  },
+  "andMoreFeatures": {
+    "message": "Və daha çoxu!"
+  },
+  "planDescPremium": {
+    "message": "Tam onlayn təhlükəsizlik"
+  },
+  "upgradeToPremium": {
+    "message": "\"Premium\"a yüksəlt"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Vaxt bitmə əməliyyatı"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sessiya vaxt bitməsi"
   }
 }
diff --git a/apps/desktop/src/locales/be/messages.json b/apps/desktop/src/locales/be/messages.json
index eb5971c97af..b2e4db47b32 100644
--- a/apps/desktop/src/locales/be/messages.json
+++ b/apps/desktop/src/locales/be/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Адправіць"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Карыстальніцкае асяроддзе"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Памылковы асноўны пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Двухэтапны ўваход робіць ваш уліковы запіс больш бяспечным, патрабуючы пацвярджэнне ўваходу на іншай прыладзе з выкарыстаннем ключа бяспекі, праграмы аўтэнтыфікацыі, SMS, тэлефоннага званка або электроннай пошты. Двухэтапны ўваход уключаецца на bitwarden.com. Перайсці на вэб-сайт, каб зрабіць гэта?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Выдаліць уліковы запіс"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "На жаль, інтэграцыя з браўзерам зараз падтрымліваецца толькі ў версіі для Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "На жаль, інтэграцыя з браўзерам у цяперашні час не падтрымліваецца ў версіі для Microsoft Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Заблакіравана"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/bg/messages.json b/apps/desktop/src/locales/bg/messages.json
index e32363f0c55..ad03c2cc023 100644
--- a/apps/desktop/src/locales/bg/messages.json
+++ b/apps/desktop/src/locales/bg/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Нямате право за редактиране на този елемент"
+  },
   "welcomeBack": {
     "message": "Добре дошли отново"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Използване на еднократна идентификация"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Вашата организация изисква еднократно удостоверяване."
+  },
   "submit": {
     "message": "Подаване"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Трябва да добавите или основния адрес на сървъра, или поне една специална среда."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Адресите трябва да ползват HTTPS."
+  },
   "customEnvironment": {
     "message": "Специална среда"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Грешна главна парола"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Грешна главна парола. Проверете дали е-пощата е правилна и дали акаунтът Ви е създаден в $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Двустепенното вписване защищава регистрацията ви като ви кара да потвърдите влизането си чрез устройство-ключ, приложение за идентификация, мобилно съобщение, телефонно обаждане или е-поща. Двустепенното вписване може да се включи чрез сайта bitwarden.com. Искате ли да го посетите?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Заключване с главната парола при повторно пускане"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Изискване на главната парола или ПИН код при повторно пускане на приложението"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Изискване на главната парола при повторно пускане на приложението"
+  },
   "deleteAccount": {
     "message": "Изтриване на регистрацията"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Възникна грешка при включването на интеграцията с браузъра."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "За жалост в момента интеграцията с браузър не се поддържа във версията за магазина на Mac."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "За жалост в момента интеграцията с браузър не се поддържа във версията за магазина на Windows."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Минималното персонализирано време за достъп е 1 минута."
+  },
   "inviteAccepted": {
     "message": "Поканата е приета"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Ще бъдат изнесени само записите от трезора свързан с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Само трезора свързан с $ORGANIZATION$ ще бъде експортиран. Моите записи няма да бъдат включени.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Заключено"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Показване на по-малко"
   },
-  "enableAutotype": {
-    "message": "Включване на автоматичното въвеждане"
-  },
   "enableAutotypeDescription": {
     "message": "Битуорден не проверява местата за въвеждане, така че се уверете, че сте в правилния прозорец, преди да ползвате клавишната комбинация."
   },
+  "typeShortcut": {
+    "message": "Комбинация за въвеждане"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Използвайте един или повече от модификаторите Ctrl, Alt, Win или Shift, заедно с някоя буква."
+  },
+  "invalidShortcut": {
+    "message": "Неправилна комбинация"
+  },
   "moreBreadcrumbs": {
     "message": "Още елементи в пътечката",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Потвърждаване"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Включване на клавишната комбинация за автоматично попълване"
+  "enableAutotypeShortcutPreview": {
+    "message": "Включване на комбинация за автоматично попълване (Функционалност в изпитание)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Уверете се, че сет в правилното поле, преди да използвате комбинацията, за да избегнете попълването на данните на грешното място."
+  "enableAutotypeShortcutDescription": {
+    "message": "Уверете се, че сте в правилното поле, преди да използвате комбинацията, за да избегнете попълването на данните на грешното място."
   },
   "editShortcut": {
     "message": "Редактиране на комбинацията"
   },
-  "archive": {
-    "message": "Архивиране"
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Архивиране",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Изваждане от архива"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Архивираните елементи ще се показват тук и ще бъдат изключени от общите резултати при търсене и от предложенията за автоматично попълване."
   },
-  "itemSentToArchive": {
-    "message": "Елементът е преместен в архива"
+  "itemWasSentToArchive": {
+    "message": "Елементът беше преместен в архива"
   },
-  "itemRemovedFromArchive": {
-    "message": "Елементът е изваден от архива"
+  "itemWasUnarchived": {
+    "message": "Елементът беше изваден от архива"
   },
   "archiveItem": {
     "message": "Архивиране на елемента"
   },
   "archiveItemConfirmDesc": {
     "message": "Архивираните елементи са изключени от общите резултати при търсене и от предложенията за автоматично попълване. Наистина ли искате да архивирате този елемент?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Пощенски код"
+  },
+  "cardNumberLabel": {
+    "message": "Номер на картата"
+  },
+  "upgradeNow": {
+    "message": "Надграждане сега"
+  },
+  "builtInAuthenticator": {
+    "message": "Вграден удостоверител"
+  },
+  "secureFileStorage": {
+    "message": "Сигурно съхранение на файлове"
+  },
+  "emergencyAccess": {
+    "message": "Авариен достъп"
+  },
+  "breachMonitoring": {
+    "message": "Наблюдение за пробиви"
+  },
+  "andMoreFeatures": {
+    "message": "И още!"
+  },
+  "planDescPremium": {
+    "message": "Пълна сигурност в Интернет"
+  },
+  "upgradeToPremium": {
+    "message": "Надградете до Платения план"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Действие при изтичането на времето за достъп"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Изтичане на времето за сесията"
   }
 }
diff --git a/apps/desktop/src/locales/bn/messages.json b/apps/desktop/src/locales/bn/messages.json
index 60b925af2e3..d6c61c1ab51 100644
--- a/apps/desktop/src/locales/bn/messages.json
+++ b/apps/desktop/src/locales/bn/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "জমা দিন"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "পছন্দসই পরিবেশ"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "অবৈধ মূল পাসওয়ার্ড"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "দ্বি-পদক্ষেপ লগইন অন্য ডিভাইসে আপনার লগইনটি যাচাই করার জন্য সিকিউরিটি কী, প্রমাণীকরণকারী অ্যাপ্লিকেশন, এসএমএস, ফোন কল বা ই-মেইল ব্যাবহারের মাধ্যমে আপনার অ্যাকাউন্টকে আরও সুরক্ষিত করে। bitwarden.com ওয়েব ভল্টে দ্বি-পদক্ষেপের লগইন সক্ষম করা যাবে। আপনি কি এখনই ওয়েবসাইটটি দেখতে চান?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/bs/messages.json b/apps/desktop/src/locales/bs/messages.json
index e6cdff50696..569f1072c4b 100644
--- a/apps/desktop/src/locales/bs/messages.json
+++ b/apps/desktop/src/locales/bs/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Potvrdi"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Prilagođeno okruženje"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Neispravna glavna lozinka"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Prijava u dva koraka čini Vaš račun sigurnijim tako što zahtjeva da verifikujete svoje podatke pomoću drugog uređaja, kao što su sigurnosni ključ, aplikacija za autentifikaciju, SMS, telefonski poziv ili E-Mail. Prijavljivanje u dva koraka može se omogućiti na bitwarden.com web trezoru. Da li želite da posjetite web stranicu sada?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Brisanje računa"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Nažalost, za sada je integracija sa preglednikom podržana samo u Mac App Store verziji aplikacije."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Nažalost, integracija sa preglednikom nije podržana u Windows Store verziji aplikacije."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/ca/messages.json b/apps/desktop/src/locales/ca/messages.json
index 0defa7a878a..de468f1e8b3 100644
--- a/apps/desktop/src/locales/ca/messages.json
+++ b/apps/desktop/src/locales/ca/messages.json
@@ -42,7 +42,7 @@
     "message": "Cerca en la caixa forta"
   },
   "resetSearch": {
-    "message": "Reset search"
+    "message": "Restableix la cerca"
   },
   "addItem": {
     "message": "Afegeix element"
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "No teniu permisos per editar aquest element"
+  },
   "welcomeBack": {
     "message": "Benvingut/da de nou"
   },
@@ -703,10 +706,10 @@
     "message": "S'ha guardat el fitxer adjunt."
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "Afig adjunt"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "La mida màxima del fitxer és de 500 MB"
   },
   "file": {
     "message": "Fitxer"
@@ -754,7 +757,7 @@
     "message": "Inicia sessió a Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Introduïu el codi que us hem enviat al correu electrònic"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
     "message": "Introduïu el codi de la vostra aplicació d'autenticació"
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Usa inici de sessió únic"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Envia"
   },
@@ -948,14 +954,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "No ho torneu a preguntar en aquest dispositiu durant 30 dies"
   },
   "selectAnotherMethod": {
     "message": "Select another method",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Utilitzeu el codi de recuperació"
   },
   "insertU2f": {
     "message": "Introduïu la vostra clau de seguretat al port USB de l'ordinador. Si té un botó, premeu-lo."
@@ -1009,16 +1015,16 @@
     "message": "Inici de sessió no disponible"
   },
   "noTwoStepProviders": {
-    "message": "Aquest compte té habilitat l'inici de sessió en dues passes, però aquest navegador web no admet cap dels dos proveïdors configurats."
+    "message": "Aquest compte té habilitat l'inici de sessió en dos passos, però aquest navegador web no admet cap dels dos proveïdors configurats."
   },
   "noTwoStepProviders2": {
     "message": "Afegiu proveïdors addicionals que s'adapten millor als dispositius (com ara una aplicació d'autenticació)."
   },
   "twoStepOptions": {
-    "message": "Opcions d'inici de sessió en dues passes"
+    "message": "Opcions d'inici de sessió en dos passos"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Seleccioneu un mètode d'inici de sessió en dues passes"
+    "message": "Seleccioneu un mètode d'inici de sessió en dos passos"
   },
   "selfHostedEnvironment": {
     "message": "Entorn d'allotjament propi"
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Entorn personalitzat"
   },
@@ -1222,14 +1231,23 @@
   "invalidMasterPassword": {
     "message": "Contrasenya mestra no vàlida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
-    "message": "L'inici de sessió en dues passes fa que el vostre compte siga més segur, ja que obliga a comprovar el vostre inici de sessió amb un altre dispositiu, com ara una clau de seguretat, una aplicació autenticadora, un SMS, una trucada telefònica o un correu electrònic. Es pot habilitar l'inici de sessió en dues passes a la caixa forta web de bitwarden.com. Voleu visitar el lloc web ara?"
+    "message": "L'inici de sessió en dos passos fa que el vostre compte siga més segur, ja que obliga a comprovar el vostre inici de sessió amb un altre dispositiu, com ara una clau de seguretat, una aplicació autenticadora, un SMS, una trucada telefònica o un correu electrònic. Es pot habilitar l'inici de sessió en dos passos a la caixa forta web de bitwarden.com. Voleu visitar el lloc web ara?"
   },
   "twoStepLogin": {
-    "message": "Inici de sessió en dues passes"
+    "message": "Inici de sessió en dos passos"
   },
   "vaultTimeoutHeader": {
-    "message": "Vault timeout"
+    "message": "Temps d'espera de la caixa forta"
   },
   "vaultTimeout": {
     "message": "Temps d'espera de la caixa forta"
@@ -1238,7 +1256,7 @@
     "message": "Temps d'espera"
   },
   "vaultTimeoutAction1": {
-    "message": "Timeout action"
+    "message": "Acció després del temps d'espera"
   },
   "vaultTimeoutDesc": {
     "message": "Trieu quan es tancarà la vostra caixa forta i feu l'acció seleccionada."
@@ -1449,7 +1467,7 @@
     "description": "Copy credit card security code (CVV)"
   },
   "cardNumber": {
-    "message": "card number"
+    "message": "núm. targeta de crèdit"
   },
   "premiumMembership": {
     "message": "Subscripció Premium"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Bloqueja amb la contrasenya mestra en reiniciar"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Sol·licita la contrasenya mestra o el PIN en reiniciar l'aplicació"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Sol·licita la contrasenya mestra en reiniciar l'aplicació"
+  },
   "deleteAccount": {
     "message": "Suprimeix el compte"
   },
@@ -1990,7 +2014,7 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Més informació sobre els autenticadors"
   },
   "copyTOTP": {
     "message": "Copy Authenticator key (TOTP)"
@@ -1999,7 +2023,7 @@
     "message": "Make 2-step verification seamless"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden pot emmagatzemar i omplir codis de verificació en dos passos. Copieu i enganxeu la clau en aquest camp."
   },
   "totpHelperWithCapture": {
     "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
@@ -2024,7 +2048,7 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Targeta de crèdit caducada"
   },
   "cardExpiredMessage": {
     "message": "If you've renewed it, update the card's information"
@@ -2109,7 +2133,7 @@
     "message": "Habilita la integració amb el navegador"
   },
   "enableBrowserIntegrationDesc1": {
-    "message": "Used to allow biometric unlock in browsers that are not Safari."
+    "message": "Es fa servir per permetre el desbloqueig biomètric en navegadors que no són Safari."
   },
   "enableDuckDuckGoBrowserIntegration": {
     "message": "Permet la integració del navegador DuckDuckGo"
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "S'ha produït un error en activar la integració del navegador."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Malauradament, la integració del navegador només és compatible amb la versió de Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Malauradament, la integració del navegador només és compatible amb la versió de Microsoft Store."
   },
@@ -2371,7 +2392,7 @@
     "message": "Autenticar WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Llegeix clau de seguretat"
+    "message": "Llig la clau de seguretat"
   },
   "awaitingSecurityKeyInteraction": {
     "message": "S'està esperant la interacció amb la clau de seguretat..."
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitació acceptada"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Bloquejat"
   },
@@ -2887,7 +2929,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Domini de $SERVICENAME$ invàlid.",
+    "message": "Domini de $SERVICENAME$ no vàlid.",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2991,7 +3033,7 @@
     "message": "aplicació web"
   },
   "notificationSentDevicePart2": {
-    "message": "Assegura't que la frase d'empremta digital encaixa amb la d'aquí sota abans d'aprovar-la."
+    "message": "Assegureu-vos que la frase de l'empremta digital coincideix amb la que hi ha a continuació abans d'aprovar-la."
   },
   "needAnotherOptionV1": {
     "message": "Necessiteu una altra opció?"
@@ -3047,18 +3089,18 @@
     "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"
+    "message": "Aplicació web"
   },
   "mobile": {
-    "message": "Mobile",
+    "message": "Mòbil",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "Extensió",
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "Escriptori",
     "description": "Desktop app"
   },
   "cli": {
@@ -3069,10 +3111,10 @@
     "description": "Software Development Kit"
   },
   "server": {
-    "message": "Server"
+    "message": "Servidor"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "Petició d'inici de sessió"
   },
   "deviceType": {
     "message": "Tipus de dispositiu"
@@ -3108,7 +3150,7 @@
     "message": "Aquesta sol·licitud ja no és vàlida."
   },
   "confirmAccessAttempt": {
-    "message": "Confirma l'intent d'accés de $EMAIL$",
+    "message": "Confirmeu l'intent d'accés de $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3120,7 +3162,7 @@
     "message": "S'ha sol·licitat inici de sessió"
   },
   "accountAccessRequested": {
-    "message": "Accés al compte demanat"
+    "message": "S'ha sol·licitat accés al compte"
   },
   "creatingAccountOn": {
     "message": "Creant compte en"
@@ -3771,7 +3813,7 @@
     "message": "Denega"
   },
   "sshkeyApprovalTitle": {
-    "message": "Confirma l'ús de la clau SSH"
+    "message": "Confirmeu l'ús de la clau SSH"
   },
   "agentForwardingWarningTitle": {
     "message": "Advertència: Reenviament de l'Agent"
@@ -3922,15 +3964,15 @@
     "message": "With notes, securely store sensitive data like banking or insurance details."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Accés SSH fàcil per a desenvolupadors"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Emmagatzemeu les claus i connecteu-vos amb l'agent SSH per a una autenticació ràpida i xifrada.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Més informació sobre l'agent SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/cs/messages.json b/apps/desktop/src/locales/cs/messages.json
index 2c5ed437187..c02dbabbc93 100644
--- a/apps/desktop/src/locales/cs/messages.json
+++ b/apps/desktop/src/locales/cs/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Nemáte oprávnění upravit tuto položku"
+  },
   "welcomeBack": {
     "message": "Vítejte zpět"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Použít jednotné přihlášení"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Vaše organizace vyžaduje jednotné přihlášení."
+  },
   "submit": {
     "message": "Odeslat"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Musíte přidat buď základní adresu URL serveru nebo alespoň jedno vlastní prostředí."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL adresy musí používat HTTPS."
+  },
   "customEnvironment": {
     "message": "Vlastní prostředí"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Chybné hlavní heslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Neplatné hlavní heslo. Potvrďte správnost e-mailu a zda byl Váš účet vytvořen na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Dvoufázové přihlášení činí Váš účet mnohem bezpečnějším díky nutnosti po každém úspěšném přihlášení zadat ověřovací kód získaný z bezpečnostního klíče, aplikace, SMS, telefonního hovoru nebo e-mailu. Dvoufázové přihlášení lze aktivovat na webové stránce bitwarden.com. Chcete tuto stránku nyní otevřít?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Zamknout trezor při restartu pomocí hlavního hesla"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Vyžadovat hlavní heslo nebo PIN při restartu aplikace"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Vyžadovat hlavní heslo při restartu aplikace"
+  },
   "deleteAccount": {
     "message": "Smazat účet"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Vyskytla se chyba při povolování integrace prohlížeče."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Integrace prohlížeče je podporována jen ve verzi pro Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Integrace prohlížeče není ve verzi pro Windows Store podporována."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimální vlastní časový limit je 1 minuta."
+  },
   "inviteAccepted": {
     "message": "Pozvánka byla přijata"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Bude exportován jen trezor organizace přidružený k $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Bude exportován jen trezor organizace přidružený k $ORGANIZATION$. Položky mých sbírek nebudou zahrnuty.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Uzamčeno"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Zobrazit méně"
   },
-  "enableAutotype": {
-    "message": "Povolit automatický zápis"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden neověřuje umístění vstupu. Před použitím zkratky se ujistěte, že jste ve správném okně a poli."
   },
+  "typeShortcut": {
+    "message": "Napsat zkratku"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Zahrňte jeden nebo dva z následujících modifikátorů: Ctrl, Alt, Win nebo Shift a písmeno."
+  },
+  "invalidShortcut": {
+    "message": "Neplatná zkratka"
+  },
   "moreBreadcrumbs": {
     "message": "Více...",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Potvrdit"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Povolit zkratku automatického psaní"
+  "enableAutotypeShortcutPreview": {
+    "message": "Povolit zkratku Autotype (náhled funkce)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Před použitím zkratky se ujistěte, že jste ve správném poli, abyste se vyhnuli vyplnění dat na nesprávné místo."
   },
   "editShortcut": {
     "message": "Upravit zkratku"
   },
-  "archive": {
-    "message": "Archivovat"
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archivovat",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Odebrat z archivu"
   },
   "itemsInArchive": {
@@ -4123,10 +4176,10 @@
   "noItemsInArchiveDesc": {
     "message": "Zde se zobrazí archivované položky a budou vyloučeny z obecných výsledků vyhledávání a návrhů automatického vyplňování."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Položka byla přesunuta do archivu"
   },
-  "itemRemovedFromArchive": {
+  "itemWasUnarchived": {
     "message": "Položka byla odebrána z archivu"
   },
   "archiveItem": {
@@ -4134,5 +4187,41 @@
   },
   "archiveItemConfirmDesc": {
     "message": "Archivované položky jsou vyloučeny z obecných výsledků vyhledávání a z návrhů automatického vyplňování. Jste si jisti, že chcete tuto položku archivovat?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / PSČ"
+  },
+  "cardNumberLabel": {
+    "message": "Číslo karty"
+  },
+  "upgradeNow": {
+    "message": "Aktualizovat nyní"
+  },
+  "builtInAuthenticator": {
+    "message": "Vestavěný autentifikátor"
+  },
+  "secureFileStorage": {
+    "message": "Zabezpečené úložiště souborů"
+  },
+  "emergencyAccess": {
+    "message": "Nouzový přístup"
+  },
+  "breachMonitoring": {
+    "message": "Sledování úniků"
+  },
+  "andMoreFeatures": {
+    "message": "A ještě více!"
+  },
+  "planDescPremium": {
+    "message": "Dokončit online zabezpečení"
+  },
+  "upgradeToPremium": {
+    "message": "Aktualizovat na Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Akce vypršení časového limitu"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Časový limit relace"
   }
 }
diff --git a/apps/desktop/src/locales/cy/messages.json b/apps/desktop/src/locales/cy/messages.json
index 9ff42bfa2c7..25b52fcc101 100644
--- a/apps/desktop/src/locales/cy/messages.json
+++ b/apps/desktop/src/locales/cy/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/da/messages.json b/apps/desktop/src/locales/da/messages.json
index 4a064a004cb..1d135a533f2 100644
--- a/apps/desktop/src/locales/da/messages.json
+++ b/apps/desktop/src/locales/da/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Velkommen tilbage"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Brug Single Sign-On"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Indsend"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Der skal tilføjes enten basis Server-URL'en eller mindst ét tilpasset miljø."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Tilpasset miljø"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Ugyldig hovedadgangskode"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Totrins-login gør kontoen mere sikker ved at kræve, at man bekræfter sit login med en anden enhed, såsom en sikkerhedsnøgle, godkendelses-app, SMS, telefonopkald eller e-mail. Totrins-login kan aktiveres via bitwarden.com web-boksen. Besøg webstedet nu?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lås med hovedadgangskode ved genstart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Slet konto"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "En fejl opstod under aktivering af webbrowserintegration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Desværre understøttes browserintegration indtil videre kun i Mac App Store-versionen."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Desværre understøttes browserintegration pt. ikke i Microsoft Store-versionen."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepteret"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Låst"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/de/messages.json b/apps/desktop/src/locales/de/messages.json
index 47b3bad34e8..2f8daec5b68 100644
--- a/apps/desktop/src/locales/de/messages.json
+++ b/apps/desktop/src/locales/de/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Du bist nicht berechtigt, diesen Eintrag zu bearbeiten"
+  },
   "welcomeBack": {
     "message": "Willkommen zurück"
   },
@@ -703,10 +706,10 @@
     "message": "Anhang gespeichert"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "Anhang hinzufügen"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "Die maximale Dateigröße beträgt 500 MB"
   },
   "file": {
     "message": "Datei"
@@ -769,7 +772,10 @@
     "message": "Anmelden mit einem anderen Gerät"
   },
   "useSingleSignOn": {
-    "message": "Single Sign-on verwenden"
+    "message": "Single Sign-On verwenden"
+  },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Deine Organisation erfordert Single Sign-On."
   },
   "submit": {
     "message": "Absenden"
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Du musst entweder die Basis-Server-URL oder mindestens eine benutzerdefinierte Umgebung hinzufügen."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs müssen HTTPS verwenden."
+  },
   "customEnvironment": {
     "message": "Benutzerdefinierte Umgebung"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Ungültiges Master-Passwort"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ungültiges Master-Passwort. Überprüfe, ob deine E-Mail-Adresse korrekt ist und dein Konto auf $HOST$ erstellt wurde.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Mit der Zwei-Faktor-Authentifizierung wird dein Konto zusätzlich abgesichert, da jede Anmeldung mit einem anderen Gerät wie einem Sicherheitsschlüssel, einer Authentifizierungs-App, einer SMS, einem Anruf oder einer E-Mail verifiziert werden muss. Die Zwei-Faktor-Authentifizierung kann im bitwarden.com Web-Tresor aktiviert werden. Möchtest du die Website jetzt öffnen?"
   },
@@ -1303,7 +1321,7 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Website-Symbole anzeigen und URLs zum Ändern von Passwörtern abrufen"
   },
   "enableMinToTray": {
     "message": "In Infobereich-Symbol minimieren"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Beim Neustart mit Master-Passwort sperren"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Master-Passwort oder PIN beim App-Neustart erfordern"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Master-Passwort beim App-Neustart erfordern"
+  },
   "deleteAccount": {
     "message": "Konto löschen"
   },
@@ -1955,7 +1979,7 @@
     "message": "Timeout-Aktion bestätigen"
   },
   "enterpriseSingleSignOn": {
-    "message": "Enterprise Single-Sign-On"
+    "message": "Enterprise Single Sign-On"
   },
   "setMasterPassword": {
     "message": "Master-Passwort festlegen"
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Beim Aktivieren der Browser-Integration ist ein Fehler aufgetreten."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Leider wird die Browser-Integration derzeit nur in der Mac App Store Version unterstützt."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Leider wird die Browser-Integration derzeit nicht in der Microsoft Store Version unterstützt."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Das minimal benutzerdefinierte Timeout beträgt 1 Minute."
+  },
   "inviteAccepted": {
     "message": "Einladung angenommen"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Nur der mit $ORGANIZATION$ verknüpfte Organisations-Tresor wird exportiert.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Nur der mit $ORGANIZATION$ verknüpfte Organisations-Tresor wird exportiert. Meine Eintrags-Sammlungen werden nicht eingeschlossen.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Gesperrt"
   },
@@ -3486,10 +3528,10 @@
     "message": "Sammlung auswählen"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "Wähle diese Option, wenn der importierte Dateiinhalt in eine Sammlung verschoben werden soll"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "Wähle diese Option, wenn der importierte Dateiinhalt in einen Ordner verschoben werden soll"
   },
   "importUnassignedItemsError": {
     "message": "Die Datei enthält nicht zugewiesene Einträge."
@@ -3586,10 +3628,10 @@
     "message": "Bitte melde dich weiterhin mit deinen Firmenzugangsdaten an."
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "Direkt aus dem Browser importieren"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "Browser-Profil"
   },
   "seeDetailedInstructions": {
     "message": "Detaillierte Anleitungen auf unserer Hilfeseite unter",
@@ -3834,10 +3876,10 @@
     "message": "Gefährdetes Passwort ändern"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Diese Zugangsdaten sind gefährdet und es fehlt eine Website. Füge eine Website hinzu und ändere das Passwort für mehr Sicherheit."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Fehlende Website"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "Du kannst Sammlungen mit Leseberechtigung nicht entfernen: $COLLECTIONS$",
@@ -3935,10 +3977,10 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Über diese Einstellung"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden verwendet gespeicherte URIs für die Anmeldung, um zu bestimmen, welches Symbol oder welche URL zum Ändern des Passworts verwendet werden soll, um dein Erlebnis zu verbessern. Es werden keine Informationen erfasst oder gespeichert, wenn du diesen Dienst nutzt."
   },
   "assignToCollections": {
     "message": "Sammlungen zuweisen"
@@ -4080,59 +4122,106 @@
   "showLess": {
     "message": "Weniger anzeigen"
   },
-  "enableAutotype": {
-    "message": "Autotype aktivieren"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden überprüft die Eingabestellen nicht. Vergewissere dich, dass du dich im richtigen Fenster und Feld befindest, bevor du die Tastenkombination verwendest."
   },
+  "typeShortcut": {
+    "message": "Autotype-Tastaturkürzel"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Füge einen oder zwei der folgenden Modifikatoren ein: Strg, Alt, Win oder Umschalttaste, sowie einen Buchstaben."
+  },
+  "invalidShortcut": {
+    "message": "Ungültiges Tastaturkürzel"
+  },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "Weitere Navigationspfade",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "next": {
-    "message": "Next"
+    "message": "Weiter"
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Key Connector-Domain bestätigen"
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "Bestätigen"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Autotype-Tastaturkürzel aktivieren (Funktionsvorschau)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
+  "enableAutotypeShortcutDescription": {
+    "message": "Stell sicher, dass du dich im richtigen Feld befindest, bevor du das Tastaturkürzel benutzt, um zu vermeiden, dass Daten an der falschen Stelle ausgefüllt werden."
   },
   "editShortcut": {
-    "message": "Edit shortcut"
+    "message": "Tastaturkürzel bearbeiten"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "Archivieren",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Nicht mehr archivieren"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Einträge im Archiv"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Keine Einträge im Archiv"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Archivierte Einträge werden hier angezeigt und von allgemeinen Suchergebnissen sowie Auto-Ausfüllen-Vorschlägen ausgeschlossen."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Eintrag wurde ins Archiv verschoben"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Eintrag wird nicht mehr archiviert"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Eintrag archivieren"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Archivierte Einträge werden von allgemeinen Suchergebnissen und Auto-Ausfüllen-Vorschlägen ausgeschlossen. Bist du sicher, dass du diesen Eintrag archivieren möchtest?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "PLZ / Postleitzahl"
+  },
+  "cardNumberLabel": {
+    "message": "Kartennummer"
+  },
+  "upgradeNow": {
+    "message": "Jetzt upgraden"
+  },
+  "builtInAuthenticator": {
+    "message": "Integrierter Authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Sicherer Dateispeicher"
+  },
+  "emergencyAccess": {
+    "message": "Notfallzugriff"
+  },
+  "breachMonitoring": {
+    "message": "Datendiebstahl-Überwachung"
+  },
+  "andMoreFeatures": {
+    "message": "Und mehr!"
+  },
+  "planDescPremium": {
+    "message": "Umfassende Online-Sicherheit"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade auf Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout-Aktion"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sitzungs-Timeout"
   }
 }
diff --git a/apps/desktop/src/locales/el/messages.json b/apps/desktop/src/locales/el/messages.json
index 0c2ee1fab65..0b869c1e02f 100644
--- a/apps/desktop/src/locales/el/messages.json
+++ b/apps/desktop/src/locales/el/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Καλωσορίσατε και πάλι"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Χρήση single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Υποβολή"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Πρέπει να προσθέσετε είτε το βασικό URL του διακομιστή ή τουλάχιστον ένα προσαρμοσμένο περιβάλλον."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Προσαρμοσμένο περιβάλλον"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Μη έγκυρος κύριος κωδικός πρόσβασης"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Η σύνδεση δύο βημάτων καθιστά τον λογαριασμό σας πιο ασφαλή απαιτώντας από εσάς να επαληθεύσετε τη σύνδεσή σας με άλλη συσκευή, όπως ένα κλειδί ασφαλείας, μία εφαρμογή αυθεντικοποίησης, ένα SMS, μία τηλεφωνική κλήση, ή ένα μήνυμα ηλ. ταχυδρομείου. Η σύνδεση δύο βημάτων μπορεί να ρυθμιστεί στη διαδικτυακή κρύπτη bitwarden.com. Θέλετε να επισκεφθείτε την ιστοσελίδα τώρα;"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Κλείδωμα με τον κύριο κωδικό πρόσβασης κατά την επανεκκίνηση"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Διαγραφή λογαριασμού"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Παρουσιάστηκε σφάλμα κατά την ενεργοποίηση ενσωμάτωσης του περιηγητή."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Δυστυχώς η ενσωμάτωση του προγράμματος περιήγησης υποστηρίζεται μόνο στην έκδοση Mac App Store για τώρα."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Δυστυχώς η ενσωμάτωση του περιηγητή, δεν υποστηρίζεται προς το παρόν στην έκδοση Windows Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Η πρόσκληση έγινε αποδεκτή"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Κλειδωμένο"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 08ec76af874..6bef882d970 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4108,16 +4150,21 @@
   "enableAutotypeShortcutPreview": {
     "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4129,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/en_GB/messages.json b/apps/desktop/src/locales/en_GB/messages.json
index 625d8804676..16af69361c6 100644
--- a/apps/desktop/src/locales/en_GB/messages.json
+++ b/apps/desktop/src/locales/en_GB/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organisation requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/en_IN/messages.json b/apps/desktop/src/locales/en_IN/messages.json
index 41211c2e7d7..c6f1253bb59 100644
--- a/apps/desktop/src/locales/en_IN/messages.json
+++ b/apps/desktop/src/locales/en_IN/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organisation requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Windows Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "PIN"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/eo/messages.json b/apps/desktop/src/locales/eo/messages.json
index cebc2fa1432..28a9f3b8bce 100644
--- a/apps/desktop/src/locales/eo/messages.json
+++ b/apps/desktop/src/locales/eo/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Bonrevenon!"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Propra medio"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Ŝlosi per la ĉefa pasvorto ĉe relanĉo"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Forigi la konton"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Ŝlosita"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/es/messages.json b/apps/desktop/src/locales/es/messages.json
index 346dc0d4221..9966fa1064c 100644
--- a/apps/desktop/src/locales/es/messages.json
+++ b/apps/desktop/src/locales/es/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Bienvenido de nuevo"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Usar inicio de sesión único"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Enviar"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Debes añadir o bien la URL del servidor base, o al menos un entorno personalizado."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Entorno personalizado"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Contraseña maestra no válida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "La autenticación en dos pasos hace que tu cuenta sea mucho más segura, requiriendo que introduzcas un código de seguridad de una aplicación de autenticación cada vez que accedes. La autenticación en dos pasos puede ser habilitada en la caja fuerte web de bitwarden.com. ¿Quieres visitar ahora el sitio web?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Bloquear con contraseña maestra al reiniciar"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Eliminar cuenta"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Se ha producido un error mientras se habilitaba la integración del navegador."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Por desgracia la integración del navegador sólo está soportada por ahora en la versión de la Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Lamentablemente, la integración del navegador no está actualmente soportada en la versión de Microsoft Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitación aceptada"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Bloqueado"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden no valida las ubicaciones de entrada, asegúrate de que estás en la ventana y en el capo correctos antes de usar el atajo."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/et/messages.json b/apps/desktop/src/locales/et/messages.json
index b8afeb2ed6a..d85c52bb763 100644
--- a/apps/desktop/src/locales/et/messages.json
+++ b/apps/desktop/src/locales/et/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Tere tulemast tagasi"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Kinnita"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Sa pead lisama serveri nime (base URL) või vähemalt ühe iseseadistatud keskkonna."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Kohandatud keskkond"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Vale ülemparool"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Kaheastmeline kinnitamine aitab konto turvalisust tõsta. Lisaks paroolile pead kontole ligipääsemiseks kinnitama sisselogimise päringu SMS-ga, telefonikõnega, autentimise rakendusega või e-postiga. Kaheastmelist kinnitust saab sisse lülitada bitwarden.com veebihoidlas. Soovid seda kohe avada?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lukusta ülemparooliga, kui rakendus taaskäivitatakse"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Kustuta konto"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Midagi läks valesti brauseriga ühendamisel."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Paraku on brauseri integratsioon hetkel toetatud ainult Mac App Store'i versioonis."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Paraku ei ole brauseri integratsioon hetkel Microsoft Store versioonis toetatud."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Kutse vastu võetud"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Lukustatud"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/eu/messages.json b/apps/desktop/src/locales/eu/messages.json
index 7f719ec0a4b..36401df0078 100644
--- a/apps/desktop/src/locales/eu/messages.json
+++ b/apps/desktop/src/locales/eu/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Bidali"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Ingurune pertsonalizatua"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Pasahitz nagusi baliogabea"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Bi urratseko saio hasiera dela eta, zure kontua seguruagoa da, beste aplikazio/gailu batekin saioa hastea eskatzen baitizu; adibidez, segurtasun-gako, autentifikazio-aplikazio, SMS, telefono dei edo email bidez. Bi urratseko saio hasiera bitwarden.com webgunean aktibatu daiteke. Orain joan nahi duzu webgunera?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Ezabatu kontua"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Zoritxarrez, Mac App Storeren bertsioan soilik onartzen da oraingoz nabigatzailearen integrazioa."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Zoritxarrez, nabigatzailearen integrazioa ez da onartzen Windows Storen bertsioan."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Blokeatuta"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/fa/messages.json b/apps/desktop/src/locales/fa/messages.json
index fbbbdfd8c7f..ac0e83dd44d 100644
--- a/apps/desktop/src/locales/fa/messages.json
+++ b/apps/desktop/src/locales/fa/messages.json
@@ -42,7 +42,7 @@
     "message": "جستجوی گاوصندوق"
   },
   "resetSearch": {
-    "message": "Reset search"
+    "message": "پاک کردن جستجو"
   },
   "addItem": {
     "message": "افزودن مورد"
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "شما اجازه ویرایش این آیتم را ندارید"
+  },
   "welcomeBack": {
     "message": "خوش آمدید"
   },
@@ -576,7 +579,7 @@
     "message": "کپی کد تأیید (TOTP)"
   },
   "copyFieldCipherName": {
-    "message": "Copy $FIELD$, $CIPHERNAME$",
+    "message": "کپی$FIELD$،$CIPHERNAME$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -703,10 +706,10 @@
     "message": "پیوست ذخیره شد"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "افزودن پیوست"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "حداکثر حجم فایل ۵۰۰ مگابایت است"
   },
   "file": {
     "message": "پرونده"
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "استفاده از ورود تک مرحله‌ای"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "سازمان شما ورود یکپارچه را الزامی کرده است."
+  },
   "submit": {
     "message": "ثبت"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "شما باید یا نشانی اینترنتی پایه سرور را اضافه کنید، یا حداقل یک محیط سفارشی تعریف کنید."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "آدرس‌های وب باید از HTTPS استفاده کنند."
+  },
   "customEnvironment": {
     "message": "محیط سفارشی"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "کلمه عبور اصلی نامعتبر است"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "رمز عبور اصلی نامعتبر است. تأیید کنید که ایمیل شما صحیح است و حساب کاربری شما در $HOST$ ایجاد شده است.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "ورود دو مرحله‌ای باعث می شود که حساب کاربری شما با استفاده از یک دستگاه دیگر مانند کلید امنیتی، برنامه احراز هویت، پیامک، تماس تلفنی و یا رایانامه، اعتبار خود را با ایمنی بیشتر اثبات کند. ورود دو مرحله‌ای می‌تواند در bitwarden.com راه‌اندازی شود. آیا می‌خواهید از سایت بازدید کنید؟"
   },
@@ -1229,7 +1247,7 @@
     "message": "ورود دو مرحله‌ای"
   },
   "vaultTimeoutHeader": {
-    "message": "Vault timeout"
+    "message": "وقفه زمانی گاوصندوق"
   },
   "vaultTimeout": {
     "message": "متوقف شدن گاو‌صندوق"
@@ -1238,7 +1256,7 @@
     "message": "پایان زمان"
   },
   "vaultTimeoutAction1": {
-    "message": "Timeout action"
+    "message": "اقدام وقفه زمانی"
   },
   "vaultTimeoutDesc": {
     "message": "انتخاب کنید که گاو‌صندوق شما چه زمانی عمل توقف زمانی گاوصندوق را انجام دهد."
@@ -1303,7 +1321,7 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "نمایش آیکون‌های وب‌سایت و دریافت آدرس‌های تغییر رمز عبور"
   },
   "enableMinToTray": {
     "message": "کوچک کردن به نماد سینی"
@@ -1449,7 +1467,7 @@
     "description": "Copy credit card security code (CVV)"
   },
   "cardNumber": {
-    "message": "card number"
+    "message": "شماره کارت"
   },
   "premiumMembership": {
     "message": "عضویت پرمیوم"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "در زمان شروع مجدد، با کلمه عبور اصلی قفل کن"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "درخواست رمز عبور اصلی یا پین هنگام راه‌اندازی مجدد برنامه"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "درخواست رمز عبور اصلی هنگام راه‌اندازی مجدد برنامه"
+  },
   "deleteAccount": {
     "message": "حذف حساب کاربری"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "خطایی هنگام فعال‌سازی یکپارچه سازی مرورگر رخ داده است."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "متأسفانه در حال حاضر ادغام مرورگر فقط در نسخه Mac App Store پشتیبانی می‌شود."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "متأسفانه در حال حاضر ادغام مرورگر در نسخه فروشگاه ویندوز پشتیبانی نمی‌شود."
   },
@@ -2416,13 +2437,13 @@
     "message": "کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روزرسانی کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه‌های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
   },
   "changePasswordWarning": {
-    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+    "message": "پس از تغییر رمز عبور، باید با رمز عبور جدید خود وارد شوید. نشست‌های فعال در سایر دستگاه‌ها ظرف یک ساعت خارج خواهند شد."
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
-    "message": "Change your master password to complete account recovery."
+    "message": "برای تکمیل بازیابی حساب، رمز عبور اصلی خود را تغییر دهید."
   },
   "updateMasterPasswordSubtitle": {
-    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+    "message": "رمز عبور اصلی شما با الزامات این سازمان مطابقت ندارد. برای ادامه، رمز عبور اصلی خود را تغییر دهید."
   },
   "tdeDisabledMasterPasswordRequired": {
     "message": "سازمان شما رمزگذاری دستگاه‌های مورد اعتماد را غیرفعال کرده است. لطفاً برای دسترسی به گاوصندوق خود یک کلمه عبور اصلی تنظیم کنید."
@@ -2512,10 +2533,10 @@
     "message": "مهلت زمانی شما بیش از محدودیت‌های تعیین شده توسط سازمان‌تان است."
   },
   "vaultTimeoutPolicyAffectingOptions": {
-    "message": "Enterprise policy requirements have been applied to your timeout options"
+    "message": "الزامات سیاست سازمانی بر روی گزینه‌های وقفه زمانی شما اعمال شده است"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
+    "message": "سیاست‌های سازمان شما حداکثر زمان مجاز وقفه گاوصندوق را روی $HOURS$ ساعت و $MINUTES$ دقیقه تنظیم کرده است.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2528,7 +2549,7 @@
     }
   },
   "vaultTimeoutPolicyMaximumError": {
-    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "message": "زمان وقفه از محدودیت تعیین شده توسط سازمان شما بیشتر است: حداکثر $HOURS$ ساعت و $MINUTES$ دقیقه",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "حداقل زمان وقفه سفارشی ۱ دقیقه است."
+  },
   "inviteAccepted": {
     "message": "دعوتنامه پذیرفته شد"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "فقط از گاوصندوق سازمانی مرتبط با $ORGANIZATION$ خروجی گرفته خواهد شد.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "فقط از گاوصندوق سازمانی مرتبط با $ORGANIZATION$ خروجی گرفته خواهد شد. مجموعه‌های «آیتم‌های من» شامل نخواهند شد.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "قفل شد"
   },
@@ -3031,7 +3073,7 @@
     }
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "درخواست ورود برای $EMAIL$ در $DEVICE$ تأیید شد",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3044,21 +3086,21 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "شما یک تلاش ورود از دستگاهی دیگر را رد کردید. اگر این شما بودید، دوباره با آن دستگاه برای ورود تلاش کنید."
   },
   "webApp": {
-    "message": "Web app"
+    "message": "نسخه وب"
   },
   "mobile": {
-    "message": "Mobile",
+    "message": "موبایل",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "افزونه",
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "دسکتاپ",
     "description": "Desktop app"
   },
   "cli": {
@@ -3069,10 +3111,10 @@
     "description": "Software Development Kit"
   },
   "server": {
-    "message": "Server"
+    "message": "سرور"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "درخواست ورود"
   },
   "deviceType": {
     "message": "نوع دستگاه"
@@ -3216,10 +3258,10 @@
     "message": "درخواست تأیید مدیر"
   },
   "unableToCompleteLogin": {
-    "message": "Unable to complete login"
+    "message": "امکان تکمیل ورود وجود ندارد"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
-    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+    "message": "شما باید در یک دستگاه قابل اعتماد وارد شوید یا از مدیر خود بخواهید رمز عبوری به شما اختصاص دهد."
   },
   "region": {
     "message": "منطقه"
@@ -3486,10 +3528,10 @@
     "message": "یک مجموعه انتخاب کنید"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "اگر می‌خواهید محتویات فایل وارد شده به یک مجموعه منتقل شود، این گزینه را انتخاب کنید"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "اگر می‌خواهید محتویات فایل وارد شده به یک پوشه منتقل شود، این گزینه را انتخاب کنید"
   },
   "importUnassignedItemsError": {
     "message": "پرونده حاوی موارد اختصاص نیافته است."
@@ -3586,10 +3628,10 @@
     "message": "لطفاً برای ورود، از اطلاعات کاربری شرکت خود استفاده کنید."
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "وارد کردن مستقیم از مرورگر"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "پروفایل مرورگر"
   },
   "seeDetailedInstructions": {
     "message": "دستورالعمل‌های کامل را در سایت راهنمای ما مشاهده کنید در",
@@ -3631,11 +3673,11 @@
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
-    "message": "Advanced options",
+    "message": "گزینه‌های پیشرفته",
     "description": "Advanced option placeholder for uri option component"
   },
   "warningCapitalized": {
-    "message": "Warning",
+    "message": "هشدار",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "success": {
@@ -3834,10 +3876,10 @@
     "message": "تغییر کلمه عبور در معرض خطر"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "این ورود در معرض خطر است و فاقد وب‌سایت می‌باشد. برای امنیت بیشتر، یک وب‌سایت اضافه کنید و رمز عبور را تغییر دهید."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "وب‌سایت وجود ندارد"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "نمی‌توانید مجموعه‌هایی را که فقط دسترسی مشاهده دارند حذف کنید: $COLLECTIONS$",
@@ -3935,10 +3977,10 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "درباره این تنظیم"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "بیت‌واردن از URI های ورود ذخیره شده استفاده می‌کند تا تشخیص دهد کدام آیکون یا آدرس تغییر رمز عبور باید برای بهبود تجربه شما استفاده شود. هنگام استفاده از این سرویس، هیچ اطلاعاتی جمع‌آوری یا ذخیره نمی‌شود."
   },
   "assignToCollections": {
     "message": "اختصاص به مجموعه‌ها"
@@ -4075,64 +4117,111 @@
     }
   },
   "showMore": {
-    "message": "Show more"
+    "message": "نمایش بیشتر"
   },
   "showLess": {
-    "message": "Show less"
-  },
-  "enableAutotype": {
-    "message": "Enable Autotype"
+    "message": "نمایش کمتر"
   },
   "enableAutotypeDescription": {
-    "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
+    "message": "بیت‌واردن مکان‌های ورودی را اعتبارسنجی نمی‌کند؛ قبل از استفاده از میانبر، مطمئن شوید که در پنجره و فیلد صحیح قرار دارید."
+  },
+  "typeShortcut": {
+    "message": "تایپ میانبر"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "شامل یک یا دو مورد از کلیدهای تغییردهنده زیر: Ctrl، Alt، Win یا Shift و یک حرف."
+  },
+  "invalidShortcut": {
+    "message": "میانبر نامعتبر"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "مسیرهای بیشتر",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "next": {
-    "message": "Next"
+    "message": "بعدی"
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "تأیید دامنه Key Connector"
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "تأیید"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "فعال‌سازی میانبر تایپ خودکار (پیش‌نمایش ویژگی)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
+  "enableAutotypeShortcutDescription": {
+    "message": "برای جلوگیری از پر کردن داده‌ها در مکان اشتباه، قبل از استفاده از میانبر مطمئن شوید که در فیلد صحیح قرار دارید."
   },
   "editShortcut": {
-    "message": "Edit shortcut"
+    "message": "ویرایش میانبر"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "بایگانی",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "بایگانی کردن",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "خارج کردن از بایگانی"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "آیتم‌های موجود در بایگانی"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "آیتمی در بایگانی وجود ندارد"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "آیتم‌های بایگانی‌شده در اینجا نمایش داده می‌شوند و از نتایج جستجوی عمومی و پیشنهاد ها پر کردن خودکار حذف خواهند شد."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "آیتم به بایگانی فرستاده شد"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "آیتم از بایگانی خارج شد"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "بایگانی آیتم"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "آیتم‌های بایگانی‌شده از نتایج جستجوی عمومی و پیشنهاد ها پر کردن خودکار حذف می‌شوند. آیا مطمئن هستید که می‌خواهید این آیتم را بایگانی کنید؟"
+  },
+  "zipPostalCodeLabel": {
+    "message": "کد پستی"
+  },
+  "cardNumberLabel": {
+    "message": "شماره کارت"
+  },
+  "upgradeNow": {
+    "message": "هم‌اکنون ارتقا دهید"
+  },
+  "builtInAuthenticator": {
+    "message": "تولیدکننده رمز دوعاملی داخلی"
+  },
+  "secureFileStorage": {
+    "message": "ذخیره‌سازی امن فایل"
+  },
+  "emergencyAccess": {
+    "message": "دسترسی اضطراری"
+  },
+  "breachMonitoring": {
+    "message": "پایش نشت اطلاعات"
+  },
+  "andMoreFeatures": {
+    "message": "و بیشتر!"
+  },
+  "planDescPremium": {
+    "message": "امنیت آنلاین کامل"
+  },
+  "upgradeToPremium": {
+    "message": "ارتقا به نسخه پرمیوم"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "اقدام وقفه زمانی"
+  },
+  "sessionTimeoutHeader": {
+    "message": "وقفه زمانی نشست"
   }
 }
diff --git a/apps/desktop/src/locales/fi/messages.json b/apps/desktop/src/locales/fi/messages.json
index ecde260d80e..e2952659d03 100644
--- a/apps/desktop/src/locales/fi/messages.json
+++ b/apps/desktop/src/locales/fi/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Tervetuloa takaisin"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Käytä kertakirjautumista"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Jatka"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Sinun on lisättävä joko palvelimen perusosoite tai ainakin yksi mukautettu palvelinympäristö."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Mukautettu palvelinympäristö"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Virheellinen pääsalasana"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Kaksivaiheinen kirjautuminen parantaa tilisi suojausta vaatimalla kirjautumisen vahvistuksen salasanan lisäksi suojausavaimen, todennussovelluksen, tekstiviestin, puhelun tai sähköpostin avulla. Voit ottaa kaksivaiheisen kirjautumisen käyttöön bitwarden.com‑verkkoholvissa. Haluatko avata sen nyt?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lukitse pääsalasanalla uudelleenkäynnistyksen yhteydessä"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Poista tili"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Otettaessa selainintegraatiota käyttöön tapahtui virhe."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Valitettavasti selainintegraatiota tuetaan toistaiseksi vain Mac App Store -versiossa."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Valitettavasti selainintegraatiota ei toistaiseksi tueta Microsoft Store -versiossa."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Kutsu hyväksyttiin"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Lukittu"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/fil/messages.json b/apps/desktop/src/locales/fil/messages.json
index 5ad2661b46a..6eaa5577807 100644
--- a/apps/desktop/src/locales/fil/messages.json
+++ b/apps/desktop/src/locales/fil/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Isumite"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Kapaligirang Custom"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Imbalidong master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Ang two-step login ay nagpapagaan sa iyong account sa pamamagitan ng pag-verify sa iyong login sa isa pang device tulad ng security key, authenticator app, SMS, tawag sa telepono o email. Ang two-step login ay maaaring magawa sa bitwarden.com web vault. Gusto mo bang bisitahin ang website ngayon?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Tanggalin ang account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Sa kasamaang palad ang pagsasama ng browser ay suportado lamang sa bersyon ng Mac App Store para sa ngayon."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Sa kasamaang palad ang pagsasama ng browser ay kasalukuyang hindi suportado sa bersyon ng Microsoft Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Naka-lock"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/fr/messages.json b/apps/desktop/src/locales/fr/messages.json
index f85708edbe0..6cca98444b8 100644
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Vous n'avez pas l'autorisation de modifier cet élément"
+  },
   "welcomeBack": {
     "message": "Content de vous revoir"
   },
@@ -280,7 +283,7 @@
     "message": "Bitwarden n'a pas pu déchiffrer le(s) élément(s) du coffre listé(s) ci-dessous."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contacter le service clientèle",
+    "message": "Contacter succès client",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Utiliser l'authentification unique"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Votre organisation exige l’authentification unique."
+  },
   "submit": {
     "message": "Soumettre"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Vous devez ajouter soit l'URL du serveur de base, soit au moins un environnement personnalisé."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Les URL doivent utiliser le protocole HTTPS."
+  },
   "customEnvironment": {
     "message": "Environnement personnalisé"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Mot de passe principal invalide"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Mot de passe principal invalide. Confirmez que votre adresse courriel est correcte et que votre compte a été créé sur $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "L'authentification à deux facteurs rend votre compte plus sûr en vous demandant de vérifier votre connexion avec un autre dispositif tel qu'une clé de sécurité, une application d'authentification, un SMS, un appel téléphonique ou un courriel. L'authentification à deux facteurs peut être configurée sur le coffre web de bitwarden.com. Voulez-vous visiter le site web maintenant ?"
   },
@@ -1817,7 +1835,7 @@
     "message": "Code PIN invalide."
   },
   "tooManyInvalidPinEntryAttemptsLoggingOut": {
-    "message": "Trop de tentatives de saisie du code PIN incorrectes. Déconnexion."
+    "message": "Trop de tentatives de saisie du code NIP incorrectes. Déconnexion."
   },
   "unlockWithWindowsHello": {
     "message": "Déverrouiller avec Windows Hello"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Verrouiller avec le mot de passe principal au redémarrage"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Exiger un mot de passe principal ou un code NIP au redémarrage de l'application"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Exiger un mot de passe principal redémarrage de l'application"
+  },
   "deleteAccount": {
     "message": "Supprimer le compte"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Une erreur s'est produite lors de l'action de l'intégration du navigateur."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Malheureusement l'intégration avec le navigateur est uniquement supportée dans la version Mac App Store pour le moment."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Malheureusement l'intégration avec le navigateur n'est pas supportée dans la version Windows Store pour le moment."
   },
@@ -2431,10 +2452,10 @@
     "message": "Essayez de nouveau"
   },
   "verificationRequiredForActionSetPinToContinue": {
-    "message": "Vérification requise pour cette action. Définissez un code PIN pour continuer."
+    "message": "Vérification requise pour cette action. Définissez un code NIP pour continuer."
   },
   "setPin": {
-    "message": "Définir un code PIN"
+    "message": "Définir un code NIP"
   },
   "verifyWithBiometrics": {
     "message": "Vérifier par biométrie"
@@ -2452,7 +2473,7 @@
     "message": "Utiliser le mot de passe principal"
   },
   "usePin": {
-    "message": "Utiliser le code PIN"
+    "message": "Utiliser le code NIP"
   },
   "useBiometrics": {
     "message": "Utiliser la biométrie"
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Le délai d'expiration personnalisé minimum est de 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation acceptée"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Seul le coffre de l'organisation associé à $ORGANIZATION$ sera exporté.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Seul le coffre de l'organisation associé à $ORGANIZATION$ sera exporté. Mes éléments de mes collections ne seront pas inclus.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Verrouillé"
   },
@@ -3547,7 +3589,7 @@
     "message": "Code incorrect"
   },
   "incorrectPin": {
-    "message": "Code PIN incorrect"
+    "message": "Code NIP incorrect"
   },
   "multifactorAuthenticationFailed": {
     "message": "Authentification multifacteur échouée"
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Afficher moins"
   },
-  "enableAutotype": {
-    "message": "Activer la Saisie Auto"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden ne valide pas les emplacements d'entrée, assurez-vous d'être dans la bonne fenêtre et le bon champ avant d'utiliser le raccourci."
   },
+  "typeShortcut": {
+    "message": "Saisir le raccourci"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Inclure un ou deux des modificateurs suivants : Ctrl, Alt, Win, ou Shift, et une lettre."
+  },
+  "invalidShortcut": {
+    "message": "Raccourci invalide"
+  },
   "moreBreadcrumbs": {
     "message": "Plus de fil d'Ariane",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirmer"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Activer le raccourci de la Saisie Auto"
+  "enableAutotypeShortcutPreview": {
+    "message": "Activer le raccourci autotype (aperçu de la fonctionnalité)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Assurez-vous d'être dans le bon champ avant d'utiliser le raccourci pour éviter de remplir les données au mauvais endroit."
   },
   "editShortcut": {
     "message": "Modifier le raccourci"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archiver",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Désarchiver"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Les éléments archivés apparaîtront ici et seront exclus des résultats de recherche généraux et des suggestions de remplissage automatique."
   },
-  "itemSentToArchive": {
-    "message": "Élément envoyé à l'archive"
+  "itemWasSentToArchive": {
+    "message": "L'élément a été envoyé à l'archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Élément retiré de l'archive"
+  "itemWasUnarchived": {
+    "message": "L'élément a été désarchivé"
   },
   "archiveItem": {
     "message": "Archiver l'élément"
   },
   "archiveItemConfirmDesc": {
     "message": "Les éléments archivés sont exclus des résultats de recherche généraux et des suggestions de remplissage automatique. Êtes-vous sûr de vouloir archiver cet élément ?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Code postal"
+  },
+  "cardNumberLabel": {
+    "message": "Numéro de carte"
+  },
+  "upgradeNow": {
+    "message": "Mettre à niveau maintenant"
+  },
+  "builtInAuthenticator": {
+    "message": "Authentificateur intégré"
+  },
+  "secureFileStorage": {
+    "message": "Stockage sécurisé de fichier"
+  },
+  "emergencyAccess": {
+    "message": "Accès d'urgence"
+  },
+  "breachMonitoring": {
+    "message": "Surveillance des fuites"
+  },
+  "andMoreFeatures": {
+    "message": "Et encore plus !"
+  },
+  "planDescPremium": {
+    "message": "Sécurité en ligne complète"
+  },
+  "upgradeToPremium": {
+    "message": "Mettre à niveau vers Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Action à l’expiration"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Délai d'expiration de la session"
   }
 }
diff --git a/apps/desktop/src/locales/gl/messages.json b/apps/desktop/src/locales/gl/messages.json
index 5849d9d4cee..d607bb8d097 100644
--- a/apps/desktop/src/locales/gl/messages.json
+++ b/apps/desktop/src/locales/gl/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/he/messages.json b/apps/desktop/src/locales/he/messages.json
index 5cbceb3ad76..868cd9ccbc5 100644
--- a/apps/desktop/src/locales/he/messages.json
+++ b/apps/desktop/src/locales/he/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "אין לך הרשאות לערוך את הפריט הזה"
+  },
   "welcomeBack": {
     "message": "ברוך שובך"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "השתמש בכניסה יחידה"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "הארגון שלך דורש כניסה יחידה."
+  },
   "submit": {
     "message": "שלח"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "אתה מוכרח להוסיף או את בסיס ה־URL של השרת או לפחות סביבה מותאמת אישית אחת."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "כתובות URL מוכרחות להשתמש ב־HTTPS."
+  },
   "customEnvironment": {
     "message": "סביבה מותאמת אישית"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "סיסמה ראשית שגויה"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "סיסמה ראשית אינה תקינה. יש לאשר שהדוא\"ל שלך נכון ושהחשבון שלך נוצר ב־$HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "אימות דו שלבי הופך את החשבון שלך למאובטח יותר בכך שתצטרך לאשר התחברות בעזרת מפתח אבטחה, תוכנת אימות, SMS, שיחת טלפון, או אימייל. ניתן להפעיל את \"אימות דו שלבי\" בכספת שבאתר bitwarden.com. האם ברצונך לפתוח את האתר כעת?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "נעל בעזרת הסיסמה הראשית בהפעלה מחדש"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "דרוש סיסמה ראשית או PIN בעת הפעלה מחדש של היישום"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "דרוש סיסמה ראשית בעת הפעלה מחדש של היישום"
+  },
   "deleteAccount": {
     "message": "מחק חשבון"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "אירעה שגיאה בעת אפשור שילוב דפדפן."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "למרבה הצער שילוב דפדפן נתמך רק בגרסת Mac App Store לעת עתה."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "למרבה הצער שילוב דפדפן אינו נתמך כרגע בגרסת ה־Microsoft Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "פסק זמן מותאם אישית מינימלי הוא דקה 1."
+  },
   "inviteAccepted": {
     "message": "ההזמנה התקבלה"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "רק הכספת הארגונית המשויכת עם $ORGANIZATION$ תיוצא.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "רק הכספת הארגונית המשויכת עם $ORGANIZATION$ תיוצא. פריטי האוספים שלי לא יכללו.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "נעול"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "הצג פחות"
   },
-  "enableAutotype": {
-    "message": "הפעל הקלדה אוטומטית"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden לא מאמת את מקומות הקלט, נא לוודא שזה החלון והשדה הנכונים בטרם שימוש בקיצור הדרך."
   },
+  "typeShortcut": {
+    "message": "הקלד קיצור דרך"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "כלול אחד או שניים ממקשי הצירוף הבאים: Ctrl, Alt, Win, או Shift, ואות."
+  },
+  "invalidShortcut": {
+    "message": "קיצור דרך לא חוקי"
+  },
   "moreBreadcrumbs": {
     "message": "עוד סימני דרך",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,40 +4147,81 @@
   "confirm": {
     "message": "אשר"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "הפעל קיצור דרך להקלדה אוטומטית"
+  "enableAutotypeShortcutPreview": {
+    "message": "הפעל קיצור דרך להקלדה אוטומטית (תצוגה תכונה מקדימה)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "וודא שאתה נמצא בשדה הנכון לפני השימוש בקיצור הדרך כדי להימנע ממילוי נתונים במקום הלא נכון."
   },
   "editShortcut": {
     "message": "ערוך קיצור דרך"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "ארכיון",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "העבר לארכיון",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "הסר מהארכיון"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "פריטים בארכיון"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "אין פריטים בארכיון"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "פריטים בארכיון יופיעו כאן ויוחרגו מתוצאות חיפוש כללי והצעות למילוי אוטומטי."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "הפריט נשלח לארכיון"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "הפריט הוסר מהארכיון"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "העבר פריט לארכיון"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "פריטים בארכיון מוחרגים מתוצאות חיפוש כללי והצעות למילוי אוטומטי. האם אתה בטוח שברצונך להעביר פריט זה לארכיון?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "מיקוד"
+  },
+  "cardNumberLabel": {
+    "message": "מספר כרטיס"
+  },
+  "upgradeNow": {
+    "message": "שדרג עכשיו"
+  },
+  "builtInAuthenticator": {
+    "message": "מאמת מובנה"
+  },
+  "secureFileStorage": {
+    "message": "אחסון קבצים מאובטח"
+  },
+  "emergencyAccess": {
+    "message": "גישת חירום"
+  },
+  "breachMonitoring": {
+    "message": "ניטור פרצות"
+  },
+  "andMoreFeatures": {
+    "message": "ועוד!"
+  },
+  "planDescPremium": {
+    "message": "השלם אבטחה מקוונת"
+  },
+  "upgradeToPremium": {
+    "message": "שדרג לפרימיום"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "פעולת פסק זמן"
+  },
+  "sessionTimeoutHeader": {
+    "message": "פסק זמן להפעלה"
   }
 }
diff --git a/apps/desktop/src/locales/hi/messages.json b/apps/desktop/src/locales/hi/messages.json
index 25ecbdf3840..2ab323eedc9 100644
--- a/apps/desktop/src/locales/hi/messages.json
+++ b/apps/desktop/src/locales/hi/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/hr/messages.json b/apps/desktop/src/locales/hr/messages.json
index 64f89a8b15f..0f7a8185118 100644
--- a/apps/desktop/src/locales/hr/messages.json
+++ b/apps/desktop/src/locales/hr/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Nemaš dozvolu za uređivanje ove stavke"
+  },
   "welcomeBack": {
     "message": "Dobro došli natrag"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Jedinstvena prijava (SSO)"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tvoja organizacija zahtijeva jedinstvenu prijavu."
+  },
   "submit": {
     "message": "Pošalji"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Moraš dodati ili osnovni URL poslužitelja ili barem jedno prilagođeno okruženje."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL mora koristiti HTTPS."
+  },
   "customEnvironment": {
     "message": "Prilagođeno okruženje"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Neispravna glavna lozinka"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Nevažeća glavna lozinka. Provjeri je li tvoja adresa e-pošta ispravna i je li račun kreiran na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Prijava dvostrukom autentifikacijom čini tvoj račun još sigurnijim tako što će zahtijevati potvrdu prijave drugim uređajem kao što je sigurnosni ključ, autentifikatorska aplikacija, SMS, poziv ili e-pošta. Prijavu dvostrukom autentifikacijom možeš omogućiti na web trezoru. Želiš li sada posjetiti bitwarden.com?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Zaključaj glavnom lozinkom kod svakog pokretanja"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Traži glavnu lozinku ili PIN kod ponovnog pokretanja aplikacije"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Traži glavnu lozinku kod ponovnog pokretanja aplikacije"
+  },
   "deleteAccount": {
     "message": "Obriši račun"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Pogreška prillikom integracije s preglednikom."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Nažalost, za sada je integracija s preglednikom podržana samo u Mac App Store verziji aplikacije."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Nažalost, integracija s preglednikom trenutno nije podržana u Windows Store verziji aplikacije."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Najmanje prilagođeno vrijeme je 1 minuta."
+  },
   "inviteAccepted": {
     "message": "Pozivnica prihvaćena"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Izvezt će se samo trezor organizacije povezan s $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Izvezt će se samo trezor organizacije povezan s $ORGANIZATION$. Zbirka mojih stavki neće biti uključena.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Zaključano"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Pokaži manje"
   },
-  "enableAutotype": {
-    "message": "Omogući automatski unos"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden ne provjerava lokacije unosa, prije korištenja prečaca provjeri da si u pravom prozoru i polju."
   },
+  "typeShortcut": {
+    "message": "Vrsta prečaca"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Uključi jedan ili dva modifikatora: Ctrl, Alt, Win ili Shift i slovo."
+  },
+  "invalidShortcut": {
+    "message": "Nevažeći prečac"
+  },
   "moreBreadcrumbs": {
     "message": "Više mrvica",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Potvrdi"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Omogući prečac za automatsko tipkanje"
+  "enableAutotypeShortcutPreview": {
+    "message": "Uključi prečac Autotype (Pretpregled značajke)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Prije korištenja prečaca provjeri nalaziš li se u ispravnom polju kako se podaci ne bi unijeli na pogrešno mjesto."
+  "enableAutotypeShortcutDescription": {
+    "message": "Prije korištenja prečaca provjeri jesi li u ispravnom polju kako podaci ne bi bili uneseni na pogrešno mjesto."
   },
   "editShortcut": {
     "message": "Uredi prečac"
   },
-  "archive": {
-    "message": "Arhiviraj"
+  "archiveNoun": {
+    "message": "Arhiva",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arhiviraj",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Poništi arhiviranje"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Arhivirane stavke biti će prikazane ovdje i biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Stavka poslana u arhivu"
   },
-  "itemRemovedFromArchive": {
-    "message": "Stavka maknute iz arhive"
+  "itemWasUnarchived": {
+    "message": "Stavka vraćena iz arhive"
   },
   "archiveItem": {
     "message": "Arhiviraj stavku"
   },
   "archiveItemConfirmDesc": {
     "message": "Arhivirane stavke biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune. Sigurno želiš arhivirati?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Poštanski broj"
+  },
+  "cardNumberLabel": {
+    "message": "Broj kartice"
+  },
+  "upgradeNow": {
+    "message": "Nadogradi sada"
+  },
+  "builtInAuthenticator": {
+    "message": "Ugrađeni autentifikator"
+  },
+  "secureFileStorage": {
+    "message": "Sigurna pohrana datoteka"
+  },
+  "emergencyAccess": {
+    "message": "Pristup u nuždi"
+  },
+  "breachMonitoring": {
+    "message": "Nadzor proboja"
+  },
+  "andMoreFeatures": {
+    "message": "I više!"
+  },
+  "planDescPremium": {
+    "message": "Dovrši online sigurnost"
+  },
+  "upgradeToPremium": {
+    "message": " Nadogradi na Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Radnja nakon isteka"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Istek sesije"
   }
 }
diff --git a/apps/desktop/src/locales/hu/messages.json b/apps/desktop/src/locales/hu/messages.json
index 9f71448ce5a..9a6dd787f8c 100644
--- a/apps/desktop/src/locales/hu/messages.json
+++ b/apps/desktop/src/locales/hu/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Nincs jogosulltság ezen elem szerkesztéséhez."
+  },
   "welcomeBack": {
     "message": "Üdvözlet újra"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Egyszeri bejelentkezés használata"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A szervezet egyszeri bejelentkezést igényel."
+  },
   "submit": {
     "message": "Beküldés"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Hozzá kell adni az alapszerver webcímét vagy legalább egy egyedi környezetet."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "A webcímeknek HTTPS-t kell használniuk."
+  },
   "customEnvironment": {
     "message": "Egyedi környezet"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "A mesterjelszó érvénytelen."
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "A mesterjelszó érvénytelen. Erősítsük meg, hogy email cím helyes és a fiók létrehozásának helye: $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "A kétlépcsős bejelentkezés biztonságosabbá teszi a fiókot azzal, hogy meg kell erősíteni a bejelentkezést egy másik olyan eszközzel mint például biztonsági kulcs, hitelesítő alkalmazás, SMS, telefonhívás vagy email. A kétlépcsős bejelentkezést a bitwarden.com webes széfben lehet megváltoztatni. Szeretnénk felkeresni most a webhelyet?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lezárás mesterjelszóval újraindításkor"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Mesterjelszó vagy PIN kód szükséges az alkalmazás indításakor."
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Mesterjelszó szükséges az alkalmazás indításakor."
+  },
   "deleteAccount": {
     "message": "Fiók törlése"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Hiba történt a böngésző integrációjának engedélyezése közben."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Sajnos a böngésző integrációt egyelőre csak a Mac App Store verzió támogatja."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "A böngésző integrációt egyelőre csak a Windows Store verzió támogatja."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "A minimális egyedi időkifutás 1 perc."
+  },
   "inviteAccepted": {
     "message": "A meghívás elfogadásra került."
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Csak a $ORGANIZATION$ szervezetehez kapcsolódó szervezeti széf kerül exportálásra.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Csak a $ORGANIZATION$ szervezethez kapcsolódó szervezeti széf kerül exportálásra. A saját elem gyűjtemények nem lesznek benne.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Lezárva"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Kevesebb megjelenítése"
   },
-  "enableAutotype": {
-    "message": "Autotípus engedélyezése"
-  },
   "enableAutotypeDescription": {
     "message": "A Bitwarden nem érvényesíti a beviteli helyeket, győződjünk meg róla, hogy a megfelelő ablakban és mezőben vagyunk, mielőtt a parancsikont használnánk."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "További morzsamenük",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Megerősítés"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Automatikus típusú parancsikon engedélyezése"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Győződjünk meg arról, hogy a megfelelő mezőben vagyunk, mielőtt a parancsikont használnánk, hogy elkerüljük az adatok rossz helyre történő kitöltését."
   },
   "editShortcut": {
     "message": "Parancsikon szerkesztése"
   },
-  "archive": {
-    "message": "Archívum"
+  "archiveNoun": {
+    "message": "Archívum",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archívum",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Visszavétel archívumból"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Az archivált elemek itt jelennek meg és kizárásra kerülnek az általános keresési eredményekből és az automatikus kitöltési javaslatokból."
   },
-  "itemSentToArchive": {
-    "message": "Archívumba küldött elemek száma"
+  "itemWasSentToArchive": {
+    "message": "Az elem az archivumba került."
   },
-  "itemRemovedFromArchive": {
-    "message": "Az elem kikerült az archívumból."
+  "itemWasUnarchived": {
+    "message": "Az elem visszavéelre került az archivumból."
   },
   "archiveItem": {
     "message": "Elem archiválása"
   },
   "archiveItemConfirmDesc": {
     "message": "Az archivált elemek ki vannak zárva az általános keresési eredményekből és az automatikus kitöltési javaslatokból. Biztosan archiválni szeretnénk ezt az elemet?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Irányítószám"
+  },
+  "cardNumberLabel": {
+    "message": "Kártya szám"
+  },
+  "upgradeNow": {
+    "message": "Áttérés most"
+  },
+  "builtInAuthenticator": {
+    "message": "Beépített hitelesítő"
+  },
+  "secureFileStorage": {
+    "message": "Biztonságos fájl tárolás"
+  },
+  "emergencyAccess": {
+    "message": "Sürgősségi hozzáférés"
+  },
+  "breachMonitoring": {
+    "message": "Adatszivárgás figyelés"
+  },
+  "andMoreFeatures": {
+    "message": "És még több!"
+  },
+  "planDescPremium": {
+    "message": "Teljes körű online biztonság"
+  },
+  "upgradeToPremium": {
+    "message": "Áttérés Prémium csomagra"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Időkifutási művelet"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Munkamenet időkifutás"
   }
 }
diff --git a/apps/desktop/src/locales/id/messages.json b/apps/desktop/src/locales/id/messages.json
index 3f44fd8bf97..188ee153da1 100644
--- a/apps/desktop/src/locales/id/messages.json
+++ b/apps/desktop/src/locales/id/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Kirim"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Lingkungan Kustom"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Sandi utama tidak valid"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Info masuk dua langkah membuat akun Anda lebih aman dengan mengharuskan Anda memverifikasi info masuk Anda dengan peranti lain seperti kode keamanan, aplikasi autentikasi, SMS, panggilan telepon, atau email. Info masuk dua langkah dapat diaktifkan di brankas web bitwarden.com. Anda ingin mengunjungi situs web sekarang?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Hapus akun"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Sayangnya integrasi browser hanya didukung di versi Mac App Store untuk saat ini."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Sayangnya integrasi browser saat ini tidak didukung di versi Windows Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Terkunci"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/it/messages.json b/apps/desktop/src/locales/it/messages.json
index 780d09f3582..8caf4982356 100644
--- a/apps/desktop/src/locales/it/messages.json
+++ b/apps/desktop/src/locales/it/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Non hai i permessi per modificare questo elemento"
+  },
   "welcomeBack": {
     "message": "Bentornato"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Usa il Single Sign-On"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "La tua organizzazione richiede un accesso Single Sign-On (SSO)."
+  },
   "submit": {
     "message": "Invia"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Devi aggiungere lo URL del server di base o almeno un ambiente personalizzato."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Gli indirizzi devono usare il protocollo HTTPS."
+  },
   "customEnvironment": {
     "message": "Ambiente personalizzato"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Password principale errata"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Password principale errata. Verifica che l'email sia corretta e che l'account sia stato creato su $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "La verifica in due passaggi rende il tuo account più sicuro richiedendoti di verificare il tuo login usando un altro dispositivo come una chiave di sicurezza, app di autenticazione, SMS, telefonata, o email. Può essere abilitata nella cassaforte web su bitwarden.com. Vuoi visitare il sito?"
   },
@@ -1303,7 +1321,7 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Mostra le icone dei siti e recupera gli URL di cambio password"
   },
   "enableMinToTray": {
     "message": "Minimizza nell'area di notifica"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Blocca con password principale al riavvio"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Richiedi la password principale dopo il riavvio"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Richiedi la password principale dopo il riavvio"
+  },
   "deleteAccount": {
     "message": "Elimina account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Si è verificato un errore durante l'attivazione dell'integrazione del browser."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Purtroppo l'integrazione del browser è supportata solo nella versione nell'App Store per ora."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Purtroppo l'integrazione del browser non è supportata nella versione del Microsoft Store per ora."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Il timeout personalizzato minimo è di 1 minuto."
+  },
   "inviteAccepted": {
     "message": "Invito accettato"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Solo la cassaforte dell'organizzazione associata a $ORGANIZATION$ sarà esportata.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Solo la cassaforte dell'organizzazione associata a $ORGANIZATION$ sarà esportata. Eventuali raccolte di elementi non saranno incluse.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Bloccato"
   },
@@ -3586,10 +3628,10 @@
     "message": "Continua ad accedere utilizzando le tue credenziali aziendali."
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "Importa direttamente dal browser"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "Profilo Browser"
   },
   "seeDetailedInstructions": {
     "message": "Consulta le istruzioni dettagliate sul nostro sito di assistenza su",
@@ -3834,10 +3876,10 @@
     "message": "Modifica la password non sicura o esposta"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Questo login è a rischio e non contiene un sito web. Aggiungi un sito web e cambia la password per maggiore sicurezza."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Sito Web mancante"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "Non puoi rimuovere raccolte con i soli permessi di visualizzazione: $COLLECTIONS$",
@@ -3935,10 +3977,10 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Informazioni su questa opzione"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden userà gli URL memorizzati in ogni login per mostrare, se possibile, l'icona del sito Web e l'URL di modifica password per facilitare la modifica delle credenziali. Nessuna informazione è raccolta o archiviata per il funzionamento di questo servizio."
   },
   "assignToCollections": {
     "message": "Assegna a una raccolta"
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Mostra di meno"
   },
-  "enableAutotype": {
-    "message": "Abilita auto immissione"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden non convalida i campi di input: assicurati di essere nella finestra e nel campo di testo corretti prima di usare la scorciatoia."
   },
+  "typeShortcut": {
+    "message": "Premi i tasti da impostare per la scorciatoia"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Includi uno o due dei seguenti modificatori: Ctrl, Alt, Win, o Shift, più una lettera."
+  },
+  "invalidShortcut": {
+    "message": "Scorciatoia non valida"
+  },
   "moreBreadcrumbs": {
     "message": "Ulteriori segmenti",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,40 +4147,81 @@
   "confirm": {
     "message": "Conferma"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Abilita la scorciatoia automatica (beta)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
+  "enableAutotypeShortcutDescription": {
+    "message": "Assicurati di essere nel campo corretto prima di usare la scorciatoia."
   },
   "editShortcut": {
-    "message": "Edit shortcut"
+    "message": "Modifica scorciatoia"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archivio",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "Archivia",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Rimuovi dall'Archivio"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Elementi archiviati"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Nessun elemento nell'archivio"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Gli elementi archiviati appariranno qui e saranno esclusi dai risultati di ricerca e dall'auto-riempimento."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Elemento archiviato"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Elemento rimosso dall'archivio"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Archivia elemento"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Gli elementi archiviati sono esclusi dai risultati di ricerca e dall'auto-riempimento. Vuoi davvero archiviare questo elemento?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "CAP / codice postale"
+  },
+  "cardNumberLabel": {
+    "message": "Numero carta"
+  },
+  "upgradeNow": {
+    "message": "Aggiorna ora"
+  },
+  "builtInAuthenticator": {
+    "message": "App di autenticazione integrata"
+  },
+  "secureFileStorage": {
+    "message": "Archiviazione sicura di file"
+  },
+  "emergencyAccess": {
+    "message": "Accesso di emergenza"
+  },
+  "breachMonitoring": {
+    "message": "Monitoraggio delle violazioni"
+  },
+  "andMoreFeatures": {
+    "message": "E molto altro!"
+  },
+  "planDescPremium": {
+    "message": "Sicurezza online completa"
+  },
+  "upgradeToPremium": {
+    "message": "Aggiorna a Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Azione al timeout"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Timeout della sessione"
   }
 }
diff --git a/apps/desktop/src/locales/ja/messages.json b/apps/desktop/src/locales/ja/messages.json
index a58543302fa..ca50828b12c 100644
--- a/apps/desktop/src/locales/ja/messages.json
+++ b/apps/desktop/src/locales/ja/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "ようこそ"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "シングルサインオンを使用する"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "送信"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "ベース サーバー URL または少なくとも 1 つのカスタム環境を追加する必要があります。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "カスタム環境"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "マスターパスワードが間違っています"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "2段階認証を使うと、ログイン時にセキュリティキーや認証アプリ、SMS、電話やメールでの認証を必要にすることでアカウントをさらに安全に出来ます。2段階認証は bitwarden.com ウェブ保管庫で有効化できます。ウェブサイトを開きますか？"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "再起動時にマスターパスワードでロック"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "アカウントを削除"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "ブラウザー統合の有効化中にエラーが発生しました。"
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "残念ながら、ブラウザ統合は、Mac App Storeのバージョンでのみサポートされています。"
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "残念ながらお使いの Microsoft Store のバージョンではブラウザの統合に対応していません。"
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "招待が承認されました"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "ロック中"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/ka/messages.json b/apps/desktop/src/locales/ka/messages.json
index 0bb7e929979..9337286d3fd 100644
--- a/apps/desktop/src/locales/ka/messages.json
+++ b/apps/desktop/src/locales/ka/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -262,7 +265,7 @@
     "message": "Remember until vault is locked"
   },
   "premiumRequired": {
-    "message": "Premium required"
+    "message": "საჭიროა პრემიუმი"
   },
   "premiumRequiredDesc": {
     "message": "A Premium membership is required to use this feature."
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "გადაცემა"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1601,7 +1619,7 @@
     "message": "ყველაფრის ჩვენება"
   },
   "quitBitwarden": {
-    "message": "Quit Bitwarden"
+    "message": "გამოდით Bitwarden-იდან"
   },
   "valueCopied": {
     "message": "$VALUE$ copied",
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "ანგარიშის წაშლა"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "დაბლოკილია"
   },
@@ -3852,7 +3894,7 @@
     "message": "Move"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "ახალი საქაღალდე"
   },
   "folderName": {
     "message": "Folder Name"
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/km/messages.json b/apps/desktop/src/locales/km/messages.json
index 5849d9d4cee..d607bb8d097 100644
--- a/apps/desktop/src/locales/km/messages.json
+++ b/apps/desktop/src/locales/km/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/kn/messages.json b/apps/desktop/src/locales/kn/messages.json
index 66a6e43d0cb..d1375efee8c 100644
--- a/apps/desktop/src/locales/kn/messages.json
+++ b/apps/desktop/src/locales/kn/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "ಒಪ್ಪಿಸು"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "ಕಸ್ಟಮ್ ಪರಿಸರ"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "ಅಮಾನ್ಯ ಮಾಸ್ಟರ್ ಪಾಸ್‌ವರ್ಡ್"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "ಭದ್ರತಾ ಕೀ, ದೃಢೀಕರಣ ಅಪ್ಲಿಕೇಶನ್, ಎಸ್‌ಎಂಎಸ್, ಫೋನ್ ಕರೆ ಅಥವಾ ಇಮೇಲ್‌ನಂತಹ ಮತ್ತೊಂದು ಸಾಧನದೊಂದಿಗೆ ನಿಮ್ಮ ಲಾಗಿನ್ ಅನ್ನು ಪರಿಶೀಲಿಸುವ ಅಗತ್ಯವಿರುವ ಎರಡು ಹಂತದ ಲಾಗಿನ್ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹೆಚ್ಚು ಸುರಕ್ಷಿತಗೊಳಿಸುತ್ತದೆ. ಬಿಟ್ವಾರ್ಡೆನ್.ಕಾಮ್ ವೆಬ್ ವಾಲ್ಟ್ನಲ್ಲಿ ಎರಡು-ಹಂತದ ಲಾಗಿನ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬಹುದು. ನೀವು ಈಗ ವೆಬ್‌ಸೈಟ್‌ಗೆ ಭೇಟಿ ನೀಡಲು ಬಯಸುವಿರಾ?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "ದುರದೃಷ್ಟವಶಾತ್ ಬ್ರೌಸರ್ ಏಕೀಕರಣವನ್ನು ಇದೀಗ ಮ್ಯಾಕ್ ಆಪ್ ಸ್ಟೋರ್ ಆವೃತ್ತಿಯಲ್ಲಿ ಮಾತ್ರ ಬೆಂಬಲಿಸಲಾಗುತ್ತದೆ."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "ದುರದೃಷ್ಟವಶಾತ್ ವಿಂಡೋಸ್ ಸ್ಟೋರ್ ಆವೃತ್ತಿಯಲ್ಲಿ ಬ್ರೌಸರ್ ಏಕೀಕರಣವನ್ನು ಪ್ರಸ್ತುತ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/ko/messages.json b/apps/desktop/src/locales/ko/messages.json
index 59423b8ad73..2e40b8d7f23 100644
--- a/apps/desktop/src/locales/ko/messages.json
+++ b/apps/desktop/src/locales/ko/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "돌아온 것을 환영합니다"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Single sign-on(SSO) 사용"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "보내기"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "사용자 지정 환경"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "잘못된 마스터 비밀번호"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "2단계 인증은 보안 키, 인증 앱, SMS, 전화 통화 등의 다른 기기로 사용자의 로그인 시도를 검증하여 사용자의 계정을 더욱 안전하게 만듭니다. 2단계 인증은 bitwarden.com 웹 보관함에서 활성화할 수 있습니다. 지금 웹 사이트를 방문하시겠습니까?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "계정 삭제"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "브라우저와 연결은 현재 Mac App Store 버전에서만 지원됩니다."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "현재 Microsoft Store 버전에서는 브라우저와 연결이 지원되지 않습니다."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "잠김"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/lt/messages.json b/apps/desktop/src/locales/lt/messages.json
index 8159bc5e28b..16f328d6240 100644
--- a/apps/desktop/src/locales/lt/messages.json
+++ b/apps/desktop/src/locales/lt/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Išsaugoti"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Individualizuota aplinka"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Neteisingas pagrindinis slaptažodis"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Prisijungus dviem veiksmais, jūsų paskyra tampa saugesnė, reikalaujant patvirtinti prisijungimą naudojant kitą įrenginį, pvz., Saugos raktą, autentifikavimo programą, SMS, telefono skambutį ar el. Paštą. Dviejų žingsnių prisijungimą galima įjungti „bitwarden.com“ interneto saugykloje. Ar norite dabar apsilankyti svetainėje?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Ištrinti paskyrą"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Deja, bet naršyklės integravimas kol kas palaikomas tik Mac App Store versijoje."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Deja, bet naršyklės integravimas nepalaikomas Microsoft Store versijoje."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Užrakinta"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/lv/messages.json b/apps/desktop/src/locales/lv/messages.json
index 5e29f10190b..7800a4e9024 100644
--- a/apps/desktop/src/locales/lv/messages.json
+++ b/apps/desktop/src/locales/lv/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Nav nepieciešamo atļauju, lai labotu šo vienumu"
+  },
   "welcomeBack": {
     "message": "Laipni lūdzam atpakaļ"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Izmantot vienoto pieteikšanos"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tava apvienība pieprasa vienoto pieteikšanos."
+  },
   "submit": {
     "message": "Iesniegt"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Jāpievieno vai no servera pamata URL vai vismaz viena pielāgota vide."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Pielāgota vide"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Nederīga galvenā parole"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Nederīga galvenā parole. Jāpārliecinās, ka e-pasta adrese ir pareiza un konts tika izveidots $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Divpakāpju pieteikšanās padara kontu krietni drošāku, pieprasot apstiprināt pieteikšanos ar tādu citu ierīču vai pakalpojumu starpniecību kā drošības atslēga, autentificētāja lietotne, īsziņa, tālruņa zvans vai e-pasts. Divpakāpju pieteikšanos var iespējot bitwarden.com tīmekļa glabātavā. Vai tagad apmeklēt tīmekļvietni?"
   },
@@ -1369,7 +1387,7 @@
     "message": "Valoda"
   },
   "languageDesc": {
-    "message": "Mainīt lietotnes valodu. Ir nepieciešama pārsāknēšana."
+    "message": "Mainīt lietotnes valodu. Ir nepieciešama atkārtota palaišana."
   },
   "theme": {
     "message": "Izskats"
@@ -1405,7 +1423,7 @@
     "message": "Pārsāknēt, lai atjauninātu"
   },
   "restartToUpdateDesc": {
-    "message": "Versija $VERSION_NUM$ ir gatava uzstādīšanai. Ir jāpārsāknē lietotne, lai pabeigtu uzstādīšanu. Vai pārsāknēt un atjaunināt tagad?",
+    "message": "Versija $VERSION_NUM$ ir gatava uzstādīšanai. Lietotne ir jāpalaiž no jauna, lai pabeigtu uzstādīšanu. Vai palaist no jauna un atjaunināt tagad?",
     "placeholders": {
       "version_num": {
         "content": "$1",
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Aizslēgt ar galveno paroli pēc pārsāknēšanas"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Pieprasīt galveno paroli vai PIN pēc lietotnes atkārtotas palaišanas"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Pieprasīt galveno paroli pēc lietotnes atkārtotas palaišanas"
+  },
   "deleteAccount": {
     "message": "Izdzēst kontu"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Atgadījās kļūda pārlūka saistīšanas iespējošanas laikā."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Diemžēl sasaistīšāna ar pārlūku pagaidām ir nodrošināta tikai Mac App Store laidienā."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Diemžēl sasaistīšana ar pārlūku pagaidām nav nodrošināta Windows veikala laidienā."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Mazākā pieļaujamā pielāgotā noildze ir 1 minūte."
+  },
   "inviteAccepted": {
     "message": "Uzaicinājums apstiprināts"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Aizslēgta"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Rādīt mazāk"
   },
-  "enableAutotype": {
-    "message": "Iespējot automātisko ievadi"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden nepārbauda ievades atrašanās vietas, jāpārliecinās, ka atrodies pareizajā logā un laukā, pirms saīsnes izmantošanas."
   },
+  "typeShortcut": {
+    "message": "Ievadīt īsinājumtaustiņus"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Jāiekļauj viens vai divi no šiem taustiņiem - Ctrl, Alt, Win vai Shift - un burts."
+  },
+  "invalidShortcut": {
+    "message": "Nederīgi īsinājumtaustiņi"
+  },
   "moreBreadcrumbs": {
     "message": "Vairāk norāžu",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Apstiprināt"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Iespējot automātiskās ievades saīsni"
+  "enableAutotypeShortcutPreview": {
+    "message": "Iespējot automātiskās ievades īsinājumtaustiņus (iespējas priekšskatījums)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Jāpārliecinās, ka pirms saīsnes izmantošanas kursors ir pareizajā laukā, lai izvairītos no datu ievadīšanas nepareizā vietā."
   },
   "editShortcut": {
     "message": "Labot saīsni"
   },
-  "archive": {
-    "message": "Arhivēt"
+  "archiveNoun": {
+    "message": "Arhīvs",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arhivēt",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Atcelt arhivēšanu"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Šeit parādīsies arhivētie vienumi, un tie netiks iekļauti vispārējās meklēšanas iznākumos un automātiskās aizpildes ieteikumos."
   },
-  "itemSentToArchive": {
-    "message": "Vienums ievietots arhīvā"
+  "itemWasSentToArchive": {
+    "message": "Vienums tika ievietots arhīvā"
   },
-  "itemRemovedFromArchive": {
-    "message": "Vienums izņemts no arhīva"
+  "itemWasUnarchived": {
+    "message": "Vienums tika izņemts no arhīva"
   },
   "archiveItem": {
     "message": "Arhivēt vienumu"
   },
   "archiveItemConfirmDesc": {
     "message": "Arhivētie vienumi netiek iekļauti vispārējās meklēšanas iznākumos un automātiskās aizpildes ieteikumos. Vai tiešām ahrivēt šo vienumu?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Pasta indekss"
+  },
+  "cardNumberLabel": {
+    "message": "Kartes numurs"
+  },
+  "upgradeNow": {
+    "message": "Uzlabot tagad"
+  },
+  "builtInAuthenticator": {
+    "message": "Iebūvēts autentificētājs"
+  },
+  "secureFileStorage": {
+    "message": "Droša datņu krātuve"
+  },
+  "emergencyAccess": {
+    "message": "Ārkārtas piekļuve"
+  },
+  "breachMonitoring": {
+    "message": "Noplūžu pārraudzīšana"
+  },
+  "andMoreFeatures": {
+    "message": "Un vēl!"
+  },
+  "planDescPremium": {
+    "message": "Pilnīga drošība tiešsaistē"
+  },
+  "upgradeToPremium": {
+    "message": "Uzlabot uz Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Noildzes darbība"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sesijas noildze"
   }
 }
diff --git a/apps/desktop/src/locales/me/messages.json b/apps/desktop/src/locales/me/messages.json
index b023d0efab0..29e3cefee0c 100644
--- a/apps/desktop/src/locales/me/messages.json
+++ b/apps/desktop/src/locales/me/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Podnesi"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Prilagođeno okruženje"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Nevažeća glavna lozinka"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Prijavljivanje u dva koraka čini vaš nalog sigurnijim tako što ćete morati da verifikujete prijavu na drugom uređaju, kao što su bezbjedonosni ključ, aplikacija za potvrđivanje, SMS, telefonski poziv ili e-pošta. Prijava u dva koraka može se omogućiti u trezoru na internet strani bitwarden.com. Da li želite da posjetite internet lokaciju sada?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/ml/messages.json b/apps/desktop/src/locales/ml/messages.json
index 863f3941a0f..662ce9a1fc6 100644
--- a/apps/desktop/src/locales/ml/messages.json
+++ b/apps/desktop/src/locales/ml/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "സമർപ്പിക്കുക"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "ഇഷ്‌ടാനുസൃത എൻവിയോണ്മെന്റ്"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "അസാധുവായ പ്രാഥമിക പാസ്‌വേഡ്"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "സുരക്ഷാ കീ, ഓതന്റിക്കേറ്റർ അപ്ലിക്കേഷൻ, SMS, ഫോൺ കോൾ അല്ലെങ്കിൽ ഇമെയിൽ പോലുള്ള മറ്റൊരു ഉപകരണം ഉപയോഗിച്ച് തങ്ങളുടെ ലോഗിൻ സ്ഥിരീകരിക്കാൻ ആവശ്യപ്പെടുന്നതിലൂടെ രണ്ട്-ഘട്ട ലോഗിൻ തങ്ങളുടെ അക്കൗണ്ടിനെ കൂടുതൽ സുരക്ഷിതമാക്കുന്നു. bitwarden.com വെബ് വാൾട്ടിൽ രണ്ട്-ഘട്ട ലോഗിൻ പ്രവർത്തനക്ഷമമാക്കാനാകും.തങ്ങള്ക്കു ഇപ്പോൾ വെബ്സൈറ്റ് സന്ദർശിക്കാൻ ആഗ്രഹമുണ്ടോ?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/mr/messages.json b/apps/desktop/src/locales/mr/messages.json
index 5849d9d4cee..d607bb8d097 100644
--- a/apps/desktop/src/locales/mr/messages.json
+++ b/apps/desktop/src/locales/mr/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/my/messages.json b/apps/desktop/src/locales/my/messages.json
index fae67d310f1..bcbd26cede3 100644
--- a/apps/desktop/src/locales/my/messages.json
+++ b/apps/desktop/src/locales/my/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/nb/messages.json b/apps/desktop/src/locales/nb/messages.json
index ec1c1bdb9b5..42fb6d479c0 100644
--- a/apps/desktop/src/locales/nb/messages.json
+++ b/apps/desktop/src/locales/nb/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Velkommen tilbake"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Bruk singulær pålogging"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Send inn"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Tilpasset miljø"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Ugyldig hovedpassord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "2-trinnsinnlogging gjør kontoen din mer sikker, ved å kreve at du verifiserer din innlogging med en annen enhet, f.eks. en autentiseringsapp, SMS, E-post, telefonsamtale, eller sikkerhetsnøkkel. 2-trinnsinnlogging kan aktiveres på bitwarden.com-netthvelvet. Vil du besøke den nettsiden nå?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Slett konto"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Nettleserintegrasjon støttes dessverre bare i Mac App Store-versjonen for øyeblikket."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Nettleserintegrasjon er for øyeblikket dessverre ikke støttet i Windows Store-versjonen."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitasjon akseptert"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Låst"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/ne/messages.json b/apps/desktop/src/locales/ne/messages.json
index 813fa967252..cce8f6a2ba5 100644
--- a/apps/desktop/src/locales/ne/messages.json
+++ b/apps/desktop/src/locales/ne/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/nl/messages.json b/apps/desktop/src/locales/nl/messages.json
index c726c003776..82b51b018c5 100644
--- a/apps/desktop/src/locales/nl/messages.json
+++ b/apps/desktop/src/locales/nl/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Je hebt geen toestemming om dit item te bewerken"
+  },
   "welcomeBack": {
     "message": "Welkom terug"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Single sign-on gebruiken"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Je organisatie vereist single sign-on."
+  },
   "submit": {
     "message": "Opslaan"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Je moet de basisserver-URL of ten minste één aangepaste omgeving toevoegen."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL's moeten HTTPS gebruiken."
+  },
   "customEnvironment": {
     "message": "Aangepaste omgeving"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Ongeldig hoofdwachtwoord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ongeldig hoofdwachtwoord. Check of je e-mailadres klopt en of je account is aangemaakt op $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Tweestapsaanmelding beschermt je account door je inlogpoging te bevestigen met een ander apparaat zoals een beveiligingssleutel, authenticatie-app, SMS, spraakoproep of e-mail. Je kunt Tweestapsaanmelding inschakelen in de webkluis op bitwarden.com. Wil je de website nu bezoeken?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Bij herstart vergrendelen met hoofdwachtwoord"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Hoofdwachtwoord of pincode vereisen bij herstart van de app"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Hoofdwachtwoord vereisen bij herstart van de app"
+  },
   "deleteAccount": {
     "message": "Account verwijderen"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Er is iets misgegaan bij het tijdens het inschakelen van de browserintegratie."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Helaas wordt browserintegratie momenteel alleen ondersteund in de Mac App Store-versie."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Helaas wordt browserintegratie momenteel niet ondersteund in de Windows Store-versie."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimale aangepaste time-out is 1 minuut."
+  },
   "inviteAccepted": {
     "message": "Uitnodiging geaccepteerd"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Alleen de organisatiekluis die gekoppeld is aan $ORGANIZATION$ wordt geëxporteerd.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Exporteert alleen de organisatiekluis van $ORGANIZATION$. Geen persoonlijke kluis-items.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Vergrendeld"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Minder weergeven"
   },
-  "enableAutotype": {
-    "message": "Autotypen inschakelen"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden valideert de invoerlocaties niet, zorg ervoor dat je je in het juiste venster en veld bevindt voordat je de snelkoppeling gebruikt."
   },
+  "typeShortcut": {
+    "message": "Typ de sneltoets"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Voeg een of twee van de volgende toetsen toe: Ctrl, Alt, Win of Shift, en een letter."
+  },
+  "invalidShortcut": {
+    "message": "Ongeldige sneltoets"
+  },
   "moreBreadcrumbs": {
     "message": "Meer broodkruimels",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Bevestigen"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Snelkoppeling autotype inschakelen"
+  "enableAutotypeShortcutPreview": {
+    "message": "Autotype sneltoets inschakelen (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Zorg ervoor dat je je in het juiste veld bevindt voordat je de snelkoppeling gebruikt om te voorkomen dat je de gegevens op de verkeerde plaats invult."
+  "enableAutotypeShortcutDescription": {
+    "message": "Zorg ervoor dat je je in het juiste veld staat voordat je de snelkoppeling gebruikt om te voorkomen dat je de gegevens op de verkeerde plaats invult."
   },
   "editShortcut": {
     "message": "Snelkoppeling bewerken"
   },
-  "archive": {
-    "message": "Archiveren"
+  "archiveNoun": {
+    "message": "Archief",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archiveren",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Dearchiveren"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Gearchiveerde items verschijnen hier en worden uitgesloten van algemene zoekresultaten en automatisch invulsuggesties."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Item naar archief verzonden"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item verwijderd uit archief"
+  "itemWasUnarchived": {
+    "message": "Item uit het archief gehaald"
   },
   "archiveItem": {
     "message": "Item archiveren"
   },
   "archiveItemConfirmDesc": {
     "message": "Gearchiveerde items worden uitgesloten van algemene zoekresultaten en automatische invulsuggesties. Weet je zeker dat je dit item wilt archiveren?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postcode"
+  },
+  "cardNumberLabel": {
+    "message": "Kaartnummer"
+  },
+  "upgradeNow": {
+    "message": "Nu upgraden"
+  },
+  "builtInAuthenticator": {
+    "message": "Ingebouwde authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Beveiligde bestandsopslag"
+  },
+  "emergencyAccess": {
+    "message": "Noodtoegang"
+  },
+  "breachMonitoring": {
+    "message": "Lek-monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "En meer!"
+  },
+  "planDescPremium": {
+    "message": "Online beveiliging voltooien"
+  },
+  "upgradeToPremium": {
+    "message": "Opwaarderen naar Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Time-out actie"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sessietime-out"
   }
 }
diff --git a/apps/desktop/src/locales/nn/messages.json b/apps/desktop/src/locales/nn/messages.json
index 94c2196edfa..08567979e8b 100644
--- a/apps/desktop/src/locales/nn/messages.json
+++ b/apps/desktop/src/locales/nn/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Send inn"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Ugyldig hovudpassord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/or/messages.json b/apps/desktop/src/locales/or/messages.json
index 217439bec80..4ca05acaac5 100644
--- a/apps/desktop/src/locales/or/messages.json
+++ b/apps/desktop/src/locales/or/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/pl/messages.json b/apps/desktop/src/locales/pl/messages.json
index 6caee67447f..c05e7f05cb1 100644
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Witaj ponownie"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Użyj logowania jednokrotnego"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Wyślij"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Musisz dodać podstawowy adres URL serwera lub co najmniej jedno niestandardowe środowisko."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Niestandardowe środowisko"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Hasło główne jest nieprawidłowe"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Logowanie dwustopniowe zwiększa bezpieczeństwo konta, wymagając weryfikacji logowania za pomocą innego urządzenia, takiego jak klucz bezpieczeństwa, aplikacja uwierzytelniająca, wiadomość SMS, połączenie telefoniczne lub wiadomość e-mail. Logowanie dwustopniowe możesz skonfigurować w sejfie internetowym bitwarden.com. Czy chcesz przejść do strony?"
   },
@@ -1706,7 +1724,7 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Hasło zostało zaktualizowane",
+    "message": "Ostatnia aktualizacja hasła",
     "description": "ex. Date this password was updated"
   },
   "exportFrom": {
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Zablokuj hasłem głównym po uruchomieniu ponownym"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Wymagaj hasła głównego lub PIN po uruchomieniu aplikacji"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Wymagaj hasła głównego po uruchomieniu aplikacji"
+  },
   "deleteAccount": {
     "message": "Usuń konto"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Wystąpił błąd podczas włączania połączenia z przeglądarką."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Połączenie z przeglądarką jest obsługiwane tylko z wersją aplikacji ze sklepu Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Połączenie z przeglądarką nie jest obecnie obsługiwane w aplikacji w wersji Windows Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimalny niestandardowy czas to 1 minuta."
+  },
   "inviteAccepted": {
     "message": "Zaproszenie zostało zaakceptowane"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Tylko sejf organizacji $ORGANIZATION$ zostanie wyeksportowany.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Tylko sejf organizacji $ORGANIZATION$ zostanie wyeksportowany. Twoje kolekcje nie zostaną uwzględnione.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Zablokowane"
   },
@@ -3774,7 +3816,7 @@
     "message": "Potwierdź użycie klucza SSH"
   },
   "agentForwardingWarningTitle": {
-    "message": "Warning: Agent Forwarding"
+    "message": "Ostrzeżenie: Przekazywanie agenta"
   },
   "agentForwardingWarningText": {
     "message": "Żądanie pochodzi ze zdalnego zalogowanego urządzenia"
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Pokaż mniej"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Rodzaj skrótu"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Skrót jest nieprawidłowy"
+  },
   "moreBreadcrumbs": {
     "message": "Więcej nawigacji",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Potwierdź"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edytuj skrót"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archiwum",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archiwizuj",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Usuń z archiwum"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Zarchiwizowane elementy pojawią się tutaj i zostaną wykluczone z wyników wyszukiwania i sugestii autouzupełniania."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Element został przeniesiony do archiwum"
   },
-  "itemRemovedFromArchive": {
+  "itemWasUnarchived": {
     "message": "Element został usunięty z archiwum"
   },
   "archiveItem": {
     "message": "Archiwizuj element"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Zarchiwizowane elementy są wykluczone z wyników wyszukiwania i sugestii autouzupełniania. Czy na pewno chcesz archiwizować element?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Kod pocztowy"
+  },
+  "cardNumberLabel": {
+    "message": "Numer karty"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/pt_BR/messages.json b/apps/desktop/src/locales/pt_BR/messages.json
index 4b28ca4918a..288f8e42616 100644
--- a/apps/desktop/src/locales/pt_BR/messages.json
+++ b/apps/desktop/src/locales/pt_BR/messages.json
@@ -6,7 +6,7 @@
     "message": "Filtros"
   },
   "allItems": {
-    "message": "Todos os Itens"
+    "message": "Todos os itens"
   },
   "favorites": {
     "message": "Favoritos"
@@ -24,10 +24,10 @@
     "message": "Identidade"
   },
   "typeNote": {
-    "message": "Notas"
+    "message": "Anotação"
   },
   "typeSecureNote": {
-    "message": "Nota Segura"
+    "message": "Anotação segura"
   },
   "typeSshKey": {
     "message": "Chave SSH"
@@ -36,16 +36,16 @@
     "message": "Pastas"
   },
   "collections": {
-    "message": "Coleções"
+    "message": "Conjuntos"
   },
   "searchVault": {
-    "message": "Pesquisar no Cofre"
+    "message": "Buscar no cofre"
   },
   "resetSearch": {
-    "message": "Redefinir pesquisa"
+    "message": "Apagar busca"
   },
   "addItem": {
-    "message": "Adicionar Item"
+    "message": "Adicionar item"
   },
   "shared": {
     "message": "Compartilhado"
@@ -54,7 +54,7 @@
     "message": "Compartilhar"
   },
   "moveToOrganization": {
-    "message": "Mover para a organização"
+    "message": "Mover para organização"
   },
   "movedItemToOrg": {
     "message": "$ITEMNAME$ movido para $ORGNAME$",
@@ -69,8 +69,11 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Você não tem permissão para editar este item"
+  },
   "welcomeBack": {
-    "message": "Bem vindo de volta"
+    "message": "Boas-vindas de volta"
   },
   "moveToOrgDesc": {
     "message": "Escolha uma organização para a qual deseja mover este item. Mudar para uma organização transfere a propriedade do item para essa organização. Você não será mais o proprietário direto deste item depois que ele for movido."
@@ -79,7 +82,7 @@
     "message": "Anexos"
   },
   "viewItem": {
-    "message": "Ver Item"
+    "message": "Ver item"
   },
   "name": {
     "message": "Nome"
@@ -101,37 +104,37 @@
     "message": "Novo URI"
   },
   "username": {
-    "message": "Nome de Usuário"
+    "message": "Nome de usuário"
   },
   "password": {
     "message": "Senha"
   },
   "passphrase": {
-    "message": "Frase Secreta"
+    "message": "Frase secreta"
   },
   "editItem": {
-    "message": "Editar Item"
+    "message": "Editar item"
   },
   "emailAddress": {
     "message": "Endereço de e-mail"
   },
   "verificationCodeTotp": {
-    "message": "Código de Verificação (TOTP)"
+    "message": "Código de verificação (TOTP)"
   },
   "website": {
     "message": "Site"
   },
   "notes": {
-    "message": "Notas"
+    "message": "Anotações"
   },
   "customFields": {
-    "message": "Campos Personalizados"
+    "message": "Campos personalizados"
   },
   "launch": {
     "message": "Abrir"
   },
   "copyValue": {
-    "message": "Copiar Valor",
+    "message": "Copiar valor",
     "description": "Copy value to clipboard"
   },
   "minimizeOnCopyToClipboard": {
@@ -141,14 +144,14 @@
     "message": "Minimizar ao copiar dados de um item para a área de transferência."
   },
   "toggleVisibility": {
-    "message": "Alternar Visibilidade"
+    "message": "Habilitar visibilidade"
   },
   "toggleCollapse": {
-    "message": "Alternar colapso",
+    "message": "Guardar/mostrar",
     "description": "Toggling an expand/collapse state."
   },
   "cardholderName": {
-    "message": "Titular do Cartão"
+    "message": "Nome do titular do cartão"
   },
   "number": {
     "message": "Número"
@@ -160,22 +163,22 @@
     "message": "Vencimento"
   },
   "securityCode": {
-    "message": "Código de Segurança"
+    "message": "Código de segurança"
   },
   "identityName": {
-    "message": "Nome de Identidade"
+    "message": "Nome da identidade"
   },
   "company": {
     "message": "Empresa"
   },
   "ssn": {
-    "message": "Número de Segurança Social"
+    "message": "Cadastro de Pessoas Físicas (CPF)"
   },
   "passportNumber": {
-    "message": "Número do Passaporte"
+    "message": "Número do passaporte"
   },
   "licenseNumber": {
-    "message": "Número da Licença"
+    "message": "Número da licença"
   },
   "email": {
     "message": "E-mail"
@@ -202,19 +205,19 @@
     "message": "ED25519"
   },
   "sshKeyAlgorithmRSA2048": {
-    "message": "RSA 2048-Bit"
+    "message": "RSA de 2048 bits"
   },
   "sshKeyAlgorithmRSA3072": {
-    "message": "RSA 3072-Bit"
+    "message": "RSA de 3072 bits"
   },
   "sshKeyAlgorithmRSA4096": {
-    "message": "RSA 4096-Bit"
+    "message": "RSA de 4096 bits"
   },
   "sshKeyGenerated": {
     "message": "Uma nova chave SSH foi gerada"
   },
   "sshKeyWrongPassword": {
-    "message": "Sua senha está incorreta."
+    "message": "A senha que você digitou está incorreta."
   },
   "importSshKey": {
     "message": "Importar"
@@ -223,31 +226,31 @@
     "message": "Confirme a senha"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Digite a senha para a chave SSH."
+    "message": "Digite a senha da chave SSH."
   },
   "enterSshKeyPassword": {
-    "message": "Insira sua senha"
+    "message": "Digite a senha"
   },
   "sshAgentUnlockRequired": {
-    "message": "Por favor, desbloqueie seu cofre para aprovar a solicitação de chave SSH."
+    "message": "Desbloqueie seu cofre para aprovar a solicitação de chave SSH."
   },
   "sshAgentUnlockTimeout": {
-    "message": "Solicitação de chave SSH expirada."
+    "message": "A solicitação da chave SSH expirou."
   },
   "enableSshAgent": {
-    "message": "Habilitar SSH agent"
+    "message": "Ativar agente SSH"
   },
   "enableSshAgentDesc": {
-    "message": "Permitir que o agente SSH assine solicitações SSH diretamente do seu cofre Bitwarden."
+    "message": "Ative o agente SSH para assinar solicitações SSH diretamente do seu cofre Bitwarden."
   },
   "enableSshAgentHelp": {
     "message": "O agente SSH é um serviço direcionado a desenvolvedores que permite que você assine solicitações SSH diretamente do seu cofre do Bitwarden."
   },
   "sshAgentPromptBehavior": {
-    "message": "Solicitar autorização ao usar o agente SSH"
+    "message": "Pedir autorização ao usar o agente SSH"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Defina como lidar com as solicitações de autorização do agente-SSH."
+    "message": "Escolha como lidar com as solicitações de autorização do agente SSH."
   },
   "sshAgentPromptBehaviorHelp": {
     "message": "Lembrar das autorizações de SSH"
@@ -259,13 +262,13 @@
     "message": "Nunca"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Lembrar até o repositório estar trancado"
+    "message": "Lembrar até que o cofre seja bloqueado"
   },
   "premiumRequired": {
-    "message": "Requer Assinatura Premium"
+    "message": "Requer Premium"
   },
   "premiumRequiredDesc": {
-    "message": "Uma conta premium é necessária para usar esse recurso."
+    "message": "Um plano Premium é necessário para usar esse recurso."
   },
   "errorOccurred": {
     "message": "Ocorreu um erro."
@@ -277,10 +280,10 @@
     "message": "Erro ao descriptografar"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "O Bitwarden não pode descriptografar o(s) item(ns) do cofre listado abaixo."
+    "message": "O Bitwarden não pôde descriptografar o(s) item(ns) listados abaixo do cofre."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contato com o cliente feito com sucesso",
+    "message": "Contate o costumer success",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
@@ -324,7 +327,7 @@
     "message": "Dezembro"
   },
   "ex": {
-    "message": "ex.",
+    "message": "p. ex.",
     "description": "Short abbreviation for 'example'."
   },
   "title": {
@@ -340,16 +343,16 @@
     "message": "Sra"
   },
   "mx": {
-    "message": "Mx"
+    "message": "Sre"
   },
   "dr": {
     "message": "Dr"
   },
   "expirationMonth": {
-    "message": "Mês de Vencimento"
+    "message": "Mês de vencimento"
   },
   "expirationYear": {
-    "message": "Ano de Vencimento"
+    "message": "Ano de vencimento"
   },
   "select": {
     "message": "Selecionar"
@@ -361,13 +364,13 @@
     "message": "Tipo"
   },
   "firstName": {
-    "message": "Primeiro Nome"
+    "message": "Primeiro nome"
   },
   "middleName": {
-    "message": "Nome do Meio"
+    "message": "Nome do meio"
   },
   "lastName": {
-    "message": "Último Nome"
+    "message": "Sobrenome"
   },
   "fullName": {
     "message": "Nome completo"
@@ -382,13 +385,13 @@
     "message": "Endereço 3"
   },
   "cityTown": {
-    "message": "Cidade / Localidade"
+    "message": "Cidade ou localidade"
   },
   "stateProvince": {
-    "message": "Estado / Província"
+    "message": "Estado ou província"
   },
   "zipPostalCode": {
-    "message": "CEP / Código Postal"
+    "message": "CEP / Código postal"
   },
   "country": {
     "message": "País"
@@ -400,19 +403,19 @@
     "message": "Cancelar"
   },
   "delete": {
-    "message": "Excluir"
+    "message": "Apagar"
   },
   "favorite": {
-    "message": "Favorito"
+    "message": "Favoritar"
   },
   "edit": {
     "message": "Editar"
   },
   "authenticatorKeyTotp": {
-    "message": "Chave de Autenticação (TOTP)"
+    "message": "Chave do autenticador (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Chave de autenticação"
+    "message": "Chave do autenticador"
   },
   "autofillOptions": {
     "message": "Opções de preenchimento automático"
@@ -437,7 +440,7 @@
     "message": "Adicionar site"
   },
   "deleteWebsite": {
-    "message": "Deletar site"
+    "message": "Apagar site"
   },
   "owner": {
     "message": "Proprietário"
@@ -449,13 +452,13 @@
     "message": "Editar campo"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Tem certeza de que deseja deletar permanentemente esse anexo?"
+    "message": "Tem certeza que quer apagar este anexo para sempre?"
   },
   "fieldType": {
     "message": "Tipo do campo"
   },
   "fieldLabel": {
-    "message": "Rótulo de campo"
+    "message": "Rótulo do campo"
   },
   "add": {
     "message": "Adicionar"
@@ -467,25 +470,25 @@
     "message": "Use campos ocultos para dados sensíveis como senhas"
   },
   "checkBoxHelpText": {
-    "message": "Use caixas de seleção caso deseje preencher automaticamente as caixas de seleção de um formulário, como um email de lembrete"
+    "message": "Use caixas de seleção se gostaria de preencher automaticamente a caixa de seleção de um formulário, como um lembrar e-mail"
   },
   "linkedHelpText": {
-    "message": "Use um campo vinculado quando você estiver experienciando problemas de preenchimento automático para um site específico."
+    "message": "Use um campo vinculado quando você estiver experienciando problemas com o preenchimento automático em um site específico."
   },
   "linkedLabelHelpText": {
-    "message": "Digite o ID html, nome, rótulo acessível (aria-label), ou espaço reservado do campo."
+    "message": "Digite o ID html, nome, aria-label, ou placeholder do campo."
   },
   "folder": {
     "message": "Pasta"
   },
   "newCustomField": {
-    "message": "Novo Campo Personalizado"
+    "message": "Novo campo personalizado"
   },
   "value": {
     "message": "Valor"
   },
   "dragToSort": {
-    "message": "Arrastar para ordenar"
+    "message": "Arraste para ordenar"
   },
   "cfTypeText": {
     "message": "Texto"
@@ -511,69 +514,69 @@
     "message": "Remover"
   },
   "nameRequired": {
-    "message": "Requer o nome."
+    "message": "O nome é necessário."
   },
   "addedItem": {
     "message": "Item adicionado"
   },
   "editedItem": {
-    "message": "Item editado"
+    "message": "Item salvo"
   },
   "deleteItem": {
-    "message": "Excluir Item"
+    "message": "Apagar item"
   },
   "deleteFolder": {
-    "message": "Excluir Pasta"
+    "message": "Apagar pasta"
   },
   "deleteAttachment": {
-    "message": "Excluir Anexo"
+    "message": "Apagar anexo"
   },
   "deleteItemConfirmation": {
     "message": "Você realmente deseja enviar para a lixeira?"
   },
   "deletedItem": {
-    "message": "Item excluído"
+    "message": "Item enviado para a lixeira"
   },
   "overwritePasswordConfirmation": {
     "message": "Você tem certeza que deseja substituir a senha atual?"
   },
   "overwriteUsername": {
-    "message": "Sobrescrever usuário"
+    "message": "Sobrescrever nome de usuário"
   },
   "overwriteUsernameConfirmation": {
-    "message": "Tem certeza que deseja substituir o usuário atual?"
+    "message": "Tem certeza que quer substituir o nome de usuário atual?"
   },
   "noneFolder": {
-    "message": "Nenhuma Pasta",
+    "message": "Sem pasta",
     "description": "This is the folder for uncategorized items"
   },
   "addFolder": {
-    "message": "Adicionar Pasta"
+    "message": "Adicionar pasta"
   },
   "editFolder": {
-    "message": "Editar Pasta"
+    "message": "Editar pasta"
   },
   "regeneratePassword": {
-    "message": "Gerar Nova Senha"
+    "message": "Regerar senha"
   },
   "copyPassword": {
-    "message": "Copiar Senha"
+    "message": "Copiar senha"
   },
   "regenerateSshKey": {
     "message": "Regerar chave SSH"
   },
   "copySshPrivateKey": {
-    "message": "Copiar chave SSH privada"
+    "message": "Copiar chave privada da chave SSH"
   },
   "copyPassphrase": {
-    "message": "Copiar senha",
+    "message": "Copiar frase secreta",
     "description": "Copy passphrase to clipboard"
   },
   "copyUri": {
     "message": "Copiar URI"
   },
   "copyVerificationCodeTotp": {
-    "message": "Copiar Código de Verificação (TOTP)"
+    "message": "Copiar código de verificação (TOTP)"
   },
   "copyFieldCipherName": {
     "message": "Copiar $FIELD$, $CIPHERNAME$",
@@ -593,7 +596,7 @@
     "message": "Comprimento"
   },
   "passwordMinLength": {
-    "message": "Tamanho mínimo da senha"
+    "message": "Comprimento mínimo da senha"
   },
   "uppercase": {
     "message": "Maiúsculas (A-Z)",
@@ -649,7 +652,7 @@
     "message": "Separador de palavras"
   },
   "capitalize": {
-    "message": "Iniciais em Maiúsculas",
+    "message": "Iniciais maiúsculas",
     "description": "Make the first letter of a word uppercase."
   },
   "includeNumber": {
@@ -659,14 +662,14 @@
     "message": "Fechar"
   },
   "minNumbers": {
-    "message": "Números Mínimos"
+    "message": "Mínimo de números"
   },
   "minSpecial": {
-    "message": "Especiais Mínimos",
+    "message": "Mínimo de caracteres especiais",
     "description": "Minimum Special Characters"
   },
   "ambiguous": {
-    "message": "Evitar Caracteres Ambíguos",
+    "message": "Evitar caracteres ambíguos",
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
@@ -674,120 +677,123 @@
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
-    "message": "Os requisitos de política empresarial foram aplicados às suas opções de gerador.",
+    "message": "Os requisitos da política empresarial foram aplicados às opções do seu gerador.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchCollection": {
-    "message": "Pesquisar coleção"
+    "message": "Buscar no conjunto"
   },
   "searchFolder": {
-    "message": "Pesquisar pasta"
+    "message": "Buscar na pasta"
   },
   "searchFavorites": {
-    "message": "Pesquisar favoritos"
+    "message": "Buscar nos favoritos"
   },
   "searchType": {
-    "message": "Pesquisar tipo",
+    "message": "Buscar tipo",
     "description": "Search item type"
   },
   "newAttachment": {
-    "message": "Adicionar Novo Anexo"
+    "message": "Adicionar novo anexo"
   },
   "deletedAttachment": {
-    "message": "Anexo excluído"
+    "message": "Anexo apagado"
   },
   "deleteAttachmentConfirmation": {
-    "message": "Tem certeza que deseja excluir esse anexo?"
+    "message": "Tem certeza que quer apagar esse anexo?"
   },
   "attachmentSaved": {
-    "message": "O anexo foi salvo."
+    "message": "Anexo salvo"
   },
   "addAttachment": {
     "message": "Adicionar anexo"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Tamanho máximo do arquivo é 500 MB"
+    "message": "O tamanho máximo do arquivo é de 500 MB"
   },
   "file": {
     "message": "Arquivo"
   },
   "selectFile": {
-    "message": "Selecione um arquivo."
+    "message": "Selecione um arquivo"
   },
   "maxFileSize": {
     "message": "O tamanho máximo do arquivo é de 500 MB."
   },
   "legacyEncryptionUnsupported": {
-    "message": "A criptografia legada não é mais suportada. Por favor, contate o suporte para recuperar a sua conta."
+    "message": "A criptografia legada não é mais suportada. Entre em contato com o suporte para recuperar a sua conta."
   },
   "editedFolder": {
-    "message": "Pasta editada"
+    "message": "Pasta salva"
   },
   "addedFolder": {
     "message": "Pasta adicionada"
   },
   "deleteFolderConfirmation": {
-    "message": "Você tem certeza que deseja excluir esta pasta?"
+    "message": "Tem certeza que deseja apagar esta pasta?"
   },
   "deletedFolder": {
-    "message": "Pasta excluída"
+    "message": "Pasta apagada"
   },
   "loginOrCreateNewAccount": {
-    "message": "Inicie a sessão ou crie uma nova conta para acessar seu cofre seguro."
+    "message": "Conecte-se ou crie uma nova conta para acessar seu cofre seguro."
   },
   "createAccount": {
-    "message": "Criar Conta"
+    "message": "Criar conta"
   },
   "newToBitwarden": {
     "message": "Novo no Bitwarden?"
   },
   "setAStrongPassword": {
-    "message": "Defina uma senha forte"
+    "message": "Configure uma senha forte"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Termine de criar a sua conta definindo uma senha"
+    "message": "Termine de criar a sua conta configurando uma senha"
   },
   "logIn": {
-    "message": "Iniciar sessão"
+    "message": "Conectar-se"
   },
   "logInToBitwarden": {
-    "message": "Inicie a sessão no Bitwarden"
+    "message": "Conecte-se ao Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Digite o código enviado por e-mail"
+    "message": "Digite o código enviado ao seu e-mail"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Insira o código do seu aplicativo autenticador"
+    "message": "Digite o código do seu aplicativo autenticador"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Pressione seu YubiKey para autenticar"
+    "message": "Pressione sua YubiKey para autenticar-se"
   },
   "logInWithPasskey": {
-    "message": "Iniciar sessão com a chave de acesso"
+    "message": "Conectar-se com chave de acesso"
   },
   "loginWithDevice": {
-    "message": "Fazer login com dispositivo"
+    "message": "Conectar-se com dispositivo"
   },
   "useSingleSignOn": {
-    "message": "Usar login único"
+    "message": "Usar autenticação única"
+  },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A sua organização requer o uso da autenticação única."
   },
   "submit": {
     "message": "Enviar"
   },
   "masterPass": {
-    "message": "Senha Mestra"
+    "message": "Senha principal"
   },
   "masterPassDesc": {
-    "message": "A senha mestra é a senha que você usa para acessar o seu cofre. É muito importante que você não esqueça sua senha mestra. Não há maneira de recuperar a senha caso você se esqueça."
+    "message": "A senha principal é a senha que você usa para acessar o seu cofre. É muito importante que você não esqueça sua senha principal. Não há maneira de recuperar a senha caso você se esqueça."
   },
   "masterPassHintDesc": {
-    "message": "Uma dica de senha mestra pode ajudá-lo(a) a lembrá-lo(a) caso você esqueça."
+    "message": "Uma dica para a senha principal pode ajudá-lo(a) a lembrá-la caso você esqueça."
   },
   "reTypeMasterPass": {
-    "message": "Digite Novamente a Senha Mestra"
+    "message": "Digite novamente a senha principal"
   },
   "masterPassHint": {
-    "message": "Dica da Senha Mestra (opcional)"
+    "message": "Dica da senha principal (opcional)"
   },
   "masterPassHintText": {
     "message": "Se você esquecer sua senha, a dica da senha pode ser enviada ao seu e-mail. $CURRENT$/$MAXIMUM$ caracteres máximos.",
@@ -803,16 +809,16 @@
     }
   },
   "masterPassword": {
-    "message": "Senha mestra"
+    "message": "Senha principal"
   },
   "masterPassImportant": {
-    "message": "Sua senha mestra não pode ser recuperada se você a esquecer!"
+    "message": "Sua senha principal não pode ser recuperada se você esquecê-la!"
   },
   "confirmMasterPassword": {
-    "message": "Confirme a senha mestra"
+    "message": "Confirme a senha principal"
   },
   "masterPassHintLabel": {
-    "message": "Dica da senha mestra"
+    "message": "Dica da senha principal"
   },
   "passwordStrengthScore": {
     "message": "Pontuação de força da senha $SCORE$",
@@ -827,7 +833,7 @@
     "message": "Juntar-se à organização"
   },
   "joinOrganizationName": {
-    "message": "Entrar em $ORGANIZATIONNAME$",
+    "message": "Juntar-se à $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -836,25 +842,25 @@
     }
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Termine de juntar-se nessa organização definindo uma senha mestra."
+    "message": "Termine de juntar-se à esta organização configurando uma senha principal."
   },
   "settings": {
     "message": "Configurações"
   },
   "accountEmail": {
-    "message": "Email da conta"
+    "message": "E-mail da conta"
   },
   "requestHint": {
-    "message": "Pedir dica"
+    "message": "Solicitar dica"
   },
   "requestPasswordHint": {
-    "message": "Dica da senha mestra"
+    "message": "Solicitar dica da senha"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
     "message": "Digite o endereço de e-mail da sua conta e sua dica da senha será enviada para você"
   },
   "getMasterPasswordHint": {
-    "message": "Obter dica da senha mestra"
+    "message": "Receber dica da senha principal"
   },
   "emailRequired": {
     "message": "O endereço de e-mail é obrigatório."
@@ -863,13 +869,13 @@
     "message": "Endereço de e-mail inválido."
   },
   "masterPasswordRequired": {
-    "message": "A senha mestra é obrigatória."
+    "message": "A senha principal é obrigatória."
   },
   "confirmMasterPasswordRequired": {
-    "message": "É necessário redigitar a senha mestra."
+    "message": "É necessário redigitar a senha principal."
   },
   "masterPasswordMinlength": {
-    "message": "A senha mestra deve ter pelo menos $VALUE$ caracteres.",
+    "message": "A senha principal deve ter pelo menos $VALUE$ caracteres.",
     "description": "The Master Password must be at least a specific number of characters long.",
     "placeholders": {
       "value": {
@@ -879,31 +885,31 @@
     }
   },
   "youSuccessfullyLoggedIn": {
-    "message": "Você logou na sua conta com sucesso"
+    "message": "Você conectou-se à sua conta com sucesso"
   },
   "youMayCloseThisWindow": {
     "message": "Você pode fechar esta janela"
   },
   "masterPassDoesntMatch": {
-    "message": "A confirmação da senha mestra não corresponde."
+    "message": "A confirmação da senha principal não corresponde."
   },
   "newAccountCreated": {
-    "message": "A sua nova conta foi criada! Agora você pode iniciar a sessão."
+    "message": "A sua nova conta foi criada! Agora você pode se conectar."
   },
   "newAccountCreated2": {
     "message": "Sua nova conta foi criada!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "Você está conectado!"
+    "message": "Você foi conectado!"
   },
   "masterPassSent": {
-    "message": "Enviamos um e-mail com a dica da sua senha mestra."
+    "message": "Enviamos um e-mail com a dica da sua senha principal."
   },
   "unexpectedError": {
     "message": "Ocorreu um erro inesperado."
   },
   "itemInformation": {
-    "message": "Informação do Item"
+    "message": "Informações do item"
   },
   "noItemsInList": {
     "message": "Não há itens para listar."
@@ -918,19 +924,19 @@
     "message": "Código enviado"
   },
   "verificationCode": {
-    "message": "Código de Verificação"
+    "message": "Código de verificação"
   },
   "confirmIdentity": {
     "message": "Confirme a sua identidade para continuar."
   },
   "verificationCodeRequired": {
-    "message": "Requer o código de verificação."
+    "message": "O código de verificação é necessário."
   },
   "webauthnCancelOrTimeout": {
-    "message": "A autenticação foi cancelada ou demorou muito. Por favor tente novamente."
+    "message": "A autenticação foi cancelada ou demorou muito. Tente novamente."
   },
   "openInNewTab": {
-    "message": "Abrir numa nova aba"
+    "message": "Abrir em uma nova aba"
   },
   "invalidVerificationCode": {
     "message": "Código de verificação inválido"
@@ -958,16 +964,16 @@
     "message": "Use seu código de recuperação"
   },
   "insertU2f": {
-    "message": "Insira a sua chave de segurança na porta USB do seu computador. Se ele tiver um botão, toque nele."
+    "message": "Insira a sua chave de segurança na porta USB do seu computador. Se ela tiver um botão, toque nele."
   },
   "recoveryCodeTitle": {
-    "message": "Código de Recuperação"
+    "message": "Código de recuperação"
   },
   "authenticatorAppTitle": {
-    "message": "Aplicativo de Autenticação"
+    "message": "Aplicativo autenticador"
   },
   "authenticatorAppDescV2": {
-    "message": "Insira um código gerado por um aplicativo autenticador como o Bitwarden Authenticator.",
+    "message": "Digite um código gerado por um aplicativo autenticador como o Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
@@ -977,7 +983,7 @@
     "message": "Utilize uma YubiKey para acessar a sua conta. Funciona com YubiKey 4, 4 Nano, 4C, e dispositivos NEO."
   },
   "duoDescV2": {
-    "message": "Insira um código gerado pelo Duo Security.",
+    "message": "Digite um código gerado pelo Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -991,7 +997,7 @@
     "message": "Não reconhecemos este dispositivo. Digite o código enviado por e-mail para verificar a sua identidade."
   },
   "continueLoggingIn": {
-    "message": "Continue acessando"
+    "message": "Continuar acessando"
   },
   "webAuthnTitle": {
     "message": "WebAuthn FIDO2"
@@ -1006,19 +1012,19 @@
     "message": "Digite o código enviado para seu e-mail."
   },
   "loginUnavailable": {
-    "message": "Sessão Indisponível"
+    "message": "Autenticação indisponível"
   },
   "noTwoStepProviders": {
-    "message": "Esta conta tem a autenticação por duas etapas ativado, no entanto, nenhum dos provedores de início de sessão em duas etapas configurados são suportados por este dispositivo."
+    "message": "Esta conta tem a autenticação em duas etapas ativada, no entanto, nenhum dos provedores de autenticação em duas etapas configurados são suportados por este dispositivo."
   },
   "noTwoStepProviders2": {
-    "message": "Por favor inclua provedores adicionais que são melhor suportados entre dispositivos (como um aplicativo de autenticação)."
+    "message": "Adicione provedores adicionais que são melhor suportados entre dispositivos (como um aplicativo autenticador)."
   },
   "twoStepOptions": {
-    "message": "Opções de Login em Duas Etapas"
+    "message": "Opções de autenticação em duas etapas"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Selecionar método de login em duas etapas"
+    "message": "Selecionar método de autenticação em duas etapas"
   },
   "selfHostedEnvironment": {
     "message": "Ambiente auto-hospedado"
@@ -1027,44 +1033,47 @@
     "message": "Especifique a URL de base da sua instalação local do Bitwarden. Exemplo: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "Para usuários avançados. Você pode especificar a URL de base de cada serviço independentemente."
+    "message": "Para configuração avançada, você pode especificar a URL de base de cada serviço independentemente."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "Você deve adicionar um URL do servidor de base ou pelo menos um ambiente personalizado."
+    "message": "Você deve adicionar um URL de base de um servidor ou pelo menos um ambiente personalizado."
+  },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs devem usar HTTPS."
   },
   "customEnvironment": {
-    "message": "Ambiente Personalizado"
+    "message": "Ambiente personalizado"
   },
   "baseUrl": {
-    "message": "URL do Servidor"
+    "message": "URL do servidor"
   },
   "authenticationTimeout": {
     "message": "Tempo de autenticação esgotado"
   },
   "authenticationSessionTimedOut": {
-    "message": "A sessão de autenticação expirou. Por favor, reinicie o processo de login."
+    "message": "A sessão de autenticação expirou. Reinicie o processo de autenticação."
   },
   "selfHostBaseUrl": {
-    "message": "URL do servidor auto-host",
+    "message": "URL do servidor auto-hospedado",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
-    "message": "URL do Servidor da API"
+    "message": "URL do servidor da API"
   },
   "webVaultUrl": {
-    "message": "URL do Servidor do Cofre Web"
+    "message": "URL do servidor do cofre web"
   },
   "identityUrl": {
-    "message": "URL do Servidor de Identidade"
+    "message": "URL do servidor de identidade"
   },
   "notificationsUrl": {
     "message": "URL do servidor de notificações"
   },
   "iconsUrl": {
-    "message": "URL do Servidor de Ícones"
+    "message": "URL do servidor de ícones"
   },
   "environmentSaved": {
-    "message": "As URLs de ambiente foram salvas"
+    "message": "URLs de ambiente salvos"
   },
   "ok": {
     "message": "Ok"
@@ -1079,16 +1088,16 @@
     "message": "Localização"
   },
   "overwritePassword": {
-    "message": "Substituir Senha"
+    "message": "Substituir senha"
   },
   "learnMore": {
-    "message": "Saber mais"
+    "message": "Saiba mais"
   },
   "featureUnavailable": {
-    "message": "Recurso Indisponível"
+    "message": "Recurso indisponível"
   },
   "loggedOut": {
-    "message": "Sessão encerrada"
+    "message": "Desconectado"
   },
   "loggedOutDesc": {
     "message": "Você foi desconectado de sua conta."
@@ -1097,13 +1106,13 @@
     "message": "A sua sessão expirou."
   },
   "restartRegistration": {
-    "message": "Reiniciar registro"
+    "message": "Reiniciar cadastro"
   },
   "expiredLink": {
     "message": "Link expirado"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Por favor, reinicie o registro ou tente fazer login."
+    "message": "Reinicie o cadastro ou tente conectar-se."
   },
   "youMayAlreadyHaveAnAccount": {
     "message": "Você pode já ter uma conta"
@@ -1112,13 +1121,13 @@
     "message": "Você tem certeza que deseja sair?"
   },
   "logOut": {
-    "message": "Encerrar a Sessão"
+    "message": "Desconectar"
   },
   "addNewLogin": {
-    "message": "Adicionar Nova Credencial"
+    "message": "Nova credencial"
   },
   "addNewItem": {
-    "message": "Adicionar Novo Item"
+    "message": "Novo item"
   },
   "view": {
     "message": "Ver"
@@ -1133,19 +1142,19 @@
     "message": "Bloquear cofre"
   },
   "passwordGenerator": {
-    "message": "Gerador de Senha"
+    "message": "Gerador de senhas"
   },
   "contactUs": {
-    "message": "Fale Conosco"
+    "message": "Contate-nos"
   },
   "helpAndFeedback": {
-    "message": "Ajuda e feedback"
+    "message": "Ajuda e retorno"
   },
   "getHelp": {
-    "message": "Obter Ajuda"
+    "message": "Receber ajuda"
   },
   "fileBugReport": {
-    "message": "Relate um bug"
+    "message": "Relatar um bug"
   },
   "blog": {
     "message": "Blog"
@@ -1154,42 +1163,42 @@
     "message": "Siga-nos"
   },
   "syncVault": {
-    "message": "Sincronizar Cofre"
+    "message": "Sincronizar cofre"
   },
   "changeMasterPass": {
-    "message": "Alterar Senha Mestra"
+    "message": "Alterar senha principal"
   },
   "continueToWebApp": {
     "message": "Continuar no aplicativo web?"
   },
   "changeMasterPasswordOnWebConfirmation": {
-    "message": "Você pode alterar a sua senha mestra no aplicativo web Bitwarden."
+    "message": "Você pode alterar a sua senha principal no aplicativo web Bitwarden."
   },
   "fingerprintPhrase": {
     "message": "Frase biométrica",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "A sua frase biométrica",
+    "message": "A frase biométrica da sua conta",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "goToWebVault": {
-    "message": "Ir para o Cofre Web"
+    "message": "Ir para o cofre web"
   },
   "getMobileApp": {
-    "message": "Obter o aplicativo para celular"
+    "message": "Baixar o app para celular"
   },
   "getBrowserExtension": {
-    "message": "Obter a extensão de navegador"
+    "message": "Baixar a extensão para navegador"
   },
   "syncingComplete": {
-    "message": "Sincronização completada"
+    "message": "Sincronização concluída"
   },
   "syncingFailed": {
-    "message": "A sincronização falhou"
+    "message": "Falha na sincronização"
   },
   "yourVaultIsLocked": {
-    "message": "Seu cofre está trancado. Verifique sua identidade para continuar."
+    "message": "O seu cofre está bloqueado. Verifique a sua identidade para continuar."
   },
   "yourAccountIsLocked": {
     "message": "Sua conta está bloqueada"
@@ -1198,16 +1207,16 @@
     "message": "ou"
   },
   "unlockWithBiometrics": {
-    "message": "Desbloquear com a biometria"
+    "message": "Desbloquear com biometria"
   },
   "unlockWithMasterPassword": {
-    "message": "Desbloquear com a senha mestra"
+    "message": "Desbloquear com senha principal"
   },
   "unlock": {
     "message": "Desbloquear"
   },
   "loggedInAsOn": {
-    "message": "Entrou como $EMAIL$ em $HOSTNAME$.",
+    "message": "Conectado como $EMAIL$ em $HOSTNAME$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1220,10 +1229,19 @@
     }
   },
   "invalidMasterPassword": {
-    "message": "Senha mestra inválida"
+    "message": "Senha principal inválida"
+  },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Senha principal inválida. Confirme que seu e-mail está correto e sua conta foi criada em $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
   },
   "twoStepLoginConfirmation": {
-    "message": "A autenticação em duas etapas torna sua conta mais segura, exigindo que você verifique o seu login com outro dispositivo, como uma chave de segurança, um aplicativo de autenticação, SMS, chamada telefônica ou e-mail. A autenticação em duas etapas pode ser ativada no cofre web em bitwarden.com. Você deseja visitar o site agora?"
+    "message": "A autenticação em duas etapas torna sua conta mais segura, exigindo que você verifique a sua autenticação com outro dispositivo, como uma chave de segurança, um aplicativo autenticador, SMS, chamada telefônica ou e-mail. A autenticação em duas etapas pode ser ativada no cofre web em bitwarden.com. Você deseja visitar o site agora?"
   },
   "twoStepLogin": {
     "message": "Autenticação em duas etapas"
@@ -1232,16 +1250,16 @@
     "message": "Tempo limite do cofre"
   },
   "vaultTimeout": {
-    "message": "Tempo Limite do Cofre"
+    "message": "Tempo limite do cofre"
   },
   "vaultTimeout1": {
-    "message": "Tempo esgotado"
+    "message": "Tempo limite"
   },
   "vaultTimeoutAction1": {
-    "message": "Tempo limite de ação"
+    "message": "Ação do tempo limite"
   },
   "vaultTimeoutDesc": {
-    "message": "Escolha quando o tempo limite do seu cofre irá se esgotar e execute a ação selecionada."
+    "message": "Escolha quando o seu cofre executará a ação do tempo limite do cofre."
   },
   "immediately": {
     "message": "Imediatamente"
@@ -1277,16 +1295,16 @@
     "message": "4 horas"
   },
   "onIdle": {
-    "message": "Quando o sistema está inativo"
+    "message": "Na inatividade do sistema"
   },
   "onSleep": {
-    "message": "Quando o sistema hibernar"
+    "message": "Na hibernação do sistema"
   },
   "onLocked": {
-    "message": "Quando o Sistema estiver Bloqueado"
+    "message": "No bloqueio do sistema"
   },
   "onRestart": {
-    "message": "Ao Reiniciar"
+    "message": "No reinício"
   },
   "never": {
     "message": "Nunca"
@@ -1303,64 +1321,64 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Mostrar ícones de sites e obter URLs de alteração de senha"
   },
   "enableMinToTray": {
     "message": "Minimizar para ícone da bandeja"
   },
   "enableMinToTrayDesc": {
-    "message": "Ao minimizar a janela, mostra um ícone na bandeja do sistema."
+    "message": "Ao minimizar a janela, mostrar um ícone na bandeja do sistema."
   },
   "enableMinToMenuBar": {
     "message": "Minimizar para a barra de menu"
   },
   "enableMinToMenuBarDesc": {
-    "message": "Ao minimizar a janela, mostra um ícone na barra de menus."
+    "message": "Ao minimizar a janela, mostrar um ícone na barra de menu."
   },
   "enableCloseToTray": {
-    "message": "Fechar para a área de notificações"
+    "message": "Fechar para ícone da bandeja"
   },
   "enableCloseToTrayDesc": {
-    "message": "Ao fechar a janela, mostra um ícone na bandeja do sistema."
+    "message": "Ao fechar a janela, mostrar um ícone na bandeja do sistema."
   },
   "enableCloseToMenuBar": {
     "message": "Fechar para barra de menu"
   },
   "enableCloseToMenuBarDesc": {
-    "message": "Ao fechar a janela, mostra um ícone na barra de menu."
+    "message": "Ao fechar a janela, mostrar um ícone na barra de menu."
   },
   "enableTray": {
-    "message": "Ativar Ícone de Bandeja"
+    "message": "Ativar icone da bandeja"
   },
   "enableTrayDesc": {
     "message": "Sempre mostrar um ícone na bandeja do sistema."
   },
   "startToTray": {
-    "message": "Iniciar para o Ícone da Bandeja"
+    "message": "Abrir no ícone da bandeja"
   },
   "startToTrayDesc": {
-    "message": "Quando o aplicativo for iniciado, apenas mostrar um ícone na bandeja do sistema."
+    "message": "Ao abrir o aplicativo, apenas mostrar um ícone na bandeja do sistema."
   },
   "startToMenuBar": {
-    "message": "Iniciar na barra de menu"
+    "message": "Abrir na barra de menu"
   },
   "startToMenuBarDesc": {
-    "message": "Quando o aplicativo for iniciado, apenas mostrar um ícone na barra de menu."
+    "message": "Ao abrir o aplicativo, apenas mostrar um ícone na barra de menu."
   },
   "openAtLogin": {
-    "message": "Iniciar automaticamente ao iniciar sessão"
+    "message": "Iniciar automaticamente com o usuário"
   },
   "openAtLoginDesc": {
-    "message": "Inicie o aplicativo Bitwarden Desktop automaticamente no login."
+    "message": "Inicie o aplicativo Bitwarden Desktop automaticamente junto com o usuário."
   },
   "alwaysShowDock": {
     "message": "Exibir sempre na Dock"
   },
   "alwaysShowDockDesc": {
-    "message": "Mostrar o ícone do Bitwarden na Dock, mesmo quando minimizado para a barra de menu."
+    "message": "Mostrar o ícone do Bitwarden na Dock, mesmo quando minimizado na barra de menu."
   },
   "confirmTrayTitle": {
-    "message": "Confirmar desativação da bandeja"
+    "message": "Confirmar ocultar da bandeja"
   },
   "confirmTrayDesc": {
     "message": "Desativar esta configuração também desativará todas as outras configurações relacionadas à bandeja."
@@ -1390,7 +1408,7 @@
     "description": "Copy to clipboard"
   },
   "checkForUpdates": {
-    "message": "Verificar por atualizações…"
+    "message": "Conferir se há atualizações…"
   },
   "version": {
     "message": "Versão $VERSION_NUM$",
@@ -1402,7 +1420,7 @@
     }
   },
   "restartToUpdate": {
-    "message": "Reiniciar para Atualizar"
+    "message": "Reiniciar para atualizar"
   },
   "restartToUpdateDesc": {
     "message": "A versão $VERSION_NUM$ está pronta para ser instalada. Você deve reiniciar o Bitwarden para completar a instalação. Você quer reiniciar e atualizar agora?",
@@ -1414,7 +1432,7 @@
     }
   },
   "updateAvailable": {
-    "message": "Atualização Disponível"
+    "message": "Atualização disponível"
   },
   "updateAvailableDesc": {
     "message": "Uma atualização foi encontrada. Você quer baixá-la agora?"
@@ -1423,7 +1441,7 @@
     "message": "Reiniciar"
   },
   "later": {
-    "message": "Mais Tarde"
+    "message": "Mais tarde"
   },
   "noUpdatesAvailable": {
     "message": "Não há atualizações disponíveis no momento. Você está usando a versão mais recente."
@@ -1435,48 +1453,48 @@
     "message": "Desconhecido"
   },
   "copyUsername": {
-    "message": "Copiar Nome de Usuário"
+    "message": "Copiar nome de usuário"
   },
   "copyNumber": {
-    "message": "Copiar Número",
+    "message": "Copiar número",
     "description": "Copy credit card number"
   },
   "copyEmail": {
     "message": "Copiar e-mail"
   },
   "copySecurityCode": {
-    "message": "Copiar Código de Segurança",
+    "message": "Copiar código de segurança",
     "description": "Copy credit card security code (CVV)"
   },
   "cardNumber": {
     "message": "número do cartão"
   },
   "premiumMembership": {
-    "message": "Assinatura Premium"
+    "message": "Plano Premium"
   },
   "premiumManage": {
-    "message": "Gerenciar Plano"
+    "message": "Gerenciar plano"
   },
   "premiumManageAlert": {
-    "message": "Você pode gerenciar a sua assinatura premium no cofre web em bitwarden.com. Você deseja visitar o site agora?"
+    "message": "Você pode gerenciar o seu plano no cofre web do bitwarden.com. Você deseja visitar o site agora?"
   },
   "premiumRefresh": {
-    "message": "Atualizar Assinatura"
+    "message": "Recarregar plano"
   },
   "premiumNotCurrentMember": {
-    "message": "Você não possui uma assinatura Premium."
+    "message": "Você não é um membro Premium atualmente."
   },
   "premiumSignUpAndGet": {
-    "message": "Registe-se para uma assinatura premium e obtenha:"
+    "message": "Inscreva-se para um plano Premium e receba:"
   },
   "premiumSignUpStorage": {
-    "message": "1 GB de armazenamento de arquivos encriptados."
+    "message": "1 GB de armazenamento criptografado para anexos de arquivos."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Opções de login em duas etapas como YubiKey e Duo."
+    "message": "Opções proprietárias de autenticação em duas etapas como YubiKey e Duo."
   },
   "premiumSignUpReports": {
-    "message": "Higiene de senha, saúde da conta, e relatórios sobre violação de dados para manter o seu cofre seguro."
+    "message": "Higiene de senha, saúde da conta, e relatórios de brechas de dados para manter o seu cofre seguro."
   },
   "premiumSignUpTotp": {
     "message": "Gerador de códigos de verificação TOTP (2FA) para credenciais no seu cofre."
@@ -1485,22 +1503,22 @@
     "message": "Prioridade no suporte ao cliente."
   },
   "premiumSignUpFuture": {
-    "message": "Todos os recursos premium no futuro. Mais em breve!"
+    "message": "Todos os recursos Premium no futuro. Mais em breve!"
   },
   "premiumPurchase": {
     "message": "Comprar Premium"
   },
   "premiumPurchaseAlertV2": {
-    "message": "Você pode comprar Premium nas configurações de sua conta no aplicativo web do Bitwarden."
+    "message": "Você pode comprar o Premium nas configurações da sua conta no aplicativo web do Bitwarden."
   },
   "premiumCurrentMember": {
-    "message": "Você é um membro premium!"
+    "message": "Você é um membro Premium!"
   },
   "premiumCurrentMemberThanks": {
     "message": "Obrigado por apoiar o Bitwarden."
   },
   "premiumPrice": {
-    "message": "Tudo por apenas $PRICE$ /ano!",
+    "message": "Tudo por apenas $PRICE$ por ano!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1509,7 +1527,7 @@
     }
   },
   "refreshComplete": {
-    "message": "Atualização completada"
+    "message": "Recarregamento concluído"
   },
   "passwordHistory": {
     "message": "Histórico de senhas"
@@ -1521,7 +1539,7 @@
     "message": "Limpar histórico do gerador"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "Se continuar, todas as entradas serão permanentemente excluídas do histórico do gerador. Tem certeza que deseja continuar?"
+    "message": "Se continuar, todos os itens serão apagados para sempre do histórico do gerador. Tem certeza que deseja continuar?"
   },
   "clear": {
     "message": "Limpar",
@@ -1537,7 +1555,7 @@
     "message": "Nada para mostrar"
   },
   "nothingGeneratedRecently": {
-    "message": "Você não gerou uma senha recentemente"
+    "message": "Você não gerou nada recentemente"
   },
   "undo": {
     "message": "Desfazer"
@@ -1554,7 +1572,7 @@
     "description": "Paste from clipboard"
   },
   "selectAll": {
-    "message": "Selecionar Tudo"
+    "message": "Selecionar tudo"
   },
   "zoomIn": {
     "message": "Ampliar"
@@ -1563,16 +1581,16 @@
     "message": "Reduzir"
   },
   "resetZoom": {
-    "message": "Redefinir Zoom"
+    "message": "Redefinir zoom"
   },
   "toggleFullScreen": {
-    "message": "Alternar para Tela Cheia"
+    "message": "Habilitar tela cheia"
   },
   "reload": {
     "message": "Recarregar"
   },
   "toggleDevTools": {
-    "message": "Alternar ferramentas de desenvolvedor"
+    "message": "Habilitar ferramentas de desenvolvedor"
   },
   "minimize": {
     "message": "Minimizar",
@@ -1582,7 +1600,7 @@
     "message": "Zoom"
   },
   "bringAllToFront": {
-    "message": "Trazer Tudo para a Frente",
+    "message": "Trazer tudo para a frente",
     "description": "Bring all windows to front (foreground)"
   },
   "aboutBitwarden": {
@@ -1592,16 +1610,16 @@
     "message": "Serviços"
   },
   "hideBitwarden": {
-    "message": "Ocultar o Bitwarden"
+    "message": "Ocultar Bitwarden"
   },
   "hideOthers": {
-    "message": "Ocultar Outros"
+    "message": "Ocultar outros"
   },
   "showAll": {
-    "message": "Mostrar Todos"
+    "message": "Mostrar tudo"
   },
   "quitBitwarden": {
-    "message": "Sair do Bitwarden"
+    "message": "Fechar Bitwarden"
   },
   "valueCopied": {
     "message": "$VALUE$ copiado(a)",
@@ -1617,10 +1635,10 @@
     "message": "Copiado com sucesso"
   },
   "errorRefreshingAccessToken": {
-    "message": "Erro ao Atualizar Token"
+    "message": "Erro de atualização do token de acesso"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "Nenhum token de atualização ou chave de API foi encontrado. Tente sair e entrar novamente."
+    "message": "Nenhum token de recarregamento ou chave de API foi encontrado. Tente desconectar-se e conectar-se novamente."
   },
   "help": {
     "message": "Ajuda"
@@ -1629,7 +1647,7 @@
     "message": "Janela"
   },
   "checkPassword": {
-    "message": "Verifique se a senha foi exposta."
+    "message": "Confira se a senha foi exposta."
   },
   "passwordExposed": {
     "message": "Esta senha foi exposta $VALUE$ vez(es) em brechas de dados. Você deve alterá-la.",
@@ -1641,14 +1659,14 @@
     }
   },
   "passwordSafe": {
-    "message": "Esta senha não foi encontrada em brechas de dados conhecidas. Deve ser seguro de usar."
+    "message": "Esta senha não foi encontrada em brechas de dados conhecidas. Deve ser segura de usar."
   },
   "baseDomain": {
     "message": "Domínio de base",
     "description": "Domain name. Ex. website.com"
   },
   "domainName": {
-    "message": "Nome do Domínio",
+    "message": "Nome do domínio",
     "description": "Domain name. Ex. website.com"
   },
   "host": {
@@ -1666,7 +1684,7 @@
     "description": "A programming term, also known as 'RegEx'."
   },
   "matchDetection": {
-    "message": "Deteção de correspondência",
+    "message": "Detecção de correspondência",
     "description": "URI match detection for auto-fill."
   },
   "defaultMatchDetection": {
@@ -1674,7 +1692,7 @@
     "description": "Default URI match detection for auto-fill."
   },
   "toggleOptions": {
-    "message": "Alternar Opções"
+    "message": "Habilitar opções"
   },
   "organization": {
     "message": "Organização",
@@ -1691,10 +1709,10 @@
     "description": "Text for a button that toggles the visibility of the window. Shows the window when it is hidden or hides the window if it is currently open."
   },
   "hideToTray": {
-    "message": "Ocultar para a área de notificações"
+    "message": "Ocultar para a bandeja"
   },
   "alwaysOnTop": {
-    "message": "Sempre no Topo",
+    "message": "Sempre acima",
     "description": "Application window should always stay on top of other windows"
   },
   "dateUpdated": {
@@ -1728,41 +1746,41 @@
     "message": "Esta senha será usada para exportar e importar este arquivo"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Use sua chave criptográfica da conta, derivada do nome de usuário e Senha Mestra da sua conta, para criptografar a exportação e restringir importação para apenas a conta atual do Bitwarden."
+    "message": "Use a chave de criptografia da sua conta, derivada do nome de usuário e senha principal da sua conta, para criptografar a exportação e restringir a importação para apenas a conta atual do Bitwarden."
   },
   "passwordProtected": {
-    "message": "Protegido por senha"
+    "message": "Protegida por senha"
   },
   "passwordProtectedOptionDescription": {
-    "message": "Defina uma senha de arquivo para criptografar a exportação e importá-la para qualquer conta do Bitwarden usando a senha para descriptografia."
+    "message": "Configure uma senha de arquivo para criptografar a exportação e importá-la para qualquer conta do Bitwarden usando a senha para descriptografá-la."
   },
   "exportTypeHeading": {
     "message": "Tipo da exportação"
   },
   "accountRestricted": {
-    "message": "Conta restrita"
+    "message": "Restrita à conta"
   },
   "restrictCardTypeImport": {
-    "message": "Não é possível importar os tipos de item cartão"
+    "message": "Não é possível importar itens do tipo de cartão"
   },
   "restrictCardTypeImportDesc": {
-    "message": "Uma política definida por 1 ou mais organizações impedem que você importe cartões dos seus repositórios."
+    "message": "Uma política configurada por uma ou mais organizações impedem que você importe cartões em seus cofres."
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "\"Senha do arquivo\" e \"Confirmação de senha\" não correspondem."
+    "message": "\"Senha do arquivo\" e \"Confirmar senha do arquivo\" não correspondem."
   },
   "done": {
-    "message": "Concluído"
+    "message": "Pronto"
   },
   "warning": {
     "message": "AVISO",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "confirmVaultExport": {
-    "message": "Confirmar Exportação do Cofre"
+    "message": "Confirmar exportação do cofre"
   },
   "exportWarningDesc": {
-    "message": "Esta exportação contém os dados do seu cofre em um formato não criptografado. Você não deve armazenar ou enviar o arquivo exportado por canais inseguros (como e-mail). Exclua o arquivo imediatamente após terminar de usá-lo."
+    "message": "Esta exportação contém os dados do seu cofre em um formato não criptografado. Você não deve armazenar ou enviar o arquivo exportado por canais inseguros (como e-mail). Apague o arquivo imediatamente após terminar de usá-lo."
   },
   "encExportKeyWarningDesc": {
     "message": "Esta exportação criptografa seus dados usando a chave de criptografia da sua conta. Se você rotacionar a chave de criptografia da sua conta, você deve exportar novamente, já que você não será capaz de descriptografar este arquivo de exportação."
@@ -1771,16 +1789,16 @@
     "message": "As chaves de criptografia de conta são únicas para cada conta de usuário do Bitwarden, então você não pode importar uma exportação criptografada para uma conta diferente."
   },
   "noOrganizationsList": {
-    "message": "Você não pertence a nenhuma organização. Organizações permitem-lhe compartilhar itens em segurança com outros usuários."
+    "message": "Você não faz parte de uma organização. Organizações permitem-lhe compartilhar itens com segurança com outros usuários."
   },
   "noCollectionsInList": {
-    "message": "Não há coleções para listar."
+    "message": "Não há conjuntos para listar."
   },
   "ownership": {
     "message": "Propriedade"
   },
   "whoOwnsThisItem": {
-    "message": "Quem possui este item?"
+    "message": "Quem é o proprietário deste item?"
   },
   "strong": {
     "message": "Forte",
@@ -1795,20 +1813,20 @@
     "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Senha mestra fraca"
+    "message": "Senha principal fraca"
   },
   "weakMasterPasswordDesc": {
-    "message": "A senha mestra que você selecionou está fraca. Você deve usar uma senha mestra forte (ou uma frase-passe) para proteger a sua conta Bitwarden adequadamente. Tem certeza que deseja usar esta senha mestra?"
+    "message": "A senha principal que você escolheu é fraca. Você deve usar uma senha principal forte (ou uma frase secreta) para proteger a sua conta Bitwarden adequadamente. Tem certeza que deseja usar esta senha principal?"
   },
   "pin": {
     "message": "PIN",
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "unlockWithPin": {
-    "message": "Desbloquear com o PIN"
+    "message": "Desbloquear com PIN"
   },
   "setYourPinCode": {
-    "message": "Defina o seu código PIN para desbloquear o Bitwarden. Suas configurações de PIN serão redefinidas se alguma vez você encerrar completamente toda a sessão do aplicativo."
+    "message": "Configure o seu código PIN para desbloquear o Bitwarden. Suas configurações de PIN serão redefinidas se você desconectar-se totalmente do aplicativo."
   },
   "pinRequired": {
     "message": "O código PIN é necessário."
@@ -1823,7 +1841,7 @@
     "message": "Desbloquear com o Windows Hello"
   },
   "unlockWithPolkit": {
-    "message": "Desbloquear com autenticação de sistema"
+    "message": "Desbloquear com a autenticação do sistema"
   },
   "windowsHelloConsentMessage": {
     "message": "Verifique para o Bitwarden."
@@ -1832,64 +1850,70 @@
     "message": "Desbloquear com o Touch ID"
   },
   "additionalTouchIdSettings": {
-    "message": "Configurações adicionais de Touch ID"
+    "message": "Configurações adicionais do Touch ID"
   },
   "touchIdConsentMessage": {
     "message": "desbloquear o seu cofre"
   },
   "autoPromptTouchId": {
-    "message": "Pedir pelo Touch ID ao iniciar"
+    "message": "Pedir o Touch ID ao abrir"
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Bloquear com senha mestra ao reiniciar"
+    "message": "Bloquear com a senha principal ao reiniciar"
+  },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Exigir senha principal ou PIN ao reiniciar o app"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Exigir senha principal ao reiniciar o app"
   },
   "deleteAccount": {
-    "message": "Excluir conta"
+    "message": "Apagar conta"
   },
   "deleteAccountDesc": {
-    "message": "Prossiga abaixo para excluir a sua conta e todos os dados associados."
+    "message": "Prossiga abaixo para apagar sua conta e todos os dados do cofre."
   },
   "deleteAccountWarning": {
-    "message": "A exclusão de sua conta é permanente. Não poderá ser desfeito."
+    "message": "O apagamento de sua conta é permanente. Não pode ser desfeito."
   },
   "cannotDeleteAccount": {
-    "message": "Não é possível excluir conta"
+    "message": "Não é possível apagar a conta"
   },
   "cannotDeleteAccountDesc": {
     "message": "Esta ação não pode ser concluída porque sua conta pertence a uma organização. Entre em contato com o administrador da sua organização para obter mais detalhes."
   },
   "accountDeleted": {
-    "message": "Conta excluída"
+    "message": "Conta apagada"
   },
   "accountDeletedDesc": {
-    "message": "A sua conta foi fechada e todos os dados associados foram excluídos."
+    "message": "A sua conta foi fechada e todos os dados associados foram apagados."
   },
   "preferences": {
     "message": "Preferências"
   },
   "enableMenuBar": {
-    "message": "Ativar Ícone da Barra de Menu"
+    "message": "Ativar ícone da barra de menu"
   },
   "enableMenuBarDesc": {
     "message": "Sempre mostrar um ícone na barra de menu."
   },
   "hideToMenuBar": {
-    "message": "Ocultar para a Barra de Menu"
+    "message": "Ocultar na barra de menu"
   },
   "selectOneCollection": {
-    "message": "Você deve selecionar pelo menos uma coleção."
+    "message": "Você deve selecionar pelo menos um conjunto."
   },
   "premiumUpdated": {
-    "message": "Você atualizou para premium."
+    "message": "Você fez upgrade para o Premium."
   },
   "restore": {
     "message": "Restaurar"
   },
   "premiumManageAlertAppStore": {
-    "message": "Você pode gerenciar sua assinatura da App Store. Você quer visitar a App Store agora?"
+    "message": "Você pode gerenciar sua assinatura pela App Store. Você quer visitar a App Store agora?"
   },
   "legal": {
-    "message": "Aspectos Legais",
+    "message": "Jurídico",
     "description": "Noun. As in 'legal documents', like our terms of service and privacy policy."
   },
   "termsOfService": {
@@ -1899,28 +1923,28 @@
     "message": "Política de Privacidade"
   },
   "unsavedChangesConfirmation": {
-    "message": "Você tem certeza que deseja sair? Se sair agora, as suas informações atuais não serão salvas."
+    "message": "Tem certeza que quer sair? Se sair agora, as suas informações atuais não serão salvas."
   },
   "unsavedChangesTitle": {
-    "message": "Alterações não Salvas"
+    "message": "Alterações não salvas"
   },
   "clone": {
     "message": "Clonar"
   },
   "passwordGeneratorPolicyInEffect": {
-    "message": "Uma ou mais políticas da organização estão afetando as suas configurações do gerador."
+    "message": "Uma ou mais políticas da organização estão afetando as configurações do seu gerador."
   },
   "vaultTimeoutAction": {
-    "message": "Ação de Tempo Limite do Cofre"
+    "message": "Ação do tempo limite do cofre"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "Um cofre bloqueado requer que você reinsira a sua senha mestra para entrar novamente."
+    "message": "A senha principal ou outro método de desbloqueio é necessário para acessar seu cofre novamente."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "Uma sessão encerrada com o cofre requer que você autentique-se novamente para acessá-lo de novo."
+    "message": "Reautenticação é necessária para acessar seu cofre novamente."
   },
   "unlockMethodNeededToChangeTimeoutActionDesc": {
-    "message": "Configure um método de desbloqueio para alterar o tempo limite do cofre."
+    "message": "Configure um método de desbloqueio para alterar a ação do tempo limite do cofre."
   },
   "lock": {
     "message": "Bloquear",
@@ -1931,45 +1955,45 @@
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "Pesquisar na lixeira"
+    "message": "Buscar na lixeira"
   },
   "permanentlyDeleteItem": {
-    "message": "Excluir o Item Permanentemente"
+    "message": "Apagar item para sempre"
   },
   "permanentlyDeleteItemConfirmation": {
-    "message": "Você tem certeza que deseja excluir permanentemente esse item?"
+    "message": "Tem certeza que quer apagar este item para sempre?"
   },
   "permanentlyDeletedItem": {
-    "message": "Item Permanentemente Excluído"
+    "message": "Item apagado para sempre"
   },
   "restoredItem": {
-    "message": "Item Restaurado"
+    "message": "Item restaurado"
   },
   "permanentlyDelete": {
-    "message": "Excluir Permanentemente"
+    "message": "Apagar para sempre"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Sair irá remover todo o acesso ao seu cofre e requer autenticação online após o período de tempo limite. Tem certeza de que deseja usar esta configuração?"
+    "message": "Ao desconectar-se, todo o seu acesso ao cofre será removido e será necessário autenticação on-line após o período do tempo limite. Tem certeza que quer usar esta configuração?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Confirmação de Ação de Tempo Limite"
+    "message": "Confirmação de ação do tempo limite"
   },
   "enterpriseSingleSignOn": {
-    "message": "Iniciar Sessão Empresarial Única"
+    "message": "Autenticação única empresarial"
   },
   "setMasterPassword": {
-    "message": "Definir Senha Mestra"
+    "message": "Configurar senha principal"
   },
   "orgPermissionsUpdatedMustSetPassword": {
-    "message": "As permissões da sua organização foram atualizadas, exigindo que você defina uma senha mestra.",
+    "message": "As permissões da sua organização foram atualizadas, exigindo que você configure uma senha principal.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "orgRequiresYouToSetPassword": {
-    "message": "Sua organização requer que você defina uma senha mestra.",
+    "message": "Sua organização requer que você configure uma senha principal.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "fora do $TOTAL$",
+    "message": "dos $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -1981,7 +2005,7 @@
     "message": "Detalhes do cartão"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ Detalhes",
+    "message": "Detalhes da $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1990,19 +2014,19 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Aprenda mais sobre autenticadores"
+    "message": "Saiba mais sobre autenticadores"
   },
   "copyTOTP": {
-    "message": "Copiar a chave de autenticação (TOTP)"
+    "message": "Copiar chave do autenticador (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Tornar a verificação em 2 etapas mais simples"
+    "message": "Torne a verificação em 2 etapas mais simples"
   },
   "totpHelper": {
-    "message": "Bitwarden pode armazenar e preencher códigos de verificação de 2 etapas. Copie e cole a chave nesse campo."
+    "message": "O Bitwarden pode armazenar e preencher códigos de verificação de 2 etapas. Copie e cole a chave nesse campo."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden pode armazenar e preencher códigos de verificação de 2 etapas. Selecione o ícone da câmera e tire uma captura de tela do código QR de autenticação desse site ou copie e cole a chave nesse campo."
+    "message": "O Bitwarden pode armazenar e preencher códigos de verificação de 2 etapas. Selecione o ícone da câmera e tire uma captura de tela do código QR do autenticador nesse site ou copie e cole a chave nesse campo."
   },
   "premium": {
     "message": "Premium",
@@ -2012,7 +2036,7 @@
     "message": "Organizações gratuitas não podem utilizar anexos"
   },
   "singleFieldNeedsAttention": {
-    "message": "1 campo precisa da sua atenção."
+    "message": "Um campo precisa da sua atenção."
   },
   "multipleFieldsNeedAttention": {
     "message": "$COUNT$ campos precisam da sua atenção.",
@@ -2024,26 +2048,26 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Cartão expirado"
+    "message": "Cartão vencido"
   },
   "cardExpiredMessage": {
-    "message": "Se você fez uma renovação recente, atualize as informações do cartão"
+    "message": "Se você o renovou, atualize as informações do cartão"
   },
   "verificationRequired": {
     "message": "Verificação necessária",
     "description": "Default title for the user verification dialog."
   },
   "currentMasterPass": {
-    "message": "Senha mestra atual"
+    "message": "Senha principal atual"
   },
   "newMasterPass": {
-    "message": "Nova Senha Mestra"
+    "message": "Nova senha principal"
   },
   "confirmNewMasterPass": {
-    "message": "Confirme a Nova Senha Mestra"
+    "message": "Confirmar nova senha principal"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "Uma ou mais políticas da organização exigem que a sua senha mestra cumpra aos seguintes requisitos:"
+    "message": "Uma ou mais políticas da organização exigem que a sua senha principal cumpra aos seguintes requisitos:"
   },
   "policyInEffectMinComplexity": {
     "message": "Pontuação mínima de complexidade de $SCORE$",
@@ -2082,13 +2106,13 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "A sua nova senha mestra não cumpre aos requisitos da política."
+    "message": "A sua nova senha principal não cumpre aos requisitos da política."
   },
   "receiveMarketingEmailsV2": {
-    "message": "Obtenha conselhos, novidades, e oportunidades de pesquisa do Bitwarden em sua caixa de entrada."
+    "message": "Receba conselhos, novidades, e oportunidades de pesquisa do Bitwarden em sua caixa de entrada."
   },
   "unsubscribe": {
-    "message": "Cancelar subscrição"
+    "message": "Desinscreva-se"
   },
   "atAnyTime": {
     "message": "a qualquer momento."
@@ -2106,55 +2130,52 @@
     "message": "Os Termos de Serviço e a Política de Privacidade não foram aceitos."
   },
   "enableBrowserIntegration": {
-    "message": "Ativar integração com o navegador"
+    "message": "Permitir integração com o navegador"
   },
   "enableBrowserIntegrationDesc1": {
-    "message": "Usado para permitir desbloqueio biométrico em navegadores que não são Safari."
+    "message": "Usado para permitir o desbloqueio biométrico em navegadores que não são o Safari."
   },
   "enableDuckDuckGoBrowserIntegration": {
-    "message": "Permitir integração ao navegador DuckDuckGo"
+    "message": "Permitir integração com o navegador DuckDuckGo"
   },
   "enableDuckDuckGoBrowserIntegrationDesc": {
     "message": "Use o seu cofre do Bitwarden ao navegar com DuckDuckGo."
   },
   "browserIntegrationUnsupportedTitle": {
-    "message": "Integração com o navegador não suportado"
+    "message": "Integração com o navegador não suportada"
   },
   "browserIntegrationErrorTitle": {
-    "message": "Erro ao ativar a integração do navegador"
+    "message": "Erro ao ativar a integração com o navegador"
   },
   "browserIntegrationErrorDesc": {
-    "message": "Ocorreu um erro ao permitir a integração do navegador."
-  },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Infelizmente, por ora, a integração do navegador só é suportada na versão da Mac App Store."
+    "message": "Ocorreu um erro ao ativar a integração com o navegador."
   },
   "browserIntegrationWindowsStoreDesc": {
-    "message": "Infelizmente, a integração do navegador não é suportada na versão da Microsoft Store."
+    "message": "Infelizmente, a integração com o navegador não é suportada na versão da Microsoft Store no momento."
   },
   "browserIntegrationLinuxDesc": {
-    "message": "Infelizmente, a integração do navegador não é suportada na versão linux."
+    "message": "Infelizmente, a integração do navegador não é suportada na versão linux no momento."
   },
   "enableBrowserIntegrationFingerprint": {
     "message": "Exigir verificação para integração com o navegador"
   },
   "enableBrowserIntegrationFingerprintDesc": {
-    "message": "Ative uma camada adicional de segurança, exigindo validação de frase de impressão digital ao estabelecer uma ligação entre o computador e o navegador. Quando ativado, isto requer intervenção do usuário e verificação cada vez que uma conexão é estabelecida."
+    "message": "Adicione uma camada adicional de segurança, exigindo a validação da frase biométrica ao estabelecer uma ligação entre o computador e o navegador. Requer intervenção do usuário e verificação cada vez que uma conexão é estabelecida."
   },
   "enableHardwareAcceleration": {
-    "message": "Utilizar aceleração de hardware"
+    "message": "Usar aceleração de hardware"
   },
   "enableHardwareAccelerationDesc": {
-    "message": "Por padrão esta configuração está ativada. Desligar apenas se tiver problemas gráficos. Reiniciar é necessário."
+    "message": "Por padrão esta configuração está ativada. Desative apenas se tiver problemas gráficos. Reiniciar é necessário."
   },
   "approve": {
     "message": "Aprovar"
   },
   "verifyBrowserTitle": {
-    "message": "Verificar conexão do navegador"
+    "message": "Verifique a conexão com o navegador"
   },
   "verifyBrowserDesc": {
-    "message": "Por favor, certifique-se que a impressão digital mostrada é idêntica à impressão digital exibida na extensão do navegador."
+    "message": "Certifique-se que a frase biométrica mostrada é idêntica à exibida na extensão do navegador."
   },
   "verifyNativeMessagingConnectionTitle": {
     "message": "$APPID$ quer se conectar ao Bitwarden",
@@ -2166,43 +2187,43 @@
     }
   },
   "verifyNativeMessagingConnectionDesc": {
-    "message": "Gostaria de aprovar este pedido?"
+    "message": "Gostaria de aprovar esta solicitação?"
   },
   "verifyNativeMessagingConnectionWarning": {
     "message": "Se não iniciou esta solicitação, não a aprove."
   },
   "biometricsNotEnabledTitle": {
-    "message": "Biometria não ativada"
+    "message": "Biometria não configurada"
   },
   "biometricsNotEnabledDesc": {
-    "message": "A biometria do navegador exige que a biometria do desktop seja configurada primeiro nas configurações."
+    "message": "A biometria do navegador exige que a biometria do computador seja configurada primeiro nas configurações."
   },
   "biometricsManualSetupTitle": {
     "message": "Configuração automática não disponível"
   },
   "biometricsManualSetupDesc": {
-    "message": "Devido ao método de instalação, o suporte a dados biométricos não pôde ser ativado automaticamente. Você gostaria de abrir a documentação sobre como fazer isso manualmente?"
+    "message": "Devido ao método de instalação, o suporte à biometria não pôde ser ativado automaticamente. Você gostaria de abrir a documentação sobre como fazer isso manualmente?"
   },
   "personalOwnershipSubmitError": {
-    "message": "Devido a uma Política Empresarial, você está restrito de salvar itens para seu cofre pessoal. Altere a opção de Propriedade para uma organização e escolha entre as Coleções disponíveis."
+    "message": "Devido a uma política empresarial, você não pode salvar itens no seu cofre pessoal. Altere a opção de propriedade para uma organização e escolha entre os conjuntos disponíveis."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Sua nova senha não pode ser a mesma que a sua atual."
+    "message": "Sua senha nova não pode ser a mesma que a sua atual."
   },
   "hintEqualsPassword": {
-    "message": "Sua dica de senha não pode ser o mesmo que sua senha."
+    "message": "A dica da sua senha não pode ser a mesma que a sua senha."
   },
   "personalOwnershipPolicyInEffect": {
     "message": "Uma política de organização está afetando suas opções de propriedade."
   },
   "personalOwnershipPolicyInEffectImports": {
-    "message": "A política da organização bloqueou a importação de itens para o seu cofre."
+    "message": "Uma política da organização bloqueou a importação de itens em seu cofre individual."
   },
   "personalDetails": {
     "message": "Detalhes pessoais"
   },
   "identification": {
-    "message": "Identificação"
+    "message": "Identidade"
   },
   "contactInfo": {
     "message": "Informações de contato"
@@ -2218,7 +2239,7 @@
     "message": "Texto"
   },
   "searchSends": {
-    "message": "Pesquisar Sends",
+    "message": "Buscar nos Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -2226,46 +2247,46 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "myVault": {
-    "message": "Meu Cofre"
+    "message": "Meu cofre"
   },
   "text": {
     "message": "Texto"
   },
   "deletionDate": {
-    "message": "Data de Exclusão"
+    "message": "Data de apagamento"
   },
   "deletionDateDesc": {
-    "message": "O Send será eliminado permanentemente na data e hora especificadas.",
+    "message": "O Send será apagado para sempre no horário especificado.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
-    "message": "Data de Expiração"
+    "message": "Data de validade"
   },
   "expirationDateDesc": {
-    "message": "Se definido, o acesso a este Send expirará na data e hora especificadas.",
+    "message": "Se configurado, o acesso a este Send acabará no horário especificado.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
-    "message": "Contagem Máxima de Acessos",
+    "message": "Número máximo de acessos",
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "maxAccessCountDesc": {
-    "message": "Se atribuído, usuários não poderão mais acessar este Send assim que o número máximo de acessos for atingido.",
+    "message": "Se configurado, usuários não poderão mais acessar este Send assim que o número máximo de acessos for atingido.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "currentAccessCount": {
-    "message": "Contagem Atual de Acessos"
+    "message": "Número atual de acessos"
   },
   "disableSend": {
-    "message": "Desative este envio para que ninguém possa acessá-lo.",
+    "message": "Desative este Send para que ninguém possa acessá-lo.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendPasswordDesc": {
-    "message": "Opcionalmente exigir uma senha para os usuários acessarem este Send.",
+    "message": "Opcionalmente exija uma senha para os usuários acessarem este Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendNotesDesc": {
-    "message": "Notas privadas sobre este Send.",
+    "message": "Anotações privadas sobre este Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
@@ -2273,7 +2294,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinkLabel": {
-    "message": "Enviar link",
+    "message": "Link do Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "textHiddenByDefault": {
@@ -2281,26 +2302,26 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Envio adicionado",
+    "message": "Send adicionado",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Envio salvo",
+    "message": "Send salvo",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletedSend": {
-    "message": "Enviar excluído",
+    "message": "Send apagado",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "newPassword": {
-    "message": "Nova senha"
+    "message": "Senha nova"
   },
   "whatTypeOfSend": {
     "message": "Que tipo de Send é este?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Novo envio",
+    "message": "Novo Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTextDesc": {
@@ -2325,7 +2346,7 @@
     "message": "Personalizado"
   },
   "deleteSendConfirmation": {
-    "message": "Você tem certeza que deseja excluir este Send?",
+    "message": "Tem certeza que quer apagar este Send?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkToClipboard": {
@@ -2336,11 +2357,11 @@
     "message": "Copiar o link para compartilhar este Send para minha área de transferência ao salvar."
   },
   "sendDisabled": {
-    "message": "Envio removido",
+    "message": "Send removido",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
-    "message": "Devido a uma política corporativa, você só pode excluir um Send existente.",
+    "message": "Devido a uma política corporativa, você só pode apagar um Send existente.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copyLink": {
@@ -2362,10 +2383,10 @@
     "message": "Número máximo de acessos atingido"
   },
   "expired": {
-    "message": "Expirado"
+    "message": "Vencido"
   },
   "pendingDeletion": {
-    "message": "Exclusão pendente"
+    "message": "Apagamento pendente"
   },
   "webAuthnAuthenticate": {
     "message": "Autenticar WebAuthn"
@@ -2392,64 +2413,64 @@
     "message": "Você precisa verificar o seu e-mail para usar este recurso."
   },
   "passwordPrompt": {
-    "message": "Solicitação nova de senha mestra"
+    "message": "Resolicitar senha principal"
   },
   "passwordConfirmation": {
-    "message": "Confirmação de senha mestra"
+    "message": "Confirmação de senha principal"
   },
   "passwordConfirmationDesc": {
-    "message": "Esta ação está protegida. Para continuar, por favor, reinsira a sua senha mestra para verificar sua identidade."
+    "message": "Esta ação está protegida. Redigite a sua senha principal para verificar sua identidade."
   },
   "masterPasswordSuccessfullySet": {
-    "message": "Senha mestra definida com sucesso"
+    "message": "Senha principal configurada com sucesso"
   },
   "updatedMasterPassword": {
-    "message": "Senha mestra atualizada"
+    "message": "Senha principal atualizada"
   },
   "updateMasterPassword": {
-    "message": "Atualizar Senha Mestra"
+    "message": "Atualizar senha principal"
   },
   "updateMasterPasswordWarning": {
-    "message": "Sua Senha Mestra foi alterada recentemente por um administrador de sua organização. Para acessar o cofre, você precisa atualizá-la agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
+    "message": "Sua senha principal foi alterada recentemente por um administrador de sua organização. Para acessar o cofre, você precisa atualizá-la agora. O processo desconectará você da sessão atual, exigindo que você conecte-se novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "A sua senha mestra não atende a uma ou mais das políticas da sua organização. Para acessar o cofre, você deve atualizar a sua senha mestra agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
+    "message": "A sua senha principal não atende a uma ou mais das políticas da sua organização. Para acessar o cofre, você deve atualizar a sua senha principal agora. O processo desconectará você da sessão atual, exigindo que você se conecte novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
   "changePasswordWarning": {
-    "message": "Após mudar a sua senha, será necessário entrar novamente com a sua nova senha. Sessões ativas em outros dispositivos serão encerradas em até uma hora."
+    "message": "Após mudar a sua senha, será necessário conectar-se novamente com a sua nova senha. Sessões ativas em outros dispositivos serão desconectadas em até uma hora."
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
-    "message": "Mude a sua senha mestra para completar a recuperação de conta."
+    "message": "Altere a sua senha principal para concluir a recuperação da conta."
   },
   "updateMasterPasswordSubtitle": {
-    "message": "Sua senha mestra não corresponde aos requerimentos da organização. Mude a sua senha mestra para continuar."
+    "message": "Sua senha principal não corresponde aos requisitos da organização. Mude a sua senha principal para continuar."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Sua organização desativou a criptografia confiável do dispositivo. Por favor, defina uma senha mestra para acessar o seu cofre."
+    "message": "Sua organização desativou a criptografia de dispositivo confiado. Configure uma senha principal para acessar o seu cofre."
   },
   "tryAgain": {
     "message": "Tentar novamente"
   },
   "verificationRequiredForActionSetPinToContinue": {
-    "message": "Verificação necessária para esta ação. Defina um PIN para continuar."
+    "message": "Verificação necessária para esta ação. Configure um PIN para continuar."
   },
   "setPin": {
-    "message": "Definir PIN"
+    "message": "Configurar PIN"
   },
   "verifyWithBiometrics": {
-    "message": "Verificiar com biometria"
+    "message": "Verificar com biometria"
   },
   "awaitingConfirmation": {
     "message": "Aguardando confirmação"
   },
   "couldNotCompleteBiometrics": {
-    "message": "Não foi possível completar a biometria."
+    "message": "Não foi possível concluir a biometria."
   },
   "needADifferentMethod": {
     "message": "Precisa de um método diferente?"
   },
   "useMasterPassword": {
-    "message": "Usar a senha mestra"
+    "message": "Usar senha principal"
   },
   "usePin": {
     "message": "Usar PIN"
@@ -2458,7 +2479,7 @@
     "message": "Usar biometria"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Digite o código de verificação que foi enviado para o seu e-mail."
+    "message": "Digite o código de verificação enviado para o seu e-mail."
   },
   "resendCode": {
     "message": "Reenviar código"
@@ -2483,7 +2504,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "As políticas da sua organização estão afetando seu cofre tempo limite. Tempo limite máximo permitido para cofre é $HOURS$ hora(s) e $MINUTES$ minuto(s). A ação de tempo limite do seu cofre é definida como $ACTION$.",
+    "message": "As políticas da sua organização estão afetando o tempo limite do seu cofre. O máximo permitido do tempo limite do cofre é $HOURS$ hora(s) e $MINUTES$ minuto(s). A ação de tempo limite do seu cofre está configurada para $ACTION$.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2500,7 +2521,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "As políticas da sua organização definiram a ação tempo limite do seu cofre para $ACTION$.",
+    "message": "As políticas da sua organização configuraram a ação do tempo limite do seu cofre para $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -2512,10 +2533,10 @@
     "message": "O tempo limite do seu cofre excede as restrições definidas por sua organização."
   },
   "vaultTimeoutPolicyAffectingOptions": {
-    "message": "Requisitos de políticas corporativas foram adicionadas as suas opções de tempo limite"
+    "message": "Os requisitos das políticas corporativas foram aplicados às suas opções de tempo limite"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "As políticas da sua organização definiram o seu tempo limite máximo permitido no cofre para $HOURS$ hora(s) e $MINUTES$ minuto(s).",
+    "message": "As políticas da sua organização configuraram o seu máximo permitido do tempo limite do cofre para $HOURS$ hora(s) e $MINUTES$ minuto(s).",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "O mínimo do tempo limite personalizado é de 1 minuto."
+  },
   "inviteAccepted": {
     "message": "Convite aceito"
   },
@@ -2547,34 +2571,34 @@
     "message": "Inscrição automática"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "Esta organização possui uma política empresarial que irá inscrevê-lo automaticamente na redefinição de senha. A inscrição permitirá que os administradores da organização alterem sua senha mestra."
+    "message": "Esta organização possui uma política empresarial que irá inscrevê-lo automaticamente na redefinição de senha. A inscrição permitirá que os administradores da organização alterem sua senha principal."
   },
   "vaultExportDisabled": {
-    "message": "Exportação de Cofre Desativada"
+    "message": "Exportação de cofre removida"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "Uma ou mais políticas da organização impdem que você exporte seu cofre pessoal."
+    "message": "Uma ou mais políticas da organização impedem que você exporte seu cofre pessoal."
   },
   "addAccount": {
-    "message": "Adicionar Conta"
+    "message": "Adicionar conta"
   },
   "removeMasterPassword": {
-    "message": "Remover Senha Mestra"
+    "message": "Remover senha principal"
   },
   "removedMasterPassword": {
-    "message": "Senha mestra removida."
+    "message": "Senha principal removida"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "Uma senha mestra não é mais necessária para membros da seguinte organização. Por favor, confirme o domínio abaixo com o administrador da sua organização."
+    "message": "Uma senha principal não é mais necessária para membros da seguinte organização. Confirme o domínio abaixo com o administrador da sua organização."
   },
   "organizationName": {
     "message": "Nome da organização"
   },
   "keyConnectorDomain": {
-    "message": "Chave de conexão do domínio"
+    "message": "Domínio do Key Connector"
   },
   "leaveOrganization": {
-    "message": "Sair da Organização"
+    "message": "Sair da organização"
   },
   "leaveOrganizationConfirmation": {
     "message": "Você tem certeza que deseja sair desta organização?"
@@ -2583,25 +2607,25 @@
     "message": "Você saiu da organização."
   },
   "ssoKeyConnectorError": {
-    "message": "Erro de Key Connector: certifique-se de que a Key Connector está disponível e funcionando corretamente."
+    "message": "Erro do Key Connector: certifique-se de que o Key Connector está disponível e funcionando corretamente."
   },
   "lockAllVaults": {
-    "message": "Bloquear Todos os Cofres"
+    "message": "Bloquear todos os cofres"
   },
   "accountLimitReached": {
-    "message": "Não mais do que 5 contas podem estar logadas ao mesmo tempo."
+    "message": "Não mais do que 5 contas podem estar conectadas ao mesmo tempo."
   },
   "accountPreferences": {
     "message": "Preferências"
   },
   "appPreferences": {
-    "message": "Configurações do Aplicativo (Todas as Contas)"
+    "message": "Configurações do aplicativo (todas as contas)"
   },
   "accountSwitcherLimitReached": {
-    "message": "Limite de Contas atingido. Saia de uma conta para adicionar outra."
+    "message": "Limite de contas atingido. Desconecte uma conta para adicionar outra."
   },
   "settingsTitle": {
-    "message": "Configurações do Aplicativo para $EMAIL$",
+    "message": "Configurações do aplicativo para $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2610,7 +2634,7 @@
     }
   },
   "switchAccount": {
-    "message": "Trocar de Conta"
+    "message": "Trocar de conta"
   },
   "alreadyHaveAccount": {
     "message": "Já tem uma conta?"
@@ -2619,13 +2643,13 @@
     "message": "Opções"
   },
   "sessionTimeout": {
-    "message": "Sua sessão expirou. Por favor, volte e tente iniciar a sessão novamente."
+    "message": "Sua sessão expirou. Volte e tente se conectar novamente."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Exportação do Cofre Pessoal"
+    "message": "Exportando cofre individual"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Apenas os itens individuais do cofre associados a $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos. Apenas as informações de item do cofre serão exportadas e não incluirão anexos associados.",
+    "message": "Apenas os itens do cofre individual associados a $EMAIL$ serão exportados. Os itens do cofre de organizações não serão incluídos. Apenas as informações dos itens do cofre serão exportadas e não incluirão anexos associados.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2634,7 +2658,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Apenas os itens individuais do cofre, incluindo anexos associados ao $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos",
+    "message": "Apenas os itens do cofre individual, incluindo anexos associados com $EMAIL$ serão exportados. Os itens do cofre de organizações não serão incluídos",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2646,7 +2670,7 @@
     "message": "Exportando cofre da organização"
   },
   "exportingOrganizationVaultDesc": {
-    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado. Itens do cofre pessoal e itens de outras organizações não serão incluídos.",
+    "message": "Apenas o cofre da organização associado a $ORGANIZATION$ será exportado. Itens de cofres individuais e de outras organizações não serão incluídos.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado. Os itens dos meus conjuntos não serão incluídos.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Bloqueado"
   },
@@ -2668,16 +2710,16 @@
     "description": "Short for 'credential generator'."
   },
   "whatWouldYouLikeToGenerate": {
-    "message": "O que você gostaria de gerar?"
+    "message": "O que gostaria de gerar?"
   },
   "passwordType": {
-    "message": "Tipo de senha"
+    "message": "Tipo da senha"
   },
   "regenerateUsername": {
-    "message": "Gerar nome de usuário novamente"
+    "message": "Regerar nome de usuário"
   },
   "generateUsername": {
-    "message": "Gerar usuário"
+    "message": "Gerar nome de usuário"
   },
   "generateEmail": {
     "message": "Gerar e-mail"
@@ -2686,16 +2728,16 @@
     "message": "Gerador de nome de usuário"
   },
   "generatePassword": {
-    "message": "Gerar Senha"
+    "message": "Gerar senha"
   },
   "generatePassphrase": {
     "message": "Gerar frase secreta"
   },
   "passwordGenerated": {
-    "message": "Gerador de senhas"
+    "message": "Senha gerada"
   },
   "passphraseGenerated": {
-    "message": "Gerador de palavra-passe"
+    "message": "Frase secreta gerada"
   },
   "usernameGenerated": {
     "message": "Nome de usuário gerado"
@@ -2718,7 +2760,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": "",
+    "message": " Utilize $RECOMMENDED$ ou mais caracteres para gerar um senha forte.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2728,7 +2770,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Utilize as palavras $RECOMMENDED$ ou mais para gerar uma frase secreta forte.",
+    "message": " Utilize $RECOMMENDED$ ou mais palavras para gerar uma frase secreta forte.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2738,32 +2780,32 @@
     }
   },
   "usernameType": {
-    "message": "Tipo de usuário"
+    "message": "Tipo do nome de usuário"
   },
   "plusAddressedEmail": {
-    "message": "Mais e-mail endereçado",
+    "message": "E-mail endereçado com +",
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
-    "message": "Use os recursos de subendereçamento do seu provedor de e-mail."
+    "message": "Use os recursos de sub-endereçamento do seu provedor de e-mail."
   },
   "catchallEmail": {
     "message": "E-mail pega-tudo"
   },
   "catchallEmailDesc": {
-    "message": "Use o catch-all configurado no seu domínio."
+    "message": "Use a caixa de entrada pega-tudo configurada no seu domínio."
   },
   "useThisEmail": {
     "message": "Usar este e-mail"
   },
   "useThisPassword": {
-    "message": "Use esta senha"
+    "message": "Usar esta senha"
   },
   "useThisPassphrase": {
-    "message": "Use essa palavra-passe"
+    "message": "Usar esta frase secreta"
   },
   "useThisUsername": {
-    "message": "Use este nome de usuário"
+    "message": "Usar este nome de usuário"
   },
   "random": {
     "message": "Aleatório"
@@ -2778,16 +2820,16 @@
     "message": "Serviço"
   },
   "allVaults": {
-    "message": "Todos os Cofres"
+    "message": "Todos os cofres"
   },
   "searchOrganization": {
-    "message": "Pesquisar Organização"
+    "message": "Buscar na organização"
   },
   "searchMyVault": {
-    "message": "Pesquisar no Meu Cofre"
+    "message": "Buscar no meu cofre"
   },
   "forwardedEmail": {
-    "message": "Alias de E-mail Encaminhado"
+    "message": "Alias de encaminhamento de e-mail"
   },
   "forwardedEmailDesc": {
     "message": "Gere um alias de e-mail com um serviço externo de encaminhamento."
@@ -2797,11 +2839,11 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Escolha um domínio que seja suportado pelo serviço selecionado",
+    "message": "Escolha um domínio suportado pelo serviço selecionado",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
-    "message": "Erro $SERVICENAME$: $ERRORMESSAGE$",
+    "message": "Erro do $SERVICENAME$: $ERRORMESSAGE$",
     "description": "Reports an error returned by a forwarding service to the user.",
     "placeholders": {
       "servicename": {
@@ -2829,7 +2871,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Token de API $SERVICENAME$ inválido",
+    "message": "Token de API do $SERVICENAME$ inválido",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2839,7 +2881,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Token de API $SERVICENAME$ inválido: $ERRORMESSAGE$",
+    "message": "Token de API da $SERVICENAME$ inválido: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -2877,7 +2919,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Não foi possível obter a máscara do ID da conta de email $SERVICENAME$.",
+    "message": "Não é possível obter o ID da conta de e-mail mascarado do $SERVICENAME$.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -2887,7 +2929,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Domínio $SERVICENAME$ inválido.",
+    "message": "Domínio inválido do $SERVICENAME$.",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2897,7 +2939,7 @@
     }
   },
   "forwarderNoUrl": {
-    "message": "URL $SERVICENAME$ inválida.",
+    "message": "URL inválido do $SERVICENAME$.",
     "description": "Displayed when the url of the forwarding service wasn't supplied.",
     "placeholders": {
       "servicename": {
@@ -2907,7 +2949,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Ocorreu um erro $SERVICENAME$ desconhecido.",
+    "message": "Ocorreu um erro desconhecido do $SERVICENAME$.",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -2927,41 +2969,41 @@
     }
   },
   "hostname": {
-    "message": "Nome do host",
+    "message": "Nome do servidor",
     "description": "Part of a URL."
   },
   "apiAccessToken": {
-    "message": "Token de acesso API"
+    "message": "Token de acesso à API"
   },
   "apiKey": {
-    "message": "Chave de API"
+    "message": "Chave da API"
   },
   "premiumSubcriptionRequired": {
     "message": "Assinatura Premium necessária"
   },
   "organizationIsDisabled": {
-    "message": "Organização está desabilitada."
+    "message": "Organização suspensa"
   },
   "disabledOrganizationFilterError": {
-    "message": "Itens em Organizações Desativadas não podem ser acessados. Entre em contato com o proprietário da sua Organização para obter ajuda."
+    "message": "Itens em organizações suspensas não podem ser acessados. Contate o proprietário da sua organização para obter ajuda."
   },
   "neverLockWarning": {
-    "message": "Você tem certeza que deseja usar a opção \"Nunca\"? Definir suas opções de bloqueio para \"Nunca\" armazena a chave de criptografia do seu cofre no seu dispositivo. Se você usar esta opção, deve garantir que mantém seu dispositivo devidamente protegido."
+    "message": "Você tem certeza que deseja usar a opção \"Nunca\"? Ao usar o \"Nunca\", a chave de criptografia do seu cofre é armazenada no seu dispositivo. Se você usar esta opção, deve garantir que mantém seu dispositivo devidamente protegido."
   },
   "vault": {
     "message": "Cofre"
   },
   "loginWithMasterPassword": {
-    "message": "‘Login’ com senha ‘master’"
+    "message": "Conectar-se com senha principal"
   },
   "rememberEmail": {
-    "message": "Lembrar e-mail"
+    "message": "Lembrar do e-mail"
   },
   "newAroundHere": {
     "message": "Novo por aqui?"
   },
   "loggingInTo": {
-    "message": "Fazendo login em $DOMAIN$",
+    "message": "Conectando-se a $DOMAIN$",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -2970,13 +3012,13 @@
     }
   },
   "logInWithAnotherDevice": {
-    "message": "Fazer login com outro dispositivo"
+    "message": "Conectar-se com outro dispositivo"
   },
   "loginInitiated": {
-    "message": "Login iniciado"
+    "message": "Autenticação iniciada"
   },
   "logInRequestSent": {
-    "message": "Pedido enviado"
+    "message": "Solicitação enviada"
   },
   "notificationSentDevice": {
     "message": "Uma notificação foi enviada para seu dispositivo."
@@ -2985,40 +3027,40 @@
     "message": "Uma notificação foi enviada para seu dispositivo"
   },
   "notificationSentDevicePart1": {
-    "message": "Desbloqueie o Bitwarden no seu dispositivo ou na "
+    "message": "Desbloqueie o Bitwarden no seu dispositivo ou no "
   },
   "notificationSentDeviceAnchor": {
     "message": "aplicativo web"
   },
   "notificationSentDevicePart2": {
-    "message": "Certifique-se de que a frase de biometria corresponde à frase abaixo antes de aprovar."
+    "message": "Certifique-se de que a frase biométrica corresponde à frase abaixo antes de aprovar."
   },
   "needAnotherOptionV1": {
     "message": "Precisa de outra opção?"
   },
   "fingerprintMatchInfo": {
-    "message": "Por favor, certifique-se de que o seu cofre esteja desbloqueado e a frase de identificação corresponda ao outro dispositivo."
+    "message": "Certifique-se de que o seu cofre esteja desbloqueado e a frase biométrica corresponda ao outro dispositivo."
   },
   "fingerprintPhraseHeader": {
-    "message": "Frase de identificação"
+    "message": "Frase biométrica"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "Você será notificado assim que a requisição for aprovada"
+    "message": "Você será notificado assim que a solicitação for aprovada"
   },
   "needAnotherOption": {
-    "message": "Login com dispositivo deve ser habilitado nas configurações do aplicativo móvel do Bitwarden. Necessita de outra opção?"
+    "message": "A autenticação com dispositivo deve ser ativada nas configurações do aplicativo móvel do Bitwarden. Precisa de outra opção?"
   },
   "viewAllLogInOptions": {
-    "message": "Ver todas as opções de login"
+    "message": "Ver todas as opções de autenticação"
   },
   "viewAllLoginOptions": {
-    "message": "Ver todas as opções de login"
+    "message": "Ver todas as opções de autenticação"
   },
   "resendNotification": {
     "message": "Reenviar notificação"
   },
   "toggleCharacterCount": {
-    "message": "Ativar/Desativar contagem de caracteres",
+    "message": "Habilitar contagem de caracteres",
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "accessAttemptBy": {
@@ -3031,7 +3073,7 @@
     }
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Solicitação de ‘login’ aprovada para $EMAIL$ em $DEVICE$",
+    "message": "Solicitação de autenticação aprovada para $EMAIL$ em $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3044,10 +3086,10 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "Você negou uma tentativa de 'login' por outro dispositivo. Se foi você, tente logar com outro dispositivo novamente."
+    "message": "Você negou uma tentativa de autenticação por outro dispositivo. Se foi você, tente conectar-se com o dispositivo novamente."
   },
   "webApp": {
-    "message": "Aplicativo da Web"
+    "message": "Aplicativo web"
   },
   "mobile": {
     "message": "Móvel",
@@ -3072,13 +3114,13 @@
     "message": "Servidor"
   },
   "loginRequest": {
-    "message": "Solicitação de 'Login'"
+    "message": "Solicitação de autenticação"
   },
   "deviceType": {
-    "message": "Tipo de dispositivo"
+    "message": "Tipo do dispositivo"
   },
   "ipAddress": {
-    "message": "Endereço IP"
+    "message": "Endereço de IP"
   },
   "time": {
     "message": "Horário"
@@ -3102,10 +3144,10 @@
     }
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "O pedido de login já expirou."
+    "message": "A solicitação de autenticação já expirou."
   },
   "thisRequestIsNoLongerValid": {
-    "message": "Este pedido não é mais válido."
+    "message": "Esta solicitação não é mais válida."
   },
   "confirmAccessAttempt": {
     "message": "Confirmar tentativa de acesso para $EMAIL$",
@@ -3126,40 +3168,40 @@
     "message": "Criando conta em"
   },
   "checkYourEmail": {
-    "message": "Verifique seu e-mail"
+    "message": "Confira seu e-mail"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Siga o link no e-mail enviado para"
+    "message": "Abra o link no e-mail enviado para"
   },
   "andContinueCreatingYourAccount": {
     "message": "e continue criando a sua conta."
   },
   "noEmail": {
-    "message": "Sem e-mail?"
+    "message": "Nenhum e-mail?"
   },
   "goBack": {
-    "message": "Voltar"
+    "message": "Volte"
   },
   "toEditYourEmailAddress": {
     "message": "para editar o seu endereço de e-mail."
   },
   "exposedMasterPassword": {
-    "message": "Senha Mestra comprometida"
+    "message": "Senha principal comprometida"
   },
   "exposedMasterPasswordDesc": {
     "message": "Senha encontrada em um vazamento de dados. Use uma senha única para proteger sua conta. Tem certeza de que deseja usar uma senha já exposta?"
   },
   "weakAndExposedMasterPassword": {
-    "message": "Senha Mestra Fraca e Comprometida"
+    "message": "Senha principal fraca e comprometida"
   },
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Senha fraca identificada e encontrada em um vazamento de dados. Use uma senha forte e única para proteger a sua conta. Tem certeza de que deseja usar essa senha?"
   },
   "checkForBreaches": {
-    "message": "Verificar vazamentos de dados conhecidos para esta senha"
+    "message": "Conferir vazamentos de dados conhecidos por esta senha"
   },
   "loggedInExclamation": {
-    "message": "Sessão Iniciada!"
+    "message": "Conectado!"
   },
   "important": {
     "message": "Importante:"
@@ -3168,16 +3210,16 @@
     "message": "Acessando"
   },
   "accessTokenUnableToBeDecrypted": {
-    "message": "Você foi desconectado porque seu token de acesso não pôde ser descriptografado. Por favor, faça o login novamente para resolver esse problema."
+    "message": "Você foi desconectado porque seu token de acesso não pôde ser descriptografado. Conecte-se novamente para resolver esse problema."
   },
   "refreshTokenSecureStorageRetrievalFailure": {
-    "message": "Você foi desconectado porque seu token de atualização não pôde ser recuperado. Por favor, faça o login novamente para resolver esse problema."
+    "message": "Você foi desconectado porque seu token de recarregamento não pôde ser recuperado. Conecte-se novamente para resolver esse problema."
   },
   "masterPasswordHint": {
-    "message": "A sua senha mestra não pode ser recuperada se você esquecê-la!"
+    "message": "A sua senha principal não pode ser recuperada se você esquecê-la!"
   },
   "characterMinimum": {
-    "message": "$LENGTH$ caracteres mínimos",
+    "message": "Mínimo de $LENGTH$ caracteres",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -3186,19 +3228,19 @@
     }
   },
   "windowsBiometricUpdateWarning": {
-    "message": "O Bitwarden recomenda a atualização das suas configurações de biometria para exigir a sua senha mestra (ou PIN) no primeiro desbloqueio. Gostaria de atualizar suas configurações agora?"
+    "message": "O Bitwarden recomenda a atualização das suas configurações de biometria para exigir a sua senha principal (ou PIN) no primeiro desbloqueio. Gostaria de atualizar suas configurações agora?"
   },
   "windowsBiometricUpdateWarningTitle": {
-    "message": "Atualização de configurações recomendadas"
+    "message": "Atualização recomendada das configurações"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Lembrar deste dispositivo para permanecer conectado"
+    "message": "Lembrar deste dispositivo para tornar futuras autenticações simples"
   },
   "deviceApprovalRequired": {
     "message": "Aprovação do dispositivo necessária. Selecione uma opção de aprovação abaixo:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "É necessária a aprovação do dispositivo"
+    "message": "Aprovação do dispositivo necessária"
   },
   "selectAnApprovalOptionBelow": {
     "message": "Selecione uma opção de aprovação abaixo"
@@ -3216,19 +3258,19 @@
     "message": "Solicitar aprovação do administrador"
   },
   "unableToCompleteLogin": {
-    "message": "Incapaz de completar o login"
+    "message": "Incapaz de concluir a autenticação"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
-    "message": "Você precisar entrar em um dispositivo confiável ou solicitar ao administrador que lhe atribua uma senha."
+    "message": "Você precisa se conectar com um dispositivo confiado ou solicitar ao administrador que lhe atribua uma senha."
   },
   "region": {
     "message": "Região"
   },
   "ssoIdentifierRequired": {
-    "message": "Identificador SSO da organização é necessário."
+    "message": "O identificador de SSO da organização é necessário."
   },
   "eu": {
-    "message": "Europa",
+    "message": "União Europeia",
     "description": "European Union"
   },
   "selfHostedServer": {
@@ -3244,25 +3286,25 @@
     "message": "Aprovação do administrador necessária"
   },
   "adminApprovalRequestSentToAdmins": {
-    "message": "Seu pedido foi enviado para seu administrador."
+    "message": "Sua solicitação foi enviada para seu administrador."
   },
   "troubleLoggingIn": {
-    "message": "Problemas em efetuar login?"
+    "message": "Problemas para acessar?"
   },
   "loginApproved": {
-    "message": "Login aprovado"
+    "message": "Autenticação aprovada"
   },
   "userEmailMissing": {
     "message": "E-mail do usuário ausente"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "E-mail de usuário ativo não encontrado. Desconectando."
+    "message": "E-mail do usuário ativo não encontrado. Desconectando você."
   },
   "deviceTrusted": {
-    "message": "Dispositivo confiável"
+    "message": "Dispositivo confiado"
   },
   "trustOrganization": {
-    "message": "Organização confiável"
+    "message": "Confiar organização"
   },
   "trust": {
     "message": "Confiar"
@@ -3271,19 +3313,19 @@
     "message": "Não confiar"
   },
   "organizationNotTrusted": {
-    "message": "Organização não confiável"
+    "message": "Organização não foi confiada"
   },
   "emergencyAccessTrustWarning": {
-    "message": "Para a segurança da sua conta, apenas confirme se você permitiu o acesso de emergência a esse usuário e se a impressão digital dele coincide com a que é exibida em sua conta"
+    "message": "Para a segurança da sua conta, apenas confirme se você permitiu o acesso de emergência a esse usuário e se a frase biométrica dele coincide com a que é exibida na conta deles"
   },
   "orgTrustWarning": {
-    "message": "Para a segurança da sua conta, prossiga apenas se você for um membro dessa organização, tem uma recuperação de conta ativa e a impressão digital exibida abaixo corresponde com a impressão digital da organização."
+    "message": "Para a segurança da sua conta, prossiga apenas se você for um membro dessa organização, tem uma recuperação de conta ativa e a frase biométrica exibida abaixo corresponde com a da organização."
   },
   "orgTrustWarning1": {
-    "message": "Esta organização tem uma política empresarial que lhe inscreverá na recuperação de conta. A matrícula permitirá que os administradores da organização alterem sua senha. Prossiga somente se você reconhecer esta organização e se a frase biométrica exibida abaixo corresponde com a impressão digital da organização."
+    "message": "Esta organização tem uma política empresarial que lhe inscreverá na recuperação de conta. A inscrição permitirá que os administradores da organização alterem sua senha. Prossiga somente se você reconhecer esta organização e se a frase biométrica exibida abaixo corresponde com a da organização."
   },
   "trustUser": {
-    "message": "Usuário confiável"
+    "message": "Confiar no usuário"
   },
   "inputRequired": {
     "message": "Entrada necessária."
@@ -3292,7 +3334,7 @@
     "message": "obrigatório"
   },
   "search": {
-    "message": "Pesquisar"
+    "message": "Buscar"
   },
   "inputMinLength": {
     "message": "A entrada deve ter pelo menos $COUNT$ caracteres.",
@@ -3331,7 +3373,7 @@
     }
   },
   "inputMaxValue": {
-    "message": "O valor de entrada não deve exceder $MAX$.",
+    "message": "O valor de entrada deve não exceder $MAX$.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -3365,16 +3407,16 @@
     "message": "-- Digite para filtrar --"
   },
   "multiSelectLoading": {
-    "message": "Carrgando Opções..."
+    "message": "Carrgando opções..."
   },
   "multiSelectNotFound": {
     "message": "Nenhum item encontrado"
   },
   "multiSelectClearAll": {
-    "message": "Limpar todos"
+    "message": "Limpar tudo"
   },
   "plusNMore": {
-    "message": "+ $QUANTITY$ mais",
+    "message": "+ mais $QUANTITY$",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -3386,7 +3428,7 @@
     "message": "Submenu"
   },
   "toggleSideNavigation": {
-    "message": "Ativar/desativar navegação lateral"
+    "message": "Habilitar navegação lateral"
   },
   "skipToContent": {
     "message": "Ir para o conteúdo"
@@ -3395,13 +3437,13 @@
     "message": "Chave de acesso"
   },
   "passkeyNotCopied": {
-    "message": "A senha não será copiada"
+    "message": "A chave de acesso não será copiada"
   },
   "passkeyNotCopiedAlert": {
-    "message": "A senha não será copiada para o item clonado. Deseja continuar clonando este item?"
+    "message": "A chave de acesso não será copiada para o item clonado. Deseja continuar clonando este item?"
   },
   "aliasDomain": {
-    "message": "Alias do domínio"
+    "message": "Domínio de alias"
   },
   "importData": {
     "message": "Importar dados",
@@ -3411,7 +3453,7 @@
     "message": "Erro ao importar"
   },
   "importErrorDesc": {
-    "message": "Houve um problema com os dados que você tentou importar. Por favor, resolva os erros listados abaixo em seu arquivo de origem e tente novamente."
+    "message": "Houve um problema com os dados que você tentou importar. Resolva os erros listados abaixo em seu arquivo de origem e tente novamente."
   },
   "resolveTheErrorsBelowAndTryAgain": {
     "message": "Resolva os erros abaixo e tente novamente."
@@ -3450,19 +3492,19 @@
     "message": "A autenticação em duas etapas do Duo é necessária para sua conta."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "A autenticação de dois fatores é necessária para sua conta. Siga os passos abaixo para conseguir entrar."
+    "message": "A autenticação de duas etapas do Duo é necessária para sua conta. Siga os passos abaixo para conseguir se conectar."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Siga os passos abaixo para finalizar o login."
+    "message": "Siga os passos abaixo para terminar de se conectar."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Siga os passos abaixo para finalizar o login com a sua chave de segurança."
+    "message": "Siga os passos abaixo para finalizar a autenticação com a sua chave de segurança."
   },
   "launchDuo": {
-    "message": "Iniciar o Duo no navegador"
+    "message": "Abrir o Duo no navegador"
   },
   "importFormatError": {
-    "message": "Os dados não estão formatados corretamente. Por favor, verifique o seu arquivo de importação e tente novamente."
+    "message": "Os dados não estão formatados corretamente. Verifique o seu arquivo de importação e tente novamente."
   },
   "importNothingError": {
     "message": "Nada foi importado."
@@ -3471,7 +3513,7 @@
     "message": "Erro ao descriptografar o arquivo exportado. Sua chave de criptografia não corresponde à chave de criptografia usada para exportar os dados."
   },
   "invalidFilePassword": {
-    "message": "Senha do arquivo inválida, por favor informe a senha utilizada quando criou o arquivo de exportação."
+    "message": "Senha do arquivo inválida, informe a senha utilizada quando criou o arquivo de exportação."
   },
   "destination": {
     "message": "Destino"
@@ -3483,13 +3525,13 @@
     "message": "Selecione uma pasta"
   },
   "selectImportCollection": {
-    "message": "Selecione uma coleção"
+    "message": "Selecione um conjunto"
   },
   "importTargetHintCollection": {
-    "message": "Selecione esta opção caso queira importar os conteúdos de arquivos movidos para a coleção"
+    "message": "Selecione esta opção caso queira importar os conteúdos do arquivo para um conjunto"
   },
   "importTargetHintFolder": {
-    "message": "Selecione esta opção caso queira importar os conteúdos de arquivos movidos para a pasta"
+    "message": "Selecione esta opção caso queira importar os conteúdos do arquivo para uma pasta"
   },
   "importUnassignedItemsError": {
     "message": "Arquivo contém itens não atribuídos."
@@ -3501,7 +3543,7 @@
     "message": "Selecione o arquivo de importação"
   },
   "chooseFile": {
-    "message": "Selecionar Arquivo"
+    "message": "Selecionar arquivo"
   },
   "noFileChosen": {
     "message": "Nenhum arquivo escolhido"
@@ -3510,7 +3552,7 @@
     "message": "ou copie/cole o conteúdo do arquivo de importação"
   },
   "instructionsFor": {
-    "message": "$NAME$ instruções",
+    "message": "Instruções para $NAME$",
     "description": "The title for the import tool instructions.",
     "placeholders": {
       "name": {
@@ -3523,7 +3565,7 @@
     "message": "Confirmar importação do cofre"
   },
   "confirmVaultImportDesc": {
-    "message": "Este arquivo é protegido por senha. Por favor, digite a senha do arquivo para importar os dados."
+    "message": "Este arquivo é protegido por senha. Digite a senha do arquivo para importar os dados."
   },
   "confirmFilePassword": {
     "message": "Confirmar senha do arquivo"
@@ -3538,7 +3580,7 @@
     "message": "Nenhum dado do LastPass encontrado"
   },
   "incorrectUsernameOrPassword": {
-    "message": "Nome de usuário ou senha incorretos"
+    "message": "Nome do usuário ou senha incorretos"
   },
   "incorrectPassword": {
     "message": "Senha incorreta"
@@ -3556,19 +3598,19 @@
     "message": "Incluir pastas compartilhadas"
   },
   "lastPassEmail": {
-    "message": "LastPass Email"
+    "message": "E-mail do LastPass"
   },
   "importingYourAccount": {
     "message": "Importando sua conta..."
   },
   "lastPassMFARequired": {
-    "message": "Requer autenticação multifatores do LastPass"
+    "message": "Requer autenticação de múltiplos fatores do LastPass"
   },
   "lastPassMFADesc": {
-    "message": "Digite sua senha única do app de autenticação"
+    "message": "Digite sua senha única do app autenticador"
   },
   "lastPassOOBDesc": {
-    "message": "Aprove a solicitação de login no seu aplicativo de autenticação ou insira código unico."
+    "message": "Aprove a solicitação de autenticação no seu aplicativo autenticador ou digite um código único."
   },
   "passcode": {
     "message": "Código"
@@ -3580,16 +3622,16 @@
     "message": "Autenticação do LastPass necessária"
   },
   "awaitingSSO": {
-    "message": "Aguardando autenticação SSO"
+    "message": "Aguardando autenticação do SSO"
   },
   "awaitingSSODesc": {
-    "message": "Por favor, continue a iniciar a sessão usando as credenciais da sua empresa."
+    "message": "Continue conectando-se usando as credenciais da sua empresa."
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "Importar diretamente do navegador"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "Perfil do navegador"
   },
   "seeDetailedInstructions": {
     "message": "Veja instruções detalhadas no nosso site de ajuda em",
@@ -3605,21 +3647,21 @@
     "message": "Tente novamente ou procure um e-mail do LastPass para verificar que é você."
   },
   "collection": {
-    "message": "Coleção"
+    "message": "Conjunto"
   },
   "lastPassYubikeyDesc": {
-    "message": "Insira a YubiKey associada com a sua conta do LastPass na porta USB do seu computador, e depois toque no botão dele."
+    "message": "Insira a YubiKey associada com a sua conta do LastPass na porta USB do seu computador, e depois toque no botão dela."
   },
   "commonImportFormats": {
     "message": "Formatos comuns",
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "Detecção de correspondência de URI é como o Bitwarden identifica sugestões de autopreenchimento.",
+    "message": "Detecção de correspondência de URI é como o Bitwarden identifica sugestões de preenchimento automático.",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
-    "message": "\"Expressão regular\" é uma opção avançada com maior risco de exposição de credenciais.",
+    "message": "\"Expressão regular\" é uma opção avançada com maior risco de exposição das credenciais.",
     "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
   },
   "startsWithAdvancedOptionWarning": {
@@ -3627,7 +3669,7 @@
     "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
   },
   "uriMatchWarningDialogLink": {
-    "message": "Mais sobre detecção de correspondências",
+    "message": "Mais sobre a detecção de correspondência",
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
@@ -3635,7 +3677,7 @@
     "description": "Advanced option placeholder for uri option component"
   },
   "warningCapitalized": {
-    "message": "Aviso",
+    "message": "Atenção",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "success": {
@@ -3651,19 +3693,19 @@
     "message": "Ativar aceleração de hardware e reiniciar"
   },
   "removePasskey": {
-    "message": "Remover senha"
+    "message": "Remover chave de acesso"
   },
   "passkeyRemoved": {
     "message": "Chave de acesso removida"
   },
   "errorAssigningTargetCollection": {
-    "message": "Erro ao atribuir coleção de destino."
+    "message": "Erro ao atribuir conjunto de destino."
   },
   "errorAssigningTargetFolder": {
     "message": "Erro ao atribuir pasta de destino."
   },
   "viewItemsIn": {
-    "message": "Visualizar itens em $NAME$",
+    "message": "Ver itens em $NAME$",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -3697,26 +3739,26 @@
     }
   },
   "data": {
-    "message": "Dado"
+    "message": "Dados"
   },
   "fileSends": {
-    "message": "Arquivos enviados"
+    "message": "Sends de arquivo"
   },
   "textSends": {
-    "message": "Texto enviado"
+    "message": "Sends de texto"
   },
   "ssoError": {
-    "message": "Nenhuma porta livre foi encontrada para o cliente final."
+    "message": "Nenhuma porta livre foi encontrada para a autenticação de SSO."
   },
   "securePasswordGenerated": {
     "message": "Senha segura gerada! Não esqueça de também atualizar a sua senha no site."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Usar o gerador",
+    "message": "Use o gerador",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "ppara criar uma senha única e segura",
+    "message": "para criar uma senha única e segura",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
@@ -3726,13 +3768,13 @@
     "message": "O desbloqueio por biometria está indisponível no momento."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "O desbloqueio por biometria está indisponível devido a algum erro na configuração dos arquivos de sistema."
+    "message": "O desbloqueio por biometria está indisponível devido a algum erro na configuração dos arquivos do sistema."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "O desbloqueio por biometria está indisponível devido a algum erro na configuração dos arquivos de sistema."
+    "message": "O desbloqueio por biometria está indisponível devido a algum erro na configuração dos arquivos do sistema."
   },
   "biometricsStatusHelptextNotEnabledLocally": {
-    "message": "O desbloqueio por biometria está indisponível, pois a opção não foi ativada no aplicativo de desktop de $EMAIL$.",
+    "message": "O desbloqueio por biometria está indisponível, pois a opção não foi ativada no aplicativo de computador de $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3750,7 +3792,7 @@
     "message": "Nome do item"
   },
   "loginCredentials": {
-    "message": "Credenciais de login"
+    "message": "Credenciais de acesso"
   },
   "additionalOptions": {
     "message": "Opções adicionais"
@@ -3762,7 +3804,7 @@
     "message": "Última edição"
   },
   "upload": {
-    "message": "Fazer upload"
+    "message": "Enviar"
   },
   "authorize": {
     "message": "Autorizar"
@@ -3777,7 +3819,7 @@
     "message": "Aviso: Encaminhamento de Agente"
   },
   "agentForwardingWarningText": {
-    "message": "Este pedido vem de um dispositivo remoto em que você está logado"
+    "message": "Esta solicitação vem de um dispositivo remoto em qual você está conectado"
   },
   "sshkeyApprovalMessageInfix": {
     "message": "está solicitando acesso para"
@@ -3789,13 +3831,13 @@
     "message": "autenticar em um servidor"
   },
   "sshActionSign": {
-    "message": "assine uma mensagem"
+    "message": "assinar uma mensagem"
   },
   "sshActionGitSign": {
-    "message": "assine um commit no git"
+    "message": "assinar uma commit no git"
   },
   "unknownApplication": {
-    "message": "Uma aplicação"
+    "message": "Um aplicativo"
   },
   "invalidSshKey": {
     "message": "A chave SSH é inválida"
@@ -3816,31 +3858,31 @@
     "message": "Permitir captura de tela"
   },
   "allowScreenshotsDesc": {
-    "message": "Permitir que a aplicação do Bitwarden seja capturada em capturas de tela e visualizada em sessões remotas no computador. Desabilitar isso impedirá acesso em algumas telas externas."
+    "message": "Permitir que o aplicativo do Bitwarden seja capturado em capturas de tela e visualizado em sessões remotas no computador. Desativar isso impede o acesso em algumas telas externas."
   },
   "confirmWindowStillVisibleTitle": {
     "message": "Confirmar janela ainda visível"
   },
   "confirmWindowStillVisibleContent": {
-    "message": "Por favor, confirme que a janela ainda está visível."
+    "message": "Confirme que a janela ainda está visível."
   },
   "updateBrowserOrDisableFingerprintDialogTitle": {
     "message": "Atualização de extensão necessária"
   },
   "updateBrowserOrDisableFingerprintDialogMessage": {
-    "message": "A extensão de navegador que você está usando está desatualizada. Atualize-a ou desabilite a validação de integração de impressão digital do navegador nas configurações do aplicativo da área de trabalho."
+    "message": "A extensão de navegador que você está usando está desatualizada. Atualize-a ou desative a validação da frase biométrica da integração do navegador nas configurações do aplicativo de computador."
   },
   "changeAtRiskPassword": {
-    "message": "Alterar senhas vulneráveis"
+    "message": "Alterar senhas em risco"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Esta credencial está em risco e está sem um site. Adicione um site e altere a senha para segurança melhor."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Site ausente"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "Você não pode remover coleções com permissões de Apenas visualização: $COLLECTIONS$",
+    "message": "Você não pode remover conjuntos com permissões de Apenas ver: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3858,38 +3900,38 @@
     "message": "Nome da pasta"
   },
   "folderHintText": {
-    "message": "Aninhe uma pasta adicionando o nome da pasta pai seguido de uma \"/\". Exemplo: Social/Fóruns"
+    "message": "Agrupe uma pasta adicionando o nome da pasta mãe seguido de uma \"/\". Exemplo: Social/Fóruns"
   },
   "sendsTitleNoItems": {
-    "message": "Enviar informações sensíveis com segurança",
+    "message": "Envie informações sensíveis com segurança",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Compartilhe dados e arquivos com segurança com qualquer pessoa ou plataforma. Suas informações permanecerão com criptografia de ponta a ponta, limitando exposições.",
+    "message": "Compartilhe dados e arquivos com segurança com qualquer pessoa, em qualquer plataforma. Suas informações permanecerão criptografadas de ponta a ponta, limitando a exposição.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "generatorNudgeTitle": {
-    "message": "Criação rápida de senhas"
+    "message": "Crie senhas de forma rápida"
   },
   "generatorNudgeBodyOne": {
-    "message": "Crie facilmente senhas únicas e fortes clicando em",
+    "message": "Crie senhas únicas e fortes com facilidade clicando em",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "para ajudá-lo a manter seus logins seguros.",
+    "message": "para ajudá-lo a manter suas credenciais seguras.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Crie facilmente senhas únicas e fortes clicando no botão Gerador de senhas para ajudá-lo a manter seus logins seguros.",
+    "message": "Crie senhas únicas e fortes com facilidade clicando no botão do Gerador de senhas para ajudá-lo a manter suas credenciais seguras.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
     "message": "Economize tempo com o preenchimento automático"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Incluir em",
+    "message": "Inclua um",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -3899,67 +3941,67 @@
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "assim este login aparece como uma sugestão de preenchimento automático.",
+    "message": "para que esta credencial apareça como uma sugestão de preenchimento automático.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Pagamento online simplificado"
+    "message": "Pagamento on-line simplificado"
   },
   "newCardNudgeBody": {
     "message": "Preencha automaticamente formulários de pagamento com cartões de forma segura e precisa."
   },
   "newIdentityNudgeTitle": {
-    "message": "Criação de contas simplificada"
+    "message": "Simplifique a criação de contas"
   },
   "newIdentityNudgeBody": {
-    "message": "Preencha automaticamente formulários longos de registro ou contato de forma rápida."
+    "message": "Preencha automaticamente formulários longos de cadastro ou contato de forma rápida."
   },
   "newNoteNudgeTitle": {
     "message": "Mantenha seus dados sensíveis seguros"
   },
   "newNoteNudgeBody": {
-    "message": "Com notas, armazena com segurança dados sensíveis como detalhes de informações bancárias ou de seguro."
+    "message": "Com anotações, armazene com segurança dados sensíveis como detalhes de informações bancárias ou de seguro."
   },
   "newSshNudgeTitle": {
     "message": "Acesso SSH amigável para desenvolvedores"
   },
   "newSshNudgeBodyOne": {
-    "message": "Armazena suas chaves e conecta com o agente SSH para uma autenticação rápida e criptografada.",
+    "message": "Armazene suas chaves e conecte com o agente SSH para uma autenticação rápida e criptografada.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Aprenda mais sobre o agente SSH",
+    "message": "Saiba mais sobre o agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Sobre esta configuração"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "O Bitwarden usará URIs de credenciais salvas para identificar qual ícone ou URL de mudança de senha deverá ser usado para melhorar sua experiência. Nenhuma informação é coletada ou salva quando você utiliza este serviço."
   },
   "assignToCollections": {
-    "message": "Atribuído a coleções"
+    "message": "Atribuir a conjuntos"
   },
   "assignToTheseCollections": {
-    "message": "Atribuído a essas coleções"
+    "message": "Atribuir a estes conjuntos"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Apenas membros da organização com acesso a essas coleções poderão ver o item."
+    "message": "Apenas membros da organização com acesso a estes conjuntos poderão ver o item."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Apenas membros da organização com acesso a essas coleções poderão ver os itens."
+    "message": "Apenas membros da organização com acesso a estes conjuntos poderão ver os itens."
   },
   "noCollectionsAssigned": {
-    "message": "Nenhuma coleção foi atribuída"
+    "message": "Nenhum conjunto foi atribuído"
   },
   "assign": {
     "message": "Atribuir"
   },
   "bulkCollectionAssignmentDialogDescription": {
-    "message": "Apenas membros da organização com acesso a essas coleções poderão ver os itens."
+    "message": "Apenas membros da organização com acesso a estes conjuntos poderão ver os itens."
   },
   "bulkCollectionAssignmentWarning": {
     "message": "Você selecionou $TOTAL_COUNT$ itens. Você não pode atualizar $READONLY_COUNT$ dos itens, pois você não tem as permissões de edição.",
@@ -3974,10 +4016,10 @@
     }
   },
   "selectCollectionsToAssign": {
-    "message": "Selecionar coleções para atribuir"
+    "message": "Selecione conjuntos a atribuir"
   },
   "personalItemsTransferWarning": {
-    "message": "$PERSONAL_ITEMS_COUNT$ serão permanentemente transferidas para a organização selecionada. Você deixará de ser o proprietário desses itens.",
+    "message": "$PERSONAL_ITEMS_COUNT$ serão permanentemente transferidos para a organização selecionada. Você deixará de ser o proprietário desses itens.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -3986,7 +4028,7 @@
     }
   },
   "personalItemsWithOrgTransferWarning": {
-    "message": "$PERSONAL_ITEMS_COUNT$ serão permanentemente transferidas para $ORG$. Você deixará de ser o proprietário desses itens.",
+    "message": "$PERSONAL_ITEMS_COUNT$ serão permanentemente transferidos para $ORG$. Você deixará de ser o proprietário desses itens.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -3999,10 +4041,10 @@
     }
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item será permanentemente transferido para a organização selecionada. Você deixará de ser o proprietário desse item."
+    "message": "Um item será permanentemente transferido para a organização selecionada. Você deixará de ser o proprietário desse item."
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item será permanentemente transferido para $ORG$. Você deixará de ser o proprietário desse item.",
+    "message": "Um item será permanentemente transferido para $ORG$. Você deixará de ser o proprietário desse item.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -4011,7 +4053,7 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Coleções atribuídas com sucesso"
+    "message": "Conjuntos atribuídos com sucesso"
   },
   "nothingSelected": {
     "message": "Você não selecionou nada."
@@ -4080,59 +4122,106 @@
   "showLess": {
     "message": "Mostrar menos"
   },
-  "enableAutotype": {
-    "message": "Habilitar Autotype"
-  },
   "enableAutotypeDescription": {
-    "message": "Bitwarden não valida localizações de entrada, tenha certeza de estar na janela e campo corretos antes de utilizar o atalho."
+    "message": "O Bitwarden não valida localizações de entrada, tenha certeza de estar na janela e campo corretos antes de utilizar o atalho."
+  },
+  "typeShortcut": {
+    "message": "Atalho de digitação"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Inclua um ou dois dos seguintes modificadores: Ctrl, Alt, Win, ou Shift, e uma letra."
+  },
+  "invalidShortcut": {
+    "message": "Atalho inválido"
   },
   "moreBreadcrumbs": {
     "message": "Mais trilhas",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "next": {
-    "message": "Next"
+    "message": "Avançar"
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Confirmar domínio do Key Connector"
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "Confirmar"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Ativar atalho de digitação automática (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
+  "enableAutotypeShortcutDescription": {
+    "message": "Certifique-se que está no campo correto antes de usar o atalho para evitar preencher dados no lugar errado."
   },
   "editShortcut": {
-    "message": "Edit shortcut"
+    "message": "Editar atalho"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Desarquivar"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Itens no arquivo"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Nenhum item no arquivo"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Os itens arquivados aparecerão aqui e serão excluídos dos resultados gerais de busca e das sugestões de preenchimento automático."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "O item foi enviado para o arquivo"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "O item foi desarquivado"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Arquivar item"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Itens arquivados são excluídos dos resultados gerais de busca e das sugestões de preenchimento automático. Tem certeza de que deseja arquivar este item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "CEP / Código postal"
+  },
+  "cardNumberLabel": {
+    "message": "Número do cartão"
+  },
+  "upgradeNow": {
+    "message": "Faça upgrade agora"
+  },
+  "builtInAuthenticator": {
+    "message": "Autenticador integrado"
+  },
+  "secureFileStorage": {
+    "message": "Armazenamento seguro de arquivos"
+  },
+  "emergencyAccess": {
+    "message": "Acesso de emergência"
+  },
+  "breachMonitoring": {
+    "message": "Monitoramento de vazamentos"
+  },
+  "andMoreFeatures": {
+    "message": "E mais!"
+  },
+  "planDescPremium": {
+    "message": "Segurança on-line completa"
+  },
+  "upgradeToPremium": {
+    "message": "Faça upgrade para o Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Ação do tempo limite"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Tempo limite da sessão"
   }
 }
diff --git a/apps/desktop/src/locales/pt_PT/messages.json b/apps/desktop/src/locales/pt_PT/messages.json
index 49573dcd647..de0427ddab0 100644
--- a/apps/desktop/src/locales/pt_PT/messages.json
+++ b/apps/desktop/src/locales/pt_PT/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Não tem permissão para editar este item"
+  },
   "welcomeBack": {
     "message": "Bem-vindo de volta"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Utilizar início de sessão único"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A sua organização exige o início de sessão único."
+  },
   "submit": {
     "message": "Submeter"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Deve adicionar o URL do servidor de base ou pelo menos um ambiente personalizado."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Os URLs devem usar HTTPS."
+  },
   "customEnvironment": {
     "message": "Ambiente personalizado"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Palavra-passe mestra inválida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Palavra-passe mestra inválida. Confirme se o seu e-mail está correto e se a sua conta foi criada em $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "A verificação de dois passos torna a sua conta mais segura, exigindo que verifique o seu início de sessão com outro dispositivo, como uma chave de segurança, aplicação de autenticação, SMS, chamada telefónica ou e-mail. A verificação de dois passos pode ser configurada em bitwarden.com. Pretende visitar o site agora?"
   },
@@ -1283,7 +1301,7 @@
     "message": "Na suspensão do sistema"
   },
   "onLocked": {
-    "message": "No bloqueio do sistema"
+    "message": "Ao bloquear o sistema"
   },
   "onRestart": {
     "message": "Ao reiniciar"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Bloquear com a palavra-passe mestra ao reiniciar"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Exigir a palavra-passe mestra ou PIN ao reiniciar a app"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Exigir a palavra-passe mestra ao reiniciar a app"
+  },
   "deleteAccount": {
     "message": "Eliminar conta"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Ocorreu um erro ao ativar a integração do navegador."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Infelizmente, a integração do navegador só é suportada na versão da Mac App Store por enquanto."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Infelizmente, a integração do navegador não é atualmente suportada na versão da Microsoft Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "O tempo limite mínimo personalizado é de 1 minuto."
+  },
   "inviteAccepted": {
     "message": "Convite aceite"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado a $ORGANIZATION$ será exportado.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado a $ORGANIZATION$ será exportado. As coleções dos meus itens não serão incluídas.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Bloqueado"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Mostrar menos"
   },
-  "enableAutotype": {
-    "message": "Ativar digitação automática"
-  },
   "enableAutotypeDescription": {
     "message": "O Bitwarden não valida a introdução de localizações. Certifique-se de que está na janela e no campo corretos antes de utilizar o atalho."
   },
+  "typeShortcut": {
+    "message": "Introduzir atalho"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Inclua um ou dois dos seguintes modificadores: Ctrl, Alt, Win, ou Shift, e uma letra."
+  },
+  "invalidShortcut": {
+    "message": "Atalho inválido"
+  },
   "moreBreadcrumbs": {
     "message": "Mais da navegação estrutural",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirmar"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Ativar o atalho de introdução automática"
+  "enableAutotypeShortcutPreview": {
+    "message": "Ativar o atalho de digitação automática (Pré-visualização da funcionalidade)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Certifique-se de que está no campo correto antes de utilizar o atalho para evitar preencher dados no local errado."
   },
   "editShortcut": {
     "message": "Editar atalho"
   },
-  "archive": {
-    "message": "Arquivar"
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Desarquivar"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Os itens arquivados aparecerão aqui e serão excluídos dos resultados gerais da pesquisa e das sugestões de preenchimento automático."
   },
-  "itemSentToArchive": {
-    "message": "Item movido para o arquivo"
+  "itemWasSentToArchive": {
+    "message": "O item foi movido para o arquivo"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removido do arquivo"
+  "itemWasUnarchived": {
+    "message": "O item foi desarquivado"
   },
   "archiveItem": {
     "message": "Arquivar item"
   },
   "archiveItemConfirmDesc": {
     "message": "Os itens arquivados são excluídos dos resultados gerais da pesquisa e das sugestões de preenchimento automático. Tem a certeza de que pretende arquivar este item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Código postal"
+  },
+  "cardNumberLabel": {
+    "message": "Número do cartão"
+  },
+  "upgradeNow": {
+    "message": "Atualizar agora"
+  },
+  "builtInAuthenticator": {
+    "message": "Autenticador incorporado"
+  },
+  "secureFileStorage": {
+    "message": "Armazenamento seguro de ficheiros"
+  },
+  "emergencyAccess": {
+    "message": "Acesso de emergência"
+  },
+  "breachMonitoring": {
+    "message": "Monitorização de violações"
+  },
+  "andMoreFeatures": {
+    "message": "E muito mais!"
+  },
+  "planDescPremium": {
+    "message": "Segurança total online"
+  },
+  "upgradeToPremium": {
+    "message": "Atualizar para o Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Ação de tempo limite"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Tempo limite da sessão"
   }
 }
diff --git a/apps/desktop/src/locales/ro/messages.json b/apps/desktop/src/locales/ro/messages.json
index 802afc3ef22..a72ce3547e9 100644
--- a/apps/desktop/src/locales/ro/messages.json
+++ b/apps/desktop/src/locales/ro/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Trimitere"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Mediu personalizat"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Parolă principală incorectă"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Autentificarea în două etape vă face contul mai sigur, cerându-vă să vă verificați autentificarea cu un alt dispozitiv, cum ar fi o cheie de securitate, o aplicație de autentificare, un SMS, un apel telefonic sau un e-mail. Autentificarea în două etape poate fi configurată pe seiful web bitwarden.com. Doriți să vizitați site-ul web acum?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Ștergere cont"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Din păcate, integrarea browserului este acceptată numai în versiunea Mac App Store pentru moment."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Din păcate, integrarea browserului nu este susținută în prezent în versiunea Microsoft Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Blocat"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/ru/messages.json b/apps/desktop/src/locales/ru/messages.json
index 292564be5f3..914bb603630 100644
--- a/apps/desktop/src/locales/ru/messages.json
+++ b/apps/desktop/src/locales/ru/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "У вас нет разрешения на редактирование этого элемента"
+  },
   "welcomeBack": {
     "message": "С возвращением"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Использовать единый вход"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Отправить"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Вы должны добавить либо базовый URL сервера, либо хотя бы одно пользовательское окружение."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL должны использовать HTTPS."
+  },
   "customEnvironment": {
     "message": "Пользовательское окружение"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Неверный мастер-пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неверный мастер-пароль. Подтвердите, что ваш адрес email указан верно и ваш аккаунт был создан на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Двухэтапная аутентификация делает аккаунт более защищенным, поскольку требуется подтверждение входа при помощи другого устройства, например, ключа безопасности, приложения-аутентификатора, SMS, телефонного звонка или электронной почты. Двухэтапная аутентификация включается на bitwarden.com. Перейти на сайт сейчас?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Блокировать мастер-паролем при перезапуске"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Требовать мастер-пароль или PIN при перезапуске приложения"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Требовать мастер-пароль при перезапуске приложения"
+  },
   "deleteAccount": {
     "message": "Удалить аккаунт"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Произошла ошибка при включении интеграции с браузером."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "К сожалению, интеграция браузера пока поддерживается только в версии Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "К сожалению, интеграция браузера в версии для Microsoft Store в настоящее время не поддерживается."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Минимальный пользовательский тайм-аут составляет 1 минуту."
+  },
   "inviteAccepted": {
     "message": "Приглашение принято"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$. Коллекции Мои элементы включены не будут.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Заблокировано"
   },
@@ -3834,7 +3876,7 @@
     "message": "Изменить пароль, подверженный риску"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "Этот логин находится под угрозой и у него отсутствует веб-сайт. Добавьте веб-сайт и смените пароль для большей безопасности."
+    "message": "Этот логин подвержен риску и у него отсутствует веб-сайт. Добавьте веб-сайт и смените пароль для большей безопасности."
   },
   "missingWebsite": {
     "message": "Отсутствует сайт"
@@ -4080,14 +4122,20 @@
   "showLess": {
     "message": "Меньше"
   },
-  "enableAutotype": {
-    "message": "Включить автоввод"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden не проверяет местоположение ввода, поэтому, прежде чем использовать ярлык, убедитесь, что вы находитесь в нужном окне и поле."
   },
+  "typeShortcut": {
+    "message": "Введите сочетание клавиш"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Включите один или два из следующих модификаторов: Ctrl, Alt, Win или Shift и букву."
+  },
+  "invalidShortcut": {
+    "message": "Недопустимое сочетание клавиш"
+  },
   "moreBreadcrumbs": {
-    "message": "Больше хлебных крошек",
+    "message": "Дополнительная навигация",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "next": {
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Подтвердить"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Включить ярлык автоввода"
+  "enableAutotypeShortcutPreview": {
+    "message": "Включить сочетание клавиш ввода (предварительная версия функции)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Прежде чем использовать ярлык, убедитесь, что вы поставили курсор в нужное поле, чтобы избежать ввода данных в неправильное место."
   },
   "editShortcut": {
     "message": "Изменить ярлык"
   },
-  "archive": {
-    "message": "Архив"
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Архивировать",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Разархивировать"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Архивированные элементы появятся здесь и будут исключены из общих результатов поиска и предложений автозаполнения."
   },
-  "itemSentToArchive": {
-    "message": "Элемент отправлен в архив"
+  "itemWasSentToArchive": {
+    "message": "Элемент был отправлен в архив"
   },
-  "itemRemovedFromArchive": {
-    "message": "Элемент удален из архива"
+  "itemWasUnarchived": {
+    "message": "Элемент был разархивирован"
   },
   "archiveItem": {
     "message": "Архивировать элемент"
   },
   "archiveItemConfirmDesc": {
     "message": "Архивированные элементы исключены из общих результатов поиска и предложений автозаполнения. Вы уверены, что хотите архивировать этот элемент?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Почтовый индекс"
+  },
+  "cardNumberLabel": {
+    "message": "Номер карты"
+  },
+  "upgradeNow": {
+    "message": "Изменить сейчас"
+  },
+  "builtInAuthenticator": {
+    "message": "Встроенный аутентификатор"
+  },
+  "secureFileStorage": {
+    "message": "Защищенное хранилище файлов"
+  },
+  "emergencyAccess": {
+    "message": "Экстренный доступ"
+  },
+  "breachMonitoring": {
+    "message": "Мониторинг нарушений"
+  },
+  "andMoreFeatures": {
+    "message": "И многое другое!"
+  },
+  "planDescPremium": {
+    "message": "Полная онлайн-защищенность"
+  },
+  "upgradeToPremium": {
+    "message": "Обновить до Премиум"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Тайм-аут действия"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Тайм-аут сеанса"
   }
 }
diff --git a/apps/desktop/src/locales/si/messages.json b/apps/desktop/src/locales/si/messages.json
index 8d4072e1da2..a83b2cbf536 100644
--- a/apps/desktop/src/locales/si/messages.json
+++ b/apps/desktop/src/locales/si/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/sk/messages.json b/apps/desktop/src/locales/sk/messages.json
index 566b9b8210a..0b14b961bbb 100644
--- a/apps/desktop/src/locales/sk/messages.json
+++ b/apps/desktop/src/locales/sk/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Na úpravu tejto položky nemáte oprávnenie"
+  },
   "welcomeBack": {
     "message": "Vitajte späť"
   },
@@ -131,7 +134,7 @@
     "message": "Spustiť"
   },
   "copyValue": {
-    "message": "Skopírovať hodnotu",
+    "message": "Kopírovať hodnotu",
     "description": "Copy value to clipboard"
   },
   "minimizeOnCopyToClipboard": {
@@ -144,7 +147,7 @@
     "message": "Prepnúť viditeľnosť"
   },
   "toggleCollapse": {
-    "message": "Prepnúť zloženie",
+    "message": "Prepnúť zbalenie",
     "description": "Toggling an expand/collapse state."
   },
   "cardholderName": {
@@ -364,7 +367,7 @@
     "message": "Krstné meno"
   },
   "middleName": {
-    "message": "Druhé meno"
+    "message": "Stredné meno"
   },
   "lastName": {
     "message": "Priezvisko"
@@ -409,7 +412,7 @@
     "message": "Upraviť"
   },
   "authenticatorKeyTotp": {
-    "message": "Kľúč overovateľa (TOTP)"
+    "message": "Overovací kľúč (TOTP)"
   },
   "authenticatorKey": {
     "message": "Overovací kľúč"
@@ -514,10 +517,10 @@
     "message": "Meno je povinné."
   },
   "addedItem": {
-    "message": "Položka pridaná"
+    "message": "Položka bola pridaná"
   },
   "editedItem": {
-    "message": "Položka upravená"
+    "message": "Položka bola uložená"
   },
   "deleteItem": {
     "message": "Odstrániť položku"
@@ -557,7 +560,7 @@
     "message": "Vygenerovať nové heslo"
   },
   "copyPassword": {
-    "message": "Skopírovať heslo"
+    "message": "Kopírovať heslo"
   },
   "regenerateSshKey": {
     "message": "Generovať nový kľúč SSH"
@@ -659,10 +662,10 @@
     "message": "Zavrieť"
   },
   "minNumbers": {
-    "message": "Minimálny počet číslic"
+    "message": "Minimum číslic"
   },
   "minSpecial": {
-    "message": "Minimum špeciálnych",
+    "message": "Minimum špeciálnych znakov",
     "description": "Minimum Special Characters"
   },
   "ambiguous": {
@@ -687,20 +690,20 @@
     "message": "Hľadať v obľúbených"
   },
   "searchType": {
-    "message": "Search type",
+    "message": "Typ vyhľadávania",
     "description": "Search item type"
   },
   "newAttachment": {
     "message": "Pridať novú prílohu"
   },
   "deletedAttachment": {
-    "message": "Príloha odstránená"
+    "message": "Príloha bola odstránená"
   },
   "deleteAttachmentConfirmation": {
     "message": "Naozaj chcete odstrániť prílohu?"
   },
   "attachmentSaved": {
-    "message": "Príloha bola uložená."
+    "message": "Príloha bola uložená"
   },
   "addAttachment": {
     "message": "Priložiť prílohu"
@@ -712,7 +715,7 @@
     "message": "Súbor"
   },
   "selectFile": {
-    "message": "Vybrať súbor."
+    "message": "Vyberte súbor"
   },
   "maxFileSize": {
     "message": "Maximálna veľkosť súboru je 500 MB."
@@ -721,16 +724,16 @@
     "message": "Staršie šifrovanie už nie je podporované. Ak chcete obnoviť svoj účet, obráťte sa na podporu."
   },
   "editedFolder": {
-    "message": "Priečinok upravený"
+    "message": "Priečinok bol upravený"
   },
   "addedFolder": {
-    "message": "Priečinok pridaný"
+    "message": "Priečinok bol pridaný"
   },
   "deleteFolderConfirmation": {
     "message": "Naozaj chcete odstrániť tento priečinok?"
   },
   "deletedFolder": {
-    "message": "Priečinok odstránený"
+    "message": "Priečinok bol odstránený"
   },
   "loginOrCreateNewAccount": {
     "message": "Prihláste sa alebo si vytvorte nový účet, aby ste mohli pristupovať k vášmu bezpečnému trezoru."
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Použiť jednotné prihlásenie"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Vaša organizácia vyžaduje jednotné prihlasovanie."
+  },
   "submit": {
     "message": "Potvrdiť"
   },
@@ -955,7 +961,7 @@
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Použiť obnovovací kód"
+    "message": "Použiť kód na obnovenie"
   },
   "insertU2f": {
     "message": "Vložte váš bezpečnostný kľúč do USB portu počítača. Ak má tlačidlo, stlačte ho."
@@ -981,7 +987,7 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Overiť sa prostredníctvom Duo Security vašej organizácie použitím Duo Mobile aplikácie, SMS, telefonátu alebo U2F bezpečnostným kľúčom.",
+    "message": "Overenie pomocou Duo Security pre vašu organizáciu pomocou aplikácie Duo Mobile, SMS, telefonického hovoru alebo bezpečnostného kľúča U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "verifyYourIdentity": {
@@ -997,7 +1003,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "Použiť akýkoľvek WebAuthn bezpečnostný kľúč pre prístup k vášmu účtu."
+    "message": "Použite akýkoľvek kompatibilný bezpečnostný kľúč WebAuthn na prístup k svojmu účtu."
   },
   "emailTitle": {
     "message": "E-mail"
@@ -1006,7 +1012,7 @@
     "message": "Zadajte kód zaslaný na váš e-mail."
   },
   "loginUnavailable": {
-    "message": "Prihlásenie nedostupné"
+    "message": "Prihlásenie nie je dostupné"
   },
   "noTwoStepProviders": {
     "message": "Tento účet má povolené dvojstupňové prihlásenie, ale žiadny z nakonfigurovaných poskytovateľov nie je podporovaný na tomto zariadení."
@@ -1021,7 +1027,7 @@
     "message": "Vyberte metódu dvojstupňového prihlásenia"
   },
   "selfHostedEnvironment": {
-    "message": "Prevádzkované vo vlastnom prostredí"
+    "message": "Prostredie s vlastným hostingom"
   },
   "selfHostedBaseUrlHint": {
     "message": "Zadajte základnú URL adresu lokálne hosťovanej inštalácie Bitwarden. Napríklad: https://bitwarden.company.com"
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Musíte pridať buď základnú adresu URL servera, alebo aspoň jedno vlastné prostredie."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Adresy URL musia používať HTTPS."
+  },
   "customEnvironment": {
     "message": "Vlastné prostredie"
   },
@@ -1058,13 +1067,13 @@
     "message": "URL servera identít"
   },
   "notificationsUrl": {
-    "message": "URL adresa servera pre oznámenia"
+    "message": "URL servera pre upozornenia"
   },
   "iconsUrl": {
     "message": "URL servera ikon"
   },
   "environmentSaved": {
-    "message": "URL prostredia boli uložené."
+    "message": "URL adresy prostredia boli uložené"
   },
   "ok": {
     "message": "Ok"
@@ -1115,10 +1124,10 @@
     "message": "Odhlásiť sa"
   },
   "addNewLogin": {
-    "message": "Pridať nové prihlasovacie údaje"
+    "message": "Nové prihlasovacie údaje"
   },
   "addNewItem": {
-    "message": "Pridať novú položku"
+    "message": "Nová položka"
   },
   "view": {
     "message": "Zobraziť"
@@ -1154,7 +1163,7 @@
     "message": "Sledujte nás"
   },
   "syncVault": {
-    "message": "Synchronizovať trezor teraz"
+    "message": "Synchronizovať trezor"
   },
   "changeMasterPass": {
     "message": "Zmeniť hlavné heslo"
@@ -1166,7 +1175,7 @@
     "message": "Hlavné heslo si môžete zmeniť vo webovej aplikácii Bitwarden."
   },
   "fingerprintPhrase": {
-    "message": "Fráza odtlačku",
+    "message": "Jedinečný identifikátor",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
@@ -1177,13 +1186,13 @@
     "message": "Prejsť do webového trezora"
   },
   "getMobileApp": {
-    "message": "Získajte mobilnú aplikáciu"
+    "message": "Získať mobilnú aplikáciu"
   },
   "getBrowserExtension": {
     "message": "Získať rozšírenie pre prehliadač"
   },
   "syncingComplete": {
-    "message": "Synchronizácia dokončená"
+    "message": "Synchronizácia bola dokončená"
   },
   "syncingFailed": {
     "message": "Synchronizácia zlyhala"
@@ -1222,8 +1231,17 @@
   "invalidMasterPassword": {
     "message": "Neplatné hlavné heslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Neplatné hlavné heslo. Potvrďte, že váš e-mail je správny a účet bol vytvorený na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
-    "message": "Dvojstupňové prihlasovanie robí váš účet bezpečnejším vďaka vyžadovaniu bezpečnostného kódu z overovacej aplikácie vždy, keď sa prihlásite. Dvojstupňové prihlasovanie môžete povoliť vo webovom trezore bitwarden.com. Chcete teraz navštíviť túto stránku?"
+    "message": "Dvojstupňové prihlásenie zvyšuje bezpečnosť vášho účtu tým, že vyžaduje overenie prihlásenia pomocou iného zariadenia, napríklad bezpečnostného kľúča, overovacej aplikácie, SMS, telefonického hovoru alebo e-mailu. Dvojstupňové prihlásenie môžete nastaviť na bitwarden.com. Chcete stránku navštíviť teraz?"
   },
   "twoStepLogin": {
     "message": "Dvojstupňové prihlásenie"
@@ -1330,7 +1348,7 @@
     "message": "Namiesto zatvorenia okna zobraziť ikonu na paneli úloh."
   },
   "enableTray": {
-    "message": "Povoliť ikonu na systémovej lište"
+    "message": "Povoliť ikonu na paneli úloh"
   },
   "enableTrayDesc": {
     "message": "Vždy zobraziť ikonu na systémovej lište."
@@ -1402,7 +1420,7 @@
     }
   },
   "restartToUpdate": {
-    "message": "Reštartovať pre dokončenie aktualizácie"
+    "message": "Reštartovať na dokončenie aktualizácie"
   },
   "restartToUpdateDesc": {
     "message": "Verzia $VERSION_NUM$ je pripravená na inštaláciu. Je nutné reštartovať aplikáciu, aby sa inštalácia mohla dokončiť. Chcete ju reštartovať a aktualizovať teraz?",
@@ -1467,7 +1485,7 @@
     "message": "Momentálne nie ste prémiovým členom."
   },
   "premiumSignUpAndGet": {
-    "message": "Zaregistrujte sa pre prémiové členstvo a získajte:"
+    "message": "Zaregistrujte sa na prémiové členstvo a získajte:"
   },
   "premiumSignUpStorage": {
     "message": "1 GB šifrovaného úložiska."
@@ -1509,7 +1527,7 @@
     }
   },
   "refreshComplete": {
-    "message": "Obnova kompletná"
+    "message": "Obnova bola dokončená"
   },
   "passwordHistory": {
     "message": "História hesla"
@@ -1554,7 +1572,7 @@
     "description": "Paste from clipboard"
   },
   "selectAll": {
-    "message": "Označiť všetko"
+    "message": "Vybrať Všetko"
   },
   "zoomIn": {
     "message": "Priblížiť"
@@ -1563,7 +1581,7 @@
     "message": "Oddialiť"
   },
   "resetZoom": {
-    "message": "Obnoviť pôvodné zobrazenie"
+    "message": "Obnoviť priblíženie"
   },
   "toggleFullScreen": {
     "message": "Prepnúť na celú obrazovku"
@@ -1572,7 +1590,7 @@
     "message": "Znovu načítať"
   },
   "toggleDevTools": {
-    "message": "Prepnúť vývojárske nástroje"
+    "message": "Prepnúť nástroje pre vývojárov"
   },
   "minimize": {
     "message": "Minimalizovať",
@@ -1582,7 +1600,7 @@
     "message": "Priblíženie"
   },
   "bringAllToFront": {
-    "message": "Preniesť všetko dopredu",
+    "message": "Presunúť všetko dopredu",
     "description": "Bring all windows to front (foreground)"
   },
   "aboutBitwarden": {
@@ -1674,7 +1692,7 @@
     "description": "Default URI match detection for auto-fill."
   },
   "toggleOptions": {
-    "message": "Voľby prepínača"
+    "message": "Zobraziť/skryť možnosti"
   },
   "organization": {
     "message": "Organizácia",
@@ -1716,7 +1734,7 @@
     "message": "Export trezoru"
   },
   "fileFormat": {
-    "message": "Formát Súboru"
+    "message": "Formát súboru"
   },
   "fileEncryptedExportWarningDesc": {
     "message": "Tento exportovaný súbor bude chránený heslom a na dešifrovanie bude potrebné heslo súboru."
@@ -1838,11 +1856,17 @@
     "message": "odomknúť svoj trezor"
   },
   "autoPromptTouchId": {
-    "message": "Pri spustení požiadať o Touch ID"
+    "message": "Pri spustení aplikácie požiadať o Touch ID"
   },
   "lockWithMasterPassOnRestart1": {
     "message": "Pri reštarte zamknúť hlavným heslom"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Pri reštarte aplikácie vyžadovať hlavné heslo alebo PIN"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Pri reštarte aplikácie vyžadovať hlavné heslo"
+  },
   "deleteAccount": {
     "message": "Odstrániť účet"
   },
@@ -1880,7 +1904,7 @@
     "message": "Musíte vybrať aspoň jednu zbierku."
   },
   "premiumUpdated": {
-    "message": "Povýšili ste na prémium."
+    "message": "Upgradovali ste na Prémium."
   },
   "restore": {
     "message": "Obnoviť"
@@ -1940,10 +1964,10 @@
     "message": "Naozaj chcete natrvalo odstrániť túto položku?"
   },
   "permanentlyDeletedItem": {
-    "message": "Položka natrvalo odstránená"
+    "message": "Položka bola natrvalo odstránená"
   },
   "restoredItem": {
-    "message": "Obnovená položka"
+    "message": "Položka bola obnovená"
   },
   "permanentlyDelete": {
     "message": "Natrvalo odstrániť"
@@ -2115,7 +2139,7 @@
     "message": "Povoliť integráciu prehliadača DuckDuckGo"
   },
   "enableDuckDuckGoBrowserIntegrationDesc": {
-    "message": "Používajte svoj trezor Bitwarden pri prehliadaní pomocou DuckDuckGo."
+    "message": "Používajte svoj trezor v Bitwardene pri prehliadaní pomocou DuckDuckGo."
   },
   "browserIntegrationUnsupportedTitle": {
     "message": "Integrácia v prehliadači nie je podporovaná"
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Pri povoľovaní integrácie v prehliadači sa vyskytla chyba."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Bohužiaľ, integrácia v prehliadači je zatiaľ podporovaná iba vo verzii Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Bohužiaľ, integrácia v prehliadači zatiaľ nie je podporovaná, ak je aplikácia nainštalovaná cez Microsoft Store."
   },
@@ -2157,7 +2178,7 @@
     "message": "Uistite sa, že zobrazený odtlačok prsta je identický s odtlačkom prsta zobrazeným v rozšírení prehliadača."
   },
   "verifyNativeMessagingConnectionTitle": {
-    "message": "$APPID$ sa chce pripojiť k Bitwarden",
+    "message": "$APPID$ sa chce pripojiť k Bitwardenu",
     "placeholders": {
       "appid": {
         "content": "$1",
@@ -2184,7 +2205,7 @@
     "message": "Vzhľadom na spôsob inštalácie nebolo možné automaticky povoliť podporu biometrie. Chcete otvoriť dokumentáciu, ako to urobiť manuálne?"
   },
   "personalOwnershipSubmitError": {
-    "message": "Z dôvodu podnikovej politiky máte obmedzené ukladanie položiek do osobného trezora. Zmeňte možnosť vlastníctvo na organizáciu a vyberte si z dostupných zbierok."
+    "message": "Z dôvodu podnikových pravidiel máte obmedzené ukladanie položiek do osobného trezora. Zmeňte možnosť vlastníctvo na organizáciu a vyberte si z dostupných zbierok."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
     "message": "Nové heslo nemôže byť rovnaké ako súčasné heslo."
@@ -2281,15 +2302,15 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Send vytvorený",
+    "message": "Send bol vytvorený",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Send upravený",
+    "message": "Send bol upravený",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletedSend": {
-    "message": "Send odstránený",
+    "message": "Send bol odstránený",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "newPassword": {
@@ -2300,7 +2321,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Vytvoriť Send",
+    "message": "Nový Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTextDesc": {
@@ -2336,7 +2357,7 @@
     "message": "Kopírovať odkaz na zdieľanie tohto Sendu do schránky počas ukladania."
   },
   "sendDisabled": {
-    "message": "Funkcia Send zakázaná",
+    "message": "Send bol odstránený",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
@@ -2404,7 +2425,7 @@
     "message": "Hlavné heslo bolo úspešne nastavené"
   },
   "updatedMasterPassword": {
-    "message": "Hlavné heslo aktualizované"
+    "message": "Hlavné heslo bolo aktualizované"
   },
   "updateMasterPassword": {
     "message": "Aktualizovať hlavné heslo"
@@ -2455,7 +2476,7 @@
     "message": "Použiť PIN kód"
   },
   "useBiometrics": {
-    "message": "Použiť biometrické údaje"
+    "message": "Použiť biometriu"
   },
   "enterVerificationCodeSentToEmail": {
     "message": "Zadajte overovací kód, ktorý vám bol zaslaný na e-mail."
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimálny vlastný časový limit je 1 minúta."
+  },
   "inviteAccepted": {
     "message": "Pozvánka prijatá"
   },
@@ -2550,7 +2574,7 @@
     "message": "Táto organizácia má podnikovú politiku, ktorá vás automaticky zaregistruje na obnovenie hesla. Registrácia umožní správcom organizácie zmeniť vaše hlavné heslo."
   },
   "vaultExportDisabled": {
-    "message": "Export trezoru je zakázaný"
+    "message": "Export trezoru bol odstránený"
   },
   "personalVaultExportPolicyInEffect": {
     "message": "Jedna alebo viacero zásad organizácie vám bráni exportovať váš osobný trezor."
@@ -2595,7 +2619,7 @@
     "message": "Predvoľby"
   },
   "appPreferences": {
-    "message": "Nastavenia aplikácie (Všetky účty)"
+    "message": "Nastavenia aplikácie (všetky účty)"
   },
   "accountSwitcherLimitReached": {
     "message": "Dosiahnutý limit počtu účtov. Odhláste sa z účtu aby ste mohli pridať ďalší."
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Exportuje sa len trezor organizácie spojený s $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Exportuje sa len trezor organizácie spojený s $ORGANIZATION$. Moje zbierky položiek nebudú zahrnuté.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Zamknutý"
   },
@@ -2748,7 +2790,7 @@
     "message": "Použiť možnosti subadresovania svojho poskytovateľa e-mailu."
   },
   "catchallEmail": {
-    "message": "Catch-all Email"
+    "message": "E-mail Catch-all"
   },
   "catchallEmailDesc": {
     "message": "Použiť doručenú poštu typu catch-all nastavenú na doméne."
@@ -2801,7 +2843,7 @@
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
-    "message": "$SERVICENAME$ chyba: $ERRORMESSAGE$",
+    "message": "Chyba $SERVICENAME$: $ERRORMESSAGE$",
     "description": "Reports an error returned by a forwarding service to the user.",
     "placeholders": {
       "servicename": {
@@ -2917,7 +2959,7 @@
     }
   },
   "forwarderUnknownForwarder": {
-    "message": "Nepodporovaná služba: '$SERVICENAME$'.",
+    "message": "Neznáme presmerovanie: '$SERVICENAME$'.",
     "description": "Displayed when the forwarding service is not supported.",
     "placeholders": {
       "servicename": {
@@ -2934,16 +2976,16 @@
     "message": "Prístupový token API"
   },
   "apiKey": {
-    "message": "API kľúč"
+    "message": "Kľúč API"
   },
   "premiumSubcriptionRequired": {
     "message": "Vyžaduje sa predplatné Prémium"
   },
   "organizationIsDisabled": {
-    "message": "Organizácia je vypnutá."
+    "message": "Organizácia je pozastavená"
   },
   "disabledOrganizationFilterError": {
-    "message": "K položkám vo vypnutej organizácii nie je možné pristupovať. Požiadajte o pomoc vlastníka organizácie."
+    "message": "K položkám pozastavenej organizácii nie je možné pristupovať. Požiadajte o pomoc vlastníka organizácie."
   },
   "neverLockWarning": {
     "message": "Ste si istí, že chcete použiť možnosť \"Nikdy\"? Táto predvoľba ukladá šifrovací kľúč od trezora priamo na zariadení. Ak použijete túto možnosť, mali by ste svoje zariadenie náležite zabezpečiť."
@@ -3144,16 +3186,16 @@
     "message": "na úpravu e-mailovej adresy."
   },
   "exposedMasterPassword": {
-    "message": "Odhalené hlavné heslo"
+    "message": "Uniknuté hlavné heslo"
   },
   "exposedMasterPasswordDesc": {
-    "message": "Nájdené heslo v uniknuných údajoch. Na ochranu svojho účtu používajte jedinečné heslo. Naozaj chcete používať odhalené heslo?"
+    "message": "Heslo bolo nájdené v uniknutých údajoch. Na ochranu svojho účtu používajte jedinečné heslo. Naozaj chcete používať uniknuté heslo?"
   },
   "weakAndExposedMasterPassword": {
-    "message": "Slabé a odhalené hlavné heslo"
+    "message": "Slabé a uniknuté hlavné heslo"
   },
   "weakAndBreachedMasterPasswordDesc": {
-    "message": "Nájdené slabé heslo v uniknuných údajoch. Na ochranu svojho účtu používajte silné a jedinečné heslo. Naozaj chcete používať toto heslo?"
+    "message": "Nájdené slabé heslo v uniknutých údajoch. Na ochranu svojho účtu používajte silné a jedinečné heslo. Naozaj chcete používať toto heslo?"
   },
   "checkForBreaches": {
     "message": "Skontrolovať známe úniky údajov pre toto heslo"
@@ -3177,7 +3219,7 @@
     "message": "Vaše hlavné heslo sa nebude dať obnoviť, ak ho zabudnete!"
   },
   "characterMinimum": {
-    "message": "Minimálny počet znakov $LENGTH$",
+    "message": "Minimálny počet znakov: $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -3783,10 +3825,10 @@
     "message": "žiada o prístup k"
   },
   "sshkeyApprovalMessageSuffix": {
-    "message": "in order to"
+    "message": "aby bolo možné"
   },
   "sshActionLogin": {
-    "message": "authenticate to a server"
+    "message": "overenie na serveri"
   },
   "sshActionSign": {
     "message": "podpísať správu"
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Zobraziť menej"
   },
-  "enableAutotype": {
-    "message": "Povoliť automatické vpisovanie"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden neoveruje miesto stupu, pred použitím skratky sa uistite, že ste v správnom okne a poli."
   },
+  "typeShortcut": {
+    "message": "Zadajte klávesovú skratku"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Použite jeden alebo dva z nasledujúcich modifikátorov: Ctrl, Alt, Win, alebo Shift a písmeno."
+  },
+  "invalidShortcut": {
+    "message": "Neplatná klávesová skratka"
+  },
   "moreBreadcrumbs": {
     "message": "Viac",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Potvrdiť"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Povoliť skratku automatického písania"
+  "enableAutotypeShortcutPreview": {
+    "message": "Povoliť skratku pre automatické vpisovanie (náhľad funkcie)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Pred použitím skratky sa uistite, že sa nachádzate v správnom poli, aby ste údaje nevyplnili na nesprávne miesto."
   },
   "editShortcut": {
     "message": "Upraviť skratku"
   },
-  "archive": {
-    "message": "Archivovať"
+  "archiveNoun": {
+    "message": "Archív",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archivovať",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Zrušiť archiváciu"
   },
   "itemsInArchive": {
@@ -4123,10 +4176,10 @@
   "noItemsInArchiveDesc": {
     "message": "Tu sa zobrazia archivované položky, ktoré budú vylúčené zo všeobecného vyhľadávania a z návrhov automatického vypĺňania."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Položka bola archivovaná"
   },
-  "itemRemovedFromArchive": {
+  "itemWasUnarchived": {
     "message": "Položka bola odobraná z archívu"
   },
   "archiveItem": {
@@ -4134,5 +4187,41 @@
   },
   "archiveItemConfirmDesc": {
     "message": "Archivované položky sú vylúčené zo všeobecného vyhľadávania a z návrhov automatického vypĺňania. Naozaj chcete archivovať túto položku?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "PSČ"
+  },
+  "cardNumberLabel": {
+    "message": "Číslo karty"
+  },
+  "upgradeNow": {
+    "message": "Upgradovať teraz"
+  },
+  "builtInAuthenticator": {
+    "message": "Zabudovaný autentifikátor"
+  },
+  "secureFileStorage": {
+    "message": "Bezpečné ukladanie súborov"
+  },
+  "emergencyAccess": {
+    "message": "Núdzový prístup"
+  },
+  "breachMonitoring": {
+    "message": "Sledovanie únikov"
+  },
+  "andMoreFeatures": {
+    "message": "A ešte viac!"
+  },
+  "planDescPremium": {
+    "message": "Úplné online zabezpečenie"
+  },
+  "upgradeToPremium": {
+    "message": "Upgradovať na Prémium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Akcia pri vypršaní časového limitu"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Časový limit relácie"
   }
 }
diff --git a/apps/desktop/src/locales/sl/messages.json b/apps/desktop/src/locales/sl/messages.json
index 23a6df7ad95..353c6858afa 100644
--- a/apps/desktop/src/locales/sl/messages.json
+++ b/apps/desktop/src/locales/sl/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Potrdi"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Okolje po meri"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Napačno glavno geslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Avtentikacija v dveh korakih naredi vaš račun bolj varen, saj od vas zahteva, da svojo prijavo preverite z drugo napravo, kot je varnostni ključ, aplikacija za preverjanje pristnosti, SMS, telefonski klic ali e-pošta. V spletnem trezorju bitwarden.com je lahko omogočite prijavo v dveh korakih. Ali želite spletno stran obiskati sedaj?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/sr/messages.json b/apps/desktop/src/locales/sr/messages.json
index cd41aa9e4b9..1bc4a0ed016 100644
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Немате дозволу да уређујете ову ставку"
+  },
   "welcomeBack": {
     "message": "Добродошли назад"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Употребити једнократну пријаву"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Ваша организација захтева јединствену пријаву."
+  },
   "submit": {
     "message": "Пошаљи"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Морате додати или основни УРЛ сервера или бар једно прилагођено окружење."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Везе морају да користе HTTPS."
+  },
   "customEnvironment": {
     "message": "Прилагођено окружење"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Погрешна главна лозинка"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неисправна главна лозинка. Потврдите да је адреса ваше е-поште исправна и да је ваш налог направљен на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Пријава у два корака чини ваш налог сигурнијим захтевом да верификујете своје податке помоћу другог уређаја, као што су безбедносни кључ, апликација, СМС-а, телефонски позив или имејл. Пријављивање у два корака може се омогућити на веб сефу. Да ли желите да посетите веб страницу сада?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Закључајте са главном лозинком при поновном покретању"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Потражити главну лозинку или ПИН при поновном покретању"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Потражити главну лозинку при поновном покретању апликације"
+  },
   "deleteAccount": {
     "message": "Брисање налога"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Дошло је до грешке при омогућавању интеграције прегледача."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Нажалост, интеграција прегледача за сада је подржана само у верзији Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Нажалост, интеграција прегледача није за сада подржана у Windows Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Минимално прилагођено временско ограничење је 1 минут."
+  },
   "inviteAccepted": {
     "message": "Позив прихваћен"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Извешће се само сеф организације повезана са $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Извешће се само сеф организације повезан са $ORGANIZATION$. Колекције мојих предмета неће бити укључене.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Закључано"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Прикажи мање"
   },
-  "enableAutotype": {
-    "message": "Упали ауто-унос"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden не потврђује локације уноса, будите сигурни да сте у добром прозору и поље пре употребе пречице."
   },
+  "typeShortcut": {
+    "message": "Унети пречицу"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Укључите један или два следећа модификатора: Ctrl, Alt, Win, или Shift, и слово."
+  },
+  "invalidShortcut": {
+    "message": "Неважећа пречица"
+  },
   "moreBreadcrumbs": {
     "message": "Више мрвица",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Потврди"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Омогућава пречицу за аутоматски унос"
+  "enableAutotypeShortcutPreview": {
+    "message": "Омогућите пречицу ауто-уноса (преглед функције)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Будите сигурни да сте у исправном пољу пре употребе пречице да бисте избегли попуњавање података на погрешно место."
   },
   "editShortcut": {
     "message": "Уреди пречицу"
   },
-  "archive": {
-    "message": "Архива"
+  "archiveNoun": {
+    "message": "Архива",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Архивирај",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Врати из архиве"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Архивиране ставке ће се овде појавити и бити искључени из општих резултата претраге и сугестија о ауто-пуњењу."
   },
-  "itemSentToArchive": {
+  "itemWasSentToArchive": {
     "message": "Ставка је послата у архиву"
   },
-  "itemRemovedFromArchive": {
-    "message": "Ставка је уклоњена из архиве"
+  "itemWasUnarchived": {
+    "message": "Ставка враћена из архиве"
   },
   "archiveItem": {
     "message": "Архивирај ставку"
   },
   "archiveItemConfirmDesc": {
     "message": "Архивиране ставке су искључене из општих резултата претраге и предлога за ауто попуњавање. Јесте ли сигурни да желите да архивирате ову ставку?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP/Поштански број"
+  },
+  "cardNumberLabel": {
+    "message": "Број картице"
+  },
+  "upgradeNow": {
+    "message": "Надогради сада"
+  },
+  "builtInAuthenticator": {
+    "message": "Уграђени аутентификатор"
+  },
+  "secureFileStorage": {
+    "message": "Сигурно складиштење датотека"
+  },
+  "emergencyAccess": {
+    "message": "Хитан приступ"
+  },
+  "breachMonitoring": {
+    "message": "Праћење повreda безбедности"
+  },
+  "andMoreFeatures": {
+    "message": "И још више!"
+  },
+  "planDescPremium": {
+    "message": "Потпуна онлајн безбедност"
+  },
+  "upgradeToPremium": {
+    "message": "Надоградите на Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/sv/messages.json b/apps/desktop/src/locales/sv/messages.json
index a867fc28753..93d56419ae3 100644
--- a/apps/desktop/src/locales/sv/messages.json
+++ b/apps/desktop/src/locales/sv/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Du har inte behörighet att redigera detta objekt"
+  },
   "welcomeBack": {
     "message": "Välkommen tillbaka"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Använd Single Sign-On"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Din organisation kräver single sign-on."
+  },
   "submit": {
     "message": "Skicka"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Du måste lägga till antingen basserverns URL eller minst en anpassad miljö."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Webbadresser måste använda HTTPS."
+  },
   "customEnvironment": {
     "message": "Anpassad miljö"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Ogiltigt huvudlösenord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ogiltigt huvudlösenord. Bekräfta att din e-postadress är korrekt och ditt konto skapades på $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Tvåstegsverifiering gör ditt konto säkrare genom att kräva att du verifierar din inloggning med en annan enhet, t.ex. en säkerhetsnyckel, autentiseringsapp, SMS, telefonsamtal eller e-post. Tvåstegsverifiering kan aktiveras i Bitwardens webbvalv. Vill du besöka webbplatsen nu?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lås med huvudlösenord vid omstart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Kräv huvudlösenord eller PIN-kod vid omstart av appen"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Kräv huvudlösenord vid omstart av appen"
+  },
   "deleteAccount": {
     "message": "Radera konto"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Ett fel uppstod vid aktivering av webbläsarintegration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Tyvärr stöds webbläsarintegration för tillfället endast i versionen från Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Tyvärr stöds webbläsarintegration för tillfället inte i versionen från Windows Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minsta anpassade tidsgräns är 1 minut."
+  },
   "inviteAccepted": {
     "message": "Inbjudan accepterad"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Endast organisationsvalvet som är associerat med $ORGANIZATION$ kommer att exporteras.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Endast organisationsvalvet som associeras med $ORGANIZATION$ kommer att exporteras. Mina objektsamlingar kommer inte att inkluderas.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Låst"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Visa mindre"
   },
-  "enableAutotype": {
-    "message": "Aktivera automatisk inmatning"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden validerar inte inmatningsplatser, så se till att du är i rätt fönster och fält innan du använder genvägen."
   },
+  "typeShortcut": {
+    "message": "Inmatningsgenväg"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Inkludera en eller två av följande modifierare: Ctrl, Alt, Win, eller Skift och en bokstav."
+  },
+  "invalidShortcut": {
+    "message": "Ogiltig genväg"
+  },
   "moreBreadcrumbs": {
     "message": "Fler länkstigar",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,20 +4147,25 @@
   "confirm": {
     "message": "Bekräfta"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Aktivera genväg för automatisk inmatning"
+  "enableAutotypeShortcutPreview": {
+    "message": "Aktivera inmatningsgenväg (förhandsvisning av funktion)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Försäkra dig om att du befinner dig i rätt fält innan du använder genvägen för att undvika att fylla i data på fel ställe."
   },
   "editShortcut": {
     "message": "Redigera genväg"
   },
-  "archive": {
-    "message": "Arkivera"
+  "archiveNoun": {
+    "message": "Arkiv",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Packa upp"
+  "archiveVerb": {
+    "message": "Arkivera",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Avarkivera"
   },
   "itemsInArchive": {
     "message": "Objekt i arkivet"
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Arkiverade objekt kommer att visas här och kommer att uteslutas från allmänna sökresultat och förslag för autofyll."
   },
-  "itemSentToArchive": {
-    "message": "Objekt skickat till arkiv"
+  "itemWasSentToArchive": {
+    "message": "Objektet skickades till arkivet"
   },
-  "itemRemovedFromArchive": {
-    "message": "Objekt borttaget från arkiv"
+  "itemWasUnarchived": {
+    "message": "Objektet har avarkiverats"
   },
   "archiveItem": {
     "message": "Arkivera objekt"
   },
   "archiveItemConfirmDesc": {
     "message": "Arkiverade objekt är uteslutna från allmänna sökresultat och förslag för autofyll. Är du säker på att du vill arkivera detta objekt?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postnummer"
+  },
+  "cardNumberLabel": {
+    "message": "Kortnummer"
+  },
+  "upgradeNow": {
+    "message": "Uppgradera nu"
+  },
+  "builtInAuthenticator": {
+    "message": "Inbyggd autenticator"
+  },
+  "secureFileStorage": {
+    "message": "Säker fillagring"
+  },
+  "emergencyAccess": {
+    "message": "Nödåtkomst"
+  },
+  "breachMonitoring": {
+    "message": "Intrångsmonitorering"
+  },
+  "andMoreFeatures": {
+    "message": "och mer!"
+  },
+  "planDescPremium": {
+    "message": "Komplett säkerhet online"
+  },
+  "upgradeToPremium": {
+    "message": "Uppgradera till Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Tidsgränsåtgärd"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sessionstidsgräns"
   }
 }
diff --git a/apps/desktop/src/locales/ta/messages.json b/apps/desktop/src/locales/ta/messages.json
index 4874985a8fd..2f9d12917d6 100644
--- a/apps/desktop/src/locales/ta/messages.json
+++ b/apps/desktop/src/locales/ta/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "மீண்டும் வருக"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "ஒற்றை உள்நுழையைப் பயன்படுத்து"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "சமர்ப்பி"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "நீங்கள் அடிப்படை சேவையக URL-ஐயாவது அல்லது குறைந்தது ஒரு தனிப்பயன் சூழலையாவது சேர்க்க வேண்டும்."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "தனிப்பயன் சூழல்"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "தவறான முதன்மை கடவுச்சொல்"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "இரண்டு-படி உள்நுழைவு உங்கள் கணக்கை ஒரு பாதுகாப்பு விசை, அங்கீகரிப்பான் செயலி, SMS, ஃபோன் அழைப்பு அல்லது மின்னஞ்சல் போன்ற மற்றொரு சாதனம் மூலம் உங்கள் உள்நுழைவை சரிபார்க்க கோருவதன் மூலம் அதை மேலும் பாதுகாக்கிறது. bitwarden.com இணைய பெட்டகத்தில் இரண்டு-படி உள்நுழைவை அமைக்கலாம். இப்போது இணையதளத்திற்குச் செல்ல விரும்புகிறீர்களா?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "மறுதொடக்கம் செய்யும் போது முதன்மை கடவுச்சொல்லுடன் பூட்டவும்"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "கணக்கை நீக்கவும்"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "உலாவி ஒருங்கிணைப்பை இயக்கும்போது ஒரு பிழை ஏற்பட்டது."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "துரதிர்ஷ்டவசமாக உலாவி ஒருங்கிணைப்பு தற்போது Mac App Store பதிப்பில் மட்டுமே ஆதரிக்கப்படுகிறது."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "துரதிர்ஷ்டவசமாக உலாவி ஒருங்கிணைப்பு தற்போது Microsoft Store பதிப்பில் ஆதரிக்கப்படவில்லை."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "அழைப்பு ஏற்கப்பட்டது"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "பூட்டப்பட்டது"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "குறைவாகக் காட்டு"
   },
-  "enableAutotype": {
-    "message": "தானியங்கு வகையை இயக்கு"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden உள்ளீட்டு இடங்களைச் சரிபார்க்காது, ஷார்ட்கட்டைப் பயன்படுத்துவதற்கு முன் சரியான சாளரம் மற்றும் புலத்தில் நீங்கள் இருக்கிறீர்கள் என்பதை உறுதிப்படுத்திக் கொள்ளுங்கள்."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "மேலும் பிரெட்க்ரம்புகள்",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "உறுதிப்படுத்து"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "தானியங்கு வகை குறுக்குவழியை இயக்கு"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "தவறான இடத்தில் தரவை நிரப்புவதைத் தவிர்க்க, குறுக்குவழியைப் பயன்படுத்துவதற்கு முன்பு நீங்கள் சரியான புலத்தில் இருப்பதை உறுதிப்படுத்திக் கொள்ளுங்கள்."
+  "enableAutotypeShortcutDescription": {
+    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "குறுக்குவழியைத் திருத்து"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/te/messages.json b/apps/desktop/src/locales/te/messages.json
index 5849d9d4cee..d607bb8d097 100644
--- a/apps/desktop/src/locales/te/messages.json
+++ b/apps/desktop/src/locales/te/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "Delete account"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/th/messages.json b/apps/desktop/src/locales/th/messages.json
index fa619695fdb..d794ace629c 100644
--- a/apps/desktop/src/locales/th/messages.json
+++ b/apps/desktop/src/locales/th/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "submit": {
     "message": "ส่งข้อมูล"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "customEnvironment": {
     "message": "Custom Environment"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "รหัสผ่านหลักไม่ถูกต้อง"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "การเข้าสู่ระบบแบบสองขั้นตอนทำให้บัญชีของคุณมีความปลอดภัยมากขึ้นด้วยการให้คุณตรวจสอบการเข้าสู่ระบบของคุณกับอุปกรณ์อื่นเช่นคีย์ความปลอดภัย, แอพ authenticator, SMS, โทรศัพท์หรืออีเมล. เข้าสู่ระบบแบบสองขั้นตอนสามารถเปิดใช้งานบน เว็บนิรภัย bitwarden.com คุณต้องการเยี่ยมชมเว็บไซต์เดี๋ยวนี้หรือไม่"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Lock with master password on restart"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Require master password or PIN on app restart"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Require master password on app restart"
+  },
   "deleteAccount": {
     "message": "ลบบัญชีผู้ใช้"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "An error has occurred while enabling browser integration."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Unfortunately browser integration is currently not supported in the Microsoft Store version."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum custom timeout is 1 minute."
+  },
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Locked"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Show less"
   },
-  "enableAutotype": {
-    "message": "Enable Autotype"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
   },
+  "typeShortcut": {
+    "message": "Type shortcut"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Invalid shortcut"
+  },
   "moreBreadcrumbs": {
     "message": "More breadcrumbs",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Confirm"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
   },
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Unarchive"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "builtInAuthenticator": {
+    "message": "Built-in authenticator"
+  },
+  "secureFileStorage": {
+    "message": "Secure file storage"
+  },
+  "emergencyAccess": {
+    "message": "Emergency access"
+  },
+  "breachMonitoring": {
+    "message": "Breach monitoring"
+  },
+  "andMoreFeatures": {
+    "message": "And more!"
+  },
+  "planDescPremium": {
+    "message": "Complete online security"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/tr/messages.json b/apps/desktop/src/locales/tr/messages.json
index c33570af387..ac67b177cbf 100644
--- a/apps/desktop/src/locales/tr/messages.json
+++ b/apps/desktop/src/locales/tr/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "Bu kaydı düzenleme yetkisine sahip değilsiniz"
+  },
   "welcomeBack": {
     "message": "Tekrar hoş geldiniz"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Çoklu oturum açma kullan"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Kuruluşunuz çoklu oturum açma gerektiriyor."
+  },
   "submit": {
     "message": "Gönder"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Temel Sunucu URL’sini veya en az bir özel ortam eklemelisiniz."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL'ler HTTPS kullanmalıdır."
+  },
   "customEnvironment": {
     "message": "Özel ortam"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Geçersiz ana parola"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ana parola geçersiz. E-posta adresinizin doğru olduğunu ve hesabınızın $HOST$ üzerinde oluşturulduğunu kontrol edin.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "İki aşamalı giriş, hesabınıza girererken işlemi bir güvenlik anahtarı, şifrematik uygulaması, SMS, telefon araması veya e-posta gibi ek bir yöntemle doğrulamanızı isteyerek hesabınızın güvenliğini artırır. İki aşamalı giriş özelliğini bitwarden.com web kasası üzerinden ayarlayabilirsiniz. Şimdi siteye gitmek ister misiniz?"
   },
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Yeniden başlatmada ana parola ile kilitle"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Uygulama yeniden başlatıldığında ana parola veya PIN iste"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Uygulama yeniden başlatıldığında ana parola iste"
+  },
   "deleteAccount": {
     "message": "Hesabı sil"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Tarayıcı entegrasyonu etkinleştirilirken bir hata oluştu."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Ne yazık ki tarayıcı entegrasyonu şu anda sadece Mac App Store sürümünde destekleniyor."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Maalesef tarayıcı entegrasyonu şimdilik Windows Store sürümünde desteklenmiyor."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Minimum özel zaman aşımı 1 dakikadır."
+  },
   "inviteAccepted": {
     "message": "Davet kabul edildi"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Kilitli"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Daha az göster"
   },
-  "enableAutotype": {
-    "message": "Otomatik yazmayı etkinleştir"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden giriş konumlarını doğrulamaz, kısayolu kullanmadan önce doğru pencerede ve alanda olduğunuzdan emin olun."
   },
+  "typeShortcut": {
+    "message": "Kısayolu yazın"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Include one or two of the following modifiers: Ctrl, Alt, Win, or Shift, and a letter."
+  },
+  "invalidShortcut": {
+    "message": "Geçersiz kısayol"
+  },
   "moreBreadcrumbs": {
     "message": "Daha fazla gezinme izi",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Onayla"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Otomatik yazma kısayolunu etkinleştir"
+  "enableAutotypeShortcutPreview": {
+    "message": "Enable autotype shortcut (Feature Preview)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "Verilerin yanlış yere doldurulmasını önlemek için kısayolu kullanmadan önce doğru alanda olduğunuzdan emin olun."
   },
   "editShortcut": {
     "message": "Kısayolu düzenle"
   },
-  "archive": {
-    "message": "Arşivle"
+  "archiveNoun": {
+    "message": "Arşiv",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Arşivle",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Arşivden çıkar"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Kayıt arşive gönderildi"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Kayıt arşivden çıkarıldı"
   },
   "archiveItem": {
     "message": "Archive item"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / posta kodu"
+  },
+  "cardNumberLabel": {
+    "message": "Kart numarası"
+  },
+  "upgradeNow": {
+    "message": "Şimdi yükselt"
+  },
+  "builtInAuthenticator": {
+    "message": "Dahili kimlik doğrulayıcı"
+  },
+  "secureFileStorage": {
+    "message": "Güvenli dosya depolama"
+  },
+  "emergencyAccess": {
+    "message": "Acil durum erişimi"
+  },
+  "breachMonitoring": {
+    "message": "İhlal izleme"
+  },
+  "andMoreFeatures": {
+    "message": "Ve daha fazlası!"
+  },
+  "planDescPremium": {
+    "message": "Eksiksiz çevrimiçi güvenlik"
+  },
+  "upgradeToPremium": {
+    "message": "Premium'a yükselt"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Zaman aşımı eylemi"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Oturum zaman aşımı"
   }
 }
diff --git a/apps/desktop/src/locales/uk/messages.json b/apps/desktop/src/locales/uk/messages.json
index c5c86baacdf..7ed0710ca74 100644
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "З поверненням"
   },
@@ -262,10 +265,10 @@
     "message": "Пам'ятати до блокування сховища"
   },
   "premiumRequired": {
-    "message": "Необхідна передплата преміум"
+    "message": "Необхідна передплата Premium"
   },
   "premiumRequiredDesc": {
-    "message": "Для використання цієї функції необхідна передплата преміум."
+    "message": "Для використання цієї функції необхідна передплата Premium."
   },
   "errorOccurred": {
     "message": "Сталася помилка."
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Використати єдиний вхід"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Ваша організація вимагає єдиний вхід (SSO)."
+  },
   "submit": {
     "message": "Відправити"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Необхідно додати URL-адресу основного сервера, або принаймні одне користувацьке середовище."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL-адреси повинні бути HTTPS."
+  },
   "customEnvironment": {
     "message": "Власне середовище"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Неправильний головний пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неправильний головний пароль. Перевірте правильність адреси електронної пошти та розміщення облікового запису на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Двоетапна перевірка дає змогу надійніше захистити ваш обліковий запис, вимагаючи підтвердження входу з використанням іншого пристрою, наприклад, за допомогою ключа безпеки, програми автентифікації, SMS, телефонного виклику, або е-пошти. Ви можете налаштувати двоетапну перевірку в сховищі на bitwarden.com. Хочете перейти на вебсайт зараз?"
   },
@@ -1303,7 +1321,7 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Показувати піктограми вебсайтів та отримувати адреси для зміни паролів"
   },
   "enableMinToTray": {
     "message": "Згортати до системного лотка"
@@ -1452,22 +1470,22 @@
     "message": "номер картки"
   },
   "premiumMembership": {
-    "message": "Преміум статус"
+    "message": "Передплата Premium"
   },
   "premiumManage": {
     "message": "Керувати передплатою"
   },
   "premiumManageAlert": {
-    "message": "Ви можете керувати своїм статусом у сховищі на bitwarden.com. Хочете перейти на вебсайт зараз?"
+    "message": "Ви можете керувати передплатою у сховищі на bitwarden.com. Хочете перейти на вебсайт зараз?"
   },
   "premiumRefresh": {
     "message": "Оновити стан передплати"
   },
   "premiumNotCurrentMember": {
-    "message": "Зараз у вас немає передплати преміум."
+    "message": "Зараз у вас немає передплати Premium."
   },
   "premiumSignUpAndGet": {
-    "message": "Передплатіть преміум і отримайте:"
+    "message": "Передплатіть Premium і отримайте:"
   },
   "premiumSignUpStorage": {
     "message": "1 ГБ зашифрованого сховища для файлів."
@@ -1485,22 +1503,22 @@
     "message": "Пріоритетну технічну підтримку."
   },
   "premiumSignUpFuture": {
-    "message": "Усі майбутні преміумфункції. Їх буде більше!"
+    "message": "Усі майбутні функції Premium. Їх буде більше!"
   },
   "premiumPurchase": {
-    "message": "Придбати преміум"
+    "message": "Придбати Premium"
   },
   "premiumPurchaseAlertV2": {
-    "message": "Ви можете придбати Преміум у налаштуваннях облікового запису вебпрограмі Bitwarden."
+    "message": "Ви можете придбати Premium у налаштуваннях облікового запису вебпрограми Bitwarden."
   },
   "premiumCurrentMember": {
-    "message": "Ви користуєтеся передплатою преміум!"
+    "message": "Ви користуєтеся передплатою Premium!"
   },
   "premiumCurrentMemberThanks": {
     "message": "Дякуємо за підтримку Bitwarden."
   },
   "premiumPrice": {
-    "message": "Всього лише $PRICE$ / за рік!",
+    "message": "Лише $PRICE$ / рік!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Блокувати головним паролем при перезапуску"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Вимагати головний пароль або PIN після перезапуску програми"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Вимагати головний пароль після перезапуску програми"
+  },
   "deleteAccount": {
     "message": "Видалити обліковий запис"
   },
@@ -2005,7 +2029,7 @@
     "message": "Bitwarden може автоматично заповнювати одноразові коди двоетапної перевірки. Відкрийте камеру, щоб сканувати QR-код на цьому вебсайті, або скопіюйте і вставте ключ у це поле."
   },
   "premium": {
-    "message": "Преміум",
+    "message": "Premium",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Під час увімкнення інтеграції з браузером сталася помилка."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "На жаль, зараз інтеграція з браузером підтримується лише у версії для Mac з App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "На жаль, зараз інтеграція з браузером не підтримується у версії з Microsoft Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Мінімальний власний час очікування – 1 хвилина."
+  },
   "inviteAccepted": {
     "message": "Запрошення прийнято"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Буде експортовано лише сховище організації, пов'язане з $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Буде експортовано лише сховище організації, пов'язане з $ORGANIZATION$. Записи моїх збірок не будуть включені.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Заблоковано"
   },
@@ -2937,7 +2979,7 @@
     "message": "Ключ API"
   },
   "premiumSubcriptionRequired": {
-    "message": "Необхідна передплата преміум"
+    "message": "Необхідна передплата Premium"
   },
   "organizationIsDisabled": {
     "message": "Організацію призупинено"
@@ -3586,10 +3628,10 @@
     "message": "Увійдіть з використанням облікових даних вашої компанії."
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "Імпортувати безпосередньо з браузера"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "Профіль браузера"
   },
   "seeDetailedInstructions": {
     "message": "Перегляньте докладні інструкції на нашому довідковому сайті",
@@ -3834,10 +3876,10 @@
     "message": "Змінити ризикований пароль"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Цей запис ризикований, і не має адреси вебсайту. Додайте адресу вебсайту і змініть пароль для вдосконалення безпеки."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Немає вебсайту"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "Ви не можете вилучати збірки, маючи дозвіл лише на перегляд: $COLLECTIONS$",
@@ -3935,10 +3977,10 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Про ці налаштування"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden використовуватиме збережені URI-адреси записів для визначення піктограм вебсайтів або URL-адрес для зміни паролів, щоб вдосконалити вашу роботу. Під час використання цієї послуги ваша інформація не збирається і не зберігається."
   },
   "assignToCollections": {
     "message": "Призначити до збірок"
@@ -4080,59 +4122,106 @@
   "showLess": {
     "message": "Згорнути"
   },
-  "enableAutotype": {
-    "message": "Увімкнути автовведення"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden не перевіряє місця введення. Переконайтеся, що у вас відкрите правильне вікно і вибрано потрібне поле, перш ніж застосувати комбінацію клавіш."
   },
+  "typeShortcut": {
+    "message": "Введіть комбінацію клавіш"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Використайте один або два таких модифікацій: Ctrl, Alt, Win, Shift, і літеру."
+  },
+  "invalidShortcut": {
+    "message": "Недійсна комбінація клавіш"
+  },
   "moreBreadcrumbs": {
     "message": "Інші елементи",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "next": {
-    "message": "Next"
+    "message": "Далі"
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Підтвердити домен Key Connector"
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "Підтвердити"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "Увімкнути комбінацію клавіш автовведення (тестова функція)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
+  "enableAutotypeShortcutDescription": {
+    "message": "Перед використанням комбінації клавіш виберіть правильне поле, щоб уникнути заповнення даних у невідповідному місці."
   },
   "editShortcut": {
-    "message": "Edit shortcut"
+    "message": "Редагувати комбінацію клавіш"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Архів",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "Архівувати",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Видобути"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "Записи в архіві"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Немає записів у архіві"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "Архівовані записи з'являтимуться тут і будуть виключені з результатів звичайного пошуку та пропозицій автозаповнення."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Запис архівовано"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "Запис розархівовано"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Архівувати запис"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "Архівовані записи виключаються з результатів звичайного пошуку та пропозицій автозаповнення. Ви дійсно хочете архівувати цей запис?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Поштовий індекс"
+  },
+  "cardNumberLabel": {
+    "message": "Номер картки"
+  },
+  "upgradeNow": {
+    "message": "Покращити"
+  },
+  "builtInAuthenticator": {
+    "message": "Вбудований автентифікатор"
+  },
+  "secureFileStorage": {
+    "message": "Захищене сховище файлів"
+  },
+  "emergencyAccess": {
+    "message": "Екстрений доступ"
+  },
+  "breachMonitoring": {
+    "message": "Моніторинг витоків даних"
+  },
+  "andMoreFeatures": {
+    "message": "Інші можливості!"
+  },
+  "planDescPremium": {
+    "message": "Повна онлайн-безпека"
+  },
+  "upgradeToPremium": {
+    "message": "Покращити до Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/vi/messages.json b/apps/desktop/src/locales/vi/messages.json
index a9ac6aa5bd7..8bf88aba458 100644
--- a/apps/desktop/src/locales/vi/messages.json
+++ b/apps/desktop/src/locales/vi/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "welcomeBack": {
     "message": "Chào mừng bạn trở lại"
   },
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "Dùng đăng nhập một lần"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tổ chức của bạn yêu cầu đăng nhập một lần."
+  },
   "submit": {
     "message": "Gửi"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Bạn phải thêm URL máy chủ cơ sở hoặc ít nhất một môi trường tùy chỉnh."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL phải sử dụng HTTPS."
+  },
   "customEnvironment": {
     "message": "Môi trường tùy chỉnh"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "Mật khẩu chính không hợp lệ"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Mật khẩu chính không hợp lệ. Xác nhận email của bạn là chính xác và tài khoản được tạo trên $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "Đăng nhập hai bước giúp tài khoản của bạn an toàn hơn bằng cách yêu cầu bạn xác minh việc đăng nhập bằng một thiết bị khác như khóa bảo mật, ứng dụng xác thực, SMS, cuộc gọi điện thoại hoặc email. Đăng nhập hai bước có thể được thiết lập trên bitwarden.com. Bạn có muốn truy cập trang web bây giờ không?"
   },
@@ -1235,7 +1253,7 @@
     "message": "Đóng kho sau"
   },
   "vaultTimeout1": {
-    "message": "Quá hạn"
+    "message": "Thời gian chờ"
   },
   "vaultTimeoutAction1": {
     "message": "Hành động sau khi đóng kho"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "Khóa bằng mật khẩu chính khi khởi động lại"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "Yêu cầu mật khẩu chính hoặc mã PIN khi khởi động lại ứng dụng"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "Yêu cầu mật khẩu chính khi khởi động lại ứng dụng"
+  },
   "deleteAccount": {
     "message": "Xóa tài khoản"
   },
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "Đã xảy ra lỗi khi bật tích hợp với trình duyệt."
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "Rất tiếc, tính năng tích hợp trình duyệt hiện chỉ được hỗ trợ trong phiên bản Mac App Store."
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Rất tiếc, tính năng tích hợp trình duyệt hiện không được hỗ trợ trong phiên bản Microsoft Store."
   },
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Thời gian đóng kho tùy chỉnh tối thiểu là 1 phút."
+  },
   "inviteAccepted": {
     "message": "Đã chấp nhận lời mời"
   },
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Chỉ kho lưu trữ tổ chức liên kết với $ORGANIZATION$ sẽ được xuất.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Chỉ kho lưu trữ tổ chức liên kết với $ORGANIZATION$ được xuất. Bộ sưu tập mục của tôi sẽ không được bao gồm.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "Đã khóa"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "Thu gọn"
   },
-  "enableAutotype": {
-    "message": "Bật tính năng Tự động nhập liệu"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden không kiểm tra vị trí nhập liệu, hãy đảm bảo bạn đang ở trong đúng cửa sổ và trường nhập liệu trước khi dùng phím tắt."
   },
+  "typeShortcut": {
+    "message": "Phím tắt nhập liệu"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "Bao gồm một hoặc hai trong số các phím bổ trợ sau: Ctrl, Alt, Win hoặc Shift, và một chữ cái."
+  },
+  "invalidShortcut": {
+    "message": "Phím tắt không hợp lệ"
+  },
   "moreBreadcrumbs": {
     "message": "Thêm mục điều hướng",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "Xác nhận"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Bật phím tắt tự động điền"
+  "enableAutotypeShortcutPreview": {
+    "message": "Bật phím tắt tự động nhập (Xem trước tính năng)"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Hãy đảm bảo bạn đang ở đúng trường trước khi sử dụng phím tắt để tránh điền dữ liệu vào chỗ không đúng."
+  "enableAutotypeShortcutDescription": {
+    "message": "Hãy đảm bảo bạn đang ở đúng trường trước khi sử dụng phím tắt để tránh điền dữ liệu vào sai chỗ."
   },
   "editShortcut": {
     "message": "Chỉnh sửa phím tắt"
   },
-  "archive": {
-    "message": "Lưu trữ"
+  "archiveNoun": {
+    "message": "Lưu trữ",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "Lưu trữ",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "Hủy lưu trữ"
   },
   "itemsInArchive": {
@@ -4123,16 +4176,52 @@
   "noItemsInArchiveDesc": {
     "message": "Các mục đã lưu trữ sẽ hiển thị ở đây và sẽ bị loại khỏi kết quả tìm kiếm và gợi ý tự động điền."
   },
-  "itemSentToArchive": {
-    "message": "Mục đã được gửi đến kho lưu trữ"
+  "itemWasSentToArchive": {
+    "message": "Mục đã được chuyển vào kho lưu trữ"
   },
-  "itemRemovedFromArchive": {
-    "message": "Mục đã được gỡ khỏi kho lưu trữ"
+  "itemWasUnarchived": {
+    "message": "Mục đã được bỏ lưu trữ"
   },
   "archiveItem": {
     "message": "Lưu trữ mục"
   },
   "archiveItemConfirmDesc": {
     "message": "Các mục đã lưu trữ sẽ bị loại khỏi kết quả tìm kiếm chung và gợi ý tự động điền. Bạn có chắc chắn muốn lưu trữ mục này không?"
+  },
+  "zipPostalCodeLabel": {
+    "message": "Mã ZIP / Bưu điện"
+  },
+  "cardNumberLabel": {
+    "message": "Số thẻ"
+  },
+  "upgradeNow": {
+    "message": "Nâng cấp ngay"
+  },
+  "builtInAuthenticator": {
+    "message": "Trình xác thực tích hợp"
+  },
+  "secureFileStorage": {
+    "message": "Lưu trữ tệp an toàn"
+  },
+  "emergencyAccess": {
+    "message": "Truy cập khẩn cấp"
+  },
+  "breachMonitoring": {
+    "message": "Giám sát vi phạm"
+  },
+  "andMoreFeatures": {
+    "message": "Và nhiều hơn nữa!"
+  },
+  "planDescPremium": {
+    "message": "Bảo mật trực tuyến toàn diện"
+  },
+  "upgradeToPremium": {
+    "message": "Nâng cấp lên gói Cao cấp"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
   }
 }
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index 552afdca34c..5e2b7f7ff7c 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "您没有编辑此项目的权限"
+  },
   "welcomeBack": {
     "message": "欢迎回来"
   },
@@ -265,7 +268,7 @@
     "message": "需要高级版"
   },
   "premiumRequiredDesc": {
-    "message": "使用此功能需要高级会员资格。"
+    "message": "需要高级会员才能使用此功能。"
   },
   "errorOccurred": {
     "message": "发生错误。"
@@ -388,7 +391,7 @@
     "message": "州 / 省"
   },
   "zipPostalCode": {
-    "message": "邮政编码"
+    "message": "ZIP / 邮政编码"
   },
   "country": {
     "message": "国家/地区"
@@ -576,7 +579,7 @@
     "message": "复制验证码 (TOTP)"
   },
   "copyFieldCipherName": {
-    "message": "复制 $CIPHERNAME$ 的 $FIELD$",
+    "message": "复制 $CIPHERNAME$ 中的 $FIELD$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "使用单点登录"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "您的组织要求单点登录。"
+  },
   "submit": {
     "message": "提交"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "您必须添加基础服务器 URL 或至少添加一个自定义环境。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL 必须使用 HTTPS。"
+  },
   "customEnvironment": {
     "message": "自定义环境"
   },
@@ -1042,7 +1051,7 @@
     "message": "身份验证超时"
   },
   "authenticationSessionTimedOut": {
-    "message": "身份验证会话超时。请重新启动登录过程。"
+    "message": "身份验证会话超时。请重新开始登录过程。"
   },
   "selfHostBaseUrl": {
     "message": "自托管服务器 URL",
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "无效的主密码"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "无效的主密码。请确认您的电子邮箱正确无误，以及您的账户是在 $HOST$ 上创建的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "两步登录要求您从其他设备（例如安全密钥、验证器 App、短信、电话或者电子邮件）来验证您的登录，这能使您的账户更加安全。两步登录需要在 bitwarden.com 网页版密码库中设置。现在访问此网站吗？"
   },
@@ -1229,13 +1247,13 @@
     "message": "两步登录"
   },
   "vaultTimeoutHeader": {
-    "message": "密码库超时时间"
+    "message": "密码库超时"
   },
   "vaultTimeout": {
-    "message": "密码库超时时间"
+    "message": "密码库超时"
   },
   "vaultTimeout1": {
-    "message": "超时"
+    "message": "超时时间"
   },
   "vaultTimeoutAction1": {
     "message": "超时动作"
@@ -1280,7 +1298,7 @@
     "message": "系统空闲时"
   },
   "onSleep": {
-    "message": "系统休眠时"
+    "message": "系统睡眠时"
   },
   "onLocked": {
     "message": "系统锁定时"
@@ -1485,7 +1503,7 @@
     "message": "优先客户支持。"
   },
   "premiumSignUpFuture": {
-    "message": "所有未来的高级功能。即将推出！"
+    "message": "未来的更多高级版功能。敬请期待！"
   },
   "premiumPurchase": {
     "message": "购买高级版"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "重启后使用主密码锁定"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "App 重启时要求主密码或 PIN 码"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "App 重启时要求主密码"
+  },
   "deleteAccount": {
     "message": "删除账户"
   },
@@ -1880,7 +1904,7 @@
     "message": "您必须至少选择一个集合。"
   },
   "premiumUpdated": {
-    "message": "您已升级到高级会员。"
+    "message": "您已升级为高级版。"
   },
   "restore": {
     "message": "恢复"
@@ -1949,7 +1973,7 @@
     "message": "永久删除"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "超时后注销将解除对密码库的所有访问权限，并需要进行在线身份验证。确定使用此设置吗？"
+    "message": "超时后注销账户将解除对密码库的所有访问权限，并需要进行在线身份验证。确定要使用此设置吗？"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
     "message": "超时动作确认"
@@ -2005,7 +2029,7 @@
     "message": "Bitwarden 可以存储并填充两步验证码。选择相机图标来拍摄此网站的验证器二维码，或将密钥复制并粘贴到此字段。"
   },
   "premium": {
-    "message": "高级会员",
+    "message": "高级版",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
@@ -2126,9 +2150,6 @@
   "browserIntegrationErrorDesc": {
     "message": "启用浏览器集成时出错。"
   },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "很遗憾，目前仅 Mac App Store 版本支持浏览器集成。"
-  },
   "browserIntegrationWindowsStoreDesc": {
     "message": "很遗憾，Microsoft Store 版本目前不支持浏览器集成。"
   },
@@ -2416,7 +2437,7 @@
     "message": "您的主密码不符合某一项或多项组织策略要求。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "changePasswordWarning": {
-    "message": "更改密码后，您需要使用新密码登录。 在其他设备上的活动会话将在一小时内注销。"
+    "message": "更改密码后，您需要使用新密码登录。在其他设备上的活动会话将在一小时内注销。"
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
     "message": "更改您的主密码以完成账户恢复。"
@@ -2483,7 +2504,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "您的组织策略正在影响您的密码库超时时间。最大允许的密码库超时时间是 $HOURS$ 小时 $MINUTES$ 分钟。您的密码库超时动作被设置为 $ACTION$。",
+    "message": "您的组织策略正在影响您的密码库超时。最大允许的密码库超时为 $HOURS$ 小时 $MINUTES$ 分钟。您的密码库超时动作被设置为 $ACTION$。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2500,7 +2521,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "您的组织策略已将您的密码库超时动作设置为 $ACTION$。",
+    "message": "您的组织策略已将您的密码库超时动作设置为「$ACTION$」。",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -2509,13 +2530,13 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "您的密码库超时时间超出了组织设置的限制。"
+    "message": "您的密码库超时超出了您组织设置的限制。"
   },
   "vaultTimeoutPolicyAffectingOptions": {
     "message": "企业策略要求已应用到您的超时选项中"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "您的组织策略已将您最大允许的密码库超时时间设置为 $HOURS$ 小时 $MINUTES$ 分钟。",
+    "message": "您的组织策略已将您最大允许的密码库超时设置为 $HOURS$ 小时 $MINUTES$ 分钟。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2528,7 +2549,7 @@
     }
   },
   "vaultTimeoutPolicyMaximumError": {
-    "message": "超时时间超出了您组织设置的限制：最多 $HOURS$ 小时 $MINUTES$ 分钟",
+    "message": "超时超出了您组织设置的限制：最多 $HOURS$ 小时 $MINUTES$ 分钟",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "自定义超时最少为 1 分钟。"
+  },
   "inviteAccepted": {
     "message": "邀请已接受"
   },
@@ -2595,13 +2619,13 @@
     "message": "偏好设置"
   },
   "appPreferences": {
-    "message": "应用程序设置（所有账户）"
+    "message": "App 设置（所有账户）"
   },
   "accountSwitcherLimitReached": {
     "message": "已达到账户上限。请注销一个账户后再添加其他账户。"
   },
   "settingsTitle": {
-    "message": "$EMAIL$ 的应用程序设置",
+    "message": "$EMAIL$ 的 App 设置",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2654,6 +2678,24 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库。不包括「我的项目」集合。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "已锁定"
   },
@@ -4080,12 +4122,18 @@
   "showLess": {
     "message": "显示更少"
   },
-  "enableAutotype": {
-    "message": "启用自动输入"
-  },
   "enableAutotypeDescription": {
     "message": "Bitwarden 不会验证输入位置，在使用快捷键之前，请确保您位于正确的窗口和字段中。"
   },
+  "typeShortcut": {
+    "message": "输入快捷键"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "包含以下一个或两个修饰符：Ctrl、Alt、Win 或 Shift，外加一个字母。"
+  },
+  "invalidShortcut": {
+    "message": "无效的快捷键"
+  },
   "moreBreadcrumbs": {
     "message": "更多导航项",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
@@ -4099,19 +4147,24 @@
   "confirm": {
     "message": "确认"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "启用自动输入快捷键"
+  "enableAutotypeShortcutPreview": {
+    "message": "启用自动输入快捷键（功能预览）"
   },
-  "enableAutotypeDescriptionTransitionKey": {
+  "enableAutotypeShortcutDescription": {
     "message": "在使用快捷键之前，请确保您位于正确的字段中，以避免将数据填入错误的地方。"
   },
   "editShortcut": {
     "message": "编辑快捷键"
   },
-  "archive": {
-    "message": "归档"
+  "archiveNoun": {
+    "message": "归档",
+    "description": "Noun"
   },
-  "unarchive": {
+  "archiveVerb": {
+    "message": "归档",
+    "description": "Verb"
+  },
+  "unArchive": {
     "message": "取消归档"
   },
   "itemsInArchive": {
@@ -4123,10 +4176,10 @@
   "noItemsInArchiveDesc": {
     "message": "已归档的项目将显示在此处，并将被排除在一般搜索结果和自动填充建议之外。"
   },
-  "itemSentToArchive": {
-    "message": "项目已归档"
+  "itemWasSentToArchive": {
+    "message": "项目已发送到归档"
   },
-  "itemRemovedFromArchive": {
+  "itemWasUnarchived": {
     "message": "项目已取消归档"
   },
   "archiveItem": {
@@ -4134,5 +4187,41 @@
   },
   "archiveItemConfirmDesc": {
     "message": "已归档的项目将被排除在一般搜索结果和自动填充建议之外。确定要归档此项目吗？"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / 邮政编码"
+  },
+  "cardNumberLabel": {
+    "message": "卡号"
+  },
+  "upgradeNow": {
+    "message": "立即升级"
+  },
+  "builtInAuthenticator": {
+    "message": "内置身份验证器"
+  },
+  "secureFileStorage": {
+    "message": "安全文件存储"
+  },
+  "emergencyAccess": {
+    "message": "紧急访问"
+  },
+  "breachMonitoring": {
+    "message": "数据泄露监测"
+  },
+  "andMoreFeatures": {
+    "message": "以及更多！"
+  },
+  "planDescPremium": {
+    "message": "全面的在线安全防护"
+  },
+  "upgradeToPremium": {
+    "message": "升级为高级版"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "超时动作"
+  },
+  "sessionTimeoutHeader": {
+    "message": "会话超时"
   }
 }
diff --git a/apps/desktop/src/locales/zh_TW/messages.json b/apps/desktop/src/locales/zh_TW/messages.json
index d4e579f89c1..61fc00543ed 100644
--- a/apps/desktop/src/locales/zh_TW/messages.json
+++ b/apps/desktop/src/locales/zh_TW/messages.json
@@ -69,6 +69,9 @@
       }
     }
   },
+  "noEditPermissions": {
+    "message": "你沒有權限編輯這個項目"
+  },
   "welcomeBack": {
     "message": "歡迎回來"
   },
@@ -470,10 +473,10 @@
     "message": "如果您想自動填充表單的復選框，例如「記住電子郵件」，請使用復選框"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "使用連結欄位若您在特定網站上遇到自動填入問題。"
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "填入欄位的 html id、名稱、標籤或預留字元"
   },
   "folder": {
     "message": "資料夾"
@@ -576,7 +579,7 @@
     "message": "複製驗證碼 (TOTP)"
   },
   "copyFieldCipherName": {
-    "message": "Copy $FIELD$, $CIPHERNAME$",
+    "message": "複製 $FIELD$，$CIPHERNAME$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -703,10 +706,10 @@
     "message": "附件已儲存"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "新增附件"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "最大檔案大小為 500MB"
   },
   "file": {
     "message": "檔案"
@@ -771,6 +774,9 @@
   "useSingleSignOn": {
     "message": "使用單一登入"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "您的組織要求使用單一登入。"
+  },
   "submit": {
     "message": "送出"
   },
@@ -1032,6 +1038,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "您必須新增伺服器網域 URL 或至少一個自訂環境。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL 必須使用 HTTPS。"
+  },
   "customEnvironment": {
     "message": "自訂環境"
   },
@@ -1222,6 +1231,15 @@
   "invalidMasterPassword": {
     "message": "無效的主密碼"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "主密碼無效。請確認你的電子郵件正確，且帳號是於 $HOST$ 建立的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "twoStepLoginConfirmation": {
     "message": "兩步驟登入需要您從其他裝置（例如安全鑰匙、驗證器程式、SMS、手機或電子郵件）來驗證您的登入，這使您的帳戶更加安全。兩步驟登入可以在 bitwarden.com 網頁版密碼庫啟用。現在要前往嗎？"
   },
@@ -1229,7 +1247,7 @@
     "message": "兩步驟登入"
   },
   "vaultTimeoutHeader": {
-    "message": "Vault timeout"
+    "message": "密碼庫逾時時間"
   },
   "vaultTimeout": {
     "message": "密碼庫逾時時間"
@@ -1238,7 +1256,7 @@
     "message": "逾時"
   },
   "vaultTimeoutAction1": {
-    "message": "Timeout action"
+    "message": "逾時後動作"
   },
   "vaultTimeoutDesc": {
     "message": "選擇密碼庫何時執行密碼庫逾時動作。"
@@ -1303,7 +1321,7 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "顯示網站圖示並取得變更密碼網址"
   },
   "enableMinToTray": {
     "message": "最小化至系統匣圖示"
@@ -1843,6 +1861,12 @@
   "lockWithMasterPassOnRestart1": {
     "message": "重啟後使用主密碼鎖定"
   },
+  "requireMasterPasswordOrPinOnAppRestart": {
+    "message": "要求在重新啟動應用程式時輸入密碼或 PIN 碼"
+  },
+  "requireMasterPasswordOnAppRestart": {
+    "message": "在應用程式重啟時重新詢問主密碼"
+  },
   "deleteAccount": {
     "message": "刪除帳戶"
   },
@@ -1969,7 +1993,7 @@
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "out of $TOTAL$",
+    "message": "$TOTAL$ 不足",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -1981,7 +2005,7 @@
     "message": "信用卡資料"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ 詳細資訊",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1990,7 +2014,7 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "了解更多驗證程式"
   },
   "copyTOTP": {
     "message": "複製驗證器金鑰 (TOTP)"
@@ -1999,23 +2023,23 @@
     "message": "無縫兩步驟驗證"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden 可以儲存並填入兩步驟驗證碼。複製金鑰並貼上到此欄位。"
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden 可以儲存並填入兩步驟驗證碼。選擇相機圖示來截取此網站的驗證器QR code，或手動複製金鑰並貼上到此欄位。"
   },
   "premium": {
-    "message": "Premium",
+    "message": "進階版",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "免費組織無法使用附檔"
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "您需注意上方的 1 個欄位。"
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "您需注意上方的 $COUNT$ 個欄位。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2024,10 +2048,10 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "過期的信用卡"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "如果您已續期，請更新信用卡資訊"
   },
   "verificationRequired": {
     "message": "需要驗證",
@@ -2085,19 +2109,19 @@
     "message": "新的主密碼不符合原則要求。"
   },
   "receiveMarketingEmailsV2": {
-    "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
+    "message": "獲得來自 Bitwarden 的公告、建議及研究資訊電子郵件。"
   },
   "unsubscribe": {
-    "message": "Unsubscribe"
+    "message": "取消訂閱"
   },
   "atAnyTime": {
-    "message": "at any time."
+    "message": "在任何時間。"
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "若是繼續，則代表您同意"
   },
   "and": {
-    "message": "and"
+    "message": "和"
   },
   "acceptPolicies": {
     "message": "選中此選取框，即表示您同意下列條款："
@@ -2109,7 +2133,7 @@
     "message": "允許瀏覽器整合"
   },
   "enableBrowserIntegrationDesc1": {
-    "message": "Used to allow biometric unlock in browsers that are not Safari."
+    "message": "用於在非 Safari 的瀏覽器中啟用生物辨識解鎖。"
   },
   "enableDuckDuckGoBrowserIntegration": {
     "message": "允許 DuckDuckGo 瀏覽器整合"
@@ -2121,13 +2145,10 @@
     "message": "不支援瀏覽器整合"
   },
   "browserIntegrationErrorTitle": {
-    "message": "Error enabling browser integration"
+    "message": "啟用瀏覽器整合時發生錯誤"
   },
   "browserIntegrationErrorDesc": {
-    "message": "An error has occurred while enabling browser integration."
-  },
-  "browserIntegrationMasOnlyDesc": {
-    "message": "很遺憾，目前僅 Mac App Store 版本支援瀏覽器整合功能。"
+    "message": "啟用瀏覽器整合時發生錯誤。"
   },
   "browserIntegrationWindowsStoreDesc": {
     "message": "很遺憾，Microsoft Store 版本目前尚不支援瀏覽器整合功能。"
@@ -2178,16 +2199,16 @@
     "message": "需先在桌面應用程式設定中設定生物特徵辨識，才能使用瀏覽器的生物特徵辨識功能。"
   },
   "biometricsManualSetupTitle": {
-    "message": "Automatic setup not available"
+    "message": "無法使用自動設定"
   },
   "biometricsManualSetupDesc": {
-    "message": "Due to the installation method, biometrics support could not be automatically enabled. Would you like to open the documentation on how to do this manually?"
+    "message": "由於安裝方式的限制，無法自動啟用生物辨識功能。是否要開啟相關文件以了解如何手動設定？"
   },
   "personalOwnershipSubmitError": {
     "message": "由於生效中的某個企業原則，您不可將項目儲存至您的個人密碼庫。請將所有權變更為組織帳號，並選擇可用的分類。"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "你的新密碼不能與目前的密碼相同。"
   },
   "hintEqualsPassword": {
     "message": "密碼提示不能與您的密碼相同。"
@@ -2199,13 +2220,13 @@
     "message": "某個組織政策已禁止您將項目匯入至您的個人密碼庫。"
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "個人詳細資訊"
   },
   "identification": {
-    "message": "Identification"
+    "message": "身分"
   },
   "contactInfo": {
-    "message": "Contact information"
+    "message": "聯絡資訊"
   },
   "allSends": {
     "message": "所有 Send",
@@ -2371,10 +2392,10 @@
     "message": "驗證 WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "讀取安全金鑰"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "等待安全金鑰操作中……"
   },
   "hideEmail": {
     "message": "對收件人隱藏我的電子郵件位址。"
@@ -2386,7 +2407,7 @@
     "message": "需要驗證電子郵件"
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "電子郵件已驗證"
   },
   "emailVerificationRequiredDesc": {
     "message": "必須驗證您的電子郵件才能使用此功能。"
@@ -2401,7 +2422,7 @@
     "message": "此操作受到保護。若要繼續，請重新輸入您的主密碼以驗證您的身份。"
   },
   "masterPasswordSuccessfullySet": {
-    "message": "Master password successfully set"
+    "message": "主密碼設定成功"
   },
   "updatedMasterPassword": {
     "message": "已更新主密碼"
@@ -2416,16 +2437,16 @@
     "message": "您的主密碼不符合一個或多個組織政策規定。您必須立即更新您的主密碼才能存取密碼庫。進行此動作將登出您目前的工作階段，需要您重新登入。其他裝置上的工作階段可能持續長達一小時。"
   },
   "changePasswordWarning": {
-    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+    "message": "變更密碼後，你需要使用新密碼重新登入。其他裝置上的工作階段會在一小時內登出。"
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
-    "message": "Change your master password to complete account recovery."
+    "message": "變更你的主密碼以完成帳號復原。"
   },
   "updateMasterPasswordSubtitle": {
-    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+    "message": "你的主密碼不符合此組織的要求。請變更主密碼以繼續。"
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
+    "message": "您的組織停用了信任裝置加密。若要存取您的密碼庫，請設定主密碼。"
   },
   "tryAgain": {
     "message": "再試一次"
@@ -2458,7 +2479,7 @@
     "message": "使用生物辨識"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Enter the verification code that was sent to your email."
+    "message": "輸入傳送到你的電子郵件的驗證碼。"
   },
   "resendCode": {
     "message": "重新傳送驗證碼"
@@ -2470,7 +2491,7 @@
     "message": "分鐘"
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "最多 $HOURS$ 小時 $MINUTES$ 分鐘",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2512,10 +2533,10 @@
     "message": "您的密碼庫逾時時間超過組織設定的限制。"
   },
   "vaultTimeoutPolicyAffectingOptions": {
-    "message": "Enterprise policy requirements have been applied to your timeout options"
+    "message": "企業政策已套用至您的逾時選項中"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
+    "message": "您的組織政策已限定您密碼庫逾時的時間長度。密碼庫逾時時間最高可以設定到 $HOURS$ 小時 $MINUTES$ 分鐘。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2528,7 +2549,7 @@
     }
   },
   "vaultTimeoutPolicyMaximumError": {
-    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "message": "逾時時間超出了您組織設定的此限制：最多 $HOURS$ 小時 $MINUTES$ 分鐘",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2540,6 +2561,9 @@
       }
     }
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "自訂逾時時間最小為 1 分鐘。"
+  },
   "inviteAccepted": {
     "message": "邀請已接受"
   },
@@ -2565,13 +2589,13 @@
     "message": "主密碼已移除"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "以下組織的成員已不再需要主密碼。請與你的組織管理員確認下方的網域。"
   },
   "organizationName": {
     "message": "機構名稱"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Key Connector 網域"
   },
   "leaveOrganization": {
     "message": "離開組織"
@@ -2634,7 +2658,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "只會匯出與 $EMAIL$ 關聯的個人密碼庫（包含附件）。組織密碼庫的項目不包含在內。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2654,11 +2678,29 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "只會匯出與 $ORGANIZATION$ 相關的組織密碼庫。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "只會匯出與 $ORGANIZATION$ 相關的組織保險庫，「我的項目」集合將不會包含在內。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "locked": {
     "message": "已鎖定"
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "您的密碼庫已被鎖定"
   },
   "unlocked": {
     "message": "已解鎖"
@@ -2680,10 +2722,10 @@
     "message": "產生使用者名稱"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "生成電子郵件"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "使用者名稱產生器"
   },
   "generatePassword": {
     "message": "產生密碼"
@@ -2692,19 +2734,19 @@
     "message": "產生密碼片語"
   },
   "passwordGenerated": {
-    "message": "Password generated"
+    "message": "已產生密碼"
   },
   "passphraseGenerated": {
-    "message": "Passphrase generated"
+    "message": "已產生密碼"
   },
   "usernameGenerated": {
-    "message": "Username generated"
+    "message": "已產生使用者名稱"
   },
   "emailGenerated": {
-    "message": "Email generated"
+    "message": "已產生電子郵件"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "值必須介於 $MIN$ 及 $MAX$。",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -2718,7 +2760,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "message": " 使用 $RECOMMENDED$ 或更多個字元產生更強的密碼。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2728,7 +2770,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": " 使用 $RECOMMENDED$ 或更多個單字產生強的密碼短語。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2754,7 +2796,7 @@
     "message": "使用您的網域設定的 Catch-all 收件匣。"
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "使用此電子郵件"
   },
   "useThisPassword": {
     "message": "使用此密碼"
@@ -2797,11 +2839,11 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "選擇一個所選服務支援的網域",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
-    "message": "$SERVICENAME$ error: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ 錯誤：$ERRORMESSAGE$",
     "description": "Reports an error returned by a forwarding service to the user.",
     "placeholders": {
       "servicename": {
@@ -2819,7 +2861,7 @@
     "description": "Displayed with the address on the forwarding service's configuration screen."
   },
   "forwarderGeneratedByWithWebsite": {
-    "message": "Website: $WEBSITE$. Generated by Bitwarden.",
+    "message": "網站：$WEBSITE$。透過 Bitwarden 產生。",
     "description": "Displayed with the address on the forwarding service's configuration screen.",
     "placeholders": {
       "WEBSITE": {
@@ -2829,7 +2871,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Invalid $SERVICENAME$ API token",
+    "message": "無效的 $SERVICENAME$ API 權杖",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2839,7 +2881,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Invalid $SERVICENAME$ API token: $ERRORMESSAGE$",
+    "message": "無效的 $SERVICENAME$ API 權杖：$ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -2853,7 +2895,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ 拒絕了你的請求。請聯絡你的服務提供者以取得協助。",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2863,7 +2905,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ 拒絕了你的請求：$ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -2877,7 +2919,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Unable to obtain $SERVICENAME$ masked email account ID.",
+    "message": "無法獲得 $SERVICENAME$ 的轉送電子郵件帳號。",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -2887,7 +2929,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Invalid $SERVICENAME$ domain.",
+    "message": "無效的 $SERVICENAME$ 網域。",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2897,7 +2939,7 @@
     }
   },
   "forwarderNoUrl": {
-    "message": "Invalid $SERVICENAME$ url.",
+    "message": "無效的 $SERVICENAME$ URI。",
     "description": "Displayed when the url of the forwarding service wasn't supplied.",
     "placeholders": {
       "servicename": {
@@ -2907,7 +2949,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Unknown $SERVICENAME$ error occurred.",
+    "message": "發生未知的 $SERVICENAME$ 錯誤。",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -2917,7 +2959,7 @@
     }
   },
   "forwarderUnknownForwarder": {
-    "message": "Unknown forwarder: '$SERVICENAME$'.",
+    "message": "未知的轉送服務提供商：$SERVICENAME$。",
     "description": "Displayed when the forwarding service is not supported.",
     "placeholders": {
       "servicename": {
@@ -2976,7 +3018,7 @@
     "message": "登入已啟動"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "已傳送請求"
   },
   "notificationSentDevice": {
     "message": "已傳送通知至您的裝置。"
@@ -2985,13 +3027,13 @@
     "message": "已傳送通知至您的裝置"
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "在你的裝置或其他裝置上解鎖 Bitwarden"
   },
   "notificationSentDeviceAnchor": {
     "message": "網頁應用程式"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "在核准前請確保您的指紋短語與下面完全相符。"
   },
   "needAnotherOptionV1": {
     "message": "需要另一個選項嗎？"
@@ -3003,7 +3045,7 @@
     "message": "指紋短語"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "一旦您的請求被通過，您會獲得通知。"
   },
   "needAnotherOption": {
     "message": "必須先在 Bitwarden 應用程式設定中開啟，才可以使用裝置登入。要改用其他選項嗎？"
@@ -3022,7 +3064,7 @@
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "來自 $EMAIL$ 的存取嘗試",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3031,7 +3073,7 @@
     }
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "登入請求已由 $DEVICE$ 上的 $EMAIL$ 批准",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3044,21 +3086,21 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "您拒絕了來自其他裝置的登入嘗試。如果這是您本人，請嘗試再次使用該裝置登入。"
   },
   "webApp": {
-    "message": "Web app"
+    "message": "網路應用程式"
   },
   "mobile": {
-    "message": "Mobile",
+    "message": "行動裝置",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "擴充套件",
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "電腦版應用程式",
     "description": "Desktop app"
   },
   "cli": {
@@ -3069,13 +3111,13 @@
     "description": "Software Development Kit"
   },
   "server": {
-    "message": "Server"
+    "message": "伺服器"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "已要求登入"
   },
   "deviceType": {
-    "message": "裝置類別"
+    "message": "裝置類型"
   },
   "ipAddress": {
     "message": "IP 位址"
@@ -3084,10 +3126,10 @@
     "message": "時間"
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "確認訪問"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "拒絕訪問權限"
   },
   "justNow": {
     "message": "剛剛"
@@ -3108,7 +3150,7 @@
     "message": "此請求已失效。"
   },
   "confirmAccessAttempt": {
-    "message": "Confirm access attempt for $EMAIL$",
+    "message": "確認 $EMAIL$ 的存取嘗試",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3120,28 +3162,28 @@
     "message": "已要求登入"
   },
   "accountAccessRequested": {
-    "message": "Account access requested"
+    "message": "帳號存取請求"
   },
   "creatingAccountOn": {
-    "message": "Creating account on"
+    "message": "建立帳號於"
   },
   "checkYourEmail": {
-    "message": "Check your email"
+    "message": "檢查您的電子郵件"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Follow the link in the email sent to"
+    "message": "跟隨電子郵件中的連結"
   },
   "andContinueCreatingYourAccount": {
-    "message": "and continue creating your account."
+    "message": "並繼續建立您的帳號"
   },
   "noEmail": {
-    "message": "No email?"
+    "message": "沒有電子郵件？"
   },
   "goBack": {
     "message": "返回"
   },
   "toEditYourEmailAddress": {
-    "message": "to edit your email address."
+    "message": "來編輯您的電子郵件位址。"
   },
   "exposedMasterPassword": {
     "message": "已洩露的主密碼"
@@ -3165,13 +3207,13 @@
     "message": "重要："
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "正在存取"
   },
   "accessTokenUnableToBeDecrypted": {
-    "message": "You have been logged out because your access token could not be decrypted. Please log in again to resolve this issue."
+    "message": "由於無法解密你的存取權杖，你已被登出。請重新登入以解決此問題。"
   },
   "refreshTokenSecureStorageRetrievalFailure": {
-    "message": "You have been logged out because your refresh token could not be retrieved. Please log in again to resolve this issue."
+    "message": "由於無法取得你的重新整理權杖，你已被登出。請重新登入以解決此問題。"
   },
   "masterPasswordHint": {
     "message": "若您忘記主密碼，將會無法找回！"
@@ -3192,7 +3234,7 @@
     "message": "建議設定更新"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "記住此裝置來讓未來的登入體驗更簡易"
   },
   "deviceApprovalRequired": {
     "message": "裝置需要取得核准。請在下面選擇一個核准選項："
@@ -3216,10 +3258,10 @@
     "message": "要求管理員核准"
   },
   "unableToCompleteLogin": {
-    "message": "Unable to complete login"
+    "message": "無法完成登入"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
-    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+    "message": "你需要在受信任的裝置上登入，或請管理員為你指派密碼。"
   },
   "region": {
     "message": "區域"
@@ -3262,7 +3304,7 @@
     "message": "裝置已信任"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "目前組織"
   },
   "trust": {
     "message": "信任"
@@ -3274,16 +3316,16 @@
     "message": "機構不被信任"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "為了保護你的帳號安全，僅在你已授予此使用者緊急存取權，且其指紋與其帳號中顯示的指紋相符時才確認。"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "為了保護你的帳號安全，僅在你是此組織的成員、已啟用帳號復原功能，且下方顯示的指紋與組織的指紋相符時才繼續。"
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "此組織有企業政策，會將你加入帳號復原功能。加入後，組織管理員可變更你的密碼。僅在你確認此組織身份，且下方顯示的指紋詞句與該組織的指紋相符時才繼續。"
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "信任使用者"
   },
   "inputRequired": {
     "message": "必須輸入內容。"
@@ -3450,13 +3492,13 @@
     "message": "您的帳號要求使用 Duo 兩步驟驗證登入。"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "您的帳號需要使用 Duo 兩步驟登入。請依照以下步驟完成登入。"
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "請依照以下步驟完成登入"
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "請依照以下步驟使用你的安全金鑰完成登入。"
   },
   "launchDuo": {
     "message": "使用瀏覽器啟動 Duo"
@@ -3486,10 +3528,10 @@
     "message": "選擇一個分類"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "若你希望將匯入檔案的內容移至集合，請選擇此選項"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "若你希望將匯入檔案的內容移至資料夾，請選擇此選項"
   },
   "importUnassignedItemsError": {
     "message": "檔案包含未指派項目。"
@@ -3586,10 +3628,10 @@
     "message": "請使用您的公司憑證繼續登入。"
   },
   "importDirectlyFromBrowser": {
-    "message": "Import directly from browser"
+    "message": "從瀏覽器直接匯入"
   },
   "browserProfile": {
-    "message": "Browser Profile"
+    "message": "瀏覽器設定檔"
   },
   "seeDetailedInstructions": {
     "message": "請參閱我們說明網站上的詳細說明於",
@@ -3615,27 +3657,27 @@
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "message": "URI 匹配偵測是 Bitwarden 用來識別自動填入建議的方式。",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
-    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "message": "「正則表達式」是進階選項，可能會增加憑證外洩的風險。",
     "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
   },
   "startsWithAdvancedOptionWarning": {
-    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "message": "「開頭為」是進階選項，可能會增加憑證外洩的風險。",
     "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
   },
   "uriMatchWarningDialogLink": {
-    "message": "More about match detection",
+    "message": "深入了解匹配偵測",
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
-    "message": "Advanced options",
+    "message": "進階選項",
     "description": "Advanced option placeholder for uri option component"
   },
   "warningCapitalized": {
-    "message": "Warning",
+    "message": "警告",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "success": {
@@ -3709,14 +3751,14 @@
     "message": "無法找到可用於 SSO 登入的空閒連接埠。"
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "已產生安全的密碼！請不要忘記同時更新您網站上的密碼。"
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "使用產生器",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "來產生高強度且唯一的密碼",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
@@ -3750,19 +3792,19 @@
     "message": "項目名稱"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "登入資訊"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "額外選項"
   },
   "itemHistory": {
     "message": "項目歷史記錄"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "最後編輯"
   },
   "upload": {
-    "message": "Upload"
+    "message": "上傳"
   },
   "authorize": {
     "message": "授權"
@@ -3774,25 +3816,25 @@
     "message": "確認 SSH 密鑰使用"
   },
   "agentForwardingWarningTitle": {
-    "message": "Warning: Agent Forwarding"
+    "message": "警告：代理轉送"
   },
   "agentForwardingWarningText": {
-    "message": "This request comes from a remote device that you are logged into"
+    "message": "此請求來自你已登入的遠端裝置"
   },
   "sshkeyApprovalMessageInfix": {
     "message": "正在請求存取權限到"
   },
   "sshkeyApprovalMessageSuffix": {
-    "message": "in order to"
+    "message": "用於"
   },
   "sshActionLogin": {
-    "message": "authenticate to a server"
+    "message": "驗證伺服器  "
   },
   "sshActionSign": {
-    "message": "sign a message"
+    "message": "簽署訊息"
   },
   "sshActionGitSign": {
-    "message": "sign a git commit"
+    "message": "簽署 git 提交"
   },
   "unknownApplication": {
     "message": "應用程式"
@@ -3807,40 +3849,40 @@
     "message": "從剪貼簿中匯入密鑰"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "SSH 密鑰成功匯入"
   },
   "fileSavedToDevice": {
     "message": "檔案已儲存到裝置。在您的裝置上管理下載檔案。"
   },
   "allowScreenshots": {
-    "message": "Allow screen capture"
+    "message": "允許螢幕擷取"
   },
   "allowScreenshotsDesc": {
-    "message": "Allow the Bitwarden desktop application to be captured in screenshots and viewed in remote desktop sessions. Disabling this will prevent access on some external displays."
+    "message": "允許 Bitwarden 桌面應用程式可被截圖或在遠端桌面工作階段中顯示。停用此功能將會限制在部分外接螢幕上的存取。"
   },
   "confirmWindowStillVisibleTitle": {
-    "message": "Confirm window still visible"
+    "message": "確認視窗仍可見"
   },
   "confirmWindowStillVisibleContent": {
-    "message": "Please confirm that the window is still visible."
+    "message": "請確認視窗仍然可見。"
   },
   "updateBrowserOrDisableFingerprintDialogTitle": {
-    "message": "Extension update required"
+    "message": "必須更新擴充套件"
   },
   "updateBrowserOrDisableFingerprintDialogMessage": {
-    "message": "The browser extension you are using is out of date. Please update it or disable browser integration fingerprint validation in the desktop app settings."
+    "message": "你使用的瀏覽器擴充功能版本已過期。請更新擴充功能，或在桌面應用程式設定中停用瀏覽器整合的指紋驗證。"
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "變更有風險的密碼"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "此登入資訊存在風險，且缺少網站。請新增網站並變更密碼以提升安全性。"
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "缺少網站"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "若您只有檢視權限，無法移除集合 $COLLECTIONS$。",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3849,120 +3891,120 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "移動"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "新增資料夾"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "資料夾名稱"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "在資料夾名稱後面使用「/」來建立樹狀結構。\n例如：社交網路/論壇"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "安全傳送機密的資訊",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "安全的和任何人及任何平臺分享檔案及資料。您的資料會受到端對端加密的保護。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "快速建立密碼"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "點擊即可輕鬆產生強且唯一的密碼。",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "協助你維持登入資訊的安全。",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "點擊「產生密碼」按鈕即可輕鬆建立強且唯一的密碼，協助你確保登入資訊的安全。",
     "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "使用自動填入節省時間"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "包含",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "網頁",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "讓此登入顯示為自動填入建議。",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "流暢的線上結帳體驗"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "使用卡片功能，安全且精準地自動填入付款表單。"
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "簡化帳號建立流程 "
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "使用身份資訊，快速自動填入冗長的註冊或聯絡表單。"
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "保護你的敏感資料安全"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "使用備註功能，安全儲存銀行或保險等敏感資料。"
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "開發者友善的 SSH 存取"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "儲存你的金鑰並透過 SSH 代理程式進行快速、加密的驗證。",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "深入了解 SSH 代理程式",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "關於此設定"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden 會使用已儲存的登入 URI 來判斷應顯示的圖示或變更密碼網址，以改善你的使用體驗。使用此服務時，不會收集或儲存任何資訊。"
   },
   "assignToCollections": {
-    "message": "Assign to collections"
+    "message": "指派至集合"
   },
   "assignToTheseCollections": {
-    "message": "Assign to these collections"
+    "message": "指派至這些集合"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "只有可以檢視集合的組織成員才能看到其中的項目。"
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "只有可以檢視集合的組織成員才能看到其中的項目。"
   },
   "noCollectionsAssigned": {
-    "message": "No collections have been assigned"
+    "message": "尚未指派任何集合"
   },
   "assign": {
-    "message": "Assign"
+    "message": "指定"
   },
   "bulkCollectionAssignmentDialogDescription": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "只有可以檢視集合的組織成員才能看到其中的項目。"
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "message": "您已經選擇 $TOTAL_COUNT$ 個項目。由於您沒有編輯權限，無法更新其中的 $READONLY_COUNT$ 個項目。",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -3974,10 +4016,10 @@
     }
   },
   "selectCollectionsToAssign": {
-    "message": "Select collections to assign"
+    "message": "選擇要指派的集合"
   },
   "personalItemsTransferWarning": {
-    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ 會被永久移到選擇的組織。您將不再擁有這些項目。",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -3986,7 +4028,7 @@
     }
   },
   "personalItemsWithOrgTransferWarning": {
-    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ 會被永久移到 $ORG$。您將不再擁有這些項目。",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -3999,10 +4041,10 @@
     }
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 個項目會被永久移到選擇的組織。您將不再擁有此項目。"
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "1 個項目會被永久移到 $ORG$。您將不再擁有此項目。",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -4011,13 +4053,13 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Successfully assigned collections"
+    "message": "指派集合成功"
   },
   "nothingSelected": {
-    "message": "You have not selected anything."
+    "message": "您沒有選擇任何項目。"
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "項目已移到 $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4026,7 +4068,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "項目已移到 $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4035,7 +4077,7 @@
     }
   },
   "movedItemsToOrg": {
-    "message": "Selected items moved to $ORGNAME$",
+    "message": "將已選取項目移動至 $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4075,64 +4117,111 @@
     }
   },
   "showMore": {
-    "message": "Show more"
+    "message": "顯示更多"
   },
   "showLess": {
-    "message": "Show less"
-  },
-  "enableAutotype": {
-    "message": "Enable Autotype"
+    "message": "顯示較少"
   },
   "enableAutotypeDescription": {
-    "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
+    "message": "Bitwarden 不會驗證輸入位置，請在使用快捷鍵前確認你位於正確的視窗與欄位中。"
+  },
+  "typeShortcut": {
+    "message": "輸入快捷鍵"
+  },
+  "editAutotypeShortcutDescription": {
+    "message": "請包含以下修飾鍵之一或兩個：Ctrl、Alt、Win 或 Shift，再加上一個字母。"
+  },
+  "invalidShortcut": {
+    "message": "無效的捷徑"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "更多導覽階層",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "next": {
-    "message": "Next"
+    "message": "下一步"
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "確認 Key Connector 網域"
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "確認"
   },
-  "enableAutotypeTransitionKey": {
-    "message": "Enable autotype shortcut"
+  "enableAutotypeShortcutPreview": {
+    "message": "啟用自動輸入快捷鍵（功能預覽）"
   },
-  "enableAutotypeDescriptionTransitionKey": {
-    "message": "Be sure you are in the correct field before using the shortcut to avoid filling data into the wrong place."
+  "enableAutotypeShortcutDescription": {
+    "message": "請在使用快捷鍵前確認位於正確的欄位中，以避免將資料填入錯誤"
   },
   "editShortcut": {
-    "message": "Edit shortcut"
+    "message": "編輯捷徑"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "封存",
+    "description": "Noun"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveVerb": {
+    "message": "封存",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "取消封存"
   },
   "itemsInArchive": {
-    "message": "Items in archive"
+    "message": "封存中的項目"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "封存中沒有項目"
   },
   "noItemsInArchiveDesc": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+    "message": "封存的項目會顯示在此處，且不會出現在一般搜尋結果或自動填入建議中。"
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "項目已移至封存"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemWasUnarchived": {
+    "message": "項目取消封存"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "封存項目"
   },
   "archiveItemConfirmDesc": {
-    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+    "message": "封存的項目將不會出現在一般搜尋結果或自動填入建議中。確定要封存此項目嗎？"
+  },
+  "zipPostalCodeLabel": {
+    "message": "郵編 / 郵政代碼"
+  },
+  "cardNumberLabel": {
+    "message": "支付卡號碼"
+  },
+  "upgradeNow": {
+    "message": "立即升級"
+  },
+  "builtInAuthenticator": {
+    "message": "內建驗證器"
+  },
+  "secureFileStorage": {
+    "message": "安全檔案儲存"
+  },
+  "emergencyAccess": {
+    "message": "緊急存取"
+  },
+  "breachMonitoring": {
+    "message": "外洩監控"
+  },
+  "andMoreFeatures": {
+    "message": "以及其他功能功能！"
+  },
+  "planDescPremium": {
+    "message": "完整的線上安全"
+  },
+  "upgradeToPremium": {
+    "message": "升級到 Premium"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "逾時後動作"
+  },
+  "sessionTimeoutHeader": {
+    "message": "工作階段逾時"
   }
 }
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index d5484213a90..fbb83a1bf56 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -221,7 +221,7 @@ export class Main {
     );
 
     this.messagingMain = new MessagingMain(this, this.desktopSettingsService);
-    this.updaterMain = new UpdaterMain(this.i18nService, this.windowMain);
+    this.updaterMain = new UpdaterMain(this.i18nService, this.logService, this.windowMain);
 
     const messageSubject = new Subject<Message<Record<string, unknown>>>();
     this.messagingService = MessageSender.combine(
diff --git a/apps/desktop/src/main/menu/menu.view.ts b/apps/desktop/src/main/menu/menu.view.ts
index 962c57fdb60..d24128730cc 100644
--- a/apps/desktop/src/main/menu/menu.view.ts
+++ b/apps/desktop/src/main/menu/menu.view.ts
@@ -6,6 +6,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 
 import { isDev } from "../../utils";
+import { WindowMain } from "../window.main";
 
 import { IMenubarMenu } from "./menubar";
 
@@ -42,11 +43,18 @@ export class ViewMenu implements IMenubarMenu {
   private readonly _i18nService: I18nService;
   private readonly _messagingService: MessagingService;
   private readonly _isLocked: boolean;
+  private readonly _windowMain: WindowMain;
 
-  constructor(i18nService: I18nService, messagingService: MessagingService, isLocked: boolean) {
+  constructor(
+    i18nService: I18nService,
+    messagingService: MessagingService,
+    isLocked: boolean,
+    windowMain: WindowMain,
+  ) {
     this._i18nService = i18nService;
     this._messagingService = messagingService;
     this._isLocked = isLocked;
+    this._windowMain = windowMain;
   }
 
   private get searchVault(): MenuItemConstructorOptions {
@@ -86,7 +94,12 @@ export class ViewMenu implements IMenubarMenu {
     return {
       id: "zoomIn",
       label: this.localize("zoomIn"),
-      role: "zoomIn",
+      click: async () => {
+        const currentZoom = this._windowMain.win.webContents.zoomFactor;
+        const newZoom = currentZoom + 0.1;
+        this._windowMain.win.webContents.zoomFactor = newZoom;
+        await this._windowMain.saveZoomFactor(newZoom);
+      },
       accelerator: "CmdOrCtrl+=",
     };
   }
@@ -95,7 +108,12 @@ export class ViewMenu implements IMenubarMenu {
     return {
       id: "zoomOut",
       label: this.localize("zoomOut"),
-      role: "zoomOut",
+      click: async () => {
+        const currentZoom = this._windowMain.win.webContents.zoomFactor;
+        const newZoom = Math.max(0.2, currentZoom - 0.1);
+        this._windowMain.win.webContents.zoomFactor = newZoom;
+        await this._windowMain.saveZoomFactor(newZoom);
+      },
       accelerator: "CmdOrCtrl+-",
     };
   }
@@ -104,7 +122,11 @@ export class ViewMenu implements IMenubarMenu {
     return {
       id: "resetZoom",
       label: this.localize("resetZoom"),
-      role: "resetZoom",
+      click: async () => {
+        const newZoom = 1.0;
+        this._windowMain.win.webContents.zoomFactor = newZoom;
+        await this._windowMain.saveZoomFactor(newZoom);
+      },
       accelerator: "CmdOrCtrl+0",
     };
   }
diff --git a/apps/desktop/src/main/menu/menubar.ts b/apps/desktop/src/main/menu/menubar.ts
index 8ac3a084d95..0a00a67b84a 100644
--- a/apps/desktop/src/main/menu/menubar.ts
+++ b/apps/desktop/src/main/menu/menubar.ts
@@ -86,7 +86,7 @@ export class Menubar {
         updateRequest?.restrictedCipherTypes,
       ),
       new EditMenu(i18nService, messagingService, isLocked),
-      new ViewMenu(i18nService, messagingService, isLocked),
+      new ViewMenu(i18nService, messagingService, isLocked, windowMain),
       new AccountMenu(
         i18nService,
         messagingService,
diff --git a/apps/desktop/src/main/native-messaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts
index 93525164ff5..ba5d8616752 100644
--- a/apps/desktop/src/main/native-messaging.main.ts
+++ b/apps/desktop/src/main/native-messaging.main.ts
@@ -78,7 +78,7 @@ export class NativeMessagingMain {
       this.ipcServer.stop();
     }
 
-    this.ipcServer = await ipc.IpcServer.listen("bitwarden", (error, msg) => {
+    this.ipcServer = await ipc.IpcServer.listen("bw", (error, msg) => {
       switch (msg.kind) {
         case ipc.IpcMessageType.Connected: {
           this.connected.push(msg.clientId);
diff --git a/apps/desktop/src/main/updater.main.ts b/apps/desktop/src/main/updater.main.ts
index 51d5073911e..60b4f282405 100644
--- a/apps/desktop/src/main/updater.main.ts
+++ b/apps/desktop/src/main/updater.main.ts
@@ -1,8 +1,9 @@
-import { dialog, shell } from "electron";
+import { dialog, shell, Notification } from "electron";
 import log from "electron-log";
 import { autoUpdater, UpdateDownloadedEvent, VerifyUpdateSupport } from "electron-updater";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/logging";
 
 import { isAppImage, isDev, isMacAppStore, isWindowsPortable, isWindowsStore } from "../utils";
 
@@ -11,6 +12,8 @@ import { WindowMain } from "./window.main";
 const UpdaterCheckInitialDelay = 5 * 1000; // 5 seconds
 const UpdaterCheckInterval = 12 * 60 * 60 * 1000; // 12 hours
 
+const MaxTimeBeforeBlockingUpdateNotification = 7 * 24 * 60 * 60 * 1000; // 7 days
+
 export class UpdaterMain {
   private doingUpdateCheck = false;
   private doingUpdateCheckWithFeedback = false;
@@ -18,8 +21,19 @@ export class UpdaterMain {
   private updateDownloaded: UpdateDownloadedEvent = null;
   private originalRolloutFunction: VerifyUpdateSupport = null;
 
+  // This needs to be tracked to avoid the Notification being garbage collected,
+  // which would break the click handler.
+  private openedNotification: Notification | null = null;
+
+  // This is used to set when the initial update notification was shown.
+  // The system notifications can be easy to miss or be disabled, so we want to
+  // ensure the user is eventually made aware of the update. If the user does not
+  // interact with the notification in a reasonable time, we will prompt them again.
+  private initialUpdateNotificationTime: number | null = null;
+
   constructor(
     private i18nService: I18nService,
+    private logService: LogService,
     private windowMain: WindowMain,
   ) {
     autoUpdater.logger = log;
@@ -43,6 +57,8 @@ export class UpdaterMain {
     });
 
     autoUpdater.on("update-available", async () => {
+      this.initialUpdateNotificationTime ??= Date.now();
+
       if (this.doingUpdateCheckWithFeedback) {
         if (this.windowMain.win == null) {
           this.reset();
@@ -87,7 +103,7 @@ export class UpdaterMain {
       }
 
       this.updateDownloaded = info;
-      await this.promptRestartUpdate(info);
+      await this.promptRestartUpdate(info, this.doingUpdateCheckWithFeedback);
     });
 
     autoUpdater.on("error", (error) => {
@@ -108,7 +124,7 @@ export class UpdaterMain {
     }
 
     if (this.updateDownloaded && withFeedback) {
-      await this.promptRestartUpdate(this.updateDownloaded);
+      await this.promptRestartUpdate(this.updateDownloaded, true);
       return;
     }
 
@@ -144,7 +160,50 @@ export class UpdaterMain {
     this.updateDownloaded = null;
   }
 
-  private async promptRestartUpdate(info: UpdateDownloadedEvent) {
+  private async promptRestartUpdate(info: UpdateDownloadedEvent, blocking: boolean) {
+    // If we have an initial notification, and it's from a long time ago,
+    // we will block the user with a dialog to ensure they see it.
+    const longTimeSinceInitialNotification =
+      this.initialUpdateNotificationTime != null &&
+      Date.now() - this.initialUpdateNotificationTime > MaxTimeBeforeBlockingUpdateNotification;
+
+    if (!longTimeSinceInitialNotification && !blocking && Notification.isSupported()) {
+      // If the prompt doesn't have to block and we support notifications,
+      // we will show a notification instead of a blocking dialog, which won't steal focus.
+      await this.promptRestartUpdateUsingSystemNotification(info);
+    } else {
+      // If we are blocking, or notifications are not supported, we will show a blocking dialog.
+      // This will steal the user's focus, so we should only do this for user initiated actions
+      // or when there are no other options.
+      await this.promptRestartUpdateUsingDialog(info);
+    }
+  }
+
+  private async promptRestartUpdateUsingSystemNotification(info: UpdateDownloadedEvent) {
+    if (this.openedNotification != null) {
+      this.openedNotification.close();
+    }
+
+    this.openedNotification = new Notification({
+      title: this.i18nService.t("bitwarden") + " - " + this.i18nService.t("restartToUpdate"),
+      body: this.i18nService.t("restartToUpdateDesc", info.version),
+      timeoutType: "never",
+      silent: false,
+    });
+
+    // If the user clicks the notification, prompt again to restart, this time with a blocking dialog.
+    this.openedNotification.on("click", () => {
+      void this.promptRestartUpdate(info, true);
+    });
+    // If the notification fails to show, fall back to the blocking dialog as well.
+    this.openedNotification.on("failed", (error) => {
+      this.logService.error("Update notification failed", error);
+      void this.promptRestartUpdate(info, true);
+    });
+    this.openedNotification.show();
+  }
+
+  private async promptRestartUpdateUsingDialog(info: UpdateDownloadedEvent) {
     const result = await dialog.showMessageBox(this.windowMain.win, {
       type: "info",
       title: this.i18nService.t("bitwarden") + " - " + this.i18nService.t("restartToUpdate"),
diff --git a/apps/desktop/src/main/window.main.ts b/apps/desktop/src/main/window.main.ts
index 1595252251b..0e234126ea3 100644
--- a/apps/desktop/src/main/window.main.ts
+++ b/apps/desktop/src/main/window.main.ts
@@ -82,7 +82,12 @@ export class WindowMain {
 
     ipcMain.on("window-hide", () => {
       if (this.win != null) {
-        this.win.hide();
+        if (isWindows()) {
+          // On windows, to return focus we need minimize
+          this.win.minimize();
+        } else {
+          this.win.hide();
+        }
       }
     });
 
@@ -180,6 +185,7 @@ export class WindowMain {
 
           await this.createWindow();
           resolve();
+
           if (this.argvCallback != null) {
             this.argvCallback(process.argv);
           }
@@ -298,7 +304,9 @@ export class WindowMain {
       this.win.webContents.zoomFactor = this.windowStates[mainWindowSizeKey].zoomFactor ?? 1.0;
     });
 
-    // Persist zoom changes immediately when user zooms in/out or resets zoom
+    // Persist zoom changes from mouse wheel and programmatic zoom operations
+    // NOTE: This event does NOT fire for keyboard shortcuts (Ctrl+/-/0, Cmd+/-/0)
+    // which are handled by custom menu click handlers in ViewMenu
     // We can't depend on higher level web events (like close) to do this
     // because locking the vault resets window state.
     this.win.webContents.on("zoom-changed", async () => {
@@ -427,6 +435,11 @@ export class WindowMain {
     await this.desktopSettingsService.setAlwaysOnTop(this.enableAlwaysOnTop);
   }
 
+  async saveZoomFactor(zoomFactor: number) {
+    this.windowStates[mainWindowSizeKey].zoomFactor = zoomFactor;
+    await this.desktopSettingsService.setWindow(this.windowStates[mainWindowSizeKey]);
+  }
+
   private windowStateChangeHandler(configKey: string, win: BrowserWindow) {
     global.clearTimeout(this.windowStateChangeTimer);
     this.windowStateChangeTimer = global.setTimeout(async () => {
@@ -500,9 +513,9 @@ export class WindowMain {
         displayBounds.x !== state.displayBounds.x ||
         displayBounds.y !== state.displayBounds.y
       ) {
-        state.x = undefined;
-        state.y = undefined;
         displayBounds = screen.getPrimaryDisplay().bounds;
+        state.x = displayBounds.x + displayBounds.width / 2 - state.width / 2;
+        state.y = displayBounds.y + displayBounds.height / 2 - state.height / 2;
       }
     }
 
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index 706ad67aa2a..44fdb5c23b0 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.9.1",
+  "version": "2025.12.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.9.1",
+      "version": "2025.12.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 7d8d0cc18a2..4c396304f4a 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.9.1",
+  "version": "2025.12.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/components/approve-ssh-request.html b/apps/desktop/src/platform/components/approve-ssh-request.html
index b7005872f25..55092788079 100644
--- a/apps/desktop/src/platform/components/approve-ssh-request.html
+++ b/apps/desktop/src/platform/components/approve-ssh-request.html
@@ -1,6 +1,6 @@
 <form [bitSubmit]="submit" [formGroup]="approveSshRequestForm">
   <bit-dialog>
-    <div class="tw-font-semibold" bitDialogTitle>{{ "sshkeyApprovalTitle" | i18n }}</div>
+    <div class="tw-font-medium" bitDialogTitle>{{ "sshkeyApprovalTitle" | i18n }}</div>
     <div bitDialogContent>
       <app-callout
         type="warning"
diff --git a/apps/desktop/src/platform/components/approve-ssh-request.ts b/apps/desktop/src/platform/components/approve-ssh-request.ts
index 8cd63e0b1ac..1741124774d 100644
--- a/apps/desktop/src/platform/components/approve-ssh-request.ts
+++ b/apps/desktop/src/platform/components/approve-ssh-request.ts
@@ -21,6 +21,8 @@ export interface ApproveSshRequestParams {
   action: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-approve-ssh-request",
   templateUrl: "approve-ssh-request.html",
diff --git a/apps/desktop/src/platform/main/autofill/native-autofill.main.ts b/apps/desktop/src/platform/main/autofill/native-autofill.main.ts
index f66eea180cf..71cfcab84ba 100644
--- a/apps/desktop/src/platform/main/autofill/native-autofill.main.ts
+++ b/apps/desktop/src/platform/main/autofill/native-autofill.main.ts
@@ -35,7 +35,7 @@ export class NativeAutofillMain {
     );
 
     this.ipcServer = await autofill.IpcServer.listen(
-      "autofill",
+      "af",
       // RegistrationCallback
       (error, clientId, sequenceNumber, request) => {
         if (error) {
diff --git a/apps/desktop/src/platform/popup-modal-styles.ts b/apps/desktop/src/platform/popup-modal-styles.ts
index ae46ebb5c76..5c5619bd463 100644
--- a/apps/desktop/src/platform/popup-modal-styles.ts
+++ b/apps/desktop/src/platform/popup-modal-styles.ts
@@ -45,11 +45,11 @@ export function applyMainWindowStyles(window: BrowserWindow, existingWindowState
   // need to guard against null/undefined values
 
   if (existingWindowState?.width && existingWindowState?.height) {
-    window.setSize(existingWindowState.width, existingWindowState.height);
+    window.setSize(Math.floor(existingWindowState.width), Math.floor(existingWindowState.height));
   }
 
   if (existingWindowState?.x && existingWindowState?.y) {
-    window.setPosition(existingWindowState.x, existingWindowState.y);
+    window.setPosition(Math.floor(existingWindowState.x), Math.floor(existingWindowState.y));
   }
 
   window.setWindowButtonVisibility?.(true);
diff --git a/apps/desktop/src/platform/services/electron-platform-utils.service.ts b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
index de63c6b28aa..9377ac567ec 100644
--- a/apps/desktop/src/platform/services/electron-platform-utils.service.ts
+++ b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
@@ -151,4 +151,20 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
   getAutofillKeyboardShortcut(): Promise<string> {
     return null;
   }
+
+  async packageType(): Promise<string> {
+    if (ipc.platform.isMacAppStore) {
+      return "MacAppStore";
+    } else if (ipc.platform.isWindowsStore) {
+      return "WindowsStore";
+    } else if (ipc.platform.isAppImage) {
+      return "AppImage";
+    } else if (ipc.platform.isSnapStore) {
+      return "Snap";
+    } else if (ipc.platform.isFlatpak) {
+      return "Flatpak";
+    } else {
+      return "Unknown";
+    }
+  }
 }
diff --git a/apps/desktop/src/platform/services/electron-storage.service.ts b/apps/desktop/src/platform/services/electron-storage.service.ts
index 2d292d6537b..34aa8837475 100644
--- a/apps/desktop/src/platform/services/electron-storage.service.ts
+++ b/apps/desktop/src/platform/services/electron-storage.service.ts
@@ -3,6 +3,7 @@
 import * as fs from "fs";
 
 import { ipcMain } from "electron";
+import ElectronStore from "electron-store";
 import { Subject } from "rxjs";
 
 import {
@@ -11,22 +12,7 @@ import {
 } from "@bitwarden/common/platform/abstractions/storage.service";
 import { NodeUtils } from "@bitwarden/node/node-utils";
 
-// See: https://github.com/sindresorhus/electron-store/blob/main/index.d.ts
-interface ElectronStoreOptions {
-  defaults: unknown;
-  name: string;
-}
-
-type ElectronStoreConstructor = new (options: ElectronStoreOptions) => ElectronStore;
-
-// eslint-disable-next-line
-const Store: ElectronStoreConstructor = require("electron-store");
-
-interface ElectronStore {
-  get: (key: string) => unknown;
-  set: (key: string, obj: unknown) => void;
-  delete: (key: string) => void;
-}
+import { isWindowsPortable } from "../../utils";
 
 interface BaseOptions<T extends string> {
   action: T;
@@ -48,11 +34,13 @@ export class ElectronStorageService implements AbstractStorageService {
     if (!fs.existsSync(dir)) {
       NodeUtils.mkdirpSync(dir, "700");
     }
-    const storeConfig: ElectronStoreOptions = {
+    const fileMode = isWindowsPortable() ? 0o666 : 0o600;
+    const storeConfig: ElectronStore.Options<Record<string, unknown>> = {
       defaults: defaults,
       name: "data",
+      configFileMode: fileMode,
     };
-    this.store = new Store(storeConfig);
+    this.store = new ElectronStore(storeConfig);
     this.updates$ = this.updatesSubject.asObservable();
 
     ipcMain.handle("storageService", (event, options: Options) => {
diff --git a/apps/desktop/src/platform/services/sso-localhost-callback.service.ts b/apps/desktop/src/platform/services/sso-localhost-callback.service.ts
index 14baee51b90..75a84919b07 100644
--- a/apps/desktop/src/platform/services/sso-localhost-callback.service.ts
+++ b/apps/desktop/src/platform/services/sso-localhost-callback.service.ts
@@ -12,10 +12,13 @@ import { MessageSender } from "@bitwarden/common/platform/messaging";
 
 /**
  * The SSO Localhost login service uses a local host listener as fallback in case scheme handling deeplinks does not work.
- * This way it is possible to log in with SSO on appimage, snap, and electron dev using the same methods that the cli uses.
+ * This way it is possible to log in with SSO on appimage and electron dev using the same methods that the cli uses.
  */
 export class SSOLocalhostCallbackService {
   private ssoRedirectUri = "";
+  // We will only track one server at a time for use-case and performance considerations.
+  // This will result in a last-one-wins behavior if multiple SSO flows are started simultaneously.
+  private currentServer: http.Server | null = null;
 
   constructor(
     private environmentService: EnvironmentService,
@@ -23,11 +26,30 @@ export class SSOLocalhostCallbackService {
     private ssoUrlService: SsoUrlService,
   ) {
     ipcMain.handle("openSsoPrompt", async (event, { codeChallenge, state, email }) => {
-      const { ssoCode, recvState } = await this.openSsoPrompt(codeChallenge, state, email);
-      this.messagingService.send("ssoCallback", {
-        code: ssoCode,
-        state: recvState,
-        redirectUri: this.ssoRedirectUri,
+      // Close any existing server before starting new one
+      if (this.currentServer) {
+        await this.closeCurrentServer();
+      }
+
+      return this.openSsoPrompt(codeChallenge, state, email).then(({ ssoCode, recvState }) => {
+        this.messagingService.send("ssoCallback", {
+          code: ssoCode,
+          state: recvState,
+          redirectUri: this.ssoRedirectUri,
+        });
+      });
+    });
+  }
+
+  private async closeCurrentServer(): Promise<void> {
+    if (!this.currentServer) {
+      return;
+    }
+
+    return new Promise<void>((resolve) => {
+      this.currentServer!.close(() => {
+        this.currentServer = null;
+        resolve();
       });
     });
   }
@@ -59,6 +81,7 @@ export class SSOLocalhostCallbackService {
               "<p>You may now close this tab and return to the app.</p>" +
               "</body></html>",
           );
+          this.currentServer = null;
           callbackServer.close(() =>
             resolve({
               ssoCode: code,
@@ -73,41 +96,68 @@ export class SSOLocalhostCallbackService {
               "<p>You may now close this tab and return to the app.</p>" +
               "</body></html>",
           );
+          this.currentServer = null;
           callbackServer.close(() => reject());
         }
       });
 
-      let foundPort = false;
-      const webUrl = env.getWebVaultUrl();
-      for (let port = 8065; port <= 8070; port++) {
-        try {
-          this.ssoRedirectUri = "http://localhost:" + port;
-          const ssoUrl = this.ssoUrlService.buildSsoUrl(
-            webUrl,
-            ClientType.Desktop,
-            this.ssoRedirectUri,
-            state,
-            codeChallenge,
-            email,
-          );
-          callbackServer.listen(port, () => {
-            this.messagingService.send("launchUri", {
-              url: ssoUrl,
-            });
-          });
-          foundPort = true;
-          break;
-        } catch {
-          // Ignore error since we run the same command up to 5 times.
-        }
-      }
-      if (!foundPort) {
-        reject();
-      }
+      // Store reference to current server
+      this.currentServer = callbackServer;
 
-      // after 5 minutes, close the server
+      const webUrl = env.getWebVaultUrl();
+
+      const tryNextPort = (port: number) => {
+        if (port > 8070) {
+          this.currentServer = null;
+          reject("All available SSO ports in use");
+          return;
+        }
+
+        this.ssoRedirectUri = "http://localhost:" + port;
+        const ssoUrl = this.ssoUrlService.buildSsoUrl(
+          webUrl,
+          ClientType.Desktop,
+          this.ssoRedirectUri,
+          state,
+          codeChallenge,
+          email,
+        );
+
+        // Set up error handler before attempting to listen
+        callbackServer.once("error", (err: any) => {
+          if (err.code === "EADDRINUSE") {
+            // Port is in use, try next port
+            tryNextPort(port + 1);
+          } else {
+            // Another error - reject and set the current server to null
+            // (one server alive at a time)
+            this.currentServer = null;
+            reject();
+          }
+        });
+
+        // Attempt to listen on the port
+        callbackServer.listen(port, () => {
+          // Success - remove error listener and launch SSO
+          callbackServer.removeAllListeners("error");
+
+          this.messagingService.send("launchUri", {
+            url: ssoUrl,
+          });
+        });
+      };
+
+      // Start trying from port 8065
+      tryNextPort(8065);
+
+      // Don't allow any server to stay up for more than 5 minutes;
+      // this gives plenty of time to complete SSO but ensures we don't
+      // have a server running indefinitely.
       setTimeout(
         () => {
+          if (this.currentServer === callbackServer) {
+            this.currentServer = null;
+          }
           callbackServer.close(() => reject());
         },
         5 * 60 * 1000,
diff --git a/apps/desktop/src/scss/environment.scss b/apps/desktop/src/scss/environment.scss
index e1356178208..699f2246b4a 100644
--- a/apps/desktop/src/scss/environment.scss
+++ b/apps/desktop/src/scss/environment.scss
@@ -21,7 +21,7 @@
   padding-left: 15px;
 
   span {
-    font-weight: 600;
+    font-weight: 500;
     font-size: $font-size-small;
   }
 }
diff --git a/apps/desktop/src/scss/left-nav.scss b/apps/desktop/src/scss/left-nav.scss
index d65e60079a5..54b795548f2 100644
--- a/apps/desktop/src/scss/left-nav.scss
+++ b/apps/desktop/src/scss/left-nav.scss
@@ -72,7 +72,7 @@
 
   &.active {
     .filter-button {
-      font-weight: bold;
+      font-weight: 500;
       @include themify($themes) {
         color: themed("primaryColor");
       }
@@ -114,7 +114,7 @@
       .filter-button {
         @include themify($themes) {
           color: themed("primaryColor");
-          font-weight: bold;
+          font-weight: 500;
         }
         max-width: 90%;
       }
diff --git a/apps/desktop/src/scss/misc.scss b/apps/desktop/src/scss/misc.scss
index b64bdd92120..c70eb823213 100644
--- a/apps/desktop/src/scss/misc.scss
+++ b/apps/desktop/src/scss/misc.scss
@@ -360,11 +360,16 @@ form,
   }
 }
 
-.settings-link {
+.help-block a.settings-link {
+  text-decoration: none;
   @include themify($themes) {
     color: themed("primaryColor");
+
+    &:hover,
+    &:focus {
+      color: darken(themed("primaryColor"), 6%);
+    }
   }
-  font-weight: bold;
 }
 
 app-root > #loading,
diff --git a/apps/desktop/src/scss/modal.scss b/apps/desktop/src/scss/modal.scss
index 1d86b1e880a..b3994946394 100644
--- a/apps/desktop/src/scss/modal.scss
+++ b/apps/desktop/src/scss/modal.scss
@@ -47,7 +47,7 @@ $modal-sm: 300px !default;
 $modal-transition: transform 0.3s ease-out !default;
 
 $close-font-size: $font-size-base * 1.5 !default;
-$close-font-weight: bold !default;
+$close-font-weight: 500 !default;
 $close-color: $black !default;
 $close-text-shadow: 0 1px 0 $white !default;
 
@@ -218,7 +218,7 @@ $close-text-shadow: 0 1px 0 $white !default;
 
   h5 {
     font-size: $font-size-base;
-    font-weight: bold;
+    font-weight: 500;
     display: flex;
     align-items: center;
 
diff --git a/apps/desktop/src/scss/variables.scss b/apps/desktop/src/scss/variables.scss
index b094be63f8c..0afff76e4ef 100644
--- a/apps/desktop/src/scss/variables.scss
+++ b/apps/desktop/src/scss/variables.scss
@@ -1,6 +1,6 @@
 $dark-icon-themes: "theme_dark";
 
-$font-family-sans-serif: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-sans-serif: Inter, "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
 $font-size-base: 14px;
 $font-size-large: 18px;
diff --git a/apps/desktop/src/services/biometric-message-handler.service.spec.ts b/apps/desktop/src/services/biometric-message-handler.service.spec.ts
index ad555729ab3..49d346bfa3a 100644
--- a/apps/desktop/src/services/biometric-message-handler.service.spec.ts
+++ b/apps/desktop/src/services/biometric-message-handler.service.spec.ts
@@ -13,13 +13,9 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { FakeAccountService } from "@bitwarden/common/spec";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
 import { UserId } from "@bitwarden/common/types/guid";
-import { DialogService, I18nMockService } from "@bitwarden/components";
-import {
-  KeyService,
-  BiometricsService,
-  BiometricStateService,
-  BiometricsCommands,
-} from "@bitwarden/key-management";
+import { DialogService } from "@bitwarden/components";
+import { KeyService, BiometricsService, BiometricsCommands } from "@bitwarden/key-management";
+import { ConfigService } from "@bitwarden/services/config.service";
 
 import { DesktopSettingsService } from "../platform/services/desktop-settings.service";
 
@@ -47,15 +43,14 @@ describe("BiometricMessageHandlerService", () => {
   let keyService: MockProxy<KeyService>;
   let encryptService: MockProxy<EncryptService>;
   let logService: MockProxy<LogService>;
+  let configService: MockProxy<ConfigService>;
   let messagingService: MockProxy<MessagingService>;
   let desktopSettingsService: DesktopSettingsService;
-  let biometricStateService: BiometricStateService;
   let biometricsService: MockProxy<BiometricsService>;
   let dialogService: MockProxy<DialogService>;
   let accountService: AccountService;
   let authService: MockProxy<AuthService>;
   let ngZone: MockProxy<NgZone>;
-  let i18nService: MockProxy<I18nMockService>;
 
   beforeEach(() => {
     cryptoFunctionService = mock<CryptoFunctionService>();
@@ -64,14 +59,13 @@ describe("BiometricMessageHandlerService", () => {
     logService = mock<LogService>();
     messagingService = mock<MessagingService>();
     desktopSettingsService = mock<DesktopSettingsService>();
-    biometricStateService = mock<BiometricStateService>();
+    configService = mock<ConfigService>();
     biometricsService = mock<BiometricsService>();
     dialogService = mock<DialogService>();
 
     accountService = new FakeAccountService(accounts);
     authService = mock<AuthService>();
     ngZone = mock<NgZone>();
-    i18nService = mock<I18nMockService>();
 
     desktopSettingsService.browserIntegrationEnabled$ = of(false);
     desktopSettingsService.browserIntegrationFingerprintEnabled$ = of(false);
@@ -94,7 +88,7 @@ describe("BiometricMessageHandlerService", () => {
     cryptoFunctionService.rsaEncrypt.mockResolvedValue(
       Utils.fromUtf8ToArray("encrypted") as CsprngArray,
     );
-
+    configService.getFeatureFlag.mockResolvedValue(false);
     service = new BiometricMessageHandlerService(
       cryptoFunctionService,
       keyService,
@@ -102,13 +96,12 @@ describe("BiometricMessageHandlerService", () => {
       logService,
       messagingService,
       desktopSettingsService,
-      biometricStateService,
       biometricsService,
       dialogService,
       accountService,
       authService,
       ngZone,
-      i18nService,
+      configService,
     );
   });
 
@@ -160,13 +153,12 @@ describe("BiometricMessageHandlerService", () => {
         logService,
         messagingService,
         desktopSettingsService,
-        biometricStateService,
         biometricsService,
         dialogService,
         accountService,
         authService,
         ngZone,
-        i18nService,
+        configService,
       );
     });
 
diff --git a/apps/desktop/src/services/biometric-message-handler.service.ts b/apps/desktop/src/services/biometric-message-handler.service.ts
index 8b4c3744a8d..ca4ea14c1e0 100644
--- a/apps/desktop/src/services/biometric-message-handler.service.ts
+++ b/apps/desktop/src/services/biometric-message-handler.service.ts
@@ -4,25 +4,21 @@ import { combineLatest, concatMap, firstValueFrom } 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 { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import { DialogService } from "@bitwarden/components";
-import {
-  BiometricStateService,
-  BiometricsCommands,
-  BiometricsService,
-  BiometricsStatus,
-  KeyService,
-} from "@bitwarden/key-management";
+import { BiometricsCommands, BiometricsStatus, KeyService } from "@bitwarden/key-management";
 
 import { BrowserSyncVerificationDialogComponent } from "../app/components/browser-sync-verification-dialog.component";
+import { DesktopBiometricsService } from "../key-management/biometrics/desktop.biometrics.service";
 import { LegacyMessage, LegacyMessageWrapper } from "../models/native-messaging";
 import { DesktopSettingsService } from "../platform/services/desktop-settings.service";
 
@@ -82,13 +78,12 @@ export class BiometricMessageHandlerService {
     private logService: LogService,
     private messagingService: MessagingService,
     private desktopSettingService: DesktopSettingsService,
-    private biometricStateService: BiometricStateService,
-    private biometricsService: BiometricsService,
+    private biometricsService: DesktopBiometricsService,
     private dialogService: DialogService,
     private accountService: AccountService,
     private authService: AuthService,
     private ngZone: NgZone,
-    private i18nService: I18nService,
+    private configService: ConfigService,
   ) {
     combineLatest([
       this.desktopSettingService.browserIntegrationEnabled$,
@@ -119,6 +114,17 @@ export class BiometricMessageHandlerService {
 
   private connectedApps: ConnectedApps = new ConnectedApps();
 
+  async init() {
+    this.logService.debug(
+      "[BiometricMessageHandlerService] Initializing biometric message handler",
+    );
+
+    const linuxV2Enabled = await this.configService.getFeatureFlag(FeatureFlag.LinuxBiometricsV2);
+    if (linuxV2Enabled) {
+      await this.biometricsService.enableLinuxV2Biometrics();
+    }
+  }
+
   async handleMessage(msg: LegacyMessageWrapper) {
     const { appId, message: rawMessage } = msg as LegacyMessageWrapper;
 
diff --git a/apps/desktop/src/services/desktop-premium-upgrade-prompt.service.spec.ts b/apps/desktop/src/services/desktop-premium-upgrade-prompt.service.spec.ts
index 3b33116ea5a..1eee4cd54f6 100644
--- a/apps/desktop/src/services/desktop-premium-upgrade-prompt.service.spec.ts
+++ b/apps/desktop/src/services/desktop-premium-upgrade-prompt.service.spec.ts
@@ -1,20 +1,31 @@
 import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 
+import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { DialogService } from "@bitwarden/components";
 
 import { DesktopPremiumUpgradePromptService } from "./desktop-premium-upgrade-prompt.service";
 
 describe("DesktopPremiumUpgradePromptService", () => {
   let service: DesktopPremiumUpgradePromptService;
   let messager: MockProxy<MessagingService>;
+  let configService: MockProxy<ConfigService>;
+  let dialogService: MockProxy<DialogService>;
 
   beforeEach(async () => {
     messager = mock<MessagingService>();
+    configService = mock<ConfigService>();
+    dialogService = mock<DialogService>();
+
     await TestBed.configureTestingModule({
       providers: [
         DesktopPremiumUpgradePromptService,
         { provide: MessagingService, useValue: messager },
+        { provide: ConfigService, useValue: configService },
+        { provide: DialogService, useValue: dialogService },
       ],
     }).compileComponents();
 
@@ -22,9 +33,38 @@ describe("DesktopPremiumUpgradePromptService", () => {
   });
 
   describe("promptForPremium", () => {
-    it("navigates to the premium update screen", async () => {
+    let openSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      openSpy = jest.spyOn(PremiumUpgradeDialogComponent, "open").mockImplementation();
+    });
+
+    afterEach(() => {
+      openSpy.mockRestore();
+    });
+
+    it("opens the new premium upgrade dialog when feature flag is enabled", async () => {
+      configService.getFeatureFlag.mockResolvedValue(true);
+
       await service.promptForPremium();
+
+      expect(configService.getFeatureFlag).toHaveBeenCalledWith(
+        FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
+      );
+      expect(openSpy).toHaveBeenCalledWith(dialogService);
+      expect(messager.send).not.toHaveBeenCalled();
+    });
+
+    it("sends openPremium message when feature flag is disabled", async () => {
+      configService.getFeatureFlag.mockResolvedValue(false);
+
+      await service.promptForPremium();
+
+      expect(configService.getFeatureFlag).toHaveBeenCalledWith(
+        FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
+      );
       expect(messager.send).toHaveBeenCalledWith("openPremium");
+      expect(openSpy).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/apps/desktop/src/services/desktop-premium-upgrade-prompt.service.ts b/apps/desktop/src/services/desktop-premium-upgrade-prompt.service.ts
index f2375ecfebb..5004e5ed547 100644
--- a/apps/desktop/src/services/desktop-premium-upgrade-prompt.service.ts
+++ b/apps/desktop/src/services/desktop-premium-upgrade-prompt.service.ts
@@ -1,15 +1,29 @@
 import { inject } from "@angular/core";
 
+import { PremiumUpgradeDialogComponent } from "@bitwarden/angular/billing/components";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+import { DialogService } from "@bitwarden/components";
 
 /**
  * This class handles the premium upgrade process for the desktop.
  */
 export class DesktopPremiumUpgradePromptService implements PremiumUpgradePromptService {
   private messagingService = inject(MessagingService);
+  private configService = inject(ConfigService);
+  private dialogService = inject(DialogService);
 
   async promptForPremium() {
-    this.messagingService.send("openPremium");
+    const showNewDialog = await this.configService.getFeatureFlag(
+      FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
+    );
+
+    if (showNewDialog) {
+      PremiumUpgradeDialogComponent.open(this.dialogService);
+    } else {
+      this.messagingService.send("openPremium");
+    }
   }
 }
diff --git a/apps/desktop/src/types/biometric-message.ts b/apps/desktop/src/types/biometric-message.ts
index 9711b49496d..7ae20945e96 100644
--- a/apps/desktop/src/types/biometric-message.ts
+++ b/apps/desktop/src/types/biometric-message.ts
@@ -13,6 +13,12 @@ export enum BiometricAction {
 
   GetShouldAutoprompt = "getShouldAutoprompt",
   SetShouldAutoprompt = "setShouldAutoprompt",
+
+  EnrollPersistent = "enrollPersistent",
+  HasPersistentKey = "hasPersistentKey",
+
+  EnableLinuxV2 = "enableLinuxV2",
+  IsLinuxV2Enabled = "isLinuxV2Enabled",
 }
 
 export type BiometricMessage =
@@ -22,7 +28,15 @@ export type BiometricMessage =
       key: string;
     }
   | {
-      action: Exclude<BiometricAction, BiometricAction.SetKeyForUser>;
+      action: BiometricAction.EnrollPersistent;
+      userId: string;
+      key: string;
+    }
+  | {
+      action: Exclude<
+        BiometricAction,
+        BiometricAction.SetKeyForUser | BiometricAction.EnrollPersistent
+      >;
       userId?: string;
       data?: any;
     };
diff --git a/apps/desktop/src/utils.ts b/apps/desktop/src/utils.ts
index ba8c1a2dba6..0f186060aae 100644
--- a/apps/desktop/src/utils.ts
+++ b/apps/desktop/src/utils.ts
@@ -53,7 +53,8 @@ export function isWindowsStore() {
   if (
     windows &&
     !windowsStore &&
-    process.resourcesPath?.indexOf("8bitSolutionsLLC.bitwardendesktop_") > -1
+    (process.resourcesPath?.indexOf("8bitSolutionsLLC.bitwardendesktop_") > -1 ||
+      process.resourcesPath?.indexOf("8bitSolutionsLLC.BitwardenBeta_") > -1)
   ) {
     windowsStore = true;
   }
@@ -69,8 +70,7 @@ export function isWindowsPortable() {
 }
 
 /**
- * We block the browser integration on some unsupported platforms, which also
- * blocks partially supported platforms (mac .dmg in dev builds) / prevents
+ * We block the browser integration on some unsupported platforms prevents
  * experimenting with the feature for QA. So this env var allows overriding
  * the block.
  */
diff --git a/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.ts b/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.ts
index d81f1662c6c..5af1f96a569 100644
--- a/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.ts
+++ b/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.ts
@@ -10,6 +10,8 @@ import {
   CollectionAssignmentResult,
 } from "@bitwarden/vault";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   templateUrl: "./assign-collections-desktop.component.html",
diff --git a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
index 26349920106..775ef55b3eb 100644
--- a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
+++ b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
@@ -39,6 +39,8 @@ export const CredentialGeneratorDialogAction = {
 
 type CredentialGeneratorDialogAction = UnionOfValues<typeof CredentialGeneratorDialogAction>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "credential-generator-dialog",
   templateUrl: "credential-generator-dialog.component.html",
diff --git a/apps/desktop/src/vault/app/vault/item-footer.component.html b/apps/desktop/src/vault/app/vault/item-footer.component.html
index 162335d03bb..859b2f1bdc5 100644
--- a/apps/desktop/src/vault/app/vault/item-footer.component.html
+++ b/apps/desktop/src/vault/app/vault/item-footer.component.html
@@ -46,7 +46,23 @@
       <i class="bwi bwi-files bwi-fw bwi-lg" aria-hidden="true"></i>
     </button>
   </ng-container>
-  <div class="right" *ngIf="cipher.permissions.delete && (action === 'edit' || action === 'view')">
+  <div class="right" *ngIf="hasFooterAction">
+    <button
+      type="button"
+      *ngIf="showArchiveButton"
+      (click)="archive()"
+      appA11yTitle="{{ 'archiveVerb' | i18n }}"
+    >
+      <i class="bwi bwi-archive bwi-lg bwi-fw" aria-hidden="true"></i>
+    </button>
+    <button
+      type="button"
+      *ngIf="showUnarchiveButton"
+      (click)="unarchive()"
+      appA11yTitle="{{ 'unarchive' | i18n }}"
+    >
+      <i class="bwi bwi-unarchive bwi-lg bwi-fw" aria-hidden="true"></i>
+    </button>
     <button
       type="button"
       (click)="delete()"
diff --git a/apps/desktop/src/vault/app/vault/item-footer.component.ts b/apps/desktop/src/vault/app/vault/item-footer.component.ts
index fef58d80a39..0034bd9a43c 100644
--- a/apps/desktop/src/vault/app/vault/item-footer.component.ts
+++ b/apps/desktop/src/vault/app/vault/item-footer.component.ts
@@ -1,6 +1,15 @@
 import { CommonModule } from "@angular/common";
-import { Input, Output, EventEmitter, Component, OnInit, ViewChild } from "@angular/core";
-import { firstValueFrom } from "rxjs";
+import {
+  Input,
+  Output,
+  EventEmitter,
+  Component,
+  OnInit,
+  ViewChild,
+  OnChanges,
+  SimpleChanges,
+} from "@angular/core";
+import { combineLatest, firstValueFrom, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -8,33 +17,62 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
 import { ButtonComponent, ButtonModule, DialogService, ToastService } from "@bitwarden/components";
-import { PasswordRepromptService } from "@bitwarden/vault";
+import { ArchiveCipherUtilitiesService, PasswordRepromptService } from "@bitwarden/vault";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-item-footer",
   templateUrl: "item-footer.component.html",
   imports: [ButtonModule, CommonModule, JslibModule],
 })
-export class ItemFooterComponent implements OnInit {
+export class ItemFooterComponent implements OnInit, OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipher: CipherView = new CipherView();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collectionId: string | null = null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) action: string = "view";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() masterPasswordAlreadyPrompted: boolean = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEdit = new EventEmitter<CipherView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onClone = new EventEmitter<CipherView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onDelete = new EventEmitter<CipherView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onRestore = new EventEmitter<CipherView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCancel = new EventEmitter<CipherView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
+  @Output() onArchiveToggle = new EventEmitter<CipherView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("submitBtn", { static: false }) submitBtn: ButtonComponent | null = null;
 
   activeUserId: UserId | null = null;
   passwordReprompted: boolean = false;
 
+  protected showArchiveButton = false;
+  protected showUnarchiveButton = false;
+
   constructor(
     protected cipherService: CipherService,
     protected dialogService: DialogService,
@@ -44,11 +82,20 @@ export class ItemFooterComponent implements OnInit {
     protected toastService: ToastService,
     protected i18nService: I18nService,
     protected logService: LogService,
+    protected cipherArchiveService: CipherArchiveService,
+    protected archiveCipherUtilitiesService: ArchiveCipherUtilitiesService,
   ) {}
 
   async ngOnInit() {
     this.activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     this.passwordReprompted = this.masterPasswordAlreadyPrompted;
+    await this.checkArchiveState();
+  }
+
+  async ngOnChanges(changes: SimpleChanges) {
+    if (changes.cipher) {
+      await this.checkArchiveState();
+    }
   }
 
   async clone() {
@@ -76,6 +123,14 @@ export class ItemFooterComponent implements OnInit {
     this.onEdit.emit(this.cipher);
   }
 
+  protected get hasFooterAction() {
+    return (
+      this.showArchiveButton ||
+      this.showUnarchiveButton ||
+      (this.cipher.permissions?.delete && (this.action === "edit" || this.action === "view"))
+    );
+  }
+
   cancel() {
     this.onCancel.emit(this.cipher);
   }
@@ -151,4 +206,36 @@ export class ItemFooterComponent implements OnInit {
 
     return (this.passwordReprompted = await this.passwordRepromptService.showPasswordPrompt());
   }
+
+  protected async archive() {
+    await this.archiveCipherUtilitiesService.archiveCipher(this.cipher);
+    this.onArchiveToggle.emit();
+  }
+
+  protected async unarchive() {
+    await this.archiveCipherUtilitiesService.unarchiveCipher(this.cipher);
+    this.onArchiveToggle.emit();
+  }
+
+  private async checkArchiveState() {
+    const cipherCanBeArchived = !this.cipher.isDeleted && this.cipher.organizationId == null;
+    const [userCanArchive, hasArchiveFlagEnabled] = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(
+        getUserId,
+        switchMap((id) =>
+          combineLatest([
+            this.cipherArchiveService.userCanArchive$(id),
+            this.cipherArchiveService.hasArchiveFlagEnabled$(),
+          ]),
+        ),
+      ),
+    );
+
+    this.showArchiveButton =
+      cipherCanBeArchived && userCanArchive && this.action === "view" && !this.cipher.isArchived;
+
+    // A user should always be able to unarchive an archived item
+    this.showUnarchiveButton =
+      hasArchiveFlagEnabled && this.action === "view" && this.cipher.isArchived;
+  }
 }
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html
index e123f4400c7..f83a2e1c91f 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html
@@ -55,7 +55,10 @@
           >
             <i
               *ngIf="c.children.length === 0"
-              class="bwi bwi-fw bwi-collection-shared"
+              [class]="
+                'bwi bwi-fw ' +
+                (c.node.type === DefaultCollectionType ? 'bwi-user' : 'bwi-collection-shared')
+              "
               aria-hidden="true"
             ></i>
             &nbsp;{{ c.node.name }}
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.ts
index 22372410e5b..015b301efdb 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { CollectionFilterComponent as BaseCollectionFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/collection-filter.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-collection-filter",
   templateUrl: "collection-filter.component.html",
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.ts
index d7364808f6d..f340e4082b8 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { FolderFilterComponent as BaseFolderFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/folder-filter.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-folder-filter",
   templateUrl: "folder-filter.component.html",
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.ts
index 503c2b2ec6e..99338ddbb7c 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.ts
@@ -9,6 +9,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-organization-filter",
   templateUrl: "organization-filter.component.html",
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html
index 0e4a4c997e9..8b064778444 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html
@@ -29,6 +29,25 @@
         </button>
       </span>
     </li>
+    <li
+      class="filter-option tw-flex tw-items-center tw-gap-2 [&>span]:tw-w-min"
+      [ngClass]="{ active: activeFilter.status === 'archive' }"
+      *ngIf="!hideArchive"
+    >
+      <span class="filter-buttons">
+        <button
+          type="button"
+          class="filter-button"
+          (click)="handleArchiveFilter($event)"
+          [attr.aria-pressed]="activeFilter.status === 'archive'"
+        >
+          <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>&nbsp;{{ "archiveNoun" | i18n }}
+        </button>
+      </span>
+      @if (!(canArchive$ | async)) {
+        <app-premium-badge></app-premium-badge>
+      }
+    </li>
     <li
       class="filter-option"
       *ngIf="!hideTrash"
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.spec.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.spec.ts
new file mode 100644
index 00000000000..ba785310a0a
--- /dev/null
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.spec.ts
@@ -0,0 +1,98 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+import { StatusFilterComponent } from "./status-filter.component";
+
+describe("StatusFilterComponent", () => {
+  let component: StatusFilterComponent;
+  let fixture: ComponentFixture<StatusFilterComponent>;
+  let cipherArchiveService: jest.Mocked<CipherArchiveService>;
+  let accountService: FakeAccountService;
+
+  const mockUserId = Utils.newGuid() as UserId;
+  const event = new Event("click");
+
+  beforeEach(async () => {
+    accountService = mockAccountServiceWith(mockUserId);
+    cipherArchiveService = mock<CipherArchiveService>();
+
+    await TestBed.configureTestingModule({
+      declarations: [StatusFilterComponent],
+      providers: [
+        { provide: AccountService, useValue: accountService },
+        { provide: CipherArchiveService, useValue: cipherArchiveService },
+        { provide: PremiumUpgradePromptService, useValue: mock<PremiumUpgradePromptService>() },
+        {
+          provide: BillingAccountProfileStateService,
+          useValue: mock<BillingAccountProfileStateService>(),
+        },
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+      ],
+      imports: [JslibModule, PremiumBadgeComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(StatusFilterComponent);
+    component = fixture.componentInstance;
+    component.activeFilter = new VaultFilter();
+    fixture.detectChanges();
+  });
+
+  describe("handleArchiveFilter", () => {
+    const applyFilter = jest.fn();
+    let promptForPremiumSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      applyFilter.mockClear();
+      component["applyFilter"] = applyFilter;
+
+      promptForPremiumSpy = jest.spyOn(component["premiumBadgeComponent"]()!, "promptForPremium");
+    });
+
+    it("should apply archive filter when userCanArchive returns true", async () => {
+      cipherArchiveService.userCanArchive$.mockReturnValue(of(true));
+      cipherArchiveService.archivedCiphers$.mockReturnValue(of([]));
+
+      await component["handleArchiveFilter"](event);
+
+      expect(applyFilter).toHaveBeenCalledWith("archive");
+      expect(promptForPremiumSpy).not.toHaveBeenCalled();
+    });
+
+    it("should apply archive filter when userCanArchive returns false but hasArchivedCiphers is true", async () => {
+      const mockCipher = new CipherView();
+      mockCipher.id = "test-id";
+
+      cipherArchiveService.userCanArchive$.mockReturnValue(of(false));
+      cipherArchiveService.archivedCiphers$.mockReturnValue(of([mockCipher]));
+
+      await component["handleArchiveFilter"](event);
+
+      expect(applyFilter).toHaveBeenCalledWith("archive");
+      expect(promptForPremiumSpy).not.toHaveBeenCalled();
+    });
+
+    it("should prompt for premium when userCanArchive returns false and hasArchivedCiphers is false", async () => {
+      cipherArchiveService.userCanArchive$.mockReturnValue(of(false));
+      cipherArchiveService.archivedCiphers$.mockReturnValue(of([]));
+
+      await component["handleArchiveFilter"](event);
+
+      expect(applyFilter).not.toHaveBeenCalled();
+      expect(promptForPremiumSpy).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.ts
index 276b11d7138..95ffd3f0212 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.ts
@@ -1,10 +1,51 @@
-import { Component } from "@angular/core";
+import { Component, viewChild } from "@angular/core";
+import { combineLatest, firstValueFrom, map, switchMap } from "rxjs";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { StatusFilterComponent as BaseStatusFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/status-filter.component";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-status-filter",
   templateUrl: "status-filter.component.html",
   standalone: false,
 })
-export class StatusFilterComponent extends BaseStatusFilterComponent {}
+export class StatusFilterComponent extends BaseStatusFilterComponent {
+  private readonly premiumBadgeComponent = viewChild(PremiumBadgeComponent);
+
+  private userId$ = this.accountService.activeAccount$.pipe(getUserId);
+  protected canArchive$ = this.userId$.pipe(
+    switchMap((userId) => this.cipherArchiveService.userCanArchive$(userId)),
+  );
+
+  protected hasArchivedCiphers$ = this.userId$.pipe(
+    switchMap((userId) =>
+      this.cipherArchiveService.archivedCiphers$(userId).pipe(map((ciphers) => ciphers.length > 0)),
+    ),
+  );
+
+  constructor(
+    private accountService: AccountService,
+    private cipherArchiveService: CipherArchiveService,
+  ) {
+    super();
+  }
+
+  protected async handleArchiveFilter(event: Event) {
+    const [canArchive, hasArchivedCiphers] = await firstValueFrom(
+      combineLatest([this.canArchive$, this.hasArchivedCiphers$]),
+    );
+
+    if (canArchive || hasArchivedCiphers) {
+      this.applyFilter("archive");
+    } else if (this.premiumBadgeComponent()) {
+      // The `premiumBadgeComponent` should always be defined here, adding the
+      // if to satisfy TypeScript.
+      await this.premiumBadgeComponent().promptForPremium(event);
+    }
+  }
+}
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
index 27e7d5c5ecb..fbab7ce4667 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
@@ -5,6 +5,8 @@ import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angul
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { CIPHER_MENU_ITEMS } from "@bitwarden/common/vault/types/cipher-menu-items";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-type-filter",
   templateUrl: "type-filter.component.html",
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html
index 0664e0591ad..14e72f3bb9d 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html
@@ -17,6 +17,7 @@
     class="filter"
     [hideFavorites]="hideFavorites"
     [hideTrash]="hideTrash"
+    [hideArchive]="!showArchiveVaultFilter"
     [activeFilter]="activeFilter"
     (onFilterChange)="applyFilter($event)"
   ></app-status-filter>
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.ts
index 161d22687e8..d7c5bafc3a4 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { VaultFilterComponent as BaseVaultFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/vault-filter.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-filter",
   templateUrl: "vault-filter.component.html",
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts
index 8729996c835..54a6d33ca6a 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts
@@ -1,6 +1,7 @@
 import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "@bitwarden/angular/vault/abstractions/deprecated-vault-filter.service";
 import { VaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
@@ -13,7 +14,7 @@ import { TypeFilterComponent } from "./filters/type-filter.component";
 import { VaultFilterComponent } from "./vault-filter.component";
 
 @NgModule({
-  imports: [CommonModule, JslibModule],
+  imports: [CommonModule, JslibModule, PremiumBadgeComponent],
   declarations: [
     VaultFilterComponent,
     CollectionFilterComponent,
diff --git a/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
index 06654fb1a5c..d312d49277a 100644
--- a/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
@@ -7,6 +7,7 @@ import { distinctUntilChanged, debounceTime } from "rxjs";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
@@ -20,6 +21,8 @@ import { MenuModule } from "@bitwarden/components";
 
 import { SearchBarService } from "../../../app/layout/search/search-bar.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-items-v2",
   templateUrl: "vault-items-v2.component.html",
@@ -33,8 +36,9 @@ export class VaultItemsV2Component<C extends CipherViewLike> extends BaseVaultIt
     cipherService: CipherService,
     accountService: AccountService,
     restrictedItemTypesService: RestrictedItemTypesService,
+    configService: ConfigService,
   ) {
-    super(searchService, cipherService, accountService, restrictedItemTypesService);
+    super(searchService, cipherService, accountService, restrictedItemTypesService, configService);
 
     this.searchBarService.searchText$
       .pipe(debounceTime(SearchTextDebounceInterval), distinctUntilChanged(), takeUntilDestroyed())
diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.html b/apps/desktop/src/vault/app/vault/vault-v2.component.html
index a3f55f0ec63..2696dd0d452 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.html
@@ -19,6 +19,7 @@
       (onClone)="cloneCipher($event)"
       (onDelete)="deleteCipher()"
       (onCancel)="cancelCipher($event)"
+      (onArchiveToggle)="refreshCurrentCipher()"
       [masterPasswordAlreadyPrompted]="cipherRepromptId === cipherId"
     ></app-vault-item-footer>
     <div class="content">
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 5a6683ed904..6c4ebe13f14 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
@@ -20,12 +20,13 @@ import { AuthRequestServiceAbstraction } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -34,6 +35,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { getByIds } from "@bitwarden/common/platform/misc";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { CipherId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
@@ -46,6 +48,7 @@ import {
   CipherViewLike,
   CipherViewLikeUtils,
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+import { filterOutNullish } from "@bitwarden/common/vault/utils/observable-utilities";
 import {
   BadgeModule,
   ButtonModule,
@@ -74,6 +77,7 @@ import {
   DefaultCipherFormConfigService,
   PasswordRepromptService,
   CipherFormComponent,
+  ArchiveCipherUtilitiesService,
 } from "@bitwarden/vault";
 
 import { NavComponent } from "../../../app/layout/nav.component";
@@ -90,6 +94,8 @@ import { VaultItemsV2Component } from "./vault-items-v2.component";
 
 const BroadcasterSubscriptionId = "VaultComponent";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault",
   templateUrl: "vault-v2.component.html",
@@ -134,12 +140,20 @@ const BroadcasterSubscriptionId = "VaultComponent";
 export class VaultV2Component<C extends CipherViewLike>
   implements OnInit, OnDestroy, CopyClickListener
 {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(VaultItemsV2Component, { static: true })
   vaultItemsComponent: VaultItemsV2Component<C> | null = null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(VaultFilterComponent, { static: true })
   vaultFilterComponent: VaultFilterComponent | null = null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("folderAddEdit", { read: ViewContainerRef, static: true })
   folderAddEditModalRef: ViewContainerRef | null = null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(CipherFormComponent)
   cipherFormComponent: CipherFormComponent | null = null;
 
@@ -169,6 +183,7 @@ export class VaultV2Component<C extends CipherViewLike>
 
   private organizations$: Observable<Organization[]> = this.accountService.activeAccount$.pipe(
     map((a) => a?.id),
+    filterOutNullish(),
     switchMap((id) => this.organizationService.organizations$(id)),
   );
 
@@ -210,6 +225,9 @@ export class VaultV2Component<C extends CipherViewLike>
     private folderService: FolderService,
     private configService: ConfigService,
     private authRequestService: AuthRequestServiceAbstraction,
+    private cipherArchiveService: CipherArchiveService,
+    private policyService: PolicyService,
+    private archiveCipherUtilitiesService: ArchiveCipherUtilitiesService,
   ) {}
 
   async ngOnInit() {
@@ -291,7 +309,7 @@ export class VaultV2Component<C extends CipherViewLike>
                 ) {
                   const value = await firstValueFrom(
                     this.totpService.getCode$(this.cipher.login.totp),
-                  ).catch(() => null);
+                  ).catch((): any => null);
                   if (value) {
                     this.copyValue(this.cipher, value.code, "verificationCodeTotp", "TOTP");
                   }
@@ -319,31 +337,18 @@ export class VaultV2Component<C extends CipherViewLike>
     this.searchBarService.setEnabled(true);
     this.searchBarService.setPlaceholderText(this.i18nService.t("searchVault"));
 
-    if (
-      (await firstValueFrom(
-        this.configService.getFeatureFlag$(FeatureFlag.PM14938_BrowserExtensionLoginApproval),
-      )) === true
-    ) {
-      const authRequests = await firstValueFrom(
-        this.authRequestService.getLatestPendingAuthRequest$(),
-      );
-      if (authRequests != null) {
-        this.messagingService.send("openLoginApproval", {
-          notificationId: authRequests.id,
-        });
-      }
-    } else {
-      const authRequest = await this.apiService.getLastAuthRequest();
-      if (authRequest != null) {
-        this.messagingService.send("openLoginApproval", {
-          notificationId: authRequest.id,
-        });
-      }
+    const authRequests = await firstValueFrom(
+      this.authRequestService.getLatestPendingAuthRequest$()!,
+    );
+    if (authRequests != null) {
+      this.messagingService.send("openLoginApproval", {
+        notificationId: authRequests.id,
+      });
     }
 
     this.activeUserId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(getUserId),
-    ).catch(() => null);
+    ).catch((): any => null);
 
     if (this.activeUserId) {
       this.cipherService
@@ -462,7 +467,7 @@ export class VaultV2Component<C extends CipherViewLike>
     const dialogRef = AttachmentsV2Component.open(this.dialogService, {
       cipherId: this.cipherId as CipherId,
     });
-    const result = await firstValueFrom(dialogRef.closed).catch(() => null);
+    const result = await firstValueFrom(dialogRef.closed).catch((): any => null);
     if (
       result?.action === AttachmentDialogResult.Removed ||
       result?.action === AttachmentDialogResult.Uploaded
@@ -502,6 +507,12 @@ export class VaultV2Component<C extends CipherViewLike>
 
   async viewCipherMenu(c: CipherViewLike) {
     const cipher = await this.cipherService.getFullCipherView(c);
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const userCanArchive = await firstValueFrom(this.cipherArchiveService.userCanArchive$(userId));
+    const orgOwnershipPolicy = await firstValueFrom(
+      this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
+    );
+
     const menu: RendererMenuItem[] = [
       {
         label: this.i18nService.t("view"),
@@ -526,7 +537,11 @@ export class VaultV2Component<C extends CipherViewLike>
           });
         },
       });
-      if (!cipher.organizationId) {
+
+      const archivedWithOrgOwnership = cipher.isArchived && orgOwnershipPolicy;
+      const canCloneArchived = !cipher.isArchived || userCanArchive;
+
+      if (!cipher.organizationId && !archivedWithOrgOwnership && canCloneArchived) {
         menu.push({
           label: this.i18nService.t("clone"),
           click: () => {
@@ -550,6 +565,31 @@ export class VaultV2Component<C extends CipherViewLike>
       }
     }
 
+    if (!cipher.organizationId && !cipher.isDeleted && !cipher.isArchived) {
+      menu.push({
+        label: this.i18nService.t("archiveVerb"),
+        click: async () => {
+          if (!userCanArchive) {
+            await this.premiumUpgradePromptService.promptForPremium();
+            return;
+          }
+
+          await this.archiveCipherUtilitiesService.archiveCipher(cipher);
+          await this.refreshCurrentCipher();
+        },
+      });
+    }
+
+    if (cipher.isArchived) {
+      menu.push({
+        label: this.i18nService.t("unArchive"),
+        click: async () => {
+          await this.archiveCipherUtilitiesService.unarchiveCipher(cipher);
+          await this.refreshCurrentCipher();
+        },
+      });
+    }
+
     switch (cipher.type) {
       case CipherType.Login:
         if (
@@ -588,7 +628,7 @@ export class VaultV2Component<C extends CipherViewLike>
             click: async () => {
               const value = await firstValueFrom(
                 this.totpService.getCode$(cipher.login.totp),
-              ).catch(() => null);
+              ).catch((): any => null);
               if (value) {
                 this.copyValue(cipher, value.code, "verificationCodeTotp", "TOTP");
               }
@@ -631,7 +671,7 @@ export class VaultV2Component<C extends CipherViewLike>
   async buildFormConfig(action: CipherFormMode) {
     this.config = await this.formConfigService
       .buildConfig(action, this.cipherId as CipherId, this.addType)
-      .catch(() => null);
+      .catch((): any => null);
   }
 
   async editCipher(cipher: CipherView) {
@@ -735,10 +775,6 @@ export class VaultV2Component<C extends CipherViewLike>
 
     this.cipherId = cipher.id;
     this.cipher = cipher;
-    if (this.activeUserId) {
-      await this.cipherService.clearCache(this.activeUserId).catch(() => {});
-    }
-    await this.vaultItemsComponent?.load(this.activeFilter.buildFilter()).catch(() => {});
     await this.go().catch(() => {});
     await this.vaultItemsComponent?.refresh().catch(() => {});
   }
@@ -761,7 +797,7 @@ export class VaultV2Component<C extends CipherViewLike>
   async cancelCipher(cipher: CipherView) {
     this.cipherId = cipher.id;
     this.cipher = cipher;
-    this.action = this.cipherId != null ? "view" : null;
+    this.action = this.cipherId ? "view" : null;
     await this.go().catch(() => {});
   }
 
@@ -771,7 +807,11 @@ export class VaultV2Component<C extends CipherViewLike>
     );
     this.activeFilter = vaultFilter;
     await this.vaultItemsComponent
-      ?.reload(this.activeFilter.buildFilter(), vaultFilter.status === "trash")
+      ?.reload(
+        this.activeFilter.buildFilter(),
+        vaultFilter.status === "trash",
+        vaultFilter.status === "archive",
+      )
       .catch(() => {});
     await this.go().catch(() => {});
   }
@@ -845,6 +885,20 @@ export class VaultV2Component<C extends CipherViewLike>
     }
   }
 
+  /** Refresh the current cipher object */
+  protected async refreshCurrentCipher() {
+    if (!this.cipher) {
+      return;
+    }
+
+    this.cipher = await firstValueFrom(
+      this.cipherService.cipherViews$(this.activeUserId!).pipe(
+        filter((c) => !!c),
+        map((ciphers) => ciphers.find((c) => c.id === this.cipherId) ?? null),
+      ),
+    );
+  }
+
   private dirtyInput(): boolean {
     return (
       (this.action === "add" || this.action === "edit" || this.action === "clone") &&
diff --git a/apps/desktop/tailwind.config.js b/apps/desktop/tailwind.config.js
index bf65ae8d7cb..e67c0c38010 100644
--- a/apps/desktop/tailwind.config.js
+++ b/apps/desktop/tailwind.config.js
@@ -9,6 +9,7 @@ config.content = [
   "../../libs/key-management-ui/src/**/*.{html,ts}",
   "../../libs/angular/src/**/*.{html,ts}",
   "../../libs/vault/src/**/*.{html,ts,mdx}",
+  "../../libs/pricing/src/**/*.{html,ts}",
 ];
 
 module.exports = config;
diff --git a/apps/desktop/tsconfig.spec.json b/apps/desktop/tsconfig.spec.json
index d52d889aa78..e6627a8ce45 100644
--- a/apps/desktop/tsconfig.spec.json
+++ b/apps/desktop/tsconfig.spec.json
@@ -4,5 +4,6 @@
     "isolatedModules": true,
     "emitDecoratorMetadata": false
   },
-  "files": ["./test.setup.ts"]
+  "files": ["./test.setup.ts"],
+  "include": ["src/**/*.spec.ts"]
 }
diff --git a/apps/desktop/webpack.base.js b/apps/desktop/webpack.base.js
new file mode 100644
index 00000000000..c9da84cd2e1
--- /dev/null
+++ b/apps/desktop/webpack.base.js
@@ -0,0 +1,333 @@
+const path = require("path");
+const webpack = require("webpack");
+const { merge } = require("webpack-merge");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const { AngularWebpackPlugin } = require("@ngtools/webpack");
+const TerserPlugin = require("terser-webpack-plugin");
+const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
+const { EnvironmentPlugin, DefinePlugin } = require("webpack");
+const configurator = require(path.resolve(__dirname, "config/config"));
+
+module.exports.getEnv = function getEnv() {
+  const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
+  const ENV = process.env.ENV == null ? "development" : process.env.ENV;
+
+  return { NODE_ENV, ENV };
+};
+
+const DEFAULT_PARAMS = {
+  outputPath: process.env.OUTPUT_PATH
+    ? path.isAbsolute(process.env.OUTPUT_PATH)
+      ? process.env.OUTPUT_PATH
+      : path.resolve(__dirname, process.env.OUTPUT_PATH)
+    : path.resolve(__dirname, "build"),
+};
+
+/**
+ * @param {{
+ *  configName: string;
+ *  renderer: {
+ *    entry: string;
+ *    entryModule: string;
+ *    tsConfig: string;
+ *  };
+ *  main: {
+ *    entry: string;
+ *    tsConfig: string;
+ *  };
+ *  preload: {
+ *    entry: string;
+ *    tsConfig: string;
+ *  };
+ *  outputPath?: string;
+ * }} params
+ */
+module.exports.buildConfig = function buildConfig(params) {
+  params = { ...DEFAULT_PARAMS, ...params };
+  const { NODE_ENV, ENV } = module.exports.getEnv();
+
+  console.log(`Building ${params.configName} Desktop App`);
+
+  const envConfig = configurator.load(NODE_ENV);
+  configurator.log(envConfig);
+
+  const commonConfig = {
+    resolve: {
+      extensions: [".tsx", ".ts", ".js"],
+      symlinks: false,
+      modules: [
+        path.resolve(__dirname, "../../node_modules"),
+        path.resolve(process.cwd(), "node_modules"),
+      ],
+    },
+  };
+
+  const getOutputConfig = (isDev) => ({
+    filename: "[name].js",
+    path: params.outputPath,
+    ...(isDev && { devtoolModuleFilenameTemplate: "[absolute-resource-path]" }),
+  });
+
+  const mainConfig = {
+    name: "main",
+    mode: NODE_ENV,
+    target: "electron-main",
+    node: {
+      __dirname: false,
+      __filename: false,
+    },
+    entry: {
+      main: params.main.entry,
+    },
+    optimization: {
+      minimize: false,
+    },
+    output: getOutputConfig(NODE_ENV === "development"),
+    devtool: NODE_ENV === "development" ? "cheap-source-map" : false,
+    module: {
+      rules: [
+        {
+          test: /\.tsx?$/,
+          use: "ts-loader",
+          exclude: /node_modules\/(?!(@bitwarden)\/).*/,
+        },
+        {
+          test: /\.node$/,
+          loader: "node-loader",
+        },
+      ],
+    },
+    experiments: {
+      asyncWebAssembly: true,
+    },
+    resolve: {
+      ...commonConfig.resolve,
+      plugins: [new TsconfigPathsPlugin({ configFile: params.main.tsConfig })],
+    },
+    plugins: [
+      new CopyWebpackPlugin({
+        patterns: [
+          path.resolve(__dirname, "src/package.json"),
+          { from: path.resolve(__dirname, "src/images"), to: "images" },
+          { from: path.resolve(__dirname, "src/locales"), to: "locales" },
+        ],
+      }),
+      new DefinePlugin({
+        BIT_ENVIRONMENT: JSON.stringify(NODE_ENV),
+      }),
+      new EnvironmentPlugin({
+        FLAGS: envConfig.flags,
+        DEV_FLAGS: NODE_ENV === "development" ? envConfig.devFlags : {},
+      }),
+    ],
+    externals: {
+      "electron-reload": "commonjs2 electron-reload",
+      "@bitwarden/desktop-napi": "commonjs2 @bitwarden/desktop-napi",
+    },
+  };
+
+  const preloadConfig = {
+    name: "preload",
+    mode: NODE_ENV,
+    target: "electron-preload",
+    node: {
+      __dirname: false,
+      __filename: false,
+    },
+    entry: {
+      preload: params.preload.entry,
+    },
+    optimization: {
+      minimize: false,
+    },
+    output: getOutputConfig(NODE_ENV === "development"),
+    devtool: NODE_ENV === "development" ? "cheap-source-map" : false,
+    module: {
+      rules: [
+        {
+          test: /\.tsx?$/,
+          use: "ts-loader",
+          exclude: /node_modules\/(?!(@bitwarden)\/).*/,
+        },
+      ],
+    },
+    resolve: {
+      ...commonConfig.resolve,
+      plugins: [new TsconfigPathsPlugin({ configFile: params.preload.tsConfig })],
+    },
+    plugins: [
+      new DefinePlugin({
+        BIT_ENVIRONMENT: JSON.stringify(NODE_ENV),
+      }),
+    ],
+  };
+
+  const rendererConfig = {
+    name: "renderer",
+    mode: NODE_ENV,
+    devtool: "source-map",
+    target: "web",
+    node: {
+      __dirname: false,
+    },
+    entry: {
+      "app/main": params.renderer.entry,
+    },
+    output: {
+      filename: "[name].js",
+      path: params.outputPath,
+    },
+    optimization: {
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            // Replicate Angular CLI behaviour
+            compress: {
+              global_defs: {
+                ngDevMode: false,
+                ngI18nClosureMode: false,
+              },
+            },
+          },
+        }),
+      ],
+      splitChunks: {
+        cacheGroups: {
+          commons: {
+            test: /[\\/]node_modules[\\/]/,
+            name: "app/vendor",
+            chunks: (chunk) => {
+              return chunk.name === "app/main";
+            },
+          },
+        },
+      },
+    },
+    module: {
+      rules: [
+        {
+          test: /\.[cm]?js$/,
+          use: [
+            {
+              loader: "babel-loader",
+              options: {
+                configFile: path.resolve(__dirname, "../../babel.config.json"),
+              },
+            },
+          ],
+        },
+        {
+          test: /\.[jt]sx?$/,
+          loader: "@ngtools/webpack",
+        },
+        {
+          test: /\.(html)$/,
+          loader: "html-loader",
+        },
+        {
+          test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
+          exclude: /loading.svg/,
+          generator: {
+            filename: "fonts/[name].[contenthash][ext]",
+          },
+          type: "asset/resource",
+        },
+        {
+          test: /\.(jpe?g|png|gif|svg)$/i,
+          exclude: /.*(bwi-font)\.svg/,
+          generator: {
+            filename: "images/[name][ext]",
+          },
+          type: "asset/resource",
+        },
+        {
+          test: /\.css$/,
+          use: [
+            {
+              loader: MiniCssExtractPlugin.loader,
+            },
+            "css-loader",
+            "resolve-url-loader",
+            {
+              loader: "postcss-loader",
+              options: {
+                sourceMap: true,
+              },
+            },
+          ],
+        },
+        {
+          test: /\.scss$/,
+          use: [
+            {
+              loader: MiniCssExtractPlugin.loader,
+              options: {
+                publicPath: "../",
+              },
+            },
+            "css-loader",
+            "resolve-url-loader",
+            {
+              loader: "sass-loader",
+              options: {
+                sourceMap: true,
+              },
+            },
+          ],
+        },
+        // Hide System.import warnings. ref: https://github.com/angular/angular/issues/21560
+        {
+          test: /[\/\\]@angular[\/\\].+\.js$/,
+          parser: { system: true },
+        },
+      ],
+    },
+    experiments: {
+      asyncWebAssembly: true,
+    },
+    resolve: {
+      ...commonConfig.resolve,
+      fallback: {
+        path: require.resolve("path-browserify"),
+        fs: false,
+      },
+    },
+    plugins: [
+      new AngularWebpackPlugin({
+        tsConfigPath: params.renderer.tsConfig,
+        entryModule: params.renderer.entryModule,
+        sourceMap: true,
+      }),
+      // ref: https://github.com/angular/angular/issues/20357
+      new webpack.ContextReplacementPlugin(
+        /\@angular(\\|\/)core(\\|\/)fesm5/,
+        path.resolve(__dirname, "./src"),
+      ),
+      new HtmlWebpackPlugin({
+        template: path.resolve(__dirname, "src/index.html"),
+        filename: "index.html",
+        chunks: ["app/vendor", "app/main"],
+      }),
+      new webpack.SourceMapDevToolPlugin({
+        include: ["app/main.js"],
+      }),
+      new MiniCssExtractPlugin({
+        filename: "[name].[contenthash].css",
+        chunkFilename: "[id].[contenthash].css",
+      }),
+      new webpack.DefinePlugin({
+        BIT_ENVIRONMENT: JSON.stringify(NODE_ENV),
+      }),
+      new webpack.EnvironmentPlugin({
+        ENV: ENV,
+        FLAGS: envConfig.flags,
+        DEV_FLAGS: NODE_ENV === "development" ? envConfig.devFlags : {},
+        ADDITIONAL_REGIONS: envConfig.additionalRegions ?? [],
+      }),
+    ],
+  };
+
+  return [mainConfig, rendererConfig, preloadConfig];
+};
diff --git a/apps/desktop/webpack.config.js b/apps/desktop/webpack.config.js
new file mode 100644
index 00000000000..685196e56c0
--- /dev/null
+++ b/apps/desktop/webpack.config.js
@@ -0,0 +1,43 @@
+const path = require("path");
+const { buildConfig } = require("./webpack.base");
+
+module.exports = (webpackConfig, context) => {
+  const isNxBuild = context && context.options;
+
+  if (isNxBuild) {
+    return buildConfig({
+      configName: "OSS",
+      renderer: {
+        entry: path.resolve(__dirname, "src/app/main.ts"),
+        entryModule: "src/app/app.module#AppModule",
+        tsConfig: path.resolve(context.context.root, "apps/desktop/tsconfig.renderer.json"),
+      },
+      main: {
+        entry: path.resolve(__dirname, "src/entry.ts"),
+        tsConfig: path.resolve(context.context.root, "apps/desktop/tsconfig.json"),
+      },
+      preload: {
+        entry: path.resolve(__dirname, "src/preload.ts"),
+        tsConfig: path.resolve(context.context.root, "apps/desktop/tsconfig.json"),
+      },
+      outputPath: path.resolve(context.context.root, context.options.outputPath),
+    });
+  } else {
+    return buildConfig({
+      configName: "OSS",
+      renderer: {
+        entry: path.resolve(__dirname, "src/app/main.ts"),
+        entryModule: "src/app/app.module#AppModule",
+        tsConfig: path.resolve(__dirname, "tsconfig.renderer.json"),
+      },
+      main: {
+        entry: path.resolve(__dirname, "src/entry.ts"),
+        tsConfig: path.resolve(__dirname, "tsconfig.json"),
+      },
+      preload: {
+        entry: path.resolve(__dirname, "src/preload.ts"),
+        tsConfig: path.resolve(__dirname, "tsconfig.json"),
+      },
+    });
+  }
+};
diff --git a/apps/desktop/webpack.main.js b/apps/desktop/webpack.main.js
deleted file mode 100644
index 151b1d0cea2..00000000000
--- a/apps/desktop/webpack.main.js
+++ /dev/null
@@ -1,93 +0,0 @@
-const path = require("path");
-const { merge } = require("webpack-merge");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
-const configurator = require("./config/config");
-const { EnvironmentPlugin, DefinePlugin } = require("webpack");
-
-const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
-
-console.log("Main process config");
-const envConfig = configurator.load(NODE_ENV);
-configurator.log(envConfig);
-
-const common = {
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: "ts-loader",
-        exclude: /node_modules\/(?!(@bitwarden)\/).*/,
-      },
-    ],
-  },
-  plugins: [],
-  resolve: {
-    extensions: [".tsx", ".ts", ".js"],
-    plugins: [new TsconfigPathsPlugin({ configFile: "./tsconfig.json" })],
-  },
-};
-
-const prod = {
-  output: {
-    filename: "[name].js",
-    path: path.resolve(__dirname, "build"),
-  },
-};
-
-const dev = {
-  output: {
-    filename: "[name].js",
-    path: path.resolve(__dirname, "build"),
-    devtoolModuleFilenameTemplate: "[absolute-resource-path]",
-  },
-  devtool: "cheap-source-map",
-};
-
-const main = {
-  mode: NODE_ENV,
-  target: "electron-main",
-  node: {
-    __dirname: false,
-    __filename: false,
-  },
-  entry: {
-    main: "./src/entry.ts",
-  },
-  optimization: {
-    minimize: false,
-  },
-  module: {
-    rules: [
-      {
-        test: /\.node$/,
-        loader: "node-loader",
-      },
-    ],
-  },
-  experiments: {
-    asyncWebAssembly: true,
-  },
-  plugins: [
-    new CopyWebpackPlugin({
-      patterns: [
-        "./src/package.json",
-        { from: "./src/images", to: "images" },
-        { from: "./src/locales", to: "locales" },
-      ],
-    }),
-    new DefinePlugin({
-      BIT_ENVIRONMENT: JSON.stringify(NODE_ENV),
-    }),
-    new EnvironmentPlugin({
-      FLAGS: envConfig.flags,
-      DEV_FLAGS: NODE_ENV === "development" ? envConfig.devFlags : {},
-    }),
-  ],
-  externals: {
-    "electron-reload": "commonjs2 electron-reload",
-    "@bitwarden/desktop-napi": "commonjs2 @bitwarden/desktop-napi",
-  },
-};
-
-module.exports = merge(common, NODE_ENV === "development" ? dev : prod, main);
diff --git a/apps/desktop/webpack.preload.js b/apps/desktop/webpack.preload.js
deleted file mode 100644
index db75e882644..00000000000
--- a/apps/desktop/webpack.preload.js
+++ /dev/null
@@ -1,66 +0,0 @@
-const path = require("path");
-const { merge } = require("webpack-merge");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
-const configurator = require("./config/config");
-const { EnvironmentPlugin, DefinePlugin } = require("webpack");
-
-const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
-
-console.log("Preload process config");
-const envConfig = configurator.load(NODE_ENV);
-configurator.log(envConfig);
-
-const common = {
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: "ts-loader",
-        exclude: /node_modules\/(?!(@bitwarden)\/).*/,
-      },
-    ],
-  },
-  plugins: [
-    new DefinePlugin({
-      BIT_ENVIRONMENT: JSON.stringify(NODE_ENV),
-    }),
-  ],
-  resolve: {
-    extensions: [".tsx", ".ts", ".js"],
-    plugins: [new TsconfigPathsPlugin({ configFile: "./tsconfig.json" })],
-  },
-};
-
-const prod = {
-  output: {
-    filename: "[name].js",
-    path: path.resolve(__dirname, "build"),
-  },
-};
-
-const dev = {
-  output: {
-    filename: "[name].js",
-    path: path.resolve(__dirname, "build"),
-    devtoolModuleFilenameTemplate: "[absolute-resource-path]",
-  },
-  devtool: "cheap-source-map",
-};
-
-const main = {
-  mode: NODE_ENV,
-  target: "electron-preload",
-  node: {
-    __dirname: false,
-    __filename: false,
-  },
-  entry: {
-    preload: "./src/preload.ts",
-  },
-  optimization: {
-    minimize: false,
-  },
-};
-
-module.exports = merge(common, NODE_ENV === "development" ? dev : prod, main);
diff --git a/apps/desktop/webpack.renderer.js b/apps/desktop/webpack.renderer.js
deleted file mode 100644
index 9c5b0fd2584..00000000000
--- a/apps/desktop/webpack.renderer.js
+++ /dev/null
@@ -1,192 +0,0 @@
-const path = require("path");
-const webpack = require("webpack");
-const { merge } = require("webpack-merge");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const { AngularWebpackPlugin } = require("@ngtools/webpack");
-const TerserPlugin = require("terser-webpack-plugin");
-const configurator = require("./config/config");
-
-const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
-
-console.log("Renderer process config");
-const envConfig = configurator.load(NODE_ENV);
-configurator.log(envConfig);
-
-const ENV = process.env.ENV == null ? "development" : process.env.ENV;
-
-const common = {
-  module: {
-    rules: [
-      {
-        test: /\.[cm]?js$/,
-        use: [
-          {
-            loader: "babel-loader",
-            options: {
-              configFile: "../../babel.config.json",
-            },
-          },
-        ],
-      },
-      {
-        test: /\.[jt]sx?$/,
-        loader: "@ngtools/webpack",
-      },
-      {
-        test: /\.(jpe?g|png|gif|svg)$/i,
-        exclude: /.*(bwi-font)\.svg/,
-        generator: {
-          filename: "images/[name][ext]",
-        },
-        type: "asset/resource",
-      },
-    ],
-  },
-  plugins: [],
-  resolve: {
-    extensions: [".tsx", ".ts", ".js"],
-    symlinks: false,
-    modules: [path.resolve("../../node_modules")],
-    fallback: {
-      path: require.resolve("path-browserify"),
-      fs: false,
-    },
-  },
-  output: {
-    filename: "[name].js",
-    path: path.resolve(__dirname, "build"),
-  },
-};
-
-const renderer = {
-  mode: NODE_ENV,
-  devtool: "source-map",
-  target: "web",
-  node: {
-    __dirname: false,
-  },
-  entry: {
-    "app/main": "./src/app/main.ts",
-  },
-  optimization: {
-    minimizer: [
-      new TerserPlugin({
-        terserOptions: {
-          // Replicate Angular CLI behaviour
-          compress: {
-            global_defs: {
-              ngDevMode: false,
-              ngI18nClosureMode: false,
-            },
-          },
-        },
-      }),
-    ],
-    splitChunks: {
-      cacheGroups: {
-        commons: {
-          test: /[\\/]node_modules[\\/]/,
-          name: "app/vendor",
-          chunks: (chunk) => {
-            return chunk.name === "app/main";
-          },
-        },
-      },
-    },
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(html)$/,
-        loader: "html-loader",
-      },
-      {
-        test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
-        exclude: /loading.svg/,
-        generator: {
-          filename: "fonts/[name].[contenthash][ext]",
-        },
-        type: "asset/resource",
-      },
-      {
-        test: /\.css$/,
-        use: [
-          {
-            loader: MiniCssExtractPlugin.loader,
-          },
-          "css-loader",
-          "resolve-url-loader",
-          {
-            loader: "postcss-loader",
-            options: {
-              sourceMap: true,
-            },
-          },
-        ],
-      },
-      {
-        test: /\.scss$/,
-        use: [
-          {
-            loader: MiniCssExtractPlugin.loader,
-            options: {
-              publicPath: "../",
-            },
-          },
-          "css-loader",
-          "resolve-url-loader",
-          {
-            loader: "sass-loader",
-            options: {
-              sourceMap: true,
-            },
-          },
-        ],
-      },
-      // Hide System.import warnings. ref: https://github.com/angular/angular/issues/21560
-      {
-        test: /[\/\\]@angular[\/\\].+\.js$/,
-        parser: { system: true },
-      },
-    ],
-  },
-  experiments: {
-    asyncWebAssembly: true,
-  },
-  plugins: [
-    new AngularWebpackPlugin({
-      tsConfigPath: "tsconfig.renderer.json",
-      entryModule: "src/app/app.module#AppModule",
-      sourceMap: true,
-    }),
-    // ref: https://github.com/angular/angular/issues/20357
-    new webpack.ContextReplacementPlugin(
-      /\@angular(\\|\/)core(\\|\/)fesm5/,
-      path.resolve(__dirname, "./src"),
-    ),
-    new HtmlWebpackPlugin({
-      template: "./src/index.html",
-      filename: "index.html",
-      chunks: ["app/vendor", "app/main"],
-    }),
-    new webpack.SourceMapDevToolPlugin({
-      include: ["app/main.js"],
-    }),
-    new MiniCssExtractPlugin({
-      filename: "[name].[contenthash].css",
-      chunkFilename: "[id].[contenthash].css",
-    }),
-    new webpack.DefinePlugin({
-      BIT_ENVIRONMENT: JSON.stringify(NODE_ENV),
-    }),
-    new webpack.EnvironmentPlugin({
-      ENV: ENV,
-      FLAGS: envConfig.flags,
-      DEV_FLAGS: NODE_ENV === "development" ? envConfig.devFlags : {},
-      ADDITIONAL_REGIONS: envConfig.additionalRegions ?? [],
-    }),
-  ],
-};
-
-module.exports = merge(common, renderer);
diff --git a/apps/web/CLAUDE.md b/apps/web/CLAUDE.md
new file mode 100644
index 00000000000..b9fe0055fe5
--- /dev/null
+++ b/apps/web/CLAUDE.md
@@ -0,0 +1,13 @@
+# Web Vault - Critical Rules
+
+- **NEVER** access browser extension APIs
+  - Web vault runs in standard browser context (no chrome._/browser._ APIs)
+  - DON'T import or use BrowserApi or extension-specific code
+
+- **ALWAYS** assume multi-tenant organization features
+  - Web vault supports enterprise organizations with complex permissions
+  - Use organization permission guards: `/apps/web/src/app/admin-console/organizations/guards/`
+
+- **CRITICAL**: All sensitive operations must work without local storage
+  - Web vault may run in environments that clear storage aggressively
+  - DON'T rely on localStorage/sessionStorage for security-critical data
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index 6017d60df5f..6d27e12537a 100644
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -9,6 +9,12 @@ COPY package*.json ./
 COPY . .
 RUN npm ci
 
+# Remove commercial packages if LICENSE_TYPE is not 'commercial'
+ARG LICENSE_TYPE=oss
+RUN if [ "${LICENSE_TYPE}" != "commercial" ] ; then \
+      rm -rf node_modules/@bitwarden/commercial-sdk-internal ; \
+    fi
+
 WORKDIR /source/apps/web
 ARG NPM_COMMAND=dist:bit:selfhost
 RUN npm run ${NPM_COMMAND}
diff --git a/apps/web/config/development.json b/apps/web/config/development.json
index d80a56ff671..3a6015dae7e 100644
--- a/apps/web/config/development.json
+++ b/apps/web/config/development.json
@@ -8,6 +8,7 @@
     "proxyIdentity": "http://localhost:33656",
     "proxyEvents": "http://localhost:46273",
     "proxyNotifications": "http://localhost:61840",
+    "proxyIcons": "http://localhost:50024",
     "proxySeederApi": "http://localhost:5047",
     "wsConnectSrc": "ws://localhost:61840"
   },
diff --git a/apps/web/config/selfhosted.json b/apps/web/config/selfhosted.json
index cd36ab15c5e..ffb7621e594 100644
--- a/apps/web/config/selfhosted.json
+++ b/apps/web/config/selfhosted.json
@@ -4,6 +4,7 @@
     "proxyIdentity": "http://localhost:33657",
     "proxyEvents": "http://localhost:46274",
     "proxyNotifications": "http://localhost:61841",
+    "proxyKeyConnector": "http://localhost:5000",
     "port": 8081
   },
   "flags": {}
diff --git a/apps/web/package.json b/apps/web/package.json
index 517b8aa8004..344a78f2a2c 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2025.9.1",
+  "version": "2025.12.0",
   "scripts": {
     "build:oss": "webpack",
     "build:bit": "webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
diff --git a/apps/web/postcss.config.js b/apps/web/postcss.config.js
index 5657df3afcf..0403fe4061e 100644
--- a/apps/web/postcss.config.js
+++ b/apps/web/postcss.config.js
@@ -1,9 +1,13 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
+const path = require("path");
+
 module.exports = {
   plugins: [
-    require("postcss-import"),
+    require("postcss-import")({
+      path: [path.resolve(__dirname, "../../libs"), path.resolve(__dirname, "src/scss")],
+    }),
     require("postcss-nested"),
-    require("tailwindcss"),
+    require("tailwindcss")({ config: path.resolve(__dirname, "tailwind.config.js") }),
     require("autoprefixer"),
   ],
 };
diff --git a/apps/web/project.json b/apps/web/project.json
new file mode 100644
index 00000000000..710fd7cb5e7
--- /dev/null
+++ b/apps/web/project.json
@@ -0,0 +1,185 @@
+{
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "name": "web",
+  "projectType": "application",
+  "sourceRoot": "apps/web/src",
+  "tags": ["scope:web", "type:app"],
+  "targets": {
+    "build": {
+      "executor": "@nx/webpack:webpack",
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": "oss",
+      "options": {
+        "outputPath": "dist/apps/web",
+        "webpackConfig": "apps/web/webpack.config.js",
+        "tsConfig": "apps/web/tsconfig.json",
+        "main": "apps/web/src/main.ts",
+        "target": "web",
+        "compiler": "tsc"
+      },
+      "configurations": {
+        "oss": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/oss"
+        },
+        "oss-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/web/oss-dev",
+          "env": {
+            "NODE_ENV": "development",
+            "ENV": "development"
+          }
+        },
+        "commercial": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/commercial",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts"
+        },
+        "commercial-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/web/commercial-dev",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "NODE_ENV": "development",
+            "ENV": "development"
+          }
+        },
+        "commercial-qa": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/commercial-qa",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "NODE_ENV": "production",
+            "ENV": "qa"
+          }
+        },
+        "commercial-cloud": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/commercial-cloud",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "NODE_ENV": "production",
+            "ENV": "cloud"
+          }
+        },
+        "commercial-euprd": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/commercial-euprd",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "NODE_ENV": "production",
+            "ENV": "euprd"
+          }
+        },
+        "commercial-euqa": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/commercial-euqa",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "NODE_ENV": "production",
+            "ENV": "euqa"
+          }
+        },
+        "commercial-usdev": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/commercial-usdev",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "NODE_ENV": "production",
+            "ENV": "usdev"
+          }
+        },
+        "commercial-ee": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/commercial-ee",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "NODE_ENV": "production",
+            "ENV": "ee"
+          }
+        },
+        "oss-selfhost": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/oss-selfhost",
+          "env": {
+            "ENV": "selfhosted",
+            "NODE_ENV": "production"
+          }
+        },
+        "oss-selfhost-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/web/oss-selfhost-dev",
+          "env": {
+            "NODE_ENV": "development",
+            "ENV": "selfhosted"
+          }
+        },
+        "commercial-selfhost": {
+          "mode": "production",
+          "outputPath": "dist/apps/web/commercial-selfhost",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "ENV": "selfhosted",
+            "NODE_ENV": "production"
+          }
+        },
+        "commercial-selfhost-dev": {
+          "mode": "development",
+          "outputPath": "dist/apps/web/commercial-selfhost-dev",
+          "webpackConfig": "bitwarden_license/bit-web/webpack.config.js",
+          "main": "bitwarden_license/bit-web/src/main.ts",
+          "env": {
+            "NODE_ENV": "development",
+            "ENV": "selfhosted"
+          }
+        }
+      }
+    },
+    "serve": {
+      "executor": "@nx/webpack:dev-server",
+      "defaultConfiguration": "oss-dev",
+      "options": {
+        "buildTarget": "web:build",
+        "host": "localhost",
+        "port": 8080
+      },
+      "configurations": {
+        "oss": {
+          "buildTarget": "web:build:oss-dev"
+        },
+        "commercial": {
+          "buildTarget": "web:build:commercial-dev"
+        },
+        "oss-selfhost": {
+          "buildTarget": "web:build:oss-selfhost-dev"
+        },
+        "commercial-selfhost": {
+          "buildTarget": "web:build:commercial-selfhost-dev"
+        }
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "apps/web/jest.config.js"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/web/**/*.ts", "apps/web/**/*.html"]
+      }
+    }
+  }
+}
diff --git a/apps/web/src/app/admin-console/common/base-members.component.ts b/apps/web/src/app/admin-console/common/base-members.component.ts
index 21c52949254..5ecf4269a1a 100644
--- a/apps/web/src/app/admin-console/common/base-members.component.ts
+++ b/apps/web/src/app/admin-console/common/base-members.component.ts
@@ -24,6 +24,7 @@ import { KeyService } from "@bitwarden/key-management";
 
 import { OrganizationUserView } from "../organizations/core/views/organization-user.view";
 import { UserConfirmComponent } from "../organizations/manage/user-confirm.component";
+import { MemberActionResult } from "../organizations/members/services/member-actions/member-actions.service";
 
 import { PeopleTableDataSource, peopleFilter } from "./people-table-data-source";
 
@@ -75,7 +76,7 @@ export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
   /**
    * The currently executing promise - used to avoid multiple user actions executing at once.
    */
-  actionPromise?: Promise<void>;
+  actionPromise?: Promise<MemberActionResult>;
 
   protected searchControl = new FormControl("", { nonNullable: true });
   protected statusToggle = new BehaviorSubject<StatusType | undefined>(undefined);
@@ -101,13 +102,13 @@ export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
 
   abstract edit(user: UserView, organization?: Organization): void;
   abstract getUsers(organization?: Organization): Promise<ListResponse<UserView> | UserView[]>;
-  abstract removeUser(id: string, organization?: Organization): Promise<void>;
-  abstract reinviteUser(id: string, organization?: Organization): Promise<void>;
+  abstract removeUser(id: string, organization?: Organization): Promise<MemberActionResult>;
+  abstract reinviteUser(id: string, organization?: Organization): Promise<MemberActionResult>;
   abstract confirmUser(
     user: UserView,
     publicKey: Uint8Array,
     organization?: Organization,
-  ): Promise<void>;
+  ): Promise<MemberActionResult>;
   abstract invite(organization?: Organization): void;
 
   async load(organization?: Organization) {
@@ -140,12 +141,16 @@ export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
 
     this.actionPromise = this.removeUser(user.id, organization);
     try {
-      await this.actionPromise;
-      this.toastService.showToast({
-        variant: "success",
-        message: this.i18nService.t("removedUserId", this.userNamePipe.transform(user)),
-      });
-      this.dataSource.removeUser(user);
+      const result = await this.actionPromise;
+      if (result.success) {
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("removedUserId", this.userNamePipe.transform(user)),
+        });
+        this.dataSource.removeUser(user);
+      } else {
+        throw new Error(result.error);
+      }
     } catch (e) {
       this.validationService.showError(e);
     }
@@ -159,11 +164,15 @@ export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
 
     this.actionPromise = this.reinviteUser(user.id, organization);
     try {
-      await this.actionPromise;
-      this.toastService.showToast({
-        variant: "success",
-        message: this.i18nService.t("hasBeenReinvited", this.userNamePipe.transform(user)),
-      });
+      const result = await this.actionPromise;
+      if (result.success) {
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("hasBeenReinvited", this.userNamePipe.transform(user)),
+        });
+      } else {
+        throw new Error(result.error);
+      }
     } catch (e) {
       this.validationService.showError(e);
     }
@@ -174,14 +183,18 @@ export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
     const confirmUser = async (publicKey: Uint8Array) => {
       try {
         this.actionPromise = this.confirmUser(user, publicKey, organization);
-        await this.actionPromise;
-        user.status = this.userStatusType.Confirmed;
-        this.dataSource.replaceUser(user);
+        const result = await this.actionPromise;
+        if (result.success) {
+          user.status = this.userStatusType.Confirmed;
+          this.dataSource.replaceUser(user);
 
-        this.toastService.showToast({
-          variant: "success",
-          message: this.i18nService.t("hasBeenConfirmed", this.userNamePipe.transform(user)),
-        });
+          this.toastService.showToast({
+            variant: "success",
+            message: this.i18nService.t("hasBeenConfirmed", this.userNamePipe.transform(user)),
+          });
+        } else {
+          throw new Error(result.error);
+        }
       } catch (e) {
         this.validationService.showError(e);
         throw e;
diff --git a/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts b/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts
index 7c4e2156ffb..b8c82ac2f01 100644
--- a/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts
@@ -50,6 +50,8 @@ export enum BulkCollectionsDialogResult {
   Canceled = "canceled",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [SharedModule, AccessSelectorModule],
   selector: "app-bulk-collections-dialog",
diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
index 86b83d75ca4..eafa3f4470a 100644
--- a/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
@@ -6,6 +6,8 @@ import { ButtonModule, NoItemsModule } from "@bitwarden/components";
 import { SharedModule } from "../../../shared";
 import { CollectionDialogTabType } from "../shared/components/collection-dialog";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "collection-access-restricted",
   imports: [SharedModule, ButtonModule, NoItemsModule],
@@ -37,9 +39,15 @@ export class CollectionAccessRestrictedComponent {
   protected icon = RestrictedView;
   protected collectionDialogTabType = CollectionDialogTabType;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canEditCollection = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canViewCollectionInfo = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() viewCollectionClicked = new EventEmitter<{
     readonly: boolean;
     tab: CollectionDialogTabType;
diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts
index d3893b5bd24..70a2e40001a 100644
--- a/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts
@@ -9,13 +9,19 @@ import { CollectionId } from "@bitwarden/sdk-internal";
 import { SharedModule } from "../../../../shared/shared.module";
 import { GetCollectionNameFromIdPipe } from "../pipes";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-collection-badge",
   templateUrl: "collection-name-badge.component.html",
   imports: [SharedModule, GetCollectionNameFromIdPipe],
 })
 export class CollectionNameBadgeComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collectionIds: CollectionId[] | string[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collections: CollectionView[];
 
   get shownCollections(): string[] {
diff --git a/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.html b/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.html
deleted file mode 100644
index 326dc627e17..00000000000
--- a/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.html
+++ /dev/null
@@ -1,121 +0,0 @@
-@if (organization) {
-  <app-organization-free-trial-warning
-    [organization]="organization"
-    (clicked)="navigateToPaymentMethod()"
-  >
-  </app-organization-free-trial-warning>
-  <app-organization-reseller-renewal-warning [organization]="organization">
-  </app-organization-reseller-renewal-warning>
-}
-
-<app-org-vault-header
-  [filter]="filter"
-  [loading]="refreshing"
-  [organization]="organization"
-  [collection]="selectedCollection"
-  [searchText]="currentSearchText$ | async"
-  (onAddCipher)="addCipher($event)"
-  (onAddCollection)="addCollection()"
-  (onEditCollection)="editCollection(selectedCollection.node, $event.tab, $event.readonly)"
-  (onDeleteCollection)="deleteCollection(selectedCollection.node)"
-  (searchTextChanged)="filterSearchText($event)"
-></app-org-vault-header>
-
-<div class="tw-flex tw-flex-row">
-  <div class="tw-w-1/4 tw-mr-5" *ngIf="!hideVaultFilters">
-    <app-organization-vault-filter
-      [organization]="organization"
-      [activeFilter]="activeFilter"
-      [searchText]="currentSearchText$ | async"
-      (searchTextChanged)="filterSearchText($event)"
-    ></app-organization-vault-filter>
-  </div>
-  <div [class]="hideVaultFilters ? 'tw-w-full' : 'tw-w-3/4'">
-    <bit-toggle-group
-      *ngIf="showAddAccessToggle && activeFilter.selectedCollectionNode"
-      [selected]="addAccessStatus$ | async"
-      (selectedChange)="addAccessToggle($event)"
-      [attr.aria-label]="'addAccessFilter' | i18n"
-    >
-      <bit-toggle [value]="0">
-        {{ "all" | i18n }}
-      </bit-toggle>
-
-      <bit-toggle [value]="1">
-        {{ "addAccess" | i18n }}
-      </bit-toggle>
-    </bit-toggle-group>
-    <bit-callout type="warning" *ngIf="activeFilter.isDeleted">
-      {{ trashCleanupWarning }}
-    </bit-callout>
-    <app-vault-items
-      #vaultItems
-      [ciphers]="ciphers"
-      [collections]="collections"
-      [allCollections]="allCollections"
-      [allOrganizations]="organization ? [organization] : []"
-      [allGroups]="allGroups"
-      [disabled]="loading"
-      [showOwner]="false"
-      [showPermissionsColumn]="true"
-      [showCollections]="filter.type !== undefined"
-      [showGroups]="
-        organization?.useGroups &&
-        ((filter.type === undefined && filter.collectionId === undefined) ||
-          filter.collectionId !== undefined)
-      "
-      [showPremiumFeatures]="organization?.useTotp"
-      [showBulkMove]="false"
-      [showBulkTrashOptions]="filter.type === 'trash'"
-      [useEvents]="organization?.canAccessEventLogs"
-      [showAdminActions]="true"
-      (onEvent)="onVaultItemsEvent($event)"
-      [showBulkEditCollectionAccess]="true"
-      [showBulkAddToCollections]="true"
-      [viewingOrgVault]="true"
-      [addAccessStatus]="addAccessStatus$ | async"
-      [addAccessToggle]="showAddAccessToggle"
-      [activeCollection]="selectedCollection?.node"
-    >
-    </app-vault-items>
-    <ng-container *ngIf="!performingInitialLoad && isEmpty">
-      <bit-no-items *ngIf="!showCollectionAccessRestricted">
-        <span slot="title" class="tw-mt-4 tw-block">{{ "noItemsInList" | i18n }}</span>
-        <button
-          slot="button"
-          bitButton
-          (click)="addCipher()"
-          buttonType="primary"
-          type="button"
-          *ngIf="
-            filter.type !== 'trash' &&
-            filter.collectionId !== Unassigned &&
-            selectedCollection?.node?.canEditItems(organization)
-          "
-        >
-          <i aria-hidden="true" class="bwi bwi-plus"></i> {{ "newItem" | i18n }}
-        </button>
-      </bit-no-items>
-      <collection-access-restricted
-        *ngIf="showCollectionAccessRestricted"
-        [canEditCollection]="selectedCollection?.node?.canEdit(organization)"
-        [canViewCollectionInfo]="selectedCollection?.node?.canViewCollectionInfo(organization)"
-        (viewCollectionClicked)="
-          editCollection(selectedCollection.node, $event.tab, $event.readonly)
-        "
-      >
-      </collection-access-restricted>
-    </ng-container>
-    <div
-      class="tw-mt-6 tw-flex tw-h-full tw-flex-col tw-items-center tw-justify-start"
-      *ngIf="performingInitialLoad"
-    >
-      <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>
-    </div>
-  </div>
-</div>
diff --git a/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.ts b/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.ts
deleted file mode 100644
index fce2827c073..00000000000
--- a/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.ts
+++ /dev/null
@@ -1,1389 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit, ViewChild } from "@angular/core";
-import { ActivatedRoute, Params, Router } from "@angular/router";
-import {
-  BehaviorSubject,
-  combineLatest,
-  firstValueFrom,
-  lastValueFrom,
-  merge,
-  Observable,
-  Subject,
-} from "rxjs";
-import {
-  concatMap,
-  debounceTime,
-  distinctUntilChanged,
-  filter,
-  first,
-  map,
-  shareReplay,
-  switchMap,
-  takeUntil,
-  tap,
-} from "rxjs/operators";
-
-import {
-  CollectionAdminService,
-  CollectionAdminView,
-  CollectionService,
-  CollectionView,
-  Unassigned,
-} from "@bitwarden/admin-console/common";
-import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
-import { NoResults } from "@bitwarden/assets/svg";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-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 { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
-import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { SyncService } from "@bitwarden/common/platform/sync";
-import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
-import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
-import { CipherType } from "@bitwarden/common/vault/enums";
-import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
-import {
-  BannerModule,
-  DialogRef,
-  DialogService,
-  NoItemsModule,
-  ToastService,
-} from "@bitwarden/components";
-import {
-  AttachmentDialogResult,
-  AttachmentsV2Component,
-  CipherFormConfig,
-  CipherFormConfigService,
-  CollectionAssignmentResult,
-  DecryptionFailureDialogComponent,
-  PasswordRepromptService,
-} from "@bitwarden/vault";
-import {
-  OrganizationFreeTrialWarningComponent,
-  OrganizationResellerRenewalWarningComponent,
-} from "@bitwarden/web-vault/app/billing/organizations/warnings/components";
-import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
-import { VaultItemsComponent } from "@bitwarden/web-vault/app/vault/components/vault-items/vault-items.component";
-
-import { SharedModule } from "../../../shared";
-import { AssignCollectionsWebComponent } from "../../../vault/components/assign-collections";
-import {
-  VaultItemDialogComponent,
-  VaultItemDialogMode,
-  VaultItemDialogResult,
-} from "../../../vault/components/vault-item-dialog/vault-item-dialog.component";
-import { VaultItemEvent } from "../../../vault/components/vault-items/vault-item-event";
-import { VaultItemsModule } from "../../../vault/components/vault-items/vault-items.module";
-import {
-  BulkDeleteDialogResult,
-  openBulkDeleteDialog,
-} from "../../../vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component";
-import { VaultFilterService } from "../../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service";
-import { RoutedVaultFilterBridgeService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
-import { RoutedVaultFilterService } from "../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
-import { createFilterFunction } from "../../../vault/individual-vault/vault-filter/shared/models/filter-function";
-import {
-  All,
-  RoutedVaultFilterModel,
-} from "../../../vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model";
-import { VaultFilter } from "../../../vault/individual-vault/vault-filter/shared/models/vault-filter.model";
-import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
-import { GroupApiService, GroupView } from "../core";
-import { openEntityEventsDialog } from "../manage/entity-events.component";
-import {
-  CollectionDialogAction,
-  CollectionDialogTabType,
-  openCollectionDialog,
-} from "../shared/components/collection-dialog";
-
-import {
-  BulkCollectionsDialogComponent,
-  BulkCollectionsDialogResult,
-} from "./bulk-collections-dialog";
-import { CollectionAccessRestrictedComponent } from "./collection-access-restricted.component";
-import { getFlatCollectionTree, getNestedCollectionTree } from "./utils";
-import { VaultFilterModule } from "./vault-filter/vault-filter.module";
-import { VaultHeaderComponent } from "./vault-header/vault-header.component";
-
-const BroadcasterSubscriptionId = "OrgVaultComponent";
-const SearchTextDebounceInterval = 200;
-
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-enum AddAccessStatusType {
-  All = 0,
-  AddAccess = 1,
-}
-
-@Component({
-  selector: "app-org-vault",
-  templateUrl: "deprecated_vault.component.html",
-  imports: [
-    VaultHeaderComponent,
-    CollectionAccessRestrictedComponent,
-    VaultFilterModule,
-    VaultItemsModule,
-    SharedModule,
-    BannerModule,
-    NoItemsModule,
-    OrganizationFreeTrialWarningComponent,
-    OrganizationResellerRenewalWarningComponent,
-  ],
-  providers: [
-    RoutedVaultFilterService,
-    RoutedVaultFilterBridgeService,
-    { provide: CipherFormConfigService, useClass: AdminConsoleCipherFormConfigService },
-  ],
-})
-export class VaultComponent implements OnInit, OnDestroy {
-  protected Unassigned = Unassigned;
-
-  trashCleanupWarning: string = null;
-  activeFilter: VaultFilter = new VaultFilter();
-
-  protected showAddAccessToggle = false;
-  protected noItemIcon = NoResults;
-  protected performingInitialLoad = true;
-  protected refreshing = false;
-  protected processingEvent = false;
-  protected filter: RoutedVaultFilterModel = {};
-  protected organization: Organization;
-  protected allCollections: CollectionAdminView[];
-  protected allGroups: GroupView[];
-  protected ciphers: CipherView[];
-  protected collections: CollectionAdminView[];
-  protected selectedCollection: TreeNode<CollectionAdminView> | undefined;
-  protected isEmpty: boolean;
-  protected showCollectionAccessRestricted: boolean;
-  protected currentSearchText$: Observable<string>;
-  protected prevCipherId: string | null = null;
-  protected userId: UserId;
-  /**
-   * A list of collections that the user can assign items to and edit those items within.
-   * @protected
-   */
-  protected editableCollections$: Observable<CollectionAdminView[]>;
-  protected allCollectionsWithoutUnassigned$: Observable<CollectionAdminView[]>;
-
-  protected get hideVaultFilters(): boolean {
-    return this.organization?.isProviderUser && !this.organization?.isMember;
-  }
-
-  private searchText$ = new Subject<string>();
-  private refresh$ = new BehaviorSubject<void>(null);
-  private destroy$ = new Subject<void>();
-  protected addAccessStatus$ = new BehaviorSubject<AddAccessStatusType>(0);
-  private vaultItemDialogRef?: DialogRef<VaultItemDialogResult> | undefined;
-
-  @ViewChild("vaultItems", { static: false }) vaultItemsComponent: VaultItemsComponent<CipherView>;
-
-  constructor(
-    private route: ActivatedRoute,
-    private organizationService: OrganizationService,
-    protected vaultFilterService: VaultFilterService,
-    private routedVaultFilterBridgeService: RoutedVaultFilterBridgeService,
-    private routedVaultFilterService: RoutedVaultFilterService,
-    private router: Router,
-    private changeDetectorRef: ChangeDetectorRef,
-    private syncService: SyncService,
-    private i18nService: I18nService,
-    private dialogService: DialogService,
-    private messagingService: MessagingService,
-    private broadcasterService: BroadcasterService,
-    private ngZone: NgZone,
-    private platformUtilsService: PlatformUtilsService,
-    private cipherService: CipherService,
-    private passwordRepromptService: PasswordRepromptService,
-    private collectionAdminService: CollectionAdminService,
-    private searchService: SearchService,
-    private searchPipe: SearchPipe,
-    private groupService: GroupApiService,
-    private logService: LogService,
-    private eventCollectionService: EventCollectionService,
-    private totpService: TotpService,
-    private apiService: ApiService,
-    private toastService: ToastService,
-    private configService: ConfigService,
-    private cipherFormConfigService: CipherFormConfigService,
-    protected billingApiService: BillingApiServiceAbstraction,
-    private accountService: AccountService,
-    private organizationWarningsService: OrganizationWarningsService,
-    private collectionService: CollectionService,
-  ) {}
-
-  async ngOnInit() {
-    this.userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-
-    this.trashCleanupWarning = this.i18nService.t(
-      this.platformUtilsService.isSelfHost()
-        ? "trashCleanupWarningSelfHosted"
-        : "trashCleanupWarning",
-    );
-
-    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(),
-    );
-
-    const organization$ = this.accountService.activeAccount$.pipe(
-      map((account) => account?.id),
-      switchMap((id) =>
-        organizationId$.pipe(
-          switchMap((organizationId) =>
-            this.organizationService
-              .organizations$(id)
-              .pipe(map((organizations) => organizations.find((org) => org.id === organizationId))),
-          ),
-          takeUntil(this.destroy$),
-          shareReplay({ refCount: false, bufferSize: 1 }),
-        ),
-      ),
-    );
-
-    const firstSetup$ = combineLatest([organization$, this.route.queryParams]).pipe(
-      first(),
-      switchMap(async ([organization]) => {
-        this.organization = organization;
-
-        if (!organization.canEditAnyCollection) {
-          await this.syncService.fullSync(false);
-        }
-
-        return undefined;
-      }),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
-      // 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.ngZone.run(async () => {
-        switch (message.command) {
-          case "syncCompleted":
-            if (message.successfully) {
-              this.refresh();
-              this.changeDetectorRef.detectChanges();
-            }
-            break;
-        }
-      });
-    });
-
-    this.routedVaultFilterBridgeService.activeFilter$
-      .pipe(takeUntil(this.destroy$))
-      .subscribe((activeFilter) => {
-        this.activeFilter = activeFilter;
-
-        // watch the active filters. Only show toggle when viewing the collections filter
-        if (!this.activeFilter.collectionId) {
-          this.showAddAccessToggle = false;
-        }
-      });
-
-    this.searchText$
-      .pipe(debounceTime(SearchTextDebounceInterval), takeUntil(this.destroy$))
-      .subscribe((searchText) =>
-        this.router.navigate([], {
-          queryParams: { search: Utils.isNullOrEmpty(searchText) ? null : searchText },
-          queryParamsHandling: "merge",
-          replaceUrl: true,
-        }),
-      );
-
-    this.currentSearchText$ = this.route.queryParams.pipe(map((queryParams) => queryParams.search));
-
-    this.allCollectionsWithoutUnassigned$ = this.refresh$.pipe(
-      switchMap(() => organizationId$),
-      switchMap((orgId) =>
-        this.accountService.activeAccount$.pipe(
-          getUserId,
-          switchMap((userId) => this.collectionAdminService.collectionAdminViews$(orgId, userId)),
-        ),
-      ),
-      shareReplay({ refCount: false, bufferSize: 1 }),
-    );
-
-    this.editableCollections$ = this.allCollectionsWithoutUnassigned$.pipe(
-      map((collections) => {
-        // Users that can edit all ciphers can implicitly add to / edit within any collection
-        if (this.organization.canEditAllCiphers) {
-          return collections;
-        }
-        return collections.filter((c) => c.assigned);
-      }),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    const allCollections$ = combineLatest([
-      organizationId$,
-      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.
-        return allCollections.concat(
-          new CollectionAdminView({
-            name: this.i18nService.t("unassigned"),
-            id: Unassigned as CollectionId,
-            organizationId,
-          }),
-        );
-      }),
-    );
-
-    const allGroups$ = organizationId$.pipe(
-      switchMap((organizationId) => this.groupService.getAll(organizationId)),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    const allCiphers$ = combineLatest([organization$, this.refresh$]).pipe(
-      switchMap(async ([organization]) => {
-        // If user swaps organization reset the addAccessToggle
-        if (!this.showAddAccessToggle || organization) {
-          this.addAccessToggle(0);
-        }
-        let ciphers;
-
-        // Restricted providers (who are not members) do not have access org cipher endpoint below
-        // Return early to avoid 404 response
-        if (!organization.isMember && organization.isProviderUser) {
-          return [];
-        }
-
-        // If the user can edit all ciphers for the organization then fetch them ALL.
-        if (organization.canEditAllCiphers) {
-          ciphers = await this.cipherService.getAllFromApiForOrganization(organization.id);
-          ciphers?.forEach((c) => (c.edit = true));
-        } else {
-          // Otherwise, only fetch ciphers they have access to (includes unassigned for admins).
-          ciphers = await this.cipherService.getManyFromApiForOrganization(organization.id);
-        }
-
-        await this.searchService.indexCiphers(this.userId, ciphers, organization.id);
-        return ciphers;
-      }),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    const allCipherMap$ = allCiphers$.pipe(
-      map((ciphers) => {
-        return Object.fromEntries(ciphers.map((c) => [c.id, c]));
-      }),
-    );
-
-    const nestedCollections$ = allCollections$.pipe(
-      map((collections) => getNestedCollectionTree(collections)),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    const collections$ = combineLatest([
-      nestedCollections$,
-      filter$,
-      this.currentSearchText$,
-      this.addAccessStatus$,
-    ]).pipe(
-      filter(([collections, filter]) => collections != undefined && filter != undefined),
-      concatMap(async ([collections, filter, searchText, addAccessStatus]) => {
-        if (
-          filter.collectionId === Unassigned ||
-          (filter.collectionId === undefined && filter.type !== undefined)
-        ) {
-          return [];
-        }
-
-        this.showAddAccessToggle = false;
-        let searchableCollectionNodes: TreeNode<CollectionAdminView>[] = [];
-        if (filter.collectionId === undefined || filter.collectionId === All) {
-          searchableCollectionNodes = collections;
-        } else {
-          const selectedCollection = ServiceUtils.getTreeNodeObjectFromList(
-            collections,
-            filter.collectionId,
-          );
-          searchableCollectionNodes = selectedCollection?.children ?? [];
-        }
-
-        let collectionsToReturn: CollectionAdminView[] = [];
-
-        if (await this.searchService.isSearchable(this.userId, searchText)) {
-          // Flatten the tree for searching through all levels
-          const flatCollectionTree: CollectionAdminView[] =
-            getFlatCollectionTree(searchableCollectionNodes);
-
-          collectionsToReturn = this.searchPipe.transform(
-            flatCollectionTree,
-            searchText,
-            (collection) => collection.name,
-            (collection) => collection.id,
-          );
-        } else {
-          collectionsToReturn = searchableCollectionNodes.map(
-            (treeNode: TreeNode<CollectionAdminView>): CollectionAdminView => treeNode.node,
-          );
-        }
-
-        // Add access toggle is only shown if allowAdminAccessToAllCollectionItems is false and there are unmanaged collections the user can edit
-        this.showAddAccessToggle =
-          !this.organization.allowAdminAccessToAllCollectionItems &&
-          this.organization.canEditUnmanagedCollections &&
-          collectionsToReturn.some((c) => c.unmanaged);
-
-        if (addAccessStatus === 1 && this.showAddAccessToggle) {
-          collectionsToReturn = collectionsToReturn.filter((c) => c.unmanaged);
-        }
-        return collectionsToReturn;
-      }),
-      takeUntil(this.destroy$),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    const selectedCollection$ = combineLatest([nestedCollections$, filter$]).pipe(
-      filter(([collections, filter]) => collections != undefined && filter != undefined),
-      map(([collections, filter]) => {
-        if (
-          filter.collectionId === undefined ||
-          filter.collectionId === All ||
-          filter.collectionId === Unassigned
-        ) {
-          return undefined;
-        }
-
-        return ServiceUtils.getTreeNodeObjectFromList(collections, filter.collectionId);
-      }),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    const showCollectionAccessRestricted$ = combineLatest([
-      filter$,
-      selectedCollection$,
-      organization$,
-    ]).pipe(
-      map(([filter, collection, organization]) => {
-        return (
-          (filter.collectionId === Unassigned && !organization.canEditUnassignedCiphers) ||
-          (!organization.canEditAllCiphers && collection != undefined && !collection.node.assigned)
-        );
-      }),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    const ciphers$ = combineLatest([
-      allCiphers$,
-      filter$,
-      this.currentSearchText$,
-      showCollectionAccessRestricted$,
-    ]).pipe(
-      filter(([ciphers, filter]) => ciphers != undefined && filter != undefined),
-      concatMap(async ([ciphers, filter, searchText, showCollectionAccessRestricted]) => {
-        if (filter.collectionId === undefined && filter.type === undefined) {
-          return [];
-        }
-
-        if (showCollectionAccessRestricted) {
-          // Do not show ciphers for restricted collections
-          // Ciphers belonging to multiple collections may still be present in $allCiphers and shouldn't be visible
-          return [];
-        }
-
-        const filterFunction = createFilterFunction(filter);
-
-        if (await this.searchService.isSearchable(this.userId, searchText)) {
-          return await this.searchService.searchCiphers<CipherView>(
-            this.userId,
-            searchText,
-            [filterFunction],
-            ciphers,
-          );
-        }
-
-        return ciphers.filter(filterFunction);
-      }),
-      shareReplay({ refCount: true, bufferSize: 1 }),
-    );
-
-    firstSetup$
-      .pipe(
-        switchMap(() => combineLatest([this.route.queryParams, allCipherMap$])),
-        filter(() => this.vaultItemDialogRef == undefined),
-        switchMap(async ([qParams, allCiphersMap]) => {
-          const cipherId = getCipherIdFromParams(qParams);
-
-          if (!cipherId) {
-            this.prevCipherId = null;
-            return;
-          }
-
-          if (cipherId === this.prevCipherId) {
-            return;
-          }
-
-          this.prevCipherId = cipherId;
-
-          const cipher = allCiphersMap[cipherId];
-          if (cipher) {
-            let action = qParams.action;
-
-            if (action == "showFailedToDecrypt") {
-              DecryptionFailureDialogComponent.open(this.dialogService, {
-                cipherIds: [cipherId as CipherId],
-              });
-              await this.router.navigate([], {
-                queryParams: { itemId: null, cipherId: null, action: null },
-                queryParamsHandling: "merge",
-                replaceUrl: true,
-              });
-              return;
-            }
-
-            // Default to "view"
-            if (action == null) {
-              action = "view";
-            }
-
-            if (action === "view") {
-              await this.viewCipherById(cipher);
-            } else {
-              await this.editCipher(cipher, false);
-            }
-          } else {
-            this.toastService.showToast({
-              variant: "error",
-              title: null,
-              message: this.i18nService.t("unknownCipher"),
-            });
-            await this.router.navigate([], {
-              queryParams: { cipherId: null, itemId: null },
-              queryParamsHandling: "merge",
-            });
-          }
-        }),
-        takeUntil(this.destroy$),
-      )
-      .subscribe();
-
-    firstSetup$
-      .pipe(
-        switchMap(() => combineLatest([this.route.queryParams, organization$, allCiphers$])),
-        switchMap(async ([qParams, organization, allCiphers$]) => {
-          const cipherId = qParams.viewEvents;
-          if (!cipherId) {
-            return;
-          }
-          const cipher = allCiphers$.find((c) => c.id === cipherId);
-          if (organization.useEvents && cipher != undefined) {
-            await this.viewEvents(cipher);
-          } else {
-            this.toastService.showToast({
-              variant: "error",
-              title: null,
-              message: this.i18nService.t("unknownCipher"),
-            });
-            await this.router.navigate([], {
-              queryParams: { viewEvents: null },
-              queryParamsHandling: "merge",
-            });
-          }
-        }),
-        takeUntil(this.destroy$),
-      )
-      .subscribe();
-
-    // Billing Warnings
-    organization$
-      .pipe(
-        switchMap((organization) =>
-          merge(
-            this.organizationWarningsService.showInactiveSubscriptionDialog$(organization),
-            this.organizationWarningsService.showSubscribeBeforeFreeTrialEndsDialog$(organization),
-          ),
-        ),
-        takeUntil(this.destroy$),
-      )
-      .subscribe();
-    // End Billing Warnings
-
-    firstSetup$
-      .pipe(
-        switchMap(() => this.refresh$),
-        tap(() => (this.refreshing = true)),
-        switchMap(() =>
-          combineLatest([
-            organization$,
-            filter$,
-            allCollections$,
-            allGroups$,
-            ciphers$,
-            collections$,
-            selectedCollection$,
-            showCollectionAccessRestricted$,
-          ]),
-        ),
-        takeUntil(this.destroy$),
-      )
-      .subscribe(
-        ([
-          organization,
-          filter,
-          allCollections,
-          allGroups,
-          ciphers,
-          collections,
-          selectedCollection,
-          showCollectionAccessRestricted,
-        ]) => {
-          this.organization = organization;
-          this.filter = filter;
-          this.allCollections = allCollections;
-          this.allGroups = allGroups;
-          this.ciphers = ciphers;
-          this.collections = collections;
-          this.selectedCollection = selectedCollection;
-          this.showCollectionAccessRestricted = showCollectionAccessRestricted;
-
-          this.isEmpty = collections?.length === 0 && ciphers?.length === 0;
-
-          // This is a temporary fix to avoid double fetching collections.
-          // TODO: Remove when implementing new VVR menu
-          this.vaultFilterService.reloadCollections(allCollections);
-
-          this.refreshing = false;
-          this.performingInitialLoad = false;
-        },
-      );
-  }
-
-  async navigateToPaymentMethod() {
-    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-    );
-    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
-    await this.router.navigate(["organizations", `${this.organization?.id}`, "billing", route], {
-      state: { launchPaymentModalAutomatically: true },
-    });
-  }
-
-  addAccessToggle(e: AddAccessStatusType) {
-    this.addAccessStatus$.next(e);
-  }
-
-  get loading() {
-    return this.refreshing || this.processingEvent;
-  }
-
-  ngOnDestroy() {
-    this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  async onVaultItemsEvent(event: VaultItemEvent<CipherView>) {
-    this.processingEvent = true;
-
-    try {
-      switch (event.type) {
-        case "viewAttachments":
-          await this.editCipherAttachments(event.item);
-          break;
-        case "clone":
-          await this.cloneCipher(event.item);
-          break;
-        case "restore":
-          if (event.items.length === 1) {
-            await this.restore(event.items[0]);
-          } else {
-            await this.bulkRestore(event.items);
-          }
-          break;
-        case "delete": {
-          const ciphers = event.items
-            .filter((i) => i.collection === undefined)
-            .map((i) => i.cipher);
-          const collections = event.items
-            .filter((i) => i.cipher === undefined)
-            .map((i) => i.collection);
-          if (ciphers.length === 1 && collections.length === 0) {
-            await this.deleteCipher(ciphers[0]);
-          } else if (ciphers.length === 0 && collections.length === 1) {
-            await this.deleteCollection(collections[0] as CollectionAdminView);
-          } else {
-            await this.bulkDelete(ciphers, collections, this.organization);
-          }
-          break;
-        }
-        case "copyField":
-          await this.copy(event.item, event.field);
-          break;
-        case "editCollection":
-          await this.editCollection(
-            event.item as CollectionAdminView,
-            CollectionDialogTabType.Info,
-            event.readonly,
-          );
-          break;
-        case "viewCollectionAccess":
-          await this.editCollection(
-            event.item as CollectionAdminView,
-            CollectionDialogTabType.Access,
-            event.readonly,
-          );
-          break;
-        case "bulkEditCollectionAccess":
-          await this.bulkEditCollectionAccess(event.items, this.organization);
-          break;
-        case "assignToCollections":
-          await this.bulkAssignToCollections(event.items);
-          break;
-        case "viewEvents":
-          await this.viewEvents(event.item);
-          break;
-      }
-    } finally {
-      this.processingEvent = false;
-    }
-  }
-
-  filterSearchText(searchText: string) {
-    this.searchText$.next(searchText);
-  }
-
-  async editCipherAttachments(cipher: CipherView) {
-    if (cipher?.reprompt !== 0 && !(await this.passwordRepromptService.showPasswordPrompt())) {
-      this.go({ cipherId: null, itemId: null });
-      return;
-    }
-
-    if (this.organization.maxStorageGb == null || this.organization.maxStorageGb === 0) {
-      this.messagingService.send("upgradeOrganization", { organizationId: cipher.organizationId });
-      return;
-    }
-
-    const dialogRef = AttachmentsV2Component.open(this.dialogService, {
-      cipherId: cipher.id as CipherId,
-      organizationId: cipher.organizationId as OrganizationId,
-      admin: true,
-    });
-
-    const result = await firstValueFrom(dialogRef.closed);
-
-    if (
-      result.action === AttachmentDialogResult.Removed ||
-      result.action === AttachmentDialogResult.Uploaded
-    ) {
-      this.refresh();
-    }
-  }
-
-  /** Opens the Add/Edit Dialog */
-  async addCipher(cipherType?: CipherType) {
-    const cipherFormConfig = await this.cipherFormConfigService.buildConfig(
-      "add",
-      null,
-      cipherType,
-    );
-
-    const collectionId: CollectionId | undefined = this.activeFilter.collectionId as CollectionId;
-
-    cipherFormConfig.initialValues = {
-      organizationId: this.organization.id as OrganizationId,
-      collectionIds: collectionId ? [collectionId] : [],
-    };
-
-    await this.openVaultItemDialog("form", cipherFormConfig);
-  }
-
-  /**
-   * Edit the given cipher or add a new cipher
-   * @param cipherView - When set, the cipher to be edited
-   * @param cloneCipher - `true` when the cipher should be cloned.
-   */
-  async editCipher(cipher: CipherView | null, cloneCipher: boolean) {
-    if (
-      cipher &&
-      cipher.reprompt !== 0 &&
-      !(await this.passwordRepromptService.showPasswordPrompt())
-    ) {
-      // didn't pass password prompt, so don't open add / edit modal
-      this.go({ cipherId: null, itemId: null });
-      return;
-    }
-
-    const cipherFormConfig = await this.cipherFormConfigService.buildConfig(
-      cloneCipher ? "clone" : "edit",
-      cipher?.id as CipherId | null,
-    );
-
-    await this.openVaultItemDialog("form", cipherFormConfig, cipher);
-  }
-
-  /** Opens the view dialog for the given cipher unless password reprompt fails */
-  async viewCipherById(cipher: CipherView) {
-    if (!cipher) {
-      return;
-    }
-
-    if (
-      cipher &&
-      cipher.reprompt !== 0 &&
-      !(await this.passwordRepromptService.showPasswordPrompt())
-    ) {
-      // Didn't pass password prompt, so don't open add / edit modal.
-      await this.go({ cipherId: null, itemId: null, action: null });
-      return;
-    }
-
-    const cipherFormConfig = await this.cipherFormConfigService.buildConfig(
-      "edit",
-      cipher.id as CipherId,
-      cipher.type,
-    );
-
-    await this.openVaultItemDialog(
-      "view",
-      cipherFormConfig,
-      cipher,
-      this.activeFilter.collectionId as CollectionId,
-    );
-  }
-
-  /**
-   * Open the combined view / edit dialog for a cipher.
-   */
-  async openVaultItemDialog(
-    mode: VaultItemDialogMode,
-    formConfig: CipherFormConfig,
-    cipher?: CipherView,
-    activeCollectionId?: CollectionId,
-  ) {
-    const disableForm = cipher ? !cipher.edit && !this.organization.canEditAllCiphers : false;
-    // If the form is disabled, force the mode into `view`
-    const dialogMode = disableForm ? "view" : mode;
-    this.vaultItemDialogRef = VaultItemDialogComponent.open(this.dialogService, {
-      mode: dialogMode,
-      formConfig,
-      disableForm,
-      activeCollectionId,
-      isAdminConsoleAction: true,
-      restore: this.restore,
-    });
-
-    const result = await lastValueFrom(this.vaultItemDialogRef.closed);
-    this.vaultItemDialogRef = undefined;
-
-    // If the dialog was closed by deleting the cipher, refresh the vault.
-    if (result === VaultItemDialogResult.Deleted || result === VaultItemDialogResult.Saved) {
-      this.refresh();
-    }
-
-    // Clear the query params when the dialog closes
-    await this.go({ cipherId: null, itemId: null, action: null });
-  }
-
-  async cloneCipher(cipher: CipherView) {
-    if (cipher.login?.hasFido2Credentials) {
-      const confirmed = await this.dialogService.openSimpleDialog({
-        title: { key: "passkeyNotCopied" },
-        content: { key: "passkeyNotCopiedAlert" },
-        type: "info",
-      });
-
-      if (!confirmed) {
-        return false;
-      }
-    }
-
-    await this.editCipher(cipher, true);
-  }
-
-  restore = async (c: CipherView): Promise<boolean> => {
-    if (!c.isDeleted) {
-      return;
-    }
-
-    if (
-      !this.organization.permissions.editAnyCollection &&
-      !c.edit &&
-      !this.organization.allowAdminAccessToAllCollectionItems
-    ) {
-      this.showMissingPermissionsError();
-      return;
-    }
-
-    if (!(await this.repromptCipher([c]))) {
-      return;
-    }
-
-    // Allow restore of an Unassigned Item
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      const asAdmin = this.organization?.canEditAnyCollection || c.isUnassigned;
-      await this.cipherService.restoreWithServer(c.id, activeUserId, asAdmin);
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("restoredItem"),
-      });
-      this.refresh();
-    } catch (e) {
-      this.logService.error(e);
-    }
-  };
-
-  async bulkRestore(ciphers: CipherView[]) {
-    if (
-      !this.organization.permissions.editAnyCollection &&
-      ciphers.some((c) => !c.edit && !this.organization.allowAdminAccessToAllCollectionItems)
-    ) {
-      this.showMissingPermissionsError();
-      return;
-    }
-
-    if (!(await this.repromptCipher(ciphers))) {
-      return;
-    }
-
-    // assess if there are unassigned ciphers and/or editable ciphers selected in bulk for restore
-    const editAccessCiphers: string[] = [];
-    const unassignedCiphers: string[] = [];
-
-    // If user has edit all Access no need to check for unassigned ciphers
-    if (this.organization.canEditAllCiphers) {
-      ciphers.map((cipher) => {
-        editAccessCiphers.push(cipher.id);
-      });
-    } else {
-      ciphers.map((cipher) => {
-        if (cipher.collectionIds.length === 0) {
-          unassignedCiphers.push(cipher.id);
-        } else if (cipher.edit) {
-          editAccessCiphers.push(cipher.id);
-        }
-      });
-    }
-
-    if (unassignedCiphers.length === 0 && editAccessCiphers.length === 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("nothingSelected"),
-      });
-      return;
-    }
-
-    if (unassignedCiphers.length > 0 || editAccessCiphers.length > 0) {
-      await this.cipherService.restoreManyWithServer(
-        [...unassignedCiphers, ...editAccessCiphers],
-        this.userId,
-        this.organization.id,
-      );
-    }
-
-    this.toastService.showToast({
-      variant: "success",
-      title: null,
-      message: this.i18nService.t("restoredItems"),
-    });
-    this.refresh();
-  }
-
-  async deleteCipher(c: CipherView): Promise<boolean> {
-    if (!c.edit && !this.organization.canEditAllCiphers) {
-      this.showMissingPermissionsError();
-      return;
-    }
-
-    if (!(await this.repromptCipher([c]))) {
-      return;
-    }
-
-    const permanent = c.isDeleted;
-
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: permanent ? "permanentlyDeleteItem" : "deleteItem" },
-      content: { key: permanent ? "permanentlyDeleteItemConfirmation" : "deleteItemConfirmation" },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return false;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      await this.deleteCipherWithServer(c.id, activeUserId, permanent, c.isUnassigned);
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t(permanent ? "permanentlyDeletedItem" : "deletedItem"),
-      });
-      this.refresh();
-    } catch (e) {
-      this.logService.error(e);
-    }
-  }
-
-  async deleteCollection(collection: CollectionAdminView): Promise<void> {
-    if (!collection.canDelete(this.organization)) {
-      this.showMissingPermissionsError();
-      return;
-    }
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: collection.name,
-      content: { key: "deleteCollectionConfirmation" },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return;
-    }
-    try {
-      await this.apiService.deleteCollection(this.organization?.id, collection.id);
-      await this.collectionService.delete([collection.id as CollectionId], this.userId);
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("deletedCollectionId", collection.name),
-      });
-
-      // Clear the cipher cache to clear the deleted collection from the cipher state
-      await this.cipherService.clear();
-
-      // Navigate away if we deleted the collection we were viewing
-      if (this.selectedCollection?.node.id === collection.id) {
-        void this.router.navigate([], {
-          queryParams: { collectionId: this.selectedCollection.parent?.node.id ?? null },
-          queryParamsHandling: "merge",
-          replaceUrl: true,
-        });
-      }
-
-      this.refresh();
-    } catch (e) {
-      this.logService.error(e);
-    }
-  }
-
-  async bulkDelete(
-    ciphers: CipherView[],
-    collections: CollectionView[],
-    organization: Organization,
-  ) {
-    if (!(await this.repromptCipher(ciphers))) {
-      return;
-    }
-
-    // Allow bulk deleting of Unassigned Items
-    const unassignedCiphers: string[] = [];
-    const assignedCiphers: string[] = [];
-
-    ciphers.map((c) => {
-      if (c.isUnassigned) {
-        unassignedCiphers.push(c.id);
-      } else {
-        assignedCiphers.push(c.id);
-      }
-    });
-
-    if (ciphers.length === 0 && collections.length === 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("nothingSelected"),
-      });
-      return;
-    }
-
-    const canDeleteCollections =
-      collections == null || collections.every((c) => c.canDelete(organization));
-    const canDeleteCiphers =
-      ciphers == null || ciphers.every((c) => c.edit) || this.organization.canEditAllCiphers;
-
-    if (!canDeleteCiphers || !canDeleteCollections) {
-      this.showMissingPermissionsError();
-      return;
-    }
-
-    const dialog = openBulkDeleteDialog(this.dialogService, {
-      data: {
-        permanent: this.filter.type === "trash",
-        cipherIds: assignedCiphers,
-        collections: collections,
-        organization,
-        unassignedCiphers,
-      },
-    });
-
-    const result = await lastValueFrom(dialog.closed);
-    if (result === BulkDeleteDialogResult.Deleted) {
-      this.refresh();
-    }
-  }
-
-  async copy(cipher: CipherView, field: "username" | "password" | "totp") {
-    let aType;
-    let value;
-    let typeI18nKey;
-
-    if (field === "username") {
-      aType = "Username";
-      value = cipher.login.username;
-      typeI18nKey = "username";
-    } else if (field === "password") {
-      aType = "Password";
-      value = cipher.login.password;
-      typeI18nKey = "password";
-    } else if (field === "totp") {
-      aType = "TOTP";
-      const totpResponse = await firstValueFrom(this.totpService.getCode$(cipher.login.totp));
-      value = totpResponse?.code;
-      typeI18nKey = "verificationCodeTotp";
-    } else {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("unexpectedError"),
-      });
-      return;
-    }
-
-    if (
-      this.passwordRepromptService.protectedFields().includes(aType) &&
-      !(await this.repromptCipher([cipher]))
-    ) {
-      return;
-    }
-
-    if (!cipher.viewPassword) {
-      return;
-    }
-
-    this.platformUtilsService.copyToClipboard(value, { window: window });
-    this.toastService.showToast({
-      variant: "info",
-      title: null,
-      message: this.i18nService.t("valueCopied", this.i18nService.t(typeI18nKey)),
-    });
-
-    if (field === "password") {
-      await this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
-    } else if (field === "totp") {
-      await this.eventCollectionService.collect(
-        EventType.Cipher_ClientCopiedHiddenField,
-        cipher.id,
-      );
-    }
-  }
-
-  async addCollection(): Promise<void> {
-    const dialog = openCollectionDialog(this.dialogService, {
-      data: {
-        organizationId: this.organization?.id,
-        parentCollectionId: this.selectedCollection?.node.id,
-        limitNestedCollections: !this.organization.canEditAnyCollection,
-        isAdminConsoleActive: true,
-      },
-    });
-
-    const result = await lastValueFrom(dialog.closed);
-    if (
-      result.action === CollectionDialogAction.Saved ||
-      result.action === CollectionDialogAction.Deleted
-    ) {
-      this.refresh();
-    }
-  }
-
-  async editCollection(
-    c: CollectionAdminView,
-    tab: CollectionDialogTabType,
-    readonly: boolean,
-  ): Promise<void> {
-    const dialog = openCollectionDialog(this.dialogService, {
-      data: {
-        collectionId: c?.id,
-        organizationId: this.organization?.id,
-        initialTab: tab,
-        readonly: readonly,
-        isAddAccessCollection: c.unmanaged,
-        limitNestedCollections: !this.organization.canEditAnyCollection,
-        isAdminConsoleActive: true,
-      },
-    });
-
-    const result = await lastValueFrom(dialog.closed);
-    if (
-      result.action === CollectionDialogAction.Saved ||
-      result.action === CollectionDialogAction.Deleted
-    ) {
-      this.refresh();
-
-      // If we deleted the selected collection, navigate up/away
-      if (
-        result.action === CollectionDialogAction.Deleted &&
-        this.selectedCollection?.node.id === c?.id
-      ) {
-        void this.router.navigate([], {
-          queryParams: { collectionId: this.selectedCollection.parent?.node.id ?? null },
-          queryParamsHandling: "merge",
-          replaceUrl: true,
-        });
-      }
-    }
-  }
-
-  async bulkEditCollectionAccess(
-    collections: CollectionView[],
-    organization: Organization,
-  ): Promise<void> {
-    if (collections.length === 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("noCollectionsSelected"),
-      });
-      return;
-    }
-
-    if (collections.some((c) => !c.canEdit(organization))) {
-      this.showMissingPermissionsError();
-      return;
-    }
-
-    const dialog = BulkCollectionsDialogComponent.open(this.dialogService, {
-      data: {
-        collections,
-        organizationId: this.organization?.id,
-      },
-    });
-
-    const result = await lastValueFrom(dialog.closed);
-    if (result === BulkCollectionsDialogResult.Saved) {
-      this.refresh();
-    }
-  }
-
-  async bulkAssignToCollections(items: CipherView[]) {
-    if (items.length === 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("nothingSelected"),
-      });
-      return;
-    }
-
-    const availableCollections = await firstValueFrom(this.editableCollections$);
-
-    const dialog = AssignCollectionsWebComponent.open(this.dialogService, {
-      data: {
-        ciphers: items,
-        organizationId: this.organization?.id as OrganizationId,
-        availableCollections,
-        activeCollection: this.activeFilter?.selectedCollectionNode?.node,
-        isSingleCipherAdmin:
-          items.length === 1 && (this.organization?.canEditAllCiphers || items[0].isUnassigned),
-      },
-    });
-
-    const result = await lastValueFrom(dialog.closed);
-    if (result === CollectionAssignmentResult.Saved) {
-      this.refresh();
-    }
-  }
-
-  async viewEvents(cipher: CipherView) {
-    await openEntityEventsDialog(this.dialogService, {
-      data: {
-        name: cipher.name,
-        organizationId: this.organization.id,
-        entityId: cipher.id,
-        showUser: true,
-        entity: "cipher",
-      },
-    });
-  }
-
-  protected deleteCipherWithServer(
-    id: string,
-    userId: UserId,
-    permanent: boolean,
-    isUnassigned: boolean,
-  ) {
-    const asAdmin = this.organization?.canEditAllCiphers || isUnassigned;
-    return permanent
-      ? this.cipherService.deleteWithServer(id, userId, asAdmin)
-      : this.cipherService.softDeleteWithServer(id, userId, asAdmin);
-  }
-
-  protected async repromptCipher(ciphers: CipherView[]) {
-    const notProtected = !ciphers.find((cipher) => cipher.reprompt !== CipherRepromptType.None);
-
-    return notProtected || (await this.passwordRepromptService.showPasswordPrompt());
-  }
-
-  private refresh() {
-    this.refresh$.next();
-    this.vaultItemsComponent?.clearSelection();
-  }
-
-  private go(queryParams: any = null) {
-    if (queryParams == null) {
-      queryParams = {
-        type: this.activeFilter.cipherType,
-        collectionId: this.activeFilter.collectionId,
-        deleted: this.activeFilter.isDeleted || null,
-      };
-    }
-
-    void this.router.navigate([], {
-      relativeTo: this.route,
-      queryParams: queryParams,
-      queryParamsHandling: "merge",
-      replaceUrl: true,
-    });
-  }
-
-  protected readonly CollectionDialogTabType = CollectionDialogTabType;
-
-  private showMissingPermissionsError() {
-    this.toastService.showToast({
-      variant: "error",
-      title: null,
-      message: this.i18nService.t("missingPermissions"),
-    });
-  }
-}
-
-/**
- * Allows backwards compatibility with
- * old links that used the original `cipherId` param
- */
-const getCipherIdFromParams = (params: Params): string => {
-  return params["itemId"] || params["cipherId"];
-};
diff --git a/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.html b/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.html
index 9ddc9897a31..a8021e82c39 100644
--- a/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.html
+++ b/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.html
@@ -1 +1 @@
-<bit-badge-list [items]="groupNames" [maxItems]="3" variant="secondary"></bit-badge-list>
+<bit-badge-list [items]="groupNames()" [maxItems]="3" variant="secondary"></bit-badge-list>
diff --git a/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.ts b/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.ts
index 8f703acf9af..3c1d0d2b691 100644
--- a/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/group-badge/group-name-badge.component.ts
@@ -1,6 +1,4 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, Input, OnChanges } from "@angular/core";
+import { ChangeDetectionStrategy, Component, computed, input } from "@angular/core";
 
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -11,20 +9,25 @@ import { GroupView } from "../../core";
   selector: "app-group-badge",
   templateUrl: "group-name-badge.component.html",
   standalone: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class GroupNameBadgeComponent implements OnChanges {
-  @Input() selectedGroups: SelectionReadOnlyRequest[];
-  @Input() allGroups: GroupView[];
+export class GroupNameBadgeComponent {
+  readonly selectedGroups = input<SelectionReadOnlyRequest[]>([]);
+  readonly allGroups = input<GroupView[]>([]);
 
-  protected groupNames: string[] = [];
+  protected readonly groupNames = computed(() => {
+    const allGroups = this.allGroups();
+    if (!allGroups) {
+      return [];
+    }
+
+    return this.selectedGroups()
+      .map((g) => {
+        return allGroups.find((o) => o.id === g.id)?.name;
+      })
+      .filter((name): name is string => name !== undefined)
+      .sort(this.i18nService.collator.compare);
+  });
 
   constructor(private i18nService: I18nService) {}
-
-  ngOnChanges() {
-    this.groupNames = this.selectedGroups
-      .map((g) => {
-        return this.allGroups.find((o) => o.id === g.id)?.name;
-      })
-      .sort(this.i18nService.collator.compare);
-  }
 }
diff --git a/apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.ts b/apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.ts
index 67cb4c7cdc8..33325b3a4bd 100644
--- a/apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/utils/collection-utils.ts
@@ -5,6 +5,7 @@ import {
   CollectionView,
   NestingDelimiter,
 } from "@bitwarden/admin-console/common";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 
@@ -26,15 +27,21 @@ export function getNestedCollectionTree(
     .sort((a, b) => a.name.localeCompare(b.name))
     .map(cloneCollection);
 
-  const nodes: TreeNode<CollectionView | CollectionAdminView>[] = [];
-  clonedCollections.forEach((collection) => {
-    const parts =
-      collection.name != null
-        ? collection.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter)
-        : [];
-    ServiceUtils.nestedTraverse(nodes, 0, parts, collection, null, NestingDelimiter);
+  const all: TreeNode<CollectionView | CollectionAdminView>[] = [];
+  const groupedByOrg = new Map<OrganizationId, (CollectionView | CollectionAdminView)[]>();
+  clonedCollections.map((c) => {
+    const key = c.organizationId;
+    (groupedByOrg.get(key) ?? groupedByOrg.set(key, []).get(key)!).push(c);
   });
-  return nodes;
+  for (const group of groupedByOrg.values()) {
+    const nodes: TreeNode<CollectionView | CollectionAdminView>[] = [];
+    for (const c of group) {
+      const parts = c.name ? c.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
+      ServiceUtils.nestedTraverse(nodes, 0, parts, c, undefined, NestingDelimiter);
+    }
+    all.push(...nodes);
+  }
+  return all;
 }
 
 export function cloneCollection(collection: CollectionView): CollectionView;
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts
index 1ab76c74655..01e61f0ab28 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts
@@ -9,11 +9,11 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { DialogService, ToastService } from "@bitwarden/components";
-import { CipherArchiveService } from "@bitwarden/vault";
 
 import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../../vault/individual-vault/vault-filter/components/vault-filter.component";
 import { VaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service";
@@ -24,6 +24,8 @@ import {
 } from "../../../../vault/individual-vault/vault-filter/shared/models/vault-filter-section.type";
 import { CollectionFilter } from "../../../../vault/individual-vault/vault-filter/shared/models/vault-filter.type";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-organization-vault-filter",
   templateUrl:
@@ -34,6 +36,8 @@ export class VaultFilterComponent
   extends BaseVaultFilterComponent
   implements OnInit, OnDestroy, OnChanges
 {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() set organization(value: Organization) {
     if (value && value !== this._organization) {
       this._organization = value;
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts
index 1be16c65cb8..30582063ab2 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts
@@ -37,6 +37,8 @@ import {
 } from "../../../../vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model";
 import { CollectionDialogTabType } from "../../shared/components/collection-dialog";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-vault-header",
   templateUrl: "./vault-header.component.html",
@@ -59,36 +61,56 @@ export class VaultHeaderComponent {
    * Boolean to determine the loading state of the header.
    * Shows a loading spinner if set to true
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() loading: boolean;
 
   /** Current active filter */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() filter: RoutedVaultFilterModel;
 
   /** The organization currently being viewed */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organization: Organization;
 
   /** Currently selected collection */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collection?: TreeNode<CollectionAdminView>;
 
   /** The current search text in the header */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() searchText: string;
 
   /** Emits an event when the new item button is clicked in the header */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddCipher = new EventEmitter<CipherType | undefined>();
 
   /** Emits an event when the new collection button is clicked in the header */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddCollection = new EventEmitter<void>();
 
   /** Emits an event when the edit collection button is clicked in the header */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEditCollection = new EventEmitter<{
     tab: CollectionDialogTabType;
     readonly: boolean;
   }>();
 
   /** Emits an event when the delete collection button is clicked in the header */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onDeleteCollection = new EventEmitter<void>();
 
   /** Emits an event when the search text changes in the header*/
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() searchTextChanged = new EventEmitter<string>();
 
   protected CollectionDialogTabType = CollectionDialogTabType;
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault-routing.module.ts b/apps/web/src/app/admin-console/organizations/collections/vault-routing.module.ts
index d529c4c31fe..7ad9f050d7b 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault-routing.module.ts
@@ -1,26 +1,19 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { featureFlaggedRoute } from "@bitwarden/angular/platform/utils/feature-flagged-route";
 import { canAccessVaultTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { organizationPermissionsGuard } from "../guards/org-permissions.guard";
 
-import { VaultComponent } from "./deprecated_vault.component";
-import { vNextVaultComponent } from "./vault.component";
+import { VaultComponent } from "./vault.component";
 
 const routes: Routes = [
-  ...featureFlaggedRoute({
-    defaultComponent: VaultComponent,
-    flaggedComponent: vNextVaultComponent,
-    featureFlag: FeatureFlag.CollectionVaultRefactor,
-    routeOptions: {
-      data: { titleId: "vaults" },
-      path: "",
-      canActivate: [organizationPermissionsGuard(canAccessVaultTab)],
-    },
-  }),
+  {
+    data: { titleId: "vaults" },
+    path: "",
+    canActivate: [organizationPermissionsGuard(canAccessVaultTab)],
+    component: VaultComponent,
+  },
 ];
 
 @NgModule({
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 64aa6936468..f827dda9a9b 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
@@ -44,9 +44,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -142,6 +140,8 @@ enum AddAccessStatusType {
   AddAccess = 1,
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-vault",
   templateUrl: "vault.component.html",
@@ -162,7 +162,7 @@ enum AddAccessStatusType {
     { provide: CipherFormConfigService, useClass: AdminConsoleCipherFormConfigService },
   ],
 })
-export class vNextVaultComponent implements OnInit, OnDestroy {
+export class VaultComponent implements OnInit, OnDestroy {
   protected Unassigned = Unassigned;
 
   trashCleanupWarning: string = this.i18nService.t(
@@ -209,6 +209,8 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
   protected selectedCollection$: Observable<TreeNode<CollectionAdminView> | undefined>;
   private nestedCollections$: Observable<TreeNode<CollectionAdminView>[]>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("vaultItems", { static: false }) vaultItemsComponent:
     | VaultItemsComponent<CipherView>
     | undefined;
@@ -239,7 +241,6 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
     private totpService: TotpService,
     private apiService: ApiService,
     private toastService: ToastService,
-    private configService: ConfigService,
     private cipherFormConfigService: CipherFormConfigService,
     protected billingApiService: BillingApiServiceAbstraction,
     private accountService: AccountService,
@@ -710,14 +711,13 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
   }
 
   async navigateToPaymentMethod() {
-    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-    );
-    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
     const organizationId = await firstValueFrom(this.organizationId$);
-    await this.router.navigate(["organizations", `${organizationId}`, "billing", route], {
-      state: { launchPaymentModalAutomatically: true },
-    });
+    await this.router.navigate(
+      ["organizations", `${organizationId}`, "billing", "payment-details"],
+      {
+        state: { launchPaymentModalAutomatically: true },
+      },
+    );
   }
 
   addAccessToggle(e: AddAccessStatusType) {
@@ -794,6 +794,9 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
         case "viewEvents":
           await this.viewEvents(event.item);
           break;
+        case "editCipher":
+          await this.editCipher(event.item);
+          break;
       }
     } finally {
       this.processingEvent$.next(false);
@@ -856,7 +859,7 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
    * @param cipherView - When set, the cipher to be edited
    * @param cloneCipher - `true` when the cipher should be cloned.
    */
-  async editCipher(cipher: CipherView | undefined, cloneCipher: boolean) {
+  async editCipher(cipher: CipherView | undefined, cloneCipher?: boolean) {
     if (
       cipher &&
       cipher.reprompt !== 0 &&
@@ -982,7 +985,7 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
 
     // Allow restore of an Unassigned Item
     try {
-      if (c.id == null) {
+      if (c.id == null || c.id === "") {
         throw new Error("Cipher must have an Id to be restored");
       }
       const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
@@ -1215,7 +1218,7 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
       aType = "Password";
       value = cipher.login.password;
       typeI18nKey = "password";
-    } else if (field === "totp") {
+    } else if (field === "totp" && cipher.login.totp != null) {
       aType = "TOTP";
       const totpResponse = await firstValueFrom(this.totpService.getCode$(cipher.login.totp));
       value = totpResponse.code;
@@ -1236,7 +1239,7 @@ export class vNextVaultComponent implements OnInit, OnDestroy {
       return;
     }
 
-    if (!cipher.viewPassword) {
+    if (!cipher.viewPassword || value == null) {
       return;
     }
 
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.module.ts b/apps/web/src/app/admin-console/organizations/collections/vault.module.ts
index 92dbc5d832c..d7c6a468eba 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault.module.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault.module.ts
@@ -2,14 +2,12 @@ import { NgModule } from "@angular/core";
 
 import { SharedModule } from "../../../shared/shared.module";
 import { OrganizationBadgeModule } from "../../../vault/individual-vault/organization-badge/organization-badge.module";
-import { ViewComponent } from "../../../vault/individual-vault/view.component";
 import { CollectionDialogComponent } from "../shared/components/collection-dialog";
 
 import { CollectionNameBadgeComponent } from "./collection-badge";
-import { VaultComponent } from "./deprecated_vault.component";
 import { GroupBadgeModule } from "./group-badge/group-badge.module";
 import { VaultRoutingModule } from "./vault-routing.module";
-import { vNextVaultComponent } from "./vault.component";
+import { VaultComponent } from "./vault.component";
 
 @NgModule({
   imports: [
@@ -20,8 +18,6 @@ import { vNextVaultComponent } from "./vault.component";
     OrganizationBadgeModule,
     CollectionDialogComponent,
     VaultComponent,
-    vNextVaultComponent,
-    ViewComponent,
   ],
 })
 export class VaultModule {}
diff --git a/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts b/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts
index cd14b73a156..d45e06ad239 100644
--- a/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts
+++ b/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts
@@ -6,17 +6,31 @@ import { firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-info",
   templateUrl: "organization-information.component.html",
   standalone: false,
 })
 export class OrganizationInformationComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() nameOnly = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() createOrganization = true;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() isProvider = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() acceptingSponsorship = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() formGroup: UntypedFormGroup;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() changedBusinessOwned = new EventEmitter<void>();
 
   constructor(private accountService: AccountService) {}
diff --git a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts
index bc4a942301a..b463d24ea3c 100644
--- a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts
+++ b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts
@@ -19,18 +19,24 @@ import { DialogService } from "@bitwarden/components";
 
 import { isEnterpriseOrgGuard } from "./is-enterprise-org.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1>This is the home screen!</h1>",
   standalone: false,
 })
 export class HomescreenComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1>This component can only be accessed by a enterprise organization!</h1>",
   standalone: false,
 })
 export class IsEnterpriseOrganizationComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1>This is the organization upgrade screen!</h1>",
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.spec.ts
index ab5fd79321a..d7c4e247d8e 100644
--- a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.spec.ts
+++ b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.spec.ts
@@ -18,18 +18,24 @@ import { DialogService } from "@bitwarden/components";
 
 import { isPaidOrgGuard } from "./is-paid-org.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1>This is the home screen!</h1>",
   standalone: false,
 })
 export class HomescreenComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1>This component can only be accessed by a paid organization!</h1>",
   standalone: false,
 })
 export class PaidOrganizationOnlyComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1>This is the organization upgrade screen!</h1>",
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/guards/org-policy.guard.ts b/apps/web/src/app/admin-console/organizations/guards/org-policy.guard.ts
new file mode 100644
index 00000000000..5964601fbe7
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/guards/org-policy.guard.ts
@@ -0,0 +1,70 @@
+import { inject } from "@angular/core";
+import { CanActivateFn, Router } from "@angular/router";
+import { firstValueFrom, Observable, switchMap, tap } from "rxjs";
+
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SyncService } from "@bitwarden/common/platform/sync";
+import { ToastService } from "@bitwarden/components";
+import { UserId } from "@bitwarden/user-core";
+
+/**
+ * This guard is intended to prevent members of an organization from accessing
+ * routes based on compliance with organization
+ * policies. e.g Emergency access, which is a non-organization
+ * feature is restricted by the Auto Confirm policy.
+ */
+export function organizationPolicyGuard(
+  featureCallback: (
+    userId: UserId,
+    configService: ConfigService,
+    policyService: PolicyService,
+  ) => Observable<boolean>,
+): CanActivateFn {
+  return async () => {
+    const router = inject(Router);
+    const toastService = inject(ToastService);
+    const i18nService = inject(I18nService);
+    const accountService = inject(AccountService);
+    const policyService = inject(PolicyService);
+    const configService = inject(ConfigService);
+    const syncService = inject(SyncService);
+
+    const synced = await firstValueFrom(
+      accountService.activeAccount$.pipe(
+        getUserId,
+        switchMap((userId) => syncService.lastSync$(userId)),
+      ),
+    );
+
+    if (synced == null) {
+      await syncService.fullSync(false);
+    }
+
+    const compliant = await firstValueFrom(
+      accountService.activeAccount$.pipe(
+        getUserId,
+        switchMap((userId) => featureCallback(userId, configService, policyService)),
+        tap((compliant) => {
+          if (typeof compliant !== "boolean") {
+            throw new Error("Feature callback must return a boolean.");
+          }
+        }),
+      ),
+    );
+
+    if (!compliant) {
+      toastService.showToast({
+        variant: "error",
+        message: i18nService.t("noPageAccess"),
+      });
+
+      return router.createUrlTree(["/"]);
+    }
+
+    return compliant;
+  };
+}
diff --git a/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.spec.ts
index 9dc084484f3..38f13c4d781 100644
--- a/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.spec.ts
+++ b/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.spec.ts
@@ -17,18 +17,24 @@ import { UserId } from "@bitwarden/common/types/guid";
 
 import { organizationRedirectGuard } from "./org-redirect.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1>This is the home screen!</h1>",
   standalone: false,
 })
 export class HomescreenComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1>This is the admin console!</h1>",
   standalone: false,
 })
 export class AdminConsoleComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "<h1> This is a subroute of the admin console!</h1>",
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
index 10290d52f1e..accb5f77fdc 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -2,17 +2,12 @@
   <app-side-nav variant="secondary" *ngIf="organization$ | async as organization">
     <bit-nav-logo [openIcon]="logo" route="." [label]="'adminConsole' | i18n"></bit-nav-logo>
     <org-switcher [filter]="orgFilter" [hideNewButton]="hideNewOrgButton$ | async"></org-switcher>
-    <bit-nav-group
+    <bit-nav-item
       icon="bwi-dashboard"
-      *ngIf="organization.useRiskInsights && organization.canAccessReports"
+      *ngIf="organization.useAccessIntelligence && organization.canAccessReports"
       [text]="'accessIntelligence' | i18n"
       route="access-intelligence"
-    >
-      <bit-nav-item
-        [text]="'riskInsights' | i18n"
-        route="access-intelligence/risk-insights"
-      ></bit-nav-item>
-    </bit-nav-group>
+    ></bit-nav-item>
     <bit-nav-item
       icon="bwi-collection-shared"
       [text]="'collections' | i18n"
@@ -71,10 +66,9 @@
     >
       <bit-nav-item [text]="'subscription' | i18n" route="billing/subscription"></bit-nav-item>
       <ng-container *ngIf="(showPaymentAndHistory$ | async) && (organizationIsUnmanaged$ | async)">
-        @let paymentDetailsPageData = paymentDetailsPageData$ | async;
         <bit-nav-item
-          [text]="paymentDetailsPageData.textKey | i18n"
-          [route]="paymentDetailsPageData.route"
+          [text]="'paymentDetails' | i18n"
+          route="billing/payment-details"
         ></bit-nav-item>
         <bit-nav-item [text]="'billingHistory' | i18n" route="billing/history"></bit-nav-item>
       </ng-container>
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
index a9b61debf89..ee09143ed2f 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -23,9 +23,6 @@ import { PolicyType, ProviderStatusType } from "@bitwarden/common/admin-console/
 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 { 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 { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { getById } from "@bitwarden/common/platform/misc";
 import { BannerModule, IconModule } from "@bitwarden/components";
@@ -39,6 +36,8 @@ import { FreeFamiliesPolicyService } from "../../../billing/services/free-famili
 import { OrgSwitcherComponent } from "../../../layouts/org-switcher/org-switcher.component";
 import { WebLayoutModule } from "../../../layouts/web-layout.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-organization-layout",
   templateUrl: "organization-layout.component.html",
@@ -70,11 +69,6 @@ export class OrganizationLayoutComponent implements OnInit {
 
   protected showSponsoredFamiliesDropdown$: Observable<boolean>;
 
-  protected paymentDetailsPageData$: Observable<{
-    route: string;
-    textKey: string;
-  }>;
-
   protected subscriber$: Observable<NonIndividualSubscriber>;
   protected getTaxIdWarning$: () => Observable<TaxIdWarningType | null>;
 
@@ -82,12 +76,10 @@ export class OrganizationLayoutComponent implements OnInit {
     private route: ActivatedRoute,
     private organizationService: OrganizationService,
     private platformUtilsService: PlatformUtilsService,
-    private configService: ConfigService,
     private policyService: PolicyService,
     private providerService: ProviderService,
     private accountService: AccountService,
     private freeFamiliesPolicyService: FreeFamiliesPolicyService,
-    private organizationBillingService: OrganizationBillingServiceAbstraction,
     private organizationWarningsService: OrganizationWarningsService,
   ) {}
 
@@ -141,16 +133,6 @@ export class OrganizationLayoutComponent implements OnInit {
 
     this.integrationPageEnabled$ = this.organization$.pipe(map((org) => org.canAccessIntegrations));
 
-    this.paymentDetailsPageData$ = this.configService
-      .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
-      .pipe(
-        map((managePaymentDetailsOutsideCheckout) =>
-          managePaymentDetailsOutsideCheckout
-            ? { route: "billing/payment-details", textKey: "paymentDetails" }
-            : { route: "billing/payment-method", textKey: "paymentMethod" },
-        ),
-      );
-
     this.subscriber$ = this.organization$.pipe(
       map((organization) => ({
         type: "organization",
diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
index 8484b05283d..b4dcb9fdfac 100644
--- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
@@ -28,7 +28,7 @@ import { EventService } from "../../../core";
 import { SharedModule } from "../../../shared";
 
 export interface EntityEventsDialogParams {
-  entity: "user" | "cipher" | "secret" | "project";
+  entity: "user" | "cipher" | "secret" | "project" | "service-account";
   entityId: string;
 
   organizationId?: string;
@@ -37,6 +37,8 @@ export interface EntityEventsDialogParams {
   name?: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [SharedModule],
   templateUrl: "entity-events.component.html",
@@ -174,6 +176,14 @@ export class EntityEventsComponent implements OnInit, OnDestroy {
         dates[1],
         clearExisting ? null : this.continuationToken,
       );
+    } else if (this.params.entity === "service-account") {
+      response = await this.apiService.getEventsServiceAccount(
+        this.params.organizationId,
+        this.params.entityId,
+        dates[0],
+        dates[1],
+        clearExisting ? null : this.continuationToken,
+      );
     } else if (this.params.entity === "project") {
       response = await this.apiService.getEventsProject(
         this.params.organizationId,
diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.html b/apps/web/src/app/admin-console/organizations/manage/events.component.html
index 344e8afef53..83665a4b99e 100644
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.html
@@ -124,7 +124,7 @@
     >
       <i class="bwi bwi-2x bwi-business tw-text-primary-600"></i>
 
-      <p class="tw-font-bold tw-mt-2">
+      <p class="tw-font-medium tw-mt-2">
         {{ "upgradeEventLogTitleMessage" | i18n }}
       </p>
       <p>
diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
index 966499c0bee..62f6539cc16 100644
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { concatMap, filter, firstValueFrom, lastValueFrom, map, switchMap, takeUntil } from "rxjs";
+import { concatMap, firstValueFrom, lastValueFrom, map, of, switchMap, takeUntil, tap } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
@@ -46,6 +46,8 @@ const EVENT_SYSTEM_USER_TO_TRANSLATION: Record<EventSystemUser, string> = {
   [EventSystemUser.PublicApi]: "publicApi",
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "events.component.html",
   imports: [SharedModule, HeaderModule],
@@ -141,17 +143,23 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
             getUserId,
             switchMap((userId) => this.providerService.get$(this.organization.providerId, userId)),
             map((provider) => provider != null && provider.canManageUsers),
-            filter((result) => result),
-            switchMap(() => this.apiService.getProviderUsers(this.organization.id)),
-            map((providerUsersResponse) =>
-              providerUsersResponse.data.forEach((u) => {
-                const name = this.userNamePipe.transform(u);
-                this.orgUsersUserIdMap.set(u.userId, {
-                  name: `${name} (${this.organization.providerName})`,
-                  email: u.email,
+            switchMap((canManage) => {
+              if (canManage) {
+                return this.apiService.getProviderUsers(this.organization.providerId);
+              }
+              return of(null);
+            }),
+            tap((providerUsersResponse) => {
+              if (providerUsersResponse) {
+                providerUsersResponse.data.forEach((u) => {
+                  const name = this.userNamePipe.transform(u);
+                  this.orgUsersUserIdMap.set(u.userId, {
+                    name: `${name} (${this.organization.providerName})`,
+                    email: u.email,
+                  });
                 });
-              }),
-            ),
+              }
+            }),
           ),
         );
       } catch (e) {
diff --git a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts
index 9b9be4e50b3..03a24703c0f 100644
--- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts
@@ -107,6 +107,8 @@ export const openGroupAddEditDialog = (
   );
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-group-add-edit",
   templateUrl: "group-add-edit.component.html",
diff --git a/apps/web/src/app/admin-console/organizations/manage/groups.component.html b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
index 62d0b5b874b..aa4f2ccf138 100644
--- a/apps/web/src/app/admin-console/organizations/manage/groups.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
@@ -34,7 +34,7 @@
               (change)="toggleAllVisible($event)"
               id="selectAll"
             />
-            <label class="tw-mb-0 !tw-font-bold !tw-text-muted" for="selectAll">{{
+            <label class="tw-mb-0 !tw-font-medium !tw-text-muted" for="selectAll">{{
               "all" | i18n
             }}</label>
           </th>
@@ -64,7 +64,7 @@
           <td bitCell (click)="check(g)" class="tw-cursor-pointer">
             <input type="checkbox" bitCheckbox [(ngModel)]="g.checked" />
           </td>
-          <td bitCell class="tw-cursor-pointer tw-font-bold" (click)="edit(g)">
+          <td bitCell class="tw-cursor-pointer tw-font-medium" (click)="edit(g)">
             <button type="button" bitLink>
               {{ g.details.name }}
             </button>
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 23e92056c95..d7dcb8a8aa2 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
@@ -77,6 +77,8 @@ const groupsFilter = (filter: string) => {
   };
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "groups.component.html",
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts b/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts
index 16543cdb58c..86d22fdf5e9 100644
--- a/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts
@@ -17,6 +17,8 @@ export type UserConfirmDialogData = {
   confirmUser: (publicKey: Uint8Array) => Promise<void>;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "user-confirm.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts b/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts
index f88eb82e529..001e64f48f1 100644
--- a/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts
@@ -12,6 +12,8 @@ import { ToastService } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared/shared.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "verify-recover-delete-org.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts
index 3240b8d707a..bb98225498f 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts
@@ -61,6 +61,8 @@ export type AccountRecoveryDialogResultType =
  * given organization user. An admin will access this form when they want to
  * reset a user's password and log them out of sessions.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   selector: "app-account-recovery-dialog",
@@ -76,6 +78,8 @@ export type AccountRecoveryDialogResultType =
   ],
 })
 export class AccountRecoveryDialogComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(InputPasswordComponent)
   inputPasswordComponent: InputPasswordComponent | undefined = undefined;
 
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 01b0d7bc380..3a624e11d95 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
@@ -9,6 +9,7 @@ import {
   OrganizationUserBulkConfirmRequest,
   OrganizationUserBulkPublicKeyResponse,
   OrganizationUserBulkResponse,
+  OrganizationUserService,
 } from "@bitwarden/admin-console/common";
 import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -26,8 +27,6 @@ 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";
 
@@ -36,6 +35,8 @@ type BulkConfirmDialogParams = {
   users: BulkUserDetails[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "bulk-confirm-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.ts
index 8fb60e85b08..0fd60b859f0 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.ts
@@ -16,6 +16,8 @@ type BulkDeleteDialogParams = {
   users: BulkUserDetails[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "bulk-delete-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts
index 9132625c587..a97d595e443 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts
@@ -20,6 +20,8 @@ export type BulkEnableSecretsManagerDialogData = {
   users: OrganizationUserView[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: `bulk-enable-sm-dialog.component.html`,
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.ts
index 5bbc6f093f0..7c95e43c8cf 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.ts
@@ -19,6 +19,8 @@ type BulkRemoveDialogParams = {
   users: BulkUserDetails[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "bulk-remove-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts
index ac99a9b51de..5e542de907a 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts
@@ -15,6 +15,8 @@ type BulkRestoreDialogParams = {
   isRevoking: boolean;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-bulk-restore-revoke",
   templateUrl: "bulk-restore-revoke.component.html",
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.ts
index 078ba6c1fd1..4f2456e1dc6 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.ts
@@ -38,6 +38,8 @@ type BulkStatusDialogData = {
   successfulMessage: string;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-bulk-status",
   templateUrl: "bulk-status.component.html",
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
index b951f73d953..9e40e5afe37 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
@@ -104,6 +104,8 @@ export enum MemberDialogResult {
   Restored = "restored",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "member-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts
index 9a2025c2b30..36dcb618989 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts
@@ -7,6 +7,8 @@ import { Subject, takeUntil } from "rxjs";
 
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-nested-checkbox",
   templateUrl: "nested-checkbox.component.html",
@@ -15,7 +17,11 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 export class NestedCheckboxComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() parentId: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() checkboxes: FormGroup<Record<string, FormControl<boolean>>>;
 
   get parentIndeterminate() {
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.html b/apps/web/src/app/admin-console/organizations/members/members.component.html
index 282291eb60e..84e5c33d20d 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.html
@@ -2,7 +2,7 @@
 @if (organization) {
   <app-organization-free-trial-warning
     [organization]="organization"
-    (clicked)="navigateToPaymentMethod(organization)"
+    (clicked)="billingConstraint.navigateToPaymentMethod(organization)"
   >
   </app-organization-free-trial-warning>
   <app-header>
@@ -94,7 +94,7 @@
                   (change)="dataSource.checkAllFilteredUsers($any($event.target).checked)"
                   id="selectAll"
                 />
-                <label class="tw-mb-0 !tw-font-bold !tw-text-muted" for="selectAll">{{
+                <label class="tw-mb-0 !tw-font-medium !tw-text-muted" for="selectAll">{{
                   "all" | i18n
                 }}</label>
               </th>
@@ -339,7 +339,10 @@
                   ></i>
                   <span class="tw-sr-only">{{ "userUsingTwoStep" | i18n }}</span>
                 </ng-container>
-                <ng-container *ngIf="showEnrolledStatus($any(u), organization)">
+                @let resetPasswordPolicyEnabled = resetPasswordPolicyEnabled$ | async;
+                <ng-container
+                  *ngIf="showEnrolledStatus($any(u), organization, resetPasswordPolicyEnabled)"
+                >
                   <i
                     class="bwi bwi-key"
                     title="{{ 'enrolledAccountRecovery' | i18n }}"
@@ -422,7 +425,7 @@
                     type="button"
                     bitMenuItem
                     (click)="resetPassword(u, organization)"
-                    *ngIf="allowResetPassword(u, organization)"
+                    *ngIf="allowResetPassword(u, organization, resetPasswordPolicyEnabled)"
                   >
                     <i aria-hidden="true" class="bwi bwi-key"></i> {{ "recoverAccount" | i18n }}
                   </button>
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 5a1ae6cd98b..59c4c4898ea 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
@@ -1,14 +1,12 @@
 import { Component, computed, Signal } from "@angular/core";
 import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
-import { ActivatedRoute, Router } from "@angular/router";
+import { ActivatedRoute } from "@angular/router";
 import {
-  BehaviorSubject,
   combineLatest,
   concatMap,
   filter,
   firstValueFrom,
   from,
-  lastValueFrom,
   map,
   merge,
   Observable,
@@ -17,24 +15,12 @@ import {
   take,
 } from "rxjs";
 
-import {
-  OrganizationUserApiService,
-  OrganizationUserConfirmRequest,
-  OrganizationUserUserDetailsResponse,
-  CollectionService,
-  CollectionData,
-  Collection,
-  CollectionDetailsResponse,
-} from "@bitwarden/admin-console/common";
+import { OrganizationUserUserDetailsResponse } from "@bitwarden/admin-console/common";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service";
-import { PolicyApiServiceAbstraction as PolicyApiService } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import {
   OrganizationUserStatusType,
@@ -43,57 +29,39 @@ import {
 } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
-import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
-import { isNotSelfUpgradable, ProductTierType } from "@bitwarden/common/billing/enums";
+import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
 import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { DialogService, SimpleDialogOptions, ToastService } from "@bitwarden/components";
+import { getById } from "@bitwarden/common/platform/misc";
+import { DialogService, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
+import { UserId } from "@bitwarden/user-core";
+import { BillingConstraintService } from "@bitwarden/web-vault/app/billing/members/billing-constraint/billing-constraint.service";
 import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
 
-import {
-  ChangePlanDialogResultType,
-  openChangePlanDialog,
-} from "../../../billing/organizations/change-plan-dialog.component";
 import { BaseMembersComponent } from "../../common/base-members.component";
 import { PeopleTableDataSource } from "../../common/people-table-data-source";
-import { GroupApiService } from "../core";
 import { OrganizationUserView } from "../core/views/organization-user.view";
-import { openEntityEventsDialog } from "../manage/entity-events.component";
 
-import {
-  AccountRecoveryDialogComponent,
-  AccountRecoveryDialogResultType,
-} from "./components/account-recovery/account-recovery-dialog.component";
-import { BulkConfirmDialogComponent } from "./components/bulk/bulk-confirm-dialog.component";
-import { BulkDeleteDialogComponent } from "./components/bulk/bulk-delete-dialog.component";
-import { BulkEnableSecretsManagerDialogComponent } from "./components/bulk/bulk-enable-sm-dialog.component";
-import { BulkRemoveDialogComponent } from "./components/bulk/bulk-remove-dialog.component";
-import { BulkRestoreRevokeComponent } from "./components/bulk/bulk-restore-revoke.component";
-import { BulkStatusComponent } from "./components/bulk/bulk-status.component";
-import {
-  MemberDialogResult,
-  MemberDialogTab,
-  openUserAddEditDialog,
-} from "./components/member-dialog";
-import { isFixedSeatPlan } from "./components/member-dialog/validators/org-seat-limit-reached.validator";
+import { AccountRecoveryDialogResultType } from "./components/account-recovery/account-recovery-dialog.component";
+import { MemberDialogResult, MemberDialogTab } from "./components/member-dialog";
+import { MemberDialogManagerService, OrganizationMembersService } from "./services";
 import { DeleteManagedMemberWarningService } from "./services/delete-managed-member/delete-managed-member-warning.service";
-import { OrganizationUserService } from "./services/organization-user/organization-user.service";
+import {
+  MemberActionsService,
+  MemberActionResult,
+} from "./services/member-actions/member-actions.service";
 
 class MembersTableDataSource extends PeopleTableDataSource<OrganizationUserView> {
   protected statusType = OrganizationUserStatusType;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "members.component.html",
   standalone: false,
@@ -104,52 +72,47 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   memberTab = MemberDialogTab;
   protected dataSource = new MembersTableDataSource();
 
-  organization: Signal<Organization | undefined>;
+  readonly organization: Signal<Organization | undefined>;
   status: OrganizationUserStatusType | undefined;
-  orgResetPasswordPolicyEnabled = false;
 
-  protected canUseSecretsManager: Signal<boolean> = computed(
+  private userId$: Observable<UserId> = this.accountService.activeAccount$.pipe(getUserId);
+
+  resetPasswordPolicyEnabled$: Observable<boolean>;
+
+  protected readonly canUseSecretsManager: Signal<boolean> = computed(
     () => this.organization()?.useSecretsManager ?? false,
   );
-  protected showUserManagementControls: Signal<boolean> = computed(
+  protected readonly showUserManagementControls: Signal<boolean> = computed(
     () => this.organization()?.canManageUsers ?? false,
   );
-  private refreshBillingMetadata$: BehaviorSubject<null> = new BehaviorSubject(null);
   protected billingMetadata$: Observable<OrganizationBillingMetadataResponse>;
 
   // Fixed sizes used for cdkVirtualScroll
   protected rowHeight = 66;
   protected rowHeightClass = `tw-h-[66px]`;
 
-  private userId$: Observable<UserId> = this.accountService.activeAccount$.pipe(getUserId);
-
   constructor(
     apiService: ApiService,
     i18nService: I18nService,
     organizationManagementPreferencesService: OrganizationManagementPreferencesService,
     keyService: KeyService,
-    private encryptService: EncryptService,
     validationService: ValidationService,
     logService: LogService,
     userNamePipe: UserNamePipe,
     dialogService: DialogService,
     toastService: ToastService,
-    private policyService: PolicyService,
-    private policyApiService: PolicyApiService,
     private route: ActivatedRoute,
-    private syncService: SyncService,
+    protected deleteManagedMemberWarningService: DeleteManagedMemberWarningService,
+    private organizationWarningsService: OrganizationWarningsService,
+    private memberActionsService: MemberActionsService,
+    private memberDialogManager: MemberDialogManagerService,
+    protected billingConstraint: BillingConstraintService,
+    protected memberService: OrganizationMembersService,
     private organizationService: OrganizationService,
     private accountService: AccountService,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    private organizationUserApiService: OrganizationUserApiService,
-    private router: Router,
-    private groupService: GroupApiService,
-    private collectionService: CollectionService,
-    private billingApiService: BillingApiServiceAbstraction,
-    protected deleteManagedMemberWarningService: DeleteManagedMemberWarningService,
-    private configService: ConfigService,
-    private organizationUserService: OrganizationUserService,
-    private organizationWarningsService: OrganizationWarningsService,
+    private policyService: PolicyService,
+    private policyApiService: PolicyApiServiceAbstraction,
+    private organizationMetadataService: OrganizationMetadataServiceAbstraction,
   ) {
     super(
       apiService,
@@ -167,14 +130,12 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       concatMap((params) =>
         this.userId$.pipe(
           switchMap((userId) =>
-            this.organizationService
-              .organizations$(userId)
-              .pipe(getOrganizationById(params.organizationId)),
+            this.organizationService.organizations$(userId).pipe(getById(params.organizationId)),
           ),
+          filter((organization): organization is Organization => organization != null),
+          shareReplay({ refCount: true, bufferSize: 1 }),
         ),
       ),
-      filter((organization): organization is Organization => organization != null),
-      shareReplay({ refCount: true, bufferSize: 1 }),
     );
 
     this.organization = toSignal(organization$);
@@ -189,53 +150,26 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       ),
     );
 
-    combineLatest([this.route.queryParams, policies$, organization$])
-      .pipe(
-        concatMap(async ([qParams, policies, organization]) => {
-          // Backfill pub/priv key if necessary
-          if (organization.canManageUsersPassword && !organization.hasPublicAndPrivateKeys) {
-            const orgShareKey = await firstValueFrom(
-              this.userId$.pipe(
-                switchMap((userId) => this.keyService.orgKeys$(userId)),
-                map((orgKeys) => {
-                  if (orgKeys == null || orgKeys[organization.id] == null) {
-                    throw new Error("Organization keys not found for provided User.");
-                  }
-                  return orgKeys[organization.id];
-                }),
-              ),
-            );
-
-            const [orgPublicKey, encryptedOrgPrivateKey] =
-              await this.keyService.makeKeyPair(orgShareKey);
-            if (encryptedOrgPrivateKey.encryptedString == null) {
-              throw new Error("Encrypted private key is null.");
-            }
-            const request = new OrganizationKeysRequest(
-              orgPublicKey,
-              encryptedOrgPrivateKey.encryptedString,
-            );
-            const response = await this.organizationApiService.updateKeys(organization.id, request);
-            if (response != null) {
-              await this.syncService.fullSync(true); // Replace organizations with new data
-            } else {
-              throw new Error(this.i18nService.t("resetPasswordOrgKeysError"));
-            }
-          }
-
-          const resetPasswordPolicy = policies
+    this.resetPasswordPolicyEnabled$ = combineLatest([organization$, policies$]).pipe(
+      map(
+        ([organization, policies]) =>
+          policies
             .filter((policy) => policy.type === PolicyType.ResetPassword)
-            .find((p) => p.organizationId === organization.id);
-          this.orgResetPasswordPolicyEnabled = resetPasswordPolicy?.enabled ?? false;
+            .find((p) => p.organizationId === organization.id)?.enabled ?? false,
+      ),
+    );
 
-          await this.load(organization);
+    combineLatest([this.route.queryParams, organization$])
+      .pipe(
+        concatMap(async ([qParams, organization]) => {
+          await this.load(organization!);
 
           this.searchControl.setValue(qParams.search);
 
           if (qParams.viewEvents != null) {
             const user = this.dataSource.data.filter((u) => u.id === qParams.viewEvents);
             if (user.length > 0 && user[0].status === OrganizationUserStatusType.Confirmed) {
-              this.openEventsDialog(user[0], organization);
+              this.openEventsDialog(user[0], organization!);
             }
           }
         }),
@@ -255,11 +189,10 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       )
       .subscribe();
 
-    this.billingMetadata$ = combineLatest([this.refreshBillingMetadata$, organization$]).pipe(
-      switchMap(([_, organization]) =>
-        this.billingApiService.getOrganizationBillingMetadata(organization.id),
+    this.billingMetadata$ = organization$.pipe(
+      switchMap((organization) =>
+        this.organizationMetadataService.getOrganizationMetadata$(organization.id),
       ),
-      takeUntilDestroyed(),
       shareReplay({ bufferSize: 1, refCount: false }),
     );
 
@@ -269,136 +202,35 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   }
 
   override async load(organization: Organization) {
-    this.refreshBillingMetadata$.next(null);
     await super.load(organization);
   }
 
   async getUsers(organization: Organization): Promise<OrganizationUserView[]> {
-    let groupsPromise: Promise<Map<string, string>> | undefined;
-    let collectionsPromise: Promise<Map<string, string>> | undefined;
-
-    // We don't need both groups and collections for the table, so only load one
-    const userPromise = this.organizationUserApiService.getAllUsers(organization.id, {
-      includeGroups: organization.useGroups,
-      includeCollections: !organization.useGroups,
-    });
-
-    // Depending on which column is displayed, we need to load the group/collection names
-    if (organization.useGroups) {
-      groupsPromise = this.getGroupNameMap(organization);
-    } else {
-      collectionsPromise = this.getCollectionNameMap(organization);
-    }
-
-    const [usersResponse, groupNamesMap, collectionNamesMap] = await Promise.all([
-      userPromise,
-      groupsPromise,
-      collectionsPromise,
-    ]);
-
-    return (
-      usersResponse.data?.map<OrganizationUserView>((r) => {
-        const userView = OrganizationUserView.fromResponse(r);
-
-        userView.groupNames = userView.groups
-          .map((g) => groupNamesMap?.get(g))
-          .filter((name): name is string => name != null)
-          .sort(this.i18nService.collator?.compare);
-        userView.collectionNames = userView.collections
-          .map((c) => collectionNamesMap?.get(c.id))
-          .filter((name): name is string => name != null)
-          .sort(this.i18nService.collator?.compare);
-
-        return userView;
-      }) ?? []
-    );
+    return await this.memberService.loadUsers(organization);
   }
 
-  async getGroupNameMap(organization: Organization): Promise<Map<string, string>> {
-    const groups = await this.groupService.getAll(organization.id);
-    const groupNameMap = new Map<string, string>();
-    groups.forEach((g) => groupNameMap.set(g.id, g.name));
-    return groupNameMap;
+  async removeUser(id: string, organization: Organization): Promise<MemberActionResult> {
+    return await this.memberActionsService.removeUser(organization, id);
   }
 
-  /**
-   * Retrieve a map of all collection IDs <-> names for the organization.
-   */
-  async getCollectionNameMap(organization: Organization) {
-    const response = from(this.apiService.getCollections(organization.id)).pipe(
-      map((res) =>
-        res.data.map((r) =>
-          Collection.fromCollectionData(new CollectionData(r as CollectionDetailsResponse)),
-        ),
-      ),
-    );
-
-    const decryptedCollections$ = combineLatest([
-      this.userId$.pipe(
-        switchMap((userId) => this.keyService.orgKeys$(userId)),
-        filter((orgKeys) => orgKeys != null),
-      ),
-      response,
-    ]).pipe(
-      switchMap(([orgKeys, collections]) =>
-        this.collectionService.decryptMany$(collections, orgKeys),
-      ),
-      map((collections) => {
-        const collectionMap = new Map<string, string>();
-        collections.forEach((c) => collectionMap.set(c.id, c.name));
-        return collectionMap;
-      }),
-    );
-
-    return await firstValueFrom(decryptedCollections$);
+  async revokeUser(id: string, organization: Organization): Promise<MemberActionResult> {
+    return await this.memberActionsService.revokeUser(organization, id);
   }
 
-  removeUser(id: string, organization: Organization): Promise<void> {
-    return this.organizationUserApiService.removeOrganizationUser(organization.id, id);
+  async restoreUser(id: string, organization: Organization): Promise<MemberActionResult> {
+    return await this.memberActionsService.restoreUser(organization, id);
   }
 
-  revokeUser(id: string, organization: Organization): Promise<void> {
-    return this.organizationUserApiService.revokeOrganizationUser(organization.id, id);
-  }
-
-  restoreUser(id: string, organization: Organization): Promise<void> {
-    return this.organizationUserApiService.restoreOrganizationUser(organization.id, id);
-  }
-
-  reinviteUser(id: string, organization: Organization): Promise<void> {
-    return this.organizationUserApiService.postOrganizationUserReinvite(organization.id, id);
+  async reinviteUser(id: string, organization: Organization): Promise<MemberActionResult> {
+    return await this.memberActionsService.reinviteUser(organization, id);
   }
 
   async confirmUser(
     user: OrganizationUserView,
     publicKey: Uint8Array,
     organization: Organization,
-  ): Promise<void> {
-    if (
-      await firstValueFrom(this.configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation))
-    ) {
-      await firstValueFrom(this.organizationUserService.confirmUser(organization, user, publicKey));
-    } else {
-      const request = await firstValueFrom(
-        this.userId$.pipe(
-          switchMap((userId) => this.keyService.orgKeys$(userId)),
-          filter((orgKeys) => orgKeys != null),
-          map((orgKeys) => orgKeys[organization.id]),
-          switchMap((orgKey) => this.encryptService.encapsulateKeyUnsigned(orgKey, publicKey)),
-          map((encKey) => {
-            const req = new OrganizationUserConfirmRequest();
-            req.key = encKey.encryptedString;
-            return req;
-          }),
-        ),
-      );
-
-      await this.organizationUserApiService.postOrganizationUserConfirm(
-        organization.id,
-        user.id,
-        request,
-      );
-    }
+  ): Promise<MemberActionResult> {
+    return await this.memberActionsService.confirmUser(user, publicKey, organization);
   }
 
   async revoke(user: OrganizationUserView, organization: Organization) {
@@ -410,12 +242,16 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
 
     this.actionPromise = this.revokeUser(user.id, organization);
     try {
-      await this.actionPromise;
-      this.toastService.showToast({
-        variant: "success",
-        message: this.i18nService.t("revokedUserId", this.userNamePipe.transform(user)),
-      });
-      await this.load(organization);
+      const result = await this.actionPromise;
+      if (result.success) {
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("revokedUserId", this.userNamePipe.transform(user)),
+        });
+        await this.load(organization);
+      } else {
+        throw new Error(result.error);
+      }
     } catch (e) {
       this.validationService.showError(e);
     }
@@ -425,198 +261,68 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   async restore(user: OrganizationUserView, organization: Organization) {
     this.actionPromise = this.restoreUser(user.id, organization);
     try {
-      await this.actionPromise;
-      this.toastService.showToast({
-        variant: "success",
-        message: this.i18nService.t("restoredUserId", this.userNamePipe.transform(user)),
-      });
-      await this.load(organization);
+      const result = await this.actionPromise;
+      if (result.success) {
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("restoredUserId", this.userNamePipe.transform(user)),
+        });
+        await this.load(organization);
+      } else {
+        throw new Error(result.error);
+      }
     } catch (e) {
       this.validationService.showError(e);
     }
     this.actionPromise = undefined;
   }
 
-  allowResetPassword(orgUser: OrganizationUserView, organization: Organization): boolean {
-    let callingUserHasPermission = false;
-
-    switch (organization.type) {
-      case OrganizationUserType.Owner:
-        callingUserHasPermission = true;
-        break;
-      case OrganizationUserType.Admin:
-        callingUserHasPermission = orgUser.type !== OrganizationUserType.Owner;
-        break;
-      case OrganizationUserType.Custom:
-        callingUserHasPermission =
-          orgUser.type !== OrganizationUserType.Owner &&
-          orgUser.type !== OrganizationUserType.Admin;
-        break;
-    }
-
-    return (
-      organization.canManageUsersPassword &&
-      callingUserHasPermission &&
-      organization.useResetPassword &&
-      organization.hasPublicAndPrivateKeys &&
-      orgUser.resetPasswordEnrolled &&
-      this.orgResetPasswordPolicyEnabled &&
-      orgUser.status === OrganizationUserStatusType.Confirmed
+  allowResetPassword(
+    orgUser: OrganizationUserView,
+    organization: Organization,
+    orgResetPasswordPolicyEnabled: boolean,
+  ): boolean {
+    return this.memberActionsService.allowResetPassword(
+      orgUser,
+      organization,
+      orgResetPasswordPolicyEnabled,
     );
   }
 
   showEnrolledStatus(
     orgUser: OrganizationUserUserDetailsResponse,
     organization: Organization,
+    orgResetPasswordPolicyEnabled: boolean,
   ): boolean {
     return (
       organization.useResetPassword &&
       orgUser.resetPasswordEnrolled &&
-      this.orgResetPasswordPolicyEnabled
-    );
-  }
-
-  private getManageBillingText(organization: Organization): string {
-    return organization.canEditSubscription ? "ManageBilling" : "NoManageBilling";
-  }
-
-  private getProductKey(organization: Organization): string {
-    let product = "";
-    switch (organization.productTierType) {
-      case ProductTierType.Free:
-        product = "freeOrg";
-        break;
-      case ProductTierType.TeamsStarter:
-        product = "teamsStarterPlan";
-        break;
-      case ProductTierType.Families:
-        product = "familiesPlan";
-        break;
-      default:
-        throw new Error(`Unsupported product type: ${organization.productTierType}`);
-    }
-    return `${product}InvLimitReached${this.getManageBillingText(organization)}`;
-  }
-
-  private getDialogContent(organization: Organization): string {
-    return this.i18nService.t(this.getProductKey(organization), organization.seats);
-  }
-
-  private getAcceptButtonText(organization: Organization): string {
-    if (!organization.canEditSubscription) {
-      return this.i18nService.t("ok");
-    }
-
-    const productType = organization.productTierType;
-
-    if (isNotSelfUpgradable(productType)) {
-      throw new Error(`Unsupported product type: ${productType}`);
-    }
-
-    return this.i18nService.t("upgrade");
-  }
-
-  private async handleDialogClose(
-    result: boolean | undefined,
-    organization: Organization,
-  ): Promise<void> {
-    if (!result || !organization.canEditSubscription) {
-      return;
-    }
-
-    const productType = organization.productTierType;
-
-    if (isNotSelfUpgradable(productType)) {
-      throw new Error(`Unsupported product type: ${organization.productTierType}`);
-    }
-
-    await this.router.navigate(["/organizations", organization.id, "billing", "subscription"], {
-      queryParams: { upgrade: true },
-    });
-  }
-
-  private async showSeatLimitReachedDialog(organization: Organization): Promise<void> {
-    const orgUpgradeSimpleDialogOpts: SimpleDialogOptions = {
-      title: this.i18nService.t("upgradeOrganization"),
-      content: this.getDialogContent(organization),
-      type: "primary",
-      acceptButtonText: this.getAcceptButtonText(organization),
-    };
-
-    if (!organization.canEditSubscription) {
-      orgUpgradeSimpleDialogOpts.cancelButtonText = null;
-    }
-
-    const simpleDialog = this.dialogService.openSimpleDialogRef(orgUpgradeSimpleDialogOpts);
-    await lastValueFrom(
-      simpleDialog.closed.pipe(map((closed) => this.handleDialogClose(closed, organization))),
+      orgResetPasswordPolicyEnabled
     );
   }
 
   private async handleInviteDialog(organization: Organization) {
     const billingMetadata = await firstValueFrom(this.billingMetadata$);
-    const dialog = openUserAddEditDialog(this.dialogService, {
-      data: {
-        kind: "Add",
-        organizationId: organization.id,
-        allOrganizationUserEmails: this.dataSource.data?.map((user) => user.email) ?? [],
-        occupiedSeatCount: billingMetadata?.organizationOccupiedSeats ?? 0,
-        isOnSecretsManagerStandalone: billingMetadata?.isOnSecretsManagerStandalone ?? false,
-      },
-    });
+    const allUserEmails = this.dataSource.data?.map((user) => user.email) ?? [];
 
-    const result = await lastValueFrom(dialog.closed);
+    const result = await this.memberDialogManager.openInviteDialog(
+      organization,
+      billingMetadata,
+      allUserEmails,
+    );
 
     if (result === MemberDialogResult.Saved) {
       await this.load(organization);
     }
   }
 
-  private async handleSeatLimitForFixedTiers(organization: Organization) {
-    if (!organization.canEditSubscription) {
-      await this.showSeatLimitReachedDialog(organization);
-      return;
-    }
-
-    const reference = openChangePlanDialog(this.dialogService, {
-      data: {
-        organizationId: organization.id,
-        productTierType: organization.productTierType,
-      },
-    });
-
-    const result = await lastValueFrom(reference.closed);
-
-    if (result === ChangePlanDialogResultType.Submitted) {
-      await this.load(organization);
-    }
-  }
-
   async invite(organization: Organization) {
     const billingMetadata = await firstValueFrom(this.billingMetadata$);
-    if (
-      organization.hasReseller &&
-      organization.seats === billingMetadata?.organizationOccupiedSeats
-    ) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("seatLimitReached"),
-        message: this.i18nService.t("contactYourProvider"),
-      });
-
-      return;
+    const seatLimitResult = this.billingConstraint.checkSeatLimit(organization, billingMetadata);
+    if (!(await this.billingConstraint.seatLimitReached(seatLimitResult, organization))) {
+      await this.handleInviteDialog(organization);
+      this.organizationMetadataService.refreshMetadataCache();
     }
-
-    if (
-      billingMetadata?.organizationOccupiedSeats === organization.seats &&
-      isFixedSeatPlan(organization.productTierType)
-    ) {
-      await this.handleSeatLimitForFixedTiers(organization);
-
-      return;
-    }
-
-    await this.handleInviteDialog(organization);
   }
 
   async edit(
@@ -625,20 +331,14 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
     initialTab: MemberDialogTab = MemberDialogTab.Role,
   ) {
     const billingMetadata = await firstValueFrom(this.billingMetadata$);
-    const dialog = openUserAddEditDialog(this.dialogService, {
-      data: {
-        kind: "Edit",
-        name: this.userNamePipe.transform(user),
-        organizationId: organization.id,
-        organizationUserId: user.id,
-        usesKeyConnector: user.usesKeyConnector,
-        isOnSecretsManagerStandalone: billingMetadata?.isOnSecretsManagerStandalone ?? false,
-        initialTab: initialTab,
-        managedByOrganization: user.managedByOrganization,
-      },
-    });
 
-    const result = await lastValueFrom(dialog.closed);
+    const result = await this.memberDialogManager.openEditDialog(
+      user,
+      organization,
+      billingMetadata,
+      initialTab,
+    );
+
     switch (result) {
       case MemberDialogResult.Deleted:
         this.dataSource.removeUser(user);
@@ -656,43 +356,23 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       return;
     }
 
-    const dialogRef = BulkRemoveDialogComponent.open(this.dialogService, {
-      data: {
-        organizationId: organization.id,
-        users: this.dataSource.getCheckedUsers(),
-      },
-    });
-    await lastValueFrom(dialogRef.closed);
+    await this.memberDialogManager.openBulkRemoveDialog(
+      organization,
+      this.dataSource.getCheckedUsers(),
+    );
+    this.organizationMetadataService.refreshMetadataCache();
     await this.load(organization);
   }
 
   async bulkDelete(organization: Organization) {
-    const warningAcknowledged = await firstValueFrom(
-      this.deleteManagedMemberWarningService.warningAcknowledged(organization.id),
-    );
-
-    if (
-      !warningAcknowledged &&
-      organization.canManageUsers &&
-      organization.productTierType === ProductTierType.Enterprise
-    ) {
-      const acknowledged = await this.deleteManagedMemberWarningService.showWarning();
-      if (!acknowledged) {
-        return;
-      }
-    }
-
     if (this.actionPromise != null) {
       return;
     }
 
-    const dialogRef = BulkDeleteDialogComponent.open(this.dialogService, {
-      data: {
-        organizationId: organization.id,
-        users: this.dataSource.getCheckedUsers(),
-      },
-    });
-    await lastValueFrom(dialogRef.closed);
+    await this.memberDialogManager.openBulkDeleteDialog(
+      organization,
+      this.dataSource.getCheckedUsers(),
+    );
     await this.load(organization);
   }
 
@@ -709,13 +389,11 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       return;
     }
 
-    const ref = BulkRestoreRevokeComponent.open(this.dialogService, {
-      organizationId: organization.id,
-      users: this.dataSource.getCheckedUsers(),
-      isRevoking: isRevoking,
-    });
-
-    await firstValueFrom(ref.closed);
+    await this.memberDialogManager.openBulkRestoreRevokeDialog(
+      organization,
+      this.dataSource.getCheckedUsers(),
+      isRevoking,
+    );
     await this.load(organization);
   }
 
@@ -737,20 +415,22 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
     }
 
     try {
-      const response = this.organizationUserApiService.postManyOrganizationUserReinvite(
-        organization.id,
+      const result = await this.memberActionsService.bulkReinvite(
+        organization,
         filteredUsers.map((user) => user.id),
       );
+
+      if (!result.successful) {
+        throw new Error();
+      }
+
       // Bulk Status component open
-      const dialogRef = BulkStatusComponent.open(this.dialogService, {
-        data: {
-          users: users,
-          filteredUsers: filteredUsers,
-          request: response,
-          successfulMessage: this.i18nService.t("bulkReinviteMessage"),
-        },
-      });
-      await lastValueFrom(dialogRef.closed);
+      await this.memberDialogManager.openBulkStatusDialog(
+        users,
+        filteredUsers,
+        Promise.resolve(result.successful),
+        this.i18nService.t("bulkReinviteMessage"),
+      );
     } catch (e) {
       this.validationService.showError(e);
     }
@@ -762,49 +442,24 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       return;
     }
 
-    const dialogRef = BulkConfirmDialogComponent.open(this.dialogService, {
-      data: {
-        organization: organization,
-        users: this.dataSource.getCheckedUsers(),
-      },
-    });
-
-    await lastValueFrom(dialogRef.closed);
+    await this.memberDialogManager.openBulkConfirmDialog(
+      organization,
+      this.dataSource.getCheckedUsers(),
+    );
     await this.load(organization);
   }
 
   async bulkEnableSM(organization: Organization) {
-    const users = this.dataSource.getCheckedUsers().filter((ou) => !ou.accessSecretsManager);
+    const users = this.dataSource.getCheckedUsers();
 
-    if (users.length === 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("noSelectedUsersApplicable"),
-      });
-      return;
-    }
+    await this.memberDialogManager.openBulkEnableSecretsManagerDialog(organization, users);
 
-    const dialogRef = BulkEnableSecretsManagerDialogComponent.open(this.dialogService, {
-      orgId: organization.id,
-      users,
-    });
-
-    await lastValueFrom(dialogRef.closed);
     this.dataSource.uncheckAllUsers();
     await this.load(organization);
   }
 
   openEventsDialog(user: OrganizationUserView, organization: Organization) {
-    openEntityEventsDialog(this.dialogService, {
-      data: {
-        name: this.userNamePipe.transform(user),
-        organizationId: organization.id,
-        entityId: user.id,
-        showUser: false,
-        entity: "user",
-      },
-    });
+    this.memberDialogManager.openEventsDialog(user, organization);
   }
 
   async resetPassword(user: OrganizationUserView, organization: Organization) {
@@ -819,16 +474,7 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       return;
     }
 
-    const dialogRef = AccountRecoveryDialogComponent.open(this.dialogService, {
-      data: {
-        name: this.userNamePipe.transform(user),
-        email: user.email,
-        organizationId: organization.id as OrganizationId,
-        organizationUserId: user.id,
-      },
-    });
-
-    const result = await lastValueFrom(dialogRef.closed);
+    const result = await this.memberDialogManager.openAccountRecoveryDialog(user, organization);
     if (result === AccountRecoveryDialogResultType.Ok) {
       await this.load(organization);
     }
@@ -837,91 +483,29 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   }
 
   protected async removeUserConfirmationDialog(user: OrganizationUserView) {
-    const content = user.usesKeyConnector
-      ? "removeUserConfirmationKeyConnector"
-      : "removeOrgUserConfirmation";
-
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: {
-        key: "removeUserIdAccess",
-        placeholders: [this.userNamePipe.transform(user)],
-      },
-      content: { key: content },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return false;
-    }
-
-    if (user.status > OrganizationUserStatusType.Invited && user.hasMasterPassword === false) {
-      return await this.noMasterPasswordConfirmationDialog(user);
-    }
-
-    return true;
+    return await this.memberDialogManager.openRemoveUserConfirmationDialog(user);
   }
 
   protected async revokeUserConfirmationDialog(user: OrganizationUserView) {
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "revokeAccess", placeholders: [this.userNamePipe.transform(user)] },
-      content: this.i18nService.t("revokeUserConfirmation"),
-      acceptButtonText: { key: "revokeAccess" },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return false;
-    }
-
-    if (user.status > OrganizationUserStatusType.Invited && user.hasMasterPassword === false) {
-      return await this.noMasterPasswordConfirmationDialog(user);
-    }
-
-    return true;
+    return await this.memberDialogManager.openRevokeUserConfirmationDialog(user);
   }
 
   async deleteUser(user: OrganizationUserView, organization: Organization) {
-    const warningAcknowledged = await firstValueFrom(
-      this.deleteManagedMemberWarningService.warningAcknowledged(organization.id),
+    const confirmed = await this.memberDialogManager.openDeleteUserConfirmationDialog(
+      user,
+      organization,
     );
 
-    if (
-      !warningAcknowledged &&
-      organization.canManageUsers &&
-      organization.productTierType === ProductTierType.Enterprise
-    ) {
-      const acknowledged = await this.deleteManagedMemberWarningService.showWarning();
-      if (!acknowledged) {
-        return false;
-      }
-    }
-
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: {
-        key: "deleteOrganizationUser",
-        placeholders: [this.userNamePipe.transform(user)],
-      },
-      content: {
-        key: "deleteOrganizationUserWarningDesc",
-        placeholders: [this.userNamePipe.transform(user)],
-      },
-      type: "warning",
-      acceptButtonText: { key: "delete" },
-      cancelButtonText: { key: "cancel" },
-    });
-
     if (!confirmed) {
       return false;
     }
 
-    await this.deleteManagedMemberWarningService.acknowledgeWarning(organization.id);
-
-    this.actionPromise = this.organizationUserApiService.deleteOrganizationUser(
-      organization.id,
-      user.id,
-    );
+    this.actionPromise = this.memberActionsService.deleteUser(organization, user.id);
     try {
-      await this.actionPromise;
+      const result = await this.actionPromise;
+      if (!result.success) {
+        throw new Error(result.error);
+      }
       this.toastService.showToast({
         variant: "success",
         message: this.i18nService.t("organizationUserDeleted", this.userNamePipe.transform(user)),
@@ -933,19 +517,6 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
     this.actionPromise = undefined;
   }
 
-  private async noMasterPasswordConfirmationDialog(user: OrganizationUserView) {
-    return this.dialogService.openSimpleDialog({
-      title: {
-        key: "removeOrgUserNoMasterPasswordTitle",
-      },
-      content: {
-        key: "removeOrgUserNoMasterPasswordDesc",
-        placeholders: [this.userNamePipe.transform(user)],
-      },
-      type: "warning",
-    });
-  }
-
   get showBulkRestoreUsers(): boolean {
     return this.dataSource
       .getCheckedUsers()
@@ -973,14 +544,4 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       .getCheckedUsers()
       .every((member) => member.managedByOrganization && validStatuses.includes(member.status));
   }
-
-  async navigateToPaymentMethod(organization: Organization) {
-    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-    );
-    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
-    await this.router.navigate(["organizations", `${organization.id}`, "billing", route], {
-      state: { launchPaymentModalAutomatically: true },
-    });
-  }
 }
diff --git a/apps/web/src/app/admin-console/organizations/members/members.module.ts b/apps/web/src/app/admin-console/organizations/members/members.module.ts
index e5bc5f29a3b..3b233932ed3 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.module.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.module.ts
@@ -4,6 +4,7 @@ import { NgModule } from "@angular/core";
 import { PasswordStrengthV2Component } from "@bitwarden/angular/tools/password-strength/password-strength-v2.component";
 import { PasswordCalloutComponent } from "@bitwarden/auth/angular";
 import { ScrollLayoutDirective } from "@bitwarden/components";
+import { BillingConstraintService } from "@bitwarden/web-vault/app/billing/members/billing-constraint/billing-constraint.service";
 import { OrganizationFreeTrialWarningComponent } from "@bitwarden/web-vault/app/billing/organizations/warnings/components";
 
 import { HeaderModule } from "../../../layouts/header/header.module";
@@ -18,6 +19,11 @@ import { BulkStatusComponent } from "./components/bulk/bulk-status.component";
 import { UserDialogModule } from "./components/member-dialog";
 import { MembersRoutingModule } from "./members-routing.module";
 import { MembersComponent } from "./members.component";
+import {
+  OrganizationMembersService,
+  MemberActionsService,
+  MemberDialogManagerService,
+} from "./services";
 
 @NgModule({
   imports: [
@@ -40,5 +46,11 @@ import { MembersComponent } from "./members.component";
     MembersComponent,
     BulkDeleteDialogComponent,
   ],
+  providers: [
+    OrganizationMembersService,
+    MemberActionsService,
+    BillingConstraintService,
+    MemberDialogManagerService,
+  ],
 })
 export class MembersModule {}
diff --git a/apps/web/src/app/admin-console/organizations/members/services/index.ts b/apps/web/src/app/admin-console/organizations/members/services/index.ts
new file mode 100644
index 00000000000..baaa33eeae9
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/index.ts
@@ -0,0 +1,4 @@
+export { OrganizationMembersService } from "./organization-members-service/organization-members.service";
+export { MemberActionsService } from "./member-actions/member-actions.service";
+export { MemberDialogManagerService } from "./member-dialog-manager/member-dialog-manager.service";
+export { DeleteManagedMemberWarningService } from "./delete-managed-member/delete-managed-member-warning.service";
diff --git a/apps/web/src/app/admin-console/organizations/members/services/member-actions/member-actions.service.spec.ts b/apps/web/src/app/admin-console/organizations/members/services/member-actions/member-actions.service.spec.ts
new file mode 100644
index 00000000000..e856ab7afd1
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/member-actions/member-actions.service.spec.ts
@@ -0,0 +1,463 @@
+import { MockProxy, mock } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import {
+  OrganizationUserApiService,
+  OrganizationUserBulkResponse,
+} from "@bitwarden/admin-console/common";
+import {
+  OrganizationUserType,
+  OrganizationUserStatusType,
+} from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
+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 { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { OrgKey } from "@bitwarden/common/types/key";
+import { newGuid } from "@bitwarden/guid";
+import { KeyService } from "@bitwarden/key-management";
+
+import { OrganizationUserView } from "../../../core/views/organization-user.view";
+import { OrganizationUserService } from "../organization-user/organization-user.service";
+
+import { MemberActionsService } from "./member-actions.service";
+
+describe("MemberActionsService", () => {
+  let service: MemberActionsService;
+  let organizationUserApiService: MockProxy<OrganizationUserApiService>;
+  let organizationUserService: MockProxy<OrganizationUserService>;
+  let keyService: MockProxy<KeyService>;
+  let encryptService: MockProxy<EncryptService>;
+  let configService: MockProxy<ConfigService>;
+  let accountService: FakeAccountService;
+  let organizationMetadataService: MockProxy<OrganizationMetadataServiceAbstraction>;
+
+  const userId = newGuid() as UserId;
+  const organizationId = newGuid() as OrganizationId;
+  const userIdToManage = newGuid();
+
+  let mockOrganization: Organization;
+  let mockOrgUser: OrganizationUserView;
+
+  beforeEach(() => {
+    organizationUserApiService = mock<OrganizationUserApiService>();
+    organizationUserService = mock<OrganizationUserService>();
+    keyService = mock<KeyService>();
+    encryptService = mock<EncryptService>();
+    configService = mock<ConfigService>();
+    accountService = mockAccountServiceWith(userId);
+    organizationMetadataService = mock<OrganizationMetadataServiceAbstraction>();
+
+    mockOrganization = {
+      id: organizationId,
+      type: OrganizationUserType.Owner,
+      canManageUsersPassword: true,
+      hasPublicAndPrivateKeys: true,
+      useResetPassword: true,
+    } as Organization;
+
+    mockOrgUser = {
+      id: userIdToManage,
+      userId: userIdToManage,
+      type: OrganizationUserType.User,
+      status: OrganizationUserStatusType.Confirmed,
+      resetPasswordEnrolled: true,
+    } as OrganizationUserView;
+
+    service = new MemberActionsService(
+      organizationUserApiService,
+      organizationUserService,
+      keyService,
+      encryptService,
+      configService,
+      accountService,
+      organizationMetadataService,
+    );
+  });
+
+  describe("inviteUser", () => {
+    it("should successfully invite a user", async () => {
+      organizationUserApiService.postOrganizationUserInvite.mockResolvedValue(undefined);
+
+      const result = await service.inviteUser(
+        mockOrganization,
+        "test@example.com",
+        OrganizationUserType.User,
+        {},
+        [],
+        [],
+      );
+
+      expect(result).toEqual({ success: true });
+      expect(organizationUserApiService.postOrganizationUserInvite).toHaveBeenCalledWith(
+        organizationId,
+        {
+          emails: ["test@example.com"],
+          type: OrganizationUserType.User,
+          accessSecretsManager: false,
+          collections: [],
+          groups: [],
+          permissions: {},
+        },
+      );
+    });
+
+    it("should handle invite errors", async () => {
+      const errorMessage = "Invitation failed";
+      organizationUserApiService.postOrganizationUserInvite.mockRejectedValue(
+        new Error(errorMessage),
+      );
+
+      const result = await service.inviteUser(
+        mockOrganization,
+        "test@example.com",
+        OrganizationUserType.User,
+      );
+
+      expect(result).toEqual({ success: false, error: errorMessage });
+    });
+  });
+
+  describe("removeUser", () => {
+    it("should successfully remove a user", async () => {
+      organizationUserApiService.removeOrganizationUser.mockResolvedValue(undefined);
+
+      const result = await service.removeUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: true });
+      expect(organizationUserApiService.removeOrganizationUser).toHaveBeenCalledWith(
+        organizationId,
+        userIdToManage,
+      );
+    });
+
+    it("should handle remove errors", async () => {
+      const errorMessage = "Remove failed";
+      organizationUserApiService.removeOrganizationUser.mockRejectedValue(new Error(errorMessage));
+
+      const result = await service.removeUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: false, error: errorMessage });
+    });
+  });
+
+  describe("revokeUser", () => {
+    it("should successfully revoke a user", async () => {
+      organizationUserApiService.revokeOrganizationUser.mockResolvedValue(undefined);
+
+      const result = await service.revokeUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: true });
+      expect(organizationUserApiService.revokeOrganizationUser).toHaveBeenCalledWith(
+        organizationId,
+        userIdToManage,
+      );
+    });
+
+    it("should handle revoke errors", async () => {
+      const errorMessage = "Revoke failed";
+      organizationUserApiService.revokeOrganizationUser.mockRejectedValue(new Error(errorMessage));
+
+      const result = await service.revokeUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: false, error: errorMessage });
+    });
+  });
+
+  describe("restoreUser", () => {
+    it("should successfully restore a user", async () => {
+      organizationUserApiService.restoreOrganizationUser.mockResolvedValue(undefined);
+
+      const result = await service.restoreUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: true });
+      expect(organizationUserApiService.restoreOrganizationUser).toHaveBeenCalledWith(
+        organizationId,
+        userIdToManage,
+      );
+    });
+
+    it("should handle restore errors", async () => {
+      const errorMessage = "Restore failed";
+      organizationUserApiService.restoreOrganizationUser.mockRejectedValue(new Error(errorMessage));
+
+      const result = await service.restoreUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: false, error: errorMessage });
+    });
+  });
+
+  describe("deleteUser", () => {
+    it("should successfully delete a user", async () => {
+      organizationUserApiService.deleteOrganizationUser.mockResolvedValue(undefined);
+
+      const result = await service.deleteUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: true });
+      expect(organizationUserApiService.deleteOrganizationUser).toHaveBeenCalledWith(
+        organizationId,
+        userIdToManage,
+      );
+    });
+
+    it("should handle delete errors", async () => {
+      const errorMessage = "Delete failed";
+      organizationUserApiService.deleteOrganizationUser.mockRejectedValue(new Error(errorMessage));
+
+      const result = await service.deleteUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: false, error: errorMessage });
+    });
+  });
+
+  describe("reinviteUser", () => {
+    it("should successfully reinvite a user", async () => {
+      organizationUserApiService.postOrganizationUserReinvite.mockResolvedValue(undefined);
+
+      const result = await service.reinviteUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: true });
+      expect(organizationUserApiService.postOrganizationUserReinvite).toHaveBeenCalledWith(
+        organizationId,
+        userIdToManage,
+      );
+    });
+
+    it("should handle reinvite errors", async () => {
+      const errorMessage = "Reinvite failed";
+      organizationUserApiService.postOrganizationUserReinvite.mockRejectedValue(
+        new Error(errorMessage),
+      );
+
+      const result = await service.reinviteUser(mockOrganization, userIdToManage);
+
+      expect(result).toEqual({ success: false, error: errorMessage });
+    });
+  });
+
+  describe("confirmUser", () => {
+    const publicKey = new Uint8Array([1, 2, 3, 4, 5]);
+
+    it("should confirm user using new flow when feature flag is enabled", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+      organizationUserService.confirmUser.mockReturnValue(of(undefined));
+
+      const result = await service.confirmUser(mockOrgUser, publicKey, mockOrganization);
+
+      expect(result).toEqual({ success: true });
+      expect(organizationUserService.confirmUser).toHaveBeenCalledWith(
+        mockOrganization,
+        mockOrgUser.id,
+        publicKey,
+      );
+      expect(organizationUserApiService.postOrganizationUserConfirm).not.toHaveBeenCalled();
+    });
+
+    it("should confirm user using exising flow when feature flag is disabled", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(false));
+
+      const mockOrgKey = mock<OrgKey>();
+      const mockOrgKeys = { [organizationId]: mockOrgKey };
+      keyService.orgKeys$.mockReturnValue(of(mockOrgKeys));
+
+      const mockEncryptedKey = new EncString("encrypted-key-data");
+      encryptService.encapsulateKeyUnsigned.mockResolvedValue(mockEncryptedKey);
+
+      organizationUserApiService.postOrganizationUserConfirm.mockResolvedValue(undefined);
+
+      const result = await service.confirmUser(mockOrgUser, publicKey, mockOrganization);
+
+      expect(result).toEqual({ success: true });
+      expect(keyService.orgKeys$).toHaveBeenCalledWith(userId);
+      expect(encryptService.encapsulateKeyUnsigned).toHaveBeenCalledWith(mockOrgKey, publicKey);
+      expect(organizationUserApiService.postOrganizationUserConfirm).toHaveBeenCalledWith(
+        organizationId,
+        userIdToManage,
+        expect.objectContaining({
+          key: "encrypted-key-data",
+        }),
+      );
+    });
+
+    it("should handle missing organization keys", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(false));
+      keyService.orgKeys$.mockReturnValue(of({}));
+
+      const result = await service.confirmUser(mockOrgUser, publicKey, mockOrganization);
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain("Organization keys not found");
+    });
+
+    it("should handle confirm errors", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+      const errorMessage = "Confirm failed";
+      organizationUserService.confirmUser.mockImplementation(() => {
+        throw new Error(errorMessage);
+      });
+
+      const result = await service.confirmUser(mockOrgUser, publicKey, mockOrganization);
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain(errorMessage);
+    });
+  });
+
+  describe("bulkReinvite", () => {
+    const userIds = [newGuid(), newGuid(), newGuid()];
+
+    it("should successfully reinvite multiple users", async () => {
+      const mockResponse = {
+        data: userIds.map((id) => ({
+          id,
+          error: null,
+        })),
+        continuationToken: null,
+      } as ListResponse<OrganizationUserBulkResponse>;
+      organizationUserApiService.postManyOrganizationUserReinvite.mockResolvedValue(mockResponse);
+
+      const result = await service.bulkReinvite(mockOrganization, userIds);
+
+      expect(result).toEqual({
+        successful: mockResponse,
+        failed: [],
+      });
+      expect(organizationUserApiService.postManyOrganizationUserReinvite).toHaveBeenCalledWith(
+        organizationId,
+        userIds,
+      );
+    });
+
+    it("should handle bulk reinvite errors", async () => {
+      const errorMessage = "Bulk reinvite failed";
+      organizationUserApiService.postManyOrganizationUserReinvite.mockRejectedValue(
+        new Error(errorMessage),
+      );
+
+      const result = await service.bulkReinvite(mockOrganization, userIds);
+
+      expect(result.successful).toBeUndefined();
+      expect(result.failed).toHaveLength(3);
+      expect(result.failed[0]).toEqual({ id: userIds[0], error: errorMessage });
+    });
+  });
+
+  describe("allowResetPassword", () => {
+    const resetPasswordEnabled = true;
+
+    it("should allow reset password for Owner over User", () => {
+      const result = service.allowResetPassword(
+        mockOrgUser,
+        mockOrganization,
+        resetPasswordEnabled,
+      );
+
+      expect(result).toBe(true);
+    });
+
+    it("should allow reset password for Admin over User", () => {
+      const adminOrg = { ...mockOrganization, type: OrganizationUserType.Admin } as Organization;
+
+      const result = service.allowResetPassword(mockOrgUser, adminOrg, resetPasswordEnabled);
+
+      expect(result).toBe(true);
+    });
+
+    it("should not allow reset password for Admin over Owner", () => {
+      const adminOrg = { ...mockOrganization, type: OrganizationUserType.Admin } as Organization;
+      const ownerUser = {
+        ...mockOrgUser,
+        type: OrganizationUserType.Owner,
+      } as OrganizationUserView;
+
+      const result = service.allowResetPassword(ownerUser, adminOrg, resetPasswordEnabled);
+
+      expect(result).toBe(false);
+    });
+
+    it("should allow reset password for Custom over User", () => {
+      const customOrg = { ...mockOrganization, type: OrganizationUserType.Custom } as Organization;
+
+      const result = service.allowResetPassword(mockOrgUser, customOrg, resetPasswordEnabled);
+
+      expect(result).toBe(true);
+    });
+
+    it("should not allow reset password for Custom over Admin", () => {
+      const customOrg = { ...mockOrganization, type: OrganizationUserType.Custom } as Organization;
+      const adminUser = {
+        ...mockOrgUser,
+        type: OrganizationUserType.Admin,
+      } as OrganizationUserView;
+
+      const result = service.allowResetPassword(adminUser, customOrg, resetPasswordEnabled);
+
+      expect(result).toBe(false);
+    });
+
+    it("should not allow reset password for Custom over Owner", () => {
+      const customOrg = { ...mockOrganization, type: OrganizationUserType.Custom } as Organization;
+      const ownerUser = {
+        ...mockOrgUser,
+        type: OrganizationUserType.Owner,
+      } as OrganizationUserView;
+
+      const result = service.allowResetPassword(ownerUser, customOrg, resetPasswordEnabled);
+
+      expect(result).toBe(false);
+    });
+
+    it("should not allow reset password when organization cannot manage users password", () => {
+      const org = { ...mockOrganization, canManageUsersPassword: false } as Organization;
+
+      const result = service.allowResetPassword(mockOrgUser, org, resetPasswordEnabled);
+
+      expect(result).toBe(false);
+    });
+
+    it("should not allow reset password when organization does not use reset password", () => {
+      const org = { ...mockOrganization, useResetPassword: false } as Organization;
+
+      const result = service.allowResetPassword(mockOrgUser, org, resetPasswordEnabled);
+
+      expect(result).toBe(false);
+    });
+
+    it("should not allow reset password when organization lacks public and private keys", () => {
+      const org = { ...mockOrganization, hasPublicAndPrivateKeys: false } as Organization;
+
+      const result = service.allowResetPassword(mockOrgUser, org, resetPasswordEnabled);
+
+      expect(result).toBe(false);
+    });
+
+    it("should not allow reset password when user is not enrolled in reset password", () => {
+      const user = { ...mockOrgUser, resetPasswordEnrolled: false } as OrganizationUserView;
+
+      const result = service.allowResetPassword(user, mockOrganization, resetPasswordEnabled);
+
+      expect(result).toBe(false);
+    });
+
+    it("should not allow reset password when reset password is disabled", () => {
+      const result = service.allowResetPassword(mockOrgUser, mockOrganization, false);
+
+      expect(result).toBe(false);
+    });
+
+    it("should not allow reset password when user status is not confirmed", () => {
+      const user = {
+        ...mockOrgUser,
+        status: OrganizationUserStatusType.Invited,
+      } as OrganizationUserView;
+
+      const result = service.allowResetPassword(user, mockOrganization, resetPasswordEnabled);
+
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/apps/web/src/app/admin-console/organizations/members/services/member-actions/member-actions.service.ts b/apps/web/src/app/admin-console/organizations/members/services/member-actions/member-actions.service.ts
new file mode 100644
index 00000000000..5e19e26954e
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/member-actions/member-actions.service.ts
@@ -0,0 +1,210 @@
+import { Injectable } from "@angular/core";
+import { firstValueFrom, switchMap, map } from "rxjs";
+
+import {
+  OrganizationUserApiService,
+  OrganizationUserBulkResponse,
+  OrganizationUserConfirmRequest,
+  OrganizationUserService,
+} from "@bitwarden/admin-console/common";
+import {
+  OrganizationUserType,
+  OrganizationUserStatusType,
+} 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 { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
+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 { KeyService } from "@bitwarden/key-management";
+
+import { OrganizationUserView } from "../../../core/views/organization-user.view";
+
+export interface MemberActionResult {
+  success: boolean;
+  error?: string;
+}
+
+export interface BulkActionResult {
+  successful?: ListResponse<OrganizationUserBulkResponse>;
+  failed: { id: string; error: string }[];
+}
+
+@Injectable()
+export class MemberActionsService {
+  private userId$ = this.accountService.activeAccount$.pipe(getUserId);
+
+  constructor(
+    private organizationUserApiService: OrganizationUserApiService,
+    private organizationUserService: OrganizationUserService,
+    private keyService: KeyService,
+    private encryptService: EncryptService,
+    private configService: ConfigService,
+    private accountService: AccountService,
+    private organizationMetadataService: OrganizationMetadataServiceAbstraction,
+  ) {}
+
+  async inviteUser(
+    organization: Organization,
+    email: string,
+    type: OrganizationUserType,
+    permissions?: any,
+    collections?: any[],
+    groups?: string[],
+  ): Promise<MemberActionResult> {
+    try {
+      await this.organizationUserApiService.postOrganizationUserInvite(organization.id, {
+        emails: [email],
+        type,
+        accessSecretsManager: false,
+        collections: collections ?? [],
+        groups: groups ?? [],
+        permissions,
+      });
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: (error as Error).message ?? String(error) };
+    }
+  }
+
+  async removeUser(organization: Organization, userId: string): Promise<MemberActionResult> {
+    try {
+      await this.organizationUserApiService.removeOrganizationUser(organization.id, userId);
+      this.organizationMetadataService.refreshMetadataCache();
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: (error as Error).message ?? String(error) };
+    }
+  }
+
+  async revokeUser(organization: Organization, userId: string): Promise<MemberActionResult> {
+    try {
+      await this.organizationUserApiService.revokeOrganizationUser(organization.id, userId);
+      this.organizationMetadataService.refreshMetadataCache();
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: (error as Error).message ?? String(error) };
+    }
+  }
+
+  async restoreUser(organization: Organization, userId: string): Promise<MemberActionResult> {
+    try {
+      await this.organizationUserApiService.restoreOrganizationUser(organization.id, userId);
+      this.organizationMetadataService.refreshMetadataCache();
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: (error as Error).message ?? String(error) };
+    }
+  }
+
+  async deleteUser(organization: Organization, userId: string): Promise<MemberActionResult> {
+    try {
+      await this.organizationUserApiService.deleteOrganizationUser(organization.id, userId);
+      this.organizationMetadataService.refreshMetadataCache();
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: (error as Error).message ?? String(error) };
+    }
+  }
+
+  async reinviteUser(organization: Organization, userId: string): Promise<MemberActionResult> {
+    try {
+      await this.organizationUserApiService.postOrganizationUserReinvite(organization.id, userId);
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: (error as Error).message ?? String(error) };
+    }
+  }
+
+  async confirmUser(
+    user: OrganizationUserView,
+    publicKey: Uint8Array,
+    organization: Organization,
+  ): Promise<MemberActionResult> {
+    try {
+      if (
+        await firstValueFrom(this.configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation))
+      ) {
+        await firstValueFrom(
+          this.organizationUserService.confirmUser(organization, user.id, publicKey),
+        );
+      } else {
+        const request = await firstValueFrom(
+          this.userId$.pipe(
+            switchMap((userId) => this.keyService.orgKeys$(userId)),
+            map((orgKeys) => {
+              if (orgKeys == null || orgKeys[organization.id] == null) {
+                throw new Error("Organization keys not found for provided User.");
+              }
+              return orgKeys[organization.id];
+            }),
+            switchMap((orgKey) => this.encryptService.encapsulateKeyUnsigned(orgKey, publicKey)),
+            map((encKey) => {
+              const req = new OrganizationUserConfirmRequest();
+              req.key = encKey.encryptedString;
+              return req;
+            }),
+          ),
+        );
+
+        await this.organizationUserApiService.postOrganizationUserConfirm(
+          organization.id,
+          user.id,
+          request,
+        );
+      }
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: (error as Error).message ?? String(error) };
+    }
+  }
+
+  async bulkReinvite(organization: Organization, userIds: string[]): Promise<BulkActionResult> {
+    try {
+      const result = await this.organizationUserApiService.postManyOrganizationUserReinvite(
+        organization.id,
+        userIds,
+      );
+      return { successful: result, failed: [] };
+    } catch (error) {
+      return {
+        failed: userIds.map((id) => ({ id, error: (error as Error).message ?? String(error) })),
+      };
+    }
+  }
+
+  allowResetPassword(
+    orgUser: OrganizationUserView,
+    organization: Organization,
+    resetPasswordEnabled: boolean,
+  ): boolean {
+    let callingUserHasPermission = false;
+
+    switch (organization.type) {
+      case OrganizationUserType.Owner:
+        callingUserHasPermission = true;
+        break;
+      case OrganizationUserType.Admin:
+        callingUserHasPermission = orgUser.type !== OrganizationUserType.Owner;
+        break;
+      case OrganizationUserType.Custom:
+        callingUserHasPermission =
+          orgUser.type !== OrganizationUserType.Owner &&
+          orgUser.type !== OrganizationUserType.Admin;
+        break;
+    }
+
+    return (
+      organization.canManageUsersPassword &&
+      callingUserHasPermission &&
+      organization.useResetPassword &&
+      organization.hasPublicAndPrivateKeys &&
+      orgUser.resetPasswordEnrolled &&
+      resetPasswordEnabled &&
+      orgUser.status === OrganizationUserStatusType.Confirmed
+    );
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.spec.ts b/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.spec.ts
new file mode 100644
index 00000000000..e478f8bbb41
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.spec.ts
@@ -0,0 +1,640 @@
+import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ProductTierType } from "@bitwarden/common/billing/enums";
+import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogService, ToastService } from "@bitwarden/components";
+
+import { OrganizationUserView } from "../../../core/views/organization-user.view";
+import { EntityEventsComponent } from "../../../manage/entity-events.component";
+import { AccountRecoveryDialogComponent } from "../../components/account-recovery/account-recovery-dialog.component";
+import { BulkConfirmDialogComponent } from "../../components/bulk/bulk-confirm-dialog.component";
+import { BulkDeleteDialogComponent } from "../../components/bulk/bulk-delete-dialog.component";
+import { BulkEnableSecretsManagerDialogComponent } from "../../components/bulk/bulk-enable-sm-dialog.component";
+import { BulkRemoveDialogComponent } from "../../components/bulk/bulk-remove-dialog.component";
+import { BulkRestoreRevokeComponent } from "../../components/bulk/bulk-restore-revoke.component";
+import { BulkStatusComponent } from "../../components/bulk/bulk-status.component";
+import {
+  MemberDialogComponent,
+  MemberDialogResult,
+  MemberDialogTab,
+} from "../../components/member-dialog";
+import { DeleteManagedMemberWarningService } from "../delete-managed-member/delete-managed-member-warning.service";
+
+import { MemberDialogManagerService } from "./member-dialog-manager.service";
+
+describe("MemberDialogManagerService", () => {
+  let service: MemberDialogManagerService;
+  let dialogService: MockProxy<DialogService>;
+  let i18nService: MockProxy<I18nService>;
+  let toastService: MockProxy<ToastService>;
+  let userNamePipe: MockProxy<UserNamePipe>;
+  let deleteManagedMemberWarningService: MockProxy<DeleteManagedMemberWarningService>;
+
+  let mockOrganization: Organization;
+  let mockUser: OrganizationUserView;
+  let mockBillingMetadata: OrganizationBillingMetadataResponse;
+
+  beforeEach(() => {
+    dialogService = mock<DialogService>();
+    i18nService = mock<I18nService>();
+    toastService = mock<ToastService>();
+    userNamePipe = mock<UserNamePipe>();
+    deleteManagedMemberWarningService = mock<DeleteManagedMemberWarningService>();
+
+    service = new MemberDialogManagerService(
+      dialogService,
+      i18nService,
+      toastService,
+      userNamePipe,
+      deleteManagedMemberWarningService,
+    );
+
+    // Setup mock data
+    mockOrganization = {
+      id: "org-id",
+      canManageUsers: true,
+      productTierType: ProductTierType.Enterprise,
+    } as Organization;
+
+    mockUser = {
+      id: "user-id",
+      email: "test@example.com",
+      name: "Test User",
+      usesKeyConnector: false,
+      status: OrganizationUserStatusType.Confirmed,
+      hasMasterPassword: true,
+      accessSecretsManager: false,
+      managedByOrganization: false,
+    } as OrganizationUserView;
+
+    mockBillingMetadata = {
+      organizationOccupiedSeats: 10,
+      isOnSecretsManagerStandalone: false,
+    } as OrganizationBillingMetadataResponse;
+
+    userNamePipe.transform.mockReturnValue("Test User");
+  });
+
+  describe("openInviteDialog", () => {
+    it("should open the invite dialog with correct parameters", async () => {
+      const mockDialogRef = { closed: of(MemberDialogResult.Saved) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const allUserEmails = ["user1@example.com", "user2@example.com"];
+
+      const result = await service.openInviteDialog(
+        mockOrganization,
+        mockBillingMetadata,
+        allUserEmails,
+      );
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        MemberDialogComponent,
+        expect.objectContaining({
+          data: {
+            kind: "Add",
+            organizationId: mockOrganization.id,
+            allOrganizationUserEmails: allUserEmails,
+            occupiedSeatCount: 10,
+            isOnSecretsManagerStandalone: false,
+          },
+        }),
+      );
+      expect(result).toBe(MemberDialogResult.Saved);
+    });
+
+    it("should return Canceled when dialog is closed without result", async () => {
+      const mockDialogRef = { closed: of(null) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const result = await service.openInviteDialog(mockOrganization, mockBillingMetadata, []);
+
+      expect(result).toBe(MemberDialogResult.Canceled);
+    });
+
+    it("should handle null billing metadata", async () => {
+      const mockDialogRef = { closed: of(MemberDialogResult.Saved) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      await service.openInviteDialog(mockOrganization, null, []);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        MemberDialogComponent,
+        expect.objectContaining({
+          data: expect.objectContaining({
+            occupiedSeatCount: 0,
+            isOnSecretsManagerStandalone: false,
+          }),
+        }),
+      );
+    });
+  });
+
+  describe("openEditDialog", () => {
+    it("should open the edit dialog with correct parameters", async () => {
+      const mockDialogRef = { closed: of(MemberDialogResult.Saved) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const result = await service.openEditDialog(mockUser, mockOrganization, mockBillingMetadata);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        MemberDialogComponent,
+        expect.objectContaining({
+          data: {
+            kind: "Edit",
+            name: "Test User",
+            organizationId: mockOrganization.id,
+            organizationUserId: mockUser.id,
+            usesKeyConnector: false,
+            isOnSecretsManagerStandalone: false,
+            initialTab: MemberDialogTab.Role,
+            managedByOrganization: false,
+          },
+        }),
+      );
+      expect(result).toBe(MemberDialogResult.Saved);
+    });
+
+    it("should use custom initial tab when provided", async () => {
+      const mockDialogRef = { closed: of(MemberDialogResult.Saved) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      await service.openEditDialog(
+        mockUser,
+        mockOrganization,
+        mockBillingMetadata,
+        MemberDialogTab.AccountRecovery,
+      );
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        MemberDialogComponent,
+        expect.objectContaining({
+          data: expect.objectContaining({
+            initialTab: 0, // MemberDialogTab.AccountRecovery is 0
+          }),
+        }),
+      );
+    });
+
+    it("should return Canceled when dialog is closed without result", async () => {
+      const mockDialogRef = { closed: of(null) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const result = await service.openEditDialog(mockUser, mockOrganization, mockBillingMetadata);
+
+      expect(result).toBe(MemberDialogResult.Canceled);
+    });
+  });
+
+  describe("openAccountRecoveryDialog", () => {
+    it("should open account recovery dialog with correct parameters", async () => {
+      const mockDialogRef = { closed: of("recovered") };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const result = await service.openAccountRecoveryDialog(mockUser, mockOrganization);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        AccountRecoveryDialogComponent,
+        expect.objectContaining({
+          data: {
+            name: "Test User",
+            email: mockUser.email,
+            organizationId: mockOrganization.id,
+            organizationUserId: mockUser.id,
+          },
+        }),
+      );
+      expect(result).toBe("recovered");
+    });
+
+    it("should return Ok when dialog is closed without result", async () => {
+      const mockDialogRef = { closed: of(null) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const result = await service.openAccountRecoveryDialog(mockUser, mockOrganization);
+
+      expect(result).toBe("ok");
+    });
+  });
+
+  describe("openBulkConfirmDialog", () => {
+    it("should open bulk confirm dialog with correct parameters", async () => {
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const users = [mockUser];
+      await service.openBulkConfirmDialog(mockOrganization, users);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        BulkConfirmDialogComponent,
+        expect.objectContaining({
+          data: {
+            organization: mockOrganization,
+            users: users,
+          },
+        }),
+      );
+    });
+  });
+
+  describe("openBulkRemoveDialog", () => {
+    it("should open bulk remove dialog with correct parameters", async () => {
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const users = [mockUser];
+      await service.openBulkRemoveDialog(mockOrganization, users);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        BulkRemoveDialogComponent,
+        expect.objectContaining({
+          data: {
+            organizationId: mockOrganization.id,
+            users: users,
+          },
+        }),
+      );
+    });
+  });
+
+  describe("openBulkDeleteDialog", () => {
+    it("should open bulk delete dialog when warning already acknowledged", async () => {
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(true));
+
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const users = [mockUser];
+      await service.openBulkDeleteDialog(mockOrganization, users);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        BulkDeleteDialogComponent,
+        expect.objectContaining({
+          data: {
+            organizationId: mockOrganization.id,
+            users: users,
+          },
+        }),
+      );
+      expect(deleteManagedMemberWarningService.showWarning).not.toHaveBeenCalled();
+    });
+
+    it("should show warning before opening dialog for enterprise organizations", async () => {
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(false));
+      deleteManagedMemberWarningService.showWarning.mockResolvedValue(true);
+
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const users = [mockUser];
+      await service.openBulkDeleteDialog(mockOrganization, users);
+
+      expect(deleteManagedMemberWarningService.showWarning).toHaveBeenCalled();
+      expect(dialogService.open).toHaveBeenCalled();
+    });
+
+    it("should not open dialog if warning is not acknowledged", async () => {
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(false));
+      deleteManagedMemberWarningService.showWarning.mockResolvedValue(false);
+
+      const users = [mockUser];
+      await service.openBulkDeleteDialog(mockOrganization, users);
+
+      expect(deleteManagedMemberWarningService.showWarning).toHaveBeenCalled();
+      expect(dialogService.open).not.toHaveBeenCalled();
+    });
+
+    it("should skip warning for non-enterprise organizations", async () => {
+      const nonEnterpriseOrg = {
+        ...mockOrganization,
+        productTierType: ProductTierType.Free,
+      } as Organization;
+
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(false));
+
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const users = [mockUser];
+      await service.openBulkDeleteDialog(nonEnterpriseOrg, users);
+
+      expect(deleteManagedMemberWarningService.showWarning).not.toHaveBeenCalled();
+      expect(dialogService.open).toHaveBeenCalled();
+    });
+  });
+
+  describe("openBulkRestoreRevokeDialog", () => {
+    it("should open bulk restore revoke dialog with correct parameters for revoking", async () => {
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const users = [mockUser];
+      await service.openBulkRestoreRevokeDialog(mockOrganization, users, true);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        BulkRestoreRevokeComponent,
+        expect.objectContaining({
+          data: expect.objectContaining({
+            organizationId: mockOrganization.id,
+            users: users,
+            isRevoking: true,
+          }),
+        }),
+      );
+    });
+
+    it("should open bulk restore revoke dialog with correct parameters for restoring", async () => {
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const users = [mockUser];
+      await service.openBulkRestoreRevokeDialog(mockOrganization, users, false);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        BulkRestoreRevokeComponent,
+        expect.objectContaining({
+          data: expect.objectContaining({
+            organizationId: mockOrganization.id,
+            users: users,
+            isRevoking: false,
+          }),
+        }),
+      );
+    });
+  });
+
+  describe("openBulkEnableSecretsManagerDialog", () => {
+    it("should open dialog with eligible users only", async () => {
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const user1 = { ...mockUser, accessSecretsManager: false } as OrganizationUserView;
+      const user2 = {
+        ...mockUser,
+        id: "user-2",
+        accessSecretsManager: true,
+      } as OrganizationUserView;
+      const users = [user1, user2];
+
+      await service.openBulkEnableSecretsManagerDialog(mockOrganization, users);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        BulkEnableSecretsManagerDialogComponent,
+        expect.objectContaining({
+          data: expect.objectContaining({
+            orgId: mockOrganization.id,
+            users: [user1],
+          }),
+        }),
+      );
+    });
+
+    it("should show error toast when no eligible users", async () => {
+      i18nService.t.mockImplementation((key) => key);
+
+      const user1 = { ...mockUser, accessSecretsManager: true } as OrganizationUserView;
+      const users = [user1];
+
+      await service.openBulkEnableSecretsManagerDialog(mockOrganization, users);
+
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        title: "errorOccurred",
+        message: "noSelectedUsersApplicable",
+      });
+      expect(dialogService.open).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("openBulkStatusDialog", () => {
+    it("should open bulk status dialog with correct parameters", async () => {
+      const mockDialogRef = { closed: of(undefined) };
+      dialogService.open.mockReturnValue(mockDialogRef as any);
+
+      const users = [mockUser];
+      const filteredUsers = [mockUser];
+      const request = Promise.resolve();
+      const successMessage = "Success!";
+
+      await service.openBulkStatusDialog(users, filteredUsers, request, successMessage);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        BulkStatusComponent,
+        expect.objectContaining({
+          data: {
+            users: users,
+            filteredUsers: filteredUsers,
+            request: request,
+            successfulMessage: successMessage,
+          },
+        }),
+      );
+    });
+  });
+
+  describe("openEventsDialog", () => {
+    it("should open events dialog with correct parameters", () => {
+      service.openEventsDialog(mockUser, mockOrganization);
+
+      expect(dialogService.open).toHaveBeenCalledWith(
+        EntityEventsComponent,
+        expect.objectContaining({
+          data: {
+            name: "Test User",
+            organizationId: mockOrganization.id,
+            entityId: mockUser.id,
+            showUser: false,
+            entity: "user",
+          },
+        }),
+      );
+    });
+  });
+
+  describe("openRemoveUserConfirmationDialog", () => {
+    it("should return true when user confirms removal", async () => {
+      dialogService.openSimpleDialog.mockResolvedValue(true);
+
+      const result = await service.openRemoveUserConfirmationDialog(mockUser);
+
+      expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: {
+          key: "removeUserIdAccess",
+          placeholders: ["Test User"],
+        },
+        content: { key: "removeOrgUserConfirmation" },
+        type: "warning",
+      });
+      expect(result).toBe(true);
+    });
+
+    it("should show key connector warning when user uses key connector", async () => {
+      const keyConnectorUser = { ...mockUser, usesKeyConnector: true } as OrganizationUserView;
+      dialogService.openSimpleDialog.mockResolvedValue(true);
+
+      await service.openRemoveUserConfirmationDialog(keyConnectorUser);
+
+      expect(dialogService.openSimpleDialog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          content: { key: "removeUserConfirmationKeyConnector" },
+        }),
+      );
+    });
+
+    it("should return false when user cancels confirmation", async () => {
+      dialogService.openSimpleDialog.mockResolvedValue(false);
+
+      const result = await service.openRemoveUserConfirmationDialog(mockUser);
+
+      expect(result).toBe(false);
+    });
+
+    it("should show no master password warning for confirmed users without master password", async () => {
+      const noMpUser = {
+        ...mockUser,
+        status: OrganizationUserStatusType.Confirmed,
+        hasMasterPassword: false,
+      } as OrganizationUserView;
+
+      dialogService.openSimpleDialog.mockResolvedValueOnce(true).mockResolvedValueOnce(true);
+
+      const result = await service.openRemoveUserConfirmationDialog(noMpUser);
+
+      expect(dialogService.openSimpleDialog).toHaveBeenCalledTimes(2);
+      expect(dialogService.openSimpleDialog).toHaveBeenLastCalledWith({
+        title: {
+          key: "removeOrgUserNoMasterPasswordTitle",
+        },
+        content: {
+          key: "removeOrgUserNoMasterPasswordDesc",
+          placeholders: ["Test User"],
+        },
+        type: "warning",
+      });
+      expect(result).toBe(true);
+    });
+  });
+
+  describe("openRevokeUserConfirmationDialog", () => {
+    it("should return true when user confirms revocation", async () => {
+      i18nService.t.mockReturnValue("Revoke user confirmation");
+      dialogService.openSimpleDialog.mockResolvedValue(true);
+
+      const result = await service.openRevokeUserConfirmationDialog(mockUser);
+
+      expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: { key: "revokeAccess", placeholders: ["Test User"] },
+        content: "Revoke user confirmation",
+        acceptButtonText: { key: "revokeAccess" },
+        type: "warning",
+      });
+      expect(result).toBe(true);
+    });
+
+    it("should return false when user cancels confirmation", async () => {
+      i18nService.t.mockReturnValue("Revoke user confirmation");
+      dialogService.openSimpleDialog.mockResolvedValue(false);
+
+      const result = await service.openRevokeUserConfirmationDialog(mockUser);
+
+      expect(result).toBe(false);
+    });
+
+    it("should show no master password warning for confirmed users without master password", async () => {
+      const noMpUser = {
+        ...mockUser,
+        status: OrganizationUserStatusType.Confirmed,
+        hasMasterPassword: false,
+      } as OrganizationUserView;
+
+      i18nService.t.mockReturnValue("Revoke user confirmation");
+      dialogService.openSimpleDialog.mockResolvedValueOnce(true).mockResolvedValueOnce(true);
+
+      const result = await service.openRevokeUserConfirmationDialog(noMpUser);
+
+      expect(dialogService.openSimpleDialog).toHaveBeenCalledTimes(2);
+      expect(result).toBe(true);
+    });
+  });
+
+  describe("openDeleteUserConfirmationDialog", () => {
+    it("should return true when user confirms deletion", async () => {
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(true));
+      dialogService.openSimpleDialog.mockResolvedValue(true);
+
+      const result = await service.openDeleteUserConfirmationDialog(mockUser, mockOrganization);
+
+      expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: {
+          key: "deleteOrganizationUser",
+          placeholders: ["Test User"],
+        },
+        content: {
+          key: "deleteOrganizationUserWarningDesc",
+          placeholders: ["Test User"],
+        },
+        type: "warning",
+        acceptButtonText: { key: "delete" },
+        cancelButtonText: { key: "cancel" },
+      });
+      expect(deleteManagedMemberWarningService.acknowledgeWarning).toHaveBeenCalledWith(
+        mockOrganization.id,
+      );
+      expect(result).toBe(true);
+    });
+
+    it("should show warning before deletion for enterprise organizations", async () => {
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(false));
+      deleteManagedMemberWarningService.showWarning.mockResolvedValue(true);
+      dialogService.openSimpleDialog.mockResolvedValue(true);
+
+      const result = await service.openDeleteUserConfirmationDialog(mockUser, mockOrganization);
+
+      expect(deleteManagedMemberWarningService.showWarning).toHaveBeenCalled();
+      expect(dialogService.openSimpleDialog).toHaveBeenCalled();
+      expect(result).toBe(true);
+    });
+
+    it("should return false if warning is not acknowledged", async () => {
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(false));
+      deleteManagedMemberWarningService.showWarning.mockResolvedValue(false);
+
+      const result = await service.openDeleteUserConfirmationDialog(mockUser, mockOrganization);
+
+      expect(deleteManagedMemberWarningService.showWarning).toHaveBeenCalled();
+      expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+      expect(result).toBe(false);
+    });
+
+    it("should skip warning for non-enterprise organizations", async () => {
+      const nonEnterpriseOrg = {
+        ...mockOrganization,
+        productTierType: ProductTierType.Free,
+      } as Organization;
+
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(false));
+      dialogService.openSimpleDialog.mockResolvedValue(true);
+
+      const result = await service.openDeleteUserConfirmationDialog(mockUser, nonEnterpriseOrg);
+
+      expect(deleteManagedMemberWarningService.showWarning).not.toHaveBeenCalled();
+      expect(dialogService.openSimpleDialog).toHaveBeenCalled();
+      expect(result).toBe(true);
+    });
+
+    it("should return false when user cancels confirmation", async () => {
+      deleteManagedMemberWarningService.warningAcknowledged.mockReturnValue(of(true));
+      dialogService.openSimpleDialog.mockResolvedValue(false);
+
+      const result = await service.openDeleteUserConfirmationDialog(mockUser, mockOrganization);
+
+      expect(result).toBe(false);
+      expect(deleteManagedMemberWarningService.acknowledgeWarning).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.ts b/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.ts
new file mode 100644
index 00000000000..c6ef536af2b
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/member-dialog-manager/member-dialog-manager.service.ts
@@ -0,0 +1,322 @@
+import { Injectable } from "@angular/core";
+import { firstValueFrom, lastValueFrom } from "rxjs";
+
+import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ProductTierType } from "@bitwarden/common/billing/enums";
+import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { DialogService, ToastService } from "@bitwarden/components";
+
+import { OrganizationUserView } from "../../../core/views/organization-user.view";
+import { openEntityEventsDialog } from "../../../manage/entity-events.component";
+import {
+  AccountRecoveryDialogComponent,
+  AccountRecoveryDialogResultType,
+} from "../../components/account-recovery/account-recovery-dialog.component";
+import { BulkConfirmDialogComponent } from "../../components/bulk/bulk-confirm-dialog.component";
+import { BulkDeleteDialogComponent } from "../../components/bulk/bulk-delete-dialog.component";
+import { BulkEnableSecretsManagerDialogComponent } from "../../components/bulk/bulk-enable-sm-dialog.component";
+import { BulkRemoveDialogComponent } from "../../components/bulk/bulk-remove-dialog.component";
+import { BulkRestoreRevokeComponent } from "../../components/bulk/bulk-restore-revoke.component";
+import { BulkStatusComponent } from "../../components/bulk/bulk-status.component";
+import {
+  MemberDialogResult,
+  MemberDialogTab,
+  openUserAddEditDialog,
+} from "../../components/member-dialog";
+import { DeleteManagedMemberWarningService } from "../delete-managed-member/delete-managed-member-warning.service";
+
+@Injectable()
+export class MemberDialogManagerService {
+  constructor(
+    private dialogService: DialogService,
+    private i18nService: I18nService,
+    private toastService: ToastService,
+    private userNamePipe: UserNamePipe,
+    private deleteManagedMemberWarningService: DeleteManagedMemberWarningService,
+  ) {}
+
+  async openInviteDialog(
+    organization: Organization,
+    billingMetadata: OrganizationBillingMetadataResponse,
+    allUserEmails: string[],
+  ): Promise<MemberDialogResult> {
+    const dialog = openUserAddEditDialog(this.dialogService, {
+      data: {
+        kind: "Add",
+        organizationId: organization.id,
+        allOrganizationUserEmails: allUserEmails,
+        occupiedSeatCount: billingMetadata?.organizationOccupiedSeats ?? 0,
+        isOnSecretsManagerStandalone: billingMetadata?.isOnSecretsManagerStandalone ?? false,
+      },
+    });
+
+    const result = await lastValueFrom(dialog.closed);
+    return result ?? MemberDialogResult.Canceled;
+  }
+
+  async openEditDialog(
+    user: OrganizationUserView,
+    organization: Organization,
+    billingMetadata: OrganizationBillingMetadataResponse,
+    initialTab: MemberDialogTab = MemberDialogTab.Role,
+  ): Promise<MemberDialogResult> {
+    const dialog = openUserAddEditDialog(this.dialogService, {
+      data: {
+        kind: "Edit",
+        name: this.userNamePipe.transform(user),
+        organizationId: organization.id,
+        organizationUserId: user.id,
+        usesKeyConnector: user.usesKeyConnector,
+        isOnSecretsManagerStandalone: billingMetadata?.isOnSecretsManagerStandalone ?? false,
+        initialTab: initialTab,
+        managedByOrganization: user.managedByOrganization,
+      },
+    });
+
+    const result = await lastValueFrom(dialog.closed);
+    return result ?? MemberDialogResult.Canceled;
+  }
+
+  async openAccountRecoveryDialog(
+    user: OrganizationUserView,
+    organization: Organization,
+  ): Promise<AccountRecoveryDialogResultType> {
+    const dialogRef = AccountRecoveryDialogComponent.open(this.dialogService, {
+      data: {
+        name: this.userNamePipe.transform(user),
+        email: user.email,
+        organizationId: organization.id as OrganizationId,
+        organizationUserId: user.id,
+      },
+    });
+
+    const result = await lastValueFrom(dialogRef.closed);
+    return result ?? AccountRecoveryDialogResultType.Ok;
+  }
+
+  async openBulkConfirmDialog(
+    organization: Organization,
+    users: OrganizationUserView[],
+  ): Promise<void> {
+    const dialogRef = BulkConfirmDialogComponent.open(this.dialogService, {
+      data: {
+        organization: organization,
+        users: users,
+      },
+    });
+
+    await lastValueFrom(dialogRef.closed);
+  }
+
+  async openBulkRemoveDialog(
+    organization: Organization,
+    users: OrganizationUserView[],
+  ): Promise<void> {
+    const dialogRef = BulkRemoveDialogComponent.open(this.dialogService, {
+      data: {
+        organizationId: organization.id,
+        users: users,
+      },
+    });
+
+    await lastValueFrom(dialogRef.closed);
+  }
+
+  async openBulkDeleteDialog(
+    organization: Organization,
+    users: OrganizationUserView[],
+  ): Promise<void> {
+    const warningAcknowledged = await firstValueFrom(
+      this.deleteManagedMemberWarningService.warningAcknowledged(organization.id),
+    );
+
+    if (
+      !warningAcknowledged &&
+      organization.canManageUsers &&
+      organization.productTierType === ProductTierType.Enterprise
+    ) {
+      const acknowledged = await this.deleteManagedMemberWarningService.showWarning();
+      if (!acknowledged) {
+        return;
+      }
+    }
+
+    const dialogRef = BulkDeleteDialogComponent.open(this.dialogService, {
+      data: {
+        organizationId: organization.id,
+        users: users,
+      },
+    });
+
+    await lastValueFrom(dialogRef.closed);
+  }
+
+  async openBulkRestoreRevokeDialog(
+    organization: Organization,
+    users: OrganizationUserView[],
+    isRevoking: boolean,
+  ): Promise<void> {
+    const ref = BulkRestoreRevokeComponent.open(this.dialogService, {
+      organizationId: organization.id,
+      users: users,
+      isRevoking: isRevoking,
+    });
+
+    await firstValueFrom(ref.closed);
+  }
+
+  async openBulkEnableSecretsManagerDialog(
+    organization: Organization,
+    users: OrganizationUserView[],
+  ): Promise<void> {
+    const eligibleUsers = users.filter((ou) => !ou.accessSecretsManager);
+
+    if (eligibleUsers.length === 0) {
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccurred"),
+        message: this.i18nService.t("noSelectedUsersApplicable"),
+      });
+      return;
+    }
+
+    const dialogRef = BulkEnableSecretsManagerDialogComponent.open(this.dialogService, {
+      orgId: organization.id,
+      users: eligibleUsers,
+    });
+
+    await lastValueFrom(dialogRef.closed);
+  }
+
+  async openBulkStatusDialog(
+    users: OrganizationUserView[],
+    filteredUsers: OrganizationUserView[],
+    request: Promise<any>,
+    successMessage: string,
+  ): Promise<void> {
+    const dialogRef = BulkStatusComponent.open(this.dialogService, {
+      data: {
+        users: users,
+        filteredUsers: filteredUsers,
+        request: request,
+        successfulMessage: successMessage,
+      },
+    });
+
+    await lastValueFrom(dialogRef.closed);
+  }
+
+  openEventsDialog(user: OrganizationUserView, organization: Organization): void {
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: this.userNamePipe.transform(user),
+        organizationId: organization.id,
+        entityId: user.id,
+        showUser: false,
+        entity: "user",
+      },
+    });
+  }
+
+  async openRemoveUserConfirmationDialog(user: OrganizationUserView): Promise<boolean> {
+    const content = user.usesKeyConnector
+      ? "removeUserConfirmationKeyConnector"
+      : "removeOrgUserConfirmation";
+
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: {
+        key: "removeUserIdAccess",
+        placeholders: [this.userNamePipe.transform(user)],
+      },
+      content: { key: content },
+      type: "warning",
+    });
+
+    if (!confirmed) {
+      return false;
+    }
+
+    if (user.status > 0 && user.hasMasterPassword === false) {
+      return await this.openNoMasterPasswordConfirmationDialog(user);
+    }
+
+    return true;
+  }
+
+  async openRevokeUserConfirmationDialog(user: OrganizationUserView): Promise<boolean> {
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "revokeAccess", placeholders: [this.userNamePipe.transform(user)] },
+      content: this.i18nService.t("revokeUserConfirmation"),
+      acceptButtonText: { key: "revokeAccess" },
+      type: "warning",
+    });
+
+    if (!confirmed) {
+      return false;
+    }
+
+    if (user.status > 0 && user.hasMasterPassword === false) {
+      return await this.openNoMasterPasswordConfirmationDialog(user);
+    }
+
+    return true;
+  }
+
+  async openDeleteUserConfirmationDialog(
+    user: OrganizationUserView,
+    organization: Organization,
+  ): Promise<boolean> {
+    const warningAcknowledged = await firstValueFrom(
+      this.deleteManagedMemberWarningService.warningAcknowledged(organization.id),
+    );
+
+    if (
+      !warningAcknowledged &&
+      organization.canManageUsers &&
+      organization.productTierType === ProductTierType.Enterprise
+    ) {
+      const acknowledged = await this.deleteManagedMemberWarningService.showWarning();
+      if (!acknowledged) {
+        return false;
+      }
+    }
+
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: {
+        key: "deleteOrganizationUser",
+        placeholders: [this.userNamePipe.transform(user)],
+      },
+      content: {
+        key: "deleteOrganizationUserWarningDesc",
+        placeholders: [this.userNamePipe.transform(user)],
+      },
+      type: "warning",
+      acceptButtonText: { key: "delete" },
+      cancelButtonText: { key: "cancel" },
+    });
+
+    if (confirmed) {
+      await this.deleteManagedMemberWarningService.acknowledgeWarning(organization.id);
+    }
+
+    return confirmed;
+  }
+
+  private async openNoMasterPasswordConfirmationDialog(
+    user: OrganizationUserView,
+  ): Promise<boolean> {
+    return this.dialogService.openSimpleDialog({
+      title: {
+        key: "removeOrgUserNoMasterPasswordTitle",
+      },
+      content: {
+        key: "removeOrgUserNoMasterPasswordDesc",
+        placeholders: [this.userNamePipe.transform(user)],
+      },
+      type: "warning",
+    });
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-members-service/organization-members.service.spec.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-members-service/organization-members.service.spec.ts
new file mode 100644
index 00000000000..aef4dd00312
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/organization-members-service/organization-members.service.spec.ts
@@ -0,0 +1,414 @@
+import { TestBed } from "@angular/core/testing";
+import { of } from "rxjs";
+
+import {
+  CollectionService,
+  OrganizationUserApiService,
+  OrganizationUserUserDetailsResponse,
+} from "@bitwarden/admin-console/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { KeyService } from "@bitwarden/key-management";
+
+import { GroupApiService } from "../../../core";
+
+import { OrganizationMembersService } from "./organization-members.service";
+
+describe("OrganizationMembersService", () => {
+  let service: OrganizationMembersService;
+  let organizationUserApiService: jest.Mocked<OrganizationUserApiService>;
+  let groupService: jest.Mocked<GroupApiService>;
+  let apiService: jest.Mocked<ApiService>;
+  let keyService: jest.Mocked<KeyService>;
+  let accountService: jest.Mocked<AccountService>;
+  let collectionService: jest.Mocked<CollectionService>;
+
+  const mockOrganizationId = "org-123" as OrganizationId;
+
+  const createMockOrganization = (overrides: Partial<Organization> = {}): Organization => {
+    const org = new Organization();
+    org.id = mockOrganizationId;
+    org.useGroups = false;
+
+    return Object.assign(org, overrides);
+  };
+
+  const createMockUserResponse = (
+    overrides: Partial<OrganizationUserUserDetailsResponse> = {},
+  ): OrganizationUserUserDetailsResponse => {
+    return {
+      id: "user-1",
+      userId: "user-id-1",
+      email: "test@example.com",
+      name: "Test User",
+      collections: [],
+      groups: [],
+      ...overrides,
+    } as OrganizationUserUserDetailsResponse;
+  };
+
+  const createMockGroup = (id: string, name: string) => ({
+    id,
+    name,
+  });
+
+  const createMockCollection = (id: string, name: string) => ({
+    id,
+    name,
+    organizationId: mockOrganizationId,
+  });
+
+  beforeEach(() => {
+    organizationUserApiService = {
+      getAllUsers: jest.fn(),
+    } as any;
+
+    groupService = {
+      getAll: jest.fn(),
+    } as any;
+
+    apiService = {
+      getCollections: jest.fn(),
+    } as any;
+
+    keyService = {
+      orgKeys$: jest.fn(),
+    } as any;
+
+    accountService = {
+      activeAccount$: of({ id: "user-123" } as any),
+    } as any;
+
+    collectionService = {
+      decryptMany$: jest.fn(),
+    } as any;
+
+    TestBed.configureTestingModule({
+      providers: [
+        OrganizationMembersService,
+        { provide: OrganizationUserApiService, useValue: organizationUserApiService },
+        { provide: GroupApiService, useValue: groupService },
+        { provide: ApiService, useValue: apiService },
+        { provide: KeyService, useValue: keyService },
+        { provide: AccountService, useValue: accountService },
+        { provide: CollectionService, useValue: collectionService },
+      ],
+    });
+
+    service = TestBed.inject(OrganizationMembersService);
+  });
+
+  describe("loadUsers", () => {
+    it("should load users with collections when organization does not use groups", async () => {
+      const organization = createMockOrganization({ useGroups: false });
+      const mockUser = createMockUserResponse({
+        collections: [{ id: "col-1" } as any],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser],
+      } as any;
+      const mockCollections = [createMockCollection("col-1", "Collection 1")];
+      const mockOrgKey = { [mockOrganizationId]: {} as any };
+      const mockDecryptedCollections = [{ id: "col-1", name: "Collection 1" }];
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      apiService.getCollections.mockResolvedValue({
+        data: mockCollections,
+      } as any);
+      keyService.orgKeys$.mockReturnValue(of(mockOrgKey));
+      collectionService.decryptMany$.mockReturnValue(of(mockDecryptedCollections as any));
+
+      const result = await service.loadUsers(organization);
+
+      expect(organizationUserApiService.getAllUsers).toHaveBeenCalledWith(mockOrganizationId, {
+        includeGroups: false,
+        includeCollections: true,
+      });
+      expect(apiService.getCollections).toHaveBeenCalledWith(mockOrganizationId);
+      expect(groupService.getAll).not.toHaveBeenCalled();
+      expect(result).toHaveLength(1);
+      expect(result[0].collectionNames).toEqual(["Collection 1"]);
+      expect(result[0].groupNames).toEqual([]);
+    });
+
+    it("should load users with groups when organization uses groups", async () => {
+      const organization = createMockOrganization({ useGroups: true });
+      const mockUser = createMockUserResponse({
+        groups: ["group-1", "group-2"],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser],
+      } as any;
+      const mockGroups = [
+        createMockGroup("group-1", "Group 1"),
+        createMockGroup("group-2", "Group 2"),
+      ];
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      groupService.getAll.mockResolvedValue(mockGroups as any);
+
+      const result = await service.loadUsers(organization);
+
+      expect(organizationUserApiService.getAllUsers).toHaveBeenCalledWith(mockOrganizationId, {
+        includeGroups: true,
+        includeCollections: false,
+      });
+      expect(groupService.getAll).toHaveBeenCalledWith(mockOrganizationId);
+      expect(apiService.getCollections).not.toHaveBeenCalled();
+      expect(result).toHaveLength(1);
+      expect(result[0].groupNames).toEqual(["Group 1", "Group 2"]);
+      expect(result[0].collectionNames).toEqual([]);
+    });
+
+    it("should sort group names alphabetically", async () => {
+      const organization = createMockOrganization({ useGroups: true });
+      const mockUser = createMockUserResponse({
+        groups: ["group-1", "group-2", "group-3"],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser],
+      } as any;
+      const mockGroups = [
+        createMockGroup("group-1", "Zebra Group"),
+        createMockGroup("group-2", "Alpha Group"),
+        createMockGroup("group-3", "Beta Group"),
+      ];
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      groupService.getAll.mockResolvedValue(mockGroups as any);
+
+      const result = await service.loadUsers(organization);
+
+      expect(result[0].groupNames).toEqual(["Alpha Group", "Beta Group", "Zebra Group"]);
+    });
+
+    it("should sort collection names alphabetically", async () => {
+      const organization = createMockOrganization({ useGroups: false });
+      const mockUser = createMockUserResponse({
+        collections: [{ id: "col-1" } as any, { id: "col-2" } as any, { id: "col-3" } as any],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser],
+      } as any;
+      const mockCollections = [
+        createMockCollection("col-1", "Zebra Collection"),
+        createMockCollection("col-2", "Alpha Collection"),
+        createMockCollection("col-3", "Beta Collection"),
+      ];
+      const mockOrgKey = { [mockOrganizationId]: {} as any };
+      const mockDecryptedCollections = [
+        { id: "col-1", name: "Zebra Collection" },
+        { id: "col-2", name: "Alpha Collection" },
+        { id: "col-3", name: "Beta Collection" },
+      ];
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      apiService.getCollections.mockResolvedValue({
+        data: mockCollections,
+      } as any);
+      keyService.orgKeys$.mockReturnValue(of(mockOrgKey));
+      collectionService.decryptMany$.mockReturnValue(of(mockDecryptedCollections as any));
+
+      const result = await service.loadUsers(organization);
+
+      expect(result[0].collectionNames).toEqual([
+        "Alpha Collection",
+        "Beta Collection",
+        "Zebra Collection",
+      ]);
+    });
+
+    it("should filter out null or undefined group names", async () => {
+      const organization = createMockOrganization({ useGroups: true });
+      const mockUser = createMockUserResponse({
+        groups: ["group-1", "group-2", "group-3"],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser],
+      } as any;
+      const mockGroups = [
+        createMockGroup("group-1", "Group 1"),
+        // group-2 is missing - should be filtered out
+        createMockGroup("group-3", "Group 3"),
+      ];
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      groupService.getAll.mockResolvedValue(mockGroups as any);
+
+      const result = await service.loadUsers(organization);
+
+      expect(result[0].groupNames).toEqual(["Group 1", "Group 3"]);
+      expect(result[0].groupNames).not.toContain(undefined);
+      expect(result[0].groupNames).not.toContain(null);
+    });
+
+    it("should filter out null or undefined collection names", async () => {
+      const organization = createMockOrganization({ useGroups: false });
+      const mockUser = createMockUserResponse({
+        collections: [{ id: "col-1" } as any, { id: "col-2" } as any, { id: "col-3" } as any],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser],
+      } as any;
+      const mockCollections = [
+        createMockCollection("col-1", "Collection 1"),
+        // col-2 is missing - should be filtered out
+        createMockCollection("col-3", "Collection 3"),
+      ];
+      const mockOrgKey = { [mockOrganizationId]: {} as any };
+      const mockDecryptedCollections = [
+        { id: "col-1", name: "Collection 1" },
+        // col-2 is missing - should be filtered out
+        { id: "col-3", name: "Collection 3" },
+      ];
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      apiService.getCollections.mockResolvedValue({
+        data: mockCollections,
+      } as any);
+      keyService.orgKeys$.mockReturnValue(of(mockOrgKey));
+      collectionService.decryptMany$.mockReturnValue(of(mockDecryptedCollections as any));
+
+      const result = await service.loadUsers(organization);
+
+      expect(result[0].collectionNames).toEqual(["Collection 1", "Collection 3"]);
+      expect(result[0].collectionNames).not.toContain(undefined);
+      expect(result[0].collectionNames).not.toContain(null);
+    });
+
+    it("should handle multiple users", async () => {
+      const organization = createMockOrganization({ useGroups: true });
+      const mockUser1 = createMockUserResponse({
+        id: "user-1",
+        groups: ["group-1"],
+      });
+      const mockUser2 = createMockUserResponse({
+        id: "user-2",
+        groups: ["group-2"],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser1, mockUser2],
+      } as any;
+      const mockGroups = [
+        createMockGroup("group-1", "Group 1"),
+        createMockGroup("group-2", "Group 2"),
+      ];
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      groupService.getAll.mockResolvedValue(mockGroups as any);
+
+      const result = await service.loadUsers(organization);
+
+      expect(result).toHaveLength(2);
+      expect(result[0].groupNames).toEqual(["Group 1"]);
+      expect(result[1].groupNames).toEqual(["Group 2"]);
+    });
+
+    it("should return empty array when usersResponse.data is null", async () => {
+      const organization = createMockOrganization({ useGroups: false });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: null as any,
+      } as any;
+      const mockOrgKey = { [mockOrganizationId]: {} as any };
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      apiService.getCollections.mockResolvedValue({
+        data: [],
+      } as any);
+      keyService.orgKeys$.mockReturnValue(of(mockOrgKey));
+      collectionService.decryptMany$.mockReturnValue(of([]));
+
+      const result = await service.loadUsers(organization);
+
+      expect(result).toEqual([]);
+    });
+
+    it("should return empty array when usersResponse.data is undefined", async () => {
+      const organization = createMockOrganization({ useGroups: false });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: undefined as any,
+      } as any;
+      const mockOrgKey = { [mockOrganizationId]: {} as any };
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      apiService.getCollections.mockResolvedValue({
+        data: [],
+      } as any);
+      keyService.orgKeys$.mockReturnValue(of(mockOrgKey));
+      collectionService.decryptMany$.mockReturnValue(of([]));
+
+      const result = await service.loadUsers(organization);
+
+      expect(result).toEqual([]);
+    });
+
+    it("should handle empty groups array", async () => {
+      const organization = createMockOrganization({ useGroups: true });
+      const mockUser = createMockUserResponse({
+        groups: [],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser],
+      } as any;
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      groupService.getAll.mockResolvedValue([]);
+
+      const result = await service.loadUsers(organization);
+
+      expect(result).toHaveLength(1);
+      expect(result[0].groupNames).toEqual([]);
+    });
+
+    it("should handle empty collections array", async () => {
+      const organization = createMockOrganization({ useGroups: false });
+      const mockUser = createMockUserResponse({
+        collections: [],
+      });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [mockUser],
+      } as any;
+      const mockOrgKey = { [mockOrganizationId]: {} as any };
+
+      organizationUserApiService.getAllUsers.mockResolvedValue(mockUsersResponse);
+      apiService.getCollections.mockResolvedValue({
+        data: [],
+      } as any);
+      keyService.orgKeys$.mockReturnValue(of(mockOrgKey));
+      collectionService.decryptMany$.mockReturnValue(of([]));
+
+      const result = await service.loadUsers(organization);
+
+      expect(result).toHaveLength(1);
+      expect(result[0].collectionNames).toEqual([]);
+    });
+
+    it("should fetch data in parallel using Promise.all", async () => {
+      const organization = createMockOrganization({ useGroups: true });
+      const mockUsersResponse: ListResponse<OrganizationUserUserDetailsResponse> = {
+        data: [],
+      } as any;
+
+      let getUsersCallTime: number;
+      let getGroupsCallTime: number;
+
+      organizationUserApiService.getAllUsers.mockImplementation(async () => {
+        getUsersCallTime = Date.now();
+        return mockUsersResponse;
+      });
+
+      groupService.getAll.mockImplementation(async () => {
+        getGroupsCallTime = Date.now();
+        return [];
+      });
+
+      await service.loadUsers(organization);
+
+      // Both calls should have been initiated at roughly the same time (within 50ms)
+      expect(Math.abs(getUsersCallTime - getGroupsCallTime)).toBeLessThan(50);
+    });
+  });
+});
diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-members-service/organization-members.service.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-members-service/organization-members.service.ts
new file mode 100644
index 00000000000..0dc417cc2c6
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/organization-members-service/organization-members.service.ts
@@ -0,0 +1,112 @@
+import { Injectable } from "@angular/core";
+import { combineLatest, firstValueFrom, from, map, switchMap } from "rxjs";
+
+import {
+  Collection,
+  CollectionData,
+  CollectionDetailsResponse,
+  CollectionService,
+  OrganizationUserApiService,
+} from "@bitwarden/admin-console/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+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 { KeyService } from "@bitwarden/key-management";
+
+import { GroupApiService } from "../../../core";
+import { OrganizationUserView } from "../../../core/views/organization-user.view";
+
+@Injectable()
+export class OrganizationMembersService {
+  constructor(
+    private organizationUserApiService: OrganizationUserApiService,
+    private groupService: GroupApiService,
+    private apiService: ApiService,
+    private keyService: KeyService,
+    private accountService: AccountService,
+    private collectionService: CollectionService,
+  ) {}
+
+  async loadUsers(organization: Organization): Promise<OrganizationUserView[]> {
+    let groupsPromise: Promise<Map<string, string>> | undefined;
+    let collectionsPromise: Promise<Map<string, string>> | undefined;
+
+    const userPromise = this.organizationUserApiService.getAllUsers(organization.id, {
+      includeGroups: organization.useGroups,
+      includeCollections: !organization.useGroups,
+    });
+
+    if (organization.useGroups) {
+      groupsPromise = this.getGroupNameMap(organization);
+    } else {
+      collectionsPromise = this.getCollectionNameMap(organization);
+    }
+
+    const [usersResponse, groupNamesMap, collectionNamesMap] = await Promise.all([
+      userPromise,
+      groupsPromise,
+      collectionsPromise,
+    ]);
+
+    return (
+      usersResponse.data?.map<OrganizationUserView>((r) => {
+        const userView = OrganizationUserView.fromResponse(r);
+
+        userView.groupNames = userView.groups
+          .map((g: string) => groupNamesMap?.get(g))
+          .filter((name): name is string => name != null)
+          .sort();
+        userView.collectionNames = userView.collections
+          .map((c: { id: string }) => collectionNamesMap?.get(c.id))
+          .filter((name): name is string => name != null)
+          .sort();
+
+        return userView;
+      }) ?? []
+    );
+  }
+
+  private async getGroupNameMap(organization: Organization): Promise<Map<string, string>> {
+    const groups = await this.groupService.getAll(organization.id);
+    const groupNameMap = new Map<string, string>();
+    groups.forEach((g: { id: string; name: string }) => groupNameMap.set(g.id, g.name));
+    return groupNameMap;
+  }
+
+  private async getCollectionNameMap(organization: Organization): Promise<Map<string, string>> {
+    const collections$ = from(this.apiService.getCollections(organization.id)).pipe(
+      map((response) => {
+        return response.data.map((r) =>
+          Collection.fromCollectionData(new CollectionData(r as CollectionDetailsResponse)),
+        );
+      }),
+    );
+
+    const orgKey$ = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) => this.keyService.orgKeys$(userId)),
+      map((orgKeys) => {
+        if (orgKeys == null) {
+          throw new Error("Organization keys not found for provided User.");
+        }
+        return orgKeys;
+      }),
+    );
+
+    return await firstValueFrom(
+      combineLatest([orgKey$, collections$]).pipe(
+        switchMap(([orgKey, collections]) =>
+          this.collectionService.decryptMany$(collections, orgKey),
+        ),
+        map((decryptedCollections) => {
+          const collectionMap: Map<string, string> = new Map<string, string>();
+          decryptedCollections.forEach((c) => {
+            collectionMap.set(c.id, c.name);
+          });
+          return collectionMap;
+        }),
+      ),
+    );
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/policies/auto-confirm-edit-policy-dialog.component.html b/apps/web/src/app/admin-console/organizations/policies/auto-confirm-edit-policy-dialog.component.html
new file mode 100644
index 00000000000..4d1db65034d
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/auto-confirm-edit-policy-dialog.component.html
@@ -0,0 +1,93 @@
+<form [formGroup]="formGroup" [bitSubmit]="submit">
+  <bit-dialog [loading]="loading">
+    <ng-container bitDialogTitle>
+      @let title = (multiStepSubmit | async)[currentStep()]?.titleContent();
+      @if (title) {
+        <ng-container [ngTemplateOutlet]="title"></ng-container>
+      }
+    </ng-container>
+
+    <ng-container bitDialogContent>
+      @if (loading) {
+        <div>
+          <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>
+        </div>
+      }
+      <div [hidden]="loading">
+        @if (policy.showDescription) {
+          <p bitTypography="body1">{{ policy.description | i18n }}</p>
+        }
+      </div>
+      <ng-template #policyForm></ng-template>
+    </ng-container>
+    <ng-container bitDialogFooter>
+      @let footer = (multiStepSubmit | async)[currentStep()]?.footerContent();
+      @if (footer) {
+        <ng-container [ngTemplateOutlet]="footer"></ng-container>
+      }
+    </ng-container>
+  </bit-dialog>
+</form>
+
+<ng-template #step0Title>
+  <div class="tw-flex tw-flex-col">
+    @let showBadge = firstTimeDialog();
+    @if (showBadge) {
+      <span bitBadge variant="info" class="tw-w-[99px] tw-my-2"> {{ "availableNow" | i18n }}</span>
+    }
+    <span>
+      {{ (showBadge ? "autoConfirm" : "editPolicy") | i18n }}
+      @if (!showBadge) {
+        <span class="tw-text-muted tw-font-normal tw-text-sm">
+          {{ policy.name | i18n }}
+        </span>
+      }
+    </span>
+  </div>
+</ng-template>
+
+<ng-template #step1Title>
+  {{ "howToTurnOnAutoConfirm" | i18n }}
+</ng-template>
+
+<ng-template #step0>
+  <button
+    bitButton
+    buttonType="primary"
+    [disabled]="saveDisabled$ | async"
+    bitFormButton
+    type="submit"
+  >
+    @let autoConfirmEnabled = autoConfirmEnabled$ | async;
+    @let managePoliciesOnly = managePoliciesOnly$ | async;
+    @if (autoConfirmEnabled || managePoliciesOnly) {
+      {{ "save" | i18n }}
+    } @else {
+      {{ "continue" | i18n }}
+    }
+  </button>
+  <button bitButton buttonType="secondary" bitDialogClose type="button">
+    {{ "cancel" | i18n }}
+  </button>
+</ng-template>
+
+<ng-template #step1>
+  <button
+    bitButton
+    buttonType="primary"
+    [disabled]="saveDisabled$ | async"
+    bitFormButton
+    type="submit"
+  >
+    {{ "openExtension" | i18n }}
+    <i class="bwi bwi-external-link tw-ml-1" aria-hidden="true"></i>
+  </button>
+  <button bitButton buttonType="secondary" bitDialogClose type="button">
+    {{ "close" | i18n }}
+  </button>
+</ng-template>
diff --git a/apps/web/src/app/admin-console/organizations/policies/auto-confirm-edit-policy-dialog.component.ts b/apps/web/src/app/admin-console/organizations/policies/auto-confirm-edit-policy-dialog.component.ts
new file mode 100644
index 00000000000..99d484f04f2
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/auto-confirm-edit-policy-dialog.component.ts
@@ -0,0 +1,289 @@
+import {
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  signal,
+  Signal,
+  TemplateRef,
+  viewChild,
+} from "@angular/core";
+import { FormBuilder } from "@angular/forms";
+import { Router } from "@angular/router";
+import {
+  combineLatest,
+  firstValueFrom,
+  map,
+  Observable,
+  of,
+  shareReplay,
+  startWith,
+  switchMap,
+  tap,
+} from "rxjs";
+
+import { AutomaticUserConfirmationService } from "@bitwarden/admin-console/common";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
+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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { getById } from "@bitwarden/common/platform/misc";
+import {
+  DIALOG_DATA,
+  DialogConfig,
+  DialogRef,
+  DialogService,
+  ToastService,
+} from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
+
+import { SharedModule } from "../../../shared";
+
+import { AutoConfirmPolicyEditComponent } from "./policy-edit-definitions/auto-confirm-policy.component";
+import {
+  PolicyEditDialogComponent,
+  PolicyEditDialogData,
+  PolicyEditDialogResult,
+} from "./policy-edit-dialog.component";
+
+export type MultiStepSubmit = {
+  sideEffect: () => Promise<void>;
+  footerContent: Signal<TemplateRef<unknown> | undefined>;
+  titleContent: Signal<TemplateRef<unknown> | undefined>;
+};
+
+export type AutoConfirmPolicyDialogData = PolicyEditDialogData & {
+  firstTimeDialog?: boolean;
+};
+
+/**
+ * Custom policy dialog component for Auto-Confirm policy.
+ * Satisfies the PolicyDialogComponent interface structurally
+ * via its static open() function.
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  templateUrl: "auto-confirm-edit-policy-dialog.component.html",
+  imports: [SharedModule],
+})
+export class AutoConfirmPolicyDialogComponent
+  extends PolicyEditDialogComponent
+  implements AfterViewInit
+{
+  policyType = PolicyType;
+
+  protected readonly firstTimeDialog = signal(false);
+  protected readonly currentStep = signal(0);
+  protected multiStepSubmit: Observable<MultiStepSubmit[]> = of([]);
+  protected autoConfirmEnabled$: Observable<boolean> = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) => this.policyService.policies$(userId)),
+    map((policies) => policies.find((p) => p.type === PolicyType.AutoConfirm)?.enabled ?? false),
+  );
+  // Users with manage policies custom permission should not see the dialog's second step since
+  // they do not have permission to configure the setting. This will only allow them to configure
+  // the policy.
+  protected managePoliciesOnly$: Observable<boolean> = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) => this.organizationService.organizations$(userId)),
+    getById(this.data.organizationId),
+    map((organization) => (!organization?.isAdmin && organization?.canManagePolicies) ?? false),
+  );
+
+  private readonly submitPolicy: Signal<TemplateRef<unknown> | undefined> = viewChild("step0");
+  private readonly openExtension: Signal<TemplateRef<unknown> | undefined> = viewChild("step1");
+
+  private readonly submitPolicyTitle: Signal<TemplateRef<unknown> | undefined> =
+    viewChild("step0Title");
+  private readonly openExtensionTitle: Signal<TemplateRef<unknown> | undefined> =
+    viewChild("step1Title");
+
+  override policyComponent: AutoConfirmPolicyEditComponent | undefined;
+
+  constructor(
+    @Inject(DIALOG_DATA) protected data: AutoConfirmPolicyDialogData,
+    accountService: AccountService,
+    policyApiService: PolicyApiServiceAbstraction,
+    i18nService: I18nService,
+    cdr: ChangeDetectorRef,
+    formBuilder: FormBuilder,
+    dialogRef: DialogRef<PolicyEditDialogResult>,
+    toastService: ToastService,
+    configService: ConfigService,
+    keyService: KeyService,
+    private organizationService: OrganizationService,
+    private policyService: PolicyService,
+    private router: Router,
+    private autoConfirmService: AutomaticUserConfirmationService,
+  ) {
+    super(
+      data,
+      accountService,
+      policyApiService,
+      i18nService,
+      cdr,
+      formBuilder,
+      dialogRef,
+      toastService,
+      configService,
+      keyService,
+    );
+
+    this.firstTimeDialog.set(data.firstTimeDialog ?? false);
+  }
+
+  /**
+   * Instantiates the child policy component and inserts it into the view.
+   */
+  async ngAfterViewInit() {
+    await super.ngAfterViewInit();
+
+    if (this.policyComponent) {
+      this.saveDisabled$ = combineLatest([
+        this.autoConfirmEnabled$,
+        this.policyComponent.enabled.valueChanges.pipe(
+          startWith(this.policyComponent.enabled.value),
+        ),
+      ]).pipe(map(([policyEnabled, value]) => !policyEnabled && !value));
+    }
+
+    this.multiStepSubmit = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) => this.policyService.policies$(userId)),
+      map((policies) => policies.find((p) => p.type === PolicyType.SingleOrg)?.enabled ?? false),
+      tap((singleOrgPolicyEnabled) =>
+        this.policyComponent?.setSingleOrgEnabled(singleOrgPolicyEnabled),
+      ),
+      switchMap((singleOrgPolicyEnabled) => this.buildMultiStepSubmit(singleOrgPolicyEnabled)),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+  }
+
+  private buildMultiStepSubmit(singleOrgPolicyEnabled: boolean): Observable<MultiStepSubmit[]> {
+    return this.managePoliciesOnly$.pipe(
+      map((managePoliciesOnly) => {
+        const submitSteps = [
+          {
+            sideEffect: () => this.handleSubmit(singleOrgPolicyEnabled ?? false),
+            footerContent: this.submitPolicy,
+            titleContent: this.submitPolicyTitle,
+          },
+        ];
+
+        if (!managePoliciesOnly) {
+          submitSteps.push({
+            sideEffect: () => this.openBrowserExtension(),
+            footerContent: this.openExtension,
+            titleContent: this.openExtensionTitle,
+          });
+        }
+        return submitSteps;
+      }),
+    );
+  }
+
+  private async handleSubmit(singleOrgEnabled: boolean) {
+    if (!singleOrgEnabled) {
+      await this.submitSingleOrg();
+    }
+    await this.submitAutoConfirm();
+  }
+
+  /**
+   *  Triggers policy submission for auto confirm.
+   *  @returns boolean: true if multi-submit workflow should continue, false otherwise.
+   */
+  private async submitAutoConfirm() {
+    if (!this.policyComponent) {
+      throw new Error("PolicyComponent not initialized.");
+    }
+
+    const autoConfirmRequest = await this.policyComponent.buildRequest();
+    await this.policyApiService.putPolicy(
+      this.data.organizationId,
+      this.data.policy.type,
+      autoConfirmRequest,
+    );
+
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+    const currentAutoConfirmState = await firstValueFrom(
+      this.autoConfirmService.configuration$(userId),
+    );
+
+    await this.autoConfirmService.upsert(userId, {
+      ...currentAutoConfirmState,
+      showSetupDialog: false,
+    });
+
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("editedPolicyId", this.i18nService.t(this.data.policy.name)),
+    });
+
+    if (!this.policyComponent.enabled.value) {
+      this.dialogRef.close("saved");
+    }
+  }
+
+  private async submitSingleOrg(): Promise<void> {
+    const singleOrgRequest: PolicyRequest = {
+      enabled: true,
+      data: null,
+    };
+
+    await this.policyApiService.putPolicy(
+      this.data.organizationId,
+      PolicyType.SingleOrg,
+      singleOrgRequest,
+    );
+  }
+
+  private async openBrowserExtension() {
+    await this.router.navigate(["/browser-extension-prompt"], {
+      queryParams: { url: "AutoConfirm" },
+    });
+  }
+
+  submit = async () => {
+    if (!this.policyComponent) {
+      throw new Error("PolicyComponent not initialized.");
+    }
+
+    if ((await this.policyComponent.confirm()) == false) {
+      this.dialogRef.close();
+      return;
+    }
+
+    try {
+      const multiStepSubmit = await firstValueFrom(this.multiStepSubmit);
+      await multiStepSubmit[this.currentStep()].sideEffect();
+
+      if (this.currentStep() === multiStepSubmit.length - 1) {
+        this.dialogRef.close("saved");
+        return;
+      }
+
+      this.currentStep.update((value) => value + 1);
+      this.policyComponent.setStep(this.currentStep());
+    } catch (error: any) {
+      this.toastService.showToast({
+        variant: "error",
+        message: error.message,
+      });
+    }
+  };
+
+  static open = (
+    dialogService: DialogService,
+    config: DialogConfig<AutoConfirmPolicyDialogData>,
+  ) => {
+    return dialogService.open<PolicyEditDialogResult>(AutoConfirmPolicyDialogComponent, config);
+  };
+}
diff --git a/apps/web/src/app/admin-console/organizations/policies/base-policy-edit.component.ts b/apps/web/src/app/admin-console/organizations/policies/base-policy-edit.component.ts
index 2e5faea4702..c1b175fa988 100644
--- a/apps/web/src/app/admin-console/organizations/policies/base-policy-edit.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/base-policy-edit.component.ts
@@ -8,6 +8,20 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 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";
+import { DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
+
+import type { PolicyEditDialogData, PolicyEditDialogResult } from "./policy-edit-dialog.component";
+
+/**
+ * Interface for policy dialog components.
+ * Any component that implements this interface can be used as a custom policy edit dialog.
+ */
+export interface PolicyDialogComponent {
+  open: (
+    dialogService: DialogService,
+    config: DialogConfig<PolicyEditDialogData>,
+  ) => DialogRef<PolicyEditDialogResult>;
+}
 
 /**
  * A metadata class that defines how a policy is displayed in the Admin Console Policies page for editing.
@@ -32,6 +46,12 @@ export abstract class BasePolicyEditDefinition {
    */
   abstract component: Constructor<BasePolicyEditComponent>;
 
+  /**
+   * The dialog component that will be opened when editing this policy.
+   * This allows customizing the look and feel of each policy's dialog contents.
+   */
+  editDialogComponent?: PolicyDialogComponent;
+
   /**
    * If true, the {@link 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.
@@ -58,7 +78,11 @@ export abstract class BasePolicyEditDefinition {
  */
 @Directive()
 export abstract class BasePolicyEditComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() policyResponse: PolicyResponse | undefined;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() policy: BasePolicyEditDefinition | undefined;
 
   /**
@@ -85,7 +109,6 @@ export abstract class BasePolicyEditComponent implements OnInit {
     }
 
     const request: PolicyRequest = {
-      type: this.policy.type,
       enabled: this.enabled.value ?? false,
       data: this.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 624e5132faf..3042be240f7 100644
--- a/apps/web/src/app/admin-console/organizations/policies/index.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/index.ts
@@ -2,3 +2,6 @@ export { PoliciesComponent } from "./policies.component";
 export { ossPolicyEditRegister } from "./policy-edit-register";
 export { BasePolicyEditDefinition, BasePolicyEditComponent } from "./base-policy-edit.component";
 export { POLICY_EDIT_REGISTER } from "./policy-register-token";
+export { AutoConfirmPolicyDialogComponent } from "./auto-confirm-edit-policy-dialog.component";
+export { AutoConfirmPolicy } from "./policy-edit-definitions";
+export { PolicyEditDialogResult } from "./policy-edit-dialog.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 ea14986749f..8df73a50e14 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,7 +1,6 @@
 <app-header></app-header>
 
 <bit-container>
-  @let organization = organization$ | async;
   @if (loading) {
     <i
       class="bwi bwi-spinner bwi-spin tw-text-muted"
@@ -13,18 +12,16 @@
   @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>
-          }
+        @for (p of policies$ | async; track p.type) {
+          <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>
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 45383133687..e80796fd0af 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
@@ -1,19 +1,30 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute } from "@angular/router";
-import { firstValueFrom, lastValueFrom, Observable } from "rxjs";
-import { first, map } from "rxjs/operators";
+import {
+  combineLatest,
+  firstValueFrom,
+  Observable,
+  of,
+  switchMap,
+  first,
+  map,
+  withLatestFrom,
+  tap,
+} from "rxjs";
 
 import {
   getOrganizationById,
   OrganizationService,
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 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 { DialogService } from "@bitwarden/components";
 import { safeProvider } from "@bitwarden/ui-common";
@@ -21,11 +32,13 @@ import { safeProvider } from "@bitwarden/ui-common";
 import { HeaderModule } from "../../../layouts/header/header.module";
 import { SharedModule } from "../../../shared";
 
-import { BasePolicyEditDefinition } from "./base-policy-edit.component";
+import { BasePolicyEditDefinition, PolicyDialogComponent } from "./base-policy-edit.component";
 import { PolicyEditDialogComponent } from "./policy-edit-dialog.component";
 import { PolicyListService } from "./policy-list.service";
 import { POLICY_EDIT_REGISTER } from "./policy-register-token";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "policies.component.html",
   imports: [SharedModule, HeaderModule],
@@ -39,8 +52,7 @@ import { POLICY_EDIT_REGISTER } from "./policy-register-token";
 export class PoliciesComponent implements OnInit {
   loading = true;
   organizationId: string;
-  policies: readonly BasePolicyEditDefinition[];
-  protected organization$: Observable<Organization>;
+  policies$: Observable<BasePolicyEditDefinition[]>;
 
   private orgPolicies: PolicyResponse[];
   protected policiesEnabledMap: Map<PolicyType, boolean> = new Map<PolicyType, boolean>();
@@ -52,8 +64,18 @@ export class PoliciesComponent implements OnInit {
     private policyApiService: PolicyApiServiceAbstraction,
     private policyListService: PolicyListService,
     private dialogService: DialogService,
+    private policyService: PolicyService,
     protected configService: ConfigService,
-  ) {}
+  ) {
+    this.accountService.activeAccount$
+      .pipe(
+        getUserId,
+        switchMap((userId) => this.policyService.policies$(userId)),
+        tap(async () => await this.load()),
+        takeUntilDestroyed(),
+      )
+      .subscribe();
+  }
 
   async ngOnInit() {
     // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
@@ -63,28 +85,41 @@ export class PoliciesComponent implements OnInit {
         this.accountService.activeAccount$.pipe(map((a) => a?.id)),
       );
 
-      this.organization$ = this.organizationService
+      const organization$ = this.organizationService
         .organizations$(userId)
         .pipe(getOrganizationById(this.organizationId));
 
-      this.policies = this.policyListService.getPolicies();
+      this.policies$ = organization$.pipe(
+        withLatestFrom(of(this.policyListService.getPolicies())),
+        switchMap(([organization, policies]) => {
+          return combineLatest(
+            policies.map((policy) =>
+              policy
+                .display$(organization, this.configService)
+                .pipe(map((shouldDisplay) => ({ policy, shouldDisplay }))),
+            ),
+          );
+        }),
+        map((results) =>
+          results.filter((result) => result.shouldDisplay).map((result) => result.policy),
+        ),
+      );
 
       await this.load();
 
       // Handle policies component launch from Event message
-      this.route.queryParams
-        .pipe(first())
+      combineLatest([this.route.queryParams.pipe(first()), this.policies$])
         /* eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe, rxjs/no-nested-subscribe */
-        .subscribe(async (qParams) => {
+        .subscribe(async ([qParams, policies]) => {
           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) {
+                for (let i = 0; i < policies.length; i++) {
+                  if (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]);
+                    this.edit(policies[i]);
                     break;
                   }
                 }
@@ -107,16 +142,13 @@ export class PoliciesComponent implements OnInit {
   }
 
   async edit(policy: BasePolicyEditDefinition) {
-    const dialogRef = PolicyEditDialogComponent.open(this.dialogService, {
+    const dialogComponent: PolicyDialogComponent =
+      policy.editDialogComponent ?? PolicyEditDialogComponent;
+    dialogComponent.open(this.dialogService, {
       data: {
         policy: policy,
         organizationId: this.organizationId,
       },
     });
-
-    const result = await lastValueFrom(dialogRef.closed);
-    if (result == "saved") {
-      await this.load();
-    }
   }
 }
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/auto-confirm-policy.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/auto-confirm-policy.component.html
new file mode 100644
index 00000000000..54f166b662e
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/auto-confirm-policy.component.html
@@ -0,0 +1,59 @@
+<ng-container [ngTemplateOutlet]="steps[step]()"></ng-container>
+
+<ng-template #step0>
+  <p class="tw-mb-6">
+    {{ "autoConfirmPolicyEditDescription" | i18n }}
+  </p>
+
+  <ul class="tw-mb-6 tw-pl-6">
+    <li>
+      <span class="tw-font-medium">
+        {{ "autoConfirmAcceptSecurityRiskTitle" | i18n }}
+      </span>
+      {{ "autoConfirmAcceptSecurityRiskDescription" | i18n }}
+      <a bitLink href="https://bitwarden.com/help/automatic-confirmation/" target="_blank">
+        {{ "autoConfirmAcceptSecurityRiskLearnMore" | i18n }}
+        <i class="bwi bwi-external-link bwi-fw"></i>
+      </a>
+    </li>
+
+    <li>
+      @if (singleOrgEnabled$ | async) {
+        <span class="tw-font-medium">
+          {{ "autoConfirmSingleOrgExemption" | i18n }}
+        </span>
+      } @else {
+        <span class="tw-font-medium">
+          {{ "autoConfirmSingleOrgRequired" | i18n }}
+        </span>
+      }
+      {{ "autoConfirmSingleOrgRequiredDesc" | i18n }}
+    </li>
+
+    <li>
+      <span class="tw-font-medium">
+        {{ "autoConfirmNoEmergencyAccess" | i18n }}
+      </span>
+      {{ "autoConfirmNoEmergencyAccessDescription" | i18n }}
+    </li>
+  </ul>
+
+  <input type="checkbox" bitCheckbox [formControl]="enabled" id="enabled" />
+  <bit-label>{{ "autoConfirmCheckBoxLabel" | i18n }}</bit-label>
+</ng-template>
+
+<ng-template #step1>
+  <div class="tw-flex tw-justify-center tw-mb-6">
+    <bit-icon class="tw-w-[233px]" [icon]="autoConfirmSvg"></bit-icon>
+  </div>
+  <ol>
+    <li>1. {{ "autoConfirmExtension1" | i18n }}</li>
+
+    <li>
+      2. {{ "autoConfirmExtension2" | i18n }}
+      <strong>
+        {{ "autoConfirmExtension3" | i18n }}
+      </strong>
+    </li>
+  </ol>
+</ng-template>
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/auto-confirm-policy.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/auto-confirm-policy.component.ts
new file mode 100644
index 00000000000..7fa4fc2eea7
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/auto-confirm-policy.component.ts
@@ -0,0 +1,52 @@
+import { Component, OnInit, Signal, TemplateRef, viewChild } from "@angular/core";
+import { BehaviorSubject, map, Observable } from "rxjs";
+
+import { AutoConfirmSvg } from "@bitwarden/assets/svg";
+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 { SharedModule } from "../../../../shared";
+import { AutoConfirmPolicyDialogComponent } from "../auto-confirm-edit-policy-dialog.component";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
+
+export class AutoConfirmPolicy extends BasePolicyEditDefinition {
+  name = "autoConfirm";
+  description = "autoConfirmDescription";
+  type = PolicyType.AutoConfirm;
+  component = AutoConfirmPolicyEditComponent;
+  showDescription = false;
+  editDialogComponent = AutoConfirmPolicyDialogComponent;
+
+  override display$(organization: Organization, configService: ConfigService): Observable<boolean> {
+    return configService
+      .getFeatureFlag$(FeatureFlag.AutoConfirm)
+      .pipe(map((enabled) => enabled && organization.useAutomaticUserConfirmation));
+  }
+}
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  templateUrl: "auto-confirm-policy.component.html",
+  imports: [SharedModule],
+})
+export class AutoConfirmPolicyEditComponent extends BasePolicyEditComponent implements OnInit {
+  protected readonly autoConfirmSvg = AutoConfirmSvg;
+  private readonly policyForm: Signal<TemplateRef<any> | undefined> = viewChild("step0");
+  private readonly extensionButton: Signal<TemplateRef<any> | undefined> = viewChild("step1");
+
+  protected step: number = 0;
+  protected steps = [this.policyForm, this.extensionButton];
+
+  protected singleOrgEnabled$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  setSingleOrgEnabled(enabled: boolean) {
+    this.singleOrgEnabled$.next(enabled);
+  }
+
+  setStep(step: number) {
+    this.step = step;
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/autotype-policy.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/autotype-policy.component.ts
index ce62a7ff5a3..ceace60cd99 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/autotype-policy.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/autotype-policy.component.ts
@@ -18,6 +18,8 @@ export class DesktopAutotypeDefaultSettingPolicy extends BasePolicyEditDefinitio
     return configService.getFeatureFlag$(FeatureFlag.WindowsDesktopAutotype);
   }
 }
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "autotype-policy.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.ts
index 3b4df75e555..103420fbf51 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/disable-send.component.ts
@@ -12,6 +12,8 @@ export class DisableSendPolicy extends BasePolicyEditDefinition {
   component = DisableSendPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "disable-send.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/index.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/index.ts
index bb2c40b7a76..9b46e228af9 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/index.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/index.ts
@@ -10,7 +10,9 @@ export { RestrictedItemTypesPolicy } from "./restricted-item-types.component";
 export { SendOptionsPolicy } from "./send-options.component";
 export { SingleOrgPolicy } from "./single-org.component";
 export { TwoFactorAuthenticationPolicy } from "./two-factor-authentication.component";
+export { UriMatchDefaultPolicy } from "./uri-match-default.component";
 export {
   vNextOrganizationDataOwnershipPolicy,
   vNextOrganizationDataOwnershipPolicyComponent,
 } from "./vnext-organization-data-ownership.component";
+export { AutoConfirmPolicy } from "./auto-confirm-policy.component";
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.ts
index fe3d76a0907..c1223a2004b 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.ts
@@ -26,6 +26,8 @@ export class MasterPasswordPolicy extends BasePolicyEditDefinition {
   component = MasterPasswordPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "master-password.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.ts
index 94094b76f69..d832dff158a 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/organization-data-ownership.component.ts
@@ -22,6 +22,8 @@ export class OrganizationDataOwnershipPolicy extends BasePolicyEditDefinition {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "organization-data-ownership.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.ts
index e26d37bfdf2..e3a67362cc9 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.ts
@@ -19,6 +19,8 @@ export class PasswordGeneratorPolicy extends BasePolicyEditDefinition {
   component = PasswordGeneratorPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "password-generator.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.ts
index e95ef8a1422..ac768d47d6e 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/remove-unlock-with-pin.component.ts
@@ -12,6 +12,8 @@ export class RemoveUnlockWithPinPolicy extends BasePolicyEditDefinition {
   component = RemoveUnlockWithPinPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "remove-unlock-with-pin.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.ts
index 3f28c0cb068..904c29ca70d 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/require-sso.component.ts
@@ -19,6 +19,8 @@ export class RequireSsoPolicy extends BasePolicyEditDefinition {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "require-sso.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.ts
index fafb0b32398..bfe149048e3 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/reset-password.component.ts
@@ -26,6 +26,8 @@ export class ResetPasswordPolicy extends BasePolicyEditDefinition {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "reset-password.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/restricted-item-types.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/restricted-item-types.component.ts
index 8f2573f0da3..554542f8a84 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/restricted-item-types.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/restricted-item-types.component.ts
@@ -12,6 +12,8 @@ export class RestrictedItemTypesPolicy extends BasePolicyEditDefinition {
   component = RestrictedItemTypesPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "restricted-item-types.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.ts
index e581ed2f4c7..b8a59e8f8ef 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/send-options.component.ts
@@ -13,6 +13,8 @@ export class SendOptionsPolicy extends BasePolicyEditDefinition {
   component = SendOptionsPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "send-options.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.ts
index ecaa86b03bc..655c5f20610 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/single-org.component.ts
@@ -12,6 +12,8 @@ export class SingleOrgPolicy extends BasePolicyEditDefinition {
   component = SingleOrgPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "single-org.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.ts
index 13b7660c4e7..62f3d1f3466 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/two-factor-authentication.component.ts
@@ -12,6 +12,8 @@ export class TwoFactorAuthenticationPolicy extends BasePolicyEditDefinition {
   component = TwoFactorAuthenticationPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "two-factor-authentication.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/uri-match-default.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/uri-match-default.component.html
new file mode 100644
index 00000000000..399a4ad2dcd
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/uri-match-default.component.html
@@ -0,0 +1,22 @@
+<bit-callout title="{{ 'prerequisite' | i18n }}">
+  {{ "requireSsoPolicyReq" | i18n }}
+</bit-callout>
+
+<bit-form-control>
+  <input type="checkbox" bitCheckbox [formControl]="enabled" id="enabled" />
+  <bit-label>{{ "turnOn" | i18n }}</bit-label>
+</bit-form-control>
+
+<div [formGroup]="data">
+  <bit-form-field class="tw-flex-auto">
+    <bit-label>{{ "uriMatchDetectionOptionsLabel" | i18n }}</bit-label>
+    <bit-select formControlName="uriMatchDetection" id="uriMatchDetection">
+      <bit-option
+        *ngFor="let o of uriMatchOptions"
+        [label]="o.label"
+        [value]="o.value"
+        [disabled]="o.disabled"
+      ></bit-option>
+    </bit-select>
+  </bit-form-field>
+</div>
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/uri-match-default.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/uri-match-default.component.ts
new file mode 100644
index 00000000000..5c0b667bea2
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/uri-match-default.component.ts
@@ -0,0 +1,72 @@
+import { Component, ChangeDetectionStrategy } from "@angular/core";
+import { FormBuilder, FormControl, Validators } from "@angular/forms";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
+import {
+  UriMatchStrategy,
+  UriMatchStrategySetting,
+} from "@bitwarden/common/models/domain/domain-service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { SharedModule } from "../../../../shared";
+import { BasePolicyEditDefinition, BasePolicyEditComponent } from "../base-policy-edit.component";
+
+export class UriMatchDefaultPolicy extends BasePolicyEditDefinition {
+  name = "uriMatchDetectionPolicy";
+  description = "uriMatchDetectionPolicyDesc";
+  type = PolicyType.UriMatchDefaults;
+  component = UriMatchDefaultPolicyComponent;
+}
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  templateUrl: "uri-match-default.component.html",
+  imports: [SharedModule],
+})
+export class UriMatchDefaultPolicyComponent extends BasePolicyEditComponent {
+  uriMatchOptions: { label: string; value: UriMatchStrategySetting | null; disabled?: boolean }[];
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private i18nService: I18nService,
+  ) {
+    super();
+
+    this.data = this.formBuilder.group({
+      uriMatchDetection: new FormControl<UriMatchStrategySetting>(UriMatchStrategy.Domain, {
+        validators: [Validators.required],
+        nonNullable: true,
+      }),
+    });
+
+    this.uriMatchOptions = [
+      { label: i18nService.t("baseDomain"), value: UriMatchStrategy.Domain },
+      { label: i18nService.t("host"), value: UriMatchStrategy.Host },
+      { label: i18nService.t("exact"), value: UriMatchStrategy.Exact },
+      { label: i18nService.t("never"), value: UriMatchStrategy.Never },
+    ];
+  }
+
+  protected loadData() {
+    const uriMatchDetection = this.policyResponse?.data?.uriMatchDetection;
+
+    this.data?.patchValue({
+      uriMatchDetection: uriMatchDetection,
+    });
+  }
+
+  protected buildRequestData() {
+    return {
+      uriMatchDetection: this.data?.value?.uriMatchDetection,
+    };
+  }
+
+  async buildRequest(): Promise<PolicyRequest> {
+    const request = await super.buildRequest();
+    if (request.data?.uriMatchDetection == null) {
+      throw new Error(this.i18nService.t("invalidUriMatchDefaultPolicySetting"));
+    }
+
+    return request;
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.html
index 0abc40da683..bd2237bc2fd 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.html
@@ -1,5 +1,5 @@
 <p>
-  {{ "organizationDataOwnershipContent" | i18n }}
+  {{ "organizationDataOwnershipDescContent" | i18n }}
   <a
     bitLink
     href="https://bitwarden.com/resources/credential-lifecycle-management/"
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.ts
index 2234d5c7437..a0d425d5886 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/vnext-organization-data-ownership.component.ts
@@ -9,7 +9,7 @@ import { EncryptService } from "@bitwarden/common/key-management/crypto/abstract
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { OrgKey } from "@bitwarden/common/types/key";
-import { DialogService } from "@bitwarden/components";
+import { CenterPositionStrategy, DialogService } from "@bitwarden/components";
 import { EncString } from "@bitwarden/sdk-internal";
 
 import { SharedModule } from "../../../../shared";
@@ -34,6 +34,8 @@ export class vNextOrganizationDataOwnershipPolicy extends BasePolicyEditDefiniti
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "vnext-organization-data-ownership.component.html",
   imports: [SharedModule],
@@ -50,11 +52,15 @@ export class vNextOrganizationDataOwnershipPolicyComponent
     super();
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @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 dialogRef = this.dialogService.open(this.warningContent, {
+        positionStrategy: new CenterPositionStrategy(),
+      });
       const result = await lastValueFrom(dialogRef.closed);
       return Boolean(result);
     }
@@ -70,7 +76,6 @@ export class vNextOrganizationDataOwnershipPolicyComponent
 
     const request: VNextPolicyRequest = {
       policy: {
-        type: this.policy.type,
         enabled: this.enabled.value ?? false,
         data: this.buildRequestData(),
       },
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts
index f0672d0f861..98b6d1c6bee 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts
@@ -30,7 +30,7 @@ import { KeyService } from "@bitwarden/key-management";
 import { SharedModule } from "../../../shared";
 
 import { BasePolicyEditDefinition, BasePolicyEditComponent } from "./base-policy-edit.component";
-import { vNextOrganizationDataOwnershipPolicyComponent } from "./policy-edit-definitions";
+import { vNextOrganizationDataOwnershipPolicyComponent } from "./policy-edit-definitions/vnext-organization-data-ownership.component";
 
 export type PolicyEditDialogData = {
   /**
@@ -45,11 +45,15 @@ export type PolicyEditDialogData = {
 
 export type PolicyEditDialogResult = "saved";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "policy-edit-dialog.component.html",
   imports: [SharedModule],
 })
 export class PolicyEditDialogComponent implements AfterViewInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("policyForm", { read: ViewContainerRef, static: true })
   policyFormRef: ViewContainerRef | undefined;
 
@@ -64,13 +68,13 @@ export class PolicyEditDialogComponent implements AfterViewInit {
   });
   constructor(
     @Inject(DIALOG_DATA) protected data: PolicyEditDialogData,
-    private accountService: AccountService,
-    private policyApiService: PolicyApiServiceAbstraction,
-    private i18nService: I18nService,
+    protected accountService: AccountService,
+    protected policyApiService: PolicyApiServiceAbstraction,
+    protected i18nService: I18nService,
     private cdr: ChangeDetectorRef,
     private formBuilder: FormBuilder,
-    private dialogRef: DialogRef<PolicyEditDialogResult>,
-    private toastService: ToastService,
+    protected dialogRef: DialogRef<PolicyEditDialogResult>,
+    protected toastService: ToastService,
     private configService: ConfigService,
     private keyService: KeyService,
   ) {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-register.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-register.ts
index 5e63ba1358a..a4bdece0a7b 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-register.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-register.ts
@@ -1,5 +1,6 @@
 import { BasePolicyEditDefinition } from "./base-policy-edit.component";
 import {
+  AutoConfirmPolicy,
   DesktopAutotypeDefaultSettingPolicy,
   DisableSendPolicy,
   MasterPasswordPolicy,
@@ -12,6 +13,7 @@ import {
   SendOptionsPolicy,
   SingleOrgPolicy,
   TwoFactorAuthenticationPolicy,
+  UriMatchDefaultPolicy,
   vNextOrganizationDataOwnershipPolicy,
 } from "./policy-edit-definitions";
 
@@ -33,4 +35,6 @@ export const ossPolicyEditRegister: BasePolicyEditDefinition[] = [
   new SendOptionsPolicy(),
   new RestrictedItemTypesPolicy(),
   new DesktopAutotypeDefaultSettingPolicy(),
+  new UriMatchDefaultPolicy(),
+  new AutoConfirmPolicy(),
 ];
diff --git a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts
index 52cb24c90d1..6043bfd3193 100644
--- a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts
+++ b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts
@@ -14,6 +14,8 @@ import { ProductTierType } from "@bitwarden/common/billing/enums";
 
 import { ReportVariant, reports, ReportType, ReportEntry } from "../../../dirt/reports";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-reports-home",
   templateUrl: "reports-home.component.html",
diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
index 21424e86521..ec8ba59b987 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
@@ -38,6 +38,8 @@ import { PurgeVaultComponent } from "../../../vault/settings/purge-vault.compone
 
 import { DeleteOrganizationDialogResult, openDeleteOrganizationDialog } from "./components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-account",
   templateUrl: "account.component.html",
@@ -166,18 +168,11 @@ export class AccountComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const request = new OrganizationUpdateRequest();
-
-    /*
-     * When you disable a FormControl, it is removed from formGroup.values, so we have to use
-     * the original value.
-     * */
-    request.name = this.formGroup.get("orgName").disabled
-      ? this.org.name
-      : this.formGroup.value.orgName;
-    request.billingEmail = this.formGroup.get("billingEmail").disabled
-      ? this.org.billingEmail
-      : this.formGroup.value.billingEmail;
+    // The server ignores any undefined values, so it's ok to reference disabled form fields here
+    const request: OrganizationUpdateRequest = {
+      name: this.formGroup.value.orgName,
+      billingEmail: this.formGroup.value.billingEmail,
+    };
 
     // Backfill pub/priv key if necessary
     if (!this.org.hasPublicAndPrivateKeys) {
diff --git a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
index 1b41dc31a62..8cf1530cb7d 100644
--- a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
@@ -78,6 +78,8 @@ export enum DeleteOrganizationDialogResult {
   Canceled = "canceled",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-delete-organization",
   imports: [SharedModule, UserVerificationModule],
diff --git a/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts
index 020a16dd932..95081af3a53 100644
--- a/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts
@@ -5,27 +5,30 @@ import { ActivatedRoute } from "@angular/router";
 import { concatMap, takeUntil, map, lastValueFrom, firstValueFrom } from "rxjs";
 import { first, tap } from "rxjs/operators";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import {
   getOrganizationById,
   OrganizationService,
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { TwoFactorDuoResponse } from "@bitwarden/common/auth/models/response/two-factor-duo.response";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { DialogRef, DialogService } from "@bitwarden/components";
+import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
 
 import { TwoFactorSetupDuoComponent } from "../../../auth/settings/two-factor/two-factor-setup-duo.component";
 import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../auth/settings/two-factor/two-factor-setup.component";
 import { TwoFactorVerifyComponent } from "../../../auth/settings/two-factor/two-factor-verify.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-setup",
   templateUrl: "../../../auth/settings/two-factor/two-factor-setup.component.html",
@@ -35,7 +38,7 @@ export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent impleme
   tabbedHeader = false;
   constructor(
     dialogService: DialogService,
-    apiService: ApiService,
+    twoFactorService: TwoFactorService,
     messagingService: MessagingService,
     policyService: PolicyService,
     private route: ActivatedRoute,
@@ -44,16 +47,20 @@ export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent impleme
     protected accountService: AccountService,
     configService: ConfigService,
     i18nService: I18nService,
+    protected userVerificationService: UserVerificationService,
+    protected toastService: ToastService,
   ) {
     super(
       dialogService,
-      apiService,
+      twoFactorService,
       messagingService,
       policyService,
       billingAccountProfileStateService,
       accountService,
       configService,
       i18nService,
+      userVerificationService,
+      toastService,
     );
   }
 
@@ -116,7 +123,7 @@ export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent impleme
   }
 
   protected getTwoFactorProviders() {
-    return this.apiService.getTwoFactorOrganizationProviders(this.organizationId);
+    return this.twoFactorService.getTwoFactorOrganizationProviders(this.organizationId);
   }
 
   protected filterProvider(type: TwoFactorProviderType): boolean {
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
index 5cb61197b99..3e23eff13a9 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
@@ -25,7 +25,7 @@ const render: Story["render"] = (args) => ({
     ...args,
   },
   template: `
-    <bit-dialog [dialogSize]="dialogSize" [disablePadding]="disablePadding">
+    <bit-dialog [dialogSize]="dialogSize" [disablePadding]="disablePadding" disableAnimations>
       <span bitDialogTitle>Access selector</span>
       <span bitDialogContent>
         <bit-access-selector
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
index 116af15f579..75d089a8764 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
@@ -100,7 +100,7 @@
         <ng-template #readOnlyPerm>
           <div
             *ngIf="item.readonly || disabled"
-            class="tw-max-w-40 tw-overflow-hidden tw-overflow-ellipsis tw-whitespace-nowrap tw-font-bold tw-text-muted"
+            class="tw-max-w-40 tw-overflow-hidden tw-overflow-ellipsis tw-whitespace-nowrap tw-font-medium tw-text-muted"
             [title]="permissionLabelId(item.readonlyPermission) | i18n"
           >
             {{ permissionLabelId(item.readonlyPermission) | i18n }}
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.ts
index 43843314ce5..89ecfd07174 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.ts
@@ -45,6 +45,8 @@ export enum PermissionMode {
   Edit = "edit",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-access-selector",
   templateUrl: "access-selector.component.html",
@@ -139,6 +141,8 @@ export class AccessSelectorComponent implements ControlValueAccessor, OnInit, On
   /**
    * List of all selectable items that. Sorted internally.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get items(): AccessItemView[] {
     return this.selectionList.allItems;
@@ -160,6 +164,8 @@ export class AccessSelectorComponent implements ControlValueAccessor, OnInit, On
   /**
    * Permission mode that controls if the permission form controls and column should be present.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get permissionMode(): PermissionMode {
     return this._permissionMode;
@@ -175,41 +181,64 @@ export class AccessSelectorComponent implements ControlValueAccessor, OnInit, On
   /**
    * Column header for the selected items table
    */
-  @Input() columnHeader: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input()
+  columnHeader: string;
 
   /**
    * Label used for the ng selector
    */
-  @Input() selectorLabelText: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input()
+  selectorLabelText: string;
 
   /**
    * Helper text displayed under the ng selector
    */
-  @Input() selectorHelpText: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input()
+  selectorHelpText: string;
 
   /**
    * Text that is shown in the table when no items are selected
    */
-  @Input() emptySelectionText: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input()
+  emptySelectionText: string;
 
   /**
    * Flag for if the member roles column should be present
    */
-  @Input() showMemberRoles: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input()
+  showMemberRoles: boolean;
 
   /**
    * Flag for if the group column should be present
    */
-  @Input() showGroupColumn: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input()
+  showGroupColumn: boolean;
 
   /**
    * Hide the multi-select so that new items cannot be added
    */
-  @Input() hideMultiSelect = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input()
+  hideMultiSelect = false;
 
   /**
    * The initial permission that will be selected in the dialog, defaults to View.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   protected initialPermission: CollectionPermission = CollectionPermission.View;
 
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 ea1a47d85cc..7b189270e1b 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
@@ -116,6 +116,8 @@ export enum CollectionDialogAction {
   Upgrade = "upgrade",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "collection-dialog.component.html",
   imports: [SharedModule, AccessSelectorModule, SelectModule],
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
index c4fe0350006..c34073b2a04 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
@@ -18,6 +18,8 @@ import { BaseAcceptComponent } from "../../../common/base.accept.component";
  * "Bitwarden allows all members of Enterprise Organizations to redeem a complimentary Families Plan with their
  * personal email address." - https://bitwarden.com/learning/free-families-plan-for-enterprise/
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "accept-family-sponsorship.component.html",
   imports: [CommonModule, I18nPipe, IconModule],
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
index 30c0ba159c1..568c4922337 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
@@ -15,8 +15,9 @@ import { PreValidateSponsorshipResponse } from "@bitwarden/common/admin-console/
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { PlanSponsorshipType, PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService, ToastService } from "@bitwarden/components";
@@ -28,18 +29,22 @@ import {
   openDeleteOrganizationDialog,
 } from "../settings/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "families-for-enterprise-setup.component.html",
   imports: [SharedModule, OrganizationPlansComponent],
 })
 export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(OrganizationPlansComponent, { static: false })
   set organizationPlansComponent(value: OrganizationPlansComponent) {
     if (!value) {
       return;
     }
 
-    value.plan = PlanType.FamiliesAnnually;
+    value.plan = this._familyPlan;
     value.productTier = ProductTierType.Families;
     value.acceptingSponsorship = true;
     value.planSponsorshipType = PlanSponsorshipType.FamiliesForEnterprise;
@@ -59,13 +64,14 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
   _selectedFamilyOrganizationId = "";
 
   private _destroy = new Subject<void>();
+  private _familyPlan: PlanType;
   formGroup = this.formBuilder.group({
     selectedFamilyOrganizationId: ["", Validators.required],
   });
 
   constructor(
     private router: Router,
-    private platformUtilsService: PlatformUtilsService,
+    private configService: ConfigService,
     private i18nService: I18nService,
     private route: ActivatedRoute,
     private apiService: ApiService,
@@ -116,6 +122,13 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
         this.badToken = !this.preValidateSponsorshipResponse.isTokenValid;
       }
 
+      const milestone3FeatureEnabled = await this.configService.getFeatureFlag(
+        FeatureFlag.PM26462_Milestone_3,
+      );
+      this._familyPlan = milestone3FeatureEnabled
+        ? PlanType.FamiliesAnnually
+        : PlanType.FamiliesAnnually2025;
+
       this.loading = false;
     });
 
diff --git a/apps/web/src/app/admin-console/settings/create-organization.component.ts b/apps/web/src/app/admin-console/settings/create-organization.component.ts
index f87e9ec5b72..78398fd8897 100644
--- a/apps/web/src/app/admin-console/settings/create-organization.component.ts
+++ b/apps/web/src/app/admin-console/settings/create-organization.component.ts
@@ -1,29 +1,47 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Component } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
+import { Subject, takeUntil } from "rxjs";
 import { first } from "rxjs/operators";
 
 import { PlanType, ProductTierType, ProductType } from "@bitwarden/common/billing/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { OrganizationPlansComponent } from "../../billing";
 import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "create-organization.component.html",
   imports: [SharedModule, OrganizationPlansComponent, HeaderModule],
 })
-export class CreateOrganizationComponent {
+export class CreateOrganizationComponent implements OnInit, OnDestroy {
   protected secretsManager = false;
   protected plan: PlanType = PlanType.Free;
   protected productTier: ProductTierType = ProductTierType.Free;
 
-  constructor(private route: ActivatedRoute) {
-    this.route.queryParams.pipe(first(), takeUntilDestroyed()).subscribe((qParams) => {
+  constructor(
+    private route: ActivatedRoute,
+    private configService: ConfigService,
+  ) {}
+
+  private destroy$ = new Subject<void>();
+
+  async ngOnInit(): Promise<void> {
+    const milestone3FeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM26462_Milestone_3,
+    );
+    const familyPlan = milestone3FeatureEnabled
+      ? PlanType.FamiliesAnnually
+      : PlanType.FamiliesAnnually2025;
+
+    this.route.queryParams.pipe(first(), takeUntil(this.destroy$)).subscribe((qParams) => {
       if (qParams.plan === "families" || qParams.productTier == ProductTierType.Families) {
-        this.plan = PlanType.FamiliesAnnually;
+        this.plan = familyPlan;
         this.productTier = ProductTierType.Families;
       } else if (qParams.plan === "teams" || qParams.productTier == ProductTierType.Teams) {
         this.plan = PlanType.TeamsAnnually;
@@ -45,4 +63,9 @@ export class CreateOrganizationComponent {
       this.secretsManager = qParams.product == ProductType.SecretsManager;
     });
   }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
 }
diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index 2fc81fe2119..c312b4edd7e 100644
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -8,6 +8,7 @@ import { Subject, filter, firstValueFrom, map, timeout } from "rxjs";
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { DeviceTrustToastService } from "@bitwarden/angular/auth/services/device-trust-toast.service.abstraction";
 import { DocumentLangSetter } from "@bitwarden/angular/platform/i18n";
+import { LockService } from "@bitwarden/auth/common";
 import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -16,7 +17,6 @@ import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
-import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -27,12 +27,14 @@ import { StateEventRunnerService } from "@bitwarden/common/platform/state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
-import { DialogService, ToastService } from "@bitwarden/components";
+import { DialogService, RouterFocusManagerService, ToastService } from "@bitwarden/components";
 import { KeyService, BiometricStateService } from "@bitwarden/key-management";
 
 const BroadcasterSubscriptionId = "AppComponent";
 const IdleTimeout = 60000 * 10; // 10 minutes
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-root",
   templateUrl: "app.component.html",
@@ -56,8 +58,8 @@ export class AppComponent implements OnDestroy, OnInit {
     private i18nService: I18nService,
     private platformUtilsService: PlatformUtilsService,
     private ngZone: NgZone,
-    private vaultTimeoutService: VaultTimeoutService,
     private keyService: KeyService,
+    private lockService: LockService,
     private collectionService: CollectionService,
     private searchService: SearchService,
     private serverNotificationsService: ServerNotificationsService,
@@ -74,11 +76,17 @@ export class AppComponent implements OnDestroy, OnInit {
     private readonly destroy: DestroyRef,
     private readonly documentLangSetter: DocumentLangSetter,
     private readonly tokenService: TokenService,
+    private readonly routerFocusManager: RouterFocusManagerService,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
 
     const langSubscription = this.documentLangSetter.start();
-    this.destroy.onDestroy(() => langSubscription.unsubscribe());
+
+    this.routerFocusManager.start$.pipe(takeUntilDestroyed()).subscribe();
+
+    this.destroy.onDestroy(() => {
+      langSubscription.unsubscribe();
+    });
   }
 
   ngOnInit() {
@@ -111,11 +119,13 @@ export class AppComponent implements OnDestroy, OnInit {
             // note: the message.logoutReason isn't consumed anymore because of the process reload clearing any toasts.
             await this.logOut(message.redirect);
             break;
-          case "lockVault":
-            await this.vaultTimeoutService.lock();
+          case "lockVault": {
+            const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+            await this.lockService.lock(userId);
             break;
+          }
           case "locked":
-            await this.processReloadService.startProcessReload(this.authService);
+            await this.processReloadService.startProcessReload();
             break;
           case "lockedUrl":
             break;
@@ -145,18 +155,6 @@ export class AppComponent implements OnDestroy, OnInit {
             }
             break;
           }
-          case "premiumRequired": {
-            const premiumConfirmed = await this.dialogService.openSimpleDialog({
-              title: { key: "premiumRequired" },
-              content: { key: "premiumRequiredDesc" },
-              acceptButtonText: { key: "upgrade" },
-              type: "success",
-            });
-            if (premiumConfirmed) {
-              await this.router.navigate(["settings/subscription/premium"]);
-            }
-            break;
-          }
           case "emailVerificationRequired": {
             const emailVerificationConfirmed = await this.dialogService.openSimpleDialog({
               title: { key: "emailVerificationRequired" },
@@ -258,7 +256,6 @@ export class AppComponent implements OnDestroy, OnInit {
     await Promise.all([
       this.keyService.clearKeys(userId),
       this.cipherService.clear(userId),
-      // ! DO NOT REMOVE folderService.clear ! For more information see PM-25660
       this.folderService.clear(userId),
       this.biometricStateService.logout(userId),
     ]);
@@ -278,7 +275,7 @@ export class AppComponent implements OnDestroy, OnInit {
         await this.router.navigate(["/"]);
       }
 
-      await this.processReloadService.startProcessReload(this.authService);
+      await this.processReloadService.startProcessReload();
 
       // Normally we would need to reset the loading state to false or remove the layout_frontend
       // class from the body here, but the process reload completely reloads the app so
diff --git a/apps/web/src/app/auth/constants/auth-web-route.constant.ts b/apps/web/src/app/auth/constants/auth-web-route.constant.ts
new file mode 100644
index 00000000000..c1e714786e9
--- /dev/null
+++ b/apps/web/src/app/auth/constants/auth-web-route.constant.ts
@@ -0,0 +1,35 @@
+// Web route segments auth owns under shared infrastructure
+export const AuthWebRouteSegment = Object.freeze({
+  // settings routes
+  Account: "account",
+  EmergencyAccess: "emergency-access",
+
+  // settings/security routes
+  Password: "password",
+  TwoFactor: "two-factor",
+  SecurityKeys: "security-keys",
+  DeviceManagement: "device-management",
+} as const);
+
+export type AuthWebRouteSegment = (typeof AuthWebRouteSegment)[keyof typeof AuthWebRouteSegment];
+
+// Full routes that auth owns in the web app
+export const AuthWebRoute = Object.freeze({
+  SignUpLinkExpired: "signup-link-expired",
+  RecoverTwoFactor: "recover-2fa",
+  AcceptEmergencyAccessInvite: "accept-emergency",
+  RecoverDeleteAccount: "recover-delete",
+  VerifyRecoverDeleteAccount: "verify-recover-delete",
+  AcceptOrganizationInvite: "accept-organization",
+
+  // Composed routes from segments (allowing for router.navigate / routerLink usage)
+  AccountSettings: `settings/${AuthWebRouteSegment.Account}`,
+  EmergencyAccessSettings: `settings/${AuthWebRouteSegment.EmergencyAccess}`,
+
+  PasswordSettings: `settings/security/${AuthWebRouteSegment.Password}`,
+  TwoFactorSettings: `settings/security/${AuthWebRouteSegment.TwoFactor}`,
+  SecurityKeysSettings: `settings/security/${AuthWebRouteSegment.SecurityKeys}`,
+  DeviceManagement: `settings/security/${AuthWebRouteSegment.DeviceManagement}`,
+} as const);
+
+export type AuthWebRoute = (typeof AuthWebRoute)[keyof typeof AuthWebRoute];
diff --git a/apps/web/src/app/auth/constants/index.ts b/apps/web/src/app/auth/constants/index.ts
new file mode 100644
index 00000000000..3d84e3729de
--- /dev/null
+++ b/apps/web/src/app/auth/constants/index.ts
@@ -0,0 +1 @@
+export * from "./auth-web-route.constant";
diff --git a/apps/web/src/app/auth/core/enums/webauthn-login-credential-prf-status.enum.ts b/apps/web/src/app/auth/core/enums/webauthn-login-credential-prf-status.enum.ts
index 3073917e57b..02f870f094d 100644
--- a/apps/web/src/app/auth/core/enums/webauthn-login-credential-prf-status.enum.ts
+++ b/apps/web/src/app/auth/core/enums/webauthn-login-credential-prf-status.enum.ts
@@ -1,7 +1,16 @@
 // FIXME: update to use a const object instead of a typescript enum
 // eslint-disable-next-line @bitwarden/platform/no-enums
 export enum WebauthnLoginCredentialPrfStatus {
+  /**
+   * Encrypted user key present, PRF function is supported.
+   */
   Enabled = 0,
+  /**
+   * PRF function is supported.
+   */
   Supported = 1,
+  /**
+   * PRF function is not supported.
+   */
   Unsupported = 2,
 }
diff --git a/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.spec.ts b/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.spec.ts
index 70f7686a2cd..647c9ae83d9 100644
--- a/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.spec.ts
+++ b/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.spec.ts
@@ -123,7 +123,9 @@ describe("WebSetInitialPasswordService", () => {
 
       userDecryptionOptions = new UserDecryptionOptions({ hasMasterPassword: true });
       userDecryptionOptionsSubject = new BehaviorSubject(userDecryptionOptions);
-      userDecryptionOptionsService.userDecryptionOptions$ = userDecryptionOptionsSubject;
+      userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
+        userDecryptionOptionsSubject,
+      );
 
       setPasswordRequest = new SetPasswordRequest(
         credentials.newServerMasterKeyHash,
diff --git a/apps/web/src/app/auth/core/services/rotateable-key-set.service.spec.ts b/apps/web/src/app/auth/core/services/rotateable-key-set.service.spec.ts
deleted file mode 100644
index 8579c4c1dc8..00000000000
--- a/apps/web/src/app/auth/core/services/rotateable-key-set.service.spec.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { TestBed } from "@angular/core/testing";
-import { mock, MockProxy } from "jest-mock-extended";
-
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { KeyService } from "@bitwarden/key-management";
-
-import { RotateableKeySetService } from "./rotateable-key-set.service";
-
-describe("RotateableKeySetService", () => {
-  let testBed!: TestBed;
-  let keyService!: MockProxy<KeyService>;
-  let encryptService!: MockProxy<EncryptService>;
-  let service!: RotateableKeySetService;
-
-  beforeEach(() => {
-    keyService = mock<KeyService>();
-    encryptService = mock<EncryptService>();
-    testBed = TestBed.configureTestingModule({
-      providers: [
-        { provide: KeyService, useValue: keyService },
-        { provide: EncryptService, useValue: encryptService },
-      ],
-    });
-    service = testBed.inject(RotateableKeySetService);
-  });
-
-  describe("createKeySet", () => {
-    it("should create a new key set", async () => {
-      const externalKey = createSymmetricKey();
-      const userKey = createSymmetricKey();
-      const encryptedUserKey = Symbol();
-      const encryptedPublicKey = Symbol();
-      const encryptedPrivateKey = Symbol();
-      keyService.makeKeyPair.mockResolvedValue(["publicKey", encryptedPrivateKey as any]);
-      keyService.getUserKey.mockResolvedValue({ key: userKey.key } as any);
-      encryptService.encapsulateKeyUnsigned.mockResolvedValue(encryptedUserKey as any);
-      encryptService.wrapEncapsulationKey.mockResolvedValue(encryptedPublicKey as any);
-
-      const result = await service.createKeySet(externalKey as any);
-
-      expect(result).toEqual({
-        encryptedUserKey,
-        encryptedPublicKey,
-        encryptedPrivateKey,
-      });
-    });
-  });
-});
-
-function createSymmetricKey() {
-  const key = Utils.fromB64ToArray(
-    "1h-TuPwSbX5qoX0aVgjmda_Lfq85qAcKssBlXZnPIsQC3HNDGIecunYqXhJnp55QpdXRh-egJiLH3a0wqlVQsQ",
-  );
-  return new SymmetricCryptoKey(key);
-}
diff --git a/apps/web/src/app/auth/core/services/rotateable-key-set.service.ts b/apps/web/src/app/auth/core/services/rotateable-key-set.service.ts
deleted file mode 100644
index 0a150b26ae2..00000000000
--- a/apps/web/src/app/auth/core/services/rotateable-key-set.service.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { inject, Injectable } from "@angular/core";
-
-import { RotateableKeySet } from "@bitwarden/auth/common";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { KeyService } from "@bitwarden/key-management";
-
-@Injectable({ providedIn: "root" })
-export class RotateableKeySetService {
-  private readonly keyService = inject(KeyService);
-  private readonly encryptService = inject(EncryptService);
-
-  /**
-   * Create a new rotateable key set for the current user, using the provided external key.
-   * For more information on rotateable key sets, see {@link RotateableKeySet}
-   *
-   * @param externalKey The `ExternalKey` used to encrypt {@link RotateableKeySet.encryptedPrivateKey}
-   * @returns RotateableKeySet containing the current users `UserKey`
-   */
-  async createKeySet<ExternalKey extends SymmetricCryptoKey>(
-    externalKey: ExternalKey,
-  ): Promise<RotateableKeySet<ExternalKey>> {
-    const [publicKey, encryptedPrivateKey] = await this.keyService.makeKeyPair(externalKey);
-
-    const userKey = await this.keyService.getUserKey();
-    const rawPublicKey = Utils.fromB64ToArray(publicKey);
-    const encryptedUserKey = await this.encryptService.encapsulateKeyUnsigned(
-      userKey,
-      rawPublicKey,
-    );
-    const encryptedPublicKey = await this.encryptService.wrapEncapsulationKey(
-      rawPublicKey,
-      userKey,
-    );
-    return new RotateableKeySet(encryptedUserKey, encryptedPublicKey, encryptedPrivateKey);
-  }
-
-  /**
-   * Rotates the current user's `UserKey` and updates the provided `RotateableKeySet` with the new keys.
-   *
-   * @param keySet The current `RotateableKeySet` for the user
-   * @returns The updated `RotateableKeySet` with the new `UserKey`
-   */
-  async rotateKeySet<ExternalKey extends SymmetricCryptoKey>(
-    keySet: RotateableKeySet<ExternalKey>,
-    oldUserKey: SymmetricCryptoKey,
-    newUserKey: SymmetricCryptoKey,
-  ): Promise<RotateableKeySet<ExternalKey>> {
-    // validate parameters
-    if (!keySet) {
-      throw new Error("failed to rotate key set: keySet is required");
-    }
-    if (!oldUserKey) {
-      throw new Error("failed to rotate key set: oldUserKey is required");
-    }
-    if (!newUserKey) {
-      throw new Error("failed to rotate key set: newUserKey is required");
-    }
-
-    const publicKey = await this.encryptService.unwrapEncapsulationKey(
-      keySet.encryptedPublicKey,
-      oldUserKey,
-    );
-    if (publicKey == null) {
-      throw new Error("failed to rotate key set: could not decrypt public key");
-    }
-    const newEncryptedPublicKey = await this.encryptService.wrapEncapsulationKey(
-      publicKey,
-      newUserKey,
-    );
-    const newEncryptedUserKey = await this.encryptService.encapsulateKeyUnsigned(
-      newUserKey,
-      publicKey,
-    );
-
-    const newRotateableKeySet = new RotateableKeySet<ExternalKey>(
-      newEncryptedUserKey,
-      newEncryptedPublicKey,
-      keySet.encryptedPrivateKey,
-    );
-
-    return newRotateableKeySet;
-  }
-}
diff --git a/apps/web/src/app/auth/core/services/webauthn-login/response/webauthn-login-credential.response.ts b/apps/web/src/app/auth/core/services/webauthn-login/response/webauthn-login-credential.response.ts
index 85e7a7368e0..603e0f2a77d 100644
--- a/apps/web/src/app/auth/core/services/webauthn-login/response/webauthn-login-credential.response.ts
+++ b/apps/web/src/app/auth/core/services/webauthn-login/response/webauthn-login-credential.response.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { RotateableKeySet } from "@bitwarden/auth/common";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { RotateableKeySet } from "@bitwarden/common/key-management/keys/models/rotateable-key-set";
 import { BaseResponse } from "@bitwarden/common/models/response/base.response";
 
 import { WebauthnLoginCredentialPrfStatus } from "../../../enums/webauthn-login-credential-prf-status.enum";
@@ -40,6 +40,6 @@ export class WebauthnLoginCredentialResponse extends BaseResponse {
   }
 
   hasPrfKeyset(): boolean {
-    return this.encryptedUserKey != null && this.encryptedPublicKey != null;
+    return this.prfStatus === WebauthnLoginCredentialPrfStatus.Enabled;
   }
 }
diff --git a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.spec.ts b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.spec.ts
index c2a9946ea38..7e263b638e0 100644
--- a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.spec.ts
+++ b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.spec.ts
@@ -3,22 +3,29 @@
 import { randomBytes } from "crypto";
 
 import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
 
-import { RotateableKeySet } from "@bitwarden/auth/common";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { WebAuthnLoginPrfKeyServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login-prf-key.service.abstraction";
 import { WebAuthnLoginCredentialAssertionView } from "@bitwarden/common/auth/models/view/webauthn-login/webauthn-login-credential-assertion.view";
 import { WebAuthnLoginAssertionResponseRequest } from "@bitwarden/common/auth/services/webauthn-login/request/webauthn-login-assertion-response.request";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { RotateableKeySet } from "@bitwarden/common/key-management/keys/models/rotateable-key-set";
+import { RotateableKeySetService } from "@bitwarden/common/key-management/keys/services/abstractions/rotateable-key-set.service";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { makeSymmetricCryptoKey } from "@bitwarden/common/spec";
+import { makeEncString, makeSymmetricCryptoKey } from "@bitwarden/common/spec";
 import { PrfKey, UserKey } from "@bitwarden/common/types/key";
+import { newGuid } from "@bitwarden/guid";
+import { KeyService } from "@bitwarden/key-management";
+import { UserId } from "@bitwarden/user-core";
 
+import { WebauthnLoginCredentialPrfStatus } from "../../enums/webauthn-login-credential-prf-status.enum";
 import { CredentialCreateOptionsView } from "../../views/credential-create-options.view";
 import { PendingWebauthnLoginCredentialView } from "../../views/pending-webauthn-login-credential.view";
-import { RotateableKeySetService } from "../rotateable-key-set.service";
 
 import { EnableCredentialEncryptionRequest } from "./request/enable-credential-encryption.request";
+import { WebauthnLoginCredentialResponse } from "./response/webauthn-login-credential.response";
 import { WebAuthnLoginAdminApiService } from "./webauthn-login-admin-api.service";
 import { WebauthnLoginAdminService } from "./webauthn-login-admin.service";
 
@@ -28,9 +35,12 @@ describe("WebauthnAdminService", () => {
   let rotateableKeySetService!: MockProxy<RotateableKeySetService>;
   let webAuthnLoginPrfKeyService!: MockProxy<WebAuthnLoginPrfKeyServiceAbstraction>;
   let credentials: MockProxy<CredentialsContainer>;
+  let keyService: MockProxy<KeyService>;
   let service!: WebauthnLoginAdminService;
 
   let originalAuthenticatorAssertionResponse!: AuthenticatorAssertionResponse | any;
+  const mockUserId = newGuid() as UserId;
+  const mockUserKey = makeSymmetricCryptoKey(64) as UserKey;
 
   beforeAll(() => {
     // Polyfill missing class
@@ -41,12 +51,14 @@ describe("WebauthnAdminService", () => {
     userVerificationService = mock<UserVerificationService>();
     rotateableKeySetService = mock<RotateableKeySetService>();
     webAuthnLoginPrfKeyService = mock<WebAuthnLoginPrfKeyServiceAbstraction>();
+    keyService = mock<KeyService>();
     credentials = mock<CredentialsContainer>();
     service = new WebauthnLoginAdminService(
       apiService,
       userVerificationService,
       rotateableKeySetService,
       webAuthnLoginPrfKeyService,
+      keyService,
       credentials,
     );
 
@@ -54,6 +66,8 @@ describe("WebauthnAdminService", () => {
     originalAuthenticatorAssertionResponse = global.AuthenticatorAssertionResponse;
     // Mock the global AuthenticatorAssertionResponse class b/c the class is only available in secure contexts
     global.AuthenticatorAssertionResponse = MockAuthenticatorAssertionResponse;
+
+    keyService.userKey$.mockReturnValue(of(mockUserKey));
   });
 
   beforeEach(() => {
@@ -120,7 +134,7 @@ describe("WebauthnAdminService", () => {
       const request = new EnableCredentialEncryptionRequest();
       request.token = assertionOptions.token;
       request.deviceResponse = assertionOptions.deviceResponse;
-      request.encryptedUserKey = prfKeySet.encryptedUserKey.encryptedString;
+      request.encryptedUserKey = prfKeySet.encapsulatedDownstreamKey.encryptedString;
       request.encryptedPublicKey = prfKeySet.encryptedPublicKey.encryptedString;
       request.encryptedPrivateKey = prfKeySet.encryptedPrivateKey.encryptedString;
 
@@ -131,10 +145,10 @@ describe("WebauthnAdminService", () => {
       const updateCredentialMock = jest.spyOn(apiService, "updateCredential").mockResolvedValue();
 
       // Act
-      await service.enableCredentialEncryption(assertionOptions);
+      await service.enableCredentialEncryption(assertionOptions, mockUserId);
 
       // Assert
-      expect(createKeySetMock).toHaveBeenCalledWith(assertionOptions.prfKey);
+      expect(createKeySetMock).toHaveBeenCalledWith(assertionOptions.prfKey, mockUserKey);
       expect(updateCredentialMock).toHaveBeenCalledWith(request);
     });
 
@@ -157,7 +171,7 @@ describe("WebauthnAdminService", () => {
 
       // Act
       try {
-        await service.enableCredentialEncryption(assertionOptions);
+        await service.enableCredentialEncryption(assertionOptions, mockUserId);
       } catch (error) {
         // Assert
         expect(error).toEqual(new Error("invalid credential"));
@@ -166,6 +180,19 @@ describe("WebauthnAdminService", () => {
       }
     });
 
+    test.each([null, undefined, ""])("should throw an error when userId is %p", async (userId) => {
+      const response = new MockPublicKeyCredential();
+      const assertionOptions: WebAuthnLoginCredentialAssertionView =
+        new WebAuthnLoginCredentialAssertionView(
+          "enable_credential_encryption_test_token",
+          new WebAuthnLoginAssertionResponseRequest(response),
+          {} as PrfKey,
+        );
+      await expect(
+        service.enableCredentialEncryption(assertionOptions, userId as any),
+      ).rejects.toThrow("userId is required");
+    });
+
     it("should throw error when WehAuthnLoginCredentialAssertionView is undefined", async () => {
       // Arrange
       const assertionOptions: WebAuthnLoginCredentialAssertionView = undefined;
@@ -178,7 +205,7 @@ describe("WebauthnAdminService", () => {
 
       // Act
       try {
-        await service.enableCredentialEncryption(assertionOptions);
+        await service.enableCredentialEncryption(assertionOptions, mockUserId);
       } catch (error) {
         // Assert
         expect(error).toEqual(new Error("invalid credential"));
@@ -248,6 +275,79 @@ describe("WebauthnAdminService", () => {
       expect(rotateKeySetMock).not.toHaveBeenCalled();
     });
   });
+
+  describe("getRotatedData", () => {
+    const mockRotatedPublicKey = makeEncString("rotated_encryptedPublicKey");
+    const mockRotatedUserKey = makeEncString("rotated_encryptedUserKey");
+    const oldUserKey = makeSymmetricCryptoKey(64) as UserKey;
+    const newUserKey = makeSymmetricCryptoKey(64) as UserKey;
+    const userId = Utils.newGuid() as UserId;
+
+    it("should only include credentials with PRF keysets", async () => {
+      const responseUnsupported = new WebauthnLoginCredentialResponse({
+        id: "test-credential-id-1",
+        name: "Test Credential 1",
+        prfStatus: WebauthnLoginCredentialPrfStatus.Unsupported,
+        encryptedPublicKey: null,
+        encryptedUserKey: null,
+      });
+      const responseSupported = new WebauthnLoginCredentialResponse({
+        id: "test-credential-id-2",
+        name: "Test Credential 2",
+        prfStatus: WebauthnLoginCredentialPrfStatus.Supported,
+        encryptedPublicKey: null,
+        encryptedUserKey: null,
+      });
+      const responseEnabled = new WebauthnLoginCredentialResponse({
+        id: "test-credential-id-3",
+        name: "Test Credential 3",
+        prfStatus: WebauthnLoginCredentialPrfStatus.Enabled,
+        encryptedPublicKey: makeEncString("encryptedPublicKey").toJSON(),
+        encryptedUserKey: makeEncString("encryptedUserKey").toJSON(),
+      });
+
+      apiService.getCredentials.mockResolvedValue(
+        new ListResponse<WebauthnLoginCredentialResponse>(
+          {
+            data: [responseUnsupported, responseSupported, responseEnabled],
+          },
+          WebauthnLoginCredentialResponse,
+        ),
+      );
+
+      rotateableKeySetService.rotateKeySet.mockResolvedValue(
+        new RotateableKeySet<PrfKey>(mockRotatedUserKey, mockRotatedPublicKey),
+      );
+
+      const result = await service.getRotatedData(oldUserKey, newUserKey, userId);
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toEqual(
+        expect.objectContaining({
+          id: "test-credential-id-3",
+          encryptedPublicKey: mockRotatedPublicKey,
+          encryptedUserKey: mockRotatedUserKey,
+        }),
+      );
+      expect(rotateableKeySetService.rotateKeySet).toHaveBeenCalledTimes(1);
+      expect(rotateableKeySetService.rotateKeySet).toHaveBeenCalledWith(
+        responseEnabled.getRotateableKeyset(),
+        oldUserKey,
+        newUserKey,
+      );
+    });
+
+    it("should error when getCredentials fails", async () => {
+      const expectedError = "API connection failed";
+      apiService.getCredentials.mockRejectedValue(new Error(expectedError));
+
+      await expect(service.getRotatedData(oldUserKey, newUserKey, userId)).rejects.toThrow(
+        expectedError,
+      );
+
+      expect(rotateableKeySetService.rotateKeySet).not.toHaveBeenCalled();
+    });
+  });
 });
 
 function createCredentialCreateOptions(): CredentialCreateOptionsView {
diff --git a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts
index edcf521efb8..7765d01f75c 100644
--- a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts
+++ b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts
@@ -1,24 +1,34 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Injectable, Optional } from "@angular/core";
-import { BehaviorSubject, filter, from, map, Observable, shareReplay, switchMap, tap } from "rxjs";
+import {
+  BehaviorSubject,
+  filter,
+  firstValueFrom,
+  from,
+  map,
+  Observable,
+  shareReplay,
+  switchMap,
+  tap,
+} from "rxjs";
 
-import { PrfKeySet } from "@bitwarden/auth/common";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { WebAuthnLoginPrfKeyServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login-prf-key.service.abstraction";
 import { WebauthnRotateCredentialRequest } from "@bitwarden/common/auth/models/request/webauthn-rotate-credential.request";
 import { WebAuthnLoginCredentialAssertionOptionsView } from "@bitwarden/common/auth/models/view/webauthn-login/webauthn-login-credential-assertion-options.view";
 import { WebAuthnLoginCredentialAssertionView } from "@bitwarden/common/auth/models/view/webauthn-login/webauthn-login-credential-assertion.view";
 import { Verification } from "@bitwarden/common/auth/types/verification";
+import { PrfKeySet } from "@bitwarden/common/key-management/keys/models/rotateable-key-set";
+import { RotateableKeySetService } from "@bitwarden/common/key-management/keys/services/abstractions/rotateable-key-set.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { UserId } from "@bitwarden/common/types/guid";
 import { UserKey } from "@bitwarden/common/types/key";
-import { UserKeyRotationDataProvider } from "@bitwarden/key-management";
+import { KeyService, UserKeyRotationDataProvider } from "@bitwarden/key-management";
 
 import { CredentialCreateOptionsView } from "../../views/credential-create-options.view";
 import { PendingWebauthnLoginCredentialView } from "../../views/pending-webauthn-login-credential.view";
 import { WebauthnLoginCredentialView } from "../../views/webauthn-login-credential.view";
-import { RotateableKeySetService } from "../rotateable-key-set.service";
 
 import { EnableCredentialEncryptionRequest } from "./request/enable-credential-encryption.request";
 import { SaveCredentialRequest } from "./request/save-credential.request";
@@ -55,6 +65,7 @@ export class WebauthnLoginAdminService
     private userVerificationService: UserVerificationService,
     private rotateableKeySetService: RotateableKeySetService,
     private webAuthnLoginPrfKeyService: WebAuthnLoginPrfKeyServiceAbstraction,
+    private keyService: KeyService,
     @Optional() navigatorCredentials?: CredentialsContainer,
     @Optional() private logService?: LogService,
   ) {
@@ -131,10 +142,12 @@ export class WebauthnLoginAdminService
    * This will trigger the browsers WebAuthn API to generate a PRF-output.
    *
    * @param pendingCredential A credential created using `createCredential`.
+   * @param userId The target users id.
    * @returns A key set that can be saved to the server. Undefined is returned if the credential doesn't support PRF.
    */
   async createKeySet(
     pendingCredential: PendingWebauthnLoginCredentialView,
+    userId: UserId,
   ): Promise<PrfKeySet | undefined> {
     const nativeOptions: CredentialRequestOptions = {
       publicKey: {
@@ -166,7 +179,8 @@ export class WebauthnLoginAdminService
 
       const symmetricPrfKey =
         await this.webAuthnLoginPrfKeyService.createSymmetricKeyFromPrf(prfResult);
-      return await this.rotateableKeySetService.createKeySet(symmetricPrfKey);
+      const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+      return await this.rotateableKeySetService.createKeySet(symmetricPrfKey, userKey);
     } catch (error) {
       this.logService?.error(error);
       return undefined;
@@ -190,7 +204,7 @@ export class WebauthnLoginAdminService
     request.token = credential.createOptions.token;
     request.name = name;
     request.supportsPrf = credential.supportsPrf;
-    request.encryptedUserKey = prfKeySet?.encryptedUserKey.encryptedString;
+    request.encryptedUserKey = prfKeySet?.encapsulatedDownstreamKey.encryptedString;
     request.encryptedPublicKey = prfKeySet?.encryptedPublicKey.encryptedString;
     request.encryptedPrivateKey = prfKeySet?.encryptedPrivateKey.encryptedString;
     await this.apiService.saveCredential(request);
@@ -204,23 +218,31 @@ export class WebauthnLoginAdminService
    * if there was a problem with the Credential Assertion.
    *
    * @param assertionOptions Options received from the server using `getCredentialAssertOptions`.
+   * @param userId  The target users id.
    * @returns void
    */
   async enableCredentialEncryption(
     assertionOptions: WebAuthnLoginCredentialAssertionView,
+    userId: UserId,
   ): Promise<void> {
     if (assertionOptions === undefined || assertionOptions?.prfKey === undefined) {
       throw new Error("invalid credential");
     }
+    if (!userId) {
+      throw new Error("userId is required");
+    }
+
+    const userKey = await firstValueFrom(this.keyService.userKey$(userId));
 
     const prfKeySet: PrfKeySet = await this.rotateableKeySetService.createKeySet(
       assertionOptions.prfKey,
+      userKey,
     );
 
     const request = new EnableCredentialEncryptionRequest();
     request.token = assertionOptions.token;
     request.deviceResponse = assertionOptions.deviceResponse;
-    request.encryptedUserKey = prfKeySet.encryptedUserKey.encryptedString;
+    request.encryptedUserKey = prfKeySet.encapsulatedDownstreamKey.encryptedString;
     request.encryptedPublicKey = prfKeySet.encryptedPublicKey.encryptedString;
     request.encryptedPrivateKey = prfKeySet.encryptedPrivateKey.encryptedString;
     await this.apiService.updateCredential(request);
@@ -317,7 +339,7 @@ export class WebauthnLoginAdminService
           const request = new WebauthnRotateCredentialRequest(
             response.id,
             rotatedKeyset.encryptedPublicKey,
-            rotatedKeyset.encryptedUserKey,
+            rotatedKeyset.encapsulatedDownstreamKey,
           );
           return request;
         }),
diff --git a/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts b/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts
index e1b7329504c..d1491e6d782 100644
--- a/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts
+++ b/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts
@@ -12,6 +12,8 @@ import { SharedModule } from "../../../shared";
 import { EmergencyAccessModule } from "../emergency-access.module";
 import { EmergencyAccessService } from "../services/emergency-access.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [SharedModule, EmergencyAccessModule],
   templateUrl: "accept-emergency.component.html",
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 2ff38f6eab0..05d6094745c 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
@@ -17,6 +17,7 @@ import { CsprngArray } from "@bitwarden/common/types/csprng";
 import { UserId } from "@bitwarden/common/types/guid";
 import { UserKey, MasterKey, UserPrivateKey } from "@bitwarden/common/types/key";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { newGuid } from "@bitwarden/guid";
 import { Argon2KdfConfig, KdfType, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
 
 import { EmergencyAccessStatusType } from "../enums/emergency-access-status-type";
@@ -44,6 +45,7 @@ describe("EmergencyAccessService", () => {
 
   const mockNewUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
   const mockTrustedPublicKeys = [Utils.fromUtf8ToArray("trustedPublicKey")];
+  const mockUserId = newGuid() as UserId;
 
   beforeAll(() => {
     emergencyAccessApiService = mock<EmergencyAccessApiService>();
@@ -125,7 +127,7 @@ describe("EmergencyAccessService", () => {
           "mockUserPublicKeyEncryptedUserKey",
         );
 
-        keyService.getUserKey.mockResolvedValueOnce(mockUserKey);
+        keyService.userKey$.mockReturnValue(of(mockUserKey));
 
         encryptService.encapsulateKeyUnsigned.mockResolvedValueOnce(
           mockUserPublicKeyEncryptedUserKey,
@@ -134,7 +136,7 @@ describe("EmergencyAccessService", () => {
         emergencyAccessApiService.postEmergencyAccessConfirm.mockResolvedValueOnce();
 
         // Act
-        await emergencyAccessService.confirm(id, granteeId, publicKey);
+        await emergencyAccessService.confirm(id, granteeId, publicKey, mockUserId);
 
         // Assert
         expect(emergencyAccessApiService.postEmergencyAccessConfirm).toHaveBeenCalledWith(id, {
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 cce8d9345b2..b91bc932e83 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
@@ -175,11 +175,17 @@ export class EmergencyAccessService
    * Step 3 of the 3 step setup flow.
    * Intended for grantor.
    * @param id emergency access id
-   * @param token secret token provided in email
+   * @param granteeId id of the grantee
    * @param publicKey public key of grantee
+   * @param activeUserId the active user's id
    */
-  async confirm(id: string, granteeId: string, publicKey: Uint8Array): Promise<void> {
-    const userKey = await this.keyService.getUserKey();
+  async confirm(
+    id: string,
+    granteeId: string,
+    publicKey: Uint8Array,
+    activeUserId: UserId,
+  ): Promise<void> {
+    const userKey = await firstValueFrom(this.keyService.userKey$(activeUserId));
     if (!userKey) {
       throw new Error("No user key found");
     }
diff --git a/apps/web/src/app/auth/guards/deep-link/deep-link.guard.spec.ts b/apps/web/src/app/auth/guards/deep-link/deep-link.guard.spec.ts
index dba4dbd8357..31033b29154 100644
--- a/apps/web/src/app/auth/guards/deep-link/deep-link.guard.spec.ts
+++ b/apps/web/src/app/auth/guards/deep-link/deep-link.guard.spec.ts
@@ -11,18 +11,24 @@ import { RouterService } from "../../../core/router.service";
 
 import { deepLinkGuard } from "./deep-link.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
 })
 export class GuardedRouteTestComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
 })
 export class LockTestComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
diff --git a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.html b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.html
deleted file mode 100644
index 94dfac42976..00000000000
--- a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<div
-  class="tw-mx-auto tw-mt-5 tw-flex tw-max-w-lg tw-flex-col tw-items-center tw-justify-center tw-p-8"
->
-  <div>
-    <img class="logo logo-themed" alt="Bitwarden" />
-    <h3 bitTypography="h3" class="tw-my-8 tw-mb-3 tw-text-center">
-      {{ "readingPasskeyLoading" | i18n }}
-    </h3>
-
-    <div
-      class="tw-rounded-md tw-border tw-border-solid tw-border-secondary-300 tw-bg-background tw-p-6"
-    >
-      <div class="tw-flex tw-flex-col tw-items-center">
-        <ng-container *ngIf="currentState === 'assert'">
-          <div class="tw-size-24 tw-content-center tw-my-10">
-            <bit-icon [icon]="Icons.TwoFactorAuthSecurityKeyIcon"></bit-icon>
-          </div>
-          <p bitTypography="body1">{{ "readingPasskeyLoadingInfo" | i18n }}</p>
-          <button
-            type="button"
-            bitButton
-            block
-            [loading]="true"
-            buttonType="primary"
-            class="tw-mb-4"
-          >
-            {{ "loading" | i18n }}
-          </button>
-        </ng-container>
-
-        <ng-container *ngIf="currentState === 'assertFailed'">
-          <div class="tw-size-24 tw-content-center tw-my-10">
-            <bit-icon [icon]="Icons.TwoFactorAuthSecurityKeyFailedIcon"></bit-icon>
-          </div>
-          <p bitTypography="body1">{{ "readingPasskeyLoadingInfo" | i18n }}</p>
-          <button
-            type="button"
-            bitButton
-            block
-            buttonType="primary"
-            class="tw-mb-4"
-            (click)="retry()"
-          >
-            {{ "tryAgain" | i18n }}
-          </button>
-        </ng-container>
-      </div>
-      <p bitTypography="body1" class="tw-mb-0">
-        {{ "troubleLoggingIn" | i18n }}<br />
-        <a bitLink routerLink="/login">{{ "useADifferentLogInMethod" | i18n }}</a>
-      </p>
-    </div>
-  </div>
-</div>
diff --git a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts
deleted file mode 100644
index 695e935b919..00000000000
--- a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component } from "@angular/core";
-
-import { BaseLoginViaWebAuthnComponent } from "@bitwarden/angular/auth/components/base-login-via-webauthn.component";
-import {
-  TwoFactorAuthSecurityKeyIcon,
-  TwoFactorAuthSecurityKeyFailedIcon,
-} from "@bitwarden/assets/svg";
-
-@Component({
-  selector: "app-login-via-webauthn",
-  templateUrl: "login-via-webauthn.component.html",
-  standalone: false,
-})
-export class LoginViaWebAuthnComponent extends BaseLoginViaWebAuthnComponent {
-  protected readonly Icons = {
-    TwoFactorAuthSecurityKeyIcon,
-    TwoFactorAuthSecurityKeyFailedIcon,
-  };
-}
diff --git a/apps/web/src/app/auth/login/login.module.ts b/apps/web/src/app/auth/login/login.module.ts
deleted file mode 100644
index 9a99c84f727..00000000000
--- a/apps/web/src/app/auth/login/login.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { CheckboxModule } from "@bitwarden/components";
-
-import { SharedModule } from "../../../app/shared";
-
-import { LoginViaWebAuthnComponent } from "./login-via-webauthn/login-via-webauthn.component";
-
-@NgModule({
-  imports: [SharedModule, CheckboxModule],
-  declarations: [LoginViaWebAuthnComponent],
-  exports: [LoginViaWebAuthnComponent],
-})
-export class LoginModule {}
diff --git a/apps/web/src/app/auth/organization-invite/accept-organization.component.ts b/apps/web/src/app/auth/organization-invite/accept-organization.component.ts
index 09d4fc3e9ef..cb1175a7002 100644
--- a/apps/web/src/app/auth/organization-invite/accept-organization.component.ts
+++ b/apps/web/src/app/auth/organization-invite/accept-organization.component.ts
@@ -11,11 +11,14 @@ import { OrganizationInvite } from "@bitwarden/common/auth/services/organization
 import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ToastService } from "@bitwarden/components";
 
 import { BaseAcceptComponent } from "../../common/base.accept.component";
 
 import { AcceptOrganizationInviteService } from "./accept-organization.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "accept-organization.component.html",
   standalone: false,
@@ -33,6 +36,7 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
     private acceptOrganizationInviteService: AcceptOrganizationInviteService,
     private organizationInviteService: OrganizationInviteService,
     private accountService: AccountService,
+    private toastService: ToastService,
   ) {
     super(router, platformUtilsService, i18nService, route, authService);
   }
@@ -49,14 +53,13 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
       return;
     }
 
-    this.platformUtilService.showToast(
-      "success",
-      this.i18nService.t("inviteAccepted"),
-      invite.initOrganization
+    this.toastService.showToast({
+      message: invite.initOrganization
         ? this.i18nService.t("inviteInitAcceptedDesc")
-        : this.i18nService.t("inviteAcceptedDesc"),
-      { timeout: 10000 },
-    );
+        : this.i18nService.t("invitationAcceptedDesc"),
+      variant: "success",
+      timeout: 10000,
+    });
 
     await this.router.navigate(["/vault"]);
   }
diff --git a/apps/web/src/app/auth/recover-delete.component.ts b/apps/web/src/app/auth/recover-delete.component.ts
index 7381d526879..00b14f9a402 100644
--- a/apps/web/src/app/auth/recover-delete.component.ts
+++ b/apps/web/src/app/auth/recover-delete.component.ts
@@ -10,6 +10,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-recover-delete",
   templateUrl: "recover-delete.component.html",
diff --git a/apps/web/src/app/auth/recover-two-factor.component.ts b/apps/web/src/app/auth/recover-two-factor.component.ts
index f606e803df3..9c033b88a75 100644
--- a/apps/web/src/app/auth/recover-two-factor.component.ts
+++ b/apps/web/src/app/auth/recover-two-factor.component.ts
@@ -16,6 +16,8 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-recover-two-factor",
   templateUrl: "recover-two-factor.component.html",
@@ -111,14 +113,37 @@ export class RecoverTwoFactorComponent implements OnInit {
       await this.router.navigate(["/settings/security/two-factor"]);
     } catch (error: unknown) {
       if (error instanceof ErrorResponse) {
-        this.logService.error("Error logging in automatically: ", error.message);
-
-        if (error.message.includes("Two-step token is invalid")) {
-          this.formGroup.get("recoveryCode")?.setErrors({
-            invalidRecoveryCode: { message: this.i18nService.t("invalidRecoveryCode") },
+        if (
+          error.message.includes(
+            "Two-factor recovery has been performed. SSO authentication is required.",
+          )
+        ) {
+          // [PM-21153]: Organization users with as SSO requirement need to be able to recover 2FA,
+          //  but still be bound by the SSO requirement to log in. Therefore, we show a success toast for recovering 2FA,
+          //  but then inform them that they need to log in via SSO and redirect them to the login page.
+          // The response tested here is a specific message for this scenario from request validation.
+          this.toastService.showToast({
+            variant: "success",
+            title: "",
+            message: this.i18nService.t("twoStepRecoverDisabled"),
           });
+          this.toastService.showToast({
+            variant: "error",
+            title: "",
+            message: this.i18nService.t("ssoLoginIsRequired"),
+          });
+
+          await this.router.navigate(["/login"]);
         } else {
-          this.validationService.showError(error.message);
+          this.logService.error("Error logging in automatically: ", error.message);
+
+          if (error.message.includes("Two-step token is invalid")) {
+            this.formGroup.get("recoveryCode")?.setErrors({
+              invalidRecoveryCode: { message: this.i18nService.t("invalidRecoveryCode") },
+            });
+          } else {
+            this.validationService.showError(error.message);
+          }
         }
       } else {
         this.logService.error("Error logging in automatically: ", error);
diff --git a/apps/web/src/app/auth/settings/account/account.component.ts b/apps/web/src/app/auth/settings/account/account.component.ts
index 921db19bc49..3e618b89dbe 100644
--- a/apps/web/src/app/auth/settings/account/account.component.ts
+++ b/apps/web/src/app/auth/settings/account/account.component.ts
@@ -1,11 +1,10 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
-import { firstValueFrom, from, lastValueFrom, map, Observable, Subject, takeUntil } from "rxjs";
+import { firstValueFrom, lastValueFrom, map, Observable, Subject, takeUntil } from "rxjs";
 
+import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { DialogService } from "@bitwarden/components";
 
 import { HeaderModule } from "../../../layouts/header/header.module";
@@ -19,6 +18,8 @@ import { DeleteAccountDialogComponent } from "./delete-account-dialog.component"
 import { ProfileComponent } from "./profile.component";
 import { SetAccountVerifyDevicesDialogComponent } from "./set-account-verify-devices-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "account.component.html",
   imports: [
@@ -40,8 +41,7 @@ export class AccountComponent implements OnInit, OnDestroy {
   constructor(
     private accountService: AccountService,
     private dialogService: DialogService,
-    private userVerificationService: UserVerificationService,
-    private configService: ConfigService,
+    private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private organizationService: OrganizationService,
   ) {}
 
@@ -54,7 +54,7 @@ export class AccountComponent implements OnInit, OnDestroy {
         map((organizations) => organizations.some((o) => o.userIsManagedByOrganization === true)),
       );
 
-    const hasMasterPassword$ = from(this.userVerificationService.hasMasterPassword());
+    const hasMasterPassword$ = this.userDecryptionOptionsService.hasMasterPasswordById$(userId);
 
     this.showChangeEmail$ = hasMasterPassword$;
 
diff --git a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts
index 6bb785fb8f5..6e6fac1404e 100644
--- a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts
@@ -32,6 +32,8 @@ type ChangeAvatarDialogData = {
   profile: ProfileResponse;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "change-avatar-dialog.component.html",
   encapsulation: ViewEncapsulation.None,
@@ -40,6 +42,8 @@ type ChangeAvatarDialogData = {
 export class ChangeAvatarDialogComponent implements OnInit, OnDestroy {
   profile: ProfileResponse;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("colorPicker") colorPickerElement: ElementRef<HTMLElement>;
 
   loading = false;
diff --git a/apps/web/src/app/auth/settings/account/change-email.component.html b/apps/web/src/app/auth/settings/account/change-email.component.html
index d4462c3b056..279ecdcfadf 100644
--- a/apps/web/src/app/auth/settings/account/change-email.component.html
+++ b/apps/web/src/app/auth/settings/account/change-email.component.html
@@ -3,7 +3,7 @@
     {{ "changeEmailTwoFactorWarning" | i18n }}
   </bit-callout>
 
-  <div class="tw-w-1/2 tw-pr-2" formGroupName="step1">
+  <div class="@3xl:tw-w-1/2 tw-pr-2" formGroupName="step1">
     <bit-form-field>
       <bit-label>{{ "masterPass" | i18n }}</bit-label>
       <input
diff --git a/apps/web/src/app/auth/settings/account/change-email.component.spec.ts b/apps/web/src/app/auth/settings/account/change-email.component.spec.ts
index bd0d9df9f06..56f2bfe2112 100644
--- a/apps/web/src/app/auth/settings/account/change-email.component.spec.ts
+++ b/apps/web/src/app/auth/settings/account/change-email.component.spec.ts
@@ -7,6 +7,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { TwoFactorProviderResponse } from "@bitwarden/common/auth/models/response/two-factor-provider.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -22,12 +23,14 @@ describe("ChangeEmailComponent", () => {
   let fixture: ComponentFixture<ChangeEmailComponent>;
 
   let apiService: MockProxy<ApiService>;
+  let twoFactorService: MockProxy<TwoFactorService>;
   let accountService: FakeAccountService;
   let keyService: MockProxy<KeyService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
 
   beforeEach(async () => {
     apiService = mock<ApiService>();
+    twoFactorService = mock<TwoFactorService>();
     keyService = mock<KeyService>();
     kdfConfigService = mock<KdfConfigService>();
     accountService = mockAccountServiceWith("UserId" as UserId);
@@ -37,6 +40,7 @@ describe("ChangeEmailComponent", () => {
       providers: [
         { provide: AccountService, useValue: accountService },
         { provide: ApiService, useValue: apiService },
+        { provide: TwoFactorService, useValue: twoFactorService },
         { provide: I18nService, useValue: { t: (key: string) => key } },
         { provide: KeyService, useValue: keyService },
         { provide: MessagingService, useValue: mock<MessagingService>() },
@@ -57,7 +61,7 @@ describe("ChangeEmailComponent", () => {
 
   describe("ngOnInit", () => {
     beforeEach(() => {
-      apiService.getTwoFactorProviders.mockResolvedValue({
+      twoFactorService.getEnabledTwoFactorProviders.mockResolvedValue({
         data: [{ type: TwoFactorProviderType.Email, enabled: true } as TwoFactorProviderResponse],
       } as ListResponse<TwoFactorProviderResponse>);
     });
diff --git a/apps/web/src/app/auth/settings/account/change-email.component.ts b/apps/web/src/app/auth/settings/account/change-email.component.ts
index a55846a5c0f..3daf2240fb2 100644
--- a/apps/web/src/app/auth/settings/account/change-email.component.ts
+++ b/apps/web/src/app/auth/settings/account/change-email.component.ts
@@ -8,6 +8,7 @@ import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-p
 import { EmailTokenRequest } from "@bitwarden/common/auth/models/request/email-token.request";
 import { EmailRequest } from "@bitwarden/common/auth/models/request/email.request";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -16,6 +17,8 @@ import { KdfConfigService, KeyService } from "@bitwarden/key-management";
 
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-change-email",
   templateUrl: "change-email.component.html",
@@ -37,6 +40,7 @@ export class ChangeEmailComponent implements OnInit {
   constructor(
     private accountService: AccountService,
     private apiService: ApiService,
+    private twoFactorService: TwoFactorService,
     private i18nService: I18nService,
     private keyService: KeyService,
     private messagingService: MessagingService,
@@ -48,7 +52,7 @@ export class ChangeEmailComponent implements OnInit {
   async ngOnInit() {
     this.userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
 
-    const twoFactorProviders = await this.apiService.getTwoFactorProviders();
+    const twoFactorProviders = await this.twoFactorService.getEnabledTwoFactorProviders();
     this.showTwoFactorEmailWarning = twoFactorProviders.data.some(
       (p) => p.type === TwoFactorProviderType.Email && p.enabled,
     );
diff --git a/apps/web/src/app/auth/settings/account/danger-zone.component.html b/apps/web/src/app/auth/settings/account/danger-zone.component.html
index 68173e12fd9..3bd934a2439 100644
--- a/apps/web/src/app/auth/settings/account/danger-zone.component.html
+++ b/apps/web/src/app/auth/settings/account/danger-zone.component.html
@@ -1,7 +1,10 @@
 <h1 bitTypography="h1" class="tw-mt-16 tw-pb-2.5 !tw-text-danger">{{ "dangerZone" | i18n }}</h1>
 
 <div class="tw-rounded tw-border tw-border-solid tw-border-danger-600 tw-p-5">
-  <div #content class="tw-flex tw-flex-row tw-gap-2">
+  <div
+    #content
+    class="tw-grid tw-auto-rows-fr @2xl:tw-grid-cols-2 @3xl:tw-flex tw-gap-2 @2xl:tw-gap-4 @3xl:tw-gap-2"
+  >
     <ng-content></ng-content>
   </div>
 </div>
diff --git a/apps/web/src/app/auth/settings/account/danger-zone.component.ts b/apps/web/src/app/auth/settings/account/danger-zone.component.ts
index 05fd22d087d..e60ff6ec03d 100644
--- a/apps/web/src/app/auth/settings/account/danger-zone.component.ts
+++ b/apps/web/src/app/auth/settings/account/danger-zone.component.ts
@@ -9,6 +9,8 @@ import { I18nPipe } from "@bitwarden/ui-common";
 /**
  * Component for the Danger Zone section of the Account/Organization Settings page.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-danger-zone",
   templateUrl: "danger-zone.component.html",
diff --git a/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts b/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts
index f75320e8335..b792963ae9b 100644
--- a/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts
+++ b/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts
@@ -12,6 +12,8 @@ import { DialogService, ToastService } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "deauthorize-sessions.component.html",
   imports: [SharedModule, UserVerificationFormInputComponent],
diff --git a/apps/web/src/app/auth/settings/account/delete-account-dialog.component.ts b/apps/web/src/app/auth/settings/account/delete-account-dialog.component.ts
index 7e8f169994f..76eb067fdd2 100644
--- a/apps/web/src/app/auth/settings/account/delete-account-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/account/delete-account-dialog.component.ts
@@ -12,6 +12,8 @@ import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "delete-account-dialog.component.html",
   imports: [SharedModule, UserVerificationFormInputComponent],
diff --git a/apps/web/src/app/auth/settings/account/profile.component.html b/apps/web/src/app/auth/settings/account/profile.component.html
index a49e6c31d2e..b3972925598 100644
--- a/apps/web/src/app/auth/settings/account/profile.component.html
+++ b/apps/web/src/app/auth/settings/account/profile.component.html
@@ -8,7 +8,7 @@
 </div>
 <form *ngIf="profile && !loading" [formGroup]="formGroup" [bitSubmit]="submit">
   <div class="tw-grid tw-grid-cols-12 tw-gap-6">
-    <div class="tw-col-span-6">
+    <div class="tw-col-span-12 @3xl:tw-col-span-6">
       <bit-form-field>
         <bit-label>{{ "name" | i18n }}</bit-label>
         <input bitInput formControlName="name" />
@@ -18,7 +18,7 @@
         <input bitInput formControlName="email" readonly />
       </bit-form-field>
     </div>
-    <div class="tw-col-span-6">
+    <div class="tw-col-span-12 @3xl:tw-col-span-6 tw-row-start-1 @3xl:tw-row-start-auto">
       <div class="tw-mb-3 tw-flex tw-align-middle tw-items-center">
         <dynamic-avatar text="{{ profile | userName }}" [id]="profile.id" size="large">
         </dynamic-avatar>
diff --git a/apps/web/src/app/auth/settings/account/profile.component.ts b/apps/web/src/app/auth/settings/account/profile.component.ts
index 54f9ac58291..fd96f343b3a 100644
--- a/apps/web/src/app/auth/settings/account/profile.component.ts
+++ b/apps/web/src/app/auth/settings/account/profile.component.ts
@@ -23,6 +23,8 @@ import { AccountFingerprintComponent } from "../../../shared/components/account-
 
 import { ChangeAvatarDialogComponent } from "./change-avatar-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-profile",
   templateUrl: "profile.component.html",
@@ -56,7 +58,9 @@ export class ProfileComponent implements OnInit, OnDestroy {
     this.profile = await this.apiService.getProfile();
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
     this.fingerprintMaterial = userId;
-    const publicKey = await firstValueFrom(this.keyService.userPublicKey$(userId));
+    const publicKey = (await firstValueFrom(
+      this.keyService.userPublicKey$(userId),
+    )) as UserPublicKey;
     if (publicKey == null) {
       this.logService.error(
         "[ProfileComponent] No public key available for the user: " +
diff --git a/apps/web/src/app/auth/settings/account/selectable-avatar.component.ts b/apps/web/src/app/auth/settings/account/selectable-avatar.component.ts
index 630c0e949ad..b74cf8beb59 100644
--- a/apps/web/src/app/auth/settings/account/selectable-avatar.component.ts
+++ b/apps/web/src/app/auth/settings/account/selectable-avatar.component.ts
@@ -5,6 +5,8 @@ import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 import { AvatarModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "selectable-avatar",
   template: `<span
@@ -30,12 +32,26 @@ import { AvatarModule } from "@bitwarden/components";
   imports: [NgClass, AvatarModule],
 })
 export class SelectableAvatarComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() id: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() text: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() color: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() border = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() selected = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() select = new EventEmitter<string>();
 
   onFire() {
diff --git a/apps/web/src/app/auth/settings/account/set-account-verify-devices-dialog.component.ts b/apps/web/src/app/auth/settings/account/set-account-verify-devices-dialog.component.ts
index 63a26f08eee..97f50df24c8 100644
--- a/apps/web/src/app/auth/settings/account/set-account-verify-devices-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/account/set-account-verify-devices-dialog.component.ts
@@ -5,11 +5,11 @@ import { firstValueFrom, Subject, takeUntil } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { UserVerificationFormInputComponent } from "@bitwarden/auth/angular";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { SetVerifyDevicesRequest } from "@bitwarden/common/auth/models/request/set-verify-devices.request";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { Verification } from "@bitwarden/common/auth/types/verification";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -27,6 +27,8 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./set-account-verify-devices-dialog.component.html",
   imports: [
@@ -64,7 +66,7 @@ export class SetAccountVerifyDevicesDialogComponent implements OnInit, OnDestroy
     private userVerificationService: UserVerificationService,
     private dialogRef: DialogRef,
     private toastService: ToastService,
-    private apiService: ApiService,
+    private twoFactorService: TwoFactorService,
   ) {
     this.accountService.accountVerifyNewDeviceLogin$
       .pipe(takeUntil(this.destroy$))
@@ -74,7 +76,7 @@ export class SetAccountVerifyDevicesDialogComponent implements OnInit, OnDestroy
   }
 
   async ngOnInit() {
-    const twoFactorProviders = await this.apiService.getTwoFactorProviders();
+    const twoFactorProviders = await this.twoFactorService.getEnabledTwoFactorProviders();
     this.has2faConfigured = twoFactorProviders.data.length > 0;
   }
 
diff --git a/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts b/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts
index 641dde66cc4..a5fdd5212fa 100644
--- a/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts
@@ -25,6 +25,8 @@ type EmergencyAccessConfirmDialogData = {
   /** user public key */
   publicKey: Uint8Array;
 };
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "emergency-access-confirm.component.html",
   imports: [SharedModule],
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts
index 04b549e7f05..2e8d02a0c4f 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts
@@ -35,6 +35,8 @@ export enum EmergencyAccessAddEditDialogResult {
   Canceled = "canceled",
   Deleted = "deleted",
 }
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "emergency-access-add-edit.component.html",
   imports: [SharedModule, PremiumBadgeComponent],
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
index de30205e6fe..7ef94706ef6 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
-import { lastValueFrom, Observable, firstValueFrom, switchMap } from "rxjs";
+import { lastValueFrom, Observable, firstValueFrom, switchMap, map } from "rxjs";
 
 import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
@@ -42,6 +42,8 @@ import {
   EmergencyAccessTakeoverDialogResultType,
 } from "./takeover/emergency-access-takeover-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "emergency-access.component.html",
   imports: [SharedModule, HeaderModule, PremiumBadgeComponent],
@@ -94,15 +96,6 @@ export class EmergencyAccessComponent implements OnInit {
     this.loaded = true;
   }
 
-  async premiumRequired() {
-    const canAccessPremium = await firstValueFrom(this.canAccessPremium$);
-
-    if (!canAccessPremium) {
-      this.messagingService.send("premiumRequired");
-      return;
-    }
-  }
-
   edit = async (details: GranteeEmergencyAccess) => {
     const canAccessPremium = await firstValueFrom(this.canAccessPremium$);
     const dialogRef = EmergencyAccessAddEditComponent.open(this.dialogService, {
@@ -165,7 +158,15 @@ export class EmergencyAccessComponent implements OnInit {
       });
       const result = await lastValueFrom(dialogRef.closed);
       if (result === EmergencyAccessConfirmDialogResult.Confirmed) {
-        await this.emergencyAccessService.confirm(contact.id, contact.granteeId, publicKey);
+        const activeUserId = await firstValueFrom(
+          this.accountService.activeAccount$.pipe(getUserId),
+        );
+        await this.emergencyAccessService.confirm(
+          contact.id,
+          contact.granteeId,
+          publicKey,
+          activeUserId,
+        );
         updateUser();
         this.toastService.showToast({
           variant: "success",
@@ -176,10 +177,14 @@ export class EmergencyAccessComponent implements OnInit {
       return;
     }
 
+    const activeUserId = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(map((a) => a?.id)),
+    );
     this.actionPromise = this.emergencyAccessService.confirm(
       contact.id,
       contact.granteeId,
       publicKey,
+      activeUserId,
     );
     await this.actionPromise;
     updateUser();
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 e5c21fb82b9..743f41537e9 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
@@ -48,6 +48,8 @@ export type EmergencyAccessTakeoverDialogResultType =
  *
  * @link https://bitwarden.com/help/emergency-access/
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-emergency-access-takeover-dialog",
   templateUrl: "./emergency-access-takeover-dialog.component.html",
@@ -61,6 +63,8 @@ export type EmergencyAccessTakeoverDialogResultType =
   ],
 })
 export class EmergencyAccessTakeoverDialogComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(InputPasswordComponent)
   inputPasswordComponent: InputPasswordComponent | undefined = undefined;
 
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 250261fb0e7..1d96a19ca74 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
@@ -14,6 +14,8 @@ import { EmergencyAccessService } from "../../../emergency-access";
 
 import { EmergencyViewDialogComponent } from "./emergency-view-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "emergency-access-view.component.html",
   providers: [{ provide: CipherFormConfigService, useClass: DefaultCipherFormConfigService }],
diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts
index 60993924ded..d13987f2e8b 100644
--- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts
@@ -8,6 +8,7 @@ import { CollectionService } from "@bitwarden/admin-console/common";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -16,6 +17,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { UserId, EmergencyAccessId } from "@bitwarden/common/types/guid";
+import { CipherRiskService } from "@bitwarden/common/vault/abstractions/cipher-risk.service";
 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";
@@ -68,6 +70,12 @@ describe("EmergencyViewDialogComponent", () => {
           useValue: { environment$: of({ getIconsUrl: () => "https://icons.example.com" }) },
         },
         { provide: DomainSettingsService, useValue: { showFavicons$: of(true) } },
+        { provide: CipherRiskService, useValue: mock<CipherRiskService>() },
+        {
+          provide: BillingAccountProfileStateService,
+          useValue: mock<BillingAccountProfileStateService>(),
+        },
+        { provide: ConfigService, useValue: mock<ConfigService>() },
       ],
     })
       .overrideComponent(EmergencyViewDialogComponent, {
@@ -78,7 +86,6 @@ describe("EmergencyViewDialogComponent", () => {
               provide: ChangeLoginPasswordService,
               useValue: ChangeLoginPasswordService,
             },
-            { provide: ConfigService, useValue: ConfigService },
             { provide: CipherService, useValue: mock<CipherService>() },
           ],
         },
@@ -89,7 +96,6 @@ describe("EmergencyViewDialogComponent", () => {
               provide: ChangeLoginPasswordService,
               useValue: mock<ChangeLoginPasswordService>(),
             },
-            { provide: ConfigService, useValue: mock<ConfigService>() },
             { provide: CipherService, useValue: mock<CipherService>() },
           ],
         },
diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.ts
index 656ec894f27..62cfd95ecfa 100644
--- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.ts
@@ -35,6 +35,8 @@ class PremiumUpgradePromptNoop implements PremiumUpgradePromptService {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-emergency-view-dialog",
   templateUrl: "emergency-view-dialog.component.html",
diff --git a/apps/web/src/app/auth/settings/security/api-key.component.ts b/apps/web/src/app/auth/settings/security/api-key.component.ts
index 82d1010f020..af49ca556ab 100644
--- a/apps/web/src/app/auth/settings/security/api-key.component.ts
+++ b/apps/web/src/app/auth/settings/security/api-key.component.ts
@@ -23,6 +23,8 @@ export type ApiKeyDialogData = {
   apiKeyWarning: string;
   apiKeyDescription: string;
 };
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "api-key.component.html",
   imports: [SharedModule, UserVerificationFormInputComponent],
diff --git a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
index 0698ffe1f8d..ee283d26415 100644
--- a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
+++ b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
@@ -5,11 +5,15 @@ import { firstValueFrom } from "rxjs";
 import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
 import { InputPasswordFlow } from "@bitwarden/auth/angular";
 import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { CalloutModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
 import { WebauthnLoginSettingsModule } from "../../webauthn-login-settings";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-password-settings",
   templateUrl: "password-settings.component.html",
@@ -22,12 +26,15 @@ export class PasswordSettingsComponent implements OnInit {
   constructor(
     private router: Router,
     private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
+    private accountService: AccountService,
   ) {}
 
   async ngOnInit() {
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     const userHasMasterPassword = await firstValueFrom(
-      this.userDecryptionOptionsService.hasMasterPassword$,
+      this.userDecryptionOptionsService.hasMasterPasswordById$(userId),
     );
+
     if (!userHasMasterPassword) {
       await this.router.navigate(["/settings/security/two-factor"]);
       return;
diff --git a/apps/web/src/app/auth/settings/security/security-keys.component.ts b/apps/web/src/app/auth/settings/security/security-keys.component.ts
index 9d16d4380eb..b62828a2783 100644
--- a/apps/web/src/app/auth/settings/security/security-keys.component.ts
+++ b/apps/web/src/app/auth/settings/security/security-keys.component.ts
@@ -1,11 +1,10 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
 import { firstValueFrom, map } from "rxjs";
 
+import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { DialogService } from "@bitwarden/components";
 
 import { ChangeKdfModule } from "../../../key-management/change-kdf/change-kdf.module";
@@ -13,6 +12,8 @@ import { SharedModule } from "../../../shared";
 
 import { ApiKeyComponent } from "./api-key.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "security-keys.component.html",
   imports: [SharedModule, ChangeKdfModule],
@@ -21,20 +22,28 @@ export class SecurityKeysComponent implements OnInit {
   showChangeKdf = true;
 
   constructor(
-    private userVerificationService: UserVerificationService,
+    private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private accountService: AccountService,
     private apiService: ApiService,
     private dialogService: DialogService,
   ) {}
 
   async ngOnInit() {
-    this.showChangeKdf = await this.userVerificationService.hasMasterPassword();
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    this.showChangeKdf = await firstValueFrom(
+      this.userDecryptionOptionsService.hasMasterPasswordById$(userId),
+    );
   }
 
   async viewUserApiKey() {
     const entityId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(map((a) => a?.id)),
     );
+
+    if (!entityId) {
+      throw new Error("Active account not found");
+    }
+
     await ApiKeyComponent.open(this.dialogService, {
       data: {
         keyType: "user",
@@ -53,6 +62,11 @@ export class SecurityKeysComponent implements OnInit {
     const entityId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(map((a) => a?.id)),
     );
+
+    if (!entityId) {
+      throw new Error("Active account not found");
+    }
+
     await ApiKeyComponent.open(this.dialogService, {
       data: {
         keyType: "user",
diff --git a/apps/web/src/app/auth/settings/security/security-routing.module.ts b/apps/web/src/app/auth/settings/security/security-routing.module.ts
index ba476dc9106..dbcfc7cb18b 100644
--- a/apps/web/src/app/auth/settings/security/security-routing.module.ts
+++ b/apps/web/src/app/auth/settings/security/security-routing.module.ts
@@ -2,7 +2,10 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { DeviceManagementComponent } from "@bitwarden/angular/auth/device-management/device-management.component";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
+import { SessionTimeoutComponent } from "../../../key-management/session-timeout/session-timeout.component";
 import { TwoFactorSetupComponent } from "../two-factor/two-factor-setup.component";
 
 import { PasswordSettingsComponent } from "./password-settings/password-settings.component";
@@ -15,7 +18,20 @@ const routes: Routes = [
     component: SecurityComponent,
     data: { titleId: "security" },
     children: [
-      { path: "", pathMatch: "full", redirectTo: "password" },
+      { path: "", pathMatch: "full", redirectTo: "session-timeout" },
+      {
+        path: "session-timeout",
+        component: SessionTimeoutComponent,
+        canActivate: [
+          canAccessFeature(
+            FeatureFlag.ConsolidatedSessionTimeoutComponent,
+            true,
+            "/settings/security/password",
+            false,
+          ),
+        ],
+        data: { titleId: "sessionTimeoutHeader" },
+      },
       {
         path: "password",
         component: PasswordSettingsComponent,
diff --git a/apps/web/src/app/auth/settings/security/security.component.html b/apps/web/src/app/auth/settings/security/security.component.html
index 355a33d4427..6942713443f 100644
--- a/apps/web/src/app/auth/settings/security/security.component.html
+++ b/apps/web/src/app/auth/settings/security/security.component.html
@@ -1,8 +1,11 @@
 <app-header>
   <bit-tab-nav-bar slot="tabs">
-    <ng-container *ngIf="showChangePassword">
+    @if (consolidatedSessionTimeoutComponent$ | async) {
+      <bit-tab-link route="session-timeout">{{ "sessionTimeoutHeader" | i18n }}</bit-tab-link>
+    }
+    @if (showChangePassword) {
       <bit-tab-link [route]="changePasswordRoute">{{ "masterPassword" | i18n }}</bit-tab-link>
-    </ng-container>
+    }
     <bit-tab-link route="two-factor">{{ "twoStepLogin" | i18n }}</bit-tab-link>
     <bit-tab-link route="device-management">{{ "devices" | i18n }}</bit-tab-link>
     <bit-tab-link route="security-keys">{{ "keys" | i18n }}</bit-tab-link>
diff --git a/apps/web/src/app/auth/settings/security/security.component.ts b/apps/web/src/app/auth/settings/security/security.component.ts
index 2a237bf6d01..85bc29fac63 100644
--- a/apps/web/src/app/auth/settings/security/security.component.ts
+++ b/apps/web/src/app/auth/settings/security/security.component.ts
@@ -1,10 +1,17 @@
 import { Component, OnInit } from "@angular/core";
+import { firstValueFrom, Observable } from "rxjs";
 
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { HeaderModule } from "../../../layouts/header/header.module";
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "security.component.html",
   imports: [SharedModule, HeaderModule],
@@ -12,10 +19,22 @@ import { SharedModule } from "../../../shared";
 export class SecurityComponent implements OnInit {
   showChangePassword = true;
   changePasswordRoute = "password";
+  consolidatedSessionTimeoutComponent$: Observable<boolean>;
 
-  constructor(private userVerificationService: UserVerificationService) {}
+  constructor(
+    private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
+    private accountService: AccountService,
+    private configService: ConfigService,
+  ) {
+    this.consolidatedSessionTimeoutComponent$ = this.configService.getFeatureFlag$(
+      FeatureFlag.ConsolidatedSessionTimeoutComponent,
+    );
+  }
 
   async ngOnInit() {
-    this.showChangePassword = await this.userVerificationService.hasMasterPassword();
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    this.showChangePassword = userId
+      ? await firstValueFrom(this.userDecryptionOptionsService.hasMasterPasswordById$(userId))
+      : false;
   }
 }
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts
index 37d94bfae0e..543c4236d89 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts
@@ -15,6 +15,8 @@ import {
 } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-recovery",
   templateUrl: "two-factor-recovery.component.html",
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
index 698e0911b04..d93a5947445 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
@@ -6,13 +6,13 @@ import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angu
 import { firstValueFrom, map } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { DisableTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/disable-two-factor-authenticator.request";
 import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/update-two-factor-authenticator.request";
 import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/auth/models/response/two-factor-authenticator.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -53,6 +53,8 @@ declare global {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-setup-authenticator",
   templateUrl: "two-factor-setup-authenticator.component.html",
@@ -76,6 +78,8 @@ export class TwoFactorSetupAuthenticatorComponent
   extends TwoFactorSetupMethodBaseComponent
   implements OnInit, OnDestroy
 {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onChangeStatus = new EventEmitter<boolean>();
   type = TwoFactorProviderType.Authenticator;
   key: string;
@@ -92,7 +96,7 @@ export class TwoFactorSetupAuthenticatorComponent
   constructor(
     @Inject(DIALOG_DATA) protected data: AuthResponse<TwoFactorAuthenticatorResponse>,
     private dialogRef: DialogRef,
-    apiService: ApiService,
+    twoFactorService: TwoFactorService,
     i18nService: I18nService,
     userVerificationService: UserVerificationService,
     private formBuilder: FormBuilder,
@@ -104,7 +108,7 @@ export class TwoFactorSetupAuthenticatorComponent
     protected toastService: ToastService,
   ) {
     super(
-      apiService,
+      twoFactorService,
       i18nService,
       platformUtilsService,
       logService,
@@ -154,7 +158,7 @@ export class TwoFactorSetupAuthenticatorComponent
     request.key = this.key;
     request.userVerificationToken = this.userVerificationToken;
 
-    const response = await this.apiService.putTwoFactorAuthenticator(request);
+    const response = await this.twoFactorService.putTwoFactorAuthenticator(request);
     await this.processResponse(response);
     this.onUpdated.emit(true);
   }
@@ -174,7 +178,7 @@ export class TwoFactorSetupAuthenticatorComponent
     request.type = this.type;
     request.key = this.key;
     request.userVerificationToken = this.userVerificationToken;
-    await this.apiService.deleteTwoFactorAuthenticator(request);
+    await this.twoFactorService.deleteTwoFactorAuthenticator(request);
     this.enabled = false;
     this.toastService.showToast({
       variant: "success",
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
index 0efd0c79b4e..b4c8ece92a7 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
@@ -2,11 +2,11 @@ import { CommonModule } from "@angular/common";
 import { Component, EventEmitter, Inject, OnInit, Output } from "@angular/core";
 import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/auth/models/request/update-two-factor-duo.request";
 import { TwoFactorDuoResponse } from "@bitwarden/common/auth/models/response/two-factor-duo.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -30,6 +30,8 @@ import { I18nPipe } from "@bitwarden/ui-common";
 
 import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-base.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-setup-duo",
   templateUrl: "two-factor-setup-duo.component.html",
@@ -51,6 +53,8 @@ export class TwoFactorSetupDuoComponent
   extends TwoFactorSetupMethodBaseComponent
   implements OnInit
 {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onChangeStatus: EventEmitter<boolean> = new EventEmitter();
 
   type = TwoFactorProviderType.Duo;
@@ -63,7 +67,7 @@ export class TwoFactorSetupDuoComponent
 
   constructor(
     @Inject(DIALOG_DATA) protected data: TwoFactorDuoComponentConfig,
-    apiService: ApiService,
+    twoFactorService: TwoFactorService,
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     logService: LogService,
@@ -74,7 +78,7 @@ export class TwoFactorSetupDuoComponent
     protected toastService: ToastService,
   ) {
     super(
-      apiService,
+      twoFactorService,
       i18nService,
       platformUtilsService,
       logService,
@@ -139,9 +143,12 @@ export class TwoFactorSetupDuoComponent
     let response: TwoFactorDuoResponse;
 
     if (this.organizationId != null) {
-      response = await this.apiService.putTwoFactorOrganizationDuo(this.organizationId, request);
+      response = await this.twoFactorService.putTwoFactorOrganizationDuo(
+        this.organizationId,
+        request,
+      );
     } else {
-      response = await this.apiService.putTwoFactorDuo(request);
+      response = await this.twoFactorService.putTwoFactorDuo(request);
     }
 
     this.processResponse(response);
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
index 544f3850ea6..1402d6b8969 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
@@ -3,13 +3,13 @@ import { Component, EventEmitter, Inject, OnInit, Output } from "@angular/core";
 import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
 import { firstValueFrom, map } from "rxjs";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
 import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/update-two-factor-email.request";
 import { TwoFactorEmailResponse } from "@bitwarden/common/auth/models/response/two-factor-email.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -33,6 +33,8 @@ import { I18nPipe } from "@bitwarden/ui-common";
 
 import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-base.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-setup-email",
   templateUrl: "two-factor-setup-email.component.html",
@@ -54,6 +56,8 @@ export class TwoFactorSetupEmailComponent
   extends TwoFactorSetupMethodBaseComponent
   implements OnInit
 {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onChangeStatus: EventEmitter<boolean> = new EventEmitter();
   type = TwoFactorProviderType.Email;
   sentEmail: string = "";
@@ -66,7 +70,7 @@ export class TwoFactorSetupEmailComponent
 
   constructor(
     @Inject(DIALOG_DATA) protected data: AuthResponse<TwoFactorEmailResponse>,
-    apiService: ApiService,
+    twoFactorService: TwoFactorService,
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     logService: LogService,
@@ -78,7 +82,7 @@ export class TwoFactorSetupEmailComponent
     protected toastService: ToastService,
   ) {
     super(
-      apiService,
+      twoFactorService,
       i18nService,
       platformUtilsService,
       logService,
@@ -131,7 +135,7 @@ export class TwoFactorSetupEmailComponent
   sendEmail = async () => {
     const request = await this.buildRequestModel(TwoFactorEmailRequest);
     request.email = this.email;
-    this.emailPromise = this.apiService.postTwoFactorEmailSetup(request);
+    this.emailPromise = this.twoFactorService.postTwoFactorEmailSetup(request);
     await this.emailPromise;
     this.sentEmail = this.email;
   };
@@ -141,7 +145,7 @@ export class TwoFactorSetupEmailComponent
     request.email = this.email;
     request.token = this.token;
 
-    const response = await this.apiService.putTwoFactorEmail(request);
+    const response = await this.twoFactorService.putTwoFactorEmail(request);
     await this.processResponse(response);
     this.onUpdated.emit(true);
   }
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
index 7569577e781..5494353449d 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
@@ -1,11 +1,11 @@
 import { Directive, EventEmitter, Output } from "@angular/core";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
 import { TwoFactorProviderRequest } from "@bitwarden/common/auth/models/request/two-factor-provider.request";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AuthResponseBase } from "@bitwarden/common/auth/types/auth-response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -17,6 +17,8 @@ import { DialogService, ToastService } from "@bitwarden/components";
  */
 @Directive({})
 export abstract class TwoFactorSetupMethodBaseComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onUpdated = new EventEmitter<boolean>();
 
   type: TwoFactorProviderType | undefined;
@@ -25,12 +27,12 @@ export abstract class TwoFactorSetupMethodBaseComponent {
   enabled = false;
   authed = false;
 
-  protected hashedSecret: string | undefined;
+  protected secret: string | undefined;
   protected verificationType: VerificationType | undefined;
   protected componentName = "";
 
   constructor(
-    protected apiService: ApiService,
+    protected twoFactorService: TwoFactorService,
     protected i18nService: I18nService,
     protected platformUtilsService: PlatformUtilsService,
     protected logService: LogService,
@@ -40,60 +42,11 @@ export abstract class TwoFactorSetupMethodBaseComponent {
   ) {}
 
   protected auth(authResponse: AuthResponseBase) {
-    this.hashedSecret = authResponse.secret;
+    this.secret = authResponse.secret;
     this.verificationType = authResponse.verificationType;
     this.authed = true;
   }
 
-  /** @deprecated used for formPromise flows.*/
-  protected async enable(enableFunction: () => Promise<void>) {
-    try {
-      await enableFunction();
-      this.onUpdated.emit(true);
-    } catch (e) {
-      this.logService.error(e);
-    }
-  }
-
-  /**
-   * @deprecated used for formPromise flows.
-   * TODO: Remove this method when formPromises are removed from all flows.
-   * */
-  protected async disable(promise: Promise<unknown>) {
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "disable" },
-      content: { key: "twoStepDisableDesc" },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return;
-    }
-
-    try {
-      const request = await this.buildRequestModel(TwoFactorProviderRequest);
-      if (this.type === undefined) {
-        throw new Error("Two-factor provider type is required");
-      }
-      request.type = this.type;
-      if (this.organizationId != null) {
-        promise = this.apiService.putTwoFactorOrganizationDisable(this.organizationId, request);
-      } else {
-        promise = this.apiService.putTwoFactorDisable(request);
-      }
-      await promise;
-      this.enabled = false;
-      this.toastService.showToast({
-        variant: "success",
-        title: "",
-        message: this.i18nService.t("twoStepDisabled"),
-      });
-      this.onUpdated.emit(false);
-    } catch (e) {
-      this.logService.error(e);
-    }
-  }
-
   protected async disableMethod() {
     const confirmed = await this.dialogService.openSimpleDialog({
       title: { key: "disable" },
@@ -111,9 +64,9 @@ export abstract class TwoFactorSetupMethodBaseComponent {
     }
     request.type = this.type;
     if (this.organizationId != null) {
-      await this.apiService.putTwoFactorOrganizationDisable(this.organizationId, request);
+      await this.twoFactorService.putTwoFactorOrganizationDisable(this.organizationId, request);
     } else {
-      await this.apiService.putTwoFactorDisable(request);
+      await this.twoFactorService.putTwoFactorDisable(request);
     }
     this.enabled = false;
     this.toastService.showToast({
@@ -127,12 +80,12 @@ export abstract class TwoFactorSetupMethodBaseComponent {
   protected async buildRequestModel<T extends SecretVerificationRequest>(
     requestClass: new () => T,
   ) {
-    if (this.hashedSecret === undefined || this.verificationType === undefined) {
+    if (this.secret === undefined || this.verificationType === undefined) {
       throw new Error("User verification data is missing");
     }
     return this.userVerificationService.buildRequest(
       {
-        secret: this.hashedSecret,
+        secret: this.secret,
         type: this.verificationType,
       },
       requestClass,
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
index eec9f74dd60..c272a8e5b70 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
@@ -17,10 +17,10 @@
       <ul class="bwi-ul">
         <li *ngFor="let k of keys; let i = index" #removeKeyBtn [appApiAction]="k.removePromise">
           <i class="bwi bwi-li bwi-key"></i>
-          <span *ngIf="!k.configured || !k.name" bitTypography="body1" class="tw-font-bold">
+          <span *ngIf="!k.configured || !k.name" bitTypography="body1" class="tw-font-medium">
             {{ "webAuthnkeyX" | i18n: (i + 1).toString() }}
           </span>
-          <span *ngIf="k.configured && k.name" bitTypography="body1" class="tw-font-bold">
+          <span *ngIf="k.configured && k.name" bitTypography="body1" class="tw-font-medium">
             {{ k.name }}
           </span>
           <ng-container *ngIf="k.configured && !$any(removeKeyBtn).loading">
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
index 66cd3596063..11ba5955902 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
@@ -3,7 +3,6 @@ import { Component, Inject, NgZone } from "@angular/core";
 import { FormControl, FormGroup, ReactiveFormsModule } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
@@ -13,6 +12,7 @@ import {
   ChallengeResponse,
   TwoFactorWebAuthnResponse,
 } from "@bitwarden/common/auth/models/response/two-factor-web-authn.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -43,6 +43,8 @@ interface Key {
   removePromise: Promise<TwoFactorWebAuthnResponse> | null;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-setup-webauthn",
   templateUrl: "two-factor-setup-webauthn.component.html",
@@ -70,7 +72,6 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
   webAuthnListening: boolean = false;
   webAuthnResponse: PublicKeyCredential | null = null;
   challengePromise: Promise<ChallengeResponse> | undefined;
-  formPromise: Promise<TwoFactorWebAuthnResponse> | undefined;
 
   override componentName = "app-two-factor-webauthn";
 
@@ -79,7 +80,7 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
   constructor(
     @Inject(DIALOG_DATA) protected data: AuthResponse<TwoFactorWebAuthnResponse>,
     private dialogRef: DialogRef,
-    apiService: ApiService,
+    twoFactorService: TwoFactorService,
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     private ngZone: NgZone,
@@ -89,7 +90,7 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
     toastService: ToastService,
   ) {
     super(
-      apiService,
+      twoFactorService,
       i18nService,
       platformUtilsService,
       logService,
@@ -127,7 +128,7 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
     request.id = this.keyIdAvailable;
     request.name = this.formGroup.value.name || "";
 
-    const response = await this.apiService.putTwoFactorWebAuthn(request);
+    const response = await this.twoFactorService.putTwoFactorWebAuthn(request);
     this.processResponse(response);
     this.toastService.showToast({
       title: this.i18nService.t("success"),
@@ -163,7 +164,7 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
     const request = await this.buildRequestModel(UpdateTwoFactorWebAuthnDeleteRequest);
     request.id = key.id;
     try {
-      key.removePromise = this.apiService.deleteTwoFactorWebAuthn(request);
+      key.removePromise = this.twoFactorService.deleteTwoFactorWebAuthn(request);
       const response = await key.removePromise;
       key.removePromise = null;
       await this.processResponse(response);
@@ -177,7 +178,7 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
       return;
     }
     const request = await this.buildRequestModel(SecretVerificationRequest);
-    this.challengePromise = this.apiService.getTwoFactorWebAuthnChallenge(request);
+    this.challengePromise = this.twoFactorService.getTwoFactorWebAuthnChallenge(request);
     const challenge = await this.challengePromise;
     this.readDevice(challenge);
   };
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html
index dbad422a32e..8baf304969f 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html
@@ -25,27 +25,25 @@
         <li>{{ "twoFactorYubikeySaveForm" | i18n }}</li>
       </ol>
       <hr />
-      <div class="tw-grid tw-grid-cols-12 tw-gap-4" formArrayName="formKeys">
-        <div class="tw-col-span-6" *ngFor="let k of keys; let i = index">
-          <div [formGroupName]="i">
-            <bit-label>{{ "yubikeyX" | i18n: (i + 1).toString() }}</bit-label>
-            <bit-form-field *ngIf="!keys[i].existingKey">
-              <input bitInput type="password" formControlName="key" appInputVerbatim />
-            </bit-form-field>
-            <div class="tw-flex tw-justify-between tw-mb-6" *ngIf="keys[i].existingKey">
-              <span class="tw-mr-2 tw-self-center">{{ keys[i].existingKey }}</span>
-              <button
-                bitIconButton="bwi-minus-circle"
-                type="button"
-                buttonType="danger"
-                (click)="remove(i)"
-                label="{{ 'remove' | i18n }}"
-              ></button>
-            </div>
+      <div class="tw-flex tw-flex-col tw-mt-4" formArrayName="formKeys">
+        <div *ngFor="let k of keys; let i = index" [formGroupName]="i">
+          <bit-label>{{ "yubikeyX" | i18n: (i + 1).toString() }}</bit-label>
+          <bit-form-field *ngIf="!keys[i].existingKey">
+            <input bitInput type="password" formControlName="key" appInputVerbatim />
+          </bit-form-field>
+          <div class="tw-flex tw-justify-between tw-mb-4" *ngIf="keys[i].existingKey">
+            <span class="tw-mr-2 tw-self-center">{{ keys[i].existingKey }}</span>
+            <button
+              bitIconButton="bwi-minus-circle"
+              type="button"
+              buttonType="danger"
+              (click)="remove(i)"
+              label="{{ 'remove' | i18n }}"
+            ></button>
           </div>
         </div>
       </div>
-      <p bitTypography="body1" class="tw-font-bold tw-mb-2">{{ "nfcSupport" | i18n }}</p>
+      <p bitTypography="body1" class="tw-font-medium tw-mb-2">{{ "nfcSupport" | i18n }}</p>
       <bit-form-control [disableMargin]="true">
         <bit-label>{{ "twoFactorYubikeySupportsNfc" | i18n }}</bit-label>
         <input bitCheckbox type="checkbox" formControlName="anyKeyHasNfc" />
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
index 0b85d219928..a58c659796d 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
@@ -9,11 +9,11 @@ import {
 } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { UpdateTwoFactorYubikeyOtpRequest } from "@bitwarden/common/auth/models/request/update-two-factor-yubikey-otp.request";
 import { TwoFactorYubiKeyResponse } from "@bitwarden/common/auth/models/response/two-factor-yubi-key.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -44,6 +44,8 @@ interface Key {
   existingKey: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-setup-yubikey",
   templateUrl: "two-factor-setup-yubikey.component.html",
@@ -72,9 +74,6 @@ export class TwoFactorSetupYubiKeyComponent
   keys: Key[] = [];
   anyKeyHasNfc = false;
 
-  formPromise: Promise<TwoFactorYubiKeyResponse> | undefined;
-  disablePromise: Promise<unknown> | undefined;
-
   override componentName = "app-two-factor-yubikey";
   formGroup:
     | FormGroup<{
@@ -93,7 +92,7 @@ export class TwoFactorSetupYubiKeyComponent
 
   constructor(
     @Inject(DIALOG_DATA) protected data: AuthResponse<TwoFactorYubiKeyResponse>,
-    apiService: ApiService,
+    twoFactorService: TwoFactorService,
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
     logService: LogService,
@@ -103,7 +102,7 @@ export class TwoFactorSetupYubiKeyComponent
     protected toastService: ToastService,
   ) {
     super(
-      apiService,
+      twoFactorService,
       i18nService,
       platformUtilsService,
       logService,
@@ -176,7 +175,7 @@ export class TwoFactorSetupYubiKeyComponent
     request.key5 = keys != null && keys.length > 4 ? (keys[4]?.key ?? "") : "";
     request.nfc = this.formGroup.value.anyKeyHasNfc ?? false;
 
-    this.processResponse(await this.apiService.putTwoFactorYubiKey(request));
+    this.processResponse(await this.twoFactorService.putTwoFactorYubiKey(request));
     this.refreshFormArrayData();
     this.toastService.showToast({
       title: this.i18nService.t("success"),
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.html
index 16c3dcb3cda..69a0dbf4145 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.html
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.html
@@ -53,7 +53,7 @@
       <div bit-item-content class="tw-px-4">
         <h3 class="tw-mb-0">
           <div
-            class="tw-font-semibold tw-text-base"
+            class="tw-font-medium tw-text-base"
             [style]="p.enabled || p.premium ? 'display:inline-block' : ''"
           >
             {{ p.name }}
@@ -71,15 +71,26 @@
         <div class="tw-mt-2 tw-text-wrap">{{ p.description }}</div>
       </div>
       <bit-item-action slot="end">
-        <button
-          type="button"
-          bitButton
-          buttonType="secondary"
-          [disabled]="!(canAccessPremium$ | async) && p.premium"
-          (click)="manage(p.type)"
-        >
-          {{ "manage" | i18n }}
-        </button>
+        @if (p.premium && p.enabled && !(canAccessPremium$ | async)) {
+          <button
+            type="button"
+            bitButton
+            buttonType="danger"
+            (click)="disablePremium2faTypeForNonPremiumUser(p.type)"
+          >
+            {{ "disable" | i18n }}
+          </button>
+        } @else {
+          <button
+            type="button"
+            bitButton
+            buttonType="secondary"
+            [disabled]="!(canAccessPremium$ | async) && p.premium"
+            (click)="manage(p.type)"
+          >
+            {{ "manage" | i18n }}
+          </button>
+        }
       </bit-item-action>
     </bit-item>
   </bit-item-group>
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
index 043c27998cd..a85bf65ab74 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
@@ -3,7 +3,6 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import {
   first,
-  firstValueFrom,
   lastValueFrom,
   Observable,
   Subject,
@@ -13,26 +12,28 @@ import {
 } from "rxjs";
 
 import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { UserVerificationDialogComponent } from "@bitwarden/auth/angular";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 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 { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
+import { TwoFactorProviderRequest } from "@bitwarden/common/auth/models/request/two-factor-provider.request";
 import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/auth/models/response/two-factor-authenticator.response";
 import { TwoFactorDuoResponse } from "@bitwarden/common/auth/models/response/two-factor-duo.response";
 import { TwoFactorEmailResponse } from "@bitwarden/common/auth/models/response/two-factor-email.response";
 import { TwoFactorWebAuthnResponse } from "@bitwarden/common/auth/models/response/two-factor-web-authn.response";
 import { TwoFactorYubiKeyResponse } from "@bitwarden/common/auth/models/response/two-factor-yubi-key.response";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { TwoFactorProviders } from "@bitwarden/common/auth/services/two-factor.service";
+import { TwoFactorService, TwoFactorProviders } from "@bitwarden/common/auth/two-factor";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { DialogRef, DialogService, ItemModule } from "@bitwarden/components";
+import { DialogRef, DialogService, ItemModule, ToastService } from "@bitwarden/components";
 
 import { HeaderModule } from "../../../layouts/header/header.module";
 import { SharedModule } from "../../../shared/shared.module";
@@ -45,6 +46,8 @@ import { TwoFactorSetupWebAuthnComponent } from "./two-factor-setup-webauthn.com
 import { TwoFactorSetupYubiKeyComponent } from "./two-factor-setup-yubikey.component";
 import { TwoFactorVerifyComponent } from "./two-factor-verify.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-setup",
   templateUrl: "two-factor-setup.component.html",
@@ -58,7 +61,6 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
   recoveryCodeWarningMessage: string;
   showPolicyWarning = false;
   loading = true;
-  formPromise: Promise<any>;
 
   tabbedHeader = true;
 
@@ -68,13 +70,15 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
 
   constructor(
     protected dialogService: DialogService,
-    protected apiService: ApiService,
+    protected twoFactorService: TwoFactorService,
     protected messagingService: MessagingService,
     protected policyService: PolicyService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
     protected accountService: AccountService,
     protected configService: ConfigService,
     protected i18nService: I18nService,
+    protected userVerificationService: UserVerificationService,
+    protected toastService: ToastService,
   ) {
     this.canAccessPremium$ = this.accountService.activeAccount$.pipe(
       switchMap((account) =>
@@ -149,6 +153,50 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
     return await lastValueFrom(twoFactorVerifyDialogRef.closed);
   }
 
+  /**
+   * For users who enabled a premium-only 2fa provider,
+   * they should still be allowed to disable that provider
+   * (without otherwise modifying) if they no longer have
+   * premium access [PM-21204]
+   * @param type the 2FA Provider Type
+   */
+  async disablePremium2faTypeForNonPremiumUser(type: TwoFactorProviderType) {
+    // Use UserVerificationDialogComponent instead of TwoFactorVerifyComponent
+    // because the latter makes GET API calls that require premium for YubiKey/Duo.
+    // The disable endpoint only requires user verification, not provider configuration.
+    const result = await UserVerificationDialogComponent.open(this.dialogService, {
+      title: "twoStepLogin",
+      verificationType: {
+        type: "custom",
+        verificationFn: async (secret) => {
+          const request = await this.userVerificationService.buildRequest<TwoFactorProviderRequest>(
+            secret,
+            TwoFactorProviderRequest,
+          );
+          request.type = type;
+
+          await this.twoFactorService.putTwoFactorDisable(request);
+          return true;
+        },
+      },
+    });
+
+    if (result.userAction === "cancel") {
+      return;
+    }
+
+    if (!result.verificationSuccess) {
+      return;
+    }
+
+    this.toastService.showToast({
+      variant: "success",
+      title: "",
+      message: this.i18nService.t("twoStepDisabled"),
+    });
+    this.updateStatus(false, type);
+  }
+
   async manage(type: TwoFactorProviderType) {
     // clear any existing subscriptions before creating a new one
     this.twoFactorSetupSubscription?.unsubscribe();
@@ -262,15 +310,8 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
     }
   }
 
-  async premiumRequired() {
-    if (!(await firstValueFrom(this.canAccessPremium$))) {
-      this.messagingService.send("premiumRequired");
-      return;
-    }
-  }
-
   protected getTwoFactorProviders() {
-    return this.apiService.getTwoFactorProviders();
+    return this.twoFactorService.getEnabledTwoFactorProviders();
   }
 
   protected filterProvider(type: TwoFactorProviderType): boolean {
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts
index 07939db7eff..04c84ca0197 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts
@@ -1,15 +1,14 @@
-import { Component, EventEmitter, Inject, Output } from "@angular/core";
+import { Component, Inject } from "@angular/core";
 import { FormControl, FormGroup, ReactiveFormsModule } from "@angular/forms";
 
 import { UserVerificationFormInputComponent } from "@bitwarden/auth/angular";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
-import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
 import { TwoFactorResponse } from "@bitwarden/common/auth/types/two-factor-response";
-import { Verification } from "@bitwarden/common/auth/types/verification";
+import { VerificationWithSecret } from "@bitwarden/common/auth/types/verification";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
@@ -28,6 +27,8 @@ type TwoFactorVerifyDialogData = {
   organizationId: string;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-verify",
   templateUrl: "two-factor-verify.component.html",
@@ -43,19 +44,17 @@ type TwoFactorVerifyDialogData = {
 export class TwoFactorVerifyComponent {
   type: TwoFactorProviderType;
   organizationId: string;
-  @Output() onAuthed = new EventEmitter<AuthResponse<TwoFactorResponse>>();
-
   formPromise: Promise<TwoFactorResponse> | undefined;
 
   protected formGroup = new FormGroup({
-    secret: new FormControl<Verification | null>(null),
+    secret: new FormControl<VerificationWithSecret | null>(null),
   });
   invalidSecret: boolean = false;
 
   constructor(
     @Inject(DIALOG_DATA) protected data: TwoFactorVerifyDialogData,
     private dialogRef: DialogRef,
-    private apiService: ApiService,
+    private twoFactorService: TwoFactorService,
     private i18nService: I18nService,
     private userVerificationService: UserVerificationService,
   ) {
@@ -65,24 +64,19 @@ export class TwoFactorVerifyComponent {
 
   submit = async () => {
     try {
-      let hashedSecret = "";
       if (!this.formGroup.value.secret) {
         throw new Error("Secret is required");
       }
 
       const secret = this.formGroup.value.secret!;
       this.formPromise = this.userVerificationService.buildRequest(secret).then((request) => {
-        hashedSecret =
-          secret.type === VerificationType.MasterPassword
-            ? request.masterPasswordHash
-            : request.otp;
         return this.apiCall(request);
       });
 
       const response = await this.formPromise;
       this.dialogRef.close({
         response: response,
-        secret: hashedSecret,
+        secret: secret.secret,
         verificationType: secret.type,
       });
     } catch (e) {
@@ -116,22 +110,22 @@ export class TwoFactorVerifyComponent {
   private apiCall(request: SecretVerificationRequest): Promise<TwoFactorResponse> {
     switch (this.type) {
       case -1 as TwoFactorProviderType:
-        return this.apiService.getTwoFactorRecover(request);
+        return this.twoFactorService.getTwoFactorRecover(request);
       case TwoFactorProviderType.Duo:
       case TwoFactorProviderType.OrganizationDuo:
         if (this.organizationId != null) {
-          return this.apiService.getTwoFactorOrganizationDuo(this.organizationId, request);
+          return this.twoFactorService.getTwoFactorOrganizationDuo(this.organizationId, request);
         } else {
-          return this.apiService.getTwoFactorDuo(request);
+          return this.twoFactorService.getTwoFactorDuo(request);
         }
       case TwoFactorProviderType.Email:
-        return this.apiService.getTwoFactorEmail(request);
+        return this.twoFactorService.getTwoFactorEmail(request);
       case TwoFactorProviderType.WebAuthn:
-        return this.apiService.getTwoFactorWebAuthn(request);
+        return this.twoFactorService.getTwoFactorWebAuthn(request);
       case TwoFactorProviderType.Authenticator:
-        return this.apiService.getTwoFactorAuthenticator(request);
+        return this.twoFactorService.getTwoFactorAuthenticator(request);
       case TwoFactorProviderType.Yubikey:
-        return this.apiService.getTwoFactorYubiKey(request);
+        return this.twoFactorService.getTwoFactorYubiKey(request);
       default:
         throw new Error(`Unknown two-factor type: ${this.type}`);
     }
diff --git a/apps/web/src/app/auth/settings/verify-email.component.ts b/apps/web/src/app/auth/settings/verify-email.component.ts
index 7088dae8d0f..a63d0b18b36 100644
--- a/apps/web/src/app/auth/settings/verify-email.component.ts
+++ b/apps/web/src/app/auth/settings/verify-email.component.ts
@@ -16,6 +16,8 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-verify-email",
   templateUrl: "verify-email.component.html",
@@ -24,7 +26,11 @@ import {
 export class VerifyEmailComponent {
   actionPromise: Promise<unknown>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onVerified = new EventEmitter<boolean>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onDismiss = new EventEmitter<void>();
 
   constructor(
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
index 04b148e8a0a..8ccf99f1aef 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
@@ -8,12 +8,13 @@ import {
   TwoFactorAuthSecurityKeyFailedIcon,
   TwoFactorAuthSecurityKeyIcon,
 } from "@bitwarden/assets/svg";
-import { PrfKeySet } from "@bitwarden/auth/common";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { Verification } from "@bitwarden/common/auth/types/verification";
+import { PrfKeySet } from "@bitwarden/common/key-management/keys/models/rotateable-key-set";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogConfig, DialogRef, DialogService, ToastService } from "@bitwarden/components";
 
 import { WebauthnLoginAdminService } from "../../../core";
@@ -32,6 +33,8 @@ type Step =
   | "credentialCreationFailed"
   | "credentialNaming";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "create-credential-dialog.component.html",
   standalone: false,
@@ -65,10 +68,10 @@ export class CreateCredentialDialogComponent implements OnInit {
     private formBuilder: FormBuilder,
     private dialogRef: DialogRef,
     private webauthnService: WebauthnLoginAdminService,
-    private platformUtilsService: PlatformUtilsService,
     private i18nService: I18nService,
     private logService: LogService,
     private toastService: ToastService,
+    private accountService: AccountService,
   ) {}
 
   ngOnInit(): void {
@@ -144,13 +147,14 @@ export class CreateCredentialDialogComponent implements OnInit {
     if (this.formGroup.controls.credentialNaming.controls.name.invalid) {
       return;
     }
+    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
 
     let keySet: PrfKeySet | undefined;
     if (
       this.pendingCredential.supportsPrf &&
       this.formGroup.value.credentialNaming.useForEncryption
     ) {
-      keySet = await this.webauthnService.createKeySet(this.pendingCredential);
+      keySet = await this.webauthnService.createKeySet(this.pendingCredential, userId);
 
       if (keySet === undefined) {
         this.formGroup.controls.credentialNaming.controls.useForEncryption?.setErrors({
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
index ea766a302ca..af4b7c497fb 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts
@@ -24,6 +24,8 @@ export interface DeleteCredentialDialogParams {
   credentialId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "delete-credential-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/enable-encryption-dialog/enable-encryption-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/enable-encryption-dialog/enable-encryption-dialog.component.ts
index dd1ac45a9b6..053da609345 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/enable-encryption-dialog/enable-encryption-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/enable-encryption-dialog/enable-encryption-dialog.component.ts
@@ -2,11 +2,13 @@
 // @ts-strict-ignore
 import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
-import { Subject } from "rxjs";
+import { firstValueFrom, Subject } from "rxjs";
 import { takeUntil } from "rxjs/operators";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { WebAuthnLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login.service.abstraction";
 import { WebAuthnLoginCredentialAssertionOptionsView } from "@bitwarden/common/auth/models/view/webauthn-login/webauthn-login-credential-assertion-options.view";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { Verification } from "@bitwarden/common/auth/types/verification";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { DIALOG_DATA, DialogConfig, DialogRef } from "@bitwarden/components";
@@ -21,6 +23,8 @@ export interface EnableEncryptionDialogParams {
   credentialId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "enable-encryption-dialog.component.html",
   standalone: false,
@@ -45,6 +49,7 @@ export class EnableEncryptionDialogComponent implements OnInit, OnDestroy {
     private dialogRef: DialogRef,
     private webauthnService: WebauthnLoginAdminService,
     private webauthnLoginService: WebAuthnLoginServiceAbstraction,
+    private accountService: AccountService,
   ) {}
 
   ngOnInit(): void {
@@ -58,6 +63,7 @@ export class EnableEncryptionDialogComponent implements OnInit, OnDestroy {
     if (this.credential === undefined) {
       return;
     }
+    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
 
     this.dialogRef.disableClose = true;
     try {
@@ -66,6 +72,7 @@ export class EnableEncryptionDialogComponent implements OnInit, OnDestroy {
       );
       await this.webauthnService.enableCredentialEncryption(
         await this.webauthnLoginService.assertCredential(this.credentialOptions),
+        userId,
       );
     } catch (error) {
       if (error instanceof ErrorResponse && error.statusCode === 400) {
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
index 7b1d859fb69..2ef177922a9 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
@@ -19,7 +19,6 @@
         </span>
       </ng-container>
     </ng-container>
-    <span bitBadge variant="warning" class="!tw-align-middle">{{ "beta" | i18n }}</span>
   </span>
   <ng-container *ngIf="loading">
     <i class="bwi bwi-spinner bwi-spin tw-ml-1" aria-hidden="true"></i>
@@ -34,7 +33,7 @@
 
 <table *ngIf="hasCredentials" class="tw-mb-5">
   <tr *ngFor="let credential of credentials">
-    <td class="tw-p-2 tw-pl-0 tw-font-semibold">{{ credential.name }}</td>
+    <td class="tw-p-2 tw-pl-0 tw-font-medium">{{ credential.name }}</td>
     <td class="tw-p-2 tw-pr-10 tw-text-left">
       <ng-container *ngIf="credential.prfStatus === WebauthnLoginCredentialPrfStatus.Enabled">
         <i class="bwi bwi-lock-encrypted"></i>
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
index 94e926ac138..b2bc8e6c322 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, HostBinding, OnDestroy, OnInit } from "@angular/core";
 import { Subject, switchMap, takeUntil } from "rxjs";
 
@@ -17,6 +15,8 @@ import { openCreateCredentialDialog } from "./create-credential-dialog/create-cr
 import { openDeleteCredentialDialogComponent } from "./delete-credential-dialog/delete-credential-dialog.component";
 import { openEnableCredentialDialogComponent } from "./enable-encryption-dialog/enable-encryption-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-webauthn-login-settings",
   templateUrl: "webauthn-login-settings.component.html",
@@ -34,6 +34,8 @@ export class WebauthnLoginSettingsComponent implements OnInit, OnDestroy {
   protected credentials?: WebauthnLoginCredentialView[];
   protected loading = true;
 
+  protected requireSsoPolicyEnabled = false;
+
   constructor(
     private webauthnService: WebauthnLoginAdminService,
     private dialogService: DialogService,
@@ -41,25 +43,6 @@ export class WebauthnLoginSettingsComponent implements OnInit, OnDestroy {
     private accountService: AccountService,
   ) {}
 
-  @HostBinding("attr.aria-busy")
-  get ariaBusy() {
-    return this.loading ? "true" : "false";
-  }
-
-  get hasCredentials() {
-    return this.credentials && this.credentials.length > 0;
-  }
-
-  get hasData() {
-    return this.credentials !== undefined;
-  }
-
-  get limitReached() {
-    return this.credentials?.length >= this.MaxCredentialCount;
-  }
-
-  requireSsoPolicyEnabled = false;
-
   ngOnInit(): void {
     this.accountService.activeAccount$
       .pipe(
@@ -88,6 +71,23 @@ export class WebauthnLoginSettingsComponent implements OnInit, OnDestroy {
     this.destroy$.complete();
   }
 
+  @HostBinding("attr.aria-busy")
+  get ariaBusy() {
+    return this.loading ? "true" : "false";
+  }
+
+  get hasCredentials() {
+    return (this.credentials?.length ?? 0) > 0;
+  }
+
+  get hasData() {
+    return this.credentials !== undefined;
+  }
+
+  get limitReached() {
+    return (this.credentials?.length ?? 0) >= this.MaxCredentialCount;
+  }
+
   protected createCredential() {
     openCreateCredentialDialog(this.dialogService, {});
   }
diff --git a/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts b/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts
index 77df374f3ed..beafa48bb8e 100644
--- a/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts
+++ b/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts
@@ -21,6 +21,8 @@ import {
 /**
  * @deprecated Jan 24, 2024: Use new libs/auth UserVerificationDialogComponent instead.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "user-verification-prompt.component.html",
   standalone: false,
diff --git a/apps/web/src/app/auth/shared/components/user-verification/user-verification.component.ts b/apps/web/src/app/auth/shared/components/user-verification/user-verification.component.ts
index 42f4b26fb36..7ea5014254b 100644
--- a/apps/web/src/app/auth/shared/components/user-verification/user-verification.component.ts
+++ b/apps/web/src/app/auth/shared/components/user-verification/user-verification.component.ts
@@ -8,6 +8,8 @@ import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/a
  * @deprecated Jan 24, 2024: Use new libs/auth UserVerificationDialogComponent or UserVerificationFormInputComponent instead.
  * Each client specific component should eventually be converted over to use one of these new components.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-user-verification",
   templateUrl: "user-verification.component.html",
diff --git a/apps/web/src/app/auth/verify-email-token.component.ts b/apps/web/src/app/auth/verify-email-token.component.ts
index 2c4fa7f447c..30bfcf95bbf 100644
--- a/apps/web/src/app/auth/verify-email-token.component.ts
+++ b/apps/web/src/app/auth/verify-email-token.component.ts
@@ -13,6 +13,8 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-verify-email-token",
   templateUrl: "verify-email-token.component.html",
diff --git a/apps/web/src/app/auth/verify-recover-delete.component.ts b/apps/web/src/app/auth/verify-recover-delete.component.ts
index a475fdfd3e5..06d6096c3de 100644
--- a/apps/web/src/app/auth/verify-recover-delete.component.ts
+++ b/apps/web/src/app/auth/verify-recover-delete.component.ts
@@ -11,6 +11,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-verify-recover-delete",
   templateUrl: "verify-recover-delete.component.html",
diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
deleted file mode 100644
index 0c1a4270662..00000000000
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<ng-container *ngIf="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>
-<form
-  #form
-  [formGroup]="formGroup"
-  [appApiAction]="formPromise"
-  (ngSubmit)="submit()"
-  *ngIf="!loading"
->
-  <div class="tw-container tw-mb-3">
-    <div class="tw-mb-6">
-      <h2 class="tw-mb-3 tw-text-base tw-font-semibold">{{ "billingPlanLabel" | i18n }}</h2>
-      <div class="tw-mb-1 tw-items-center" *ngIf="annualPlan !== null">
-        <label class="tw- tw-block tw-text-main" for="annual">
-          <input
-            class="tw-size-4 tw-align-middle"
-            id="annual"
-            name="cadence"
-            type="radio"
-            [value]="annualCadence"
-            formControlName="cadence"
-          />
-          {{ "annual" | i18n }} -
-          {{ getPriceFor(annualCadence) | currency: "$" }}
-          /{{ "yr" | i18n }}
-        </label>
-      </div>
-      <div class="tw-mb-1 tw-items-center" *ngIf="monthlyPlan !== null">
-        <label class="tw- tw-block tw-text-main" for="monthly">
-          <input
-            class="tw-size-4 tw-align-middle"
-            id="monthly"
-            name="cadence"
-            type="radio"
-            [value]="monthlyCadence"
-            formControlName="cadence"
-          />
-          {{ "monthly" | i18n }} -
-          {{ getPriceFor(monthlyCadence) | currency: "$" }}
-          /{{ "monthAbbr" | i18n }}
-        </label>
-      </div>
-    </div>
-    <div class="tw-mb-4">
-      <h2 class="tw-mb-3 tw-text-base tw-font-semibold">{{ "paymentType" | i18n }}</h2>
-      <app-payment [showAccountCredit]="false"></app-payment>
-      <app-manage-tax-information
-        [showTaxIdField]="showTaxIdField"
-        (taxInformationChanged)="onTaxInformationChanged()"
-      ></app-manage-tax-information>
-
-      @if (trialLength === 0) {
-        @let priceLabel =
-          subscriptionProduct === SubscriptionProduct.PasswordManager
-            ? "passwordManagerPlanPrice"
-            : "secretsManagerPlanPrice";
-
-        <div id="price" class="tw-my-4">
-          <div class="tw-text-muted tw-text-base">
-            {{ priceLabel | i18n }}: {{ getPriceFor(formGroup.value.cadence) | currency: "USD $" }}
-            <div>
-              {{ "estimatedTax" | i18n }}:
-              @if (fetchingTaxAmount) {
-                <ng-container *ngTemplateOutlet="loadingSpinner" />
-              } @else {
-                {{ taxAmount | currency: "USD $" }}
-              }
-            </div>
-          </div>
-          <hr class="tw-my-1 tw-grid tw-grid-cols-3 tw-ml-0" />
-          <p class="tw-text-lg">
-            <strong>{{ "total" | i18n }}: </strong>
-            @if (fetchingTaxAmount) {
-              <ng-container *ngTemplateOutlet="loadingSpinner" />
-            } @else {
-              {{ total | currency: "USD $" }}/{{ interval | i18n }}
-            }
-          </p>
-        </div>
-      }
-    </div>
-    <div class="tw-flex tw-space-x-2">
-      <button type="submit" buttonType="primary" bitButton [loading]="form.loading">
-        {{ (trialLength > 0 ? "startTrial" : "submit") | i18n }}
-      </button>
-      <button bitButton type="button" buttonType="secondary" (click)="stepBack()">Back</button>
-    </div>
-  </div>
-</form>
-
-<ng-template #loadingSpinner>
-  <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-template>
diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
deleted file mode 100644
index 431f8882505..00000000000
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
+++ /dev/null
@@ -1,360 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import {
-  Component,
-  EventEmitter,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild,
-} from "@angular/core";
-import { FormBuilder, Validators } from "@angular/forms";
-import { firstValueFrom, from, Subject, switchMap, takeUntil } from "rxjs";
-
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import {
-  BillingInformation,
-  OrganizationBillingServiceAbstraction as OrganizationBillingService,
-  OrganizationInformation,
-  PaymentInformation,
-  PlanInformation,
-} from "@bitwarden/common/billing/abstractions/organization-billing.service";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import {
-  PaymentMethodType,
-  PlanType,
-  ProductTierType,
-  ProductType,
-} from "@bitwarden/common/billing/enums";
-import { PreviewTaxAmountForOrganizationTrialRequest } from "@bitwarden/common/billing/models/request/tax";
-import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { ToastService } from "@bitwarden/components";
-
-import { BillingSharedModule } from "../../shared";
-import { PaymentComponent } from "../../shared/payment/payment.component";
-
-export type TrialOrganizationType = Exclude<ProductTierType, ProductTierType.Free>;
-
-export interface OrganizationInfo {
-  name: string;
-  email: string;
-  type: TrialOrganizationType | null;
-}
-
-export interface OrganizationCreatedEvent {
-  organizationId: string;
-  planDescription: string;
-}
-
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-enum SubscriptionCadence {
-  Annual,
-  Monthly,
-}
-
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum SubscriptionProduct {
-  PasswordManager,
-  SecretsManager,
-}
-
-@Component({
-  selector: "app-trial-billing-step",
-  templateUrl: "trial-billing-step.component.html",
-  imports: [BillingSharedModule],
-})
-export class TrialBillingStepComponent implements OnInit, OnDestroy {
-  @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(ManageTaxInformationComponent) taxInfoComponent: ManageTaxInformationComponent;
-  @Input() organizationInfo: OrganizationInfo;
-  @Input() subscriptionProduct: SubscriptionProduct = SubscriptionProduct.PasswordManager;
-  @Input() trialLength: number;
-  @Output() steppedBack = new EventEmitter();
-  @Output() organizationCreated = new EventEmitter<OrganizationCreatedEvent>();
-
-  loading = true;
-  fetchingTaxAmount = false;
-
-  annualCadence = SubscriptionCadence.Annual;
-  monthlyCadence = SubscriptionCadence.Monthly;
-
-  formGroup = this.formBuilder.group({
-    cadence: [SubscriptionCadence.Annual, Validators.required],
-  });
-  formPromise: Promise<string>;
-
-  applicablePlans: PlanResponse[];
-  annualPlan?: PlanResponse;
-  monthlyPlan?: PlanResponse;
-
-  taxAmount = 0;
-
-  private destroy$ = new Subject<void>();
-
-  protected readonly SubscriptionProduct = SubscriptionProduct;
-
-  constructor(
-    private apiService: ApiService,
-    private i18nService: I18nService,
-    private formBuilder: FormBuilder,
-    private messagingService: MessagingService,
-    private organizationBillingService: OrganizationBillingService,
-    private toastService: ToastService,
-    private taxService: TaxServiceAbstraction,
-    private accountService: AccountService,
-  ) {}
-
-  async ngOnInit(): Promise<void> {
-    const plans = await this.apiService.getPlans();
-    this.applicablePlans = plans.data.filter(this.isApplicable);
-    this.annualPlan = this.findPlanFor(SubscriptionCadence.Annual);
-    this.monthlyPlan = this.findPlanFor(SubscriptionCadence.Monthly);
-
-    if (this.trialLength === 0) {
-      this.formGroup.controls.cadence.valueChanges
-        .pipe(
-          switchMap((cadence) => from(this.previewTaxAmount(cadence))),
-          takeUntil(this.destroy$),
-        )
-        .subscribe((taxAmount) => {
-          this.taxAmount = taxAmount;
-        });
-    }
-
-    this.loading = false;
-  }
-
-  ngOnDestroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  async submit(): Promise<void> {
-    if (!this.taxInfoComponent.validate()) {
-      return;
-    }
-
-    this.formPromise = this.createOrganization();
-
-    const organizationId = await this.formPromise;
-    const planDescription = this.getPlanDescription();
-
-    this.toastService.showToast({
-      variant: "success",
-      title: this.i18nService.t("organizationCreated"),
-      message: this.i18nService.t("organizationReadyToGo"),
-    });
-
-    this.organizationCreated.emit({
-      organizationId,
-      planDescription,
-    });
-
-    // TODO: No one actually listening to this?
-    this.messagingService.send("organizationCreated", { organizationId });
-  }
-
-  async onTaxInformationChanged() {
-    if (this.trialLength === 0) {
-      this.taxAmount = await this.previewTaxAmount(this.formGroup.value.cadence);
-    }
-
-    this.paymentComponent.showBankAccount =
-      this.taxInfoComponent.getTaxInformation().country === "US";
-    if (
-      !this.paymentComponent.showBankAccount &&
-      this.paymentComponent.selected === PaymentMethodType.BankAccount
-    ) {
-      this.paymentComponent.select(PaymentMethodType.Card);
-    }
-  }
-
-  protected getPriceFor(cadence: SubscriptionCadence): number {
-    const plan = this.findPlanFor(cadence);
-    return this.subscriptionProduct === SubscriptionProduct.PasswordManager
-      ? plan.PasswordManager.basePrice === 0
-        ? plan.PasswordManager.seatPrice
-        : plan.PasswordManager.basePrice
-      : plan.SecretsManager.basePrice === 0
-        ? plan.SecretsManager.seatPrice
-        : plan.SecretsManager.basePrice;
-  }
-
-  protected stepBack() {
-    this.steppedBack.emit();
-  }
-
-  private async createOrganization(): Promise<string> {
-    const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-    const planResponse = this.findPlanFor(this.formGroup.value.cadence);
-
-    const { type, token } = await this.paymentComponent.tokenize();
-    const paymentMethod: [string, PaymentMethodType] = [token, type];
-
-    const organization: OrganizationInformation = {
-      name: this.organizationInfo.name,
-      billingEmail: this.organizationInfo.email,
-      initiationPath:
-        this.subscriptionProduct === SubscriptionProduct.PasswordManager
-          ? "Password Manager trial from marketing website"
-          : "Secrets Manager trial from marketing website",
-    };
-
-    const plan: PlanInformation = {
-      type: planResponse.type,
-      passwordManagerSeats: 1,
-    };
-
-    if (this.subscriptionProduct === SubscriptionProduct.SecretsManager) {
-      plan.subscribeToSecretsManager = true;
-      plan.isFromSecretsManagerTrial = true;
-      plan.secretsManagerSeats = 1;
-    }
-
-    const payment: PaymentInformation = {
-      paymentMethod,
-      billing: this.getBillingInformationFromTaxInfoComponent(),
-      skipTrial: this.trialLength === 0,
-    };
-
-    const response = await this.organizationBillingService.purchaseSubscription(
-      {
-        organization,
-        plan,
-        payment,
-      },
-      activeUserId,
-    );
-
-    return response.id;
-  }
-
-  private productTypeToPlanTypeMap: {
-    [productType in TrialOrganizationType]: {
-      [cadence in SubscriptionCadence]?: PlanType;
-    };
-  } = {
-    [ProductTierType.Enterprise]: {
-      [SubscriptionCadence.Annual]: PlanType.EnterpriseAnnually,
-      [SubscriptionCadence.Monthly]: PlanType.EnterpriseMonthly,
-    },
-    [ProductTierType.Families]: {
-      [SubscriptionCadence.Annual]: PlanType.FamiliesAnnually,
-      // No monthly option for Families plan
-    },
-    [ProductTierType.Teams]: {
-      [SubscriptionCadence.Annual]: PlanType.TeamsAnnually,
-      [SubscriptionCadence.Monthly]: PlanType.TeamsMonthly,
-    },
-    [ProductTierType.TeamsStarter]: {
-      // No annual option for Teams Starter plan
-      [SubscriptionCadence.Monthly]: PlanType.TeamsStarter,
-    },
-  };
-
-  private findPlanFor(cadence: SubscriptionCadence): PlanResponse | null {
-    const productType = this.organizationInfo.type;
-    const planType = this.productTypeToPlanTypeMap[productType]?.[cadence];
-    return planType ? this.applicablePlans.find((plan) => plan.type === planType) : null;
-  }
-
-  protected get showTaxIdField(): boolean {
-    switch (this.organizationInfo.type) {
-      case ProductTierType.Families:
-        return false;
-      default:
-        return true;
-    }
-  }
-
-  private getBillingInformationFromTaxInfoComponent(): BillingInformation {
-    return {
-      postalCode: this.taxInfoComponent.getTaxInformation()?.postalCode,
-      country: this.taxInfoComponent.getTaxInformation()?.country,
-      taxId: this.taxInfoComponent.getTaxInformation()?.taxId,
-      addressLine1: this.taxInfoComponent.getTaxInformation()?.line1,
-      addressLine2: this.taxInfoComponent.getTaxInformation()?.line2,
-      city: this.taxInfoComponent.getTaxInformation()?.city,
-      state: this.taxInfoComponent.getTaxInformation()?.state,
-    };
-  }
-
-  private getPlanDescription(): string {
-    const plan = this.findPlanFor(this.formGroup.value.cadence);
-    const price =
-      this.subscriptionProduct === SubscriptionProduct.PasswordManager
-        ? plan.PasswordManager.basePrice === 0
-          ? plan.PasswordManager.seatPrice
-          : plan.PasswordManager.basePrice
-        : plan.SecretsManager.basePrice === 0
-          ? plan.SecretsManager.seatPrice
-          : plan.SecretsManager.basePrice;
-
-    switch (this.formGroup.value.cadence) {
-      case SubscriptionCadence.Annual:
-        return `${this.i18nService.t("annual")} ($${price}/${this.i18nService.t("yr")})`;
-      case SubscriptionCadence.Monthly:
-        return `${this.i18nService.t("monthly")} ($${price}/${this.i18nService.t("monthAbbr")})`;
-    }
-  }
-
-  private isApplicable(plan: PlanResponse): boolean {
-    const hasCorrectProductType =
-      plan.productTier === ProductTierType.Enterprise ||
-      plan.productTier === ProductTierType.Families ||
-      plan.productTier === ProductTierType.Teams ||
-      plan.productTier === ProductTierType.TeamsStarter;
-    const notDisabledOrLegacy = !plan.disabled && !plan.legacyYear;
-    return hasCorrectProductType && notDisabledOrLegacy;
-  }
-
-  private previewTaxAmount = async (cadence: SubscriptionCadence): Promise<number> => {
-    this.fetchingTaxAmount = true;
-
-    if (!this.taxInfoComponent.validate()) {
-      this.fetchingTaxAmount = false;
-      return 0;
-    }
-
-    const plan = this.findPlanFor(cadence);
-
-    const productType =
-      this.subscriptionProduct === SubscriptionProduct.PasswordManager
-        ? ProductType.PasswordManager
-        : ProductType.SecretsManager;
-
-    const taxInformation = this.taxInfoComponent.getTaxInformation();
-
-    const request: PreviewTaxAmountForOrganizationTrialRequest = {
-      planType: plan.type,
-      productType,
-      taxInformation: {
-        ...taxInformation,
-      },
-    };
-
-    const response = await this.taxService.previewTaxAmountForOrganizationTrial(request);
-    this.fetchingTaxAmount = false;
-    return response;
-  };
-
-  get price() {
-    return this.getPriceFor(this.formGroup.value.cadence);
-  }
-
-  get total() {
-    return this.price + this.taxAmount;
-  }
-
-  get interval() {
-    return this.formGroup.value.cadence === SubscriptionCadence.Annual ? "year" : "month";
-  }
-}
diff --git a/apps/web/src/app/billing/clients/account-billing.client.ts b/apps/web/src/app/billing/clients/account-billing.client.ts
new file mode 100644
index 00000000000..256a06b3ead
--- /dev/null
+++ b/apps/web/src/app/billing/clients/account-billing.client.ts
@@ -0,0 +1,34 @@
+import { Injectable } from "@angular/core";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+
+import {
+  BillingAddress,
+  NonTokenizedPaymentMethod,
+  TokenizedPaymentMethod,
+} from "../payment/types";
+
+@Injectable()
+export class AccountBillingClient {
+  private endpoint = "/account/billing/vnext";
+  private apiService: ApiService;
+
+  constructor(apiService: ApiService) {
+    this.apiService = apiService;
+  }
+
+  purchasePremiumSubscription = async (
+    paymentMethod: TokenizedPaymentMethod | NonTokenizedPaymentMethod,
+    billingAddress: Pick<BillingAddress, "country" | "postalCode">,
+  ): Promise<void> => {
+    const path = `${this.endpoint}/subscription`;
+
+    // Determine the request payload based on the payment method type
+    const isTokenizedPayment = "token" in paymentMethod;
+
+    const request = isTokenizedPayment
+      ? { tokenizedPaymentMethod: paymentMethod, billingAddress: billingAddress }
+      : { nonTokenizedPaymentMethod: paymentMethod, billingAddress: billingAddress };
+    await this.apiService.send("POST", path, request, true, true);
+  };
+}
diff --git a/apps/web/src/app/billing/clients/index.ts b/apps/web/src/app/billing/clients/index.ts
index ff962abcbf3..0251693a3b2 100644
--- a/apps/web/src/app/billing/clients/index.ts
+++ b/apps/web/src/app/billing/clients/index.ts
@@ -1,2 +1,4 @@
 export * from "./organization-billing.client";
 export * from "./subscriber-billing.client";
+export * from "./tax.client";
+export * from "./account-billing.client";
diff --git a/apps/web/src/app/billing/clients/subscriber-billing.client.ts b/apps/web/src/app/billing/clients/subscriber-billing.client.ts
index 18ca215ef0c..107a8ccc728 100644
--- a/apps/web/src/app/billing/clients/subscriber-billing.client.ts
+++ b/apps/web/src/app/billing/clients/subscriber-billing.client.ts
@@ -82,6 +82,24 @@ export class SubscriberBillingClient {
     return data ? new MaskedPaymentMethodResponse(data).value : null;
   };
 
+  restartSubscription = async (
+    subscriber: BitwardenSubscriber,
+    paymentMethod: TokenizedPaymentMethod,
+    billingAddress: BillingAddress,
+  ): Promise<void> => {
+    const path = `${this.getEndpoint(subscriber)}/subscription/restart`;
+    await this.apiService.send(
+      "POST",
+      path,
+      {
+        paymentMethod,
+        billingAddress,
+      },
+      true,
+      false,
+    );
+  };
+
   updateBillingAddress = async (
     subscriber: BitwardenSubscriber,
     billingAddress: BillingAddress,
diff --git a/apps/web/src/app/billing/clients/tax.client.ts b/apps/web/src/app/billing/clients/tax.client.ts
new file mode 100644
index 00000000000..09debd5a210
--- /dev/null
+++ b/apps/web/src/app/billing/clients/tax.client.ts
@@ -0,0 +1,131 @@
+import { Injectable } from "@angular/core";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { BillingAddress } from "@bitwarden/web-vault/app/billing/payment/types";
+
+class TaxAmountResponse extends BaseResponse implements TaxAmounts {
+  tax: number;
+  total: number;
+
+  constructor(response: any) {
+    super(response);
+
+    this.tax = this.getResponseProperty("Tax");
+    this.total = this.getResponseProperty("Total");
+  }
+}
+
+export type OrganizationSubscriptionPlan = {
+  tier: "families" | "teams" | "enterprise";
+  cadence: "annually" | "monthly";
+};
+
+export type OrganizationSubscriptionPurchase = OrganizationSubscriptionPlan & {
+  passwordManager: {
+    seats: number;
+    additionalStorage: number;
+    sponsored: boolean;
+  };
+  secretsManager?: {
+    seats: number;
+    additionalServiceAccounts: number;
+    standalone: boolean;
+  };
+};
+
+export type OrganizationSubscriptionUpdate = {
+  passwordManager?: {
+    seats?: number;
+    additionalStorage?: number;
+  };
+  secretsManager?: {
+    seats?: number;
+    additionalServiceAccounts?: number;
+  };
+};
+
+export interface TaxAmounts {
+  tax: number;
+  total: number;
+}
+
+@Injectable()
+export class TaxClient {
+  constructor(private apiService: ApiService) {}
+
+  previewTaxForOrganizationSubscriptionPurchase = async (
+    purchase: OrganizationSubscriptionPurchase,
+    billingAddress: BillingAddress,
+  ): Promise<TaxAmounts> => {
+    const json = await this.apiService.send(
+      "POST",
+      "/billing/tax/organizations/subscriptions/purchase",
+      {
+        purchase,
+        billingAddress,
+      },
+      true,
+      true,
+    );
+
+    return new TaxAmountResponse(json);
+  };
+
+  previewTaxForOrganizationSubscriptionPlanChange = async (
+    organizationId: string,
+    plan: {
+      tier: "families" | "teams" | "enterprise";
+      cadence: "annually" | "monthly";
+    },
+    billingAddress: BillingAddress | null,
+  ): Promise<TaxAmounts> => {
+    const json = await this.apiService.send(
+      "POST",
+      `/billing/tax/organizations/${organizationId}/subscription/plan-change`,
+      {
+        plan,
+        billingAddress,
+      },
+      true,
+      true,
+    );
+
+    return new TaxAmountResponse(json);
+  };
+
+  previewTaxForOrganizationSubscriptionUpdate = async (
+    organizationId: string,
+    update: OrganizationSubscriptionUpdate,
+  ): Promise<TaxAmounts> => {
+    const json = await this.apiService.send(
+      "POST",
+      `/billing/tax/organizations/${organizationId}/subscription/update`,
+      {
+        update,
+      },
+      true,
+      true,
+    );
+
+    return new TaxAmountResponse(json);
+  };
+
+  previewTaxForPremiumSubscriptionPurchase = async (
+    additionalStorage: number,
+    billingAddress: BillingAddress,
+  ): Promise<TaxAmounts> => {
+    const json = await this.apiService.send(
+      "POST",
+      `/billing/tax/premium/subscriptions/purchase`,
+      {
+        additionalStorage,
+        billingAddress,
+      },
+      true,
+      true,
+    );
+
+    return new TaxAmountResponse(json);
+  };
+}
diff --git a/apps/web/src/app/billing/guards/has-premium.guard.ts b/apps/web/src/app/billing/guards/has-premium.guard.ts
index 61853b25cb8..f10e75d8268 100644
--- a/apps/web/src/app/billing/guards/has-premium.guard.ts
+++ b/apps/web/src/app/billing/guards/has-premium.guard.ts
@@ -1,21 +1,21 @@
 import { inject } from "@angular/core";
 import {
   ActivatedRouteSnapshot,
-  RouterStateSnapshot,
-  Router,
   CanActivateFn,
+  Router,
+  RouterStateSnapshot,
   UrlTree,
 } from "@angular/router";
-import { Observable, of } from "rxjs";
+import { from, Observable, of } from "rxjs";
 import { switchMap, tap } from "rxjs/operators";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 
 /**
- * CanActivate guard that checks if the user has premium and otherwise triggers the "premiumRequired"
- * message and blocks navigation.
+ * CanActivate guard that checks if the user has premium and otherwise triggers the premium upgrade
+ * flow and blocks navigation.
  */
 export function hasPremiumGuard(): CanActivateFn {
   return (
@@ -23,7 +23,7 @@ export function hasPremiumGuard(): CanActivateFn {
     _state: RouterStateSnapshot,
   ): Observable<boolean | UrlTree> => {
     const router = inject(Router);
-    const messagingService = inject(MessagingService);
+    const premiumUpgradePromptService = inject(PremiumUpgradePromptService);
     const billingAccountProfileStateService = inject(BillingAccountProfileStateService);
     const accountService = inject(AccountService);
 
@@ -33,10 +33,14 @@ export function hasPremiumGuard(): CanActivateFn {
           ? billingAccountProfileStateService.hasPremiumFromAnySource$(account.id)
           : of(false),
       ),
-      tap((userHasPremium: boolean) => {
+      switchMap((userHasPremium: boolean) => {
+        // Can't call async method inside observables so instead, wait for service then switch back to the boolean
         if (!userHasPremium) {
-          messagingService.send("premiumRequired");
+          return from(premiumUpgradePromptService.promptForPremium()).pipe(
+            switchMap(() => of(userHasPremium)),
+          );
         }
+        return of(userHasPremium);
       }),
       // Prevent trapping the user on the login page, since that's an awful UX flow
       tap((userHasPremium: boolean) => {
diff --git a/apps/web/src/app/billing/index.ts b/apps/web/src/app/billing/index.ts
index 217f1e05be9..a3047bbab6a 100644
--- a/apps/web/src/app/billing/index.ts
+++ b/apps/web/src/app/billing/index.ts
@@ -1,2 +1 @@
 export { OrganizationPlansComponent } from "./organizations";
-export { TaxInfoComponent } from "./shared";
diff --git a/apps/web/src/app/billing/individual/billing-history-view.component.ts b/apps/web/src/app/billing/individual/billing-history-view.component.ts
index d615e01d0db..607a35baa94 100644
--- a/apps/web/src/app/billing/individual/billing-history-view.component.ts
+++ b/apps/web/src/app/billing/individual/billing-history-view.component.ts
@@ -10,6 +10,8 @@ import {
 } from "@bitwarden/common/billing/models/response/billing.response";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "billing-history-view.component.html",
   standalone: false,
diff --git a/apps/web/src/app/billing/individual/index.ts b/apps/web/src/app/billing/individual/index.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/apps/web/src/app/billing/individual/individual-billing-routing.module.ts b/apps/web/src/app/billing/individual/individual-billing-routing.module.ts
index 87b342ed997..cdccaaab8ab 100644
--- a/apps/web/src/app/billing/individual/individual-billing-routing.module.ts
+++ b/apps/web/src/app/billing/individual/individual-billing-routing.module.ts
@@ -1,12 +1,16 @@
-import { NgModule } from "@angular/core";
+import { inject, NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
+import { map } from "rxjs";
 
+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 { AccountPaymentDetailsComponent } from "@bitwarden/web-vault/app/billing/individual/payment-details/account-payment-details.component";
-
-import { PaymentMethodComponent } from "../shared";
+import { SelfHostedPremiumComponent } from "@bitwarden/web-vault/app/billing/individual/premium/self-hosted-premium.component";
 
 import { BillingHistoryViewComponent } from "./billing-history-view.component";
-import { PremiumComponent } from "./premium/premium.component";
+import { CloudHostedPremiumVNextComponent } from "./premium/cloud-hosted-premium-vnext.component";
+import { CloudHostedPremiumComponent } from "./premium/cloud-hosted-premium.component";
 import { SubscriptionComponent } from "./subscription.component";
 import { UserSubscriptionComponent } from "./user-subscription.component";
 
@@ -22,15 +26,54 @@ const routes: Routes = [
         component: UserSubscriptionComponent,
         data: { titleId: "premiumMembership" },
       },
+      /**
+       * Three-Route Matching Strategy for /premium:
+       *
+       * Routes are evaluated in order using canMatch guards. The first route that matches will be selected.
+       *
+       * 1. Self-Hosted Environment → SelfHostedPremiumComponent
+       *    - Matches when platformUtilsService.isSelfHost() === true
+       *
+       * 2. Cloud-Hosted + Feature Flag Enabled → CloudHostedPremiumVNextComponent
+       *    - Only evaluated if Route 1 doesn't match (not self-hosted)
+       *    - Matches when PM24033PremiumUpgradeNewDesign feature flag === true
+       *
+       * 3. Cloud-Hosted + Feature Flag Disabled → CloudHostedPremiumComponent (Fallback)
+       *    - No canMatch guard, so this always matches as the fallback route
+       *    - Used when neither Route 1 nor Route 2 match
+       */
+      // Route 1: Self-Hosted -> SelfHostedPremiumComponent
       {
         path: "premium",
-        component: PremiumComponent,
+        component: SelfHostedPremiumComponent,
         data: { titleId: "goPremium" },
+        canMatch: [
+          () => {
+            const platformUtilsService = inject(PlatformUtilsService);
+            return platformUtilsService.isSelfHost();
+          },
+        ],
       },
+      // Route 2: Cloud Hosted + FF -> CloudHostedPremiumVNextComponent
       {
-        path: "payment-method",
-        component: PaymentMethodComponent,
-        data: { titleId: "paymentMethod" },
+        path: "premium",
+        component: CloudHostedPremiumVNextComponent,
+        data: { titleId: "goPremium" },
+        canMatch: [
+          () => {
+            const configService = inject(ConfigService);
+
+            return configService
+              .getFeatureFlag$(FeatureFlag.PM24033PremiumUpgradeNewDesign)
+              .pipe(map((flagValue) => flagValue === true));
+          },
+        ],
+      },
+      // Route 3: Cloud Hosted + FF Disabled -> CloudHostedPremiumComponent (Fallback)
+      {
+        path: "premium",
+        component: CloudHostedPremiumComponent,
+        data: { titleId: "goPremium" },
       },
       {
         path: "payment-details",
diff --git a/apps/web/src/app/billing/individual/individual-billing.module.ts b/apps/web/src/app/billing/individual/individual-billing.module.ts
index ad75da00c99..200df5d9f07 100644
--- a/apps/web/src/app/billing/individual/individual-billing.module.ts
+++ b/apps/web/src/app/billing/individual/individual-billing.module.ts
@@ -1,21 +1,34 @@
 import { NgModule } from "@angular/core";
 
+import { PricingCardComponent } from "@bitwarden/pricing";
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+
 import { HeaderModule } from "../../layouts/header/header.module";
 import { BillingSharedModule } from "../shared";
 
 import { BillingHistoryViewComponent } from "./billing-history-view.component";
 import { IndividualBillingRoutingModule } from "./individual-billing-routing.module";
-import { PremiumComponent } from "./premium/premium.component";
+import { CloudHostedPremiumComponent } from "./premium/cloud-hosted-premium.component";
 import { SubscriptionComponent } from "./subscription.component";
 import { UserSubscriptionComponent } from "./user-subscription.component";
 
 @NgModule({
-  imports: [IndividualBillingRoutingModule, BillingSharedModule, HeaderModule],
+  imports: [
+    IndividualBillingRoutingModule,
+    BillingSharedModule,
+    HeaderModule,
+    EnterPaymentMethodComponent,
+    EnterBillingAddressComponent,
+    PricingCardComponent,
+  ],
   declarations: [
     SubscriptionComponent,
     BillingHistoryViewComponent,
     UserSubscriptionComponent,
-    PremiumComponent,
+    CloudHostedPremiumComponent,
   ],
 })
 export class IndividualBillingModule {}
diff --git a/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.ts b/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.ts
index 9f46d9d3909..8c061894fac 100644
--- a/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.ts
+++ b/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.ts
@@ -1,22 +1,7 @@
 import { Component } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-import {
-  BehaviorSubject,
-  EMPTY,
-  filter,
-  from,
-  map,
-  merge,
-  Observable,
-  shareReplay,
-  switchMap,
-  tap,
-} from "rxjs";
-import { catchError } from "rxjs/operators";
+import { BehaviorSubject, filter, merge, Observable, shareReplay, switchMap, tap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { HeaderModule } from "../../../layouts/header/header.module";
 import { SharedModule } from "../../../shared";
@@ -28,19 +13,14 @@ import {
 import { MaskedPaymentMethod } from "../../payment/types";
 import { mapAccountToSubscriber, BitwardenSubscriber } from "../../types";
 
-class RedirectError {
-  constructor(
-    public path: string[],
-    public relativeTo: ActivatedRoute,
-  ) {}
-}
-
 type View = {
   account: BitwardenSubscriber;
   paymentMethod: MaskedPaymentMethod | null;
   credit: number | null;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./account-payment-details.component.html",
   standalone: true,
@@ -56,23 +36,11 @@ export class AccountPaymentDetailsComponent {
   private viewState$ = new BehaviorSubject<View | null>(null);
 
   private load$: Observable<View> = this.accountService.activeAccount$.pipe(
-    switchMap((account) =>
-      this.configService
-        .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
-        .pipe(
-          map((managePaymentDetailsOutsideCheckout) => {
-            if (!managePaymentDetailsOutsideCheckout) {
-              throw new RedirectError(["../payment-method"], this.activatedRoute);
-            }
-            return account;
-          }),
-        ),
-    ),
     mapAccountToSubscriber,
     switchMap(async (account) => {
       const [paymentMethod, credit] = await Promise.all([
-        this.billingClient.getPaymentMethod(account),
-        this.billingClient.getCredit(account),
+        this.subscriberBillingClient.getPaymentMethod(account),
+        this.subscriberBillingClient.getCredit(account),
       ]);
 
       return {
@@ -82,14 +50,6 @@ export class AccountPaymentDetailsComponent {
       };
     }),
     shareReplay({ bufferSize: 1, refCount: false }),
-    catchError((error: unknown) => {
-      if (error instanceof RedirectError) {
-        return from(this.router.navigate(error.path, { relativeTo: error.relativeTo })).pipe(
-          switchMap(() => EMPTY),
-        );
-      }
-      throw error;
-    }),
   );
 
   view$: Observable<View> = merge(
@@ -99,10 +59,7 @@ export class AccountPaymentDetailsComponent {
 
   constructor(
     private accountService: AccountService,
-    private activatedRoute: ActivatedRoute,
-    private billingClient: SubscriberBillingClient,
-    private configService: ConfigService,
-    private router: Router,
+    private subscriberBillingClient: SubscriberBillingClient,
   ) {}
 
   setPaymentMethod = (paymentMethod: MaskedPaymentMethod) => {
diff --git a/apps/web/src/app/billing/individual/premium/cloud-hosted-premium-vnext.component.html b/apps/web/src/app/billing/individual/premium/cloud-hosted-premium-vnext.component.html
new file mode 100644
index 00000000000..6b168901b2e
--- /dev/null
+++ b/apps/web/src/app/billing/individual/premium/cloud-hosted-premium-vnext.component.html
@@ -0,0 +1,68 @@
+<div class="tw-max-w-3xl tw-mx-auto">
+  <bit-section *ngIf="shouldShowNewDesign$ | async">
+    <div class="tw-text-center">
+      <div class="tw-mt-8 tw-mb-6">
+        <span bitBadge variant="secondary" [truncate]="false">
+          {{ "bitwardenFreeplanMessage" | i18n }}
+        </span>
+      </div>
+
+      <h2 class="tw-mt-2 tw-text-4xl">
+        {{ "upgradeCompleteSecurity" | i18n }}
+      </h2>
+      <p class="tw-text-muted tw-mb-6 tw-mt-4">
+        {{ "individualUpgradeDescriptionMessage" | i18n }}
+      </p>
+    </div>
+
+    <!-- Two-Card Layout -->
+    <div class="tw-grid tw-grid-cols-1 md:tw-grid-cols-2 tw-gap-6 tw-mt-6 tw-justify-center">
+      <!-- Premium Card -->
+      <div>
+        @if (premiumCardData$ | async; as premiumData) {
+          <billing-pricing-card
+            [tagline]="'planDescPremium' | i18n"
+            [price]="{ amount: premiumData.price, cadence: 'monthly' }"
+            [button]="{ type: 'primary', text: ('upgradeToPremium' | i18n) }"
+            [features]="premiumData.features"
+            (buttonClick)="openUpgradeDialog('Premium')"
+          >
+            <h3 slot="title" bitTypography="h3" class="tw-m-0">{{ "premium" | i18n }}</h3>
+          </billing-pricing-card>
+        }
+      </div>
+
+      <!-- Families Card -->
+      <div>
+        @if (familiesCardData$ | async; as familiesData) {
+          <billing-pricing-card
+            [tagline]="'planDescFamiliesV2' | i18n"
+            [price]="{ amount: familiesData.price, cadence: 'monthly' }"
+            [button]="{ type: 'secondary', text: ('startFreeFamiliesTrial' | i18n) }"
+            [features]="familiesData.features"
+            (buttonClick)="openUpgradeDialog('Families')"
+          >
+            <h3 slot="title" bitTypography="h3" class="tw-m-0">{{ "families" | i18n }}</h3>
+          </billing-pricing-card>
+        }
+      </div>
+    </div>
+
+    <!-- Business Plans Link -->
+    <div class="tw-text-center tw-mt-6">
+      <p class="tw-text-muted tw-mb-2 tw-italic">
+        {{ "individualUpgradeTaxInformationMessage" | i18n }}
+      </p>
+      <a
+        bitLink
+        linkType="primary"
+        href="https://bitwarden.com/pricing/business/"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {{ "viewbusinessplans" | i18n }}
+        <i class="bwi bwi-external-link tw-ml-1" aria-hidden="true"></i>
+      </a>
+    </div>
+  </bit-section>
+</div>
diff --git a/apps/web/src/app/billing/individual/premium/cloud-hosted-premium-vnext.component.ts b/apps/web/src/app/billing/individual/premium/cloud-hosted-premium-vnext.component.ts
new file mode 100644
index 00000000000..d78451e4f3a
--- /dev/null
+++ b/apps/web/src/app/billing/individual/premium/cloud-hosted-premium-vnext.component.ts
@@ -0,0 +1,242 @@
+import { CommonModule } from "@angular/common";
+import { Component, DestroyRef, inject } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  combineLatest,
+  firstValueFrom,
+  from,
+  map,
+  Observable,
+  of,
+  shareReplay,
+  switchMap,
+  take,
+} from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { SubscriptionPricingServiceAbstraction } from "@bitwarden/common/billing/abstractions/subscription-pricing.service.abstraction";
+import {
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { SyncService } from "@bitwarden/common/platform/sync";
+import {
+  BadgeModule,
+  DialogService,
+  LinkModule,
+  SectionComponent,
+  TypographyModule,
+} from "@bitwarden/components";
+import { PricingCardComponent } from "@bitwarden/pricing";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import { BitwardenSubscriber, mapAccountToSubscriber } from "../../types";
+import {
+  UnifiedUpgradeDialogComponent,
+  UnifiedUpgradeDialogParams,
+  UnifiedUpgradeDialogResult,
+  UnifiedUpgradeDialogStatus,
+  UnifiedUpgradeDialogStep,
+} from "../upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component";
+
+const RouteParams = {
+  callToAction: "callToAction",
+} as const;
+const RouteParamValues = {
+  upgradeToPremium: "upgradeToPremium",
+} as const;
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  templateUrl: "./cloud-hosted-premium-vnext.component.html",
+  standalone: true,
+  imports: [
+    CommonModule,
+    SectionComponent,
+    BadgeModule,
+    TypographyModule,
+    LinkModule,
+    I18nPipe,
+    PricingCardComponent,
+  ],
+})
+export class CloudHostedPremiumVNextComponent {
+  protected hasPremiumFromAnyOrganization$: Observable<boolean>;
+  protected hasPremiumPersonally$: Observable<boolean>;
+  protected shouldShowNewDesign$: Observable<boolean>;
+  protected shouldShowUpgradeDialogOnInit$: Observable<boolean>;
+  protected personalPricingTiers$: Observable<PersonalSubscriptionPricingTier[]>;
+  protected premiumCardData$: Observable<{
+    tier: PersonalSubscriptionPricingTier | undefined;
+    price: number;
+    features: string[];
+  }>;
+  protected familiesCardData$: Observable<{
+    tier: PersonalSubscriptionPricingTier | undefined;
+    price: number;
+    features: string[];
+  }>;
+  protected subscriber!: BitwardenSubscriber;
+  private destroyRef = inject(DestroyRef);
+
+  constructor(
+    private accountService: AccountService,
+    private apiService: ApiService,
+    private dialogService: DialogService,
+    private syncService: SyncService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private subscriptionPricingService: SubscriptionPricingServiceAbstraction,
+    private router: Router,
+    private activatedRoute: ActivatedRoute,
+  ) {
+    this.hasPremiumFromAnyOrganization$ = this.accountService.activeAccount$.pipe(
+      switchMap((account) =>
+        account
+          ? this.billingAccountProfileStateService.hasPremiumFromAnyOrganization$(account.id)
+          : of(false),
+      ),
+    );
+
+    this.hasPremiumPersonally$ = this.accountService.activeAccount$.pipe(
+      switchMap((account) =>
+        account
+          ? this.billingAccountProfileStateService.hasPremiumPersonally$(account.id)
+          : of(false),
+      ),
+    );
+
+    this.accountService.activeAccount$
+      .pipe(mapAccountToSubscriber, takeUntilDestroyed(this.destroyRef))
+      .subscribe((subscriber) => {
+        this.subscriber = subscriber;
+      });
+
+    this.shouldShowNewDesign$ = combineLatest([
+      this.hasPremiumFromAnyOrganization$,
+      this.hasPremiumPersonally$,
+    ]).pipe(map(([hasOrgPremium, hasPersonalPremium]) => !hasOrgPremium && !hasPersonalPremium));
+
+    // redirect to user subscription page if they already have premium personally
+    // redirect to individual vault if they already have premium from an org
+    combineLatest([this.hasPremiumFromAnyOrganization$, this.hasPremiumPersonally$])
+      .pipe(
+        takeUntilDestroyed(this.destroyRef),
+        switchMap(([hasPremiumFromOrg, hasPremiumPersonally]) => {
+          if (hasPremiumPersonally) {
+            return from(this.navigateToSubscriptionPage());
+          }
+          if (hasPremiumFromOrg) {
+            return from(this.navigateToIndividualVault());
+          }
+          return of(true);
+        }),
+      )
+      .subscribe();
+
+    this.shouldShowUpgradeDialogOnInit$ = combineLatest([
+      this.hasPremiumFromAnyOrganization$,
+      this.hasPremiumPersonally$,
+      this.activatedRoute.queryParams,
+    ]).pipe(
+      map(([hasOrgPremium, hasPersonalPremium, queryParams]) => {
+        const cta = queryParams[RouteParams.callToAction];
+        return !hasOrgPremium && !hasPersonalPremium && cta === RouteParamValues.upgradeToPremium;
+      }),
+    );
+
+    this.personalPricingTiers$ =
+      this.subscriptionPricingService.getPersonalSubscriptionPricingTiers$();
+
+    this.premiumCardData$ = this.personalPricingTiers$.pipe(
+      map((tiers) => {
+        const tier = tiers.find((t) => t.id === PersonalSubscriptionPricingTierIds.Premium);
+        return {
+          tier,
+          price:
+            tier?.passwordManager.type === "standalone"
+              ? Number((tier.passwordManager.annualPrice / 12).toFixed(2))
+              : 0,
+          features: tier?.passwordManager.features.map((f) => f.value) || [],
+        };
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+
+    this.familiesCardData$ = this.personalPricingTiers$.pipe(
+      map((tiers) => {
+        const tier = tiers.find((t) => t.id === PersonalSubscriptionPricingTierIds.Families);
+        return {
+          tier,
+          price:
+            tier?.passwordManager.type === "packaged"
+              ? Number((tier.passwordManager.annualPrice / 12).toFixed(2))
+              : 0,
+          features: tier?.passwordManager.features.map((f) => f.value) || [],
+        };
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+
+    this.shouldShowUpgradeDialogOnInit$
+      .pipe(
+        take(1),
+        switchMap((shouldShowUpgradeDialogOnInit) => {
+          if (shouldShowUpgradeDialogOnInit) {
+            return from(this.openUpgradeDialog("Premium"));
+          }
+          // Return an Observable that completes immediately when dialog should not be shown
+          return of(void 0);
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe();
+  }
+
+  private navigateToSubscriptionPage = (): Promise<boolean> =>
+    this.router.navigate(["../user-subscription"], { relativeTo: this.activatedRoute });
+
+  private navigateToIndividualVault = (): Promise<boolean> => this.router.navigate(["/vault"]);
+
+  finalizeUpgrade = async () => {
+    await this.apiService.refreshIdentityToken();
+    await this.syncService.fullSync(true);
+  };
+
+  protected async openUpgradeDialog(planType: "Premium" | "Families"): Promise<void> {
+    const account = await firstValueFrom(this.accountService.activeAccount$);
+    if (!account) {
+      return;
+    }
+
+    const selectedPlan =
+      planType === "Premium"
+        ? PersonalSubscriptionPricingTierIds.Premium
+        : PersonalSubscriptionPricingTierIds.Families;
+
+    const dialogParams: UnifiedUpgradeDialogParams = {
+      account,
+      initialStep: UnifiedUpgradeDialogStep.Payment,
+      selectedPlan: selectedPlan,
+      redirectOnCompletion: true,
+    };
+
+    const dialogRef = UnifiedUpgradeDialogComponent.open(this.dialogService, {
+      data: dialogParams,
+    });
+
+    dialogRef.closed
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((result: UnifiedUpgradeDialogResult | undefined) => {
+        if (
+          result?.status === UnifiedUpgradeDialogStatus.UpgradedToPremium ||
+          result?.status === UnifiedUpgradeDialogStatus.UpgradedToFamilies
+        ) {
+          void this.finalizeUpgrade();
+        }
+      });
+  }
+}
diff --git a/apps/web/src/app/billing/individual/premium/cloud-hosted-premium.component.html b/apps/web/src/app/billing/individual/premium/cloud-hosted-premium.component.html
new file mode 100644
index 00000000000..63c26bd61f1
--- /dev/null
+++ b/apps/web/src/app/billing/individual/premium/cloud-hosted-premium.component.html
@@ -0,0 +1,138 @@
+@if (isLoadingPrices$ | async) {
+  <ng-container>
+    <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>
+} @else {
+  <bit-container>
+    <bit-section>
+      <h2 bitTypography="h2">{{ "goPremium" | i18n }}</h2>
+      <bit-callout
+        type="info"
+        *ngIf="hasPremiumFromAnyOrganization$ | async"
+        title="{{ 'youHavePremiumAccess' | i18n }}"
+        icon="bwi bwi-star-f"
+      >
+        {{ "alreadyPremiumFromOrg" | i18n }}
+      </bit-callout>
+      <bit-callout type="success">
+        <p>{{ "premiumUpgradeUnlockFeatures" | i18n }}</p>
+        <ul class="bwi-ul">
+          <li>
+            <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+            {{ "premiumSignUpStorage" | i18n }}
+          </li>
+          <li>
+            <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+            {{ "premiumSignUpTwoStepOptions" | i18n }}
+          </li>
+          <li>
+            <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+            {{ "premiumSignUpEmergency" | i18n }}
+          </li>
+          <li>
+            <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+            {{ "premiumSignUpReports" | i18n }}
+          </li>
+          <li>
+            <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+            {{ "premiumSignUpTotp" | i18n }}
+          </li>
+          <li>
+            <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+            {{ "premiumSignUpSupport" | i18n }}
+          </li>
+          <li>
+            <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+            {{ "premiumSignUpFuture" | i18n }}
+          </li>
+        </ul>
+        <p bitTypography="body1" class="tw-mb-0">
+          {{
+            "premiumPriceWithFamilyPlan"
+              | i18n: (premiumPrice$ | async | currency: "$") : familyPlanMaxUserCount
+          }}
+          <a
+            bitLink
+            linkType="primary"
+            routerLink="/create-organization"
+            [queryParams]="{ plan: 'families' }"
+          >
+            {{ "bitwardenFamiliesPlan" | i18n }}
+          </a>
+        </p>
+      </bit-callout>
+    </bit-section>
+    <form [formGroup]="formGroup" [bitSubmit]="submitPayment">
+      <bit-section>
+        <h2 bitTypography="h2">{{ "addons" | i18n }}</h2>
+        <div class="tw-grid tw-grid-cols-12 tw-gap-4">
+          <bit-form-field class="tw-col-span-6">
+            <bit-label>{{ "additionalStorageGb" | i18n }}</bit-label>
+            <input
+              bitInput
+              formControlName="additionalStorage"
+              type="number"
+              step="1"
+              placeholder="{{ 'additionalStorageGbDesc' | i18n }}"
+            />
+            <bit-hint>{{
+              "additionalStorageIntervalDesc"
+                | i18n: "1 GB" : (storagePrice$ | async | currency: "$") : ("year" | i18n)
+            }}</bit-hint>
+          </bit-form-field>
+        </div>
+      </bit-section>
+      <bit-section>
+        <h2 bitTypography="h2">{{ "summary" | i18n }}</h2>
+        {{ "premiumMembership" | i18n }}: {{ premiumPrice$ | async | currency: "$" }} <br />
+        {{ "additionalStorageGb" | i18n }}: {{ formGroup.value.additionalStorage || 0 }} GB &times;
+        {{ storagePrice$ | async | currency: "$" }} =
+        {{ storageCost$ | async | currency: "$" }}
+        <hr class="tw-my-3" />
+      </bit-section>
+      <bit-section>
+        <h3 bitTypography="h2">{{ "paymentInformation" | i18n }}</h3>
+        <div class="tw-mb-4">
+          <app-enter-payment-method
+            [group]="formGroup.controls.paymentMethod"
+            [showBankAccount]="false"
+            [showAccountCredit]="true"
+            [hasEnoughAccountCredit]="hasEnoughAccountCredit$ | async"
+          >
+          </app-enter-payment-method>
+          <app-enter-billing-address
+            [group]="formGroup.controls.billingAddress"
+            [scenario]="{ type: 'checkout', supportsTaxId: false }"
+          >
+          </app-enter-billing-address>
+        </div>
+        <div class="tw-mb-4">
+          <div class="tw-text-muted tw-text-sm tw-flex tw-flex-col">
+            <span>{{ "planPrice" | i18n }}: {{ subtotal$ | async | currency: "USD $" }}</span>
+            <span>{{ "estimatedTax" | i18n }}: {{ tax$ | async | currency: "USD $" }}</span>
+          </div>
+        </div>
+        <hr class="tw-my-1 tw-w-1/4 tw-ml-0" />
+        <p bitTypography="body1">
+          <strong>{{ "total" | i18n }}:</strong> {{ total$ | async | currency: "USD $" }}/{{
+            "year" | i18n
+          }}
+        </p>
+        <button
+          type="submit"
+          buttonType="primary"
+          bitButton
+          bitFormButton
+          [disabled]="!(hasEnoughAccountCredit$ | async)"
+        >
+          {{ "submit" | i18n }}
+        </button>
+      </bit-section>
+    </form>
+  </bit-container>
+}
diff --git a/apps/web/src/app/billing/individual/premium/cloud-hosted-premium.component.ts b/apps/web/src/app/billing/individual/premium/cloud-hosted-premium.component.ts
new file mode 100644
index 00000000000..fceeeedf170
--- /dev/null
+++ b/apps/web/src/app/billing/individual/premium/cloud-hosted-premium.component.ts
@@ -0,0 +1,240 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { Component, ViewChild } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  catchError,
+  combineLatest,
+  concatMap,
+  filter,
+  from,
+  map,
+  Observable,
+  of,
+  shareReplay,
+  startWith,
+  switchMap,
+} from "rxjs";
+import { debounceTime } from "rxjs/operators";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+import { DefaultSubscriptionPricingService } from "@bitwarden/common/billing/services/subscription-pricing.service";
+import { PersonalSubscriptionPricingTierIds } from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SyncService } from "@bitwarden/common/platform/sync";
+import { ToastService } from "@bitwarden/components";
+import { SubscriberBillingClient, TaxClient } from "@bitwarden/web-vault/app/billing/clients";
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+  getBillingAddressFromForm,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+import {
+  NonTokenizablePaymentMethods,
+  tokenizablePaymentMethodToLegacyEnum,
+} from "@bitwarden/web-vault/app/billing/payment/types";
+import { mapAccountToSubscriber } from "@bitwarden/web-vault/app/billing/types";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  templateUrl: "./cloud-hosted-premium.component.html",
+  standalone: false,
+  providers: [SubscriberBillingClient, TaxClient],
+})
+export class CloudHostedPremiumComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
+
+  protected hasPremiumFromAnyOrganization$: Observable<boolean>;
+  protected hasEnoughAccountCredit$: Observable<boolean>;
+
+  protected formGroup = new FormGroup({
+    additionalStorage: new FormControl<number>(0, [Validators.min(0), Validators.max(99)]),
+    paymentMethod: EnterPaymentMethodComponent.getFormGroup(),
+    billingAddress: EnterBillingAddressComponent.getFormGroup(),
+  });
+
+  premiumPrices$ = this.subscriptionPricingService.getPersonalSubscriptionPricingTiers$().pipe(
+    map((tiers) => {
+      const premiumPlan = tiers.find(
+        (tier) => tier.id === PersonalSubscriptionPricingTierIds.Premium,
+      );
+
+      if (!premiumPlan) {
+        throw new Error("Could not find Premium plan");
+      }
+
+      return {
+        seat: premiumPlan.passwordManager.annualPrice,
+        storage: premiumPlan.passwordManager.annualPricePerAdditionalStorageGB,
+      };
+    }),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
+  premiumPrice$ = this.premiumPrices$.pipe(map((prices) => prices.seat));
+
+  storagePrice$ = this.premiumPrices$.pipe(map((prices) => prices.storage));
+
+  protected isLoadingPrices$ = this.premiumPrices$.pipe(
+    map(() => false),
+    startWith(true),
+    catchError(() => of(false)),
+  );
+
+  storageCost$ = combineLatest([
+    this.storagePrice$,
+    this.formGroup.controls.additionalStorage.valueChanges.pipe(
+      startWith(this.formGroup.value.additionalStorage),
+    ),
+  ]).pipe(map(([storagePrice, additionalStorage]) => storagePrice * additionalStorage));
+
+  subtotal$ = combineLatest([this.premiumPrice$, this.storageCost$]).pipe(
+    map(([premiumPrice, storageCost]) => premiumPrice + storageCost),
+  );
+
+  tax$ = this.formGroup.valueChanges.pipe(
+    filter(() => this.formGroup.valid),
+    debounceTime(1000),
+    switchMap(async () => {
+      const billingAddress = getBillingAddressFromForm(this.formGroup.controls.billingAddress);
+      const taxAmounts = await this.taxClient.previewTaxForPremiumSubscriptionPurchase(
+        this.formGroup.value.additionalStorage,
+        billingAddress,
+      );
+      return taxAmounts.tax;
+    }),
+    startWith(0),
+  );
+
+  total$ = combineLatest([this.subtotal$, this.tax$]).pipe(
+    map(([subtotal, tax]) => subtotal + tax),
+  );
+
+  protected cloudWebVaultURL: string;
+  protected readonly familyPlanMaxUserCount = 6;
+
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private apiService: ApiService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private environmentService: EnvironmentService,
+    private i18nService: I18nService,
+    private router: Router,
+    private syncService: SyncService,
+    private toastService: ToastService,
+    private accountService: AccountService,
+    private subscriberBillingClient: SubscriberBillingClient,
+    private taxClient: TaxClient,
+    private subscriptionPricingService: DefaultSubscriptionPricingService,
+  ) {
+    this.hasPremiumFromAnyOrganization$ = this.accountService.activeAccount$.pipe(
+      switchMap((account) =>
+        this.billingAccountProfileStateService.hasPremiumFromAnyOrganization$(account.id),
+      ),
+    );
+
+    const accountCredit$ = this.accountService.activeAccount$.pipe(
+      mapAccountToSubscriber,
+      switchMap((account) => this.subscriberBillingClient.getCredit(account)),
+    );
+
+    this.hasEnoughAccountCredit$ = combineLatest([
+      accountCredit$,
+      this.total$,
+      this.formGroup.controls.paymentMethod.controls.type.valueChanges.pipe(
+        startWith(this.formGroup.value.paymentMethod.type),
+      ),
+    ]).pipe(
+      map(([credit, total, paymentMethod]) => {
+        if (paymentMethod !== NonTokenizablePaymentMethods.accountCredit) {
+          return true;
+        }
+        return credit >= total;
+      }),
+    );
+
+    combineLatest([
+      this.accountService.activeAccount$.pipe(
+        switchMap((account) =>
+          this.billingAccountProfileStateService.hasPremiumPersonally$(account.id),
+        ),
+      ),
+      this.environmentService.cloudWebVaultUrl$,
+    ])
+      .pipe(
+        takeUntilDestroyed(),
+        concatMap(([hasPremiumPersonally, cloudWebVaultURL]) => {
+          if (hasPremiumPersonally) {
+            return from(this.navigateToSubscriptionPage());
+          }
+
+          this.cloudWebVaultURL = cloudWebVaultURL;
+          return of(true);
+        }),
+      )
+      .subscribe();
+  }
+
+  finalizeUpgrade = async () => {
+    await this.apiService.refreshIdentityToken();
+    await this.syncService.fullSync(true);
+  };
+
+  postFinalizeUpgrade = async () => {
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("premiumUpdated"),
+    });
+    await this.navigateToSubscriptionPage();
+  };
+
+  navigateToSubscriptionPage = (): Promise<boolean> =>
+    this.router.navigate(["../user-subscription"], { relativeTo: this.activatedRoute });
+
+  submitPayment = async (): Promise<void> => {
+    if (this.formGroup.invalid) {
+      return;
+    }
+
+    // Check if account credit is selected
+    const selectedPaymentType = this.formGroup.value.paymentMethod.type;
+
+    let paymentMethodType: number;
+    let paymentToken: string;
+
+    if (selectedPaymentType === NonTokenizablePaymentMethods.accountCredit) {
+      // Account credit doesn't need tokenization
+      paymentMethodType = PaymentMethodType.Credit;
+      paymentToken = "";
+    } else {
+      // Tokenize for card, bank account, or PayPal
+      const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+      paymentMethodType = tokenizablePaymentMethodToLegacyEnum(paymentMethod.type);
+      paymentToken = paymentMethod.token;
+    }
+
+    const formData = new FormData();
+    formData.append("paymentMethodType", paymentMethodType.toString());
+    formData.append("paymentToken", paymentToken);
+    formData.append(
+      "additionalStorageGb",
+      (this.formGroup.value.additionalStorage ?? 0).toString(),
+    );
+    formData.append("country", this.formGroup.value.billingAddress.country);
+    formData.append("postalCode", this.formGroup.value.billingAddress.postalCode);
+
+    await this.apiService.postPremium(formData);
+    await this.finalizeUpgrade();
+    await this.postFinalizeUpgrade();
+  };
+}
diff --git a/apps/web/src/app/billing/individual/premium/premium.component.html b/apps/web/src/app/billing/individual/premium/premium.component.html
deleted file mode 100644
index 3f0f97541df..00000000000
--- a/apps/web/src/app/billing/individual/premium/premium.component.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<bit-section>
-  <h2 *ngIf="!isSelfHost" bitTypography="h2">{{ "goPremium" | i18n }}</h2>
-  <bit-callout
-    type="info"
-    *ngIf="hasPremiumFromAnyOrganization$ | async"
-    title="{{ 'youHavePremiumAccess' | i18n }}"
-    icon="bwi bwi-star-f"
-  >
-    {{ "alreadyPremiumFromOrg" | i18n }}
-  </bit-callout>
-  <bit-callout type="success">
-    <p>{{ "premiumUpgradeUnlockFeatures" | i18n }}</p>
-    <ul class="bwi-ul">
-      <li>
-        <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
-        {{ "premiumSignUpStorage" | i18n }}
-      </li>
-      <li>
-        <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
-        {{ "premiumSignUpTwoStepOptions" | i18n }}
-      </li>
-      <li>
-        <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
-        {{ "premiumSignUpEmergency" | i18n }}
-      </li>
-      <li>
-        <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
-        {{ "premiumSignUpReports" | i18n }}
-      </li>
-      <li>
-        <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
-        {{ "premiumSignUpTotp" | i18n }}
-      </li>
-      <li>
-        <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
-        {{ "premiumSignUpSupport" | i18n }}
-      </li>
-      <li>
-        <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
-        {{ "premiumSignUpFuture" | i18n }}
-      </li>
-    </ul>
-    <p bitTypography="body1" [ngClass]="{ 'tw-mb-0': !isSelfHost }">
-      {{
-        "premiumPriceWithFamilyPlan" | i18n: (premiumPrice | currency: "$") : familyPlanMaxUserCount
-      }}
-      <a
-        bitLink
-        linkType="primary"
-        routerLink="/create-organization"
-        [queryParams]="{ plan: 'families' }"
-      >
-        {{ "bitwardenFamiliesPlan" | i18n }}
-      </a>
-    </p>
-    <a
-      bitButton
-      href="{{ premiumURL }}"
-      target="_blank"
-      rel="noreferrer"
-      buttonType="secondary"
-      *ngIf="isSelfHost"
-    >
-      {{ "purchasePremium" | i18n }}
-    </a>
-  </bit-callout>
-</bit-section>
-<bit-section *ngIf="isSelfHost">
-  <individual-self-hosting-license-uploader
-    (onLicenseFileUploaded)="onLicenseFileSelectedChanged()"
-  />
-</bit-section>
-<form *ngIf="!isSelfHost" [formGroup]="addOnFormGroup" [bitSubmit]="submitPayment">
-  <bit-section>
-    <h2 bitTypography="h2">{{ "addons" | i18n }}</h2>
-    <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-      <bit-form-field class="tw-col-span-6">
-        <bit-label>{{ "additionalStorageGb" | i18n }}</bit-label>
-        <input
-          bitInput
-          formControlName="additionalStorage"
-          type="number"
-          step="1"
-          placeholder="{{ 'additionalStorageGbDesc' | i18n }}"
-        />
-        <bit-hint>{{
-          "additionalStorageIntervalDesc"
-            | i18n: "1 GB" : (storageGBPrice | currency: "$") : ("year" | i18n)
-        }}</bit-hint>
-      </bit-form-field>
-    </div>
-  </bit-section>
-  <bit-section>
-    <h2 bitTypography="h2">{{ "summary" | i18n }}</h2>
-    {{ "premiumMembership" | i18n }}: {{ premiumPrice | currency: "$" }} <br />
-    {{ "additionalStorageGb" | i18n }}: {{ addOnFormGroup.value.additionalStorage || 0 }} GB &times;
-    {{ storageGBPrice | currency: "$" }} =
-    {{ additionalStorageCost | currency: "$" }}
-    <hr class="tw-my-3" />
-  </bit-section>
-  <bit-section>
-    <h3 bitTypography="h2">{{ "paymentInformation" | i18n }}</h3>
-    <app-payment [showBankAccount]="false"></app-payment>
-    <app-tax-info (taxInformationChanged)="onTaxInformationChanged()"></app-tax-info>
-    <div class="tw-mb-4">
-      <div class="tw-text-muted tw-text-sm tw-flex tw-flex-col">
-        <span>{{ "planPrice" | i18n }}: {{ subtotal | currency: "USD $" }}</span>
-        <span>{{ "estimatedTax" | i18n }}: {{ estimatedTax | currency: "USD $" }}</span>
-      </div>
-    </div>
-    <hr class="tw-my-1 tw-w-1/4 tw-ml-0" />
-    <p bitTypography="body1">
-      <strong>{{ "total" | i18n }}:</strong> {{ total | currency: "USD $" }}/{{ "year" | i18n }}
-    </p>
-    <button type="submit" buttonType="primary" bitButton bitFormButton>
-      {{ "submit" | i18n }}
-    </button>
-  </bit-section>
-</form>
diff --git a/apps/web/src/app/billing/individual/premium/premium.component.ts b/apps/web/src/app/billing/individual/premium/premium.component.ts
deleted file mode 100644
index 974c22455ff..00000000000
--- a/apps/web/src/app/billing/individual/premium/premium.component.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, ViewChild } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { ActivatedRoute, Router } from "@angular/router";
-import { combineLatest, concatMap, from, Observable, of, switchMap } from "rxjs";
-import { debounceTime } from "rxjs/operators";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SyncService } from "@bitwarden/common/platform/sync";
-import { ToastService } from "@bitwarden/components";
-
-import { PaymentComponent } from "../../shared/payment/payment.component";
-import { TaxInfoComponent } from "../../shared/tax-info.component";
-
-@Component({
-  templateUrl: "./premium.component.html",
-  standalone: false,
-})
-export class PremiumComponent {
-  @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(TaxInfoComponent) taxInfoComponent: TaxInfoComponent;
-
-  protected hasPremiumFromAnyOrganization$: Observable<boolean>;
-
-  protected addOnFormGroup = new FormGroup({
-    additionalStorage: new FormControl<number>(0, [Validators.min(0), Validators.max(99)]),
-  });
-
-  protected licenseFormGroup = new FormGroup({
-    file: new FormControl<File>(null, [Validators.required]),
-  });
-
-  protected cloudWebVaultURL: string;
-  protected isSelfHost = false;
-
-  protected estimatedTax: number = 0;
-  protected readonly familyPlanMaxUserCount = 6;
-  protected readonly premiumPrice = 10;
-  protected readonly storageGBPrice = 4;
-
-  constructor(
-    private activatedRoute: ActivatedRoute,
-    private apiService: ApiService,
-    private billingAccountProfileStateService: BillingAccountProfileStateService,
-    private configService: ConfigService,
-    private environmentService: EnvironmentService,
-    private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
-    private router: Router,
-    private syncService: SyncService,
-    private toastService: ToastService,
-    private tokenService: TokenService,
-    private taxService: TaxServiceAbstraction,
-    private accountService: AccountService,
-  ) {
-    this.isSelfHost = this.platformUtilsService.isSelfHost();
-
-    this.hasPremiumFromAnyOrganization$ = this.accountService.activeAccount$.pipe(
-      switchMap((account) =>
-        this.billingAccountProfileStateService.hasPremiumFromAnyOrganization$(account.id),
-      ),
-    );
-
-    combineLatest([
-      this.accountService.activeAccount$.pipe(
-        switchMap((account) =>
-          this.billingAccountProfileStateService.hasPremiumPersonally$(account.id),
-        ),
-      ),
-      this.environmentService.cloudWebVaultUrl$,
-    ])
-      .pipe(
-        takeUntilDestroyed(),
-        concatMap(([hasPremiumPersonally, cloudWebVaultURL]) => {
-          if (hasPremiumPersonally) {
-            return from(this.navigateToSubscriptionPage());
-          }
-
-          this.cloudWebVaultURL = cloudWebVaultURL;
-          return of(true);
-        }),
-      )
-      .subscribe();
-
-    this.addOnFormGroup.controls.additionalStorage.valueChanges
-      .pipe(debounceTime(1000), takeUntilDestroyed())
-      .subscribe(() => {
-        this.refreshSalesTax();
-      });
-  }
-
-  finalizeUpgrade = async () => {
-    await this.apiService.refreshIdentityToken();
-    await this.syncService.fullSync(true);
-  };
-
-  postFinalizeUpgrade = async () => {
-    this.toastService.showToast({
-      variant: "success",
-      title: null,
-      message: this.i18nService.t("premiumUpdated"),
-    });
-    await this.navigateToSubscriptionPage();
-  };
-
-  navigateToSubscriptionPage = (): Promise<boolean> =>
-    this.router.navigate(["../user-subscription"], { relativeTo: this.activatedRoute });
-
-  onLicenseFileSelected = (event: Event): void => {
-    const element = event.target as HTMLInputElement;
-    this.licenseFormGroup.value.file = element.files.length > 0 ? element.files[0] : null;
-  };
-
-  submitPremiumLicense = async (): Promise<void> => {
-    this.licenseFormGroup.markAllAsTouched();
-
-    if (this.licenseFormGroup.invalid) {
-      return this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("selectFile"),
-      });
-    }
-
-    const emailVerified = await this.tokenService.getEmailVerified();
-    if (!emailVerified) {
-      return this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("verifyEmailFirst"),
-      });
-    }
-
-    const formData = new FormData();
-    formData.append("license", this.licenseFormGroup.value.file);
-
-    await this.apiService.postAccountLicense(formData);
-    await this.finalizeUpgrade();
-    await this.postFinalizeUpgrade();
-  };
-
-  submitPayment = async (): Promise<void> => {
-    this.taxInfoComponent.taxFormGroup.markAllAsTouched();
-    if (this.taxInfoComponent.taxFormGroup.invalid) {
-      return;
-    }
-
-    const { type, token } = await this.paymentComponent.tokenize();
-
-    const formData = new FormData();
-    formData.append("paymentMethodType", type.toString());
-    formData.append("paymentToken", token);
-    formData.append("additionalStorageGb", this.addOnFormGroup.value.additionalStorage.toString());
-    formData.append("country", this.taxInfoComponent.country);
-    formData.append("postalCode", this.taxInfoComponent.postalCode);
-
-    await this.apiService.postPremium(formData);
-    await this.finalizeUpgrade();
-    await this.postFinalizeUpgrade();
-  };
-
-  protected get additionalStorageCost(): number {
-    return this.storageGBPrice * this.addOnFormGroup.value.additionalStorage;
-  }
-
-  protected get premiumURL(): string {
-    return `${this.cloudWebVaultURL}/#/settings/subscription/premium`;
-  }
-
-  protected get subtotal(): number {
-    return this.premiumPrice + this.additionalStorageCost;
-  }
-
-  protected get total(): number {
-    return this.subtotal + this.estimatedTax;
-  }
-
-  protected async onLicenseFileSelectedChanged(): Promise<void> {
-    await this.postFinalizeUpgrade();
-  }
-
-  private refreshSalesTax(): void {
-    if (!this.taxInfoComponent.country || !this.taxInfoComponent.postalCode) {
-      return;
-    }
-    const request: PreviewIndividualInvoiceRequest = {
-      passwordManager: {
-        additionalStorage: this.addOnFormGroup.value.additionalStorage,
-      },
-      taxInformation: {
-        postalCode: this.taxInfoComponent.postalCode,
-        country: this.taxInfoComponent.country,
-      },
-    };
-
-    this.taxService
-      .previewIndividualInvoice(request)
-      .then((invoice) => {
-        this.estimatedTax = invoice.taxAmount;
-      })
-      .catch((error) => {
-        this.toastService.showToast({
-          title: "",
-          variant: "error",
-          message: this.i18nService.t(error.message),
-        });
-      });
-  }
-
-  protected onTaxInformationChanged(): void {
-    this.refreshSalesTax();
-  }
-}
diff --git a/apps/web/src/app/billing/individual/premium/self-hosted-premium.component.html b/apps/web/src/app/billing/individual/premium/self-hosted-premium.component.html
new file mode 100644
index 00000000000..1e32e73c8f5
--- /dev/null
+++ b/apps/web/src/app/billing/individual/premium/self-hosted-premium.component.html
@@ -0,0 +1,49 @@
+<bit-container>
+  <bit-section>
+    <bit-callout type="success">
+      <p>{{ "premiumUpgradeUnlockFeatures" | i18n }}</p>
+      <ul class="bwi-ul">
+        <li>
+          <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+          {{ "premiumSignUpStorage" | i18n }}
+        </li>
+        <li>
+          <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+          {{ "premiumSignUpTwoStepOptions" | i18n }}
+        </li>
+        <li>
+          <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+          {{ "premiumSignUpEmergency" | i18n }}
+        </li>
+        <li>
+          <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+          {{ "premiumSignUpReports" | i18n }}
+        </li>
+        <li>
+          <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+          {{ "premiumSignUpTotp" | i18n }}
+        </li>
+        <li>
+          <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+          {{ "premiumSignUpSupport" | i18n }}
+        </li>
+        <li>
+          <i class="bwi bwi-check tw-text-success bwi-li" aria-hidden="true"></i>
+          {{ "premiumSignUpFuture" | i18n }}
+        </li>
+      </ul>
+      <a
+        bitButton
+        href="{{ cloudPremiumPageUrl$ | async }}"
+        target="_blank"
+        rel="noreferrer"
+        buttonType="secondary"
+      >
+        {{ "purchasePremium" | i18n }}
+      </a>
+    </bit-callout>
+  </bit-section>
+  <bit-section>
+    <individual-self-hosting-license-uploader (onLicenseFileUploaded)="onLicenseFileUploaded()" />
+  </bit-section>
+</bit-container>
diff --git a/apps/web/src/app/billing/individual/premium/self-hosted-premium.component.ts b/apps/web/src/app/billing/individual/premium/self-hosted-premium.component.ts
new file mode 100644
index 00000000000..c28f2d45b6f
--- /dev/null
+++ b/apps/web/src/app/billing/individual/premium/self-hosted-premium.component.ts
@@ -0,0 +1,79 @@
+import { Component } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ActivatedRoute, Router } from "@angular/router";
+import { combineLatest, map, of, switchMap } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ToastService } from "@bitwarden/components";
+import { BillingSharedModule } from "@bitwarden/web-vault/app/billing/shared";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  templateUrl: "./self-hosted-premium.component.html",
+  imports: [SharedModule, BillingSharedModule],
+})
+export class SelfHostedPremiumComponent {
+  cloudPremiumPageUrl$ = this.environmentService.cloudWebVaultUrl$.pipe(
+    map((url) => `${url}/#/settings/subscription/premium`),
+  );
+
+  hasPremiumFromAnyOrganization$ = this.accountService.activeAccount$.pipe(
+    switchMap((account) =>
+      account
+        ? this.billingAccountProfileStateService.hasPremiumFromAnyOrganization$(account.id)
+        : of(false),
+    ),
+  );
+
+  hasPremiumPersonally$ = this.accountService.activeAccount$.pipe(
+    switchMap((account) =>
+      account
+        ? this.billingAccountProfileStateService.hasPremiumPersonally$(account.id)
+        : of(false),
+    ),
+  );
+
+  onLicenseFileUploaded = async () => {
+    this.toastService.showToast({
+      variant: "success",
+      title: "",
+      message: this.i18nService.t("premiumUpdated"),
+    });
+    await this.navigateToSubscription();
+  };
+
+  constructor(
+    private accountService: AccountService,
+    private activatedRoute: ActivatedRoute,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private environmentService: EnvironmentService,
+    private i18nService: I18nService,
+    private router: Router,
+    private toastService: ToastService,
+  ) {
+    combineLatest([this.hasPremiumFromAnyOrganization$, this.hasPremiumPersonally$])
+      .pipe(
+        takeUntilDestroyed(),
+        switchMap(([hasPremiumFromAnyOrganization, hasPremiumPersonally]) => {
+          if (hasPremiumFromAnyOrganization) {
+            return this.navigateToVault();
+          }
+          if (hasPremiumPersonally) {
+            return this.navigateToSubscription();
+          }
+
+          return of(true);
+        }),
+      )
+      .subscribe();
+  }
+
+  navigateToSubscription = () =>
+    this.router.navigate(["../user-subscription"], { relativeTo: this.activatedRoute });
+  navigateToVault = () => this.router.navigate(["/vault"]);
+}
diff --git a/apps/web/src/app/billing/individual/subscription.component.html b/apps/web/src/app/billing/individual/subscription.component.html
index fa2eb0412a9..4cbec4b4338 100644
--- a/apps/web/src/app/billing/individual/subscription.component.html
+++ b/apps/web/src/app/billing/individual/subscription.component.html
@@ -3,14 +3,9 @@
     <bit-tab-link [route]="(hasPremium$ | async) ? 'user-subscription' : 'premium'">{{
       "subscription" | i18n
     }}</bit-tab-link>
-    @let paymentMethodPageData = paymentDetailsPageData$ | async;
-    <bit-tab-link [route]="paymentMethodPageData.route">{{
-      paymentMethodPageData.textKey | i18n
-    }}</bit-tab-link>
+    <bit-tab-link route="payment-details">{{ "paymentDetails" | i18n }}</bit-tab-link>
     <bit-tab-link route="billing-history">{{ "billingHistory" | i18n }}</bit-tab-link>
   </bit-tab-nav-bar>
 </app-header>
 
-<bit-container>
-  <router-outlet></router-outlet>
-</bit-container>
+<router-outlet></router-outlet>
diff --git a/apps/web/src/app/billing/individual/subscription.component.ts b/apps/web/src/app/billing/individual/subscription.component.ts
index c6a20a9f6a3..37fb2baf3a6 100644
--- a/apps/web/src/app/billing/individual/subscription.component.ts
+++ b/apps/web/src/app/billing/individual/subscription.component.ts
@@ -1,46 +1,30 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
-import { map, Observable, switchMap } from "rxjs";
+import { Observable, switchMap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "subscription.component.html",
   standalone: false,
 })
 export class SubscriptionComponent implements OnInit {
   hasPremium$: Observable<boolean>;
-  paymentDetailsPageData$: Observable<{
-    route: string;
-    textKey: string;
-  }>;
-
   selfHosted: boolean;
 
   constructor(
     private platformUtilsService: PlatformUtilsService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
     accountService: AccountService,
-    private configService: ConfigService,
   ) {
     this.hasPremium$ = accountService.activeAccount$.pipe(
       switchMap((account) => billingAccountProfileStateService.hasPremiumPersonally$(account.id)),
     );
-
-    this.paymentDetailsPageData$ = this.configService
-      .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
-      .pipe(
-        map((managePaymentDetailsOutsideCheckout) =>
-          managePaymentDetailsOutsideCheckout
-            ? { route: "payment-details", textKey: "paymentDetails" }
-            : { route: "payment-method", textKey: "paymentMethod" },
-        ),
-      );
   }
 
   ngOnInit() {
diff --git a/apps/web/src/app/billing/individual/upgrade/services/index.ts b/apps/web/src/app/billing/individual/upgrade/services/index.ts
new file mode 100644
index 00000000000..e81e2eaeb01
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/services/index.ts
@@ -0,0 +1 @@
+export * from "./unified-upgrade-prompt.service";
diff --git a/apps/web/src/app/billing/individual/upgrade/services/unified-upgrade-prompt.service.spec.ts b/apps/web/src/app/billing/individual/upgrade/services/unified-upgrade-prompt.service.spec.ts
new file mode 100644
index 00000000000..b18e3a7f5c3
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/services/unified-upgrade-prompt.service.spec.ts
@@ -0,0 +1,342 @@
+import { mock, mockReset } from "jest-mock-extended";
+import { of, BehaviorSubject } from "rxjs";
+
+import { VaultProfileService } from "@bitwarden/angular/vault/services/vault-profile.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService, Account } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SyncService } from "@bitwarden/common/platform/sync/sync.service";
+import { DialogRef, DialogService } from "@bitwarden/components";
+import { StateProvider } from "@bitwarden/state";
+
+import {
+  UnifiedUpgradeDialogComponent,
+  UnifiedUpgradeDialogStatus,
+} from "../unified-upgrade-dialog/unified-upgrade-dialog.component";
+
+import {
+  UnifiedUpgradePromptService,
+  PREMIUM_MODAL_DISMISSED_KEY,
+} from "./unified-upgrade-prompt.service";
+
+describe("UnifiedUpgradePromptService", () => {
+  let sut: UnifiedUpgradePromptService;
+  const mockAccountService = mock<AccountService>();
+  const mockConfigService = mock<ConfigService>();
+  const mockBillingService = mock<BillingAccountProfileStateService>();
+  const mockVaultProfileService = mock<VaultProfileService>();
+  const mockSyncService = mock<SyncService>();
+  const mockDialogService = mock<DialogService>();
+  const mockOrganizationService = mock<OrganizationService>();
+  const mockDialogOpen = jest.spyOn(UnifiedUpgradeDialogComponent, "open");
+  const mockPlatformUtilsService = mock<PlatformUtilsService>();
+  const mockStateProvider = mock<StateProvider>();
+  const mockLogService = mock<LogService>();
+
+  /**
+   * Creates a mock DialogRef that implements the required properties for testing
+   * @param result The result that will be emitted by the closed observable
+   * @returns A mock DialogRef object
+   */
+  function createMockDialogRef<T>(result: T): DialogRef<T> {
+    // Create a mock that implements the DialogRef interface
+    return {
+      // The closed property is readonly in the actual DialogRef
+      closed: of(result),
+    } as DialogRef<T>;
+  }
+
+  // Mock the open method of a dialog component to return the provided DialogRefs
+  // Supports multiple calls by returning different refs in sequence
+  function mockDialogOpenMethod(...refs: DialogRef<any>[]) {
+    refs.forEach((ref) => mockDialogOpen.mockReturnValueOnce(ref));
+  }
+
+  function setupTestService() {
+    sut = new UnifiedUpgradePromptService(
+      mockAccountService,
+      mockConfigService,
+      mockBillingService,
+      mockVaultProfileService,
+      mockSyncService,
+      mockDialogService,
+      mockOrganizationService,
+      mockPlatformUtilsService,
+      mockStateProvider,
+      mockLogService,
+    );
+  }
+
+  const mockAccount: Account = {
+    id: "test-user-id",
+  } as Account;
+  const accountSubject = new BehaviorSubject<Account | null>(mockAccount);
+
+  describe("initialization", () => {
+    beforeEach(() => {
+      mockAccountService.activeAccount$ = accountSubject.asObservable();
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockStateProvider.getUserState$.mockReturnValue(of(false));
+
+      setupTestService();
+    });
+    it("should be created", () => {
+      expect(sut).toBeTruthy();
+    });
+  });
+
+  describe("displayUpgradePromptConditionally", () => {
+    beforeEach(() => {
+      accountSubject.next(mockAccount); // Reset account to mockAccount
+      mockAccountService.activeAccount$ = accountSubject.asObservable();
+      mockDialogOpen.mockReset();
+      mockReset(mockDialogService);
+      mockReset(mockConfigService);
+      mockReset(mockBillingService);
+      mockReset(mockVaultProfileService);
+      mockReset(mockSyncService);
+      mockReset(mockOrganizationService);
+      mockReset(mockStateProvider);
+
+      // Mock sync service methods
+      mockSyncService.fullSync.mockResolvedValue(true);
+      mockSyncService.lastSync$.mockReturnValue(of(new Date()));
+      mockReset(mockPlatformUtilsService);
+
+      // Default: modal has not been dismissed
+      mockStateProvider.getUserState$.mockReturnValue(of(false));
+      mockStateProvider.setUserState.mockResolvedValue(undefined);
+    });
+    it("should subscribe to account and feature flag observables when checking display conditions", async () => {
+      // Arrange
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(false));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+
+      setupTestService();
+
+      // Act
+      await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(mockConfigService.getFeatureFlag$).toHaveBeenCalledWith(
+        FeatureFlag.PM24996_ImplementUpgradeFromFreeDialog,
+      );
+      expect(mockAccountService.activeAccount$).toBeDefined();
+    });
+    it("should not show dialog when feature flag is disabled", async () => {
+      // Arrange
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(false));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      const recentDate = new Date();
+      recentDate.setMinutes(recentDate.getMinutes() - 3); // 3 minutes old
+      mockVaultProfileService.getProfileCreationDate.mockResolvedValue(recentDate);
+
+      setupTestService();
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toBeNull();
+      expect(mockDialogOpen).not.toHaveBeenCalled();
+    });
+
+    it("should not show dialog when user has premium", async () => {
+      // Arrange
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(true));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      setupTestService();
+
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toBeNull();
+      expect(mockDialogOpen).not.toHaveBeenCalled();
+    });
+
+    it("should not show dialog when user has any organization membership", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([{ id: "org1" } as any]));
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+      setupTestService();
+
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toBeNull();
+      expect(mockDialogOpen).not.toHaveBeenCalled();
+    });
+
+    it("should not show dialog when profile is older than 5 minutes", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      const oldDate = new Date();
+      oldDate.setMinutes(oldDate.getMinutes() - 10); // 10 minutes old
+      mockVaultProfileService.getProfileCreationDate.mockResolvedValue(oldDate);
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+      setupTestService();
+
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toBeNull();
+      expect(mockDialogOpen).not.toHaveBeenCalled();
+    });
+
+    it("should show dialog when all conditions are met", async () => {
+      //Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      const recentDate = new Date();
+      recentDate.setMinutes(recentDate.getMinutes() - 3); // 3 minutes old
+      mockVaultProfileService.getProfileCreationDate.mockResolvedValue(recentDate);
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+
+      const expectedResult = { status: UnifiedUpgradeDialogStatus.Closed };
+      mockDialogOpenMethod(createMockDialogRef(expectedResult));
+      setupTestService();
+
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toEqual(expectedResult);
+      expect(mockDialogOpen).toHaveBeenCalled();
+    });
+
+    it("should not show dialog when account is null/undefined", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      accountSubject.next(null); // Set account to null
+      setupTestService();
+
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toBeNull();
+      expect(mockDialogOpen).not.toHaveBeenCalled();
+    });
+
+    it("should not show dialog when profile creation date is unavailable", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      mockVaultProfileService.getProfileCreationDate.mockResolvedValue(null);
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+
+      setupTestService();
+
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toBeNull();
+      expect(mockDialogOpen).not.toHaveBeenCalled();
+    });
+
+    it("should not show dialog when running in self-hosted environment", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      const recentDate = new Date();
+      recentDate.setMinutes(recentDate.getMinutes() - 3); // 3 minutes old
+      mockVaultProfileService.getProfileCreationDate.mockResolvedValue(recentDate);
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(true);
+      setupTestService();
+
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toBeNull();
+      expect(mockDialogOpen).not.toHaveBeenCalled();
+    });
+
+    it("should not show dialog when user has previously dismissed the modal", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      const recentDate = new Date();
+      recentDate.setMinutes(recentDate.getMinutes() - 3); // 3 minutes old
+      mockVaultProfileService.getProfileCreationDate.mockResolvedValue(recentDate);
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+      mockStateProvider.getUserState$.mockReturnValue(of(true)); // User has dismissed
+      setupTestService();
+
+      // Act
+      const result = await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(result).toBeNull();
+      expect(mockDialogOpen).not.toHaveBeenCalled();
+    });
+
+    it("should save dismissal state when user closes the dialog", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      const recentDate = new Date();
+      recentDate.setMinutes(recentDate.getMinutes() - 3); // 3 minutes old
+      mockVaultProfileService.getProfileCreationDate.mockResolvedValue(recentDate);
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+
+      const expectedResult = { status: UnifiedUpgradeDialogStatus.Closed };
+      mockDialogOpenMethod(createMockDialogRef(expectedResult));
+      setupTestService();
+
+      // Act
+      await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(mockStateProvider.setUserState).toHaveBeenCalledWith(
+        PREMIUM_MODAL_DISMISSED_KEY,
+        true,
+        mockAccount.id,
+      );
+    });
+
+    it("should not save dismissal state when user upgrades to premium", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+      mockBillingService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      mockOrganizationService.memberOrganizations$.mockReturnValue(of([]));
+      const recentDate = new Date();
+      recentDate.setMinutes(recentDate.getMinutes() - 3); // 3 minutes old
+      mockVaultProfileService.getProfileCreationDate.mockResolvedValue(recentDate);
+      mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+
+      const expectedResult = { status: UnifiedUpgradeDialogStatus.UpgradedToPremium };
+      mockDialogOpenMethod(createMockDialogRef(expectedResult));
+      setupTestService();
+
+      // Act
+      await sut.displayUpgradePromptConditionally();
+
+      // Assert
+      expect(mockStateProvider.setUserState).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/individual/upgrade/services/unified-upgrade-prompt.service.ts b/apps/web/src/app/billing/individual/upgrade/services/unified-upgrade-prompt.service.ts
new file mode 100644
index 00000000000..3ea8f19341d
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/services/unified-upgrade-prompt.service.ts
@@ -0,0 +1,199 @@
+import { Injectable } from "@angular/core";
+import { combineLatest, firstValueFrom, timeout, from, Observable, of } from "rxjs";
+import { filter, switchMap, take, map } from "rxjs/operators";
+
+import { VaultProfileService } from "@bitwarden/angular/vault/services/vault-profile.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SyncService } from "@bitwarden/common/platform/sync/sync.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { DialogRef, DialogService } from "@bitwarden/components";
+import { BILLING_DISK, StateProvider, UserKeyDefinition } from "@bitwarden/state";
+
+import {
+  UnifiedUpgradeDialogComponent,
+  UnifiedUpgradeDialogResult,
+  UnifiedUpgradeDialogStatus,
+} from "../unified-upgrade-dialog/unified-upgrade-dialog.component";
+
+// State key for tracking premium modal dismissal
+export const PREMIUM_MODAL_DISMISSED_KEY = new UserKeyDefinition<boolean>(
+  BILLING_DISK,
+  "premiumModalDismissed",
+  {
+    deserializer: (value: boolean) => value,
+    clearOn: [],
+  },
+);
+
+@Injectable({
+  providedIn: "root",
+})
+export class UnifiedUpgradePromptService {
+  private unifiedUpgradeDialogRef: DialogRef<UnifiedUpgradeDialogResult> | null = null;
+  constructor(
+    private accountService: AccountService,
+    private configService: ConfigService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private vaultProfileService: VaultProfileService,
+    private syncService: SyncService,
+    private dialogService: DialogService,
+    private organizationService: OrganizationService,
+    private platformUtilsService: PlatformUtilsService,
+    private stateProvider: StateProvider,
+    private logService: LogService,
+  ) {}
+
+  private shouldShowPrompt$: Observable<boolean> = this.accountService.activeAccount$.pipe(
+    switchMap((account) => {
+      // Check self-hosted first before any other operations
+      if (this.platformUtilsService.isSelfHost()) {
+        return of(false);
+      }
+
+      if (!account) {
+        return of(false);
+      }
+
+      const isProfileLessThanFiveMinutesOld$ = from(
+        this.isProfileLessThanFiveMinutesOld(account.id),
+      );
+      const hasOrganizations$ = from(this.hasOrganizations(account.id));
+      const hasDismissedModal$ = this.hasDismissedModal$(account.id);
+
+      return combineLatest([
+        isProfileLessThanFiveMinutesOld$,
+        hasOrganizations$,
+        this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
+        this.configService.getFeatureFlag$(FeatureFlag.PM24996_ImplementUpgradeFromFreeDialog),
+        hasDismissedModal$,
+      ]).pipe(
+        map(
+          ([
+            isProfileLessThanFiveMinutesOld,
+            hasOrganizations,
+            hasPremium,
+            isFlagEnabled,
+            hasDismissed,
+          ]) => {
+            return (
+              isProfileLessThanFiveMinutesOld &&
+              !hasOrganizations &&
+              !hasPremium &&
+              isFlagEnabled &&
+              !hasDismissed
+            );
+          },
+        ),
+      );
+    }),
+    take(1),
+  );
+
+  /**
+   * Conditionally prompt the user based on predefined criteria.
+   *
+   * @returns A promise that resolves to the dialog result if shown, or null if not shown
+   */
+  async displayUpgradePromptConditionally(): Promise<UnifiedUpgradeDialogResult | null> {
+    const shouldShow = await firstValueFrom(this.shouldShowPrompt$);
+
+    if (shouldShow) {
+      return this.launchUpgradeDialog();
+    }
+
+    return null;
+  }
+
+  /**
+   * Checks if a user's profile was created less than five minutes ago
+   * @param userId User ID to check
+   * @returns Promise that resolves to true if profile was created less than five minutes ago
+   */
+  private async isProfileLessThanFiveMinutesOld(userId: string): Promise<boolean> {
+    const createdAtDate = await this.vaultProfileService.getProfileCreationDate(userId);
+    if (!createdAtDate) {
+      return false;
+    }
+    const createdAtInMs = createdAtDate.getTime();
+    const nowInMs = new Date().getTime();
+
+    const differenceInMs = nowInMs - createdAtInMs;
+    const msInAMinute = 1000 * 60; // 60 seconds * 1000ms
+    const differenceInMinutes = Math.round(differenceInMs / msInAMinute);
+
+    return differenceInMinutes <= 5;
+  }
+
+  private async launchUpgradeDialog(): Promise<UnifiedUpgradeDialogResult | null> {
+    const account = await firstValueFrom(this.accountService.activeAccount$);
+    if (!account) {
+      return null;
+    }
+
+    this.unifiedUpgradeDialogRef = UnifiedUpgradeDialogComponent.open(this.dialogService, {
+      data: { account },
+    });
+
+    const result = await firstValueFrom(this.unifiedUpgradeDialogRef.closed);
+    this.unifiedUpgradeDialogRef = null;
+
+    // Save dismissal state when the modal is closed without upgrading
+    if (result?.status === UnifiedUpgradeDialogStatus.Closed) {
+      try {
+        await this.stateProvider.setUserState(PREMIUM_MODAL_DISMISSED_KEY, true, account.id);
+      } catch (error) {
+        // Log the error but don't block the dialog from closing
+        // The modal will still close properly even if persistence fails
+        this.logService.error("Failed to save premium modal dismissal state:", error);
+      }
+    }
+
+    // Return the result or null if the dialog was dismissed without a result
+    return result || null;
+  }
+
+  /**
+   * Checks if the user has any organization associated with their account
+   * @param userId User ID to check
+   * @returns Promise that resolves to true if user has any organizations, false otherwise
+   */
+  private async hasOrganizations(userId: UserId): Promise<boolean> {
+    // Wait for sync to complete to ensure organizations are fully loaded
+    // Also force a sync to ensure we have the latest data
+    await this.syncService.fullSync(false);
+
+    // Wait for the sync to complete with timeout to prevent hanging
+    await firstValueFrom(
+      this.syncService.lastSync$(userId).pipe(
+        filter((lastSync) => lastSync !== null),
+        take(1),
+        timeout(30000), // 30 second timeout
+      ),
+    );
+
+    // Check if user has any organization membership (any status including pending)
+    // Try using memberOrganizations$ which might have different filtering logic
+    const memberOrganizations = await firstValueFrom(
+      this.organizationService.memberOrganizations$(userId),
+    );
+
+    return memberOrganizations.length > 0;
+  }
+
+  /**
+   * Checks if the user has previously dismissed the premium modal
+   * @param userId User ID to check
+   * @returns Observable that emits true if modal was dismissed, false otherwise
+   */
+  private hasDismissedModal$(userId: UserId): Observable<boolean> {
+    return this.stateProvider
+      .getUserState$(PREMIUM_MODAL_DISMISSED_KEY, userId)
+      .pipe(map((dismissed) => dismissed ?? false));
+  }
+}
diff --git a/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.html b/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.html
new file mode 100644
index 00000000000..83c940da97f
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.html
@@ -0,0 +1,15 @@
+@if (step() == PlanSelectionStep) {
+  <app-upgrade-account
+    [dialogTitleMessageOverride]="planSelectionStepTitleOverride()"
+    [hideContinueWithoutUpgradingButton]="hideContinueWithoutUpgradingButton()"
+    (planSelected)="onPlanSelected($event)"
+    (closeClicked)="onCloseClicked()"
+  />
+} @else if (step() == PaymentStep && selectedPlan() !== null && account() !== null) {
+  <app-upgrade-payment
+    [selectedPlanId]="selectedPlan()"
+    [account]="account()"
+    (goBack)="previousStep()"
+    (complete)="onComplete($event)"
+  />
+}
diff --git a/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.spec.ts b/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.spec.ts
new file mode 100644
index 00000000000..7f698ae50d1
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.spec.ts
@@ -0,0 +1,424 @@
+import { Component, input, output } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { Router } from "@angular/router";
+import { mock } from "jest-mock-extended";
+
+import { PremiumInterestStateService } from "@bitwarden/angular/billing/services/premium-interest/premium-interest-state.service.abstraction";
+import { Account } from "@bitwarden/common/auth/abstractions/account.service";
+import {
+  PersonalSubscriptionPricingTierId,
+  PersonalSubscriptionPricingTierIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { UserId } from "@bitwarden/common/types/guid";
+import { DIALOG_DATA, DialogRef } from "@bitwarden/components";
+
+import {
+  UpgradeAccountComponent,
+  UpgradeAccountStatus,
+} from "../upgrade-account/upgrade-account.component";
+import {
+  UpgradePaymentComponent,
+  UpgradePaymentResult,
+} from "../upgrade-payment/upgrade-payment.component";
+
+import {
+  UnifiedUpgradeDialogComponent,
+  UnifiedUpgradeDialogParams,
+  UnifiedUpgradeDialogStep,
+} from "./unified-upgrade-dialog.component";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-upgrade-account",
+  template: "",
+  standalone: true,
+})
+class MockUpgradeAccountComponent {
+  readonly dialogTitleMessageOverride = input<string | null>(null);
+  readonly hideContinueWithoutUpgradingButton = input<boolean>(false);
+  planSelected = output<PersonalSubscriptionPricingTierId>();
+  closeClicked = output<UpgradeAccountStatus>();
+}
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-upgrade-payment",
+  template: "",
+  standalone: true,
+})
+class MockUpgradePaymentComponent {
+  readonly selectedPlanId = input<PersonalSubscriptionPricingTierId | null>(null);
+  readonly account = input<Account | null>(null);
+  goBack = output<void>();
+  complete = output<UpgradePaymentResult>();
+}
+
+describe("UnifiedUpgradeDialogComponent", () => {
+  let component: UnifiedUpgradeDialogComponent;
+  let fixture: ComponentFixture<UnifiedUpgradeDialogComponent>;
+  const mockDialogRef = mock<DialogRef>();
+  const mockRouter = mock<Router>();
+  const mockPremiumInterestStateService = mock<PremiumInterestStateService>();
+
+  const mockAccount: Account = {
+    id: "user-id" as UserId,
+    email: "test@example.com",
+    emailVerified: true,
+    name: "Test User",
+  };
+
+  const defaultDialogData: UnifiedUpgradeDialogParams = {
+    account: mockAccount,
+    initialStep: null,
+    selectedPlan: null,
+    planSelectionStepTitleOverride: null,
+  };
+
+  beforeEach(async () => {
+    // Reset mocks
+    jest.clearAllMocks();
+
+    await TestBed.configureTestingModule({
+      imports: [NoopAnimationsModule, UnifiedUpgradeDialogComponent],
+      providers: [
+        { provide: DialogRef, useValue: mockDialogRef },
+        { provide: DIALOG_DATA, useValue: defaultDialogData },
+        { provide: Router, useValue: mockRouter },
+        { provide: PremiumInterestStateService, useValue: mockPremiumInterestStateService },
+      ],
+    })
+      .overrideComponent(UnifiedUpgradeDialogComponent, {
+        remove: {
+          imports: [UpgradeAccountComponent, UpgradePaymentComponent],
+        },
+        add: {
+          imports: [MockUpgradeAccountComponent, MockUpgradePaymentComponent],
+        },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(UnifiedUpgradeDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  it("should initialize with default values", () => {
+    expect(component["step"]()).toBe(UnifiedUpgradeDialogStep.PlanSelection);
+    expect(component["selectedPlan"]()).toBeNull();
+    expect(component["account"]()).toEqual(mockAccount);
+    expect(component["planSelectionStepTitleOverride"]()).toBeNull();
+  });
+
+  it("should initialize with custom initial step", async () => {
+    TestBed.resetTestingModule();
+
+    const customDialogData: UnifiedUpgradeDialogParams = {
+      account: mockAccount,
+      initialStep: UnifiedUpgradeDialogStep.Payment,
+      selectedPlan: PersonalSubscriptionPricingTierIds.Premium,
+    };
+
+    await TestBed.configureTestingModule({
+      imports: [NoopAnimationsModule, UnifiedUpgradeDialogComponent],
+      providers: [
+        { provide: DialogRef, useValue: mockDialogRef },
+        { provide: DIALOG_DATA, useValue: customDialogData },
+        { provide: Router, useValue: mockRouter },
+        { provide: PremiumInterestStateService, useValue: mockPremiumInterestStateService },
+      ],
+    })
+      .overrideComponent(UnifiedUpgradeDialogComponent, {
+        remove: {
+          imports: [UpgradeAccountComponent, UpgradePaymentComponent],
+        },
+        add: {
+          imports: [MockUpgradeAccountComponent, MockUpgradePaymentComponent],
+        },
+      })
+      .compileComponents();
+
+    const customFixture = TestBed.createComponent(UnifiedUpgradeDialogComponent);
+    const customComponent = customFixture.componentInstance;
+    customFixture.detectChanges();
+
+    expect(customComponent["step"]()).toBe(UnifiedUpgradeDialogStep.Payment);
+    expect(customComponent["selectedPlan"]()).toBe(PersonalSubscriptionPricingTierIds.Premium);
+  });
+
+  describe("custom dialog title", () => {
+    it("should use null as default when no override is provided", () => {
+      expect(component["planSelectionStepTitleOverride"]()).toBeNull();
+    });
+
+    it("should use custom title when provided in dialog config", async () => {
+      TestBed.resetTestingModule();
+
+      const customDialogData: UnifiedUpgradeDialogParams = {
+        account: mockAccount,
+        initialStep: UnifiedUpgradeDialogStep.PlanSelection,
+        selectedPlan: null,
+        planSelectionStepTitleOverride: "upgradeYourPlan",
+      };
+
+      await TestBed.configureTestingModule({
+        imports: [NoopAnimationsModule, UnifiedUpgradeDialogComponent],
+        providers: [
+          { provide: DialogRef, useValue: mockDialogRef },
+          { provide: DIALOG_DATA, useValue: customDialogData },
+          { provide: Router, useValue: mockRouter },
+          { provide: PremiumInterestStateService, useValue: mockPremiumInterestStateService },
+        ],
+      })
+        .overrideComponent(UnifiedUpgradeDialogComponent, {
+          remove: {
+            imports: [UpgradeAccountComponent, UpgradePaymentComponent],
+          },
+          add: {
+            imports: [MockUpgradeAccountComponent, MockUpgradePaymentComponent],
+          },
+        })
+        .compileComponents();
+
+      const customFixture = TestBed.createComponent(UnifiedUpgradeDialogComponent);
+      const customComponent = customFixture.componentInstance;
+      customFixture.detectChanges();
+
+      expect(customComponent["planSelectionStepTitleOverride"]()).toBe("upgradeYourPlan");
+    });
+  });
+
+  describe("onPlanSelected", () => {
+    it("should set selected plan and move to payment step", () => {
+      component["onPlanSelected"](PersonalSubscriptionPricingTierIds.Premium);
+
+      expect(component["selectedPlan"]()).toBe(PersonalSubscriptionPricingTierIds.Premium);
+      expect(component["step"]()).toBe(UnifiedUpgradeDialogStep.Payment);
+    });
+  });
+
+  describe("previousStep", () => {
+    it("should go back to plan selection and clear selected plan", async () => {
+      component["step"].set(UnifiedUpgradeDialogStep.Payment);
+      component["selectedPlan"].set(PersonalSubscriptionPricingTierIds.Premium);
+
+      await component["previousStep"]();
+
+      expect(component["step"]()).toBe(UnifiedUpgradeDialogStep.PlanSelection);
+      expect(component["selectedPlan"]()).toBeNull();
+    });
+  });
+
+  describe("hideContinueWithoutUpgradingButton", () => {
+    it("should default to false when not provided", () => {
+      expect(component["hideContinueWithoutUpgradingButton"]()).toBe(false);
+    });
+
+    it("should be set to true when provided in dialog config", async () => {
+      TestBed.resetTestingModule();
+
+      const customDialogData: UnifiedUpgradeDialogParams = {
+        account: mockAccount,
+        initialStep: null,
+        selectedPlan: null,
+        hideContinueWithoutUpgradingButton: true,
+      };
+
+      await TestBed.configureTestingModule({
+        imports: [NoopAnimationsModule, UnifiedUpgradeDialogComponent],
+        providers: [
+          { provide: DialogRef, useValue: mockDialogRef },
+          { provide: DIALOG_DATA, useValue: customDialogData },
+          { provide: Router, useValue: mockRouter },
+          { provide: PremiumInterestStateService, useValue: mockPremiumInterestStateService },
+        ],
+      })
+        .overrideComponent(UnifiedUpgradeDialogComponent, {
+          remove: {
+            imports: [UpgradeAccountComponent, UpgradePaymentComponent],
+          },
+          add: {
+            imports: [MockUpgradeAccountComponent, MockUpgradePaymentComponent],
+          },
+        })
+        .compileComponents();
+
+      const customFixture = TestBed.createComponent(UnifiedUpgradeDialogComponent);
+      const customComponent = customFixture.componentInstance;
+      customFixture.detectChanges();
+
+      expect(customComponent["hideContinueWithoutUpgradingButton"]()).toBe(true);
+    });
+  });
+
+  describe("onComplete with premium interest", () => {
+    it("should check premium interest, clear it, and route to /vault when premium interest exists", async () => {
+      mockPremiumInterestStateService.getPremiumInterest.mockResolvedValue(true);
+      mockPremiumInterestStateService.clearPremiumInterest.mockResolvedValue();
+      mockRouter.navigate.mockResolvedValue(true);
+
+      const result: UpgradePaymentResult = {
+        status: "upgradedToPremium",
+        organizationId: null,
+      };
+
+      await component["onComplete"](result);
+
+      expect(mockPremiumInterestStateService.getPremiumInterest).toHaveBeenCalledWith(
+        mockAccount.id,
+      );
+      expect(mockPremiumInterestStateService.clearPremiumInterest).toHaveBeenCalledWith(
+        mockAccount.id,
+      );
+      expect(mockRouter.navigate).toHaveBeenCalledWith(["/vault"]);
+      expect(mockDialogRef.close).toHaveBeenCalledWith({
+        status: "upgradedToPremium",
+        organizationId: null,
+      });
+    });
+
+    it("should not clear premium interest when upgrading to families", async () => {
+      const result: UpgradePaymentResult = {
+        status: "upgradedToFamilies",
+        organizationId: "org-123",
+      };
+
+      await component["onComplete"](result);
+
+      expect(mockPremiumInterestStateService.getPremiumInterest).not.toHaveBeenCalled();
+      expect(mockPremiumInterestStateService.clearPremiumInterest).not.toHaveBeenCalled();
+      expect(mockDialogRef.close).toHaveBeenCalledWith({
+        status: "upgradedToFamilies",
+        organizationId: "org-123",
+      });
+    });
+
+    it("should use standard redirect when no premium interest exists", async () => {
+      TestBed.resetTestingModule();
+
+      const customDialogData: UnifiedUpgradeDialogParams = {
+        account: mockAccount,
+        redirectOnCompletion: true,
+      };
+
+      mockPremiumInterestStateService.getPremiumInterest.mockResolvedValue(false);
+      mockRouter.navigate.mockResolvedValue(true);
+
+      await TestBed.configureTestingModule({
+        imports: [NoopAnimationsModule, UnifiedUpgradeDialogComponent],
+        providers: [
+          { provide: DialogRef, useValue: mockDialogRef },
+          { provide: DIALOG_DATA, useValue: customDialogData },
+          { provide: Router, useValue: mockRouter },
+          { provide: PremiumInterestStateService, useValue: mockPremiumInterestStateService },
+        ],
+      })
+        .overrideComponent(UnifiedUpgradeDialogComponent, {
+          remove: {
+            imports: [UpgradeAccountComponent, UpgradePaymentComponent],
+          },
+          add: {
+            imports: [MockUpgradeAccountComponent, MockUpgradePaymentComponent],
+          },
+        })
+        .compileComponents();
+
+      const customFixture = TestBed.createComponent(UnifiedUpgradeDialogComponent);
+      const customComponent = customFixture.componentInstance;
+      customFixture.detectChanges();
+
+      const result: UpgradePaymentResult = {
+        status: "upgradedToPremium",
+        organizationId: null,
+      };
+
+      await customComponent["onComplete"](result);
+
+      expect(mockPremiumInterestStateService.getPremiumInterest).toHaveBeenCalledWith(
+        mockAccount.id,
+      );
+      expect(mockPremiumInterestStateService.clearPremiumInterest).not.toHaveBeenCalled();
+      expect(mockRouter.navigate).toHaveBeenCalledWith([
+        "/settings/subscription/user-subscription",
+      ]);
+      expect(mockDialogRef.close).toHaveBeenCalledWith({
+        status: "upgradedToPremium",
+        organizationId: null,
+      });
+    });
+  });
+
+  describe("onCloseClicked with premium interest", () => {
+    it("should clear premium interest when modal is closed", async () => {
+      mockPremiumInterestStateService.clearPremiumInterest.mockResolvedValue();
+
+      await component["onCloseClicked"]();
+
+      expect(mockPremiumInterestStateService.clearPremiumInterest).toHaveBeenCalledWith(
+        mockAccount.id,
+      );
+      expect(mockDialogRef.close).toHaveBeenCalledWith({ status: "closed" });
+    });
+  });
+
+  describe("previousStep with premium interest", () => {
+    it("should NOT clear premium interest when navigating between steps", async () => {
+      component["step"].set(UnifiedUpgradeDialogStep.Payment);
+      component["selectedPlan"].set(PersonalSubscriptionPricingTierIds.Premium);
+
+      await component["previousStep"]();
+
+      expect(mockPremiumInterestStateService.clearPremiumInterest).not.toHaveBeenCalled();
+      expect(component["step"]()).toBe(UnifiedUpgradeDialogStep.PlanSelection);
+      expect(component["selectedPlan"]()).toBeNull();
+    });
+
+    it("should clear premium interest when backing out of dialog completely", async () => {
+      TestBed.resetTestingModule();
+
+      const customDialogData: UnifiedUpgradeDialogParams = {
+        account: mockAccount,
+        initialStep: UnifiedUpgradeDialogStep.Payment,
+        selectedPlan: PersonalSubscriptionPricingTierIds.Premium,
+      };
+
+      mockPremiumInterestStateService.clearPremiumInterest.mockResolvedValue();
+
+      await TestBed.configureTestingModule({
+        imports: [NoopAnimationsModule, UnifiedUpgradeDialogComponent],
+        providers: [
+          { provide: DialogRef, useValue: mockDialogRef },
+          { provide: DIALOG_DATA, useValue: customDialogData },
+          { provide: Router, useValue: mockRouter },
+          { provide: PremiumInterestStateService, useValue: mockPremiumInterestStateService },
+        ],
+      })
+        .overrideComponent(UnifiedUpgradeDialogComponent, {
+          remove: {
+            imports: [UpgradeAccountComponent, UpgradePaymentComponent],
+          },
+          add: {
+            imports: [MockUpgradeAccountComponent, MockUpgradePaymentComponent],
+          },
+        })
+        .compileComponents();
+
+      const customFixture = TestBed.createComponent(UnifiedUpgradeDialogComponent);
+      const customComponent = customFixture.componentInstance;
+      customFixture.detectChanges();
+
+      await customComponent["previousStep"]();
+
+      expect(mockPremiumInterestStateService.clearPremiumInterest).toHaveBeenCalledWith(
+        mockAccount.id,
+      );
+      expect(mockDialogRef.close).toHaveBeenCalledWith({ status: "closed" });
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.ts b/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.ts
new file mode 100644
index 00000000000..02d48e8d8f4
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.ts
@@ -0,0 +1,203 @@
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { CommonModule } from "@angular/common";
+import { Component, Inject, OnInit, signal } from "@angular/core";
+import { Router } from "@angular/router";
+
+import { PremiumInterestStateService } from "@bitwarden/angular/billing/services/premium-interest/premium-interest-state.service.abstraction";
+import { Account } from "@bitwarden/common/auth/abstractions/account.service";
+import { PersonalSubscriptionPricingTierId } from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
+import {
+  ButtonModule,
+  DialogConfig,
+  DialogModule,
+  DialogRef,
+  DialogService,
+} from "@bitwarden/components";
+
+import { AccountBillingClient, TaxClient } from "../../../clients";
+import { BillingServicesModule } from "../../../services";
+import { UpgradeAccountComponent } from "../upgrade-account/upgrade-account.component";
+import { UpgradePaymentService } from "../upgrade-payment/services/upgrade-payment.service";
+import {
+  UpgradePaymentComponent,
+  UpgradePaymentResult,
+} from "../upgrade-payment/upgrade-payment.component";
+
+export const UnifiedUpgradeDialogStatus = {
+  Closed: "closed",
+  UpgradedToPremium: "upgradedToPremium",
+  UpgradedToFamilies: "upgradedToFamilies",
+} as const;
+
+export const UnifiedUpgradeDialogStep = {
+  PlanSelection: "planSelection",
+  Payment: "payment",
+} as const;
+
+export type UnifiedUpgradeDialogStatus = UnionOfValues<typeof UnifiedUpgradeDialogStatus>;
+export type UnifiedUpgradeDialogStep = UnionOfValues<typeof UnifiedUpgradeDialogStep>;
+
+export type UnifiedUpgradeDialogResult = {
+  status: UnifiedUpgradeDialogStatus;
+  organizationId?: string | null;
+};
+
+/**
+ * Parameters for the UnifiedUpgradeDialog component.
+ * In order to open the dialog to a specific step, you must provide the `initialStep` parameter and a `selectedPlan` if the step is `Payment`.
+ *
+ * @property {Account} account - The user account information.
+ * @property {UnifiedUpgradeDialogStep | null} [initialStep] - The initial step to show in the dialog, if any.
+ * @property {PersonalSubscriptionPricingTierId | null} [selectedPlan] - Pre-selected subscription plan, if any.
+ * @property {string | null} [dialogTitleMessageOverride] - Optional custom i18n key to override the default dialog title.
+ * @property {boolean} [hideContinueWithoutUpgradingButton] - Whether to hide the "Continue without upgrading" button.
+ * @property {boolean} [redirectOnCompletion] - Whether to redirect after successful upgrade. Premium upgrades redirect to subscription settings, Families upgrades redirect to organization vault.
+ */
+export type UnifiedUpgradeDialogParams = {
+  account: Account;
+  initialStep?: UnifiedUpgradeDialogStep | null;
+  selectedPlan?: PersonalSubscriptionPricingTierId | null;
+  planSelectionStepTitleOverride?: string | null;
+  hideContinueWithoutUpgradingButton?: boolean;
+  redirectOnCompletion?: boolean;
+};
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-unified-upgrade-dialog",
+  imports: [
+    CommonModule,
+    DialogModule,
+    ButtonModule,
+    UpgradeAccountComponent,
+    UpgradePaymentComponent,
+    BillingServicesModule,
+  ],
+  providers: [UpgradePaymentService, AccountBillingClient, TaxClient],
+  templateUrl: "./unified-upgrade-dialog.component.html",
+})
+export class UnifiedUpgradeDialogComponent implements OnInit {
+  // Use signals for dialog state because inputs depend on parent component
+  protected readonly step = signal<UnifiedUpgradeDialogStep>(
+    UnifiedUpgradeDialogStep.PlanSelection,
+  );
+  protected readonly selectedPlan = signal<PersonalSubscriptionPricingTierId | null>(null);
+  protected readonly account = signal<Account | null>(null);
+  protected readonly planSelectionStepTitleOverride = signal<string | null>(null);
+  protected readonly hideContinueWithoutUpgradingButton = signal<boolean>(false);
+
+  protected readonly PaymentStep = UnifiedUpgradeDialogStep.Payment;
+  protected readonly PlanSelectionStep = UnifiedUpgradeDialogStep.PlanSelection;
+
+  constructor(
+    private dialogRef: DialogRef<UnifiedUpgradeDialogResult>,
+    @Inject(DIALOG_DATA) private params: UnifiedUpgradeDialogParams,
+    private router: Router,
+    private premiumInterestStateService: PremiumInterestStateService,
+  ) {}
+
+  ngOnInit(): void {
+    this.account.set(this.params.account);
+    this.step.set(this.params.initialStep ?? UnifiedUpgradeDialogStep.PlanSelection);
+    this.selectedPlan.set(this.params.selectedPlan ?? null);
+    this.planSelectionStepTitleOverride.set(this.params.planSelectionStepTitleOverride ?? null);
+    this.hideContinueWithoutUpgradingButton.set(
+      this.params.hideContinueWithoutUpgradingButton ?? false,
+    );
+  }
+
+  protected onPlanSelected(planId: PersonalSubscriptionPricingTierId): void {
+    this.selectedPlan.set(planId);
+    this.nextStep();
+  }
+  protected async onCloseClicked(): Promise<void> {
+    // Clear premium interest when user closes/abandons modal
+    await this.premiumInterestStateService.clearPremiumInterest(this.params.account.id);
+    this.close({ status: UnifiedUpgradeDialogStatus.Closed });
+  }
+
+  private close(result: UnifiedUpgradeDialogResult): void {
+    this.dialogRef.close(result);
+  }
+
+  protected nextStep() {
+    if (this.step() === UnifiedUpgradeDialogStep.PlanSelection) {
+      this.step.set(UnifiedUpgradeDialogStep.Payment);
+    }
+  }
+
+  protected async previousStep(): Promise<void> {
+    // If we are on the payment step and there was no initial step, go back to plan selection this is to prevent
+    // going back to payment step if the dialog was opened directly to payment step
+    if (this.step() === UnifiedUpgradeDialogStep.Payment && this.params?.initialStep == null) {
+      this.step.set(UnifiedUpgradeDialogStep.PlanSelection);
+      this.selectedPlan.set(null);
+    } else {
+      // Clear premium interest when backing out of dialog completely
+      await this.premiumInterestStateService.clearPremiumInterest(this.params.account.id);
+      this.close({ status: UnifiedUpgradeDialogStatus.Closed });
+    }
+  }
+
+  protected async onComplete(result: UpgradePaymentResult): Promise<void> {
+    let status: UnifiedUpgradeDialogStatus;
+    switch (result.status) {
+      case "upgradedToPremium":
+        status = UnifiedUpgradeDialogStatus.UpgradedToPremium;
+        break;
+      case "upgradedToFamilies":
+        status = UnifiedUpgradeDialogStatus.UpgradedToFamilies;
+        break;
+      case "closed":
+        status = UnifiedUpgradeDialogStatus.Closed;
+        break;
+      default:
+        status = UnifiedUpgradeDialogStatus.Closed;
+    }
+
+    this.close({ status, organizationId: result.organizationId });
+
+    // Check premium interest and route to vault for marketing-initiated premium upgrades
+    if (status === UnifiedUpgradeDialogStatus.UpgradedToPremium) {
+      const hasPremiumInterest = await this.premiumInterestStateService.getPremiumInterest(
+        this.params.account.id,
+      );
+      if (hasPremiumInterest) {
+        await this.premiumInterestStateService.clearPremiumInterest(this.params.account.id);
+        await this.router.navigate(["/vault"]);
+        return; // Exit early, don't use redirectOnCompletion
+      }
+    }
+
+    // Use redirectOnCompletion for standard upgrade flows
+    if (
+      this.params.redirectOnCompletion &&
+      (status === UnifiedUpgradeDialogStatus.UpgradedToPremium ||
+        status === UnifiedUpgradeDialogStatus.UpgradedToFamilies)
+    ) {
+      const redirectUrl =
+        status === UnifiedUpgradeDialogStatus.UpgradedToFamilies
+          ? `/organizations/${result.organizationId}/vault`
+          : "/settings/subscription/user-subscription";
+      await this.router.navigate([redirectUrl]);
+    }
+  }
+
+  /**
+   * Opens the unified upgrade dialog.
+   *
+   * @param dialogService - The dialog service used to open the component
+   * @param dialogConfig - The configuration for the dialog including UnifiedUpgradeDialogParams data
+   * @returns A dialog reference object of type DialogRef<UnifiedUpgradeDialogResult>
+   */
+  static open(
+    dialogService: DialogService,
+    dialogConfig: DialogConfig<UnifiedUpgradeDialogParams>,
+  ): DialogRef<UnifiedUpgradeDialogResult> {
+    return dialogService.open<UnifiedUpgradeDialogResult>(UnifiedUpgradeDialogComponent, {
+      data: dialogConfig.data,
+    });
+  }
+}
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.html b/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.html
new file mode 100644
index 00000000000..f1aebac7695
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.html
@@ -0,0 +1,70 @@
+@if (!loading()) {
+  <section
+    class="tw-w-screen tw-max-h-screen tw-min-w-[332px] md:tw-max-w-4xl tw-overflow-y-auto tw-self-center tw-bg-background tw-rounded-xl tw-shadow-lg tw-border-secondary-100 tw-border-solid tw-border"
+    cdkTrapFocus
+    cdkTrapFocusAutoCapture
+  >
+    <header class="tw-flex tw-items-center tw-justify-end tw-pl-6 tw-pt-3 tw-pr-2">
+      <button
+        type="button"
+        bitIconButton="bwi-close"
+        buttonType="main"
+        size="default"
+        [label]="'close' | i18n"
+        (click)="closeClicked.emit(closeStatus)"
+      ></button>
+    </header>
+    <div class="tw-px-14 tw-pb-8">
+      <div class="tw-flex tw-text-center tw-flex-col tw-pb-4">
+        <h1 class="tw-font-medium tw-text-[32px]">
+          {{ dialogTitle() | i18n }}
+        </h1>
+        <p bitTypography="body1" class="tw-text-muted">
+          {{ "individualUpgradeDescriptionMessage" | i18n }}
+        </p>
+      </div>
+
+      <div class="tw-grid tw-grid-cols-1 sm:tw-grid-cols-2 tw-gap-5 tw-mb-4">
+        @if (premiumCardDetails) {
+          <billing-pricing-card
+            class="tw-w-full tw-min-w-[216px] tw-max-w-[456px]"
+            [tagline]="premiumCardDetails.tagline"
+            [price]="premiumCardDetails.price"
+            [button]="premiumCardDetails.button"
+            [features]="premiumCardDetails.features"
+            (buttonClick)="planSelected.emit(premiumPlanType)"
+          >
+            <h3 slot="title" class="tw-m-0" bitTypography="h3">
+              {{ premiumCardDetails.title }}
+            </h3>
+          </billing-pricing-card>
+        }
+
+        @if (familiesCardDetails) {
+          <billing-pricing-card
+            class="tw-w-full tw-min-w-[216px] tw-max-w-[456px]"
+            [tagline]="familiesCardDetails.tagline"
+            [price]="familiesCardDetails.price"
+            [button]="familiesCardDetails.button"
+            [features]="familiesCardDetails.features"
+            (buttonClick)="planSelected.emit(familiesPlanType)"
+          >
+            <h3 slot="title" class="tw-m-0" bitTypography="h3">
+              {{ familiesCardDetails.title }}
+            </h3>
+          </billing-pricing-card>
+        }
+      </div>
+      <div class="tw-text-center tw-w-full">
+        <p bitTypography="helper" class="tw-text-muted tw-italic">
+          {{ "individualUpgradeTaxInformationMessage" | i18n }}
+        </p>
+        @if (!hideContinueWithoutUpgradingButton()) {
+          <button bitLink linkType="primary" type="button" (click)="closeClicked.emit(closeStatus)">
+            {{ "continueWithoutUpgrading" | i18n }}
+          </button>
+        }
+      </div>
+    </div>
+  </section>
+}
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.spec.ts b/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.spec.ts
new file mode 100644
index 00000000000..add0eb0a011
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.spec.ts
@@ -0,0 +1,197 @@
+import { CdkTrapFocus } from "@angular/cdk/a11y";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { SubscriptionPricingServiceAbstraction } from "@bitwarden/common/billing/abstractions/subscription-pricing.service.abstraction";
+import {
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PricingCardComponent } from "@bitwarden/pricing";
+
+import { BillingServicesModule } from "../../../services";
+
+import { UpgradeAccountComponent, UpgradeAccountStatus } from "./upgrade-account.component";
+
+describe("UpgradeAccountComponent", () => {
+  let sut: UpgradeAccountComponent;
+  let fixture: ComponentFixture<UpgradeAccountComponent>;
+  const mockI18nService = mock<I18nService>();
+  const mockSubscriptionPricingService = mock<SubscriptionPricingServiceAbstraction>();
+
+  // Mock pricing tiers data
+  const mockPricingTiers: PersonalSubscriptionPricingTier[] = [
+    {
+      id: PersonalSubscriptionPricingTierIds.Premium,
+      name: "premium", // Name changed to match i18n key expectation
+      description: "Premium plan for individuals",
+      passwordManager: {
+        annualPrice: 10,
+        features: [{ value: "Feature 1" }, { value: "Feature 2" }, { value: "Feature 3" }],
+      },
+    } as PersonalSubscriptionPricingTier,
+    {
+      id: PersonalSubscriptionPricingTierIds.Families,
+      name: "planNameFamilies", // Name changed to match i18n key expectation
+      description: "Family plan for up to 6 users",
+      passwordManager: {
+        annualPrice: 40,
+        features: [{ value: "Feature A" }, { value: "Feature B" }, { value: "Feature C" }],
+        users: 6,
+      },
+    } as PersonalSubscriptionPricingTier,
+  ];
+
+  beforeEach(async () => {
+    jest.resetAllMocks();
+
+    mockI18nService.t.mockImplementation((key) => key);
+    mockSubscriptionPricingService.getPersonalSubscriptionPricingTiers$.mockReturnValue(
+      of(mockPricingTiers),
+    );
+
+    await TestBed.configureTestingModule({
+      imports: [NoopAnimationsModule, UpgradeAccountComponent, PricingCardComponent, CdkTrapFocus],
+      providers: [
+        { provide: I18nService, useValue: mockI18nService },
+        {
+          provide: SubscriptionPricingServiceAbstraction,
+          useValue: mockSubscriptionPricingService,
+        },
+      ],
+    })
+      .overrideComponent(UpgradeAccountComponent, {
+        // Remove BillingServicesModule to avoid conflicts with mocking SubscriptionPricingService dependencies
+        remove: { imports: [BillingServicesModule] },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(UpgradeAccountComponent);
+    sut = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(sut).toBeTruthy();
+  });
+
+  it("should set up pricing tier details properly", () => {
+    expect(sut["premiumCardDetails"]).toBeDefined();
+    expect(sut["familiesCardDetails"]).toBeDefined();
+  });
+
+  it("should create premium card details correctly", () => {
+    // Because the i18n service is mocked to return the key itself
+    expect(sut["premiumCardDetails"].title).toBe("premium");
+    expect(sut["premiumCardDetails"].tagline).toBe("Premium plan for individuals");
+    expect(sut["premiumCardDetails"].price.amount).toBe(10 / 12);
+    expect(sut["premiumCardDetails"].price.cadence).toBe("monthly");
+    expect(sut["premiumCardDetails"].button.type).toBe("primary");
+    expect(sut["premiumCardDetails"].button.text).toBe("upgradeToPremium");
+    expect(sut["premiumCardDetails"].features).toEqual(["Feature 1", "Feature 2", "Feature 3"]);
+  });
+
+  it("should create families card details correctly", () => {
+    // Because the i18n service is mocked to return the key itself
+    expect(sut["familiesCardDetails"].title).toBe("planNameFamilies");
+    expect(sut["familiesCardDetails"].tagline).toBe("Family plan for up to 6 users");
+    expect(sut["familiesCardDetails"].price.amount).toBe(40 / 12);
+    expect(sut["familiesCardDetails"].price.cadence).toBe("monthly");
+    expect(sut["familiesCardDetails"].button.type).toBe("secondary");
+    expect(sut["familiesCardDetails"].button.text).toBe("startFreeFamiliesTrial");
+    expect(sut["familiesCardDetails"].features).toEqual(["Feature A", "Feature B", "Feature C"]);
+  });
+
+  it("should emit planSelected with premium pricing tier when premium plan is selected", () => {
+    // Arrange
+    const emitSpy = jest.spyOn(sut.planSelected, "emit");
+
+    // Act
+    sut.planSelected.emit(PersonalSubscriptionPricingTierIds.Premium);
+
+    // Assert
+    expect(emitSpy).toHaveBeenCalledWith(PersonalSubscriptionPricingTierIds.Premium);
+  });
+
+  it("should emit planSelected with families pricing tier when families plan is selected", () => {
+    // Arrange
+    const emitSpy = jest.spyOn(sut.planSelected, "emit");
+
+    // Act
+    sut.planSelected.emit(PersonalSubscriptionPricingTierIds.Families);
+
+    // Assert
+    expect(emitSpy).toHaveBeenCalledWith(PersonalSubscriptionPricingTierIds.Families);
+  });
+
+  it("should emit closeClicked with closed status when close button is clicked", () => {
+    // Arrange
+    const emitSpy = jest.spyOn(sut.closeClicked, "emit");
+
+    // Act
+    sut.closeClicked.emit(UpgradeAccountStatus.Closed);
+
+    // Assert
+    expect(emitSpy).toHaveBeenCalledWith(UpgradeAccountStatus.Closed);
+  });
+
+  describe("isFamiliesPlan", () => {
+    it("should return true for families plan", () => {
+      const result = sut["isFamiliesPlan"](PersonalSubscriptionPricingTierIds.Families);
+      expect(result).toBe(true);
+    });
+
+    it("should return false for premium plan", () => {
+      const result = sut["isFamiliesPlan"](PersonalSubscriptionPricingTierIds.Premium);
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("hideContinueWithoutUpgradingButton", () => {
+    it("should show the continue without upgrading button by default", () => {
+      const button = fixture.nativeElement.querySelector('button[bitLink][linkType="primary"]');
+      expect(button).toBeTruthy();
+    });
+
+    it("should hide the continue without upgrading button when input is true", async () => {
+      TestBed.resetTestingModule();
+
+      mockI18nService.t.mockImplementation((key) => key);
+      mockSubscriptionPricingService.getPersonalSubscriptionPricingTiers$.mockReturnValue(
+        of(mockPricingTiers),
+      );
+
+      await TestBed.configureTestingModule({
+        imports: [
+          NoopAnimationsModule,
+          UpgradeAccountComponent,
+          PricingCardComponent,
+          CdkTrapFocus,
+        ],
+        providers: [
+          { provide: I18nService, useValue: mockI18nService },
+          {
+            provide: SubscriptionPricingServiceAbstraction,
+            useValue: mockSubscriptionPricingService,
+          },
+        ],
+      })
+        .overrideComponent(UpgradeAccountComponent, {
+          remove: { imports: [BillingServicesModule] },
+        })
+        .compileComponents();
+
+      const customFixture = TestBed.createComponent(UpgradeAccountComponent);
+      customFixture.componentRef.setInput("hideContinueWithoutUpgradingButton", true);
+      customFixture.detectChanges();
+
+      const button = customFixture.nativeElement.querySelector(
+        'button[bitLink][linkType="primary"]',
+      );
+      expect(button).toBeNull();
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.ts b/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.ts
new file mode 100644
index 00000000000..a4089d7a47a
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-account/upgrade-account.component.ts
@@ -0,0 +1,146 @@
+import { CdkTrapFocus } from "@angular/cdk/a11y";
+import { CommonModule } from "@angular/common";
+import { Component, DestroyRef, OnInit, computed, input, output, signal } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { catchError, of } from "rxjs";
+
+import { SubscriptionPricingServiceAbstraction } from "@bitwarden/common/billing/abstractions/subscription-pricing.service.abstraction";
+import {
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierId,
+  PersonalSubscriptionPricingTierIds,
+  SubscriptionCadence,
+  SubscriptionCadenceIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
+import { ButtonType, DialogModule, ToastService } from "@bitwarden/components";
+import { PricingCardComponent } from "@bitwarden/pricing";
+
+import { SharedModule } from "../../../../shared";
+import { BillingServicesModule } from "../../../services";
+
+export const UpgradeAccountStatus = {
+  Closed: "closed",
+  ProceededToPayment: "proceeded-to-payment",
+} as const;
+
+export type UpgradeAccountStatus = UnionOfValues<typeof UpgradeAccountStatus>;
+
+export type UpgradeAccountResult = {
+  status: UpgradeAccountStatus;
+  plan: PersonalSubscriptionPricingTierId | null;
+};
+
+type CardDetails = {
+  title: string;
+  tagline: string;
+  price: { amount: number; cadence: SubscriptionCadence };
+  button: { text: string; type: ButtonType };
+  features: string[];
+};
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-upgrade-account",
+  imports: [
+    CommonModule,
+    DialogModule,
+    SharedModule,
+    BillingServicesModule,
+    PricingCardComponent,
+    CdkTrapFocus,
+  ],
+  templateUrl: "./upgrade-account.component.html",
+})
+export class UpgradeAccountComponent implements OnInit {
+  readonly dialogTitleMessageOverride = input<string | null>(null);
+  readonly hideContinueWithoutUpgradingButton = input<boolean>(false);
+  planSelected = output<PersonalSubscriptionPricingTierId>();
+  closeClicked = output<UpgradeAccountStatus>();
+  protected readonly loading = signal(true);
+  protected premiumCardDetails!: CardDetails;
+  protected familiesCardDetails!: CardDetails;
+
+  protected familiesPlanType = PersonalSubscriptionPricingTierIds.Families;
+  protected premiumPlanType = PersonalSubscriptionPricingTierIds.Premium;
+  protected closeStatus = UpgradeAccountStatus.Closed;
+
+  protected readonly dialogTitle = computed(() => {
+    return this.dialogTitleMessageOverride() || "individualUpgradeWelcomeMessage";
+  });
+
+  constructor(
+    private i18nService: I18nService,
+    private subscriptionPricingService: SubscriptionPricingServiceAbstraction,
+    private toastService: ToastService,
+    private destroyRef: DestroyRef,
+  ) {}
+
+  ngOnInit(): void {
+    this.subscriptionPricingService
+      .getPersonalSubscriptionPricingTiers$()
+      .pipe(
+        catchError((error: unknown) => {
+          this.toastService.showToast({
+            variant: "error",
+            title: "",
+            message: this.i18nService.t("unexpectedError"),
+          });
+          this.loading.set(false);
+          return of([]);
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe((plans) => {
+        this.setupCardDetails(plans);
+        this.loading.set(false);
+      });
+  }
+
+  /** Setup card details for the pricing tiers.
+   * This can be extended in the future for business plans, etc.
+   */
+  private setupCardDetails(plans: PersonalSubscriptionPricingTier[]): void {
+    const premiumTier = plans.find(
+      (tier) => tier.id === PersonalSubscriptionPricingTierIds.Premium,
+    );
+    const familiesTier = plans.find(
+      (tier) => tier.id === PersonalSubscriptionPricingTierIds.Families,
+    );
+
+    if (premiumTier) {
+      this.premiumCardDetails = this.createCardDetails(premiumTier, "primary");
+    }
+
+    if (familiesTier) {
+      this.familiesCardDetails = this.createCardDetails(familiesTier, "secondary");
+    }
+  }
+
+  private createCardDetails(
+    tier: PersonalSubscriptionPricingTier,
+    buttonType: ButtonType,
+  ): CardDetails {
+    return {
+      title: tier.name,
+      tagline: tier.description,
+      price: {
+        amount: tier.passwordManager.annualPrice / 12,
+        cadence: SubscriptionCadenceIds.Monthly,
+      },
+      button: {
+        text: this.i18nService.t(
+          this.isFamiliesPlan(tier.id) ? "startFreeFamiliesTrial" : "upgradeToPremium",
+        ),
+        type: buttonType,
+      },
+      features: tier.passwordManager.features.map((f: { key: string; value: string }) => f.value),
+    };
+  }
+
+  private isFamiliesPlan(plan: PersonalSubscriptionPricingTierId): boolean {
+    return plan === PersonalSubscriptionPricingTierIds.Families;
+  }
+}
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.html b/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.html
new file mode 100644
index 00000000000..a028839f8f0
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.html
@@ -0,0 +1,14 @@
+<div class="tw-px-2 tw-mt-3 tw-mb-2 tw-h-10">
+  <div class="tw-rounded-full tw-bg-primary-100 tw-size-full">
+    <!-- Note that this is a custom button style for premium upgrade because the style desired
+      is not supported by the button in the CL. -->
+    <button
+      type="button"
+      class="tw-py-1.5 tw-px-4 tw-flex tw-gap-2 tw-items-center tw-size-full focus-visible:tw-ring-2 focus-visible:tw-ring-offset-0 focus:tw-outline-none focus-visible:tw-outline-none focus-visible:tw-ring-text-alt2 focus-visible:tw-z-10 tw-font-medium tw-rounded-full tw-transition tw-border tw-border-solid tw-text-left tw-bg-primary-100 tw-text-primary-600 tw-border-primary-600 hover:tw-bg-hover-default hover:tw-text-primary-700 hover:tw-border-primary-700"
+      (click)="upgrade()"
+    >
+      <i class="bwi bwi-premium" aria-hidden="true"></i>
+      {{ "upgradeYourPlan" | i18n }}
+    </button>
+  </div>
+</div>
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.spec.ts b/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.spec.ts
new file mode 100644
index 00000000000..787936c102e
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.spec.ts
@@ -0,0 +1,161 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { Router } from "@angular/router";
+import { mock, MockProxy } from "jest-mock-extended";
+import { BehaviorSubject, of } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { DialogRef, DialogService } from "@bitwarden/components";
+
+import {
+  UnifiedUpgradeDialogResult,
+  UnifiedUpgradeDialogStatus,
+} from "../../unified-upgrade-dialog/unified-upgrade-dialog.component";
+
+import { UpgradeNavButtonComponent } from "./upgrade-nav-button.component";
+
+describe("UpgradeNavButtonComponent", () => {
+  let component: UpgradeNavButtonComponent;
+  let fixture: ComponentFixture<UpgradeNavButtonComponent>;
+  let mockDialogService: MockProxy<DialogService>;
+  let mockAccountService: MockProxy<AccountService>;
+  let mockSyncService: MockProxy<SyncService>;
+  let mockApiService: MockProxy<ApiService>;
+  let mockRouter: MockProxy<Router>;
+  let mockI18nService: MockProxy<I18nService>;
+  let mockPlatformUtilsService: MockProxy<PlatformUtilsService>;
+  let activeAccount$: BehaviorSubject<Account | null>;
+
+  const mockAccount: Account = {
+    id: "user-id" as UserId,
+    email: "test@example.com",
+    emailVerified: true,
+    name: "Test User",
+  };
+
+  beforeEach(async () => {
+    mockDialogService = mock<DialogService>();
+    mockAccountService = mock<AccountService>();
+    mockSyncService = mock<SyncService>();
+    mockApiService = mock<ApiService>();
+    mockRouter = mock<Router>();
+    mockI18nService = mock<I18nService>();
+    mockPlatformUtilsService = mock<PlatformUtilsService>();
+
+    activeAccount$ = new BehaviorSubject<Account | null>(mockAccount);
+    mockAccountService.activeAccount$ = activeAccount$;
+    mockI18nService.t.mockImplementation((key) => key);
+    mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+
+    await TestBed.configureTestingModule({
+      imports: [UpgradeNavButtonComponent],
+      providers: [
+        { provide: DialogService, useValue: mockDialogService },
+        { provide: AccountService, useValue: mockAccountService },
+        { provide: SyncService, useValue: mockSyncService },
+        { provide: ApiService, useValue: mockApiService },
+        { provide: Router, useValue: mockRouter },
+        { provide: I18nService, useValue: mockI18nService },
+        { provide: PlatformUtilsService, useValue: mockPlatformUtilsService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(UpgradeNavButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe("upgrade()", () => {
+    describe("when self-hosted", () => {
+      beforeEach(() => {
+        mockPlatformUtilsService.isSelfHost.mockReturnValue(true);
+      });
+
+      it("should navigate to subscription page", async () => {
+        await component.upgrade();
+
+        expect(mockRouter.navigate).toHaveBeenCalledWith(["/settings/subscription/premium"]);
+        expect(mockDialogService.open).not.toHaveBeenCalled();
+      });
+    });
+
+    describe("when not self-hosted", () => {
+      beforeEach(() => {
+        mockPlatformUtilsService.isSelfHost.mockReturnValue(false);
+      });
+
+      it("should return early if no active account exists", async () => {
+        activeAccount$.next(null);
+
+        await component.upgrade();
+
+        expect(mockDialogService.open).not.toHaveBeenCalled();
+      });
+
+      it("should open upgrade dialog with correct configuration", async () => {
+        const mockDialogRef = mock<DialogRef<UnifiedUpgradeDialogResult>>();
+        mockDialogRef.closed = of({ status: UnifiedUpgradeDialogStatus.Closed });
+        mockDialogService.open.mockReturnValue(mockDialogRef);
+
+        await component.upgrade();
+
+        expect(mockDialogService.open).toHaveBeenCalledWith(
+          expect.anything(),
+          expect.objectContaining({
+            data: {
+              account: mockAccount,
+              planSelectionStepTitleOverride: "upgradeYourPlan",
+              hideContinueWithoutUpgradingButton: true,
+            },
+          }),
+        );
+      });
+
+      it("should full sync after upgrading to premium", async () => {
+        const mockDialogRef = mock<DialogRef<UnifiedUpgradeDialogResult>>();
+        mockDialogRef.closed = of({ status: UnifiedUpgradeDialogStatus.UpgradedToPremium });
+        mockDialogService.open.mockReturnValue(mockDialogRef);
+
+        await component.upgrade();
+
+        expect(mockSyncService.fullSync).toHaveBeenCalledWith(true);
+      });
+
+      it("should navigate to organization vault after upgrading to families", async () => {
+        const organizationId = "org-123";
+        const mockDialogRef = mock<DialogRef<UnifiedUpgradeDialogResult>>();
+        mockDialogRef.closed = of({
+          status: UnifiedUpgradeDialogStatus.UpgradedToFamilies,
+          organizationId,
+        });
+        mockDialogService.open.mockReturnValue(mockDialogRef);
+
+        await component.upgrade();
+
+        expect(mockRouter.navigate).toHaveBeenCalledWith([
+          `/organizations/${organizationId}/vault`,
+        ]);
+      });
+
+      it("should do nothing when dialog closes without upgrade", async () => {
+        const mockDialogRef = mock<DialogRef<UnifiedUpgradeDialogResult>>();
+        mockDialogRef.closed = of({ status: UnifiedUpgradeDialogStatus.Closed });
+        mockDialogService.open.mockReturnValue(mockDialogRef);
+
+        await component.upgrade();
+
+        expect(mockApiService.refreshIdentityToken).not.toHaveBeenCalled();
+        expect(mockSyncService.fullSync).not.toHaveBeenCalled();
+        expect(mockRouter.navigate).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.ts b/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.ts
new file mode 100644
index 00000000000..4dda16674ff
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component.ts
@@ -0,0 +1,69 @@
+import { Component, inject } from "@angular/core";
+import { Router } from "@angular/router";
+import { firstValueFrom, lastValueFrom } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { DialogService } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import {
+  UnifiedUpgradeDialogComponent,
+  UnifiedUpgradeDialogStatus,
+} from "../../unified-upgrade-dialog/unified-upgrade-dialog.component";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-upgrade-nav-button",
+  imports: [I18nPipe],
+  templateUrl: "./upgrade-nav-button.component.html",
+  standalone: true,
+})
+export class UpgradeNavButtonComponent {
+  private dialogService = inject(DialogService);
+  private accountService = inject(AccountService);
+  private syncService = inject(SyncService);
+  private apiService = inject(ApiService);
+  private router = inject(Router);
+  private platformUtilsService = inject(PlatformUtilsService);
+
+  upgrade = async () => {
+    if (this.platformUtilsService.isSelfHost()) {
+      await this.navigateToSelfHostSubscriptionPage();
+    } else {
+      await this.openUpgradeDialog();
+    }
+  };
+
+  private async navigateToSelfHostSubscriptionPage(): Promise<void> {
+    const subscriptionUrl = "/settings/subscription/premium";
+    await this.router.navigate([subscriptionUrl]);
+  }
+
+  private async openUpgradeDialog() {
+    const account = await firstValueFrom(this.accountService.activeAccount$);
+    if (!account) {
+      return;
+    }
+
+    const dialogRef = UnifiedUpgradeDialogComponent.open(this.dialogService, {
+      data: {
+        account,
+        planSelectionStepTitleOverride: "upgradeYourPlan",
+        hideContinueWithoutUpgradingButton: true,
+      },
+    });
+
+    const result = await lastValueFrom(dialogRef.closed);
+
+    if (result?.status === UnifiedUpgradeDialogStatus.UpgradedToPremium) {
+      await this.syncService.fullSync(true);
+    } else if (result?.status === UnifiedUpgradeDialogStatus.UpgradedToFamilies) {
+      const redirectUrl = `/organizations/${result.organizationId}/vault`;
+      await this.router.navigate([redirectUrl]);
+    }
+  }
+}
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.stories.ts b/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.stories.ts
new file mode 100644
index 00000000000..e4ac9eed22c
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.stories.ts
@@ -0,0 +1,86 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+import { of } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { DialogService, I18nMockService } from "@bitwarden/components";
+import { UpgradeNavButtonComponent } from "@bitwarden/web-vault/app/billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component";
+
+export default {
+  title: "Billing/Upgrade Navigation Button",
+  component: UpgradeNavButtonComponent,
+  decorators: [
+    moduleMetadata({
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              upgradeYourPlan: "Upgrade your plan",
+            });
+          },
+        },
+        {
+          provide: DialogService,
+          useValue: {
+            open: () => ({
+              closed: of({}),
+            }),
+          },
+        },
+        {
+          provide: AccountService,
+          useValue: {
+            activeAccount$: of({
+              id: "user-id" as UserId,
+              email: "test@example.com",
+              name: "Test User",
+              emailVerified: true,
+            }),
+          },
+        },
+        {
+          provide: ApiService,
+          useValue: {
+            refreshIdentityToken: () => {},
+          },
+        },
+        {
+          provide: SyncService,
+          useValue: {
+            fullSync: () => {},
+          },
+        },
+        {
+          provide: PlatformUtilsService,
+          useValue: {
+            isSelfHost: () => false,
+          },
+        },
+      ],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/nuFrzHsgEoEk2Sm8fWOGuS/Premium---business-upgrade-flows?node-id=858-44274&t=EiNqDGuccfhF14on-1",
+    },
+  },
+} as Meta;
+
+type Story = StoryObj<UpgradeNavButtonComponent>;
+
+export const Default: Story = {
+  render: (args) => ({
+    props: args,
+    template: `
+      <div class="tw-p-4 tw-bg-background-alt3">
+        <app-upgrade-nav-button></app-upgrade-nav-button>
+      </div>
+    `,
+  }),
+};
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-payment/services/upgrade-payment.service.spec.ts b/apps/web/src/app/billing/individual/upgrade/upgrade-payment/services/upgrade-payment.service.spec.ts
new file mode 100644
index 00000000000..9d17d62e4dc
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-payment/services/upgrade-payment.service.spec.ts
@@ -0,0 +1,701 @@
+import { TestBed } from "@angular/core/testing";
+import { mock, mockReset } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums";
+import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationResponse } from "@bitwarden/common/admin-console/models/response/organization.response";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { PaymentMethodType, PlanType } from "@bitwarden/common/billing/enums";
+import { PersonalSubscriptionPricingTierIds } from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { SyncService } from "@bitwarden/common/platform/sync";
+import { UserId } from "@bitwarden/common/types/guid";
+import { LogService } from "@bitwarden/logging";
+
+import {
+  AccountBillingClient,
+  SubscriberBillingClient,
+  TaxAmounts,
+  TaxClient,
+} from "../../../../clients";
+import {
+  BillingAddress,
+  NonTokenizablePaymentMethods,
+  NonTokenizedPaymentMethod,
+  TokenizedPaymentMethod,
+} from "../../../../payment/types";
+
+import { UpgradePaymentService, PlanDetails } from "./upgrade-payment.service";
+
+describe("UpgradePaymentService", () => {
+  const mockOrganizationBillingService = mock<OrganizationBillingServiceAbstraction>();
+  const mockAccountBillingClient = mock<AccountBillingClient>();
+  const mockTaxClient = mock<TaxClient>();
+  const mockLogService = mock<LogService>();
+  const mockSyncService = mock<SyncService>();
+  const mockOrganizationService = mock<OrganizationService>();
+  const mockAccountService = mock<AccountService>();
+  const mockSubscriberBillingClient = mock<SubscriberBillingClient>();
+  const mockConfigService = mock<ConfigService>();
+
+  mockSyncService.fullSync.mockResolvedValue(true);
+
+  let sut: UpgradePaymentService;
+
+  const mockAccount = {
+    id: "user-id" as UserId,
+    email: "test@example.com",
+    emailVerified: true,
+    name: "Test User",
+  };
+
+  const mockTokenizedPaymentMethod: TokenizedPaymentMethod = {
+    token: "test-token",
+    type: "card",
+  };
+
+  const mockBillingAddress: BillingAddress = {
+    line1: "123 Test St",
+    line2: null,
+    city: "Test City",
+    state: "TS",
+    country: "US",
+    postalCode: "12345",
+    taxId: null,
+  };
+
+  const mockPremiumPlanDetails: PlanDetails = {
+    tier: PersonalSubscriptionPricingTierIds.Premium,
+    details: {
+      id: PersonalSubscriptionPricingTierIds.Premium,
+      name: "Premium",
+      description: "Premium plan",
+      availableCadences: ["annually"],
+      passwordManager: {
+        type: "standalone",
+        annualPrice: 10,
+        annualPricePerAdditionalStorageGB: 4,
+        features: [
+          { key: "feature1", value: "Feature 1" },
+          { key: "feature2", value: "Feature 2" },
+        ],
+      },
+    },
+  };
+
+  const mockFamiliesPlanDetails: PlanDetails = {
+    tier: PersonalSubscriptionPricingTierIds.Families,
+    details: {
+      id: PersonalSubscriptionPricingTierIds.Families,
+      name: "Families",
+      description: "Families plan",
+      availableCadences: ["annually"],
+      passwordManager: {
+        type: "packaged",
+        annualPrice: 40,
+        annualPricePerAdditionalStorageGB: 4,
+        features: [
+          { key: "feature1", value: "Feature 1" },
+          { key: "feature2", value: "Feature 2" },
+        ],
+        users: 6,
+      },
+    },
+  };
+
+  beforeEach(() => {
+    mockReset(mockOrganizationBillingService);
+    mockReset(mockAccountBillingClient);
+    mockReset(mockTaxClient);
+    mockReset(mockLogService);
+    mockReset(mockOrganizationService);
+    mockReset(mockAccountService);
+    mockReset(mockSubscriberBillingClient);
+
+    mockAccountService.activeAccount$ = of(null);
+    mockOrganizationService.organizations$.mockReturnValue(of([]));
+
+    TestBed.configureTestingModule({
+      providers: [
+        UpgradePaymentService,
+        {
+          provide: SubscriberBillingClient,
+          useValue: mockSubscriberBillingClient,
+        },
+        {
+          provide: OrganizationBillingServiceAbstraction,
+          useValue: mockOrganizationBillingService,
+        },
+        { provide: AccountBillingClient, useValue: mockAccountBillingClient },
+        { provide: TaxClient, useValue: mockTaxClient },
+        { provide: LogService, useValue: mockLogService },
+        { provide: SyncService, useValue: mockSyncService },
+        { provide: OrganizationService, useValue: mockOrganizationService },
+        { provide: AccountService, useValue: mockAccountService },
+        { provide: ConfigService, useValue: mockConfigService },
+      ],
+    });
+
+    sut = TestBed.inject(UpgradePaymentService);
+  });
+
+  describe("userIsOwnerOfFreeOrg$", () => {
+    it("should return true when user is owner of a free organization", (done) => {
+      // Arrange
+      mockReset(mockAccountService);
+      mockReset(mockOrganizationService);
+
+      const mockAccount: Account = {
+        id: "user-id" as UserId,
+        email: "test@example.com",
+        name: "Test User",
+        emailVerified: true,
+      };
+
+      const paidOrgData = {
+        id: "org-1",
+        name: "Paid Org",
+        useTotp: true, // useTotp = true means NOT free
+        type: OrganizationUserType.Owner,
+      } as OrganizationData;
+
+      const freeOrgData = {
+        id: "org-2",
+        name: "Free Org",
+        useTotp: false, // useTotp = false means IS free
+        type: OrganizationUserType.Owner,
+      } as OrganizationData;
+
+      const paidOrg = new Organization(paidOrgData);
+      const freeOrg = new Organization(freeOrgData);
+      const mockOrganizations = [paidOrg, freeOrg];
+
+      mockAccountService.activeAccount$ = of(mockAccount);
+      mockOrganizationService.organizations$.mockReturnValue(of(mockOrganizations));
+
+      const service = new UpgradePaymentService(
+        mockOrganizationBillingService,
+        mockAccountBillingClient,
+        mockTaxClient,
+        mockLogService,
+        mockSyncService,
+        mockOrganizationService,
+        mockAccountService,
+        mockSubscriberBillingClient,
+        mockConfigService,
+      );
+
+      // Act & Assert
+      service.userIsOwnerOfFreeOrg$.subscribe((result) => {
+        expect(result).toBe(true);
+        done();
+      });
+    });
+
+    it("should return false when user is not owner of any free organization", (done) => {
+      // Arrange
+      mockReset(mockAccountService);
+      mockReset(mockOrganizationService);
+
+      const mockAccount: Account = {
+        id: "user-id" as UserId,
+        email: "test@example.com",
+        name: "Test User",
+        emailVerified: true,
+      };
+
+      const paidOrgData = {
+        id: "org-1",
+        name: "Paid Org",
+        useTotp: true, // useTotp = true means NOT free
+        type: OrganizationUserType.Owner,
+      } as OrganizationData;
+
+      const freeOrgData = {
+        id: "org-2",
+        name: "Free Org",
+        useTotp: false, // useTotp = false means IS free
+        type: OrganizationUserType.User, // Not owner
+      } as OrganizationData;
+
+      const paidOrg = new Organization(paidOrgData);
+      const freeOrg = new Organization(freeOrgData);
+      const mockOrganizations = [paidOrg, freeOrg];
+
+      mockAccountService.activeAccount$ = of(mockAccount);
+      mockOrganizationService.organizations$.mockReturnValue(of(mockOrganizations));
+
+      const service = new UpgradePaymentService(
+        mockOrganizationBillingService,
+        mockAccountBillingClient,
+        mockTaxClient,
+        mockLogService,
+        mockSyncService,
+        mockOrganizationService,
+        mockAccountService,
+        mockSubscriberBillingClient,
+        mockConfigService,
+      );
+
+      // Act & Assert
+      service.userIsOwnerOfFreeOrg$.subscribe((result) => {
+        expect(result).toBe(false);
+        done();
+      });
+    });
+
+    it("should return false when user has no organizations", (done) => {
+      // Arrange
+      mockReset(mockAccountService);
+      mockReset(mockOrganizationService);
+
+      const mockAccount: Account = {
+        id: "user-id" as UserId,
+        email: "test@example.com",
+        name: "Test User",
+        emailVerified: true,
+      };
+
+      mockAccountService.activeAccount$ = of(mockAccount);
+      mockOrganizationService.organizations$.mockReturnValue(of([]));
+
+      const service = new UpgradePaymentService(
+        mockOrganizationBillingService,
+        mockAccountBillingClient,
+        mockTaxClient,
+        mockLogService,
+        mockSyncService,
+        mockOrganizationService,
+        mockAccountService,
+        mockSubscriberBillingClient,
+        mockConfigService,
+      );
+
+      // Act & Assert
+      service.userIsOwnerOfFreeOrg$.subscribe((result) => {
+        expect(result).toBe(false);
+        done();
+      });
+    });
+  });
+
+  describe("accountCredit$", () => {
+    it("should correctly fetch account credit for subscriber", (done) => {
+      // Arrange
+
+      const mockAccount: Account = {
+        id: "user-id" as UserId,
+        email: "test@example.com",
+        name: "Test User",
+        emailVerified: true,
+      };
+      const expectedCredit = 25.5;
+
+      mockAccountService.activeAccount$ = of(mockAccount);
+      mockSubscriberBillingClient.getCredit.mockResolvedValue(expectedCredit);
+
+      const service = new UpgradePaymentService(
+        mockOrganizationBillingService,
+        mockAccountBillingClient,
+        mockTaxClient,
+        mockLogService,
+        mockSyncService,
+        mockOrganizationService,
+        mockAccountService,
+        mockSubscriberBillingClient,
+        mockConfigService,
+      );
+
+      // Act & Assert
+      service.accountCredit$.subscribe((credit) => {
+        expect(credit).toBe(expectedCredit);
+        expect(mockSubscriberBillingClient.getCredit).toHaveBeenCalledWith({
+          data: mockAccount,
+          type: "account",
+        });
+        done();
+      });
+    });
+
+    it("should handle empty account", (done) => {
+      // Arrange
+      mockAccountService.activeAccount$ = of(null);
+      const service = new UpgradePaymentService(
+        mockOrganizationBillingService,
+        mockAccountBillingClient,
+        mockTaxClient,
+        mockLogService,
+        mockSyncService,
+        mockOrganizationService,
+        mockAccountService,
+        mockSubscriberBillingClient,
+        mockConfigService,
+      );
+      // Act & Assert
+      service?.accountCredit$.subscribe({
+        error: () => {
+          expect(mockSubscriberBillingClient.getCredit).not.toHaveBeenCalled();
+          done();
+        },
+      });
+    });
+  });
+
+  describe("adminConsoleRouteForOwnedOrganization$", () => {
+    it("should return the admin console route for the first free organization the user owns", (done) => {
+      // Arrange
+      mockReset(mockAccountService);
+      mockReset(mockOrganizationService);
+
+      const mockAccount: Account = {
+        id: "user-id" as UserId,
+        email: "test@example.com",
+        name: "Test User",
+        emailVerified: true,
+      };
+
+      const paidOrgData = {
+        id: "org-1",
+        name: "Paid Org",
+        useTotp: true, // useTotp = true means NOT free
+        type: OrganizationUserType.Owner,
+      } as OrganizationData;
+
+      const freeOrgData = {
+        id: "org-2",
+        name: "Free Org",
+        useTotp: false, // useTotp = false means IS free
+        type: OrganizationUserType.Owner,
+      } as OrganizationData;
+
+      const paidOrg = new Organization(paidOrgData);
+      const freeOrg = new Organization(freeOrgData);
+      const mockOrganizations = [paidOrg, freeOrg];
+
+      mockAccountService.activeAccount$ = of(mockAccount);
+      mockOrganizationService.organizations$.mockReturnValue(of(mockOrganizations));
+
+      const service = new UpgradePaymentService(
+        mockOrganizationBillingService,
+        mockAccountBillingClient,
+        mockTaxClient,
+        mockLogService,
+        mockSyncService,
+        mockOrganizationService,
+        mockAccountService,
+        mockSubscriberBillingClient,
+        mockConfigService,
+      );
+
+      // Act & Assert
+      service.adminConsoleRouteForOwnedOrganization$.subscribe((result) => {
+        expect(result).toBe("/organizations/org-2/billing/subscription");
+        done();
+      });
+    });
+  });
+
+  describe("calculateEstimatedTax", () => {
+    it("should calculate tax for premium plan", async () => {
+      // Arrange
+      const mockResponse = mock<TaxAmounts>();
+      mockResponse.tax = 2.5;
+
+      mockTaxClient.previewTaxForPremiumSubscriptionPurchase.mockResolvedValue(mockResponse);
+
+      // Act
+      const result = await sut.calculateEstimatedTax(mockPremiumPlanDetails, mockBillingAddress);
+
+      // Assert
+      expect(result).toEqual(2.5);
+      expect(mockTaxClient.previewTaxForPremiumSubscriptionPurchase).toHaveBeenCalledWith(
+        0,
+        mockBillingAddress,
+      );
+    });
+
+    it("should calculate tax for families plan", async () => {
+      // Arrange
+      const mockResponse = mock<TaxAmounts>();
+      mockResponse.tax = 5.0;
+
+      mockTaxClient.previewTaxForOrganizationSubscriptionPurchase.mockResolvedValue(mockResponse);
+
+      // Act
+      const result = await sut.calculateEstimatedTax(mockFamiliesPlanDetails, mockBillingAddress);
+
+      // Assert
+      expect(result).toEqual(5.0);
+      expect(mockTaxClient.previewTaxForOrganizationSubscriptionPurchase).toHaveBeenCalledWith(
+        {
+          cadence: "annually",
+          tier: "families",
+          passwordManager: {
+            additionalStorage: 0,
+            seats: 1,
+            sponsored: false,
+          },
+        },
+        mockBillingAddress,
+      );
+    });
+
+    it("should throw and log error if personal tax calculation fails", async () => {
+      // Arrange
+      const error = new Error("Tax service error");
+      mockTaxClient.previewTaxForPremiumSubscriptionPurchase.mockRejectedValue(error);
+
+      // Act & Assert
+      await expect(
+        sut.calculateEstimatedTax(mockPremiumPlanDetails, mockBillingAddress),
+      ).rejects.toThrow();
+      expect(mockLogService.error).toHaveBeenCalledWith("Tax calculation failed:", error);
+    });
+
+    it("should throw and log error if organization tax calculation fails", async () => {
+      // Arrange
+      const error = new Error("Tax service error");
+      mockTaxClient.previewTaxForOrganizationSubscriptionPurchase.mockRejectedValue(error);
+      // Act & Assert
+      await expect(
+        sut.calculateEstimatedTax(mockFamiliesPlanDetails, mockBillingAddress),
+      ).rejects.toThrow();
+      expect(mockLogService.error).toHaveBeenCalledWith("Tax calculation failed:", error);
+    });
+  });
+
+  describe("upgradeToPremium", () => {
+    it("should call accountBillingClient to purchase premium subscription and refresh data", async () => {
+      // Arrange
+      mockAccountBillingClient.purchasePremiumSubscription.mockResolvedValue();
+
+      // Act
+      await sut.upgradeToPremium(mockTokenizedPaymentMethod, mockBillingAddress);
+
+      // Assert
+      expect(mockAccountBillingClient.purchasePremiumSubscription).toHaveBeenCalledWith(
+        mockTokenizedPaymentMethod,
+        mockBillingAddress,
+      );
+      expect(mockSyncService.fullSync).toHaveBeenCalledWith(true);
+    });
+
+    it("should handle upgrade with account credit payment method and refresh data", async () => {
+      // Arrange
+      const accountCreditPaymentMethod: NonTokenizedPaymentMethod = {
+        type: NonTokenizablePaymentMethods.accountCredit,
+      };
+      mockAccountBillingClient.purchasePremiumSubscription.mockResolvedValue();
+
+      // Act
+      await sut.upgradeToPremium(accountCreditPaymentMethod, mockBillingAddress);
+
+      // Assert
+      expect(mockAccountBillingClient.purchasePremiumSubscription).toHaveBeenCalledWith(
+        accountCreditPaymentMethod,
+        mockBillingAddress,
+      );
+      expect(mockSyncService.fullSync).toHaveBeenCalledWith(true);
+    });
+
+    it("should validate payment method type and token", async () => {
+      // Arrange
+      const noTypePaymentMethod = { token: "test-token" } as any;
+      const noTokenPaymentMethod = { type: "card" } as TokenizedPaymentMethod;
+
+      // Act & Assert
+      await expect(sut.upgradeToPremium(noTypePaymentMethod, mockBillingAddress)).rejects.toThrow(
+        "Payment method type is missing",
+      );
+
+      await expect(sut.upgradeToPremium(noTokenPaymentMethod, mockBillingAddress)).rejects.toThrow(
+        "Payment method token is missing",
+      );
+    });
+
+    it("should validate billing address fields", async () => {
+      // Arrange
+      const missingCountry = { postalCode: "12345" } as any;
+      const missingPostal = { country: "US" } as any;
+      const nullFields = { country: "US", postalCode: null } as any;
+
+      // Act & Assert
+      await expect(
+        sut.upgradeToPremium(mockTokenizedPaymentMethod, missingCountry),
+      ).rejects.toThrow("Billing address information is incomplete");
+
+      await expect(sut.upgradeToPremium(mockTokenizedPaymentMethod, missingPostal)).rejects.toThrow(
+        "Billing address information is incomplete",
+      );
+
+      await expect(sut.upgradeToPremium(mockTokenizedPaymentMethod, nullFields)).rejects.toThrow(
+        "Billing address information is incomplete",
+      );
+    });
+  });
+
+  describe("upgradeToFamilies", () => {
+    it("should call organizationBillingService to purchase subscription and refresh data", async () => {
+      // Arrange
+      mockOrganizationBillingService.purchaseSubscription.mockResolvedValue({
+        id: "org-id",
+        name: "Test Organization",
+        billingEmail: "test@example.com",
+      } as OrganizationResponse);
+
+      // Act
+      await sut.upgradeToFamilies(
+        mockAccount,
+        mockFamiliesPlanDetails,
+        mockTokenizedPaymentMethod,
+        {
+          organizationName: "Test Organization",
+          billingAddress: mockBillingAddress,
+        },
+      );
+
+      // Assert
+      expect(mockOrganizationBillingService.purchaseSubscription).toHaveBeenCalledWith(
+        expect.objectContaining({
+          organization: {
+            name: "Test Organization",
+            billingEmail: "test@example.com",
+          },
+          plan: {
+            type: PlanType.FamiliesAnnually2025,
+            passwordManagerSeats: 6,
+          },
+          payment: {
+            paymentMethod: ["test-token", PaymentMethodType.Card],
+            billing: {
+              country: "US",
+              postalCode: "12345",
+            },
+          },
+        }),
+        "user-id",
+      );
+      expect(mockSyncService.fullSync).toHaveBeenCalledWith(true);
+    });
+
+    it("should use FamiliesAnnually2025 plan when feature flag is disabled", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag.mockResolvedValue(false);
+      mockOrganizationBillingService.purchaseSubscription.mockResolvedValue({
+        id: "org-id",
+        name: "Test Organization",
+        billingEmail: "test@example.com",
+      } as OrganizationResponse);
+
+      // Act
+      await sut.upgradeToFamilies(
+        mockAccount,
+        mockFamiliesPlanDetails,
+        mockTokenizedPaymentMethod,
+        {
+          organizationName: "Test Organization",
+          billingAddress: mockBillingAddress,
+        },
+      );
+
+      // Assert
+      expect(mockOrganizationBillingService.purchaseSubscription).toHaveBeenCalledWith(
+        expect.objectContaining({
+          plan: {
+            type: PlanType.FamiliesAnnually2025,
+            passwordManagerSeats: 6,
+          },
+        }),
+        "user-id",
+      );
+    });
+
+    it("should use FamiliesAnnually plan when feature flag is enabled", async () => {
+      // Arrange
+      mockConfigService.getFeatureFlag.mockResolvedValue(true);
+      mockOrganizationBillingService.purchaseSubscription.mockResolvedValue({
+        id: "org-id",
+        name: "Test Organization",
+        billingEmail: "test@example.com",
+      } as OrganizationResponse);
+
+      // Act
+      await sut.upgradeToFamilies(
+        mockAccount,
+        mockFamiliesPlanDetails,
+        mockTokenizedPaymentMethod,
+        {
+          organizationName: "Test Organization",
+          billingAddress: mockBillingAddress,
+        },
+      );
+
+      // Assert
+      expect(mockOrganizationBillingService.purchaseSubscription).toHaveBeenCalledWith(
+        expect.objectContaining({
+          plan: {
+            type: PlanType.FamiliesAnnually,
+            passwordManagerSeats: 6,
+          },
+        }),
+        "user-id",
+      );
+    });
+
+    it("should throw error if password manager seats are 0", async () => {
+      // Arrange
+      const invalidPlanDetails: PlanDetails = {
+        tier: PersonalSubscriptionPricingTierIds.Families,
+        details: {
+          passwordManager: {
+            type: "packaged",
+            users: 0,
+            annualPrice: 0,
+            features: [],
+            annualPricePerAdditionalStorageGB: 0,
+          },
+          id: "families",
+          name: "",
+          description: "",
+          availableCadences: ["annually"],
+        },
+      };
+
+      mockOrganizationBillingService.purchaseSubscription.mockRejectedValue(
+        new Error("Seats must be greater than 0 for families plan"),
+      );
+
+      // Act & Assert
+      await expect(
+        sut.upgradeToFamilies(mockAccount, invalidPlanDetails, mockTokenizedPaymentMethod, {
+          organizationName: "Test Organization",
+          billingAddress: mockBillingAddress,
+        }),
+      ).rejects.toThrow("Seats must be greater than 0 for families plan");
+      expect(mockOrganizationBillingService.purchaseSubscription).toHaveBeenCalledTimes(1);
+    });
+
+    it("should throw error if payment token is missing with card type", async () => {
+      const incompletePaymentMethod = { type: "card" } as TokenizedPaymentMethod;
+
+      await expect(
+        sut.upgradeToFamilies(mockAccount, mockFamiliesPlanDetails, incompletePaymentMethod, {
+          organizationName: "Test Organization",
+          billingAddress: mockBillingAddress,
+        }),
+      ).rejects.toThrow("Payment method token is missing");
+    });
+    it("should throw error if organization name is missing", async () => {
+      await expect(
+        sut.upgradeToFamilies(mockAccount, mockFamiliesPlanDetails, mockTokenizedPaymentMethod, {
+          organizationName: "",
+          billingAddress: mockBillingAddress,
+        }),
+      ).rejects.toThrow("Organization name is required for families upgrade");
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-payment/services/upgrade-payment.service.ts b/apps/web/src/app/billing/individual/upgrade/upgrade-payment/services/upgrade-payment.service.ts
new file mode 100644
index 00000000000..94f1c816168
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-payment/services/upgrade-payment.service.ts
@@ -0,0 +1,240 @@
+import { Injectable } from "@angular/core";
+import { defaultIfEmpty, find, map, mergeMap, Observable, switchMap } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationResponse } from "@bitwarden/common/admin-console/models/response/organization.response";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import {
+  OrganizationBillingServiceAbstraction,
+  SubscriptionInformation,
+} from "@bitwarden/common/billing/abstractions";
+import { PaymentMethodType, PlanType } from "@bitwarden/common/billing/enums";
+import {
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierId,
+  PersonalSubscriptionPricingTierIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { LogService } from "@bitwarden/logging";
+
+import {
+  AccountBillingClient,
+  OrganizationSubscriptionPurchase,
+  SubscriberBillingClient,
+  TaxAmounts,
+  TaxClient,
+} from "../../../../clients";
+import {
+  BillingAddress,
+  NonTokenizablePaymentMethods,
+  NonTokenizedPaymentMethod,
+  tokenizablePaymentMethodToLegacyEnum,
+  TokenizedPaymentMethod,
+} from "../../../../payment/types";
+import { mapAccountToSubscriber } from "../../../../types";
+
+export type PlanDetails = {
+  tier: PersonalSubscriptionPricingTierId;
+  details: PersonalSubscriptionPricingTier;
+};
+
+export type PaymentFormValues = {
+  organizationName?: string | null;
+  billingAddress: {
+    country: string;
+    postalCode: string;
+  };
+};
+
+/**
+ * Service for handling payment submission and sales tax calculation for upgrade payment component
+ */
+@Injectable()
+export class UpgradePaymentService {
+  constructor(
+    private organizationBillingService: OrganizationBillingServiceAbstraction,
+    private accountBillingClient: AccountBillingClient,
+    private taxClient: TaxClient,
+    private logService: LogService,
+    private syncService: SyncService,
+    private organizationService: OrganizationService,
+    private accountService: AccountService,
+    private subscriberBillingClient: SubscriberBillingClient,
+    private configService: ConfigService,
+  ) {}
+
+  userIsOwnerOfFreeOrg$: Observable<boolean> = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((id) => this.organizationService.organizations$(id)),
+    mergeMap((userOrganizations) => userOrganizations),
+    find((org) => org.isFreeOrg && org.isOwner),
+    defaultIfEmpty(false),
+    map((value) => value instanceof Organization),
+  );
+
+  adminConsoleRouteForOwnedOrganization$: Observable<string> =
+    this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((id) => this.organizationService.organizations$(id)),
+      mergeMap((userOrganizations) => userOrganizations),
+      find((org) => org.isFreeOrg && org.isOwner),
+      map((org) => `/organizations/${org!.id}/billing/subscription`),
+    );
+
+  // Fetch account credit
+  accountCredit$: Observable<number | null> = this.accountService.activeAccount$.pipe(
+    mapAccountToSubscriber,
+    switchMap((account) => this.subscriberBillingClient.getCredit(account)),
+  );
+
+  /**
+   * Calculate estimated tax for the selected plan
+   */
+  async calculateEstimatedTax(
+    planDetails: PlanDetails,
+    billingAddress: BillingAddress,
+  ): Promise<number> {
+    const isFamiliesPlan = planDetails.tier === PersonalSubscriptionPricingTierIds.Families;
+    const isPremiumPlan = planDetails.tier === PersonalSubscriptionPricingTierIds.Premium;
+
+    let taxClientCall: Promise<TaxAmounts> | null = null;
+
+    if (isFamiliesPlan) {
+      // Currently, only Families plan is supported for organization plans
+      const request: OrganizationSubscriptionPurchase = {
+        tier: "families",
+        cadence: "annually",
+        passwordManager: { seats: 1, additionalStorage: 0, sponsored: false },
+      };
+
+      taxClientCall = this.taxClient.previewTaxForOrganizationSubscriptionPurchase(
+        request,
+        billingAddress,
+      );
+    }
+
+    if (isPremiumPlan) {
+      taxClientCall = this.taxClient.previewTaxForPremiumSubscriptionPurchase(0, billingAddress);
+    }
+
+    if (taxClientCall === null) {
+      throw new Error("Tax client call is not defined");
+    }
+
+    try {
+      const preview = await taxClientCall;
+      return preview.tax;
+    } catch (error) {
+      this.logService.error("Tax calculation failed:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * Process premium upgrade
+   */
+  async upgradeToPremium(
+    paymentMethod: TokenizedPaymentMethod | NonTokenizedPaymentMethod,
+    billingAddress: Pick<BillingAddress, "country" | "postalCode">,
+  ): Promise<void> {
+    this.validatePaymentAndBillingInfo(paymentMethod, billingAddress);
+
+    await this.accountBillingClient.purchasePremiumSubscription(paymentMethod, billingAddress);
+
+    await this.refreshAndSync();
+  }
+
+  /**
+   * Process families upgrade
+   */
+  async upgradeToFamilies(
+    account: Account,
+    planDetails: PlanDetails,
+    paymentMethod: TokenizedPaymentMethod,
+    formValues: PaymentFormValues,
+  ): Promise<OrganizationResponse> {
+    const billingAddress = formValues.billingAddress;
+
+    if (!formValues.organizationName) {
+      throw new Error("Organization name is required for families upgrade");
+    }
+
+    this.validatePaymentAndBillingInfo(paymentMethod, billingAddress);
+
+    const passwordManagerSeats = this.getPasswordManagerSeats(planDetails);
+    const milestone3FeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM26462_Milestone_3,
+    );
+    const familyPlan = milestone3FeatureEnabled
+      ? PlanType.FamiliesAnnually
+      : PlanType.FamiliesAnnually2025;
+
+    const subscriptionInformation: SubscriptionInformation = {
+      organization: {
+        name: formValues.organizationName,
+        billingEmail: account.email, // Use account email as billing email
+      },
+      plan: {
+        type: familyPlan,
+        passwordManagerSeats: passwordManagerSeats,
+      },
+      payment: {
+        paymentMethod: [paymentMethod.token, this.getPaymentMethodType(paymentMethod)],
+        billing: {
+          country: billingAddress.country,
+          postalCode: billingAddress.postalCode,
+        },
+      },
+    };
+
+    const result = await this.organizationBillingService.purchaseSubscription(
+      subscriptionInformation,
+      account.id,
+    );
+    await this.refreshAndSync();
+    return result;
+  }
+
+  private getPasswordManagerSeats(planDetails: PlanDetails): number {
+    return "users" in planDetails.details.passwordManager
+      ? planDetails.details.passwordManager.users
+      : 0;
+  }
+
+  private validatePaymentAndBillingInfo(
+    paymentMethod: TokenizedPaymentMethod | NonTokenizedPaymentMethod,
+    billingAddress: { country: string; postalCode: string },
+  ): void {
+    if (!paymentMethod?.type) {
+      throw new Error("Payment method type is missing");
+    }
+
+    // Account credit does not require a token
+    if (
+      paymentMethod.type !== NonTokenizablePaymentMethods.accountCredit &&
+      !paymentMethod?.token
+    ) {
+      throw new Error("Payment method token is missing");
+    }
+
+    if (!billingAddress?.country || !billingAddress?.postalCode) {
+      throw new Error("Billing address information is incomplete");
+    }
+  }
+
+  private async refreshAndSync(): Promise<void> {
+    await this.syncService.fullSync(true);
+  }
+
+  private getPaymentMethodType(
+    paymentMethod: TokenizedPaymentMethod | NonTokenizedPaymentMethod,
+  ): PaymentMethodType {
+    return paymentMethod.type === NonTokenizablePaymentMethods.accountCredit
+      ? PaymentMethodType.Credit
+      : tokenizablePaymentMethodToLegacyEnum(paymentMethod.type);
+  }
+}
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-payment/upgrade-payment.component.html b/apps/web/src/app/billing/individual/upgrade/upgrade-payment/upgrade-payment.component.html
new file mode 100644
index 00000000000..45a68136a00
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-payment/upgrade-payment.component.html
@@ -0,0 +1,87 @@
+<form [formGroup]="formGroup" [bitSubmit]="submit">
+  <bit-dialog dialogSize="large" [loading]="loading()">
+    <span bitDialogTitle class="tw-font-medium">{{ upgradeToMessage() }}</span>
+    <ng-container bitDialogContent>
+      <section>
+        @if (isFamiliesPlan) {
+          @if (userIsOwnerOfFreeOrg$ | async) {
+            <div class="tw-pb-2">
+              <bit-callout type="info">
+                {{ "formWillCreateNewFamiliesOrgMessage" | i18n }}
+                <a
+                  bitLink
+                  bitDialogClose
+                  linkType="primary"
+                  [routerLink]="adminConsoleRouteForOwnedOrganization$ | async"
+                >
+                  {{ "upgradeNow" | i18n }}
+                  <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
+                </a>
+              </bit-callout>
+            </div>
+          }
+          <div class="tw-pb-4">
+            <bit-form-field class="!tw-mb-0">
+              <bit-label>{{ "organizationName" | i18n }}</bit-label>
+              <input bitInput type="text" formControlName="organizationName" required />
+            </bit-form-field>
+            <p bitTypography="helper" class="tw-text-muted tw-pt-1 tw-pl-1">
+              {{ "organizationNameDescription" | i18n }}
+            </p>
+          </div>
+        }
+        <div class="tw-pb-8 !tw-mx-0">
+          <h5 bitTypography="h5">{{ "paymentMethod" | i18n }}</h5>
+          <app-enter-payment-method
+            [showBankAccount]="isFamiliesPlan"
+            [showAccountCredit]="!isFamiliesPlan"
+            [group]="formGroup.controls.paymentForm"
+            [includeBillingAddress]="false"
+            [hasEnoughAccountCredit]="hasEnoughAccountCredit$ | async"
+            #paymentComponent
+          ></app-enter-payment-method>
+          <h5 bitTypography="h5" class="tw-pt-4 tw-pb-2">{{ "billingAddress" | i18n }}</h5>
+          <app-enter-billing-address
+            [group]="formGroup.controls.billingAddress"
+            [scenario]="{ type: 'checkout', supportsTaxId: false }"
+          >
+          </app-enter-billing-address>
+        </div>
+      </section>
+
+      <section>
+        <billing-cart-summary
+          #cartSummaryComponent
+          [passwordManager]="passwordManager()"
+          [estimatedTax]="estimatedTax$ | async"
+        ></billing-cart-summary>
+        @if (isFamiliesPlan) {
+          <p bitTypography="helper" class="tw-italic tw-text-muted !tw-mb-0">
+            {{ "paymentChargedWithTrial" | i18n }}
+          </p>
+        }
+      </section>
+    </ng-container>
+
+    <ng-container bitDialogFooter>
+      <button
+        bitButton
+        bitFormButton
+        buttonType="primary"
+        [disabled]="loading() || !isFormValid() || !(hasEnoughAccountCredit$ | async)"
+        type="submit"
+      >
+        {{ "upgrade" | i18n }}
+      </button>
+      <button
+        bitButton
+        type="button"
+        buttonType="secondary"
+        (click)="goBack.emit()"
+        [disabled]="loading()"
+      >
+        {{ "back" | i18n }}
+      </button>
+    </ng-container>
+  </bit-dialog>
+</form>
diff --git a/apps/web/src/app/billing/individual/upgrade/upgrade-payment/upgrade-payment.component.ts b/apps/web/src/app/billing/individual/upgrade/upgrade-payment/upgrade-payment.component.ts
new file mode 100644
index 00000000000..a824e850db6
--- /dev/null
+++ b/apps/web/src/app/billing/individual/upgrade/upgrade-payment/upgrade-payment.component.ts
@@ -0,0 +1,372 @@
+import {
+  AfterViewInit,
+  Component,
+  computed,
+  DestroyRef,
+  input,
+  OnInit,
+  output,
+  signal,
+  viewChild,
+} from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import {
+  debounceTime,
+  Observable,
+  switchMap,
+  startWith,
+  from,
+  catchError,
+  of,
+  combineLatest,
+  map,
+  shareReplay,
+} from "rxjs";
+
+import { Account } from "@bitwarden/common/auth/abstractions/account.service";
+import { SubscriptionPricingServiceAbstraction } from "@bitwarden/common/billing/abstractions/subscription-pricing.service.abstraction";
+import {
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierId,
+  PersonalSubscriptionPricingTierIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
+import { ButtonModule, DialogModule, ToastService } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+import { CartSummaryComponent } from "@bitwarden/pricing";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+  getBillingAddressFromForm,
+} from "../../../payment/components";
+import {
+  BillingAddress,
+  NonTokenizablePaymentMethods,
+  NonTokenizedPaymentMethod,
+  TokenizedPaymentMethod,
+} from "../../../payment/types";
+import { BillingServicesModule } from "../../../services";
+import { BitwardenSubscriber } from "../../../types";
+
+import {
+  PaymentFormValues,
+  PlanDetails,
+  UpgradePaymentService,
+} from "./services/upgrade-payment.service";
+
+/**
+ * Status types for upgrade payment dialog
+ */
+export const UpgradePaymentStatus = {
+  Back: "back",
+  Closed: "closed",
+  UpgradedToPremium: "upgradedToPremium",
+  UpgradedToFamilies: "upgradedToFamilies",
+} as const;
+
+export type UpgradePaymentStatus = UnionOfValues<typeof UpgradePaymentStatus>;
+
+export type UpgradePaymentResult = {
+  status: UpgradePaymentStatus;
+  organizationId: string | null;
+};
+
+/**
+ * Parameters for upgrade payment
+ */
+export type UpgradePaymentParams = {
+  plan: PersonalSubscriptionPricingTierId | null;
+  subscriber: BitwardenSubscriber;
+};
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-upgrade-payment",
+  imports: [
+    DialogModule,
+    SharedModule,
+    CartSummaryComponent,
+    ButtonModule,
+    EnterPaymentMethodComponent,
+    EnterBillingAddressComponent,
+    BillingServicesModule,
+  ],
+  providers: [UpgradePaymentService],
+  templateUrl: "./upgrade-payment.component.html",
+})
+export class UpgradePaymentComponent implements OnInit, AfterViewInit {
+  private readonly INITIAL_TAX_VALUE = 0;
+  protected readonly selectedPlanId = input.required<PersonalSubscriptionPricingTierId>();
+  protected readonly account = input.required<Account>();
+  protected goBack = output<void>();
+  protected complete = output<UpgradePaymentResult>();
+
+  readonly paymentComponent = viewChild.required(EnterPaymentMethodComponent);
+  readonly cartSummaryComponent = viewChild.required(CartSummaryComponent);
+
+  protected formGroup = new FormGroup({
+    organizationName: new FormControl<string>("", [Validators.required]),
+    paymentForm: EnterPaymentMethodComponent.getFormGroup(),
+    billingAddress: EnterBillingAddressComponent.getFormGroup(),
+  });
+
+  protected readonly selectedPlan = signal<PlanDetails | null>(null);
+  protected readonly loading = signal(true);
+  protected readonly upgradeToMessage = signal("");
+  // Cart Summary data
+  protected readonly passwordManager = computed(() => {
+    if (!this.selectedPlan()) {
+      return { name: "", cost: 0, quantity: 0, cadence: "year" as const };
+    }
+
+    return {
+      name: this.isFamiliesPlan ? "familiesMembership" : "premiumMembership",
+      cost: this.selectedPlan()!.details.passwordManager.annualPrice,
+      quantity: 1,
+      cadence: "year" as const,
+    };
+  });
+
+  protected hasEnoughAccountCredit$!: Observable<boolean>;
+  private pricingTiers$!: Observable<PersonalSubscriptionPricingTier[]>;
+  protected estimatedTax$!: Observable<number>;
+
+  constructor(
+    private i18nService: I18nService,
+    private subscriptionPricingService: SubscriptionPricingServiceAbstraction,
+    private toastService: ToastService,
+    private logService: LogService,
+    private destroyRef: DestroyRef,
+    private upgradePaymentService: UpgradePaymentService,
+  ) {}
+
+  protected userIsOwnerOfFreeOrg$ = this.upgradePaymentService.userIsOwnerOfFreeOrg$;
+  protected adminConsoleRouteForOwnedOrganization$ =
+    this.upgradePaymentService.adminConsoleRouteForOwnedOrganization$;
+
+  async ngOnInit(): Promise<void> {
+    if (!this.isFamiliesPlan) {
+      this.formGroup.controls.organizationName.disable();
+    }
+
+    this.pricingTiers$ = this.subscriptionPricingService.getPersonalSubscriptionPricingTiers$();
+    this.pricingTiers$
+      .pipe(
+        catchError((error: unknown) => {
+          this.toastService.showToast({
+            variant: "error",
+            title: this.i18nService.t("error"),
+            message: this.i18nService.t("unexpectedError"),
+          });
+          this.loading.set(false);
+          return of([]);
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe((plans) => {
+        const planDetails = plans.find((plan) => plan.id === this.selectedPlanId());
+
+        if (planDetails) {
+          this.selectedPlan.set({
+            tier: this.selectedPlanId(),
+            details: planDetails,
+          });
+
+          this.upgradeToMessage.set(
+            this.i18nService.t(this.isFamiliesPlan ? "startFreeFamiliesTrial" : "upgradeToPremium"),
+          );
+        } else {
+          this.complete.emit({ status: UpgradePaymentStatus.Closed, organizationId: null });
+          return;
+        }
+      });
+
+    this.estimatedTax$ = this.formGroup.controls.billingAddress.valueChanges.pipe(
+      startWith(this.formGroup.controls.billingAddress.value),
+      debounceTime(1000),
+      // Only proceed when form has required values
+      switchMap(() => this.refreshSalesTax$()),
+    );
+
+    this.loading.set(false);
+  }
+
+  ngAfterViewInit(): void {
+    const cartSummaryComponent = this.cartSummaryComponent();
+    cartSummaryComponent.isExpanded.set(false);
+
+    this.hasEnoughAccountCredit$ = combineLatest([
+      cartSummaryComponent.total$,
+      this.upgradePaymentService.accountCredit$,
+      this.formGroup.controls.paymentForm.valueChanges.pipe(
+        startWith(this.formGroup.controls.paymentForm.value),
+      ),
+    ]).pipe(
+      map(([total, credit, currentFormValue]) => {
+        const selectedPaymentType = currentFormValue?.type;
+        if (selectedPaymentType !== NonTokenizablePaymentMethods.accountCredit) {
+          return true; // Not using account credit, so this check doesn't apply
+        }
+        return credit ? credit >= total : false;
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }), // Cache the latest for two async pipes
+    );
+  }
+
+  protected get isPremiumPlan(): boolean {
+    return this.selectedPlanId() === PersonalSubscriptionPricingTierIds.Premium;
+  }
+
+  protected get isFamiliesPlan(): boolean {
+    return this.selectedPlanId() === PersonalSubscriptionPricingTierIds.Families;
+  }
+
+  protected submit = async (): Promise<void> => {
+    if (!this.isFormValid()) {
+      this.formGroup.markAllAsTouched();
+      return;
+    }
+
+    if (!this.selectedPlan()) {
+      throw new Error("No plan selected");
+    }
+
+    try {
+      const result = await this.processUpgrade();
+      if (result.status === UpgradePaymentStatus.UpgradedToFamilies) {
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("familiesUpdated"),
+        });
+      } else if (result.status === UpgradePaymentStatus.UpgradedToPremium) {
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("premiumUpdated"),
+        });
+      }
+      this.complete.emit(result);
+    } catch (error: unknown) {
+      this.logService.error("Upgrade failed:", error);
+      this.toastService.showToast({
+        variant: "error",
+        message: this.i18nService.t("upgradeErrorMessage"),
+      });
+    }
+  };
+
+  protected isFormValid(): boolean {
+    return this.formGroup.valid && this.paymentComponent().validate();
+  }
+
+  private async processUpgrade(): Promise<UpgradePaymentResult> {
+    if (!this.selectedPlan()) {
+      throw new Error("No plan selected");
+    }
+
+    const billingAddress = getBillingAddressFromForm(this.formGroup.controls.billingAddress);
+    const organizationName = this.formGroup.value?.organizationName;
+
+    if (!billingAddress.country || !billingAddress.postalCode) {
+      throw new Error("Billing address is incomplete");
+    }
+
+    if (this.isFamiliesPlan && !organizationName) {
+      throw new Error("Organization name is required");
+    }
+
+    const paymentMethod = await this.getPaymentMethod();
+
+    if (!paymentMethod) {
+      throw new Error("Payment method is required");
+    }
+
+    const isTokenizedPayment = "token" in paymentMethod;
+
+    if (!isTokenizedPayment && this.isFamiliesPlan) {
+      throw new Error("Tokenized payment is required for families plan");
+    }
+
+    return this.isFamiliesPlan
+      ? this.processFamiliesUpgrade(
+          organizationName!,
+          billingAddress,
+          paymentMethod as TokenizedPaymentMethod,
+        )
+      : this.processPremiumUpgrade(paymentMethod, billingAddress);
+  }
+
+  private async processFamiliesUpgrade(
+    organizationName: string,
+    billingAddress: BillingAddress,
+    paymentMethod: TokenizedPaymentMethod,
+  ): Promise<UpgradePaymentResult> {
+    const paymentFormValues: PaymentFormValues = {
+      organizationName,
+      billingAddress,
+    };
+
+    const response = await this.upgradePaymentService.upgradeToFamilies(
+      this.account(),
+      this.selectedPlan()!,
+      paymentMethod,
+      paymentFormValues,
+    );
+
+    return { status: UpgradePaymentStatus.UpgradedToFamilies, organizationId: response.id };
+  }
+
+  private async processPremiumUpgrade(
+    paymentMethod: NonTokenizedPaymentMethod | TokenizedPaymentMethod,
+    billingAddress: BillingAddress,
+  ): Promise<UpgradePaymentResult> {
+    await this.upgradePaymentService.upgradeToPremium(paymentMethod, billingAddress);
+    return { status: UpgradePaymentStatus.UpgradedToPremium, organizationId: null };
+  }
+
+  /**
+   * Get payment method based on selected type
+   * If using account credit, returns a non-tokenized payment method
+   * Otherwise, tokenizes the payment method from the payment component
+   */
+  private async getPaymentMethod(): Promise<
+    NonTokenizedPaymentMethod | TokenizedPaymentMethod | null
+  > {
+    const isAccountCreditSelected =
+      this.formGroup.value?.paymentForm?.type === NonTokenizablePaymentMethods.accountCredit;
+
+    if (isAccountCreditSelected) {
+      return { type: NonTokenizablePaymentMethods.accountCredit };
+    }
+
+    return await this.paymentComponent().tokenize();
+  }
+
+  // Create an observable for tax calculation
+  private refreshSalesTax$(): Observable<number> {
+    if (this.formGroup.invalid || !this.selectedPlan()) {
+      return of(this.INITIAL_TAX_VALUE);
+    }
+
+    const billingAddress = getBillingAddressFromForm(this.formGroup.controls.billingAddress);
+    if (!billingAddress.country || !billingAddress.postalCode) {
+      return of(this.INITIAL_TAX_VALUE);
+    }
+    return from(
+      this.upgradePaymentService.calculateEstimatedTax(this.selectedPlan()!, billingAddress),
+    ).pipe(
+      catchError((error: unknown) => {
+        this.logService.error("Tax calculation failed:", error);
+        this.toastService.showToast({
+          variant: "error",
+          message: this.i18nService.t("taxCalculationError"),
+        });
+        return of(this.INITIAL_TAX_VALUE); // Return default value on error
+      }),
+    );
+  }
+}
diff --git a/apps/web/src/app/billing/individual/user-subscription.component.html b/apps/web/src/app/billing/individual/user-subscription.component.html
index e801237467a..b7e490cdf2e 100644
--- a/apps/web/src/app/billing/individual/user-subscription.component.html
+++ b/apps/web/src/app/billing/individual/user-subscription.component.html
@@ -37,41 +37,63 @@
     <dd *ngIf="sub.expiration">{{ sub.expiration | date: "mediumDate" }}</dd>
     <dd *ngIf="!sub.expiration">{{ "neverExpires" | i18n }}</dd>
   </dl>
-  <div class="tw-flex tw-w-full" *ngIf="!selfHosted">
-    <div class="tw-w-1/3">
-      <dl>
-        <dt>{{ "status" | i18n }}</dt>
-        <dd>
+  <div class="tw-flex tw-max-w-[1340px] tw-pt-6" *ngIf="!selfHosted">
+    <div class="tw-flex tw-gap-16 tw-justify-between tw-w-full">
+      <div class="tw-flex tw-flex-col">
+        <div class="tw-font-semibold tw-mb-2">{{ "plan" | i18n }}</div>
+        <div>{{ "premiumMembership" | i18n }}</div>
+      </div>
+      <div class="tw-flex tw-flex-col">
+        <div class="tw-font-semibold tw-mb-2">{{ "status" | i18n }}</div>
+        <div>
           <span class="tw-capitalize">{{ (subscription && subscriptionStatus) || "-" }}</span>
-          <span bitBadge variant="warning" *ngIf="subscriptionMarkedForCancel">{{
-            "pendingCancellation" | i18n
-          }}</span>
-        </dd>
-        <dt>{{ "nextCharge" | i18n }}</dt>
-        <dd>
-          {{
-            nextInvoice
-              ? (sub.subscription.periodEndDate | date: "mediumDate") +
-                ", " +
-                (nextInvoice.amount | currency: "$")
-              : "-"
-          }}
-        </dd>
-      </dl>
-    </div>
-    <div class="tw-w-2/3" *ngIf="subscription">
-      <strong class="!tw-block tw-mb-1">{{ "details" | i18n }}</strong>
-      <bit-table>
-        <ng-template body>
-          <tr *ngFor="let i of subscription.items">
-            <td bitCell>
-              {{ i.name }} {{ i.quantity > 1 ? "&times;" + i.quantity : "" }} &#64;
-              {{ i.amount | currency: "$" }}
-            </td>
-            <td bitCell>{{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}</td>
-          </tr>
-        </ng-template>
-      </bit-table>
+          <span
+            bitBadge
+            variant="warning"
+            *ngIf="subscriptionMarkedForCancel"
+            class="tw-mt-2 tw-block"
+            >{{ "pendingCancellation" | i18n }}</span
+          >
+        </div>
+      </div>
+      <div class="tw-flex tw-flex-col">
+        <div class="tw-font-semibold tw-mb-2 tw-text-right">{{ "nextChargeHeader" | i18n }}</div>
+        <div>
+          <ng-container *ngIf="subscription">
+            <ng-container *ngIf="enableDiscountDisplay$ | async as enableDiscount; else noDiscount">
+              <div class="tw-flex tw-items-center tw-gap-2 tw-flex-wrap tw-justify-end">
+                <span [attr.aria-label]="'nextChargeDateAndAmount' | i18n">
+                  {{
+                    (sub.subscription.periodEndDate | date: "MMM d, y") +
+                      ", " +
+                      (discountedSubscriptionAmount | currency: "$")
+                  }}
+                </span>
+                <billing-discount-badge
+                  [discount]="getDiscountInfo(sub?.customerDiscount)"
+                ></billing-discount-badge>
+              </div>
+            </ng-container>
+            <ng-template #noDiscount>
+              <div class="tw-flex tw-items-center tw-gap-2 tw-flex-wrap tw-justify-end">
+                <span [attr.aria-label]="'nextChargeDateAndAmount' | i18n">
+                  {{
+                    (sub.subscription.periodEndDate | date: "MMM d, y") +
+                      ", " +
+                      (subscriptionAmount | currency: "$")
+                  }}
+                </span>
+              </div>
+            </ng-template>
+          </ng-container>
+          <span
+            *ngIf="!subscription"
+            class="tw-block tw-text-right"
+            [attr.aria-label]="'noChargeScheduled' | i18n"
+            >-</span
+          >
+        </div>
+      </div>
     </div>
   </div>
   <ng-container *ngIf="selfHosted">
@@ -90,8 +112,27 @@
       </a>
     </div>
   </ng-container>
-  <ng-container *ngIf="!selfHosted">
-    <div class="tw-flex tw-justify-between">
+  <div class="tw-max-w-[1340px]" *ngIf="!selfHosted">
+    <h3 bitTypography="h3" class="tw-mt-8">{{ "storage" | i18n }}</h3>
+    <p bitTypography="body1">
+      {{ "subscriptionStorage" | i18n: sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}
+    </p>
+    <bit-progress [barWidth]="storagePercentage" bgColor="success" size="default"></bit-progress>
+    <ng-container *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel">
+      <div class="tw-mt-3">
+        <div class="tw-flex tw-gap-4">
+          <button bitButton type="button" buttonType="secondary" (click)="adjustStorage(true)">
+            {{ "addStorage" | i18n }}
+          </button>
+          <button bitButton type="button" buttonType="secondary" (click)="adjustStorage(false)">
+            {{ "removeStorage" | i18n }}
+          </button>
+        </div>
+      </div>
+    </ng-container>
+    <h3 bitTypography="h3" class="tw-mt-16">{{ "additionalOptions" | i18n }}</h3>
+    <p bitTypography="body1" class="tw-mt-3">{{ "additionalOptionsDesc" | i18n }}</p>
+    <div class="tw-flex tw-gap-4 tw-mt-3">
       <button
         bitButton
         type="button"
@@ -106,7 +147,6 @@
         #cancelBtn
         type="button"
         buttonType="danger"
-        class="tw-ml-auto"
         (click)="cancelSubscription()"
         [appApiAction]="cancelPromise"
         [disabled]="$any(cancelBtn).loading()"
@@ -115,22 +155,5 @@
         {{ "cancelSubscription" | i18n }}
       </button>
     </div>
-    <h3 bitTypography="h3" class="tw-mt-16">{{ "storage" | i18n }}</h3>
-    <p bitTypography="body1">
-      {{ "subscriptionStorage" | i18n: sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}
-    </p>
-    <bit-progress [barWidth]="storagePercentage" bgColor="success" size="default"></bit-progress>
-    <ng-container *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel">
-      <div class="tw-mt-3">
-        <div class="tw-flex tw-gap-1">
-          <button bitButton type="button" buttonType="secondary" (click)="adjustStorage(true)">
-            {{ "addStorage" | i18n }}
-          </button>
-          <button bitButton type="button" buttonType="secondary" (click)="adjustStorage(false)">
-            {{ "removeStorage" | i18n }}
-          </button>
-        </div>
-      </div>
-    </ng-container>
-  </ng-container>
+  </div>
 </ng-container>
diff --git a/apps/web/src/app/billing/individual/user-subscription.component.ts b/apps/web/src/app/billing/individual/user-subscription.component.ts
index 4d1fa97785b..c39b5d153b1 100644
--- a/apps/web/src/app/billing/individual/user-subscription.component.ts
+++ b/apps/web/src/app/billing/individual/user-subscription.component.ts
@@ -7,13 +7,17 @@ import { firstValueFrom, lastValueFrom } from "rxjs";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { BillingCustomerDiscount } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { SubscriptionResponse } from "@bitwarden/common/billing/models/response/subscription.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService, ToastService } from "@bitwarden/components";
+import { DiscountInfo } from "@bitwarden/pricing";
 
 import {
   AdjustStorageDialogComponent,
@@ -26,6 +30,8 @@ import {
 import { UpdateLicenseDialogComponent } from "../shared/update-license-dialog.component";
 import { UpdateLicenseDialogResult } from "../shared/update-license-types";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "user-subscription.component.html",
   standalone: false,
@@ -40,6 +46,10 @@ export class UserSubscriptionComponent implements OnInit {
   cancelPromise: Promise<any>;
   reinstatePromise: Promise<any>;
 
+  protected enableDiscountDisplay$ = this.configService.getFeatureFlag$(
+    FeatureFlag.PM23341_Milestone_2,
+  );
+
   constructor(
     private apiService: ApiService,
     private platformUtilsService: PlatformUtilsService,
@@ -52,6 +62,7 @@ export class UserSubscriptionComponent implements OnInit {
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private toastService: ToastService,
     private accountService: AccountService,
+    private configService: ConfigService,
   ) {
     this.selfHosted = this.platformUtilsService.isSelfHost();
   }
@@ -185,6 +196,28 @@ export class UserSubscriptionComponent implements OnInit {
     return this.sub != null ? this.sub.upcomingInvoice : null;
   }
 
+  get subscriptionAmount(): number {
+    if (!this.subscription?.items || this.subscription.items.length === 0) {
+      return 0;
+    }
+
+    return this.subscription.items.reduce(
+      (sum, item) => sum + (item.amount || 0) * (item.quantity || 0),
+      0,
+    );
+  }
+
+  get discountedSubscriptionAmount(): number {
+    // Use the upcoming invoice amount from the server as it already includes discounts,
+    // taxes, prorations, and all other adjustments. Fall back to subscription amount
+    // if upcoming invoice is not available.
+    if (this.nextInvoice?.amount != null) {
+      return this.nextInvoice.amount;
+    }
+
+    return this.subscriptionAmount;
+  }
+
   get storagePercentage() {
     return this.sub != null && this.sub.maxStorageGb
       ? +(100 * (this.sub.storageGb / this.sub.maxStorageGb)).toFixed(2)
@@ -215,4 +248,15 @@ export class UserSubscriptionComponent implements OnInit {
       return this.subscription.status;
     }
   }
+
+  getDiscountInfo(discount: BillingCustomerDiscount | null): DiscountInfo | null {
+    if (!discount) {
+      return null;
+    }
+    return {
+      active: discount.active,
+      percentOff: discount.percentOff,
+      amountOff: discount.amountOff,
+    };
+  }
 }
diff --git a/apps/web/src/app/billing/members/add-sponsorship-dialog.component.ts b/apps/web/src/app/billing/members/add-sponsorship-dialog.component.ts
index 38ae39cabfe..971cfb5704b 100644
--- a/apps/web/src/app/billing/members/add-sponsorship-dialog.component.ts
+++ b/apps/web/src/app/billing/members/add-sponsorship-dialog.component.ts
@@ -38,6 +38,8 @@ interface AddSponsorshipDialogParams {
   organizationKey: OrgKey;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "add-sponsorship-dialog.component.html",
   imports: [
diff --git a/apps/web/src/app/billing/members/billing-constraint/billing-constraint.service.spec.ts b/apps/web/src/app/billing/members/billing-constraint/billing-constraint.service.spec.ts
new file mode 100644
index 00000000000..f7bb510f579
--- /dev/null
+++ b/apps/web/src/app/billing/members/billing-constraint/billing-constraint.service.spec.ts
@@ -0,0 +1,461 @@
+import { TestBed } from "@angular/core/testing";
+import { Router } from "@angular/router";
+import { of } from "rxjs";
+
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
+import { ProductTierType } from "@bitwarden/common/billing/enums";
+import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { DialogService, ToastService } from "@bitwarden/components";
+
+import {
+  ChangePlanDialogResultType,
+  openChangePlanDialog,
+} from "../../organizations/change-plan-dialog.component";
+
+import { BillingConstraintService, SeatLimitResult } from "./billing-constraint.service";
+
+jest.mock("../../organizations/change-plan-dialog.component");
+
+describe("BillingConstraintService", () => {
+  let service: BillingConstraintService;
+  let i18nService: jest.Mocked<I18nService>;
+  let dialogService: jest.Mocked<DialogService>;
+  let toastService: jest.Mocked<ToastService>;
+  let router: jest.Mocked<Router>;
+  let organizationMetadataService: jest.Mocked<OrganizationMetadataServiceAbstraction>;
+
+  const mockOrganizationId = "org-123" as OrganizationId;
+
+  const createMockOrganization = (overrides: Partial<Organization> = {}): Organization => {
+    const org = new Organization();
+    org.id = mockOrganizationId;
+    org.seats = 10;
+    org.productTierType = ProductTierType.Teams;
+
+    Object.defineProperty(org, "hasReseller", {
+      value: false,
+      writable: true,
+      configurable: true,
+    });
+
+    Object.defineProperty(org, "canEditSubscription", {
+      value: true,
+      writable: true,
+      configurable: true,
+    });
+
+    return Object.assign(org, overrides);
+  };
+
+  const createMockBillingMetadata = (
+    overrides: Partial<OrganizationBillingMetadataResponse> = {},
+  ): OrganizationBillingMetadataResponse => {
+    return {
+      organizationOccupiedSeats: 5,
+      ...overrides,
+    } as OrganizationBillingMetadataResponse;
+  };
+
+  beforeEach(() => {
+    const mockDialogRef = {
+      closed: of(true),
+    };
+
+    const mockSimpleDialogRef = {
+      closed: of(true),
+    };
+
+    i18nService = {
+      t: jest.fn().mockReturnValue("translated-text"),
+    } as any;
+
+    dialogService = {
+      openSimpleDialogRef: jest.fn().mockReturnValue(mockSimpleDialogRef),
+    } as any;
+
+    toastService = {
+      showToast: jest.fn(),
+    } as any;
+
+    router = {
+      navigate: jest.fn().mockResolvedValue(true),
+    } as any;
+
+    organizationMetadataService = {
+      getOrganizationMetadata$: jest.fn(),
+      refreshMetadataCache: jest.fn(),
+    } as any;
+
+    (openChangePlanDialog as jest.Mock).mockReturnValue(mockDialogRef);
+
+    TestBed.configureTestingModule({
+      providers: [
+        BillingConstraintService,
+        { provide: I18nService, useValue: i18nService },
+        { provide: DialogService, useValue: dialogService },
+        { provide: ToastService, useValue: toastService },
+        { provide: Router, useValue: router },
+        { provide: OrganizationMetadataServiceAbstraction, useValue: organizationMetadataService },
+      ],
+    });
+
+    service = TestBed.inject(BillingConstraintService);
+  });
+
+  describe("checkSeatLimit", () => {
+    it("should allow users when occupied seats are less than total seats", () => {
+      const organization = createMockOrganization({ seats: 10 });
+      const billingMetadata = createMockBillingMetadata({ organizationOccupiedSeats: 5 });
+
+      const result = service.checkSeatLimit(organization, billingMetadata);
+
+      expect(result).toEqual({ canAddUsers: true });
+    });
+
+    it("should allow users when occupied seats equal total seats for non-fixed seat plans", () => {
+      const organization = createMockOrganization({
+        seats: 10,
+        productTierType: ProductTierType.Teams,
+      });
+      const billingMetadata = createMockBillingMetadata({ organizationOccupiedSeats: 10 });
+
+      const result = service.checkSeatLimit(organization, billingMetadata);
+
+      expect(result).toEqual({ canAddUsers: true });
+    });
+
+    it("should block users with reseller-limit reason when organization has reseller", () => {
+      const organization = createMockOrganization({
+        seats: 10,
+        hasReseller: true,
+      });
+      const billingMetadata = createMockBillingMetadata({ organizationOccupiedSeats: 10 });
+
+      const result = service.checkSeatLimit(organization, billingMetadata);
+
+      expect(result).toEqual({
+        canAddUsers: false,
+        reason: "reseller-limit",
+      });
+    });
+
+    it("should block users with fixed-seat-limit reason for fixed seat plans", () => {
+      const organization = createMockOrganization({
+        seats: 10,
+        productTierType: ProductTierType.Free,
+        canEditSubscription: true,
+      });
+      const billingMetadata = createMockBillingMetadata({ organizationOccupiedSeats: 10 });
+
+      const result = service.checkSeatLimit(organization, billingMetadata);
+
+      expect(result).toEqual({
+        canAddUsers: false,
+        reason: "fixed-seat-limit",
+        shouldShowUpgradeDialog: true,
+      });
+    });
+
+    it("should not show upgrade dialog when organization cannot edit subscription", () => {
+      const organization = createMockOrganization({
+        seats: 10,
+        productTierType: ProductTierType.TeamsStarter,
+        canEditSubscription: false,
+      });
+      const billingMetadata = createMockBillingMetadata({ organizationOccupiedSeats: 10 });
+
+      const result = service.checkSeatLimit(organization, billingMetadata);
+
+      expect(result).toEqual({
+        canAddUsers: false,
+        reason: "fixed-seat-limit",
+        shouldShowUpgradeDialog: false,
+      });
+    });
+
+    it("shoud throw if missing billingMetadata", () => {
+      const organization = createMockOrganization({ seats: 10 });
+      const billingMetadata = createMockBillingMetadata({
+        organizationOccupiedSeats: undefined as any,
+      });
+
+      const err = () => service.checkSeatLimit(organization, billingMetadata);
+
+      expect(err).toThrow("Cannot check seat limit: billingMetadata is null or undefined.");
+    });
+  });
+
+  describe("seatLimitReached", () => {
+    it("should return false when canAddUsers is true", async () => {
+      const result: SeatLimitResult = { canAddUsers: true };
+      const organization = createMockOrganization();
+
+      const seatLimitReached = await service.seatLimitReached(result, organization);
+
+      expect(seatLimitReached).toBe(false);
+    });
+
+    it("should show toast and return true for reseller-limit", async () => {
+      const result: SeatLimitResult = { canAddUsers: false, reason: "reseller-limit" };
+      const organization = createMockOrganization();
+
+      const seatLimitReached = await service.seatLimitReached(result, organization);
+
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        title: "translated-text",
+        message: "translated-text",
+      });
+      expect(i18nService.t).toHaveBeenCalledWith("seatLimitReached");
+      expect(i18nService.t).toHaveBeenCalledWith("contactYourProvider");
+      expect(seatLimitReached).toBe(true);
+    });
+
+    it("should return true when upgrade dialog is cancelled", async () => {
+      const result: SeatLimitResult = {
+        canAddUsers: false,
+        reason: "fixed-seat-limit",
+        shouldShowUpgradeDialog: true,
+      };
+      const organization = createMockOrganization();
+      const mockDialogRef = { closed: of(ChangePlanDialogResultType.Closed) };
+      (openChangePlanDialog as jest.Mock).mockReturnValue(mockDialogRef);
+
+      const seatLimitReached = await service.seatLimitReached(result, organization);
+
+      expect(openChangePlanDialog).toHaveBeenCalledWith(dialogService, {
+        data: {
+          organizationId: organization.id,
+          productTierType: organization.productTierType,
+        },
+      });
+      expect(seatLimitReached).toBe(true);
+    });
+
+    it("should return false when upgrade dialog is submitted", async () => {
+      const result: SeatLimitResult = {
+        canAddUsers: false,
+        reason: "fixed-seat-limit",
+        shouldShowUpgradeDialog: true,
+      };
+      const organization = createMockOrganization();
+      const mockDialogRef = { closed: of(ChangePlanDialogResultType.Submitted) };
+      (openChangePlanDialog as jest.Mock).mockReturnValue(mockDialogRef);
+
+      const seatLimitReached = await service.seatLimitReached(result, organization);
+
+      expect(seatLimitReached).toBe(false);
+    });
+
+    it("should show seat limit dialog when shouldShowUpgradeDialog is false", async () => {
+      const result: SeatLimitResult = {
+        canAddUsers: false,
+        reason: "fixed-seat-limit",
+        shouldShowUpgradeDialog: false,
+      };
+      const organization = createMockOrganization({
+        canEditSubscription: false,
+        productTierType: ProductTierType.Free,
+      });
+
+      const seatLimitReached = await service.seatLimitReached(result, organization);
+
+      expect(dialogService.openSimpleDialogRef).toHaveBeenCalled();
+      expect(seatLimitReached).toBe(true);
+    });
+
+    it("should return true for unknown reasons", async () => {
+      const result: SeatLimitResult = { canAddUsers: false };
+      const organization = createMockOrganization();
+
+      const seatLimitReached = await service.seatLimitReached(result, organization);
+
+      expect(seatLimitReached).toBe(true);
+    });
+  });
+
+  describe("navigateToPaymentMethod", () => {
+    it("should navigate to payment method with correct parameters", async () => {
+      const organization = createMockOrganization();
+
+      await service.navigateToPaymentMethod(organization);
+
+      expect(router.navigate).toHaveBeenCalledWith(
+        ["organizations", organization.id, "billing", "payment-method"],
+        {
+          state: { launchPaymentModalAutomatically: true },
+        },
+      );
+    });
+  });
+
+  describe("private methods through public method coverage", () => {
+    describe("getDialogContent via showSeatLimitReachedDialog", () => {
+      it("should get correct dialog content for Free organization", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          productTierType: ProductTierType.Free,
+          canEditSubscription: false,
+          seats: 5,
+        });
+
+        await service.seatLimitReached(result, organization);
+
+        expect(i18nService.t).toHaveBeenCalledWith("freeOrgInvLimitReachedNoManageBilling", 5);
+      });
+
+      it("should get correct dialog content for TeamsStarter organization", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          productTierType: ProductTierType.TeamsStarter,
+          canEditSubscription: false,
+          seats: 3,
+        });
+
+        await service.seatLimitReached(result, organization);
+
+        expect(i18nService.t).toHaveBeenCalledWith(
+          "teamsStarterPlanInvLimitReachedNoManageBilling",
+          3,
+        );
+      });
+
+      it("should get correct dialog content for Families organization", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          productTierType: ProductTierType.Families,
+          canEditSubscription: false,
+          seats: 6,
+        });
+
+        await service.seatLimitReached(result, organization);
+
+        expect(i18nService.t).toHaveBeenCalledWith("familiesPlanInvLimitReachedNoManageBilling", 6);
+      });
+
+      it("should throw error for unsupported product type in getProductKey", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          productTierType: ProductTierType.Enterprise,
+          canEditSubscription: false,
+        });
+
+        await expect(service.seatLimitReached(result, organization)).rejects.toThrow(
+          `Unsupported product type: ${ProductTierType.Enterprise}`,
+        );
+      });
+    });
+
+    describe("getAcceptButtonText via showSeatLimitReachedDialog", () => {
+      it("should return 'ok' when organization cannot edit subscription", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          canEditSubscription: false,
+          productTierType: ProductTierType.Free,
+        });
+
+        await service.seatLimitReached(result, organization);
+
+        expect(i18nService.t).toHaveBeenCalledWith("ok");
+      });
+
+      it("should return 'upgrade' when organization can edit subscription", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          canEditSubscription: true,
+          productTierType: ProductTierType.Free,
+        });
+        const mockSimpleDialogRef = { closed: of(false) };
+        dialogService.openSimpleDialogRef.mockReturnValue(mockSimpleDialogRef);
+
+        await service.seatLimitReached(result, organization);
+
+        expect(i18nService.t).toHaveBeenCalledWith("upgrade");
+      });
+
+      it("should throw error for unsupported product type in getAcceptButtonText", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          canEditSubscription: true,
+          productTierType: ProductTierType.Enterprise,
+        });
+
+        await expect(service.seatLimitReached(result, organization)).rejects.toThrow(
+          `Unsupported product type: ${ProductTierType.Enterprise}`,
+        );
+      });
+    });
+
+    describe("handleUpgradeNavigation", () => {
+      it("should navigate to billing subscription with upgrade query param", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          canEditSubscription: true,
+          productTierType: ProductTierType.Free,
+        });
+        const mockSimpleDialogRef = { closed: of(true) };
+        dialogService.openSimpleDialogRef.mockReturnValue(mockSimpleDialogRef);
+
+        await service.seatLimitReached(result, organization);
+
+        expect(router.navigate).toHaveBeenCalledWith(
+          ["/organizations", organization.id, "billing", "subscription"],
+          { queryParams: { upgrade: true } },
+        );
+      });
+
+      it("should throw error for non-self-upgradable product type", async () => {
+        const result: SeatLimitResult = {
+          canAddUsers: false,
+          reason: "fixed-seat-limit",
+          shouldShowUpgradeDialog: false,
+        };
+        const organization = createMockOrganization({
+          canEditSubscription: true,
+          productTierType: ProductTierType.Enterprise,
+        });
+        const mockSimpleDialogRef = { closed: of(true) };
+        dialogService.openSimpleDialogRef.mockReturnValue(mockSimpleDialogRef);
+
+        await expect(service.seatLimitReached(result, organization)).rejects.toThrow(
+          `Unsupported product type: ${ProductTierType.Enterprise}`,
+        );
+      });
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/members/billing-constraint/billing-constraint.service.ts b/apps/web/src/app/billing/members/billing-constraint/billing-constraint.service.ts
new file mode 100644
index 00000000000..d43c2e68497
--- /dev/null
+++ b/apps/web/src/app/billing/members/billing-constraint/billing-constraint.service.ts
@@ -0,0 +1,192 @@
+import { Injectable } from "@angular/core";
+import { Router } from "@angular/router";
+import { lastValueFrom } from "rxjs";
+
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { isNotSelfUpgradable, ProductTierType } from "@bitwarden/common/billing/enums";
+import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogService, ToastService } from "@bitwarden/components";
+
+import { isFixedSeatPlan } from "../../../admin-console/organizations/members/components/member-dialog/validators/org-seat-limit-reached.validator";
+import {
+  ChangePlanDialogResultType,
+  openChangePlanDialog,
+} from "../../organizations/change-plan-dialog.component";
+
+export interface SeatLimitResult {
+  canAddUsers: boolean;
+  reason?: "reseller-limit" | "fixed-seat-limit" | "no-billing-permission";
+  shouldShowUpgradeDialog?: boolean;
+}
+
+@Injectable()
+export class BillingConstraintService {
+  constructor(
+    private i18nService: I18nService,
+    private dialogService: DialogService,
+    private toastService: ToastService,
+    private router: Router,
+  ) {}
+
+  checkSeatLimit(
+    organization: Organization,
+    billingMetadata: OrganizationBillingMetadataResponse,
+  ): SeatLimitResult {
+    const occupiedSeats = billingMetadata?.organizationOccupiedSeats;
+    if (occupiedSeats == null) {
+      throw new Error("Cannot check seat limit: billingMetadata is null or undefined.");
+    }
+    const totalSeats = organization.seats;
+
+    if (occupiedSeats < totalSeats) {
+      return { canAddUsers: true };
+    }
+
+    if (organization.hasReseller) {
+      return {
+        canAddUsers: false,
+        reason: "reseller-limit",
+      };
+    }
+
+    if (isFixedSeatPlan(organization.productTierType)) {
+      return {
+        canAddUsers: false,
+        reason: "fixed-seat-limit",
+        shouldShowUpgradeDialog: organization.canEditSubscription,
+      };
+    }
+
+    return { canAddUsers: true };
+  }
+
+  async seatLimitReached(result: SeatLimitResult, organization: Organization): Promise<boolean> {
+    if (result.canAddUsers) {
+      return false;
+    }
+
+    switch (result.reason) {
+      case "reseller-limit":
+        this.toastService.showToast({
+          variant: "error",
+          title: this.i18nService.t("seatLimitReached"),
+          message: this.i18nService.t("contactYourProvider"),
+        });
+        return true;
+
+      case "fixed-seat-limit":
+        if (result.shouldShowUpgradeDialog) {
+          const dialogResult = await this.showChangePlanDialog(organization);
+          // If the plan was successfully changed, the seat limit is no longer blocking
+          return dialogResult !== ChangePlanDialogResultType.Submitted;
+        } else {
+          await this.showSeatLimitReachedDialog(organization);
+          return true;
+        }
+
+      default:
+        return true;
+    }
+  }
+
+  private async showChangePlanDialog(
+    organization: Organization,
+  ): Promise<ChangePlanDialogResultType> {
+    const reference = openChangePlanDialog(this.dialogService, {
+      data: {
+        organizationId: organization.id,
+        productTierType: organization.productTierType,
+      },
+    });
+
+    const result = await lastValueFrom(reference.closed);
+    if (result == null) {
+      throw new Error("ChangePlanDialog result is null or undefined.");
+    }
+
+    return result;
+  }
+
+  private async showSeatLimitReachedDialog(organization: Organization): Promise<void> {
+    const dialogContent = this.getSeatLimitReachedDialogContent(organization);
+    const acceptButtonText = this.getSeatLimitReachedDialogAcceptButtonText(organization);
+
+    const orgUpgradeSimpleDialogOpts = {
+      title: this.i18nService.t("upgradeOrganization"),
+      content: dialogContent,
+      type: "primary" as const,
+      acceptButtonText,
+      cancelButtonText: organization.canEditSubscription ? undefined : (null as string | null),
+    };
+
+    const simpleDialog = this.dialogService.openSimpleDialogRef(orgUpgradeSimpleDialogOpts);
+    const result = await lastValueFrom(simpleDialog.closed);
+
+    if (result && organization.canEditSubscription) {
+      await this.handleUpgradeNavigation(organization);
+    }
+  }
+
+  private async handleUpgradeNavigation(organization: Organization): Promise<void> {
+    const productType = organization.productTierType;
+
+    if (isNotSelfUpgradable(productType)) {
+      throw new Error(`Unsupported product type: ${organization.productTierType}`);
+    }
+
+    await this.router.navigate(["/organizations", organization.id, "billing", "subscription"], {
+      queryParams: { upgrade: true },
+    });
+  }
+
+  private getSeatLimitReachedDialogContent(organization: Organization): string {
+    const productKey = this.getProductKey(organization);
+    return this.i18nService.t(productKey, organization.seats);
+  }
+
+  private getSeatLimitReachedDialogAcceptButtonText(organization: Organization): string {
+    if (!organization.canEditSubscription) {
+      return this.i18nService.t("ok");
+    }
+
+    const productType = organization.productTierType;
+
+    if (isNotSelfUpgradable(productType)) {
+      throw new Error(`Unsupported product type: ${productType}`);
+    }
+
+    return this.i18nService.t("upgrade");
+  }
+
+  private getProductKey(organization: Organization): string {
+    const manageBillingText = organization.canEditSubscription
+      ? "ManageBilling"
+      : "NoManageBilling";
+
+    let product = "";
+    switch (organization.productTierType) {
+      case ProductTierType.Free:
+        product = "freeOrg";
+        break;
+      case ProductTierType.TeamsStarter:
+        product = "teamsStarterPlan";
+        break;
+      case ProductTierType.Families:
+        product = "familiesPlan";
+        break;
+      default:
+        throw new Error(`Unsupported product type: ${organization.productTierType}`);
+    }
+    return `${product}InvLimitReached${manageBillingText}`;
+  }
+
+  async navigateToPaymentMethod(organization: Organization): Promise<void> {
+    await this.router.navigate(
+      ["organizations", `${organization.id}`, "billing", "payment-method"],
+      {
+        state: { launchPaymentModalAutomatically: true },
+      },
+    );
+  }
+}
diff --git a/apps/web/src/app/billing/members/free-bitwarden-families.component.ts b/apps/web/src/app/billing/members/free-bitwarden-families.component.ts
index dc4a2f6df9b..474e513da6b 100644
--- a/apps/web/src/app/billing/members/free-bitwarden-families.component.ts
+++ b/apps/web/src/app/billing/members/free-bitwarden-families.component.ts
@@ -20,13 +20,15 @@ import { KeyService } from "@bitwarden/key-management";
 
 import { AddSponsorshipDialogComponent } from "./add-sponsorship-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-free-bitwarden-families",
   templateUrl: "free-bitwarden-families.component.html",
   standalone: false,
 })
 export class FreeBitwardenFamiliesComponent implements OnInit {
-  loading = signal<boolean>(true);
+  readonly loading = signal<boolean>(true);
   tabIndex = 0;
   sponsoredFamilies: OrganizationSponsorshipInvitesResponse[] = [];
 
diff --git a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts
index d1086a6646b..255e1ef544c 100644
--- a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts
+++ b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts
@@ -16,17 +16,33 @@ import { OrganizationSubscriptionUpdateRequest } from "@bitwarden/common/billing
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-adjust-subscription",
   templateUrl: "adjust-subscription.component.html",
   standalone: false,
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
 export class AdjustSubscription implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationId: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() maxAutoscaleSeats: number;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() currentSeatCount: number;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() seatPrice = 0;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() interval = "year";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAdjusted = new EventEmitter();
 
   private destroy$ = new Subject<void>();
diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
index 465a50ec8c3..83a857886cf 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
+++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
@@ -37,7 +37,7 @@
           ></button>
         </bit-form-field>
         <div class="tw-mt-2 tw-text-sm tw-text-muted" *ngIf="showLastSyncText">
-          <b class="tw-font-semibold">{{ "lastSync" | i18n }}:</b>
+          <b class="tw-font-medium">{{ "lastSync" | i18n }}:</b>
           {{ lastSyncDate | date: "medium" }}
         </div>
         <div class="tw-mt-2 tw-text-sm tw-text-danger" *ngIf="showAwaitingSyncText">
diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
index 55687f00052..52a7fab60f5 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
+++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts
@@ -20,6 +20,8 @@ export interface BillingSyncApiModalData {
   hasBillingToken: boolean;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "billing-sync-api-key.component.html",
   standalone: false,
diff --git a/apps/web/src/app/billing/organizations/billing-sync-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-key.component.ts
index 37ebefc803a..c6c2bf379eb 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-key.component.ts
+++ b/apps/web/src/app/billing/organizations/billing-sync-key.component.ts
@@ -19,6 +19,8 @@ export interface BillingSyncKeyModalData {
   setParentConnection: (connection: OrganizationConnectionResponse<BillingSyncConfigApi>) => void;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "billing-sync-key.component.html",
   standalone: false,
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
index f899b8eccb4..a7b9196cc5e 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -1,12 +1,12 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog dialogSize="large" [loading]="loading">
-    <span bitDialogTitle class="tw-font-semibold">
+    <span bitDialogTitle class="tw-font-medium">
       {{ dialogHeaderName }}
     </span>
     <div bitDialogContent>
       <p>{{ "upgradePlans" | i18n }}</p>
       <div class="tw-mb-3 tw-flex tw-justify-between">
-        <span [hidden]="isSubscriptionCanceled" class="tw-text-lg tw-pr-1 tw-font-bold">{{
+        <span [hidden]="isSubscriptionCanceled" class="tw-text-lg tw-pr-1 tw-font-medium">{{
           "selectAPlan" | i18n
         }}</span>
         <!-- Discount Badge -->
@@ -57,7 +57,7 @@
                   selectableProduct.productTier === productTypes.Enterprise &&
                   !isSubscriptionCanceled
                 "
-                class="tw-bg-secondary-100 tw-text-center !tw-border-0 tw-text-sm tw-font-bold tw-py-1"
+                class="tw-bg-secondary-100 tw-text-center !tw-border-0 tw-text-sm tw-font-medium tw-py-1"
                 [ngClass]="{
                   'tw-bg-primary-700 !tw-text-contrast': selectableProduct === selectedPlan,
                   'tw-bg-secondary-100': !(selectableProduct === selectedPlan),
@@ -73,7 +73,7 @@
                 }"
               >
                 <h3
-                  class="tw-text-[1.25rem] tw-mt-[6px] tw-font-bold tw-mb-0 tw-leading-[2rem] tw-flex tw-items-center"
+                  class="tw-text-[1.25rem] tw-mt-[6px] tw-font-medium tw-mb-0 tw-leading-[2rem] tw-flex tw-items-center"
                 >
                   <span class="tw-capitalize tw-whitespace-nowrap">{{
                     selectableProduct.nameLocalizationKey | i18n
@@ -91,7 +91,7 @@
                   <ng-container
                     *ngIf="selectableProduct.PasswordManager.basePrice && !acceptingSponsorship"
                   >
-                    <b class="tw-text-lg tw-font-semibold">
+                    <b class="tw-text-lg tw-font-medium">
                       {{
                         (selectableProduct.isAnnual
                           ? selectableProduct.PasswordManager.basePrice / 12
@@ -106,7 +106,7 @@
                           : ("monthPerMember" | i18n)
                       }}</span
                     >
-                    <b class="tw-text-sm tw-font-semibold">
+                    <b class="tw-text-sm tw-font-medium">
                       <ng-container
                         *ngIf="selectableProduct.PasswordManager.hasAdditionalSeatsOption"
                       >
@@ -128,7 +128,7 @@
                     selectableProduct.PasswordManager.hasAdditionalSeatsOption
                   "
                 >
-                  <b class="tw-text-lg tw-font-semibold"
+                  <b class="tw-text-lg tw-font-medium"
                     >{{
                       "costPerMember"
                         | i18n
@@ -155,7 +155,7 @@
               "
             >
               <p
-                class="tw-text-xs tw-px-2 tw-font-semibold tw-mb-1"
+                class="tw-text-xs tw-px-2 tw-font-medium tw-mb-1"
                 *ngIf="organization.useSecretsManager"
               >
                 {{ "bitwardenPasswordManager" | i18n }}
@@ -182,7 +182,7 @@
               </ul>
 
               <p
-                class="tw-text-xs tw-px-2 tw-font-semibold tw-mb-1"
+                class="tw-text-xs tw-px-2 tw-font-medium tw-mb-1"
                 *ngIf="organization.useSecretsManager"
               >
                 {{ "bitwardenSecretsManager" | i18n }}
@@ -222,7 +222,7 @@
               </ng-container>
               <ng-template #fullFeatureList>
                 <p
-                  class="tw-text-xs tw-px-2 tw-font-semibold tw-mb-1"
+                  class="tw-text-xs tw-px-2 tw-font-medium tw-mb-1"
                   *ngIf="organization.useSecretsManager"
                 >
                   {{ "bitwardenPasswordManager" | i18n }}
@@ -274,7 +274,7 @@
                   </li>
                 </ul>
                 <p
-                  class="tw-text-xs tw-px-2 tw-font-semibold tw-mb-1"
+                  class="tw-text-xs tw-px-2 tw-font-medium tw-mb-1"
                   *ngIf="
                     organization.useSecretsManager &&
                     selectableProduct.productTier !== productTypes.Families
@@ -328,28 +328,64 @@
         *ngIf="formGroup.value.productTier !== productTypes.Free || isSubscriptionCanceled"
       >
         <h2 bitTypography="h4">{{ "paymentMethod" | i18n }}</h2>
-        <p
-          *ngIf="
-            !showPayment && (paymentSource || billing?.paymentSource) && !isSubscriptionCanceled
-          "
-        >
-          <i class="bwi bwi-fw" [ngClass]="paymentSourceClasses"></i>
-          {{ paymentSource?.description }}
-          <span class="tw-ml-2 tw-text-primary-600 tw-cursor-pointer" (click)="toggleShowPayment()">
-            {{ "changePaymentMethod" | i18n }}
-          </span>
+        <p *ngIf="!showPayment && !!paymentMethod && !isSubscriptionCanceled">
+          @switch (paymentMethod.type) {
+            @case ("bankAccount") {
+              <i class="bwi bwi-fw bwi-billing"></i>
+              {{ paymentMethod.bankName }}, *{{ paymentMethod.last4 }}
+              @if (paymentMethod.hostedVerificationUrl) {
+                <span>- {{ "unverified" | i18n }}</span>
+              }
+              <span
+                class="tw-ml-2 tw-text-primary-600 tw-cursor-pointer"
+                (click)="toggleShowPayment()"
+              >
+                {{ "changePaymentMethod" | i18n }}
+              </span>
+            }
+            @case ("card") {
+              <p class="tw-flex tw-items-center tw-gap-2">
+                @let cardBrandIcon = getCardBrandIcon();
+                @if (cardBrandIcon !== null) {
+                  <i class="bwi bwi-fw credit-card-icon {{ cardBrandIcon }}"></i>
+                } @else {
+                  <i class="bwi bwi-fw bwi-credit-card"></i>
+                }
+                {{ paymentMethod.brand | titlecase }}, *{{ paymentMethod.last4 }},
+                {{ paymentMethod.expiration }}
+                <span
+                  class="tw-ml-2 tw-text-primary-600 tw-cursor-pointer"
+                  (click)="toggleShowPayment()"
+                >
+                  {{ "changePaymentMethod" | i18n }}
+                </span>
+              </p>
+            }
+            @case ("payPal") {
+              <i class="bwi bwi-fw bwi-paypal tw-text-primary-600"></i>
+              {{ paymentMethod.email }}
+              <span
+                class="tw-ml-2 tw-text-primary-600 tw-cursor-pointer"
+                (click)="toggleShowPayment()"
+              >
+                {{ "changePaymentMethod" | i18n }}
+              </span>
+            }
+          }
           <a></a>
         </p>
         <ng-container *ngIf="canUpdatePaymentInformation()">
-          <app-payment [showAccountCredit]="false" />
-          <app-manage-tax-information
-            [startWith]="taxInformation"
-            (taxInformationChanged)="taxInformationChanged($event)"
-          ></app-manage-tax-information>
+          <app-enter-payment-method [group]="billingFormGroup.controls.paymentMethod">
+          </app-enter-payment-method>
+          <app-enter-billing-address
+            [group]="billingFormGroup.controls.billingAddress"
+            [scenario]="{ type: 'checkout', supportsTaxId }"
+          >
+          </app-enter-billing-address>
         </ng-container>
         <div class="tw-mt-4">
           <p class="tw-text-lg tw-mb-1">
-            <span class="tw-font-semibold"
+            <span class="tw-font-medium"
               >{{ "total" | i18n }}:
               {{ total - calculateTotalAppliedDiscount(total) | currency: "USD" : "$" }} USD</span
             >
@@ -366,7 +402,7 @@
         <!-- SM + PM and PM only cost summary -->
         <div *ngIf="totalOpened && !isSecretsManagerTrial()" class="tw-flex tw-flex-wrap tw-gap-4">
           <bit-hint class="tw-w-1/2" *ngIf="selectedInterval == planIntervals.Annually">
-            <p class="tw-font-semibold tw-mb-1" *ngIf="organization.useSecretsManager">
+            <p class="tw-font-medium tw-mb-1" *ngIf="organization.useSecretsManager">
               {{ "passwordManager" | i18n }}
             </p>
             <p
@@ -451,7 +487,7 @@
               </ng-container>
             </p>
             <!-- secrets manager summary for annual -->
-            <p class="tw-font-semibold tw-mt-3 tw-mb-1" *ngIf="organization.useSecretsManager">
+            <p class="tw-font-medium tw-mt-3 tw-mb-1" *ngIf="organization.useSecretsManager">
               {{ "secretsManager" | i18n }}
             </p>
             <p
@@ -533,7 +569,7 @@
             </p>
           </bit-hint>
           <bit-hint class="tw-w-1/2" *ngIf="selectedInterval == planIntervals.Monthly">
-            <p class="tw-font-semibold tw-mb-1" *ngIf="organization.useSecretsManager">
+            <p class="tw-font-medium tw-mb-1" *ngIf="organization.useSecretsManager">
               {{ "passwordManager" | i18n }}
             </p>
             <p
@@ -606,7 +642,7 @@
               </ng-container>
             </p>
             <!-- secrets manager summary for monthly -->
-            <p class="tw-font-semibold tw-mt-3 tw-mb-1" *ngIf="organization.useSecretsManager">
+            <p class="tw-font-medium tw-mt-3 tw-mb-1" *ngIf="organization.useSecretsManager">
               {{ "secretsManager" | i18n }}
             </p>
             <p
@@ -691,7 +727,7 @@
         <div *ngIf="totalOpened && isSecretsManagerTrial()" class="tw-flex tw-flex-wrap tw-gap-4">
           <bit-hint class="tw-w-1/2" *ngIf="selectedInterval == planIntervals.Annually">
             <!-- secrets manager summary for annual -->
-            <p class="tw-font-semibold tw-mt-2 tw-mb-0" *ngIf="organization.useSecretsManager">
+            <p class="tw-font-medium tw-mt-2 tw-mb-0" *ngIf="organization.useSecretsManager">
               {{ "secretsManager" | i18n }}
             </p>
             <p
@@ -752,7 +788,7 @@
               <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
             </p>
             <!-- password manager summary for annual -->
-            <p class="tw-font-semibold tw-mt-3 tw-mb-0" *ngIf="organization.useSecretsManager">
+            <p class="tw-font-medium tw-mt-3 tw-mb-0" *ngIf="organization.useSecretsManager">
               {{ "passwordManager" | i18n }}
             </p>
             <p
@@ -810,7 +846,7 @@
           </bit-hint>
           <bit-hint class="tw-w-1/2" *ngIf="selectedInterval == planIntervals.Monthly">
             <!-- secrets manager summary for monthly -->
-            <p class="tw-font-semibold tw-mt-2 tw-mb-0" *ngIf="organization.useSecretsManager">
+            <p class="tw-font-medium tw-mt-2 tw-mb-0" *ngIf="organization.useSecretsManager">
               {{ "secretsManager" | i18n }}
             </p>
             <p
@@ -867,7 +903,7 @@
               <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
             </p>
             <!-- password manager summary for monthly -->
-            <p class="tw-font-semibold tw-mt-3 tw-mb-0" *ngIf="organization.useSecretsManager">
+            <p class="tw-font-medium tw-mt-3 tw-mb-0" *ngIf="organization.useSecretsManager">
               {{ "passwordManager" | i18n }}
             </p>
             <p
@@ -936,7 +972,7 @@
             <p
               class="tw-flex tw-justify-between tw-border-0 tw-border-solid tw-border-t tw-border-secondary-300 tw-pt-2 tw-mb-0"
             >
-              <span class="tw-font-semibold">
+              <span class="tw-font-medium">
                 {{ "estimatedTax" | i18n }}
               </span>
               <span>
@@ -950,14 +986,12 @@
             <p
               class="tw-flex tw-justify-between tw-border-0 tw-border-solid tw-border-t tw-border-secondary-300 tw-pt-2 tw-mb-0"
             >
-              <span class="tw-font-semibold">
+              <span class="tw-font-medium">
                 {{ "total" | i18n }}
               </span>
               <span>
                 {{ total - calculateTotalAppliedDiscount(total) | currency: "USD" : "$" }}
-                <span class="tw-text-xs tw-font-semibold">
-                  / {{ selectedPlanInterval | i18n }}</span
-                >
+                <span class="tw-text-xs tw-font-medium"> / {{ selectedPlanInterval | i18n }}</span>
               </span>
             </p>
           </bit-hint>
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index 6fc2dc57ba2..0fd7746fc9d 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -12,9 +12,9 @@ import {
 } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
-import { firstValueFrom, map, Subject, switchMap, takeUntil } from "rxjs";
+import { combineLatest, firstValueFrom, map, Subject, switchMap, takeUntil } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
@@ -28,35 +28,18 @@ import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/
 import { OrganizationUpgradeRequest } from "@bitwarden/common/admin-console/models/request/organization-upgrade.request";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import {
-  BillingApiServiceAbstraction,
-  BillingInformation,
-  OrganizationBillingServiceAbstraction as OrganizationBillingService,
-  OrganizationInformation,
-  PaymentInformation,
-  PlanInformation,
-} from "@bitwarden/common/billing/abstractions";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import {
-  PaymentMethodType,
-  PlanInterval,
-  PlanType,
-  ProductTierType,
-} from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
-import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
-import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
+import { PlanInterval, PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
-import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 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 { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import {
+  CardComponent,
   DIALOG_DATA,
   DialogConfig,
   DialogRef,
@@ -64,11 +47,26 @@ import {
   ToastService,
 } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
-import { UserId } from "@bitwarden/user-core";
+import {
+  OrganizationSubscriptionPlan,
+  SubscriberBillingClient,
+  TaxClient,
+} from "@bitwarden/web-vault/app/billing/clients";
+import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+  getBillingAddressFromForm,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+import {
+  BillingAddress,
+  getCardBrandIcon,
+  MaskedPaymentMethod,
+} from "@bitwarden/web-vault/app/billing/payment/types";
+import { BitwardenSubscriber } from "@bitwarden/web-vault/app/billing/types";
 
 import { BillingNotificationService } from "../services/billing-notification.service";
 import { BillingSharedModule } from "../shared/billing-shared.module";
-import { PaymentComponent } from "../shared/payment/payment.component";
 
 type ChangePlanDialogParams = {
   organizationId: string;
@@ -109,19 +107,38 @@ interface OnSuccessArgs {
   organizationId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./change-plan-dialog.component.html",
-  imports: [BillingSharedModule],
+  imports: [
+    BillingSharedModule,
+    EnterPaymentMethodComponent,
+    EnterBillingAddressComponent,
+    CardComponent,
+  ],
+  providers: [SubscriberBillingClient, TaxClient],
 })
 export class ChangePlanDialogComponent implements OnInit, OnDestroy {
-  @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(ManageTaxInformationComponent) taxComponent: ManageTaxInformationComponent;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent: EnterPaymentMethodComponent;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() acceptingSponsorship = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationId: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showFree = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showCancel = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get productTier(): ProductTierType {
     return this._productTier;
@@ -134,7 +151,10 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
   protected estimatedTax: number = 0;
   private _productTier = ProductTierType.Free;
+  private _familyPlan: PlanType;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get plan(): PlanType {
     return this._plan;
@@ -146,9 +166,17 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   }
 
   private _plan = PlanType.Free;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() providerId?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSuccess = new EventEmitter<OnSuccessArgs>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCanceled = new EventEmitter<void>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onTrialBillingSuccess = new EventEmitter();
 
   protected discountPercentageFromSub: number;
@@ -172,7 +200,11 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     clientOwnerEmail: ["", [Validators.email]],
     plan: [this.plan],
     productTier: [this.productTier],
-    // planInterval: [1],
+  });
+
+  billingFormGroup = this.formBuilder.group({
+    paymentMethod: EnterPaymentMethodComponent.getFormGroup(),
+    billingAddress: EnterBillingAddressComponent.getFormGroup(),
   });
 
   planType: string;
@@ -183,7 +215,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   secretsManagerPlans: PlanResponse[];
   organization: Organization;
   sub: OrganizationSubscriptionResponse;
-  billing: BillingResponse;
   dialogHeaderName: string;
   currentPlanName: string;
   showPayment: boolean = false;
@@ -191,15 +222,14 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   currentPlan: PlanResponse;
   isCardStateDisabled = false;
   focusedIndex: number | null = null;
-  accountCredit: number;
-  paymentSource?: PaymentSourceResponse;
   plans: ListResponse<PlanResponse>;
   isSubscriptionCanceled: boolean = false;
   secretsManagerTotal: number;
 
-  private destroy$ = new Subject<void>();
+  paymentMethod: MaskedPaymentMethod | null;
+  billingAddress: BillingAddress | null;
 
-  protected taxInformation: TaxInformation;
+  private destroy$ = new Subject<void>();
 
   constructor(
     @Inject(DIALOG_DATA) private dialogParams: ChangePlanDialogParams,
@@ -215,11 +245,12 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     private messagingService: MessagingService,
     private formBuilder: FormBuilder,
     private organizationApiService: OrganizationApiServiceAbstraction,
-    private billingApiService: BillingApiServiceAbstraction,
-    private taxService: TaxServiceAbstraction,
     private accountService: AccountService,
-    private organizationBillingService: OrganizationBillingService,
     private billingNotificationService: BillingNotificationService,
+    private subscriberBillingClient: SubscriberBillingClient,
+    private taxClient: TaxClient,
+    private organizationWarningsService: OrganizationWarningsService,
+    private configService: ConfigService,
   ) {}
 
   async ngOnInit(): Promise<void> {
@@ -242,10 +273,14 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       );
       if (this.sub?.subscription?.status !== "canceled") {
         try {
-          const { accountCredit, paymentSource } =
-            await this.billingApiService.getOrganizationPaymentMethod(this.organizationId);
-          this.accountCredit = accountCredit;
-          this.paymentSource = paymentSource;
+          const subscriber: BitwardenSubscriber = { type: "organization", data: this.organization };
+          const [paymentMethod, billingAddress] = await Promise.all([
+            this.subscriberBillingClient.getPaymentMethod(subscriber),
+            this.subscriberBillingClient.getBillingAddress(subscriber),
+          ]);
+
+          this.paymentMethod = paymentMethod;
+          this.billingAddress = billingAddress;
         } catch (error) {
           this.billingNotificationService.handleError(error);
         }
@@ -265,10 +300,16 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       }
     }
 
+    const milestone3FeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM26462_Milestone_3,
+    );
+    this._familyPlan = milestone3FeatureEnabled
+      ? PlanType.FamiliesAnnually
+      : PlanType.FamiliesAnnually2025;
     if (this.currentPlan && this.currentPlan.productTier !== ProductTierType.Enterprise) {
       const upgradedPlan = this.passwordManagerPlans.find((plan) =>
         this.currentPlan.productTier === ProductTierType.Free
-          ? plan.type === PlanType.FamiliesAnnually
+          ? plan.type === this._familyPlan
           : plan.upgradeSortOrder == this.currentPlan.upgradeSortOrder + 1,
       );
 
@@ -307,15 +348,24 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       ? 0
       : (this.sub?.customerDiscount?.percentOff ?? 0);
 
-    this.setInitialPlanSelection();
-    this.loading = false;
-
-    const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
-    this.taxInformation = TaxInformation.from(taxInfo);
-
+    await this.setInitialPlanSelection();
     if (!this.isSubscriptionCanceled) {
-      this.refreshSalesTax();
+      await this.refreshSalesTax();
     }
+
+    combineLatest([
+      this.billingFormGroup.controls.billingAddress.controls.country.valueChanges,
+      this.billingFormGroup.controls.billingAddress.controls.postalCode.valueChanges,
+      this.billingFormGroup.controls.billingAddress.controls.taxId.valueChanges,
+    ])
+      .pipe(
+        debounceTime(1000),
+        switchMap(async () => await this.refreshSalesTax()),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
+
+    this.loading = false;
   }
 
   resolveHeaderName(subscription: OrganizationSubscriptionResponse): string {
@@ -333,10 +383,10 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     );
   }
 
-  setInitialPlanSelection() {
+  async setInitialPlanSelection() {
     this.focusedIndex = this.selectableProducts.length - 1;
     if (!this.isSubscriptionCanceled) {
-      this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
+      await this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
     }
   }
 
@@ -344,10 +394,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     return this.selectableProducts.find((product) => product.productTier === productTier);
   }
 
-  isPaymentSourceEmpty() {
-    return this.paymentSource === null || this.paymentSource === undefined;
-  }
-
   isSecretsManagerTrial(): boolean {
     return (
       this.sub?.subscription?.items?.some((item) =>
@@ -356,13 +402,13 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     );
   }
 
-  planTypeChanged() {
-    this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
+  async planTypeChanged() {
+    await this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
   }
 
-  updateInterval(event: number) {
+  async updateInterval(event: number) {
     this.selectedInterval = event;
-    this.planTypeChanged();
+    await this.planTypeChanged();
   }
 
   protected getPlanIntervals() {
@@ -415,9 +461,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
           "tw-border-solid",
           "tw-border-primary-600",
           "hover:tw-border-primary-700",
-          "focus:tw-border-2",
-          "focus:tw-border-primary-700",
-          "focus:tw-rounded-lg",
+          "tw-border-2",
+          "!tw-border-primary-700",
+          "tw-rounded-lg",
         ];
       }
       case PlanCardState.NotSelected: {
@@ -460,7 +506,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
   }
 
-  protected selectPlan(plan: PlanResponse) {
+  protected async selectPlan(plan: PlanResponse) {
     if (
       this.selectedInterval === PlanInterval.Monthly &&
       plan.productTier == ProductTierType.Families
@@ -475,7 +521,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     this.formGroup.patchValue({ productTier: plan.productTier });
 
     try {
-      this.refreshSalesTax();
+      await this.refreshSalesTax();
     } catch {
       this.estimatedTax = 0;
     }
@@ -489,19 +535,11 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   get upgradeRequiresPaymentMethod() {
     const isFreeTier = this.organization?.productTierType === ProductTierType.Free;
     const shouldHideFree = !this.showFree;
-    const hasNoPaymentSource = !this.paymentSource;
+    const hasNoPaymentSource = !this.paymentMethod;
 
     return isFreeTier && shouldHideFree && hasNoPaymentSource;
   }
 
-  get selectedSecretsManagerPlan() {
-    let planResponse: PlanResponse;
-    if (this.secretsManagerPlans) {
-      return this.secretsManagerPlans.find((plan) => plan.type === this.selectedPlan.type);
-    }
-    return planResponse;
-  }
-
   get selectedPlanInterval() {
     if (this.isSubscriptionCanceled) {
       return this.currentPlan.isAnnual ? "year" : "month";
@@ -516,9 +554,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
 
     if (this.acceptingSponsorship) {
-      const familyPlan = this.passwordManagerPlans.find(
-        (plan) => plan.type === PlanType.FamiliesAnnually,
-      );
+      const familyPlan = this.passwordManagerPlans.find((plan) => plan.type === this._familyPlan);
       this.discount = familyPlan.PasswordManager.basePrice;
       return [familyPlan];
     }
@@ -534,6 +570,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
           plan.productTier === ProductTierType.TeamsStarter ||
           (this.selectedInterval === PlanInterval.Annually && plan.isAnnual) ||
           (this.selectedInterval === PlanInterval.Monthly && !plan.isAnnual)) &&
+        (plan.productTier !== ProductTierType.Families || plan.type === this._familyPlan) &&
         (!this.currentPlan || this.currentPlan.upgradeSortOrder < plan.upgradeSortOrder) &&
         this.planIsEnabled(plan),
     );
@@ -591,8 +628,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       return 0;
     }
 
-    const result = plan.PasswordManager.seatPrice * Math.abs(this.sub?.seats || 0);
-    return result;
+    return plan.PasswordManager.seatPrice * Math.abs(this.sub?.seats || 0);
   }
 
   secretsManagerSeatTotal(plan: PlanResponse, seats: number): number {
@@ -643,6 +679,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     if (this.selectedPlan.PasswordManager.hasPremiumAccessOption) {
       subTotal += this.selectedPlan.PasswordManager.premiumAccessOptionPrice;
     }
+    if (this.selectedPlan.PasswordManager.hasAdditionalStorageOption) {
+      subTotal += this.additionalStorageTotal(this.selectedPlan);
+    }
     return subTotal - this.discount;
   }
 
@@ -680,18 +719,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
 
     if (this.organization.useSecretsManager) {
-      return (
-        this.passwordManagerSubtotal +
-        this.additionalStorageTotal(this.selectedPlan) +
-        this.secretsManagerSubtotal() +
-        this.estimatedTax
-      );
+      return this.passwordManagerSubtotal + this.secretsManagerSubtotal() + this.estimatedTax;
     }
-    return (
-      this.passwordManagerSubtotal +
-      this.additionalStorageTotal(this.selectedPlan) +
-      this.estimatedTax
-    );
+    return this.passwordManagerSubtotal + this.estimatedTax;
   }
 
   get teamsStarterPlanIsAvailable() {
@@ -746,39 +776,22 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     this.formGroup.controls.additionalSeats.setValue(1);
   }
 
-  changedCountry() {
-    this.paymentComponent.showBankAccount = this.taxInformation.country === "US";
-
-    if (
-      !this.paymentComponent.showBankAccount &&
-      this.paymentComponent.selected === PaymentMethodType.BankAccount
-    ) {
-      this.paymentComponent.select(PaymentMethodType.Card);
-    }
-  }
-
-  protected taxInformationChanged(event: TaxInformation): void {
-    this.taxInformation = event;
-    this.changedCountry();
-    this.refreshSalesTax();
-  }
-
   submit = async () => {
-    if (this.taxComponent !== undefined && !this.taxComponent.validate()) {
-      this.taxComponent.markAllAsTouched();
+    this.formGroup.markAllAsTouched();
+    this.billingFormGroup.markAllAsTouched();
+    if (this.formGroup.invalid || (this.billingFormGroup.invalid && !this.paymentMethod)) {
       return;
     }
 
     const doSubmit = async (): Promise<string> => {
-      const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-      let orgId: string = null;
+      let orgId: string;
       const sub = this.sub?.subscription;
       const isCanceled = sub?.status === "canceled";
       const isCancelledDowngradedToFreeOrg =
         sub?.cancelled && this.organization.productTierType === ProductTierType.Free;
 
       if (isCanceled || isCancelledDowngradedToFreeOrg) {
-        await this.restartSubscription(activeUserId);
+        await this.restartSubscription();
         orgId = this.organizationId;
       } else {
         orgId = await this.updateOrganization();
@@ -791,13 +804,10 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
           : this.i18nService.t("organizationUpgraded"),
       });
 
-      await this.apiService.refreshIdentityToken();
       await this.syncService.fullSync(true);
 
       if (!this.acceptingSponsorship && !this.isInTrialFlow) {
-        // 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.router.navigate(["/organizations/" + orgId + "/billing/subscription"]);
+        await this.router.navigate(["/organizations/" + orgId + "/billing/subscription"]);
       }
 
       if (this.isInTrialFlow) {
@@ -818,47 +828,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     this.dialogRef.close();
   };
 
-  private async restartSubscription(activeUserId: UserId) {
-    const org = await this.organizationApiService.get(this.organizationId);
-    const organization: OrganizationInformation = {
-      name: org.name,
-      billingEmail: org.billingEmail,
-    };
-
-    const filteredPlan = this.plans.data
-      .filter((plan) => plan.productTier === this.selectedPlan.productTier && !plan.legacyYear)
-      .find((plan) => {
-        const isSameBillingCycle = plan.isAnnual === this.selectedPlan.isAnnual;
-        return isSameBillingCycle;
-      });
-
-    const plan: PlanInformation = {
-      type: filteredPlan.type,
-      passwordManagerSeats: org.seats,
-    };
-
-    if (org.useSecretsManager) {
-      plan.subscribeToSecretsManager = true;
-      plan.secretsManagerSeats = org.smSeats;
-    }
-
-    const { type, token } = await this.paymentComponent.tokenize();
-    const paymentMethod: [string, PaymentMethodType] = [token, type];
-
-    const payment: PaymentInformation = {
+  private async restartSubscription() {
+    const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+    const billingAddress = getBillingAddressFromForm(this.billingFormGroup.controls.billingAddress);
+    await this.subscriberBillingClient.restartSubscription(
+      { type: "organization", data: this.organization },
       paymentMethod,
-      billing: this.getBillingInformationFromTaxInfoComponent(),
-    };
-
-    await this.organizationBillingService.restartSubscription(
-      this.organization.id,
-      {
-        organization,
-        plan,
-        payment,
-      },
-      activeUserId,
+      billingAddress,
     );
+    this.organizationWarningsService.refreshInactiveSubscriptionWarning();
   }
 
   private async updateOrganization() {
@@ -875,25 +853,24 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       this.formGroup.controls.premiumAccessAddon.value;
     request.planType = this.selectedPlan.type;
     if (this.showPayment) {
-      request.billingAddressCountry = this.taxInformation.country;
-      request.billingAddressPostalCode = this.taxInformation.postalCode;
+      request.billingAddressCountry = this.billingFormGroup.controls.billingAddress.value.country;
+      request.billingAddressPostalCode =
+        this.billingFormGroup.controls.billingAddress.value.postalCode;
     }
 
     // Secrets Manager
     this.buildSecretsManagerRequest(request);
 
-    if (this.upgradeRequiresPaymentMethod || this.showPayment || this.isPaymentSourceEmpty()) {
-      const tokenizedPaymentSource = await this.paymentComponent.tokenize();
-      const updatePaymentMethodRequest = new UpdatePaymentMethodRequest();
-      updatePaymentMethodRequest.paymentSource = tokenizedPaymentSource;
-      updatePaymentMethodRequest.taxInformation = ExpandedTaxInfoUpdateRequest.From(
-        this.taxInformation,
+    if (this.upgradeRequiresPaymentMethod || this.showPayment || !this.paymentMethod) {
+      const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+      const billingAddress = getBillingAddressFromForm(
+        this.billingFormGroup.controls.billingAddress,
       );
 
-      await this.billingApiService.updateOrganizationPaymentMethod(
-        this.organizationId,
-        updatePaymentMethodRequest,
-      );
+      const subscriber: BitwardenSubscriber = { type: "organization", data: this.organization };
+      // These need to be synchronous so one of them can create the Customer in the case we're upgrading from Free.
+      await this.subscriberBillingClient.updateBillingAddress(subscriber, billingAddress);
+      await this.subscriberBillingClient.updatePaymentMethod(subscriber, paymentMethod, null);
     }
 
     // Backfill pub/priv key if necessary
@@ -931,18 +908,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     return text;
   }
 
-  private getBillingInformationFromTaxInfoComponent(): BillingInformation {
-    return {
-      country: this.taxInformation.country,
-      postalCode: this.taxInformation.postalCode,
-      taxId: this.taxInformation.taxId,
-      addressLine1: this.taxInformation.line1,
-      addressLine2: this.taxInformation.line2,
-      city: this.taxInformation.city,
-      state: this.taxInformation.state,
-    };
-  }
-
   private buildSecretsManagerRequest(request: OrganizationUpgradeRequest): void {
     request.useSecretsManager = this.organization.useSecretsManager;
     if (!this.organization.useSecretsManager) {
@@ -970,7 +935,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     if (this.currentPlan && this.currentPlan.productTier !== ProductTierType.Enterprise) {
       const upgradedPlan = this.passwordManagerPlans.find((plan) => {
         if (this.currentPlan.productTier === ProductTierType.Free) {
-          return plan.type === PlanType.FamiliesAnnually;
+          return plan.type === this._familyPlan;
         }
 
         if (
@@ -1002,25 +967,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   }
 
   calculateTotalAppliedDiscount(total: number) {
-    const discountedTotal = total * (this.discountPercentageFromSub / 100);
-    return discountedTotal;
-  }
-
-  get paymentSourceClasses() {
-    if (this.paymentSource == null) {
-      return [];
-    }
-    switch (this.paymentSource.type) {
-      case PaymentMethodType.Card:
-        return ["bwi-credit-card"];
-      case PaymentMethodType.BankAccount:
-      case PaymentMethodType.Check:
-        return ["bwi-billing"];
-      case PaymentMethodType.PayPal:
-        return ["bwi-paypal text-primary"];
-      default:
-        return [];
-    }
+    return total * (this.discountPercentageFromSub / 100);
   }
 
   resolvePlanName(productTier: ProductTierType) {
@@ -1064,9 +1011,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
   }
 
-  onFocus(index: number) {
+  async onFocus(index: number) {
     this.focusedIndex = index;
-    this.selectPlan(this.selectableProducts[index]);
+    await this.selectPlan(this.selectableProducts[index]);
   }
 
   isCardDisabled(index: number): boolean {
@@ -1078,58 +1025,45 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     return index;
   }
 
-  private refreshSalesTax(): void {
-    if (
-      this.taxInformation === undefined ||
-      !this.taxInformation.country ||
-      !this.taxInformation.postalCode
-    ) {
+  private async refreshSalesTax(): Promise<void> {
+    if (this.billingFormGroup.controls.billingAddress.invalid && !this.billingAddress) {
       return;
     }
 
-    const request: PreviewOrganizationInvoiceRequest = {
-      organizationId: this.organizationId,
-      passwordManager: {
-        additionalStorage: 0,
-        plan: this.selectedPlan?.type,
-        seats: this.sub.seats,
-      },
-      taxInformation: {
-        postalCode: this.taxInformation.postalCode,
-        country: this.taxInformation.country,
-        taxId: this.taxInformation.taxId,
-      },
+    const getPlanFromLegacyEnum = (planType: PlanType): OrganizationSubscriptionPlan => {
+      switch (planType) {
+        case PlanType.FamiliesAnnually:
+        case PlanType.FamiliesAnnually2025:
+          return { tier: "families", cadence: "annually" };
+        case PlanType.TeamsMonthly:
+          return { tier: "teams", cadence: "monthly" };
+        case PlanType.TeamsAnnually:
+          return { tier: "teams", cadence: "annually" };
+        case PlanType.EnterpriseMonthly:
+          return { tier: "enterprise", cadence: "monthly" };
+        case PlanType.EnterpriseAnnually:
+          return { tier: "enterprise", cadence: "annually" };
+      }
     };
 
-    if (this.organization.useSecretsManager) {
-      request.secretsManager = {
-        seats: this.sub.smSeats,
-        additionalMachineAccounts:
-          this.sub.smServiceAccounts - this.sub.plan.SecretsManager.baseServiceAccount,
-      };
-    }
+    const billingAddress = this.billingFormGroup.controls.billingAddress.valid
+      ? getBillingAddressFromForm(this.billingFormGroup.controls.billingAddress)
+      : this.billingAddress;
 
-    this.taxService
-      .previewOrganizationInvoice(request)
-      .then((invoice) => {
-        this.estimatedTax = invoice.taxAmount;
-      })
-      .catch((error) => {
-        const translatedMessage = this.i18nService.t(error.message);
-        this.toastService.showToast({
-          title: "",
-          variant: "error",
-          message:
-            !translatedMessage || translatedMessage === "" ? error.message : translatedMessage,
-        });
-      });
+    const taxAmounts = await this.taxClient.previewTaxForOrganizationSubscriptionPlanChange(
+      this.organizationId,
+      getPlanFromLegacyEnum(this.selectedPlan.type),
+      billingAddress,
+    );
+
+    this.estimatedTax = taxAmounts.tax;
   }
 
   protected canUpdatePaymentInformation(): boolean {
     return (
       this.upgradeRequiresPaymentMethod ||
       this.showPayment ||
-      this.isPaymentSourceEmpty() ||
+      !this.paymentMethod ||
       this.isSubscriptionCanceled
     );
   }
@@ -1146,4 +1080,10 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       return this.i18nService.t("upgrade");
     }
   }
+
+  get supportsTaxId() {
+    return this.formGroup.value.productTier !== ProductTierType.Families;
+  }
+
+  getCardBrandIcon = () => getCardBrandIcon(this.paymentMethod);
 }
diff --git a/apps/web/src/app/billing/organizations/change-plan.component.ts b/apps/web/src/app/billing/organizations/change-plan.component.ts
index 31cbf4e94bf..a3f14f5ce29 100644
--- a/apps/web/src/app/billing/organizations/change-plan.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan.component.ts
@@ -6,16 +6,28 @@ import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-change-plan",
   templateUrl: "change-plan.component.html",
   standalone: false,
 })
 export class ChangePlanComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationId: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() currentPlan: PlanResponse;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() preSelectedProductTier: ProductTierType;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onChanged = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCanceled = new EventEmitter();
 
   formPromise: Promise<any>;
diff --git a/apps/web/src/app/billing/organizations/download-license.component.ts b/apps/web/src/app/billing/organizations/download-license.component.ts
index 8ada57e8377..e93ae5028dc 100644
--- a/apps/web/src/app/billing/organizations/download-license.component.ts
+++ b/apps/web/src/app/billing/organizations/download-license.component.ts
@@ -18,6 +18,8 @@ type DownloadLicenseDialogData = {
   organizationId: string;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "download-license.component.html",
   standalone: false,
diff --git a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts
index ce4678ad8ef..a654ac272fe 100644
--- a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts
@@ -10,6 +10,8 @@ import {
   BillingTransactionResponse,
 } from "@bitwarden/common/billing/models/response/billing.response";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "organization-billing-history-view.component.html",
   standalone: false,
diff --git a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
index 692791db855..5c8df483587 100644
--- a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
+++ b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
@@ -11,7 +11,6 @@ import { WebPlatformUtilsService } from "../../core/web-platform-utils.service";
 import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
 import { OrganizationSubscriptionCloudComponent } from "./organization-subscription-cloud.component";
 import { OrganizationSubscriptionSelfhostComponent } from "./organization-subscription-selfhost.component";
-import { OrganizationPaymentMethodComponent } from "./payment-method/organization-payment-method.component";
 
 const routes: Routes = [
   {
@@ -26,17 +25,6 @@ const routes: Routes = [
           : OrganizationSubscriptionCloudComponent,
         data: { titleId: "subscription" },
       },
-      {
-        path: "payment-method",
-        component: OrganizationPaymentMethodComponent,
-        canActivate: [
-          organizationPermissionsGuard((org) => org.canEditPaymentMethods),
-          organizationIsUnmanaged,
-        ],
-        data: {
-          titleId: "paymentMethod",
-        },
-      },
       {
         path: "payment-details",
         component: OrganizationPaymentDetailsComponent,
diff --git a/apps/web/src/app/billing/organizations/organization-billing.module.ts b/apps/web/src/app/billing/organizations/organization-billing.module.ts
index 707a854de02..90ba04c4fa4 100644
--- a/apps/web/src/app/billing/organizations/organization-billing.module.ts
+++ b/apps/web/src/app/billing/organizations/organization-billing.module.ts
@@ -17,7 +17,6 @@ import { OrganizationBillingRoutingModule } from "./organization-billing-routing
 import { OrganizationPlansComponent } from "./organization-plans.component";
 import { OrganizationSubscriptionCloudComponent } from "./organization-subscription-cloud.component";
 import { OrganizationSubscriptionSelfhostComponent } from "./organization-subscription-selfhost.component";
-import { OrganizationPaymentMethodComponent } from "./payment-method/organization-payment-method.component";
 import { SecretsManagerAdjustSubscriptionComponent } from "./sm-adjust-subscription.component";
 import { SecretsManagerSubscribeStandaloneComponent } from "./sm-subscribe-standalone.component";
 import { SubscriptionHiddenComponent } from "./subscription-hidden.component";
@@ -45,7 +44,6 @@ import { SubscriptionStatusComponent } from "./subscription-status.component";
     SecretsManagerSubscribeStandaloneComponent,
     SubscriptionHiddenComponent,
     SubscriptionStatusComponent,
-    OrganizationPaymentMethodComponent,
   ],
 })
 export class OrganizationBillingModule {}
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
index 3b765927c3c..6234fc6e6e3 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -404,17 +404,16 @@
     <p class="tw-text-muted tw-italic tw-mb-3 tw-block" bitTypography="body2">
       {{ paymentDesc }}
     </p>
-    <app-payment
-      *ngIf="createOrganization || upgradeRequiresPaymentMethod"
-      [showAccountCredit]="false"
-    >
-    </app-payment>
-    <app-manage-tax-information
+    @if (createOrganization || upgradeRequiresPaymentMethod) {
+      <app-enter-payment-method [group]="billingFormGroup.controls.paymentMethod">
+      </app-enter-payment-method>
+    }
+    <app-enter-billing-address
+      [group]="billingFormGroup.controls.billingAddress"
+      [scenario]="{ type: 'checkout', supportsTaxId: showTaxIdField }"
       class="tw-my-4"
-      [showTaxIdField]="showTaxIdField"
-      [startWith]="taxInformation"
-      (taxInformationChanged)="onTaxInformationChanged($event)"
-    />
+    >
+    </app-enter-billing-address>
     <div id="price" class="tw-my-4">
       <div class="tw-text-muted tw-text-base">
         {{ "passwordManagerPlanPrice" | i18n }}: {{ passwordManagerSubtotal | currency: "USD $" }}
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index 820bee950eb..561a3e03deb 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -11,10 +11,9 @@ import {
 } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
-import { Subject, firstValueFrom, takeUntil } from "rxjs";
+import { firstValueFrom, merge, Subject, takeUntil } from "rxjs";
 import { debounceTime, map, switchMap } from "rxjs/operators";
 
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
@@ -32,21 +31,12 @@ import { ProviderOrganizationCreateRequest } from "@bitwarden/common/admin-conso
 import { ProviderResponse } from "@bitwarden/common/admin-console/models/response/provider/provider.response";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import {
-  PaymentMethodType,
-  PlanSponsorshipType,
-  PlanType,
-  ProductTierType,
-} from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
-import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
+import { assertNonNullish } from "@bitwarden/common/auth/utils";
+import { PlanSponsorshipType, PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
 import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -54,15 +44,26 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { OrganizationId } from "@bitwarden/common/types/guid";
+import { OrganizationId, ProviderId, UserId } from "@bitwarden/common/types/guid";
 import { OrgKey } from "@bitwarden/common/types/key";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
+import {
+  OrganizationSubscriptionPlan,
+  OrganizationSubscriptionPurchase,
+  SubscriberBillingClient,
+  TaxClient,
+} from "@bitwarden/web-vault/app/billing/clients";
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+  getBillingAddressFromForm,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+import { tokenizablePaymentMethodToLegacyEnum } from "@bitwarden/web-vault/app/billing/payment/types";
 
 import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
 import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared";
-import { PaymentComponent } from "../shared/payment/payment.component";
 
 interface OnSuccessArgs {
   organizationId: string;
@@ -75,24 +76,47 @@ const Allowed2020PlansForLegacyProviders = [
   PlanType.EnterpriseMonthly2020,
 ];
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-organization-plans",
   templateUrl: "organization-plans.component.html",
-  imports: [BillingSharedModule, OrganizationCreateModule],
+  imports: [
+    BillingSharedModule,
+    OrganizationCreateModule,
+    EnterPaymentMethodComponent,
+    EnterBillingAddressComponent,
+  ],
+  providers: [SubscriberBillingClient, TaxClient],
 })
 export class OrganizationPlansComponent implements OnInit, OnDestroy {
-  @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(ManageTaxInformationComponent) taxComponent: ManageTaxInformationComponent;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationId?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showFree = true;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showCancel = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() acceptingSponsorship = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() planSponsorshipType?: PlanSponsorshipType;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() currentPlan: PlanResponse;
 
   selectedFile: File;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get productTier(): ProductTierType {
     return this._productTier;
@@ -104,9 +128,10 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
   }
 
   private _productTier = ProductTierType.Free;
+  private _familyPlan: PlanType;
 
-  protected taxInformation: TaxInformation;
-
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get plan(): PlanType {
     return this._plan;
@@ -116,13 +141,25 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     this._plan = plan;
     this.formGroup?.controls?.plan?.setValue(plan);
   }
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() enableSecretsManagerByDefault: boolean;
 
   private _plan = PlanType.Free;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() providerId?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() preSelectedProductTier?: ProductTierType;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSuccess = new EventEmitter<OnSuccessArgs>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCanceled = new EventEmitter<void>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onTrialBillingSuccess = new EventEmitter();
 
   loading = true;
@@ -135,10 +172,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
   secretsManagerSubscription = secretsManagerSubscribeFormFactory(this.formBuilder);
 
-  selfHostedForm = this.formBuilder.group({
-    file: [null, [Validators.required]],
-  });
-
   formGroup = this.formBuilder.group({
     name: [""],
     billingEmail: ["", [Validators.email]],
@@ -152,6 +185,11 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     secretsManager: this.secretsManagerSubscription,
   });
 
+  billingFormGroup = this.formBuilder.group({
+    paymentMethod: EnterPaymentMethodComponent.getFormGroup(),
+    billingAddress: EnterBillingAddressComponent.getFormGroup(),
+  });
+
   passwordManagerPlans: PlanResponse[];
   secretsManagerPlans: PlanResponse[];
   organization: Organization;
@@ -179,10 +217,10 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     private organizationApiService: OrganizationApiServiceAbstraction,
     private providerApiService: ProviderApiServiceAbstraction,
     private toastService: ToastService,
-    private configService: ConfigService,
-    private billingApiService: BillingApiServiceAbstraction,
-    private taxService: TaxServiceAbstraction,
     private accountService: AccountService,
+    private subscriberBillingClient: SubscriberBillingClient,
+    private taxClient: TaxClient,
+    private configService: ConfigService,
   ) {
     this.selfHosted = this.platformUtilsService.isSelfHost();
   }
@@ -199,9 +237,14 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       );
       this.billing = await this.organizationApiService.getBilling(this.organizationId);
       this.sub = await this.organizationApiService.getSubscription(this.organizationId);
-      this.taxInformation = await this.organizationApiService.getTaxInfo(this.organizationId);
-    } else if (!this.selfHosted) {
-      this.taxInformation = await this.apiService.getTaxInfo();
+      const billingAddress = await this.subscriberBillingClient.getBillingAddress({
+        type: "organization",
+        data: this.organization,
+      });
+      this.billingFormGroup.controls.billingAddress.patchValue({
+        ...billingAddress,
+        taxId: billingAddress?.taxId?.value,
+      });
     }
 
     if (!this.selfHosted) {
@@ -217,10 +260,16 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       }
     }
 
+    const milestone3FeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM26462_Milestone_3,
+    );
+    this._familyPlan = milestone3FeatureEnabled
+      ? PlanType.FamiliesAnnually
+      : PlanType.FamiliesAnnually2025;
     if (this.currentPlan && this.currentPlan.productTier !== ProductTierType.Enterprise) {
       const upgradedPlan = this.passwordManagerPlans.find((plan) =>
         this.currentPlan.productTier === ProductTierType.Free
-          ? plan.type === PlanType.FamiliesAnnually
+          ? plan.type === this._familyPlan
           : plan.upgradeSortOrder == this.currentPlan.upgradeSortOrder + 1,
       );
 
@@ -268,15 +317,17 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
     this.loading = false;
 
-    this.formGroup.valueChanges.pipe(debounceTime(1000), takeUntil(this.destroy$)).subscribe(() => {
-      this.refreshSalesTax();
-    });
-
-    this.secretsManagerForm.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        this.refreshSalesTax();
-      });
+    merge(
+      this.formGroup.valueChanges,
+      this.billingFormGroup.valueChanges,
+      this.secretsManagerForm.valueChanges,
+    )
+      .pipe(
+        debounceTime(1000),
+        switchMap(async () => await this.refreshSalesTax()),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
 
     if (this.enableSecretsManagerByDefault && this.selectedSecretsManagerPlan) {
       this.secretsManagerSubscription.patchValue({
@@ -337,9 +388,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
   get selectableProducts() {
     if (this.acceptingSponsorship) {
-      const familyPlan = this.passwordManagerPlans.find(
-        (plan) => plan.type === PlanType.FamiliesAnnually,
-      );
+      const familyPlan = this.passwordManagerPlans.find((plan) => plan.type === this._familyPlan);
       this.discount = familyPlan.PasswordManager.basePrice;
       return [familyPlan];
     }
@@ -356,6 +405,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
           plan.productTier === ProductTierType.TeamsStarter) &&
         (!this.currentPlan || this.currentPlan.upgradeSortOrder < plan.upgradeSortOrder) &&
         (!this.hasProvider || plan.productTier !== ProductTierType.TeamsStarter) &&
+        (plan.productTier !== ProductTierType.Families || plan.type === this._familyPlan) &&
         ((!this.isProviderQualifiedFor2020Plan() && this.planIsEnabled(plan)) ||
           (this.isProviderQualifiedFor2020Plan() &&
             Allowed2020PlansForLegacyProviders.includes(plan.type))),
@@ -372,6 +422,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       this.passwordManagerPlans?.filter(
         (plan) =>
           plan.productTier === selectedProductTierType &&
+          (plan.productTier !== ProductTierType.Families || plan.type === this._familyPlan) &&
           ((!this.isProviderQualifiedFor2020Plan() && this.planIsEnabled(plan)) ||
             (this.isProviderQualifiedFor2020Plan() &&
               Allowed2020PlansForLegacyProviders.includes(plan.type))),
@@ -438,7 +489,10 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
   }
 
   get passwordManagerSubtotal() {
-    let subTotal = this.selectedPlan.PasswordManager.basePrice;
+    const basePriceAfterDiscount = this.acceptingSponsorship
+      ? Math.max(this.selectedPlan.PasswordManager.basePrice - this.discount, 0)
+      : this.selectedPlan.PasswordManager.basePrice;
+    let subTotal = basePriceAfterDiscount;
     if (
       this.selectedPlan.PasswordManager.hasAdditionalSeatsOption &&
       this.formGroup.controls.additionalSeats.value
@@ -448,19 +502,19 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         this.formGroup.value.additionalSeats,
       );
     }
-    if (
-      this.selectedPlan.PasswordManager.hasAdditionalStorageOption &&
-      this.formGroup.controls.additionalStorage.value
-    ) {
-      subTotal += this.additionalStorageTotal(this.selectedPlan);
-    }
     if (
       this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
       this.formGroup.controls.premiumAccessAddon.value
     ) {
       subTotal += this.selectedPlan.PasswordManager.premiumAccessOptionPrice;
     }
-    return subTotal - this.discount;
+    if (
+      this.selectedPlan.PasswordManager.hasAdditionalStorageOption &&
+      this.formGroup.controls.additionalStorage.value
+    ) {
+      subTotal += this.additionalStorageTotal(this.selectedPlan);
+    }
+    return subTotal;
   }
 
   get secretsManagerSubtotal() {
@@ -587,34 +641,13 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     this.changedProduct();
   }
 
-  protected changedCountry(): void {
-    this.paymentComponent.showBankAccount = this.taxInformation?.country === "US";
-    if (
-      !this.paymentComponent.showBankAccount &&
-      this.paymentComponent.selected === PaymentMethodType.BankAccount
-    ) {
-      this.paymentComponent.select(PaymentMethodType.Card);
-    }
-  }
-
-  protected onTaxInformationChanged(event: TaxInformation): void {
-    this.taxInformation = event;
-    this.changedCountry();
-    this.refreshSalesTax();
-  }
-
   protected cancel(): void {
     this.onCanceled.emit();
   }
 
-  protected setSelectedFile(event: Event): void {
-    const fileInputEl = <HTMLInputElement>event.target;
-    this.selectedFile = fileInputEl.files.length > 0 ? fileInputEl.files[0] : null;
-  }
-
   submit = async () => {
-    if (this.taxComponent && !this.taxComponent.validate()) {
-      this.taxComponent.markAllAsTouched();
+    this.formGroup.markAllAsTouched();
+    if (this.formGroup.invalid) {
       return;
     }
 
@@ -636,7 +669,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
         orgId = this.selfHosted
           ? await this.createSelfHosted(key, collectionCt, orgKeys)
-          : await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]);
+          : await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1], activeUserId);
 
         this.toastService.showToast({
           variant: "success",
@@ -652,7 +685,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         });
       }
 
-      await this.apiService.refreshIdentityToken();
       await this.syncService.fullSync(true);
 
       if (!this.acceptingSponsorship && !this.isInTrialFlow) {
@@ -688,46 +720,91 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     }
   }
 
-  private refreshSalesTax(): void {
-    if (!this.taxComponent.validate()) {
+  private getPlanFromLegacyEnum(): OrganizationSubscriptionPlan {
+    switch (this.formGroup.value.plan) {
+      case PlanType.FamiliesAnnually:
+      case PlanType.FamiliesAnnually2025:
+        return { tier: "families", cadence: "annually" };
+      case PlanType.TeamsMonthly:
+        return { tier: "teams", cadence: "monthly" };
+      case PlanType.TeamsAnnually:
+        return { tier: "teams", cadence: "annually" };
+      case PlanType.EnterpriseMonthly:
+        return { tier: "enterprise", cadence: "monthly" };
+      case PlanType.EnterpriseAnnually:
+        return { tier: "enterprise", cadence: "annually" };
+    }
+  }
+
+  private buildTaxPreviewRequest(
+    additionalStorage: number,
+    sponsored: boolean,
+  ): OrganizationSubscriptionPurchase {
+    const passwordManagerSeats = this.selectedPlan.PasswordManager.hasAdditionalSeatsOption
+      ? this.formGroup.value.additionalSeats
+      : 1;
+
+    return {
+      ...this.getPlanFromLegacyEnum(),
+      passwordManager: {
+        seats: passwordManagerSeats,
+        additionalStorage,
+        sponsored,
+      },
+      secretsManager: this.formGroup.value.secretsManager.enabled
+        ? {
+            seats: this.secretsManagerForm.value.userSeats,
+            additionalServiceAccounts: this.secretsManagerForm.value.additionalServiceAccounts,
+            standalone: false,
+          }
+        : undefined,
+    };
+  }
+
+  private async refreshSalesTax(): Promise<void> {
+    if (this.billingFormGroup.controls.billingAddress.invalid) {
       return;
     }
 
-    const request: PreviewOrganizationInvoiceRequest = {
-      organizationId: this.organizationId,
-      passwordManager: {
-        additionalStorage: this.formGroup.controls.additionalStorage.value,
-        plan: this.formGroup.controls.plan.value,
-        sponsoredPlan: this.planSponsorshipType,
-        seats: this.formGroup.controls.additionalSeats.value,
-      },
-      taxInformation: {
-        postalCode: this.taxInformation.postalCode,
-        country: this.taxInformation.country,
-        taxId: this.taxInformation.taxId,
-      },
-    };
+    const billingAddress = getBillingAddressFromForm(this.billingFormGroup.controls.billingAddress);
 
-    if (this.secretsManagerForm.controls.enabled.value === true) {
-      request.secretsManager = {
-        seats: this.secretsManagerForm.controls.userSeats.value,
-        additionalMachineAccounts: this.secretsManagerForm.controls.additionalServiceAccounts.value,
-      };
+    // should still be taxed. We mark the plan as NOT sponsored when there is additional storage
+    // so the server calculates tax, but we'll adjust the calculation to only tax the storage.
+    const hasPaidStorage = (this.formGroup.value.additionalStorage || 0) > 0;
+    const sponsoredForTaxPreview = this.acceptingSponsorship && !hasPaidStorage;
+
+    if (this.acceptingSponsorship && hasPaidStorage) {
+      // For sponsored plans with paid storage, calculate tax only on storage
+      // by comparing tax on base+storage vs tax on base only
+      //TODO: Move this logic to PreviewOrganizationTaxCommand - https://bitwarden.atlassian.net/browse/PM-27585
+      const [baseTaxAmounts, fullTaxAmounts] = await Promise.all([
+        this.taxClient.previewTaxForOrganizationSubscriptionPurchase(
+          this.buildTaxPreviewRequest(0, false),
+          billingAddress,
+        ),
+        this.taxClient.previewTaxForOrganizationSubscriptionPurchase(
+          this.buildTaxPreviewRequest(this.formGroup.value.additionalStorage, false),
+          billingAddress,
+        ),
+      ]);
+
+      // Tax on storage = Tax on (base + storage) - Tax on (base only)
+      this.estimatedTax = fullTaxAmounts.tax - baseTaxAmounts.tax;
+    } else {
+      const taxAmounts = await this.taxClient.previewTaxForOrganizationSubscriptionPurchase(
+        this.buildTaxPreviewRequest(this.formGroup.value.additionalStorage, sponsoredForTaxPreview),
+        billingAddress,
+      );
+
+      this.estimatedTax = taxAmounts.tax;
     }
 
-    this.taxService
-      .previewOrganizationInvoice(request)
-      .then((invoice) => {
-        this.estimatedTax = invoice.taxAmount;
-        this.total = invoice.totalAmount;
-      })
-      .catch((error) => {
-        this.toastService.showToast({
-          title: "",
-          variant: "error",
-          message: this.i18nService.t(error.message),
-        });
-      });
+    const subtotal =
+      this.passwordManagerSubtotal +
+      (this.planOffersSecretsManager && this.secretsManagerForm.value.enabled
+        ? this.secretsManagerSubtotal
+        : 0);
+    this.total = subtotal + this.estimatedTax;
   }
 
   private async updateOrganization() {
@@ -738,21 +815,24 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
       this.formGroup.controls.premiumAccessAddon.value;
     request.planType = this.selectedPlan.type;
-    request.billingAddressCountry = this.taxInformation?.country;
-    request.billingAddressPostalCode = this.taxInformation?.postalCode;
+    request.billingAddressCountry = this.billingFormGroup.value.billingAddress.country;
+    request.billingAddressPostalCode = this.billingFormGroup.value.billingAddress.postalCode;
 
     // Secrets Manager
     this.buildSecretsManagerRequest(request);
 
     if (this.upgradeRequiresPaymentMethod) {
-      const updatePaymentMethodRequest = new UpdatePaymentMethodRequest();
-      updatePaymentMethodRequest.paymentSource = await this.paymentComponent.tokenize();
-      updatePaymentMethodRequest.taxInformation = ExpandedTaxInfoUpdateRequest.From(
-        this.taxInformation,
-      );
-      await this.billingApiService.updateOrganizationPaymentMethod(
-        this.organizationId,
-        updatePaymentMethodRequest,
+      if (this.billingFormGroup.invalid) {
+        return;
+      }
+      const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+      await this.subscriberBillingClient.updatePaymentMethod(
+        { type: "organization", data: this.organization },
+        paymentMethod,
+        {
+          country: this.billingFormGroup.value.billingAddress.country,
+          postalCode: this.billingFormGroup.value.billingAddress.postalCode,
+        },
       );
     }
 
@@ -779,6 +859,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     collectionCt: string,
     orgKeys: [string, EncString],
     orgKey: SymmetricCryptoKey,
+    activeUserId: UserId,
   ): Promise<string> {
     const request = new OrganizationCreateRequest();
     request.key = key;
@@ -791,23 +872,31 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     if (this.selectedPlan.type === PlanType.Free) {
       request.planType = PlanType.Free;
     } else {
-      const { type, token } = await this.paymentComponent.tokenize();
+      if (this.billingFormGroup.invalid) {
+        return;
+      }
 
-      request.paymentToken = token;
-      request.paymentMethodType = type;
+      const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+
+      const billingAddress = getBillingAddressFromForm(
+        this.billingFormGroup.controls.billingAddress,
+      );
+
+      request.paymentToken = paymentMethod.token;
+      request.paymentMethodType = tokenizablePaymentMethodToLegacyEnum(paymentMethod.type);
       request.additionalSeats = this.formGroup.controls.additionalSeats.value;
       request.additionalStorageGb = this.formGroup.controls.additionalStorage.value;
       request.premiumAccessAddon =
         this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
         this.formGroup.controls.premiumAccessAddon.value;
       request.planType = this.selectedPlan.type;
-      request.billingAddressPostalCode = this.taxInformation?.postalCode;
-      request.billingAddressCountry = this.taxInformation?.country;
-      request.taxIdNumber = this.taxInformation?.taxId;
-      request.billingAddressLine1 = this.taxInformation?.line1;
-      request.billingAddressLine2 = this.taxInformation?.line2;
-      request.billingAddressCity = this.taxInformation?.city;
-      request.billingAddressState = this.taxInformation?.state;
+      request.billingAddressPostalCode = billingAddress.postalCode;
+      request.billingAddressCountry = billingAddress.country;
+      request.taxIdNumber = billingAddress.taxId?.value;
+      request.billingAddressLine1 = billingAddress.line1;
+      request.billingAddressLine2 = billingAddress.line2;
+      request.billingAddressCity = billingAddress.city;
+      request.billingAddressState = billingAddress.state;
     }
 
     // Secrets Manager
@@ -818,7 +907,14 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         this.formGroup.controls.clientOwnerEmail.value,
         request,
       );
-      const providerKey = await this.keyService.getProviderKey(this.providerId);
+
+      const providerKey = await firstValueFrom(
+        this.keyService
+          .providerKeys$(activeUserId)
+          .pipe(map((providerKeys) => providerKeys?.[this.providerId as ProviderId] ?? null)),
+      );
+      assertNonNullish(providerKey, "Provider key not found");
+
       providerRequest.organizationCreateRequest.key = (
         await this.encryptService.wrapSymmetricKey(orgKey, providerKey)
       ).encryptedString;
@@ -900,7 +996,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     if (this.currentPlan && this.currentPlan.productTier !== ProductTierType.Enterprise) {
       const upgradedPlan = this.passwordManagerPlans.find((plan) => {
         if (this.currentPlan.productTier === ProductTierType.Free) {
-          return plan.type === PlanType.FamiliesAnnually;
+          return plan.type === this._familyPlan;
         }
 
         if (
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index 5fa10c4c87c..0666cca2c4b 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -223,7 +223,7 @@
       <h2 bitTypography="h2">{{ "manageSubscription" | i18n }}</h2>
       <p bitTypography="body1" *ngIf="userOrg.isProviderUser; else isOrganizationOwner">
         {{ "manageSubscriptionFromThe" | i18n }}
-        <a [routerLink]="['/providers', userOrg.providerId, 'manage-client-organizations']">{{
+        <a [routerLink]="['/providers', userOrg.providerId, 'billing', 'subscription']">{{
           "providerPortal" | i18n
         }}</a
         >.
@@ -241,7 +241,7 @@
         <div class="tw-size-56 tw-content-center">
           <bit-icon [icon]="gearIcon" aria-hidden="true"></bit-icon>
         </div>
-        <p class="tw-font-bold">{{ "billingManagedByProvider" | i18n: userOrg.providerName }}</p>
+        <p class="tw-font-medium">{{ "billingManagedByProvider" | i18n: userOrg.providerName }}</p>
         <p>{{ "billingContactProviderForAssistance" | i18n }}</p>
       </div>
     </ng-template>
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 6bb262152ed..e0c1a12a80f 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -42,6 +42,8 @@ import { ChangePlanDialogResultType, openChangePlanDialog } from "./change-plan-
 import { DownloadLicenceDialogComponent } from "./download-license.component";
 import { SecretsManagerSubscriptionOptions } from "./sm-adjust-subscription.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "organization-subscription-cloud.component.html",
   standalone: false,
@@ -148,19 +150,17 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
     const isResoldOrganizationOwner = this.userOrg.hasReseller && this.userOrg.isOwner;
     const isMSPUser = this.userOrg.hasProvider && this.userOrg.isProviderUser;
 
-    const metadata = await this.billingApiService.getOrganizationBillingMetadata(
-      this.organizationId,
-    );
-
     this.organizationIsManagedByConsolidatedBillingMSP =
-      this.userOrg.hasProvider && metadata.isManaged;
+      this.userOrg.hasProvider && this.userOrg.hasBillableProvider;
 
     this.showSubscription =
       isIndependentOrganizationOwner ||
       isResoldOrganizationOwner ||
       (isMSPUser && !this.organizationIsManagedByConsolidatedBillingMSP);
 
-    this.showSelfHost = metadata.isEligibleForSelfHost;
+    this.showSelfHost =
+      this.userOrg.productTierType === ProductTierType.Families ||
+      this.userOrg.productTierType === ProductTierType.Enterprise;
 
     if (this.showSubscription) {
       this.sub = await this.organizationApiService.getSubscription(this.organizationId);
@@ -300,6 +300,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
       return this.i18nService.t("subscriptionFreePlan", this.sub.seats.toString());
     } else if (
       this.sub.planType === PlanType.FamiliesAnnually ||
+      this.sub.planType === PlanType.FamiliesAnnually2025 ||
       this.sub.planType === PlanType.FamiliesAnnually2019 ||
       this.sub.planType === PlanType.TeamsStarter2023 ||
       this.sub.planType === PlanType.TeamsStarter
@@ -343,6 +344,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
       data: {
         type: "Organization",
         id: this.organizationId,
+        plan: this.sub.plan.type,
       },
     });
 
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
index 1c823ed76cc..d4828e359b9 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
@@ -130,7 +130,7 @@
           <bit-label class="tw-mb-6 tw-block" *ngIf="!showAutomaticSyncAndManualUpload">
             {{ "licenseAndBillingManagementDesc" | i18n }}
           </bit-label>
-          <h3 *ngIf="showAutomaticSyncAndManualUpload" class="tw-font-semibold tw-mt-6">
+          <h3 *ngIf="showAutomaticSyncAndManualUpload" class="tw-font-medium tw-mt-6">
             {{ "uploadLicense" | i18n }}
           </h3>
           <app-update-license
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts
index fa4b633cb7a..905e682ceca 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts
@@ -34,6 +34,8 @@ enum LicenseOptions {
   UPLOAD = 1,
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "organization-subscription-selfhost.component.html",
   standalone: false,
diff --git a/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.ts b/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.ts
index 47742ba0a88..9609160089b 100644
--- a/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.ts
+++ b/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.ts
@@ -1,15 +1,11 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import { ActivatedRoute } from "@angular/router";
 import {
   BehaviorSubject,
-  catchError,
   combineLatest,
-  EMPTY,
   filter,
   firstValueFrom,
-  from,
   lastValueFrom,
-  map,
   merge,
   Observable,
   of,
@@ -22,15 +18,13 @@ import {
   withLatestFrom,
 } from "rxjs";
 
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 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 { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { getById } from "@bitwarden/common/platform/misc";
 import { DialogService } from "@bitwarden/components";
 import { CommandDefinition, MessageListener } from "@bitwarden/messaging";
 import { SubscriberBillingClient } from "@bitwarden/web-vault/app/billing/clients";
@@ -54,13 +48,6 @@ import { TaxIdWarningType } from "@bitwarden/web-vault/app/billing/warnings/type
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-class RedirectError {
-  constructor(
-    public path: string[],
-    public relativeTo: ActivatedRoute,
-  ) {}
-}
-
 type View = {
   organization: BitwardenSubscriber;
   paymentMethod: MaskedPaymentMethod | null;
@@ -73,6 +60,8 @@ const BANK_ACCOUNT_VERIFIED_COMMAND = new CommandDefinition<{ organizationId: st
   "organizationBankAccountVerified",
 );
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./organization-payment-details.component.html",
   standalone: true,
@@ -93,24 +82,12 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {
     switchMap((userId) =>
       this.organizationService
         .organizations$(userId)
-        .pipe(getOrganizationById(this.activatedRoute.snapshot.params.organizationId)),
+        .pipe(getById(this.activatedRoute.snapshot.params.organizationId)),
     ),
     filter((organization): organization is Organization => !!organization),
   );
 
   private load$: Observable<View> = this.organization$.pipe(
-    switchMap((organization) =>
-      this.configService
-        .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
-        .pipe(
-          map((managePaymentDetailsOutsideCheckout) => {
-            if (!managePaymentDetailsOutsideCheckout) {
-              throw new RedirectError(["../payment-method"], this.activatedRoute);
-            }
-            return organization;
-          }),
-        ),
-    ),
     mapOrganizationToSubscriber,
     switchMap(async (organization) => {
       const getTaxIdWarning = firstValueFrom(
@@ -132,14 +109,6 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {
         taxIdWarning,
       };
     }),
-    catchError((error: unknown) => {
-      if (error instanceof RedirectError) {
-        return from(this.router.navigate(error.path, { relativeTo: error.relativeTo })).pipe(
-          switchMap(() => EMPTY),
-        );
-      }
-      throw error;
-    }),
   );
 
   view$: Observable<View> = merge(
@@ -159,7 +128,6 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {
     private messageListener: MessageListener,
     private organizationService: OrganizationService,
     private organizationWarningsService: OrganizationWarningsService,
-    private router: Router,
     private subscriberBillingClient: SubscriberBillingClient,
   ) {}
 
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
deleted file mode 100644
index ab31147e916..00000000000
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<app-header></app-header>
-<bit-container>
-  <ng-container *ngIf="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>
-  <ng-container *ngIf="!loading">
-    <!-- Account Credit -->
-    <bit-section>
-      <h2 bitTypography="h2">
-        {{ accountCreditHeaderText }}
-      </h2>
-      <p class="tw-text-lg tw-font-bold">{{ Math.abs(accountCredit) | currency: "$" }}</p>
-      <p bitTypography="body1">{{ "creditAppliedDesc" | i18n }}</p>
-      <button type="button" bitButton buttonType="secondary" [bitAction]="addAccountCredit">
-        {{ "addCredit" | i18n }}
-      </button>
-    </bit-section>
-    <!-- Payment Method -->
-    <bit-section>
-      <h2 bitTypography="h2">{{ "paymentMethod" | i18n }}</h2>
-      <p *ngIf="!paymentSource" bitTypography="body1">{{ "noPaymentMethod" | i18n }}</p>
-      <ng-container *ngIf="paymentSource">
-        <app-verify-bank-account
-          *ngIf="paymentSource.needsVerification"
-          [onSubmit]="verifyBankAccount"
-          (submitted)="load()"
-        >
-        </app-verify-bank-account>
-        <p>
-          <i class="bwi bwi-fw" [ngClass]="paymentSourceClasses"></i>
-          {{ paymentSource.description }}
-          <span *ngIf="paymentSource.needsVerification">- {{ "unverified" | i18n }}</span>
-        </p>
-      </ng-container>
-      <button type="button" bitButton buttonType="secondary" [bitAction]="updatePaymentMethod">
-        {{ updatePaymentSourceButtonText }}
-      </button>
-      <p *ngIf="subscriptionIsUnpaid" bitTypography="body1">
-        {{ "paymentChargedWithUnpaidSubscription" | i18n }}
-      </p>
-    </bit-section>
-  </ng-container>
-</bit-container>
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
deleted file mode 100644
index 4106ee4f9cd..00000000000
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-import { Location } from "@angular/common";
-import { Component, OnDestroy } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute, Router } from "@angular/router";
-import { combineLatest, firstValueFrom, from, lastValueFrom, map, switchMap } from "rxjs";
-
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import {
-  OrganizationService,
-  getOrganizationById,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
-import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
-import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
-import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SyncService } from "@bitwarden/common/platform/sync";
-import { DialogService, ToastService } from "@bitwarden/components";
-
-import { BillingNotificationService } from "../../services/billing-notification.service";
-import {
-  AddCreditDialogResult,
-  openAddCreditDialog,
-} from "../../shared/add-credit-dialog.component";
-import {
-  AdjustPaymentDialogComponent,
-  AdjustPaymentDialogResultType,
-} from "../../shared/adjust-payment-dialog/adjust-payment-dialog.component";
-import {
-  TRIAL_PAYMENT_METHOD_DIALOG_RESULT_TYPE,
-  TrialPaymentDialogComponent,
-} from "../../shared/trial-payment-dialog/trial-payment-dialog.component";
-
-@Component({
-  templateUrl: "./organization-payment-method.component.html",
-  standalone: false,
-})
-export class OrganizationPaymentMethodComponent implements OnDestroy {
-  organizationId!: string;
-  isUnpaid = false;
-  accountCredit?: number;
-  paymentSource?: PaymentSourceResponse;
-  subscriptionStatus?: string;
-  organization?: Organization;
-  organizationSubscriptionResponse?: OrganizationSubscriptionResponse;
-
-  loading = true;
-
-  protected readonly Math = Math;
-  launchPaymentModalAutomatically = false;
-
-  protected taxInformation?: TaxInformation;
-
-  constructor(
-    private activatedRoute: ActivatedRoute,
-    private billingApiService: BillingApiServiceAbstraction,
-    protected organizationApiService: OrganizationApiServiceAbstraction,
-    private dialogService: DialogService,
-    private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
-    private router: Router,
-    private toastService: ToastService,
-    private location: Location,
-    private organizationService: OrganizationService,
-    private accountService: AccountService,
-    protected syncService: SyncService,
-    private billingNotificationService: BillingNotificationService,
-    private configService: ConfigService,
-  ) {
-    combineLatest([
-      this.activatedRoute.params,
-      this.configService.getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout),
-    ])
-      .pipe(
-        switchMap(([{ organizationId }, managePaymentDetailsOutsideCheckout]) => {
-          if (this.platformUtilsService.isSelfHost()) {
-            return from(this.router.navigate(["/settings/subscription"]));
-          }
-
-          if (managePaymentDetailsOutsideCheckout) {
-            return from(
-              this.router.navigate(["../payment-details"], { relativeTo: this.activatedRoute }),
-            );
-          }
-
-          this.organizationId = organizationId;
-          return from(this.load());
-        }),
-        takeUntilDestroyed(),
-      )
-      .subscribe();
-
-    const state = this.router.getCurrentNavigation()?.extras?.state;
-    // In case the above state is undefined or null, we use redundantState
-    const redundantState: any = location.getState();
-    const queryParam = this.activatedRoute.snapshot.queryParamMap.get(
-      "launchPaymentModalAutomatically",
-    );
-    if (state && Object.prototype.hasOwnProperty.call(state, "launchPaymentModalAutomatically")) {
-      this.launchPaymentModalAutomatically = state.launchPaymentModalAutomatically;
-    } else if (
-      redundantState &&
-      Object.prototype.hasOwnProperty.call(redundantState, "launchPaymentModalAutomatically")
-    ) {
-      this.launchPaymentModalAutomatically = redundantState.launchPaymentModalAutomatically;
-    } else {
-      this.launchPaymentModalAutomatically = queryParam === "true";
-    }
-  }
-  ngOnDestroy(): void {
-    this.launchPaymentModalAutomatically = false;
-  }
-
-  protected addAccountCredit = async (): Promise<void> => {
-    if (this.subscriptionStatus === "trialing") {
-      const hasValidBillingAddress = await this.checkBillingAddressForTrialingOrg();
-      if (!hasValidBillingAddress) {
-        return;
-      }
-    }
-    const dialogRef = openAddCreditDialog(this.dialogService, {
-      data: {
-        organizationId: this.organizationId,
-      },
-    });
-
-    const result = await lastValueFrom(dialogRef.closed);
-
-    if (result === AddCreditDialogResult.Added) {
-      await this.load();
-    }
-  };
-
-  protected load = async (): Promise<void> => {
-    this.loading = true;
-    try {
-      const { accountCredit, paymentSource, subscriptionStatus, taxInformation } =
-        await this.billingApiService.getOrganizationPaymentMethod(this.organizationId);
-      this.accountCredit = accountCredit;
-      this.paymentSource = paymentSource;
-      this.subscriptionStatus = subscriptionStatus;
-      this.taxInformation = taxInformation;
-      this.isUnpaid = this.subscriptionStatus === "unpaid";
-
-      if (this.organizationId) {
-        const organizationSubscriptionPromise = this.organizationApiService.getSubscription(
-          this.organizationId,
-        );
-
-        const userId = await firstValueFrom(
-          this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-        );
-
-        if (!userId) {
-          throw new Error("User ID is not found");
-        }
-
-        const organizationPromise = await firstValueFrom(
-          this.organizationService
-            .organizations$(userId)
-            .pipe(getOrganizationById(this.organizationId)),
-        );
-
-        [this.organizationSubscriptionResponse, this.organization] = await Promise.all([
-          organizationSubscriptionPromise,
-          organizationPromise,
-        ]);
-
-        if (!this.organization) {
-          throw new Error("Organization is not found");
-        }
-        if (!this.paymentSource) {
-          throw new Error("Payment source is not found");
-        }
-      }
-      // If the flag `launchPaymentModalAutomatically` is set to true,
-      // we schedule a timeout (delay of 800ms) to automatically launch the payment modal.
-      // This delay ensures that any prior UI/rendering operations complete before triggering the modal.
-      if (this.launchPaymentModalAutomatically) {
-        window.setTimeout(async () => {
-          await this.changePayment();
-          this.launchPaymentModalAutomatically = false;
-          this.location.replaceState(this.location.path(), "", {});
-        }, 800);
-      }
-    } catch (error) {
-      this.billingNotificationService.handleError(error);
-    } finally {
-      this.loading = false;
-    }
-  };
-
-  protected updatePaymentMethod = async (): Promise<void> => {
-    const dialogRef = AdjustPaymentDialogComponent.open(this.dialogService, {
-      data: {
-        initialPaymentMethod: this.paymentSource?.type,
-        organizationId: this.organizationId,
-        productTier: this.organization?.productTierType,
-      },
-    });
-
-    const result = await lastValueFrom(dialogRef.closed);
-
-    if (result === AdjustPaymentDialogResultType.Submitted) {
-      await this.load();
-    }
-  };
-
-  changePayment = async () => {
-    const dialogRef = TrialPaymentDialogComponent.open(this.dialogService, {
-      data: {
-        organizationId: this.organizationId,
-        subscription: this.organizationSubscriptionResponse!,
-        productTierType: this.organization!.productTierType,
-      },
-    });
-    const result = await lastValueFrom(dialogRef.closed);
-    if (result === TRIAL_PAYMENT_METHOD_DIALOG_RESULT_TYPE.SUBMITTED) {
-      this.location.replaceState(this.location.path(), "", {});
-      if (this.launchPaymentModalAutomatically && !this.organization?.enabled) {
-        await this.syncService.fullSync(true);
-      }
-      this.launchPaymentModalAutomatically = false;
-      await this.load();
-    }
-  };
-
-  protected verifyBankAccount = async (request: VerifyBankAccountRequest): Promise<void> => {
-    await this.billingApiService.verifyOrganizationBankAccount(this.organizationId, request);
-    this.toastService.showToast({
-      variant: "success",
-      title: "",
-      message: this.i18nService.t("verifiedBankAccount"),
-    });
-  };
-
-  protected get accountCreditHeaderText(): string {
-    const hasAccountCredit = this.accountCredit && this.accountCredit > 0;
-    const key = hasAccountCredit ? "accountCredit" : "accountBalance";
-    return this.i18nService.t(key);
-  }
-
-  protected get paymentSourceClasses() {
-    if (this.paymentSource == null) {
-      return [];
-    }
-    switch (this.paymentSource.type) {
-      case PaymentMethodType.Card:
-        return ["bwi-credit-card"];
-      case PaymentMethodType.BankAccount:
-      case PaymentMethodType.Check:
-        return ["bwi-billing"];
-      case PaymentMethodType.PayPal:
-        return ["bwi-paypal text-primary"];
-      default:
-        return [];
-    }
-  }
-
-  protected get subscriptionIsUnpaid(): boolean {
-    return this.subscriptionStatus === "unpaid";
-  }
-
-  protected get updatePaymentSourceButtonText(): string {
-    const key = this.paymentSource == null ? "addPaymentMethod" : "changePaymentMethod";
-    return this.i18nService.t(key);
-  }
-
-  private async checkBillingAddressForTrialingOrg(): Promise<boolean> {
-    const hasBillingAddress = this.taxInformation != null;
-    if (!hasBillingAddress) {
-      this.toastService.showToast({
-        variant: "error",
-        title: "",
-        message: this.i18nService.t("billingAddressRequiredToAddCredit"),
-      });
-      return false;
-    }
-    return true;
-  }
-}
diff --git a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts
index 33413832865..5fa6971bac6 100644
--- a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts
+++ b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts
@@ -56,14 +56,22 @@ export interface SecretsManagerSubscriptionOptions {
   additionalServiceAccountPrice: number;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-sm-adjust-subscription",
   templateUrl: "sm-adjust-subscription.component.html",
   standalone: false,
 })
 export class SecretsManagerAdjustSubscriptionComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationId: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() options: SecretsManagerSubscriptionOptions;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAdjusted = new EventEmitter();
 
   private destroy$ = new Subject<void>();
diff --git a/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts
index 6f9525e4fce..1ef705fd4bd 100644
--- a/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts
+++ b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts
@@ -20,15 +20,25 @@ import { ToastService } from "@bitwarden/components";
 
 import { secretsManagerSubscribeFormFactory } from "../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-subscribe-standalone",
   templateUrl: "sm-subscribe-standalone.component.html",
   standalone: false,
 })
 export class SecretsManagerSubscribeStandaloneComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() plan: PlanResponse;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organization: Organization;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() customerDiscount: BillingCustomerDiscount;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSubscribe = new EventEmitter<void>();
 
   formGroup = secretsManagerSubscribeFormFactory(this.formBuilder);
diff --git a/apps/web/src/app/billing/organizations/subscription-hidden.component.ts b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
index cca12e938d2..ef6e2dd0495 100644
--- a/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
+++ b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
@@ -4,18 +4,22 @@ import { Component, Input } from "@angular/core";
 
 import { GearIcon } from "@bitwarden/assets/svg";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-subscription-hidden",
   template: `<div class="tw-flex tw-flex-col tw-items-center tw-text-info">
     <div class="tw-size-56 tw-content-center">
       <bit-icon [icon]="gearIcon" aria-hidden="true"></bit-icon>
     </div>
-    <p class="tw-font-bold">{{ "billingManagedByProvider" | i18n: providerName }}</p>
+    <p class="tw-font-medium">{{ "billingManagedByProvider" | i18n: providerName }}</p>
     <p>{{ "billingContactProviderForAssistance" | i18n }}</p>
   </div>`,
   standalone: false,
 })
 export class SubscriptionHiddenComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() providerName: string;
   gearIcon = GearIcon;
 }
diff --git a/apps/web/src/app/billing/organizations/subscription-status.component.ts b/apps/web/src/app/billing/organizations/subscription-status.component.ts
index 0b59df3f707..54a309a441b 100644
--- a/apps/web/src/app/billing/organizations/subscription-status.component.ts
+++ b/apps/web/src/app/billing/organizations/subscription-status.component.ts
@@ -23,13 +23,19 @@ type ComponentData = {
   };
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-subscription-status",
   templateUrl: "subscription-status.component.html",
   standalone: false,
 })
 export class SubscriptionStatusComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) organizationSubscriptionResponse: OrganizationSubscriptionResponse;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() reinstatementRequested = new EventEmitter<void>();
 
   constructor(
diff --git a/apps/web/src/app/billing/organizations/warnings/components/organization-free-trial-warning.component.ts b/apps/web/src/app/billing/organizations/warnings/components/organization-free-trial-warning.component.ts
index 8390e432236..debac3cb2f7 100644
--- a/apps/web/src/app/billing/organizations/warnings/components/organization-free-trial-warning.component.ts
+++ b/apps/web/src/app/billing/organizations/warnings/components/organization-free-trial-warning.component.ts
@@ -8,6 +8,8 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
 import { OrganizationWarningsService } from "../services";
 import { OrganizationFreeTrialWarning } from "../types";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-organization-free-trial-warning",
   template: `
@@ -36,8 +38,14 @@ import { OrganizationFreeTrialWarning } from "../types";
   imports: [BannerModule, SharedModule],
 })
 export class OrganizationFreeTrialWarningComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) organization!: Organization;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() includeOrganizationNameInMessaging = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() clicked = new EventEmitter<void>();
 
   warning$!: Observable<OrganizationFreeTrialWarning | null>;
diff --git a/apps/web/src/app/billing/organizations/warnings/components/organization-reseller-renewal-warning.component.ts b/apps/web/src/app/billing/organizations/warnings/components/organization-reseller-renewal-warning.component.ts
index c49f59f6b05..e9850b55c9e 100644
--- a/apps/web/src/app/billing/organizations/warnings/components/organization-reseller-renewal-warning.component.ts
+++ b/apps/web/src/app/billing/organizations/warnings/components/organization-reseller-renewal-warning.component.ts
@@ -8,6 +8,8 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
 import { OrganizationWarningsService } from "../services";
 import { OrganizationResellerRenewalWarning } from "../types";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-organization-reseller-renewal-warning",
   template: `
@@ -27,6 +29,8 @@ import { OrganizationResellerRenewalWarning } from "../types";
   imports: [BannerModule, SharedModule],
 })
 export class OrganizationResellerRenewalWarningComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) organization!: Organization;
 
   warning$!: Observable<OrganizationResellerRenewalWarning | null>;
diff --git a/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts b/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts
index c7a297cc28b..9466e813e4d 100644
--- a/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts
+++ b/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.spec.ts
@@ -15,9 +15,8 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogRef, DialogService } from "@bitwarden/components";
 import { OrganizationBillingClient } from "@bitwarden/web-vault/app/billing/clients";
 import {
@@ -35,11 +34,11 @@ import { TaxIdWarningTypes } from "@bitwarden/web-vault/app/billing/warnings/typ
 
 describe("OrganizationWarningsService", () => {
   let service: OrganizationWarningsService;
-  let configService: MockProxy<ConfigService>;
   let dialogService: MockProxy<DialogService>;
   let i18nService: MockProxy<I18nService>;
   let organizationApiService: MockProxy<OrganizationApiServiceAbstraction>;
   let organizationBillingClient: MockProxy<OrganizationBillingClient>;
+  let platformUtilsService: MockProxy<PlatformUtilsService>;
   let router: MockProxy<Router>;
 
   const organization = {
@@ -57,15 +56,17 @@ describe("OrganizationWarningsService", () => {
     });
 
   beforeEach(() => {
-    configService = mock<ConfigService>();
     dialogService = mock<DialogService>();
     i18nService = mock<I18nService>();
     organizationApiService = mock<OrganizationApiServiceAbstraction>();
     organizationBillingClient = mock<OrganizationBillingClient>();
+    platformUtilsService = mock<PlatformUtilsService>();
     router = mock<Router>();
 
     (openChangePlanDialog as jest.Mock).mockReset();
 
+    platformUtilsService.isSelfHost.mockReturnValue(false);
+
     i18nService.t.mockImplementation((key: string, ...args: any[]) => {
       switch (key) {
         case "freeTrialEndPromptCount":
@@ -94,11 +95,11 @@ describe("OrganizationWarningsService", () => {
     TestBed.configureTestingModule({
       providers: [
         OrganizationWarningsService,
-        { provide: ConfigService, useValue: configService },
         { provide: DialogService, useValue: dialogService },
         { provide: I18nService, useValue: i18nService },
         { provide: OrganizationApiServiceAbstraction, useValue: organizationApiService },
         { provide: OrganizationBillingClient, useValue: organizationBillingClient },
+        { provide: PlatformUtilsService, useValue: platformUtilsService },
         { provide: Router, useValue: router },
       ],
     });
@@ -116,6 +117,16 @@ describe("OrganizationWarningsService", () => {
       });
     });
 
+    it("should return null when platform is self-hosted", (done) => {
+      platformUtilsService.isSelfHost.mockReturnValue(true);
+
+      service.getFreeTrialWarning$(organization).subscribe((result) => {
+        expect(result).toBeNull();
+        expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
     it("should return warning with count message when remaining trial days >= 2", (done) => {
       const warning = { remainingTrialDays: 5 };
       organizationBillingClient.getWarnings.mockResolvedValue({
@@ -211,6 +222,16 @@ describe("OrganizationWarningsService", () => {
       });
     });
 
+    it("should return null when platform is self-hosted", (done) => {
+      platformUtilsService.isSelfHost.mockReturnValue(true);
+
+      service.getResellerRenewalWarning$(organization).subscribe((result) => {
+        expect(result).toBeNull();
+        expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
     it("should return upcoming warning with correct type and message", (done) => {
       const renewalDate = new Date(2024, 11, 31);
       const warning = {
@@ -303,6 +324,16 @@ describe("OrganizationWarningsService", () => {
       });
     });
 
+    it("should return null when platform is self-hosted", (done) => {
+      platformUtilsService.isSelfHost.mockReturnValue(true);
+
+      service.getTaxIdWarning$(organization).subscribe((result) => {
+        expect(result).toBeNull();
+        expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
     it("should return tax_id_missing type when tax ID is missing", (done) => {
       const warning = { type: TaxIdWarningTypes.Missing };
       organizationBillingClient.getWarnings.mockResolvedValue({
@@ -426,11 +457,19 @@ describe("OrganizationWarningsService", () => {
     it("should not show dialog when no inactive subscription warning exists", (done) => {
       organizationBillingClient.getWarnings.mockResolvedValue({} as OrganizationWarningsResponse);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
-        complete: () => {
-          expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
-          done();
-        },
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+        expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it("should not show dialog when platform is self-hosted", (done) => {
+      platformUtilsService.isSelfHost.mockReturnValue(true);
+
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+        expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+        expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+        done();
       });
     });
 
@@ -442,20 +481,18 @@ describe("OrganizationWarningsService", () => {
 
       dialogService.openSimpleDialog.mockResolvedValue(true);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
-        complete: () => {
-          expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
-            title: "Test Organization subscription suspended",
-            content: {
-              key: "suspendedManagedOrgMessage",
-              placeholders: ["Test Reseller Inc"],
-            },
-            type: "danger",
-            acceptButtonText: "Close",
-            cancelButtonText: null,
-          });
-          done();
-        },
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+        expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+          title: "Test Organization subscription suspended",
+          content: {
+            key: "suspendedManagedOrgMessage",
+            placeholders: ["Test Reseller Inc"],
+          },
+          type: "danger",
+          acceptButtonText: "Close",
+          cancelButtonText: null,
+        });
+        done();
       });
     });
 
@@ -466,27 +503,21 @@ describe("OrganizationWarningsService", () => {
       } as OrganizationWarningsResponse);
 
       dialogService.openSimpleDialog.mockResolvedValue(true);
-      configService.getFeatureFlag.mockResolvedValue(false);
       router.navigate.mockResolvedValue(true);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
-        complete: () => {
-          expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
-            title: "Test Organization subscription suspended",
-            content: { key: "suspendedOwnerOrgMessage" },
-            type: "danger",
-            acceptButtonText: "Continue",
-            cancelButtonText: "Close",
-          });
-          expect(configService.getFeatureFlag).toHaveBeenCalledWith(
-            FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-          );
-          expect(router.navigate).toHaveBeenCalledWith(
-            ["organizations", "org-id-123", "billing", "payment-method"],
-            { state: { launchPaymentModalAutomatically: true } },
-          );
-          done();
-        },
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+        expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+          title: "Test Organization subscription suspended",
+          content: { key: "suspendedOwnerOrgMessage" },
+          type: "danger",
+          acceptButtonText: "Continue",
+          cancelButtonText: "Close",
+        });
+        expect(router.navigate).toHaveBeenCalledWith(
+          ["organizations", "org-id-123", "billing", "payment-details"],
+          { state: { launchPaymentModalAutomatically: true } },
+        );
+        done();
       });
     });
 
@@ -497,17 +528,14 @@ describe("OrganizationWarningsService", () => {
       } as OrganizationWarningsResponse);
 
       dialogService.openSimpleDialog.mockResolvedValue(true);
-      configService.getFeatureFlag.mockResolvedValue(true);
       router.navigate.mockResolvedValue(true);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
-        complete: () => {
-          expect(router.navigate).toHaveBeenCalledWith(
-            ["organizations", "org-id-123", "billing", "payment-details"],
-            { state: { launchPaymentModalAutomatically: true } },
-          );
-          done();
-        },
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+        expect(router.navigate).toHaveBeenCalledWith(
+          ["organizations", "org-id-123", "billing", "payment-details"],
+          { state: { launchPaymentModalAutomatically: true } },
+        );
+        done();
       });
     });
 
@@ -519,13 +547,10 @@ describe("OrganizationWarningsService", () => {
 
       dialogService.openSimpleDialog.mockResolvedValue(false);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
-        complete: () => {
-          expect(dialogService.openSimpleDialog).toHaveBeenCalled();
-          expect(configService.getFeatureFlag).not.toHaveBeenCalled();
-          expect(router.navigate).not.toHaveBeenCalled();
-          done();
-        },
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+        expect(dialogService.openSimpleDialog).toHaveBeenCalled();
+        expect(router.navigate).not.toHaveBeenCalled();
+        done();
       });
     });
 
@@ -545,18 +570,16 @@ describe("OrganizationWarningsService", () => {
 
       (openChangePlanDialog as jest.Mock).mockReturnValue(mockDialogRef);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
-        complete: () => {
-          expect(organizationApiService.getSubscription).toHaveBeenCalledWith(organization.id);
-          expect(openChangePlanDialog).toHaveBeenCalledWith(dialogService, {
-            data: {
-              organizationId: organization.id,
-              subscription: subscription,
-              productTierType: organization.productTierType,
-            },
-          });
-          done();
-        },
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+        expect(organizationApiService.getSubscription).toHaveBeenCalledWith(organization.id);
+        expect(openChangePlanDialog).toHaveBeenCalledWith(dialogService, {
+          data: {
+            organizationId: organization.id,
+            subscription: subscription,
+            productTierType: organization.productTierType,
+          },
+        });
+        done();
       });
     });
 
@@ -568,17 +591,15 @@ describe("OrganizationWarningsService", () => {
 
       dialogService.openSimpleDialog.mockResolvedValue(true);
 
-      service.showInactiveSubscriptionDialog$(organization).subscribe({
-        complete: () => {
-          expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
-            title: "Test Organization subscription suspended",
-            content: { key: "suspendedUserOrgMessage" },
-            type: "danger",
-            acceptButtonText: "Close",
-            cancelButtonText: null,
-          });
-          done();
-        },
+      service.showInactiveSubscriptionDialog$(organization).subscribe(() => {
+        expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+          title: "Test Organization subscription suspended",
+          content: { key: "suspendedUserOrgMessage" },
+          type: "danger",
+          acceptButtonText: "Close",
+          cancelButtonText: null,
+        });
+        done();
       });
     });
   });
@@ -595,6 +616,18 @@ describe("OrganizationWarningsService", () => {
       });
     });
 
+    it("should not show dialog when platform is self-hosted", (done) => {
+      platformUtilsService.isSelfHost.mockReturnValue(true);
+
+      service.showSubscribeBeforeFreeTrialEndsDialog$(organization).subscribe({
+        complete: () => {
+          expect(organizationApiService.getSubscription).not.toHaveBeenCalled();
+          expect(organizationBillingClient.getWarnings).not.toHaveBeenCalled();
+          done();
+        },
+      });
+    });
+
     it("should open trial payment dialog when free trial warning exists", (done) => {
       const warning = { remainingTrialDays: 2 };
       const subscription = { id: "sub-123" } as OrganizationSubscriptionResponse;
diff --git a/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts b/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts
index c6bb1bc231b..a34533bcada 100644
--- a/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts
+++ b/apps/web/src/app/billing/organizations/warnings/services/organization-warnings.service.ts
@@ -8,6 +8,7 @@ import {
   map,
   merge,
   Observable,
+  of,
   Subject,
   switchMap,
   tap,
@@ -16,9 +17,8 @@ import { take } from "rxjs/operators";
 
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { DialogService } from "@bitwarden/components";
 import { OrganizationBillingClient } from "@bitwarden/web-vault/app/billing/clients";
@@ -48,16 +48,17 @@ export class OrganizationWarningsService {
 
   private refreshFreeTrialWarningTrigger = new Subject<void>();
   private refreshTaxIdWarningTrigger = new Subject<void>();
+  private refreshInactiveSubscriptionWarningTrigger = new Subject<void>();
 
   private taxIdWarningRefreshedSubject = new BehaviorSubject<TaxIdWarningType | null>(null);
   taxIdWarningRefreshed$ = this.taxIdWarningRefreshedSubject.asObservable();
 
   constructor(
-    private configService: ConfigService,
     private dialogService: DialogService,
     private i18nService: I18nService,
     private organizationApiService: OrganizationApiServiceAbstraction,
     private organizationBillingClient: OrganizationBillingClient,
+    private platformUtilsService: PlatformUtilsService,
     private router: Router,
   ) {}
 
@@ -167,12 +168,24 @@ export class OrganizationWarningsService {
 
   refreshFreeTrialWarning = () => this.refreshFreeTrialWarningTrigger.next();
 
+  refreshInactiveSubscriptionWarning = () => this.refreshInactiveSubscriptionWarningTrigger.next();
+
   refreshTaxIdWarning = () => this.refreshTaxIdWarningTrigger.next();
 
   showInactiveSubscriptionDialog$ = (organization: Organization): Observable<void> =>
-    this.getWarning$(organization, (response) => response.inactiveSubscription).pipe(
-      filter((warning) => warning !== null),
+    merge(
+      this.getWarning$(organization, (response) => response.inactiveSubscription),
+      this.refreshInactiveSubscriptionWarningTrigger.pipe(
+        switchMap(() =>
+          this.getWarning$(organization, (response) => response.inactiveSubscription, true),
+        ),
+      ),
+    ).pipe(
       switchMap(async (warning) => {
+        if (!warning) {
+          return;
+        }
+
         switch (warning.resolution) {
           case "contact_provider": {
             await this.dialogService.openSimpleDialog({
@@ -196,14 +209,8 @@ export class OrganizationWarningsService {
               cancelButtonText: this.i18nService.t("close"),
             });
             if (confirmed) {
-              const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-                FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-              );
-              const route = managePaymentDetailsOutsideCheckout
-                ? "payment-details"
-                : "payment-method";
               await this.router.navigate(
-                ["organizations", `${organization.id}`, "billing", route],
+                ["organizations", `${organization.id}`, "billing", "payment-details"],
                 {
                   state: { launchPaymentModalAutomatically: true },
                 },
@@ -277,12 +284,17 @@ export class OrganizationWarningsService {
     organization: Organization,
     extract: (response: OrganizationWarningsResponse) => T | null | undefined,
     bypassCache: boolean = false,
-  ): Observable<T | null> =>
-    this.readThroughWarnings$(organization, bypassCache).pipe(
+  ): Observable<T | null> => {
+    if (this.platformUtilsService.isSelfHost()) {
+      return of(null);
+    }
+
+    return this.readThroughWarnings$(organization, bypassCache).pipe(
       map((response) => {
         const value = extract(response);
         return value ? value : null;
       }),
       take(1),
     );
+  };
 }
diff --git a/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts b/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts
index a83a00e8158..1ba1536ff36 100644
--- a/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts
+++ b/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts
@@ -52,11 +52,13 @@ const positiveNumberValidator =
     return null;
   };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <form [formGroup]="formGroup" [bitSubmit]="submit">
       <bit-dialog>
-        <span bitDialogTitle class="tw-font-semibold">
+        <span bitDialogTitle class="tw-font-medium">
           {{ "addCredit" | i18n }}
         </span>
         <div bitDialogContent>
@@ -128,6 +130,8 @@ const positiveNumberValidator =
   providers: [SubscriberBillingClient],
 })
 export class AddAccountCreditDialogComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("payPalForm", { read: ElementRef, static: true }) payPalForm!: ElementRef;
 
   protected payPalConfig = process.env.PAYPAL_CONFIG as PayPalConfig;
diff --git a/apps/web/src/app/billing/payment/components/change-payment-method-dialog.component.ts b/apps/web/src/app/billing/payment/components/change-payment-method-dialog.component.ts
index 4d2fadaa894..756f7281049 100644
--- a/apps/web/src/app/billing/payment/components/change-payment-method-dialog.component.ts
+++ b/apps/web/src/app/billing/payment/components/change-payment-method-dialog.component.ts
@@ -18,11 +18,13 @@ type DialogParams = {
   subscriber: BitwardenSubscriber;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <form [formGroup]="formGroup" [bitSubmit]="submit">
       <bit-dialog>
-        <span bitDialogTitle class="tw-font-semibold">
+        <span bitDialogTitle class="tw-font-medium">
           {{ "changePaymentMethod" | i18n }}
         </span>
         <div bitDialogContent>
diff --git a/apps/web/src/app/billing/payment/components/display-account-credit.component.ts b/apps/web/src/app/billing/payment/components/display-account-credit.component.ts
index f6aa0ef58bb..b4684f0d739 100644
--- a/apps/web/src/app/billing/payment/components/display-account-credit.component.ts
+++ b/apps/web/src/app/billing/payment/components/display-account-credit.component.ts
@@ -10,6 +10,8 @@ import { BitwardenSubscriber } from "../../types";
 
 import { AddAccountCreditDialogComponent } from "./add-account-credit-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-display-account-credit",
   template: `
@@ -26,7 +28,11 @@ import { AddAccountCreditDialogComponent } from "./add-account-credit-dialog.com
   providers: [SubscriberBillingClient, CurrencyPipe],
 })
 export class DisplayAccountCreditComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) subscriber!: BitwardenSubscriber;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) credit!: number | null;
 
   constructor(
diff --git a/apps/web/src/app/billing/payment/components/display-billing-address.component.ts b/apps/web/src/app/billing/payment/components/display-billing-address.component.ts
index 03d21a79003..2c5b7986c7b 100644
--- a/apps/web/src/app/billing/payment/components/display-billing-address.component.ts
+++ b/apps/web/src/app/billing/payment/components/display-billing-address.component.ts
@@ -12,6 +12,8 @@ import {
 } from "@bitwarden/web-vault/app/billing/warnings/types";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-display-billing-address",
   template: `
@@ -48,9 +50,17 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
   imports: [AddressPipe, SharedModule],
 })
 export class DisplayBillingAddressComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) subscriber!: BitwardenSubscriber;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) billingAddress!: BillingAddress | null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() taxIdWarning?: TaxIdWarningType;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() updated = new EventEmitter<BillingAddress>();
 
   constructor(private dialogService: DialogService) {}
diff --git a/apps/web/src/app/billing/payment/components/display-payment-method.component.ts b/apps/web/src/app/billing/payment/components/display-payment-method.component.ts
index c33d805aed7..c5ffa4268ed 100644
--- a/apps/web/src/app/billing/payment/components/display-payment-method.component.ts
+++ b/apps/web/src/app/billing/payment/components/display-payment-method.component.ts
@@ -5,10 +5,12 @@ import { DialogService } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared";
 import { BitwardenSubscriber } from "../../types";
-import { MaskedPaymentMethod } from "../types";
+import { getCardBrandIcon, MaskedPaymentMethod } from "../types";
 
 import { ChangePaymentMethodDialogComponent } from "./change-payment-method-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-display-payment-method",
   template: `
@@ -40,9 +42,9 @@ import { ChangePaymentMethodDialogComponent } from "./change-payment-method-dial
           }
           @case ("card") {
             <p class="tw-flex tw-items-center tw-gap-2">
-              @let brandIcon = getBrandIconForCard();
-              @if (brandIcon !== null) {
-                <i class="bwi bwi-fw credit-card-icon {{ brandIcon }}"></i>
+              @let cardBrandIcon = getCardBrandIcon();
+              @if (cardBrandIcon !== null) {
+                <i class="bwi bwi-fw credit-card-icon {{ cardBrandIcon }}"></i>
               } @else {
                 <i class="bwi bwi-fw bwi-credit-card"></i>
               }
@@ -70,20 +72,16 @@ import { ChangePaymentMethodDialogComponent } from "./change-payment-method-dial
   imports: [SharedModule],
 })
 export class DisplayPaymentMethodComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) subscriber!: BitwardenSubscriber;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) paymentMethod!: MaskedPaymentMethod | null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() updated = new EventEmitter<MaskedPaymentMethod>();
 
-  protected availableCardIcons: Record<string, string> = {
-    amex: "card-amex",
-    diners: "card-diners-club",
-    discover: "card-discover",
-    jcb: "card-jcb",
-    mastercard: "card-mastercard",
-    unionpay: "card-unionpay",
-    visa: "card-visa",
-  };
-
   constructor(private dialogService: DialogService) {}
 
   changePaymentMethod = async (): Promise<void> => {
@@ -100,13 +98,5 @@ export class DisplayPaymentMethodComponent {
     }
   };
 
-  protected getBrandIconForCard = (): string | null => {
-    if (this.paymentMethod?.type !== "card") {
-      return null;
-    }
-
-    return this.paymentMethod.brand in this.availableCardIcons
-      ? this.availableCardIcons[this.paymentMethod.brand]
-      : null;
-  };
+  protected getCardBrandIcon = () => getCardBrandIcon(this.paymentMethod);
 }
diff --git a/apps/web/src/app/billing/payment/components/edit-billing-address-dialog.component.ts b/apps/web/src/app/billing/payment/components/edit-billing-address-dialog.component.ts
index de2f2f94497..3ac7cbd8702 100644
--- a/apps/web/src/app/billing/payment/components/edit-billing-address-dialog.component.ts
+++ b/apps/web/src/app/billing/payment/components/edit-billing-address-dialog.component.ts
@@ -11,10 +11,7 @@ import {
   ToastService,
 } from "@bitwarden/components";
 import { SubscriberBillingClient } from "@bitwarden/web-vault/app/billing/clients";
-import {
-  BillingAddress,
-  getTaxIdTypeForCountry,
-} from "@bitwarden/web-vault/app/billing/payment/types";
+import { BillingAddress } from "@bitwarden/web-vault/app/billing/payment/types";
 import { BitwardenSubscriber } from "@bitwarden/web-vault/app/billing/types";
 import {
   TaxIdWarningType,
@@ -22,7 +19,10 @@ import {
 } from "@bitwarden/web-vault/app/billing/warnings/types";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-import { EnterBillingAddressComponent } from "./enter-billing-address.component";
+import {
+  EnterBillingAddressComponent,
+  getBillingAddressFromForm,
+} from "./enter-billing-address.component";
 
 type DialogParams = {
   subscriber: BitwardenSubscriber;
@@ -35,11 +35,13 @@ type DialogResult =
   | { type: "error" }
   | { type: "success"; billingAddress: BillingAddress };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <form [formGroup]="formGroup" [bitSubmit]="submit">
       <bit-dialog>
-        <span bitDialogTitle class="tw-font-semibold">
+        <span bitDialogTitle class="tw-font-medium">
           {{ "editBillingAddress" | i18n }}
         </span>
         <div bitDialogContent>
@@ -104,13 +106,7 @@ export class EditBillingAddressDialogComponent {
       return;
     }
 
-    const { taxId, ...addressFields } = this.formGroup.getRawValue();
-
-    const taxIdType = taxId ? getTaxIdTypeForCountry(addressFields.country) : null;
-
-    const billingAddress = taxIdType
-      ? { ...addressFields, taxId: { code: taxIdType.code, value: taxId! } }
-      : { ...addressFields, taxId: null };
+    const billingAddress = getBillingAddressFromForm(this.formGroup);
 
     const result = await this.billingClient.updateBillingAddress(
       this.dialogParams.subscriber,
diff --git a/apps/web/src/app/billing/payment/components/enter-billing-address.component.ts b/apps/web/src/app/billing/payment/components/enter-billing-address.component.ts
index 7659b7ed5ca..db95beea7f8 100644
--- a/apps/web/src/app/billing/payment/components/enter-billing-address.component.ts
+++ b/apps/web/src/app/billing/payment/components/enter-billing-address.component.ts
@@ -24,6 +24,17 @@ export interface BillingAddressControls {
 
 export type BillingAddressFormGroup = FormGroup<ControlsOf<BillingAddressControls>>;
 
+export const getBillingAddressFromForm = (formGroup: BillingAddressFormGroup): BillingAddress =>
+  getBillingAddressFromControls(formGroup.getRawValue());
+
+export const getBillingAddressFromControls = (controls: BillingAddressControls) => {
+  const { taxId, ...addressFields } = controls;
+  const taxIdType = taxId ? getTaxIdTypeForCountry(addressFields.country) : null;
+  return taxIdType
+    ? { ...addressFields, taxId: { code: taxIdType.code, value: taxId! } }
+    : { ...addressFields, taxId: null };
+};
+
 type Scenario =
   | {
       type: "checkout";
@@ -36,6 +47,8 @@ type Scenario =
       taxIdWarning?: TaxIdWarningType;
     };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-enter-billing-address",
   template: `
@@ -57,7 +70,7 @@ type Scenario =
         </div>
         <div class="tw-col-span-6">
           <bit-form-field [disableMargin]="true">
-            <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
+            <bit-label>{{ "zipPostalCodeLabel" | i18n }}</bit-label>
             <input
               bitInput
               type="text"
@@ -67,54 +80,56 @@ type Scenario =
             />
           </bit-form-field>
         </div>
-        <div class="tw-col-span-6">
-          <bit-form-field [disableMargin]="true">
-            <bit-label>{{ "address1" | i18n }}</bit-label>
-            <input
-              bitInput
-              type="text"
-              [formControl]="group.controls.line1"
-              autocomplete="address-line1"
-              data-testid="address-line1"
-            />
-          </bit-form-field>
-        </div>
-        <div class="tw-col-span-6">
-          <bit-form-field [disableMargin]="true">
-            <bit-label>{{ "address2" | i18n }}</bit-label>
-            <input
-              bitInput
-              type="text"
-              [formControl]="group.controls.line2"
-              autocomplete="address-line2"
-              data-testid="address-line2"
-            />
-          </bit-form-field>
-        </div>
-        <div class="tw-col-span-6">
-          <bit-form-field [disableMargin]="true">
-            <bit-label>{{ "cityTown" | i18n }}</bit-label>
-            <input
-              bitInput
-              type="text"
-              [formControl]="group.controls.city"
-              autocomplete="address-level2"
-              data-testid="city"
-            />
-          </bit-form-field>
-        </div>
-        <div class="tw-col-span-6">
-          <bit-form-field [disableMargin]="true">
-            <bit-label>{{ "stateProvince" | i18n }}</bit-label>
-            <input
-              bitInput
-              type="text"
-              [formControl]="group.controls.state"
-              autocomplete="address-level1"
-              data-testid="state"
-            />
-          </bit-form-field>
-        </div>
+        @if (scenario.type === "update") {
+          <div class="tw-col-span-6">
+            <bit-form-field [disableMargin]="true">
+              <bit-label>{{ "address1" | i18n }}</bit-label>
+              <input
+                bitInput
+                type="text"
+                [formControl]="group.controls.line1"
+                autocomplete="address-line1"
+                data-testid="address-line1"
+              />
+            </bit-form-field>
+          </div>
+          <div class="tw-col-span-6">
+            <bit-form-field [disableMargin]="true">
+              <bit-label>{{ "address2" | i18n }}</bit-label>
+              <input
+                bitInput
+                type="text"
+                [formControl]="group.controls.line2"
+                autocomplete="address-line2"
+                data-testid="address-line2"
+              />
+            </bit-form-field>
+          </div>
+          <div class="tw-col-span-6">
+            <bit-form-field [disableMargin]="true">
+              <bit-label>{{ "cityTown" | i18n }}</bit-label>
+              <input
+                bitInput
+                type="text"
+                [formControl]="group.controls.city"
+                autocomplete="address-level2"
+                data-testid="city"
+              />
+            </bit-form-field>
+          </div>
+          <div class="tw-col-span-6">
+            <bit-form-field [disableMargin]="true">
+              <bit-label>{{ "stateProvince" | i18n }}</bit-label>
+              <input
+                bitInput
+                type="text"
+                [formControl]="group.controls.state"
+                autocomplete="address-level1"
+                data-testid="state"
+              />
+            </bit-form-field>
+          </div>
+        }
         @if (supportsTaxId$ | async) {
           <div class="tw-col-span-12">
             <bit-form-field [disableMargin]="true">
@@ -146,7 +161,11 @@ type Scenario =
   imports: [SharedModule],
 })
 export class EnterBillingAddressComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) scenario!: Scenario;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) group!: BillingAddressFormGroup;
 
   protected selectableCountries = selectableCountries;
@@ -175,7 +194,7 @@ export class EnterBillingAddressComponent implements OnInit, OnDestroy {
     this.supportsTaxId$ = this.group.controls.country.valueChanges.pipe(
       startWith(this.group.value.country ?? this.selectableCountries[0].value),
       map((country) => {
-        if (!this.scenario.supportsTaxId) {
+        if (!this.scenario.supportsTaxId || country === "US") {
           return false;
         }
 
diff --git a/apps/web/src/app/billing/payment/components/enter-payment-method.component.ts b/apps/web/src/app/billing/payment/components/enter-payment-method.component.ts
index 93c45b873fe..9e7b870579d 100644
--- a/apps/web/src/app/billing/payment/components/enter-payment-method.component.ts
+++ b/apps/web/src/app/billing/payment/components/enter-payment-method.component.ts
@@ -1,22 +1,25 @@
-import { Component, Input, OnInit } from "@angular/core";
+import { ChangeDetectionStrategy, Component, input, OnDestroy, OnInit } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { map, Observable, of, startWith, Subject, takeUntil } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { PopoverModule, ToastService } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared";
 import { BillingServicesModule, BraintreeService, StripeService } from "../../services";
-import { PaymentLabelComponent } from "../../shared/payment/payment-label.component";
 import {
+  AccountCreditPaymentMethod,
   isTokenizablePaymentMethod,
   selectableCountries,
   TokenizablePaymentMethod,
   TokenizedPaymentMethod,
 } from "../types";
 
-type PaymentMethodOption = TokenizablePaymentMethod | "accountCredit";
+import { PaymentLabelComponent } from "./payment-label.component";
+
+type PaymentMethodOption = TokenizablePaymentMethod | AccountCreditPaymentMethod;
 
 type PaymentMethodFormGroup = FormGroup<{
   type: FormControl<PaymentMethodOption>;
@@ -34,14 +37,15 @@ type PaymentMethodFormGroup = FormGroup<{
 
 @Component({
   selector: "app-enter-payment-method",
+  changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    @let showBillingDetails = includeBillingAddress && selected !== "payPal";
-    <form [formGroup]="group">
+    @let showBillingDetails = includeBillingAddress() && selected !== "payPal";
+    <form [formGroup]="group()">
       @if (showBillingDetails) {
         <h5 bitTypography="h5">{{ "paymentMethod" | i18n }}</h5>
       }
       <div class="tw-mb-4 tw-text-lg">
-        <bit-radio-group [formControl]="group.controls.type">
+        <bit-radio-group [formControl]="group().controls.type">
           <bit-radio-button id="card-payment-method" [value]="'card'">
             <bit-label>
               <i class="bwi bwi-fw bwi-credit-card" aria-hidden="true"></i>
@@ -56,7 +60,7 @@ type PaymentMethodFormGroup = FormGroup<{
               </bit-label>
             </bit-radio-button>
           }
-          @if (showPayPal) {
+          @if (showPayPal()) {
             <bit-radio-button id="paypal-payment-method" [value]="'payPal'">
               <bit-label>
                 <i class="bwi bwi-fw bwi-paypal" aria-hidden="true"></i>
@@ -64,7 +68,7 @@ type PaymentMethodFormGroup = FormGroup<{
               </bit-label>
             </bit-radio-button>
           }
-          @if (showAccountCredit) {
+          @if (showAccountCredit()) {
             <bit-radio-button id="credit-payment-method" [value]="'accountCredit'">
               <bit-label>
                 <i class="bwi bwi-fw bwi-dollar" aria-hidden="true"></i>
@@ -78,10 +82,10 @@ type PaymentMethodFormGroup = FormGroup<{
         @case ("card") {
           <div class="tw-grid tw-grid-cols-2 tw-gap-4 tw-mb-4">
             <div class="tw-col-span-1">
-              <app-payment-label for="stripe-card-number" required>
-                {{ "number" | i18n }}
+              <app-payment-label [for]="'stripe-card-number-' + instanceId" required>
+                {{ "cardNumberLabel" | i18n }}
               </app-payment-label>
-              <div id="stripe-card-number" class="tw-stripe-form-control"></div>
+              <div [id]="'stripe-card-number-' + instanceId" class="tw-stripe-form-control"></div>
             </div>
             <div class="tw-col-span-1 tw-flex tw-items-end">
               <img
@@ -91,27 +95,27 @@ type PaymentMethodFormGroup = FormGroup<{
               />
             </div>
             <div class="tw-col-span-1">
-              <app-payment-label for="stripe-card-expiry" required>
+              <app-payment-label [for]="'stripe-card-expiry-' + instanceId" required>
                 {{ "expiration" | i18n }}
               </app-payment-label>
-              <div id="stripe-card-expiry" class="tw-stripe-form-control"></div>
+              <div [id]="'stripe-card-expiry-' + instanceId" class="tw-stripe-form-control"></div>
             </div>
             <div class="tw-col-span-1">
-              <app-payment-label for="stripe-card-cvc" required>
+              <app-payment-label [for]="'stripe-card-cvc-' + instanceId" required>
                 {{ "securityCodeSlashCVV" | i18n }}
                 <button
                   [bitPopoverTriggerFor]="cardSecurityCodePopover"
                   type="button"
-                  class="tw-border-none tw-bg-transparent tw-text-primary-600 tw-p-0"
+                  class="tw-border-none tw-bg-transparent tw-text-primary-600 tw-pr-1"
                   [position]="'above-end'"
                 >
-                  <i class="bwi bwi-question-circle tw-text-lg" aria-hidden="true"></i>
+                  <i class="bwi bwi-question-circle tw-text-sm" aria-hidden="true"></i>
                 </button>
                 <bit-popover [title]="'cardSecurityCode' | i18n" #cardSecurityCodePopover>
                   <p class="tw-mb-0">{{ "cardSecurityCodeDescription" | i18n }}</p>
                 </bit-popover>
               </app-payment-label>
-              <div id="stripe-card-cvc" class="tw-stripe-form-control"></div>
+              <div [id]="'stripe-card-cvc-' + instanceId" class="tw-stripe-form-control"></div>
             </div>
           </div>
         }
@@ -127,7 +131,7 @@ type PaymentMethodFormGroup = FormGroup<{
                   bitInput
                   id="routingNumber"
                   type="text"
-                  [formControl]="group.controls.bankAccount.controls.routingNumber"
+                  [formControl]="group().controls.bankAccount.controls.routingNumber"
                   required
                 />
               </bit-form-field>
@@ -137,7 +141,7 @@ type PaymentMethodFormGroup = FormGroup<{
                   bitInput
                   id="accountNumber"
                   type="text"
-                  [formControl]="group.controls.bankAccount.controls.accountNumber"
+                  [formControl]="group().controls.bankAccount.controls.accountNumber"
                   required
                 />
               </bit-form-field>
@@ -147,7 +151,7 @@ type PaymentMethodFormGroup = FormGroup<{
                   id="accountHolderName"
                   bitInput
                   type="text"
-                  [formControl]="group.controls.bankAccount.controls.accountHolderName"
+                  [formControl]="group().controls.bankAccount.controls.accountHolderName"
                   required
                 />
               </bit-form-field>
@@ -155,7 +159,7 @@ type PaymentMethodFormGroup = FormGroup<{
                 <bit-label>{{ "bankAccountType" | i18n }}</bit-label>
                 <bit-select
                   id="accountHolderType"
-                  [formControl]="group.controls.bankAccount.controls.accountHolderType"
+                  [formControl]="group().controls.bankAccount.controls.accountHolderType"
                   required
                 >
                   <bit-option [value]="''" label="-- {{ 'select' | i18n }} --"></bit-option>
@@ -182,19 +186,25 @@ type PaymentMethodFormGroup = FormGroup<{
         }
         @case ("accountCredit") {
           <ng-container>
-            <bit-callout type="info">
-              {{ "makeSureEnoughCredit" | i18n }}
-            </bit-callout>
+            @if (hasEnoughAccountCredit()) {
+              <bit-callout type="info">
+                {{ "makeSureEnoughCredit" | i18n }}
+              </bit-callout>
+            } @else {
+              <bit-callout type="warning">
+                {{ "notEnoughAccountCredit" | i18n }}
+              </bit-callout>
+            }
           </ng-container>
         }
       }
       @if (showBillingDetails) {
-        <h5 bitTypography="h5">{{ "billingAddress" | i18n }}</h5>
+        <h5 bitTypography="h5" class="tw-pt-4">{{ "billingAddress" | i18n }}</h5>
         <div class="tw-grid tw-grid-cols-12 tw-gap-4">
           <div class="tw-col-span-6">
             <bit-form-field [disableMargin]="true">
               <bit-label>{{ "country" | i18n }}</bit-label>
-              <bit-select [formControl]="group.controls.billingAddress.controls.country">
+              <bit-select [formControl]="group().controls.billingAddress.controls.country">
                 @for (selectableCountry of selectableCountries; track selectableCountry.value) {
                   <bit-option
                     [value]="selectableCountry.value"
@@ -207,11 +217,11 @@ type PaymentMethodFormGroup = FormGroup<{
           </div>
           <div class="tw-col-span-6">
             <bit-form-field [disableMargin]="true">
-              <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
+              <bit-label>{{ "zipPostalCodeLabel" | i18n }}</bit-label>
               <input
                 bitInput
                 type="text"
-                [formControl]="group.controls.billingAddress.controls.postalCode"
+                [formControl]="group().controls.billingAddress.controls.postalCode"
                 autocomplete="postal-code"
               />
             </bit-form-field>
@@ -223,13 +233,15 @@ type PaymentMethodFormGroup = FormGroup<{
   standalone: true,
   imports: [BillingServicesModule, PaymentLabelComponent, PopoverModule, SharedModule],
 })
-export class EnterPaymentMethodComponent implements OnInit {
-  @Input({ required: true }) group!: PaymentMethodFormGroup;
+export class EnterPaymentMethodComponent implements OnInit, OnDestroy {
+  protected readonly instanceId = Utils.newGuid();
 
-  @Input() private showBankAccount = true;
-  @Input() showPayPal = true;
-  @Input() showAccountCredit = false;
-  @Input() includeBillingAddress = false;
+  readonly group = input.required<PaymentMethodFormGroup>();
+  protected readonly showBankAccount = input(true);
+  readonly showPayPal = input(true);
+  readonly showAccountCredit = input(false);
+  readonly hasEnoughAccountCredit = input(true);
+  readonly includeBillingAddress = input(false);
 
   protected showBankAccount$!: Observable<boolean>;
   protected selectableCountries = selectableCountries;
@@ -246,57 +258,62 @@ export class EnterPaymentMethodComponent implements OnInit {
 
   ngOnInit() {
     this.stripeService.loadStripe(
+      this.instanceId,
       {
-        cardNumber: "#stripe-card-number",
-        cardExpiry: "#stripe-card-expiry",
-        cardCvc: "#stripe-card-cvc",
+        cardNumber: `#stripe-card-number-${this.instanceId}`,
+        cardExpiry: `#stripe-card-expiry-${this.instanceId}`,
+        cardCvc: `#stripe-card-cvc-${this.instanceId}`,
       },
       true,
     );
 
-    if (this.showPayPal) {
+    if (this.showPayPal()) {
       this.braintreeService.loadBraintree("#braintree-container", false);
     }
 
-    if (!this.includeBillingAddress) {
-      this.showBankAccount$ = of(this.showBankAccount);
-      this.group.controls.billingAddress.disable();
+    if (!this.includeBillingAddress()) {
+      this.showBankAccount$ = of(this.showBankAccount());
+      this.group().controls.billingAddress.disable();
     } else {
-      this.group.controls.billingAddress.patchValue({
+      this.group().controls.billingAddress.patchValue({
         country: "US",
       });
-      this.showBankAccount$ = this.group.controls.billingAddress.controls.country.valueChanges.pipe(
-        startWith(this.group.controls.billingAddress.controls.country.value),
-        map((country) => this.showBankAccount && country === "US"),
-      );
+      this.showBankAccount$ =
+        this.group().controls.billingAddress.controls.country.valueChanges.pipe(
+          startWith(this.group().controls.billingAddress.controls.country.value),
+          map((country) => this.showBankAccount() && country === "US"),
+        );
     }
 
-    this.group.controls.type.valueChanges
-      .pipe(startWith(this.group.controls.type.value), takeUntil(this.destroy$))
+    this.group()
+      .controls.type.valueChanges.pipe(
+        startWith(this.group().controls.type.value),
+        takeUntil(this.destroy$),
+      )
       .subscribe((selected) => {
         if (selected === "bankAccount") {
-          this.group.controls.bankAccount.enable();
-          if (this.includeBillingAddress) {
-            this.group.controls.billingAddress.enable();
+          this.group().controls.bankAccount.enable();
+          if (this.includeBillingAddress()) {
+            this.group().controls.billingAddress.enable();
           }
         } else {
           switch (selected) {
             case "card": {
-              this.stripeService.mountElements();
-              if (this.includeBillingAddress) {
-                this.group.controls.billingAddress.enable();
+              this.stripeService.mountElements(this.instanceId);
+              if (this.includeBillingAddress()) {
+                this.group().controls.billingAddress.enable();
               }
               break;
             }
             case "payPal": {
               this.braintreeService.createDropin();
-              if (this.includeBillingAddress) {
-                this.group.controls.billingAddress.disable();
+              if (this.includeBillingAddress()) {
+                this.group().controls.billingAddress.disable();
               }
               break;
             }
           }
-          this.group.controls.bankAccount.disable();
+          this.group().controls.bankAccount.disable();
         }
       });
 
@@ -307,22 +324,28 @@ export class EnterPaymentMethodComponent implements OnInit {
     });
   }
 
-  select = (paymentMethod: PaymentMethodOption) =>
-    this.group.controls.type.patchValue(paymentMethod);
+  ngOnDestroy() {
+    this.stripeService.unloadStripe(this.instanceId);
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
 
-  tokenize = async (): Promise<TokenizedPaymentMethod> => {
+  select = (paymentMethod: PaymentMethodOption) =>
+    this.group().controls.type.patchValue(paymentMethod);
+
+  tokenize = async (): Promise<TokenizedPaymentMethod | null> => {
     const exchange = async (paymentMethod: TokenizablePaymentMethod) => {
       switch (paymentMethod) {
         case "bankAccount": {
-          this.group.controls.bankAccount.markAllAsTouched();
-          if (!this.group.controls.bankAccount.valid) {
+          this.group().controls.bankAccount.markAllAsTouched();
+          if (!this.group().controls.bankAccount.valid) {
             throw new Error("Attempted to tokenize invalid bank account information.");
           }
 
-          const bankAccount = this.group.controls.bankAccount.getRawValue();
+          const bankAccount = this.group().controls.bankAccount.getRawValue();
           const clientSecret = await this.stripeService.createSetupIntent("bankAccount");
-          const billingDetails = this.group.controls.billingAddress.enabled
-            ? this.group.controls.billingAddress.getRawValue()
+          const billingDetails = this.group().controls.billingAddress.enabled
+            ? this.group().controls.billingAddress.getRawValue()
             : undefined;
           return await this.stripeService.setupBankAccountPaymentMethod(
             clientSecret,
@@ -332,10 +355,14 @@ export class EnterPaymentMethodComponent implements OnInit {
         }
         case "card": {
           const clientSecret = await this.stripeService.createSetupIntent("card");
-          const billingDetails = this.group.controls.billingAddress.enabled
-            ? this.group.controls.billingAddress.getRawValue()
+          const billingDetails = this.group().controls.billingAddress.enabled
+            ? this.group().controls.billingAddress.getRawValue()
             : undefined;
-          return this.stripeService.setupCardPaymentMethod(clientSecret, billingDetails);
+          return this.stripeService.setupCardPaymentMethod(
+            this.instanceId,
+            clientSecret,
+            billingDetails,
+          );
         }
         case "payPal": {
           return this.braintreeService.requestPaymentMethod();
@@ -351,27 +378,51 @@ export class EnterPaymentMethodComponent implements OnInit {
       const token = await exchange(this.selected);
       return { type: this.selected, token };
     } catch (error: unknown) {
-      this.logService.error(error);
-      this.toastService.showToast({
-        variant: "error",
-        title: "",
-        message: this.i18nService.t("problemSubmittingPaymentMethod"),
-      });
-      throw error;
+      if (error) {
+        this.logService.error(error);
+        switch (this.selected) {
+          case "card": {
+            if (
+              typeof error === "object" &&
+              "message" in error &&
+              typeof error.message === "string"
+            ) {
+              this.toastService.showToast({
+                variant: "error",
+                title: "",
+                message: error.message,
+              });
+            }
+            return null;
+          }
+          case "payPal": {
+            if (typeof error === "string" && error === "No payment method is available.") {
+              this.toastService.showToast({
+                variant: "error",
+                title: "",
+                message: this.i18nService.t("clickPayWithPayPal"),
+              });
+              return null;
+            }
+          }
+        }
+        throw error;
+      }
+      return null;
     }
   };
 
   validate = (): boolean => {
     if (this.selected === "bankAccount") {
-      this.group.controls.bankAccount.markAllAsTouched();
-      return this.group.controls.bankAccount.valid;
+      this.group().controls.bankAccount.markAllAsTouched();
+      return this.group().controls.bankAccount.valid;
     }
 
     return true;
   };
 
   get selected(): PaymentMethodOption {
-    return this.group.value.type!;
+    return this.group().value.type!;
   }
 
   static getFormGroup = (): PaymentMethodFormGroup =>
diff --git a/apps/web/src/app/billing/payment/components/index.ts b/apps/web/src/app/billing/payment/components/index.ts
index 7e500d2119e..5e10fa4763b 100644
--- a/apps/web/src/app/billing/payment/components/index.ts
+++ b/apps/web/src/app/billing/payment/components/index.ts
@@ -6,6 +6,7 @@ export * from "./display-payment-method.component";
 export * from "./edit-billing-address-dialog.component";
 export * from "./enter-billing-address.component";
 export * from "./enter-payment-method.component";
+export * from "./payment-label.component";
 export * from "./require-payment-method-dialog.component";
 export * from "./submit-payment-method-dialog.component";
 export * from "./verify-bank-account.component";
diff --git a/apps/web/src/app/billing/payment/components/payment-label.component.ts b/apps/web/src/app/billing/payment/components/payment-label.component.ts
new file mode 100644
index 00000000000..cfd19ef791d
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/payment-label.component.ts
@@ -0,0 +1,46 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { booleanAttribute, Component, Input } from "@angular/core";
+
+import { FormFieldModule } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+
+/**
+ * Label that should be used for elements loaded via Stripe API.
+ *
+ * Applies the same label styles from CL form-field component
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-payment-label",
+  template: `
+    <ng-template #defaultContent>
+      <ng-content></ng-content>
+    </ng-template>
+
+    <div class="tw-relative tw-mt-2">
+      <bit-label
+        [attr.for]="for"
+        class="tw-absolute tw-bg-background tw-px-1 tw-text-sm tw-text-muted -tw-top-2.5 tw-left-3 tw-mb-0 tw-max-w-full tw-pointer-events-auto"
+      >
+        <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
+        <span class="tw-text-[0.625rem] tw-font-normal">({{ "required" | i18n }})</span>
+      </bit-label>
+    </div>
+  `,
+  imports: [FormFieldModule, SharedModule],
+})
+export class PaymentLabelComponent {
+  /** `id` of the associated input */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input({ required: true }) for: string;
+  /** Displays required text on the label */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input({ transform: booleanAttribute }) required = false;
+
+  constructor() {}
+}
diff --git a/apps/web/src/app/billing/payment/components/require-payment-method-dialog.component.ts b/apps/web/src/app/billing/payment/components/require-payment-method-dialog.component.ts
index b1ca1922775..81775c83b58 100644
--- a/apps/web/src/app/billing/payment/components/require-payment-method-dialog.component.ts
+++ b/apps/web/src/app/billing/payment/components/require-payment-method-dialog.component.ts
@@ -29,11 +29,13 @@ type DialogParams = {
   };
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <form [formGroup]="formGroup" [bitSubmit]="submit">
       <bit-dialog>
-        <span bitDialogTitle class="tw-font-semibold">
+        <span bitDialogTitle class="tw-font-medium">
           {{ "addPaymentMethod" | i18n }}
         </span>
         <div bitDialogContent>
diff --git a/apps/web/src/app/billing/payment/components/submit-payment-method-dialog.component.ts b/apps/web/src/app/billing/payment/components/submit-payment-method-dialog.component.ts
index 62d2b775eb5..98e8ba99e5e 100644
--- a/apps/web/src/app/billing/payment/components/submit-payment-method-dialog.component.ts
+++ b/apps/web/src/app/billing/payment/components/submit-payment-method-dialog.component.ts
@@ -14,8 +14,12 @@ export type SubmitPaymentMethodDialogResult =
   | { type: "error" }
   | { type: "success"; paymentMethod: MaskedPaymentMethod };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({ template: "" })
 export abstract class SubmitPaymentMethodDialogComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(EnterPaymentMethodComponent)
   private enterPaymentMethodComponent!: EnterPaymentMethodComponent;
   protected formGroup = EnterPaymentMethodComponent.getFormGroup();
@@ -37,6 +41,10 @@ export abstract class SubmitPaymentMethodDialogComponent {
     }
 
     const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+    if (!paymentMethod) {
+      return;
+    }
+
     const billingAddress =
       this.formGroup.value.type !== "payPal"
         ? this.formGroup.controls.billingAddress.getRawValue()
diff --git a/apps/web/src/app/billing/payment/components/verify-bank-account.component.ts b/apps/web/src/app/billing/payment/components/verify-bank-account.component.ts
index b1a2814daf2..5e61cf5b129 100644
--- a/apps/web/src/app/billing/payment/components/verify-bank-account.component.ts
+++ b/apps/web/src/app/billing/payment/components/verify-bank-account.component.ts
@@ -9,6 +9,8 @@ import { SharedModule } from "../../../shared";
 import { BitwardenSubscriber } from "../../types";
 import { MaskedPaymentMethod } from "../types";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-verify-bank-account",
   template: `
@@ -35,7 +37,11 @@ import { MaskedPaymentMethod } from "../types";
   providers: [SubscriberBillingClient],
 })
 export class VerifyBankAccountComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) subscriber!: BitwardenSubscriber;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() verified = new EventEmitter<MaskedPaymentMethod>();
 
   protected formGroup = new FormGroup({
diff --git a/apps/web/src/app/billing/payment/types/masked-payment-method.ts b/apps/web/src/app/billing/payment/types/masked-payment-method.ts
index f57170518a1..9f194667cb8 100644
--- a/apps/web/src/app/billing/payment/types/masked-payment-method.ts
+++ b/apps/web/src/app/billing/payment/types/masked-payment-method.ts
@@ -21,6 +21,24 @@ export const StripeCardBrands = {
 
 export type StripeCardBrand = (typeof StripeCardBrands)[keyof typeof StripeCardBrands];
 
+export const cardBrandIcons: Record<string, string> = {
+  amex: "card-amex",
+  diners: "card-diners-club",
+  discover: "card-discover",
+  jcb: "card-jcb",
+  mastercard: "card-mastercard",
+  unionpay: "card-unionpay",
+  visa: "card-visa",
+};
+
+export const getCardBrandIcon = (paymentMethod: MaskedPaymentMethod | null): string | null => {
+  if (paymentMethod?.type !== "card") {
+    return null;
+  }
+
+  return paymentMethod.brand in cardBrandIcons ? cardBrandIcons[paymentMethod.brand] : null;
+};
+
 type MaskedBankAccount = {
   type: BankAccountPaymentMethod;
   bankName: string;
diff --git a/apps/web/src/app/billing/payment/types/tokenized-payment-method.ts b/apps/web/src/app/billing/payment/types/tokenized-payment-method.ts
index def240f534b..d2cbfcf5101 100644
--- a/apps/web/src/app/billing/payment/types/tokenized-payment-method.ts
+++ b/apps/web/src/app/billing/payment/types/tokenized-payment-method.ts
@@ -1,22 +1,48 @@
+import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+
 export const TokenizablePaymentMethods = {
   bankAccount: "bankAccount",
   card: "card",
   payPal: "payPal",
 } as const;
 
+export const NonTokenizablePaymentMethods = {
+  accountCredit: "accountCredit",
+} as const;
+
 export type BankAccountPaymentMethod = typeof TokenizablePaymentMethods.bankAccount;
 export type CardPaymentMethod = typeof TokenizablePaymentMethods.card;
 export type PayPalPaymentMethod = typeof TokenizablePaymentMethods.payPal;
+export type AccountCreditPaymentMethod = typeof NonTokenizablePaymentMethods.accountCredit;
 
 export type TokenizablePaymentMethod =
   (typeof TokenizablePaymentMethods)[keyof typeof TokenizablePaymentMethods];
+export type NonTokenizablePaymentMethod =
+  (typeof NonTokenizablePaymentMethods)[keyof typeof NonTokenizablePaymentMethods];
 
 export const isTokenizablePaymentMethod = (value: string): value is TokenizablePaymentMethod => {
   const valid = Object.values(TokenizablePaymentMethods) as readonly string[];
   return valid.includes(value);
 };
 
+export const tokenizablePaymentMethodToLegacyEnum = (
+  paymentMethod: TokenizablePaymentMethod,
+): PaymentMethodType => {
+  switch (paymentMethod) {
+    case "bankAccount":
+      return PaymentMethodType.BankAccount;
+    case "card":
+      return PaymentMethodType.Card;
+    case "payPal":
+      return PaymentMethodType.PayPal;
+  }
+};
+
 export type TokenizedPaymentMethod = {
   type: TokenizablePaymentMethod;
   token: string;
 };
+
+export type NonTokenizedPaymentMethod = {
+  type: NonTokenizablePaymentMethod;
+};
diff --git a/apps/web/src/app/billing/services/free-families-policy.service.spec.ts b/apps/web/src/app/billing/services/free-families-policy.service.spec.ts
index 10ccc448986..5b39a5a848a 100644
--- a/apps/web/src/app/billing/services/free-families-policy.service.spec.ts
+++ b/apps/web/src/app/billing/services/free-families-policy.service.spec.ts
@@ -38,7 +38,6 @@ describe("FreeFamiliesPolicyService", () => {
   describe("showSponsoredFamiliesDropdown$", () => {
     it("should return true when all conditions are met", async () => {
       // Configure mocks
-      configService.getFeatureFlag$.mockReturnValue(of(true));
       policyService.policiesByType$.mockReturnValue(of([]));
 
       // Create a test organization that meets all criteria
@@ -58,7 +57,6 @@ describe("FreeFamiliesPolicyService", () => {
 
     it("should return false when organization is not Enterprise", async () => {
       // Configure mocks
-      configService.getFeatureFlag$.mockReturnValue(of(true));
       policyService.policiesByType$.mockReturnValue(of([]));
 
       // Create a test organization that is not Enterprise tier
@@ -74,27 +72,8 @@ describe("FreeFamiliesPolicyService", () => {
       expect(result).toBe(false);
     });
 
-    it("should return false when feature flag is disabled", async () => {
-      // Configure mocks to disable feature flag
-      configService.getFeatureFlag$.mockReturnValue(of(false));
-      policyService.policiesByType$.mockReturnValue(of([]));
-
-      // Create a test organization that meets other criteria
-      const organization = {
-        id: "org-id",
-        productTierType: ProductTierType.Enterprise,
-        useAdminSponsoredFamilies: true,
-        isAdmin: true,
-      } as Organization;
-
-      // Test the method
-      const result = await firstValueFrom(service.showSponsoredFamiliesDropdown$(of(organization)));
-      expect(result).toBe(false);
-    });
-
     it("should return false when families feature is disabled by policy", async () => {
       // Configure mocks with a policy that disables the feature
-      configService.getFeatureFlag$.mockReturnValue(of(true));
       policyService.policiesByType$.mockReturnValue(
         of([{ organizationId: "org-id", enabled: true } as Policy]),
       );
@@ -114,7 +93,6 @@ describe("FreeFamiliesPolicyService", () => {
 
     it("should return false when useAdminSponsoredFamilies is false", async () => {
       // Configure mocks
-      configService.getFeatureFlag$.mockReturnValue(of(true));
       policyService.policiesByType$.mockReturnValue(of([]));
 
       // Create a test organization with useAdminSponsoredFamilies set to false
@@ -132,7 +110,6 @@ describe("FreeFamiliesPolicyService", () => {
 
     it("should return true when user is an owner but not admin", async () => {
       // Configure mocks
-      configService.getFeatureFlag$.mockReturnValue(of(true));
       policyService.policiesByType$.mockReturnValue(of([]));
 
       // Create a test organization where user is owner but not admin
@@ -152,7 +129,6 @@ describe("FreeFamiliesPolicyService", () => {
 
     it("should return true when user can manage users but is not admin or owner", async () => {
       // Configure mocks
-      configService.getFeatureFlag$.mockReturnValue(of(true));
       policyService.policiesByType$.mockReturnValue(of([]));
 
       // Create a test organization where user can manage users but is not admin or owner
@@ -172,7 +148,6 @@ describe("FreeFamiliesPolicyService", () => {
 
     it("should return false when user has no admin permissions", async () => {
       // Configure mocks
-      configService.getFeatureFlag$.mockReturnValue(of(true));
       policyService.policiesByType$.mockReturnValue(of([]));
 
       // Create a test organization where user has no admin permissions
diff --git a/apps/web/src/app/billing/services/free-families-policy.service.ts b/apps/web/src/app/billing/services/free-families-policy.service.ts
index 7a8e3804b2c..68e333d53ba 100644
--- a/apps/web/src/app/billing/services/free-families-policy.service.ts
+++ b/apps/web/src/app/billing/services/free-families-policy.service.ts
@@ -8,8 +8,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 { ProductTierType } from "@bitwarden/common/billing/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 interface EnterpriseOrgStatus {
   isFreeFamilyPolicyEnabled: boolean;
@@ -19,17 +17,10 @@ interface EnterpriseOrgStatus {
 
 @Injectable({ providedIn: "root" })
 export class FreeFamiliesPolicyService {
-  protected enterpriseOrgStatus: EnterpriseOrgStatus = {
-    isFreeFamilyPolicyEnabled: false,
-    belongToOneEnterpriseOrgs: false,
-    belongToMultipleEnterpriseOrgs: false,
-  };
-
   constructor(
     private policyService: PolicyService,
     private organizationService: OrganizationService,
     private accountService: AccountService,
-    private configService: ConfigService,
   ) {}
 
   organizations$ = this.accountService.activeAccount$.pipe(
@@ -64,20 +55,14 @@ export class FreeFamiliesPolicyService {
           userId,
         );
 
-        return combineLatest([
-          enterpriseOrganization$,
-          this.configService.getFeatureFlag$(FeatureFlag.PM17772_AdminInitiatedSponsorships),
-          organization,
-          policies$,
-        ]).pipe(
-          map(([isEnterprise, featureFlagEnabled, org, policies]) => {
+        return combineLatest([enterpriseOrganization$, organization, policies$]).pipe(
+          map(([isEnterprise, org, policies]) => {
             const familiesFeatureDisabled = policies.some(
               (policy) => policy.organizationId === org.id && policy.enabled,
             );
 
             return (
               isEnterprise &&
-              featureFlagEnabled &&
               !familiesFeatureDisabled &&
               org.useAdminSponsoredFamilies &&
               (org.isAdmin || org.isOwner || org.canManageUsers)
@@ -104,9 +89,11 @@ export class FreeFamiliesPolicyService {
     if (!orgStatus) {
       return false;
     }
-    const { belongToOneEnterpriseOrgs, isFreeFamilyPolicyEnabled } = orgStatus;
+    const { isFreeFamilyPolicyEnabled } = orgStatus;
     const hasSponsorshipOrgs = organizations.some((org) => org.canManageSponsorships);
-    return hasSponsorshipOrgs && !(belongToOneEnterpriseOrgs && isFreeFamilyPolicyEnabled);
+
+    // Hide if ANY organization has the policy enabled
+    return hasSponsorshipOrgs && !isFreeFamilyPolicyEnabled;
   }
 
   checkEnterpriseOrganizationsAndFetchPolicy(): Observable<EnterpriseOrgStatus> {
@@ -122,16 +109,12 @@ export class FreeFamiliesPolicyService {
     const { belongToOneEnterpriseOrgs, belongToMultipleEnterpriseOrgs } =
       this.evaluateEnterpriseOrganizations(organizations);
 
-    if (!belongToOneEnterpriseOrgs) {
-      return of({
-        isFreeFamilyPolicyEnabled: false,
-        belongToOneEnterpriseOrgs,
-        belongToMultipleEnterpriseOrgs,
-      });
-    }
+    // Get all enterprise organization IDs
+    const enterpriseOrgIds = organizations
+      .filter((org) => org.canManageSponsorships)
+      .map((org) => org.id);
 
-    const organizationId = this.getOrganizationIdForOneEnterprise(organizations);
-    if (!organizationId) {
+    if (enterpriseOrgIds.length === 0) {
       return of({
         isFreeFamilyPolicyEnabled: false,
         belongToOneEnterpriseOrgs,
@@ -145,8 +128,8 @@ export class FreeFamiliesPolicyService {
         this.policyService.policiesByType$(PolicyType.FreeFamiliesSponsorshipPolicy, userId),
       ),
       map((policies) => ({
-        isFreeFamilyPolicyEnabled: policies.some(
-          (policy) => policy.organizationId === organizationId && policy.enabled,
+        isFreeFamilyPolicyEnabled: enterpriseOrgIds.every((orgId) =>
+          policies.some((policy) => policy.organizationId === orgId && policy.enabled),
         ),
         belongToOneEnterpriseOrgs,
         belongToMultipleEnterpriseOrgs,
@@ -166,9 +149,4 @@ export class FreeFamiliesPolicyService {
       belongToMultipleEnterpriseOrgs: count > 1,
     };
   }
-
-  private getOrganizationIdForOneEnterprise(organizations: any[]): string | null {
-    const enterpriseOrganizations = organizations.filter((org) => org.canManageSponsorships);
-    return enterpriseOrganizations.length === 1 ? enterpriseOrganizations[0].id : null;
-  }
 }
diff --git a/apps/web/src/app/billing/services/premium-interest/web-premium-interest-state.service.spec.ts b/apps/web/src/app/billing/services/premium-interest/web-premium-interest-state.service.spec.ts
new file mode 100644
index 00000000000..086c7504040
--- /dev/null
+++ b/apps/web/src/app/billing/services/premium-interest/web-premium-interest-state.service.spec.ts
@@ -0,0 +1,147 @@
+import { firstValueFrom } from "rxjs";
+
+import {
+  FakeAccountService,
+  FakeStateProvider,
+  mockAccountServiceWith,
+} from "@bitwarden/common/spec";
+import { newGuid } from "@bitwarden/guid";
+import { UserId } from "@bitwarden/user-core";
+
+import {
+  PREMIUM_INTEREST_KEY,
+  WebPremiumInterestStateService,
+} from "./web-premium-interest-state.service";
+
+describe("WebPremiumInterestStateService", () => {
+  let service: WebPremiumInterestStateService;
+  let stateProvider: FakeStateProvider;
+  let accountService: FakeAccountService;
+
+  const mockUserId = newGuid() as UserId;
+  const mockUserEmail = "user@example.com";
+
+  beforeEach(() => {
+    accountService = mockAccountServiceWith(mockUserId, { email: mockUserEmail });
+    stateProvider = new FakeStateProvider(accountService);
+    service = new WebPremiumInterestStateService(stateProvider);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("getPremiumInterest", () => {
+    it("should throw an error when userId is not provided", async () => {
+      const promise = service.getPremiumInterest(null);
+
+      await expect(promise).rejects.toThrow("UserId is required. Cannot get 'premiumInterest'.");
+    });
+
+    it("should return null when no value is set", async () => {
+      const result = await service.getPremiumInterest(mockUserId);
+
+      expect(result).toBeNull();
+    });
+
+    it("should return true when value is set to true", async () => {
+      await stateProvider.setUserState(PREMIUM_INTEREST_KEY, true, mockUserId);
+
+      const result = await service.getPremiumInterest(mockUserId);
+
+      expect(result).toBe(true);
+    });
+
+    it("should return false when value is set to false", async () => {
+      await stateProvider.setUserState(PREMIUM_INTEREST_KEY, false, mockUserId);
+
+      const result = await service.getPremiumInterest(mockUserId);
+
+      expect(result).toBe(false);
+    });
+
+    it("should use getUserState$ to retrieve the value", async () => {
+      const getUserStateSpy = jest.spyOn(stateProvider, "getUserState$");
+      await stateProvider.setUserState(PREMIUM_INTEREST_KEY, true, mockUserId);
+
+      await service.getPremiumInterest(mockUserId);
+
+      expect(getUserStateSpy).toHaveBeenCalledWith(PREMIUM_INTEREST_KEY, mockUserId);
+    });
+  });
+
+  describe("setPremiumInterest", () => {
+    it("should throw an error when userId is not provided", async () => {
+      const promise = service.setPremiumInterest(null, true);
+
+      await expect(promise).rejects.toThrow("UserId is required. Cannot set 'premiumInterest'.");
+    });
+
+    it("should set the value to true", async () => {
+      await service.setPremiumInterest(mockUserId, true);
+
+      const result = await firstValueFrom(
+        stateProvider.getUserState$(PREMIUM_INTEREST_KEY, mockUserId),
+      );
+
+      expect(result).toBe(true);
+    });
+
+    it("should set the value to false", async () => {
+      await service.setPremiumInterest(mockUserId, false);
+
+      const result = await firstValueFrom(
+        stateProvider.getUserState$(PREMIUM_INTEREST_KEY, mockUserId),
+      );
+
+      expect(result).toBe(false);
+    });
+
+    it("should update an existing value", async () => {
+      await service.setPremiumInterest(mockUserId, true);
+      await service.setPremiumInterest(mockUserId, false);
+
+      const result = await firstValueFrom(
+        stateProvider.getUserState$(PREMIUM_INTEREST_KEY, mockUserId),
+      );
+
+      expect(result).toBe(false);
+    });
+
+    it("should use setUserState to store the value", async () => {
+      const setUserStateSpy = jest.spyOn(stateProvider, "setUserState");
+
+      await service.setPremiumInterest(mockUserId, true);
+
+      expect(setUserStateSpy).toHaveBeenCalledWith(PREMIUM_INTEREST_KEY, true, mockUserId);
+    });
+  });
+
+  describe("clearPremiumInterest", () => {
+    it("should throw an error when userId is not provided", async () => {
+      const promise = service.clearPremiumInterest(null);
+
+      await expect(promise).rejects.toThrow("UserId is required. Cannot clear 'premiumInterest'.");
+    });
+
+    it("should clear the value by setting it to null", async () => {
+      await service.setPremiumInterest(mockUserId, true);
+      await service.clearPremiumInterest(mockUserId);
+
+      const result = await firstValueFrom(
+        stateProvider.getUserState$(PREMIUM_INTEREST_KEY, mockUserId),
+      );
+
+      expect(result).toBeNull();
+    });
+
+    it("should use setUserState with null to clear the value", async () => {
+      const setUserStateSpy = jest.spyOn(stateProvider, "setUserState");
+      await service.setPremiumInterest(mockUserId, true);
+
+      await service.clearPremiumInterest(mockUserId);
+
+      expect(setUserStateSpy).toHaveBeenCalledWith(PREMIUM_INTEREST_KEY, null, mockUserId);
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/services/premium-interest/web-premium-interest-state.service.ts b/apps/web/src/app/billing/services/premium-interest/web-premium-interest-state.service.ts
new file mode 100644
index 00000000000..f66fba559f4
--- /dev/null
+++ b/apps/web/src/app/billing/services/premium-interest/web-premium-interest-state.service.ts
@@ -0,0 +1,44 @@
+import { Injectable } from "@angular/core";
+import { firstValueFrom } from "rxjs";
+
+import { PremiumInterestStateService } from "@bitwarden/angular/billing/services/premium-interest/premium-interest-state.service.abstraction";
+import { BILLING_MEMORY, StateProvider, UserKeyDefinition } from "@bitwarden/state";
+import { UserId } from "@bitwarden/user-core";
+
+export const PREMIUM_INTEREST_KEY = new UserKeyDefinition<boolean>(
+  BILLING_MEMORY,
+  "premiumInterest",
+  {
+    deserializer: (value: boolean) => value,
+    clearOn: ["lock", "logout"],
+  },
+);
+
+@Injectable()
+export class WebPremiumInterestStateService implements PremiumInterestStateService {
+  constructor(private stateProvider: StateProvider) {}
+
+  async getPremiumInterest(userId: UserId): Promise<boolean | null> {
+    if (!userId) {
+      throw new Error("UserId is required. Cannot get 'premiumInterest'.");
+    }
+
+    return await firstValueFrom(this.stateProvider.getUserState$(PREMIUM_INTEREST_KEY, userId));
+  }
+
+  async setPremiumInterest(userId: UserId, premiumInterest: boolean): Promise<void> {
+    if (!userId) {
+      throw new Error("UserId is required. Cannot set 'premiumInterest'.");
+    }
+
+    await this.stateProvider.setUserState(PREMIUM_INTEREST_KEY, premiumInterest, userId);
+  }
+
+  async clearPremiumInterest(userId: UserId): Promise<void> {
+    if (!userId) {
+      throw new Error("UserId is required. Cannot clear 'premiumInterest'.");
+    }
+
+    await this.stateProvider.setUserState(PREMIUM_INTEREST_KEY, null, userId);
+  }
+}
diff --git a/apps/web/src/app/billing/services/pricing-summary.service.ts b/apps/web/src/app/billing/services/pricing-summary.service.ts
index 0b048b379d8..b3c071a8b88 100644
--- a/apps/web/src/app/billing/services/pricing-summary.service.ts
+++ b/apps/web/src/app/billing/services/pricing-summary.service.ts
@@ -1,10 +1,7 @@
 import { Injectable } from "@angular/core";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import { PlanInterval, ProductTierType } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain/tax-information";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
 
@@ -14,17 +11,13 @@ import { PricingSummaryData } from "../shared/pricing-summary/pricing-summary.co
   providedIn: "root",
 })
 export class PricingSummaryService {
-  private estimatedTax: number = 0;
-
-  constructor(private taxService: TaxServiceAbstraction) {}
-
   async getPricingSummaryData(
     plan: PlanResponse,
     sub: OrganizationSubscriptionResponse,
     organization: Organization,
     selectedInterval: PlanInterval,
-    taxInformation: TaxInformation,
     isSecretsManagerTrial: boolean,
+    estimatedTax: number,
   ): Promise<PricingSummaryData> {
     // Calculation helpers
     const passwordManagerSeatTotal =
@@ -57,6 +50,9 @@ export class PricingSummaryService {
     if (plan.PasswordManager?.hasPremiumAccessOption) {
       passwordManagerSubtotal += plan.PasswordManager.premiumAccessOptionPrice;
     }
+    if (plan.PasswordManager?.hasAdditionalStorageOption) {
+      passwordManagerSubtotal += additionalStorageTotal;
+    }
 
     const secretsManagerSubtotal = plan.SecretsManager
       ? (plan.SecretsManager.basePrice || 0) +
@@ -72,14 +68,9 @@ export class PricingSummaryService {
     const acceptingSponsorship = false;
     const storageGb = sub?.maxStorageGb ? sub?.maxStorageGb - 1 : 0;
 
-    this.estimatedTax = await this.getEstimatedTax(organization, plan, sub, taxInformation);
-
     const total = organization?.useSecretsManager
-      ? passwordManagerSubtotal +
-        additionalStorageTotal +
-        secretsManagerSubtotal +
-        this.estimatedTax
-      : passwordManagerSubtotal + additionalStorageTotal + this.estimatedTax;
+      ? passwordManagerSubtotal + secretsManagerSubtotal + estimatedTax
+      : passwordManagerSubtotal + estimatedTax;
 
     return {
       selectedPlanInterval: selectedInterval === PlanInterval.Annually ? "year" : "month",
@@ -104,45 +95,10 @@ export class PricingSummaryService {
       additionalServiceAccount,
       storageGb,
       isSecretsManagerTrial,
-      estimatedTax: this.estimatedTax,
+      estimatedTax,
     };
   }
 
-  async getEstimatedTax(
-    organization: Organization,
-    currentPlan: PlanResponse,
-    sub: OrganizationSubscriptionResponse,
-    taxInformation: TaxInformation,
-  ) {
-    if (!taxInformation || !taxInformation.country || !taxInformation.postalCode) {
-      return 0;
-    }
-
-    const request: PreviewOrganizationInvoiceRequest = {
-      organizationId: organization.id,
-      passwordManager: {
-        additionalStorage: 0,
-        plan: currentPlan?.type,
-        seats: sub.seats,
-      },
-      taxInformation: {
-        postalCode: taxInformation.postalCode,
-        country: taxInformation.country,
-        taxId: taxInformation.taxId,
-      },
-    };
-
-    if (organization.useSecretsManager) {
-      request.secretsManager = {
-        seats: sub.smSeats ?? 0,
-        additionalMachineAccounts:
-          (sub.smServiceAccounts ?? 0) - (sub.plan.SecretsManager?.baseServiceAccount ?? 0),
-      };
-    }
-    const invoiceResponse = await this.taxService.previewOrganizationInvoice(request);
-    return invoiceResponse.taxAmount;
-  }
-
   getAdditionalServiceAccount(plan: PlanResponse, sub: OrganizationSubscriptionResponse): number {
     if (!plan || !plan.SecretsManager) {
       return 0;
diff --git a/apps/web/src/app/billing/services/stripe.service.spec.ts b/apps/web/src/app/billing/services/stripe.service.spec.ts
new file mode 100644
index 00000000000..983aeb266ae
--- /dev/null
+++ b/apps/web/src/app/billing/services/stripe.service.spec.ts
@@ -0,0 +1,797 @@
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { BankAccount } from "@bitwarden/common/billing/models/domain";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+
+import { StripeService } from "./stripe.service";
+
+// Extend Window interface to include Stripe
+declare global {
+  interface Window {
+    Stripe: any;
+  }
+}
+
+describe("StripeService", () => {
+  let service: StripeService;
+  let apiService: MockProxy<ApiService>;
+  let logService: MockProxy<LogService>;
+
+  // Stripe SDK mocks
+  let mockStripeInstance: any;
+  let mockElements: any;
+  let mockCardNumber: any;
+  let mockCardExpiry: any;
+  let mockCardCvc: any;
+
+  // DOM mocks
+  let mockScript: HTMLScriptElement;
+  let mockIframe: HTMLIFrameElement;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+
+    // Setup service dependency mocks
+    apiService = mock<ApiService>();
+    logService = mock<LogService>();
+
+    // Setup Stripe element mocks
+    mockCardNumber = {
+      mount: jest.fn(),
+      unmount: jest.fn(),
+    };
+    mockCardExpiry = {
+      mount: jest.fn(),
+      unmount: jest.fn(),
+    };
+    mockCardCvc = {
+      mount: jest.fn(),
+      unmount: jest.fn(),
+    };
+
+    // Setup Stripe Elements mock
+    mockElements = {
+      create: jest.fn((type: string) => {
+        switch (type) {
+          case "cardNumber":
+            return mockCardNumber;
+          case "cardExpiry":
+            return mockCardExpiry;
+          case "cardCvc":
+            return mockCardCvc;
+          default:
+            return null;
+        }
+      }),
+      getElement: jest.fn((type: string) => {
+        switch (type) {
+          case "cardNumber":
+            return mockCardNumber;
+          case "cardExpiry":
+            return mockCardExpiry;
+          case "cardCvc":
+            return mockCardCvc;
+          default:
+            return null;
+        }
+      }),
+    };
+
+    // Setup Stripe instance mock
+    mockStripeInstance = {
+      elements: jest.fn(() => mockElements),
+      confirmCardSetup: jest.fn(),
+      confirmUsBankAccountSetup: jest.fn(),
+    };
+
+    // Setup window.Stripe mock
+    window.Stripe = jest.fn(() => mockStripeInstance);
+
+    // Setup DOM mocks
+    mockScript = {
+      id: "",
+      src: "",
+      onload: null,
+      onerror: null,
+    } as any;
+
+    mockIframe = {
+      src: "https://js.stripe.com/v3/",
+      remove: jest.fn(),
+    } as any;
+
+    jest.spyOn(window.document, "createElement").mockReturnValue(mockScript);
+    jest.spyOn(window.document, "getElementById").mockReturnValue(null);
+    jest.spyOn(window.document.head, "appendChild").mockReturnValue(mockScript);
+    jest.spyOn(window.document.head, "removeChild").mockImplementation(() => mockScript);
+    jest.spyOn(window.document, "querySelectorAll").mockReturnValue([mockIframe] as any);
+
+    // Mock getComputedStyle
+    jest.spyOn(window, "getComputedStyle").mockReturnValue({
+      getPropertyValue: (prop: string) => {
+        const props: Record<string, string> = {
+          "--color-text-main": "0, 0, 0",
+          "--color-text-muted": "128, 128, 128",
+          "--color-danger-600": "220, 38, 38",
+        };
+        return props[prop] || "";
+      },
+    } as any);
+
+    // Create service instance
+    service = new StripeService(apiService, logService);
+  });
+
+  afterEach(() => {
+    jest.clearAllTimers();
+    jest.useRealTimers();
+    jest.restoreAllMocks();
+  });
+
+  // Helper function to trigger script load
+  const triggerScriptLoad = () => {
+    if (mockScript.onload) {
+      mockScript.onload(new Event("load"));
+    }
+  };
+
+  // Helper function to advance timers and flush promises
+  const advanceTimersAndFlush = async (ms: number) => {
+    jest.advanceTimersByTime(ms);
+    await Promise.resolve();
+  };
+
+  describe("createSetupIntent", () => {
+    it("should call API with correct path for card payment", async () => {
+      apiService.send.mockResolvedValue("client_secret_card_123");
+
+      const result = await service.createSetupIntent("card");
+
+      expect(apiService.send).toHaveBeenCalledWith("POST", "/setup-intent/card", null, true, true);
+      expect(result).toBe("client_secret_card_123");
+    });
+
+    it("should call API with correct path for bank account payment", async () => {
+      apiService.send.mockResolvedValue("client_secret_bank_456");
+
+      const result = await service.createSetupIntent("bankAccount");
+
+      expect(apiService.send).toHaveBeenCalledWith(
+        "POST",
+        "/setup-intent/bank-account",
+        null,
+        true,
+        true,
+      );
+      expect(result).toBe("client_secret_bank_456");
+    });
+
+    it("should return client secret from API response", async () => {
+      const expectedSecret = "seti_1234567890_secret_abcdefg";
+      apiService.send.mockResolvedValue(expectedSecret);
+
+      const result = await service.createSetupIntent("card");
+
+      expect(result).toBe(expectedSecret);
+    });
+
+    it("should propagate API errors", async () => {
+      const error = new Error("API error");
+      apiService.send.mockRejectedValue(error);
+
+      await expect(service.createSetupIntent("card")).rejects.toThrow("API error");
+    });
+  });
+
+  describe("loadStripe - initial load", () => {
+    const instanceId = "test-instance-1";
+    const elementIds = {
+      cardNumber: "#card-number",
+      cardExpiry: "#card-expiry",
+      cardCvc: "#card-cvc",
+    };
+
+    it("should create script element with correct attributes", () => {
+      service.loadStripe(instanceId, elementIds, false);
+
+      expect(window.document.createElement).toHaveBeenCalledWith("script");
+      expect(mockScript.id).toBe("stripe-script");
+      expect(mockScript.src).toBe("https://js.stripe.com/v3?advancedFraudSignals=false");
+    });
+
+    it("should append script to document head", () => {
+      service.loadStripe(instanceId, elementIds, false);
+
+      expect(window.document.head.appendChild).toHaveBeenCalledWith(mockScript);
+    });
+
+    it("should initialize Stripe client on script load", async () => {
+      service.loadStripe(instanceId, elementIds, false);
+
+      triggerScriptLoad();
+      await advanceTimersAndFlush(0);
+
+      expect(window.Stripe).toHaveBeenCalledWith(process.env.STRIPE_KEY);
+    });
+
+    it("should create Elements instance and store in Map", async () => {
+      service.loadStripe(instanceId, elementIds, false);
+
+      triggerScriptLoad();
+      await advanceTimersAndFlush(50);
+
+      expect(mockStripeInstance.elements).toHaveBeenCalled();
+      expect(service["instances"].size).toBe(1);
+      expect(service["instances"].get(instanceId)).toBeDefined();
+    });
+
+    it("should increment instanceCount", async () => {
+      service.loadStripe(instanceId, elementIds, false);
+
+      triggerScriptLoad();
+      await advanceTimersAndFlush(50);
+
+      expect(service["instanceCount"]).toBe(1);
+    });
+  });
+
+  describe("loadStripe - already loaded", () => {
+    const instanceId1 = "instance-1";
+    const instanceId2 = "instance-2";
+    const elementIds = {
+      cardNumber: "#card-number",
+      cardExpiry: "#card-expiry",
+      cardCvc: "#card-cvc",
+    };
+
+    beforeEach(async () => {
+      // Load first instance to initialize Stripe
+      service.loadStripe(instanceId1, elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+    });
+
+    it("should not create new script if already loaded", () => {
+      jest.clearAllMocks();
+
+      service.loadStripe(instanceId2, elementIds, false);
+
+      expect(window.document.createElement).not.toHaveBeenCalled();
+      expect(window.document.head.appendChild).not.toHaveBeenCalled();
+    });
+
+    it("should immediately initialize instance when script loaded", async () => {
+      service.loadStripe(instanceId2, elementIds, false);
+      await advanceTimersAndFlush(50);
+
+      expect(service["instances"].size).toBe(2);
+      expect(service["instances"].get(instanceId2)).toBeDefined();
+    });
+
+    it("should increment instanceCount correctly", async () => {
+      expect(service["instanceCount"]).toBe(1);
+
+      service.loadStripe(instanceId2, elementIds, false);
+      await advanceTimersAndFlush(50);
+
+      expect(service["instanceCount"]).toBe(2);
+    });
+  });
+
+  describe("loadStripe - concurrent calls", () => {
+    const elementIds = {
+      cardNumber: "#card-number",
+      cardExpiry: "#card-expiry",
+      cardCvc: "#card-cvc",
+    };
+
+    it("should handle multiple loadStripe calls sequentially", async () => {
+      // Test practical scenario: load instances one after another
+      service.loadStripe("instance-1", elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+
+      service.loadStripe("instance-2", elementIds, false);
+      await advanceTimersAndFlush(100);
+
+      service.loadStripe("instance-3", elementIds, false);
+      await advanceTimersAndFlush(100);
+
+      // All instances should be initialized
+      expect(service["instances"].size).toBe(3);
+      expect(service["instanceCount"]).toBe(3);
+      expect(service["instances"].get("instance-1")).toBeDefined();
+      expect(service["instances"].get("instance-2")).toBeDefined();
+      expect(service["instances"].get("instance-3")).toBeDefined();
+    });
+
+    it("should share Stripe client across instances", async () => {
+      // Load first instance
+      service.loadStripe("instance-1", elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+
+      const stripeClientAfterFirst = service["stripe"];
+      expect(stripeClientAfterFirst).toBeDefined();
+
+      // Load second instance
+      service.loadStripe("instance-2", elementIds, false);
+      await advanceTimersAndFlush(100);
+
+      // Should reuse the same Stripe client
+      expect(service["stripe"]).toBe(stripeClientAfterFirst);
+      expect(service["instances"].size).toBe(2);
+    });
+  });
+
+  describe("mountElements - success path", () => {
+    const instanceId = "mount-test-instance";
+    const elementIds = {
+      cardNumber: "#card-number-mount",
+      cardExpiry: "#card-expiry-mount",
+      cardCvc: "#card-cvc-mount",
+    };
+
+    beforeEach(async () => {
+      service.loadStripe(instanceId, elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+    });
+
+    it("should mount all three card elements to DOM", async () => {
+      service.mountElements(instanceId);
+      await advanceTimersAndFlush(100);
+
+      expect(mockCardNumber.mount).toHaveBeenCalledWith("#card-number-mount");
+      expect(mockCardExpiry.mount).toHaveBeenCalledWith("#card-expiry-mount");
+      expect(mockCardCvc.mount).toHaveBeenCalledWith("#card-cvc-mount");
+    });
+
+    it("should use correct element IDs from instance", async () => {
+      const customIds = {
+        cardNumber: "#custom-card",
+        cardExpiry: "#custom-expiry",
+        cardCvc: "#custom-cvc",
+      };
+
+      service.loadStripe("custom-instance", customIds, false);
+      await advanceTimersAndFlush(100);
+
+      service.mountElements("custom-instance");
+      await advanceTimersAndFlush(100);
+
+      expect(mockCardNumber.mount).toHaveBeenCalledWith("#custom-card");
+      expect(mockCardExpiry.mount).toHaveBeenCalledWith("#custom-expiry");
+      expect(mockCardCvc.mount).toHaveBeenCalledWith("#custom-cvc");
+    });
+
+    it("should handle autoMount flag correctly", async () => {
+      const autoMountId = "auto-mount-instance";
+      jest.clearAllMocks();
+
+      service.loadStripe(autoMountId, elementIds, true);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(150);
+
+      // Should auto-mount without explicit call
+      expect(mockCardNumber.mount).toHaveBeenCalled();
+      expect(mockCardExpiry.mount).toHaveBeenCalled();
+      expect(mockCardCvc.mount).toHaveBeenCalled();
+    });
+  });
+
+  describe("mountElements - retry logic", () => {
+    const elementIds = {
+      cardNumber: "#card-number",
+      cardExpiry: "#card-expiry",
+      cardCvc: "#card-cvc",
+    };
+
+    it("should retry if instance not found", async () => {
+      service.mountElements("non-existent-instance");
+      await advanceTimersAndFlush(100);
+
+      expect(logService.warning).toHaveBeenCalledWith(
+        expect.stringContaining("Stripe instance non-existent-instance not found"),
+      );
+    });
+
+    it("should log error after 10 failed attempts", async () => {
+      service.mountElements("non-existent-instance");
+
+      for (let i = 0; i < 10; i++) {
+        await advanceTimersAndFlush(100);
+      }
+
+      expect(logService.error).toHaveBeenCalledWith(
+        expect.stringContaining("not found after 10 attempts"),
+      );
+    });
+
+    it("should retry if elements not ready", async () => {
+      const instanceId = "retry-elements-instance";
+      service.loadStripe(instanceId, elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+
+      // Make elements temporarily unavailable
+      mockElements.getElement.mockReturnValueOnce(null);
+      mockElements.getElement.mockReturnValueOnce(null);
+      mockElements.getElement.mockReturnValueOnce(null);
+
+      service.mountElements(instanceId);
+      await advanceTimersAndFlush(100);
+
+      expect(logService.warning).toHaveBeenCalledWith(
+        expect.stringContaining("Some Stripe card elements"),
+      );
+    });
+  });
+
+  describe("setupCardPaymentMethod", () => {
+    const instanceId = "card-setup-instance";
+    const clientSecret = "seti_card_secret_123";
+    const elementIds = {
+      cardNumber: "#card-number",
+      cardExpiry: "#card-expiry",
+      cardCvc: "#card-cvc",
+    };
+
+    beforeEach(async () => {
+      service.loadStripe(instanceId, elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+    });
+
+    it("should call Stripe confirmCardSetup with correct parameters", async () => {
+      mockStripeInstance.confirmCardSetup.mockResolvedValue({
+        setupIntent: { status: "succeeded", payment_method: "pm_card_123" },
+      });
+
+      await service.setupCardPaymentMethod(instanceId, clientSecret);
+
+      expect(mockStripeInstance.confirmCardSetup).toHaveBeenCalledWith(clientSecret, {
+        payment_method: {
+          card: mockCardNumber,
+        },
+      });
+    });
+
+    it("should include billing details when provided", async () => {
+      mockStripeInstance.confirmCardSetup.mockResolvedValue({
+        setupIntent: { status: "succeeded", payment_method: "pm_card_123" },
+      });
+
+      const billingDetails = { country: "US", postalCode: "12345" };
+      await service.setupCardPaymentMethod(instanceId, clientSecret, billingDetails);
+
+      expect(mockStripeInstance.confirmCardSetup).toHaveBeenCalledWith(clientSecret, {
+        payment_method: {
+          card: mockCardNumber,
+          billing_details: {
+            address: {
+              country: "US",
+              postal_code: "12345",
+            },
+          },
+        },
+      });
+    });
+
+    it("should throw error if instance not found", async () => {
+      await expect(service.setupCardPaymentMethod("non-existent", clientSecret)).rejects.toThrow(
+        "Payment method initialization failed. Please try again.",
+      );
+      expect(logService.error).toHaveBeenCalledWith(
+        expect.stringContaining("Stripe instance non-existent not found"),
+      );
+    });
+
+    it("should throw error if setup fails", async () => {
+      const error = { message: "Card declined" };
+      mockStripeInstance.confirmCardSetup.mockResolvedValue({ error });
+
+      await expect(service.setupCardPaymentMethod(instanceId, clientSecret)).rejects.toEqual(error);
+      expect(logService.error).toHaveBeenCalledWith(error);
+    });
+
+    it("should throw error if status is not succeeded", async () => {
+      const error = { message: "Invalid status" };
+      mockStripeInstance.confirmCardSetup.mockResolvedValue({
+        setupIntent: { status: "requires_action" },
+        error,
+      });
+
+      await expect(service.setupCardPaymentMethod(instanceId, clientSecret)).rejects.toEqual(error);
+    });
+
+    it("should return payment method ID on success", async () => {
+      mockStripeInstance.confirmCardSetup.mockResolvedValue({
+        setupIntent: { status: "succeeded", payment_method: "pm_card_success_123" },
+      });
+
+      const result = await service.setupCardPaymentMethod(instanceId, clientSecret);
+
+      expect(result).toBe("pm_card_success_123");
+    });
+  });
+
+  describe("setupBankAccountPaymentMethod", () => {
+    const clientSecret = "seti_bank_secret_456";
+    const bankAccount: BankAccount = {
+      accountHolderName: "John Doe",
+      routingNumber: "110000000",
+      accountNumber: "000123456789",
+      accountHolderType: "individual",
+    };
+
+    beforeEach(async () => {
+      // Initialize Stripe instance for bank account tests
+      service.loadStripe(
+        "bank-test-instance",
+        {
+          cardNumber: "#card",
+          cardExpiry: "#expiry",
+          cardCvc: "#cvc",
+        },
+        false,
+      );
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+    });
+
+    it("should call Stripe confirmUsBankAccountSetup with bank details", async () => {
+      mockStripeInstance.confirmUsBankAccountSetup.mockResolvedValue({
+        setupIntent: { status: "requires_action", payment_method: "pm_bank_123" },
+      });
+
+      await service.setupBankAccountPaymentMethod(clientSecret, bankAccount);
+
+      expect(mockStripeInstance.confirmUsBankAccountSetup).toHaveBeenCalledWith(clientSecret, {
+        payment_method: {
+          us_bank_account: {
+            routing_number: "110000000",
+            account_number: "000123456789",
+            account_holder_type: "individual",
+          },
+          billing_details: {
+            name: "John Doe",
+          },
+        },
+      });
+    });
+
+    it("should include billing address when provided", async () => {
+      mockStripeInstance.confirmUsBankAccountSetup.mockResolvedValue({
+        setupIntent: { status: "requires_action", payment_method: "pm_bank_123" },
+      });
+
+      const billingDetails = { country: "US", postalCode: "90210" };
+      await service.setupBankAccountPaymentMethod(clientSecret, bankAccount, billingDetails);
+
+      expect(mockStripeInstance.confirmUsBankAccountSetup).toHaveBeenCalledWith(clientSecret, {
+        payment_method: {
+          us_bank_account: {
+            routing_number: "110000000",
+            account_number: "000123456789",
+            account_holder_type: "individual",
+          },
+          billing_details: {
+            name: "John Doe",
+            address: {
+              country: "US",
+              postal_code: "90210",
+            },
+          },
+        },
+      });
+    });
+
+    it("should omit billing address when not provided", async () => {
+      mockStripeInstance.confirmUsBankAccountSetup.mockResolvedValue({
+        setupIntent: { status: "requires_action", payment_method: "pm_bank_123" },
+      });
+
+      await service.setupBankAccountPaymentMethod(clientSecret, bankAccount);
+
+      const call = mockStripeInstance.confirmUsBankAccountSetup.mock.calls[0][1];
+      expect(call.payment_method.billing_details.address).toBeUndefined();
+    });
+
+    it("should validate status is requires_action", async () => {
+      const error = { message: "Invalid status" };
+      mockStripeInstance.confirmUsBankAccountSetup.mockResolvedValue({
+        setupIntent: { status: "succeeded" },
+        error,
+      });
+
+      await expect(
+        service.setupBankAccountPaymentMethod(clientSecret, bankAccount),
+      ).rejects.toEqual(error);
+    });
+
+    it("should return payment method ID on success", async () => {
+      mockStripeInstance.confirmUsBankAccountSetup.mockResolvedValue({
+        setupIntent: { status: "requires_action", payment_method: "pm_bank_success_456" },
+      });
+
+      const result = await service.setupBankAccountPaymentMethod(clientSecret, bankAccount);
+
+      expect(result).toBe("pm_bank_success_456");
+    });
+  });
+
+  describe("unloadStripe - single instance", () => {
+    const instanceId = "unload-test-instance";
+    const elementIds = {
+      cardNumber: "#card-number",
+      cardExpiry: "#card-expiry",
+      cardCvc: "#card-cvc",
+    };
+
+    beforeEach(async () => {
+      service.loadStripe(instanceId, elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+    });
+
+    it("should unmount all card elements", () => {
+      service.unloadStripe(instanceId);
+
+      expect(mockCardNumber.unmount).toHaveBeenCalled();
+      expect(mockCardExpiry.unmount).toHaveBeenCalled();
+      expect(mockCardCvc.unmount).toHaveBeenCalled();
+    });
+
+    it("should remove instance from Map", () => {
+      expect(service["instances"].has(instanceId)).toBe(true);
+
+      service.unloadStripe(instanceId);
+
+      expect(service["instances"].has(instanceId)).toBe(false);
+    });
+
+    it("should decrement instanceCount", () => {
+      expect(service["instanceCount"]).toBe(1);
+
+      service.unloadStripe(instanceId);
+
+      expect(service["instanceCount"]).toBe(0);
+    });
+
+    it("should remove script when last instance unloaded", () => {
+      jest.spyOn(window.document, "getElementById").mockReturnValue(mockScript);
+
+      service.unloadStripe(instanceId);
+
+      expect(window.document.head.removeChild).toHaveBeenCalledWith(mockScript);
+    });
+
+    it("should remove Stripe iframes after cleanup delay", async () => {
+      service.unloadStripe(instanceId);
+
+      await advanceTimersAndFlush(500);
+
+      expect(window.document.querySelectorAll).toHaveBeenCalledWith("iframe");
+      expect(mockIframe.remove).toHaveBeenCalled();
+    });
+  });
+
+  describe("unloadStripe - multiple instances", () => {
+    const elementIds = {
+      cardNumber: "#card-number",
+      cardExpiry: "#card-expiry",
+      cardCvc: "#card-cvc",
+    };
+
+    beforeEach(async () => {
+      // Load first instance
+      service.loadStripe("instance-1", elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+
+      // Load second instance (script already loaded)
+      service.loadStripe("instance-2", elementIds, false);
+      await advanceTimersAndFlush(100);
+    });
+
+    it("should not remove script when other instances exist", () => {
+      expect(service["instanceCount"]).toBe(2);
+
+      service.unloadStripe("instance-1");
+
+      expect(service["instanceCount"]).toBe(1);
+      expect(window.document.head.removeChild).not.toHaveBeenCalled();
+    });
+
+    it("should only cleanup specific instance", () => {
+      service.unloadStripe("instance-1");
+
+      expect(service["instances"].has("instance-1")).toBe(false);
+      expect(service["instances"].has("instance-2")).toBe(true);
+    });
+
+    it("should handle reference counting correctly", () => {
+      expect(service["instanceCount"]).toBe(2);
+
+      service.unloadStripe("instance-1");
+      expect(service["instanceCount"]).toBe(1);
+
+      service.unloadStripe("instance-2");
+      expect(service["instanceCount"]).toBe(0);
+    });
+  });
+
+  describe("unloadStripe - edge cases", () => {
+    it("should handle unload of non-existent instance gracefully", () => {
+      expect(() => service.unloadStripe("non-existent")).not.toThrow();
+      expect(service["instanceCount"]).toBe(0);
+    });
+
+    it("should handle duplicate unload calls", async () => {
+      const instanceId = "duplicate-unload";
+      const elementIds = {
+        cardNumber: "#card-number",
+        cardExpiry: "#card-expiry",
+        cardCvc: "#card-cvc",
+      };
+
+      service.loadStripe(instanceId, elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+
+      service.unloadStripe(instanceId);
+      expect(service["instanceCount"]).toBe(0);
+
+      service.unloadStripe(instanceId);
+      expect(service["instanceCount"]).toBe(0); // Should not go negative
+    });
+
+    it("should catch and log element unmount errors", async () => {
+      const instanceId = "error-unmount";
+      const elementIds = {
+        cardNumber: "#card-number",
+        cardExpiry: "#card-expiry",
+        cardCvc: "#card-cvc",
+      };
+
+      service.loadStripe(instanceId, elementIds, false);
+      triggerScriptLoad();
+      await advanceTimersAndFlush(100);
+
+      const unmountError = new Error("Unmount failed");
+      mockCardNumber.unmount.mockImplementation(() => {
+        throw unmountError;
+      });
+
+      service.unloadStripe(instanceId);
+
+      expect(logService.error).toHaveBeenCalledWith(
+        expect.stringContaining("Error unmounting Stripe elements"),
+        unmountError,
+      );
+    });
+  });
+
+  describe("element styling", () => {
+    it("should apply correct CSS custom properties", () => {
+      const options = service["getElementOptions"]("cardNumber");
+
+      expect(options.style.base.color).toBe("rgb(0, 0, 0)");
+      expect(options.style.base["::placeholder"].color).toBe("rgb(128, 128, 128)");
+      expect(options.style.invalid.color).toBe("rgb(0, 0, 0)");
+      expect(options.style.invalid.borderColor).toBe("rgb(220, 38, 38)");
+    });
+
+    it("should remove placeholder for cardNumber and cardCvc", () => {
+      const cardNumberOptions = service["getElementOptions"]("cardNumber");
+      const cardCvcOptions = service["getElementOptions"]("cardCvc");
+      const cardExpiryOptions = service["getElementOptions"]("cardExpiry");
+
+      expect(cardNumberOptions.placeholder).toBe("");
+      expect(cardCvcOptions.placeholder).toBe("");
+      expect(cardExpiryOptions.placeholder).toBeUndefined();
+    });
+  });
+});
diff --git a/apps/web/src/app/billing/services/stripe.service.ts b/apps/web/src/app/billing/services/stripe.service.ts
index 7ea0d7d52c8..9aabab9beb0 100644
--- a/apps/web/src/app/billing/services/stripe.service.ts
+++ b/apps/web/src/app/billing/services/stripe.service.ts
@@ -8,8 +8,6 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 
 import { BankAccountPaymentMethod, CardPaymentMethod } from "../payment/types";
 
-import { BillingServicesModule } from "./billing-services.module";
-
 type SetupBankAccountRequest = {
   payment_method: {
     us_bank_account: {
@@ -39,15 +37,21 @@ type SetupCardRequest = {
   };
 };
 
-@Injectable({ providedIn: BillingServicesModule })
+@Injectable({ providedIn: "root" })
 export class StripeService {
-  private stripe: any;
-  private elements: any;
-  private elementIds: {
-    cardNumber: string;
-    cardExpiry: string;
-    cardCvc: string;
-  };
+  // Shared/Global - One Stripe client for entire application
+  private stripe: any = null;
+  private stripeScriptLoaded = false;
+  private instanceCount = 0;
+
+  // Per-Instance - Isolated Elements for each component
+  private instances = new Map<
+    string,
+    {
+      elements: any;
+      elementIds: { cardNumber: string; cardExpiry: string; cardCvc: string };
+    }
+  >();
 
   constructor(
     private apiService: ApiService,
@@ -76,53 +80,121 @@ export class StripeService {
    * Loads [Stripe JS]{@link https://docs.stripe.com/js} in the <head> element of the current page and mounts
    * Stripe credit card [elements]{@link https://docs.stripe.com/js/elements_object/create} into the HTML elements with the provided element IDS.
    * We do this to avoid having to load the Stripe JS SDK on every page of the Web Vault given many pages contain sensitive information.
+   * @param instanceId - Unique identifier for this component instance.
    * @param elementIds - The ID attributes of the HTML elements used to load the Stripe JS credit card elements.
    * @param autoMount - A flag indicating whether you want to immediately mount the Stripe credit card elements.
    */
   loadStripe(
+    instanceId: string,
     elementIds: { cardNumber: string; cardExpiry: string; cardCvc: string },
     autoMount: boolean,
   ) {
-    this.elementIds = elementIds;
-    const script = window.document.createElement("script");
-    script.id = "stripe-script";
-    script.src = "https://js.stripe.com/v3?advancedFraudSignals=false";
-    script.onload = async () => {
-      const window$ = window as any;
-      this.stripe = window$.Stripe(process.env.STRIPE_KEY);
-      this.elements = this.stripe.elements();
-      setTimeout(() => {
-        this.elements.create("cardNumber", this.getElementOptions("cardNumber"));
-        this.elements.create("cardExpiry", this.getElementOptions("cardExpiry"));
-        this.elements.create("cardCvc", this.getElementOptions("cardCvc"));
-        if (autoMount) {
-          this.mountElements();
-        }
-      }, 50);
-    };
+    // Check if script is already loaded
+    if (this.stripeScriptLoaded) {
+      // Script already loaded, initialize this instance immediately
+      this.initializeInstance(instanceId, elementIds, autoMount);
+    } else if (!window.document.getElementById("stripe-script")) {
+      // Script not loaded and not loading, start loading it
+      const script = window.document.createElement("script");
+      script.id = "stripe-script";
+      script.src = "https://js.stripe.com/v3?advancedFraudSignals=false";
+      script.onload = async () => {
+        const window$ = window as any;
+        this.stripe = window$.Stripe(process.env.STRIPE_KEY);
+        this.stripeScriptLoaded = true; // Mark as loaded after script loads
 
-    window.document.head.appendChild(script);
+        // Initialize this instance after script loads
+        this.initializeInstance(instanceId, elementIds, autoMount);
+      };
+      window.document.head.appendChild(script);
+    } else {
+      // Script is currently loading, wait for it
+      this.initializeInstance(instanceId, elementIds, autoMount);
+    }
   }
 
-  mountElements(attempt: number = 1) {
-    setTimeout(() => {
-      if (!this.elements) {
-        this.logService.warning(`Stripe elements are missing, retrying for attempt ${attempt}...`);
-        this.mountElements(attempt + 1);
+  private initializeInstance(
+    instanceId: string,
+    elementIds: { cardNumber: string; cardExpiry: string; cardCvc: string },
+    autoMount: boolean,
+    attempt: number = 1,
+  ) {
+    // Wait for stripe to be available if script just loaded
+    if (!this.stripe) {
+      if (attempt < 10) {
+        this.logService.warning(
+          `Stripe not yet loaded for instance ${instanceId}, retrying attempt ${attempt}...`,
+        );
+        setTimeout(
+          () => this.initializeInstance(instanceId, elementIds, autoMount, attempt + 1),
+          50,
+        );
       } else {
-        const cardNumber = this.elements.getElement("cardNumber");
-        const cardExpiry = this.elements.getElement("cardExpiry");
-        const cardCVC = this.elements.getElement("cardCvc");
+        this.logService.error(
+          `Stripe failed to load for instance ${instanceId} after ${attempt} attempts`,
+        );
+      }
+      return;
+    }
+
+    // Create a new Elements instance for this component
+    const elements = this.stripe.elements();
+
+    // Store instance data
+    this.instances.set(instanceId, { elements, elementIds });
+
+    // Increment instance count now that instance is successfully initialized
+    this.instanceCount++;
+
+    // Create the card elements
+    setTimeout(() => {
+      elements.create("cardNumber", this.getElementOptions("cardNumber"));
+      elements.create("cardExpiry", this.getElementOptions("cardExpiry"));
+      elements.create("cardCvc", this.getElementOptions("cardCvc"));
+
+      if (autoMount) {
+        this.mountElements(instanceId);
+      }
+    }, 50);
+  }
+
+  mountElements(instanceId: string, attempt: number = 1) {
+    setTimeout(() => {
+      const instance = this.instances.get(instanceId);
+
+      if (!instance) {
+        if (attempt < 10) {
+          this.logService.warning(
+            `Stripe instance ${instanceId} not found, retrying for attempt ${attempt}...`,
+          );
+          this.mountElements(instanceId, attempt + 1);
+        } else {
+          this.logService.error(
+            `Stripe instance ${instanceId} not found after ${attempt} attempts`,
+          );
+        }
+        return;
+      }
+
+      if (!instance.elements) {
+        this.logService.warning(
+          `Stripe elements for instance ${instanceId} are missing, retrying for attempt ${attempt}...`,
+        );
+        this.mountElements(instanceId, attempt + 1);
+      } else {
+        const cardNumber = instance.elements.getElement("cardNumber");
+        const cardExpiry = instance.elements.getElement("cardExpiry");
+        const cardCVC = instance.elements.getElement("cardCvc");
 
         if ([cardNumber, cardExpiry, cardCVC].some((element) => !element)) {
           this.logService.warning(
-            `Some Stripe card elements are missing, retrying for attempt ${attempt}...`,
+            `Some Stripe card elements for instance ${instanceId} are missing, retrying for attempt ${attempt}...`,
           );
-          this.mountElements(attempt + 1);
+          this.mountElements(instanceId, attempt + 1);
         } else {
-          cardNumber.mount(this.elementIds.cardNumber);
-          cardExpiry.mount(this.elementIds.cardExpiry);
-          cardCVC.mount(this.elementIds.cardCvc);
+          cardNumber.mount(instance.elementIds.cardNumber);
+          cardExpiry.mount(instance.elementIds.cardExpiry);
+          cardCVC.mount(instance.elementIds.cardCvc);
         }
       }
     }, 100);
@@ -132,6 +204,9 @@ export class StripeService {
    * Creates a Stripe [SetupIntent]{@link https://docs.stripe.com/api/setup_intents} and uses the resulting client secret
    * to invoke the Stripe JS [confirmUsBankAccountSetup]{@link https://docs.stripe.com/js/setup_intents/confirm_us_bank_account_setup} method,
    * thereby creating and storing a Stripe [PaymentMethod]{@link https://docs.stripe.com/api/payment_methods}.
+   * @param clientSecret - The client secret from the SetupIntent.
+   * @param bankAccount - The bank account details.
+   * @param billingDetails - Optional billing details.
    * @returns The ID of the newly created PaymentMethod.
    */
   async setupBankAccountPaymentMethod(
@@ -171,13 +246,28 @@ export class StripeService {
    * Creates a Stripe [SetupIntent]{@link https://docs.stripe.com/api/setup_intents} and uses the resulting client secret
    * to invoke the Stripe JS [confirmCardSetup]{@link https://docs.stripe.com/js/setup_intents/confirm_card_setup} method,
    * thereby creating and storing a Stripe [PaymentMethod]{@link https://docs.stripe.com/api/payment_methods}.
+   * @param instanceId - Unique identifier for the component instance.
+   * @param clientSecret - The client secret from the SetupIntent.
+   * @param billingDetails - Optional billing details.
    * @returns The ID of the newly created PaymentMethod.
    */
   async setupCardPaymentMethod(
+    instanceId: string,
     clientSecret: string,
     billingDetails?: { country: string; postalCode: string },
   ): Promise<string> {
-    const cardNumber = this.elements.getElement("cardNumber");
+    const instance = this.instances.get(instanceId);
+    if (!instance) {
+      const availableInstances = Array.from(this.instances.keys());
+      this.logService.error(
+        `Stripe instance ${instanceId} not found. ` +
+          `Available instances: [${availableInstances.join(", ")}]. ` +
+          `This may occur if the component was destroyed during the payment flow.`,
+      );
+      throw new Error("Payment method initialization failed. Please try again.");
+    }
+
+    const cardNumber = instance.elements.getElement("cardNumber");
     const request: SetupCardRequest = {
       payment_method: {
         card: cardNumber,
@@ -200,24 +290,77 @@ export class StripeService {
   }
 
   /**
-   * Removes {@link https://docs.stripe.com/js} from the <head> element of the current page as well as all
-   * Stripe-managed <iframe> elements.
+   * Removes the Stripe Elements instance for the specified component.
+   * Only removes the Stripe script and iframes when the last instance is unloaded.
+   * @param instanceId - Unique identifier for the component instance to unload.
    */
-  unloadStripe() {
-    const script = window.document.getElementById("stripe-script");
-    window.document.head.removeChild(script);
-    window.setTimeout(() => {
-      const iFrames = Array.from(window.document.querySelectorAll("iframe")).filter(
-        (element) => element.src != null && element.src.indexOf("stripe") > -1,
-      );
-      iFrames.forEach((iFrame) => {
-        try {
-          window.document.body.removeChild(iFrame);
-        } catch (error) {
-          this.logService.error(error);
+  unloadStripe(instanceId: string) {
+    const instance = this.instances.get(instanceId);
+
+    // Only proceed if instance was actually initialized
+    if (!instance) {
+      return;
+    }
+
+    // Unmount all elements for this instance
+    if (instance.elements) {
+      try {
+        const cardNumber = instance.elements.getElement("cardNumber");
+        const cardExpiry = instance.elements.getElement("cardExpiry");
+        const cardCvc = instance.elements.getElement("cardCvc");
+
+        if (cardNumber) {
+          cardNumber.unmount();
         }
-      });
-    }, 500);
+        if (cardExpiry) {
+          cardExpiry.unmount();
+        }
+        if (cardCvc) {
+          cardCvc.unmount();
+        }
+      } catch (error) {
+        this.logService.error(
+          `Error unmounting Stripe elements for instance ${instanceId}:`,
+          error,
+        );
+      }
+    }
+
+    // Remove instance from map
+    this.instances.delete(instanceId);
+
+    // Decrement instance count (only if instance was initialized)
+    this.instanceCount--;
+
+    // Only remove script and iframes when no instances remain
+    if (this.instanceCount <= 0) {
+      if (this.instanceCount < 0) {
+        this.logService.error(
+          `Stripe instance count became negative (${this.instanceCount}). This indicates a reference counting bug.`,
+        );
+      }
+      this.instanceCount = 0;
+      this.stripeScriptLoaded = false;
+      this.stripe = null;
+
+      const script = window.document.getElementById("stripe-script");
+      if (script) {
+        window.document.head.removeChild(script);
+      }
+
+      window.setTimeout(() => {
+        const iFrames = Array.from(window.document.querySelectorAll("iframe")).filter(
+          (element) => element.src != null && element.src.indexOf("stripe") > -1,
+        );
+        iFrames.forEach((iFrame) => {
+          try {
+            iFrame.remove();
+          } catch (error) {
+            this.logService.error(error);
+          }
+        });
+      }, 500);
+    }
   }
 
   private getElementOptions(element: "cardNumber" | "cardExpiry" | "cardCvc"): any {
@@ -226,10 +369,12 @@ export class StripeService {
         base: {
           color: null,
           fontFamily:
-            'Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif, ' +
+            'Inter, "Helvetica Neue", Helvetica, Arial, sans-serif, ' +
             '"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"',
           fontSize: "16px",
           fontSmoothing: "antialiased",
+          lineHeight: "1.5",
+          padding: "8px 12px",
           "::placeholder": {
             color: null,
           },
diff --git a/apps/web/src/app/billing/settings/sponsored-families.component.ts b/apps/web/src/app/billing/settings/sponsored-families.component.ts
index 80e66784ae8..530db0ff397 100644
--- a/apps/web/src/app/billing/settings/sponsored-families.component.ts
+++ b/apps/web/src/app/billing/settings/sponsored-families.component.ts
@@ -33,6 +33,8 @@ interface RequestSponsorshipForm {
   sponsorshipEmail: FormControl<string>;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-sponsored-families",
   templateUrl: "sponsored-families.component.html",
diff --git a/apps/web/src/app/billing/settings/sponsoring-org-row.component.ts b/apps/web/src/app/billing/settings/sponsoring-org-row.component.ts
index 70320e7e62e..6d27130025d 100644
--- a/apps/web/src/app/billing/settings/sponsoring-org-row.component.ts
+++ b/apps/web/src/app/billing/settings/sponsoring-org-row.component.ts
@@ -15,15 +15,23 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "[sponsoring-org-row]",
   templateUrl: "sponsoring-org-row.component.html",
   standalone: false,
 })
 export class SponsoringOrgRowComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() sponsoringOrg: Organization = null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() isSelfHosted = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() sponsorshipRemoved = new EventEmitter();
 
   statusMessage = "loading";
diff --git a/apps/web/src/app/billing/shared/add-credit-dialog.component.html b/apps/web/src/app/billing/shared/add-credit-dialog.component.html
deleted file mode 100644
index 790099df882..00000000000
--- a/apps/web/src/app/billing/shared/add-credit-dialog.component.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog dialogSize="default" [title]="'addCredit' | i18n">
-    <ng-container bitDialogContent>
-      <p bitTypography="body1">{{ "creditDelayed" | i18n }}</p>
-      <div class="tw-grid tw-grid-cols-2">
-        <bit-radio-group formControlName="method">
-          <bit-radio-button id="credit-method-paypal" [value]="paymentMethodType.PayPal">
-            <bit-label> <i class="bwi bwi-paypal"></i>PayPal</bit-label>
-          </bit-radio-button>
-          <bit-radio-button id="credit-method-bitcoin" [value]="paymentMethodType.BitPay">
-            <bit-label> <i class="bwi bwi-bitcoin"></i>Bitcoin</bit-label>
-          </bit-radio-button>
-        </bit-radio-group>
-      </div>
-      <div class="tw-grid tw-grid-cols-2">
-        <bit-form-field>
-          <bit-label>{{ "amount" | i18n }}</bit-label>
-          <input
-            bitInput
-            type="text"
-            formControlName="creditAmount"
-            (blur)="formatAmount()"
-            required
-          />
-          <span bitPrefix>$USD</span>
-        </bit-form-field>
-      </div>
-    </ng-container>
-    <ng-container bitDialogFooter>
-      <button type="submit" bitButton bitFormButton buttonType="primary">
-        {{ "submit" | i18n }}
-      </button>
-      <button
-        type="button"
-        bitButton
-        bitFormButton
-        buttonType="secondary"
-        [bitDialogClose]="DialogResult.Cancelled"
-      >
-        {{ "cancel" | i18n }}
-      </button>
-    </ng-container>
-  </bit-dialog>
-</form>
-<form #ppButtonForm action="{{ ppButtonFormAction }}" method="post" target="_top">
-  <input type="hidden" name="cmd" value="_xclick" />
-  <input type="hidden" name="business" value="{{ ppButtonBusinessId }}" />
-  <input type="hidden" name="button_subtype" value="services" />
-  <input type="hidden" name="no_note" value="1" />
-  <input type="hidden" name="no_shipping" value="1" />
-  <input type="hidden" name="rm" value="1" />
-  <input type="hidden" name="return" value="{{ returnUrl }}" />
-  <input type="hidden" name="cancel_return" value="{{ returnUrl }}" />
-  <input type="hidden" name="currency_code" value="USD" />
-  <input type="hidden" name="image_url" value="https://bitwarden.com/images/paypal-banner.png" />
-  <input type="hidden" name="bn" value="PP-BuyNowBF:btn_buynow_LG.gif:NonHosted" />
-  <input type="hidden" name="amount" value="{{ formGroup.get('creditAmount').value }}" />
-  <input type="hidden" name="custom" value="{{ ppButtonCustomField }}" />
-  <input type="hidden" name="item_name" value="Bitwarden Account Credit" />
-  <input type="hidden" name="item_number" value="{{ subject }}" />
-</form>
diff --git a/apps/web/src/app/billing/shared/add-credit-dialog.component.ts b/apps/web/src/app/billing/shared/add-credit-dialog.component.ts
deleted file mode 100644
index cdf72168acf..00000000000
--- a/apps/web/src/app/billing/shared/add-credit-dialog.component.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, ElementRef, Inject, OnInit, ViewChild } from "@angular/core";
-import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { firstValueFrom, map } from "rxjs";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { BitPayInvoiceRequest } from "@bitwarden/common/billing/models/request/bit-pay-invoice.request";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
-
-export interface AddCreditDialogData {
-  organizationId: string;
-}
-
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum AddCreditDialogResult {
-  Added = "added",
-  Cancelled = "cancelled",
-}
-
-export type PayPalConfig = {
-  businessId?: string;
-  buttonAction?: string;
-};
-
-@Component({
-  templateUrl: "add-credit-dialog.component.html",
-  standalone: false,
-})
-export class AddCreditDialogComponent implements OnInit {
-  @ViewChild("ppButtonForm", { read: ElementRef, static: true }) ppButtonFormRef: ElementRef;
-
-  paymentMethodType = PaymentMethodType;
-  ppButtonFormAction: string;
-  ppButtonBusinessId: string;
-  ppButtonCustomField: string;
-  ppLoading = false;
-  subject: string;
-  returnUrl: string;
-  organizationId: string;
-
-  private userId: string;
-  private name: string;
-  private email: string;
-  private region: string;
-
-  protected DialogResult = AddCreditDialogResult;
-  protected formGroup = new FormGroup({
-    method: new FormControl(PaymentMethodType.PayPal),
-    creditAmount: new FormControl(null, [Validators.required]),
-  });
-
-  constructor(
-    private dialogRef: DialogRef,
-    @Inject(DIALOG_DATA) protected data: AddCreditDialogData,
-    private accountService: AccountService,
-    private apiService: ApiService,
-    private platformUtilsService: PlatformUtilsService,
-    private organizationService: OrganizationService,
-    private logService: LogService,
-    private configService: ConfigService,
-  ) {
-    this.organizationId = data.organizationId;
-    const payPalConfig = process.env.PAYPAL_CONFIG as PayPalConfig;
-    this.ppButtonFormAction = payPalConfig.buttonAction;
-    this.ppButtonBusinessId = payPalConfig.businessId;
-  }
-
-  async ngOnInit() {
-    if (this.organizationId != null) {
-      if (this.creditAmount == null) {
-        this.creditAmount = "0.00";
-      }
-      this.ppButtonCustomField = "organization_id:" + this.organizationId;
-      const userId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-      );
-      const org = await firstValueFrom(
-        this.organizationService
-          .organizations$(userId)
-          .pipe(getOrganizationById(this.organizationId)),
-      );
-      if (org != null) {
-        this.subject = org.name;
-        this.name = org.name;
-      }
-    } else {
-      if (this.creditAmount == null) {
-        this.creditAmount = "0.00";
-      }
-      const [userId, email] = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => [a?.id, a?.email])),
-      );
-      this.userId = userId;
-      this.subject = email;
-      this.email = this.subject;
-      this.ppButtonCustomField = "user_id:" + this.userId;
-    }
-    this.region = await firstValueFrom(this.configService.cloudRegion$);
-    this.ppButtonCustomField += ",account_credit:1";
-    this.ppButtonCustomField += `,region:${this.region}`;
-    this.returnUrl = window.location.href;
-  }
-
-  get creditAmount() {
-    return this.formGroup.value.creditAmount;
-  }
-  set creditAmount(value: string) {
-    this.formGroup.get("creditAmount").setValue(value);
-  }
-
-  get method() {
-    return this.formGroup.value.method;
-  }
-
-  submit = async () => {
-    if (this.creditAmount == null || this.creditAmount === "") {
-      return;
-    }
-
-    if (this.method === PaymentMethodType.PayPal) {
-      this.ppButtonFormRef.nativeElement.submit();
-      this.ppLoading = true;
-      return;
-    }
-    if (this.method === PaymentMethodType.BitPay) {
-      const req = new BitPayInvoiceRequest();
-      req.email = this.email;
-      req.name = this.name;
-      req.credit = true;
-      req.amount = this.creditAmountNumber;
-      req.organizationId = this.organizationId;
-      req.userId = this.userId;
-      req.returnUrl = this.returnUrl;
-      const bitPayUrl: string = await this.apiService.postBitPayInvoice(req);
-      this.platformUtilsService.launchUri(bitPayUrl);
-      return;
-    }
-    this.dialogRef.close(AddCreditDialogResult.Added);
-  };
-
-  formatAmount() {
-    try {
-      if (this.creditAmount != null && this.creditAmount !== "") {
-        const floatAmount = Math.abs(parseFloat(this.creditAmount));
-        if (floatAmount > 0) {
-          this.creditAmount = parseFloat((Math.round(floatAmount * 100) / 100).toString())
-            .toFixed(2)
-            .toString();
-          return;
-        }
-      }
-    } catch (e) {
-      this.logService.error(e);
-    }
-    this.creditAmount = "";
-  }
-
-  get creditAmountNumber(): number {
-    if (this.creditAmount != null && this.creditAmount !== "") {
-      try {
-        return parseFloat(this.creditAmount);
-      } catch (e) {
-        this.logService.error(e);
-      }
-    }
-    return null;
-  }
-}
-
-/**
- * Strongly typed helper to open a AddCreditDialog
- * @param dialogService Instance of the dialog service that will be used to open the dialog
- * @param config Configuration for the dialog
- */
-export function openAddCreditDialog(
-  dialogService: DialogService,
-  config: DialogConfig<AddCreditDialogData>,
-) {
-  return dialogService.open<AddCreditDialogResult>(AddCreditDialogComponent, config);
-}
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
deleted file mode 100644
index 9c70908af8e..00000000000
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<bit-dialog dialogSize="large" [title]="dialogHeader" [loading]="loading">
-  <ng-container bitDialogContent>
-    <app-payment
-      [showAccountCredit]="false"
-      [showBankAccount]="!!organizationId || !!providerId"
-      [initialPaymentMethod]="initialPaymentMethod"
-    ></app-payment>
-    <app-manage-tax-information
-      *ngIf="taxInformation"
-      [showTaxIdField]="showTaxIdField"
-      [startWith]="taxInformation"
-      (taxInformationChanged)="taxInformationChanged($event)"
-    />
-  </ng-container>
-  <ng-container bitDialogFooter>
-    <button type="submit" bitButton bitFormButton buttonType="primary" [bitAction]="submit">
-      {{ "submit" | i18n }}
-    </button>
-    <button
-      type="button"
-      bitButton
-      bitFormButton
-      buttonType="secondary"
-      [bitDialogClose]="ResultType.Closed"
-    >
-      {{ "cancel" | i18n }}
-    </button>
-  </ng-container>
-</bit-dialog>
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts
deleted file mode 100644
index 9944085488f..00000000000
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, forwardRef, Inject, OnInit, ViewChild } from "@angular/core";
-
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-import { PaymentMethodType, ProductTierType } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
-import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import {
-  DIALOG_DATA,
-  DialogConfig,
-  DialogRef,
-  DialogService,
-  ToastService,
-} from "@bitwarden/components";
-
-import { PaymentComponent } from "../payment/payment.component";
-
-export interface AdjustPaymentDialogParams {
-  initialPaymentMethod?: PaymentMethodType | null;
-  organizationId?: string;
-  productTier?: ProductTierType;
-  providerId?: string;
-}
-
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum AdjustPaymentDialogResultType {
-  Closed = "closed",
-  Submitted = "submitted",
-}
-
-@Component({
-  templateUrl: "./adjust-payment-dialog.component.html",
-  standalone: false,
-})
-export class AdjustPaymentDialogComponent implements OnInit {
-  @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(forwardRef(() => ManageTaxInformationComponent))
-  taxInfoComponent: ManageTaxInformationComponent;
-
-  protected readonly PaymentMethodType = PaymentMethodType;
-  protected readonly ResultType = AdjustPaymentDialogResultType;
-
-  protected dialogHeader: string;
-  protected initialPaymentMethod: PaymentMethodType;
-  protected organizationId?: string;
-  protected productTier?: ProductTierType;
-  protected providerId?: string;
-
-  protected loading = true;
-
-  protected taxInformation: TaxInformation;
-
-  constructor(
-    private apiService: ApiService,
-    private billingApiService: BillingApiServiceAbstraction,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    @Inject(DIALOG_DATA) protected dialogParams: AdjustPaymentDialogParams,
-    private dialogRef: DialogRef<AdjustPaymentDialogResultType>,
-    private i18nService: I18nService,
-    private toastService: ToastService,
-  ) {
-    const key = this.dialogParams.initialPaymentMethod ? "changePaymentMethod" : "addPaymentMethod";
-    this.dialogHeader = this.i18nService.t(key);
-    this.initialPaymentMethod = this.dialogParams.initialPaymentMethod ?? PaymentMethodType.Card;
-    this.organizationId = this.dialogParams.organizationId;
-    this.productTier = this.dialogParams.productTier;
-    this.providerId = this.dialogParams.providerId;
-  }
-
-  ngOnInit(): void {
-    if (this.organizationId) {
-      this.organizationApiService
-        .getTaxInfo(this.organizationId)
-        .then((response: TaxInfoResponse) => {
-          this.taxInformation = TaxInformation.from(response);
-          this.toggleBankAccount();
-        })
-        .catch(() => {
-          this.taxInformation = new TaxInformation();
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    } else if (this.providerId) {
-      this.billingApiService
-        .getProviderTaxInformation(this.providerId)
-        .then((response) => {
-          this.taxInformation = TaxInformation.from(response);
-          this.toggleBankAccount();
-        })
-        .catch(() => {
-          this.taxInformation = new TaxInformation();
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    } else {
-      this.apiService
-        .getTaxInfo()
-        .then((response: TaxInfoResponse) => {
-          this.taxInformation = TaxInformation.from(response);
-        })
-        .catch(() => {
-          this.taxInformation = new TaxInformation();
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    }
-  }
-
-  taxInformationChanged(event: TaxInformation) {
-    this.taxInformation = event;
-    this.toggleBankAccount();
-  }
-
-  toggleBankAccount = () => {
-    if (this.taxInformation.country === "US") {
-      this.paymentComponent.showBankAccount = !!this.organizationId || !!this.providerId;
-    } else {
-      this.paymentComponent.showBankAccount = false;
-      if (this.paymentComponent.selected === PaymentMethodType.BankAccount) {
-        this.paymentComponent.select(PaymentMethodType.Card);
-      }
-    }
-  };
-
-  submit = async (): Promise<void> => {
-    if (!this.taxInfoComponent.validate()) {
-      this.taxInfoComponent.markAllAsTouched();
-      return;
-    }
-
-    try {
-      if (this.organizationId) {
-        await this.updateOrganizationPaymentMethod();
-      } else if (this.providerId) {
-        await this.updateProviderPaymentMethod();
-      } else {
-        await this.updatePremiumUserPaymentMethod();
-      }
-
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("updatedPaymentMethod"),
-      });
-
-      this.dialogRef.close(AdjustPaymentDialogResultType.Submitted);
-    } catch (error) {
-      const msg = typeof error == "object" ? error.message : error;
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t(msg) || msg,
-      });
-    }
-  };
-
-  private updateOrganizationPaymentMethod = async () => {
-    const paymentSource = await this.paymentComponent.tokenize();
-
-    const request = new UpdatePaymentMethodRequest();
-    request.paymentSource = paymentSource;
-    request.taxInformation = ExpandedTaxInfoUpdateRequest.From(this.taxInformation);
-
-    await this.billingApiService.updateOrganizationPaymentMethod(this.organizationId, request);
-  };
-
-  private updatePremiumUserPaymentMethod = async () => {
-    const { type, token } = await this.paymentComponent.tokenize();
-
-    const request = new PaymentRequest();
-    request.paymentMethodType = type;
-    request.paymentToken = token;
-    request.country = this.taxInformation.country;
-    request.postalCode = this.taxInformation.postalCode;
-    request.taxId = this.taxInformation.taxId;
-    request.state = this.taxInformation.state;
-    request.line1 = this.taxInformation.line1;
-    request.line2 = this.taxInformation.line2;
-    request.city = this.taxInformation.city;
-    request.state = this.taxInformation.state;
-    await this.apiService.postAccountPayment(request);
-  };
-
-  private updateProviderPaymentMethod = async () => {
-    const paymentSource = await this.paymentComponent.tokenize();
-
-    const request = new UpdatePaymentMethodRequest();
-    request.paymentSource = paymentSource;
-    request.taxInformation = ExpandedTaxInfoUpdateRequest.From(this.taxInformation);
-
-    await this.billingApiService.updateProviderPaymentMethod(this.providerId, request);
-  };
-
-  protected get showTaxIdField(): boolean {
-    if (this.organizationId) {
-      switch (this.productTier) {
-        case ProductTierType.Free:
-        case ProductTierType.Families:
-          return false;
-        default:
-          return true;
-      }
-    } else {
-      return !!this.providerId;
-    }
-  }
-
-  static open = (
-    dialogService: DialogService,
-    dialogConfig: DialogConfig<AdjustPaymentDialogParams>,
-  ) =>
-    dialogService.open<AdjustPaymentDialogResultType>(AdjustPaymentDialogComponent, dialogConfig);
-}
diff --git a/apps/web/src/app/billing/shared/adjust-storage-dialog/adjust-storage-dialog.component.ts b/apps/web/src/app/billing/shared/adjust-storage-dialog/adjust-storage-dialog.component.ts
index 1f9172eaf59..a9857588e1c 100644
--- a/apps/web/src/app/billing/shared/adjust-storage-dialog/adjust-storage-dialog.component.ts
+++ b/apps/web/src/app/billing/shared/adjust-storage-dialog/adjust-storage-dialog.component.ts
@@ -29,6 +29,8 @@ export enum AdjustStorageDialogResultType {
   Closed = "closed",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./adjust-storage-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/billing/shared/billing-free-families-nav-item.component.ts b/apps/web/src/app/billing/shared/billing-free-families-nav-item.component.ts
index 60b46c2b64e..00d4a7835e5 100644
--- a/apps/web/src/app/billing/shared/billing-free-families-nav-item.component.ts
+++ b/apps/web/src/app/billing/shared/billing-free-families-nav-item.component.ts
@@ -7,6 +7,8 @@ import { FreeFamiliesPolicyService } from "../services/free-families-policy.serv
 
 import { BillingSharedModule } from "./billing-shared.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "billing-free-families-nav-item",
   templateUrl: "./billing-free-families-nav-item.component.html",
diff --git a/apps/web/src/app/billing/shared/billing-history.component.ts b/apps/web/src/app/billing/shared/billing-history.component.ts
index 745939f0d5e..a5d8d7e3da7 100644
--- a/apps/web/src/app/billing/shared/billing-history.component.ts
+++ b/apps/web/src/app/billing/shared/billing-history.component.ts
@@ -8,18 +8,26 @@ import {
   BillingTransactionResponse,
 } from "@bitwarden/common/billing/models/response/billing.response";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-billing-history",
   templateUrl: "billing-history.component.html",
   standalone: false,
 })
 export class BillingHistoryComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   openInvoices: BillingInvoiceResponse[];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   paidInvoices: BillingInvoiceResponse[];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   transactions: BillingTransactionResponse[];
 
diff --git a/apps/web/src/app/billing/shared/billing-shared.module.ts b/apps/web/src/app/billing/shared/billing-shared.module.ts
index 7322f047551..12792cd781a 100644
--- a/apps/web/src/app/billing/shared/billing-shared.module.ts
+++ b/apps/web/src/app/billing/shared/billing-shared.module.ts
@@ -1,46 +1,42 @@
 import { NgModule } from "@angular/core";
 
 import { BannerModule } from "@bitwarden/components";
+import { DiscountBadgeComponent } from "@bitwarden/pricing";
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+} from "@bitwarden/web-vault/app/billing/payment/components";
 
 import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 
-import { AddCreditDialogComponent } from "./add-credit-dialog.component";
-import { AdjustPaymentDialogComponent } from "./adjust-payment-dialog/adjust-payment-dialog.component";
 import { AdjustStorageDialogComponent } from "./adjust-storage-dialog/adjust-storage-dialog.component";
 import { BillingHistoryComponent } from "./billing-history.component";
 import { OffboardingSurveyComponent } from "./offboarding-survey.component";
-import { PaymentComponent } from "./payment/payment.component";
-import { PaymentMethodComponent } from "./payment-method.component";
 import { PlanCardComponent } from "./plan-card/plan-card.component";
 import { PricingSummaryComponent } from "./pricing-summary/pricing-summary.component";
 import { IndividualSelfHostingLicenseUploaderComponent } from "./self-hosting-license-uploader/individual-self-hosting-license-uploader.component";
 import { OrganizationSelfHostingLicenseUploaderComponent } from "./self-hosting-license-uploader/organization-self-hosting-license-uploader.component";
 import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component";
-import { TaxInfoComponent } from "./tax-info.component";
 import { TrialPaymentDialogComponent } from "./trial-payment-dialog/trial-payment-dialog.component";
 import { UpdateLicenseDialogComponent } from "./update-license-dialog.component";
 import { UpdateLicenseComponent } from "./update-license.component";
-import { VerifyBankAccountComponent } from "./verify-bank-account/verify-bank-account.component";
 
 @NgModule({
   imports: [
     SharedModule,
-    TaxInfoComponent,
     HeaderModule,
     BannerModule,
-    PaymentComponent,
-    VerifyBankAccountComponent,
+    EnterPaymentMethodComponent,
+    EnterBillingAddressComponent,
+    DiscountBadgeComponent,
   ],
   declarations: [
-    AddCreditDialogComponent,
     BillingHistoryComponent,
-    PaymentMethodComponent,
     SecretsManagerSubscribeComponent,
     UpdateLicenseComponent,
     UpdateLicenseDialogComponent,
     OffboardingSurveyComponent,
-    AdjustPaymentDialogComponent,
     AdjustStorageDialogComponent,
     IndividualSelfHostingLicenseUploaderComponent,
     OrganizationSelfHostingLicenseUploaderComponent,
@@ -50,16 +46,14 @@ import { VerifyBankAccountComponent } from "./verify-bank-account/verify-bank-ac
   ],
   exports: [
     SharedModule,
-    TaxInfoComponent,
     BillingHistoryComponent,
     SecretsManagerSubscribeComponent,
     UpdateLicenseComponent,
     UpdateLicenseDialogComponent,
     OffboardingSurveyComponent,
-    VerifyBankAccountComponent,
-    PaymentComponent,
     IndividualSelfHostingLicenseUploaderComponent,
     OrganizationSelfHostingLicenseUploaderComponent,
+    DiscountBadgeComponent,
   ],
 })
 export class BillingSharedModule {}
diff --git a/apps/web/src/app/billing/shared/index.ts b/apps/web/src/app/billing/shared/index.ts
index 54ab5bc0a2a..466d1d3e586 100644
--- a/apps/web/src/app/billing/shared/index.ts
+++ b/apps/web/src/app/billing/shared/index.ts
@@ -1,4 +1,2 @@
 export * from "./billing-shared.module";
-export * from "./payment-method.component";
 export * from "./sm-subscribe.component";
-export * from "./tax-info.component";
diff --git a/apps/web/src/app/billing/shared/offboarding-survey.component.html b/apps/web/src/app/billing/shared/offboarding-survey.component.html
index 3fcbd39d8d4..50cf71a03d5 100644
--- a/apps/web/src/app/billing/shared/offboarding-survey.component.html
+++ b/apps/web/src/app/billing/shared/offboarding-survey.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog>
-    <span bitDialogTitle class="tw-font-semibold">
+    <span bitDialogTitle class="tw-font-medium">
       {{ "cancelSubscription" | i18n }}
     </span>
     <div bitDialogContent>
@@ -21,7 +21,8 @@
         </bit-label>
         <textarea rows="4" bitInput formControlName="feedback"></textarea>
         <bit-hint>{{
-          "charactersCurrentAndMaximum" | i18n: formGroup.value.feedback.length : MaxFeedbackLength
+          "charactersCurrentAndMaximum"
+            | i18n: formGroup.value.feedback?.length ?? 0 : MaxFeedbackLength
         }}</bit-hint>
       </bit-form-field>
     </div>
diff --git a/apps/web/src/app/billing/shared/offboarding-survey.component.ts b/apps/web/src/app/billing/shared/offboarding-survey.component.ts
index 9f21f2b8cd5..40e1572a3bb 100644
--- a/apps/web/src/app/billing/shared/offboarding-survey.component.ts
+++ b/apps/web/src/app/billing/shared/offboarding-survey.component.ts
@@ -1,9 +1,10 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Component, Inject } from "@angular/core";
+import { ChangeDetectionStrategy, Component, Inject } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 
 import { BillingApiServiceAbstraction as BillingApiService } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
+import { PlanType } from "@bitwarden/common/billing/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import {
@@ -21,6 +22,7 @@ type UserOffboardingParams = {
 type OrganizationOffboardingParams = {
   type: "Organization";
   id: string;
+  plan: PlanType;
 };
 
 export type OffboardingSurveyDialogParams = UserOffboardingParams | OrganizationOffboardingParams;
@@ -49,45 +51,17 @@ export const openOffboardingSurvey = (
 @Component({
   selector: "app-cancel-subscription-form",
   templateUrl: "offboarding-survey.component.html",
+  changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: false,
 })
 export class OffboardingSurveyComponent {
   protected ResultType = OffboardingSurveyDialogResultType;
   protected readonly MaxFeedbackLength = 400;
 
-  protected readonly reasons: Reason[] = [
-    {
-      value: null,
-      text: this.i18nService.t("selectPlaceholder"),
-    },
-    {
-      value: "missing_features",
-      text: this.i18nService.t("missingFeatures"),
-    },
-    {
-      value: "switched_service",
-      text: this.i18nService.t("movingToAnotherTool"),
-    },
-    {
-      value: "too_complex",
-      text: this.i18nService.t("tooDifficultToUse"),
-    },
-    {
-      value: "unused",
-      text: this.i18nService.t("notUsingEnough"),
-    },
-    {
-      value: "too_expensive",
-      text: this.i18nService.t("tooExpensive"),
-    },
-    {
-      value: "other",
-      text: this.i18nService.t("other"),
-    },
-  ];
+  protected readonly reasons: Reason[] = [];
 
   protected formGroup = this.formBuilder.group({
-    reason: [this.reasons[0].value, [Validators.required]],
+    reason: [null, [Validators.required]],
     feedback: ["", [Validators.maxLength(this.MaxFeedbackLength)]],
   });
 
@@ -99,7 +73,35 @@ export class OffboardingSurveyComponent {
     private i18nService: I18nService,
     private platformUtilsService: PlatformUtilsService,
     private toastService: ToastService,
-  ) {}
+  ) {
+    this.reasons = [
+      {
+        value: null,
+        text: this.i18nService.t("selectPlaceholder"),
+      },
+      {
+        value: "missing_features",
+        text: this.i18nService.t("missingFeatures"),
+      },
+      {
+        value: "switched_service",
+        text: this.i18nService.t("movingToAnotherTool"),
+      },
+      {
+        value: "too_complex",
+        text: this.i18nService.t("tooDifficultToUse"),
+      },
+      {
+        value: "unused",
+        text: this.i18nService.t("notUsingEnough"),
+      },
+      this.getSwitchingReason(),
+      {
+        value: "other",
+        text: this.i18nService.t("other"),
+      },
+    ];
+  }
 
   submit = async () => {
     this.formGroup.markAllAsTouched();
@@ -125,4 +127,24 @@ export class OffboardingSurveyComponent {
 
     this.dialogRef.close(this.ResultType.Submitted);
   };
+
+  private getSwitchingReason(): Reason {
+    if (this.dialogParams.type === "User") {
+      return {
+        value: "too_expensive",
+        text: this.i18nService.t("switchToFreePlan"),
+      };
+    }
+
+    const isFamilyPlan = [
+      PlanType.FamiliesAnnually,
+      PlanType.FamiliesAnnually2019,
+      PlanType.FamiliesAnnually2025,
+    ].includes(this.dialogParams.plan);
+
+    return {
+      value: "too_expensive",
+      text: this.i18nService.t(isFamilyPlan ? "switchToFreeOrg" : "tooExpensive"),
+    };
+  }
 }
diff --git a/apps/web/src/app/billing/shared/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html
deleted file mode 100644
index 81ed7e5a631..00000000000
--- a/apps/web/src/app/billing/shared/payment-method.component.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<app-header *ngIf="organizationId">
-  <button
-    type="button"
-    bitButton
-    buttonType="secondary"
-    [bitAction]="load"
-    class="tw-ml-auto"
-    *ngIf="firstLoaded"
-    [disabled]="loading"
-  >
-    <i class="bwi bwi-refresh bwi-fw" [ngClass]="{ 'bwi-spin': loading }" aria-hidden="true"></i>
-    {{ "refresh" | i18n }}
-  </button>
-</app-header>
-
-<bit-container>
-  <!-- TODO: Organization and individual should use different "page" components -->
-  <h2 bitTypography="h1" *ngIf="!organizationId">{{ "paymentMethod" | i18n }}</h2>
-
-  <ng-container *ngIf="!firstLoaded && 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>
-  <ng-container *ngIf="billing">
-    <bit-section>
-      <h2 bitTypography="h2">
-        {{ (isCreditBalance ? "accountCredit" : "accountBalance") | i18n }}
-      </h2>
-      <p class="tw-text-lg tw-font-bold">{{ creditOrBalance | currency: "$" }}</p>
-      <p bitTypography="body1">{{ "creditAppliedDesc" | i18n }}</p>
-      <button type="button" bitButton buttonType="secondary" [bitAction]="addCredit">
-        {{ "addCredit" | i18n }}
-      </button>
-    </bit-section>
-    <bit-section>
-      <h2 bitTypography="h2">{{ "paymentMethod" | i18n }}</h2>
-      <p *ngIf="!paymentSource" bitTypography="body1">{{ "noPaymentMethod" | i18n }}</p>
-      <ng-container *ngIf="paymentSource">
-        <bit-callout
-          type="warning"
-          title="{{ 'verifyBankAccount' | i18n }}"
-          *ngIf="
-            forOrganization &&
-            paymentSource.type === paymentMethodType.BankAccount &&
-            paymentSource.needsVerification
-          "
-        >
-          <p bitTypography="body1">
-            {{ "verifyBankAccountDesc" | i18n }} {{ "verifyBankAccountFailureWarning" | i18n }}
-          </p>
-          <form
-            [formGroup]="verifyBankForm"
-            [bitSubmit]="verifyBank"
-            class="tw-flex tw-flex-wrap tw-items-center tw-space-x-2"
-          >
-            <bit-form-field class="tw-w-40">
-              <bit-label>{{ "amountX" | i18n: "1" }}</bit-label>
-              <input bitInput type="number" step="1" placeholder="xx" formControlName="amount1" />
-              <span bitPrefix>$0.</span>
-            </bit-form-field>
-            <bit-form-field class="tw-w-40">
-              <bit-label>{{ "amountX" | i18n: "2" }}</bit-label>
-              <input bitInput type="number" step="1" placeholder="xx" formControlName="amount2" />
-              <span bitPrefix>$0.</span>
-            </bit-form-field>
-            <button bitButton bitFormButton buttonType="primary" type="submit">
-              {{ "verifyBankAccount" | i18n }}
-            </button>
-          </form>
-        </bit-callout>
-        <p>
-          <i class="bwi bwi-fw" [ngClass]="paymentSourceClasses"></i>
-          {{ paymentSource.description }}
-        </p>
-      </ng-container>
-      <button type="button" bitButton buttonType="secondary" [bitAction]="changePayment">
-        {{ (paymentSource ? "changePaymentMethod" : "addPaymentMethod") | i18n }}
-      </button>
-      <p *ngIf="isUnpaid" bitTypography="body1">
-        {{ "paymentChargedWithUnpaidSubscription" | i18n }}
-      </p>
-    </bit-section>
-  </ng-container>
-</bit-container>
diff --git a/apps/web/src/app/billing/shared/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts
deleted file mode 100644
index b6431843b83..00000000000
--- a/apps/web/src/app/billing/shared/payment-method.component.ts
+++ /dev/null
@@ -1,261 +0,0 @@
-import { Location } from "@angular/common";
-import { Component, OnDestroy, OnInit } from "@angular/core";
-import { FormBuilder, FormControl, Validators } from "@angular/forms";
-import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, lastValueFrom, map } from "rxjs";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import {
-  OrganizationService,
-  getOrganizationById,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { BillingPaymentResponse } from "@bitwarden/common/billing/models/response/billing-payment.response";
-import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
-import { SubscriptionResponse } from "@bitwarden/common/billing/models/response/subscription.response";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { VerifyBankRequest } from "@bitwarden/common/models/request/verify-bank.request";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SyncService } from "@bitwarden/common/platform/sync";
-import { DialogService, ToastService } from "@bitwarden/components";
-
-import { AddCreditDialogResult, openAddCreditDialog } from "./add-credit-dialog.component";
-import {
-  AdjustPaymentDialogComponent,
-  AdjustPaymentDialogResultType,
-} from "./adjust-payment-dialog/adjust-payment-dialog.component";
-
-@Component({
-  templateUrl: "payment-method.component.html",
-  standalone: false,
-})
-export class PaymentMethodComponent implements OnInit, OnDestroy {
-  loading = false;
-  firstLoaded = false;
-  billing?: BillingPaymentResponse;
-  org?: OrganizationSubscriptionResponse;
-  sub?: SubscriptionResponse;
-  paymentMethodType = PaymentMethodType;
-  organizationId?: string;
-  isUnpaid = false;
-  organization?: Organization;
-
-  verifyBankForm = this.formBuilder.group({
-    amount1: new FormControl<number>(0, [
-      Validators.required,
-      Validators.max(99),
-      Validators.min(0),
-    ]),
-    amount2: new FormControl<number>(0, [
-      Validators.required,
-      Validators.max(99),
-      Validators.min(0),
-    ]),
-  });
-
-  launchPaymentModalAutomatically = false;
-  constructor(
-    protected apiService: ApiService,
-    protected organizationApiService: OrganizationApiServiceAbstraction,
-    protected i18nService: I18nService,
-    protected platformUtilsService: PlatformUtilsService,
-    private router: Router,
-    private location: Location,
-    private route: ActivatedRoute,
-    private formBuilder: FormBuilder,
-    private dialogService: DialogService,
-    private toastService: ToastService,
-    private organizationService: OrganizationService,
-    private accountService: AccountService,
-    protected syncService: SyncService,
-    private configService: ConfigService,
-  ) {
-    const state = this.router.getCurrentNavigation()?.extras?.state;
-    // In case the above state is undefined or null, we use redundantState
-    const redundantState: any = location.getState();
-    if (state && Object.prototype.hasOwnProperty.call(state, "launchPaymentModalAutomatically")) {
-      this.launchPaymentModalAutomatically = state.launchPaymentModalAutomatically;
-    } else if (
-      redundantState &&
-      Object.prototype.hasOwnProperty.call(redundantState, "launchPaymentModalAutomatically")
-    ) {
-      this.launchPaymentModalAutomatically = redundantState.launchPaymentModalAutomatically;
-    } else {
-      this.launchPaymentModalAutomatically = false;
-    }
-  }
-
-  async ngOnInit() {
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.route.params.subscribe(async (params) => {
-      if (params.organizationId) {
-        this.organizationId = params.organizationId;
-      } else if (this.platformUtilsService.isSelfHost()) {
-        // 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.router.navigate(["/settings/subscription"]);
-        return;
-      }
-
-      const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-        FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-      );
-
-      if (managePaymentDetailsOutsideCheckout) {
-        await this.router.navigate(["../payment-details"], { relativeTo: this.route });
-      }
-
-      await this.load();
-      this.firstLoaded = true;
-    });
-  }
-
-  load = async () => {
-    if (this.loading) {
-      return;
-    }
-    this.loading = true;
-    if (this.forOrganization) {
-      const billingPromise = this.organizationApiService.getBilling(this.organizationId!);
-      const organizationSubscriptionPromise = this.organizationApiService.getSubscription(
-        this.organizationId!,
-      );
-
-      const userId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-      );
-
-      if (!userId) {
-        throw new Error("User ID is not found");
-      }
-
-      const organizationPromise = await firstValueFrom(
-        this.organizationService
-          .organizations$(userId)
-          .pipe(getOrganizationById(this.organizationId!)),
-      );
-
-      [this.billing, this.org, this.organization] = await Promise.all([
-        billingPromise,
-        organizationSubscriptionPromise,
-        organizationPromise,
-      ]);
-    } else {
-      const billingPromise = this.apiService.getUserBillingPayment();
-      const subPromise = this.apiService.getUserSubscription();
-
-      [this.billing, this.sub] = await Promise.all([billingPromise, subPromise]);
-    }
-    // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
-    // eslint-disable-next-line no-constant-binary-expression
-    this.isUnpaid = this.subscription?.status === "unpaid" ?? false;
-    this.loading = false;
-    // If the flag `launchPaymentModalAutomatically` is set to true,
-    // we schedule a timeout (delay of 800ms) to automatically launch the payment modal.
-    // This delay ensures that any prior UI/rendering operations complete before triggering the modal.
-    if (this.launchPaymentModalAutomatically) {
-      window.setTimeout(async () => {
-        await this.changePayment();
-        this.launchPaymentModalAutomatically = false;
-        this.location.replaceState(this.location.path(), "", {});
-      }, 800);
-    }
-  };
-
-  addCredit = async () => {
-    if (this.forOrganization) {
-      const dialogRef = openAddCreditDialog(this.dialogService, {
-        data: {
-          organizationId: this.organizationId!,
-        },
-      });
-      const result = await lastValueFrom(dialogRef.closed);
-      if (result === AddCreditDialogResult.Added) {
-        await this.load();
-      }
-    }
-  };
-
-  changePayment = async () => {
-    const dialogRef = AdjustPaymentDialogComponent.open(this.dialogService, {
-      data: {
-        organizationId: this.organizationId,
-        initialPaymentMethod: this.paymentSource !== null ? this.paymentSource.type : null,
-      },
-    });
-
-    const result = await lastValueFrom(dialogRef.closed);
-
-    if (result === AdjustPaymentDialogResultType.Submitted) {
-      this.location.replaceState(this.location.path(), "", {});
-      if (this.launchPaymentModalAutomatically && !this.organization?.enabled) {
-        await this.syncService.fullSync(true);
-      }
-      this.launchPaymentModalAutomatically = false;
-      await this.load();
-    }
-  };
-
-  verifyBank = async () => {
-    if (this.loading || !this.forOrganization) {
-      return;
-    }
-
-    const request = new VerifyBankRequest();
-    request.amount1 = this.verifyBankForm.value.amount1!;
-    request.amount2 = this.verifyBankForm.value.amount2!;
-    await this.organizationApiService.verifyBank(this.organizationId!, request);
-    this.toastService.showToast({
-      variant: "success",
-      title: "",
-      message: this.i18nService.t("verifiedBankAccount"),
-    });
-    await this.load();
-  };
-
-  get isCreditBalance() {
-    return this.billing == null || this.billing.balance <= 0;
-  }
-
-  get creditOrBalance() {
-    return Math.abs(this.billing != null ? this.billing.balance : 0);
-  }
-
-  get paymentSource() {
-    return this.billing != null ? this.billing.paymentSource : null;
-  }
-
-  get forOrganization() {
-    return this.organizationId != null;
-  }
-
-  get paymentSourceClasses() {
-    if (this.paymentSource == null) {
-      return [];
-    }
-    switch (this.paymentSource.type) {
-      case PaymentMethodType.Card:
-        return ["bwi-credit-card"];
-      case PaymentMethodType.BankAccount:
-      case PaymentMethodType.Check:
-        return ["bwi-billing"];
-      case PaymentMethodType.PayPal:
-        return ["bwi-paypal text-primary"];
-      default:
-        return [];
-    }
-  }
-
-  get subscription() {
-    return this.sub?.subscription ?? this.org?.subscription ?? null;
-  }
-
-  ngOnDestroy(): void {
-    this.launchPaymentModalAutomatically = false;
-  }
-}
diff --git a/apps/web/src/app/billing/shared/payment/payment-label.component.html b/apps/web/src/app/billing/shared/payment/payment-label.component.html
deleted file mode 100644
index a931b0524e3..00000000000
--- a/apps/web/src/app/billing/shared/payment/payment-label.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<ng-template #defaultContent>
-  <ng-content></ng-content>
-</ng-template>
-
-<div class="tw-relative tw-mt-2">
-  <bit-label
-    [attr.for]="for"
-    class="tw-absolute tw-bg-background tw-px-1 tw-text-sm tw-text-muted -tw-top-2.5 tw-left-3 tw-mb-0 tw-max-w-full tw-pointer-events-auto"
-  >
-    <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
-    <span class="tw-text-xs tw-font-normal">({{ "required" | i18n }})</span>
-  </bit-label>
-</div>
diff --git a/apps/web/src/app/billing/shared/payment/payment-label.component.ts b/apps/web/src/app/billing/shared/payment/payment-label.component.ts
deleted file mode 100644
index 025727d1d1e..00000000000
--- a/apps/web/src/app/billing/shared/payment/payment-label.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { booleanAttribute, Component, Input } from "@angular/core";
-
-import { FormFieldModule } from "@bitwarden/components";
-
-import { SharedModule } from "../../../shared";
-
-/**
- * Label that should be used for elements loaded via Stripe API.
- *
- * Applies the same label styles from CL form-field component
- */
-@Component({
-  selector: "app-payment-label",
-  templateUrl: "./payment-label.component.html",
-  imports: [FormFieldModule, SharedModule],
-})
-export class PaymentLabelComponent {
-  /** `id` of the associated input */
-  @Input({ required: true }) for: string;
-  /** Displays required text on the label */
-  @Input({ transform: booleanAttribute }) required = false;
-
-  constructor() {}
-}
diff --git a/apps/web/src/app/billing/shared/payment/payment.component.html b/apps/web/src/app/billing/shared/payment/payment.component.html
deleted file mode 100644
index d1356c20854..00000000000
--- a/apps/web/src/app/billing/shared/payment/payment.component.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<form [formGroup]="formGroup" [bitSubmit]="submit">
-  <div class="tw-mb-4 tw-text-lg">
-    <bit-radio-group formControlName="paymentMethod">
-      <bit-radio-button id="card-payment-method" [value]="PaymentMethodType.Card">
-        <bit-label>
-          <i class="bwi bwi-fw bwi-credit-card" aria-hidden="true"></i>
-          {{ "creditCard" | i18n }}
-        </bit-label>
-      </bit-radio-button>
-      <bit-radio-button
-        id="bank-payment-method"
-        [value]="PaymentMethodType.BankAccount"
-        *ngIf="showBankAccount"
-      >
-        <bit-label>
-          <i class="bwi bwi-fw bwi-billing" aria-hidden="true"></i>
-          {{ "bankAccount" | i18n }}
-        </bit-label>
-      </bit-radio-button>
-      <bit-radio-button
-        id="paypal-payment-method"
-        [value]="PaymentMethodType.PayPal"
-        *ngIf="showPayPal"
-      >
-        <bit-label>
-          <i class="bwi bwi-fw bwi-paypal" aria-hidden="true"></i>
-          {{ "payPal" | i18n }}
-        </bit-label>
-      </bit-radio-button>
-      <bit-radio-button
-        id="credit-payment-method"
-        [value]="PaymentMethodType.Credit"
-        *ngIf="showAccountCredit"
-      >
-        <bit-label>
-          <i class="bwi bwi-fw bwi-dollar" aria-hidden="true"></i>
-          {{ "accountCredit" | i18n }}
-        </bit-label>
-      </bit-radio-button>
-    </bit-radio-group>
-  </div>
-  <!-- Card -->
-  <ng-container *ngIf="usingCard">
-    <div class="tw-grid tw-grid-cols-2 tw-gap-4 tw-mb-4">
-      <div class="tw-col-span-1">
-        <app-payment-label for="stripe-card-number" required>
-          {{ "number" | i18n }}
-        </app-payment-label>
-        <div id="stripe-card-number" class="tw-stripe-form-control"></div>
-      </div>
-      <div class="tw-col-span-1 tw-flex tw-items-end">
-        <img
-          src="../../../images/cards.png"
-          alt="Visa, MasterCard, Discover, AmEx, JCB, Diners Club, UnionPay"
-          class="tw-max-w-full"
-        />
-      </div>
-      <div class="tw-col-span-1">
-        <app-payment-label for="stripe-card-expiry" required>
-          {{ "expiration" | i18n }}
-        </app-payment-label>
-        <div id="stripe-card-expiry" class="tw-stripe-form-control"></div>
-      </div>
-      <div class="tw-col-span-1">
-        <app-payment-label for="stripe-card-cvc" required>
-          {{ "securityCodeSlashCVV" | i18n }}
-          <a
-            href="https://www.cvvnumber.com/cvv.html"
-            target="_blank"
-            rel="noreferrer"
-            appA11yTitle="{{ 'learnMore' | i18n }}"
-            class="hover:tw-no-underline"
-          >
-            <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-          </a>
-        </app-payment-label>
-        <div id="stripe-card-cvc" class="tw-stripe-form-control"></div>
-      </div>
-    </div>
-  </ng-container>
-  <!-- Bank Account -->
-  <ng-container *ngIf="showBankAccount && usingBankAccount">
-    <bit-callout type="warning" title="{{ 'verifyBankAccount' | i18n }}">
-      {{ "requiredToVerifyBankAccountWithStripe" | i18n }}
-    </bit-callout>
-    <div class="tw-grid tw-grid-cols-2 tw-gap-4 tw-mb-4" formGroupName="bankInformation">
-      <bit-form-field class="tw-col-span-1" disableMargin>
-        <bit-label>{{ "routingNumber" | i18n }}</bit-label>
-        <input
-          bitInput
-          id="routingNumber"
-          type="text"
-          formControlName="routingNumber"
-          required
-          appInputVerbatim
-        />
-      </bit-form-field>
-      <bit-form-field class="tw-col-span-1" disableMargin>
-        <bit-label>{{ "accountNumber" | i18n }}</bit-label>
-        <input
-          bitInput
-          id="accountNumber"
-          type="text"
-          formControlName="accountNumber"
-          required
-          appInputVerbatim
-        />
-      </bit-form-field>
-      <bit-form-field class="tw-col-span-1" disableMargin>
-        <bit-label>{{ "accountHolderName" | i18n }}</bit-label>
-        <input
-          id="accountHolderName"
-          bitInput
-          type="text"
-          formControlName="accountHolderName"
-          required
-          appInputVerbatim
-        />
-      </bit-form-field>
-      <bit-form-field class="tw-col-span-1" disableMargin>
-        <bit-label>{{ "bankAccountType" | i18n }}</bit-label>
-        <bit-select id="accountHolderType" formControlName="accountHolderType" required>
-          <bit-option value="" label="-- {{ 'select' | i18n }} --"></bit-option>
-          <bit-option value="company" label="{{ 'bankAccountTypeCompany' | i18n }}"></bit-option>
-          <bit-option
-            value="individual"
-            label="{{ 'bankAccountTypeIndividual' | i18n }}"
-          ></bit-option>
-        </bit-select>
-      </bit-form-field>
-    </div>
-  </ng-container>
-  <!-- PayPal -->
-  <ng-container *ngIf="showPayPal && usingPayPal">
-    <div class="tw-mb-3">
-      <div id="braintree-container" class="tw-mb-1 tw-content-center"></div>
-      <small class="tw-text-muted">{{ "paypalClickSubmit" | i18n }}</small>
-    </div>
-  </ng-container>
-  <!-- Account Credit -->
-  <ng-container *ngIf="showAccountCredit && usingAccountCredit">
-    <app-callout type="info">
-      {{ "makeSureEnoughCredit" | i18n }}
-    </app-callout>
-  </ng-container>
-  <button *ngIf="!!onSubmit" bitButton bitFormButton buttonType="primary" type="submit">
-    {{ "submit" | i18n }}
-  </button>
-</form>
diff --git a/apps/web/src/app/billing/shared/payment/payment.component.ts b/apps/web/src/app/billing/shared/payment/payment.component.ts
deleted file mode 100644
index 08476e9952f..00000000000
--- a/apps/web/src/app/billing/shared/payment/payment.component.ts
+++ /dev/null
@@ -1,215 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
-import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { Subject } from "rxjs";
-import { takeUntil } from "rxjs/operators";
-
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { TokenizedPaymentSourceRequest } from "@bitwarden/common/billing/models/request/tokenized-payment-source.request";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-
-import { SharedModule } from "../../../shared";
-import { BillingServicesModule, BraintreeService, StripeService } from "../../services";
-
-import { PaymentLabelComponent } from "./payment-label.component";
-
-/**
- * Render a form that allows the user to enter their payment method, tokenize it against one of our payment providers and,
- * optionally, submit it using the {@link onSubmit} function if it is provided.
- */
-@Component({
-  selector: "app-payment",
-  templateUrl: "./payment.component.html",
-  imports: [BillingServicesModule, SharedModule, PaymentLabelComponent],
-})
-export class PaymentComponent implements OnInit, OnDestroy {
-  /** Show account credit as a payment option. */
-  @Input() showAccountCredit: boolean = true;
-  /** Show bank account as a payment option. */
-  @Input() showBankAccount: boolean = true;
-  /** Show PayPal as a payment option. */
-  @Input() showPayPal: boolean = true;
-
-  /** The payment method selected by default when the component renders. */
-  @Input() private initialPaymentMethod: PaymentMethodType = PaymentMethodType.Card;
-  /** If provided, will be invoked with the tokenized payment source during form submission. */
-  @Input() protected onSubmit?: (request: TokenizedPaymentSourceRequest) => Promise<void>;
-
-  @Input() private bankAccountWarningOverride?: string;
-
-  @Output() submitted = new EventEmitter<PaymentMethodType>();
-
-  private destroy$ = new Subject<void>();
-
-  protected formGroup = new FormGroup({
-    paymentMethod: new FormControl<PaymentMethodType>(null),
-    bankInformation: new FormGroup({
-      routingNumber: new FormControl<string>("", [Validators.required]),
-      accountNumber: new FormControl<string>("", [Validators.required]),
-      accountHolderName: new FormControl<string>("", [Validators.required]),
-      accountHolderType: new FormControl<string>("", [Validators.required]),
-    }),
-  });
-
-  protected PaymentMethodType = PaymentMethodType;
-
-  constructor(
-    private billingApiService: BillingApiServiceAbstraction,
-    private braintreeService: BraintreeService,
-    private i18nService: I18nService,
-    private stripeService: StripeService,
-  ) {}
-
-  ngOnInit(): void {
-    this.formGroup.controls.paymentMethod.patchValue(this.initialPaymentMethod);
-
-    this.stripeService.loadStripe(
-      {
-        cardNumber: "#stripe-card-number",
-        cardExpiry: "#stripe-card-expiry",
-        cardCvc: "#stripe-card-cvc",
-      },
-      this.initialPaymentMethod === PaymentMethodType.Card,
-    );
-
-    if (this.showPayPal) {
-      this.braintreeService.loadBraintree(
-        "#braintree-container",
-        this.initialPaymentMethod === PaymentMethodType.PayPal,
-      );
-    }
-
-    this.formGroup
-      .get("paymentMethod")
-      .valueChanges.pipe(takeUntil(this.destroy$))
-      .subscribe((type) => {
-        this.onPaymentMethodChange(type);
-      });
-  }
-
-  /** Programmatically select the provided payment method. */
-  select = (paymentMethod: PaymentMethodType) => {
-    this.formGroup.get("paymentMethod").patchValue(paymentMethod);
-  };
-
-  protected submit = async () => {
-    const { type, token } = await this.tokenize();
-    await this.onSubmit?.({ type, token });
-    this.submitted.emit(type);
-  };
-
-  validate = () => {
-    if (!this.usingBankAccount) {
-      return true;
-    }
-
-    this.formGroup.controls.bankInformation.markAllAsTouched();
-    return this.formGroup.controls.bankInformation.valid;
-  };
-
-  /**
-   * Tokenize the payment method information entered by the user against one of our payment providers.
-   *
-   * - {@link PaymentMethodType.Card} => [Stripe.confirmCardSetup]{@link https://docs.stripe.com/js/setup_intents/confirm_card_setup}
-   * - {@link PaymentMethodType.BankAccount} => [Stripe.confirmUsBankAccountSetup]{@link https://docs.stripe.com/js/setup_intents/confirm_us_bank_account_setup}
-   * - {@link PaymentMethodType.PayPal} => [Braintree.requestPaymentMethod]{@link https://braintree.github.io/braintree-web-drop-in/docs/current/Dropin.html#requestPaymentMethod}
-   * */
-  async tokenize(): Promise<{ type: PaymentMethodType; token: string }> {
-    const type = this.selected;
-
-    if (this.usingStripe) {
-      const clientSecret = await this.billingApiService.createSetupIntent(type);
-
-      if (this.usingBankAccount) {
-        this.formGroup.markAllAsTouched();
-        if (this.formGroup.valid) {
-          const token = await this.stripeService.setupBankAccountPaymentMethod(clientSecret, {
-            accountHolderName: this.formGroup.value.bankInformation.accountHolderName,
-            routingNumber: this.formGroup.value.bankInformation.routingNumber,
-            accountNumber: this.formGroup.value.bankInformation.accountNumber,
-            accountHolderType: this.formGroup.value.bankInformation.accountHolderType,
-          });
-          return {
-            type,
-            token,
-          };
-        } else {
-          throw "Invalid input provided. Please ensure all required fields are filled out correctly and try again.";
-        }
-      }
-
-      if (this.usingCard) {
-        const token = await this.stripeService.setupCardPaymentMethod(clientSecret);
-        return {
-          type,
-          token,
-        };
-      }
-    }
-
-    if (this.usingPayPal) {
-      const token = await this.braintreeService.requestPaymentMethod();
-      return {
-        type,
-        token,
-      };
-    }
-
-    if (this.usingAccountCredit) {
-      return {
-        type: PaymentMethodType.Credit,
-        token: null,
-      };
-    }
-
-    return null;
-  }
-
-  ngOnDestroy(): void {
-    this.destroy$.next();
-    this.destroy$.complete();
-    this.stripeService.unloadStripe();
-    if (this.showPayPal) {
-      this.braintreeService.unloadBraintree();
-    }
-  }
-
-  private onPaymentMethodChange(type: PaymentMethodType): void {
-    switch (type) {
-      case PaymentMethodType.Card: {
-        this.stripeService.mountElements();
-        break;
-      }
-      case PaymentMethodType.PayPal: {
-        this.braintreeService.createDropin();
-        break;
-      }
-    }
-  }
-
-  get selected(): PaymentMethodType {
-    return this.formGroup.value.paymentMethod;
-  }
-
-  protected get usingAccountCredit(): boolean {
-    return this.selected === PaymentMethodType.Credit;
-  }
-
-  protected get usingBankAccount(): boolean {
-    return this.selected === PaymentMethodType.BankAccount;
-  }
-
-  protected get usingCard(): boolean {
-    return this.selected === PaymentMethodType.Card;
-  }
-
-  protected get usingPayPal(): boolean {
-    return this.selected === PaymentMethodType.PayPal;
-  }
-
-  private get usingStripe(): boolean {
-    return this.usingBankAccount || this.usingCard;
-  }
-}
diff --git a/apps/web/src/app/billing/shared/plan-card/plan-card.component.html b/apps/web/src/app/billing/shared/plan-card/plan-card.component.html
index af228842720..6f19facb0f5 100644
--- a/apps/web/src/app/billing/shared/plan-card/plan-card.component.html
+++ b/apps/web/src/app/billing/shared/plan-card/plan-card.component.html
@@ -11,7 +11,7 @@
   <div class="tw-relative">
     @if (isRecommended) {
       <div
-        class="tw-bg-secondary-100 tw-text-center !tw-border-0 tw-text-sm tw-font-bold tw-py-1"
+        class="tw-bg-secondary-100 tw-text-center !tw-border-0 tw-text-sm tw-font-medium tw-py-1"
         [ngClass]="{
           'tw-bg-primary-700 !tw-text-contrast': plan().isSelected,
           'tw-bg-secondary-100': !plan().isSelected,
@@ -28,12 +28,12 @@
       }"
     >
       <h3
-        class="tw-text-[1.25rem] tw-mt-[6px] tw-font-bold tw-mb-0 tw-leading-[2rem] tw-flex tw-items-center"
+        class="tw-text-[1.25rem] tw-mt-[6px] tw-font-medium tw-mb-0 tw-leading-[2rem] tw-flex tw-items-center"
       >
         <span class="tw-capitalize tw-whitespace-nowrap">{{ plan().title }}</span>
       </h3>
       <span>
-        <b class="tw-text-lg tw-font-semibold">{{ plan().costPerMember | currency: "$" }} </b>
+        <b class="tw-text-lg tw-font-medium">{{ plan().costPerMember | currency: "$" }} </b>
         <span class="tw-text-xs tw-px-0"> /{{ "monthPerMember" | i18n }}</span>
       </span>
     </div>
diff --git a/apps/web/src/app/billing/shared/plan-card/plan-card.component.ts b/apps/web/src/app/billing/shared/plan-card/plan-card.component.ts
index 4150ddc25ba..0c64d078757 100644
--- a/apps/web/src/app/billing/shared/plan-card/plan-card.component.ts
+++ b/apps/web/src/app/billing/shared/plan-card/plan-card.component.ts
@@ -11,13 +11,15 @@ export interface PlanCard {
   productTier: ProductTierType;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-plan-card",
   templateUrl: "./plan-card.component.html",
   standalone: false,
 })
 export class PlanCardComponent {
-  plan = input.required<PlanCard>();
+  readonly plan = input.required<PlanCard>();
   productTiers = ProductTierType;
 
   cardClicked = output();
diff --git a/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.html b/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.html
index 428d6b7f04e..fdfff31da0f 100644
--- a/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.html
+++ b/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.html
@@ -1,7 +1,7 @@
 <ng-container>
   <div class="tw-mt-4">
     <p class="tw-text-lg tw-mb-1">
-      <span class="tw-font-semibold"
+      <span class="tw-font-medium"
         >{{ "total" | i18n }}:
         {{ summaryData.total - summaryData.totalAppliedDiscount | currency: "USD" : "$" }} USD</span
       >
@@ -37,7 +37,7 @@
           <ng-container
             *ngIf="!summaryData.isSecretsManagerTrial || summaryData.organization.useSecretsManager"
           >
-            <p class="tw-font-semibold tw-mt-3 tw-mb-1">{{ "passwordManager" | i18n }}</p>
+            <p class="tw-font-medium tw-mt-3 tw-mb-1">{{ "passwordManager" | i18n }}</p>
 
             <!-- Base Price -->
             <ng-container *ngIf="summaryData.selectedPlan.PasswordManager.basePrice">
@@ -137,7 +137,7 @@
         <!-- Secrets Manager section -->
         <ng-template #secretsManagerSection>
           <ng-container *ngIf="summaryData.organization.useSecretsManager">
-            <p class="tw-font-semibold tw-mt-3 tw-mb-1">{{ "secretsManager" | i18n }}</p>
+            <p class="tw-font-medium tw-mt-3 tw-mb-1">{{ "secretsManager" | i18n }}</p>
 
             <!-- Base Price -->
             <ng-container *ngIf="summaryData.selectedPlan?.SecretsManager?.basePrice">
@@ -236,7 +236,7 @@
         <p
           class="tw-flex tw-justify-between tw-border-0 tw-border-solid tw-border-t tw-border-secondary-300 tw-pt-2 tw-mb-0"
         >
-          <span class="tw-font-semibold">{{ "estimatedTax" | i18n }}</span>
+          <span class="tw-font-medium">{{ "estimatedTax" | i18n }}</span>
           <span>{{ summaryData.estimatedTax | currency: "USD" : "$" }}</span>
         </p>
       </bit-hint>
@@ -247,10 +247,10 @@
         <p
           class="tw-flex tw-justify-between tw-border-0 tw-border-solid tw-border-t tw-border-secondary-300 tw-pt-2 tw-mb-0"
         >
-          <span class="tw-font-semibold">{{ "total" | i18n }}</span>
+          <span class="tw-font-medium">{{ "total" | i18n }}</span>
           <span>
             {{ summaryData.total - summaryData.totalAppliedDiscount | currency: "USD" : "$" }}
-            <span class="tw-text-xs tw-font-semibold"
+            <span class="tw-text-xs tw-font-medium"
               >/ {{ summaryData.selectedPlanInterval | i18n }}</span
             >
           </span>
diff --git a/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.ts b/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.ts
index d4fdf35b743..f502297425a 100644
--- a/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.ts
+++ b/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.ts
@@ -31,12 +31,16 @@ export interface PricingSummaryData {
   estimatedTax?: number;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-pricing-summary",
   templateUrl: "./pricing-summary.component.html",
   standalone: false,
 })
 export class PricingSummaryComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() summaryData!: PricingSummaryData;
   planIntervals = PlanInterval;
 
diff --git a/apps/web/src/app/billing/shared/self-hosting-license-uploader/individual-self-hosting-license-uploader.component.ts b/apps/web/src/app/billing/shared/self-hosting-license-uploader/individual-self-hosting-license-uploader.component.ts
index 75da10a7b09..8c4010d2117 100644
--- a/apps/web/src/app/billing/shared/self-hosting-license-uploader/individual-self-hosting-license-uploader.component.ts
+++ b/apps/web/src/app/billing/shared/self-hosting-license-uploader/individual-self-hosting-license-uploader.component.ts
@@ -14,6 +14,8 @@ import { AbstractSelfHostingLicenseUploaderComponent } from "../../shared/self-h
  * Processes license file uploads for individual plans.
  * @remarks Requires self-hosting.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "individual-self-hosting-license-uploader",
   templateUrl: "./self-hosting-license-uploader.component.html",
@@ -23,6 +25,8 @@ export class IndividualSelfHostingLicenseUploaderComponent extends AbstractSelfH
   /**
    * Emitted when a license file has been successfully uploaded & processed.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onLicenseFileUploaded: EventEmitter<void> = new EventEmitter<void>();
 
   constructor(
diff --git a/apps/web/src/app/billing/shared/self-hosting-license-uploader/organization-self-hosting-license-uploader.component.ts b/apps/web/src/app/billing/shared/self-hosting-license-uploader/organization-self-hosting-license-uploader.component.ts
index e2b43a6a568..892a42ef61c 100644
--- a/apps/web/src/app/billing/shared/self-hosting-license-uploader/organization-self-hosting-license-uploader.component.ts
+++ b/apps/web/src/app/billing/shared/self-hosting-license-uploader/organization-self-hosting-license-uploader.component.ts
@@ -24,6 +24,8 @@ import { AbstractSelfHostingLicenseUploaderComponent } from "../../shared/self-h
  * Processes license file uploads for organizations.
  * @remarks Requires self-hosting.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "organization-self-hosting-license-uploader",
   templateUrl: "./self-hosting-license-uploader.component.html",
@@ -33,6 +35,8 @@ export class OrganizationSelfHostingLicenseUploaderComponent extends AbstractSel
   /**
    * Notifies the parent component of the `organizationId` the license was created for.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onLicenseFileUploaded: EventEmitter<string> = new EventEmitter<string>();
 
   constructor(
diff --git a/apps/web/src/app/billing/shared/sm-subscribe.component.ts b/apps/web/src/app/billing/shared/sm-subscribe.component.ts
index d1e5566a235..739cc6f1451 100644
--- a/apps/web/src/app/billing/shared/sm-subscribe.component.ts
+++ b/apps/web/src/app/billing/shared/sm-subscribe.component.ts
@@ -29,16 +29,28 @@ export const secretsManagerSubscribeFormFactory = (
     ],
   });
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-subscribe",
   templateUrl: "sm-subscribe.component.html",
   standalone: false,
 })
 export class SecretsManagerSubscribeComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() formGroup: FormGroup<ControlsOf<SecretsManagerSubscription>>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() upgradeOrganization: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showSubmitButton = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() selectedPlan: PlanResponse;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() customerDiscount: BillingCustomerDiscount;
 
   logo = SecretsManagerAlt;
diff --git a/apps/web/src/app/billing/shared/tax-info.component.html b/apps/web/src/app/billing/shared/tax-info.component.html
deleted file mode 100644
index ca2ae046f6e..00000000000
--- a/apps/web/src/app/billing/shared/tax-info.component.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<form [formGroup]="taxFormGroup">
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "country" | i18n }}</bit-label>
-        <bit-select formControlName="country" autocomplete="country" data-testid="country">
-          <bit-option
-            *ngFor="let country of countryList"
-            [value]="country.value"
-            [disabled]="country.disabled"
-            [label]="country.name"
-          ></bit-option>
-        </bit-select>
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="text"
-          formControlName="postalCode"
-          autocomplete="postal-code"
-          data-testid="postal-code"
-        />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
-      <bit-form-field>
-        <bit-label>{{ "address1" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="text"
-          formControlName="line1"
-          autocomplete="address-line1"
-          data-testid="address-line1"
-        />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
-      <bit-form-field>
-        <bit-label>{{ "address2" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="text"
-          formControlName="line2"
-          autocomplete="address-line2"
-          data-testid="address-line2"
-        />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
-      <bit-form-field>
-        <bit-label for="addressCity">{{ "cityTown" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="text"
-          formControlName="city"
-          autocomplete="address-level2"
-          data-testid="city"
-        />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
-      <bit-form-field>
-        <bit-label>{{ "stateProvince" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="text"
-          formControlName="state"
-          autocomplete="address-level1"
-          data-testid="state"
-        />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported && showTaxIdField">
-      <bit-form-field>
-        <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="taxId" data-testid="tax-id" />
-      </bit-form-field>
-    </div>
-  </div>
-</form>
diff --git a/apps/web/src/app/billing/shared/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts
deleted file mode 100644
index 35c4a3fcc4e..00000000000
--- a/apps/web/src/app/billing/shared/tax-info.component.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
-import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
-import { debounceTime } from "rxjs/operators";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { CountryListItem } from "@bitwarden/common/billing/models/domain";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-
-import { SharedModule } from "../../shared";
-
-/**
- * @deprecated Use `ManageTaxInformationComponent` instead.
- */
-@Component({
-  selector: "app-tax-info",
-  templateUrl: "tax-info.component.html",
-  imports: [SharedModule],
-})
-export class TaxInfoComponent implements OnInit, OnDestroy {
-  private destroy$ = new Subject<void>();
-
-  @Input() trialFlow = false;
-  @Output() countryChanged = new EventEmitter();
-  @Output() taxInformationChanged: EventEmitter<void> = new EventEmitter<void>();
-
-  taxFormGroup = new FormGroup({
-    country: new FormControl<string>(null, [Validators.required]),
-    postalCode: new FormControl<string>(null, [Validators.required]),
-    taxId: new FormControl<string>(null),
-    line1: new FormControl<string>(null),
-    line2: new FormControl<string>(null),
-    city: new FormControl<string>(null),
-    state: new FormControl<string>(null),
-  });
-
-  protected isTaxSupported: boolean;
-
-  loading = true;
-  organizationId: string;
-  providerId: string;
-  countryList: CountryListItem[] = this.taxService.getCountries();
-
-  constructor(
-    private apiService: ApiService,
-    private route: ActivatedRoute,
-    private logService: LogService,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    private taxService: TaxServiceAbstraction,
-  ) {}
-
-  get country(): string {
-    return this.taxFormGroup.controls.country.value;
-  }
-
-  get postalCode(): string {
-    return this.taxFormGroup.controls.postalCode.value;
-  }
-
-  get taxId(): string {
-    return this.taxFormGroup.controls.taxId.value;
-  }
-
-  get line1(): string {
-    return this.taxFormGroup.controls.line1.value;
-  }
-
-  get line2(): string {
-    return this.taxFormGroup.controls.line2.value;
-  }
-
-  get city(): string {
-    return this.taxFormGroup.controls.city.value;
-  }
-
-  get state(): string {
-    return this.taxFormGroup.controls.state.value;
-  }
-
-  get showTaxIdField(): boolean {
-    return !!this.organizationId;
-  }
-
-  async ngOnInit() {
-    // Provider setup
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-    this.route.queryParams.subscribe((params) => {
-      this.providerId = params.providerId;
-    });
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.route.parent?.parent?.params.subscribe(async (params) => {
-      this.organizationId = params.organizationId;
-      if (this.organizationId) {
-        try {
-          const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
-          if (taxInfo) {
-            this.taxFormGroup.controls.taxId.setValue(taxInfo.taxId);
-            this.taxFormGroup.controls.state.setValue(taxInfo.state);
-            this.taxFormGroup.controls.line1.setValue(taxInfo.line1);
-            this.taxFormGroup.controls.line2.setValue(taxInfo.line2);
-            this.taxFormGroup.controls.city.setValue(taxInfo.city);
-            this.taxFormGroup.controls.postalCode.setValue(taxInfo.postalCode);
-            this.taxFormGroup.controls.country.setValue(taxInfo.country);
-          }
-        } catch (e) {
-          this.logService.error(e);
-        }
-      } else {
-        try {
-          const taxInfo = await this.apiService.getTaxInfo();
-          if (taxInfo) {
-            this.taxFormGroup.controls.postalCode.setValue(taxInfo.postalCode);
-            this.taxFormGroup.controls.country.setValue(taxInfo.country);
-          }
-        } catch (e) {
-          this.logService.error(e);
-        }
-      }
-
-      this.isTaxSupported = await this.taxService.isCountrySupported(
-        this.taxFormGroup.controls.country.value,
-      );
-
-      this.countryChanged.emit();
-    });
-
-    this.taxFormGroup.controls.country.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe((value) => {
-        this.taxService
-          .isCountrySupported(this.taxFormGroup.controls.country.value)
-          .then((isSupported) => {
-            this.isTaxSupported = isSupported;
-          })
-          .catch(() => {
-            this.isTaxSupported = false;
-          })
-          .finally(() => {
-            if (!this.isTaxSupported) {
-              this.taxFormGroup.controls.taxId.setValue(null);
-              this.taxFormGroup.controls.line1.setValue(null);
-              this.taxFormGroup.controls.line2.setValue(null);
-              this.taxFormGroup.controls.city.setValue(null);
-              this.taxFormGroup.controls.state.setValue(null);
-            }
-
-            this.countryChanged.emit();
-          });
-        this.taxInformationChanged.emit();
-      });
-
-    this.taxFormGroup.controls.postalCode.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        this.taxInformationChanged.emit();
-      });
-
-    this.taxFormGroup.controls.taxId.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        this.taxInformationChanged.emit();
-      });
-
-    this.loading = false;
-  }
-
-  ngOnDestroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  submitTaxInfo(): Promise<any> {
-    this.taxFormGroup.updateValueAndValidity();
-    this.taxFormGroup.markAllAsTouched();
-
-    const request = new ExpandedTaxInfoUpdateRequest();
-    request.country = this.country;
-    request.postalCode = this.postalCode;
-    request.taxId = this.taxId;
-    request.line1 = this.line1;
-    request.line2 = this.line2;
-    request.city = this.city;
-    request.state = this.state;
-
-    return this.organizationId
-      ? this.organizationApiService.updateTaxInfo(
-          this.organizationId,
-          request as ExpandedTaxInfoUpdateRequest,
-        )
-      : this.apiService.putTaxInfo(request);
-  }
-}
diff --git a/apps/web/src/app/billing/shared/trial-payment-dialog/trial-payment-dialog.component.html b/apps/web/src/app/billing/shared/trial-payment-dialog/trial-payment-dialog.component.html
index dbd2899c9e0..b3162507b9a 100644
--- a/apps/web/src/app/billing/shared/trial-payment-dialog/trial-payment-dialog.component.html
+++ b/apps/web/src/app/billing/shared/trial-payment-dialog/trial-payment-dialog.component.html
@@ -1,5 +1,5 @@
 <bit-dialog dialogSize="default">
-  <span bitDialogTitle class="tw-font-semibold">
+  <span bitDialogTitle class="tw-font-medium">
     {{ "subscribetoEnterprise" | i18n: currentPlanName }}
   </span>
 
@@ -86,17 +86,13 @@
     <ng-container>
       <h2 bitTypography="h4">{{ "paymentMethod" | i18n }}</h2>
       <ng-container bitDialogContent>
-        <app-payment
-          [showAccountCredit]="false"
-          [showBankAccount]="!!organizationId"
-          [initialPaymentMethod]="initialPaymentMethod"
-        ></app-payment>
-        <app-manage-tax-information
-          *ngIf="taxInformation"
-          [showTaxIdField]="showTaxIdField"
-          [startWith]="taxInformation"
-          (taxInformationChanged)="taxInformationChanged($event)"
-        />
+        <app-enter-payment-method [group]="formGroup.controls.paymentMethod">
+        </app-enter-payment-method>
+        <app-enter-billing-address
+          [group]="formGroup.controls.billingAddress"
+          [scenario]="{ type: 'checkout', supportsTaxId }"
+        >
+        </app-enter-billing-address>
       </ng-container>
       <!-- Pricing Breakdown -->
       <app-pricing-summary
diff --git a/apps/web/src/app/billing/shared/trial-payment-dialog/trial-payment-dialog.component.ts b/apps/web/src/app/billing/shared/trial-payment-dialog/trial-payment-dialog.component.ts
index ca51ae80e1f..64af7be948e 100644
--- a/apps/web/src/app/billing/shared/trial-payment-dialog/trial-payment-dialog.component.ts
+++ b/apps/web/src/app/billing/shared/trial-payment-dialog/trial-payment-dialog.component.ts
@@ -1,7 +1,17 @@
-import { Component, EventEmitter, Inject, OnInit, Output, signal, ViewChild } from "@angular/core";
-import { firstValueFrom, map } from "rxjs";
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  OnDestroy,
+  OnInit,
+  Output,
+  signal,
+  ViewChild,
+} from "@angular/core";
+import { FormGroup } from "@angular/forms";
+import { combineLatest, firstValueFrom, map, Subject, takeUntil } from "rxjs";
+import { debounceTime, startWith, switchMap } from "rxjs/operators";
 
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
@@ -10,14 +20,9 @@ import {
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction";
 import { PaymentMethodType, PlanInterval, ProductTierType } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
 import { ChangePlanFrequencyRequest } from "@bitwarden/common/billing/models/request/change-plan-frequency.request";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
-import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
@@ -29,9 +34,15 @@ import {
   DialogService,
   ToastService,
 } from "@bitwarden/components";
+import { SubscriberBillingClient, TaxClient } from "@bitwarden/web-vault/app/billing/clients";
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+  getBillingAddressFromForm,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+import { BitwardenSubscriber } from "@bitwarden/web-vault/app/billing/types";
 
 import { PlanCardService } from "../../services/plan-card.service";
-import { PaymentComponent } from "../payment/payment.component";
 import { PlanCard } from "../plan-card/plan-card.component";
 import { PricingSummaryData } from "../pricing-summary/pricing-summary.component";
 
@@ -56,14 +67,18 @@ interface OnSuccessArgs {
   organizationId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-trial-payment-dialog",
   templateUrl: "./trial-payment-dialog.component.html",
   standalone: false,
+  providers: [SubscriberBillingClient, TaxClient],
 })
-export class TrialPaymentDialogComponent implements OnInit {
-  @ViewChild(PaymentComponent) paymentComponent!: PaymentComponent;
-  @ViewChild(ManageTaxInformationComponent) taxComponent!: ManageTaxInformationComponent;
+export class TrialPaymentDialogComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
 
   currentPlan!: PlanResponse;
   currentPlanName!: string;
@@ -73,15 +88,23 @@ export class TrialPaymentDialogComponent implements OnInit {
   sub!: OrganizationSubscriptionResponse;
   selectedInterval: PlanInterval = PlanInterval.Annually;
 
-  planCards = signal<PlanCard[]>([]);
+  readonly planCards = signal<PlanCard[]>([]);
   plans!: ListResponse<PlanResponse>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSuccess = new EventEmitter<OnSuccessArgs>();
   protected initialPaymentMethod: PaymentMethodType;
-  protected taxInformation!: TaxInformation;
   protected readonly ResultType = TRIAL_PAYMENT_METHOD_DIALOG_RESULT_TYPE;
   pricingSummaryData!: PricingSummaryData;
 
+  formGroup = new FormGroup({
+    paymentMethod: EnterPaymentMethodComponent.getFormGroup(),
+    billingAddress: EnterBillingAddressComponent.getFormGroup(),
+  });
+
+  private destroy$ = new Subject<void>();
+
   constructor(
     @Inject(DIALOG_DATA) private dialogParams: TrialPaymentDialogParams,
     private dialogRef: DialogRef<TrialPaymentDialogResultType>,
@@ -93,8 +116,9 @@ export class TrialPaymentDialogComponent implements OnInit {
     private pricingSummaryService: PricingSummaryService,
     private apiService: ApiService,
     private toastService: ToastService,
-    private billingApiService: BillingApiServiceAbstraction,
     private organizationBillingApiServiceAbstraction: OrganizationBillingApiServiceAbstraction,
+    private subscriberBillingClient: SubscriberBillingClient,
+    private taxClient: TaxClient,
   ) {
     this.initialPaymentMethod = this.dialogParams.initialPaymentMethod ?? PaymentMethodType.Card;
   }
@@ -134,19 +158,48 @@ export class TrialPaymentDialogComponent implements OnInit {
         : PlanInterval.Monthly;
     }
 
-    const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
-    this.taxInformation = TaxInformation.from(taxInfo);
+    const billingAddress = await this.subscriberBillingClient.getBillingAddress({
+      type: "organization",
+      data: this.organization,
+    });
 
-    this.pricingSummaryData = await this.pricingSummaryService.getPricingSummaryData(
-      this.currentPlan,
-      this.sub,
-      this.organization,
-      this.selectedInterval,
-      this.taxInformation,
-      this.isSecretsManagerTrial(),
-    );
+    if (billingAddress) {
+      const { taxId, ...location } = billingAddress;
+
+      this.formGroup.controls.billingAddress.patchValue({
+        ...location,
+        taxId: taxId ? taxId.value : null,
+      });
+    }
+
+    await this.refreshPricingSummary();
 
     this.plans = await this.apiService.getPlans();
+
+    combineLatest([
+      this.formGroup.controls.billingAddress.controls.country.valueChanges.pipe(
+        startWith(this.formGroup.controls.billingAddress.controls.country.value),
+      ),
+      this.formGroup.controls.billingAddress.controls.postalCode.valueChanges.pipe(
+        startWith(this.formGroup.controls.billingAddress.controls.postalCode.value),
+      ),
+      this.formGroup.controls.billingAddress.controls.taxId.valueChanges.pipe(
+        startWith(this.formGroup.controls.billingAddress.controls.taxId.value),
+      ),
+    ])
+      .pipe(
+        debounceTime(500),
+        switchMap(() => {
+          return this.refreshPricingSummary();
+        }),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 
   static open = (
@@ -175,14 +228,7 @@ export class TrialPaymentDialogComponent implements OnInit {
 
     await this.selectPlan();
 
-    this.pricingSummaryData = await this.pricingSummaryService.getPricingSummaryData(
-      this.currentPlan,
-      this.sub,
-      this.organization,
-      this.selectedInterval,
-      this.taxInformation,
-      this.isSecretsManagerTrial(),
-    );
+    await this.refreshPricingSummary();
   }
 
   protected async selectPlan() {
@@ -202,7 +248,7 @@ export class TrialPaymentDialogComponent implements OnInit {
       this.currentPlan = filteredPlans[0];
     }
     try {
-      await this.refreshSalesTax();
+      await this.refreshPricingSummary();
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       const translatedMessage = this.i18nService.t(errorMessage);
@@ -214,72 +260,57 @@ export class TrialPaymentDialogComponent implements OnInit {
     }
   }
 
-  protected get showTaxIdField(): boolean {
-    switch (this.currentPlan.productTier) {
-      case ProductTierType.Free:
-      case ProductTierType.Families:
-        return false;
-      default:
-        return true;
-    }
-  }
-
-  private async refreshSalesTax(): Promise<void> {
-    if (
-      this.taxInformation === undefined ||
-      !this.taxInformation.country ||
-      !this.taxInformation.postalCode
-    ) {
-      return;
-    }
-
-    const request: PreviewOrganizationInvoiceRequest = {
-      organizationId: this.organizationId,
-      passwordManager: {
-        additionalStorage: 0,
-        plan: this.currentPlan?.type,
-        seats: this.sub.seats,
-      },
-      taxInformation: {
-        postalCode: this.taxInformation.postalCode,
-        country: this.taxInformation.country,
-        taxId: this.taxInformation.taxId,
-      },
-    };
-
-    if (this.organization.useSecretsManager) {
-      request.secretsManager = {
-        seats: this.sub.smSeats ?? 0,
-        additionalMachineAccounts:
-          (this.sub.smServiceAccounts ?? 0) -
-          (this.sub.plan.SecretsManager?.baseServiceAccount ?? 0),
-      };
-    }
-
+  private refreshPricingSummary = async () => {
+    const estimatedTax = await this.getEstimatedTax();
     this.pricingSummaryData = await this.pricingSummaryService.getPricingSummaryData(
       this.currentPlan,
       this.sub,
       this.organization,
       this.selectedInterval,
-      this.taxInformation,
       this.isSecretsManagerTrial(),
+      estimatedTax,
     );
-  }
+  };
 
-  async taxInformationChanged(event: TaxInformation) {
-    this.taxInformation = event;
-    this.toggleBankAccount();
-    await this.refreshSalesTax();
-  }
+  private getEstimatedTax = async () => {
+    if (this.formGroup.controls.billingAddress.invalid) {
+      return 0;
+    }
 
-  toggleBankAccount = () => {
-    this.paymentComponent.showBankAccount = this.taxInformation.country === "US";
+    const cadence =
+      this.currentPlan.productTier !== ProductTierType.Families
+        ? this.currentPlan.isAnnual
+          ? "annually"
+          : "monthly"
+        : null;
 
-    if (
-      !this.paymentComponent.showBankAccount &&
-      this.paymentComponent.selected === PaymentMethodType.BankAccount
-    ) {
-      this.paymentComponent.select(PaymentMethodType.Card);
+    const billingAddress = getBillingAddressFromForm(this.formGroup.controls.billingAddress);
+
+    const getTierFromLegacyEnum = (organization: Organization) => {
+      switch (organization.productTierType) {
+        case ProductTierType.Families:
+          return "families";
+        case ProductTierType.Teams:
+          return "teams";
+        case ProductTierType.Enterprise:
+          return "enterprise";
+      }
+    };
+
+    const tier = getTierFromLegacyEnum(this.organization);
+
+    if (tier && cadence) {
+      const costs = await this.taxClient.previewTaxForOrganizationSubscriptionPlanChange(
+        this.organization.id,
+        {
+          tier,
+          cadence,
+        },
+        billingAddress,
+      );
+      return costs.tax;
+    } else {
+      return 0;
     }
   };
 
@@ -292,15 +323,24 @@ export class TrialPaymentDialogComponent implements OnInit {
   }
 
   async onSubscribe(): Promise<void> {
-    if (!this.taxComponent.validate()) {
-      this.taxComponent.markAllAsTouched();
+    this.formGroup.markAllAsTouched();
+    if (this.formGroup.invalid) {
+      return;
     }
+
     try {
-      await this.updateOrganizationPaymentMethod(
-        this.organizationId,
-        this.paymentComponent,
-        this.taxInformation,
-      );
+      const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+      if (!paymentMethod) {
+        return;
+      }
+
+      const billingAddress = getBillingAddressFromForm(this.formGroup.controls.billingAddress);
+
+      const subscriber: BitwardenSubscriber = { type: "organization", data: this.organization };
+      await Promise.all([
+        this.subscriberBillingClient.updatePaymentMethod(subscriber, paymentMethod, null),
+        this.subscriberBillingClient.updateBillingAddress(subscriber, billingAddress),
+      ]);
 
       if (this.currentPlan.type !== this.sub.planType) {
         const changePlanRequest = new ChangePlanFrequencyRequest();
@@ -332,20 +372,6 @@ export class TrialPaymentDialogComponent implements OnInit {
     }
   }
 
-  private async updateOrganizationPaymentMethod(
-    organizationId: string,
-    paymentComponent: PaymentComponent,
-    taxInformation: TaxInformation,
-  ): Promise<void> {
-    const paymentSource = await paymentComponent.tokenize();
-
-    const request = new UpdatePaymentMethodRequest();
-    request.paymentSource = paymentSource;
-    request.taxInformation = ExpandedTaxInfoUpdateRequest.From(taxInformation);
-
-    await this.billingApiService.updateOrganizationPaymentMethod(organizationId, request);
-  }
-
   resolvePlanName(productTier: ProductTierType): string {
     switch (productTier) {
       case ProductTierType.Enterprise:
@@ -362,4 +388,11 @@ export class TrialPaymentDialogComponent implements OnInit {
         return this.i18nService.t("planNameFree");
     }
   }
+
+  get supportsTaxId() {
+    if (!this.organization) {
+      return false;
+    }
+    return this.organization.productTierType !== ProductTierType.Families;
+  }
 }
diff --git a/apps/web/src/app/billing/shared/update-license-dialog.component.ts b/apps/web/src/app/billing/shared/update-license-dialog.component.ts
index 11b5e7fd8df..d9c885c9819 100644
--- a/apps/web/src/app/billing/shared/update-license-dialog.component.ts
+++ b/apps/web/src/app/billing/shared/update-license-dialog.component.ts
@@ -10,6 +10,8 @@ import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
 import { UpdateLicenseDialogResult } from "./update-license-types";
 import { UpdateLicenseComponent } from "./update-license.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "update-license-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/billing/shared/update-license.component.ts b/apps/web/src/app/billing/shared/update-license.component.ts
index 455b38386c6..fa42c116184 100644
--- a/apps/web/src/app/billing/shared/update-license.component.ts
+++ b/apps/web/src/app/billing/shared/update-license.component.ts
@@ -12,16 +12,28 @@ import { ToastService } from "@bitwarden/components";
 
 import { UpdateLicenseDialogResult } from "./update-license-types";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-update-license",
   templateUrl: "update-license.component.html",
   standalone: false,
 })
 export class UpdateLicenseComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationId: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showCancel = true;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showAutomaticSyncAndManualUpload: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onUpdated = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCanceled = new EventEmitter();
 
   formPromise: Promise<void>;
diff --git a/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.html b/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.html
deleted file mode 100644
index 1367e6e3082..00000000000
--- a/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<bit-callout type="warning" title="{{ 'verifyBankAccount' | i18n }}">
-  <p>{{ "verifyBankAccountWithStatementDescriptorInstructions" | i18n }}</p>
-  <form [formGroup]="formGroup" [bitSubmit]="submit">
-    <bit-form-field class="tw-mr-2 tw-w-48">
-      <bit-label>{{ "descriptorCode" | i18n }}</bit-label>
-      <input bitInput type="text" placeholder="SMAB12" formControlName="descriptorCode" />
-    </bit-form-field>
-    <button *ngIf="onSubmit" type="submit" bitButton bitFormButton buttonType="primary">
-      {{ "submit" | i18n }}
-    </button>
-  </form>
-</bit-callout>
diff --git a/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.ts b/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.ts
deleted file mode 100644
index b7cdfbe60a2..00000000000
--- a/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { FormBuilder, FormControl, Validators } from "@angular/forms";
-
-import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
-
-import { SharedModule } from "../../../shared";
-
-@Component({
-  selector: "app-verify-bank-account",
-  templateUrl: "./verify-bank-account.component.html",
-  imports: [SharedModule],
-})
-export class VerifyBankAccountComponent {
-  @Input() onSubmit?: (request: VerifyBankAccountRequest) => Promise<void>;
-  @Output() submitted = new EventEmitter();
-
-  protected formGroup = this.formBuilder.group({
-    descriptorCode: new FormControl<string>(null, [
-      Validators.required,
-      Validators.minLength(6),
-      Validators.maxLength(6),
-    ]),
-  });
-
-  constructor(private formBuilder: FormBuilder) {}
-
-  submit = async () => {
-    const request = new VerifyBankAccountRequest(this.formGroup.value.descriptorCode);
-    await this.onSubmit?.(request);
-    this.submitted.emit();
-  };
-}
diff --git a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html
index c1a33a4c8df..7377fc45484 100644
--- a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html
+++ b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html
@@ -54,17 +54,7 @@
       >
         <app-trial-billing-step
           *ngIf="stepper.selectedIndex === 2"
-          [organizationInfo]="{
-            name: orgInfoFormGroup.value.name!,
-            email: orgInfoFormGroup.value.billingEmail!,
-            type: trialOrganizationType,
-          }"
-          [subscriptionProduct]="
-            product === ProductType.SecretsManager
-              ? SubscriptionProduct.SecretsManager
-              : SubscriptionProduct.PasswordManager
-          "
-          [trialLength]="trialLength"
+          [trial]="trial"
           (steppedBack)="previousStep()"
           (organizationCreated)="createdOrganization($event)"
         >
diff --git a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
index 0b1ddda0c12..ef34584633b 100644
--- a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
+++ b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
@@ -30,25 +30,26 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { ToastService } from "@bitwarden/components";
 import { UserId } from "@bitwarden/user-core";
+import { Trial } from "@bitwarden/web-vault/app/billing/trial-initiation/trial-billing-step/trial-billing-step.service";
 
-import {
-  OrganizationCreatedEvent,
-  SubscriptionProduct,
-  TrialOrganizationType,
-} from "../../../billing/accounts/trial-initiation/trial-billing-step.component";
 import { RouterService } from "../../../core/router.service";
+import { OrganizationCreatedEvent } from "../trial-billing-step/trial-billing-step.component";
 import { VerticalStepperComponent } from "../vertical-stepper/vertical-stepper.component";
 
 export type InitiationPath =
   | "Password Manager trial from marketing website"
   | "Secrets Manager trial from marketing website";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-complete-trial-initiation",
   templateUrl: "complete-trial-initiation.component.html",
   standalone: false,
 })
 export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("stepper", { static: false }) verticalStepper!: VerticalStepperComponent;
 
   inputPasswordFlow = InputPasswordFlow.SetInitialPasswordAccountRegistration;
@@ -95,7 +96,6 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
   });
 
   private destroy$ = new Subject<void>();
-  protected readonly SubscriptionProduct = SubscriptionProduct;
   protected readonly ProductType = ProductType;
   protected trialPaymentOptional$ = this.configService.getFeatureFlag$(
     FeatureFlag.TrialPaymentOptional,
@@ -251,7 +251,7 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
     this.loading = true;
     let trialInitiationPath: InitiationPath = "Password Manager trial from marketing website";
     let plan: PlanInformation = {
-      type: this.getPlanType(),
+      type: await this.getPlanType(),
       passwordManagerSeats: 1,
     };
 
@@ -293,14 +293,21 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
     this.verticalStepper.previous();
   }
 
-  getPlanType() {
+  async getPlanType() {
+    const milestone3FeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM26462_Milestone_3,
+    );
+    const familyPlan = milestone3FeatureEnabled
+      ? PlanType.FamiliesAnnually
+      : PlanType.FamiliesAnnually2025;
+
     switch (this.productTier) {
       case ProductTierType.Teams:
         return PlanType.TeamsAnnually;
       case ProductTierType.Enterprise:
         return PlanType.EnterpriseAnnually;
       case ProductTierType.Families:
-        return PlanType.FamiliesAnnually;
+        return familyPlan;
       case ProductTierType.Free:
         return PlanType.Free;
       default:
@@ -338,14 +345,6 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
     }
   }
 
-  get trialOrganizationType(): TrialOrganizationType | null {
-    if (this.productTier === ProductTierType.Free) {
-      return null;
-    }
-
-    return this.productTier;
-  }
-
   readonly showBillingStep$ = this.trialPaymentOptional$.pipe(
     map((trialPaymentOptional) => {
       return (
@@ -434,4 +433,26 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
         return null;
       });
   }
+
+  get trial(): Trial {
+    const product =
+      this.product === ProductType.PasswordManager ? "passwordManager" : "secretsManager";
+
+    const tier =
+      this.productTier === ProductTierType.Families
+        ? "families"
+        : this.productTier === ProductTierType.Teams
+          ? "teams"
+          : "enterprise";
+
+    return {
+      organization: {
+        name: this.orgInfoFormGroup.value.name!,
+        email: this.orgInfoFormGroup.value.billingEmail!,
+      },
+      product,
+      tier,
+      length: this.trialLength,
+    };
+  }
 }
diff --git a/apps/web/src/app/billing/trial-initiation/confirmation-details.component.html b/apps/web/src/app/billing/trial-initiation/confirmation-details.component.html
index 764a417f531..237fb381400 100644
--- a/apps/web/src/app/billing/trial-initiation/confirmation-details.component.html
+++ b/apps/web/src/app/billing/trial-initiation/confirmation-details.component.html
@@ -9,7 +9,7 @@
     <li>
       <p>
         {{ "trialConfirmationEmail" | i18n }}
-        <span class="tw-font-bold">{{ email }}</span
+        <span class="tw-font-medium">{{ email }}</span
         >.
       </p>
     </li>
diff --git a/apps/web/src/app/billing/trial-initiation/confirmation-details.component.ts b/apps/web/src/app/billing/trial-initiation/confirmation-details.component.ts
index cbb1c84284c..3c92749dd38 100644
--- a/apps/web/src/app/billing/trial-initiation/confirmation-details.component.ts
+++ b/apps/web/src/app/billing/trial-initiation/confirmation-details.component.ts
@@ -4,15 +4,25 @@ import { Component, Input } from "@angular/core";
 
 import { ProductType } from "@bitwarden/common/billing/enums";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-trial-confirmation-details",
   templateUrl: "confirmation-details.component.html",
   standalone: false,
 })
 export class ConfirmationDetailsComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() email: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() orgLabel: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() product?: ProductType = ProductType.PasswordManager;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() trialLength: number;
 
   protected readonly Product = ProductType;
diff --git a/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.component.html b/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.component.html
new file mode 100644
index 00000000000..e3f7b68bf95
--- /dev/null
+++ b/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.component.html
@@ -0,0 +1,87 @@
+@if (!(prices$ | async)) {
+  <ng-container *ngTemplateOutlet="loadingSpinner" />
+} @else {
+  @let prices = prices$ | async;
+  <form [formGroup]="formGroup" [bitSubmit]="submit">
+    <div class="tw-container tw-mb-3">
+      <!-- Cadence -->
+      <div class="tw-mb-6">
+        <h2 class="tw-mb-3 tw-text-base tw-font-medium">{{ "billingPlanLabel" | i18n }}</h2>
+        <bit-radio-group [formControl]="formGroup.controls.cadence">
+          <div class="tw-mb-1 tw-items-center">
+            <bit-radio-button id="annual-cadence-button" [value]="'annually'">
+              <bit-label>
+                {{ "annual" | i18n }} -
+                {{ prices.annually | currency: "$" }}
+                /{{ "yr" | i18n }}
+              </bit-label>
+            </bit-radio-button>
+          </div>
+          @if (prices.monthly) {
+            <div class="tw-mb-1 tw-items-center">
+              <bit-radio-button id="monthly-cadence-button" [value]="'monthly'">
+                <bit-label>
+                  {{ "monthly" | i18n }} -
+                  {{ prices.monthly | currency: "$" }}
+                  /{{ "monthAbbr" | i18n }}
+                </bit-label>
+              </bit-radio-button>
+            </div>
+          }
+        </bit-radio-group>
+      </div>
+      <!-- Payment -->
+      <div class="tw-mb-4">
+        <h2 class="tw-mb-3 tw-text-base tw-font-medium">{{ "paymentType" | i18n }}</h2>
+        <app-enter-payment-method
+          [group]="formGroup.controls.paymentMethod"
+        ></app-enter-payment-method>
+        <app-enter-billing-address
+          [group]="formGroup.controls.billingAddress"
+          [scenario]="{ type: 'checkout', supportsTaxId: trial().tier !== 'families' }"
+        ></app-enter-billing-address>
+
+        @if (trial().length === 0) {
+          @let label =
+            trial().product === "passwordManager"
+              ? "passwordManagerPlanPrice"
+              : "secretsManagerPlanPrice";
+          <div id="price" class="tw-my-4">
+            @let selectionTaxAmounts = selectionCosts$ | async;
+            <div class="tw-text-muted tw-text-base">
+              {{ label | i18n }}: {{ selectionPrice$ | async | currency: "USD $" }}
+              <div>
+                {{ "estimatedTax" | i18n }}:
+                {{ selectionTaxAmounts.tax | currency: "USD $" }}
+              </div>
+            </div>
+            <hr class="tw-my-1 tw-grid tw-grid-cols-3 tw-ml-0" />
+            <p class="tw-text-lg">
+              <strong>{{ "total" | i18n }}: </strong>
+              @let interval = formGroup.value.cadence === "annually" ? "year" : "month";
+              {{ selectionTaxAmounts.total | currency: "USD $" }}/{{ interval | i18n }}
+            </p>
+          </div>
+        }
+      </div>
+      <!-- Submit -->
+      <div class="tw-flex tw-space-x-2">
+        <button bitButton bitFormButton buttonType="primary" type="submit">
+          {{ (trial().length > 0 ? "startTrial" : "submit") | i18n }}
+        </button>
+        <button bitButton type="button" buttonType="secondary" (click)="stepBack()">
+          {{ "back" | i18n }}
+        </button>
+      </div>
+    </div>
+  </form>
+}
+
+<ng-template #loadingSpinner>
+  <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-template>
diff --git a/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.component.ts b/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.component.ts
new file mode 100644
index 00000000000..04ee7931cf3
--- /dev/null
+++ b/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.component.ts
@@ -0,0 +1,166 @@
+import { Component, input, OnDestroy, OnInit, output, ViewChild } from "@angular/core";
+import { FormControl, FormGroup } from "@angular/forms";
+import {
+  combineLatest,
+  debounceTime,
+  filter,
+  map,
+  Observable,
+  shareReplay,
+  startWith,
+  switchMap,
+  Subject,
+  firstValueFrom,
+} from "rxjs";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ToastService } from "@bitwarden/components";
+import { TaxClient } from "@bitwarden/web-vault/app/billing/clients";
+import {
+  BillingAddressControls,
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+import {
+  Cadence,
+  Cadences,
+  Prices,
+  Trial,
+  TrialBillingStepService,
+} from "@bitwarden/web-vault/app/billing/trial-initiation/trial-billing-step/trial-billing-step.service";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+export interface OrganizationCreatedEvent {
+  organizationId: string;
+  planDescription: string;
+}
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-trial-billing-step",
+  templateUrl: "./trial-billing-step.component.html",
+  imports: [EnterPaymentMethodComponent, EnterBillingAddressComponent, SharedModule],
+  providers: [TaxClient, TrialBillingStepService],
+})
+export class TrialBillingStepComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
+
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  protected trial = input.required<Trial>();
+  protected steppedBack = output<void>();
+  protected organizationCreated = output<OrganizationCreatedEvent>();
+
+  private destroy$ = new Subject<void>();
+
+  protected prices$!: Observable<Prices>;
+
+  protected selectionPrice$!: Observable<number>;
+  protected selectionCosts$!: Observable<{
+    tax: number;
+    total: number;
+  }>;
+  protected selectionDescription$!: Observable<string>;
+
+  protected formGroup = new FormGroup({
+    cadence: new FormControl<Cadence>(Cadences.Annually, {
+      nonNullable: true,
+    }),
+    paymentMethod: EnterPaymentMethodComponent.getFormGroup(),
+    billingAddress: EnterBillingAddressComponent.getFormGroup(),
+  });
+
+  constructor(
+    private i18nService: I18nService,
+    private toastService: ToastService,
+    private trialBillingStepService: TrialBillingStepService,
+  ) {}
+
+  async ngOnInit() {
+    const { product, tier } = this.trial();
+    this.prices$ = this.trialBillingStepService.getPrices$(product, tier);
+
+    const cadenceChanged = this.formGroup.controls.cadence.valueChanges.pipe(
+      startWith(Cadences.Annually),
+    );
+
+    this.selectionPrice$ = combineLatest([this.prices$, cadenceChanged]).pipe(
+      map(([prices, cadence]) => prices[cadence]),
+      filter((price): price is number => !!price),
+    );
+
+    this.selectionCosts$ = combineLatest([
+      cadenceChanged,
+      this.formGroup.controls.billingAddress.valueChanges.pipe(
+        startWith(this.formGroup.controls.billingAddress.value),
+        filter(
+          (billingAddress): billingAddress is BillingAddressControls =>
+            !!billingAddress.country && !!billingAddress.postalCode,
+        ),
+      ),
+    ]).pipe(
+      debounceTime(500),
+      switchMap(([cadence, billingAddress]) =>
+        this.trialBillingStepService.getCosts(product, tier, cadence, billingAddress),
+      ),
+      startWith({
+        tax: 0,
+        total: 0,
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+
+    this.selectionDescription$ = combineLatest([this.selectionPrice$, cadenceChanged]).pipe(
+      map(([price, cadence]) => {
+        switch (cadence) {
+          case Cadences.Annually:
+            return `${this.i18nService.t("annual")} ($${price}/${this.i18nService.t("yr")})`;
+          case Cadences.Monthly:
+            return `${this.i18nService.t("monthly")} ($${price}/${this.i18nService.t("monthAbbr")})`;
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  submit = async (): Promise<void> => {
+    this.formGroup.markAllAsTouched();
+    if (this.formGroup.invalid) {
+      return;
+    }
+
+    const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+    if (!paymentMethod) {
+      return;
+    }
+
+    const billingAddress = this.formGroup.controls.billingAddress.getRawValue();
+
+    const organization = await this.trialBillingStepService.startTrial(
+      this.trial(),
+      this.formGroup.value.cadence!,
+      billingAddress,
+      paymentMethod,
+    );
+
+    this.toastService.showToast({
+      variant: "success",
+      title: this.i18nService.t("organizationCreated"),
+      message: this.i18nService.t("organizationReadyToGo"),
+    });
+
+    this.organizationCreated.emit({
+      organizationId: organization.id,
+      planDescription: await firstValueFrom(this.selectionDescription$),
+    });
+  };
+
+  protected stepBack = () => this.steppedBack.emit();
+}
diff --git a/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.service.ts b/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.service.ts
new file mode 100644
index 00000000000..0888ef07afc
--- /dev/null
+++ b/apps/web/src/app/billing/trial-initiation/trial-billing-step/trial-billing-step.service.ts
@@ -0,0 +1,225 @@
+import { Injectable } from "@angular/core";
+import { combineLatestWith, firstValueFrom, from, map, shareReplay } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationResponse } from "@bitwarden/common/admin-console/models/response/organization.response";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import {
+  OrganizationBillingServiceAbstraction,
+  SubscriptionInformation,
+} from "@bitwarden/common/billing/abstractions";
+import { PaymentMethodType, PlanType } from "@bitwarden/common/billing/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { TaxClient } from "@bitwarden/web-vault/app/billing/clients";
+import {
+  BillingAddressControls,
+  getBillingAddressFromControls,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+import {
+  tokenizablePaymentMethodToLegacyEnum,
+  TokenizedPaymentMethod,
+} from "@bitwarden/web-vault/app/billing/payment/types";
+
+export const Tiers = {
+  Families: "families",
+  Teams: "teams",
+  Enterprise: "enterprise",
+} as const;
+
+export const Cadences = {
+  Annually: "annually",
+  Monthly: "monthly",
+} as const;
+
+export const Products = {
+  PasswordManager: "passwordManager",
+  SecretsManager: "secretsManager",
+} as const;
+
+export type Tier = (typeof Tiers)[keyof typeof Tiers];
+export type Cadence = (typeof Cadences)[keyof typeof Cadences];
+export type Product = (typeof Products)[keyof typeof Products];
+
+export type Prices = {
+  [Cadences.Annually]: number;
+  [Cadences.Monthly]?: number;
+};
+
+export interface Trial {
+  organization: {
+    name: string;
+    email: string;
+  };
+  product: Product;
+  tier: Tier;
+  length: number;
+}
+
+@Injectable()
+export class TrialBillingStepService {
+  constructor(
+    private accountService: AccountService,
+    private apiService: ApiService,
+    private organizationBillingService: OrganizationBillingServiceAbstraction,
+    private taxClient: TaxClient,
+    private configService: ConfigService,
+  ) {}
+
+  private plans$ = from(this.apiService.getPlans()).pipe(
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
+  getPrices$ = (product: Product, tier: Tier) =>
+    this.plans$.pipe(
+      combineLatestWith(this.configService.getFeatureFlag$(FeatureFlag.PM26462_Milestone_3)),
+      map(([plans, milestone3FeatureEnabled]) => {
+        switch (tier) {
+          case "families": {
+            const annually = plans.data.find(
+              (plan) =>
+                plan.type ===
+                (milestone3FeatureEnabled
+                  ? PlanType.FamiliesAnnually
+                  : PlanType.FamiliesAnnually2025),
+            );
+            return {
+              annually: annually!.PasswordManager.basePrice,
+            };
+          }
+          case "teams":
+          case "enterprise": {
+            const annually = plans.data.find(
+              (plan) =>
+                plan.type ===
+                (tier === "teams" ? PlanType.TeamsAnnually : PlanType.EnterpriseAnnually),
+            );
+            const monthly = plans.data.find(
+              (plan) =>
+                plan.type ===
+                (tier === "teams" ? PlanType.TeamsMonthly : PlanType.EnterpriseMonthly),
+            );
+            switch (product) {
+              case "passwordManager": {
+                return {
+                  annually: annually!.PasswordManager.seatPrice,
+                  monthly: monthly!.PasswordManager.seatPrice,
+                };
+              }
+              case "secretsManager": {
+                return {
+                  annually: annually!.SecretsManager.seatPrice,
+                  monthly: monthly!.SecretsManager.seatPrice,
+                };
+              }
+            }
+          }
+        }
+      }),
+    );
+
+  getCosts = async (
+    product: Product,
+    tier: Tier,
+    cadence: Cadence,
+    billingAddressControls: BillingAddressControls,
+  ): Promise<{
+    tax: number;
+    total: number;
+  }> => {
+    const billingAddress = getBillingAddressFromControls(billingAddressControls);
+    return await this.taxClient.previewTaxForOrganizationSubscriptionPurchase(
+      {
+        tier,
+        cadence,
+        passwordManager: {
+          seats: 1,
+          additionalStorage: 0,
+          sponsored: false,
+        },
+        secretsManager:
+          product === "secretsManager"
+            ? {
+                seats: 1,
+                additionalServiceAccounts: 0,
+                standalone: true,
+              }
+            : undefined,
+      },
+      billingAddress,
+    );
+  };
+
+  startTrial = async (
+    trial: Trial,
+    cadence: Cadence,
+    billingAddress: BillingAddressControls,
+    paymentMethod: TokenizedPaymentMethod,
+  ): Promise<OrganizationResponse> => {
+    const getPlanType = async (tier: Tier, cadence: Cadence) => {
+      const plans = await firstValueFrom(this.plans$);
+      const milestone3FeatureEnabled = await this.configService.getFeatureFlag(
+        FeatureFlag.PM26462_Milestone_3,
+      );
+      const familyPlan = milestone3FeatureEnabled
+        ? PlanType.FamiliesAnnually
+        : PlanType.FamiliesAnnually2025;
+      switch (tier) {
+        case "families":
+          return plans.data.find((plan) => plan.type === familyPlan)!.type;
+        case "teams":
+          return plans.data.find(
+            (plan) =>
+              plan.type ===
+              (cadence === "annually" ? PlanType.TeamsAnnually : PlanType.TeamsMonthly),
+          )!.type;
+        case "enterprise":
+          return plans.data.find(
+            (plan) =>
+              plan.type ===
+              (cadence === "annually" ? PlanType.EnterpriseAnnually : PlanType.EnterpriseMonthly),
+          )!.type;
+      }
+    };
+
+    const legacyPaymentMethod: [string, PaymentMethodType] = [
+      paymentMethod.token,
+      tokenizablePaymentMethodToLegacyEnum(paymentMethod.type),
+    ];
+    const planType = await getPlanType(trial.tier, cadence);
+
+    const request: SubscriptionInformation = {
+      organization: {
+        name: trial.organization.name,
+        billingEmail: trial.organization.email,
+        initiationPath:
+          trial.product === "passwordManager"
+            ? "Password Manager trial from marketing website"
+            : "Secrets Manager trial from marketing website",
+      },
+      plan:
+        trial.product === "passwordManager"
+          ? { type: planType, passwordManagerSeats: 1 }
+          : {
+              type: planType,
+              passwordManagerSeats: 1,
+              subscribeToSecretsManager: true,
+              isFromSecretsManagerTrial: true,
+              secretsManagerSeats: 1,
+            },
+      payment: {
+        paymentMethod: legacyPaymentMethod,
+        billing: {
+          country: billingAddress.country,
+          postalCode: billingAddress.postalCode,
+          taxId: billingAddress.taxId ?? undefined,
+        },
+        skipTrial: trial.length === 0,
+      },
+    };
+
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    return await this.organizationBillingService.purchaseSubscription(request, activeUserId);
+  };
+}
diff --git a/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
index 06e1cce7f23..cd393f0dd5e 100644
--- a/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
+++ b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
@@ -6,11 +6,11 @@ import { InputPasswordComponent } from "@bitwarden/auth/angular";
 import { FormFieldModule } from "@bitwarden/components";
 
 import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
-import { TrialBillingStepComponent } from "../../billing/accounts/trial-initiation/trial-billing-step.component";
 import { SharedModule } from "../../shared";
 
 import { CompleteTrialInitiationComponent } from "./complete-trial-initiation/complete-trial-initiation.component";
 import { ConfirmationDetailsComponent } from "./confirmation-details.component";
+import { TrialBillingStepComponent } from "./trial-billing-step/trial-billing-step.component";
 import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.module";
 
 @NgModule({
diff --git a/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.html b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.html
index 5d7d3c62d2f..bd1a9dc59a7 100644
--- a/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.html
+++ b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.html
@@ -11,7 +11,7 @@
     [attr.aria-expanded]="selected"
   >
     <span
-      class="tw-mr-3.5 tw-w-9 tw-rounded-full tw-font-bold tw-leading-9"
+      class="tw-mr-3.5 tw-w-9 tw-rounded-full tw-font-medium tw-leading-9"
       *ngIf="!step.completed"
       [ngClass]="{
         'tw-bg-primary-600 tw-text-contrast': selected,
@@ -22,7 +22,7 @@
       {{ stepNumber }}
     </span>
     <span
-      class="tw-mr-3.5 tw-w-9 tw-rounded-full tw-bg-primary-600 tw-font-bold tw-leading-9 tw-text-contrast"
+      class="tw-mr-3.5 tw-w-9 tw-rounded-full tw-bg-primary-600 tw-font-medium tw-leading-9 tw-text-contrast"
       *ngIf="step.completed"
     >
       <i class="bwi bwi-fw bwi-check tw-p-1" aria-hidden="true"></i>
@@ -30,7 +30,7 @@
     <div
       class="tw-txt-main tw-mt-3.5 tw-h-12 tw-text-left tw-leading-snug"
       [ngClass]="{
-        'tw-font-bold': selected,
+        'tw-font-medium': selected,
       }"
     >
       <p
diff --git a/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.ts b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.ts
index 0c6e084f5c4..183346b9033 100644
--- a/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.ts
+++ b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.ts
@@ -4,17 +4,29 @@ import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 import { VerticalStep } from "./vertical-step.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vertical-step-content",
   templateUrl: "vertical-step-content.component.html",
   standalone: false,
 })
 export class VerticalStepContentComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSelectStep = new EventEmitter<void>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() selected = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() step: VerticalStep;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() stepNumber: number;
 
   selectStep() {
diff --git a/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step.component.ts b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step.component.ts
index b4b643b3889..f79bb5a4451 100644
--- a/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step.component.ts
+++ b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step.component.ts
@@ -1,14 +1,24 @@
 import { CdkStep } from "@angular/cdk/stepper";
 import { Component, Input } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vertical-step",
   templateUrl: "vertical-step.component.html",
   providers: [{ provide: CdkStep, useExisting: VerticalStep }],
   standalone: false,
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
 export class VerticalStep extends CdkStep {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() subLabel = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() applyBorder = true;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() addSubLabelSpacing = false;
 }
diff --git a/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.component.ts b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.component.ts
index 333224aac54..c7c2c17000e 100644
--- a/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.component.ts
+++ b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.component.ts
@@ -5,6 +5,8 @@ import { Component, Input, QueryList } from "@angular/core";
 
 import { VerticalStep } from "./vertical-step.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vertical-stepper",
   templateUrl: "vertical-stepper.component.html",
@@ -14,6 +16,8 @@ import { VerticalStep } from "./vertical-step.component";
 export class VerticalStepperComponent extends CdkStepper {
   readonly steps: QueryList<VerticalStep>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   activeClass = "active";
 
diff --git a/apps/web/src/app/billing/warnings/components/tax-id-warning.component.ts b/apps/web/src/app/billing/warnings/components/tax-id-warning.component.ts
index 55fa0c0f439..c0fe5626fcb 100644
--- a/apps/web/src/app/billing/warnings/components/tax-id-warning.component.ts
+++ b/apps/web/src/app/billing/warnings/components/tax-id-warning.component.ts
@@ -83,6 +83,8 @@ type View = {
 
 type GetWarning$ = () => Observable<TaxIdWarningType | null>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-tax-id-warning",
   template: `
@@ -108,8 +110,14 @@ type GetWarning$ = () => Observable<TaxIdWarningType | null>;
   imports: [BannerModule, SharedModule],
 })
 export class TaxIdWarningComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) subscriber!: NonIndividualSubscriber;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) getWarning$!: GetWarning$;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() billingAddressUpdated = new EventEmitter<void>();
 
   protected enableTaxIdWarning$ = this.configService.getFeatureFlag$(
diff --git a/apps/web/src/app/components/dynamic-avatar.component.ts b/apps/web/src/app/components/dynamic-avatar.component.ts
index 8cd73862151..ddaaa21758b 100644
--- a/apps/web/src/app/components/dynamic-avatar.component.ts
+++ b/apps/web/src/app/components/dynamic-avatar.component.ts
@@ -8,6 +8,8 @@ import { AvatarService } from "@bitwarden/common/auth/abstractions/avatar.servic
 import { SharedModule } from "../shared";
 
 type SizeTypes = "xlarge" | "large" | "default" | "small" | "xsmall";
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "dynamic-avatar",
   imports: [SharedModule],
@@ -25,10 +27,20 @@ type SizeTypes = "xlarge" | "large" | "default" | "small" | "xsmall";
   </span>`,
 })
 export class DynamicAvatarComponent implements OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() border = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() id: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() text: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() size: SizeTypes = "default";
   private destroy$ = new Subject<void>();
 
diff --git a/apps/web/src/app/components/environment-selector/environment-selector.component.html b/apps/web/src/app/components/environment-selector/environment-selector.component.html
index 0c93865c900..9862f62c2e2 100644
--- a/apps/web/src/app/components/environment-selector/environment-selector.component.html
+++ b/apps/web/src/app/components/environment-selector/environment-selector.component.html
@@ -18,7 +18,7 @@
   <div bitTypography="body2">
     {{ "accessing" | i18n }}:
     <a [routerLink]="[]" [bitMenuTriggerFor]="environmentOptions">
-      <b class="tw-text-primary-600 tw-font-semibold">{{ currentRegion?.domain }}</b>
+      <b class="tw-text-primary-600 tw-font-medium">{{ currentRegion?.domain }}</b>
       <i class="bwi bwi-fw bwi-sm bwi-angle-down" aria-hidden="true"></i>
     </a>
   </div>
diff --git a/apps/web/src/app/components/environment-selector/environment-selector.component.ts b/apps/web/src/app/components/environment-selector/environment-selector.component.ts
index 37e5ae0c3d8..4f77cc96bf7 100644
--- a/apps/web/src/app/components/environment-selector/environment-selector.component.ts
+++ b/apps/web/src/app/components/environment-selector/environment-selector.component.ts
@@ -12,6 +12,8 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 
 import { SharedModule } from "../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "environment-selector",
   templateUrl: "environment-selector.component.html",
diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts
index 29b84ddc382..c0716d99716 100644
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -9,11 +9,16 @@ import {
   DefaultCollectionAdminService,
   OrganizationUserApiService,
   CollectionService,
+  AutomaticUserConfirmationService,
+  DefaultAutomaticUserConfirmationService,
+  OrganizationUserService,
+  DefaultOrganizationUserService,
 } from "@bitwarden/admin-console/common";
 import { DefaultDeviceManagementComponentService } from "@bitwarden/angular/auth/device-management/default-device-management-component.service";
 import { DeviceManagementComponentServiceAbstraction } from "@bitwarden/angular/auth/device-management/device-management-component.service.abstraction";
 import { ChangePasswordService } from "@bitwarden/angular/auth/password-management/change-password";
 import { SetInitialPasswordService } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
+import { PremiumInterestStateService } from "@bitwarden/angular/billing/services/premium-interest/premium-interest-state.service.abstraction";
 import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
 import {
   CLIENT_TYPE,
@@ -43,7 +48,10 @@ import {
 } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import {
+  InternalOrganizationServiceAbstraction,
+  OrganizationService,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import {
   InternalPolicyService,
@@ -55,6 +63,7 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
 import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { ClientType } from "@bitwarden/common/enums";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
@@ -78,6 +87,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { SdkClientFactory } from "@bitwarden/common/platform/abstractions/sdk/sdk-client-factory";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
+import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
 import { IpcService } from "@bitwarden/common/platform/ipc";
 // eslint-disable-next-line no-restricted-imports -- Needed for DI
 import {
@@ -94,6 +104,7 @@ import { NoopSdkLoadService } from "@bitwarden/common/platform/services/sdk/noop
 import { StorageServiceProvider } from "@bitwarden/common/platform/services/storage-service.provider";
 import { GlobalStateProvider, StateProvider } from "@bitwarden/common/platform/state";
 import { WindowStorageService } from "@bitwarden/common/platform/storage/window-storage.service";
+import { SyncService } from "@bitwarden/common/platform/sync/sync.service";
 import {
   DefaultThemeStateService,
   ThemeStateService,
@@ -106,10 +117,14 @@ import {
   KeyService as KeyServiceAbstraction,
   BiometricsService,
 } from "@bitwarden/key-management";
-import { LockComponentService } from "@bitwarden/key-management-ui";
+import {
+  LockComponentService,
+  SessionTimeoutSettingsComponentService,
+} from "@bitwarden/key-management-ui";
 import { SerializedMemoryStorageService } from "@bitwarden/storage-core";
 import { DefaultSshImportPromptService, SshImportPromptService } from "@bitwarden/vault";
 import { WebOrganizationInviteService } from "@bitwarden/web-vault/app/auth/core/services/organization-invite/web-organization-invite.service";
+import { WebSessionTimeoutSettingsComponentService } from "@bitwarden/web-vault/app/key-management/session-timeout/services/web-session-timeout-settings-component.service";
 import { WebVaultPremiumUpgradePromptService } from "@bitwarden/web-vault/app/vault/services/web-premium-upgrade-prompt.service";
 
 import { flagEnabled } from "../../utils/flags";
@@ -127,6 +142,7 @@ import {
   WebSetInitialPasswordService,
 } from "../auth";
 import { WebSsoComponentService } from "../auth/core/services/login/web-sso-component.service";
+import { WebPremiumInterestStateService } from "../billing/services/premium-interest/web-premium-interest-state.service";
 import { HtmlStorageService } from "../core/html-storage.service";
 import { I18nService } from "../core/i18n.service";
 import { WebFileDownloadService } from "../core/web-file-download.service";
@@ -139,6 +155,7 @@ import { WebEnvironmentService } from "../platform/web-environment.service";
 import { WebMigrationRunner } from "../platform/web-migration-runner";
 import { WebSdkLoadService } from "../platform/web-sdk-load.service";
 import { WebStorageServiceProvider } from "../platform/web-storage-service.provider";
+import { WebSystemService } from "../platform/web-system.service";
 
 import { EventService } from "./event.service";
 import { InitService } from "./init.service";
@@ -332,6 +349,29 @@ const safeProviders: SafeProvider[] = [
       OrganizationService,
     ],
   }),
+  safeProvider({
+    provide: OrganizationUserService,
+    useClass: DefaultOrganizationUserService,
+    deps: [
+      KeyServiceAbstraction,
+      EncryptService,
+      OrganizationUserApiService,
+      AccountService,
+      I18nServiceAbstraction,
+    ],
+  }),
+  safeProvider({
+    provide: AutomaticUserConfirmationService,
+    useClass: DefaultAutomaticUserConfirmationService,
+    deps: [
+      ConfigService,
+      ApiService,
+      OrganizationUserService,
+      StateProvider,
+      InternalOrganizationServiceAbstraction,
+      OrganizationUserApiService,
+    ],
+  }),
   safeProvider({
     provide: SdkLoadService,
     useClass: flagEnabled("sdk") ? WebSdkLoadService : NoopSdkLoadService,
@@ -408,7 +448,31 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: PremiumUpgradePromptService,
     useClass: WebVaultPremiumUpgradePromptService,
-    deps: [DialogService, Router],
+    deps: [
+      DialogService,
+      ConfigService,
+      AccountService,
+      ApiService,
+      SyncService,
+      BillingAccountProfileStateService,
+      PlatformUtilsService,
+      Router,
+    ],
+  }),
+  safeProvider({
+    provide: PremiumInterestStateService,
+    useClass: WebPremiumInterestStateService,
+    deps: [StateProvider],
+  }),
+  safeProvider({
+    provide: SystemService,
+    useClass: WebSystemService,
+    deps: [],
+  }),
+  safeProvider({
+    provide: SessionTimeoutSettingsComponentService,
+    useClass: WebSessionTimeoutSettingsComponentService,
+    deps: [I18nServiceAbstraction, PlatformUtilsService],
   }),
 ];
 
diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts
index 7b1e598a77e..05a7f5aa64c 100644
--- a/apps/web/src/app/core/event.service.ts
+++ b/apps/web/src/app/core/event.service.ts
@@ -559,9 +559,12 @@ export class EventService {
         humanReadableMsg = this.i18nService.t("editedSecretWithId", this.getShortId(ev.secretId));
         break;
       case EventType.Project_Retrieved:
-        msg = this.i18nService.t("accessedProjectWithId", this.formatProjectId(ev, options));
+        msg = this.i18nService.t(
+          "accessedProjectWithIdentifier",
+          this.formatProjectId(ev, options),
+        );
         humanReadableMsg = this.i18nService.t(
-          "accessedProjectWithId",
+          "accessedProjectWithIdentifier",
           this.getShortId(ev.projectId),
         );
         break;
@@ -583,6 +586,74 @@ export class EventService {
         msg = this.i18nService.t("editedProjectWithId", this.formatProjectId(ev, options));
         humanReadableMsg = this.i18nService.t("editedProjectWithId", this.getShortId(ev.projectId));
         break;
+      case EventType.ServiceAccount_UserAdded:
+        msg = this.i18nService.t(
+          "addedUserToServiceAccountWithId",
+          this.formatUserId(ev, options),
+          this.formatServiceAccountId(ev, options),
+        );
+        humanReadableMsg = this.i18nService.t(
+          "addedUserToServiceAccountWithId",
+          this.formatUserId(ev, options),
+          this.formatServiceAccountId(ev, options),
+        );
+        break;
+      case EventType.ServiceAccount_UserRemoved:
+        msg = this.i18nService.t(
+          "removedUserToServiceAccountWithId",
+          this.formatUserId(ev, options),
+          this.formatServiceAccountId(ev, options),
+        );
+        humanReadableMsg = this.i18nService.t(
+          "removedUserToServiceAccountWithId",
+          this.formatUserId(ev, options),
+          this.formatServiceAccountId(ev, options),
+        );
+        break;
+      case EventType.ServiceAccount_GroupRemoved:
+        msg = this.i18nService.t(
+          "removedGroupFromServiceAccountWithId",
+          this.formatGroupId(ev),
+          this.formatServiceAccountId(ev, options),
+        );
+        humanReadableMsg = this.i18nService.t(
+          "removedGroupFromServiceAccountWithId",
+          this.formatGroupId(ev),
+          this.formatServiceAccountId(ev, options),
+        );
+        break;
+      case EventType.ServiceAccount_GroupAdded:
+        msg = this.i18nService.t(
+          "addedGroupToServiceAccountId",
+          this.formatGroupId(ev),
+          this.formatServiceAccountId(ev, options),
+        );
+        humanReadableMsg = this.i18nService.t(
+          "addedGroupToServiceAccountId",
+          this.formatGroupId(ev),
+          this.formatServiceAccountId(ev, options),
+        );
+        break;
+      case EventType.ServiceAccount_Created:
+        msg = this.i18nService.t(
+          "serviceAccountCreatedWithId",
+          this.formatServiceAccountId(ev, options),
+        );
+        humanReadableMsg = this.i18nService.t(
+          "serviceAccountCreatedWithId",
+          this.formatServiceAccountId(ev, options),
+        );
+        break;
+      case EventType.ServiceAccount_Deleted:
+        msg = this.i18nService.t(
+          "serviceAccountDeletedWithId",
+          this.formatServiceAccountId(ev, options),
+        );
+        humanReadableMsg = this.i18nService.t(
+          "serviceAccountDeletedWithId",
+          this.formatServiceAccountId(ev, options),
+        );
+        break;
       default:
         break;
     }
@@ -757,6 +828,35 @@ export class EventService {
     return a.outerHTML;
   }
 
+  formatServiceAccountId(ev: EventResponse, options: EventOptions): string {
+    const shortId = this.getShortId(ev.grantedServiceAccountId);
+    if (options.disableLink) {
+      return shortId;
+    }
+    const a = this.makeAnchor(shortId);
+    a.setAttribute(
+      "href",
+      "#/sm/" +
+        ev.organizationId +
+        "/machine-accounts?search=" +
+        shortId +
+        "&viewEvents=" +
+        ev.grantedServiceAccountId +
+        "&type=all",
+    );
+    return a.outerHTML;
+  }
+
+  formatUserId(ev: EventResponse, options: EventOptions): string {
+    const shortId = this.getShortId(ev.userId);
+    if (options.disableLink) {
+      return shortId;
+    }
+    const a = this.makeAnchor(shortId);
+    a.setAttribute("href", "#/organizations/" + ev.organizationId + "/members?search=" + shortId);
+    return a.outerHTML;
+  }
+
   formatProjectId(ev: EventResponse, options: EventOptions): string {
     const shortId = this.getShortId(ev.projectId);
     if (options.disableLink) {
diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts
index a3358ff7253..71e3578a7c6 100644
--- a/apps/web/src/app/core/init.service.ts
+++ b/apps/web/src/app/core/init.service.ts
@@ -6,9 +6,10 @@ import { AbstractThemingService } from "@bitwarden/angular/platform/services/the
 import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DefaultVaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { IpcService } from "@bitwarden/common/platform/ipc";
@@ -30,7 +31,7 @@ export class InitService {
     private vaultTimeoutService: DefaultVaultTimeoutService,
     private i18nService: I18nServiceAbstraction,
     private eventUploadService: EventUploadServiceAbstraction,
-    private twoFactorService: TwoFactorServiceAbstraction,
+    private twoFactorService: TwoFactorService,
     private keyService: KeyServiceAbstraction,
     private themingService: AbstractThemingService,
     private encryptService: EncryptService,
@@ -40,6 +41,7 @@ export class InitService {
     private ipcService: IpcService,
     private sdkLoadService: SdkLoadService,
     private taskService: TaskService,
+    private configService: ConfigService,
     private readonly migrationRunner: MigrationRunner,
     @Inject(DOCUMENT) private document: Document,
   ) {}
@@ -48,6 +50,7 @@ export class InitService {
     return async () => {
       await this.sdkLoadService.loadAndInit();
       await this.migrationRunner.run();
+      this.encryptService.init(this.configService);
 
       const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
       if (activeAccount) {
diff --git a/apps/web/src/app/core/router.service.ts b/apps/web/src/app/core/router.service.ts
index 603c171e95b..7a2e53a374e 100644
--- a/apps/web/src/app/core/router.service.ts
+++ b/apps/web/src/app/core/router.service.ts
@@ -75,9 +75,7 @@ export class RouterService {
         const titleId: string = child?.snapshot?.data?.titleId;
         const rawTitle: string = child?.snapshot?.data?.title;
 
-        // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
-        // eslint-disable-next-line no-constant-binary-expression
-        const updateUrl = !child?.snapshot?.data?.doNotSaveUrl ?? true;
+        const updateUrl = !child?.snapshot?.data?.doNotSaveUrl;
 
         if (titleId != null || rawTitle != null) {
           const newTitle = rawTitle != null ? rawTitle : i18nService.t(titleId);
diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts
index dea4323bcc4..037ee0f9060 100644
--- a/apps/web/src/app/core/web-platform-utils.service.ts
+++ b/apps/web/src/app/core/web-platform-utils.service.ts
@@ -219,4 +219,8 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
   getAutofillKeyboardShortcut(): Promise<string> {
     return null;
   }
+
+  packageType(): Promise<string | null> {
+    return null;
+  }
 }
diff --git a/apps/web/src/app/dirt/reports/pages/breach-report.component.ts b/apps/web/src/app/dirt/reports/pages/breach-report.component.ts
index b197c7dcae8..db85f503aec 100644
--- a/apps/web/src/app/dirt/reports/pages/breach-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/breach-report.component.ts
@@ -8,6 +8,8 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BreachAccountResponse } from "@bitwarden/common/dirt/models/response/breach-account.response";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-breach-report",
   templateUrl: "breach-report.component.html",
diff --git a/apps/web/src/app/dirt/reports/pages/cipher-report.component.ts b/apps/web/src/app/dirt/reports/pages/cipher-report.component.ts
index 69dd360ad31..d098be56663 100644
--- a/apps/web/src/app/dirt/reports/pages/cipher-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/cipher-report.component.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Directive, OnDestroy } from "@angular/core";
 import {
   BehaviorSubject,
@@ -36,7 +34,7 @@ import {
 import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 
 @Directive()
-export class CipherReportComponent implements OnDestroy {
+export abstract class CipherReportComponent implements OnDestroy {
   isAdminConsoleActive = false;
 
   loading = false;
@@ -44,16 +42,16 @@ export class CipherReportComponent implements OnDestroy {
   ciphers: CipherView[] = [];
   allCiphers: CipherView[] = [];
   dataSource = new TableDataSource<CipherView>();
-  organization: Organization;
-  organizations: Organization[];
+  organization: Organization | undefined = undefined;
+  organizations: Organization[] = [];
   organizations$: Observable<Organization[]>;
 
   filterStatus: any = [0];
   showFilterToggle: boolean = false;
   vaultMsg: string = "vault";
-  currentFilterStatus: number | string;
+  currentFilterStatus: number | string = 0;
   protected filterOrgStatus$ = new BehaviorSubject<number | string>(0);
-  private destroyed$: Subject<void> = new Subject();
+  protected destroyed$: Subject<void> = new Subject();
   private vaultItemDialogRef?: DialogRef<VaultItemDialogResult> | undefined;
 
   constructor(
@@ -107,7 +105,7 @@ export class CipherReportComponent implements OnDestroy {
     if (filterId === 0) {
       cipherCount = this.allCiphers.length;
     } else if (filterId === 1) {
-      cipherCount = this.allCiphers.filter((c) => c.organizationId === null).length;
+      cipherCount = this.allCiphers.filter((c) => !c.organizationId).length;
     } else {
       this.organizations.filter((org: Organization) => {
         if (org.id === filterId) {
@@ -121,9 +119,9 @@ export class CipherReportComponent implements OnDestroy {
   }
 
   async filterOrgToggle(status: any) {
-    let filter = null;
+    let filter = (c: CipherView) => true;
     if (typeof status === "number" && status === 1) {
-      filter = (c: CipherView) => c.organizationId == null;
+      filter = (c: CipherView) => !c.organizationId;
     } else if (typeof status === "string") {
       const orgId = status as OrganizationId;
       filter = (c: CipherView) => c.organizationId === orgId;
@@ -185,7 +183,7 @@ export class CipherReportComponent implements OnDestroy {
     cipher: CipherView,
     activeCollectionId?: CollectionId,
   ) {
-    const disableForm = cipher ? !cipher.edit && !this.organization.canEditAllCiphers : false;
+    const disableForm = cipher ? !cipher.edit && !this.organization?.canEditAllCiphers : false;
 
     this.vaultItemDialogRef = VaultItemDialogComponent.open(this.dialogService, {
       mode,
@@ -230,10 +228,11 @@ export class CipherReportComponent implements OnDestroy {
       let updatedCipher = await this.cipherService.get(cipher.id, activeUserId);
 
       if (this.isAdminConsoleActive) {
-        updatedCipher = await this.adminConsoleCipherFormConfigService.getCipher(
-          cipher.id as CipherId,
-          this.organization,
-        );
+        updatedCipher =
+          (await this.adminConsoleCipherFormConfigService.getCipher(
+            cipher.id as CipherId,
+            this.organization!,
+          )) ?? updatedCipher;
       }
 
       // convert cipher to cipher view model
diff --git a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.spec.ts b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.spec.ts
index 052e3bc7cfe..560245bdc34 100644
--- a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.spec.ts
+++ b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.spec.ts
@@ -90,6 +90,7 @@ describe("ExposedPasswordsReportComponent", () => {
   });
 
   beforeEach(() => {
+    jest.clearAllMocks();
     fixture = TestBed.createComponent(ExposedPasswordsReportComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
diff --git a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.ts
index 1a4141c4d68..51bdde3eda8 100644
--- a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.ts
@@ -18,6 +18,8 @@ import { CipherReportComponent } from "./cipher-report.component";
 
 type ReportResult = CipherView & { exposedXTimes: number };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-exposed-passwords-report",
   templateUrl: "exposed-passwords-report.component.html",
@@ -89,6 +91,9 @@ export class ExposedPasswordsReportComponent extends CipherReportComponent imple
 
   private async isPasswordExposed(cv: CipherView): Promise<ReportResult | null> {
     const { login } = cv;
+    if (login.password == null) {
+      return null;
+    }
     return await this.auditService.passwordLeaked(login.password).then((exposedCount) => {
       if (exposedCount > 0) {
         return { ...cv, exposedXTimes: exposedCount } as ReportResult;
diff --git a/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.spec.ts b/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.spec.ts
index acc34232571..64a851e120e 100644
--- a/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.spec.ts
+++ b/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.spec.ts
@@ -1,3 +1,4 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { MockProxy, mock } from "jest-mock-extended";
 import { of } from "rxjs";
@@ -29,14 +30,13 @@ describe("InactiveTwoFactorReportComponent", () => {
   const userId = Utils.newGuid() as UserId;
   const accountService: FakeAccountService = mockAccountServiceWith(userId);
 
-  beforeEach(() => {
+  beforeEach(async () => {
     let cipherFormConfigServiceMock: MockProxy<CipherFormConfigService>;
     organizationService = mock<OrganizationService>();
     organizationService.organizations$.mockReturnValue(of([]));
     syncServiceMock = mock<SyncService>();
-    // 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
-    TestBed.configureTestingModule({
+
+    await TestBed.configureTestingModule({
       declarations: [InactiveTwoFactorReportComponent, I18nPipe],
       providers: [
         {
@@ -80,9 +80,7 @@ describe("InactiveTwoFactorReportComponent", () => {
           useValue: adminConsoleCipherFormConfigServiceMock,
         },
       ],
-      schemas: [],
-      // FIXME(PM-18598): Replace unknownElements and unknownProperties with actual imports
-      errorOnUnknownElements: false,
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });
 
@@ -121,4 +119,153 @@ describe("InactiveTwoFactorReportComponent", () => {
   it("should call fullSync method of syncService", () => {
     expect(syncServiceMock.fullSync).toHaveBeenCalledWith(false);
   });
+
+  describe("isInactive2faCipher", () => {
+    beforeEach(() => {
+      // Add both domain and host to services map
+      component.services.set("example.com", "https://example.com/2fa-doc");
+      component.services.set("sub.example.com", "https://sub.example.com/2fa-doc");
+      fixture.detectChanges();
+    });
+    it("should return true and documentation for cipher with matching domain", () => {
+      const cipher = createCipherView({
+        login: {
+          uris: [{ uri: "https://example.com/login" }],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(true);
+      expect(doc).toBe("https://example.com/2fa-doc");
+    });
+
+    it("should return true and documentation for cipher with matching host", () => {
+      const cipher = createCipherView({
+        login: {
+          uris: [{ uri: "https://sub.example.com/login" }],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(true);
+      expect(doc).toBe("https://sub.example.com/2fa-doc");
+    });
+
+    it("should return false for cipher with non-matching domain or host", () => {
+      const cipher = createCipherView({
+        login: {
+          uris: [{ uri: "https://otherdomain.com/login" }],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(false);
+      expect(doc).toBe("");
+    });
+
+    it("should return false if cipher type is not Login", () => {
+      const cipher = createCipherView({
+        type: 2,
+        login: {
+          uris: [{ uri: "https://example.com/login" }],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(false);
+      expect(doc).toBe("");
+    });
+
+    it("should return false if cipher has TOTP", () => {
+      const cipher = createCipherView({
+        login: {
+          totp: "some-totp",
+          uris: [{ uri: "https://example.com/login" }],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(false);
+      expect(doc).toBe("");
+    });
+
+    it("should return false if cipher is deleted", () => {
+      const cipher = createCipherView({
+        isDeleted: true,
+        login: {
+          uris: [{ uri: "https://example.com/login" }],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(false);
+      expect(doc).toBe("");
+    });
+
+    it("should return false if cipher does not have edit access and no organization", () => {
+      component.organization = null;
+      const cipher = createCipherView({
+        edit: false,
+        login: {
+          uris: [{ uri: "https://example.com/login" }],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(false);
+      expect(doc).toBe("");
+    });
+
+    it("should return false if cipher does not have viewPassword", () => {
+      const cipher = createCipherView({
+        viewPassword: false,
+        login: {
+          uris: [{ uri: "https://example.com/login" }],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(false);
+      expect(doc).toBe("");
+    });
+
+    it("should check all uris and return true if any matches domain or host", () => {
+      const cipher = createCipherView({
+        login: {
+          uris: [
+            { uri: "https://otherdomain.com/login" },
+            { uri: "https://sub.example.com/dashboard" },
+          ],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(true);
+      expect(doc).toBe("https://sub.example.com/2fa-doc");
+    });
+
+    it("should return false if uris array is empty", () => {
+      const cipher = createCipherView({
+        login: {
+          uris: [],
+        },
+      });
+      const [doc, isInactive] = (component as any).isInactive2faCipher(cipher);
+      expect(isInactive).toBe(false);
+      expect(doc).toBe("");
+    });
+
+    function createCipherView({
+      type = 1,
+      login = {},
+      isDeleted = false,
+      edit = true,
+      viewPassword = true,
+    }: any): any {
+      return {
+        id: "test-id",
+        type,
+        login: {
+          totp: null,
+          hasUris: true,
+          uris: [],
+          ...login,
+        },
+        isDeleted,
+        edit,
+        viewPassword,
+      };
+    }
+  });
 });
diff --git a/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.ts
index 0024af35109..9d7de688f3e 100644
--- a/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.ts
@@ -1,6 +1,4 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnInit } from "@angular/core";
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from "@angular/core";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -20,6 +18,7 @@ import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/se
 import { CipherReportComponent } from "./cipher-report.component";
 
 @Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
   selector: "app-inactive-two-factor-report",
   templateUrl: "inactive-two-factor-report.component.html",
   standalone: false,
@@ -40,6 +39,7 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl
     syncService: SyncService,
     cipherFormConfigService: CipherFormConfigService,
     adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
+    protected changeDetectorRef: ChangeDetectorRef,
   ) {
     super(
       cipherService,
@@ -84,6 +84,7 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl
 
       this.filterCiphersByOrg(inactive2faCiphers);
       this.cipherDocs = docs;
+      this.changeDetectorRef.markForCheck();
     }
   }
 
@@ -107,7 +108,18 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl
       const u = login.uris[i];
       if (u.uri != null && u.uri !== "") {
         const uri = u.uri.replace("www.", "");
+        const host = Utils.getHost(uri);
         const domain = Utils.getDomain(uri);
+        // check host first
+        if (host != null && this.services.has(host)) {
+          if (this.services.get(host) != null) {
+            docFor2fa = this.services.get(host) || "";
+          }
+          isInactive2faCipher = true;
+          break;
+        }
+
+        // then check domain
         if (domain != null && this.services.has(domain)) {
           if (this.services.get(domain) != null) {
             docFor2fa = this.services.get(domain) || "";
@@ -144,6 +156,7 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl
       }
       this.services.set(serviceData.domain, serviceData.documentation);
     }
+    this.changeDetectorRef.markForCheck();
   }
 
   /**
diff --git a/apps/web/src/app/dirt/reports/pages/organizations/exposed-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/organizations/exposed-passwords-report.component.ts
index b88987e1d25..f83614557bd 100644
--- a/apps/web/src/app/dirt/reports/pages/organizations/exposed-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/organizations/exposed-passwords-report.component.ts
@@ -19,11 +19,17 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService, CipherFormConfigService } from "@bitwarden/vault";
 
+import { HeaderModule } from "../../../../layouts/header/header.module";
+import { SharedModule } from "../../../../shared";
+import { OrganizationBadgeModule } from "../../../../vault/individual-vault/organization-badge/organization-badge.module";
+import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module";
 import { RoutedVaultFilterBridgeService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
 import { RoutedVaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
 import { AdminConsoleCipherFormConfigService } from "../../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../exposed-passwords-report.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-exposed-passwords-report",
   templateUrl: "../exposed-passwords-report.component.html",
@@ -36,7 +42,7 @@ import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent
     RoutedVaultFilterService,
     RoutedVaultFilterBridgeService,
   ],
-  standalone: false,
+  imports: [SharedModule, HeaderModule, OrganizationBadgeModule, PipesModule],
 })
 export class ExposedPasswordsReportComponent
   extends BaseExposedPasswordsReportComponent
@@ -86,7 +92,7 @@ export class ExposedPasswordsReportComponent
   }
 
   getAllCiphers(): Promise<CipherView[]> {
-    return this.cipherService.getAllFromApiForOrganization(this.organization.id);
+    return this.cipherService.getAllFromApiForOrganization(this.organization.id, true);
   }
 
   canManageCipher(c: CipherView): boolean {
diff --git a/apps/web/src/app/dirt/reports/pages/organizations/inactive-two-factor-report.component.ts b/apps/web/src/app/dirt/reports/pages/organizations/inactive-two-factor-report.component.ts
index 1105e814245..b1adbd26eb3 100644
--- a/apps/web/src/app/dirt/reports/pages/organizations/inactive-two-factor-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/organizations/inactive-two-factor-report.component.ts
@@ -1,16 +1,12 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnInit } from "@angular/core";
+import { ChangeDetectorRef, Component, OnInit, ChangeDetectionStrategy } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { firstValueFrom, map } from "rxjs";
+import { firstValueFrom, map, takeUntil } from "rxjs";
 
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { getById } from "@bitwarden/common/platform/misc";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
@@ -18,12 +14,17 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
 
+import { HeaderModule } from "../../../../layouts/header/header.module";
+import { SharedModule } from "../../../../shared";
+import { OrganizationBadgeModule } from "../../../../vault/individual-vault/organization-badge/organization-badge.module";
+import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module";
 import { RoutedVaultFilterBridgeService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
 import { RoutedVaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
 import { AdminConsoleCipherFormConfigService } from "../../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../inactive-two-factor-report.component";
 
 @Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
   selector: "app-inactive-two-factor-report",
   templateUrl: "../inactive-two-factor-report.component.html",
   providers: [
@@ -35,14 +36,14 @@ import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponen
     RoutedVaultFilterService,
     RoutedVaultFilterBridgeService,
   ],
-  standalone: false,
+  imports: [SharedModule, HeaderModule, OrganizationBadgeModule, PipesModule],
 })
 export class InactiveTwoFactorReportComponent
   extends BaseInactiveTwoFactorReportComponent
   implements OnInit
 {
   // Contains a list of ciphers, the user running the report, can manage
-  private manageableCiphers: Cipher[];
+  private manageableCiphers: Cipher[] = [];
 
   constructor(
     cipherService: CipherService,
@@ -56,6 +57,7 @@ export class InactiveTwoFactorReportComponent
     syncService: SyncService,
     cipherFormConfigService: CipherFormConfigService,
     adminConsoleCipherFormConfigService: AdminConsoleCipherFormConfigService,
+    protected changeDetectorRef: ChangeDetectorRef,
   ) {
     super(
       cipherService,
@@ -68,28 +70,37 @@ export class InactiveTwoFactorReportComponent
       syncService,
       cipherFormConfigService,
       adminConsoleCipherFormConfigService,
+      changeDetectorRef,
     );
   }
 
   async ngOnInit() {
     this.isAdminConsoleActive = true;
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.route.parent.parent.params.subscribe(async (params) => {
-      const userId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-      );
-      this.organization = await firstValueFrom(
-        this.organizationService
-          .organizations$(userId)
-          .pipe(getOrganizationById(params.organizationId)),
-      );
-      this.manageableCiphers = await this.cipherService.getAll(userId);
-      await super.ngOnInit();
-    });
+
+    this.route.parent?.parent?.params
+      ?.pipe(takeUntil(this.destroyed$))
+      // eslint-disable-next-line rxjs/no-async-subscribe
+      .subscribe(async (params) => {
+        const userId = await firstValueFrom(
+          this.accountService.activeAccount$.pipe(map((a) => a?.id)),
+        );
+
+        if (userId) {
+          this.organization = await firstValueFrom(
+            this.organizationService.organizations$(userId).pipe(getById(params.organizationId)),
+          );
+          this.manageableCiphers = await this.cipherService.getAll(userId);
+          await super.ngOnInit();
+        }
+        this.changeDetectorRef.markForCheck();
+      });
   }
 
-  getAllCiphers(): Promise<CipherView[]> {
-    return this.cipherService.getAllFromApiForOrganization(this.organization.id);
+  async getAllCiphers(): Promise<CipherView[]> {
+    if (this.organization) {
+      return await this.cipherService.getAllFromApiForOrganization(this.organization.id, true);
+    }
+    return [];
   }
 
   protected canManageCipher(c: CipherView): boolean {
diff --git a/apps/web/src/app/dirt/reports/pages/organizations/reused-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/organizations/reused-passwords-report.component.ts
index 7fcf3562437..3944e2edfcb 100644
--- a/apps/web/src/app/dirt/reports/pages/organizations/reused-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/organizations/reused-passwords-report.component.ts
@@ -18,11 +18,17 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
 
+import { HeaderModule } from "../../../../layouts/header/header.module";
+import { SharedModule } from "../../../../shared";
+import { OrganizationBadgeModule } from "../../../../vault/individual-vault/organization-badge/organization-badge.module";
+import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module";
 import { RoutedVaultFilterBridgeService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
 import { RoutedVaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
 import { AdminConsoleCipherFormConfigService } from "../../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../reused-passwords-report.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-reused-passwords-report",
   templateUrl: "../reused-passwords-report.component.html",
@@ -35,7 +41,7 @@ import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent }
     RoutedVaultFilterService,
     RoutedVaultFilterBridgeService,
   ],
-  standalone: false,
+  imports: [SharedModule, HeaderModule, OrganizationBadgeModule, PipesModule],
 })
 export class ReusedPasswordsReportComponent
   extends BaseReusedPasswordsReportComponent
@@ -84,7 +90,7 @@ export class ReusedPasswordsReportComponent
   }
 
   getAllCiphers(): Promise<CipherView[]> {
-    return this.cipherService.getAllFromApiForOrganization(this.organization.id);
+    return this.cipherService.getAllFromApiForOrganization(this.organization.id, true);
   }
 
   canManageCipher(c: CipherView): boolean {
diff --git a/apps/web/src/app/dirt/reports/pages/organizations/unsecured-websites-report.component.ts b/apps/web/src/app/dirt/reports/pages/organizations/unsecured-websites-report.component.ts
index 2e916da0294..d49baa5d465 100644
--- a/apps/web/src/app/dirt/reports/pages/organizations/unsecured-websites-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/organizations/unsecured-websites-report.component.ts
@@ -18,11 +18,17 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
 
+import { HeaderModule } from "../../../../layouts/header/header.module";
+import { SharedModule } from "../../../../shared";
+import { OrganizationBadgeModule } from "../../../../vault/individual-vault/organization-badge/organization-badge.module";
+import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module";
 import { RoutedVaultFilterBridgeService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
 import { RoutedVaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
 import { AdminConsoleCipherFormConfigService } from "../../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../unsecured-websites-report.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-unsecured-websites-report",
   templateUrl: "../unsecured-websites-report.component.html",
@@ -35,7 +41,7 @@ import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponen
     RoutedVaultFilterService,
     RoutedVaultFilterBridgeService,
   ],
-  standalone: false,
+  imports: [SharedModule, HeaderModule, OrganizationBadgeModule, PipesModule],
 })
 export class UnsecuredWebsitesReportComponent
   extends BaseUnsecuredWebsitesReportComponent
@@ -89,7 +95,7 @@ export class UnsecuredWebsitesReportComponent
   }
 
   getAllCiphers(): Promise<CipherView[]> {
-    return this.cipherService.getAllFromApiForOrganization(this.organization.id);
+    return this.cipherService.getAllFromApiForOrganization(this.organization.id, true);
   }
 
   protected canManageCipher(c: CipherView): boolean {
diff --git a/apps/web/src/app/dirt/reports/pages/organizations/weak-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/organizations/weak-passwords-report.component.ts
index 80be66e9ad2..5158416dd28 100644
--- a/apps/web/src/app/dirt/reports/pages/organizations/weak-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/organizations/weak-passwords-report.component.ts
@@ -19,11 +19,17 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
 
+import { HeaderModule } from "../../../../layouts/header/header.module";
+import { SharedModule } from "../../../../shared";
+import { OrganizationBadgeModule } from "../../../../vault/individual-vault/organization-badge/organization-badge.module";
+import { PipesModule } from "../../../../vault/individual-vault/pipes/pipes.module";
 import { RoutedVaultFilterBridgeService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter-bridge.service";
 import { RoutedVaultFilterService } from "../../../../vault/individual-vault/vault-filter/services/routed-vault-filter.service";
 import { AdminConsoleCipherFormConfigService } from "../../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../weak-passwords-report.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-weak-passwords-report",
   templateUrl: "../weak-passwords-report.component.html",
@@ -36,7 +42,7 @@ import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from
     RoutedVaultFilterService,
     RoutedVaultFilterBridgeService,
   ],
-  standalone: false,
+  imports: [SharedModule, HeaderModule, OrganizationBadgeModule, PipesModule],
 })
 export class WeakPasswordsReportComponent
   extends BaseWeakPasswordsReportComponent
@@ -88,7 +94,7 @@ export class WeakPasswordsReportComponent
   }
 
   getAllCiphers(): Promise<CipherView[]> {
-    return this.cipherService.getAllFromApiForOrganization(this.organization.id);
+    return this.cipherService.getAllFromApiForOrganization(this.organization.id, true);
   }
 
   canManageCipher(c: CipherView): boolean {
diff --git a/apps/web/src/app/dirt/reports/pages/reports-home.component.ts b/apps/web/src/app/dirt/reports/pages/reports-home.component.ts
index acc3efac58a..a0e3a73aa3f 100644
--- a/apps/web/src/app/dirt/reports/pages/reports-home.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/reports-home.component.ts
@@ -9,6 +9,8 @@ import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abs
 import { reports, ReportType } from "../reports";
 import { ReportEntry, ReportVariant } from "../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-reports-home",
   templateUrl: "reports-home.component.html",
diff --git a/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.ts
index 8e1e4fcf0cc..0a81b19d4ff 100644
--- a/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.ts
@@ -17,6 +17,8 @@ import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/se
 
 import { CipherReportComponent } from "./cipher-report.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-reused-passwords-report",
   templateUrl: "reused-passwords-report.component.html",
diff --git a/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.ts
index 4b9cc3fd789..4a2c0677574 100644
--- a/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.ts
@@ -16,6 +16,8 @@ import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/se
 
 import { CipherReportComponent } from "./cipher-report.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-unsecured-websites-report",
   templateUrl: "unsecured-websites-report.component.html",
diff --git a/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.ts
index 0472dbfaa6f..bb5400346fd 100644
--- a/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.ts
@@ -22,6 +22,8 @@ import { CipherReportComponent } from "./cipher-report.component";
 type ReportScore = { label: string; badgeVariant: BadgeVariant; sortOrder: number };
 type ReportResult = CipherView & { score: number; reportValue: ReportScore; scoreKey: number };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-weak-passwords-report",
   templateUrl: "weak-passwords-report.component.html",
diff --git a/apps/web/src/app/dirt/reports/reports-layout.component.ts b/apps/web/src/app/dirt/reports/reports-layout.component.ts
index 360898e6057..c2fbf858590 100644
--- a/apps/web/src/app/dirt/reports/reports-layout.component.ts
+++ b/apps/web/src/app/dirt/reports/reports-layout.component.ts
@@ -3,6 +3,8 @@ import { NavigationEnd, Router } from "@angular/router";
 import { Subscription } from "rxjs";
 import { filter } from "rxjs/operators";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-reports-layout",
   templateUrl: "reports-layout.component.html",
diff --git a/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.html b/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.html
index 8db0db3b5e6..f0318028e60 100644
--- a/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.html
+++ b/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.html
@@ -1,8 +1,8 @@
 <a
-  class="tw-block tw-h-full tw-max-w-72 tw-overflow-hidden tw-rounded tw-border tw-border-solid tw-border-secondary-300 !tw-text-main tw-transition-all hover:tw-scale-105 hover:tw-no-underline focus:tw-outline-none focus:tw-ring focus:tw-ring-primary-700 focus:tw-ring-offset-2"
+  class="tw-block tw-h-full tw-max-w-72 tw-rounded-xl !tw-text-main tw-transition-all hover:tw-scale-105 hover:tw-no-underline focus:tw-outline-none focus:tw-ring focus:tw-ring-primary-700 focus:tw-ring-offset-2"
   [routerLink]="route"
 >
-  <div class="tw-relative">
+  <bit-base-card class="tw-relative tw-overflow-hidden tw-h-full">
     <div
       class="tw-flex tw-h-28 tw-bg-background-alt2 tw-text-center tw-text-primary-300"
       [ngClass]="{ 'tw-grayscale': disabled }"
@@ -11,18 +11,16 @@
         <bit-icon [icon]="icon" aria-hidden="true"></bit-icon>
       </div>
     </div>
-    <div class="tw-p-5" [ngClass]="{ 'tw-grayscale': disabled }">
-      <h3 class="tw-mb-4 tw-text-xl tw-font-bold">{{ title }}</h3>
+    <bit-card-content [ngClass]="{ 'tw-grayscale': disabled }">
+      <h3 class="tw-mb-4 tw-text-xl tw-font-medium">{{ title }}</h3>
       <p class="tw-mb-0">{{ description }}</p>
-    </div>
-    <span
-      bitBadge
-      [variant]="requiresPremium ? 'success' : 'primary'"
-      class="tw-absolute tw-left-2 tw-top-2 tw-leading-none"
-      *ngIf="disabled"
-    >
-      <ng-container *ngIf="requiresPremium">{{ "premium" | i18n }}</ng-container>
-      <ng-container *ngIf="!requiresPremium">{{ "upgrade" | i18n }}</ng-container>
-    </span>
-  </div>
+    </bit-card-content>
+    @if (requiresPremium) {
+      <app-premium-badge class="tw-absolute tw-left-2 tw-top-2"></app-premium-badge>
+    } @else if (requiresUpgrade) {
+      <span bitBadge variant="primary" class="tw-absolute tw-left-2 tw-top-2">
+        {{ "upgrade" | i18n }}
+      </span>
+    }
+  </bit-base-card>
 </a>
diff --git a/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.ts b/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.ts
index e8ffcd01068..87c005ea46b 100644
--- a/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.ts
+++ b/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.ts
@@ -6,16 +6,28 @@ import { Icon } from "@bitwarden/assets/svg";
 
 import { ReportVariant } from "../models/report-variant";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-report-card",
   templateUrl: "report-card.component.html",
   standalone: false,
 })
 export class ReportCardComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() description: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() route: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() icon: Icon;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() variant: ReportVariant;
 
   protected get disabled() {
@@ -25,4 +37,8 @@ export class ReportCardComponent {
   protected get requiresPremium() {
     return this.variant == ReportVariant.RequiresPremium;
   }
+
+  protected get requiresUpgrade() {
+    return this.variant == ReportVariant.RequiresUpgrade;
+  }
 }
diff --git a/apps/web/src/app/dirt/reports/shared/report-card/report-card.stories.ts b/apps/web/src/app/dirt/reports/shared/report-card/report-card.stories.ts
index 76951bf9451..93ea79c8418 100644
--- a/apps/web/src/app/dirt/reports/shared/report-card/report-card.stories.ts
+++ b/apps/web/src/app/dirt/reports/shared/report-card/report-card.stories.ts
@@ -1,10 +1,21 @@
 import { importProvidersFrom } from "@angular/core";
 import { RouterTestingModule } from "@angular/router/testing";
-import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
+import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+import { of } from "rxjs";
 
 import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { BadgeModule, IconModule } from "@bitwarden/components";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+import {
+  BadgeModule,
+  BaseCardComponent,
+  CardContentComponent,
+  I18nMockService,
+  IconModule,
+} from "@bitwarden/components";
 
 import { PreloadedEnglishI18nModule } from "../../../../core/tests";
 import { ReportVariant } from "../models/report-variant";
@@ -16,7 +27,46 @@ export default {
   component: ReportCardComponent,
   decorators: [
     moduleMetadata({
-      imports: [JslibModule, BadgeModule, IconModule, RouterTestingModule, PremiumBadgeComponent],
+      imports: [
+        JslibModule,
+        BadgeModule,
+        CardContentComponent,
+        IconModule,
+        RouterTestingModule,
+        PremiumBadgeComponent,
+        BaseCardComponent,
+      ],
+      providers: [
+        {
+          provide: AccountService,
+          useValue: {
+            activeAccount$: of({
+              id: "123",
+            }),
+          },
+        },
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              premium: "Premium",
+              upgrade: "Upgrade",
+            });
+          },
+        },
+        {
+          provide: BillingAccountProfileStateService,
+          useValue: {
+            hasPremiumFromAnySource$: () => of(false),
+          },
+        },
+        {
+          provide: PremiumUpgradePromptService,
+          useValue: {
+            promptForPremium: (orgId?: string) => {},
+          },
+        },
+      ],
     }),
     applicationConfig({
       providers: [importProvidersFrom(PreloadedEnglishI18nModule)],
diff --git a/apps/web/src/app/dirt/reports/shared/report-list/report-list.component.html b/apps/web/src/app/dirt/reports/shared/report-list/report-list.component.html
index 809ccbabcb7..2a03bf78dd4 100644
--- a/apps/web/src/app/dirt/reports/shared/report-list/report-list.component.html
+++ b/apps/web/src/app/dirt/reports/shared/report-list/report-list.component.html
@@ -1,4 +1,6 @@
-<div class="tw-inline-grid tw-grid-cols-3 tw-gap-4">
+<div
+  class="tw-inline-grid tw-place-items-stretch tw-place-content-center tw-grid-cols-1 @xl:tw-grid-cols-2 @4xl:tw-grid-cols-3 tw-gap-4 [&_a]:tw-max-w-none @5xl:[&_a]:tw-max-w-72"
+>
   <div *ngFor="let report of reports">
     <app-report-card
       [title]="report.title | i18n"
diff --git a/apps/web/src/app/dirt/reports/shared/report-list/report-list.component.ts b/apps/web/src/app/dirt/reports/shared/report-list/report-list.component.ts
index c81c99d50d5..509e2f3b872 100644
--- a/apps/web/src/app/dirt/reports/shared/report-list/report-list.component.ts
+++ b/apps/web/src/app/dirt/reports/shared/report-list/report-list.component.ts
@@ -4,11 +4,15 @@ import { Component, Input } from "@angular/core";
 
 import { ReportEntry } from "../models/report-entry";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-report-list",
   templateUrl: "report-list.component.html",
   standalone: false,
 })
 export class ReportListComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() reports: ReportEntry[];
 }
diff --git a/apps/web/src/app/dirt/reports/shared/report-list/report-list.stories.ts b/apps/web/src/app/dirt/reports/shared/report-list/report-list.stories.ts
index 22c7e851bed..5a95e332816 100644
--- a/apps/web/src/app/dirt/reports/shared/report-list/report-list.stories.ts
+++ b/apps/web/src/app/dirt/reports/shared/report-list/report-list.stories.ts
@@ -1,10 +1,19 @@
 import { importProvidersFrom } from "@angular/core";
 import { RouterTestingModule } from "@angular/router/testing";
-import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
+import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+import { of } from "rxjs";
 
 import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { BadgeModule, IconModule } from "@bitwarden/components";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+import {
+  BadgeModule,
+  BaseCardComponent,
+  CardContentComponent,
+  IconModule,
+} from "@bitwarden/components";
 
 import { PreloadedEnglishI18nModule } from "../../../../core/tests";
 import { reports } from "../../reports";
@@ -18,8 +27,38 @@ export default {
   component: ReportListComponent,
   decorators: [
     moduleMetadata({
-      imports: [JslibModule, BadgeModule, RouterTestingModule, IconModule, PremiumBadgeComponent],
+      imports: [
+        JslibModule,
+        BadgeModule,
+        RouterTestingModule,
+        IconModule,
+        PremiumBadgeComponent,
+        CardContentComponent,
+        BaseCardComponent,
+      ],
       declarations: [ReportCardComponent],
+      providers: [
+        {
+          provide: AccountService,
+          useValue: {
+            activeAccount$: of({
+              id: "123",
+            }),
+          },
+        },
+        {
+          provide: BillingAccountProfileStateService,
+          useValue: {
+            hasPremiumFromAnySource$: () => of(false),
+          },
+        },
+        {
+          provide: PremiumUpgradePromptService,
+          useValue: {
+            promptForPremium: (orgId?: string) => {},
+          },
+        },
+      ],
     }),
     applicationConfig({
       providers: [importProvidersFrom(PreloadedEnglishI18nModule)],
diff --git a/apps/web/src/app/dirt/reports/shared/reports-shared.module.ts b/apps/web/src/app/dirt/reports/shared/reports-shared.module.ts
index cad5d06d798..940a2d4e3a5 100644
--- a/apps/web/src/app/dirt/reports/shared/reports-shared.module.ts
+++ b/apps/web/src/app/dirt/reports/shared/reports-shared.module.ts
@@ -1,13 +1,22 @@
 import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 
+import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
+import { BaseCardComponent, CardContentComponent } from "@bitwarden/components";
+
 import { SharedModule } from "../../../shared/shared.module";
 
 import { ReportCardComponent } from "./report-card/report-card.component";
 import { ReportListComponent } from "./report-list/report-list.component";
 
 @NgModule({
-  imports: [CommonModule, SharedModule],
+  imports: [
+    CommonModule,
+    SharedModule,
+    BaseCardComponent,
+    CardContentComponent,
+    PremiumBadgeComponent,
+  ],
   declarations: [ReportCardComponent, ReportListComponent],
   exports: [ReportCardComponent, ReportListComponent],
 })
diff --git a/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.html b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.html
index 9f21b28f190..88c6c8b9aca 100644
--- a/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.html
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.html
@@ -1,12 +1,14 @@
 <form [formGroup]="form" [bitSubmit]="submit" autocomplete="off">
   <bit-dialog>
     <span bitDialogTitle>
-      {{ "changeKdf" | i18n }}
+      {{ "updateYourEncryptionSettings" | i18n }}
     </span>
 
     <span bitDialogContent>
-      <bit-callout type="warning">{{ "kdfSettingsChangeLogoutWarning" | i18n }}</bit-callout>
-      <bit-form-field>
+      @if (!(noLogoutOnKdfChangeFeatureFlag$ | async)) {
+        <bit-callout type="warning">{{ "kdfSettingsChangeLogoutWarning" | i18n }}</bit-callout>
+      }
+      <bit-form-field disableMargin>
         <bit-label>{{ "masterPass" | i18n }}</bit-label>
         <input bitInput type="password" formControlName="masterPassword" appAutofocus />
         <button
@@ -18,12 +20,12 @@
         ></button>
         <bit-hint>
           {{ "confirmIdentity" | i18n }}
-        </bit-hint></bit-form-field
-      >
+        </bit-hint>
+      </bit-form-field>
     </span>
     <ng-container bitDialogFooter>
       <button bitButton buttonType="primary" type="submit" bitFormButton>
-        <span>{{ "changeKdf" | i18n }}</span>
+        <span>{{ "updateSettings" | i18n }}</span>
       </button>
       <button bitButton buttonType="secondary" type="button" bitFormButton bitDialogClose>
         {{ "cancel" | i18n }}
diff --git a/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.spec.ts b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.spec.ts
new file mode 100644
index 00000000000..525ddd89675
--- /dev/null
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.spec.ts
@@ -0,0 +1,243 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { FormControl } from "@angular/forms";
+import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ChangeKdfService } from "@bitwarden/common/key-management/kdf/change-kdf-service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
+import { DIALOG_DATA, DialogRef, ToastService } from "@bitwarden/components";
+import { KdfType, PBKDF2KdfConfig, Argon2KdfConfig } from "@bitwarden/key-management";
+
+import { SharedModule } from "../../shared";
+
+import { ChangeKdfConfirmationComponent } from "./change-kdf-confirmation.component";
+
+describe("ChangeKdfConfirmationComponent", () => {
+  let component: ChangeKdfConfirmationComponent;
+  let fixture: ComponentFixture<ChangeKdfConfirmationComponent>;
+
+  // Mock Services
+  let mockI18nService: MockProxy<I18nService>;
+  let mockMessagingService: MockProxy<MessagingService>;
+  let mockToastService: MockProxy<ToastService>;
+  let mockDialogRef: MockProxy<DialogRef<ChangeKdfConfirmationComponent>>;
+  let mockConfigService: MockProxy<ConfigService>;
+  let accountService: FakeAccountService;
+  let mockChangeKdfService: MockProxy<ChangeKdfService>;
+
+  const mockUserId = "user-id" as UserId;
+  const mockEmail = "email";
+  const mockMasterPassword = "master-password";
+  const mockDialogData = jest.fn();
+  const kdfConfig = new PBKDF2KdfConfig(600_001);
+
+  beforeEach(() => {
+    mockI18nService = mock<I18nService>();
+    mockMessagingService = mock<MessagingService>();
+    mockToastService = mock<ToastService>();
+    mockDialogRef = mock<DialogRef<ChangeKdfConfirmationComponent>>();
+    mockConfigService = mock<ConfigService>();
+    accountService = mockAccountServiceWith(mockUserId, { email: mockEmail });
+    mockChangeKdfService = mock<ChangeKdfService>();
+
+    mockI18nService.t.mockImplementation((key) => `${key}-used-i18n`);
+
+    // Mock config service feature flag
+    mockConfigService.getFeatureFlag$.mockReturnValue(of(false));
+
+    mockDialogData.mockReturnValue({
+      kdf: KdfType.PBKDF2_SHA256,
+      kdfConfig,
+    });
+
+    TestBed.configureTestingModule({
+      declarations: [ChangeKdfConfirmationComponent],
+      imports: [SharedModule],
+      providers: [
+        { provide: I18nService, useValue: mockI18nService },
+        { provide: MessagingService, useValue: mockMessagingService },
+        { provide: AccountService, useValue: accountService },
+        { provide: ToastService, useValue: mockToastService },
+        { provide: DialogRef, useValue: mockDialogRef },
+        { provide: ConfigService, useValue: mockConfigService },
+        { provide: ChangeKdfService, useValue: mockChangeKdfService },
+        {
+          provide: DIALOG_DATA,
+          useFactory: mockDialogData,
+        },
+      ],
+    });
+  });
+
+  describe("Component Initialization", () => {
+    it("should create component with PBKDF2 config", () => {
+      const fixture = TestBed.createComponent(ChangeKdfConfirmationComponent);
+      const component = fixture.componentInstance;
+
+      expect(component).toBeTruthy();
+      expect(component.kdfConfig).toBeInstanceOf(PBKDF2KdfConfig);
+      expect(component.kdfConfig.iterations).toBe(600_001);
+    });
+
+    it("should create component with Argon2id config", () => {
+      mockDialogData.mockReturnValue({
+        kdf: KdfType.Argon2id,
+        kdfConfig: new Argon2KdfConfig(4, 65, 5),
+      });
+
+      const fixture = TestBed.createComponent(ChangeKdfConfirmationComponent);
+      const component = fixture.componentInstance;
+
+      expect(component).toBeTruthy();
+      expect(component.kdfConfig).toBeInstanceOf(Argon2KdfConfig);
+      const kdfConfig = component.kdfConfig as Argon2KdfConfig;
+      expect(kdfConfig.iterations).toBe(4);
+      expect(kdfConfig.memory).toBe(65);
+      expect(kdfConfig.parallelism).toBe(5);
+    });
+
+    it("should initialize form with required master password field", () => {
+      const fixture = TestBed.createComponent(ChangeKdfConfirmationComponent);
+      const component = fixture.componentInstance;
+
+      expect(component.form.controls.masterPassword).toBeInstanceOf(FormControl);
+      expect(component.form.controls.masterPassword.value).toEqual(null);
+      expect(component.form.controls.masterPassword.hasError("required")).toBe(true);
+    });
+  });
+
+  describe("Form Validation", () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ChangeKdfConfirmationComponent);
+      component = fixture.componentInstance;
+    });
+
+    it("should be invalid when master password is empty", () => {
+      component.form.controls.masterPassword.setValue("");
+      expect(component.form.invalid).toBe(true);
+    });
+
+    it("should be valid when master password is provided", () => {
+      component.form.controls.masterPassword.setValue(mockMasterPassword);
+      expect(component.form.valid).toBe(true);
+    });
+  });
+
+  describe("submit method", () => {
+    describe("should not update kdf and not show success toast", () => {
+      beforeEach(() => {
+        fixture = TestBed.createComponent(ChangeKdfConfirmationComponent);
+        component = fixture.componentInstance;
+
+        component.form.controls.masterPassword.setValue(mockMasterPassword);
+      });
+
+      it("when form is invalid", async () => {
+        // Arrange
+        component.form.controls.masterPassword.setValue("");
+        expect(component.form.invalid).toBe(true);
+
+        // Act
+        await component.submit();
+
+        // Assert
+        expect(mockChangeKdfService.updateUserKdfParams).not.toHaveBeenCalled();
+      });
+
+      it("when no active account", async () => {
+        accountService.activeAccount$ = of(null);
+
+        await expect(component.submit()).rejects.toThrow("Null or undefined account");
+
+        expect(mockChangeKdfService.updateUserKdfParams).not.toHaveBeenCalled();
+      });
+
+      it("when kdf is invalid", async () => {
+        // Arrange
+        component.kdfConfig = new PBKDF2KdfConfig(1);
+
+        // Act
+        await expect(component.submit()).rejects.toThrow();
+
+        expect(mockChangeKdfService.updateUserKdfParams).not.toHaveBeenCalled();
+      });
+    });
+
+    describe("should update kdf and show success toast", () => {
+      it("should set loading to true during submission", async () => {
+        // Arrange
+        let loadingDuringExecution = false;
+        mockChangeKdfService.updateUserKdfParams.mockImplementation(async () => {
+          loadingDuringExecution = component.loading;
+        });
+
+        const fixture = TestBed.createComponent(ChangeKdfConfirmationComponent);
+        const component = fixture.componentInstance;
+
+        component.form.controls.masterPassword.setValue(mockMasterPassword);
+
+        // Act
+        await component.submit();
+
+        expect(loadingDuringExecution).toBe(true);
+        expect(component.loading).toBe(false);
+      });
+
+      it("doesn't logout and closes the dialog when feature flag is enabled", async () => {
+        // Arrange
+        mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+
+        const fixture = TestBed.createComponent(ChangeKdfConfirmationComponent);
+        const component = fixture.componentInstance;
+
+        component.form.controls.masterPassword.setValue(mockMasterPassword);
+
+        // Act
+        await component.submit();
+
+        // Assert
+        expect(mockChangeKdfService.updateUserKdfParams).toHaveBeenCalledWith(
+          mockMasterPassword,
+          kdfConfig,
+          mockUserId,
+        );
+        expect(mockToastService.showToast).toHaveBeenCalledWith({
+          variant: "success",
+          message: "encKeySettingsChanged-used-i18n",
+        });
+        expect(mockDialogRef.close).toHaveBeenCalled();
+        expect(mockMessagingService.send).not.toHaveBeenCalled();
+      });
+
+      it("sends a logout and displays a log back in toast when feature flag is disabled", async () => {
+        // Arrange
+        const fixture = TestBed.createComponent(ChangeKdfConfirmationComponent);
+        const component = fixture.componentInstance;
+
+        component.form.controls.masterPassword.setValue(mockMasterPassword);
+
+        // Act
+        await component.submit();
+
+        // Assert
+        expect(mockChangeKdfService.updateUserKdfParams).toHaveBeenCalledWith(
+          mockMasterPassword,
+          kdfConfig,
+          mockUserId,
+        );
+        expect(mockToastService.showToast).toHaveBeenCalledWith({
+          variant: "success",
+          title: "encKeySettingsChanged-used-i18n",
+          message: "logBackIn-used-i18n",
+        });
+        expect(mockMessagingService.send).toHaveBeenCalledWith("logout");
+        expect(mockDialogRef.close).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.ts b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.ts
index 3e09f710062..b730a3597ba 100644
--- a/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.ts
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf-confirmation.component.ts
@@ -1,17 +1,19 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, Inject } from "@angular/core";
 import { FormGroup, FormControl, Validators } from "@angular/forms";
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, Observable } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ChangeKdfService } from "@bitwarden/common/key-management/kdf/change-kdf-service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { DIALOG_DATA, ToastService } from "@bitwarden/components";
+import { DIALOG_DATA, DialogRef, ToastService } from "@bitwarden/components";
 import { KdfConfig, KdfType } from "@bitwarden/key-management";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-change-kdf-confirmation",
   templateUrl: "change-kdf-confirmation.component.html",
@@ -21,12 +23,13 @@ export class ChangeKdfConfirmationComponent {
   kdfConfig: KdfConfig;
 
   form = new FormGroup({
-    masterPassword: new FormControl(null, Validators.required),
+    masterPassword: new FormControl<string | null>(null, Validators.required),
   });
   showPassword = false;
-  masterPassword: string;
   loading = false;
 
+  noLogoutOnKdfChangeFeatureFlag$: Observable<boolean>;
+
   constructor(
     private i18nService: I18nService,
     private messagingService: MessagingService,
@@ -34,9 +37,13 @@ export class ChangeKdfConfirmationComponent {
     private accountService: AccountService,
     private toastService: ToastService,
     private changeKdfService: ChangeKdfService,
+    private dialogRef: DialogRef<ChangeKdfConfirmationComponent>,
+    configService: ConfigService,
   ) {
     this.kdfConfig = params.kdfConfig;
-    this.masterPassword = null;
+    this.noLogoutOnKdfChangeFeatureFlag$ = configService.getFeatureFlag$(
+      FeatureFlag.NoLogoutOnKdfChange,
+    );
   }
 
   submit = async () => {
@@ -44,24 +51,32 @@ export class ChangeKdfConfirmationComponent {
       return;
     }
     this.loading = true;
-    await this.makeKeyAndSaveAsync();
-    this.toastService.showToast({
-      variant: "success",
-      title: this.i18nService.t("encKeySettingsChanged"),
-      message: this.i18nService.t("logBackIn"),
-    });
-    this.messagingService.send("logout");
+    await this.makeKeyAndSave();
+    if (await firstValueFrom(this.noLogoutOnKdfChangeFeatureFlag$)) {
+      this.toastService.showToast({
+        variant: "success",
+        message: this.i18nService.t("encKeySettingsChanged"),
+      });
+      this.dialogRef.close();
+    } else {
+      this.toastService.showToast({
+        variant: "success",
+        title: this.i18nService.t("encKeySettingsChanged"),
+        message: this.i18nService.t("logBackIn"),
+      });
+      this.messagingService.send("logout");
+    }
     this.loading = false;
   };
 
-  private async makeKeyAndSaveAsync() {
-    const masterPassword = this.form.value.masterPassword;
+  private async makeKeyAndSave() {
+    const activeAccountId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+
+    const masterPassword = this.form.value.masterPassword!;
 
     // Ensure the KDF config is valid.
     this.kdfConfig.validateKdfConfigForSetting();
 
-    const activeAccountId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-
     await this.changeKdfService.updateUserKdfParams(
       masterPassword,
       this.kdfConfig,
diff --git a/apps/web/src/app/key-management/change-kdf/change-kdf.component.html b/apps/web/src/app/key-management/change-kdf/change-kdf.component.html
index 203f6d016bb..7ac34d7f3e5 100644
--- a/apps/web/src/app/key-management/change-kdf/change-kdf.component.html
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf.component.html
@@ -1,31 +1,30 @@
-<h2 bitTypography="h2">{{ "encKeySettings" | i18n }}</h2>
-<bit-callout type="warning">{{ "kdfSettingsChangeLogoutWarning" | i18n }}</bit-callout>
-<p bitTypography="body1">
-  {{ "higherKDFIterations" | i18n }}
+<h2 bitTypography="h2" class="tw-mt-6">
+  {{ "encKeySettings" | i18n }}
+</h2>
+@if (!(noLogoutOnKdfChangeFeatureFlag$ | async)) {
+  <bit-callout type="warning">{{ "kdfSettingsChangeLogoutWarning" | i18n }}</bit-callout>
+}
+<p bitTypography="body1" class="tw-mt-4">
+  {{ "encryptionKeySettingsHowShouldWeEncryptYourData" | i18n }}
 </p>
 <p bitTypography="body1">
-  {{
-    "kdfToHighWarningIncreaseInIncrements"
-      | i18n: (isPBKDF2(kdfConfig) ? ("incrementsOf100,000" | i18n) : ("smallIncrements" | i18n))
-  }}
+  {{ "encryptionKeySettingsIncreaseImproveSecurity" | i18n }}
 </p>
 <form [formGroup]="formGroup" autocomplete="off">
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4">
+  <div class="tw-grid tw-grid-cols-12 tw-gap-x-4">
     <div class="tw-col-span-6">
       <bit-form-field>
-        <bit-label
-          >{{ "kdfAlgorithm" | i18n }}
-          <a
-            class="tw-ml-auto"
+        <bit-label>
+          {{ "algorithm" | i18n }}
+          <button
+            type="button"
+            class="tw-border-none tw-bg-transparent tw-text-primary-600 tw-p-0"
+            [bitPopoverTriggerFor]="algorithmPopover"
+            appA11yTitle="{{ 'encryptionKeySettingsAlgorithmPopoverTitle' | i18n }}"
             bitLink
-            href="https://bitwarden.com/help/kdf-algorithms"
-            target="_blank"
-            rel="noreferrer"
-            appA11yTitle="{{ 'learnMoreAboutEncryptionAlgorithms' | i18n }}"
-            slot="end"
           >
             <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-          </a>
+          </button>
         </bit-label>
         <bit-select formControlName="kdf">
           <bit-option
@@ -35,33 +34,12 @@
           ></bit-option>
         </bit-select>
       </bit-form-field>
-      <bit-form-field formGroupName="kdfConfig" *ngIf="isArgon2(kdfConfig)">
-        <bit-label>{{ "kdfMemory" | i18n }}</bit-label>
-        <input
-          bitInput
-          formControlName="memory"
-          type="number"
-          [min]="ARGON2_MEMORY.min"
-          [max]="ARGON2_MEMORY.max"
-        />
-      </bit-form-field>
     </div>
     <div class="tw-col-span-6">
-      <div class="tw-mb-0">
-        <bit-form-field formGroupName="kdfConfig" *ngIf="isPBKDF2(kdfConfig)">
+      @if (isPBKDF2(kdfConfig)) {
+        <bit-form-field formGroupName="kdfConfig">
           <bit-label>
             {{ "kdfIterations" | i18n }}
-            <a
-              bitLink
-              class="tw-ml-auto"
-              href="https://bitwarden.com/help/what-encryption-is-used/#changing-kdf-iterations"
-              target="_blank"
-              rel="noreferrer"
-              appA11yTitle="{{ 'learnMoreAboutKDFIterations' | i18n }}"
-              slot="end"
-            >
-              <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-            </a>
           </bit-label>
           <input
             bitInput
@@ -72,34 +50,49 @@
           />
           <bit-hint>{{ "kdfIterationRecommends" | i18n }}</bit-hint>
         </bit-form-field>
-        <ng-container *ngIf="isArgon2(kdfConfig)">
-          <bit-form-field formGroupName="kdfConfig">
-            <bit-label>
-              {{ "kdfIterations" | i18n }}
-            </bit-label>
-            <input
-              bitInput
-              type="number"
-              formControlName="iterations"
-              [min]="ARGON2_ITERATIONS.min"
-              [max]="ARGON2_ITERATIONS.max"
-            />
-          </bit-form-field>
-          <bit-form-field formGroupName="kdfConfig">
-            <bit-label>
-              {{ "kdfParallelism" | i18n }}
-            </bit-label>
-            <input
-              bitInput
-              type="number"
-              formControlName="parallelism"
-              [min]="ARGON2_PARALLELISM.min"
-              [max]="ARGON2_PARALLELISM.max"
-            />
-          </bit-form-field>
-        </ng-container>
-      </div>
+      } @else if (isArgon2(kdfConfig)) {
+        <bit-form-field formGroupName="kdfConfig">
+          <bit-label>{{ "kdfMemory" | i18n }}</bit-label>
+          <input
+            bitInput
+            formControlName="memory"
+            type="number"
+            [min]="ARGON2_MEMORY.min"
+            [max]="ARGON2_MEMORY.max"
+          />
+        </bit-form-field>
+      }
     </div>
+    @if (isArgon2(kdfConfig)) {
+      <div class="tw-col-span-6">
+        <bit-form-field formGroupName="kdfConfig">
+          <bit-label>
+            {{ "kdfIterations" | i18n }}
+          </bit-label>
+          <input
+            bitInput
+            type="number"
+            formControlName="iterations"
+            [min]="ARGON2_ITERATIONS.min"
+            [max]="ARGON2_ITERATIONS.max"
+          />
+        </bit-form-field>
+      </div>
+      <div class="tw-col-span-6">
+        <bit-form-field formGroupName="kdfConfig">
+          <bit-label>
+            {{ "kdfParallelism" | i18n }}
+          </bit-label>
+          <input
+            bitInput
+            type="number"
+            formControlName="parallelism"
+            [min]="ARGON2_PARALLELISM.min"
+            [max]="ARGON2_PARALLELISM.max"
+          />
+        </bit-form-field>
+      </div>
+    }
   </div>
   <button
     (click)="openConfirmationModal()"
@@ -107,7 +100,27 @@
     buttonType="primary"
     bitButton
     bitFormButton
+    class="tw-mt-2"
   >
-    {{ "changeKdf" | i18n }}
+    {{ "updateEncryptionSettings" | i18n }}
   </button>
 </form>
+
+<bit-popover [title]="'encryptionKeySettingsAlgorithmPopoverTitle' | i18n" #algorithmPopover>
+  <ul class="tw-mt-2 tw-mb-0 tw-ps-4">
+    <li class="tw-mb-2">{{ "encryptionKeySettingsAlgorithmPopoverPBKDF2" | i18n }}</li>
+    <li>{{ "encryptionKeySettingsAlgorithmPopoverArgon2Id" | i18n }}</li>
+  </ul>
+  <div class="tw-mt-4 tw-mb-1">
+    <a
+      href="https://bitwarden.com/help/kdf-algorithms/"
+      bitLink
+      target="_blank"
+      rel="noreferrer"
+      appA11yTitle="{{ 'learnMoreAboutEncryptionAlgorithms' | i18n }}"
+    >
+      {{ "learnMore" | i18n }}
+      <i class="bwi bwi-external-link tw-ml-1" aria-hidden="true"></i>
+    </a>
+  </div>
+</bit-popover>
diff --git a/apps/web/src/app/key-management/change-kdf/change-kdf.component.spec.ts b/apps/web/src/app/key-management/change-kdf/change-kdf.component.spec.ts
new file mode 100644
index 00000000000..c5144223ba0
--- /dev/null
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf.component.spec.ts
@@ -0,0 +1,365 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { FormBuilder, FormControl } from "@angular/forms";
+import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
+
+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 { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
+import { DialogService, PopoverModule, CalloutModule } from "@bitwarden/components";
+import {
+  KdfConfigService,
+  Argon2KdfConfig,
+  PBKDF2KdfConfig,
+  KdfType,
+} from "@bitwarden/key-management";
+
+import { SharedModule } from "../../shared";
+
+import { ChangeKdfComponent } from "./change-kdf.component";
+
+describe("ChangeKdfComponent", () => {
+  let component: ChangeKdfComponent;
+  let fixture: ComponentFixture<ChangeKdfComponent>;
+
+  // Mock Services
+  let mockDialogService: MockProxy<DialogService>;
+  let mockKdfConfigService: MockProxy<KdfConfigService>;
+  let mockConfigService: MockProxy<ConfigService>;
+  let mockI18nService: MockProxy<I18nService>;
+  let accountService: FakeAccountService;
+  let formBuilder: FormBuilder;
+
+  const mockUserId = "user-id" as UserId;
+
+  // Helper functions for validation testing
+  function expectPBKDF2Validation(
+    iterationsControl: FormControl<number | null>,
+    memoryControl: FormControl<number | null>,
+    parallelismControl: FormControl<number | null>,
+  ) {
+    // Assert current validators state
+    expect(iterationsControl.hasError("required")).toBe(false);
+    expect(iterationsControl.hasError("min")).toBe(false);
+    expect(iterationsControl.hasError("max")).toBe(false);
+    expect(memoryControl.validator).toBeNull();
+    expect(parallelismControl.validator).toBeNull();
+
+    // Test validation boundaries
+    iterationsControl.setValue(PBKDF2KdfConfig.ITERATIONS.min - 1);
+    expect(iterationsControl.hasError("min")).toBe(true);
+
+    iterationsControl.setValue(PBKDF2KdfConfig.ITERATIONS.max + 1);
+    expect(iterationsControl.hasError("max")).toBe(true);
+  }
+
+  function expectArgon2Validation(
+    iterationsControl: FormControl<number | null>,
+    memoryControl: FormControl<number | null>,
+    parallelismControl: FormControl<number | null>,
+  ) {
+    // Assert current validators state
+    expect(iterationsControl.hasError("required")).toBe(false);
+    expect(memoryControl.hasError("required")).toBe(false);
+    expect(parallelismControl.hasError("required")).toBe(false);
+
+    // Test validation boundaries - min values
+    iterationsControl.setValue(Argon2KdfConfig.ITERATIONS.min - 1);
+    expect(iterationsControl.hasError("min")).toBe(true);
+
+    memoryControl.setValue(Argon2KdfConfig.MEMORY.min - 1);
+    expect(memoryControl.hasError("min")).toBe(true);
+
+    parallelismControl.setValue(Argon2KdfConfig.PARALLELISM.min - 1);
+    expect(parallelismControl.hasError("min")).toBe(true);
+
+    // Test validation boundaries - max values
+    iterationsControl.setValue(Argon2KdfConfig.ITERATIONS.max + 1);
+    expect(iterationsControl.hasError("max")).toBe(true);
+
+    memoryControl.setValue(Argon2KdfConfig.MEMORY.max + 1);
+    expect(memoryControl.hasError("max")).toBe(true);
+
+    parallelismControl.setValue(Argon2KdfConfig.PARALLELISM.max + 1);
+    expect(parallelismControl.hasError("max")).toBe(true);
+  }
+
+  beforeEach(() => {
+    mockDialogService = mock<DialogService>();
+    mockKdfConfigService = mock<KdfConfigService>();
+    mockConfigService = mock<ConfigService>();
+    mockI18nService = mock<I18nService>();
+    accountService = mockAccountServiceWith(mockUserId);
+    formBuilder = new FormBuilder();
+
+    mockConfigService.getFeatureFlag$.mockReturnValue(of(false));
+
+    mockI18nService.t.mockImplementation((key) => `${key}-used-i18n`);
+
+    TestBed.configureTestingModule({
+      declarations: [ChangeKdfComponent],
+      imports: [SharedModule, PopoverModule, CalloutModule],
+      providers: [
+        { provide: DialogService, useValue: mockDialogService },
+        { provide: KdfConfigService, useValue: mockKdfConfigService },
+        { provide: AccountService, useValue: accountService },
+        { provide: FormBuilder, useValue: formBuilder },
+        { provide: ConfigService, useValue: mockConfigService },
+        { provide: I18nService, useValue: mockI18nService },
+      ],
+    });
+  });
+
+  describe("Component Initialization", () => {
+    describe("given PBKDF2 configuration", () => {
+      it("should initialize form with PBKDF2 values and validators when component loads", async () => {
+        // Arrange
+        const mockPBKDF2Config = new PBKDF2KdfConfig(600_000);
+        mockKdfConfigService.getKdfConfig.mockResolvedValue(mockPBKDF2Config);
+
+        // Act
+        fixture = TestBed.createComponent(ChangeKdfComponent);
+        component = fixture.componentInstance;
+        await component.ngOnInit();
+
+        // Extract form controls
+        const formGroup = component["formGroup"];
+
+        // Assert form values
+        expect(formGroup.controls.kdf.value).toBe(KdfType.PBKDF2_SHA256);
+        const kdfConfigFormGroup = formGroup.controls.kdfConfig;
+        expect(kdfConfigFormGroup.controls.iterations.value).toBe(600_000);
+        expect(kdfConfigFormGroup.controls.memory.value).toBeNull();
+        expect(kdfConfigFormGroup.controls.parallelism.value).toBeNull();
+        expect(component.kdfConfig).toEqual(mockPBKDF2Config);
+
+        // Assert validators
+        expectPBKDF2Validation(
+          kdfConfigFormGroup.controls.iterations,
+          kdfConfigFormGroup.controls.memory,
+          kdfConfigFormGroup.controls.parallelism,
+        );
+      });
+    });
+
+    describe("given Argon2id configuration", () => {
+      it("should initialize form with Argon2id values and validators when component loads", async () => {
+        // Arrange
+        const mockArgon2Config = new Argon2KdfConfig(3, 64, 4);
+        mockKdfConfigService.getKdfConfig.mockResolvedValue(mockArgon2Config);
+
+        // Act
+        fixture = TestBed.createComponent(ChangeKdfComponent);
+        component = fixture.componentInstance;
+        await component.ngOnInit();
+
+        // Extract form controls
+        const formGroup = component["formGroup"];
+
+        // Assert form values
+        expect(formGroup.controls.kdf.value).toBe(KdfType.Argon2id);
+        const kdfConfigFormGroup = formGroup.controls.kdfConfig;
+        expect(kdfConfigFormGroup.controls.iterations.value).toBe(3);
+        expect(kdfConfigFormGroup.controls.memory.value).toBe(64);
+        expect(kdfConfigFormGroup.controls.parallelism.value).toBe(4);
+        expect(component.kdfConfig).toEqual(mockArgon2Config);
+
+        // Assert validators
+        expectArgon2Validation(
+          kdfConfigFormGroup.controls.iterations,
+          kdfConfigFormGroup.controls.memory,
+          kdfConfigFormGroup.controls.parallelism,
+        );
+      });
+    });
+
+    it.each([
+      [true, false],
+      [false, true],
+    ])(
+      "should show log out banner = %s when feature flag observable is %s",
+      async (showLogOutBanner, forceUpgradeKdfFeatureFlag) => {
+        // Arrange
+        const mockPBKDF2Config = new PBKDF2KdfConfig(600_000);
+        mockKdfConfigService.getKdfConfig.mockResolvedValue(mockPBKDF2Config);
+        mockConfigService.getFeatureFlag$.mockReturnValue(of(forceUpgradeKdfFeatureFlag));
+
+        // Act
+        fixture = TestBed.createComponent(ChangeKdfComponent);
+        component = fixture.componentInstance;
+        await component.ngOnInit();
+        fixture.detectChanges();
+
+        // Assert
+        const calloutElement = fixture.debugElement.query((el) =>
+          el.nativeElement.textContent?.includes("kdfSettingsChangeLogoutWarning"),
+        );
+
+        if (showLogOutBanner) {
+          expect(calloutElement).not.toBeNull();
+          expect(calloutElement.nativeElement.textContent).toContain(
+            "kdfSettingsChangeLogoutWarning-used-i18n",
+          );
+        } else {
+          expect(calloutElement).toBeNull();
+        }
+      },
+    );
+  });
+
+  describe("KDF Type Switching", () => {
+    describe("switching from PBKDF2 to Argon2id", () => {
+      beforeEach(async () => {
+        // Setup component with initial PBKDF2 configuration
+        const mockPBKDF2Config = new PBKDF2KdfConfig(600_001);
+        mockKdfConfigService.getKdfConfig.mockResolvedValue(mockPBKDF2Config);
+
+        fixture = TestBed.createComponent(ChangeKdfComponent);
+        component = fixture.componentInstance;
+        await component.ngOnInit();
+      });
+
+      it("should update form structure and default values when KDF type changes to Argon2id", () => {
+        // Arrange
+        const formGroup = component["formGroup"];
+
+        // Act - change KDF type to Argon2id
+        formGroup.controls.kdf.setValue(KdfType.Argon2id);
+
+        // Assert form values update to Argon2id defaults
+        expect(formGroup.controls.kdf.value).toBe(KdfType.Argon2id);
+        const kdfConfigFormGroup = formGroup.controls.kdfConfig;
+        expect(kdfConfigFormGroup.controls.iterations.value).toBe(3); // Argon2id default
+        expect(kdfConfigFormGroup.controls.memory.value).toBe(64); // Argon2id default
+        expect(kdfConfigFormGroup.controls.parallelism.value).toBe(4); // Argon2id default
+      });
+
+      it("should update validators when KDF type changes to Argon2id", () => {
+        // Arrange
+        const formGroup = component["formGroup"];
+
+        // Act - change KDF type to Argon2id
+        formGroup.controls.kdf.setValue(KdfType.Argon2id);
+
+        // Assert validators update to Argon2id validation rules
+        const kdfConfigFormGroup = formGroup.controls.kdfConfig;
+        expectArgon2Validation(
+          kdfConfigFormGroup.controls.iterations,
+          kdfConfigFormGroup.controls.memory,
+          kdfConfigFormGroup.controls.parallelism,
+        );
+      });
+    });
+
+    describe("switching from Argon2id to PBKDF2", () => {
+      beforeEach(async () => {
+        // Setup component with initial Argon2id configuration
+        const mockArgon2IdConfig = new Argon2KdfConfig(4, 65, 5);
+        mockKdfConfigService.getKdfConfig.mockResolvedValue(mockArgon2IdConfig);
+
+        fixture = TestBed.createComponent(ChangeKdfComponent);
+        component = fixture.componentInstance;
+        await component.ngOnInit();
+      });
+
+      it("should update form structure and default values when KDF type changes to PBKDF2", () => {
+        // Arrange
+        const formGroup = component["formGroup"];
+
+        // Act - change KDF type back to PBKDF2
+        formGroup.controls.kdf.setValue(KdfType.PBKDF2_SHA256);
+
+        // Assert form values update to PBKDF2 defaults
+        expect(formGroup.controls.kdf.value).toBe(KdfType.PBKDF2_SHA256);
+        const kdfConfigFormGroup = formGroup.controls.kdfConfig;
+        expect(kdfConfigFormGroup.controls.iterations.value).toBe(600_000); // PBKDF2 default
+        expect(kdfConfigFormGroup.controls.memory.value).toBeNull(); // PBKDF2 doesn't use memory
+        expect(kdfConfigFormGroup.controls.parallelism.value).toBeNull(); // PBKDF2 doesn't use parallelism
+      });
+
+      it("should update validators when KDF type changes to PBKDF2", () => {
+        // Arrange
+        const formGroup = component["formGroup"];
+
+        // Act - change KDF type back to PBKDF2
+        formGroup.controls.kdf.setValue(KdfType.PBKDF2_SHA256);
+
+        // Assert validators update to PBKDF2 validation rules
+        const kdfConfigFormGroup = formGroup.controls.kdfConfig;
+        expectPBKDF2Validation(
+          kdfConfigFormGroup.controls.iterations,
+          kdfConfigFormGroup.controls.memory,
+          kdfConfigFormGroup.controls.parallelism,
+        );
+      });
+    });
+  });
+
+  describe("openConfirmationModal", () => {
+    describe("when form is valid", () => {
+      it("should open confirmation modal with PBKDF2 config when form is submitted", async () => {
+        // Arrange
+        const mockPBKDF2Config = new PBKDF2KdfConfig(600_001);
+        mockKdfConfigService.getKdfConfig.mockResolvedValue(mockPBKDF2Config);
+
+        fixture = TestBed.createComponent(ChangeKdfComponent);
+        component = fixture.componentInstance;
+        await component.ngOnInit();
+
+        // Act
+        await component.openConfirmationModal();
+
+        // Assert
+        expect(mockDialogService.open).toHaveBeenCalledWith(
+          expect.any(Function),
+          expect.objectContaining({
+            data: expect.objectContaining({
+              kdfConfig: mockPBKDF2Config,
+            }),
+          }),
+        );
+      });
+
+      it("should open confirmation modal with Argon2id config when form is submitted", async () => {
+        // Arrange
+        const mockArgon2Config = new Argon2KdfConfig(4, 65, 5);
+        mockKdfConfigService.getKdfConfig.mockResolvedValue(mockArgon2Config);
+
+        fixture = TestBed.createComponent(ChangeKdfComponent);
+        component = fixture.componentInstance;
+        await component.ngOnInit();
+
+        // Act
+        await component.openConfirmationModal();
+
+        // Assert
+        expect(mockDialogService.open).toHaveBeenCalledWith(
+          expect.any(Function),
+          expect.objectContaining({
+            data: expect.objectContaining({
+              kdfConfig: mockArgon2Config,
+            }),
+          }),
+        );
+      });
+
+      it("should not open modal when form is invalid", async () => {
+        // Arrange
+        const mockPBKDF2Config = new PBKDF2KdfConfig(PBKDF2KdfConfig.ITERATIONS.min - 1);
+        mockKdfConfigService.getKdfConfig.mockResolvedValue(mockPBKDF2Config);
+
+        fixture = TestBed.createComponent(ChangeKdfComponent);
+        component = fixture.componentInstance;
+        await component.ngOnInit();
+
+        // Act
+        await component.openConfirmationModal();
+
+        // Assert
+        expect(mockDialogService.open).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/apps/web/src/app/key-management/change-kdf/change-kdf.component.ts b/apps/web/src/app/key-management/change-kdf/change-kdf.component.ts
index a059ede77b4..f128aefdd9b 100644
--- a/apps/web/src/app/key-management/change-kdf/change-kdf.component.ts
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf.component.ts
@@ -1,11 +1,11 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
-import { FormBuilder, FormControl, ValidatorFn, Validators } from "@angular/forms";
-import { Subject, firstValueFrom, takeUntil } from "rxjs";
+import { FormBuilder, FormControl, Validators } from "@angular/forms";
+import { Subject, firstValueFrom, takeUntil, Observable } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { DialogService } from "@bitwarden/components";
 import {
   KdfConfigService,
@@ -18,6 +18,8 @@ import {
 
 import { ChangeKdfConfirmationComponent } from "./change-kdf-confirmation.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-change-kdf",
   templateUrl: "change-kdf.component.html",
@@ -29,11 +31,11 @@ export class ChangeKdfComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
 
   protected formGroup = this.formBuilder.group({
-    kdf: new FormControl(KdfType.PBKDF2_SHA256, [Validators.required]),
+    kdf: new FormControl<KdfType>(KdfType.PBKDF2_SHA256, [Validators.required]),
     kdfConfig: this.formBuilder.group({
-      iterations: [this.kdfConfig.iterations],
-      memory: [null as number],
-      parallelism: [null as number],
+      iterations: new FormControl<number | null>(null),
+      memory: new FormControl<number | null>(null),
+      parallelism: new FormControl<number | null>(null),
     }),
   });
 
@@ -43,95 +45,102 @@ export class ChangeKdfComponent implements OnInit, OnDestroy {
   protected ARGON2_MEMORY = Argon2KdfConfig.MEMORY;
   protected ARGON2_PARALLELISM = Argon2KdfConfig.PARALLELISM;
 
+  noLogoutOnKdfChangeFeatureFlag$: Observable<boolean>;
+
   constructor(
     private dialogService: DialogService,
     private kdfConfigService: KdfConfigService,
     private accountService: AccountService,
     private formBuilder: FormBuilder,
+    configService: ConfigService,
   ) {
     this.kdfOptions = [
       { name: "PBKDF2 SHA-256", value: KdfType.PBKDF2_SHA256 },
       { name: "Argon2id", value: KdfType.Argon2id },
     ];
+    this.noLogoutOnKdfChangeFeatureFlag$ = configService.getFeatureFlag$(
+      FeatureFlag.NoLogoutOnKdfChange,
+    );
   }
 
   async ngOnInit() {
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
     this.kdfConfig = await this.kdfConfigService.getKdfConfig(userId);
-    this.formGroup.get("kdf").setValue(this.kdfConfig.kdfType);
+    this.formGroup.controls.kdf.setValue(this.kdfConfig.kdfType);
     this.setFormControlValues(this.kdfConfig);
+    this.setFormValidators(this.kdfConfig.kdfType);
 
-    this.formGroup
-      .get("kdf")
-      .valueChanges.pipe(takeUntil(this.destroy$))
+    this.formGroup.controls.kdf.valueChanges
+      .pipe(takeUntil(this.destroy$))
       .subscribe((newValue) => {
-        this.updateKdfConfig(newValue);
+        this.updateKdfConfig(newValue!);
       });
   }
   private updateKdfConfig(newValue: KdfType) {
     let config: KdfConfig;
-    const validators: { [key: string]: ValidatorFn[] } = {
-      iterations: [],
-      memory: [],
-      parallelism: [],
-    };
 
     switch (newValue) {
       case KdfType.PBKDF2_SHA256:
         config = new PBKDF2KdfConfig();
-        validators.iterations = [
-          Validators.required,
-          Validators.min(PBKDF2KdfConfig.ITERATIONS.min),
-          Validators.max(PBKDF2KdfConfig.ITERATIONS.max),
-        ];
         break;
       case KdfType.Argon2id:
         config = new Argon2KdfConfig();
-        validators.iterations = [
-          Validators.required,
-          Validators.min(Argon2KdfConfig.ITERATIONS.min),
-          Validators.max(Argon2KdfConfig.ITERATIONS.max),
-        ];
-        validators.memory = [
-          Validators.required,
-          Validators.min(Argon2KdfConfig.MEMORY.min),
-          Validators.max(Argon2KdfConfig.MEMORY.max),
-        ];
-        validators.parallelism = [
-          Validators.required,
-          Validators.min(Argon2KdfConfig.PARALLELISM.min),
-          Validators.max(Argon2KdfConfig.PARALLELISM.max),
-        ];
         break;
       default:
         throw new Error("Unknown KDF type.");
     }
 
     this.kdfConfig = config;
-    this.setFormValidators(validators);
+    this.setFormValidators(newValue);
     this.setFormControlValues(this.kdfConfig);
   }
 
-  private setFormValidators(validators: { [key: string]: ValidatorFn[] }) {
-    this.setValidators("kdfConfig.iterations", validators.iterations);
-    this.setValidators("kdfConfig.memory", validators.memory);
-    this.setValidators("kdfConfig.parallelism", validators.parallelism);
-  }
-  private setValidators(controlName: string, validators: ValidatorFn[]) {
-    const control = this.formGroup.get(controlName);
-    if (control) {
-      control.setValidators(validators);
-      control.updateValueAndValidity();
+  private setFormValidators(kdfType: KdfType) {
+    const kdfConfigFormGroup = this.formGroup.controls.kdfConfig;
+    switch (kdfType) {
+      case KdfType.PBKDF2_SHA256:
+        kdfConfigFormGroup.controls.iterations.setValidators([
+          Validators.required,
+          Validators.min(PBKDF2KdfConfig.ITERATIONS.min),
+          Validators.max(PBKDF2KdfConfig.ITERATIONS.max),
+        ]);
+        kdfConfigFormGroup.controls.memory.setValidators([]);
+        kdfConfigFormGroup.controls.parallelism.setValidators([]);
+        break;
+      case KdfType.Argon2id:
+        kdfConfigFormGroup.controls.iterations.setValidators([
+          Validators.required,
+          Validators.min(Argon2KdfConfig.ITERATIONS.min),
+          Validators.max(Argon2KdfConfig.ITERATIONS.max),
+        ]);
+        kdfConfigFormGroup.controls.memory.setValidators([
+          Validators.required,
+          Validators.min(Argon2KdfConfig.MEMORY.min),
+          Validators.max(Argon2KdfConfig.MEMORY.max),
+        ]);
+        kdfConfigFormGroup.controls.parallelism.setValidators([
+          Validators.required,
+          Validators.min(Argon2KdfConfig.PARALLELISM.min),
+          Validators.max(Argon2KdfConfig.PARALLELISM.max),
+        ]);
+        break;
+      default:
+        throw new Error("Unknown KDF type.");
     }
+    kdfConfigFormGroup.controls.iterations.updateValueAndValidity();
+    kdfConfigFormGroup.controls.memory.updateValueAndValidity();
+    kdfConfigFormGroup.controls.parallelism.updateValueAndValidity();
   }
+
   private setFormControlValues(kdfConfig: KdfConfig) {
-    this.formGroup.get("kdfConfig").reset();
+    const kdfConfigFormGroup = this.formGroup.controls.kdfConfig;
+    kdfConfigFormGroup.reset();
     if (kdfConfig.kdfType === KdfType.PBKDF2_SHA256) {
-      this.formGroup.get("kdfConfig.iterations").setValue(kdfConfig.iterations);
+      kdfConfigFormGroup.controls.iterations.setValue(kdfConfig.iterations);
     } else if (kdfConfig.kdfType === KdfType.Argon2id) {
-      this.formGroup.get("kdfConfig.iterations").setValue(kdfConfig.iterations);
-      this.formGroup.get("kdfConfig.memory").setValue(kdfConfig.memory);
-      this.formGroup.get("kdfConfig.parallelism").setValue(kdfConfig.parallelism);
+      kdfConfigFormGroup.controls.iterations.setValue(kdfConfig.iterations);
+      kdfConfigFormGroup.controls.memory.setValue(kdfConfig.memory);
+      kdfConfigFormGroup.controls.parallelism.setValue(kdfConfig.parallelism);
     }
   }
 
@@ -153,12 +162,14 @@ export class ChangeKdfComponent implements OnInit, OnDestroy {
     if (this.formGroup.invalid) {
       return;
     }
+
+    const kdfConfigFormGroup = this.formGroup.controls.kdfConfig;
     if (this.kdfConfig.kdfType === KdfType.PBKDF2_SHA256) {
-      this.kdfConfig.iterations = this.formGroup.get("kdfConfig.iterations").value;
+      this.kdfConfig.iterations = kdfConfigFormGroup.controls.iterations.value!;
     } else if (this.kdfConfig.kdfType === KdfType.Argon2id) {
-      this.kdfConfig.iterations = this.formGroup.get("kdfConfig.iterations").value;
-      this.kdfConfig.memory = this.formGroup.get("kdfConfig.memory").value;
-      this.kdfConfig.parallelism = this.formGroup.get("kdfConfig.parallelism").value;
+      this.kdfConfig.iterations = kdfConfigFormGroup.controls.iterations.value!;
+      this.kdfConfig.memory = kdfConfigFormGroup.controls.memory.value!;
+      this.kdfConfig.parallelism = kdfConfigFormGroup.controls.parallelism.value!;
     }
     this.dialogService.open(ChangeKdfConfirmationComponent, {
       data: {
diff --git a/apps/web/src/app/key-management/change-kdf/change-kdf.module.ts b/apps/web/src/app/key-management/change-kdf/change-kdf.module.ts
index 342ad43e368..4c9cd00e79d 100644
--- a/apps/web/src/app/key-management/change-kdf/change-kdf.module.ts
+++ b/apps/web/src/app/key-management/change-kdf/change-kdf.module.ts
@@ -1,13 +1,15 @@
 import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 
+import { PopoverModule } from "@bitwarden/components";
+
 import { SharedModule } from "../../shared";
 
 import { ChangeKdfConfirmationComponent } from "./change-kdf-confirmation.component";
 import { ChangeKdfComponent } from "./change-kdf.component";
 
 @NgModule({
-  imports: [CommonModule, SharedModule],
+  imports: [CommonModule, SharedModule, PopoverModule],
   declarations: [ChangeKdfComponent, ChangeKdfConfirmationComponent],
   exports: [ChangeKdfComponent, ChangeKdfConfirmationComponent],
 })
diff --git a/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.ts b/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.ts
index 6127bd25a6f..858f3924790 100644
--- a/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.ts
+++ b/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.ts
@@ -3,6 +3,8 @@ import { Component } from "@angular/core";
 import { ConfirmKeyConnectorDomainComponent as BaseConfirmKeyConnectorDomainComponent } from "@bitwarden/key-management-ui";
 import { RouterService } from "@bitwarden/web-vault/app/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-confirm-key-connector-domain",
   template: ` <confirm-key-connector-domain [onBeforeNavigation]="onBeforeNavigation" /> `,
diff --git a/apps/web/src/app/key-management/key-connector/remove-password.component.ts b/apps/web/src/app/key-management/key-connector/remove-password.component.ts
index 1b07f04ba8a..d9fea9409f8 100644
--- a/apps/web/src/app/key-management/key-connector/remove-password.component.ts
+++ b/apps/web/src/app/key-management/key-connector/remove-password.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/key-management-ui";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-remove-password",
   templateUrl: "remove-password.component.html",
diff --git a/apps/web/src/app/key-management/key-rotation/model/public-key-encryption-key-pair-request.model.ts b/apps/web/src/app/key-management/key-rotation/model/public-key-encryption-key-pair-request.model.ts
new file mode 100644
index 00000000000..7504b599e16
--- /dev/null
+++ b/apps/web/src/app/key-management/key-rotation/model/public-key-encryption-key-pair-request.model.ts
@@ -0,0 +1,19 @@
+import { UnsignedPublicKey, WrappedPrivateKey } from "@bitwarden/common/key-management/types";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { SignedPublicKey } from "@bitwarden/sdk-internal";
+
+export class PublicKeyEncryptionKeyPairRequestModel {
+  wrappedPrivateKey: WrappedPrivateKey;
+  publicKey: string;
+  signedPublicKey: SignedPublicKey | null;
+
+  constructor(
+    wrappedPrivateKey: WrappedPrivateKey,
+    publicKey: UnsignedPublicKey,
+    signedPublicKey: SignedPublicKey | null,
+  ) {
+    this.wrappedPrivateKey = wrappedPrivateKey;
+    this.publicKey = Utils.fromBufferToB64(publicKey);
+    this.signedPublicKey = signedPublicKey;
+  }
+}
diff --git a/apps/web/src/app/key-management/key-rotation/model/signature-key-pair-request-request.model.ts b/apps/web/src/app/key-management/key-rotation/model/signature-key-pair-request-request.model.ts
new file mode 100644
index 00000000000..2dbf75e2ff8
--- /dev/null
+++ b/apps/web/src/app/key-management/key-rotation/model/signature-key-pair-request-request.model.ts
@@ -0,0 +1,18 @@
+import { VerifyingKey, WrappedSigningKey } from "@bitwarden/common/key-management/types";
+import { SignatureAlgorithm } from "@bitwarden/sdk-internal";
+
+export class SignatureKeyPairRequestModel {
+  signatureAlgorithm: SignatureAlgorithm;
+  wrappedSigningKey: WrappedSigningKey;
+  verifyingKey: VerifyingKey;
+
+  constructor(
+    signingKey: WrappedSigningKey,
+    verifyingKey: VerifyingKey,
+    signingKeyAlgorithm: SignatureAlgorithm,
+  ) {
+    this.signatureAlgorithm = signingKeyAlgorithm;
+    this.wrappedSigningKey = signingKey;
+    this.verifyingKey = verifyingKey;
+  }
+}
diff --git a/apps/web/src/app/key-management/key-rotation/request/account-keys.request.ts b/apps/web/src/app/key-management/key-rotation/request/account-keys.request.ts
index 1c9b6c9ceca..2c8964a3588 100644
--- a/apps/web/src/app/key-management/key-rotation/request/account-keys.request.ts
+++ b/apps/web/src/app/key-management/key-rotation/request/account-keys.request.ts
@@ -1,10 +1,70 @@
-export class AccountKeysRequest {
-  // Other keys encrypted by the userkey
-  userKeyEncryptedAccountPrivateKey: string;
-  accountPublicKey: string;
+import { SecurityStateRequest } from "@bitwarden/common/key-management/security-state/request/security-state.request";
+import { WrappedPrivateKey } from "@bitwarden/common/key-management/types";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { PureCrypto } from "@bitwarden/sdk-internal";
 
-  constructor(userKeyEncryptedAccountPrivateKey: string, accountPublicKey: string) {
-    this.userKeyEncryptedAccountPrivateKey = userKeyEncryptedAccountPrivateKey;
-    this.accountPublicKey = accountPublicKey;
+import { PublicKeyEncryptionKeyPairRequestModel } from "../model/public-key-encryption-key-pair-request.model";
+import { SignatureKeyPairRequestModel } from "../model/signature-key-pair-request-request.model";
+import { V1UserCryptographicState } from "../types/v1-cryptographic-state";
+import { V2UserCryptographicState } from "../types/v2-cryptographic-state";
+
+// This request contains other account-owned keys that are encrypted with the user key.
+export class AccountKeysRequest {
+  /**
+   * @deprecated
+   */
+  userKeyEncryptedAccountPrivateKey: WrappedPrivateKey | null = null;
+  /**
+   * @deprecated
+   */
+  accountPublicKey: string | null = null;
+
+  publicKeyEncryptionKeyPair: PublicKeyEncryptionKeyPairRequestModel | null = null;
+  signatureKeyPair: SignatureKeyPairRequestModel | null = null;
+  securityState: SecurityStateRequest | null = null;
+
+  constructor() {}
+
+  static fromV1CryptographicState(state: V1UserCryptographicState): AccountKeysRequest {
+    const request = new AccountKeysRequest();
+    request.userKeyEncryptedAccountPrivateKey = state.publicKeyEncryptionKeyPair.wrappedPrivateKey;
+    request.accountPublicKey = Utils.fromBufferToB64(state.publicKeyEncryptionKeyPair.publicKey);
+    request.publicKeyEncryptionKeyPair = new PublicKeyEncryptionKeyPairRequestModel(
+      state.publicKeyEncryptionKeyPair.wrappedPrivateKey,
+      state.publicKeyEncryptionKeyPair.publicKey,
+      null,
+    );
+
+    return request;
+  }
+
+  static async fromV2CryptographicState(
+    state: V2UserCryptographicState,
+  ): Promise<AccountKeysRequest> {
+    // Ensure the SDK is loaded, since it is used to derive the signature algorithm.
+    await SdkLoadService.Ready;
+
+    const request = new AccountKeysRequest();
+    request.userKeyEncryptedAccountPrivateKey = state.publicKeyEncryptionKeyPair.wrappedPrivateKey!;
+    request.accountPublicKey = Utils.fromBufferToB64(state.publicKeyEncryptionKeyPair.publicKey);
+    request.publicKeyEncryptionKeyPair = new PublicKeyEncryptionKeyPairRequestModel(
+      state.publicKeyEncryptionKeyPair.wrappedPrivateKey,
+      state.publicKeyEncryptionKeyPair.publicKey,
+      state.publicKeyEncryptionKeyPair.signedPublicKey,
+    );
+    request.signatureKeyPair = new SignatureKeyPairRequestModel(
+      state.signatureKeyPair.wrappedSigningKey,
+      state.signatureKeyPair.verifyingKey,
+      PureCrypto.key_algorithm_for_verifying_key(
+        Utils.fromB64ToArray(state.signatureKeyPair.verifyingKey),
+      ),
+    );
+    request.securityState = new SecurityStateRequest(
+      state.securityState.securityState,
+      state.securityState.securityStateVersion,
+    );
+
+    return request;
   }
 }
diff --git a/apps/web/src/app/key-management/key-rotation/request/master-password-unlock-data.request.ts b/apps/web/src/app/key-management/key-rotation/request/master-password-unlock-data.request.ts
index 95e54e16464..965d866c91c 100644
--- a/apps/web/src/app/key-management/key-rotation/request/master-password-unlock-data.request.ts
+++ b/apps/web/src/app/key-management/key-rotation/request/master-password-unlock-data.request.ts
@@ -9,6 +9,9 @@ export class MasterPasswordUnlockDataRequest {
   email: string;
   masterKeyAuthenticationHash: string;
 
+  /**
+   * Also known as masterKeyWrappedUserKey in other parts of the codebase
+   */
   masterKeyEncryptedUserKey: string;
 
   masterPasswordHint?: string;
@@ -17,7 +20,7 @@ export class MasterPasswordUnlockDataRequest {
     kdfConfig: KdfConfig,
     email: string,
     masterKeyAuthenticationHash: string,
-    masterKeyEncryptedUserKey: string,
+    masterKeyWrappedUserKey: string,
     masterPasswordHash?: string,
   ) {
     this.kdfType = kdfConfig.kdfType;
@@ -29,7 +32,7 @@ export class MasterPasswordUnlockDataRequest {
 
     this.email = email;
     this.masterKeyAuthenticationHash = masterKeyAuthenticationHash;
-    this.masterKeyEncryptedUserKey = masterKeyEncryptedUserKey;
+    this.masterKeyEncryptedUserKey = masterKeyWrappedUserKey;
     this.masterPasswordHint = masterPasswordHash;
   }
 }
diff --git a/apps/web/src/app/key-management/key-rotation/types/v1-cryptographic-state.ts b/apps/web/src/app/key-management/key-rotation/types/v1-cryptographic-state.ts
new file mode 100644
index 00000000000..220bdd37752
--- /dev/null
+++ b/apps/web/src/app/key-management/key-rotation/types/v1-cryptographic-state.ts
@@ -0,0 +1,10 @@
+import { UnsignedPublicKey, WrappedPrivateKey } from "@bitwarden/common/key-management/types";
+import { UserKey } from "@bitwarden/common/types/key";
+
+export type V1UserCryptographicState = {
+  userKey: UserKey;
+  publicKeyEncryptionKeyPair: {
+    wrappedPrivateKey: WrappedPrivateKey;
+    publicKey: UnsignedPublicKey;
+  };
+};
diff --git a/apps/web/src/app/key-management/key-rotation/types/v2-cryptographic-state.ts b/apps/web/src/app/key-management/key-rotation/types/v2-cryptographic-state.ts
new file mode 100644
index 00000000000..da52d6d6eef
--- /dev/null
+++ b/apps/web/src/app/key-management/key-rotation/types/v2-cryptographic-state.ts
@@ -0,0 +1,49 @@
+import {
+  SignedSecurityState,
+  UnsignedPublicKey,
+  VerifyingKey,
+  WrappedPrivateKey,
+  WrappedSigningKey,
+} from "@bitwarden/common/key-management/types";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserKey } from "@bitwarden/common/types/key";
+import { SignedPublicKey, UserCryptoV2KeysResponse } from "@bitwarden/sdk-internal";
+
+export type V2UserCryptographicState = {
+  userKey: UserKey;
+  publicKeyEncryptionKeyPair: {
+    wrappedPrivateKey: WrappedPrivateKey;
+    publicKey: UnsignedPublicKey;
+    signedPublicKey: SignedPublicKey;
+  };
+  signatureKeyPair: {
+    wrappedSigningKey: WrappedSigningKey;
+    verifyingKey: VerifyingKey;
+  };
+  securityState: {
+    securityState: SignedSecurityState;
+    securityStateVersion: number;
+  };
+};
+
+export function fromSdkV2KeysToV2UserCryptographicState(
+  response: UserCryptoV2KeysResponse,
+): V2UserCryptographicState {
+  return {
+    userKey: SymmetricCryptoKey.fromString(response.userKey) as UserKey,
+    publicKeyEncryptionKeyPair: {
+      wrappedPrivateKey: response.privateKey as WrappedPrivateKey,
+      publicKey: Utils.fromB64ToArray(response.publicKey) as UnsignedPublicKey,
+      signedPublicKey: response.signedPublicKey,
+    },
+    signatureKeyPair: {
+      wrappedSigningKey: response.signingKey as WrappedSigningKey,
+      verifyingKey: response.verifyingKey as VerifyingKey,
+    },
+    securityState: {
+      securityState: response.securityState as SignedSecurityState,
+      securityStateVersion: response.securityVersion,
+    },
+  };
+}
diff --git a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
index 0ffa48048f6..b790fb8409a 100644
--- a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
+++ b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
@@ -4,6 +4,7 @@ import { BehaviorSubject } from "rxjs";
 import { OrganizationUserResetPasswordWithIdRequest } from "@bitwarden/admin-console/common";
 import { Account } from "@bitwarden/common/auth/abstractions/account.service";
 import { WebauthnRotateCredentialRequest } from "@bitwarden/common/auth/models/request/webauthn-rotate-credential.request";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import {
@@ -11,10 +12,22 @@ import {
   EncString,
 } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
+import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
+import {
+  SignedPublicKey,
+  SignedSecurityState,
+  UnsignedPublicKey,
+  VerifyingKey,
+  WrappedPrivateKey,
+  WrappedSigningKey,
+} from "@bitwarden/common/key-management/types";
 import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { SdkClientFactory } from "@bitwarden/common/platform/abstractions/sdk/sdk-client-factory";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
+import { HashPurpose } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { SendWithIdRequest } from "@bitwarden/common/tools/send/models/request/send-with-id.request";
@@ -33,13 +46,14 @@ import {
   PBKDF2KdfConfig,
   KdfConfigService,
   KdfConfig,
+  KdfType,
 } from "@bitwarden/key-management";
 import {
   AccountRecoveryTrustComponent,
   EmergencyAccessTrustComponent,
   KeyRotationTrustInfoComponent,
 } from "@bitwarden/key-management-ui";
-import { PureCrypto } from "@bitwarden/sdk-internal";
+import { BitwardenClient, PureCrypto } from "@bitwarden/sdk-internal";
 
 import { OrganizationUserResetPasswordService } from "../../admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service";
 import { WebauthnLoginAdminService } from "../../auth";
@@ -48,11 +62,18 @@ import { EmergencyAccessStatusType } from "../../auth/emergency-access/enums/eme
 import { EmergencyAccessType } from "../../auth/emergency-access/enums/emergency-access-type";
 import { EmergencyAccessWithIdRequest } from "../../auth/emergency-access/request/emergency-access-update.request";
 
+import { AccountKeysRequest } from "./request/account-keys.request";
 import { MasterPasswordUnlockDataRequest } from "./request/master-password-unlock-data.request";
 import { UnlockDataRequest } from "./request/unlock-data.request";
 import { UserDataRequest } from "./request/userdata.request";
+import { V1UserCryptographicState } from "./types/v1-cryptographic-state";
+import { V2UserCryptographicState } from "./types/v2-cryptographic-state";
 import { UserKeyRotationApiService } from "./user-key-rotation-api.service";
-import { UserKeyRotationService } from "./user-key-rotation.service";
+import {
+  UserKeyRotationService,
+  V1CryptographicStateParameters,
+  V2CryptographicStateParameters,
+} from "./user-key-rotation.service";
 
 const initialPromptedOpenTrue = jest.fn();
 initialPromptedOpenTrue.mockReturnValue({ closed: new BehaviorSubject(true) });
@@ -120,6 +141,21 @@ function createMockWebauthn(id: string): any {
   } as WebauthnRotateCredentialRequest;
 }
 
+const TEST_VECTOR_USER_KEY_V1 = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+const TEST_VECTOR_PRIVATE_KEY_V1 =
+  "2.AAAw2vTUePO+CCyokcIfVw==|DTBNlJ5yVsV2Bsk3UU3H6Q==|YvFBff5gxWqM+UsFB6BKimKxhC32AtjF3IStpU1Ijwg=" as WrappedPrivateKey;
+const TEST_VECTOR_PUBLIC_KEY_V1 = Utils.fromBufferToB64(new Uint8Array(400));
+const TEST_VECTOR_PRIVATE_KEY_V1_ROTATED =
+  "2.AAAw2vTUePO+CCyokcIfVw==|DTBNlJ5yVsV2Bsk3UU3H6Q==|AAAAff5gxWqM+UsFB6BKimKxhC32AtjF3IStpU1Ijwg=" as WrappedPrivateKey;
+
+const TEST_VECTOR_USER_KEY_V2 = new SymmetricCryptoKey(new Uint8Array(70)) as UserKey;
+const TEST_VECTOR_PRIVATE_KEY_V2 = "7.AAAw2vTUePO+CCyokcIfVw==" as WrappedPrivateKey;
+const TEST_VECTOR_SIGNING_KEY_V2 = "7.AAAw2vTUePO+CCyokcIfVw==" as WrappedSigningKey;
+const TEST_VECTOR_VERIFYING_KEY_V2 = "AAAw2vTUePO+CCyokcIfVw==" as VerifyingKey;
+const TEST_VECTOR_SECURITY_STATE_V2 = "AAAw2vTUePO+CCyokcIfVw==" as SignedSecurityState;
+const TEST_VECTOR_PUBLIC_KEY_V2 = Utils.fromBufferToB64(new Uint8Array(400));
+const TEST_VECTOR_SIGNED_PUBLIC_KEY_V2 = "AAAw2vTUePO+CCyokcIfVw==" as SignedPublicKey;
+
 class TestUserKeyRotationService extends UserKeyRotationService {
   override rotateUserKeyMasterPasswordAndEncryptedData(
     currentMasterPassword: string,
@@ -138,22 +174,17 @@ class TestUserKeyRotationService extends UserKeyRotationService {
     return super.ensureIsAllowedToRotateUserKey();
   }
   override getNewAccountKeysV1(
-    currentUserKey: UserKey,
-    currentUserKeyWrappedPrivateKey: EncString,
-  ): Promise<{
-    userKey: UserKey;
-    asymmetricEncryptionKeys: { wrappedPrivateKey: EncString; publicKey: string };
-  }> {
-    return super.getNewAccountKeysV1(currentUserKey, currentUserKeyWrappedPrivateKey);
+    cryptographicStateParameters: V1CryptographicStateParameters,
+  ): Promise<V1UserCryptographicState> {
+    return super.getNewAccountKeysV1(cryptographicStateParameters);
   }
   override getNewAccountKeysV2(
-    currentUserKey: UserKey,
-    currentUserKeyWrappedPrivateKey: EncString,
-  ): Promise<{
-    userKey: UserKey;
-    asymmetricEncryptionKeys: { wrappedPrivateKey: EncString; publicKey: string };
-  }> {
-    return super.getNewAccountKeysV2(currentUserKey, currentUserKeyWrappedPrivateKey);
+    userId: UserId,
+    kdfConfig: KdfConfig,
+    email: string,
+    cryptographicStateParameters: V1CryptographicStateParameters | V2CryptographicStateParameters,
+  ): Promise<V2UserCryptographicState> {
+    return super.getNewAccountKeysV2(userId, kdfConfig, email, cryptographicStateParameters);
   }
   override createMasterPasswordUnlockDataRequest(
     userKey: UserKey,
@@ -176,8 +207,8 @@ class TestUserKeyRotationService extends UserKeyRotationService {
       masterKeyKdfConfig: KdfConfig;
       masterPasswordHint: string;
     },
-    trustedEmergencyAccessGranteesPublicKeys: Uint8Array[],
-    trustedOrganizationPublicKeys: Uint8Array[],
+    trustedEmergencyAccessGranteesPublicKeys: UnsignedPublicKey[],
+    trustedOrganizationPublicKeys: UnsignedPublicKey[],
   ): Promise<UnlockDataRequest> {
     return super.getAccountUnlockDataRequest(
       userId,
@@ -190,8 +221,8 @@ class TestUserKeyRotationService extends UserKeyRotationService {
   }
   override verifyTrust(user: Account): Promise<{
     wasTrustDenied: boolean;
-    trustedOrganizationPublicKeys: Uint8Array[];
-    trustedEmergencyAccessUserPublicKeys: Uint8Array[];
+    trustedOrganizationPublicKeys: UnsignedPublicKey[];
+    trustedEmergencyAccessUserPublicKeys: UnsignedPublicKey[];
   }> {
     return super.verifyTrust(user);
   }
@@ -202,14 +233,6 @@ class TestUserKeyRotationService extends UserKeyRotationService {
   ): Promise<UserDataRequest> {
     return super.getAccountDataRequest(originalUserKey, newUnencryptedUserKey, user);
   }
-  override makeNewUserKeyV1(oldUserKey: UserKey): Promise<UserKey> {
-    return super.makeNewUserKeyV1(oldUserKey);
-  }
-  override makeNewUserKeyV2(
-    oldUserKey: UserKey,
-  ): Promise<{ isUpgrading: boolean; newUserKey: UserKey }> {
-    return super.makeNewUserKeyV2(oldUserKey);
-  }
   override isV1User(userKey: UserKey): boolean {
     return super.isV1User(userKey);
   }
@@ -227,6 +250,13 @@ class TestUserKeyRotationService extends UserKeyRotationService {
       masterKeySalt,
     );
   }
+  override getCryptographicStateForUser(user: Account): Promise<{
+    masterKeyKdfConfig: KdfConfig;
+    masterKeySalt: string;
+    cryptographicStateParameters: V1CryptographicStateParameters | V2CryptographicStateParameters;
+  }> {
+    return super.getCryptographicStateForUser(user);
+  }
 }
 
 describe("KeyRotationService", () => {
@@ -251,6 +281,8 @@ describe("KeyRotationService", () => {
   let mockI18nService: MockProxy<I18nService>;
   let mockCryptoFunctionService: MockProxy<CryptoFunctionService>;
   let mockKdfConfigService: MockProxy<KdfConfigService>;
+  let mockSdkClientFactory: MockProxy<SdkClientFactory>;
+  let mockSecurityStateService: MockProxy<SecurityStateService>;
 
   const mockUser = {
     id: "mockUserId" as UserId,
@@ -261,6 +293,9 @@ describe("KeyRotationService", () => {
 
   const mockTrustedPublicKeys = [Utils.fromUtf8ToArray("test-public-key")];
 
+  const mockMakeKeysForUserCryptoV2 = jest.fn();
+  const mockGetV2RotatedAccountKeys = jest.fn();
+
   beforeAll(() => {
     mockApiService = mock<UserKeyRotationApiService>();
     mockCipherService = mock<CipherService>();
@@ -271,7 +306,7 @@ describe("KeyRotationService", () => {
       mockTrustedPublicKeys.map((key) => {
         return {
           publicKey: key,
-          id: "mockId",
+          id: "00000000-0000-0000-0000-000000000000" as UserId,
           granteeId: "mockGranteeId",
           name: "mockName",
           email: "mockEmail",
@@ -306,6 +341,17 @@ describe("KeyRotationService", () => {
     mockDialogService = mock<DialogService>();
     mockCryptoFunctionService = mock<CryptoFunctionService>();
     mockKdfConfigService = mock<KdfConfigService>();
+    mockSdkClientFactory = mock<SdkClientFactory>();
+    mockSdkClientFactory.createSdkClient.mockResolvedValue({
+      crypto: () => {
+        return {
+          initialize_user_crypto: jest.fn(),
+          make_keys_for_user_crypto_v2: mockMakeKeysForUserCryptoV2,
+          get_v2_rotated_account_keys: mockGetV2RotatedAccountKeys,
+        } as any;
+      },
+    } as BitwardenClient);
+    mockSecurityStateService = mock<SecurityStateService>();
 
     keyRotationService = new TestUserKeyRotationService(
       mockApiService,
@@ -327,6 +373,8 @@ describe("KeyRotationService", () => {
       mockConfigService,
       mockCryptoFunctionService,
       mockKdfConfigService,
+      mockSdkClientFactory,
+      mockSecurityStateService,
     );
   });
 
@@ -334,13 +382,16 @@ describe("KeyRotationService", () => {
     jest.clearAllMocks();
     jest.mock("@bitwarden/key-management-ui");
     jest.spyOn(PureCrypto, "make_user_key_aes256_cbc_hmac").mockReturnValue(new Uint8Array(64));
-    jest.spyOn(PureCrypto, "make_user_key_xchacha20_poly1305").mockReturnValue(new Uint8Array(70));
     jest
       .spyOn(PureCrypto, "encrypt_user_key_with_master_password")
       .mockReturnValue("mockNewUserKey");
+    Object.defineProperty(SdkLoadService, "Ready", {
+      value: Promise.resolve(),
+      configurable: true,
+    });
   });
 
-  describe("rotateUserKeyAndEncryptedData", () => {
+  describe("rotateUserKeyMasterPasswordAndEncryptedData", () => {
     let privateKey: BehaviorSubject<UserPrivateKey | null>;
     let keyPair: BehaviorSubject<{ privateKey: UserPrivateKey; publicKey: UserPublicKey }>;
 
@@ -438,6 +489,64 @@ describe("KeyRotationService", () => {
       expect(arg.accountUnlockData.passkeyUnlockData.length).toBe(2);
     });
 
+    it("passes the EnrollAeadOnKeyRotation feature flag to getRotatedAccountKeysFlagged", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
+      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
+      mockKdfConfigService.getKdfConfig$.mockReturnValue(
+        new BehaviorSubject(new PBKDF2KdfConfig(100000)),
+      );
+      mockKeyService.userKey$.mockReturnValue(
+        new BehaviorSubject(new SymmetricCryptoKey(new Uint8Array(64)) as UserKey),
+      );
+      mockKeyService.userEncryptedPrivateKey$.mockReturnValue(
+        new BehaviorSubject(TEST_VECTOR_PRIVATE_KEY_V1 as string as EncryptedString),
+      );
+      mockKeyService.userSigningKey$.mockReturnValue(new BehaviorSubject(null));
+      mockSecurityStateService.accountSecurityState$.mockReturnValue(new BehaviorSubject(null));
+      mockConfigService.getFeatureFlag.mockResolvedValue(true);
+
+      const spy = jest.spyOn(keyRotationService, "getRotatedAccountKeysFlagged").mockResolvedValue({
+        userKey: TEST_VECTOR_USER_KEY_V2,
+        accountKeysRequest: {
+          userKeyEncryptedAccountPrivateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+          accountPublicKey: TEST_VECTOR_PUBLIC_KEY_V2,
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+            publicKey: TEST_VECTOR_PUBLIC_KEY_V2,
+            signedPublicKey: TEST_VECTOR_SIGNED_PUBLIC_KEY_V2,
+          },
+          signatureKeyPair: {
+            wrappedSigningKey: TEST_VECTOR_SIGNING_KEY_V2,
+            verifyingKey: TEST_VECTOR_VERIFYING_KEY_V2,
+            signatureAlgorithm: "ed25519",
+          },
+          securityState: {
+            securityState: TEST_VECTOR_SECURITY_STATE_V2,
+            securityVersion: 2,
+          },
+        },
+      });
+
+      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
+        "mockMasterPassword",
+        "mockMasterPassword1",
+        mockUser,
+        "masterPasswordHint",
+      );
+
+      expect(mockConfigService.getFeatureFlag).toHaveBeenCalledWith(
+        FeatureFlag.EnrollAeadOnKeyRotation,
+      );
+      expect(spy).toHaveBeenCalledWith(
+        mockUser.id,
+        expect.any(PBKDF2KdfConfig),
+        mockUser.email,
+        expect.objectContaining({ version: 1 }),
+        true,
+      );
+    });
+
     it("throws if kdf config is null", async () => {
       KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
       AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
@@ -511,17 +620,17 @@ describe("KeyRotationService", () => {
   });
 
   describe("getNewAccountKeysV1", () => {
-    const currentUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
-    const mockEncryptedPrivateKey = new EncString(
-      "2.eh465OrUcluL9UpnCOUTAg==|2HXNXwrLwAjUfZ/U75c92rZEltt1eHxjMkp/ADAmx346oT1+GaQvaL1QIV/9Om0T72m8AnlO92iUfWdhbA/ifHZ+lhFoUVeyw1M88CMzktbVcq42rFoK7SGHSAGdTL3ccUWKI8yCCQJhpt2X6a/5+T7ey5k2CqvylKyOtkiCnVeLmYqETn5BM9Rl3tEgJW1yDLuSJ+L+Qh9xnk/Z3zJUV5HAs+YwjKwuSNrd00SXjDyx8rBEstD9MKI+lrk7to/q90vqKqCucAj/dzUpVtHe88al2AAlBVwQ13HUPdNFOyti6niUgCAWx+DzRqlhkFvl/z/rtxtQsyqq/3Eh/EL54ylxKzAya0ev9EaIOm/dD1aBmI58p4Bs0eMOCIKJjtw+Cmdql+RhCtKtumgFShqyXv+LfD/FgUsdTVNExk3YNhgwPR4jOaMa/j9LCrBMCLKxdAhQyBe7T3qoX1fBBirvY6t77ifMu1YEQ6DfmFphVSwDH5C9xGeTSh5IELSf0tGVtlWUe9RffDDzccD0L1lR8U+dqzoSTYCuXvhEhQptdIW6fpH/47u0M5MiI97/d35A7Et2I1gjHp7WF3qsY20ellBueu7ZL5P1BmqPXl58yaBBXJaCutYHDfIucspqdZmfBGEbdRT4wmuZRON0J8zLmUejM0VR/2MOmpfyYQXnJhTfrvnZ1bOg1aMhUxJ2vhDNPXUFm5b+vwsho4GEvcLAKq9WwbvOJ/sK7sEVfTfEO2IG+0X6wkWm7RpR6Wq9FGKSrv2PSjMAYnb+z3ETeWiaaiD+tVFxa2AaqsbOuX092/86GySpHES7cFWhQ/YMOgj6egUi8mEC0CqMXYsx0TTJDsn16oP+XB3a2WoRqzE0YBozp2aMXxhVf/jMZ03BmEmRQu5B+Sq1gMEZwtIfJ+srkZLMYlLjvVw92FRoFy+N6ytPiyf6RMHMUnJ3vEZSBogaElYoQAtFJ5kK811CUzb78zEHH8xWtPrCZn9zZfvf/zaWxo7fpV8VwAwUeHXHcQMraZum5QeO+5tLRUYrLm85JNelGfmUA3BjfNyFbfb32PhkWWd0CbDaPME48uIriVK32pNEtvtR/+I/f3YgA/jP9kSlDvbzG/OAg/AFBIpNwKUzsu4+va8mI+O5FDufw5D74WwdGJ9DeyEb2CHtWMR1VwtFKL0ZZsqltNf8EkBeJ5RtTNtAMM8ie4dDZaKC96ymQHKrdB4hjkAr0F1XFsU4XdOa9Nbkdcm/7KoNc6bE6oJtG9lqE8h+1CysfcbfJ7am+hvDFzT0IPmp3GDSMAk+e6xySgFQw0C/SZ7LQsxPa1s6hc+BOtTn0oClZnU7Mowxv+z+xURJj4Yp3Cy6tAoia1jEQSs6lSMNKPf9bi3xFKtPl4143hwhpvTAzJUcski9OVGd7Du+VyxwIrvLqp5Ct/oNrESVJpf1EDCs9xT1EW+PiSkRmHXoZ1t5MOLFEiMAZL2+bNe3A2661oJeMtps8zrfCVc251OUE1WvqWePlTOs5TDVqdwDH88J6rHLsbaf33Mxh5DP8gMfZQxE44Nsp6H0/Szfkss5UmFwBEpHjl1GJMWDnB3u2d+l1CSkLoB6C+diAUlY6wL/VwJBeMPHZTf6amQIS2B/lo/CnvV/E3k=|uuoY4b7xwMYBNIZi85KBsaHmNqtJl5FrKxZI9ugeNwc=",
-    );
-    const mockNewEncryptedPrivateKey = new EncString(
-      "2.ab465OrUcluL9UpnCOUTAg==|4HXNXwrLwAjUfZ/U75c92rZEltt1eHxjMkp/ADAmx346oT1+GaQvaL1QIV/9Om0T72m8AnlO92iUfWdhbA/ifHZ+lhFoUVeyw1M88CMzktbVcq42rFoK7SGHSAGdTL3ccUWKI8yCCQJhpt2X6a/5+T7ey5k2CqvylKyOtkiCnVeLmYqETn5BM9Rl3tEgJW1yDLuSJ+L+Qh9xnk/Z3zJUV5HAs+YwjKwuSNrd00SXjDyx8rBEstD9MKI+lrk7to/q90vqKqCucAj/dzUpVtHe88al2AAlBVwQ13HUPdNFOyti6niUgCAWx+DzRqlhkFvl/z/rtxtQsyqq/3Eh/EL54ylxKzAya0ev9EaIOm/dD1aBmI58p4Bs0eMOCIKJjtw+Cmdql+RhCtKtumgFShqyXv+LfD/FgUsdTVNExk3YNhgwPR4jOaMa/j9LCrBMCLKxdAhQyBe7T3qoX1fBBirvY6t77ifMu1YEQ6DfmFphVSwDH5C9xGeTSh5IELSf0tGVtlWUe9RffDDzccD0L1lR8U+dqzoSTYCuXvhEhQptdIW6fpH/47u0M5MiI97/d35A7Et2I1gjHp7WF3qsY20ellBueu7ZL5P1BmqPXl58yaBBXJaCutYHDfIucspqdZmfBGEbdRT4wmuZRON0J8zLmUejM0VR/2MOmpfyYQXnJhTfrvnZ1bOg1aMhUxJ2vhDNPXUFm5b+vwsho4GEvcLAKq9WwbvOJ/sK7sEVfTfEO2IG+0X6wkWm7RpR6Wq9FGKSrv2PSjMAYnb+z3ETeWiaaiD+tVFxa2AaqsbOuX092/86GySpHES7cFWhQ/YMOgj6egUi8mEC0CqMXYsx0TTJDsn16oP+XB3a2WoRqzE0YBozp2aMXxhVf/jMZ03BmEmRQu5B+Sq1gMEZwtIfJ+srkZLMYlLjvVw92FRoFy+N6ytPiyf6RMHMUnJ3vEZSBogaElYoQAtFJ5kK811CUzb78zEHH8xWtPrCZn9zZfvf/zaWxo7fpV8VwAwUeHXHcQMraZum5QeO+5tLRUYrLm85JNelGfmUA3BjfNyFbfb32PhkWWd0CbDaPME48uIriVK32pNEtvtR/+I/f3YgA/jP9kSlDvbzG/OAg/AFBIpNwKUzsu4+va8mI+O5FDufw5D74WwdGJ9DeyEb2CHtWMR1VwtFKL0ZZsqltNf8EkBeJ5RtTNtAMM8ie4dDZaKC96ymQHKrdB4hjkAr0F1XFsU4XdOa9Nbkdcm/7KoNc6bE6oJtG9lqE8h+1CysfcbfJ7am+hvDFzT0IPmp3GDSMAk+e6xySgFQw0C/SZ7LQsxPa1s6hc+BOtTn0oClZnU7Mowxv+z+xURJj4Yp3Cy6tAoia1jEQSs6lSMNKPf9bi3xFKtPl4143hwhpvTAzJUcski9OVGd7Du+VyxwIrvLqp5Ct/oNrESVJpf1EDCs9xT1EW+PiSkRmHXoZ1t5MOLFEiMAZL2+bNe3A2661oJeMtps8zrfCVc251OUE1WvqWePlTOs5TDVqdwDH88J6rHLsbaf33Mxh5DP8gMfZQxE44Nsp6H0/Szfkss5UmFwBEpHjl1GJMWDnB3u2d+l1CSkLoB6C+diAUlY6wL/VwJBeMPHZTf6amQIS2B/lo/CnvV/E3k=|uuoY4b7xwMYBNIZi85KBsaHmNqtJl5FrKxZI9ugeNwc=",
-    );
+    const currentUserKey = TEST_VECTOR_USER_KEY_V1;
+    const mockEncryptedPrivateKey = TEST_VECTOR_PRIVATE_KEY_V1 as WrappedPrivateKey;
+    const mockNewEncryptedPrivateKey = TEST_VECTOR_PRIVATE_KEY_V1_ROTATED as WrappedPrivateKey;
     beforeAll(() => {
       mockEncryptService.unwrapDecapsulationKey.mockResolvedValue(new Uint8Array(200));
-      mockEncryptService.wrapDecapsulationKey.mockResolvedValue(mockNewEncryptedPrivateKey);
-      mockCryptoFunctionService.rsaExtractPublicKey.mockResolvedValue(new Uint8Array(400));
+      mockEncryptService.wrapDecapsulationKey.mockResolvedValue(
+        new EncString(mockNewEncryptedPrivateKey),
+      );
+      mockCryptoFunctionService.rsaExtractPublicKey.mockResolvedValue(
+        new Uint8Array(400) as UnsignedPublicKey,
+      );
     });
 
     afterAll(() => {
@@ -529,28 +638,110 @@ describe("KeyRotationService", () => {
     });
 
     it("returns new account keys", async () => {
-      const result = await keyRotationService.getNewAccountKeysV1(
-        currentUserKey,
-        mockEncryptedPrivateKey,
-      );
+      const result = await keyRotationService.getNewAccountKeysV1({
+        version: 1,
+        userKey: currentUserKey,
+        publicKeyEncryptionKeyPair: {
+          wrappedPrivateKey: mockEncryptedPrivateKey,
+          publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V1) as UnsignedPublicKey,
+        },
+      });
       expect(result).toEqual({
         userKey: expect.any(SymmetricCryptoKey),
-        asymmetricEncryptionKeys: {
+        publicKeyEncryptionKeyPair: {
           wrappedPrivateKey: mockNewEncryptedPrivateKey,
-          publicKey: Utils.fromBufferToB64(new Uint8Array(400)),
+          publicKey: new Uint8Array(400) as UserPublicKey,
         },
       });
     });
   });
 
   describe("getNewAccountKeysV2", () => {
-    it("throws not supported", async () => {
-      await expect(
-        keyRotationService.getNewAccountKeysV2(
-          new SymmetricCryptoKey(new Uint8Array(64)) as UserKey,
-          null,
-        ),
-      ).rejects.toThrow("User encryption v2 upgrade is not supported yet");
+    it("rotates a v2 user", async () => {
+      mockGetV2RotatedAccountKeys.mockReturnValue({
+        userKey: TEST_VECTOR_USER_KEY_V2.toBase64(),
+        privateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+        publicKey: TEST_VECTOR_PUBLIC_KEY_V2,
+        signedPublicKey: TEST_VECTOR_SIGNED_PUBLIC_KEY_V2,
+        signingKey: TEST_VECTOR_SIGNING_KEY_V2,
+        verifyingKey: TEST_VECTOR_VERIFYING_KEY_V2,
+        securityState: TEST_VECTOR_SECURITY_STATE_V2,
+        securityVersion: 2,
+      });
+      const result = await keyRotationService.getNewAccountKeysV2(
+        "00000000-0000-0000-0000-000000000000" as UserId,
+        new PBKDF2KdfConfig(600_000),
+        "mockuseremail",
+        {
+          version: 2 as const,
+          userKey: TEST_VECTOR_USER_KEY_V2,
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+            publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V2) as UnsignedPublicKey,
+          },
+          signingKey: TEST_VECTOR_SIGNING_KEY_V2 as WrappedSigningKey,
+          securityState: TEST_VECTOR_SECURITY_STATE_V2 as SignedSecurityState,
+        },
+      );
+      expect(mockGetV2RotatedAccountKeys).toHaveBeenCalled();
+      expect(result).toEqual({
+        userKey: TEST_VECTOR_USER_KEY_V2,
+        publicKeyEncryptionKeyPair: {
+          wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+          publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V2) as UnsignedPublicKey,
+          signedPublicKey: TEST_VECTOR_SIGNED_PUBLIC_KEY_V2,
+        },
+        signatureKeyPair: {
+          wrappedSigningKey: TEST_VECTOR_SIGNING_KEY_V2 as WrappedSigningKey,
+          verifyingKey: TEST_VECTOR_VERIFYING_KEY_V2 as VerifyingKey,
+        },
+        securityState: {
+          securityState: TEST_VECTOR_SECURITY_STATE_V2 as SignedSecurityState,
+          securityStateVersion: 2,
+        },
+      });
+    });
+    it("upgrades v1 user to v2 user", async () => {
+      mockMakeKeysForUserCryptoV2.mockReturnValue({
+        userKey: TEST_VECTOR_USER_KEY_V2.toBase64(),
+        privateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+        publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V2) as UnsignedPublicKey,
+        signedPublicKey: TEST_VECTOR_SIGNED_PUBLIC_KEY_V2,
+        signingKey: TEST_VECTOR_SIGNING_KEY_V2,
+        verifyingKey: TEST_VECTOR_VERIFYING_KEY_V2,
+        securityState: TEST_VECTOR_SECURITY_STATE_V2,
+        securityVersion: 2,
+      });
+      const result = await keyRotationService.getNewAccountKeysV2(
+        "00000000-0000-0000-0000-000000000000" as UserId,
+        new PBKDF2KdfConfig(600_000),
+        "mockuseremail",
+        {
+          version: 1,
+          userKey: TEST_VECTOR_USER_KEY_V1,
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V1 as WrappedPrivateKey,
+            publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V1) as UnsignedPublicKey,
+          },
+        },
+      );
+      expect(mockMakeKeysForUserCryptoV2).toHaveBeenCalled();
+      expect(result).toEqual({
+        userKey: TEST_VECTOR_USER_KEY_V2,
+        publicKeyEncryptionKeyPair: {
+          wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+          publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V2),
+          signedPublicKey: TEST_VECTOR_SIGNED_PUBLIC_KEY_V2,
+        },
+        signatureKeyPair: {
+          wrappedSigningKey: TEST_VECTOR_SIGNING_KEY_V2 as WrappedSigningKey,
+          verifyingKey: TEST_VECTOR_VERIFYING_KEY_V2 as VerifyingKey,
+        },
+        securityState: {
+          securityState: TEST_VECTOR_SECURITY_STATE_V2 as SignedSecurityState,
+          securityStateVersion: 2,
+        },
+      });
     });
   });
 
@@ -560,7 +751,7 @@ describe("KeyRotationService", () => {
         new SymmetricCryptoKey(new Uint8Array(32)) as MasterKey,
       );
       mockKeyService.hashMasterKey.mockResolvedValue("mockMasterPasswordHash");
-      const newKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const newKey = TEST_VECTOR_USER_KEY_V1;
       const userAccount = mockUser;
       const masterPasswordUnlockData =
         await keyRotationService.createMasterPasswordUnlockDataRequest(newKey, {
@@ -572,13 +763,13 @@ describe("KeyRotationService", () => {
       expect(masterPasswordUnlockData).toEqual({
         masterKeyEncryptedUserKey: "mockNewUserKey",
         email: "mockEmail",
-        kdfType: 0,
+        kdfType: KdfType.PBKDF2_SHA256,
         kdfIterations: 600_000,
         masterKeyAuthenticationHash: "mockMasterPasswordHash",
         masterPasswordHint: "mockMasterPasswordHint",
       });
       expect(PureCrypto.encrypt_user_key_with_master_password).toHaveBeenCalledWith(
-        new SymmetricCryptoKey(new Uint8Array(64)).toEncoded(),
+        TEST_VECTOR_USER_KEY_V1.toEncoded(),
         "mockMasterPassword",
         userAccount.email,
         new PBKDF2KdfConfig(600_000).toSdkConfig(),
@@ -637,8 +828,8 @@ describe("KeyRotationService", () => {
           masterKeyKdfConfig: new PBKDF2KdfConfig(600_000),
           masterPasswordHint: "mockMasterPasswordHint",
         },
-        [new Uint8Array(1)], // emergency access public key
-        [new Uint8Array(2)], // account recovery public key
+        [new Uint8Array(1) as UnsignedPublicKey], // emergency access public key
+        [new Uint8Array(2) as UnsignedPublicKey], // account recovery public key
       );
       expect(accountUnlockDataRequest.passkeyUnlockData).toEqual([
         {
@@ -758,66 +949,29 @@ describe("KeyRotationService", () => {
       expect(wasTrustDenied).toBe(true);
     });
 
-    it("returns trusted keys if all dialogs are accepted", async () => {
-      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
-      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
-      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
-      mockEmergencyAccessService.getPublicKeys.mockResolvedValue([
-        mockGranteeEmergencyAccessWithPublicKey,
-      ]);
-      mockResetPasswordService.getPublicKeys.mockResolvedValue([
-        mockOrganizationUserResetPasswordEntry,
-      ]);
-      const {
-        wasTrustDenied,
-        trustedOrganizationPublicKeys: trustedOrgs,
-        trustedEmergencyAccessUserPublicKeys: trustedEmergencyAccessUsers,
-      } = await keyRotationService.verifyTrust(mockUser);
-      expect(wasTrustDenied).toBe(false);
-      expect(trustedEmergencyAccessUsers).toEqual([
-        mockGranteeEmergencyAccessWithPublicKey.publicKey,
-      ]);
-      expect(trustedOrgs).toEqual([mockOrganizationUserResetPasswordEntry.publicKey]);
-    });
-  });
-
-  describe("makeNewUserKeyV1", () => {
-    it("throws if old keys is xchacha20poly1305 key", async () => {
-      await expect(
-        keyRotationService.makeNewUserKeyV1(new SymmetricCryptoKey(new Uint8Array(70)) as UserKey),
-      ).rejects.toThrow(
-        "User account crypto format is v2, but the feature flag is disabled. User key rotation cannot proceed.",
-      );
-    });
-    it("returns new user key", async () => {
-      const oldKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
-      const newKey = await keyRotationService.makeNewUserKeyV1(oldKey);
-      expect(newKey).toEqual(new SymmetricCryptoKey(new Uint8Array(64)));
-    });
-  });
-
-  describe("makeNewUserKeyV2", () => {
-    it("returns xchacha20poly1305 key", async () => {
-      const oldKey = new SymmetricCryptoKey(new Uint8Array(70)) as UserKey;
-      const { newUserKey } = await keyRotationService.makeNewUserKeyV2(oldKey);
-      expect(newUserKey).toEqual(new SymmetricCryptoKey(new Uint8Array(70)));
-    });
-    it("returns isUpgrading true if old key is v1", async () => {
-      const oldKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
-      const newKey = await keyRotationService.makeNewUserKeyV2(oldKey);
-      expect(newKey).toEqual({
-        newUserKey: new SymmetricCryptoKey(new Uint8Array(70)),
-        isUpgrading: true,
-      });
-    });
-    it("returns isUpgrading false if old key is v2", async () => {
-      const oldKey = new SymmetricCryptoKey(new Uint8Array(70)) as UserKey;
-      const newKey = await keyRotationService.makeNewUserKeyV2(oldKey);
-      expect(newKey).toEqual({
-        newUserKey: new SymmetricCryptoKey(new Uint8Array(70)),
-        isUpgrading: false,
-      });
-    });
+    test.each([
+      [[mockGranteeEmergencyAccessWithPublicKey], []],
+      [[], [mockOrganizationUserResetPasswordEntry]],
+      [[], []],
+      [[mockGranteeEmergencyAccessWithPublicKey], [mockOrganizationUserResetPasswordEntry]],
+    ])(
+      "returns trusted keys when dialogs are open and public keys are provided",
+      async (emUsers, orgs) => {
+        KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+        EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
+        AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
+        mockEmergencyAccessService.getPublicKeys.mockResolvedValue(emUsers);
+        mockResetPasswordService.getPublicKeys.mockResolvedValue(orgs);
+        const {
+          wasTrustDenied,
+          trustedOrganizationPublicKeys: trustedOrgs,
+          trustedEmergencyAccessUserPublicKeys: trustedEmergencyAccessUsers,
+        } = await keyRotationService.verifyTrust(mockUser);
+        expect(wasTrustDenied).toBe(false);
+        expect(trustedEmergencyAccessUsers).toEqual(emUsers.map((e) => e.publicKey));
+        expect(trustedOrgs).toEqual(orgs.map((o) => o.publicKey));
+      },
+    );
   });
 
   describe("getAccountDataRequest", () => {
@@ -890,13 +1044,264 @@ describe("KeyRotationService", () => {
   });
 
   describe("isV1UserKey", () => {
-    const v1Key = new SymmetricCryptoKey(new Uint8Array(64));
-    const v2Key = new SymmetricCryptoKey(new Uint8Array(70));
+    const aes256CbcHmacV1UserKey = new SymmetricCryptoKey(new Uint8Array(64));
+    const coseV2UserKey = new SymmetricCryptoKey(new Uint8Array(70));
     it("returns true for v1 key", () => {
-      expect(keyRotationService.isV1User(v1Key as UserKey)).toBe(true);
+      expect(keyRotationService.isV1User(aes256CbcHmacV1UserKey as UserKey)).toBe(true);
     });
     it("returns false for v2 key", () => {
-      expect(keyRotationService.isV1User(v2Key as UserKey)).toBe(false);
+      expect(keyRotationService.isV1User(coseV2UserKey as UserKey)).toBe(false);
+    });
+    it("returns false for 32 byte AES256-CBC key", () => {
+      const aes256CbcKey = new SymmetricCryptoKey(new Uint8Array(32)) as UserKey;
+      expect(keyRotationService.isV1User(aes256CbcKey)).toBe(false);
+    });
+  });
+
+  describe("makeServerMasterKeyAuthenticationHash", () => {
+    it("returns the master key authentication hash", async () => {
+      mockKeyService.makeMasterKey.mockResolvedValue(
+        new SymmetricCryptoKey(new Uint8Array(32)) as MasterKey,
+      );
+      mockKeyService.hashMasterKey.mockResolvedValue("mockMasterPasswordHash");
+      const masterKeyAuthenticationHash =
+        await keyRotationService.makeServerMasterKeyAuthenticationHash(
+          "mockMasterPassword",
+          new PBKDF2KdfConfig(600_000),
+          "mockEmail",
+        );
+      expect(masterKeyAuthenticationHash).toBe("mockMasterPasswordHash");
+      expect(mockKeyService.makeMasterKey).toHaveBeenCalledWith(
+        "mockMasterPassword",
+        "mockEmail",
+        new PBKDF2KdfConfig(600_000),
+      );
+      expect(mockKeyService.hashMasterKey).toHaveBeenCalledWith(
+        "mockMasterPassword",
+        new SymmetricCryptoKey(new Uint8Array(32)) as MasterKey,
+        HashPurpose.ServerAuthorization,
+      );
+    });
+  });
+
+  describe("getCryptographicStateForUser", () => {
+    beforeEach(() => {
+      mockKdfConfigService.getKdfConfig$.mockReturnValue(
+        new BehaviorSubject(new PBKDF2KdfConfig(100000)),
+      );
+      mockKeyService.userKey$.mockReturnValue(new BehaviorSubject(TEST_VECTOR_USER_KEY_V2));
+      mockKeyService.userEncryptedPrivateKey$.mockReturnValue(
+        new BehaviorSubject(TEST_VECTOR_PRIVATE_KEY_V2 as string as EncryptedString),
+      );
+      mockKeyService.userSigningKey$.mockReturnValue(
+        new BehaviorSubject(TEST_VECTOR_SIGNING_KEY_V2 as WrappedSigningKey),
+      );
+      mockSecurityStateService.accountSecurityState$.mockReturnValue(
+        new BehaviorSubject(TEST_VECTOR_SECURITY_STATE_V2 as SignedSecurityState),
+      );
+      mockCryptoFunctionService.rsaExtractPublicKey.mockResolvedValue(
+        new Uint8Array(400) as UnsignedPublicKey,
+      );
+    });
+
+    it("returns the cryptographic state for v1 user", async () => {
+      mockKeyService.userKey$.mockReturnValue(
+        new BehaviorSubject(new SymmetricCryptoKey(new Uint8Array(64)) as UserKey),
+      );
+      mockKeyService.userEncryptedPrivateKey$.mockReturnValue(
+        new BehaviorSubject(TEST_VECTOR_PRIVATE_KEY_V1 as string as EncryptedString),
+      );
+      mockKeyService.userSigningKey$.mockReturnValue(new BehaviorSubject(null));
+      mockSecurityStateService.accountSecurityState$.mockReturnValue(new BehaviorSubject(null));
+
+      const cryptographicState = await keyRotationService.getCryptographicStateForUser(mockUser);
+      expect(cryptographicState).toEqual({
+        masterKeyKdfConfig: new PBKDF2KdfConfig(100000),
+        masterKeySalt: "mockemail", // the email is lowercased to become the salt
+        cryptographicStateParameters: {
+          version: 1,
+          userKey: TEST_VECTOR_USER_KEY_V1,
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V1,
+            publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V1),
+          },
+        },
+      });
+    });
+
+    it("returns the cryptographic state for v2 user", async () => {
+      const cryptographicState = await keyRotationService.getCryptographicStateForUser(mockUser);
+      expect(cryptographicState).toEqual({
+        masterKeyKdfConfig: new PBKDF2KdfConfig(100000),
+        masterKeySalt: "mockemail", // the email is lowercased to become the salt
+        cryptographicStateParameters: {
+          version: 2,
+          userKey: TEST_VECTOR_USER_KEY_V2,
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+            publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V2) as UnsignedPublicKey,
+          },
+          signingKey: TEST_VECTOR_SIGNING_KEY_V2 as WrappedSigningKey,
+          securityState: TEST_VECTOR_SECURITY_STATE_V2 as SignedSecurityState,
+        },
+      });
+    });
+
+    it("throws if no kdf config is found", async () => {
+      mockKdfConfigService.getKdfConfig$.mockReturnValue(new BehaviorSubject(null));
+      await expect(keyRotationService.getCryptographicStateForUser(mockUser)).rejects.toThrow(
+        "Failed to get KDF config",
+      );
+    });
+
+    it("throws if current user key is not found", async () => {
+      mockKeyService.userKey$.mockReturnValue(new BehaviorSubject(null));
+      await expect(keyRotationService.getCryptographicStateForUser(mockUser)).rejects.toThrow(
+        "Failed to get User key",
+      );
+    });
+
+    it("throws if private key is not found", async () => {
+      mockKeyService.userEncryptedPrivateKey$.mockReturnValue(new BehaviorSubject(null));
+      await expect(keyRotationService.getCryptographicStateForUser(mockUser)).rejects.toThrow(
+        "Failed to get Private key",
+      );
+    });
+
+    it("throws if user key is not AES256-CBC-HMAC or COSE", async () => {
+      const invalidKey = new SymmetricCryptoKey(new Uint8Array(32)) as UserKey;
+      mockKeyService.userKey$.mockReturnValue(new BehaviorSubject(invalidKey));
+      await expect(keyRotationService.getCryptographicStateForUser(mockUser)).rejects.toThrow(
+        "Unsupported user key type",
+      );
+    });
+  });
+
+  describe("getRotatedAccountKeysFlagged", () => {
+    const userId = "mockUserId" as UserId;
+    const kdfConfig = new PBKDF2KdfConfig(100000);
+    const masterKeySalt = "mockSalt";
+    const v1Params = {
+      version: 1,
+      userKey: TEST_VECTOR_USER_KEY_V1,
+      publicKeyEncryptionKeyPair: {
+        wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V1,
+        publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V1) as UnsignedPublicKey,
+      },
+    } as V1CryptographicStateParameters;
+    const v2Params = {
+      version: 2,
+      userKey: TEST_VECTOR_USER_KEY_V2,
+      publicKeyEncryptionKeyPair: {
+        wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+        publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V2) as UnsignedPublicKey,
+      },
+      signingKey: TEST_VECTOR_SIGNING_KEY_V2,
+      securityState: TEST_VECTOR_SECURITY_STATE_V2,
+    } as V2CryptographicStateParameters;
+
+    beforeEach(() => {
+      jest.spyOn(keyRotationService, "getNewAccountKeysV1").mockResolvedValue({
+        userKey: TEST_VECTOR_USER_KEY_V1,
+        publicKeyEncryptionKeyPair: {
+          wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V1_ROTATED,
+          publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V1) as UnsignedPublicKey,
+        },
+      });
+      jest.spyOn(keyRotationService, "getNewAccountKeysV2").mockResolvedValue({
+        userKey: TEST_VECTOR_USER_KEY_V2,
+        publicKeyEncryptionKeyPair: {
+          wrappedPrivateKey: TEST_VECTOR_PRIVATE_KEY_V2,
+          publicKey: Utils.fromB64ToArray(TEST_VECTOR_PUBLIC_KEY_V2) as UnsignedPublicKey,
+          signedPublicKey: TEST_VECTOR_SIGNED_PUBLIC_KEY_V2,
+        },
+        signatureKeyPair: {
+          wrappedSigningKey: TEST_VECTOR_SIGNING_KEY_V2 as WrappedSigningKey,
+          verifyingKey: TEST_VECTOR_VERIFYING_KEY_V2 as VerifyingKey,
+        },
+        securityState: {
+          securityState: TEST_VECTOR_SECURITY_STATE_V2 as SignedSecurityState,
+          securityStateVersion: 2,
+        },
+      });
+      jest
+        .spyOn(AccountKeysRequest, "fromV1CryptographicState")
+        .mockReturnValue("v1Request" as any);
+      jest
+        .spyOn(AccountKeysRequest, "fromV2CryptographicState")
+        .mockResolvedValue("v2Request" as any);
+    });
+
+    it("returns v2 keys and request if v2UpgradeEnabled is true", async () => {
+      const result = await keyRotationService.getRotatedAccountKeysFlagged(
+        userId,
+        kdfConfig,
+        masterKeySalt,
+        v1Params,
+        true,
+      );
+      expect(keyRotationService.getNewAccountKeysV2).toHaveBeenCalledWith(
+        userId,
+        kdfConfig,
+        masterKeySalt,
+        v1Params,
+      );
+      expect(result).toEqual({
+        userKey: TEST_VECTOR_USER_KEY_V2,
+        accountKeysRequest: "v2Request",
+      });
+    });
+
+    it("returns v2 keys and request if params.version is 2", async () => {
+      const result = await keyRotationService.getRotatedAccountKeysFlagged(
+        userId,
+        kdfConfig,
+        masterKeySalt,
+        v2Params,
+        false,
+      );
+      expect(keyRotationService.getNewAccountKeysV2).toHaveBeenCalledWith(
+        userId,
+        kdfConfig,
+        masterKeySalt,
+        v2Params,
+      );
+      expect(result).toEqual({
+        userKey: TEST_VECTOR_USER_KEY_V2,
+        accountKeysRequest: "v2Request",
+      });
+    });
+
+    it("returns v1 keys and request if v2UpgradeEnabled is false and params.version is 1", async () => {
+      const result = await keyRotationService.getRotatedAccountKeysFlagged(
+        userId,
+        kdfConfig,
+        masterKeySalt,
+        v1Params,
+        false,
+      );
+      expect(keyRotationService.getNewAccountKeysV1).toHaveBeenCalledWith(v1Params);
+      expect(result).toEqual({
+        userKey: TEST_VECTOR_USER_KEY_V1,
+        accountKeysRequest: "v1Request",
+      });
+    });
+  });
+
+  describe("ensureIsAllowedToRotateUserKey", () => {
+    it("resolves if last sync exists", async () => {
+      mockSyncService.getLastSync.mockResolvedValue(new Date());
+      await expect(keyRotationService.ensureIsAllowedToRotateUserKey()).resolves.toBeUndefined();
+    });
+
+    it("throws if last sync is null", async () => {
+      mockSyncService.getLastSync.mockResolvedValue(null);
+      await expect(keyRotationService.ensureIsAllowedToRotateUserKey()).rejects.toThrow(
+        /de-synced|log out and log back in/i,
+      );
+      expect(mockLogService.info).toHaveBeenCalledWith(
+        "[Userkey rotation] Client was never synced. Aborting!",
+      );
     });
   });
 });
diff --git a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
index f7f611b75ee..168dbe7442e 100644
--- a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
+++ b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
@@ -1,19 +1,27 @@
 import { Injectable } from "@angular/core";
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, Observable } from "rxjs";
 
+import { LogoutService } from "@bitwarden/auth/common";
 import { Account } from "@bitwarden/common/auth/abstractions/account.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
-import { firstValueFromOrThrow } from "@bitwarden/common/key-management/utils";
-import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
+import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
+import {
+  SignedSecurityState,
+  UnsignedPublicKey,
+  WrappedPrivateKey,
+  WrappedSigningKey,
+} from "@bitwarden/common/key-management/types";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { SdkClientFactory } from "@bitwarden/common/platform/abstractions/sdk/sdk-client-factory";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
+import { asUuid } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { EncryptionType, HashPurpose } from "@bitwarden/common/platform/enums";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -28,7 +36,7 @@ import {
   EmergencyAccessTrustComponent,
   KeyRotationTrustInfoComponent,
 } from "@bitwarden/key-management-ui";
-import { PureCrypto } from "@bitwarden/sdk-internal";
+import { PureCrypto, TokenProvider } from "@bitwarden/sdk-internal";
 
 import { OrganizationUserResetPasswordService } from "../../admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service";
 import { WebauthnLoginAdminService } from "../../auth/core";
@@ -39,6 +47,11 @@ import { MasterPasswordUnlockDataRequest } from "./request/master-password-unloc
 import { RotateUserAccountKeysRequest } from "./request/rotate-user-account-keys.request";
 import { UnlockDataRequest } from "./request/unlock-data.request";
 import { UserDataRequest } from "./request/userdata.request";
+import { V1UserCryptographicState } from "./types/v1-cryptographic-state";
+import {
+  fromSdkV2KeysToV2UserCryptographicState,
+  V2UserCryptographicState,
+} from "./types/v2-cryptographic-state";
 import { UserKeyRotationApiService } from "./user-key-rotation-api.service";
 
 type MasterPasswordAuthenticationAndUnlockData = {
@@ -48,6 +61,19 @@ type MasterPasswordAuthenticationAndUnlockData = {
   masterPasswordHint: string;
 };
 
+/**
+ * A token provider that exposes a null access token to the SDK.
+ */
+class NoopTokenProvider implements TokenProvider {
+  constructor() {}
+
+  async get_access_token(): Promise<string | undefined> {
+    // Ignore from the test coverage, since this is called by the SDK
+    /* istanbul ignore next */
+    return undefined;
+  }
+}
+
 @Injectable({ providedIn: "root" })
 export class UserKeyRotationService {
   constructor(
@@ -63,13 +89,15 @@ export class UserKeyRotationService {
     private syncService: SyncService,
     private webauthnLoginAdminService: WebauthnLoginAdminService,
     private logService: LogService,
-    private vaultTimeoutService: VaultTimeoutService,
+    private logoutService: LogoutService,
     private toastService: ToastService,
     private i18nService: I18nService,
     private dialogService: DialogService,
     private configService: ConfigService,
     private cryptoFunctionService: CryptoFunctionService,
     private kdfConfigService: KdfConfigService,
+    private sdkClientFactory: SdkClientFactory,
+    private securityStateService: SecurityStateService,
   ) {}
 
   /**
@@ -85,12 +113,15 @@ export class UserKeyRotationService {
     user: Account,
     newMasterPasswordHint?: string,
   ): Promise<void> {
-    this.logService.info("[UserKey Rotation] Starting user key rotation...");
+    // Key-rotation uses the SDK, so we need to ensure that the SDK is loaded / the WASM initialized.
+    await SdkLoadService.Ready;
 
     const upgradeToV2FeatureFlagEnabled = await this.configService.getFeatureFlag(
       FeatureFlag.EnrollAeadOnKeyRotation,
     );
 
+    this.logService.info("[UserKey Rotation] Starting user key rotation...");
+
     // Make sure all conditions match - e.g. account state is up to date
     await this.ensureIsAllowedToRotateUserKey();
 
@@ -104,53 +135,26 @@ export class UserKeyRotationService {
     }
 
     // Read current cryptographic state / settings
-    const masterKeyKdfConfig: KdfConfig = (await firstValueFromOrThrow(
-      this.kdfConfigService.getKdfConfig$(user.id),
-      "KDF config",
-    ))!;
-    // The masterkey salt used for deriving the masterkey always needs to be trimmed and lowercased.
-    const masterKeySalt = user.email.trim().toLowerCase();
-    const currentUserKey: UserKey = (await firstValueFromOrThrow(
-      this.keyService.userKey$(user.id),
-      "User key",
-    ))!;
-    const currentUserKeyWrappedPrivateKey = new EncString(
-      (await firstValueFromOrThrow(
-        this.keyService.userEncryptedPrivateKey$(user.id),
-        "User encrypted private key",
-      ))!,
-    );
+    const {
+      masterKeyKdfConfig,
+      masterKeySalt,
+      cryptographicStateParameters: currentCryptographicStateParameters,
+    } = await this.getCryptographicStateForUser(user);
 
-    // Update account keys
-    // This creates at least a new user key, and possibly upgrades user encryption formats
-    let newUserKey: UserKey;
-    let wrappedPrivateKey: EncString;
-    let publicKey: string;
-    if (upgradeToV2FeatureFlagEnabled) {
-      this.logService.info("[Userkey rotation] Using v2 account keys");
-      const { userKey, asymmetricEncryptionKeys } = await this.getNewAccountKeysV2(
-        currentUserKey,
-        currentUserKeyWrappedPrivateKey,
-      );
-      newUserKey = userKey;
-      wrappedPrivateKey = asymmetricEncryptionKeys.wrappedPrivateKey;
-      publicKey = asymmetricEncryptionKeys.publicKey;
-    } else {
-      this.logService.info("[Userkey rotation] Using v1 account keys");
-      const { userKey, asymmetricEncryptionKeys } = await this.getNewAccountKeysV1(
-        currentUserKey,
-        currentUserKeyWrappedPrivateKey,
-      );
-      newUserKey = userKey;
-      wrappedPrivateKey = asymmetricEncryptionKeys.wrappedPrivateKey;
-      publicKey = asymmetricEncryptionKeys.publicKey;
-    }
+    // Get new set of keys for the account.
+    const { userKey: newUserKey, accountKeysRequest } = await this.getRotatedAccountKeysFlagged(
+      user.id,
+      masterKeyKdfConfig,
+      user.email,
+      currentCryptographicStateParameters,
+      upgradeToV2FeatureFlagEnabled,
+    );
 
     // Assemble the key rotation request
     const request = new RotateUserAccountKeysRequest(
       await this.getAccountUnlockDataRequest(
         user.id,
-        currentUserKey,
+        currentCryptographicStateParameters.userKey,
         newUserKey,
         {
           masterPassword: newMasterPassword,
@@ -161,8 +165,12 @@ export class UserKeyRotationService {
         trustedEmergencyAccessUserPublicKeys,
         trustedOrganizationPublicKeys,
       ),
-      new AccountKeysRequest(wrappedPrivateKey.encryptedString!, publicKey),
-      await this.getAccountDataRequest(currentUserKey, newUserKey, user),
+      accountKeysRequest,
+      await this.getAccountDataRequest(
+        currentCryptographicStateParameters.userKey,
+        newUserKey,
+        user,
+      ),
       await this.makeServerMasterKeyAuthenticationHash(
         currentMasterPassword,
         masterKeyKdfConfig,
@@ -181,8 +189,7 @@ export class UserKeyRotationService {
       timeout: 15000,
     });
 
-    // temporary until userkey can be better verified
-    await this.vaultTimeoutService.logOut();
+    await this.logoutService.logout(user.id);
   }
 
   protected async ensureIsAllowedToRotateUserKey(): Promise<void> {
@@ -194,55 +201,153 @@ export class UserKeyRotationService {
     }
   }
 
+  async getRotatedAccountKeysFlagged(
+    userId: UserId,
+    kdfConfig: KdfConfig,
+    masterKeySalt: string,
+    cryptographicStateParameters: V1CryptographicStateParameters | V2CryptographicStateParameters,
+    v2UpgradeEnabled: boolean,
+  ): Promise<{ userKey: UserKey; accountKeysRequest: AccountKeysRequest }> {
+    if (v2UpgradeEnabled || cryptographicStateParameters.version === 2) {
+      const keys = await this.getNewAccountKeysV2(
+        userId,
+        kdfConfig,
+        masterKeySalt,
+        cryptographicStateParameters,
+      );
+      return {
+        userKey: keys.userKey,
+        accountKeysRequest: await AccountKeysRequest.fromV2CryptographicState(keys),
+      };
+    } else {
+      const keys = await this.getNewAccountKeysV1(
+        cryptographicStateParameters as V1CryptographicStateParameters,
+      );
+      return {
+        userKey: keys.userKey,
+        accountKeysRequest: AccountKeysRequest.fromV1CryptographicState(keys),
+      };
+    }
+  }
+
+  /**
+   * This method rotates the user key of a V1 user and re-encrypts the private key.
+   * @deprecated Removed after roll-out of V2 encryption.
+   */
   protected async getNewAccountKeysV1(
-    currentUserKey: UserKey,
-    currentUserKeyWrappedPrivateKey: EncString,
-  ): Promise<{
-    userKey: UserKey;
-    asymmetricEncryptionKeys: {
-      wrappedPrivateKey: EncString;
-      publicKey: string;
-    };
-  }> {
-    // Account key rotation creates a new userkey. All downstream data and keys need to be re-encrypted under this key.
+    cryptographicStateParameters: V1CryptographicStateParameters,
+  ): Promise<V1UserCryptographicState> {
+    // Account key rotation creates a new user key. All downstream data and keys need to be re-encrypted under this key.
     // Further, this method is used to create new keys in the event that the key hierarchy changes, such as for the
     // creation of a new signing key pair.
-    const newUserKey = await this.makeNewUserKeyV1(currentUserKey);
+    const newUserKey = new SymmetricCryptoKey(
+      PureCrypto.make_user_key_aes256_cbc_hmac(),
+    ) as UserKey;
 
     // Re-encrypt the private key with the new user key
     // Rotation of the private key is not supported yet
     const privateKey = await this.encryptService.unwrapDecapsulationKey(
-      currentUserKeyWrappedPrivateKey,
-      currentUserKey,
+      new EncString(cryptographicStateParameters.publicKeyEncryptionKeyPair.wrappedPrivateKey),
+      cryptographicStateParameters.userKey,
     );
-    const newUserKeyWrappedPrivateKey = await this.encryptService.wrapDecapsulationKey(
+    const newUserKeyWrappedPrivateKey = (
+      await this.encryptService.wrapDecapsulationKey(privateKey, newUserKey)
+    ).encryptedString! as string as WrappedPrivateKey;
+    const publicKey = (await this.cryptoFunctionService.rsaExtractPublicKey(
       privateKey,
-      newUserKey,
-    );
-    const publicKey = await this.cryptoFunctionService.rsaExtractPublicKey(privateKey);
+    )) as UnsignedPublicKey;
 
     return {
       userKey: newUserKey,
-      asymmetricEncryptionKeys: {
+      publicKeyEncryptionKeyPair: {
         wrappedPrivateKey: newUserKeyWrappedPrivateKey,
-        publicKey: Utils.fromBufferToB64(publicKey),
+        publicKey: publicKey,
       },
     };
   }
 
+  /**
+   * This method either enrolls a user from v1 encryption to v2 encryption, rotating the user key, or rotates the keys of a v2 user, staying on v2.
+   */
   protected async getNewAccountKeysV2(
-    currentUserKey: UserKey,
-    currentUserKeyWrappedPrivateKey: EncString,
-  ): Promise<{
-    userKey: UserKey;
-    asymmetricEncryptionKeys: {
-      wrappedPrivateKey: EncString;
-      publicKey: string;
-    };
-  }> {
-    throw new Error("User encryption v2 upgrade is not supported yet");
+    userId: UserId,
+    masterKeyKdfConfig: KdfConfig,
+    masterKeySalt: string,
+    cryptographicStateParameters: V1CryptographicStateParameters | V2CryptographicStateParameters,
+  ): Promise<V2UserCryptographicState> {
+    if (cryptographicStateParameters.version === 1) {
+      return this.upgradeV1UserToV2UserAccountKeys(
+        userId,
+        masterKeyKdfConfig,
+        masterKeySalt,
+        cryptographicStateParameters as V1CryptographicStateParameters,
+      );
+    } else {
+      return this.rotateV2UserAccountKeys(
+        userId,
+        masterKeyKdfConfig,
+        masterKeySalt,
+        cryptographicStateParameters as V2CryptographicStateParameters,
+      );
+    }
   }
 
+  /**
+   * Upgrades a V1 user to a V2 user by creating a new user key, re-encrypting the private key, generating a signature key-pair, and
+   * finally creating a signed security state.
+   */
+  protected async upgradeV1UserToV2UserAccountKeys(
+    userId: UserId,
+    kdfConfig: KdfConfig,
+    email: string,
+    cryptographicStateParameters: V1CryptographicStateParameters,
+  ): Promise<V2UserCryptographicState> {
+    // Initialize an SDK with the current cryptographic state
+    const sdk = await this.sdkClientFactory.createSdkClient(new NoopTokenProvider());
+    await sdk.crypto().initialize_user_crypto({
+      userId: asUuid(userId),
+      kdfParams: kdfConfig.toSdkConfig(),
+      email: email,
+      privateKey: cryptographicStateParameters.publicKeyEncryptionKeyPair.wrappedPrivateKey,
+      signingKey: undefined,
+      securityState: undefined,
+      method: {
+        decryptedKey: { decrypted_user_key: cryptographicStateParameters.userKey.toBase64() },
+      },
+    });
+
+    return fromSdkV2KeysToV2UserCryptographicState(sdk.crypto().make_keys_for_user_crypto_v2());
+  }
+
+  /**
+   * Generates a new user key for a v2 user, and re-encrypts the private key, signing key.
+   */
+  protected async rotateV2UserAccountKeys(
+    userId: UserId,
+    kdfConfig: KdfConfig,
+    email: string,
+    cryptographicStateParameters: V2CryptographicStateParameters,
+  ): Promise<V2UserCryptographicState> {
+    // Initialize an SDK with the current cryptographic state
+    const sdk = await this.sdkClientFactory.createSdkClient(new NoopTokenProvider());
+    await sdk.crypto().initialize_user_crypto({
+      userId: asUuid(userId),
+      kdfParams: kdfConfig.toSdkConfig(),
+      email: email,
+      privateKey: cryptographicStateParameters.publicKeyEncryptionKeyPair.wrappedPrivateKey,
+      signingKey: cryptographicStateParameters.signingKey,
+      securityState: cryptographicStateParameters.securityState,
+      method: {
+        decryptedKey: { decrypted_user_key: cryptographicStateParameters.userKey.toBase64() },
+      },
+    });
+
+    return fromSdkV2KeysToV2UserCryptographicState(sdk.crypto().get_v2_rotated_account_keys());
+  }
+
+  /**
+   * Generates a new request for updating the master-password unlock/authentication data.
+   */
   protected async createMasterPasswordUnlockDataRequest(
     userKey: UserKey,
     newUnlockData: MasterPasswordAuthenticationAndUnlockData,
@@ -272,13 +377,17 @@ export class UserKeyRotationService {
     );
   }
 
+  /**
+   * Re-generates the accounts unlock methods, including master-password, passkey, trusted device, emergency access, and organization account recovery
+   * for the new user key.
+   */
   protected async getAccountUnlockDataRequest(
     userId: UserId,
     currentUserKey: UserKey,
     newUserKey: UserKey,
     masterPasswordAuthenticationAndUnlockData: MasterPasswordAuthenticationAndUnlockData,
-    trustedEmergencyAccessGranteesPublicKeys: Uint8Array[],
-    trustedOrganizationPublicKeys: Uint8Array[],
+    trustedEmergencyAccessGranteesPublicKeys: UnsignedPublicKey[],
+    trustedOrganizationPublicKeys: UnsignedPublicKey[],
   ): Promise<UnlockDataRequest> {
     // To ensure access; all unlock methods need to be updated and provided the new user key.
     // User unlock methods
@@ -321,10 +430,13 @@ export class UserKeyRotationService {
     );
   }
 
+  /**
+   * Verifies the trust of the organizations and emergency access users by prompting the user. Denying any of these will return early.
+   */
   protected async verifyTrust(user: Account): Promise<{
     wasTrustDenied: boolean;
-    trustedOrganizationPublicKeys: Uint8Array[];
-    trustedEmergencyAccessUserPublicKeys: Uint8Array[];
+    trustedOrganizationPublicKeys: UnsignedPublicKey[];
+    trustedEmergencyAccessUserPublicKeys: UnsignedPublicKey[];
   }> {
     // Since currently the joined organizations and emergency access grantees are
     // not signed, manual trust prompts are required, to verify that the server
@@ -392,11 +504,16 @@ export class UserKeyRotationService {
     );
     return {
       wasTrustDenied: false,
-      trustedOrganizationPublicKeys: organizations.map((d) => d.publicKey),
-      trustedEmergencyAccessUserPublicKeys: emergencyAccessGrantees.map((d) => d.publicKey),
+      trustedOrganizationPublicKeys: organizations.map((d) => d.publicKey as UnsignedPublicKey),
+      trustedEmergencyAccessUserPublicKeys: emergencyAccessGrantees.map(
+        (d) => d.publicKey as UnsignedPublicKey,
+      ),
     };
   }
 
+  /**
+   * Re-encrypts the account data owned by the user, such as ciphers, folders, and sends with the new user key.
+   */
   protected async getAccountDataRequest(
     originalUserKey: UserKey,
     newUnencryptedUserKey: UserKey,
@@ -429,64 +546,6 @@ export class UserKeyRotationService {
     return new UserDataRequest(rotatedCiphers, rotatedFolders, rotatedSends);
   }
 
-  protected async makeNewUserKeyV1(oldUserKey: UserKey): Promise<UserKey> {
-    // The user's account format is determined by the user key.
-    // Being tied to the userkey ensures an all-or-nothing approach. A compromised
-    // server cannot downgrade to a previous format (no signing keys) without
-    // completely making the account unusable.
-    //
-    // V0: AES256-CBC (no userkey, directly using masterkey) (pre-2019 accounts)
-    //     This format is unsupported, and not secure; It is being forced migrated, and being removed
-    // V1: AES256-CBC-HMAC userkey, no signing key (2019-2025)
-    //     This format is still supported, but may be migrated in the future
-    // V2: XChaCha20-Poly1305 userkey, signing key, account security version
-    //     This is the new, modern format.
-    if (this.isV1User(oldUserKey)) {
-      this.logService.info(
-        "[Userkey rotation] Existing userkey key is AES256-CBC-HMAC; not upgrading",
-      );
-      return new SymmetricCryptoKey(PureCrypto.make_user_key_aes256_cbc_hmac()) as UserKey;
-    } else {
-      // If the feature flag is rolled back, we want to block rotation in order to be as safe as possible with the user's account.
-      this.logService.info(
-        "[Userkey rotation] Existing userkey key is XChaCha20-Poly1305, but feature flag is not enabled; aborting..",
-      );
-      throw new Error(
-        "User account crypto format is v2, but the feature flag is disabled. User key rotation cannot proceed.",
-      );
-    }
-  }
-
-  protected async makeNewUserKeyV2(
-    oldUserKey: UserKey,
-  ): Promise<{ isUpgrading: boolean; newUserKey: UserKey }> {
-    // The user's account format is determined by the user key.
-    // Being tied to the userkey ensures an all-or-nothing approach. A compromised
-    // server cannot downgrade to a previous format (no signing keys) without
-    // completely making the account unusable.
-    //
-    // V0: AES256-CBC (no userkey, directly using masterkey) (pre-2019 accounts)
-    //     This format is unsupported, and not secure; It is being forced migrated, and being removed
-    // V1: AES256-CBC-HMAC userkey, no signing key (2019-2025)
-    //     This format is still supported, but may be migrated in the future
-    // V2: XChaCha20-Poly1305 userkey, signing key, account security version
-    //     This is the new, modern format.
-    const newUserKey: UserKey = new SymmetricCryptoKey(
-      PureCrypto.make_user_key_xchacha20_poly1305(),
-    ) as UserKey;
-    const isUpgrading = this.isV1User(oldUserKey);
-    if (isUpgrading) {
-      this.logService.info(
-        "[Userkey rotation] Existing userkey key is AES256-CBC-HMAC; upgrading to XChaCha20-Poly1305",
-      );
-    } else {
-      this.logService.info(
-        "[Userkey rotation] Existing userkey key is XChaCha20-Poly1305; no upgrade needed",
-      );
-    }
-    return { isUpgrading, newUserKey };
-  }
-
   /**
    * A V1 user has no signing key, and uses AES256-CBC-HMAC.
    * A V2 user has a signing key, and uses XChaCha20-Poly1305.
@@ -516,4 +575,111 @@ export class UserKeyRotationService {
       HashPurpose.ServerAuthorization,
     );
   }
+
+  /**
+   * Gets the cryptographic state for a user. This can be a V1 user or a V2 user.
+   */
+  protected async getCryptographicStateForUser(user: Account): Promise<{
+    masterKeyKdfConfig: KdfConfig;
+    masterKeySalt: string;
+    cryptographicStateParameters: V1CryptographicStateParameters | V2CryptographicStateParameters;
+  }> {
+    // Master password unlock
+    const masterKeyKdfConfig: KdfConfig = (await this.firstValueFromOrThrow(
+      this.kdfConfigService.getKdfConfig$(user.id),
+      "KDF config",
+    ))!;
+    // The master key salt used for deriving the masterkey always needs to be trimmed and lowercased.
+    const masterKeySalt = user.email.trim().toLowerCase();
+
+    // V1 and V2 users both have a user key and a private key
+    const currentUserKey: UserKey = (await this.firstValueFromOrThrow(
+      this.keyService.userKey$(user.id),
+      "User key",
+    ))!;
+    const currentUserKeyWrappedPrivateKey: WrappedPrivateKey = new EncString(
+      (await this.firstValueFromOrThrow(
+        this.keyService.userEncryptedPrivateKey$(user.id),
+        "Private key",
+      ))!,
+    ).encryptedString! as string as WrappedPrivateKey;
+    const publicKey = (await this.cryptoFunctionService.rsaExtractPublicKey(
+      await this.encryptService.unwrapDecapsulationKey(
+        new EncString(currentUserKeyWrappedPrivateKey),
+        currentUserKey,
+      ),
+    )) as UnsignedPublicKey;
+
+    if (this.isV1User(currentUserKey)) {
+      return {
+        masterKeyKdfConfig,
+        masterKeySalt,
+        cryptographicStateParameters: {
+          version: 1,
+          userKey: currentUserKey,
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: currentUserKeyWrappedPrivateKey,
+            publicKey: publicKey,
+          },
+        },
+      };
+    } else if (currentUserKey.inner().type === EncryptionType.CoseEncrypt0) {
+      const signingKey = await this.firstValueFromOrThrow(
+        this.keyService.userSigningKey$(user.id),
+        "User signing key",
+      );
+      const securityState = await this.firstValueFromOrThrow(
+        this.securityStateService.accountSecurityState$(user.id),
+        "User security state",
+      );
+
+      return {
+        masterKeyKdfConfig,
+        masterKeySalt,
+        cryptographicStateParameters: {
+          version: 2,
+          userKey: currentUserKey,
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: currentUserKeyWrappedPrivateKey,
+            publicKey: publicKey,
+          },
+          signingKey: signingKey!,
+          securityState: securityState!,
+        },
+      };
+    }
+
+    /// AES-CBC (no-hmac) keys are not supported as user keys
+    throw new Error(
+      `Unsupported user key type: ${currentUserKey.inner().type}. Expected AesCbc256_HmacSha256_B64 or XChaCha20_Poly1305_B64.`,
+    );
+  }
+
+  async firstValueFromOrThrow<T>(value: Observable<T>, name: string): Promise<T> {
+    const result = await firstValueFrom(value);
+    if (result == null) {
+      throw new Error(`Failed to get ${name}`);
+    }
+    return result as T;
+  }
 }
+
+export type V1CryptographicStateParameters = {
+  version: 1;
+  userKey: UserKey;
+  publicKeyEncryptionKeyPair: {
+    wrappedPrivateKey: WrappedPrivateKey;
+    publicKey: UnsignedPublicKey;
+  };
+};
+
+export type V2CryptographicStateParameters = {
+  version: 2;
+  userKey: UserKey;
+  publicKeyEncryptionKeyPair: {
+    wrappedPrivateKey: WrappedPrivateKey;
+    publicKey: UnsignedPublicKey;
+  };
+  signingKey: WrappedSigningKey;
+  securityState: SignedSecurityState;
+};
diff --git a/apps/web/src/app/key-management/services/web-process-reload.service.ts b/apps/web/src/app/key-management/services/web-process-reload.service.ts
index c542c97c0e0..6f055cd990c 100644
--- a/apps/web/src/app/key-management/services/web-process-reload.service.ts
+++ b/apps/web/src/app/key-management/services/web-process-reload.service.ts
@@ -1,10 +1,9 @@
-import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
 
 export class WebProcessReloadService implements ProcessReloadServiceAbstraction {
   constructor(private window: Window) {}
 
-  async startProcessReload(authService: AuthService): Promise<void> {
+  async startProcessReload(): Promise<void> {
     this.window.location.reload();
   }
 
diff --git a/apps/web/src/app/key-management/session-timeout/services/web-session-timeout-settings-component.service.ts b/apps/web/src/app/key-management/session-timeout/services/web-session-timeout-settings-component.service.ts
new file mode 100644
index 00000000000..61836c98252
--- /dev/null
+++ b/apps/web/src/app/key-management/session-timeout/services/web-session-timeout-settings-component.service.ts
@@ -0,0 +1,39 @@
+import { defer, Observable, of } from "rxjs";
+
+import {
+  VaultTimeout,
+  VaultTimeoutOption,
+  VaultTimeoutStringType,
+} from "@bitwarden/common/key-management/vault-timeout";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SessionTimeoutSettingsComponentService } from "@bitwarden/key-management-ui";
+
+export class WebSessionTimeoutSettingsComponentService
+  implements SessionTimeoutSettingsComponentService
+{
+  availableTimeoutOptions$: Observable<VaultTimeoutOption[]> = defer(() => {
+    const options: VaultTimeoutOption[] = [
+      { name: this.i18nService.t("oneMinute"), value: 1 },
+      { name: this.i18nService.t("fiveMinutes"), value: 5 },
+      { name: this.i18nService.t("fifteenMinutes"), value: 15 },
+      { name: this.i18nService.t("thirtyMinutes"), value: 30 },
+      { name: this.i18nService.t("oneHour"), value: 60 },
+      { name: this.i18nService.t("fourHours"), value: 240 },
+      { name: this.i18nService.t("onRefresh"), value: VaultTimeoutStringType.OnRestart },
+    ];
+
+    if (this.platformUtilsService.isDev()) {
+      options.push({ name: this.i18nService.t("never"), value: VaultTimeoutStringType.Never });
+    }
+
+    return of(options);
+  });
+
+  constructor(
+    private readonly i18nService: I18nService,
+    private readonly platformUtilsService: PlatformUtilsService,
+  ) {}
+
+  onTimeoutSave(_: VaultTimeout): void {}
+}
diff --git a/apps/web/src/app/key-management/session-timeout/session-timeout.component.html b/apps/web/src/app/key-management/session-timeout/session-timeout.component.html
new file mode 100644
index 00000000000..0ca6267da50
--- /dev/null
+++ b/apps/web/src/app/key-management/session-timeout/session-timeout.component.html
@@ -0,0 +1,5 @@
+<h2 class="tw-mt-6 tw-mb-2 tw-pb-2.5">{{ "sessionTimeoutHeader" | i18n }}</h2>
+
+<div class="tw-max-w-lg">
+  <bit-session-timeout-settings />
+</div>
diff --git a/apps/web/src/app/key-management/session-timeout/session-timeout.component.ts b/apps/web/src/app/key-management/session-timeout/session-timeout.component.ts
new file mode 100644
index 00000000000..566484ddcee
--- /dev/null
+++ b/apps/web/src/app/key-management/session-timeout/session-timeout.component.ts
@@ -0,0 +1,11 @@
+import { ChangeDetectionStrategy, Component } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { SessionTimeoutSettingsComponent } from "@bitwarden/key-management-ui";
+
+@Component({
+  templateUrl: "session-timeout.component.html",
+  imports: [SessionTimeoutSettingsComponent, JslibModule],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class SessionTimeoutComponent {}
diff --git a/apps/web/src/app/layouts/frontend-layout.component.ts b/apps/web/src/app/layouts/frontend-layout.component.ts
index a91fc92df61..ef52550321e 100644
--- a/apps/web/src/app/layouts/frontend-layout.component.ts
+++ b/apps/web/src/app/layouts/frontend-layout.component.ts
@@ -7,6 +7,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { EnvironmentSelectorComponent } from "../components/environment-selector/environment-selector.component";
 import { SharedModule } from "../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-frontend-layout",
   templateUrl: "frontend-layout.component.html",
diff --git a/apps/web/src/app/layouts/header/web-header.component.ts b/apps/web/src/app/layouts/header/web-header.component.ts
index 67d447723e1..694ee5c4ae9 100644
--- a/apps/web/src/app/layouts/header/web-header.component.ts
+++ b/apps/web/src/app/layouts/header/web-header.component.ts
@@ -14,6 +14,8 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-header",
   templateUrl: "./web-header.component.html",
@@ -23,11 +25,15 @@ export class WebHeaderComponent {
   /**
    * Custom title that overrides the route data `titleId`
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title: string;
 
   /**
    * Icon to show before the title
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() icon: string;
 
   protected routeData$: Observable<{ titleId: string }>;
diff --git a/apps/web/src/app/layouts/header/web-header.stories.ts b/apps/web/src/app/layouts/header/web-header.stories.ts
index 7abddf01f2b..88c98f01e6c 100644
--- a/apps/web/src/app/layouts/header/web-header.stories.ts
+++ b/apps/web/src/app/layouts/header/web-header.stories.ts
@@ -46,19 +46,23 @@ class MockStateService {
   accounts$ = new BehaviorSubject({ "1": { profile: { name: "Foo" } } }).asObservable();
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "product-switcher",
   template: `<button type="button" bitIconButton="bwi-filter" label="Switch products"></button>`,
   standalone: false,
 })
-class MockProductSwitcher {}
+class MockProductSwitcherComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "dynamic-avatar",
   template: `<bit-avatar [text]="name$ | async"></bit-avatar>`,
   imports: [CommonModule, AvatarModule],
 })
-class MockDynamicAvatar implements Partial<DynamicAvatarComponent> {
+class MockDynamicAvatarComponent implements Partial<DynamicAvatarComponent> {
   protected name$ = combineLatest([
     this.stateService.accounts$,
     this.stateService.activeAccount$,
@@ -68,6 +72,8 @@ class MockDynamicAvatar implements Partial<DynamicAvatarComponent> {
     ),
   );
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   text?: string;
 
@@ -94,9 +100,9 @@ export default {
         TabsModule,
         TypographyModule,
         NavigationModule,
-        MockDynamicAvatar,
+        MockDynamicAvatarComponent,
       ],
-      declarations: [WebHeaderComponent, MockProductSwitcher],
+      declarations: [WebHeaderComponent, MockProductSwitcherComponent],
       providers: [
         { provide: StateService, useClass: MockStateService },
         {
diff --git a/apps/web/src/app/layouts/org-switcher/org-switcher.component.html b/apps/web/src/app/layouts/org-switcher/org-switcher.component.html
index 96d17e7ada4..a9acddeb0b8 100644
--- a/apps/web/src/app/layouts/org-switcher/org-switcher.component.html
+++ b/apps/web/src/app/layouts/org-switcher/org-switcher.component.html
@@ -22,7 +22,6 @@
       [route]="['../', org.id]"
       (mainContentClicked)="toggle()"
       [routerLinkActiveOptions]="{ exact: true }"
-      (click)="showInactiveSubscriptionDialog(org)"
     >
       <i
         slot="end"
diff --git a/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts b/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts
index 31689914f13..fd9ffb571a8 100644
--- a/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts
+++ b/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts
@@ -3,7 +3,7 @@
 import { CommonModule } from "@angular/common";
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { combineLatest, firstValueFrom, map, Observable, switchMap } from "rxjs";
+import { combineLatest, map, Observable, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -12,8 +12,9 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { DialogService, NavigationModule } from "@bitwarden/components";
 import { OrganizationWarningsModule } from "@bitwarden/web-vault/app/billing/organizations/warnings/organization-warnings.module";
-import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "org-switcher",
   templateUrl: "org-switcher.component.html",
@@ -43,20 +44,28 @@ export class OrgSwitcherComponent {
    * const smFilter = (org: Organization) => org.canAccessSecretsManager
    * // <org-switcher [filter]="smFilter">
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   filter: (org: Organization) => boolean = () => true;
 
   /**
    * Is `true` if the expanded content is visible
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   open = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   openChange = new EventEmitter<boolean>();
 
   /**
    * Visibility of the New Organization button
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   hideNewButton = false;
 
@@ -66,7 +75,6 @@ export class OrgSwitcherComponent {
     private organizationService: OrganizationService,
     protected billingApiService: BillingApiServiceAbstraction,
     private accountService: AccountService,
-    private organizationWarningsService: OrganizationWarningsService,
   ) {}
 
   protected toggle(event?: MouseEvent) {
@@ -74,9 +82,4 @@ export class OrgSwitcherComponent {
     this.open = !this.open;
     this.openChange.emit(this.open);
   }
-
-  showInactiveSubscriptionDialog = async (organization: Organization) =>
-    await firstValueFrom(
-      this.organizationWarningsService.showInactiveSubscriptionDialog$(organization),
-    );
 }
diff --git a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.html b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.html
index f8ebfa60451..9c8f2125614 100644
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.html
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.html
@@ -1,19 +1,25 @@
 <div class="tw-mt-auto">
-  <!-- [attr.icon] is used to keep the icon attribute on the bit-nav-item after prod mode is enabled. Matches other navigation items and assists in automated testing. -->
-  <bit-nav-item
-    *ngFor="let product of accessibleProducts$ | async"
-    [icon]="product.icon"
-    [text]="product.name"
-    [route]="product.appRoute"
-    [attr.icon]="product.icon"
-    [forceActiveStyles]="product.isActive"
-  >
-  </bit-nav-item>
-  <ng-container *ngIf="moreProducts$ | async as moreProducts">
-    <section
-      *ngIf="moreProducts.length > 0"
-      class="tw-mt-2 tw-flex tw-w-full tw-flex-col tw-gap-2 tw-border-0"
+  @let accessibleProducts = accessibleProducts$ | async;
+  @if (accessibleProducts && accessibleProducts.length > 1) {
+    <!-- [attr.icon] is used to keep the icon attribute on the bit-nav-item after prod mode is enabled. Matches other navigation items and assists in automated testing. -->
+    <bit-nav-item
+      *ngFor="let product of accessibleProducts"
+      [icon]="product.icon"
+      [text]="product.name"
+      [route]="product.appRoute"
+      [attr.icon]="product.icon"
+      [forceActiveStyles]="product.isActive"
     >
+    </bit-nav-item>
+  }
+
+  @if (shouldShowPremiumUpgradeButton$ | async) {
+    <app-upgrade-nav-button></app-upgrade-nav-button>
+  }
+
+  @let moreProducts = moreProducts$ | async;
+  @if (moreProducts && moreProducts.length > 0) {
+    <section class="tw-mt-2 tw-flex tw-w-full tw-flex-col tw-gap-2 tw-border-0">
       <span class="tw-text-xs !tw-text-alt2 tw-p-2 tw-pb-0">{{ "moreFromBitwarden" | i18n }}</span>
       <ng-container *ngFor="let more of moreProducts">
         <div class="tw-ps-2 tw-pe-2">
@@ -23,7 +29,7 @@
             [href]="more.marketingRoute.route"
             target="_blank"
             rel="noreferrer"
-            class="tw-flex tw-px-3 tw-py-2 tw-rounded-md tw-font-bold !tw-text-alt2 !tw-no-underline hover:tw-bg-hover-contrast [&>:not(.bwi)]:hover:tw-underline"
+            class="tw-flex tw-px-3 tw-py-2 tw-rounded-md tw-font-medium !tw-text-alt2 !tw-no-underline hover:tw-bg-hover-contrast [&>:not(.bwi)]:hover:tw-underline"
           >
             <i class="bwi bwi-fw {{ more.icon }} tw-mt-1 tw-mx-1"></i>
             <div>
@@ -41,7 +47,7 @@
             *ngIf="!more.marketingRoute.external"
             [routerLink]="more.marketingRoute.route"
             rel="noreferrer"
-            class="tw-flex tw-px-3 tw-py-2 tw-rounded-md tw-font-bold !tw-text-alt2 !tw-no-underline hover:tw-bg-hover-contrast [&>:not(.bwi)]:hover:tw-underline"
+            class="tw-flex tw-px-3 tw-py-2 tw-rounded-md tw-font-medium !tw-text-alt2 !tw-no-underline hover:tw-bg-hover-contrast [&>:not(.bwi)]:hover:tw-underline"
           >
             <i class="bwi bwi-fw {{ more.icon }} tw-mt-1 tw-mx-1"></i>
             <div>
@@ -57,5 +63,5 @@
         </div>
       </ng-container>
     </section>
-  </ng-container>
+  }
 </div>
diff --git a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.spec.ts b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.spec.ts
index d1b82bc114d..9f6c8f6b194 100644
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.spec.ts
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.spec.ts
@@ -1,3 +1,4 @@
+import { Component } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { ActivatedRoute, RouterModule } from "@angular/router";
@@ -15,10 +16,19 @@ import { ProductSwitcherItem, ProductSwitcherService } from "../shared/product-s
 
 import { NavigationProductSwitcherComponent } from "./navigation-switcher.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-upgrade-nav-button",
+  template: "<div>Upgrade Nav Button</div>",
+  standalone: true,
+})
+class MockUpgradeNavButtonComponent {}
+
 Object.defineProperty(window, "matchMedia", {
   writable: true,
   value: jest.fn().mockImplementation((query) => ({
-    matches: false,
+    matches: true,
     media: query,
     onchange: null,
     addListener: jest.fn(), // deprecated
@@ -41,13 +51,16 @@ describe("NavigationProductSwitcherComponent", () => {
     other: [],
   });
 
+  const mockShouldShowPremiumUpgradeButton$ = new BehaviorSubject<boolean>(false);
+
   beforeEach(async () => {
     productSwitcherService = mock<ProductSwitcherService>();
     productSwitcherService.products$ = mockProducts$;
+    productSwitcherService.shouldShowPremiumUpgradeButton$ = mockShouldShowPremiumUpgradeButton$;
     mockProducts$.next({ bento: [], other: [] });
 
     await TestBed.configureTestingModule({
-      imports: [RouterModule, NavigationModule, IconButtonModule],
+      imports: [RouterModule, NavigationModule, IconButtonModule, MockUpgradeNavButtonComponent],
       declarations: [NavigationProductSwitcherComponent, I18nPipe],
       providers: [
         { provide: ProductSwitcherService, useValue: productSwitcherService },
@@ -187,15 +200,23 @@ describe("NavigationProductSwitcherComponent", () => {
             },
             isActive: true,
           },
+          {
+            name: "Test Product",
+            icon: "bwi-lock",
+            marketingRoute: {
+              route: "https://www.example.com/",
+              external: true,
+            },
+          },
         ],
         other: [],
       });
 
       fixture.detectChanges();
 
-      const navItem = fixture.debugElement.query(By.directive(NavItemComponent));
+      const navItem = fixture.debugElement.queryAll(By.directive(NavItemComponent));
 
-      expect(navItem.componentInstance.forceActiveStyles()).toBe(true);
+      expect(navItem[0].componentInstance.forceActiveStyles()).toBe(true);
     });
   });
 
@@ -218,18 +239,56 @@ describe("NavigationProductSwitcherComponent", () => {
       expect(links[0].textContent).toContain("Password Manager");
       expect(links[1].textContent).toContain("Secret Manager");
     });
+
+    it("does not show products list when there is only one item", () => {
+      mockProducts$.next({
+        bento: [{ isActive: true, name: "Password Manager", icon: "bwi-lock", appRoute: "/vault" }],
+        other: [],
+      });
+
+      fixture.detectChanges();
+
+      const navItems = fixture.debugElement.queryAll(By.directive(NavItemComponent));
+
+      expect(navItems.length).toBe(0);
+    });
   });
 
   it("links to `appRoute`", () => {
     mockProducts$.next({
-      bento: [{ isActive: false, name: "Password Manager", icon: "bwi-lock", appRoute: "/vault" }],
+      bento: [
+        { isActive: true, name: "Password Manager", icon: "bwi-lock", appRoute: "/vault" },
+        { isActive: false, name: "Secret Manager", icon: "bwi-lock", appRoute: "/sm" },
+      ],
       other: [],
     });
 
     fixture.detectChanges();
 
-    const link = fixture.nativeElement.querySelector("a");
+    const links = fixture.nativeElement.querySelectorAll("a");
 
-    expect(link.getAttribute("href")).toBe("/vault");
+    expect(links[0].getAttribute("href")).toBe("/vault");
+  });
+
+  describe("upgrade nav button", () => {
+    it("shows upgrade nav button when shouldShowPremiumUpgradeButton$ is true", () => {
+      mockShouldShowPremiumUpgradeButton$.next(true);
+      mockProducts$.next({
+        bento: [],
+        other: [
+          {
+            name: "Organizations",
+            icon: "bwi-lock",
+            marketingRoute: { route: "https://www.example.com/", external: true },
+          },
+        ],
+      });
+
+      fixture.detectChanges();
+
+      const upgradeButton = fixture.nativeElement.querySelector("app-upgrade-nav-button");
+
+      expect(upgradeButton).toBeTruthy();
+    });
   });
 });
diff --git a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.ts b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.ts
index 9d4250087af..ab835b67545 100644
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.ts
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.ts
@@ -3,6 +3,8 @@ import { map, Observable } from "rxjs";
 
 import { ProductSwitcherItem, ProductSwitcherService } from "../shared/product-switcher.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "navigation-product-switcher",
   templateUrl: "./navigation-switcher.component.html",
@@ -11,6 +13,9 @@ import { ProductSwitcherItem, ProductSwitcherService } from "../shared/product-s
 export class NavigationProductSwitcherComponent {
   constructor(private productSwitcherService: ProductSwitcherService) {}
 
+  protected readonly shouldShowPremiumUpgradeButton$: Observable<boolean> =
+    this.productSwitcherService.shouldShowPremiumUpgradeButton$;
+
   protected readonly accessibleProducts$: Observable<ProductSwitcherItem[]> =
     this.productSwitcherService.products$.pipe(map((products) => products.bento ?? []));
 
diff --git a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
index b5f10f9158e..88132e56384 100644
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
@@ -9,6 +9,9 @@ import { ProviderService } from "@bitwarden/common/admin-console/abstractions/pr
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { AccountService, Account } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { FeatureFlag, FeatureFlagValueType } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
@@ -27,6 +30,8 @@ import { NavigationProductSwitcherComponent } from "./navigation-switcher.compon
   selector: "[mockOrgs]",
   standalone: false,
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28232): Use Directive suffix
+// eslint-disable-next-line @angular-eslint/directive-class-suffix
 class MockOrganizationService implements Partial<OrganizationService> {
   private static _orgs = new BehaviorSubject<Organization[]>([]);
 
@@ -34,6 +39,8 @@ class MockOrganizationService implements Partial<OrganizationService> {
     return MockOrganizationService._orgs.asObservable();
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   set mockOrgs(orgs: Organization[]) {
     MockOrganizationService._orgs.next(orgs);
@@ -44,6 +51,8 @@ class MockOrganizationService implements Partial<OrganizationService> {
   selector: "[mockProviders]",
   standalone: false,
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28232): Use Directive suffix
+// eslint-disable-next-line @angular-eslint/directive-class-suffix
 class MockProviderService implements Partial<ProviderService> {
   private static _providers = new BehaviorSubject<Provider[]>([]);
 
@@ -51,6 +60,8 @@ class MockProviderService implements Partial<ProviderService> {
     return MockProviderService._providers.asObservable();
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   set mockProviders(providers: Provider[]) {
     MockProviderService._providers.next(providers);
@@ -78,6 +89,20 @@ class MockPlatformUtilsService implements Partial<PlatformUtilsService> {
   }
 }
 
+class MockBillingAccountProfileStateService implements Partial<BillingAccountProfileStateService> {
+  hasPremiumFromAnySource$(userId: UserId): Observable<boolean> {
+    return of(false);
+  }
+}
+
+class MockConfigService implements Partial<ConfigService> {
+  getFeatureFlag$<Flag extends FeatureFlag>(key: Flag): Observable<FeatureFlagValueType<Flag>> {
+    return of(false);
+  }
+}
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "story-layout",
   template: `<ng-content></ng-content>`,
@@ -85,6 +110,8 @@ class MockPlatformUtilsService implements Partial<PlatformUtilsService> {
 })
 class StoryLayoutComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "story-content",
   template: ``,
@@ -117,6 +144,11 @@ export default {
         { provide: ProviderService, useClass: MockProviderService },
         { provide: SyncService, useClass: MockSyncService },
         { provide: PlatformUtilsService, useClass: MockPlatformUtilsService },
+        {
+          provide: BillingAccountProfileStateService,
+          useClass: MockBillingAccountProfileStateService,
+        },
+        { provide: ConfigService, useClass: MockConfigService },
         ProductSwitcherService,
         {
           provide: I18nService,
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
index aa853796971..f2154ec74a3 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
@@ -14,7 +14,7 @@
         [routerLink]="product.appRoute"
         [ngClass]="
           product.isActive
-            ? 'tw-bg-primary-600 tw-font-bold !tw-text-contrast tw-ring-offset-2 hover:tw-bg-primary-600'
+            ? 'tw-bg-primary-600 tw-font-medium !tw-text-contrast tw-ring-offset-2 hover:tw-bg-primary-600'
             : ''
         "
         class="tw-group/product-link tw-flex tw-h-24 tw-w-28 tw-flex-col tw-items-center tw-justify-center tw-rounded tw-p-1 tw-text-primary-600 tw-outline-none hover:tw-bg-background-alt hover:tw-text-primary-700 hover:tw-no-underline focus-visible:!tw-ring-2 focus-visible:!tw-ring-primary-700"
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
index 5a6572e15be..0157e7b321a 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
@@ -6,12 +6,16 @@ import { MenuComponent } from "@bitwarden/components";
 
 import { ProductSwitcherService } from "./shared/product-switcher.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "product-switcher-content",
   templateUrl: "./product-switcher-content.component.html",
   standalone: false,
 })
 export class ProductSwitcherContentComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("menu")
   menu: MenuComponent;
 
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.component.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.component.ts
index 5dd29815ef2..114d95097a2 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.component.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.component.ts
@@ -5,6 +5,8 @@ import { AfterViewInit, ChangeDetectorRef, Component, Input } from "@angular/cor
 import { IconButtonType } from "@bitwarden/components/src/icon-button/icon-button.component";
 
 import { ProductSwitcherService } from "./shared/product-switcher.service";
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "product-switcher",
   templateUrl: "./product-switcher.component.html",
@@ -14,6 +16,8 @@ export class ProductSwitcherComponent implements AfterViewInit {
   /**
    * Passed to the product switcher's `bitIconButton`
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   buttonType: IconButtonType = "main";
 
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.module.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.module.ts
index b78b1ce6b96..1d0353105c6 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.module.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.module.ts
@@ -5,6 +5,7 @@ import { RouterModule } from "@angular/router";
 import { NavigationModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
+import { UpgradeNavButtonComponent } from "../../billing/individual/upgrade/upgrade-nav-button/upgrade-nav-button/upgrade-nav-button.component";
 import { SharedModule } from "../../shared";
 
 import { NavigationProductSwitcherComponent } from "./navigation-switcher/navigation-switcher.component";
@@ -12,7 +13,14 @@ import { ProductSwitcherContentComponent } from "./product-switcher-content.comp
 import { ProductSwitcherComponent } from "./product-switcher.component";
 
 @NgModule({
-  imports: [SharedModule, A11yModule, RouterModule, NavigationModule, I18nPipe],
+  imports: [
+    SharedModule,
+    A11yModule,
+    RouterModule,
+    NavigationModule,
+    I18nPipe,
+    UpgradeNavButtonComponent,
+  ],
   declarations: [
     ProductSwitcherComponent,
     ProductSwitcherContentComponent,
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
index 18cb8e26c70..4581f5981e6 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
@@ -10,6 +10,9 @@ import { ProviderService } from "@bitwarden/common/admin-console/abstractions/pr
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { AccountService, Account } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { FeatureFlag, FeatureFlagValueType } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
@@ -27,6 +30,8 @@ import { ProductSwitcherService } from "./shared/product-switcher.service";
   selector: "[mockOrgs]",
   standalone: false,
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28232): Use Directive suffix
+// eslint-disable-next-line @angular-eslint/directive-class-suffix
 class MockOrganizationService implements Partial<OrganizationService> {
   private static _orgs = new BehaviorSubject<Organization[]>([]);
 
@@ -34,6 +39,8 @@ class MockOrganizationService implements Partial<OrganizationService> {
     return MockOrganizationService._orgs.asObservable();
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   set mockOrgs(orgs: Organization[]) {
     MockOrganizationService._orgs.next(orgs);
@@ -44,6 +51,8 @@ class MockOrganizationService implements Partial<OrganizationService> {
   selector: "[mockProviders]",
   standalone: false,
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28232): Use Directive suffix
+// eslint-disable-next-line @angular-eslint/directive-class-suffix
 class MockProviderService implements Partial<ProviderService> {
   private static _providers = new BehaviorSubject<Provider[]>([]);
 
@@ -51,6 +60,8 @@ class MockProviderService implements Partial<ProviderService> {
     return MockProviderService._providers.asObservable();
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   set mockProviders(providers: Provider[]) {
     MockProviderService._providers.next(providers);
@@ -78,6 +89,20 @@ class MockPlatformUtilsService implements Partial<PlatformUtilsService> {
   }
 }
 
+class MockBillingAccountProfileStateService implements Partial<BillingAccountProfileStateService> {
+  hasPremiumFromAnySource$(userId: UserId): Observable<boolean> {
+    return of(false);
+  }
+}
+
+class MockConfigService implements Partial<ConfigService> {
+  getFeatureFlag$<Flag extends FeatureFlag>(key: Flag): Observable<FeatureFlagValueType<Flag>> {
+    return of(false);
+  }
+}
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "story-layout",
   template: `<ng-content></ng-content>`,
@@ -85,6 +110,8 @@ class MockPlatformUtilsService implements Partial<PlatformUtilsService> {
 })
 class StoryLayoutComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "story-content",
   template: ``,
@@ -114,6 +141,11 @@ export default {
         MockProviderService,
         { provide: SyncService, useClass: MockSyncService },
         { provide: PlatformUtilsService, useClass: MockPlatformUtilsService },
+        {
+          provide: BillingAccountProfileStateService,
+          useClass: MockBillingAccountProfileStateService,
+        },
+        { provide: ConfigService, useClass: MockConfigService },
         MockPlatformUtilsService,
         ProductSwitcherService,
         {
diff --git a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
index efbeb786f77..f7f319f2fab 100644
--- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
+++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
@@ -11,6 +11,8 @@ import { ProviderService } from "@bitwarden/common/admin-console/abstractions/pr
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -27,6 +29,8 @@ describe("ProductSwitcherService", () => {
   let providerService: MockProxy<ProviderService>;
   let accountService: FakeAccountService;
   let platformUtilsService: MockProxy<PlatformUtilsService>;
+  let billingAccountProfileStateService: MockProxy<BillingAccountProfileStateService>;
+  let configService: MockProxy<ConfigService>;
   let activeRouteParams = convertToParamMap({ organizationId: "1234" });
   let singleOrgPolicyEnabled = false;
   const getLastSync = jest.fn().mockResolvedValue(new Date("2024-05-14"));
@@ -48,6 +52,8 @@ describe("ProductSwitcherService", () => {
     providerService = mock<ProviderService>();
     accountService = mockAccountServiceWith(userId);
     platformUtilsService = mock<PlatformUtilsService>();
+    billingAccountProfileStateService = mock<BillingAccountProfileStateService>();
+    configService = mock<ConfigService>();
 
     router.url = "/";
     router.events = of({});
@@ -85,6 +91,8 @@ describe("ProductSwitcherService", () => {
             policyAppliesToUser$: () => of(singleOrgPolicyEnabled),
           },
         },
+        { provide: BillingAccountProfileStateService, useValue: billingAccountProfileStateService },
+        { provide: ConfigService, useValue: configService },
       ],
     });
   });
@@ -325,4 +333,57 @@ describe("ProductSwitcherService", () => {
 
     expect(appRoute).toEqual(["/organizations", "111-22-33"]);
   });
+
+  describe("shouldShowPremiumUpgradeButton$", () => {
+    it("returns false when feature flag is disabled", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(false));
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+
+      initiateService();
+
+      const shouldShow = await firstValueFrom(service.shouldShowPremiumUpgradeButton$);
+
+      expect(shouldShow).toBe(false);
+    });
+
+    it("returns false when there is no active account", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+      accountService.activeAccount$ = of(null);
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+
+      initiateService();
+
+      const shouldShow = await firstValueFrom(service.shouldShowPremiumUpgradeButton$);
+
+      expect(shouldShow).toBe(false);
+    });
+
+    it("returns true when feature flag is enabled, account exists, and user has no premium", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+
+      initiateService();
+
+      const shouldShow = await firstValueFrom(service.shouldShowPremiumUpgradeButton$);
+
+      expect(shouldShow).toBe(true);
+      expect(billingAccountProfileStateService.hasPremiumFromAnySource$).toHaveBeenCalledWith(
+        userId,
+      );
+    });
+
+    it("returns false when feature flag is enabled, account exists, but user has premium", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(true));
+
+      initiateService();
+
+      const shouldShow = await firstValueFrom(service.shouldShowPremiumUpgradeButton$);
+
+      expect(shouldShow).toBe(false);
+      expect(billingAccountProfileStateService.hasPremiumFromAnySource$).toHaveBeenCalledWith(
+        userId,
+      );
+    });
+  });
 });
diff --git a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts
index ba86e9fed28..6cfecd59403 100644
--- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts
+++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts
@@ -2,7 +2,16 @@
 // @ts-strict-ignore
 import { Injectable } from "@angular/core";
 import { ActivatedRoute, NavigationEnd, NavigationStart, ParamMap, Router } from "@angular/router";
-import { combineLatest, filter, map, Observable, ReplaySubject, startWith, switchMap } from "rxjs";
+import {
+  combineLatest,
+  filter,
+  map,
+  Observable,
+  of,
+  ReplaySubject,
+  startWith,
+  switchMap,
+} from "rxjs";
 
 import {
   canAccessOrgAdmin,
@@ -15,6 +24,9 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { BillingAccountProfileStateService } 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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
@@ -87,7 +99,7 @@ export class ProductSwitcherService {
       startWith(null), // Start with a null event to trigger the initial combineLatest
       filter((e) => e instanceof NavigationEnd || e instanceof NavigationStart || e === null),
     ),
-  ]).pipe(map(() => null));
+  ]).pipe(map((): any => null));
 
   constructor(
     private organizationService: OrganizationService,
@@ -99,6 +111,8 @@ export class ProductSwitcherService {
     private platformUtilsService: PlatformUtilsService,
     private policyService: PolicyService,
     private i18nService: I18nService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private configService: ConfigService,
   ) {
     this.pollUntilSynced();
   }
@@ -118,6 +132,20 @@ export class ProductSwitcherService {
     switchMap((userId) => this.policyService.policyAppliesToUser$(PolicyType.SingleOrg, userId)),
   );
 
+  shouldShowPremiumUpgradeButton$: Observable<boolean> = combineLatest([
+    this.configService.getFeatureFlag$(FeatureFlag.PM24032_NewNavigationPremiumUpgradeButton),
+    this.accountService.activeAccount$,
+  ]).pipe(
+    switchMap(([featureFlag, account]) => {
+      if (!featureFlag || !account) {
+        return of(false);
+      }
+      return this.billingAccountProfileStateService
+        .hasPremiumFromAnySource$(account.id)
+        .pipe(map((hasPremium) => !hasPremium));
+    }),
+  );
+
   products$: Observable<{
     bento: ProductSwitcherItem[];
     other: ProductSwitcherItem[];
diff --git a/apps/web/src/app/layouts/toggle-width.component.ts b/apps/web/src/app/layouts/toggle-width.component.ts
index 411fc73b175..25b8790bb4a 100644
--- a/apps/web/src/app/layouts/toggle-width.component.ts
+++ b/apps/web/src/app/layouts/toggle-width.component.ts
@@ -4,6 +4,8 @@ import { Component } from "@angular/core";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { NavigationModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-toggle-width",
   template: `<bit-nav-item
diff --git a/apps/web/src/app/layouts/user-layout.component.html b/apps/web/src/app/layouts/user-layout.component.html
index 530d4caca03..9f474062120 100644
--- a/apps/web/src/app/layouts/user-layout.component.html
+++ b/apps/web/src/app/layouts/user-layout.component.html
@@ -13,17 +13,23 @@
     <bit-nav-group icon="bwi-cog" [text]="'settings' | i18n" route="settings">
       <bit-nav-item [text]="'myAccount' | i18n" route="settings/account"></bit-nav-item>
       <bit-nav-item [text]="'security' | i18n" route="settings/security"></bit-nav-item>
-      <bit-nav-item [text]="'preferences' | i18n" route="settings/preferences"></bit-nav-item>
+      @if (consolidatedSessionTimeoutComponent$ | async) {
+        <bit-nav-item [text]="'appearance' | i18n" route="settings/appearance"></bit-nav-item>
+      } @else {
+        <bit-nav-item [text]="'preferences' | i18n" route="settings/preferences"></bit-nav-item>
+      }
       <bit-nav-item
         [text]="'subscription' | i18n"
         route="settings/subscription"
         *ngIf="showSubscription$ | async"
       ></bit-nav-item>
       <bit-nav-item [text]="'domainRules' | i18n" route="settings/domain-rules"></bit-nav-item>
-      <bit-nav-item
-        [text]="'emergencyAccess' | i18n"
-        route="settings/emergency-access"
-      ></bit-nav-item>
+      @if (showEmergencyAccess()) {
+        <bit-nav-item
+          [text]="'emergencyAccess' | i18n"
+          route="settings/emergency-access"
+        ></bit-nav-item>
+      }
       <billing-free-families-nav-item></billing-free-families-nav-item>
     </bit-nav-group>
   </app-side-nav>
diff --git a/apps/web/src/app/layouts/user-layout.component.ts b/apps/web/src/app/layouts/user-layout.component.ts
index 37b35ee41be..3af514466b7 100644
--- a/apps/web/src/app/layouts/user-layout.component.ts
+++ b/apps/web/src/app/layouts/user-layout.component.ts
@@ -1,14 +1,20 @@
 // 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 } from "@angular/core";
+import { Component, OnInit, Signal } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
 import { RouterModule } from "@angular/router";
-import { Observable, switchMap } from "rxjs";
+import { combineLatest, map, Observable, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { PasswordManagerLogo } from "@bitwarden/assets/svg";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { IconModule } from "@bitwarden/components";
 
@@ -16,6 +22,8 @@ import { BillingFreeFamiliesNavItemComponent } from "../billing/shared/billing-f
 
 import { WebLayoutModule } from "./web-layout.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-user-layout",
   templateUrl: "user-layout.component.html",
@@ -30,20 +38,47 @@ import { WebLayoutModule } from "./web-layout.module";
 })
 export class UserLayoutComponent implements OnInit {
   protected readonly logo = PasswordManagerLogo;
+  protected readonly showEmergencyAccess: Signal<boolean>;
   protected hasFamilySponsorshipAvailable$: Observable<boolean>;
   protected showSponsoredFamilies$: Observable<boolean>;
   protected showSubscription$: Observable<boolean>;
+  protected consolidatedSessionTimeoutComponent$: Observable<boolean>;
 
   constructor(
     private syncService: SyncService,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private accountService: AccountService,
+    private policyService: PolicyService,
+    private configService: ConfigService,
   ) {
     this.showSubscription$ = this.accountService.activeAccount$.pipe(
       switchMap((account) =>
         this.billingAccountProfileStateService.canViewSubscription$(account.id),
       ),
     );
+
+    this.showEmergencyAccess = toSignal(
+      combineLatest([
+        this.configService.getFeatureFlag$(FeatureFlag.AutoConfirm),
+        this.accountService.activeAccount$.pipe(
+          getUserId,
+          switchMap((userId) =>
+            this.policyService.policyAppliesToUser$(PolicyType.AutoConfirm, userId),
+          ),
+        ),
+      ]).pipe(
+        map(([enabled, policyAppliesToUser]) => {
+          if (!enabled || !policyAppliesToUser) {
+            return true;
+          }
+          return false;
+        }),
+      ),
+    );
+
+    this.consolidatedSessionTimeoutComponent$ = this.configService.getFeatureFlag$(
+      FeatureFlag.ConsolidatedSessionTimeoutComponent,
+    );
   }
 
   async ngOnInit() {
diff --git a/apps/web/src/app/layouts/web-layout.component.ts b/apps/web/src/app/layouts/web-layout.component.ts
index 2d2635fd296..f4d24e08c6f 100644
--- a/apps/web/src/app/layouts/web-layout.component.ts
+++ b/apps/web/src/app/layouts/web-layout.component.ts
@@ -5,6 +5,8 @@ import { LayoutComponent } from "@bitwarden/components";
 
 import { ProductSwitcherModule } from "./product-switcher/product-switcher.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-layout",
   templateUrl: "web-layout.component.html",
diff --git a/apps/web/src/app/layouts/web-side-nav.component.ts b/apps/web/src/app/layouts/web-side-nav.component.ts
index 364b3bedecc..747e1ce322e 100644
--- a/apps/web/src/app/layouts/web-side-nav.component.ts
+++ b/apps/web/src/app/layouts/web-side-nav.component.ts
@@ -6,11 +6,15 @@ import { SideNavVariant, NavigationModule } from "@bitwarden/components";
 import { ProductSwitcherModule } from "./product-switcher/product-switcher.module";
 import { ToggleWidthComponent } from "./toggle-width.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-side-nav",
   templateUrl: "web-side-nav.component.html",
   imports: [CommonModule, NavigationModule, ProductSwitcherModule, ToggleWidthComponent],
 })
 export class WebSideNavComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() variant: SideNavVariant = "primary";
 }
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 9ac628752b6..b40b9143991 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from "@angular/core";
 import { Route, RouterModule, Routes } from "@angular/router";
 
 import { AuthenticationTimeoutComponent } from "@bitwarden/angular/auth/components/authentication-timeout.component";
+import { AuthRoute } from "@bitwarden/angular/auth/constants";
 import {
   authGuard,
   lockGuard,
@@ -10,18 +11,26 @@ import {
   unauthGuardFn,
   activeAuthGuard,
 } from "@bitwarden/angular/auth/guards";
+import { LoginViaWebAuthnComponent } from "@bitwarden/angular/auth/login-via-webauthn/login-via-webauthn.component";
 import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
 import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import {
   DevicesIcon,
   RegistrationUserAddIcon,
   TwoFactorTimeoutIcon,
   TwoFactorAuthEmailIcon,
+  TwoFactorAuthSecurityKeyIcon,
   UserLockIcon,
   VaultIcon,
   SsoKeyIcon,
   LockIcon,
   BrowserExtensionIcon,
+  ActiveSendIcon,
+  TwoFactorAuthAuthenticatorIcon,
+  AccountWarning,
+  BusinessWelcome,
+  DomainIcon,
 } from "@bitwarden/assets/svg";
 import {
   PasswordHintComponent,
@@ -39,17 +48,21 @@ import {
   TwoFactorAuthGuard,
   NewDeviceVerificationComponent,
 } from "@bitwarden/auth/angular";
+import { canAccessEmergencyAccess } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
 import { LockComponent } from "@bitwarden/key-management-ui";
+import { premiumInterestRedirectGuard } from "@bitwarden/web-vault/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard";
 
 import { flagEnabled, Flags } from "../utils/flags";
 
+import { organizationPolicyGuard } from "./admin-console/organizations/guards/org-policy.guard";
 import { VerifyRecoverDeleteOrgComponent } from "./admin-console/organizations/manage/verify-recover-delete-org.component";
 import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component";
 import { FamiliesForEnterpriseSetupComponent } from "./admin-console/organizations/sponsorships/families-for-enterprise-setup.component";
 import { CreateOrganizationComponent } from "./admin-console/settings/create-organization.component";
+import { AuthWebRoute, AuthWebRouteSegment } from "./auth/constants/auth-web-route.constant";
 import { deepLinkGuard } from "./auth/guards/deep-link/deep-link.guard";
-import { LoginViaWebAuthnComponent } from "./auth/login/login-via-webauthn/login-via-webauthn.component";
 import { AcceptOrganizationComponent } from "./auth/organization-invite/accept-organization.component";
 import { RecoverDeleteComponent } from "./auth/recover-delete.component";
 import { RecoverTwoFactorComponent } from "./auth/recover-two-factor.component";
@@ -71,6 +84,7 @@ import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
 import { UserLayoutComponent } from "./layouts/user-layout.component";
 import { RequestSMAccessComponent } from "./secrets-manager/secrets-manager-landing/request-sm-access.component";
 import { SMLandingComponent } from "./secrets-manager/secrets-manager-landing/sm-landing.component";
+import { AppearanceComponent } from "./settings/appearance.component";
 import { DomainRulesComponent } from "./settings/domain-rules.component";
 import { PreferencesComponent } from "./settings/preferences.component";
 import { CredentialGeneratorComponent } from "./tools/credential-generator/credential-generator.component";
@@ -87,12 +101,12 @@ const routes: Routes = [
   // so that the redirectGuard does not interrupt the navigation.
   {
     path: "register",
-    redirectTo: "signup",
+    redirectTo: AuthRoute.SignUp,
     pathMatch: "full",
   },
   {
     path: "trial",
-    redirectTo: "signup",
+    redirectTo: AuthRoute.SignUp,
     pathMatch: "full",
   },
   {
@@ -106,14 +120,9 @@ const routes: Routes = [
         children: [], // Children lets us have an empty component.
         canActivate: [redirectGuard()], // Redirects either to vault, login, or lock page.
       },
-      {
-        path: "login-with-passkey",
-        component: LoginViaWebAuthnComponent,
-        data: { titleId: "logInWithPasskey" } satisfies RouteDataProperties,
-      },
       { path: "verify-email", component: VerifyEmailTokenComponent },
       {
-        path: "accept-organization",
+        path: AuthWebRoute.AcceptOrganizationInvite,
         canActivate: [deepLinkGuard()],
         component: AcceptOrganizationComponent,
         data: { titleId: "joinOrganization", doNotSaveUrl: false } satisfies RouteDataProperties,
@@ -127,7 +136,7 @@ const routes: Routes = [
           doNotSaveUrl: false,
         } satisfies RouteDataProperties,
       },
-      { path: "recover", pathMatch: "full", redirectTo: "recover-2fa" },
+      { path: "recover", pathMatch: "full", redirectTo: AuthWebRoute.RecoverTwoFactor },
       {
         path: "verify-recover-delete-org",
         component: VerifyRecoverDeleteOrgComponent,
@@ -141,7 +150,29 @@ const routes: Routes = [
     component: AnonLayoutWrapperComponent,
     children: [
       {
-        path: "signup",
+        path: AuthRoute.LoginWithPasskey,
+        canActivate: [unauthGuardFn()],
+        data: {
+          pageIcon: TwoFactorAuthSecurityKeyIcon,
+          titleId: "logInWithPasskey",
+          pageTitle: {
+            key: "logInWithPasskey",
+          },
+          pageSubtitle: {
+            key: "readingPasskeyLoadingInfo",
+          },
+        } satisfies RouteDataProperties & AnonLayoutWrapperData,
+        children: [
+          { path: "", component: LoginViaWebAuthnComponent },
+          {
+            path: "",
+            component: EnvironmentSelectorComponent,
+            outlet: "environment-selector",
+          },
+        ],
+      },
+      {
+        path: AuthRoute.SignUp,
         canActivate: [unauthGuardFn()],
         data: {
           pageIcon: RegistrationUserAddIcon,
@@ -166,7 +197,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "finish-signup",
+        path: AuthRoute.FinishSignUp,
         canActivate: [unauthGuardFn()],
         data: {
           pageIcon: LockIcon,
@@ -180,7 +211,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "login",
+        path: AuthRoute.Login,
         canActivate: [unauthGuardFn()],
         data: {
           pageTitle: {
@@ -206,7 +237,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "login-with-device",
+        path: AuthRoute.LoginWithDevice,
         data: {
           pageIcon: DevicesIcon,
           pageTitle: {
@@ -227,7 +258,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "admin-approval-requested",
+        path: AuthRoute.AdminApprovalRequested,
         data: {
           pageIcon: DevicesIcon,
           pageTitle: {
@@ -241,7 +272,7 @@ const routes: Routes = [
         children: [{ path: "", component: LoginViaAuthRequestComponent }],
       },
       {
-        path: "hint",
+        path: AuthRoute.PasswordHint,
         canActivate: [unauthGuardFn()],
         data: {
           pageTitle: {
@@ -263,7 +294,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "login-initiated",
+        path: AuthRoute.LoginInitiated,
         canActivate: [tdeDecryptionRequiredGuard()],
         data: {
           pageIcon: DevicesIcon,
@@ -277,6 +308,7 @@ const routes: Routes = [
             key: "viewSend",
           },
           showReadonlyHostname: true,
+          pageIcon: ActiveSendIcon,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
         children: [
           {
@@ -291,15 +323,16 @@ const routes: Routes = [
         ],
       },
       {
-        path: "set-initial-password",
+        path: AuthRoute.SetInitialPassword,
         canActivate: [authGuard],
         component: SetInitialPasswordComponent,
         data: {
           maxWidth: "lg",
+          pageIcon: LockIcon,
         } satisfies AnonLayoutWrapperData,
       },
       {
-        path: "signup-link-expired",
+        path: AuthWebRoute.SignUpLinkExpired,
         canActivate: [unauthGuardFn()],
         data: {
           pageIcon: TwoFactorTimeoutIcon,
@@ -312,13 +345,13 @@ const routes: Routes = [
             path: "",
             component: RegistrationLinkExpiredComponent,
             data: {
-              loginRoute: "/login",
+              loginRoute: `/${AuthRoute.Login}`,
             } satisfies RegistrationStartSecondaryComponentData,
           },
         ],
       },
       {
-        path: "sso",
+        path: AuthRoute.Sso,
         canActivate: [unauthGuardFn()],
         data: {
           pageTitle: {
@@ -343,7 +376,7 @@ const routes: Routes = [
         ],
       },
       {
-        path: "2fa",
+        path: AuthRoute.TwoFactor,
         component: TwoFactorAuthComponent,
         canActivate: [unauthGuardFn(), TwoFactorAuthGuard],
         children: [
@@ -361,6 +394,8 @@ const routes: Routes = [
           pageTitle: {
             key: "verifyYourIdentity",
           },
+          // `TwoFactorAuthComponent` manually sets its icon based on the 2fa type
+          pageIcon: null,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
       {
@@ -381,7 +416,7 @@ const routes: Routes = [
         } satisfies AnonLayoutWrapperData,
       },
       {
-        path: "authentication-timeout",
+        path: AuthRoute.AuthenticationTimeout,
         canActivate: [unauthGuardFn()],
         children: [
           {
@@ -403,7 +438,7 @@ const routes: Routes = [
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
       {
-        path: "recover-2fa",
+        path: AuthWebRoute.RecoverTwoFactor,
         canActivate: [unauthGuardFn()],
         children: [
           {
@@ -421,10 +456,11 @@ const routes: Routes = [
             key: "recoverAccountTwoStep",
           },
           titleId: "recoverAccountTwoStep",
+          pageIcon: TwoFactorAuthAuthenticatorIcon,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
       {
-        path: "device-verification",
+        path: AuthRoute.NewDeviceVerification,
         canActivate: [unauthGuardFn(), activeAuthGuard()],
         children: [
           {
@@ -443,7 +479,7 @@ const routes: Routes = [
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
       {
-        path: "accept-emergency",
+        path: AuthWebRoute.AcceptEmergencyAccessInvite,
         canActivate: [deepLinkGuard()],
         data: {
           pageTitle: {
@@ -451,6 +487,7 @@ const routes: Routes = [
           },
           titleId: "acceptEmergency",
           doNotSaveUrl: false,
+          pageIcon: VaultIcon,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
         children: [
           {
@@ -463,13 +500,14 @@ const routes: Routes = [
         ],
       },
       {
-        path: "recover-delete",
+        path: AuthWebRoute.RecoverDeleteAccount,
         canActivate: [unauthGuardFn()],
         data: {
           pageTitle: {
             key: "deleteAccount",
           },
           titleId: "deleteAccount",
+          pageIcon: AccountWarning,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
         children: [
           {
@@ -484,13 +522,14 @@ const routes: Routes = [
         ],
       },
       {
-        path: "verify-recover-delete",
+        path: AuthWebRoute.VerifyRecoverDeleteAccount,
         canActivate: [unauthGuardFn()],
         data: {
           pageTitle: {
             key: "deleteAccount",
           },
           titleId: "deleteAccount",
+          pageIcon: AccountWarning,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
         children: [
           {
@@ -508,6 +547,7 @@ const routes: Routes = [
             key: "removeMasterPassword",
           },
           titleId: "removeMasterPassword",
+          pageIcon: LockIcon,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
       {
@@ -519,6 +559,7 @@ const routes: Routes = [
             key: "confirmKeyConnectorDomain",
           },
           titleId: "confirmKeyConnectorDomain",
+          pageIcon: DomainIcon,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
       {
@@ -530,6 +571,7 @@ const routes: Routes = [
         },
         data: {
           maxWidth: "3xl",
+          pageIcon: BusinessWelcome,
         } satisfies AnonLayoutWrapperData,
       },
       {
@@ -541,6 +583,7 @@ const routes: Routes = [
         },
         data: {
           maxWidth: "3xl",
+          pageIcon: BusinessWelcome,
         } satisfies AnonLayoutWrapperData,
       },
       {
@@ -561,15 +604,18 @@ const routes: Routes = [
         ],
       },
       {
-        path: "change-password",
+        path: AuthRoute.ChangePassword,
         component: ChangePasswordComponent,
         canActivate: [authGuard],
+        data: {
+          pageIcon: LockIcon,
+        } satisfies AnonLayoutWrapperData,
       },
       {
         path: "setup-extension",
         data: {
           hideCardWrapper: true,
-          hideIcon: true,
+          pageIcon: null,
           maxWidth: "4xl",
         } satisfies AnonLayoutWrapperData,
         children: [
@@ -588,7 +634,7 @@ const routes: Routes = [
     children: [
       {
         path: "vault",
-        canActivate: [setupExtensionRedirectGuard],
+        canActivate: [premiumInterestRedirectGuard, setupExtensionRedirectGuard],
         loadChildren: () => VaultModule,
       },
       {
@@ -614,15 +660,36 @@ const routes: Routes = [
       {
         path: "settings",
         children: [
-          { path: "", pathMatch: "full", redirectTo: "account" },
+          { path: "", pathMatch: "full", redirectTo: AuthWebRouteSegment.Account },
           {
-            path: "account",
+            path: AuthWebRouteSegment.Account,
             component: AccountComponent,
             data: { titleId: "myAccount" } satisfies RouteDataProperties,
           },
+          {
+            path: "appearance",
+            component: AppearanceComponent,
+            canActivate: [
+              canAccessFeature(
+                FeatureFlag.ConsolidatedSessionTimeoutComponent,
+                true,
+                "/settings/preferences",
+                false,
+              ),
+            ],
+            data: { titleId: "appearance" } satisfies RouteDataProperties,
+          },
           {
             path: "preferences",
             component: PreferencesComponent,
+            canActivate: [
+              canAccessFeature(
+                FeatureFlag.ConsolidatedSessionTimeoutComponent,
+                false,
+                "/settings/appearance",
+                false,
+              ),
+            ],
             data: { titleId: "preferences" } satisfies RouteDataProperties,
           },
           {
@@ -642,16 +709,18 @@ const routes: Routes = [
               ),
           },
           {
-            path: "emergency-access",
+            path: AuthWebRouteSegment.EmergencyAccess,
             children: [
               {
                 path: "",
                 component: EmergencyAccessComponent,
+                canActivate: [organizationPolicyGuard(canAccessEmergencyAccess)],
                 data: { titleId: "emergencyAccess" } satisfies RouteDataProperties,
               },
               {
                 path: ":id",
                 component: EmergencyAccessViewComponent,
+                canActivate: [organizationPolicyGuard(canAccessEmergencyAccess)],
                 data: { titleId: "emergencyAccess" } satisfies RouteDataProperties,
               },
             ],
diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts
index 4e04910246f..ce1b45a9e47 100644
--- a/apps/web/src/app/oss.module.ts
+++ b/apps/web/src/app/oss.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from "@angular/core";
 
 import { AuthModule } from "./auth";
-import { LoginModule } from "./auth/login/login.module";
 import { TrialInitiationModule } from "./billing/trial-initiation/trial-initiation.module";
 import { HeaderModule } from "./layouts/header/header.module";
 import { SharedModule } from "./shared";
@@ -21,7 +20,6 @@ import "./shared/locales";
     TrialInitiationModule,
     VaultFilterModule,
     OrganizationBadgeModule,
-    LoginModule,
     AuthModule,
     AccessComponent,
   ],
@@ -31,7 +29,6 @@ import "./shared/locales";
     TrialInitiationModule,
     VaultFilterModule,
     OrganizationBadgeModule,
-    LoginModule,
     AccessComponent,
   ],
   bootstrap: [],
diff --git a/apps/web/src/app/platform/ipc/web-ipc.service.ts b/apps/web/src/app/platform/ipc/web-ipc.service.ts
index 590c1f36cc4..c6614759b44 100644
--- a/apps/web/src/app/platform/ipc/web-ipc.service.ts
+++ b/apps/web/src/app/platform/ipc/web-ipc.service.ts
@@ -3,7 +3,12 @@ import { inject } from "@angular/core";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
-import { IpcMessage, IpcService, isIpcMessage } from "@bitwarden/common/platform/ipc";
+import {
+  IpcMessage,
+  IpcService,
+  isIpcMessage,
+  IpcSessionRepository,
+} from "@bitwarden/common/platform/ipc";
 import {
   IncomingMessage,
   IpcClient,
@@ -15,6 +20,7 @@ import {
 export class WebIpcService extends IpcService {
   private logService = inject(LogService);
   private platformUtilsService = inject(PlatformUtilsService);
+  private sessionRepository = inject(IpcSessionRepository);
   private communicationBackend?: IpcCommunicationBackend;
 
   override async init() {
@@ -70,7 +76,9 @@ export class WebIpcService extends IpcService {
         );
       });
 
-      await super.initWithClient(new IpcClient(this.communicationBackend));
+      await super.initWithClient(
+        IpcClient.newWithClientManagedSessions(this.communicationBackend, this.sessionRepository),
+      );
 
       if (this.platformUtilsService.isDev()) {
         await ipcRegisterDiscoverHandler(this.client, {
diff --git a/apps/web/src/app/platform/web-system.service.ts b/apps/web/src/app/platform/web-system.service.ts
new file mode 100644
index 00000000000..b614d0f9245
--- /dev/null
+++ b/apps/web/src/app/platform/web-system.service.ts
@@ -0,0 +1,10 @@
+import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
+
+/**
+ * Web implementation of SystemService.
+ * The implementation is NOOP since these functions are not supported on web.
+ */
+export class WebSystemService extends SystemService {
+  async clearClipboard(clipboardValue: string, timeoutMs?: number): Promise<void> {}
+  async clearPendingClipboard(): Promise<any> {}
+}
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 0e32321a0b3..afac3b059a8 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
@@ -19,6 +19,8 @@ import { RequestSMAccessRequest } from "../models/requests/request-sm-access.req
 
 import { SmLandingApiService } from "./sm-landing-api.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-request-sm-access",
   templateUrl: "request-sm-access.component.html",
diff --git a/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts b/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts
index 301e6f7dfad..c1cc2b63e28 100644
--- a/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts
+++ b/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts
@@ -12,6 +12,8 @@ import { NoItemsModule, SearchModule } from "@bitwarden/components";
 import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared/shared.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-sm-landing",
   imports: [SharedModule, SearchModule, NoItemsModule, HeaderModule],
diff --git a/apps/web/src/app/settings/appearance.component.html b/apps/web/src/app/settings/appearance.component.html
new file mode 100644
index 00000000000..840895eea42
--- /dev/null
+++ b/apps/web/src/app/settings/appearance.component.html
@@ -0,0 +1,48 @@
+<app-header></app-header>
+
+<bit-container>
+  <form [formGroup]="form" class="tw-w-full tw-max-w-md">
+    <bit-form-field>
+      <bit-label>{{ "theme" | i18n }}</bit-label>
+      <bit-select formControlName="theme" id="theme">
+        @for (option of themeOptions; track option.value) {
+          <bit-option [value]="option.value" [label]="option.name"></bit-option>
+        }
+      </bit-select>
+      <bit-hint>{{ "themeDesc" | i18n }}</bit-hint>
+    </bit-form-field>
+    <bit-form-field>
+      <bit-label>
+        {{ "language" | i18n }}
+        <a
+          bitLink
+          class="tw-float-right"
+          href="https://bitwarden.com/help/localization/"
+          target="_blank"
+          rel="noreferrer"
+          appA11yTitle="{{ 'learnMoreAboutLocalization' | i18n }}"
+          slot="end"
+        >
+          <i class="bwi bwi-question-circle" aria-hidden="true"></i>
+        </a>
+      </bit-label>
+      <bit-select formControlName="locale" id="locale">
+        @for (option of localeOptions; track option.value) {
+          <bit-option [value]="option.value" [label]="option.name"></bit-option>
+        }
+      </bit-select>
+      <bit-hint>{{ "languageDesc" | i18n }}</bit-hint>
+    </bit-form-field>
+    <div class="tw-flex tw-items-start tw-gap-1.5">
+      <bit-form-control>
+        <input type="checkbox" bitCheckbox formControlName="enableFavicons" />
+        <bit-label>
+          {{ "showIconsChangePasswordUrls" | i18n }}
+        </bit-label>
+      </bit-form-control>
+      <div class="-tw-mt-0.5">
+        <vault-permit-cipher-details-popover></vault-permit-cipher-details-popover>
+      </div>
+    </div>
+  </form>
+</bit-container>
diff --git a/apps/web/src/app/settings/appearance.component.spec.ts b/apps/web/src/app/settings/appearance.component.spec.ts
new file mode 100644
index 00000000000..53ae9f81a80
--- /dev/null
+++ b/apps/web/src/app/settings/appearance.component.spec.ts
@@ -0,0 +1,215 @@
+import { ComponentFixture, fakeAsync, flush, TestBed } from "@angular/core/testing";
+import { ReactiveFormsModule } from "@angular/forms";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { mock, MockProxy } from "jest-mock-extended";
+import { BehaviorSubject } from "rxjs";
+
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums";
+import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
+
+import { AppearanceComponent } from "./appearance.component";
+
+describe("AppearanceComponent", () => {
+  let component: AppearanceComponent;
+  let fixture: ComponentFixture<AppearanceComponent>;
+  let mockI18nService: MockProxy<I18nService>;
+  let mockThemeStateService: MockProxy<ThemeStateService>;
+  let mockDomainSettingsService: MockProxy<DomainSettingsService>;
+
+  const mockShowFavicons$ = new BehaviorSubject<boolean>(true);
+  const mockSelectedTheme$ = new BehaviorSubject<Theme>(ThemeTypes.Light);
+  const mockUserSetLocale$ = new BehaviorSubject<string | undefined>("en");
+
+  const mockSupportedLocales = ["en", "es", "fr", "de"];
+  const mockLocaleNames = new Map([
+    ["en", "English"],
+    ["es", "Español"],
+    ["fr", "Français"],
+    ["de", "Deutsch"],
+  ]);
+
+  beforeEach(async () => {
+    mockI18nService = mock<I18nService>();
+    mockThemeStateService = mock<ThemeStateService>();
+    mockDomainSettingsService = mock<DomainSettingsService>();
+
+    mockI18nService.supportedTranslationLocales = mockSupportedLocales;
+    mockI18nService.localeNames = mockLocaleNames;
+    mockI18nService.collator = {
+      compare: jest.fn((a: string, b: string) => a.localeCompare(b)),
+    } as any;
+    mockI18nService.t.mockImplementation((key: string) => `${key}-used-i18n`);
+    mockI18nService.userSetLocale$ = mockUserSetLocale$;
+
+    mockThemeStateService.selectedTheme$ = mockSelectedTheme$;
+    mockDomainSettingsService.showFavicons$ = mockShowFavicons$;
+
+    mockDomainSettingsService.setShowFavicons.mockResolvedValue(undefined);
+    mockThemeStateService.setSelectedTheme.mockResolvedValue(undefined);
+    mockI18nService.setLocale.mockResolvedValue(undefined);
+
+    await TestBed.configureTestingModule({
+      imports: [AppearanceComponent, ReactiveFormsModule, NoopAnimationsModule],
+      providers: [
+        { provide: I18nService, useValue: mockI18nService },
+        { provide: ThemeStateService, useValue: mockThemeStateService },
+        { provide: DomainSettingsService, useValue: mockDomainSettingsService },
+      ],
+    })
+      .overrideComponent(AppearanceComponent, {
+        set: {
+          template: "",
+          imports: [],
+        },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AppearanceComponent);
+    component = fixture.componentInstance;
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe("constructor", () => {
+    describe("locale options setup", () => {
+      it("should create locale options sorted by name from supported locales with display names", () => {
+        expect(component.localeOptions).toHaveLength(5);
+        expect(component.localeOptions[0]).toEqual({ name: "default-used-i18n", value: null });
+        expect(component.localeOptions[1]).toEqual({ name: "de - Deutsch", value: "de" });
+        expect(component.localeOptions[2]).toEqual({ name: "en - English", value: "en" });
+        expect(component.localeOptions[3]).toEqual({ name: "es - Español", value: "es" });
+        expect(component.localeOptions[4]).toEqual({ name: "fr - Français", value: "fr" });
+      });
+    });
+
+    describe("theme options setup", () => {
+      it("should create theme options with Light, Dark, and System", () => {
+        expect(component.themeOptions).toEqual([
+          { name: "themeLight-used-i18n", value: ThemeTypes.Light },
+          { name: "themeDark-used-i18n", value: ThemeTypes.Dark },
+          { name: "themeSystem-used-i18n", value: ThemeTypes.System },
+        ]);
+      });
+    });
+  });
+
+  describe("ngOnInit", () => {
+    it("should initialize form with values", fakeAsync(() => {
+      mockShowFavicons$.next(false);
+      mockSelectedTheme$.next(ThemeTypes.Dark);
+      mockUserSetLocale$.next("es");
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.form.value).toEqual({
+        enableFavicons: false,
+        theme: ThemeTypes.Dark,
+        locale: "es",
+      });
+    }));
+
+    it("should set locale to null when user locale not set", fakeAsync(() => {
+      mockUserSetLocale$.next(undefined);
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.form.value.locale).toBeNull();
+    }));
+  });
+
+  describe("enableFavicons value changes", () => {
+    beforeEach(fakeAsync(() => {
+      fixture.detectChanges();
+      flush();
+      jest.clearAllMocks();
+    }));
+
+    it("should call setShowFavicons when enableFavicons changes to true", fakeAsync(() => {
+      component.form.controls.enableFavicons.setValue(true);
+      flush();
+
+      expect(mockDomainSettingsService.setShowFavicons).toHaveBeenCalledWith(true);
+    }));
+
+    it("should call setShowFavicons when enableFavicons changes to false", fakeAsync(() => {
+      component.form.controls.enableFavicons.setValue(false);
+      flush();
+
+      expect(mockDomainSettingsService.setShowFavicons).toHaveBeenCalledWith(false);
+    }));
+
+    it("should not call setShowFavicons when value is null", fakeAsync(() => {
+      component.form.controls.enableFavicons.setValue(null);
+      flush();
+
+      expect(mockDomainSettingsService.setShowFavicons).not.toHaveBeenCalled();
+    }));
+  });
+
+  describe("theme value changes", () => {
+    beforeEach(fakeAsync(() => {
+      fixture.detectChanges();
+      flush();
+      jest.clearAllMocks();
+    }));
+
+    it.each([ThemeTypes.Light, ThemeTypes.Dark, ThemeTypes.System])(
+      "should call setSelectedTheme when theme changes to %s",
+      fakeAsync((themeType: Theme) => {
+        component.form.controls.theme.setValue(themeType);
+        flush();
+
+        expect(mockThemeStateService.setSelectedTheme).toHaveBeenCalledWith(themeType);
+      }),
+    );
+
+    it("should not call setSelectedTheme when value is null", fakeAsync(() => {
+      component.form.controls.theme.setValue(null);
+      flush();
+
+      expect(mockThemeStateService.setSelectedTheme).not.toHaveBeenCalled();
+    }));
+  });
+
+  describe("locale value changes", () => {
+    let reloadMock: jest.Mock;
+
+    beforeEach(fakeAsync(() => {
+      reloadMock = jest.fn();
+      Object.defineProperty(window, "location", {
+        value: { reload: reloadMock },
+        writable: true,
+      });
+
+      fixture.detectChanges();
+      flush();
+      jest.clearAllMocks();
+    }));
+
+    it("should call setLocale and reload window when locale changes to english", fakeAsync(() => {
+      component.form.controls.locale.setValue("es");
+      flush();
+
+      expect(mockI18nService.setLocale).toHaveBeenCalledWith("es");
+      expect(reloadMock).toHaveBeenCalled();
+    }));
+
+    it("should call setLocale and reload window when locale changes to default", fakeAsync(() => {
+      component.form.controls.locale.setValue(null);
+      flush();
+
+      expect(mockI18nService.setLocale).toHaveBeenCalledWith(null);
+      expect(reloadMock).toHaveBeenCalled();
+    }));
+  });
+});
diff --git a/apps/web/src/app/settings/appearance.component.ts b/apps/web/src/app/settings/appearance.component.ts
new file mode 100644
index 00000000000..d1bcf2c28f4
--- /dev/null
+++ b/apps/web/src/app/settings/appearance.component.ts
@@ -0,0 +1,107 @@
+import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormBuilder } from "@angular/forms";
+import { filter, firstValueFrom, switchMap } from "rxjs";
+
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
+import { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";
+
+import { HeaderModule } from "../layouts/header/header.module";
+import { SharedModule } from "../shared";
+
+type LocaleOption = {
+  name: string;
+  value: string | null;
+};
+
+type ThemeOption = {
+  name: string;
+  value: Theme;
+};
+
+@Component({
+  selector: "app-appearance",
+  templateUrl: "appearance.component.html",
+  imports: [SharedModule, HeaderModule, PermitCipherDetailsPopoverComponent],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AppearanceComponent implements OnInit {
+  localeOptions: LocaleOption[];
+  themeOptions: ThemeOption[];
+
+  form = this.formBuilder.group({
+    enableFavicons: true,
+    theme: [ThemeTypes.Light as Theme],
+    locale: [null as string | null],
+  });
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private i18nService: I18nService,
+    private themeStateService: ThemeStateService,
+    private domainSettingsService: DomainSettingsService,
+    private destroyRef: DestroyRef,
+  ) {
+    const localeOptions: LocaleOption[] = [];
+    i18nService.supportedTranslationLocales.forEach((locale) => {
+      let name = locale;
+      if (i18nService.localeNames.has(locale)) {
+        name += " - " + i18nService.localeNames.get(locale);
+      }
+      localeOptions.push({ name: name, value: locale });
+    });
+    localeOptions.sort(Utils.getSortFunction(i18nService, "name"));
+    localeOptions.splice(0, 0, { name: i18nService.t("default"), value: null });
+    this.localeOptions = localeOptions;
+    this.themeOptions = [
+      { name: i18nService.t("themeLight"), value: ThemeTypes.Light },
+      { name: i18nService.t("themeDark"), value: ThemeTypes.Dark },
+      { name: i18nService.t("themeSystem"), value: ThemeTypes.System },
+    ];
+  }
+
+  async ngOnInit() {
+    this.form.setValue(
+      {
+        enableFavicons: await firstValueFrom(this.domainSettingsService.showFavicons$),
+        theme: await firstValueFrom(this.themeStateService.selectedTheme$),
+        locale: (await firstValueFrom(this.i18nService.userSetLocale$)) ?? null,
+      },
+      { emitEvent: false },
+    );
+
+    this.form.controls.enableFavicons.valueChanges
+      .pipe(
+        filter((enableFavicons) => enableFavicons != null),
+        switchMap(async (enableFavicons) => {
+          await this.domainSettingsService.setShowFavicons(enableFavicons);
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe();
+
+    this.form.controls.theme.valueChanges
+      .pipe(
+        filter((theme) => theme != null),
+        switchMap(async (theme) => {
+          await this.themeStateService.setSelectedTheme(theme);
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe();
+
+    this.form.controls.locale.valueChanges
+      .pipe(
+        switchMap(async (locale) => {
+          await this.i18nService.setLocale(locale);
+          window.location.reload();
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe();
+  }
+}
diff --git a/apps/web/src/app/settings/domain-rules.component.ts b/apps/web/src/app/settings/domain-rules.component.ts
index 6c4cb13d5fa..0e9d2f422d9 100644
--- a/apps/web/src/app/settings/domain-rules.component.ts
+++ b/apps/web/src/app/settings/domain-rules.component.ts
@@ -12,6 +12,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { HeaderModule } from "../layouts/header/header.module";
 import { SharedModule } from "../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-domain-rules",
   templateUrl: "domain-rules.component.html",
diff --git a/apps/web/src/app/settings/preferences.component.html b/apps/web/src/app/settings/preferences.component.html
index 050d7395caf..a2e90dd5889 100644
--- a/apps/web/src/app/settings/preferences.component.html
+++ b/apps/web/src/app/settings/preferences.component.html
@@ -2,7 +2,7 @@
 
 <bit-container>
   <p bitTypography="body1">{{ "preferencesDesc" | i18n }}</p>
-  <form [formGroup]="form" [bitSubmit]="submit" class="tw-w-1/2">
+  <form [formGroup]="form" [bitSubmit]="submit" class="tw-w-full tw-max-w-md">
     <bit-callout type="info" *ngIf="vaultTimeoutPolicyCallout | async as policy">
       <span *ngIf="policy.timeout && policy.action">
         {{
@@ -17,12 +17,12 @@
         {{ "vaultTimeoutActionPolicyInEffect" | i18n: (policy.action | i18n) }}
       </span>
     </bit-callout>
-    <auth-vault-timeout-input
+    <bit-session-timeout-input
       [vaultTimeoutOptions]="vaultTimeoutOptions"
       [formControl]="form.controls.vaultTimeout"
       ngDefaultControl
     >
-    </auth-vault-timeout-input>
+    </bit-session-timeout-input>
     <ng-container *ngIf="availableVaultTimeoutActions$ | async as availableVaultTimeoutActions">
       <bit-radio-group
         formControlName="vaultTimeoutAction"
@@ -48,8 +48,8 @@
       </bit-radio-group>
     </ng-container>
     <bit-form-field>
-      <bit-label
-        >{{ "language" | i18n }}
+      <bit-label>
+        {{ "language" | i18n }}
         <a
           bitLink
           class="tw-float-right"
diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts
index 58a072ce76a..4b63e346ea8 100644
--- a/apps/web/src/app/settings/preferences.component.ts
+++ b/apps/web/src/app/settings/preferences.component.ts
@@ -14,7 +14,6 @@ import {
   tap,
 } from "rxjs";
 
-import { VaultTimeoutInputComponent } from "@bitwarden/auth/angular";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/default-policy.service";
@@ -34,18 +33,26 @@ import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { DialogService } from "@bitwarden/components";
+import { SessionTimeoutInputComponent } from "@bitwarden/key-management-ui";
 import { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";
 
 import { HeaderModule } from "../layouts/header/header.module";
 import { SharedModule } from "../shared";
 
+/**
+ * @deprecated Use {@link AppearanceComponent} and {@link SessionTimeoutComponent} instead.
+ *
+ * TODO Cleanup once feature flag enabled: https://bitwarden.atlassian.net/browse/PM-27297
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-preferences",
   templateUrl: "preferences.component.html",
   imports: [
     SharedModule,
     HeaderModule,
-    VaultTimeoutInputComponent,
+    SessionTimeoutInputComponent,
     PermitCipherDetailsPopoverComponent,
   ],
 })
@@ -209,6 +216,8 @@ export class PreferencesComponent implements OnInit, OnDestroy {
       values.vaultTimeout,
       values.vaultTimeoutAction,
     );
+
+    // Save other preferences (theme, locale, favicons)
     await this.domainSettingsService.setShowFavicons(values.enableFavicons);
     await this.themeStateService.setSelectedTheme(values.theme);
     await this.i18nService.setLocale(values.locale);
diff --git a/apps/web/src/app/shared/components/account-fingerprint/account-fingerprint.component.ts b/apps/web/src/app/shared/components/account-fingerprint/account-fingerprint.component.ts
index 256c8d6af34..eb84868dca1 100644
--- a/apps/web/src/app/shared/components/account-fingerprint/account-fingerprint.component.ts
+++ b/apps/web/src/app/shared/components/account-fingerprint/account-fingerprint.component.ts
@@ -6,14 +6,22 @@ import { KeyService } from "@bitwarden/key-management";
 
 import { SharedModule } from "../../shared.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-account-fingerprint",
   templateUrl: "account-fingerprint.component.html",
   imports: [SharedModule],
 })
 export class AccountFingerprintComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() fingerprintMaterial: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() publicKeyBuffer: Uint8Array;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() fingerprintLabel: string;
 
   protected fingerprint: string;
diff --git a/apps/web/src/app/shared/components/onboarding/onboarding-task.component.ts b/apps/web/src/app/shared/components/onboarding/onboarding-task.component.ts
index f9798ec7f0f..277a4d2d26e 100644
--- a/apps/web/src/app/shared/components/onboarding/onboarding-task.component.ts
+++ b/apps/web/src/app/shared/components/onboarding/onboarding-task.component.ts
@@ -2,6 +2,8 @@
 // @ts-strict-ignore
 import { Component, Input } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-onboarding-task",
   templateUrl: "./onboarding-task.component.html",
@@ -11,18 +13,28 @@ import { Component, Input } from "@angular/core";
   standalone: false,
 })
 export class OnboardingTaskComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   completed = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   icon = "bwi-info-circle";
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   title: string;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   route: string | any[];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   isDisabled: boolean = false;
 
diff --git a/apps/web/src/app/shared/components/onboarding/onboarding.component.ts b/apps/web/src/app/shared/components/onboarding/onboarding.component.ts
index 5ead9fcc10b..832e7964cce 100644
--- a/apps/web/src/app/shared/components/onboarding/onboarding.component.ts
+++ b/apps/web/src/app/shared/components/onboarding/onboarding.component.ts
@@ -4,15 +4,23 @@ import { Component, ContentChildren, EventEmitter, Input, Output, QueryList } fr
 
 import { OnboardingTaskComponent } from "./onboarding-task.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-onboarding",
   templateUrl: "./onboarding.component.html",
   standalone: false,
 })
 export class OnboardingComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ContentChildren(OnboardingTaskComponent) tasks: QueryList<OnboardingTaskComponent>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title: string;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() dismiss = new EventEmitter<void>();
 
   protected open = true;
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts
index f7f3aa3bfee..0fff13f428c 100644
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -7,16 +7,6 @@ import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.comp
 import { FreeBitwardenFamiliesComponent } from "../billing/members/free-bitwarden-families.component";
 import { SponsoredFamiliesComponent } from "../billing/settings/sponsored-families.component";
 import { SponsoringOrgRowComponent } from "../billing/settings/sponsoring-org-row.component";
-// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module
-import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../dirt/reports/pages/organizations/exposed-passwords-report.component";
-// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module
-import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../dirt/reports/pages/organizations/inactive-two-factor-report.component";
-// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module
-import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../dirt/reports/pages/organizations/reused-passwords-report.component";
-// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module
-import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../dirt/reports/pages/organizations/unsecured-websites-report.component";
-// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module
-import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../dirt/reports/pages/organizations/weak-passwords-report.component";
 import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
 import { HeaderModule } from "../layouts/header/header.module";
 import { OrganizationBadgeModule } from "../vault/individual-vault/organization-badge/organization-badge.module";
@@ -29,11 +19,6 @@ import { SharedModule } from "./shared.module";
 @NgModule({
   imports: [SharedModule, HeaderModule, OrganizationBadgeModule, PipesModule],
   declarations: [
-    OrgExposedPasswordsReportComponent,
-    OrgInactiveTwoFactorReportComponent,
-    OrgReusedPasswordsReportComponent,
-    OrgUnsecuredWebsitesReportComponent,
-    OrgWeakPasswordsReportComponent,
     RecoverDeleteComponent,
     RecoverTwoFactorComponent,
     RemovePasswordComponent,
diff --git a/apps/web/src/app/tools/credential-generator/credential-generator.component.ts b/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
index 7d62bff0ac1..093afa10bb5 100644
--- a/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
+++ b/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
@@ -9,6 +9,8 @@ import {
 import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
diff --git a/apps/web/src/app/tools/import/import-web.component.ts b/apps/web/src/app/tools/import/import-web.component.ts
index 7883769389f..e7e57870bd9 100644
--- a/apps/web/src/app/tools/import/import-web.component.ts
+++ b/apps/web/src/app/tools/import/import-web.component.ts
@@ -1,14 +1,33 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { ImportComponent } from "@bitwarden/importer-ui";
+import {
+  DefaultImportMetadataService,
+  ImportMetadataServiceAbstraction,
+} from "@bitwarden/importer-core";
+import {
+  ImportComponent,
+  ImporterProviders,
+  SYSTEM_SERVICE_PROVIDER,
+} from "@bitwarden/importer-ui";
+import { safeProvider } from "@bitwarden/ui-common";
 
 import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "import-web.component.html",
   imports: [SharedModule, ImportComponent, HeaderModule],
+  providers: [
+    ...ImporterProviders,
+    safeProvider({
+      provide: ImportMetadataServiceAbstraction,
+      useClass: DefaultImportMetadataService,
+      deps: [SYSTEM_SERVICE_PROVIDER],
+    }),
+  ],
 })
 export class ImportWebComponent {
   protected loading = false;
diff --git a/apps/web/src/app/tools/import/org-import.component.ts b/apps/web/src/app/tools/import/org-import.component.ts
index 8fb5a582b1a..b3e007fed25 100644
--- a/apps/web/src/app/tools/import/org-import.component.ts
+++ b/apps/web/src/app/tools/import/org-import.component.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom, map } from "rxjs";
@@ -11,18 +9,36 @@ import {
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { ImportCollectionServiceAbstraction } from "@bitwarden/importer-core";
-import { ImportComponent } from "@bitwarden/importer-ui";
+import { isId, OrganizationId } from "@bitwarden/common/types/guid";
+import {
+  DefaultImportMetadataService,
+  ImportCollectionServiceAbstraction,
+  ImportMetadataServiceAbstraction,
+} from "@bitwarden/importer-core";
+import {
+  ImportComponent,
+  ImporterProviders,
+  SYSTEM_SERVICE_PROVIDER,
+} from "@bitwarden/importer-ui";
+import { safeProvider } from "@bitwarden/ui-common";
 
 import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 
 import { ImportCollectionAdminService } from "./import-collection-admin.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "org-import.component.html",
   imports: [SharedModule, ImportComponent, HeaderModule],
   providers: [
+    ...ImporterProviders,
+    safeProvider({
+      provide: ImportMetadataServiceAbstraction,
+      useClass: DefaultImportMetadataService,
+      deps: [SYSTEM_SERVICE_PROVIDER],
+    }),
     {
       provide: ImportCollectionServiceAbstraction,
       useClass: ImportCollectionAdminService,
@@ -31,7 +47,7 @@ import { ImportCollectionAdminService } from "./import-collection-admin.service"
   ],
 })
 export class OrgImportComponent implements OnInit {
-  protected routeOrgId: string = null;
+  protected routeOrgId: OrganizationId | undefined = undefined;
   protected loading = false;
   protected disabled = false;
 
@@ -43,7 +59,16 @@ export class OrgImportComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.routeOrgId = this.route.snapshot.paramMap.get("organizationId");
+    const orgIdParam = this.route.snapshot.paramMap.get("organizationId");
+    if (orgIdParam === undefined) {
+      throw new Error("`organizationId` is a required route parameter");
+    }
+
+    if (!isId<OrganizationId>(orgIdParam)) {
+      throw new Error("Invalid OrganizationId provided in route parameter `organizationId`");
+    }
+
+    this.routeOrgId = orgIdParam;
   }
 
   /**
diff --git a/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.ts b/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.ts
index bb72ff75a39..80d1d0e1e12 100644
--- a/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.ts
+++ b/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.ts
@@ -10,6 +10,8 @@ import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { ButtonModule, DialogService, MenuModule } from "@bitwarden/components";
 import { DefaultSendFormConfigService, SendAddEditDialogComponent } from "@bitwarden/send-ui";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-new-send-dropdown",
   templateUrl: "new-send-dropdown.component.html",
@@ -21,6 +23,8 @@ import { DefaultSendFormConfigService, SendAddEditDialogComponent } from "@bitwa
  */
 export class NewSendDropdownComponent {
   /** If true, the plus icon will be hidden */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideIcon: boolean = false;
 
   /** SendType provided for the markup to pass back the selected type of Send */
diff --git a/apps/web/src/app/tools/send/send-access/access.component.html b/apps/web/src/app/tools/send/send-access/access.component.html
index 16c1fcf0747..aec6e2a10b9 100644
--- a/apps/web/src/app/tools/send/send-access/access.component.html
+++ b/apps/web/src/app/tools/send/send-access/access.component.html
@@ -11,12 +11,12 @@
       (setPasswordEvent)="setPassword($event)"
       *ngIf="passwordRequired && !error"
     ></app-send-access-password>
-    <bit-no-items [icon]="sendIcon" class="tw-text-main" *ngIf="unavailable">
-      <ng-container slot="description">{{ "sendAccessUnavailable" | i18n }}</ng-container>
-    </bit-no-items>
-    <bit-no-items [icon]="sendIcon" class="tw-text-main" *ngIf="error">
-      <ng-container slot="description">{{ "unexpectedErrorSend" | i18n }}</ng-container>
-    </bit-no-items>
+    <div class="tw-text-main tw-text-center" *ngIf="unavailable">
+      <p bitTypography="body1">{{ "sendAccessUnavailable" | i18n }}</p>
+    </div>
+    <div class="tw-text-main tw-text-center" *ngIf="error">
+      <p bitTypography="body1">{{ "unexpectedErrorSend" | i18n }}</p>
+    </div>
     <div *ngIf="!passwordRequired && send && !error && !unavailable">
       <p class="tw-text-center">
         <b>{{ send.name }}</b>
diff --git a/apps/web/src/app/tools/send/send-access/access.component.ts b/apps/web/src/app/tools/send/send-access/access.component.ts
index a21644da924..273f1c8c979 100644
--- a/apps/web/src/app/tools/send/send-access/access.component.ts
+++ b/apps/web/src/app/tools/send/send-access/access.component.ts
@@ -4,7 +4,6 @@ import { Component, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 
-import { ActiveSendIcon } from "@bitwarden/assets/svg";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -17,7 +16,7 @@ import { SendAccessResponse } from "@bitwarden/common/tools/send/models/response
 import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view";
 import { SEND_KDF_ITERATIONS } from "@bitwarden/common/tools/send/send-kdf";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
-import { AnonLayoutWrapperDataService, NoItemsModule, ToastService } from "@bitwarden/components";
+import { AnonLayoutWrapperDataService, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
 import { SharedModule } from "../../../shared";
@@ -26,6 +25,8 @@ import { SendAccessFileComponent } from "./send-access-file.component";
 import { SendAccessPasswordComponent } from "./send-access-password.component";
 import { SendAccessTextComponent } from "./send-access-text.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send-access",
   templateUrl: "access.component.html",
@@ -34,7 +35,6 @@ import { SendAccessTextComponent } from "./send-access-text.component";
     SendAccessTextComponent,
     SendAccessPasswordComponent,
     SharedModule,
-    NoItemsModule,
   ],
 })
 export class AccessComponent implements OnInit {
@@ -49,7 +49,6 @@ export class AccessComponent implements OnInit {
   protected hideEmail = false;
   protected decKey: SymmetricCryptoKey;
   protected accessRequest: SendAccessRequest;
-  protected sendIcon = ActiveSendIcon;
 
   protected formGroup = this.formBuilder.group({});
 
diff --git a/apps/web/src/app/tools/send/send-access/send-access-explainer.component.ts b/apps/web/src/app/tools/send/send-access/send-access-explainer.component.ts
index d9f35a3d38e..c5baa98ebbb 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-explainer.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-explainer.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send-access-explainer",
   templateUrl: "send-access-explainer.component.html",
diff --git a/apps/web/src/app/tools/send/send-access/send-access-file.component.ts b/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
index 239861dd244..dc7689f011a 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
@@ -15,14 +15,22 @@ import { ToastService } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send-access-file",
   templateUrl: "send-access-file.component.html",
   imports: [SharedModule],
 })
 export class SendAccessFileComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() send: SendAccessView;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() decKey: SymmetricCryptoKey;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() accessRequest: SendAccessRequest;
   constructor(
     private i18nService: I18nService,
diff --git a/apps/web/src/app/tools/send/send-access/send-access-password.component.ts b/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
index 81e66c8acc4..34b183be10e 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
@@ -6,6 +6,8 @@ import { Subject, takeUntil } from "rxjs";
 
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send-access-password",
   templateUrl: "send-access-password.component.html",
@@ -17,7 +19,11 @@ export class SendAccessPasswordComponent implements OnInit, OnDestroy {
     password: ["", [Validators.required]],
   });
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() loading: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() setPasswordEvent = new EventEmitter<string>();
 
   constructor(private formBuilder: FormBuilder) {}
diff --git a/apps/web/src/app/tools/send/send-access/send-access-text.component.ts b/apps/web/src/app/tools/send/send-access/send-access-text.component.ts
index 2b5405a3f27..794cfbc9678 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-text.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-text.component.ts
@@ -10,6 +10,8 @@ import { ToastService } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send-access-text",
   templateUrl: "send-access-text.component.html",
@@ -34,6 +36,8 @@ export class SendAccessTextComponent {
     return this._send;
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() set send(value: SendAccessView) {
     this._send = value;
     this.showText = this.send.text != null ? !this.send.text.hidden : true;
diff --git a/apps/web/src/app/tools/send/send.component.html b/apps/web/src/app/tools/send/send.component.html
index b79f50311ed..b8538606aec 100644
--- a/apps/web/src/app/tools/send/send.component.html
+++ b/apps/web/src/app/tools/send/send.component.html
@@ -21,7 +21,7 @@
   <div class="tw-col-span-3">
     <div class="tw-border tw-border-solid tw-border-secondary-300 tw-rounded" data-testid="filters">
       <div
-        class="tw-bg-background-alt tw-border-0 tw-border-b tw-border-solid tw-border-secondary-100 tw-rounded-t tw-px-5 tw-py-2.5 tw-font-semibold tw-uppercase"
+        class="tw-bg-background-alt tw-border-0 tw-border-b tw-border-solid tw-border-secondary-100 tw-rounded-t tw-px-5 tw-py-2.5 tw-font-medium tw-uppercase"
         data-testid="filters-header"
       >
         {{ "filters" | i18n }}
diff --git a/apps/web/src/app/tools/send/send.component.ts b/apps/web/src/app/tools/send/send.component.ts
index 20b93a10975..e9ad7aee1f1 100644
--- a/apps/web/src/app/tools/send/send.component.ts
+++ b/apps/web/src/app/tools/send/send.component.ts
@@ -39,6 +39,8 @@ import { NewSendDropdownComponent } from "./new-send/new-send-dropdown.component
 
 const BroadcasterSubscriptionId = "SendComponent";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send",
   imports: [SharedModule, SearchModule, NoItemsModule, HeaderModule, NewSendDropdownComponent],
diff --git a/apps/web/src/app/tools/vault-export/export-web.component.ts b/apps/web/src/app/tools/vault-export/export-web.component.ts
index bf29e83b893..1b11a2dd36f 100644
--- a/apps/web/src/app/tools/vault-export/export-web.component.ts
+++ b/apps/web/src/app/tools/vault-export/export-web.component.ts
@@ -6,6 +6,8 @@ import { ExportComponent } from "@bitwarden/vault-export-ui";
 import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "export-web.component.html",
   imports: [SharedModule, ExportComponent, HeaderModule],
diff --git a/apps/web/src/app/tools/vault-export/org-vault-export.component.ts b/apps/web/src/app/tools/vault-export/org-vault-export.component.ts
index 69dcce52823..19216e9e8e9 100644
--- a/apps/web/src/app/tools/vault-export/org-vault-export.component.ts
+++ b/apps/web/src/app/tools/vault-export/org-vault-export.component.ts
@@ -7,6 +7,8 @@ import { ExportComponent } from "@bitwarden/vault-export-ui";
 import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "org-vault-export.component.html",
   imports: [SharedModule, ExportComponent, HeaderModule],
diff --git a/apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts b/apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts
index 753d2708e60..2b97222fb14 100644
--- a/apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts
+++ b/apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts
@@ -12,6 +12,8 @@ import {
 
 import { SharedModule } from "../../../shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [SharedModule, AssignCollectionsComponent, PluralizePipe],
   templateUrl: "./assign-collections-web.component.html",
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.ts b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.ts
index 005fbb1b14d..2444ed1f707 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.ts
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.ts
@@ -25,6 +25,8 @@ const WebStoreUrls: Partial<Record<DeviceType, string>> = {
     "https://microsoftedge.microsoft.com/addons/detail/jbkfoedolllekgbhcbcoahefnbanhhlh",
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-browser-extension-prompt-install",
   templateUrl: "./browser-extension-prompt-install.component.html",
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 56332cc424b..aff549a84f4 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
@@ -4,13 +4,14 @@
     <p bitTypography="body1" class="tw-mb-0 tw-mt-2">{{ "openingExtension" | i18n }}</p>
   </ng-container>
 
+  @let page = extensionPage$ | async;
   <ng-container *ngIf="pageState === BrowserPromptState.Error">
     <p bitTypography="body1" class="tw-mb-4 tw-text-xl">{{ "openingExtensionError" | i18n }}</p>
     <button
       bitButton
       buttonType="primary"
       type="button"
-      (click)="openExtension()"
+      (click)="openExtension(page)"
       id="bw-extension-prompt-button"
     >
       {{ "openExtension" | i18n }}
@@ -21,7 +22,7 @@
   <ng-container *ngIf="pageState === BrowserPromptState.Success">
     <i class="bwi tw-text-2xl bwi-check-circle tw-text-success-700" aria-hidden="true"></i>
     <p bitTypography="body1" class="tw-mb-4 tw-text-xl">
-      {{ "openedExtensionViewAtRiskPasswords" | i18n }}
+      {{ pageToI18nKeyMap[page] | i18n }}
     </p>
   </ng-container>
 
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
index 1b5b012ab13..b31759a1fe1 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
-import { BehaviorSubject } from "rxjs";
+import { ActivatedRoute } from "@angular/router";
+import { BehaviorSubject, of } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
@@ -16,6 +17,7 @@ describe("BrowserExtensionPromptComponent", () => {
   let component: BrowserExtensionPromptComponent;
   const start = jest.fn();
   const openExtension = jest.fn();
+  const registerPopupUrl = jest.fn();
   const pageState$ = new BehaviorSubject<BrowserPromptState>(BrowserPromptState.Loading);
   const setAttribute = jest.fn();
   const getAttribute = jest.fn().mockReturnValue("width=1010");
@@ -23,6 +25,7 @@ describe("BrowserExtensionPromptComponent", () => {
   beforeEach(async () => {
     start.mockClear();
     openExtension.mockClear();
+    registerPopupUrl.mockClear();
     setAttribute.mockClear();
     getAttribute.mockClear();
 
@@ -41,12 +44,20 @@ describe("BrowserExtensionPromptComponent", () => {
       providers: [
         {
           provide: BrowserExtensionPromptService,
-          useValue: { start, openExtension, pageState$ },
+          useValue: { start, openExtension, registerPopupUrl, pageState$ },
         },
         {
           provide: I18nService,
           useValue: { t: (key: string) => key },
         },
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            queryParamMap: of({
+              get: (key: string) => null,
+            }),
+          },
+        },
       ],
     }).compileComponents();
 
@@ -92,7 +103,7 @@ describe("BrowserExtensionPromptComponent", () => {
       button.click();
 
       expect(openExtension).toHaveBeenCalledTimes(1);
-      expect(openExtension).toHaveBeenCalledWith(true);
+      expect(openExtension).toHaveBeenCalledWith("openAtRiskPasswords", true);
     });
   });
 
@@ -155,8 +166,8 @@ describe("BrowserExtensionPromptComponent", () => {
 
     it("shows manual open error message", () => {
       const manualText = fixture.debugElement.query(By.css("p")).nativeElement;
-      expect(manualText.textContent.trim()).toContain("openExtensionManuallyPart1");
-      expect(manualText.textContent.trim()).toContain("openExtensionManuallyPart2");
+      expect(manualText.textContent.trim()).toContain("openExtensionFromToolbarPart1");
+      expect(manualText.textContent.trim()).toContain("openExtensionFromToolbarPart2");
     });
   });
 });
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 177311cbfde..505a0df5032 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
@@ -1,6 +1,10 @@
 import { CommonModule, DOCUMENT } from "@angular/common";
-import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
+import { Component, Inject, OnDestroy, OnInit, ChangeDetectionStrategy } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ActivatedRoute } from "@angular/router";
+import { map, Observable, of, tap } from "rxjs";
 
+import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
 import { ButtonComponent, IconModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
@@ -14,8 +18,11 @@ import { ManuallyOpenExtensionComponent } from "../manually-open-extension/manua
   selector: "vault-browser-extension-prompt",
   templateUrl: "./browser-extension-prompt.component.html",
   imports: [CommonModule, I18nPipe, ButtonComponent, IconModule, ManuallyOpenExtensionComponent],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class BrowserExtensionPromptComponent implements OnInit, OnDestroy {
+  protected VaultMessages = VaultMessages;
+
   /** Current state of the prompt page */
   protected pageState$ = this.browserExtensionPromptService.pageState$;
 
@@ -25,14 +32,33 @@ export class BrowserExtensionPromptComponent implements OnInit, OnDestroy {
   /** Content of the meta[name="viewport"] element */
   private viewportContent: string | null = null;
 
+  /** Map of extension page identifiers to their i18n keys */
+  protected readonly pageToI18nKeyMap: Record<string, string> = {
+    [VaultMessages.OpenAtRiskPasswords]: "openedExtensionViewAtRiskPasswords",
+    AutoConfirm: "autoConfirmExtensionOpened",
+  } as const;
+
+  protected extensionPage$: Observable<string> = of(VaultMessages.OpenAtRiskPasswords);
+
   constructor(
     private browserExtensionPromptService: BrowserExtensionPromptService,
+    private route: ActivatedRoute,
     @Inject(DOCUMENT) private document: Document,
-  ) {}
+  ) {
+    this.extensionPage$ = this.route.queryParamMap.pipe(
+      map((params) => params.get("url") ?? VaultMessages.OpenAtRiskPasswords),
+    );
+
+    this.extensionPage$
+      .pipe(
+        tap((url) => this.browserExtensionPromptService.registerPopupUrl(url)),
+        takeUntilDestroyed(),
+      )
+      .subscribe();
+  }
 
   ngOnInit(): void {
     this.browserExtensionPromptService.start();
-
     // It is not be uncommon for users to hit this page from a mobile device.
     // There are global styles and the viewport meta tag that set a min-width
     // for the page which cause it to render poorly. Remove them here.
@@ -57,7 +83,7 @@ export class BrowserExtensionPromptComponent implements OnInit, OnDestroy {
     }
   }
 
-  openExtension(): void {
-    this.browserExtensionPromptService.openExtension(true);
+  async openExtension(command: string) {
+    await this.browserExtensionPromptService.openExtension(command, true);
   }
 }
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
index 22c36e51177..d15cdaa712b 100644
--- 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
@@ -1,8 +1,8 @@
-<p bitTypography="body1" class="tw-mb-0 tw-text-xl">
-  {{ "openExtensionManuallyPart1" | i18n }}
+<p bitTypography="body1" class="tw-mb-0">
+  {{ "openExtensionFromToolbarPart1" | i18n }}
   <bit-icon
     [icon]="BitwardenIcon"
-    class="[&>svg]:tw-align-baseline [&>svg]:-tw-mb-[2px]"
+    class="!tw-inline-block [&>svg]:tw-align-baseline [&>svg]:-tw-mb-[0.25rem]"
   ></bit-icon>
-  {{ "openExtensionManuallyPart2" | i18n }}
+  {{ "openExtensionFromToolbarPart2" | 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
index 646ff76311e..435e847f6e9 100644
--- a/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.ts
+++ b/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.ts
@@ -1,10 +1,11 @@
-import { Component } from "@angular/core";
+import { Component, ChangeDetectionStrategy } from "@angular/core";
 
 import { BitwardenIcon } from "@bitwarden/assets/svg";
 import { IconModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
 @Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
   selector: "vault-manually-open-extension",
   templateUrl: "./manually-open-extension.component.html",
   imports: [I18nPipe, IconModule],
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.ts b/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.ts
index 5f4e3f586f5..9237d70b996 100644
--- a/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.ts
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.ts
@@ -16,6 +16,8 @@ export type AddExtensionLaterDialogData = {
   onDismiss: () => void;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-add-extension-later-dialog",
   templateUrl: "./add-extension-later-dialog.component.html",
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 c9c222e8e64..9a974a395f0 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
@@ -6,12 +6,16 @@ import { debounceTime, fromEvent } from "rxjs";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { DarkImageSourceDirective } from "@bitwarden/vault";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-add-extension-videos",
   templateUrl: "./add-extension-videos.component.html",
   imports: [CommonModule, JslibModule, DarkImageSourceDirective],
 })
 export class AddExtensionVideosComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChildren("video", { read: ElementRef }) protected videoElements!: QueryList<
     ElementRef<HTMLVideoElement>
   >;
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 41ee1b4707e..1976321b4ee 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
@@ -6,7 +6,7 @@
 ></i>
 
 <section *ngIf="state === SetupExtensionState.NeedsExtension" class="tw-text-center tw-mt-4">
-  <h1 class="tw-text-xl tw-font-semibold tw-text-main sm:tw-text-2xl">
+  <h1 class="tw-text-xl tw-font-medium tw-text-main sm:tw-text-2xl">
     {{ "setupExtensionPageTitle" | i18n }}
   </h1>
   <h2 class="tw-text-sm tw-text-main tw-mb-6 tw-font-normal sm:tw-text-base">
@@ -29,23 +29,40 @@
   </div>
 </section>
 
-<section *ngIf="state === SetupExtensionState.Success" class="tw-flex tw-flex-col tw-items-center">
+<section *ngIf="showSuccessUI" class="tw-flex tw-flex-col tw-items-center">
   <div class="tw-size-[90px]">
     <bit-icon [icon]="PartyIcon"></bit-icon>
   </div>
-  <h1 bitTypography="h2" class="tw-mb-6 tw-mt-4">{{ "bitwardenExtensionInstalled" | i18n }}</h1>
+  <h1 bitTypography="h2" class="tw-mb-6 tw-mt-4 tw-text-center">
+    {{
+      (state === SetupExtensionState.Success
+        ? "bitwardenExtensionInstalled"
+        : "bitwardenExtensionIsInstalled"
+      ) | i18n
+    }}
+  </h1>
   <div
-    class="tw-flex tw-flex-col tw-rounded-2xl tw-bg-background tw-border tw-border-solid tw-border-secondary-300 tw-p-8"
+    class="tw-flex tw-flex-col tw-rounded-2xl tw-bg-background tw-border tw-border-solid tw-border-secondary-300 tw-p-8 tw-max-w-md md:tw-w-[28rem] tw-text-center"
   >
-    <p>{{ "openExtensionToAutofill" | i18n }}</p>
+    <p>
+      {{ "openExtensionToAutofill" | i18n }}
+    </p>
     <button type="button" bitButton buttonType="primary" class="tw-mb-2" (click)="openExtension()">
       {{ "openBitwardenExtension" | i18n }}
     </button>
     <a bitButton buttonType="secondary" routerLink="/vault">
       {{ "skipToWebApp" | i18n }}
     </a>
+    <div
+      *ngIf="state === SetupExtensionState.ManualOpen"
+      aria-live="polite"
+      class="tw-text-center tw-mt-4"
+    >
+      <vault-manually-open-extension></vault-manually-open-extension>
+    </div>
   </div>
-  <p class="tw-mt-10 tw-max-w-96 tw-text-center">
+
+  <p class="tw-mt-4 tw-max-w-96 tw-text-center">
     {{ "gettingStartedWithBitwardenPart1" | i18n }}
     <a bitLink href="https://bitwarden.com/help/learning-center/">
       {{ "gettingStartedWithBitwardenPart2" | i18n }}
@@ -56,7 +73,3 @@
     </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 3be8251b1d7..ef67e072116 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
@@ -4,7 +4,6 @@ import { Router, RouterModule } from "@angular/router";
 import { BehaviorSubject } from "rxjs";
 
 import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
-import { BrowserExtensionIcon } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { DeviceType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -12,7 +11,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
-import { AnonLayoutWrapperDataService } from "@bitwarden/components";
 
 import { WebBrowserInteractionService } from "../../services/web-browser-interaction.service";
 
@@ -25,14 +23,12 @@ 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();
     window.matchMedia = jest.fn().mockReturnValue(false);
 
     await TestBed.configureTestingModule({
@@ -43,7 +39,6 @@ describe("SetupExtensionComponent", () => {
         { provide: PlatformUtilsService, useValue: { getDevice: () => DeviceType.UnknownBrowser } },
         { provide: SYSTEM_THEME_OBSERVABLE, useValue: new BehaviorSubject("system") },
         { provide: ThemeStateService, useValue: { selectedTheme$: new BehaviorSubject("system") } },
-        { provide: AnonLayoutWrapperDataService, useValue: { setAnonLayoutWrapperData } },
         {
           provide: AccountService,
           useValue: { activeAccount$: new BehaviorSubject({ account: { id: "account-id" } }) },
@@ -93,14 +88,9 @@ describe("SetupExtensionComponent", () => {
   });
 
   describe("extensionInstalled$", () => {
-    it("redirects the user to the vault when the first emitted value is true", () => {
-      extensionInstalled$.next(true);
-
-      expect(navigate).toHaveBeenCalledWith(["/vault"]);
-    });
-
     describe("success state", () => {
       beforeEach(() => {
+        update.mockClear();
         // avoid initial redirect
         extensionInstalled$.next(false);
 
@@ -138,15 +128,6 @@ describe("SetupExtensionComponent", () => {
         tick();
 
         expect(component["state"]).toBe(SetupExtensionState.ManualOpen);
-        expect(setAnonLayoutWrapperData).toHaveBeenCalledWith({
-          pageTitle: {
-            key: "somethingWentWrong",
-          },
-          pageIcon: BrowserExtensionIcon,
-          hideIcon: false,
-          hideCardWrapper: false,
-          maxWidth: "md",
-        });
       }));
     });
   });
diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
index 558f0eb06c9..809e404f5f1 100644
--- a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
@@ -5,7 +5,7 @@ import { Router, RouterModule } from "@angular/router";
 import { firstValueFrom, pairwise, startWith } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { BrowserExtensionIcon, Party } from "@bitwarden/assets/svg";
+import { Party } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -14,8 +14,8 @@ 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,
+  CenterPositionStrategy,
   DialogRef,
   DialogService,
   IconModule,
@@ -36,11 +36,14 @@ export const SetupExtensionState = {
   Loading: "loading",
   NeedsExtension: "needs-extension",
   Success: "success",
+  AlreadyInstalled: "already-installed",
   ManualOpen: "manual-open",
 } as const;
 
 type SetupExtensionState = UnionOfValues<typeof SetupExtensionState>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-setup-extension",
   templateUrl: "./setup-extension.component.html",
@@ -64,7 +67,6 @@ 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 = Party;
@@ -99,9 +101,10 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
     this.webBrowserExtensionInteractionService.extensionInstalled$
       .pipe(takeUntilDestroyed(this.destroyRef), startWith(null), pairwise())
       .subscribe(([previousState, currentState]) => {
-        // Initial state transitioned to extension installed, redirect the user
+        // User landed on the page and the extension is already installed, show already installed state
         if (previousState === null && currentState) {
-          void this.router.navigate(["/vault"]);
+          void this.dismissExtensionPage();
+          this.state = SetupExtensionState.AlreadyInstalled;
         }
 
         // Extension was not installed and now it is, show success state
@@ -139,6 +142,16 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
     }
   }
 
+  get showSuccessUI(): boolean {
+    const successStates = [
+      SetupExtensionState.Success,
+      SetupExtensionState.AlreadyInstalled,
+      SetupExtensionState.ManualOpen,
+    ] as string[];
+
+    return successStates.includes(this.state);
+  }
+
   /** Opens the add extension later dialog */
   addItLater() {
     this.dialogRef = this.dialogService.open<unknown, AddExtensionLaterDialogData>(
@@ -147,6 +160,7 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
         data: {
           onDismiss: this.dismissExtensionPage.bind(this),
         },
+        positionStrategy: new CenterPositionStrategy(),
       },
     );
   }
@@ -155,17 +169,6 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
   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: BrowserExtensionIcon,
-        hideIcon: false,
-        hideCardWrapper: false,
-        maxWidth: "md",
-      });
     });
   }
 
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.spec.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.spec.ts
index e45a82d82ba..6716cde629a 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.spec.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.spec.ts
@@ -6,11 +6,14 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
 import { DialogRef, DIALOG_DATA, DialogService, ToastService } from "@bitwarden/components";
@@ -73,6 +76,7 @@ describe("VaultItemDialogComponent", () => {
         { provide: LogService, useValue: {} },
         { provide: CipherService, useValue: {} },
         { provide: AccountService, useValue: { activeAccount$: { pipe: () => ({}) } } },
+        { provide: ConfigService, useValue: { getFeatureFlag: () => Promise.resolve(false) } },
         { provide: Router, useValue: {} },
         { provide: ActivatedRoute, useValue: {} },
         {
@@ -84,6 +88,8 @@ describe("VaultItemDialogComponent", () => {
         { provide: ApiService, useValue: {} },
         { provide: EventCollectionService, useValue: {} },
         { provide: RoutedVaultFilterService, useValue: {} },
+        { provide: SyncService, useValue: {} },
+        { provide: PlatformUtilsService, useValue: {} },
       ],
     }).compileComponents();
 
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
index b48db2bba91..8508596a67b 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
@@ -48,6 +48,7 @@ import {
   DialogService,
   ItemModule,
   ToastService,
+  CenterPositionStrategy,
 } from "@bitwarden/components";
 import {
   AttachmentDialogCloseResult,
@@ -129,6 +130,8 @@ export const VaultItemDialogResult = {
 
 export type VaultItemDialogResult = UnionOfValues<typeof VaultItemDialogResult>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-item-dialog",
   templateUrl: "vault-item-dialog.component.html",
@@ -159,9 +162,13 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
    * Reference to the dialog content element. Used to scroll to the top of the dialog when switching modes.
    * @protected
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("dialogContent")
   protected dialogContent: ElementRef<HTMLElement>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(CipherFormComponent) cipherFormComponent!: CipherFormComponent;
 
   /**
@@ -325,6 +332,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
       if (this.cipher.decryptionFailure) {
         this.dialogService.open(DecryptionFailureDialogComponent, {
           data: { cipherIds: [this.cipher.id] },
+          positionStrategy: new CenterPositionStrategy(),
         });
         this.dialogRef.close();
         return;
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 2074f380e32..c8732154ef4 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,7 +93,7 @@
       </span>
     </button>
   </bit-menu>
-  @if (!decryptionFailure && !hideMenu) {
+  @if (!decryptionFailure) {
     <button
       [bitMenuTriggerFor]="cipherOptions"
       [disabled]="disabled"
@@ -104,16 +104,18 @@
       label="{{ 'options' | i18n }}"
     ></button>
     <bit-menu #cipherOptions>
-      <ng-container *ngIf="isNotDeletedLoginCipher">
-        <button bitMenuItem type="button" (click)="copy('username')" *ngIf="hasUsernameToCopy">
+      <ng-container *ngIf="isLoginCipher">
+        <button type="button" bitMenuItem appCopyField="username" [cipher]="cipher">
           <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">
+        @if (cipher.viewPassword) {
+          <button bitMenuItem type="button" appCopyField="password" [cipher]="cipher">
+            <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+            {{ "copyPassword" | i18n }}
+          </button>
+        }
+        <button bitMenuItem type="button" appCopyField="totp" [cipher]="cipher">
           <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
           {{ "copyVerificationCode" | i18n }}
         </button>
@@ -130,6 +132,55 @@
         </a>
       </ng-container>
 
+      <ng-container *ngIf="isCardCipher">
+        <button type="button" bitMenuItem appCopyField="cardNumber" [cipher]="cipher">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyNumber" | i18n }}
+        </button>
+        <button type="button" bitMenuItem appCopyField="securityCode" [cipher]="cipher">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copySecurityCode" | i18n }}
+        </button>
+      </ng-container>
+
+      <ng-container *ngIf="isIdentityCipher">
+        <button type="button" bitMenuItem appCopyField="username" [cipher]="cipher">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyUsername" | i18n }}
+        </button>
+        <button type="button" bitMenuItem appCopyField="email" [cipher]="cipher">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyEmail" | i18n }}
+        </button>
+        <button type="button" bitMenuItem appCopyField="phone" [cipher]="cipher">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyPhone" | i18n }}
+        </button>
+        <button type="button" bitMenuItem appCopyField="address" [cipher]="cipher">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyAddress" | i18n }}
+        </button>
+      </ng-container>
+
+      <ng-container *ngIf="isSecureNoteCipher">
+        <button type="button" bitMenuItem appCopyField="secureNote" [cipher]="cipher">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyNote" | i18n }}
+        </button>
+      </ng-container>
+
+      <bit-menu-divider *ngIf="showMenuDivider"></bit-menu-divider>
+
+      @if (!viewingOrgVault) {
+        <button bitMenuItem type="button" (click)="toggleFavorite()">
+          <i class="bwi bwi-fw bwi-star" aria-hidden="true"></i>
+          {{ (cipher.favorite ? "unfavorite" : "favorite") | i18n }}
+        </button>
+      }
+      <button bitMenuItem type="button" (click)="editCipher()" *ngIf="canEditCipher">
+        <i class="bwi bwi-fw bwi-pencil-square" aria-hidden="true"></i>
+        {{ "edit" | i18n }}
+      </button>
       <button bitMenuItem *ngIf="showAttachments" type="button" (click)="attachments()">
         <i class="bwi bwi-fw bwi-paperclip" aria-hidden="true"></i>
         {{ "attachments" | i18n }}
@@ -151,6 +202,20 @@
         <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
         {{ "eventLogs" | i18n }}
       </button>
+      @if (showArchiveButton) {
+        <button bitMenuItem (click)="archive()" type="button">
+          <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
+          {{ "archiveVerb" | i18n }}
+        </button>
+      }
+
+      @if (showUnArchiveButton) {
+        <button bitMenuItem (click)="unarchive()" type="button">
+          <i class="bwi bwi-fw bwi-unarchive" aria-hidden="true"></i>
+          {{ "unArchive" | i18n }}
+        </button>
+      }
+
       <button bitMenuItem (click)="restore()" type="button" *ngIf="isDeleted && canRestoreCipher">
         <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
         {{ "restore" | i18n }}
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.spec.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.spec.ts
new file mode 100644
index 00000000000..d5f7b54f37a
--- /dev/null
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.spec.ts
@@ -0,0 +1,144 @@
+import { OverlayContainer } from "@angular/cdk/overlay";
+import { CommonModule } from "@angular/common";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { RouterModule } from "@angular/router";
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+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";
+import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
+import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+import { IconButtonModule, MenuModule } from "@bitwarden/components";
+import { CopyCipherFieldDirective, CopyCipherFieldService } from "@bitwarden/vault";
+
+import { OrganizationNameBadgeComponent } from "../../individual-vault/organization-badge/organization-name-badge.component";
+
+import { VaultCipherRowComponent } from "./vault-cipher-row.component";
+
+// eslint-disable-next-line no-console
+const originalError = console.error;
+
+// eslint-disable-next-line no-console
+console.error = (...args) => {
+  if (
+    typeof args[0] === "object" &&
+    (args[0] as Error).message.includes("Could not parse CSS stylesheet")
+  ) {
+    // Opening the overlay container in tests causes stylesheets to be parsed,
+    // which can lead to JSDOM unable to parse CSS errors. These can be ignored safely.
+    return;
+  }
+  originalError(...args);
+};
+
+describe("VaultCipherRowComponent", () => {
+  let component: VaultCipherRowComponent<CipherViewLike>;
+  let fixture: ComponentFixture<VaultCipherRowComponent<CipherViewLike>>;
+  let overlayContainer: OverlayContainer;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [VaultCipherRowComponent, OrganizationNameBadgeComponent],
+      imports: [
+        CommonModule,
+        RouterModule.forRoot([]),
+        MenuModule,
+        IconButtonModule,
+        JslibModule,
+        CopyCipherFieldDirective,
+      ],
+      providers: [
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+        {
+          provide: EnvironmentService,
+          useValue: { environment$: new BehaviorSubject({}).asObservable() },
+        },
+        {
+          provide: DomainSettingsService,
+          useValue: { showFavicons$: new BehaviorSubject(false).asObservable() },
+        },
+        { provide: CopyCipherFieldService, useValue: mock<CopyCipherFieldService>() },
+        { provide: AccountService, useValue: mock<AccountService>() },
+        { provide: CipherService, useValue: mock<CipherService>() },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(VaultCipherRowComponent);
+    component = fixture.componentInstance;
+    overlayContainer = TestBed.inject(OverlayContainer);
+  });
+
+  afterEach(() => {
+    overlayContainer?.ngOnDestroy();
+  });
+
+  afterAll(() => {
+    // eslint-disable-next-line no-console
+    console.error = originalError;
+  });
+
+  describe("copy password visibility", () => {
+    let loginCipher: CipherView;
+
+    beforeEach(() => {
+      loginCipher = new CipherView();
+      loginCipher.id = "cipher-1";
+      loginCipher.name = "Test Login";
+      loginCipher.type = CipherType.Login;
+      loginCipher.login = new LoginView();
+      loginCipher.login.password = "test-password";
+      loginCipher.organizationId = undefined;
+      loginCipher.deletedDate = null;
+      loginCipher.archivedDate = null;
+
+      component.cipher = loginCipher;
+      component.disabled = false;
+    });
+
+    const openMenuAndGetContent = (): string => {
+      fixture.detectChanges();
+
+      const menuTrigger = fixture.nativeElement.querySelector(
+        'button[biticonbutton="bwi-ellipsis-v"]',
+      ) as HTMLButtonElement;
+      expect(menuTrigger).toBeTruthy();
+
+      menuTrigger.click();
+      fixture.detectChanges();
+
+      return overlayContainer.getContainerElement().innerHTML;
+    };
+
+    it("renders copy password button in menu when viewPassword is true", () => {
+      component.cipher.viewPassword = true;
+
+      const overlayContent = openMenuAndGetContent();
+
+      expect(overlayContent).toContain('appcopyfield="password"');
+      expect(overlayContent).toContain("copyPassword");
+    });
+
+    it("does not render copy password button in menu when viewPassword is false", () => {
+      component.cipher.viewPassword = false;
+
+      const overlayContent = openMenuAndGetContent();
+
+      expect(overlayContent).not.toContain('appcopyfield="password"');
+    });
+
+    it("does not render copy password button in menu when viewPassword is undefined", () => {
+      component.cipher.viewPassword = undefined;
+
+      const overlayContent = openMenuAndGetContent();
+
+      expect(overlayContent).not.toContain('appcopyfield="password"');
+    });
+  });
+});
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 32037493e36..4ea062db8d1 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
@@ -1,6 +1,14 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import {
+  Component,
+  EventEmitter,
+  HostListener,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+} from "@angular/core";
 
 import { CollectionView } from "@bitwarden/admin-console/common";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -10,6 +18,7 @@ import {
   CipherViewLike,
   CipherViewLikeUtils,
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+import { MenuTriggerForDirective } from "@bitwarden/components";
 
 import {
   convertToPermission,
@@ -18,6 +27,8 @@ import {
 import { VaultItemEvent } from "./vault-item-event";
 import { RowHeightClass } from "./vault-items.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tr[appVaultCipherRow]",
   templateUrl: "vault-cipher-row.component.html",
@@ -26,32 +37,86 @@ import { RowHeightClass } from "./vault-items.component";
 export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit {
   protected RowHeightClass = RowHeightClass;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @ViewChild(MenuTriggerForDirective, { static: false }) menuTrigger: MenuTriggerForDirective;
+
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cipher: C;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showOwner: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showCollections: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showGroups: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showPremiumFeatures: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() useEvents: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cloneable: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizations: Organization[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collections: CollectionView[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() viewingOrgVault: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canEditCipher: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canAssignCollections: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canManageCollection: boolean;
   /**
    * uses new permission delete logic from PM-15493
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canDeleteCipher: boolean;
   /**
    * uses new permission restore logic from PM-15493
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canRestoreCipher: boolean;
+  /**
+   * user has archive permissions
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() userCanArchive: boolean;
+  /**
+   * Enforge Org Data Ownership Policy Status
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() enforceOrgDataOwnershipPolicy: boolean;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEvent = new EventEmitter<VaultItemEvent<C>>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() checked: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() checkedToggled = new EventEmitter<void>();
 
   protected CipherType = CipherType;
@@ -76,6 +141,20 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     }
   }
 
+  protected get showArchiveButton() {
+    return (
+      this.userCanArchive &&
+      !CipherViewLikeUtils.isArchived(this.cipher) &&
+      !CipherViewLikeUtils.isDeleted(this.cipher) &&
+      !this.cipher.organizationId
+    );
+  }
+
+  // If item is archived always show unarchive button, even if user is not premium
+  protected get showUnArchiveButton() {
+    return CipherViewLikeUtils.isArchived(this.cipher);
+  }
+
   protected get clickAction() {
     if (this.decryptionFailure) {
       return "showFailedToDecrypt";
@@ -100,7 +179,12 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     return CipherViewLikeUtils.hasAttachments(this.cipher);
   }
 
+  // Do not show attachments button if:
+  // item is archived AND user is not premium user
   protected get showAttachments() {
+    if (CipherViewLikeUtils.isArchived(this.cipher) && !this.userCanArchive) {
+      return false;
+    }
     return this.canEditCipher || this.hasAttachments;
   }
 
@@ -124,7 +208,11 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     return CipherViewLikeUtils.decryptionFailure(this.cipher);
   }
 
+  // Do Not show Assign to Collections option if item is archived
   protected get showAssignToCollections() {
+    if (CipherViewLikeUtils.isArchived(this.cipher)) {
+      return false;
+    }
     return (
       this.organizations?.length &&
       this.canAssignCollections &&
@@ -132,7 +220,16 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     );
   }
 
+  // Do NOT show clone option if:
+  // item is archived AND user is not premium user
+  // item is archived AND enforce org data ownership policy is on
   protected get showClone() {
+    if (
+      CipherViewLikeUtils.isArchived(this.cipher) &&
+      (!this.userCanArchive || this.enforceOrgDataOwnershipPolicy)
+    ) {
+      return false;
+    }
     return this.cloneable && !CipherViewLikeUtils.isDeleted(this.cipher);
   }
 
@@ -140,10 +237,11 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     return this.useEvents && this.cipher.organizationId;
   }
 
-  protected get isNotDeletedLoginCipher() {
+  protected get isLoginCipher() {
     return (
       CipherViewLikeUtils.getType(this.cipher) === this.CipherType.Login &&
-      !CipherViewLikeUtils.isDeleted(this.cipher)
+      !CipherViewLikeUtils.isDeleted(this.cipher) &&
+      !CipherViewLikeUtils.isArchived(this.cipher)
     );
   }
 
@@ -189,43 +287,63 @@ 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 {
-    const passwordCopy = CipherViewLikeUtils.hasCopyableValue(this.cipher, "password");
-    return this.isNotDeletedLoginCipher && this.cipher.viewPassword && passwordCopy;
-  }
-
-  protected get showCopyTotp(): boolean {
-    return this.isNotDeletedLoginCipher && this.showTotpCopyButton;
-  }
-
-  protected get showLaunchUri(): boolean {
-    return this.isNotDeletedLoginCipher && this.canLaunch;
-  }
-
-  protected get isDeletedCanRestore(): boolean {
-    return CipherViewLikeUtils.isDeleted(this.cipher) && this.canRestoreCipher;
-  }
-
-  protected get hideMenu() {
-    return !(
-      this.isDeletedCanRestore ||
-      this.showCopyUsername ||
-      this.showCopyPassword ||
-      this.showCopyTotp ||
-      this.showLaunchUri ||
-      this.showAttachments ||
-      this.showClone ||
-      this.canEditCipher
+  protected get hasVisibleLoginOptions() {
+    return (
+      this.isLoginCipher &&
+      (CipherViewLikeUtils.hasCopyableValue(this.cipher, "username") ||
+        (this.cipher.viewPassword &&
+          CipherViewLikeUtils.hasCopyableValue(this.cipher, "password")) ||
+        this.showTotpCopyButton ||
+        this.canLaunch)
     );
   }
 
-  protected copy(field: "username" | "password" | "totp") {
-    this.onEvent.emit({ type: "copyField", item: this.cipher, field });
+  protected get isCardCipher(): boolean {
+    return CipherViewLikeUtils.getType(this.cipher) === this.CipherType.Card && !this.isDeleted;
+  }
+
+  protected get hasVisibleCardOptions(): boolean {
+    return (
+      this.isCardCipher &&
+      (CipherViewLikeUtils.hasCopyableValue(this.cipher, "cardNumber") ||
+        CipherViewLikeUtils.hasCopyableValue(this.cipher, "securityCode"))
+    );
+  }
+
+  protected get isIdentityCipher() {
+    return CipherViewLikeUtils.getType(this.cipher) === this.CipherType.Identity && !this.isDeleted;
+  }
+
+  protected get hasVisibleIdentityOptions(): boolean {
+    return (
+      this.isIdentityCipher &&
+      (CipherViewLikeUtils.hasCopyableValue(this.cipher, "address") ||
+        CipherViewLikeUtils.hasCopyableValue(this.cipher, "email") ||
+        CipherViewLikeUtils.hasCopyableValue(this.cipher, "username") ||
+        CipherViewLikeUtils.hasCopyableValue(this.cipher, "phone"))
+    );
+  }
+
+  protected get isSecureNoteCipher() {
+    return (
+      CipherViewLikeUtils.getType(this.cipher) === this.CipherType.SecureNote &&
+      !(this.isDeleted && this.canRestoreCipher)
+    );
+  }
+
+  protected get hasVisibleSecureNoteOptions(): boolean {
+    return (
+      this.isSecureNoteCipher && CipherViewLikeUtils.hasCopyableValue(this.cipher, "secureNote")
+    );
+  }
+
+  protected get showMenuDivider() {
+    return (
+      this.hasVisibleLoginOptions ||
+      this.hasVisibleCardOptions ||
+      this.hasVisibleIdentityOptions ||
+      this.hasVisibleSecureNoteOptions
+    );
   }
 
   protected clone() {
@@ -236,6 +354,14 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     this.onEvent.emit({ type: "viewEvents", item: this.cipher });
   }
 
+  protected archive() {
+    this.onEvent.emit({ type: "archive", items: [this.cipher] });
+  }
+
+  protected unarchive() {
+    this.onEvent.emit({ type: "unarchive", items: [this.cipher] });
+  }
+
   protected restore() {
     this.onEvent.emit({ type: "restore", items: [this.cipher] });
   }
@@ -259,4 +385,26 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
 
     return this.organization.canEditAllCiphers || (this.cipher.edit && this.cipher.viewPassword);
   }
+
+  protected toggleFavorite() {
+    this.onEvent.emit({
+      type: "toggleFavorite",
+      item: this.cipher,
+    });
+  }
+
+  protected editCipher() {
+    this.onEvent.emit({ type: "editCipher", item: this.cipher });
+  }
+
+  @HostListener("contextmenu", ["$event"])
+  protected onRightClick(event: MouseEvent) {
+    if (event.shiftKey && event.ctrlKey) {
+      return;
+    }
+
+    if (!this.disabled && this.menuTrigger) {
+      this.menuTrigger.toggleMenuOnRightClick(event);
+    }
+  }
 }
diff --git a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
index c1955e56903..e351b9f46ce 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
@@ -13,7 +13,12 @@
 </td>
 <td bitCell [ngClass]="RowHeightClass" class="tw-min-w-fit">
   <div aria-hidden="true">
-    <i class="bwi bwi-fw bwi-lg bwi-collection-shared"></i>
+    <i
+      [class]="
+        'bwi bwi-fw bwi-lg ' +
+        (collection.type === DefaultCollectionType ? 'bwi-user' : 'bwi-collection-shared')
+      "
+    ></i>
   </div>
 </td>
 <td bitCell [ngClass]="RowHeightClass">
diff --git a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
index 0e69ea3e567..daa981d509a 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
@@ -1,11 +1,17 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { Component, EventEmitter, HostListener, Input, Output, ViewChild } from "@angular/core";
 
-import { CollectionAdminView, Unassigned, CollectionView } from "@bitwarden/admin-console/common";
+import {
+  CollectionAdminView,
+  Unassigned,
+  CollectionView,
+  CollectionTypes,
+} from "@bitwarden/admin-console/common";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+import { MenuTriggerForDirective } from "@bitwarden/components";
 
 import { GroupView } from "../../../admin-console/organizations/core";
 
@@ -17,6 +23,8 @@ import {
 import { VaultItemEvent } from "./vault-item-event";
 import { RowHeightClass } from "./vault-items.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tr[appVaultCollectionRow]",
   templateUrl: "vault-collection-row.component.html",
@@ -26,22 +34,55 @@ export class VaultCollectionRowComponent<C extends CipherViewLike> {
   protected RowHeightClass = RowHeightClass;
   protected Unassigned = "unassigned";
   protected CollectionPermission = CollectionPermission;
+  protected DefaultCollectionType = CollectionTypes.DefaultUserCollection;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @ViewChild(MenuTriggerForDirective, { static: false }) menuTrigger: MenuTriggerForDirective;
+
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collection: CollectionView;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showOwner: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showCollections: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showGroups: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canEditCollection: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canDeleteCollection: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canViewCollectionInfo: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizations: Organization[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() groups: GroupView[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showPermissionsColumn: boolean;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEvent = new EventEmitter<VaultItemEvent<C>>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() checked: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() checkedToggled = new EventEmitter<void>();
 
   constructor(private i18nService: I18nService) {}
@@ -116,4 +157,15 @@ export class VaultCollectionRowComponent<C extends CipherViewLike> {
   protected deleteCollection() {
     this.onEvent.next({ type: "delete", items: [{ collection: this.collection }] });
   }
+
+  @HostListener("contextmenu", ["$event"])
+  protected onRightClick(event: MouseEvent) {
+    if (event.shiftKey && event.ctrlKey) {
+      return;
+    }
+
+    if (!this.disabled && this.menuTrigger) {
+      this.menuTrigger.toggleMenuOnRightClick(event);
+    }
+  }
 }
diff --git a/apps/web/src/app/vault/components/vault-items/vault-item-event.ts b/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
index 6d84ed5cde1..a4651da69e2 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
@@ -20,4 +20,8 @@ export type VaultItemEvent<C extends CipherViewLike> =
   | { type: "delete"; items: VaultItem<C>[] }
   | { type: "copyField"; item: C; field: "username" | "password" | "totp" }
   | { type: "moveToFolder"; items: C[] }
-  | { type: "assignToCollections"; items: C[] };
+  | { type: "assignToCollections"; items: C[] }
+  | { type: "archive"; items: C[] }
+  | { type: "unarchive"; items: C[] }
+  | { type: "toggleFavorite"; item: C }
+  | { type: "editCipher"; item: C };
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index 5ddccf6a395..cb2af9a64e5 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -12,7 +12,7 @@
             (change)="$event ? toggleAll() : null"
             [checked]="selection.hasValue() && isAllSelected"
           />
-          <label class="tw-mb-0 !tw-font-bold !tw-text-muted" for="checkAll">{{
+          <label class="tw-mb-0 !tw-font-medium !tw-text-muted" for="checkAll">{{
             "all" | i18n
           }}</label>
         </th>
@@ -83,6 +83,22 @@
               <i class="bwi bwi-fw bwi-collection-shared" aria-hidden="true"></i>
               {{ "assignToCollections" | i18n }}
             </button>
+
+            <button *ngIf="bulkArchiveAllowed" type="button" bitMenuItem (click)="bulkArchive()">
+              <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
+              {{ "archiveVerb" | i18n }}
+            </button>
+
+            <button
+              *ngIf="bulkUnarchiveAllowed"
+              type="button"
+              bitMenuItem
+              (click)="bulkUnarchive()"
+            >
+              <i class="bwi bwi-fw bwi-unarchive" aria-hidden="true"></i>
+              {{ "unArchive" | i18n }}
+            </button>
+
             <button
               *ngIf="canRestoreSelected$ | async"
               type="button"
@@ -146,7 +162,7 @@
           [showPremiumFeatures]="showPremiumFeatures"
           [useEvents]="useEvents"
           [viewingOrgVault]="viewingOrgVault"
-          [cloneable]="canClone(item)"
+          [cloneable]="canClone$(item) | async"
           [organizations]="allOrganizations"
           [collections]="allCollections"
           [checked]="selection.isSelected(item)"
@@ -161,6 +177,8 @@
           "
           (checkedToggled)="selection.toggle(item)"
           (onEvent)="event($event)"
+          [userCanArchive]="userCanArchive"
+          [enforceOrgDataOwnershipPolicy]="enforceOrgDataOwnershipPolicy"
         ></tr>
       </ng-container>
     </ng-template>
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.spec.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.spec.ts
new file mode 100644
index 00000000000..902fc2eb5a2
--- /dev/null
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.spec.ts
@@ -0,0 +1,139 @@
+import { ScrollingModule } from "@angular/cdk/scrolling";
+import { TestBed } from "@angular/core/testing";
+import { of } from "rxjs";
+
+import { CollectionView } from "@bitwarden/admin-console/common";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+import { MenuModule, TableModule } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import { VaultItem } from "./vault-item";
+import { VaultItemsComponent } from "./vault-items.component";
+
+describe("VaultItemsComponent", () => {
+  let component: VaultItemsComponent<CipherViewLike>;
+
+  const cipher1: Partial<CipherView> = {
+    id: "cipher-1",
+    name: "Cipher 1",
+    organizationId: undefined,
+  };
+
+  const cipher2: Partial<CipherView> = {
+    id: "cipher-2",
+    name: "Cipher 2",
+    organizationId: undefined,
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [VaultItemsComponent],
+      imports: [ScrollingModule, TableModule, I18nPipe, MenuModule],
+      providers: [
+        {
+          provide: CipherAuthorizationService,
+          useValue: {
+            canDeleteCipher$: jest.fn(),
+            canRestoreCipher$: jest.fn(),
+          },
+        },
+        {
+          provide: RestrictedItemTypesService,
+          useValue: {
+            restricted$: of([]),
+            isCipherRestricted: jest.fn().mockReturnValue(false),
+          },
+        },
+        {
+          provide: I18nService,
+          useValue: {
+            t: (key: string) => key,
+          },
+        },
+      ],
+    });
+
+    const fixture = TestBed.createComponent(VaultItemsComponent);
+    component = fixture.componentInstance;
+  });
+
+  describe("bulkUnarchiveAllowed", () => {
+    it("returns false when no items are selected", () => {
+      component["selection"].clear();
+
+      expect(component.bulkUnarchiveAllowed).toBe(false);
+    });
+
+    it("returns false when selecting collections only", () => {
+      const collection1 = { id: "col-1", name: "Collection 1" } as CollectionView;
+      const collection2 = { id: "col-2", name: "Collection 2" } as CollectionView;
+
+      const items: VaultItem<CipherView>[] = [
+        { collection: collection1 },
+        { collection: collection2 },
+      ];
+
+      component["selection"].select(...items);
+
+      expect(component.bulkUnarchiveAllowed).toBe(false);
+    });
+
+    it("returns true when selecting archived ciphers without organization", () => {
+      const archivedCipher1 = {
+        ...cipher1,
+        archivedDate: new Date("2024-01-01"),
+      };
+      const archivedCipher2 = {
+        ...cipher2,
+        archivedDate: new Date("2024-01-02"),
+      };
+
+      const items: VaultItem<CipherView>[] = [
+        { cipher: archivedCipher1 as CipherView },
+        { cipher: archivedCipher2 as CipherView },
+      ];
+
+      component["selection"].select(...items);
+
+      expect(component.bulkUnarchiveAllowed).toBe(true);
+    });
+
+    it("returns false when any selected cipher has an organizationId", () => {
+      const archivedCipher1: Partial<CipherView> = {
+        ...cipher1,
+        archivedDate: new Date("2024-01-01"),
+        organizationId: undefined,
+      };
+
+      const archivedCipher2: Partial<CipherView> = {
+        ...cipher2,
+        archivedDate: new Date("2024-01-02"),
+        organizationId: "org-1",
+      };
+
+      const items: VaultItem<CipherView>[] = [
+        { cipher: archivedCipher1 as CipherView },
+        { cipher: archivedCipher2 as CipherView },
+      ];
+
+      component["selection"].select(...items);
+
+      expect(component.bulkUnarchiveAllowed).toBe(false);
+    });
+
+    it("returns false when any selected cipher is not archived", () => {
+      const items: VaultItem<CipherView>[] = [
+        { cipher: cipher1 as CipherView },
+        { cipher: cipher2 as CipherView },
+      ];
+
+      component["selection"].select(...items);
+
+      expect(component.bulkUnarchiveAllowed).toBe(false);
+    });
+  });
+});
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 a5bcb915713..3ab643927f1 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
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { SelectionModel } from "@angular/cdk/collections";
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { toSignal, takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Observable, combineLatest, map, of, startWith, switchMap } from "rxjs";
 
 import { CollectionView, Unassigned, CollectionAdminView } from "@bitwarden/admin-console/common";
@@ -17,6 +17,7 @@ import {
   CipherViewLikeUtils,
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 import { SortDirection, TableDataSource } from "@bitwarden/components";
+import { OrganizationId } from "@bitwarden/sdk-internal";
 
 import { GroupView } from "../../../admin-console/organizations/core";
 
@@ -35,6 +36,8 @@ const MaxSelectionCount = 500;
 
 type ItemPermission = CollectionPermission | "NoAccess";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-items",
   templateUrl: "vault-items.component.html",
@@ -43,30 +46,74 @@ type ItemPermission = CollectionPermission | "NoAccess";
 export class VaultItemsComponent<C extends CipherViewLike> {
   protected RowHeight = RowHeight;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showOwner: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showCollections: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showGroups: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() useEvents: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showPremiumFeatures: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showBulkMove: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showBulkTrashOptions: boolean;
   // Encompasses functionality only available from the organization vault context
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showAdminActions = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() allOrganizations: Organization[] = [];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() allCollections: CollectionView[] = [];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() allGroups: GroupView[] = [];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showBulkEditCollectionAccess = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showBulkAddToCollections = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showPermissionsColumn = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() viewingOrgVault: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() addAccessStatus: number;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() addAccessToggle: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeCollection: CollectionView | undefined;
-
-  private restrictedPolicies = toSignal(this.restrictedItemTypesService.restricted$);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() userCanArchive: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() enforceOrgDataOwnershipPolicy: boolean;
 
   private _ciphers?: C[] = [];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() get ciphers(): C[] {
     return this._ciphers;
   }
@@ -76,6 +123,8 @@ export class VaultItemsComponent<C extends CipherViewLike> {
   }
 
   private _collections?: CollectionView[] = [];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() get collections(): CollectionView[] {
     return this._collections;
   }
@@ -84,6 +133,8 @@ export class VaultItemsComponent<C extends CipherViewLike> {
     this.refreshItems();
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEvent = new EventEmitter<VaultItemEvent<C>>();
 
   protected editableItems: VaultItem<C>[] = [];
@@ -190,6 +241,30 @@ export class VaultItemsComponent<C extends CipherViewLike> {
     );
   }
 
+  get bulkArchiveAllowed() {
+    if (this.selection.selected.length === 0 || !this.userCanArchive) {
+      return false;
+    }
+
+    return (
+      this.userCanArchive &&
+      !this.selection.selected.find(
+        (item) => item.cipher && (item.cipher.organizationId || item.cipher.archivedDate),
+      )
+    );
+  }
+
+  // Bulk Unarchive button should appear for Archive vault even if user does not have archive permissions
+  get bulkUnarchiveAllowed() {
+    if (this.selection.selected.length === 0) {
+      return false;
+    }
+
+    return !this.selection.selected.find(
+      (item) => !item.cipher?.archivedDate || item.cipher?.organizationId,
+    );
+  }
+
   //@TODO: remove this function when removing the limitItemDeletion$ feature flag.
   get showDelete(): boolean {
     if (this.selection.selected.length === 0) {
@@ -220,7 +295,17 @@ export class VaultItemsComponent<C extends CipherViewLike> {
   }
 
   get bulkAssignToCollectionsAllowed() {
-    return this.showBulkAddToCollections && this.ciphers.length > 0;
+    return (
+      this.showBulkAddToCollections &&
+      this.ciphers.length > 0 &&
+      !this.anySelectedCiphersAreArchived
+    );
+  }
+
+  get anySelectedCiphersAreArchived() {
+    return this.selection.selected.some(
+      (item) => item.cipher && CipherViewLikeUtils.isArchived(item.cipher),
+    );
   }
 
   protected canEditCollection(collection: CollectionView): boolean {
@@ -269,6 +354,24 @@ export class VaultItemsComponent<C extends CipherViewLike> {
     });
   }
 
+  protected bulkArchive() {
+    this.event({
+      type: "archive",
+      items: this.selection.selected
+        .filter((item) => item.cipher !== undefined)
+        .map((item) => item.cipher),
+    });
+  }
+
+  protected bulkUnarchive() {
+    this.event({
+      type: "unarchive",
+      items: this.selection.selected
+        .filter((item) => item.cipher !== undefined)
+        .map((item) => item.cipher),
+    });
+  }
+
   protected bulkRestore() {
     this.event({
       type: "restore",
@@ -285,37 +388,22 @@ export class VaultItemsComponent<C extends CipherViewLike> {
     });
   }
 
-  // TODO: PM-13944 Refactor to use cipherAuthorizationService.canClone$ instead
-  protected canClone(vaultItem: VaultItem<C>) {
-    // This will check for restrictions from org policies before allowing cloning.
-    const isItemRestricted = this.restrictedPolicies().some(
-      (rt) => rt.cipherType === CipherViewLikeUtils.getType(vaultItem.cipher),
+  protected canClone$(vaultItem: VaultItem<C>): Observable<boolean> {
+    return this.restrictedItemTypesService.restricted$.pipe(
+      switchMap((restrictedTypes) => {
+        // This will check for restrictions from org policies before allowing cloning.
+        const isItemRestricted = restrictedTypes.some(
+          (rt) => rt.cipherType === CipherViewLikeUtils.getType(vaultItem.cipher),
+        );
+        if (isItemRestricted) {
+          return of(false);
+        }
+        return this.cipherAuthorizationService.canCloneCipher$(
+          vaultItem.cipher,
+          this.showAdminActions,
+        );
+      }),
     );
-    if (isItemRestricted) {
-      return false;
-    }
-
-    if (vaultItem.cipher.organizationId == null) {
-      return true;
-    }
-
-    const org = this.allOrganizations.find((o) => o.id === vaultItem.cipher.organizationId);
-
-    // Admins and custom users can always clone in the Org Vault
-    if (this.viewingOrgVault && (org.isAdmin || org.permissions.editAnyCollection)) {
-      return true;
-    }
-
-    // Check if the cipher belongs to a collection with canManage permission
-    const orgCollections = this.allCollections.filter((c) => c.organizationId === org.id);
-
-    for (const collection of orgCollections) {
-      if (vaultItem.cipher.collectionIds.includes(collection.id as any) && collection.manage) {
-        return true;
-      }
-    }
-
-    return false;
   }
 
   protected canEditCipher(cipher: C) {
@@ -579,7 +667,7 @@ export class VaultItemsComponent<C extends CipherViewLike> {
       .every(({ cipher }) => cipher?.edit && cipher?.viewPassword);
   }
 
-  private getUniqueOrganizationIds(): Set<string> {
+  private getUniqueOrganizationIds(): Set<string | [] | OrganizationId> {
     return new Set(this.selection.selected.flatMap((i) => i.cipher?.organizationId ?? []));
   }
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.module.ts b/apps/web/src/app/vault/components/vault-items/vault-items.module.ts
index ab4f8bddb16..a3a92559878 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.module.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.module.ts
@@ -4,6 +4,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 
 import { ScrollLayoutDirective, TableModule } from "@bitwarden/components";
+import { CopyCipherFieldDirective } from "@bitwarden/vault";
 
 import { CollectionNameBadgeComponent } from "../../../admin-console/organizations/collections";
 import { GroupBadgeModule } from "../../../admin-console/organizations/collections/group-badge/group-badge.module";
@@ -26,6 +27,7 @@ import { VaultItemsComponent } from "./vault-items.component";
     CollectionNameBadgeComponent,
     GroupBadgeModule,
     PipesModule,
+    CopyCipherFieldDirective,
     ScrollLayoutDirective,
   ],
   declarations: [VaultItemsComponent, VaultCipherRowComponent, VaultCollectionRowComponent],
diff --git a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
index afb32738901..82eb1180961 100644
--- a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
+++ b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
@@ -16,14 +16,26 @@ import {
   WebVaultGeneratorDialogResult,
 } from "./web-generator-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-cipher-form-generator",
   template: "",
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
 class MockCipherFormGenerator {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() type: "password" | "username" = "password";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() algorithmSelected: EventEmitter<AlgorithmInfo> = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() uri?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() valueGenerated = new EventEmitter<string>();
 }
 
diff --git a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.ts b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.ts
index 7454b4d10f0..957f72015a5 100644
--- a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.ts
+++ b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.ts
@@ -34,6 +34,8 @@ export const WebVaultGeneratorDialogAction = {
 
 type WebVaultGeneratorDialogAction = UnionOfValues<typeof WebVaultGeneratorDialogAction>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "web-vault-generator-dialog",
   templateUrl: "./web-generator-dialog.component.html",
diff --git a/apps/web/src/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard.spec.ts b/apps/web/src/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard.spec.ts
new file mode 100644
index 00000000000..f0f3af47150
--- /dev/null
+++ b/apps/web/src/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard.spec.ts
@@ -0,0 +1,88 @@
+import { TestBed } from "@angular/core/testing";
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from "@angular/router";
+import { BehaviorSubject } from "rxjs";
+
+import { PremiumInterestStateService } from "@bitwarden/angular/billing/services/premium-interest/premium-interest-state.service.abstraction";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+
+import { premiumInterestRedirectGuard } from "./premium-interest-redirect.guard";
+
+describe("premiumInterestRedirectGuard", () => {
+  const _state = Object.freeze({}) as RouterStateSnapshot;
+  const emptyRoute = Object.freeze({ queryParams: {} }) as ActivatedRouteSnapshot;
+
+  const account = {
+    id: "account-id",
+  } as Account;
+
+  const activeAccount$ = new BehaviorSubject<Account | null>(account);
+  const createUrlTree = jest.fn();
+  const getPremiumInterest = jest.fn().mockResolvedValue(false);
+  const logError = jest.fn();
+
+  beforeEach(() => {
+    getPremiumInterest.mockClear();
+    createUrlTree.mockClear();
+    logError.mockClear();
+    activeAccount$.next(account);
+
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: Router, useValue: { createUrlTree } },
+        { provide: AccountService, useValue: { activeAccount$ } },
+        {
+          provide: PremiumInterestStateService,
+          useValue: { getPremiumInterest },
+        },
+        { provide: LogService, useValue: { error: logError } },
+      ],
+    });
+  });
+
+  function runPremiumInterestGuard(route?: ActivatedRouteSnapshot) {
+    // Run the guard within injection context so `inject` works as you'd expect
+    // Pass state object to make TypeScript happy
+    return TestBed.runInInjectionContext(async () =>
+      premiumInterestRedirectGuard(route ?? emptyRoute, _state),
+    );
+  }
+
+  it("returns `true` when the user does not intend to setup premium", async () => {
+    getPremiumInterest.mockResolvedValueOnce(false);
+
+    expect(await runPremiumInterestGuard()).toBe(true);
+  });
+
+  it("redirects to premium subscription page when user intends to setup premium", async () => {
+    const urlTree = { toString: () => "/settings/subscription/premium" };
+    createUrlTree.mockReturnValueOnce(urlTree);
+    getPremiumInterest.mockResolvedValueOnce(true);
+
+    const result = await runPremiumInterestGuard();
+
+    expect(createUrlTree).toHaveBeenCalledWith(["/settings/subscription/premium"], {
+      queryParams: { callToAction: "upgradeToPremium" },
+    });
+    expect(result).toBe(urlTree);
+  });
+
+  it("redirects to login when active account is missing", async () => {
+    const urlTree = { toString: () => "/login" };
+    createUrlTree.mockReturnValueOnce(urlTree);
+    activeAccount$.next(null);
+
+    const result = await runPremiumInterestGuard();
+
+    expect(createUrlTree).toHaveBeenCalledWith(["/login"]);
+    expect(result).toBe(urlTree);
+  });
+
+  it("returns `true` and logs error when getPremiumInterest throws an error", async () => {
+    const error = new Error("Premium interest check failed");
+    getPremiumInterest.mockRejectedValueOnce(error);
+
+    expect(await runPremiumInterestGuard()).toBe(true);
+    expect(logError).toHaveBeenCalledWith("Error in premiumInterestRedirectGuard", error);
+  });
+});
diff --git a/apps/web/src/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard.ts b/apps/web/src/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard.ts
new file mode 100644
index 00000000000..0fb0d744304
--- /dev/null
+++ b/apps/web/src/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard.ts
@@ -0,0 +1,37 @@
+import { inject } from "@angular/core";
+import { CanActivateFn, Router } from "@angular/router";
+import { firstValueFrom } from "rxjs";
+
+import { PremiumInterestStateService } from "@bitwarden/angular/billing/services/premium-interest/premium-interest-state.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+
+export const premiumInterestRedirectGuard: CanActivateFn = async () => {
+  const router = inject(Router);
+  const accountService = inject(AccountService);
+  const premiumInterestStateService = inject(PremiumInterestStateService);
+  const logService = inject(LogService);
+
+  try {
+    const currentAcct = await firstValueFrom(accountService.activeAccount$);
+
+    if (!currentAcct) {
+      return router.createUrlTree(["/login"]);
+    }
+
+    const intendsToSetupPremium = await premiumInterestStateService.getPremiumInterest(
+      currentAcct.id,
+    );
+
+    if (intendsToSetupPremium) {
+      return router.createUrlTree(["/settings/subscription/premium"], {
+        queryParams: { callToAction: "upgradeToPremium" },
+      });
+    }
+
+    return true;
+  } catch (error) {
+    logService.error("Error in premiumInterestRedirectGuard", error);
+    return true;
+  }
+};
diff --git a/apps/web/src/app/vault/guards/setup-extension-redirect.guard.spec.ts b/apps/web/src/app/vault/guards/setup-extension-redirect.guard.spec.ts
index 14f6763dbf9..7520451df34 100644
--- a/apps/web/src/app/vault/guards/setup-extension-redirect.guard.spec.ts
+++ b/apps/web/src/app/vault/guards/setup-extension-redirect.guard.spec.ts
@@ -82,13 +82,6 @@ describe("setupExtensionRedirectGuard", () => {
     expect(await setupExtensionGuard()).toBe(true);
   });
 
-  it("returns `true` when the user has the extension installed", async () => {
-    state$.next(false);
-    extensionInstalled$.next(true);
-
-    expect(await setupExtensionGuard()).toBe(true);
-  });
-
   it('redirects the user to "/setup-extension" when all criteria do not pass', async () => {
     state$.next(false);
     extensionInstalled$.next(false);
diff --git a/apps/web/src/app/vault/guards/setup-extension-redirect.guard.ts b/apps/web/src/app/vault/guards/setup-extension-redirect.guard.ts
index 5355ebf7232..0c9e31ae77f 100644
--- a/apps/web/src/app/vault/guards/setup-extension-redirect.guard.ts
+++ b/apps/web/src/app/vault/guards/setup-extension-redirect.guard.ts
@@ -11,8 +11,6 @@ import {
   UserKeyDefinition,
 } from "@bitwarden/common/platform/state";
 
-import { WebBrowserInteractionService } from "../services/web-browser-interaction.service";
-
 export const SETUP_EXTENSION_DISMISSED = new UserKeyDefinition<boolean>(
   SETUP_EXTENSION_DISMISSED_DISK,
   "setupExtensionDismissed",
@@ -27,7 +25,6 @@ export const setupExtensionRedirectGuard: CanActivateFn = async () => {
   const accountService = inject(AccountService);
   const vaultProfileService = inject(VaultProfileService);
   const stateProvider = inject(StateProvider);
-  const webBrowserInteractionService = inject(WebBrowserInteractionService);
 
   const isMobile = Utils.isMobileBrowser;
 
@@ -43,10 +40,6 @@ export const setupExtensionRedirectGuard: CanActivateFn = async () => {
     return router.createUrlTree(["/login"]);
   }
 
-  const hasExtensionInstalledPromise = firstValueFrom(
-    webBrowserInteractionService.extensionInstalled$,
-  );
-
   const dismissedExtensionPage = await firstValueFrom(
     stateProvider
       .getUser(currentAcct.id, SETUP_EXTENSION_DISMISSED)
@@ -66,13 +59,6 @@ export const setupExtensionRedirectGuard: CanActivateFn = async () => {
     return true;
   }
 
-  // Checking for the extension is a more expensive operation, do it last to avoid unnecessary delays.
-  const hasExtensionInstalled = await hasExtensionInstalledPromise;
-
-  if (hasExtensionInstalled) {
-    return true;
-  }
-
   return router.createUrlTree(["/setup-extension"]);
 };
 
diff --git a/apps/web/src/app/vault/individual-vault/add-edit-v2.component.ts b/apps/web/src/app/vault/individual-vault/add-edit-v2.component.ts
index c09238e7953..5277d4a0aea 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit-v2.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit-v2.component.ts
@@ -62,6 +62,8 @@ export interface AddEditCipherDialogCloseResult {
  * Component for viewing a cipher, presented in a dialog.
  * @deprecated Use the VaultItemDialogComponent instead.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-add-edit-v2",
   templateUrl: "add-edit-v2.component.html",
@@ -76,6 +78,8 @@ export interface AddEditCipherDialogCloseResult {
   ],
   providers: [{ provide: CipherFormGenerationService, useClass: WebCipherFormGenerationService }],
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28231): Use Component suffix
+// eslint-disable-next-line @angular-eslint/component-class-suffix
 export class AddEditComponentV2 implements OnInit {
   config: CipherFormConfig;
   headerText: string;
diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
index 78abad1ebf8..5f139ade144 100644
--- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
+++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
@@ -14,6 +14,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { CipherBulkDeleteRequest } from "@bitwarden/common/vault/models/request/cipher-bulk-delete.request";
 import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
+  CenterPositionStrategy,
   DIALOG_DATA,
   DialogConfig,
   DialogRef,
@@ -48,10 +49,15 @@ export const openBulkDeleteDialog = (
 ) => {
   return dialogService.open<BulkDeleteDialogResult, BulkDeleteDialogParams>(
     BulkDeleteDialogComponent,
-    config,
+    {
+      positionStrategy: new CenterPositionStrategy(),
+      ...config,
+    },
   );
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "bulk-delete-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts
index ef43a3ead81..f76e505f87d 100644
--- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts
+++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts
@@ -46,6 +46,8 @@ export const openBulkMoveDialog = (
   );
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "bulk-move-dialog.component.html",
   standalone: false,
diff --git a/apps/web/src/app/vault/individual-vault/organization-badge/organization-name-badge.component.ts b/apps/web/src/app/vault/individual-vault/organization-badge/organization-name-badge.component.ts
index 79fae4d5b1f..19c462193e1 100644
--- a/apps/web/src/app/vault/individual-vault/organization-badge/organization-name-badge.component.ts
+++ b/apps/web/src/app/vault/individual-vault/organization-badge/organization-name-badge.component.ts
@@ -10,14 +10,22 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { OrganizationId } from "@bitwarden/sdk-internal";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-badge",
   templateUrl: "organization-name-badge.component.html",
   standalone: false,
 })
 export class OrganizationNameBadgeComponent implements OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationId?: OrganizationId | string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationName: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled: boolean;
 
   // Need a separate variable or we get weird behavior when used as part of cdk virtual scrolling
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
index c97b23b1456..6b46cd89956 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
@@ -1,26 +1,17 @@
 import { TestBed } from "@angular/core/testing";
-import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject, firstValueFrom, of, take, timeout } from "rxjs";
+import { BehaviorSubject, firstValueFrom, take, timeout } from "rxjs";
 
-import {
-  AuthRequestServiceAbstraction,
-  UserDecryptionOptions,
-  UserDecryptionOptionsServiceAbstraction,
-} from "@bitwarden/auth/common";
+import { AuthRequestServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
-import { DeviceView } from "@bitwarden/common/auth/abstractions/devices/views/device.view";
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { DeviceType } from "@bitwarden/common/enums";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { FakeStateProvider, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { UserId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { KdfConfigService, KdfType } from "@bitwarden/key-management";
 
 import {
   PREMIUM_BANNER_REPROMPT_KEY,
@@ -36,23 +27,15 @@ describe("VaultBannersService", () => {
   const fakeStateProvider = new FakeStateProvider(mockAccountServiceWith(userId));
   const getEmailVerified = jest.fn().mockResolvedValue(true);
   const lastSync$ = new BehaviorSubject<Date | null>(null);
-  const userDecryptionOptions$ = new BehaviorSubject<UserDecryptionOptions>({
-    hasMasterPassword: true,
-  });
-  const kdfConfig$ = new BehaviorSubject({ kdfType: KdfType.PBKDF2_SHA256, iterations: 600000 });
   const accounts$ = new BehaviorSubject<Record<UserId, AccountInfo>>({
     [userId]: { email: "test@bitwarden.com", emailVerified: true, name: "name" } as AccountInfo,
   });
-  const devices$ = new BehaviorSubject<DeviceView[]>([]);
   const pendingAuthRequests$ = new BehaviorSubject<Array<AuthRequestResponse>>([]);
-  let configService: MockProxy<ConfigService>;
 
   beforeEach(() => {
     lastSync$.next(new Date("2024-05-14"));
     isSelfHost.mockClear();
     getEmailVerified.mockClear().mockResolvedValue(true);
-    configService = mock<ConfigService>();
-    configService.getFeatureFlag$.mockImplementation(() => of(true));
 
     TestBed.configureTestingModule({
       providers: [
@@ -69,40 +52,18 @@ describe("VaultBannersService", () => {
           provide: StateProvider,
           useValue: fakeStateProvider,
         },
-        {
-          provide: PlatformUtilsService,
-          useValue: { isSelfHost },
-        },
         {
           provide: AccountService,
           useValue: { accounts$ },
         },
-        {
-          provide: KdfConfigService,
-          useValue: { getKdfConfig$: () => kdfConfig$ },
-        },
         {
           provide: SyncService,
           useValue: { lastSync$: () => lastSync$ },
         },
-        {
-          provide: UserDecryptionOptionsServiceAbstraction,
-          useValue: {
-            userDecryptionOptionsById$: () => userDecryptionOptions$,
-          },
-        },
-        {
-          provide: DevicesServiceAbstraction,
-          useValue: { getDevices$: () => devices$ },
-        },
         {
           provide: AuthRequestServiceAbstraction,
           useValue: { getPendingAuthRequests$: () => pendingAuthRequests$ },
         },
-        {
-          provide: ConfigService,
-          useValue: configService,
-        },
       ],
     });
   });
@@ -206,45 +167,6 @@ describe("VaultBannersService", () => {
     });
   });
 
-  describe("KDFSettings", () => {
-    beforeEach(async () => {
-      userDecryptionOptions$.next({ hasMasterPassword: true });
-      kdfConfig$.next({ kdfType: KdfType.PBKDF2_SHA256, iterations: 599999 });
-    });
-
-    it("shows low KDF iteration banner", async () => {
-      service = TestBed.inject(VaultBannersService);
-
-      expect(await service.shouldShowLowKDFBanner(userId)).toBe(true);
-    });
-
-    it("does not show low KDF iteration banner if KDF type is not PBKDF2_SHA256", async () => {
-      kdfConfig$.next({ kdfType: KdfType.Argon2id, iterations: 600001 });
-
-      service = TestBed.inject(VaultBannersService);
-
-      expect(await service.shouldShowLowKDFBanner(userId)).toBe(false);
-    });
-
-    it("does not show low KDF for iterations about 600,000", async () => {
-      kdfConfig$.next({ kdfType: KdfType.PBKDF2_SHA256, iterations: 600001 });
-
-      service = TestBed.inject(VaultBannersService);
-
-      expect(await service.shouldShowLowKDFBanner(userId)).toBe(false);
-    });
-
-    it("dismisses low KDF iteration banner", async () => {
-      service = TestBed.inject(VaultBannersService);
-
-      expect(await service.shouldShowLowKDFBanner(userId)).toBe(true);
-
-      await service.dismissBanner(userId, VisibleVaultBanner.KDFSettings);
-
-      expect(await service.shouldShowLowKDFBanner(userId)).toBe(false);
-    });
-  });
-
   describe("OutdatedBrowser", () => {
     beforeEach(async () => {
       // Hardcode `MSIE` in userAgent string
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
index dd50c832cc6..1c53274d9d7 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
@@ -1,15 +1,9 @@
 import { Injectable } from "@angular/core";
 import { Observable, combineLatest, firstValueFrom, map, filter, mergeMap, take } from "rxjs";
 
-import {
-  AuthRequestServiceAbstraction,
-  UserDecryptionOptionsServiceAbstraction,
-} from "@bitwarden/auth/common";
+import { AuthRequestServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import {
   StateProvider,
@@ -21,10 +15,8 @@ import {
 import { UserId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
-import { PBKDF2KdfConfig, KdfConfigService, KdfType } from "@bitwarden/key-management";
 
 export const VisibleVaultBanner = {
-  KDFSettings: "kdf-settings",
   OutdatedBrowser: "outdated-browser",
   Premium: "premium",
   VerifyEmail: "verify-email",
@@ -67,12 +59,8 @@ export class VaultBannersService {
     private stateProvider: StateProvider,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private platformUtilsService: PlatformUtilsService,
-    private kdfConfigService: KdfConfigService,
     private syncService: SyncService,
-    private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
-    private devicesService: DevicesServiceAbstraction,
     private authRequestService: AuthRequestServiceAbstraction,
-    private configService: ConfigService,
   ) {}
 
   /** Returns true when the pending auth request banner should be shown */
@@ -80,24 +68,12 @@ export class VaultBannersService {
     const alreadyDismissed = (await this.getBannerDismissedState(userId)).includes(
       VisibleVaultBanner.PendingAuthRequest,
     );
-    // TODO: PM-20439 remove feature flag
-    const browserLoginApprovalFeatureFlag = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.PM14938_BrowserExtensionLoginApproval),
+
+    const pendingAuthRequests = await firstValueFrom(
+      this.authRequestService.getPendingAuthRequests$(),
     );
-    if (browserLoginApprovalFeatureFlag === true) {
-      const pendingAuthRequests = await firstValueFrom(
-        this.authRequestService.getPendingAuthRequests$(),
-      );
 
-      return pendingAuthRequests.length > 0 && !alreadyDismissed;
-    } else {
-      const devices = await firstValueFrom(this.devicesService.getDevices$());
-      const hasPendingRequest = devices.some(
-        (device) => device.response?.devicePendingAuthRequest != null,
-      );
-
-      return hasPendingRequest && !alreadyDismissed;
-    }
+    return pendingAuthRequests.length > 0 && !alreadyDismissed;
   }
 
   shouldShowPremiumBanner$(userId: UserId): Observable<boolean> {
@@ -150,21 +126,6 @@ export class VaultBannersService {
     return needsVerification && !alreadyDismissed;
   }
 
-  /** Returns true when the low KDF iteration banner should be shown */
-  async shouldShowLowKDFBanner(userId: UserId): Promise<boolean> {
-    const hasLowKDF = (
-      await firstValueFrom(this.userDecryptionOptionsService.userDecryptionOptionsById$(userId))
-    )?.hasMasterPassword
-      ? await this.isLowKdfIteration(userId)
-      : false;
-
-    const alreadyDismissed = (await this.getBannerDismissedState(userId)).includes(
-      VisibleVaultBanner.KDFSettings,
-    );
-
-    return hasLowKDF && !alreadyDismissed;
-  }
-
   /** Dismiss the given banner and perform any respective side effects */
   async dismissBanner(userId: UserId, banner: SessionBanners): Promise<void> {
     if (banner === VisibleVaultBanner.Premium) {
@@ -238,13 +199,4 @@ export class VaultBannersService {
       };
     });
   }
-
-  private async isLowKdfIteration(userId: UserId) {
-    const kdfConfig = await firstValueFrom(this.kdfConfigService.getKdfConfig$(userId));
-    return (
-      kdfConfig != null &&
-      kdfConfig.kdfType === KdfType.PBKDF2_SHA256 &&
-      kdfConfig.iterations < PBKDF2KdfConfig.ITERATIONS.defaultValue
-    );
-  }
 }
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html
index d52ea9f61e6..44b2975ee19 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html
@@ -25,18 +25,6 @@
   </a>
 </bit-banner>
 
-<bit-banner
-  id="kdf-settings-banner"
-  bannerType="warning"
-  *ngIf="visibleBanners.includes(VisibleVaultBanner.KDFSettings)"
-  (onClose)="dismissBanner(VisibleVaultBanner.KDFSettings)"
->
-  {{ "lowKDFIterationsBanner" | i18n }}
-  <a bitLink linkType="secondary" routerLink="/settings/security/security-keys">
-    {{ "changeKDFSettings" | i18n }}
-  </a>
-</bit-banner>
-
 <bit-banner
   id="pending-auth-request-banner"
   bannerType="info"
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
index 9bcc3fcac1c..7730ab974fb 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
@@ -8,6 +8,7 @@ import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -29,13 +30,13 @@ describe("VaultBannersComponent", () => {
   let messageSubject: Subject<{ command: string }>;
   const premiumBanner$ = new BehaviorSubject<boolean>(false);
   const pendingAuthRequest$ = new BehaviorSubject<boolean>(false);
+  const PM24996_ImplementUpgradeFromFreeDialogFlag$ = new BehaviorSubject<boolean>(false);
   const mockUserId = Utils.newGuid() as UserId;
 
   const bannerService = mock<VaultBannersService>({
     shouldShowPremiumBanner$: jest.fn((userId: UserId) => premiumBanner$),
     shouldShowUpdateBrowserBanner: jest.fn(),
     shouldShowVerifyEmailBanner: jest.fn(),
-    shouldShowLowKDFBanner: jest.fn(),
     shouldShowPendingAuthRequestBanner: jest.fn((userId: UserId) =>
       Promise.resolve(pendingAuthRequest$.value),
     ),
@@ -48,7 +49,6 @@ describe("VaultBannersComponent", () => {
     messageSubject = new Subject<{ command: string }>();
     bannerService.shouldShowUpdateBrowserBanner.mockResolvedValue(false);
     bannerService.shouldShowVerifyEmailBanner.mockResolvedValue(false);
-    bannerService.shouldShowLowKDFBanner.mockResolvedValue(false);
     pendingAuthRequest$.next(false);
     premiumBanner$.next(false);
 
@@ -90,7 +90,14 @@ describe("VaultBannersComponent", () => {
         },
         {
           provide: ConfigService,
-          useValue: mock<ConfigService>(),
+          useValue: mock<ConfigService>({
+            getFeatureFlag$: jest.fn((flag: FeatureFlag) => {
+              if (flag === FeatureFlag.PM24996_ImplementUpgradeFromFreeDialog) {
+                return PM24996_ImplementUpgradeFromFreeDialogFlag$;
+              }
+              return new BehaviorSubject(false);
+            }),
+          }),
         },
       ],
     })
@@ -106,8 +113,14 @@ describe("VaultBannersComponent", () => {
   });
 
   describe("premiumBannerVisible$", () => {
-    it("shows premium banner", async () => {
+    beforeEach(() => {
+      // Reset feature flag to default (false) before each test
+      PM24996_ImplementUpgradeFromFreeDialogFlag$.next(false);
+    });
+
+    it("shows premium banner when shouldShowPremiumBanner is true and feature flag is off", async () => {
       premiumBanner$.next(true);
+      PM24996_ImplementUpgradeFromFreeDialogFlag$.next(false);
 
       fixture.detectChanges();
 
@@ -115,8 +128,29 @@ describe("VaultBannersComponent", () => {
       expect(banner.componentInstance.bannerType()).toBe("premium");
     });
 
-    it("dismisses premium banner", async () => {
+    it("hides premium banner when feature flag is enabled", async () => {
+      premiumBanner$.next(true);
+      PM24996_ImplementUpgradeFromFreeDialogFlag$.next(true);
+
+      fixture.detectChanges();
+
+      const banner = fixture.debugElement.query(By.directive(BannerComponent));
+      expect(banner).toBeNull();
+    });
+
+    it("dismisses premium banner when shouldShowPremiumBanner is false", async () => {
       premiumBanner$.next(false);
+      PM24996_ImplementUpgradeFromFreeDialogFlag$.next(false);
+
+      fixture.detectChanges();
+
+      const banner = fixture.debugElement.query(By.directive(BannerComponent));
+      expect(banner).toBeNull();
+    });
+
+    it("hides premium banner when both shouldShowPremiumBanner is false and feature flag is enabled", async () => {
+      premiumBanner$.next(false);
+      PM24996_ImplementUpgradeFromFreeDialogFlag$.next(true);
 
       fixture.detectChanges();
 
@@ -137,11 +171,6 @@ describe("VaultBannersComponent", () => {
         method: bannerService.shouldShowVerifyEmailBanner,
         banner: VisibleVaultBanner.VerifyEmail,
       },
-      {
-        name: "LowKDF",
-        method: bannerService.shouldShowLowKDFBanner,
-        banner: VisibleVaultBanner.KDFSettings,
-      },
     ].forEach(({ name, method, banner }) => {
       describe(name, () => {
         beforeEach(async () => {
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
index a16374f19b3..80626d258f8 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Router } from "@angular/router";
-import { filter, firstValueFrom, map, Observable, switchMap } from "rxjs";
+import { combineLatest, filter, firstValueFrom, map, Observable, switchMap } from "rxjs";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -17,6 +17,8 @@ import { SharedModule } from "../../../shared";
 
 import { VaultBannersService, VisibleVaultBanner } from "./services/vault-banners.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-banners",
   templateUrl: "./vault-banners.component.html",
@@ -32,6 +34,8 @@ export class VaultBannersComponent implements OnInit {
   visibleBanners: VisibleVaultBanner[] = [];
   premiumBannerVisible$: Observable<boolean>;
   VisibleVaultBanner = VisibleVaultBanner;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizations: Organization[] = [];
 
   private activeUserId$ = this.accountService.activeAccount$.pipe(map((a) => a?.id));
@@ -45,7 +49,17 @@ export class VaultBannersComponent implements OnInit {
   ) {
     this.premiumBannerVisible$ = this.activeUserId$.pipe(
       filter((userId): userId is UserId => userId != null),
-      switchMap((userId) => this.vaultBannerService.shouldShowPremiumBanner$(userId)),
+      switchMap((userId) =>
+        combineLatest([
+          this.vaultBannerService.shouldShowPremiumBanner$(userId),
+          this.configService.getFeatureFlag$(FeatureFlag.PM24996_ImplementUpgradeFromFreeDialog),
+        ]).pipe(
+          map(
+            ([shouldShowBanner, PM24996_ImplementUpgradeFromFreeDialogEnabled]) =>
+              shouldShowBanner && !PM24996_ImplementUpgradeFromFreeDialogEnabled,
+          ),
+        ),
+      ),
     );
 
     // Listen for auth request messages and show banner immediately
@@ -75,16 +89,12 @@ export class VaultBannersComponent implements OnInit {
   }
 
   async navigateToPaymentMethod(organizationId: string): Promise<void> {
-    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-    );
-    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
     const navigationExtras = {
       state: { launchPaymentModalAutomatically: true },
     };
 
     await this.router.navigate(
-      ["organizations", organizationId, "billing", route],
+      ["organizations", organizationId, "billing", "payment-details"],
       navigationExtras,
     );
   }
@@ -100,14 +110,12 @@ export class VaultBannersComponent implements OnInit {
     const showBrowserOutdated =
       await this.vaultBannerService.shouldShowUpdateBrowserBanner(activeUserId);
     const showVerifyEmail = await this.vaultBannerService.shouldShowVerifyEmailBanner(activeUserId);
-    const showLowKdf = await this.vaultBannerService.shouldShowLowKDFBanner(activeUserId);
     const showPendingAuthRequest =
       await this.vaultBannerService.shouldShowPendingAuthRequestBanner(activeUserId);
 
     this.visibleBanners = [
       showBrowserOutdated ? VisibleVaultBanner.OutdatedBrowser : null,
       showVerifyEmail ? VisibleVaultBanner.VerifyEmail : null,
-      showLowKdf ? VisibleVaultBanner.KDFSettings : null,
       showPendingAuthRequest ? VisibleVaultBanner.PendingAuthRequest : null,
     ].filter((banner) => banner !== null);
   }
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts
index fe5ef281b2d..37b881406e3 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts
@@ -25,7 +25,6 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -40,6 +39,8 @@ import { LinkSsoService } from "../../../../auth/core/services";
 import { OptionsInput } from "../shared/components/vault-filter-section.component";
 import { OrganizationFilter } from "../shared/models/vault-filter.type";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-organization-options",
   templateUrl: "organization-options.component.html",
@@ -94,7 +95,10 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
     combineLatest([
       this.organization$,
       resetPasswordPolicies$,
-      this.userDecryptionOptionsService.userDecryptionOptions$,
+      this.accountService.activeAccount$.pipe(
+        getUserId,
+        switchMap((userId) => this.userDecryptionOptionsService.userDecryptionOptionsById$(userId)),
+      ),
       managingOrg$,
     ])
       .pipe(takeUntil(this.destroy$))
@@ -179,13 +183,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
         message: this.i18nService.t("unlinkedSso"),
       });
 
-      const disableAlternateLoginMethodsFlagEnabled = await this.configService.getFeatureFlag(
-        FeatureFlag.PM22110_DisableAlternateLoginMethods,
-      );
-
-      if (disableAlternateLoginMethodsFlagEnabled) {
-        await this.removeEmailFromSsoRequiredCacheIfPresent();
-      }
+      await this.removeEmailFromSsoRequiredCacheIfPresent();
     } catch (e) {
       this.logService.error(e);
     }
@@ -212,13 +210,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
         message: this.i18nService.t("leftOrganization"),
       });
 
-      const disableAlternateLoginMethodsFlagEnabled = await this.configService.getFeatureFlag(
-        FeatureFlag.PM22110_DisableAlternateLoginMethods,
-      );
-
-      if (disableAlternateLoginMethodsFlagEnabled) {
-        await this.removeEmailFromSsoRequiredCacheIfPresent();
-      }
+      await this.removeEmailFromSsoRequiredCacheIfPresent();
     } catch (e) {
       this.logService.error(e);
     }
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.html
index 7722ba1ad86..640bf1bb653 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.html
@@ -1,10 +1,10 @@
 <div class="tw-border tw-border-solid tw-border-secondary-300 tw-rounded" data-testid="filters">
   <div class="tw-text-center tw-p-5" *ngIf="!isLoaded">
-    <i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin" aria-hidden="true"></i>
   </div>
   <div *ngIf="isLoaded">
     <div
-      class="tw-bg-background-alt tw-border-0 tw-border-b tw-border-solid tw-border-secondary-100 tw-rounded-t tw-px-5 tw-py-2.5 tw-font-semibold tw-uppercase"
+      class="tw-bg-background-alt tw-border-0 tw-border-b tw-border-solid tw-border-secondary-100 tw-rounded-t tw-px-5 tw-py-2.5 tw-font-medium tw-uppercase"
       data-testid="filters-header"
     >
       {{ "filters" | i18n }}
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
index 6feaa52d190..e40a32dc8b9 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
@@ -19,12 +19,12 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { DialogService, ToastService } from "@bitwarden/components";
-import { CipherArchiveService } from "@bitwarden/vault";
 import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
 
 import { VaultFilterService } from "../services/abstractions/vault-filter.service";
@@ -44,6 +44,8 @@ import {
 
 import { OrganizationOptionsComponent } from "./organization-options.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-filter",
   templateUrl: "vault-filter.component.html",
@@ -51,10 +53,18 @@ import { OrganizationOptionsComponent } from "./organization-options.component";
 })
 export class VaultFilterComponent implements OnInit, OnDestroy {
   filters?: VaultFilterList;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeFilter: VaultFilter = new VaultFilter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEditFolder = new EventEmitter<FolderFilter>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() searchText = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() searchTextChanged = new EventEmitter<string>();
 
   isLoaded = false;
@@ -208,15 +218,6 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   }
 
   applyOrganizationFilter = async (orgNode: TreeNode<OrganizationFilter>): Promise<void> => {
-    if (!orgNode?.node.enabled) {
-      this.toastService.showToast({
-        variant: "error",
-        message: this.i18nService.t("disabledOrganizationFilterError"),
-      });
-      await firstValueFrom(
-        this.organizationWarningsService.showInactiveSubscriptionDialog$(orgNode.node),
-      );
-    }
     const filter = this.activeFilter;
     if (orgNode?.node.id === "AllVaults") {
       filter.resetOrganization();
@@ -251,16 +252,13 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   };
 
   async buildAllFilters(): Promise<VaultFilterList> {
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const hasArchiveFlag = await firstValueFrom(this.cipherArchiveService.hasArchiveFlagEnabled$());
     const builderFilter = {} as VaultFilterList;
     builderFilter.organizationFilter = await this.addOrganizationFilter();
     builderFilter.typeFilter = await this.addTypeFilter();
     builderFilter.folderFilter = await this.addFolderFilter();
     builderFilter.collectionFilter = await this.addCollectionFilter();
-    if (
-      (await firstValueFrom(this.cipherArchiveService.userCanArchive$(userId))) ||
-      (await firstValueFrom(this.cipherArchiveService.showArchiveVault$(userId)))
-    ) {
+    if (hasArchiveFlag) {
       builderFilter.archiveFilter = await this.addArchiveFilter();
     }
     builderFilter.trashFilter = await this.addTrashFilter();
@@ -315,7 +313,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
 
     const data$ = combineLatest([
       this.restrictedItemTypesService.restricted$,
-      this.cipherService.cipherViews$(userId),
+      this.cipherService.cipherListViews$(userId),
     ]).pipe(
       map(([restrictedTypes, ciphers]) => {
         const restrictedForUser = restrictedTypes
@@ -433,7 +431,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         [
           {
             id: "archive",
-            name: this.i18nService.t("archive"),
+            name: this.i18nService.t("archiveNoun"),
             type: "archive",
             icon: "bwi-archive",
           },
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 5897ea8c2ce..1f27773c467 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
@@ -12,7 +12,11 @@ import {
   switchMap,
 } from "rxjs";
 
-import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
+import {
+  CollectionService,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
 import { sortDefaultCollections } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -257,7 +261,8 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
         const collectionCopy = cloneCollection(
           new CollectionView({ ...c, name: c.name }),
         ) as CollectionFilter;
-        collectionCopy.icon = "bwi-collection-shared";
+        collectionCopy.icon =
+          c.type === CollectionTypes.DefaultUserCollection ? "bwi-user" : "bwi-collection-shared";
         const parts = c.name ? c.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
         ServiceUtils.nestedTraverse(nodes, 0, parts, collectionCopy, undefined, NestingDelimiter);
       }
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts
index 1a0a96fa19c..e8cf49c3208 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts
@@ -13,6 +13,8 @@ import { VaultFilterService } from "../../services/abstractions/vault-filter.ser
 import { VaultFilterSection, VaultFilterType } from "../models/vault-filter-section.type";
 import { VaultFilter } from "../models/vault-filter.model";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-filter-section",
   templateUrl: "vault-filter-section.component.html",
@@ -22,7 +24,11 @@ export class VaultFilterSectionComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
   private activeUserId$ = getUserId(this.accountService.activeAccount$);
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeFilter: VaultFilter;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() section: VaultFilterSection;
 
   data: TreeNode<VaultFilterType>;
diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
index 63e6d391b42..8fa801f5dc0 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
@@ -7,6 +7,7 @@ import {
   Unassigned,
   CollectionView,
   CollectionAdminService,
+  CollectionTypes,
 } from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -59,33 +60,53 @@ export class VaultHeaderComponent {
    * Boolean to determine the loading state of the header.
    * Shows a loading spinner if set to true
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() loading: boolean = true;
 
   /** Current active filter */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() filter: RoutedVaultFilterModel | undefined;
 
   /** All organizations that can be shown */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizations: Organization[] = [];
 
   /** Currently selected collection */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collection?: TreeNode<CollectionView>;
 
   /** Whether 'Collection' option is shown in the 'New' dropdown */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canCreateCollections: boolean = false;
 
   /** Emits an event when the new item button is clicked in the header */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddCipher = new EventEmitter<CipherType | undefined>();
 
   /** Emits an event when the new collection button is clicked in the 'New' dropdown menu */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddCollection = new EventEmitter<null>();
 
   /** Emits an event when the new folder button is clicked in the 'New' dropdown menu */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddFolder = new EventEmitter<null>();
 
   /** Emits an event when the edit collection button is clicked in the header */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEditCollection = new EventEmitter<{ tab: CollectionDialogTabType }>();
 
   /** Emits an event when the delete collection button is clicked in the header */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onDeleteCollection = new EventEmitter<void>();
 
   constructor(
@@ -140,7 +161,7 @@ export class VaultHeaderComponent {
     }
 
     if (this.filter.type === "archive") {
-      return this.i18nService.t("archive");
+      return this.i18nService.t("archiveNoun");
     }
 
     const activeOrganization = this.activeOrganization;
@@ -152,9 +173,12 @@ export class VaultHeaderComponent {
   }
 
   protected get icon() {
-    return this.filter?.collectionId && this.filter.collectionId !== All
-      ? "bwi-collection-shared"
-      : "";
+    if (!this.filter?.collectionId || this.filter.collectionId === All) {
+      return "";
+    }
+    return this.collection?.node.type === CollectionTypes.DefaultUserCollection
+      ? "bwi-user"
+      : "bwi-collection-shared";
   }
 
   /**
diff --git a/apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.ts b/apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.ts
index 8dc442abe2e..503c088c3da 100644
--- a/apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.ts
@@ -32,6 +32,8 @@ import { OnboardingModule } from "../../../shared/components/onboarding/onboardi
 import { VaultOnboardingService as VaultOnboardingServiceAbstraction } from "./services/abstraction/vault-onboarding.service";
 import { VaultOnboardingService, VaultOnboardingTasks } from "./services/vault-onboarding.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [OnboardingModule, CommonModule, JslibModule, LinkModule],
   providers: [
@@ -44,8 +46,14 @@ import { VaultOnboardingService, VaultOnboardingTasks } from "./services/vault-o
   templateUrl: "vault-onboarding.component.html",
 })
 export class VaultOnboardingComponent implements OnInit, OnChanges, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() ciphers: CipherViewLike[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() orgs: Organization[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddCipher = new EventEmitter<CipherType>();
 
   extensionUrl: string;
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 958cf655d17..711a34413b5 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -50,6 +50,8 @@
       [useEvents]="false"
       [showAdminActions]="false"
       [showBulkAddToCollections]="true"
+      [userCanArchive]="userCanArchive$ | async"
+      [enforceOrgDataOwnershipPolicy]="enforceOrgDataOwnershipPolicy$ | async"
       (onEvent)="onVaultItemsEvent($event)"
     >
     </app-vault-items>
@@ -68,19 +70,20 @@
       class="tw-mt-6 tw-flex tw-h-full tw-flex-col tw-items-center tw-justify-start"
       *ngIf="isEmpty && !performingInitialLoad"
     >
-      <bit-no-items [icon]="noItemIcon">
-        <div slot="title" *ngIf="filter.type === 'archive'">{{ "noItemsInArchive" | i18n }}</div>
-        <p slot="description" class="tw-text-center tw-max-w-md" *ngIf="filter.type === 'archive'">
-          {{ "archivedItemsDescription" | i18n }}
+      <bit-no-items [icon]="(emptyState$ | async)?.icon">
+        <div slot="title">
+          {{ (emptyState$ | async)?.title | i18n }}
+        </div>
+        <p slot="description" bitTypography="body2" class="tw-max-w-md tw-text-center">
+          {{ (emptyState$ | async)?.description | i18n }}
         </p>
-        <div slot="title" *ngIf="filter.type !== 'archive'">{{ "noItemsInList" | i18n }}</div>
         <button
           type="button"
           buttonType="primary"
           bitButton
           (click)="addCipher()"
           slot="button"
-          *ngIf="filter.type !== 'trash' && filter.type !== 'archive'"
+          *ngIf="showAddCipherBtn"
         >
           <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
           {{ "newItem" | i18n }}
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 01082bfcd60..3b0a7a6f141 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -9,6 +9,7 @@ import {
   lastValueFrom,
   Observable,
   Subject,
+  zip,
 } from "rxjs";
 import {
   concatMap,
@@ -25,6 +26,7 @@ import {
 } from "rxjs/operators";
 
 import {
+  AutomaticUserConfirmationService,
   CollectionData,
   CollectionDetailsResponse,
   CollectionService,
@@ -32,20 +34,31 @@ import {
   Unassigned,
 } from "@bitwarden/admin-console/common";
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
-import { NoResults } from "@bitwarden/assets/svg";
+import {
+  NoResults,
+  DeactivatedOrg,
+  EmptyTrash,
+  FavoritesIcon,
+  ItemTypes,
+  Icon,
+} from "@bitwarden/assets/svg";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import {
   getOrganizationById,
   OrganizationService,
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+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 { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { EventType } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -54,7 +67,9 @@ import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.se
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -77,13 +92,13 @@ import {
   AttachmentDialogCloseResult,
   AttachmentDialogResult,
   AttachmentsV2Component,
-  CipherArchiveService,
   CipherFormConfig,
   CollectionAssignmentResult,
   DecryptionFailureDialogComponent,
   DefaultCipherFormConfigService,
   PasswordRepromptService,
 } from "@bitwarden/vault";
+import { UnifiedUpgradePromptService } from "@bitwarden/web-vault/app/billing/individual/upgrade/services";
 import { OrganizationWarningsModule } from "@bitwarden/web-vault/app/billing/organizations/warnings/organization-warnings.module";
 import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
 
@@ -91,6 +106,11 @@ import {
   getNestedCollectionTree,
   getFlatCollectionTree,
 } from "../../admin-console/organizations/collections";
+import {
+  AutoConfirmPolicy,
+  AutoConfirmPolicyDialogComponent,
+  PolicyEditDialogResult,
+} from "../../admin-console/organizations/policies";
 import {
   CollectionDialogAction,
   CollectionDialogTabType,
@@ -134,6 +154,18 @@ import { VaultOnboardingComponent } from "./vault-onboarding/vault-onboarding.co
 
 const BroadcasterSubscriptionId = "VaultComponent";
 
+type EmptyStateType = "trash" | "favorites" | "archive";
+
+type EmptyStateItem = {
+  title: string;
+  description: string;
+  icon: Icon;
+};
+
+type EmptyStateMap = Record<EmptyStateType, EmptyStateItem>;
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault",
   templateUrl: "vault.component.html",
@@ -153,14 +185,22 @@ const BroadcasterSubscriptionId = "VaultComponent";
   ],
 })
 export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("vaultFilter", { static: true }) filterComponent: VaultFilterComponent;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("vaultItems", { static: false }) vaultItemsComponent: VaultItemsComponent<C>;
 
   trashCleanupWarning: string = null;
   kdfIterations: number;
   activeFilter: VaultFilter = new VaultFilter();
 
-  protected noItemIcon = NoResults;
+  protected deactivatedOrgIcon = DeactivatedOrg;
+  protected emptyTrashIcon = EmptyTrash;
+  protected favoritesIcon = FavoritesIcon;
+  protected itemTypesIcon = ItemTypes;
+  protected noResultsIcon = NoResults;
   protected performingInitialLoad = true;
   protected refreshing = false;
   protected processingEvent = false;
@@ -174,23 +214,96 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
   protected isEmpty: boolean;
   protected selectedCollection: TreeNode<CollectionView> | undefined;
   protected canCreateCollections = false;
-  protected currentSearchText$: Observable<string>;
+  protected currentSearchText$: Observable<string> = this.route.queryParams.pipe(
+    map((queryParams) => queryParams.search),
+  );
   private searchText$ = new Subject<string>();
   private refresh$ = new BehaviorSubject<void>(null);
   private destroy$ = new Subject<void>();
 
   private vaultItemDialogRef?: DialogRef<VaultItemDialogResult> | undefined;
+  private autoConfirmDialogRef?: DialogRef<PolicyEditDialogResult> | undefined;
+
+  protected showAddCipherBtn: boolean = false;
+
   organizations$ = this.accountService.activeAccount$
     .pipe(map((a) => a?.id))
     .pipe(switchMap((id) => this.organizationService.organizations$(id)));
 
-  private userCanArchive$ = this.accountService.activeAccount$.pipe(
+  protected userCanArchive$ = this.accountService.activeAccount$.pipe(
     getUserId,
     switchMap((userId) => {
       return this.cipherArchiveService.userCanArchive$(userId);
     }),
   );
 
+  emptyState$ = combineLatest([
+    this.currentSearchText$,
+    this.routedVaultFilterService.filter$,
+    this.organizations$,
+  ]).pipe(
+    map(([searchText, filter, organizations]) => {
+      const selectedOrg = organizations?.find((org) => org.id === filter.organizationId);
+      const isOrgDisabled = selectedOrg && !selectedOrg.enabled;
+
+      if (isOrgDisabled) {
+        this.showAddCipherBtn = false;
+        return {
+          title: "organizationIsSuspended",
+          description: "organizationIsSuspendedDesc",
+          icon: this.deactivatedOrgIcon,
+        };
+      }
+
+      if (searchText) {
+        return {
+          title: "noSearchResults",
+          description: "clearFiltersOrTryAnother",
+          icon: this.noResultsIcon,
+        };
+      }
+
+      const emptyStateMap: EmptyStateMap = {
+        trash: {
+          title: "noItemsInTrash",
+          description: "noItemsInTrashDesc",
+          icon: this.emptyTrashIcon,
+        },
+        favorites: {
+          title: "emptyFavorites",
+          description: "emptyFavoritesDesc",
+          icon: this.favoritesIcon,
+        },
+        archive: {
+          title: "noItemsInArchive",
+          description: "noItemsInArchiveDesc",
+          icon: this.itemTypesIcon,
+        },
+      };
+
+      if (filter?.type && filter.type in emptyStateMap) {
+        this.showAddCipherBtn = false;
+        return emptyStateMap[filter.type as EmptyStateType];
+      }
+
+      this.showAddCipherBtn = true;
+      return {
+        title: "noItemsInVault",
+        description: "emptyVaultDescription",
+        icon: this.itemTypesIcon,
+      };
+    }),
+  );
+
+  protected enforceOrgDataOwnershipPolicy$ = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) =>
+      this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
+    ),
+  );
+
+  private userId$ = this.accountService.activeAccount$.pipe(getUserId);
+
   constructor(
     private syncService: SyncService,
     private route: ActivatedRoute,
@@ -223,6 +336,11 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     private restrictedItemTypesService: RestrictedItemTypesService,
     private cipherArchiveService: CipherArchiveService,
     private organizationWarningsService: OrganizationWarningsService,
+    private policyService: PolicyService,
+    private unifiedUpgradePromptService: UnifiedUpgradePromptService,
+    private premiumUpgradePromptService: PremiumUpgradePromptService,
+    private autoConfirmService: AutomaticUserConfirmationService,
+    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
@@ -298,8 +416,6 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
         }),
       );
 
-    this.currentSearchText$ = this.route.queryParams.pipe(map((queryParams) => queryParams.search));
-
     const _ciphers = this.cipherService
       .cipherListViews$(activeUserId)
       .pipe(filter((c) => c !== null));
@@ -322,7 +438,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       allowedCiphers$,
       filter$,
       this.currentSearchText$,
-      this.userCanArchive$,
+      this.cipherArchiveService.hasArchiveFlagEnabled$(),
     ]).pipe(
       filter(([ciphers, filter]) => ciphers != undefined && filter != undefined),
       concatMap(async ([ciphers, filter, searchText, archiveEnabled]) => {
@@ -434,15 +550,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
                 await this.editCipherId(cipherId);
               }
             } else {
-              this.toastService.showToast({
-                variant: "error",
-                title: null,
-                message: this.i18nService.t("unknownCipher"),
-              });
-              await this.router.navigate([], {
-                queryParams: { itemId: null, cipherId: null },
-                queryParamsHandling: "merge",
-              });
+              await this.handleUnknownCipher();
             }
           }
         }),
@@ -525,6 +633,9 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
           this.changeDetectorRef.markForCheck();
         },
       );
+    void this.unifiedUpgradePromptService.displayUpgradePromptConditionally();
+
+    this.setupAutoConfirm();
   }
 
   ngOnDestroy() {
@@ -569,12 +680,160 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
         case "assignToCollections":
           await this.bulkAssignToCollections(event.items);
           break;
+        case "archive":
+          if (event.items.length === 1) {
+            await this.archive(event.items[0]);
+          } else {
+            await this.bulkArchive(event.items);
+          }
+          break;
+        case "unarchive":
+          if (event.items.length === 1) {
+            await this.unarchive(event.items[0]);
+          } else {
+            await this.bulkUnarchive(event.items);
+          }
+          break;
+        case "toggleFavorite":
+          await this.handleFavoriteEvent(event.item);
+          break;
+        case "editCipher":
+          await this.editCipher(event.item);
+          break;
       }
     } finally {
       this.processingEvent = false;
     }
   }
 
+  async handleUnknownCipher() {
+    this.toastService.showToast({
+      variant: "error",
+      title: null,
+      message: this.i18nService.t("unknownCipher"),
+    });
+    await this.router.navigate([], {
+      queryParams: { itemId: null, cipherId: null },
+      queryParamsHandling: "merge",
+    });
+  }
+
+  async archive(cipher: C) {
+    const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
+
+    if (!repromptPassed) {
+      return;
+    }
+
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "archiveItem" },
+      content: { key: "archiveItemConfirmDesc" },
+      type: "info",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(this.userId$);
+    try {
+      await this.cipherArchiveService.archiveWithServer(cipher.id as CipherId, activeUserId);
+      this.toastService.showToast({
+        variant: "success",
+        message: this.i18nService.t("itemWasSentToArchive"),
+      });
+      this.refresh();
+    } catch (e) {
+      this.logService.error("Error archiving cipher", e);
+      this.toastService.showToast({
+        variant: "error",
+        message: this.i18nService.t("errorOccurred"),
+      });
+    }
+  }
+
+  async bulkArchive(ciphers: C[]) {
+    if (!(await this.repromptCipher(ciphers))) {
+      return;
+    }
+
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "archiveBulkItems" },
+      content: { key: "archiveBulkItemsConfirmDesc" },
+      type: "info",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(this.userId$);
+    const cipherIds = ciphers.map((c) => c.id as CipherId);
+    try {
+      await this.cipherArchiveService.archiveWithServer(cipherIds as CipherId[], activeUserId);
+      this.toastService.showToast({
+        variant: "success",
+        message: this.i18nService.t("itemsWereSentToArchive"),
+      });
+      this.refresh();
+    } catch (e) {
+      this.logService.error("Error archiving ciphers", e);
+      this.toastService.showToast({
+        variant: "error",
+        message: this.i18nService.t("errorOccurred"),
+      });
+    }
+  }
+
+  async unarchive(cipher: C) {
+    const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
+    if (!repromptPassed) {
+      return;
+    }
+    const activeUserId = await firstValueFrom(this.userId$);
+
+    try {
+      await this.cipherArchiveService.unarchiveWithServer(cipher.id as CipherId, activeUserId);
+
+      this.toastService.showToast({
+        variant: "success",
+        message: this.i18nService.t("itemUnarchived"),
+      });
+
+      this.refresh();
+    } catch (e) {
+      this.logService.error("Error unarchiving cipher", e);
+      this.toastService.showToast({
+        variant: "error",
+        message: this.i18nService.t("errorOccurred"),
+      });
+    }
+  }
+
+  async bulkUnarchive(ciphers: C[]) {
+    if (!(await this.repromptCipher(ciphers))) {
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(this.userId$);
+    const cipherIds = ciphers.map((c) => c.id as CipherId);
+    try {
+      await this.cipherArchiveService.unarchiveWithServer(cipherIds as CipherId[], activeUserId);
+      this.toastService.showToast({
+        variant: "success",
+        message: this.i18nService.t("bulkUnarchiveItems"),
+      });
+
+      this.refresh();
+    } catch (e) {
+      this.logService.error("Error unarchiving ciphers", e);
+      this.toastService.showToast({
+        variant: "error",
+        message: this.i18nService.t("errorOccurred"),
+      });
+    }
+  }
+
   async applyOrganizationFilter(orgId: string) {
     if (orgId == null) {
       orgId = "MyVault";
@@ -629,7 +888,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     }
 
     if (cipher.organizationId == null && !this.canAccessPremium) {
-      this.messagingService.send("premiumRequired");
+      await this.premiumUpgradePromptService.promptForPremium();
       return;
     } else if (cipher.organizationId != null) {
       const org = await firstValueFrom(
@@ -742,6 +1001,10 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
   async editCipherId(id: string, cloneMode?: boolean) {
     const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
     const cipher = await this.cipherService.get(id, activeUserId);
+    if (!cipher) {
+      await this.handleUnknownCipher();
+      return;
+    }
 
     if (
       cipher &&
@@ -779,6 +1042,10 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
   async viewCipherById(id: string) {
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     const cipher = await this.cipherService.get(id, activeUserId);
+    if (!cipher) {
+      await this.handleUnknownCipher();
+      return;
+    }
     // If cipher exists (cipher is null when new) and MP reprompt
     // is on for this cipher, then show password reprompt.
     if (
@@ -1228,6 +1495,27 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     }
   }
 
+  /**
+   * Toggles the favorite status of the cipher and updates it on the server.
+   */
+  async handleFavoriteEvent(cipher: C) {
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const cipherFullView = await this.cipherService.getFullCipherView(cipher);
+    cipherFullView.favorite = !cipherFullView.favorite;
+    const encryptedCipher = await this.cipherService.encrypt(cipherFullView, activeUserId);
+    await this.cipherService.updateWithServer(encryptedCipher);
+
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t(
+        cipherFullView.favorite ? "itemAddedToFavorites" : "itemRemovedFromFavorites",
+      ),
+    });
+
+    this.refresh();
+  }
+
   protected deleteCipherWithServer(id: string, userId: UserId, permanent: boolean) {
     return permanent
       ? this.cipherService.deleteWithServer(id, userId)
@@ -1286,6 +1574,72 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     const cipherView = await this.cipherService.decrypt(_cipher, activeUserId);
     return cipherView.login?.password;
   }
+
+  private async openAutoConfirmFeatureDialog(organization: Organization) {
+    if (this.autoConfirmDialogRef) {
+      return;
+    }
+
+    this.autoConfirmDialogRef = AutoConfirmPolicyDialogComponent.open(this.dialogService, {
+      data: {
+        policy: new AutoConfirmPolicy(),
+        organizationId: organization.id,
+        firstTimeDialog: true,
+      },
+    });
+
+    await lastValueFrom(this.autoConfirmDialogRef.closed);
+    this.autoConfirmDialogRef = undefined;
+  }
+
+  private setupAutoConfirm() {
+    // if the policy is enabled, then the user may only belong to one organization at most.
+    const organization$ = this.organizations$.pipe(map((organizations) => organizations[0]));
+
+    const featureFlag$ = this.configService.getFeatureFlag$(FeatureFlag.AutoConfirm);
+
+    const autoConfirmState$ = this.userId$.pipe(
+      switchMap((userId) => this.autoConfirmService.configuration$(userId)),
+    );
+
+    const policyEnabled$ = combineLatest([
+      this.userId$.pipe(
+        switchMap((userId) => this.policyService.policies$(userId)),
+        map((policies) => policies.find((p) => p.type === PolicyType.AutoConfirm && p.enabled)),
+      ),
+      organization$,
+    ]).pipe(
+      map(
+        ([policy, organization]) => (policy && policy.organizationId === organization?.id) ?? false,
+      ),
+    );
+
+    zip([organization$, featureFlag$, autoConfirmState$, policyEnabled$, this.userId$])
+      .pipe(
+        first(),
+        switchMap(async ([organization, flagEnabled, autoConfirmState, policyEnabled, userId]) => {
+          const showDialog =
+            flagEnabled &&
+            !policyEnabled &&
+            autoConfirmState.showSetupDialog &&
+            !!organization &&
+            organization.canEnableAutoConfirmPolicy;
+
+          if (showDialog) {
+            await this.openAutoConfirmFeatureDialog(organization);
+
+            await this.autoConfirmService.upsert(userId, {
+              ...autoConfirmState,
+              showSetupDialog: false,
+            });
+          }
+        }),
+        takeUntil(this.destroy$),
+      )
+      .subscribe({
+        error: (err: unknown) => this.logService.error("Failed to update auto-confirm state", err),
+      });
+  }
 }
 
 /**
diff --git a/apps/web/src/app/vault/individual-vault/vault.module.ts b/apps/web/src/app/vault/individual-vault/vault.module.ts
index 573eceef64a..156e73b439a 100644
--- a/apps/web/src/app/vault/individual-vault/vault.module.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.module.ts
@@ -10,7 +10,6 @@ import { OrganizationBadgeModule } from "./organization-badge/organization-badge
 import { PipesModule } from "./pipes/pipes.module";
 import { VaultRoutingModule } from "./vault-routing.module";
 import { VaultComponent } from "./vault.component";
-import { ViewComponent } from "./view.component";
 
 @NgModule({
   imports: [
@@ -23,7 +22,6 @@ import { ViewComponent } from "./view.component";
     BulkDialogsModule,
     CollectionDialogComponent,
     VaultComponent,
-    ViewComponent,
   ],
 })
 export class VaultModule {}
diff --git a/apps/web/src/app/vault/individual-vault/view.component.html b/apps/web/src/app/vault/individual-vault/view.component.html
deleted file mode 100644
index ac6db212362..00000000000
--- a/apps/web/src/app/vault/individual-vault/view.component.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<bit-dialog dialogSize="large" background="alt">
-  <span bitDialogTitle>
-    {{ cipherTypeString }}
-  </span>
-  <ng-container bitDialogContent>
-    <app-cipher-view [cipher]="cipher" [collections]="collections"></app-cipher-view>
-  </ng-container>
-  <ng-container bitDialogFooter>
-    <button
-      bitButton
-      (click)="edit()"
-      buttonType="primary"
-      type="button"
-      [disabled]="params.disableEdit"
-    >
-      {{ "edit" | i18n }}
-    </button>
-    <div class="tw-ml-auto">
-      <button
-        bitButton
-        type="button"
-        buttonType="danger"
-        [appA11yTitle]="'delete' | i18n"
-        [bitAction]="delete"
-        [disabled]="!(canDeleteCipher$ | async)"
-      >
-        <i class="bwi bwi-trash bwi-lg bwi-fw" aria-hidden="true"></i>
-      </button>
-    </div>
-  </ng-container>
-</bit-dialog>
diff --git a/apps/web/src/app/vault/individual-vault/view.component.spec.ts b/apps/web/src/app/vault/individual-vault/view.component.spec.ts
deleted file mode 100644
index d60a6313c67..00000000000
--- a/apps/web/src/app/vault/individual-vault/view.component.spec.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { mock } from "jest-mock-extended";
-import { of } from "rxjs";
-
-import { CollectionService } from "@bitwarden/admin-console/common";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
-import { 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 { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
-import { TaskService } from "@bitwarden/common/vault/tasks";
-import { DIALOG_DATA, DialogRef, DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-import { ChangeLoginPasswordService } from "@bitwarden/vault";
-
-import { ViewCipherDialogParams, ViewCipherDialogResult, ViewComponent } from "./view.component";
-
-describe("ViewComponent", () => {
-  let component: ViewComponent;
-  let fixture: ComponentFixture<ViewComponent>;
-
-  const mockCipher: CipherView = {
-    id: "cipher-id",
-    type: 1,
-    organizationId: "org-id",
-    isDeleted: false,
-  } as CipherView;
-
-  const mockOrganization: Organization = {
-    id: "org-id",
-    name: "Test Organization",
-  } as Organization;
-
-  const mockParams: ViewCipherDialogParams = {
-    cipher: mockCipher,
-  };
-  const userId = Utils.newGuid() as UserId;
-  const accountService: FakeAccountService = mockAccountServiceWith(userId);
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [ViewComponent],
-      providers: [
-        { provide: DIALOG_DATA, useValue: mockParams },
-        { provide: DialogRef, useValue: mock<DialogRef>() },
-        { provide: I18nService, useValue: { t: jest.fn().mockReturnValue("login") } },
-        { provide: DialogService, useValue: mock<DialogService>() },
-        { provide: CipherService, useValue: mock<CipherService>() },
-        { provide: ToastService, useValue: mock<ToastService>() },
-        { provide: MessagingService, useValue: mock<MessagingService>() },
-        {
-          provide: AccountService,
-          useValue: accountService,
-        },
-        { provide: LogService, useValue: mock<LogService>() },
-        {
-          provide: OrganizationService,
-          useValue: { organizations$: jest.fn().mockReturnValue(of([mockOrganization])) },
-        },
-        { provide: CollectionService, useValue: mock<CollectionService>() },
-        { provide: FolderService, useValue: mock<FolderService>() },
-        { provide: KeyService, useValue: mock<KeyService>() },
-        {
-          provide: BillingAccountProfileStateService,
-          useValue: mock<BillingAccountProfileStateService>(),
-        },
-        { provide: ConfigService, useValue: mock<ConfigService>() },
-        { provide: AccountService, useValue: mockAccountServiceWith("UserId" as UserId) },
-        {
-          provide: CipherAuthorizationService,
-          useValue: {
-            canDeleteCipher$: jest.fn().mockReturnValue(true),
-          },
-        },
-        { provide: TaskService, useValue: mock<TaskService>() },
-      ],
-    })
-      .overrideComponent(ViewComponent, {
-        remove: {
-          providers: [
-            { provide: PlatformUtilsService, useValue: PlatformUtilsService },
-            {
-              provide: ChangeLoginPasswordService,
-              useValue: ChangeLoginPasswordService,
-            },
-          ],
-        },
-        add: {
-          providers: [
-            { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
-            {
-              provide: ChangeLoginPasswordService,
-              useValue: mock<ChangeLoginPasswordService>(),
-            },
-          ],
-        },
-      })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(ViewComponent);
-    component = fixture.componentInstance;
-    component.params = mockParams;
-    component.cipher = mockCipher;
-  });
-
-  describe("ngOnInit", () => {
-    it("initializes the component with cipher and organization", async () => {
-      await component.ngOnInit();
-
-      expect(component.cipher).toEqual(mockCipher);
-      expect(component.organization).toEqual(mockOrganization);
-    });
-  });
-
-  describe("edit", () => {
-    it("closes the dialog with the proper arguments", async () => {
-      const dialogRefCloseSpy = jest.spyOn(component["dialogRef"], "close");
-
-      await component.edit();
-
-      expect(dialogRefCloseSpy).toHaveBeenCalledWith({ action: ViewCipherDialogResult.Edited });
-    });
-  });
-
-  describe("delete", () => {
-    it("calls the delete method on delete and closes the dialog with the proper arguments", async () => {
-      const deleteSpy = jest.spyOn(component, "delete");
-      const dialogRefCloseSpy = jest.spyOn(component["dialogRef"], "close");
-      jest.spyOn(component["dialogService"], "openSimpleDialog").mockResolvedValue(true);
-
-      await component.delete();
-
-      expect(deleteSpy).toHaveBeenCalled();
-      expect(dialogRefCloseSpy).toHaveBeenCalledWith({ action: ViewCipherDialogResult.Deleted });
-    });
-  });
-});
diff --git a/apps/web/src/app/vault/individual-vault/view.component.ts b/apps/web/src/app/vault/individual-vault/view.component.ts
deleted file mode 100644
index 6de29f8e328..00000000000
--- a/apps/web/src/app/vault/individual-vault/view.component.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { CommonModule } from "@angular/common";
-import { Component, EventEmitter, Inject, OnInit } from "@angular/core";
-import { firstValueFrom, map, Observable } from "rxjs";
-
-import { CollectionView } from "@bitwarden/admin-console/common";
-import { VaultViewPasswordHistoryService } from "@bitwarden/angular/services/view-password-history.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { CollectionId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { ViewPasswordHistoryService } from "@bitwarden/common/vault/abstractions/view-password-history.service";
-import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
-import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
-import {
-  DIALOG_DATA,
-  DialogRef,
-  DialogConfig,
-  AsyncActionsModule,
-  DialogModule,
-  DialogService,
-  ToastService,
-} from "@bitwarden/components";
-import { CipherViewComponent } from "@bitwarden/vault";
-
-import { SharedModule } from "../../shared/shared.module";
-
-export interface ViewCipherDialogParams {
-  cipher: CipherView;
-
-  /**
-   * Optional list of collections the cipher is assigned to. If none are provided, they will be loaded using the
-   * `CipherService` and the `collectionIds` property of the cipher.
-   */
-  collections?: CollectionView[];
-
-  /**
-   * Optional collection ID used to know the collection filter selected.
-   */
-  activeCollectionId?: CollectionId;
-
-  /**
-   * If true, the edit button will be disabled in the dialog.
-   */
-  disableEdit?: boolean;
-}
-
-export const ViewCipherDialogResult = {
-  Edited: "edited",
-  Deleted: "deleted",
-  PremiumUpgrade: "premiumUpgrade",
-} as const;
-
-type ViewCipherDialogResult = UnionOfValues<typeof ViewCipherDialogResult>;
-
-export interface ViewCipherDialogCloseResult {
-  action: ViewCipherDialogResult;
-}
-
-/**
- * Component for viewing a cipher, presented in a dialog.
- * @deprecated Use the VaultItemDialogComponent instead.
- */
-@Component({
-  selector: "app-vault-view",
-  templateUrl: "view.component.html",
-  imports: [CipherViewComponent, CommonModule, AsyncActionsModule, DialogModule, SharedModule],
-  providers: [{ provide: ViewPasswordHistoryService, useClass: VaultViewPasswordHistoryService }],
-})
-export class ViewComponent implements OnInit {
-  cipher: CipherView;
-  collections?: CollectionView[];
-  onDeletedCipher = new EventEmitter<CipherView>();
-  cipherTypeString: string;
-  organization: Organization;
-
-  canDeleteCipher$: Observable<boolean>;
-
-  constructor(
-    @Inject(DIALOG_DATA) public params: ViewCipherDialogParams,
-    private dialogRef: DialogRef<ViewCipherDialogCloseResult>,
-    private i18nService: I18nService,
-    private dialogService: DialogService,
-    private messagingService: MessagingService,
-    private logService: LogService,
-    private cipherService: CipherService,
-    private toastService: ToastService,
-    private organizationService: OrganizationService,
-    private cipherAuthorizationService: CipherAuthorizationService,
-    private accountService: AccountService,
-  ) {}
-
-  /**
-   * Lifecycle hook for component initialization.
-   */
-  async ngOnInit() {
-    this.cipher = this.params.cipher;
-    this.collections = this.params.collections;
-    this.cipherTypeString = this.getCipherViewTypeString();
-
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-
-    if (this.cipher.organizationId) {
-      this.organization = await firstValueFrom(
-        this.organizationService
-          .organizations$(userId)
-          .pipe(
-            map((organizations) => organizations.find((o) => o.id === this.cipher.organizationId)),
-          ),
-      );
-    }
-
-    this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(this.cipher);
-  }
-
-  /**
-   * Method to handle cipher deletion. Called when a user clicks the delete button.
-   */
-  delete = async () => {
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "deleteItem" },
-      content: {
-        key: this.cipher.isDeleted ? "permanentlyDeleteItemConfirmation" : "deleteItemConfirmation",
-      },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return;
-    }
-
-    try {
-      await this.deleteCipher();
-      this.toastService.showToast({
-        variant: "success",
-        title: this.i18nService.t("success"),
-        message: this.i18nService.t(
-          this.cipher.isDeleted ? "permanentlyDeletedItem" : "deletedItem",
-        ),
-      });
-      this.onDeletedCipher.emit(this.cipher);
-      this.messagingService.send(
-        this.cipher.isDeleted ? "permanentlyDeletedCipher" : "deletedCipher",
-      );
-    } catch (e) {
-      this.logService.error(e);
-    }
-
-    this.dialogRef.close({ action: ViewCipherDialogResult.Deleted });
-  };
-
-  /**
-   * Helper method to delete cipher.
-   */
-  protected async deleteCipher(): Promise<void> {
-    const asAdmin = this.organization?.canEditAllCiphers;
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    if (this.cipher.isDeleted) {
-      await this.cipherService.deleteWithServer(this.cipher.id, userId, asAdmin);
-    } else {
-      await this.cipherService.softDeleteWithServer(this.cipher.id, userId, asAdmin);
-    }
-  }
-
-  /**
-   * Method to handle cipher editing. Called when a user clicks the edit button.
-   */
-  async edit(): Promise<void> {
-    this.dialogRef.close({ action: ViewCipherDialogResult.Edited });
-  }
-
-  /**
-   * Method to get cipher view type string, used for the dialog title.
-   * E.g. "View login" or "View note".
-   * @returns The localized string for the cipher type
-   */
-  getCipherViewTypeString(): string {
-    if (!this.cipher) {
-      return null;
-    }
-
-    switch (this.cipher.type) {
-      case CipherType.Login:
-        return this.i18nService.t("viewItemHeaderLogin");
-      case CipherType.SecureNote:
-        return this.i18nService.t("viewItemHeaderCard");
-      case CipherType.Card:
-        return this.i18nService.t("viewItemHeaderIdentity");
-      case CipherType.Identity:
-        return this.i18nService.t("viewItemHeaderNote");
-      case CipherType.SshKey:
-        return this.i18nService.t("viewItemHeaderSshKey");
-      default:
-        return null;
-    }
-  }
-}
-
-/**
- * Strongly typed helper to open a cipher view dialog
- * @param dialogService Instance of the dialog service that will be used to open the dialog
- * @param config Configuration for the dialog
- * @returns A reference to the opened dialog
- */
-export function openViewCipherDialog(
-  dialogService: DialogService,
-  config: DialogConfig<ViewCipherDialogParams>,
-): DialogRef<ViewCipherDialogCloseResult> {
-  return dialogService.open(ViewComponent, config);
-}
diff --git a/apps/web/src/app/vault/services/browser-extension-prompt.service.spec.ts b/apps/web/src/app/vault/services/browser-extension-prompt.service.spec.ts
index 5b4c6665aa0..8938431d554 100644
--- a/apps/web/src/app/vault/services/browser-extension-prompt.service.spec.ts
+++ b/apps/web/src/app/vault/services/browser-extension-prompt.service.spec.ts
@@ -1,4 +1,5 @@
 import { TestBed } from "@angular/core/testing";
+import { firstValueFrom, Observable } from "rxjs";
 
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -9,11 +10,13 @@ import {
   BrowserExtensionPromptService,
   BrowserPromptState,
 } from "./browser-extension-prompt.service";
+import { WebBrowserInteractionService } from "./web-browser-interaction.service";
 
 describe("BrowserExtensionPromptService", () => {
   let service: BrowserExtensionPromptService;
   const setAnonLayoutWrapperData = jest.fn();
   const isFirefox = jest.fn().mockReturnValue(false);
+  const openExtensionMock = jest.fn().mockResolvedValue(undefined);
   const postMessage = jest.fn();
   window.postMessage = postMessage;
 
@@ -21,12 +24,14 @@ describe("BrowserExtensionPromptService", () => {
     setAnonLayoutWrapperData.mockClear();
     postMessage.mockClear();
     isFirefox.mockClear();
+    openExtensionMock.mockClear();
 
     TestBed.configureTestingModule({
       providers: [
         BrowserExtensionPromptService,
         { provide: AnonLayoutWrapperDataService, useValue: { setAnonLayoutWrapperData } },
         { provide: PlatformUtilsService, useValue: { isFirefox } },
+        { provide: WebBrowserInteractionService, useValue: { openExtension: openExtensionMock } },
       ],
     });
     jest.useFakeTimers();
@@ -45,38 +50,42 @@ describe("BrowserExtensionPromptService", () => {
     });
   });
 
-  describe("start", () => {
+  describe("registerPopupUrl", () => {
     it("posts message to check for extension", () => {
-      service.start();
+      service.registerPopupUrl(VaultMessages.OpenAtRiskPasswords);
 
       expect(window.postMessage).toHaveBeenCalledWith({
         command: VaultMessages.checkBwInstalled,
       });
     });
 
-    it("sets timeout for error state", () => {
-      service.start();
-
-      expect(service["extensionCheckTimeout"]).not.toBeNull();
-    });
-
     it("attempts to open the extension when installed", () => {
-      service.start();
+      service.registerPopupUrl(VaultMessages.OpenAtRiskPasswords);
 
       window.dispatchEvent(
         new MessageEvent("message", { data: { command: VaultMessages.HasBwInstalled } }),
       );
 
       expect(window.postMessage).toHaveBeenCalledTimes(2);
+      expect(window.postMessage).toHaveBeenCalledWith({
+        command: VaultMessages.checkBwInstalled,
+      });
       expect(window.postMessage).toHaveBeenCalledWith({
         command: VaultMessages.OpenAtRiskPasswords,
       });
     });
   });
 
-  describe("success state", () => {
-    beforeEach(() => {
+  describe("start", () => {
+    it("sets timeout for error state", () => {
       service.start();
+      expect(service["extensionCheckTimeout"]).not.toBeNull();
+    });
+  });
+
+  describe("success registerPopupUrl", () => {
+    beforeEach(() => {
+      service.registerPopupUrl(VaultMessages.OpenAtRiskPasswords);
 
       window.dispatchEvent(
         new MessageEvent("message", { data: { command: VaultMessages.PopupOpened } }),
@@ -155,7 +164,7 @@ describe("BrowserExtensionPromptService", () => {
 
   describe("error state", () => {
     beforeEach(() => {
-      service.start();
+      service.registerPopupUrl(VaultMessages.OpenAtRiskPasswords);
       jest.advanceTimersByTime(1000);
     });
 
@@ -172,19 +181,17 @@ describe("BrowserExtensionPromptService", () => {
       });
     });
 
-    it("sets manual open state when open extension is called", (done) => {
-      service.openExtension(true);
+    it("sets manual open state when open extension is called", async () => {
+      const pageState$: Observable<BrowserPromptState> = service.pageState$;
 
+      await service.openExtension(VaultMessages.OpenAtRiskPasswords, true);
       jest.advanceTimersByTime(1000);
 
-      service.pageState$.subscribe((state) => {
-        expect(state).toBe(BrowserPromptState.ManualOpen);
-        done();
-      });
+      expect(await firstValueFrom(pageState$)).toBe(BrowserPromptState.ManualOpen);
     });
 
-    it("shows success state when extension auto opens", (done) => {
-      service.openExtension(true);
+    it("shows success state when extension auto opens", async () => {
+      await service.openExtension(VaultMessages.OpenAtRiskPasswords, true);
 
       jest.advanceTimersByTime(500); // don't let timeout occur
 
@@ -192,11 +199,9 @@ describe("BrowserExtensionPromptService", () => {
         new MessageEvent("message", { data: { command: VaultMessages.PopupOpened } }),
       );
 
-      service.pageState$.subscribe((state) => {
-        expect(state).toBe(BrowserPromptState.Success);
-        expect(service["extensionCheckTimeout"]).toBeUndefined();
-        done();
-      });
+      const pageState$: Observable<BrowserPromptState> = service.pageState$;
+      expect(await firstValueFrom(pageState$)).toBe(BrowserPromptState.Success);
+      expect(service["extensionCheckTimeout"]).toBeUndefined();
     });
   });
 });
diff --git a/apps/web/src/app/vault/services/browser-extension-prompt.service.ts b/apps/web/src/app/vault/services/browser-extension-prompt.service.ts
index a164a106917..2bbbd287d76 100644
--- a/apps/web/src/app/vault/services/browser-extension-prompt.service.ts
+++ b/apps/web/src/app/vault/services/browser-extension-prompt.service.ts
@@ -4,10 +4,13 @@ import { BehaviorSubject, fromEvent } from "rxjs";
 
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { ExtensionPageUrls } from "@bitwarden/common/vault/enums";
 import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
 import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import { AnonLayoutWrapperDataService } from "@bitwarden/components";
 
+import { WebBrowserInteractionService } from "./web-browser-interaction.service";
+
 export const BrowserPromptState = {
   Loading: "loading",
   Error: "error",
@@ -36,6 +39,7 @@ export class BrowserExtensionPromptService {
     private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
     private destroyRef: DestroyRef,
     private platformUtilsService: PlatformUtilsService,
+    private webBrowserInteractionService: WebBrowserInteractionService,
   ) {}
 
   start(): void {
@@ -52,14 +56,19 @@ export class BrowserExtensionPromptService {
       this.setErrorState(BrowserPromptState.ManualOpen);
       return;
     }
+  }
 
-    this.checkForBrowserExtension();
+  registerPopupUrl(url: string) {
+    this.checkForBrowserExtension(url);
   }
 
   /** Post a message to the extension to open */
-  openExtension(setManualErrorTimeout = false) {
-    window.postMessage({ command: VaultMessages.OpenAtRiskPasswords });
-
+  async openExtension(url: string, setManualErrorTimeout = false) {
+    if (url == VaultMessages.OpenAtRiskPasswords) {
+      window.postMessage({ command: url });
+    } else {
+      await this.webBrowserInteractionService.openExtension(ExtensionPageUrls[url]);
+    }
     // Optionally, configure timeout to show the manual open error state if
     // the extension does not open within one second.
     if (setManualErrorTimeout) {
@@ -72,11 +81,11 @@ export class BrowserExtensionPromptService {
   }
 
   /** Send message checking for the browser extension */
-  private checkForBrowserExtension() {
+  private checkForBrowserExtension(url: string) {
     fromEvent<MessageEvent>(window, "message")
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe((event) => {
-        void this.getMessages(event);
+        void this.getMessages(event, url);
       });
 
     window.postMessage({ command: VaultMessages.checkBwInstalled });
@@ -88,9 +97,9 @@ export class BrowserExtensionPromptService {
   }
 
   /** Handle window message events */
-  private getMessages(event: any) {
+  private async getMessages(event: any, url: string) {
     if (event.data.command === VaultMessages.HasBwInstalled) {
-      this.openExtension();
+      await this.openExtension(url);
     }
 
     if (event.data.command === VaultMessages.PopupOpened) {
diff --git a/apps/web/src/app/vault/services/web-premium-upgrade-prompt.service.spec.ts b/apps/web/src/app/vault/services/web-premium-upgrade-prompt.service.spec.ts
index 1f34b823aec..f9319e87656 100644
--- a/apps/web/src/app/vault/services/web-premium-upgrade-prompt.service.spec.ts
+++ b/apps/web/src/app/vault/services/web-premium-upgrade-prompt.service.spec.ts
@@ -2,8 +2,19 @@ import { TestBed } from "@angular/core/testing";
 import { Router } from "@angular/router";
 import { lastValueFrom, of } from "rxjs";
 
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } 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 { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SyncService } from "@bitwarden/common/platform/sync";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { DialogRef, DialogService } from "@bitwarden/components";
+import {
+  UnifiedUpgradeDialogComponent,
+  UnifiedUpgradeDialogStatus,
+} from "@bitwarden/web-vault/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component";
 
 import { VaultItemDialogResult } from "../components/vault-item-dialog/vault-item-dialog.component";
 
@@ -13,13 +24,27 @@ describe("WebVaultPremiumUpgradePromptService", () => {
   let service: WebVaultPremiumUpgradePromptService;
   let dialogServiceMock: jest.Mocked<DialogService>;
   let routerMock: jest.Mocked<Router>;
-  let dialogRefMock: jest.Mocked<DialogRef<VaultItemDialogResult>>;
+  let dialogRefMock: jest.Mocked<DialogRef>;
+  let configServiceMock: jest.Mocked<ConfigService>;
+  let accountServiceMock: jest.Mocked<AccountService>;
+  let apiServiceMock: jest.Mocked<ApiService>;
+  let syncServiceMock: jest.Mocked<SyncService>;
+  let billingAccountProfileServiceMock: jest.Mocked<BillingAccountProfileStateService>;
+  let platformUtilsServiceMock: jest.Mocked<PlatformUtilsService>;
 
   beforeEach(() => {
     dialogServiceMock = {
       openSimpleDialog: jest.fn(),
     } as unknown as jest.Mocked<DialogService>;
 
+    configServiceMock = {
+      getFeatureFlag: jest.fn().mockReturnValue(false),
+    } as unknown as jest.Mocked<ConfigService>;
+
+    accountServiceMock = {
+      activeAccount$: of({ id: "user-123" }),
+    } as unknown as jest.Mocked<AccountService>;
+
     routerMock = {
       navigate: jest.fn(),
     } as unknown as jest.Mocked<Router>;
@@ -28,12 +53,34 @@ describe("WebVaultPremiumUpgradePromptService", () => {
       close: jest.fn(),
     } as unknown as jest.Mocked<DialogRef<VaultItemDialogResult>>;
 
+    apiServiceMock = {
+      refreshIdentityToken: jest.fn().mockReturnValue({}),
+    } as unknown as jest.Mocked<ApiService>;
+
+    syncServiceMock = {
+      fullSync: jest.fn(),
+    } as unknown as jest.Mocked<SyncService>;
+
+    billingAccountProfileServiceMock = {
+      hasPremiumFromAnySource$: jest.fn().mockReturnValue(of(false)),
+    } as unknown as jest.Mocked<BillingAccountProfileStateService>;
+
+    platformUtilsServiceMock = {
+      isSelfHost: jest.fn().mockReturnValue(false),
+    } as unknown as jest.Mocked<PlatformUtilsService>;
+
     TestBed.configureTestingModule({
       providers: [
         WebVaultPremiumUpgradePromptService,
         { provide: DialogService, useValue: dialogServiceMock },
         { provide: Router, useValue: routerMock },
         { provide: DialogRef, useValue: dialogRefMock },
+        { provide: ConfigService, useValue: configServiceMock },
+        { provide: AccountService, useValue: accountServiceMock },
+        { provide: ApiService, useValue: apiServiceMock },
+        { provide: SyncService, useValue: syncServiceMock },
+        { provide: BillingAccountProfileStateService, useValue: billingAccountProfileServiceMock },
+        { provide: PlatformUtilsService, useValue: platformUtilsServiceMock },
       ],
     });
 
@@ -84,4 +131,151 @@ describe("WebVaultPremiumUpgradePromptService", () => {
     expect(routerMock.navigate).not.toHaveBeenCalled();
     expect(dialogRefMock.close).not.toHaveBeenCalled();
   });
+
+  describe("premium status check", () => {
+    it("should not prompt if user already has premium (feature flag off)", async () => {
+      configServiceMock.getFeatureFlag.mockReturnValue(Promise.resolve(false));
+      billingAccountProfileServiceMock.hasPremiumFromAnySource$.mockReturnValue(of(true));
+
+      await service.promptForPremium();
+
+      expect(dialogServiceMock.openSimpleDialog).not.toHaveBeenCalled();
+      expect(routerMock.navigate).not.toHaveBeenCalled();
+    });
+
+    it("should not prompt if user already has premium (feature flag on)", async () => {
+      configServiceMock.getFeatureFlag.mockImplementation((flag: FeatureFlag) => {
+        if (flag === FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog) {
+          return Promise.resolve(true);
+        }
+        return Promise.resolve(false);
+      });
+      billingAccountProfileServiceMock.hasPremiumFromAnySource$.mockReturnValue(of(true));
+
+      const unifiedDialogRefMock = {
+        closed: of({ status: UnifiedUpgradeDialogStatus.Closed }),
+        close: jest.fn(),
+      } as any;
+      jest.spyOn(UnifiedUpgradeDialogComponent, "open").mockReturnValue(unifiedDialogRefMock);
+
+      await service.promptForPremium();
+
+      expect(UnifiedUpgradeDialogComponent.open).not.toHaveBeenCalled();
+      expect(dialogServiceMock.openSimpleDialog).not.toHaveBeenCalled();
+      expect(routerMock.navigate).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("new premium upgrade dialog with post-upgrade actions", () => {
+    beforeEach(() => {
+      configServiceMock.getFeatureFlag.mockImplementation((flag: FeatureFlag) => {
+        if (flag === FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog) {
+          return Promise.resolve(true);
+        }
+        return Promise.resolve(false);
+      });
+    });
+
+    describe("when self-hosted", () => {
+      beforeEach(() => {
+        platformUtilsServiceMock.isSelfHost.mockReturnValue(true);
+      });
+
+      it("should navigate to subscription page instead of opening dialog", async () => {
+        await service.promptForPremium();
+
+        expect(routerMock.navigate).toHaveBeenCalledWith(["settings/subscription/premium"]);
+        expect(dialogServiceMock.openSimpleDialog).not.toHaveBeenCalled();
+      });
+
+      it("should close dialog when redirecting to subscription page", async () => {
+        await service.promptForPremium();
+
+        expect(dialogRefMock.close).toHaveBeenCalledWith(VaultItemDialogResult.PremiumUpgrade);
+        expect(routerMock.navigate).toHaveBeenCalledWith(["settings/subscription/premium"]);
+      });
+    });
+
+    describe("when not self-hosted", () => {
+      beforeEach(() => {
+        platformUtilsServiceMock.isSelfHost.mockReturnValue(false);
+      });
+
+      it("should full sync when user upgrades to premium", async () => {
+        const unifiedDialogRefMock = {
+          closed: of({ status: UnifiedUpgradeDialogStatus.UpgradedToPremium }),
+          close: jest.fn(),
+        } as any;
+        jest.spyOn(UnifiedUpgradeDialogComponent, "open").mockReturnValue(unifiedDialogRefMock);
+
+        await service.promptForPremium();
+
+        expect(UnifiedUpgradeDialogComponent.open).toHaveBeenCalledWith(dialogServiceMock, {
+          data: {
+            account: { id: "user-123" },
+            planSelectionStepTitleOverride: "upgradeYourPlan",
+            hideContinueWithoutUpgradingButton: true,
+          },
+        });
+        expect(syncServiceMock.fullSync).toHaveBeenCalledWith(true);
+      });
+
+      it("should full sync when user upgrades to families", async () => {
+        const unifiedDialogRefMock = {
+          closed: of({ status: UnifiedUpgradeDialogStatus.UpgradedToFamilies }),
+          close: jest.fn(),
+        } as any;
+        jest.spyOn(UnifiedUpgradeDialogComponent, "open").mockReturnValue(unifiedDialogRefMock);
+
+        await service.promptForPremium();
+
+        expect(UnifiedUpgradeDialogComponent.open).toHaveBeenCalledWith(dialogServiceMock, {
+          data: {
+            account: { id: "user-123" },
+            planSelectionStepTitleOverride: "upgradeYourPlan",
+            hideContinueWithoutUpgradingButton: true,
+          },
+        });
+        expect(syncServiceMock.fullSync).toHaveBeenCalledWith(true);
+      });
+
+      it("should not refresh or sync when user closes dialog without upgrading", async () => {
+        const unifiedDialogRefMock = {
+          closed: of({ status: UnifiedUpgradeDialogStatus.Closed }),
+          close: jest.fn(),
+        } as any;
+        jest.spyOn(UnifiedUpgradeDialogComponent, "open").mockReturnValue(unifiedDialogRefMock);
+
+        await service.promptForPremium();
+
+        expect(UnifiedUpgradeDialogComponent.open).toHaveBeenCalledWith(dialogServiceMock, {
+          data: {
+            account: { id: "user-123" },
+            planSelectionStepTitleOverride: "upgradeYourPlan",
+            hideContinueWithoutUpgradingButton: true,
+          },
+        });
+        expect(apiServiceMock.refreshIdentityToken).not.toHaveBeenCalled();
+        expect(syncServiceMock.fullSync).not.toHaveBeenCalled();
+      });
+
+      it("should not open new dialog if organizationId is provided", async () => {
+        const organizationId = "test-org-id" as OrganizationId;
+        dialogServiceMock.openSimpleDialog.mockReturnValue(lastValueFrom(of(true)));
+
+        const openSpy = jest.spyOn(UnifiedUpgradeDialogComponent, "open");
+        openSpy.mockClear();
+
+        await service.promptForPremium(organizationId);
+
+        expect(openSpy).not.toHaveBeenCalled();
+        expect(dialogServiceMock.openSimpleDialog).toHaveBeenCalledWith({
+          title: { key: "upgradeOrganization" },
+          content: { key: "upgradeOrganizationDesc" },
+          acceptButtonText: { key: "upgradeOrganization" },
+          type: "info",
+        });
+      });
+    });
+  });
 });
diff --git a/apps/web/src/app/vault/services/web-premium-upgrade-prompt.service.ts b/apps/web/src/app/vault/services/web-premium-upgrade-prompt.service.ts
index 87fcdc345d8..917a2761e24 100644
--- a/apps/web/src/app/vault/services/web-premium-upgrade-prompt.service.ts
+++ b/apps/web/src/app/vault/services/web-premium-upgrade-prompt.service.ts
@@ -1,10 +1,21 @@
 import { Injectable, Optional } from "@angular/core";
 import { Router } from "@angular/router";
-import { Subject } from "rxjs";
+import { firstValueFrom, lastValueFrom, Subject } from "rxjs";
 
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } 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 { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SyncService } from "@bitwarden/common/platform/sync";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { DialogRef, DialogService } from "@bitwarden/components";
+import {
+  UnifiedUpgradeDialogComponent,
+  UnifiedUpgradeDialogStatus,
+} from "@bitwarden/web-vault/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component";
 
 import { VaultItemDialogResult } from "../components/vault-item-dialog/vault-item-dialog.component";
 
@@ -15,14 +26,44 @@ export class WebVaultPremiumUpgradePromptService implements PremiumUpgradePrompt
 
   constructor(
     private dialogService: DialogService,
+    private configService: ConfigService,
+    private accountService: AccountService,
+    private apiService: ApiService,
+    private syncService: SyncService,
+    private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private platformUtilsService: PlatformUtilsService,
     private router: Router,
     @Optional() private dialog?: DialogRef<VaultItemDialogResult>,
   ) {}
+  private readonly subscriptionPageRoute = "settings/subscription/premium";
 
   /**
    * Prompts the user for a premium upgrade.
    */
   async promptForPremium(organizationId?: OrganizationId) {
+    const account = await firstValueFrom(this.accountService.activeAccount$);
+    if (!account) {
+      return;
+    }
+    const hasPremium = await firstValueFrom(
+      this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
+    );
+    if (hasPremium) {
+      // Already has premium, don't prompt
+      return;
+    }
+
+    const showNewDialog = await this.configService.getFeatureFlag(
+      FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog,
+    );
+
+    // Per conversation in PM-23713, retain the existing upgrade org flow for now, will be addressed
+    //  as a part of https://bitwarden.atlassian.net/browse/PM-25507
+    if (showNewDialog && !organizationId) {
+      await this.promptForPremiumVNext(account);
+      return;
+    }
+
     let confirmed = false;
     let route: string[] | null = null;
 
@@ -44,7 +85,7 @@ export class WebVaultPremiumUpgradePromptService implements PremiumUpgradePrompt
         type: "success",
       });
       if (confirmed) {
-        route = ["settings/subscription/premium"];
+        route = [this.subscriptionPageRoute];
       }
     }
 
@@ -57,4 +98,34 @@ export class WebVaultPremiumUpgradePromptService implements PremiumUpgradePrompt
       this.dialog.close(VaultItemDialogResult.PremiumUpgrade);
     }
   }
+
+  private async promptForPremiumVNext(account: Account) {
+    await (this.platformUtilsService.isSelfHost()
+      ? this.redirectToSubscriptionPage()
+      : this.openUpgradeDialog(account));
+  }
+
+  private async redirectToSubscriptionPage() {
+    await this.router.navigate([this.subscriptionPageRoute]);
+    if (this.dialog) {
+      this.dialog.close(VaultItemDialogResult.PremiumUpgrade);
+    }
+  }
+
+  private async openUpgradeDialog(account: Account) {
+    const dialogRef = UnifiedUpgradeDialogComponent.open(this.dialogService, {
+      data: {
+        account,
+        planSelectionStepTitleOverride: "upgradeYourPlan",
+        hideContinueWithoutUpgradingButton: true,
+      },
+    });
+    const result = await lastValueFrom(dialogRef.closed);
+    if (
+      result?.status === UnifiedUpgradeDialogStatus.UpgradedToPremium ||
+      result?.status === UnifiedUpgradeDialogStatus.UpgradedToFamilies
+    ) {
+      await this.syncService.fullSync(true);
+    }
+  }
 }
diff --git a/apps/web/src/app/vault/settings/purge-vault.component.ts b/apps/web/src/app/vault/settings/purge-vault.component.ts
index 4c58a27adb7..a81c14e9cc4 100644
--- a/apps/web/src/app/vault/settings/purge-vault.component.ts
+++ b/apps/web/src/app/vault/settings/purge-vault.component.ts
@@ -25,6 +25,8 @@ export interface PurgeVaultDialogData {
   organizationId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "purge-vault.component.html",
   imports: [SharedModule, UserVerificationModule],
diff --git a/apps/web/src/connectors/duo-redirect.ts b/apps/web/src/connectors/duo-redirect.ts
index ae8f84715db..842bd8c0064 100644
--- a/apps/web/src/connectors/duo-redirect.ts
+++ b/apps/web/src/connectors/duo-redirect.ts
@@ -123,7 +123,7 @@ function displayHandoffMessage(client: string) {
       ? localeService.t("thisWindowWillCloseIn5Seconds")
       : localeService.t("youMayCloseThisWindow");
 
-  h1.className = "tw-font-semibold";
+  h1.className = "tw-font-medium";
   p.className = "tw-mb-4";
 
   content.appendChild(h1);
diff --git a/apps/web/src/connectors/webauthn-fallback.html b/apps/web/src/connectors/webauthn-fallback.html
index 43da5b1a485..ef85ce6f351 100644
--- a/apps/web/src/connectors/webauthn-fallback.html
+++ b/apps/web/src/connectors/webauthn-fallback.html
@@ -115,7 +115,7 @@
           <button
             type="button"
             id="webauthn-button"
-            class="!tw-text-contrast disabled:!tw-text-muted disabled:hover:!tw-text-muted disabled:hover:tw-bg-secondary-300 disabled:hover:tw-border-secondary-300 disabled:hover:tw-no-underline disabled:tw-bg-secondary-300 disabled:tw-border-secondary-300 disabled:tw-cursor-not-allowed focus-visible:tw-ring-2 focus-visible:tw-ring-offset-2 focus-visible:tw-ring-primary-600 focus-visible:tw-z-10 focus:tw-outline-none hover:tw-bg-primary-700 hover:tw-border-primary-700 hover:tw-no-underline tw-bg-primary-600 tw-block tw-border-2 tw-border-primary-600 tw-border-solid tw-font-semibold tw-no-underline tw-px-3 tw-py-1.5 tw-rounded-full tw-text-center tw-transition tw-w-full"
+            class="!tw-text-contrast disabled:!tw-text-muted disabled:hover:!tw-text-muted disabled:hover:tw-bg-secondary-300 disabled:hover:tw-border-secondary-300 disabled:hover:tw-no-underline disabled:tw-bg-secondary-300 disabled:tw-border-secondary-300 disabled:tw-cursor-not-allowed focus-visible:tw-ring-2 focus-visible:tw-ring-offset-2 focus-visible:tw-ring-primary-600 focus-visible:tw-z-10 focus:tw-outline-none hover:tw-bg-primary-700 hover:tw-border-primary-700 hover:tw-no-underline tw-bg-primary-600 tw-block tw-border-2 tw-border-primary-600 tw-border-solid tw-font-medium tw-no-underline tw-px-3 tw-py-1.5 tw-rounded-full tw-text-center tw-transition tw-w-full"
           ></button>
         </div>
       </div>
diff --git a/apps/web/src/connectors/webauthn-mobile.html b/apps/web/src/connectors/webauthn-mobile.html
index 06df8b012ab..0551d176eab 100644
--- a/apps/web/src/connectors/webauthn-mobile.html
+++ b/apps/web/src/connectors/webauthn-mobile.html
@@ -24,7 +24,7 @@
         <button
           type="button"
           id="webauthn-button"
-          class="tw-cursor-pointer tw-bg-primary-600 tw-border-transparent tw-px-4 tw-py-2 tw-rounded-md hover:tw-bg-primary-700 tw-transition-colors tw-font-semibold tw-text-contrast tw-text-lg"
+          class="tw-cursor-pointer tw-bg-primary-600 tw-border-transparent tw-px-4 tw-py-2 tw-rounded-md hover:tw-bg-primary-700 tw-transition-colors tw-font-medium tw-text-contrast tw-text-lg"
         ></button>
       </div>
     </div>
diff --git a/apps/web/src/connectors/webauthn.html b/apps/web/src/connectors/webauthn.html
index 27f143f90d3..358e589b68f 100644
--- a/apps/web/src/connectors/webauthn.html
+++ b/apps/web/src/connectors/webauthn.html
@@ -9,7 +9,7 @@
     <button
       type="button"
       id="webauthn-button"
-      class="tw-block !tw-text-contrast focus-visible:tw-ring-2 focus-visible:tw-ring-offset-2 focus-visible:tw-ring-primary-600 focus-visible:tw-z-10 focus:tw-outline-none hover:tw-bg-primary-700 hover:tw-border-primary-700 hover:tw-no-underline tw-bg-primary-600 tw-border-2 tw-border-primary-600 tw-border-solid tw-font-semibold tw-no-underline tw-px-3 tw-py-1.5 tw-rounded-full tw-text-center tw-transition tw-w-full"
+      class="tw-block !tw-text-contrast focus-visible:tw-ring-2 focus-visible:tw-ring-offset-2 focus-visible:tw-ring-primary-600 focus-visible:tw-z-10 focus:tw-outline-none hover:tw-bg-primary-700 hover:tw-border-primary-700 hover:tw-no-underline tw-bg-primary-600 tw-border-2 tw-border-primary-600 tw-border-solid tw-font-medium tw-no-underline tw-px-3 tw-py-1.5 tw-rounded-full tw-text-center tw-transition tw-w-full"
     ></button>
   </body>
 </html>
diff --git a/apps/web/src/images/integrations/logo-datadog-color.svg b/apps/web/src/images/integrations/logo-datadog-color.svg
new file mode 100644
index 00000000000..62e608cd544
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-datadog-color.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="114" height="113" fill="none"><g clip-path="url(#a)"><mask id="b" width="115" height="122" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M114.686 0H.45v121.828h114.236V0Z"/></mask><g mask="url(#b)"><path fill="#5C2D90" d="m102.158 59.532 2.781 35.489-49.225 8.833-4.238-35.489 7.033-.982c1.144.491 1.963.654 3.271.982 2.126.49 4.58 1.144 8.175-.817.818-.491 2.617-1.964 3.272-2.944l28.931-5.072Zm-76.05 42.198c-.818-1.307-2.29-2.78-4.58-4.58-3.272-2.617-2.126-7.197-.165-9.976 2.472-4.742 15.374-10.957 14.72-18.645-.326-2.78-.653-6.379-3.271-8.996-.164.982 0 1.964 0 1.964s-1.144-1.307-1.635-3.272c-.491-.653-.982-.982-1.473-1.963-.326 1.144-.326 2.29-.326 2.29s-.818-2.126-.982-3.761c-.49.817-.653 2.29-.653 2.29s-1.144-3.272-.818-5.068c-.49-1.472-2.126-4.58-1.635-11.448 2.781 1.964 8.996 1.473 11.449-2.126.817-1.144 1.306-4.414-.327-10.795-1.144-4.089-3.925-10.14-5.067-12.43l-.165.165c.654 1.8 1.801 5.724 2.29 7.687 1.307 5.724 1.801 7.688 1.145 10.304-.491 2.29-1.802 3.761-5.234 5.398-3.271 1.635-7.85-2.472-8.016-2.617-3.271-2.617-5.724-6.886-6.05-8.832-.327-2.29 1.306-3.598 2.125-5.397-1.144.327-2.472.982-2.472.982s1.473-1.635 3.434-2.944a16.649 16.649 0 0 0 2.126-1.472h-2.104s1.963-1.144 4.089-1.801H19.57l7.85-3.434c2.472-.982 4.743-.653 6.051 1.144 1.801 2.472 3.599 3.76 7.36 4.742 2.29-.981 3.107-1.635 6.05-2.471 2.617-2.944 4.742-3.272 4.742-3.272s-1.472 1.306-1.635 2.78c1.473-1.143 3.108-2.125 3.108-2.125s-.653.817-1.144 1.963l.164.164c1.801-.981 3.76-1.8 3.76-1.8s-.652.653-1.306 1.634c1.307 0 3.925 0 4.909.165 6.05.164 7.359-6.38 9.649-7.36 2.943-.981 4.251-1.634 9.158 3.272 4.252 4.252 7.522 11.613 5.889 13.248-1.307 1.306-4.09-.491-7.197-4.252-1.635-1.963-2.781-4.414-3.434-7.359-.327-2.472-2.126-3.925-2.126-3.925s1.144 2.472 1.144 4.58c0 1.144.164 5.398 1.963 7.85-.164.327-.326 1.8-.49 1.963-2.126-2.616-6.886-4.414-7.522-5.067 2.617 2.126 8.505 6.886 10.795 11.448 2.126 4.414.817 8.341 1.963 9.323.327.326 4.58 5.561 5.398 8.34 1.472 4.743.164 9.65-1.801 12.593l-5.233.818a6.922 6.922 0 0 1-1.964-.656c.327-.653 1.144-2.29 1.144-2.616l-.326-.491c-1.635 2.29-4.414 4.58-6.706 5.888-2.943 1.635-6.38 1.473-8.652.654-6.379-1.964-12.43-6.215-13.736-7.36 0 0 0 .818.164 1.145a49.564 49.564 0 0 0 8.832 7.359l-7.522.817 3.599 27.804c-1.636.164-1.802.326-3.599.653-1.472-5.398-4.414-8.832-7.687-10.958-2.781-1.8-6.706-2.29-10.467-1.472l-.164.327c2.616-.327 5.724.164 8.831 2.125 3.108 1.962 5.562 7.033 6.542 9.976 1.144 3.925 1.963 8.016-1.144 12.43-2.29 3.108-8.832 4.909-14.065 1.144 1.472 2.29 3.272 4.089 5.888 4.414 3.761.491 7.36-.164 9.976-2.616 2.126-2.126 3.272-6.706 2.943-11.613l3.434-.49 1.145 8.651 55.746-6.653-4.909-44.485-2.781.49L96.598 0 3.703 10.795l11.448 92.568 10.958-1.633Z"/></g><path fill="#5C2D90" d="M70.307 53.075c2.471 1.8 4.58 2.943 6.706 2.78 1.306-.164 2.616-2.29 3.434-4.251.653-1.307.653-2.78-.327-3.272-.49-.164-2.472-.164-3.925 0-2.78.327-5.562 1.307-6.215 1.801-.982.653-.49 2.29.327 2.944m.653-19.14v.164l.164.327c.653 1.306 1.307 2.617 2.617 3.272.326 0 .653-.165.981-.165 1.145 0 1.801.165 2.29.327v-.982c-.164-1.635.327-4.58-2.943-6.215-1.306-.653-2.943-.326-3.598.327h.326c.818.327.327.653.165.982-.165.653-.329.817-.002 1.963ZM56.24 34.265c.817-.653-3.76-1.635-7.36.654-2.616 1.8-2.616 5.561-.163 7.687.245.122.467.289.653.491.653-.327 1.635-.653 2.472-.982 1.635-.49 2.943-.817 4.089-.981.49-.654 1.144-1.635.982-3.434-.165-2.472-2.126-1.964-.654-3.435m26.658 39.727-7.85 13.066-9.159-2.781-8.016 12.266.327 3.924 43.832-8.015-2.617-27.315-7.197 15.047-9.32-6.192Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M.273 0h113v113h-113z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-sumo-logic-siem-darkmode.svg b/apps/web/src/images/integrations/logo-sumo-logic-siem-darkmode.svg
new file mode 100644
index 00000000000..cbd9e1555f0
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-sumo-logic-siem-darkmode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="577" height="108" fill="none"><g clip-path="url(#a)"><path fill="#fff" d="M118.3 23.8v60.4h-14.1v-6.4C101 83 95.1 86 86.5 86c-14.3 0-21.4-7.4-21.4-19.2v-43h15.4v38.9c0 6.3 3.4 10 10 10 7.7 0 12.4-4.4 12.4-12.5V23.8h15.4Zm100 18.2v42.2h-15.4V46.6c0-7.2-2.9-11.6-9.6-11.6-6.7 0-10.6 5-10.6 12v37.2h-15.4V46.6c0-7.7-3.2-11.6-9.6-11.6-6.8 0-10.6 5-10.6 12v37.2h-15.4V23.8H146v6.7c3.5-5.8 9.3-8.7 17.2-8.7 7.7 0 13.5 3.2 16.8 8.9 4.1-5.9 10.2-8.9 18.1-8.9 12.9 0 20.2 7.7 20.2 20.2Zm123.6 42.2h-15.4V.2h15.4v84Zm167 0h-15.4V23.8h15.4v60.4Zm-15.7-69.5h15.9V0h-15.9v14.7Zm73.4 48.9c-6.3 6.7-10.6 9.3-16.4 9.3-6.9 0-11.8-4-14-10.2V45.1c2.3-6.3 7.2-10.3 14.2-10.3 5.1 0 9.2 1.8 15.7 7.9l9.6-9.5c-7.7-8.4-15.2-11.5-25.3-11.5-14.1 0-25 7.4-29.3 19.8v24.8C525.3 78.7 536 86 550 86c10.9 0 18.4-3.6 26.8-14l-10.2-8.4ZM31.7 47c-4.2-.9-7.2-1.7-8.9-2.1-2.1-.6-3.7-1.4-4.5-2.5v-4.6c1.4-2.2 4.8-3.6 9.5-3.6 6.5 0 11 1.5 18.1 7.1l8.3-10c-8.4-7-15.6-9.5-26-9.5-12 0-20.3 4.9-23.6 11.9v15.2c2.6 5.1 8.6 8 20.6 10.6 4.3 1 7.2 1.7 8.9 2 2.2.7 4.2 1.6 5.3 3.2V70c-1.5 2.4-5.1 3.7-9.8 3.7-3.4.1-6.7-.6-9.8-1.9-3-1.2-6.5-3.5-10.9-7.1L0 74.6C9.6 83.1 17.7 86 29.2 86c12.3 0 21-4.7 24.3-12.2V58.5C50.7 52.8 44 49.8 31.7 47Zm227-25.3c-13.9 0-24.8 7.5-29.3 19.5v25.4c4.4 12 15.4 19.5 29.3 19.5s24.7-7.5 29.1-19.4V41.1c-4.5-11.9-15.4-19.4-29.1-19.4Zm14.2 41.1c-2.4 6.4-7.5 10.2-14.3 10.2-6.7 0-12-3.8-14.4-10.2V45c2.4-6.4 7.5-10.3 14.4-10.3 6.8 0 11.8 3.9 14.2 10.3l.1 17.8Zm110.2-41.1c-13.9 0-24.8 7.5-29.3 19.5v25.4c4.5 12 15.4 19.5 29.3 19.5s24.7-7.5 29.1-19.4V41.1c-4.4-11.9-15.3-19.4-29.1-19.4Zm14.2 41.1c-2.4 6.4-7.5 10.2-14.2 10.2-6.7 0-12-3.8-14.4-10.2V45c2.4-6.4 7.5-10.3 14.4-10.3s11.8 3.9 14.2 10.3v17.8Zm68.5-39v6.7c-3.9-5.8-10-8.7-18.4-8.7-11.4 0-20.6 7-24.6 18.1v24.9c3.9 11.1 13.1 18 24.6 18 7.7 0 13.5-2.6 17.6-7.7v4.8c0 10-5.8 14.7-14.8 14.7-6.7 0-12.2-2-21-7.2l-7.5 11.1c8.5 5.7 18.5 8.8 28.7 8.9 17 0 29.5-9.1 29.5-26.1V23.8h-14.1Zm-1.9 36.7c-2.3 5.7-7.1 9.3-13.1 9.3s-10.8-3.5-13.1-9.3V44c2.3-5.7 7-9.2 13.1-9.2s10.8 3.5 13.1 9.2v16.5Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h577v107.3H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-sumo-logic-siem.svg b/apps/web/src/images/integrations/logo-sumo-logic-siem.svg
new file mode 100644
index 00000000000..1d584be72dd
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-sumo-logic-siem.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 577 107.3" viewBox="0 0 577 107.3"><path d="M118.3 23.8v60.4h-14.1v-6.4C101 83 95.1 86 86.5 86c-14.3 0-21.4-7.4-21.4-19.2v-43h15.4v38.9c0 6.3 3.4 10 10 10 7.7 0 12.4-4.4 12.4-12.5V23.8h15.4zm100 18.2v42.2h-15.4V46.6c0-7.2-2.9-11.6-9.6-11.6s-10.6 5-10.6 12v37.2h-15.4V46.6c0-7.7-3.2-11.6-9.6-11.6-6.8 0-10.6 5-10.6 12v37.2h-15.4V23.8H146v6.7c3.5-5.8 9.3-8.7 17.2-8.7 7.7 0 13.5 3.2 16.8 8.9 4.1-5.9 10.2-8.9 18.1-8.9 12.9 0 20.2 7.7 20.2 20.2zm123.6 42.2h-15.4V.2h15.4v84zm167 0h-15.4V23.8h15.4v60.4zm-15.7-69.5h15.9V0h-15.9v14.7zm73.4 48.9c-6.3 6.7-10.6 9.3-16.4 9.3-6.9 0-11.8-4-14-10.2V45.1c2.3-6.3 7.2-10.3 14.2-10.3 5.1 0 9.2 1.8 15.7 7.9l9.6-9.5c-7.7-8.4-15.2-11.5-25.3-11.5-14.1 0-25 7.4-29.3 19.8v24.8C525.3 78.7 536 86 550 86c10.9 0 18.4-3.6 26.8-14l-10.2-8.4zM31.7 47c-4.2-.9-7.2-1.7-8.9-2.1-2.1-.6-3.7-1.4-4.5-2.5v-4.6c1.4-2.2 4.8-3.6 9.5-3.6 6.5 0 11 1.5 18.1 7.1l8.3-10c-8.4-7-15.6-9.5-26-9.5-12 0-20.3 4.9-23.6 11.9v15.2c2.6 5.1 8.6 8 20.6 10.6 4.3 1 7.2 1.7 8.9 2 2.2.7 4.2 1.6 5.3 3.2V70c-1.5 2.4-5.1 3.7-9.8 3.7-3.4.1-6.7-.6-9.8-1.9-3-1.2-6.5-3.5-10.9-7.1L0 74.6C9.6 83.1 17.7 86 29.2 86c12.3 0 21-4.7 24.3-12.2V58.5C50.7 52.8 44 49.8 31.7 47zm227-25.3c-13.9 0-24.8 7.5-29.3 19.5v25.4c4.4 12 15.4 19.5 29.3 19.5s24.7-7.5 29.1-19.4V41.1c-4.5-11.9-15.4-19.4-29.1-19.4zm14.2 41.1c-2.4 6.4-7.5 10.2-14.3 10.2-6.7 0-12-3.8-14.4-10.2V45c2.4-6.4 7.5-10.3 14.4-10.3 6.8 0 11.8 3.9 14.2 10.3l.1 17.8zm110.2-41.1c-13.9 0-24.8 7.5-29.3 19.5v25.4c4.5 12 15.4 19.5 29.3 19.5s24.7-7.5 29.1-19.4V41.1c-4.4-11.9-15.3-19.4-29.1-19.4zm14.2 41.1c-2.4 6.4-7.5 10.2-14.2 10.2s-12-3.8-14.4-10.2V45c2.4-6.4 7.5-10.3 14.4-10.3s11.8 3.9 14.2 10.3v17.8zm68.5-39v6.7c-3.9-5.8-10-8.7-18.4-8.7-11.4 0-20.6 7-24.6 18.1v24.9c3.9 11.1 13.1 18 24.6 18 7.7 0 13.5-2.6 17.6-7.7v4.8c0 10-5.8 14.7-14.8 14.7-6.7 0-12.2-2-21-7.2l-7.5 11.1c8.5 5.7 18.5 8.8 28.7 8.9 17 0 29.5-9.1 29.5-26.1V23.8h-14.1zm-1.9 36.7c-2.3 5.7-7.1 9.3-13.1 9.3s-10.8-3.5-13.1-9.3V44c2.3-5.7 7-9.2 13.1-9.2s10.8 3.5 13.1 9.2v16.5z" style="fill:#009"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/loading-white.svg b/apps/web/src/images/loading-white.svg
index ef5970da42e..f5546e56340 100644
--- a/apps/web/src/images/loading-white.svg
+++ b/apps/web/src/images/loading-white.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 100% 100%">
-  <text fill="%23FBFBFB" x="50%" y="50%" font-family="\'Roboto\', \'Helvetica Neue\', Helvetica, Arial, sans-serif"
+  <text fill="%23FBFBFB" x="50%" y="50%" font-family="\'Inter\', \'Helvetica Neue\', Helvetica, Arial, sans-serif"
         font-size="18" text-anchor="middle">
     Loading...
   </text> 
diff --git a/apps/web/src/images/loading.svg b/apps/web/src/images/loading.svg
index 5f4102a5921..e05a42f6c70 100644
--- a/apps/web/src/images/loading.svg
+++ b/apps/web/src/images/loading.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 100% 100%">
-  <text fill="%23333333" x="50%" y="50%" font-family="\'Roboto\', \'Helvetica Neue\', Helvetica, Arial, sans-serif"
+  <text fill="%23333333" x="50%" y="50%" font-family="\'Inter\', \'Helvetica Neue\', Helvetica, Arial, sans-serif"
         font-size="18" text-anchor="middle">
     Loading...
   </text>
diff --git a/apps/web/src/images/secrets-manager/integrations/terraform.svg b/apps/web/src/images/secrets-manager/integrations/terraform.svg
new file mode 100644
index 00000000000..813e95e0200
--- /dev/null
+++ b/apps/web/src/images/secrets-manager/integrations/terraform.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="98" height="111" viewBox="0 0 98 111" fill="none">
+  <path d="M67.34 37.0927V72.1132L97.68 54.6122V19.5547L67.34 37.0927Z" fill="#4040B2"></path>
+  <path d="M33.6699 19.5547L64.0099 37.0927V72.1132L33.6699 54.5937V19.5547Z" fill="#5C4EE5"></path>
+  <path d="M0 0V35.039L30.34 52.5585V17.5195L0 0ZM33.67 93.4805L64.01 111V75.961L33.67 58.4415V93.4805Z" fill="#5C4EE5"></path>
+</svg>
diff --git a/apps/web/src/locales/af/messages.json b/apps/web/src/locales/af/messages.json
index fcfd90269f2..0fc3ebe06d9 100644
--- a/apps/web/src/locales/af/messages.json
+++ b/apps/web/src/locales/af/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Gunstelinge"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tipes"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Ongeldige hoofwagwoord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Daar is geen items om te lys nie."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Enkripsiesleutelinstellings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF-algoritme"
-  },
   "kdfIterations": {
     "message": "KDF-iteraties"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Verander KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Enkripsiesleutelinstellings is verander"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Laai lisensie af"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Werk Blaaier By"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "U gebruik ’n onondersteunde webblaaier. Die webkluis werk dalk nie soos normaal nie."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Uitnodiging is Aanvaar"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisasie is gedeaktiveer."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "Lisensie het verstryk."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO-identifiseerder"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Persoonlike eienaarskap"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Gewysigde beleid $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "U hoofwagwoord voldoen nie aan een of meer van die organisasiebeleide nie. Om toegang tot die kluis te kry, moet u nou u hoofwagwoord bywerk. Deur voort te gaan sal u van u huidige sessie afgeteken word, en u sal weer moet aanteken. Aktiewe sessies op ander toestelle kan vir tot een uur aktief bly."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Kluis-uittel"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Uur"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minute"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "U organisasiebeleide beïnvloed u kluisuitelling. Maksimum toegelate kluisuittelling is $HOURS$ uur en $MINUTES$ minuut(e)",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Toegang geweiger. U het nie toestemming om hierdie blad te sien nie."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Hoofwagwoord"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Groep/Gebruiker"
   },
-  "lowKdfIterations": {
-    "message": "Lae KDF-iteraties"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Werk u enkripsie-instellings by om aan die nuwe beveiligingsaanbevelings te voldoen en die beskerming van u rekening te verbeter."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Verander KDF-instellings"
-  },
   "secureYourInfrastructure": {
     "message": "Beveilig u infrastruktuur"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/ar/messages.json b/apps/web/src/locales/ar/messages.json
index fd0214fa71d..acd669d462e 100644
--- a/apps/web/src/locales/ar/messages.json
+++ b/apps/web/src/locales/ar/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "الوصول إلى الذكاء"
   },
-  "riskInsights": {
-    "message": "رؤى المخاطر"
-  },
   "passwordRisk": {
     "message": "مخاطر كلمة المرور"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "راجع كلمات المرور المعرضة للخطر (الضعيفة، المكشوفة، أو المعاد استخدامها) عبر التطبيقات. اختر تطبيقاتك الحرجة لتحديد أولويات إجراءات الأمان لمستخدميك لمعالجة كلمات المرور المعرضة للخطر."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "آخر تحديث للبيانات: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "الأعضاء الذين تم إشعارهم"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "إنشاء عنصر تسجيل دخول جديد"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "التطبيقات الحساسة ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "الأعضاء المبلّغون ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "تعيين كتطبيق حساس"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "التطبيقات المعلَّمة كتطبيقات حرجة"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "تطبيق"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "الأعضاء المعرضون للخطر"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "يقوم هؤلاء الأعضاء بتسجيل الدخول إلى التطبيقات باستخدام كلمات مرور ضعيفة أو مكشوفة أو مُعادة الاستخدام."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "يقوم هؤلاء الأعضاء بتسجيل الدخول إلى التطبيقات باستخدام كلمات مرور ضعيفة أو مكشوفة أو مُعادة الاستخدام."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "كل التطبيقات"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "المفضلة"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "الفئات"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "ابق هذه النافذة مفتوحة واتبع الطلبات من المتصفح الخاص بك."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "استخدم طريقة أخرى للولوج"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "استخدام تسجيل الدخول الأحادي"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "مرحباً بعودتك"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "كلمة المرور الرئيسية غير صالحة"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "كلمة مرور الملف غير صالحة، الرجاء استخدام كلمة المرور التي أدخلتها عند إنشاء ملف التصدير."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "لا توجد أية عناصر في القائمة."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "ليس لديك الصلاحية لعرض جميع العناصر في هذه المجموعة."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "إعدادات مفتاح التشفير"
   },
-  "kdfAlgorithm": {
-    "message": "خوارزمية KDF"
-  },
   "kdfIterations": {
     "message": "تكرار KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "تغيير KDF"
-  },
   "encKeySettingsChanged": {
     "message": "تم حفظ إعدادات مفتاح التشفير"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "الدفعة القادمة"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "التفاصيل"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "تنزيل الرخصة"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "تم تعليق المؤسسة"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "معرف SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "ساعات"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "دقائق"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "كلمة المرور الرئيسية"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/az/messages.json b/apps/web/src/locales/az/messages.json
index c9d53bd9c52..9fa7411f199 100644
--- a/apps/web/src/locales/az/messages.json
+++ b/apps/web/src/locales/az/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Məlumatları"
-  },
   "passwordRisk": {
     "message": "Parol riski"
   },
+  "noEditPermissions": {
+    "message": "Bu elementə düzəliş etmə icazəniz yoxdur"
+  },
   "reviewAtRiskPasswords": {
     "message": "Tətbiqlər arasında riskli (zəif, ifşa olunmuş və ya təkrar istifadə olunmuş) parolları incələyin. İstifadəçilərinizin riskli parollara yönəlmiş təhlükəsizlik tədbirlərinə əhəmiyyət vermələri üçün kritik tətbiqlərinizi seçin."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Riskli girişləri incələ"
+  },
   "dataLastUpdated": {
     "message": "Verilərin son güncəlləmə tarixi: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Hələ heç bir hesabat yaratmamısınız"
+  },
   "notifiedMembers": {
     "message": "Məlumatlandırılan üzvlər"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Yeni giriş elementi yarat"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% tamamlandı",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$/$TOTAL$ təhlükəsizlik tapşırığı tamamlandı",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Parol dəyişmə irəliləyişi"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "İrəliləyişi izləmək üçün üzvlərə tapşırıqlar təyin edin"
+  },
+  "onceYouReviewApplications": {
+    "message": "Tətbiqləri incələyib kritik olaraq işarələdikdən sonra, üzvlərə parollarını dəyişməsi üçün tapşırıqlar təyin edin."
+  },
+  "sendReminders": {
+    "message": "Xatırlatma göndər"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Tətbiqləri kritik olaraq işarələsəniz, onlar burada nümayiş olunacaq."
   },
+  "viewAtRiskMembers": {
+    "message": "Riskli üzvlərə bax"
+  },
+  "viewAtRiskApplications": {
+    "message": "Riskli tətbiqlərə bax"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$/$TOTAL$ kritik tətbiq, riskli parollara görə risk altındadır",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Kritik tətbiqlər ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "kritik olaraq işarələnmiş tətbiqlər"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ kritik tətbiq",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ tətbiq risk altındadır",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ parol risk altındadır",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ yeni parol risklidir",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Məlumatlandırılan üzvlər ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "$ORGNAME$ təşkilatında heç bir tətbiq tapılmadı",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Heç bir veri tapılmadı"
   },
-  "noAppsInOrgDescription": {
-    "message": "İstifadəçilər giriş məlumatlarını saxladıqda, tətbiqlər burada görünür və riskli parolları göstərir. Kritik tətbiqləri işarələyin və parollarını güncəlləməsi üçün istifadəçiləri məlumatlandırın."
+  "noDataInOrgDescription": {
+    "message": "Access Intelligence-i istifadə etməyə başlamaq üçün təşkilatınızın giriş verilərini daxilə köçürün. Bunu etdikdən sonra, bunları edə biləcəksiniz:"
+  },
+  "feature1Title": {
+    "message": "Tətbiqləri kritik olaraq işarələmə"
+  },
+  "feature1Description": {
+    "message": "Bu, əvvəlcə ən vacib tətbiqlərinizdəki riskləri xaric etməyinizə kömək edəcək."
+  },
+  "feature2Title": {
+    "message": "Üzvlərin təhlükəsizliyini təkmilləşdirməsinə kömək"
+  },
+  "feature2Description": {
+    "message": "Riskli üzvlərə kimlik məlumatlarını güncəlləməsi üçün təhlükəsizlik tapşırıqları təyin edin."
+  },
+  "feature3Title": {
+    "message": "İrəliləyişin monitorinqi"
+  },
+  "feature3Description": {
+    "message": "Təhlükəsizlik təkmilləşdirmələrini göstərmək üçün zamanla dəyişiklikləri izləyin."
+  },
+  "noReportsRunTitle": {
+    "message": "Hesabat yaratma"
+  },
+  "noReportsRunDescription": {
+    "message": "Hesabatın hazırlanmasına başlaya bilərsiniz. Hazırladıqdan sonra, bunları edə biləcəksiniz:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Heç bir tətbiqi kritik olaraq işarələməmisiniz"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Tətbiqi kritik olaraq işarələ"
   },
+  "markAsCritical": {
+    "message": "Kritik olaraq işarələ"
+  },
+  "applicationsSelected": {
+    "message": "tətbiq seçildi"
+  },
+  "selectApplication": {
+    "message": "Tətbiq seç"
+  },
+  "unselectApplication": {
+    "message": "Tətbiqi seçimini götür"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Kritik olaraq işarələnmiş tətbiqlər"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ tətbiq kritik olaraq işarələndi",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Müraciətlər kritik olaraq işarələnmədi"
+  },
   "application": {
     "message": "Tətbiq"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Riskli üzvlər"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Kritik tətbiqlər üçün risk altındakı elementlərə düzəliş erişimi olan üzvlər"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Bu üzvlər, kritik tətbiqlər üçün müdafiəsiz elementlərə erişə bilər."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ üzv riskdədir",
+  "membersWithAtRiskPasswords": {
+    "message": "Riskli parollara sahib üzvlər"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Təşkilatınızdakı üzvlərə, təhlükəsizlik boşluğu mövcud olan parolları dəyişdirməsi üçün bir tapşırıq təyin ediləcək. Üzvlər, Bitwarden brauzer uzantılarında bir bildiriş alacaq."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ üzv risk altındadır",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Bu üzvlər, tətbiqlərə zəif, ifşa olunmuş və ya təkrar istifadə olunan parollarla giriş edir."
+  "atRiskMemberDescription": {
+    "message": "Bu üzvlər, kritik tətbiqlərə zəif, ifşa olunmuş və ya təkrar istifadə olunan parollarla giriş edir."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Tətbiqlərə zəif, ifşa olunmuş və ya təkrar istifadə olunan parollarla giriş edən üzv yoxdur."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Cəmi tətbiq"
   },
+  "applicationsNeedingReview": {
+    "message": "İncələmə gözləyən müraciətlər"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Yeni tətbiqləri incələ"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ yeni müraciət",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Yeni müraciətləri incələyib kritik olaraq işarələyin və təşkilatınızı güvəndə saxlayın"
+  },
+  "reviewNow": {
+    "message": "İndi incələ"
+  },
+  "allCaughtUp": {
+    "message": "Hələlik bu qədər!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Hazırda incələnməli yeni tətbiq yoxdur"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Təşkilatınızda $COUNT$ tətbiq üçün saxlanılmış elementlər var",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Təşkilatınzıın təhlükəsizliyi üçün ən kritik sayılan elementləri güvəndə saxlamaq üçün tətbiqləri incələyin"
+  },
+  "reviewApplications": {
+    "message": "Tətbiqləri incələ"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Kritik tətbiqləri prioritetləşdir"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Təşkilatınız üçün ən kritik sayılan tətbiqləri seçin. Daha sonra, riskləri aradan qaldırmaları üçün üzvlərə təhlükəsizlik tapşırıqları təyin edə biləcəksiniz."
+  },
+  "reviewNewApplications": {
+    "message": "Yeni tətbiqlər incələ"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Bir tətbiqi kritik olaraq işarələmək üçün ulduz ikonuna klikləyin"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Kritik olaraq işarələmə funksionallığı, gələcək güncəlləmədə tətbiq olunacaq"
+  },
+  "applicationReviewSaved": {
+    "message": "Tətbiq incələmə saxlanıldı"
+  },
+  "newApplicationsReviewed": {
+    "message": "Yeni tətbiqlər incələnib"
+  },
+  "errorSavingReviewStatus": {
+    "message": "İncələmə statusunu saxlama xətası"
+  },
+  "pleaseTryAgain": {
+    "message": "Lütfən yenidən sınayın"
+  },
   "unmarkAsCritical": {
     "message": "Kritik olaraq işarələməni götür"
   },
@@ -587,7 +796,7 @@
     }
   },
   "passwordSafe": {
-    "message": "Bu parol, veri pozuntularında qeydə alınmayıb. Rahatlıqla istifadə edə bilərsiniz."
+    "message": "Bu parol, veri pozuntularında qeydə alınmayıb. Əmniyyətlə istifadə edə bilərsiniz."
   },
   "save": {
     "message": "Saxla"
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Sevimlilər"
   },
+  "taskSummary": {
+    "message": "Tapşırıq icmalı"
+  },
   "types": {
     "message": "Növlər"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Bu pəncərəni açıq saxlayın və brauzerinizdən gələn sorğuları izləyin."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Keçid açarı kimlik doğrulaması uğursuzdur. Lütfən yenidən sınayın."
+  },
   "useADifferentLogInMethod": {
     "message": "Fərqli bir giriş üsulu istifadə edin"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Vahid daxil olma üsulunu istifadə et"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Təşkilatınız, vahid daxil olma tələb edir."
+  },
   "welcomeBack": {
     "message": "Yenidən xoş gəlmisiniz"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Yararsız ana parol"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Yararsız ana parol. E-poçtunuzun doğru olduğunu və hesabınızın $HOST$ üzərində yaradıldığını təsdiqləyin.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Yararsız fayl parolu, lütfən xaricə köçürmə faylını yaradarkən daxil etdiyiniz parolu istifadə edin."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Sadalanacaq heç bir element yoxdur."
   },
+  "noItemsInTrash": {
+    "message": "Tullantıda element yoxdur"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Sildiyiniz elementlər burada görünəcək və 30 gün sonra birdəfəlik silinəcək"
+  },
+  "noItemsInVault": {
+    "message": "Seyfdə element yoxdur"
+  },
+  "emptyVaultDescription": {
+    "message": "Seyf, yalnız parollarızı yox, həm də daha çoxunu qoruyur. Giriş məlumatlarınızı, kimlikləri, kartları və notları burada güvənli şəkildə saxlayın."
+  },
+  "emptyFavorites": {
+    "message": "Hələ sevimlilərinizdə heç nə yoxdur"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Çox istifadə etdiyiniz elementləri cəld erişim üçün sevimlilərə əlavə edin."
+  },
+  "noSearchResults": {
+    "message": "Heç bir axtarış nəticəsi qayıtmadı"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Filtrləri təmizləyin və ya başqa bir axtarış terminini sınayın"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Bu kolleksiyadakı bütün elementlərə baxmaq üçün icazəniz yoxdur."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Şifrələmə açarı ayarları"
   },
-  "kdfAlgorithm": {
-    "message": "KDF Algoritmi"
-  },
   "kdfIterations": {
     "message": "KDF iterasiyaları"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Yüksək KDF iterasiyaları, yaddaşı və paralelizmi, ana parolunuzu təcavüzkar tərəfindən \"brute force\" hücumuna qarşı qorumağa kömək edir."
   },
-  "changeKdf": {
-    "message": "KDF-i dəyişdir"
-  },
   "encKeySettingsChanged": {
     "message": "Şifrələmə açarı ayarları dəyişdirildi"
   },
@@ -2258,7 +2503,7 @@
     "message": "SSO quraşdırması etmisinizsə və ya etmək planınız varsa, İki addımlı giriş, artıq Kimlik Provayderiniz vasitəsilə tətbiq edilmiş ola bilər."
   },
   "twoStepLoginRecoveryWarning": {
-    "message": "İki addımlı girişi qurmaq, Bitwarden hesabınızı birdəfəlik kilidləyə bilər. Geri qaytarma kodu, normal iki addımlı giriş provayderinizi artıq istifadə edə bilmədiyiniz hallarda (məs. cihazınızı itirəndə) hesabınıza erişməyinizə imkan verir. Hesabınıza erişimi itirsəniz, Bitwarden dəstəyi sizə kömək edə bilməyəcək. Geri qaytarma kodunuzu bir yerə yazmağınızı və ya çap etməyinizi və onu etibarlı bir yerdə saxlamağınızı məsləhət görürük."
+    "message": "İki addımlı girişi qurmaq, Bitwarden hesabınızı birdəfəlik kilidləyə bilər. Geri qaytarma kodu, normal iki addımlı giriş provayderinizi artıq istifadə edə bilmədiyiniz hallarda (məs. cihazınızı itirəndə) hesabınıza erişməyinizə imkan verir. Hesabınıza erişimi itirsəniz, Bitwarden dəstəyi sizə kömək edə bilməyəcək. Geri qaytarma kodunuzu bir yerə yazmağınızı və ya çap etməyinizi və onu əmniyyətli bir yerdə saxlamağınızı məsləhət görürük."
   },
   "restrictedItemTypePolicy": {
     "message": "Kart element növünü sil"
@@ -2273,7 +2518,7 @@
     "message": "1 və ya daha çox təşkilat tərəfindən təyin edilən bir siyasət, kartların seyfinizə köçürülməsini əngəlləyir."
   },
   "yourSingleUseRecoveryCode": {
-    "message": "İki addımlı giriş provayderinizə erişə bilmədiyiniz halda, iki addımlı girişi söndürmək üçün təkistifadəlik geri qaytarma kodunu istifadə edə bilərsiniz. Bitwarden tövsiyə edir ki, geri qaytarma kodunuzu bir yerə yazıb güvənli bir yerdə saxlayın."
+    "message": "İki addımlı giriş provayderinizə erişə bilmədiyiniz halda, iki addımlı girişi söndürmək üçün təkistifadəlik geri qaytarma kodunu istifadə edə bilərsiniz. Bitwarden tövsiyə edir ki, geri qaytarma kodunuzu bir yerə yazıb əmniyyətli bir yerdə saxlayın."
   },
   "viewRecoveryCode": {
     "message": "Geri qaytarma koduna bax"
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Lütfən bu alış üçün hesabınızda yetərli qədər kredit olduğuna əmin olun. Hesabınızda yetərli kredit yoxdursa, fərq üçün fayldakı ilkin ödəniş metodunuz istifadə edilir. Hesabınıza, faktura səhifəsindən kredit əlavə edə bilərsiniz."
   },
+  "notEnoughAccountCredit": {
+    "message": "Bu satın alma üçün hesabınızda yetərli kredit yoxdur. Faktura səhifəsindən hesabınıza kredit əlavə edə bilərsiniz."
+  },
   "creditAppliedDesc": {
     "message": "Hesabınızın krediti, satın alma üçün istifadə oluna bilər. Əlçatan istənilən kredit, bu hesab üçün yaradılan fakturalara avtomatik tətbiq ediləcək."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Növbəti ödəniş"
   },
+  "nextChargeHeader": {
+    "message": "Növbəti ödəniş"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Təfsilatlar"
   },
+  "discount": {
+    "message": "endirim"
+  },
   "downloadLicense": {
     "message": "Lisenziyanı endir"
   },
@@ -3021,7 +3278,7 @@
     "message": "Saxlama sahəsi əlavə et"
   },
   "removeStorage": {
-    "message": "Saxlama sahəsini çıxart"
+    "message": "Saxlama sahəsini xaric et"
   },
   "subscriptionStorage": {
     "message": "Abunəliyinizdə cəmi $MAX_STORAGE$ GB şifrələnmiş fayl saxlama sahəsi var. Hazırda $USED_STORAGE$ istifadə edirsiniz.",
@@ -3093,7 +3350,7 @@
     "message": "GB saxlamaya əlavə et"
   },
   "gbStorageRemove": {
-    "message": "GB saxlamadan çıxart"
+    "message": "Anbardan xaric ediləcək GB"
   },
   "storageAddNote": {
     "message": "Saxlama sahəsi əlavə etmək, fakturanın cəmində dəyişikliklərə səbəb olacaq və dərhal hesab ödəniş metodunuzdan çıxılacaq. İlk çıxılacaq hesab, hazırkı faktura dövrünün qalanı üçün etibarlı olacaq."
@@ -3434,10 +3691,10 @@
     }
   },
   "removeUserConfirmation": {
-    "message": "Bu istifadəçini çıxartmaq istədiyinizə əminsiniz?"
+    "message": "Bu istifadəçini xaric etmək istədiyinizə əminsiniz?"
   },
   "removeOrgUserConfirmation": {
-    "message": "Bir üzv silindikdə, artıq həmin üzv təşkilat verilərinə erişə bilmir və bu əməliyyatın geri dönüşü yoxdur. Həmin üzvü təşkilata yenidən əlavə etmək üçün, onu dəvət edib üzv olmasını təmin etmək lazımdır."
+    "message": "Bir üzv xaric edildiyi zaman, artıq həmin üzv təşkilat verilərinə erişə bilmir və bu əməliyyatın geri dönüşü yoxdur. Həmin üzvü təşkilata yenidən əlavə etmək üçün, onu dəvət edib üzv olmasını təmin etmək lazımdır."
   },
   "revokeUserConfirmation": {
     "message": "Bir üzv ləğv edildikdə, artıq həmin üzv təşkilat verilərinə erişə bilmir. Üzv erişimini daha tez bərpa etmək üçün, Ləğv edilənlər vərəqinə gedin."
@@ -3858,7 +4115,7 @@
     }
   },
   "removedUserId": {
-    "message": "$ID$ istifadəçisi çıxarıldı.",
+    "message": "$ID$ istifadəçisi xaric edildi.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3867,7 +4124,7 @@
     }
   },
   "removeUserIdAccess": {
-    "message": "$ID$ erişimini sil",
+    "message": "$ID$ erişimini xaric et",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3996,7 +4253,7 @@
     }
   },
   "removedOrganizationId": {
-    "message": "$ID$ təşkilatı silindi.",
+    "message": "$ID$ təşkilatı xaric edildi.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Brauzeri güncəllə"
   },
-  "generatingYourRiskInsights": {
-    "message": "Risk Təhlilləriniz yaradılır..."
+  "generatingYourAccessIntelligence": {
+    "message": "Access Intelligence-niz yaradılır..."
+  },
+  "fetchingMemberData": {
+    "message": "Üzv veriləri alınır..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Parol sağlamlığı analiz edirilir..."
+  },
+  "calculatingRiskScores": {
+    "message": "Risk xalı hesablanır..."
+  },
+  "generatingReportData": {
+    "message": "Hesabat veriləri yaradılır..."
+  },
+  "savingReport": {
+    "message": "Hesabat saxlanılır..."
+  },
+  "compilingInsights": {
+    "message": "Təhlillər şərh edilir..."
+  },
+  "loadingProgress": {
+    "message": "İrəliləyiş yüklənir"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Bu, bir neçə dəqiqə çəkə bilər."
+  },
+  "riskInsightsRunReport": {
+    "message": "Hesabatı işə sal"
   },
   "updateBrowserDesc": {
     "message": "Dəstəklənməyən bir veb brauzer istifadə edirsiniz. Veb seyf düzgün işləməyə bilər."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Dəvət qəbul edildi"
   },
-  "inviteAcceptedDesc": {
-    "message": "Bir inzibatçı üzvlüyünüzü təsdiqlədikdən sonra bu təşkilata erişə bilərsiniz. Üzvlüyünüz təsdiqləndikdə sizə bir e-poçt göndərəcəyik."
+  "invitationAcceptedDesc": {
+    "message": "Dəvətiniz uğurla qəbul edildi."
   },
   "inviteInitAcceptedDesc": {
     "message": "Artıq bu təşkilata erişə bilərsiniz."
@@ -4477,7 +4761,7 @@
     "description": "Seat = User Seat"
   },
   "removeSeats": {
-    "message": "Yeri götür",
+    "message": "Yeri xaric et",
     "description": "Seat = User Seat"
   },
   "subscriptionDesc": {
@@ -4586,7 +4870,7 @@
     "message": "Əlavə ediləcək yerlər"
   },
   "seatsToRemove": {
-    "message": "Götürüləcək yerlər"
+    "message": "Xaric ediləcək yerlər"
   },
   "seatsAddNote": {
     "message": "İstifadəçi yerləri əlavə etmək, fakturanın cəmində dəyişikliklərə səbəb olacaq və dərhal hesab ödəniş metodunuzdan çıxılacaq. İlk çıxılacaq hesab, hazırkı faktura dövrünün qalanı üçün etibarlı olacaq."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Təşkilat sıradan çıxarıldı."
   },
+  "organizationIsSuspended": {
+    "message": "Təşkilatın fəaliyyəti dayandırılıb"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Fəaliyyəti dayandırılmış təşkilatlardakı elementlərə erişilə bilməz. Kömək üçün təşkilatınızın sahibi ilə əlaqə saxlayın."
+  },
   "secretsAccessSuspended": {
     "message": "Fəaliyyəti dayandırılmış təşkilatlara erişilə bilməz. Lütfən kömək üçün təşkilatınızın sahibi ilə əlaqə saxlayın."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Xidmət hesabları dayandırılmış təşkilatlarda yaradıla bilməz. Lütfən kömək üçün təşkilatınızın sahibi ilə əlaqə saxlayın."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Fəaliyyəti dayandırılmış təşkilatlardakı elementlərə erişilə bilməz. Kömək üçün təşkilatınızın sahibi ilə əlaqə saxlayın."
-  },
   "licenseIsExpired": {
     "message": "Lisenziyanın vaxtı bitib."
   },
@@ -4936,10 +5223,10 @@
     "message": "İstifadəçilərin \"iki addımlı giriş\"i qurmasını tələb et."
   },
   "twoStepLoginPolicyWarning": {
-    "message": "Sahib və ya Administrator olmayan və fərdi hesablarında \"iki addımlı giriş\"i fəallaşdırmayan təşkilat üzvləri təşkilatdan çıxarılacaq və dəyişiklik haqqında onları məlumatlandıran e-poçt göndəriləcək."
+    "message": "Sahib və ya Administrator olmayan və fərdi hesablarında \"iki addımlı giriş\"i fəallaşdırmayan təşkilat üzvləri təşkilatdan xaric ediləcək və dəyişiklik haqqında onları məlumatlandıran e-poçt göndəriləcək."
   },
   "twoStepLoginPolicyUserWarning": {
-    "message": "İstifadəçi hesabında \"iki addımlı giriş\"in qurulmasını tələb edən təşkilatın üzvüsünüz. İki addımlı giriş provayderlərinin hamısını söndürsəniz, bu təşkilatdan avtomatik olaraq çıxarılacaqsınız."
+    "message": "İstifadəçi hesabında \"iki addımlı giriş\"in qurulmasını tələb edən təşkilatın üzvüsünüz. İki addımlı giriş provayderlərinin hamısını söndürsəniz, bu təşkilatdan avtomatik olaraq xaric ediləcəksiniz."
   },
   "passwordGeneratorPolicyDesc": {
     "message": "Parol yaradıcı üçün tələbləri ayarla."
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifikatoru"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "SSO ilə giriş etmələri üçün üzvlərinizi bu kimliklə təmin edin. Bu addımı ötürmək üçün, quraşdırın ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "SSO ilə giriş etmələri üçün üzvlərinizə bu ID-ni təqdim edin. Əgər tələb olunan domen qurulubsa, üzvlər SSO zamanı bu identifikatora daxil olmağı ötürə bilər.",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Daha ətraflı",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO əlaqəsini kəs"
@@ -5518,9 +5809,9 @@
     "message": "Bütün elementlərin bir təşkilata məxsus olmasını tələb et və elementlərin hesab səviyyəsində saxlanılma seçimini ləğv et.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Bütün elementlər bir təşkilata məxsus olacaq və orada saxlanılacaq, bu da təşkilat üzrə kontrollar, görünürlük və hesabatları mümkün edəcək. İşə salındığı zaman, hər üzv üçün elementləri saxlaya biləcəyi ilkin bir kolleksiya mövcud olacaq. Daha ətraflı ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "daha ətraflı öyrənin",
@@ -5545,8 +5836,67 @@
     "message": "Kimlik məlumatlarının dövriyyəsi barədə ",
     "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.'"
   },
+  "availableNow": {
+    "message": "İndi mövcuddur"
+  },
+  "autoConfirm": {
+    "message": "Yeni istifadəçilər üçün avtomatik təsdiq"
+  },
+  "autoConfirmDescription": {
+    "message": "Təşkilata dəvət edilmiş yeni istifadəçilər, admin cihazının kilidi açıldığı zaman avtomatik olaraq təsdiqlənəcək.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Avtomatik istifadəçi təsdiqi necə işə salınır"
+  },
+  "autoConfirmExtension1": {
+    "message": "Bitwarden uzantınızı açın"
+  },
+  "autoConfirmExtension2": {
+    "message": "Seç:",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " İşə sal",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Bitwarden brauzer uzantısı uğurla açıldı. Artıq avtomatik istifadəçi təsdiqi ayarını aktivləşdirə bilərsiniz."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Təşkilata dəvət edilmiş yeni istifadəçilər, admin cihazının kilidi açıldığı zaman avtomatik olaraq təsdiqlənəcək. Bu siyasəti işə salmazdan əvvəl, lütfən aşağıdakıları incələyin və razılaşın: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potensial təhlükəsizlik riski. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Avtomatik istifadəçi təsdiqi, təşkilatınızın veriləri üçün təhlükəsizlik riski yarada bilər."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Risklər barədə öyrən",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Vahid təşkilat siyasəti tələb olunur. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Bu avtomatlaşdırmanı aktivləşdirmək üçün bütün üzvlər yalnız bu təşkilata aid olmalıdır."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Vahid təşkilat siyasəti bütün rollara şamil ediləcək. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Fövqəladə hal erişimi yoxdur. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Fövqəladə Erişim silinib."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Bu riskləri və siyasət güncəlləmələrini qəbul edirəm"
+  },
   "personalOwnership": {
-    "message": "Fərdi sahiblik"
+    "message": "Fərdi seyfi xaric et"
   },
   "personalOwnershipPolicyDesc": {
     "message": "Fərdi seyf seçimini silərək istifadəçilərin elementləri bir təşkilatda saxlamasını məcburi edin."
@@ -5565,7 +5915,7 @@
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
-    "message": "\"Send\"i sıradan çıxart"
+    "message": "\"Send\"i sil"
   },
   "disableSendPolicyDesc": {
     "message": "İstifadəçilərin Bitwarden Send yaratmasına və ya ona düzəliş etməsinə icazə vermə. Mövcud \"Send\"in silinməsinə hələ də icazə verilir.",
@@ -5575,7 +5925,7 @@
     "message": "Təşkilatın siyasətlərini idarə edə bilən təşkilat istifadəçiləri bu siyasətin tətbiqindən azaddırlar."
   },
   "sendDisabled": {
-    "message": "Send sıradan çıxarıldı",
+    "message": "Send silindi",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
@@ -5597,6 +5947,19 @@
     "message": "\"Send\" yaradarkən və ya ona düzəliş edərkən istifadəçilərin e-poçt ünvanlarını alıcılardan gizlətməsinə icazə verməyin.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "İlkin URI uyuşma aşkarlaması"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Avto-doldurma üçün giriş məlumatlarının nə vaxt təklif ediləcəyini müəyyənləşdirin. Adminlər və sahiblər bu siyasətdən azaddır."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "İlkin URI uyuşma aşkarlaması"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Lütfən yararlı bir URI uyuşma aşkarlama variantını seçin.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "$ID$ siyasətinə düzəliş edildi.",
     "placeholders": {
@@ -5694,7 +6057,7 @@
     "message": "Bir təşkilat siyasəti, elementlərin fərdi seyfinizə köçürülməsini əngəllədi."
   },
   "personalOwnershipCheckboxDesc": {
-    "message": "Təşkilat istifadəçiləri üçün fərdi sahibliyi sıradan çıxart"
+    "message": "Təşkilat istifadəçiləri üçün fərdi sahibliyi sil"
   },
   "send": {
     "message": "Send",
@@ -6019,10 +6382,10 @@
     "message": "Bu əməliyyat, seçilən istifadəçilərin heç biri üçün etibarlı deyil."
   },
   "removeUsersWarning": {
-    "message": "Aşağıdakı istifadəçiləri çıxartmaq istədiyinizə əminsiniz? Bu prosesin tamamlanması bir neçə saniyə çəkir, ləğv edilə və ya dayandırıla bilməz."
+    "message": "Aşağıdakı istifadəçiləri xaric etmək istədiyinizə əminsiniz? Bu prosesin tamamlanması bir neçə saniyə çəkir, ləğv edilə və ya dayandırıla bilməz."
   },
   "removeOrgUsersConfirmation": {
-    "message": "Üzv(lər) silindikdə, artıq həmin üzv(lər) təşkilat verilərinə erişə bilmir və bu əməliyyatın geri dönüşü yoxdur. Üzvü təşkilata yenidən əlavə etmək üçün, onu dəvət edib üzv olmasını təmin etmək lazımdır. Prosesin tamamlanması bir neçə saniyə çəkə bilər, bu proses dayandırıla və ya ləğv edilə bilməz."
+    "message": "Üzv(lər) xaric edildiyi zaman, artıq həmin üzv(lər) təşkilat verilərinə erişə bilmir və bu əməliyyatın geri dönüşü yoxdur. Üzvü təşkilata yenidən əlavə etmək üçün, onu dəvət edib üzv olmasını təmin etmək lazımdır. Prosesin tamamlanması bir neçə saniyə çəkə bilər, bu proses dayandırıla və ya ləğv edilə bilməz."
   },
   "revokeUsersWarning": {
     "message": "Üzv(lər) ləğv edildikə, artıq həmin üzv(lər) təşkilat verilərinə erişə bilmir. Üzv erişimini daha tez bərpa etmək üçün, Ləğv edilənlər vərəqinə gedin. Prosesin tamamlanması bir neçə saniyə çəkə bilər, bu proses dayandırıla və ya ləğv edilə bilməz."
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ana parolunuz təşkilatınızdakı siyasətlərdən birinə və ya bir neçəsinə uyğun gəlmir. Seyfə erişmək üçün ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər."
   },
-  "automaticAppLogin": {
-    "message": "İcazə verilən tətbiqlər üçün istifadəçilərin avtomatik giriş etməsi"
+  "automaticAppLoginWithSSO": {
+    "message": "SSO ilə avtomatik giriş"
   },
-  "automaticAppLoginDesc": {
-    "message": "Konfiqurasiya edilmiş kimlik provayderinizdən başladılan tətbiqlər üçün giriş xanaları avtomatik doldurulub göndəriləcək."
+  "automaticAppLoginWithSSODesc": {
+    "message": "SSO təhlükəsizliyini və rahatlığını idarə edilməyən tətbiqlərə genişləndirin. İstifadəçilər bir tətbiqi kimlik provayderinizdən işə saldığı zaman, onların giriş məlumatları avtomatik olaraq doldurulub təqdim ediləcək. Beləliklə kimlik provayderindən tətbiqə bir kliklə təhlükəsiz axın yaradılır."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Provayder host-unu müəyyənləşdir"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Təşkilatınız, şifrə açma seçimlərinizi güncəllədi. Seyfinizə erişmək üçün lütfən bir ana parol təyin edin."
   },
-  "maximumVaultTimeout": {
-    "message": "Seyf vaxtının bitməsi"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Seans vaxt bitməsi"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Üzvlər üçün maksimum seyf bitmə vaxtını ayarlayın."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Sahiblər istisna olmaqla bütün üzvlər üçün maksimum seans bitmə vaxtını təyin edin."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maksimum seyf bitmə vaxtı"
+  "maximumAllowedTimeout": {
+    "message": "Maksimum icazə verilən bitmə vaxtı"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Yararsız maksimum seyf bitmə vaxtı."
+  "maximumAllowedTimeoutRequired": {
+    "message": "İcazə verilən maksimum bitmə vaxtı tələb olunur."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Vaxt etibarsızdır. Ən azı bir dəyəri dəyişdirin."
+  },
+  "sessionTimeoutAction": {
+    "message": "Seans vaxt bitmə əməliyyatı"
+  },
+  "immediately": {
+    "message": "Dərhal"
+  },
+  "onSystemLock": {
+    "message": "Sistem kilidlənəndə"
+  },
+  "onAppRestart": {
+    "message": "Tətbiq yenidən başladılanda"
   },
   "hours": {
     "message": "Saat"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Dəqiqə"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Bütün üzvlər üçün maksimum bitmə vaxtını \"Heç vaxt\" olaraq icazə vermək istədiyinizə əminsiniz?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Cihaz mühafizəsi barədə daha ətraflı"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Təşkilatınızın siyasətləri, icazə verilən maksimum seyf bitmə vaxtını $HOURS$ saat $MINUTES$ dəqiqə olaraq ayarladı.",
     "placeholders": {
@@ -6561,7 +6954,7 @@
     "message": "\"Bitwarden Ailələri\"ni istifadə etmək üçün fərdi e-poçtunuzu daxil edin"
   },
   "sponsoredFamiliesLeaveCopy": {
-    "message": "Bu təşkilatı tərk etsəniz və ya bu təşkilatdan çıxarılsanız, Ailələr planınızın istifadə müddəti faktura dövrünün sonunda başa çatacaq."
+    "message": "Bu təşkilatı tərk etsəniz və ya bu təşkilatdan xaric edilsəniz, Ailələr planınızın istifadə müddəti faktura dövrünün sonunda başa çatacaq."
   },
   "acceptBitwardenFamiliesHelp": {
     "message": "Mövcud bir təşkilat üçün bir təklifi qəbul edin və ya yeni bir Ailələr təşkilatını yaradın."
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Təməl server URL-sini və ya ən azı bir özəl mühiti əlavə etməlisiniz."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL-lər, HTTPS istifadə etməlidir."
+  },
   "apiUrl": {
     "message": "API server URL-si"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Yalnız $ORGANIZATION$ ilə əlaqələndirilmiş təşkilat seyfi xaricə köçürüləcək.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Yalnız $ORGANIZATION$ ilə əlaqələndirilmiş təşkilat seyfi xaricə köçürüləcək. Element kolleksiyalarım daxil edilməyəcək.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Erişim rədd edildi. Bu səhifəyə baxmaq üçün icazəniz yoxdur."
   },
+  "noPageAccess": {
+    "message": "Bu səhifəyə erişmək üçün icazəniz yoxdur"
+  },
   "masterPassword": {
     "message": "Ana parol"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Bilinməyən sirr, bu sirrə erişmək üçün icazə istəməli ola bilərsiniz."
   },
+  "unknownServiceAccount": {
+    "message": "Bilinməyən maşın hesabı, bu maşın hesabına erişmək üçün icazə istəməli ola bilərsiniz."
+  },
   "unknownProject": {
     "message": "Bilinməyən layihə, bu layihəyə erişmək üçün icazə istəməli ola bilərsiniz."
   },
@@ -8032,7 +8452,7 @@
     "message": "Rol"
   },
   "removeMember": {
-    "message": "Üzv sil"
+    "message": "Üzv xaric et"
   },
   "collection": {
     "message": "Kolleksiya"
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Qrup/İstifadəçi"
   },
-  "lowKdfIterations": {
-    "message": "Aşağı KDF iterasiyaları"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Yeni güvənlik tövsiyələrini qarşılamaq və hesab qorumasını təkmilləşdirmək üçün şifrələmə ayarlarınızı güncəlləyin."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Davam etsəniz, bütün aktiv seanslardan çıxış edəcəksiniz. Təkrar giriş etməyiniz və əgər varsa iki addımlı girişi tamamlamağınız lazım olacaq. Veri itkisini önləmək üçün şifrələmə ayarlarınızı dəyişdirməzdən əvvəl seyfinizi xaricə köçürməyinizi tövsiyə edirik."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "$PROJECT_ID$ kimliyinə sahib bir layihəyə erişildi.",
+  "accessedProjectWithIdentifier": {
+    "message": "$PROJECT_ID$ identifikatoruna sahib bir layihəyə erişildi.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "ID-si $SERVICE_ACCOUNT_ID$ olan maşın hesabı silindi",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "$SECRET_ID$ identifikatoruna sahib bir layihəyə düzəliş edildi.",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "$USER_ID$ istifadəçisi, $SERVICE_ACCOUNT_ID$ ID-sinə sahib maşın hesabına əlavə edildi",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "$USER_ID$ istifadəçisi, $SERVICE_ACCOUNT_ID$ ID-sinə sahib maşın hesabından xaric edildi",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "$GROUP_ID$ qrupu, $SERVICE_ACCOUNT_ID$ ID-sinə sahib maşın hesabından xaric edildi",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "$SERVICE_ACCOUNT_ID$ ID-sinə sahib maşın hesabı yaradıldı",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "$GROUP_ID$ qrupu, $SERVICE_ACCOUNT_ID$ ID-sinə sahib maşın hesabına əlavə edildi",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "$SERVICE_ACCOUNT_ID$ ID-sinə sahib maşın hesabı silindi",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "$PROJECT_ID$ identifikatoruna sahib bir layihə silindi.",
     "placeholders": {
@@ -8606,7 +9099,7 @@
     "message": "Erişim tokenləri hələ də mövcuddur"
   },
   "saPeopleWarningMessage": {
-    "message": "İnsanları xidmət hesabından silsəniz belə, yaratdıqları erişim tokenləri silinmir. Ən yaxşı təhlükəsizlik təcrübəsi üçün, xidmət hesabından silinmiş insanlar tərəfindən yaradılan erişim tokenlərinin ləğv edilməsi tövsiyə olunur."
+    "message": "İnsanları xidmət hesabından xaric etsəniz belə, yaratdıqları erişim tokenləri silinmir. Ən yaxşı təhlükəsizlik təcrübəsi üçün, xidmət hesabından xaric edilmiş insanlar tərəfindən yaradılan erişim tokenlərinin ləğv edilməsi tövsiyə olunur."
   },
   "smAccessRemovalWarningProjectTitle": {
     "message": "Bu layihəyə erişimi sil"
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Giriş edildi!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Kolleksiya erişimini təyin et"
   },
@@ -9330,6 +9820,14 @@
     "message": "Çox bahadır",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "1 illik ödənişsiz"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Təyin et"
   },
+  "assignTasks": {
+    "message": "Tapşırıq təyin et"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Kolleksiyalara təyin et"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Event verilərini öz Logscale instance\"na göndər"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Seyf event verilərini Datadog serverinizə göndərin"
+  },
   "failedToSaveIntegration": {
     "message": "İnteqrasiya saxlanılmadı. Lütfən daha sonra yenidən sınayın."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Bu əməliyyatı icra etmək üçün təşkilatın sahibi olmalısınız."
+  },
   "failedToDeleteIntegration": {
     "message": "İnteqrasiya silinmədi. Lütfən daha sonra yenidən sınayın."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Aşağı KDF iterasiyaları. Hesabınızın güvənliyini təkmilləşdirmək üçün iterasiyaları artırın."
-  },
-  "changeKDFSettings": {
-    "message": "KDF ayarlarını dəyişdir"
-  },
   "secureYourInfrastructure": {
     "message": "İnfrastrukturunuzu qoruyun"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Bağlı"
   },
-  "higherKDFIterations": {
-    "message": "Daha yüksək KDF iterasiyaları, ana parolunuzu təcavüzkar tərəfindən \"brute force\" hücumuna qarşı qorumağa kömək edir."
-  },
-  "incrementsOf100,000": {
-    "message": "100,000-lik artım"
-  },
-  "smallIncrements": {
-    "message": "kiçik artım"
-  },
   "kdfIterationRecommends": {
     "message": "600,000 və ya daha çoxunu tövsiyə edirik"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Daha köhnə cihazlar üçün KDF-inizi çox yüksək ayarlamaq performans problemlərinə səbəb ola bilər. $VALUE$ üzrə dəyəri artırın və cihazınızı test edin.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Abunəliyinizi bərpa etmək üçün Müştəri Dəstəyi ilə əlaqə saxlayın."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domen götürüldü"
   },
+  "itemAddedToFavorites": {
+    "message": "Element sevimlilərə əlavə edildi"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Element sevimlilərdən çıxarıldı"
+  },
+  "copyNote": {
+    "message": "Notu kopyala"
+  },
   "organizationNameMaxLength": {
     "message": "Təşkilat adı 50 xarakterdən çox ola bilməz."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Bitwarden brauzer uzantısı uğurla açıldı. Riskli parollarınıza nəzər sala bilərsiniz."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Bitwarden brauzer uzantısı açılarkən xəta ilə üzləşdik. Alət çubuğundan",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "Bitwarden ikonunu açın.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Abunəliyiniz tezliklə yenilənəcək. Kəsintisiz xidməti təmin etmək və yeniləməni $RENEWAL_DATE$ tarixindən əvvəl təsdiqləmək üçün $RESELLER$ ilə əlaqə saxlayın.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Arxivdə axtar"
   },
-  "archive": {
-    "message": "Arxiv"
+  "archiveNoun": {
+    "message": "Arxiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arxivlə",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Arxivdən çıxart"
+  },
+  "itemsInArchive": {
+    "message": "Arxivdəki elementlər"
   },
   "noItemsInArchive": {
     "message": "Arxivdə element yoxdur"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Arxivlənmiş elementlər burada görünəcək, ümumi axtarış nəticələrindən və avto-doldurma təkliflərindən xaric ediləcək."
   },
+  "itemWasSentToArchive": {
+    "message": "Element arxivə göndərildi"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Elementlər arxivə göndərildi"
+  },
+  "itemUnarchived": {
+    "message": "Element arxivdən çıxarıldı"
+  },
+  "bulkArchiveItems": {
+    "message": "Arxivlənən elementlər"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Arxivdən çıxarılmış elementlər"
+  },
+  "archiveItem": {
+    "message": "Elementi arxivlə",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Arxivlənmiş elementlər ümumi axtarış nəticələrindən və avto-doldurma təkliflərindən xaric ediləcək. Bu elementi arxivləmək istədiyinizə əminsiniz?"
+  },
+  "archiveBulkItems": {
+    "message": "Elementləri arxivlə",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Arxivlənmiş elementlər ümumi axtarış nəticələrindən və avto-doldurma təkliflərindən xaric ediləcək. Bu elementləri arxivləmək istədiyinizə əminsiniz?"
+  },
   "businessUnit": {
     "message": "Biznes vahidi"
   },
@@ -11043,7 +11570,7 @@
     "message": "Yeni biznes vahidi"
   },
   "sendsTitleNoItems": {
-    "message": "Send, həssas məlumatlar təhlükəsizdir",
+    "message": "Send ilə həssas məlumatlar əmniyyətdədir",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
@@ -11098,7 +11625,7 @@
     "message": "Kimliklərinizlə, uzun qeydiyyat və ya əlaqə xanalarını daha tez avtomatik doldurun."
   },
   "newNoteNudgeTitle": {
-    "message": "Həssas verilərinizi güvənli şəkildə saxlayın"
+    "message": "Həssas verilərinizi əmniyyətdə saxlayın"
   },
   "newNoteNudgeBody": {
     "message": "Notlarla, bankçılıq və ya sığorta təfsilatları kimi həssas veriləri təhlükəsiz saxlayın."
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden uzantısı quraşdırıldı!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Giriş etmək üçün uzantını aç və avto-doldurmağa başla."
   },
@@ -11154,6 +11684,14 @@
     "message": "Öyrənmə Mərkəzi",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Kömək Mərkəzi",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Problemsiz inteqrasiya"
+  },
+  "families": {
+    "message": "Ailələr"
+  },
+  "upgradeToFamilies": {
+    "message": "\"Ailələr\"ə yüksəlt"
+  },
+  "upgradeToPremium": {
+    "message": "\"Premium\"a yüksəlt"
+  },
+  "familiesUpdated": {
+    "message": "\"Ailələr\"ə yüksəltdiniz!"
+  },
+  "taxCalculationError": {
+    "message": "Yerləşməniz üçün vergi hesablanması zamanı xəta baş verdi. Lütfən yenidən sınayın."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Bitwarden-ə xoş gəlmisiniz"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Premium ilə daha çox təhlükəsizlik özəlliklərinin kilidini açın və ya Ailələr ilə elementləri paylaşmağa başlayın"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Qiymətə vergi daxil deyildir və illik hesablanır."
+  },
+  "organizationNameDescription": {
+    "message": "Üzvlərə göndərəcəyiniz dəvətlərdə təşkilatınızın adı görünəcək."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Yüksəltmə olmadan davam et"
+  },
+  "upgradeYourPlan": {
+    "message": "Planınızı yüksəldin"
+  },
+  "upgradeNow": {
+    "message": "İndi yüksəlt"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Bu formu tamamladığınız zaman yeni bir Ailələr təşkilatı yaradılacaq. Ödənişsiz təşkilatınızı Admin Konsolundan yüksəldə bilərsiniz."
+  },
+  "upgradeErrorMessage": {
+    "message": "Yüksəltmə prosesiniz emal olunarkən xəta ilə üzləşdik. Lütfən yenidən sınayın."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Bitwarden Ödənişsiz planınız var"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Tam təhlükəsizlik üçün yüksəldin"
+  },
+  "viewbusinessplans": {
+    "message": "Biznes planlarına bax"
+  },
+  "updateEncryptionSettings": {
+    "message": "Şifrələmə ayarlarını güncəlləyin"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Şifrələmə ayarlarınızı güncəlləyin"
+  },
+  "updateSettings": {
+    "message": "Güncəlləmə ayarları"
+  },
+  "algorithm": {
+    "message": "Alqoritm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Bitwarden-in seyf verilərinizi necə şifrələyəcəyini seçin. Bütün seçimlər güvənlidir, ancaq daha güclü üsullar, xüsusən də brute-force hücumlarına qarşı daha yaxşı qoruma təklif edir. Bitwarden, əksər istifadəçilər üçün ilkin ayarı tövsiyə edir."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "İlkin dəyərdən yuxarı dəyərin təyin edilməsi, təhlükəsizliyi artırır, ancaq bu, seyfinizin kilidini açma prosesini uzada bilər."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Şifrələmə alqoritmləri barədə"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 təhlükəsizlik və performansı tarazlaşdıran yaxşı test edilmiş şifrələmə üsuludur. Bütün istifadəçilər üçün idealdır."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id, müasir hücumlara qarşı daha güclü qoruma təklif edir. Güclü cihazlara sahib qabaqcıl istifadəçilər üçün idealdır."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Poçt kodu"
+  },
+  "cardNumberLabel": {
+    "message": "Kart nömrəsi"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Ödənişsiz Ailələr sınağını başlat"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Seyf vaxt bitmə əməliyyatınızı dəyişdirmək üçün bir kilid açma üsulu qurun."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Müəssisə siyasət tələbləri, vaxt bitmə seçimlərinizə tətbiq edildi"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Seyfin bitmə vaxtı, təşkilatınız tərəfindən ayarlanan məhdudiyyətləri aşır."
+  },
+  "neverLockWarning": {
+    "message": "\"Heç vaxt\"i seçmək istədiyinizə əminsiniz? Kilid seçimini \"Heç vaxt\" olaraq ayarlasanız, seyfinizin şifrələmə açarı cihazınızda saxlanılacaq. Bu seçimi istifadə etsəniz, cihazınızı daha yaxşı mühafizə etdiyinizə əmin olmalısınız."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Vaxt bitmə əməliyyatı"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sessiya vaxt bitməsi"
+  },
+  "appearance": {
+    "message": "Görünüş"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Vaxt bitməsinə təyin olunan vaxt, təşkilatınız tərəfindən ayarlanan məhdudiyyəti aşır: Maksimum $HOURS$ saat və $MINUTES$ dəqiqə",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Heç bir kritik tətbiq seçilməyib"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Davam etmək istədiyinizə əminsiniz?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/be/messages.json b/apps/web/src/locales/be/messages.json
index 91eb4328810..20142bf95d1 100644
--- a/apps/web/src/locales/be/messages.json
+++ b/apps/web/src/locales/be/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Кіраванне доступам"
   },
-  "riskInsights": {
-    "message": "Разуменне рызык"
-  },
   "passwordRisk": {
     "message": "Рызыка пароля"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Праглядайце паролі, якія знаходзяцца ў зоне рызыкі (ненадзейныя, скампраметаваныя або паўторна выкарыстаныя) ва ўсіх вашых праграмах. Выберыце найбольш крытычныя праграмы для вызначэння прыярытэту бяспекі дзеянняў для вашых карыстальнікаў, якія выкарыстоўваюць рызыкоўныя паролі."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Апошняе абнаўленне даных: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Апавешчаныя ўдзельнікі"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Стварыць новы элемент запісу ўваходу"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Крытычныя праграмы ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Апавешчаныя ўдзельнікі ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Праграмы ў $ORG NAME$ не знойдзены",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Тут будуць адлюстроўвацца праграмы па меры таго, як карыстальнікі будуць захоўваць запісы ўваходу, якія знаходзяцца ў зоне рызыкі. Пазначце крытычныя праграмы і апавяшчайце карыстальнікаў аб неабходнасці абнавіць паролі."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Пазначыць праграму як крытычную"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Праграма"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Удзельнікі ў зоне рызыкі"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Гэтыя ўдзельнікі ўваходзяць у праграму з ненадзейнымі, скампраметаванымі або паўторна выкарыстанымі паролямі."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Усяго праграм"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Абраныя"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Тыпы"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Памылковы асноўны пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Памылковы пароль файла. Скарыстайцеся паролем, які вы ўводзілі пры стварэнні файла экспартавання."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "У спісе адсутнічаюць элементы."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "У вас няма правоў для прагляду ўсіх элементаў у гэтай калекцыі."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Налады ключа шыфравання"
   },
-  "kdfAlgorithm": {
-    "message": "Алгарытм KDF"
-  },
   "kdfIterations": {
     "message": "Ітэрацыя KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Высокае значэнне ітэрацыі KDF, памяці і паралелізму дапаможа абараніць асноўны пароль ад атакі поўным пераборам."
   },
-  "changeKdf": {
-    "message": "Змяніць KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Налады ключа шыфравання зменены"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Пераканайцеся, што на вашым рахунку дастаткова крэдытаў для ажыццяўлення гэтай пакупкі. Калі сродкаў на вашым рахунку не хапае, то для кампенсацыі нястачы будзе выкарыстаны ваш прадвызначаны спосаб аплаты. Вы можаце дадаць крэдыты на свой рахунак на старонцы аплаты."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Крэдыт вашага рахунку можа выкарыстоўвацца для здзяйснення купляў. Любыя даступныя крэдыты будуць аўтаматычна ўжыты для рахункаў, якія згенерыраваны для гэтага ўліковага запісу."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Наступнае спагнанне"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Падрабязнасці"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Спампаваць ліцэнзію"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Абнавіць браўзер"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Ваш браўзер не падтрымліваецца. Вэб-сховішча можа працаваць няправільна."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Запрашэнне прынята"
   },
-  "inviteAcceptedDesc": {
-    "message": "Вы можаце атрымаць доступ да гэтай арганізацыі адразу пасля таго, як будзе пацверджаны ваш удзел. Мы апавясцім вас, калі гэта адбудзецца."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Цяпер вы можаце атрымаць доступ да гэтай арганізацыі."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Арганізацыя адключана."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Доступ да элементаў у адключаных арганізацыях немагчымы. Звяжыце з уладальнікам арганізацыі для атрымання дапамогі."
-  },
   "licenseIsExpired": {
     "message": "Ліцэнзія пратэрмінавана."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Ідэнтыфікатар SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Адлучыць SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Выдаліць асабістае сховішча"
   },
@@ -5597,6 +5947,19 @@
     "message": "Заўсёды паказваць атрымальнікам адрас электроннай пошты ўдзельніка пры стварэнні або рэдагаванні Send'a.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Змяненне палітыкі $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ваш асноўны пароль не адпавядае адной або некалькім палітыкам арганізацыі. Для атрымання доступу да сховішча, вы павінны абнавіць яго. Працягваючы, вы выйдзіце з бягучага сеанса і вам неабходна будзе ўвайсці паўторна. Актыўныя сеансы на іншых прыладах могуць заставацца актыўнымі на працягу адной гадзіны."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Час чакання сховішча"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Прызначыць час чакання сховішча для ўдзельнікаў."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Максімальны час чакання сховішча"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Памылковы максімальны час чакання сховішча."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Гадзіны"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Хвіліны"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Палітыка вашай арганізацыі ўплывае на час чакання сховішча. Максімальны дазволены час чакання сховішча складае $HOURS$ гадз. і $MINUTES$ хв.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Доступ забаронены. У вас не дастаткова правоў для прагляду гэтай старонкі."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Асноўны пароль"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Група/Карыстальнік"
   },
-  "lowKdfIterations": {
-    "message": "Нізкае значэнне ітэрацыі KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Абнавіце свае налады шыфравання, каб адпавядаць новым рэкамендацыям бяспекі і палепшыць абарону ўліковага запісу."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Вы ўвайшлі!"
   },
-  "beta": {
-    "message": "Бэта"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/bg/messages.json b/apps/web/src/locales/bg/messages.json
index 86136cb8f16..3267ebc3385 100644
--- a/apps/web/src/locales/bg/messages.json
+++ b/apps/web/src/locales/bg/messages.json
@@ -15,17 +15,20 @@
     "message": "Няма важни приложения в риск"
   },
   "accessIntelligence": {
-    "message": "Access Intelligence"
-  },
-  "riskInsights": {
-    "message": "Подробности за рисковете"
+    "message": "Анализ на достъпа"
   },
   "passwordRisk": {
     "message": "Рискова парола"
   },
+  "noEditPermissions": {
+    "message": "Нямате право за редактиране на този елемент"
+  },
   "reviewAtRiskPasswords": {
     "message": "Прегледайте паролите в риск (слаби, преизползвани или разобличени) в различните приложения. Изберете най-важните си приложения, за да дадете приоритет на действията по сигурността за потребителите си, така че те да обърнат внимание на паролите си в риск."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Преглед на елементите за вписване в риск"
+  },
   "dataLastUpdated": {
     "message": "Последно обновяване на данните: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Все още не сте създали нито един доклад"
+  },
   "notifiedMembers": {
     "message": "Известени членове"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Създаване на нов елемент за вписване"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% завършено",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ от $TOTAL$ задачи по сигурността за завършени",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Напредък по смяната на паролата"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Назначете задачи на членовете, за да следите напредъка"
+  },
+  "onceYouReviewApplications": {
+    "message": "След като прегледате приложенията и ги отбележите като важни, можете да зададете задачи на членовете си, за да сменят паролите си."
+  },
+  "sendReminders": {
+    "message": "Изпращане на напомняния"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Когато отбележите някое приложение като важно, то ще се появи тук."
   },
+  "viewAtRiskMembers": {
+    "message": "Преглед на членовете в риск"
+  },
+  "viewAtRiskApplications": {
+    "message": "Преглед на приложенията в риск"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ от $TOTAL$ важни приложения са в риск, тъй като има пароли в риск",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Важни приложения ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "важни приложения са отбелязани"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ важни приложения",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ прилжения са в риск",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ пароли в риск",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ нови пароли в риск",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Известени членове ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Няма намерени приложения в $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Няма намерени данни"
   },
-  "noAppsInOrgDescription": {
-    "message": "Когато потребителите запазват данните си за вписване, тук ще се появяват приложения, а също и ще се показват паролите в риск. Можете да отбелязвате важните приложения и да напомняте на потребителите да сменят паролите си."
+  "noDataInOrgDescription": {
+    "message": "Внесете данните за вписване на организацията си, за да започнете да използвате Анализа на достъпа. След като направите това, ще можете да:"
+  },
+  "feature1Title": {
+    "message": "Отбелязвате приложения като важни"
+  },
+  "feature1Description": {
+    "message": "Това ще Ви помогне да отстранявате рисковете първо в най-важните си приложения."
+  },
+  "feature2Title": {
+    "message": "Помагате на членовете да подобряват сигурността си"
+  },
+  "feature2Description": {
+    "message": "Задавайте на членовете в риск задачи по сигурността, които да ги насочват в промяната на данните им."
+  },
+  "feature3Title": {
+    "message": "Следите напредъка"
+  },
+  "feature3Description": {
+    "message": "Следете промените във времето, за да виждате как сигурността се подобрява."
+  },
+  "noReportsRunTitle": {
+    "message": "Създаване на доклад"
+  },
+  "noReportsRunDescription": {
+    "message": "Всичко е готово и можете да започнете да създавате доклади. След като го направите, ще можете да:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Не сте отбелязали нито едно приложение като важно"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Отбелязване на приложението като важно"
   },
+  "markAsCritical": {
+    "message": "Отбелязване като важно"
+  },
+  "applicationsSelected": {
+    "message": "избрани приложения"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ приложения са отбелязани като важни",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Приложенията не успяха да бъдат отбелязани като важни"
+  },
   "application": {
     "message": "Приложение"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Членове в риск"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Членове с права за редактиране на елементи в риск за важни приложения"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Тези членове имат достъп до рисковите елементи за важните приложения."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Членове с пароли в риск"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Членовете на организацията ще получат задача за промяна на рисковите пароли. Те ще получат известие в разширението за браузър на Битуорден."
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ членове в риск",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Тези членове се вписват в приложенията със слаби, преизползвани или разобличени пароли."
+  "atRiskMemberDescription": {
+    "message": "Тези членове се вписват във важните приложения със слаби, преизползвани или разкрити пароли."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Няма членове, които се вписват в приложенията със слаби, преизползвани или разобличени пароли."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Общо приложения"
   },
+  "applicationsNeedingReview": {
+    "message": "Приложения, които имат нужда от преглед"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Преглед на новите приложения"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ нови приложения",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Прегледайте новите приложения, за да ги отбележите като важни, ако е необходимо – така ще се затвърдите сигурността на организацията си"
+  },
+  "reviewNow": {
+    "message": "Преглеждане сега"
+  },
+  "allCaughtUp": {
+    "message": "Всичко е изпълнено!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "В момента няма нови приложения за преглед"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Вашата организация има запазени елементи за $COUNT$ приложения",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Прегледайте приложенията, за да защитите най-важните за организацията си елементи"
+  },
+  "reviewApplications": {
+    "message": "Преглед на приложенията"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Даване на приоритет на важните приложения"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Изберете кои приложения са най-важни за организацията Ви. След това ще можете да зададете задачи на членовете, за да отстраните рисковете."
+  },
+  "reviewNewApplications": {
+    "message": "Преглед на новите приложения"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Прегледайте новите приложения с рискови елементи и ги отбележете, ако искате да ги следите внимателно като важни. След това ще можете да задавате задачи на членовете, за да отстраните рисковете."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Щракнете върху иконката със звезда, за да отбележите приложение като важно"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Функционалността за отбелязване на нещо като важно ще бъде добавена в бъдеща версия"
+  },
+  "applicationReviewSaved": {
+    "message": "Прегледът на приложението е запазен"
+  },
+  "newApplicationsReviewed": {
+    "message": "Има нови прегледани приложения"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Грешка при запазването на състоянието на преглед"
+  },
+  "pleaseTryAgain": {
+    "message": "Моля, опитайте отново"
+  },
   "unmarkAsCritical": {
     "message": "Премахване от важните"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Любими"
   },
+  "taskSummary": {
+    "message": "Обобщение на задачата"
+  },
   "types": {
     "message": "Видове"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Дръжте този прозорец отворен и следвайте инструкциите в браузъра си."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Удостоверяването чрез секретен ключ беше неуспешно. Моля, опитайте отново."
+  },
   "useADifferentLogInMethod": {
     "message": "Използване на друг метод на вписване"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Използване на еднократна идентификация"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Вашата организация изисква еднократно удостоверяване."
+  },
   "welcomeBack": {
     "message": "Добре дошли отново"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Грешна главна парола"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Грешна главна парола. Проверете дали е-пощата е правилна и дали акаунтът Ви е създаден в $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Неправилна парола за файла. Използвайте паролата, която сте въвели при създаването на изнесения файл."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Няма елементи за показване."
   },
+  "noItemsInTrash": {
+    "message": "Няма елементи в кошчето"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Елементите, които изтривате, ще бъдат премествани тук и изтривани окончателно след 30 дни"
+  },
+  "noItemsInVault": {
+    "message": "Няма елементи в трезора"
+  },
+  "emptyVaultDescription": {
+    "message": "Трезорът може да пази не само паролите Ви. Тум можете да съхранявате сигурно данни за вписване, идентификационни данни, карти и бележки."
+  },
+  "emptyFavorites": {
+    "message": "Все още нямате любими неща"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Добавете често ползваните неща в любимите си, за бърз достъп."
+  },
+  "noSearchResults": {
+    "message": "Няма резултати от търсенето"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Изчистете филтрите или опитайте да търсите нещо друго"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Нямате права да преглеждате всички елементи в тази колекция."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Настройки на шифриращия ключ"
   },
-  "kdfAlgorithm": {
-    "message": "Алгоритъм KDF"
-  },
   "kdfIterations": {
     "message": "Повторения за KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "По-високите стойности за броя на повторения, паметта или степента на успоредно изпълнение на KDF може да защитят главната Ви парола от атаки тип „груба сила“."
   },
-  "changeKdf": {
-    "message": "Смяна на KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Настройките за шифриращия ключ са сменени"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Проверете дали към абонамента си имате достатъчно средства за тази покупка. В противен случай разликата от наличното и необходимото се изисква от основния ви метод за плащане, който сте задали."
   },
+  "notEnoughAccountCredit": {
+    "message": "Нямате достатъчно средства в акаунта за тази покупка. Можете да добавите средства в акаунта си на страницата за плащанията."
+  },
   "creditAppliedDesc": {
     "message": "Може да използвате кредитите към абонамента си за покупки. Кредитите се използват за покриването на издадените фактури към абонамента."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Следваща промяна"
   },
+  "nextChargeHeader": {
+    "message": "Следващо плащане"
+  },
+  "plan": {
+    "message": "План"
+  },
   "details": {
     "message": "Детайли"
   },
+  "discount": {
+    "message": "отстъпка"
+  },
   "downloadLicense": {
     "message": "Изтегляне на лиценз"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Обновяване на браузъра"
   },
-  "generatingYourRiskInsights": {
-    "message": "Създаване на Вашата информация относно рисковете…"
+  "generatingYourAccessIntelligence": {
+    "message": "Създаване на Вашия анализ на достъпа…"
+  },
+  "fetchingMemberData": {
+    "message": "Извличане на данните за членовете…"
+  },
+  "analyzingPasswordHealth": {
+    "message": "Анализиране на състоянието на паролите…"
+  },
+  "calculatingRiskScores": {
+    "message": "Изчисляване на оценките на риска…"
+  },
+  "generatingReportData": {
+    "message": "Създаване на данните за доклада…"
+  },
+  "savingReport": {
+    "message": "Запазване на доклада…"
+  },
+  "compilingInsights": {
+    "message": "Събиране на подробности…"
+  },
+  "loadingProgress": {
+    "message": "Зареждане на напредъка"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Това може да отнеме няколко минути."
+  },
+  "riskInsightsRunReport": {
+    "message": "Изпълнение на доклада"
   },
   "updateBrowserDesc": {
     "message": "Ползвате неподдържан браузър. Трезорът по уеб може да не сработи правилно."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Поканата е приета"
   },
-  "inviteAcceptedDesc": {
-    "message": "Ще имате достъп до организацията, след като администраторът ѝ потвърди членството ви. Ще ви изпратим електронно писмо, когато това се случи."
+  "invitationAcceptedDesc": {
+    "message": "Поканата е приета успешно."
   },
   "inviteInitAcceptedDesc": {
     "message": "Вече имате достъп до тази организация."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Организацията е изключена."
   },
+  "organizationIsSuspended": {
+    "message": "Организацията е с преустановен достъп"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Записите в организации с преустановен достъп не са достъпни. Свържете се със собственика на организацията си за помощ."
+  },
   "secretsAccessSuspended": {
     "message": "Изключените организации са недостъпни. Свържете се със собственика на организацията си за помощ."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "В изключени организации не могат да се създават сервизни акаунти. Свържете се със собственика на организацията си за помощ."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Записите в изключени организации не са достъпни. Свържете се със собственика на организацията си за помощ."
-  },
   "licenseIsExpired": {
     "message": "Изтекъл лиценз."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Идентификатор за еднократна идентификация"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Дайте този идентификатор на членовете си, за да могат да се вписват чрез еднократно удостоверяване. Ако искате да пропуснете тази стъпка, настройте ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Дайте този идентификатор на членовете си, за да се вписват чрез еднократно удостоверяване. Членовете могат да пропуснат въвеждането та този идентификатор по време на еднократното удостоверяване, ако е настроен присвоен домейн. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Научете повече",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Прекъсване на еднократна идентификация"
@@ -5518,9 +5809,9 @@
     "message": "Изискване на всички елементи да бъдат притежавани от организация, премахвайки възможността за съхраняване на елементи в отделен акаунт.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
+  "organizationDataOwnershipDescContent": {
     "message": "Всички елементи ще се притежават от и съхраняват в организацията, което ще означава, че управлението, видимостта и докладите ще се извършват от организацията. Когато това и включено, всеки член ще може да съхранява елементите си в стандартна колекция. Научете повече относно управлението на ",
-    "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.'"
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "жизнения цикъл на данните за удостоверяване",
@@ -5536,7 +5827,7 @@
     "message": "няма да бъде автоматично избрана при създаване на нови елементи"
   },
   "organizationDataOwnershipWarning3": {
-    "message": "не може да се управлява от Конзолата за администриране, докато потребителят не бъде премахнат"
+    "message": "не може да се управлява от Административната конзола, докато потребителят не бъде премахнат"
   },
   "organizationDataOwnershipWarningContentTop": {
     "message": "Изключвайки тази политика, стандартната колекция: "
@@ -5545,6 +5836,65 @@
     "message": "Научете повече относно ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Налично сега"
+  },
+  "autoConfirm": {
+    "message": "Автоматично потвърждение на новите потребители"
+  },
+  "autoConfirmDescription": {
+    "message": "Новите потребители, поканени в организацията, ще бъдат потвърждавани автоматично, когато се отключи устройство на администратор.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Как се включва автоматичното потвърждаване на потребителите"
+  },
+  "autoConfirmExtension1": {
+    "message": "Отворете добавката на Битуорден"
+  },
+  "autoConfirmExtension2": {
+    "message": "Изберете",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Включване",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Добавката за браузър на Битуорден е отворена. Сега можете да включите настройката за автоматично потвърждаване на потребителите."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Новите потребители, поканени в организацията, ще бъдат потвърждавани автоматично, когато се отключи устройство на администратор. Преди да включите тази настройка, трябва да прегледате и да се съгласите със следното: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Потенциален риск за сигурността. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Автоматичното потвърждение на потребителите може да представлява риск за сигурността на данните на организацията."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Научете повече за рисковете",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Изисква се да е включена политиката за единствена организация. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "За да може да се включи тази автоматизация, всички членове трябва да принадлежат само на тази организация."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Политиката за единствена организация ще се прилага за всички роли. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Без авариен достъп. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Аварийният достъп ще бъде премахнат."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Приемам тези рискове и промени в политиката"
+  },
   "personalOwnership": {
     "message": "Индивидуално притежание"
   },
@@ -5597,6 +5947,19 @@
     "message": "Потребителите да не могат да скриват адреса на е-пощата си от получателите, когато създават или редактират изпращания.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Стандартно засичане на съвпадения на адреси"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Определя кога данните за вписване да се предлагат за автоматично попълване. Тази политика не засяга администраторите и собствениците."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Стандартно засичане на съвпадения на адреси"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Моля, изберете вариант за засичане на съвпаденията на адреси.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Редактирана политика № $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Вашата главна парола не отговаря на една или повече политики на организацията Ви. За да получите достъп до трезора, трябва да промените главната си парола сега. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час."
   },
-  "automaticAppLogin": {
-    "message": "Автоматично вписване на потребителите за разрешените приложения"
+  "automaticAppLoginWithSSO": {
+    "message": "Автоматично вписване чрез еднократно удостоверяване"
   },
-  "automaticAppLoginDesc": {
-    "message": "Формулярите за вписване ще бъдат попълвани и изпращани автоматично за приложенията, стартирани от настроения Ви доставчик на самоличност."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Възползвайте се от сигурността и удобството на еднократното удостоверяване дори и за неуправлявани приложения. Когато потребителите пуснат приложение от Вашия доставчик на самоличности, данните им за вписване ще бъдат автоматично попълнени и изпратени, с едно щракване и по безопасен път от доставчика на самоличност до приложението."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Сървър на доставчика на самоличност"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Вашата организация е променила настройките за шифроване. Задайте главна парола, за да получите достъп до трезора си."
   },
-  "maximumVaultTimeout": {
-    "message": "Време за достъп"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Време на давност за сесията"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Настройте максимално време за достъп до трезора, което ще важи за всички потребители."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Задайте максимално време на давност на сесиите за достъп за всички членове, без собствениците."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Максимално време за достъп до трезора"
+  "maximumAllowedTimeout": {
+    "message": "Максимално допустимо време на достъп"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Неправилно максимално време за достъп."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Максималното допустимо време е задължително."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Времето е зададено грешно. Променете поне една стойност."
+  },
+  "sessionTimeoutAction": {
+    "message": "Действие при изтичане на времето за сесията"
+  },
+  "immediately": {
+    "message": "Незабавно"
+  },
+  "onSystemLock": {
+    "message": "При заключване на системата"
+  },
+  "onAppRestart": {
+    "message": "При рестартиране на приложението"
   },
   "hours": {
     "message": "Часа"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Минути"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Наистина ли искате да разрешите максималното време за достъп да бъде „Безкрайно“ за всички членове?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Така ключовете за шифроване на членовете ще бъдат запазени на техните устройства. Ако изберете това, уверете се, че устройствата им са защитени адекватно."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Научете повече относно защитата на устройствата"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "„Заключването на системата“ ще се прилага само за браузъра и приложението за компютър"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Мобилното приложение и това по уеб ще ползват настройката „При рестартиране на приложението€ като максимално разрешено време за достъп, тъй като другата не се поддържа."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Настройките на организацията Ви влияят върху времето за достъп до трезора Ви. Максималното разрешено време за достъп е $HOURS$ час(а) и $MINUTES$ минути",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Трябва да добавите или основния адрес на сървъра, или поне една специална среда."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Адресите трябва да ползват HTTPS."
+  },
   "apiUrl": {
     "message": "Адрес на сървъра за ППИ"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Ще бъдат изнесени само записите от трезора свързан с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Ще бъдат изнесени само записите от трезора свързан с $ORGANIZATION$. Колекциите от вида „Моите записи“ няма да бъдат включени.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Достъпът е отказан. Нямате право за преглед на тази страница."
   },
+  "noPageAccess": {
+    "message": "Нямате достъп до тази страница"
+  },
   "masterPassword": {
     "message": "Главна парола"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Неизвестна тайна. Може да се нуждаете от правомощие за достъп до тази тайна."
   },
+  "unknownServiceAccount": {
+    "message": "Неизвестен машинен акаунт. Може да се нуждаете от правомощие за достъп до този машинен акаунт."
+  },
   "unknownProject": {
     "message": "Неизвестен проект. Може да се нуждаете от правомощие за достъп до този проект."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Група/потребител"
   },
-  "lowKdfIterations": {
-    "message": "Малко повторения за KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Променете настройките си за шифроване, така че да отговарят на новите препоръки за сигурността и да подобрите защитата на регистрацията си."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Ако продължите, ще излезете от всички активни сесии. Ще трябва да се впишете отново и да извършите двустепенно удостоверяване, ако такова е настроено. Препоръчително е да изнесете трезора си преди да променяте настройките за шифроване, за да избегнете загуба на данни."
   },
@@ -8485,7 +8899,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "Осъществен е достъп до проект с идентификатор: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Изтрит е машинен акаунт с идентификатор: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Редактиран е проект с идентификатор: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Добавен е потребител: $USER_ID$ към машинен акаунт с идентификатор: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Премахнат е потребител: $USER_ID$ от машинен акаунт с идентификатор: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Премахната е група: $GROUP_ID$ от машинен акаунт с идентификатор: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Създаден е машинен акаунт с идентификатор: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Създадена е група: $GROUP_ID$ към машинен акаунт с идентификатор: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Изтрит е машинен акаунт с идентификатор: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Изтрит е проект с идентификатор: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Вписахте се!"
   },
-  "beta": {
-    "message": "Бета"
-  },
   "assignCollectionAccess": {
     "message": "Задаване на достъп за колекциите"
   },
@@ -9330,6 +9820,14 @@
     "message": "Твърде скъпо",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Превключване към безплатен план",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Превключване към безплатна организация",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Безплатно за 1 година"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Свързване"
   },
+  "assignTasks": {
+    "message": "Назначаване на задачи"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Изпращане на известия за промяна на пароли"
+  },
   "assignToCollections": {
     "message": "Свързване с колекции"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Изпращане на данни за събитията до Вашата инстанция на Logscale"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Изпращане на данните за събитията в трезора към Вашата инсталация на Datadog"
+  },
   "failedToSaveIntegration": {
     "message": "Интеграцията не беше запазена. Опитайте отново по-късно."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Трябва да бъдете собственик на организацията, за да извършите това действие."
+  },
   "failedToDeleteIntegration": {
     "message": "Интеграцията не беше изтрита. Опитайте отново по-късно."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Малък брой повторения за KDF. Увеличете броя повторения, за да подсилите защитата на регистрацията си."
-  },
-  "changeKDFSettings": {
-    "message": "Промяна на настройките за KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Подсигурете инфраструктурата си"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Изключено"
   },
-  "higherKDFIterations": {
-    "message": "По-високите стойности за броя на повторения на KDF може да защитят главната Ви парола от атаки тип „груба сила“."
-  },
-  "incrementsOf100,000": {
-    "message": "стъпки от 100 000"
-  },
-  "smallIncrements": {
-    "message": "малки стъпки"
-  },
   "kdfIterationRecommends": {
     "message": "Препоръчваме 600 000 или повече"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Задаването на прекалено висока стойност за KDF може да натовари прекомерно по-старите устройства. Увеличете стойността на $VALUE$ и изпробвайте устройствата си.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Свържете се с поддръжката, за да възобновите абонамента си."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Домейнът е присвоен"
   },
+  "itemAddedToFavorites": {
+    "message": "Елементът е добавен към любимите"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Елементът е премахнат от любимите"
+  },
+  "copyNote": {
+    "message": "Копиране на бележката"
+  },
   "organizationNameMaxLength": {
     "message": "Името на организацията не може да бъде по-дълго от 50 знака."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Добавката за браузър на Биуторден се отвори. Сега може да прегледате паролите си в риск."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Добавката за браузър на Биуторден не успя да се отвори. Отворете я с иконката на Битуорден",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "от лентата с инструменти.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Вашият абонамент ще бъде подновен скоро. За да подсигурите, че услугата няма да има прекъсвания, свържете се с $RESELLER$ и потвърдете подновяването преди $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Търсене в архива"
   },
-  "archive": {
-    "message": "Архив"
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивиране",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Изваждане от архива"
+  },
+  "itemsInArchive": {
+    "message": "Елементи в архива"
   },
   "noItemsInArchive": {
     "message": "Няма елементи в архива"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Архивираните елементи ще се показват тук и ще бъдат изключени от общите резултати при търсене и от предложенията за автоматично попълване."
   },
+  "itemWasSentToArchive": {
+    "message": "Елементът беше преместен в архива"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Елементите бяха преместени в архива"
+  },
+  "itemUnarchived": {
+    "message": "Елементът беше изваден от архива"
+  },
+  "bulkArchiveItems": {
+    "message": "Елементите са архивирани"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Елементите са извадени от архива"
+  },
+  "archiveItem": {
+    "message": "Архивиране на елемента",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архивираните елементи са изключени от общите резултати при търсене и от предложенията за автоматично попълване. Наистина ли искате да архивирате този елемент?"
+  },
+  "archiveBulkItems": {
+    "message": "Архивиране на елементите",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Архивираните елементи са изключени от общите резултати при търсене и от предложенията за автоматично попълване. Наистина ли искате да архивирате тези елементи?"
+  },
   "businessUnit": {
     "message": "Бизнес единица"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Добавката на Битуорден е инсталирана!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Добавката на Битуорден е инсталирана!"
+  },
   "openExtensionToAutofill": {
     "message": "Отворете добавката, за да се впишете и да можете да използвате автоматичното попълване."
   },
@@ -11154,6 +11684,14 @@
     "message": "Центъра за обучения",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Ако добавката на Битуорден не се е отворила, може да трябва да отворите Битуорден от иконката ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " в лентата с инструменти.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Помощния център",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Безпроблемна интеграция"
+  },
+  "families": {
+    "message": "Семейства"
+  },
+  "upgradeToFamilies": {
+    "message": "Надградете до Семейния план"
+  },
+  "upgradeToPremium": {
+    "message": "Надградете до Платения план"
+  },
+  "familiesUpdated": {
+    "message": "Вече ползвате Семейния абонамент!"
+  },
+  "taxCalculationError": {
+    "message": "Възникна грешка при изчисляването на данъка за Вашето местоположение. Моля, опитайте отново."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Добре дошли в Битуорден"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Отключете още функционалности свързани със сигурността, с Платения план; или започнете да споделяте данните в трезора си със Семейния план"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Цените не включват данък и се заплащат веднъж годишно."
+  },
+  "organizationNameDescription": {
+    "message": "Името на организацията Ви ще се вижда в поканите за присъединяване, които изпращате."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Продължаване без надграждане"
+  },
+  "upgradeYourPlan": {
+    "message": "Надградете плана си"
+  },
+  "upgradeNow": {
+    "message": "Надграждане сега"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Чрез попълването на този формуляр ще създадете нова Семейна организация. Можете да надградите безплатната си организация от Администраторската конзола."
+  },
+  "upgradeErrorMessage": {
+    "message": "Възникна грешка при надграждането. Моля, опитайте отново."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Имате безплатния план на Битуорден"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Надградете, за да се възползвате от пълна защита"
+  },
+  "viewbusinessplans": {
+    "message": "Преглед на плановете за компании"
+  },
+  "updateEncryptionSettings": {
+    "message": "Обновяване на настройките за шифроване"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Обновете настройките си за шифроване"
+  },
+  "updateSettings": {
+    "message": "Обновяване на настройките"
+  },
+  "algorithm": {
+    "message": "Алгоритъм"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Изберете как да шифрова Битуорден данните в трезора Ви. Всички варианти са сигурни, но по-сложните методи дават по-добра защита – особено срещу атаки от вида „груба сила“. За повечето потребители, Битуорден препоръчва стандартната настройка."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Увеличаването на стойностите над стандартните ще подобри сигурността, но може да направи отключването на трезора по-бавно."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Информация относно алгоритмите за шифроване"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 е изпитан метод за шифроване, който дава баланс между сигурност и бързина. Подходящ за всички потребители."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id предлага по-добра защита срещу съвременните атаки. Подходящ за напреднали потребители с по-мощни устройства."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Пощенски код"
+  },
+  "cardNumberLabel": {
+    "message": "Номер на картата"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Започнете безплатния пробен период на Семейния план"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Блокиране на създаването на акаунти за присвоени домейни"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Предотвратяване на създаването на потребителски акаунти извън Вашата организация чрез адреси на е-поща от присвоени домейни."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Трябва да има присвоен домейн преди активирането на тази политика."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Задайте метод за отключване, за да може да промените действието при изтичане на времето за достъп до трезора."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Изискванията на политиката за големи компании бяха приложени към настройките на времето за достъп"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Времето за достъп до трезора Ви превишава ограничението, определено от организацията Ви."
+  },
+  "neverLockWarning": {
+    "message": "Уверени ли сте, че искате да зададете стойност „Никога“? Това води до съхранение на шифриращия ключ за трезора във устройството ви. Ако използвате тази възможност, е много важно да имате надлежна защита на устройството си."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Действие при изтичането на времето за достъп"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Изтичане на времето за сесията"
+  },
+  "appearance": {
+    "message": "Външен вид"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Времето за достъп превишава ограничението, зададено от Вашата организация: максимум $HOURS$ час(а) и $MINUTES$ минута/и",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Няма избрани важни приложения"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Наистина ли искате да продължите?"
+  },
+  "userVerificationFailed": {
+    "message": "Проверката на потребителя беше неуспешна."
   }
 }
diff --git a/apps/web/src/locales/bn/messages.json b/apps/web/src/locales/bn/messages.json
index 53f4cc91ae1..f302bd08e24 100644
--- a/apps/web/src/locales/bn/messages.json
+++ b/apps/web/src/locales/bn/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "প্রিয়গুলো"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "প্রকার"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "অবৈধ মূল পাসওয়ার্ড"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "তালিকার জন্য কোনও বস্তু নেই।"
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/bs/messages.json b/apps/web/src/locales/bs/messages.json
index f53fc830b7a..dce29d875db 100644
--- a/apps/web/src/locales/bs/messages.json
+++ b/apps/web/src/locales/bs/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoriti"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/ca/messages.json b/apps/web/src/locales/ca/messages.json
index d9dfa7c1eac..dc3f4994c67 100644
--- a/apps/web/src/locales/ca/messages.json
+++ b/apps/web/src/locales/ca/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Intel·ligència d'accés"
   },
-  "riskInsights": {
-    "message": "Coneixements de risc"
-  },
   "passwordRisk": {
     "message": "Risc de contrasenya"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Reviseu les contrasenyes de risc (febles, exposades o reutilitzades) a totes les aplicacions. Seleccioneu les aplicacions més crítiques per prioritzar les accions de seguretat perquè els usuaris aborden les contrasenyes de risc."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Última actualització de les dades: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Membres notificats"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Crea un nou element d'inici de sessió"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Aplicacions crítiques ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membres notificats ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Aplicació"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Preferits"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tipus"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Utilitzeu un mètode d'inici de sessió diferent"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Usa inici de sessió únic"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Benvingut/da de nou"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Contrasenya mestra no vàlida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "La contrasenya del fitxer no és vàlida. Utilitzeu la contrasenya que vau introduir quan vau crear el fitxer d'exportació."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "No hi ha cap element a llistar."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "No teniu permís per veure tots els elements en aquesta col·lecció."
   },
@@ -1872,7 +2123,7 @@
     "message": "Canvia el correu electrònic"
   },
   "changeEmailTwoFactorWarning": {
-    "message": "Si continueu, canviarà l'adreça de correu electrònic del vostre compte. No canviarà l'adreça de correu electrònic utilitzada per a l'autenticació de dos factors. Podeu canviar aquesta adreça de correu electrònic a la configuració d'inici de sessió en dues passes."
+    "message": "Si continueu, canviarà l'adreça de correu electrònic del vostre compte. No canviarà l'adreça de correu electrònic utilitzada per a l'autenticació de doble factor. Podeu canviar aquesta adreça de correu electrònic a la configuració d'inici de sessió en dos passos."
   },
   "newEmail": {
     "message": "Nou correu electrònic"
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Configuració de claus de xifratge"
   },
-  "kdfAlgorithm": {
-    "message": "Algorisme de KDF"
-  },
   "kdfIterations": {
     "message": "Iteracions de KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Les iteracions de KDF, la memòria i el paral·lelisme més alts poden ajudar a protegir la vostra contrasenya mestra de ser forçada per força bruta per un atacant."
   },
-  "changeKdf": {
-    "message": "Canvia KDF"
-  },
   "encKeySettingsChanged": {
     "message": "S'ha canviat la configuració de les claus de xifratge"
   },
@@ -1978,10 +2223,10 @@
     "message": "Desautoritza sessions"
   },
   "deauthorizeSessionsDesc": {
-    "message": "Voleu evitar que el vostre compte s'inicie en un altre dispositiu? Seguiu aquestes passes per desautoritzar tots els ordinadors o dispositius que hàgeu utilitzat prèviament. Aquest pas de seguretat es recomana si anteriorment heu utilitzat un ordinador públic o si heu guardat la contrasenya accidentalment en un dispositiu que no és vostre. Aquest pas també esborrarà totes les sessions d'inici de sessió en dues passes recordades prèviament."
+    "message": "Voleu evitar que el vostre compte s'inicie en un altre dispositiu? A continuació podeu desautoritzar tots els ordinadors o dispositius que hàgeu utilitzat prèviament. Aquest pas de seguretat es recomana si anteriorment heu utilitzat un ordinador públic o si heu guardat la contrasenya accidentalment en un dispositiu que no és vostre. Aquest pas també esborrarà totes les sessions d'inici de sessió en dos passos recordades prèviament."
   },
   "deauthorizeSessionsWarning": {
-    "message": "El procediment també tancarà la sessió actual, i l'heu de tornar a iniciar. També demanarà iniciar la sessió en dues passes, si està habilitada. Les sessions actives d'altres dispositius poden mantenir-se actives fins a una hora."
+    "message": "El procediment també tancarà la sessió actual, i l'heu de tornar a iniciar. També demanarà iniciar la sessió en dos passos, si està habilitada. Les sessions actives d'altres dispositius poden mantenir-se actives fins a una hora."
   },
   "newDeviceLoginProtection": {
     "message": "New device login"
@@ -2233,7 +2478,7 @@
     "message": "Dominis guardats"
   },
   "twoStepLogin": {
-    "message": "Inici de sessió en dues passes"
+    "message": "Inici de sessió en dos passos"
   },
   "twoStepLoginEnforcement": {
     "message": "Aplicació d'inici de sessió en dos passos"
@@ -2258,7 +2503,7 @@
     "message": "Si heu configurat l'SSO o teniu previst fer-ho, és possible que l'inici de sessió en dos passos ja s'aplique a través del vostre proveïdor d'identitat."
   },
   "twoStepLoginRecoveryWarning": {
-    "message": "Si habiliteu l'inici de sessió en dues passes, pot bloquejar-vos de manera definitiva el compte de Bitwarden. Un codi de recuperació us permet accedir al vostre compte en cas que no pugueu utilitzar el proveïdor d'inici de sessió en dues passes (p. Ex. Perdre el dispositiu). El suport de Bitwarden no podrà ajudar-vos si perdeu l'accés al vostre compte. Us recomanem que escriviu o imprimiu el codi de recuperació i el mantingueu en un lloc segur."
+    "message": "Si habiliteu l'inici de sessió en dos passos, pot bloquejar-vos de manera definitiva el compte de Bitwarden. Un codi de recuperació us permet accedir al vostre compte en cas que no pugueu utilitzar el proveïdor d'inici de sessió en dos passos (p. Ex. Perdre el dispositiu). El suport de Bitwarden no podrà ajudar-vos si perdeu l'accés al vostre compte. Us recomanem que escriviu o imprimiu el codi de recuperació i el mantingueu en un lloc segur."
   },
   "restrictedItemTypePolicy": {
     "message": "Remove card item type"
@@ -2344,7 +2589,7 @@
     "message": "Aquest proveïdor d'inici de sessió en dos passos està habilitat al vostre compte."
   },
   "twoStepLoginAuthDesc": {
-    "message": "Introduïu la vostra contrasenya mestra per modificar la configuració d'inici de sessió en dues passes."
+    "message": "Introduïu la vostra contrasenya mestra per modificar la configuració d'inici de sessió en dos passos."
   },
   "twoStepAuthenticatorInstructionPrefix": {
     "message": "Download an authenticator app such as"
@@ -2476,7 +2721,7 @@
     "message": "Nom de l'amfitrió d'API"
   },
   "twoFactorEmailDesc": {
-    "message": "Seguiu aquestes passes per configurar l'inici de sessió en dues passes amb el correu electrònic:"
+    "message": "Seguiu aquestes passes per configurar l'inici de sessió en dos passos amb el correu electrònic:"
   },
   "twoFactorEmailEnterEmail": {
     "message": "Introduïu el correu electrònic amb el que voleu rebre els codis de verificació"
@@ -2530,7 +2775,7 @@
     "message": "Hi ha hagut un problema en llegir la clau de seguretat. Torneu-ho a provar."
   },
   "twoFactorRecoveryYourCode": {
-    "message": "El codi de recuperació d'inici de sessió en dues passes de Bitwarden"
+    "message": "El codi de recuperació d'inici de sessió en dos passos de Bitwarden"
   },
   "twoFactorRecoveryNoCode": {
     "message": "Encara no heu habilitat cap proveïdor d'inici de sessió en dos passos. Després d'activar-lo, podeu consultar ací el codi de recuperació."
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Assegureu-vos que el compte tinga suficient crèdit disponible per a aquesta compra. Si no té suficient crèdit, el mètode de pagament predeterminat en el fitxer s'utilitzarà per la diferència. Podeu afegir crèdit al vostre compte des de la pàgina de facturació."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "El crèdit del vostre compte es pot utilitzar per fer compres. Qualsevol crèdit disponible s'aplicarà automàticament a les factures generades."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Càrrec següent"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detall"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Baixa la llicència"
   },
@@ -3512,7 +3769,7 @@
     "message": "You have 0 invites remaining."
   },
   "userUsingTwoStep": {
-    "message": "Aquest usuari fa servir l'inici de sessió en dues passes per protegir el seu compte."
+    "message": "Aquest usuari fa servir l'inici de sessió en dos passos per protegir el seu compte."
   },
   "search": {
     "message": "Cerca"
@@ -3617,7 +3874,7 @@
     "message": "S'ha produït un error d'inici de sessió amb una contrasenya incorrecta."
   },
   "failedLogin2fa": {
-    "message": "S'ha produït un error amb un inici de sessió en dues passes incorrecte."
+    "message": "S'ha produït un error amb un inici de sessió en dos passos incorrecte."
   },
   "incorrectPassword": {
     "message": "Contrasenya incorrecta"
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Actualitza el navegador"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Esteu utilitzant un navegador web no compatible. La caixa forta web pot no funcionar correctament."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitació acceptada"
   },
-  "inviteAcceptedDesc": {
-    "message": "Podeu accedir a aquesta organització una vegada que un administrador confirme la vostra pertinença. Rebreu un correu electrònic quan això passe."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Ara podeu accedir a aquesta organització."
@@ -4310,13 +4594,13 @@
     "message": "Recorda el correu electronic"
   },
   "recoverAccountTwoStepDesc": {
-    "message": "Si no podeu accedir al vostre compte a través dels vostres mètodes d'inici de sessió de dues passes, podeu utilitzar el codi de recuperació de l'inici de sessió en dues passes per desactivar tots els proveïdors del vostre compte."
+    "message": "Si no podeu accedir al vostre compte a través dels vostres mètodes d'inici de sessió en dos passos, podeu utilitzar el codi de recuperació de l'inici de sessió en dos passos per desactivar tots els proveïdors del vostre compte."
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
     "message": "Log in below using your single-use recovery code. This will turn off all two-step providers on your account."
   },
   "recoverAccountTwoStep": {
-    "message": "Recupera l'inici de sessió en dues passes del compte"
+    "message": "Recupera l'inici de sessió en dos passos del compte"
   },
   "twoStepRecoverDisabled": {
     "message": "S'ha inhabilitat l'inici de sessió en dos passos al vostre compte."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "L'organització està inhabilitada."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "No es pot accedir a les organitzacions suspeses. Poseu-vos en contacte amb el propietari de la vostra organització per obtenir ajuda."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "No es poden crear comptes de servei en organitzacions suspeses. Poseu-vos en contacte amb el propietari de la vostra organització per obtenir ajuda."
   },
-  "disabledOrganizationFilterError": {
-    "message": "No es pot accedir als elements de les organitzacions inhabilitades. Poseu-vos en contacte amb el propietari de la vostra organització per obtenir ajuda."
-  },
   "licenseIsExpired": {
     "message": "Llicència caducada."
   },
@@ -4933,7 +5220,7 @@
     "message": "Cal iniciar sessió en dos passos"
   },
   "twoStepLoginPolicyDesc": {
-    "message": "Requereix que els usuaris configuren l’inici de sessió en dues passes als seus comptes personals."
+    "message": "Requereix que els usuaris configuren l’inici de sessió en dos passos als seus comptes personals."
   },
   "twoStepLoginPolicyWarning": {
     "message": "Els membres de l’organització que no tinguen activat l’inici de sessió en dos passos per al seu compte personal s'eliminaran de l’organització i rebran un correu electrònic que els notificarà sobre el canvi."
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Identificador SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Proporcioneu aquest identificador als vostres membres per iniciar sessió amb SSO. Per evitar aquest pas, configureu-ho ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Desenllaça SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Suprimeix la caixa forta individual"
   },
@@ -5597,6 +5947,19 @@
     "message": "Mostra sempre l'adreça de correu electrònic del membre amb els destinataris quan creeu o editeu un Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Política modificada $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "La vostra contrasenya mestra no compleix una o més de les polítiques de l'organització. Per accedir a la caixa forta, heu d'actualitzar-la ara. Si continueu, es tancarà la sessió actual i us demanarà que torneu a iniciar-la. Les sessions en altres dispositius poden continuar romanent actives fins a una hora."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Temps d'espera de la caixa forta"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Configureu un temps d'espera màxima a la caixa forta per a tots els usuaris."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Temps d'espera màxima a la caixa forta"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Temps d'espera màxima a la caixa forta no vàlid."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hores"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuts"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Les polítiques de l'organització afecten el temps d'espera de la caixa forta. El temps d'espera màxim permès d'aquesta és de $HOURS$ hores i $MINUTES$ minuts.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "URL del servidor API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Accés denegat. No teniu permís per veure aquesta pàgina."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Contrasenya mestra"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grup/Usuari"
   },
-  "lowKdfIterations": {
-    "message": "Iteracions de KDF baixes"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Actualitzeu la configuració d'encriptació per complir les noves recomanacions de seguretat i millorar la protecció del compte."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Si continueu, tancareu totes les sessions actives. Haureu de tornar a iniciar la sessió i completar l'inici de sessió en dos passos. Recomanem que exporteu la caixa forta abans de canviar la configuració de xifratge per evitar la pèrdua de dades."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Connectat!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assigna accés a la col·lecció"
   },
@@ -9330,6 +9820,14 @@
     "message": "Massa car",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Gratuït durant 1 any"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assigna"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assigna a col·leccions"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Iteracions baixes de KDF. Augmenta les iteracions per millorar la seguretat del teu compte."
-  },
-  "changeKDFSettings": {
-    "message": "Canvia la configuració de KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Assegureu la vostra infraestructura"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Les iteracions mes altes de KDF poden ajudar a protegir la contrasenya mestra de ser forçada per un atacant."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "Recomanem 600.000 o més"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Per a dispositius més antics, configurar el KDF a un valor massa alt pot provocar problemes de rendiment. Augmenteu el valor de $VALUE$ i proveu els dispositius.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Unitat de negoci"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/cs/messages.json b/apps/web/src/locales/cs/messages.json
index 5837d159e92..b4016223c73 100644
--- a/apps/web/src/locales/cs/messages.json
+++ b/apps/web/src/locales/cs/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Přístup k inteligenci"
   },
-  "riskInsights": {
-    "message": "Poznatky o rizicích"
-  },
   "passwordRisk": {
     "message": "Rizikové heslo"
   },
+  "noEditPermissions": {
+    "message": "Nemáte oprávnění upravit tuto položku"
+  },
   "reviewAtRiskPasswords": {
     "message": "Zkontrolujte ohrožená hesla (slabá, odhalená nebo opakovaně používaná) ve všech aplikacích. Vyberte nejkritičtější aplikace a stanovte priority bezpečnostních opatření pro uživatele, abyste se vypořádali s ohroženými hesly."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Zkontrolovat ohrožená přihlášení"
+  },
   "dataLastUpdated": {
     "message": "Data naposledy aktualizována: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Zatím jste nevytvořili hlášení"
+  },
   "notifiedMembers": {
     "message": "Obeznámení členové"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Vytvořit novou položku přihlášení"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$ % dokončeno",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ z $TOTAL$ bezpečnostních úkolů dokončeno",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Probíhá změna hesla"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Přiřadit úkoly členů ke sledování průběhu"
+  },
+  "onceYouReviewApplications": {
+    "message": "Jakmile zkontrolujete aplikace a označíte je jako kritické, přiřaďte svým členům úkoly ke změně jejich hesel."
+  },
+  "sendReminders": {
+    "message": "Odeslat připomenutí"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Jakmile označíte aplikace jako kritické, zobrazí se zde."
   },
+  "viewAtRiskMembers": {
+    "message": "Zobrazit ohrožené členy"
+  },
+  "viewAtRiskApplications": {
+    "message": "Zobrazit ohrožené aplikace"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ z $TOTAL$ kritických aplikací je ohrožených kvůli ohroženým heslům",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Kritické aplikace ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "označených kritických aplikací"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ kritických aplikací",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ ohrožených aplikací",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ ohrožených hesel",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ nových ohrožených hesel",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Obeznámení členové ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "V $ORG NAME$ nebyly nalezeny žádné aplikace",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Nebyla nalezena žádná data"
   },
-  "noAppsInOrgDescription": {
-    "message": "Jakmile uživatelé uloží přihlašovací údaje, zobrazí se zde aplikace, které zobrazují všechna ohrožená hesla. Označte kritické aplikace a upozorněte uživatele, aby hesla aktualizovali."
+  "noDataInOrgDescription": {
+    "message": "Importujte přihlašovací údaje Vaší organizace a začněte s Access Intelligence. Jakmile to uděláte, budete moci:"
+  },
+  "feature1Title": {
+    "message": "Označit aplikace jako kritické"
+  },
+  "feature1Description": {
+    "message": "To Vám pomůže nejprve odebrat rizika pro Vaše nejdůležitější aplikace."
+  },
+  "feature2Title": {
+    "message": "Pomoci členům zlepšit jejich zabezpečení"
+  },
+  "feature2Description": {
+    "message": "Přiřaďte ohroženým členům řízené bezpečnostní úkoly k aktualizaci přihlašovacích údajů."
+  },
+  "feature3Title": {
+    "message": "Sledovat průběh"
+  },
+  "feature3Description": {
+    "message": "Sleduje změny v průběhu času pro zobrazení zlepšení zabezpečení."
+  },
+  "noReportsRunTitle": {
+    "message": "Vygenerovat přehled"
+  },
+  "noReportsRunDescription": {
+    "message": "Jste připraveni začít generovat přehledy. Jakmile je vytvoříte, budete moci:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Neoznačili jste žádné aplikace jako kritické"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Označit aplikaci jako kritickou"
   },
+  "markAsCritical": {
+    "message": "Označit jako kritické"
+  },
+  "applicationsSelected": {
+    "message": "vybraných aplikací"
+  },
+  "selectApplication": {
+    "message": "Vybrat aplikaci"
+  },
+  "unselectApplication": {
+    "message": "Zrušit výběr aplikace"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Aplikace označené jako kritické"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ aplikací označených jako kritických",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Nepodařilo se označit aplikace jako kritické"
+  },
   "application": {
     "message": "Aplikace"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Ohrožení členové"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Členové, kteří upravují přístup k rizikovým položkám pro kritické aplikace"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Tito členové mají přístup k zranitelným položkám pro kritické aplikace."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Členové s ohroženými hesly"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Členům Vaší organizace bude přiřazen úkol ke změně zranitelných hesel. Obdrželi oznámení v rámci jejich rozšíření prohlížeče Bitwarden."
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ členů v ohrožení",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Tito členové se přihlašují do aplikací se slabými, odhalenými nebo znovu použitými hesly."
+  "atRiskMemberDescription": {
+    "message": "Tito členové se přihlašují do kritických aplikací s odhalenými nebo znovu použitými hesly."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Žádní členové se nepřihlašují do aplikací se slabými, odhalenými nebo znovu použitými hesly."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Celkem aplikací"
   },
+  "applicationsNeedingReview": {
+    "message": "Aplikace, které vyžadují kontrolu"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Zkontrolovat nové aplikace"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ nových aplikací",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Zkontrolujte nové aplikace a označte je jako kritické a udržujte v bezpečí Vaši organizaci"
+  },
+  "reviewNow": {
+    "message": "Zkontrolovat nyní"
+  },
+  "allCaughtUp": {
+    "message": "Vše je hotovo!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Nyní nejsou k dispozici žádné nové kontroly"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Vaše organizace má položky uložené pro $COUNT$ aplikací",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Zkontrolujte aplikace pro zabezpečení položek nejkritičtějších pro bezpečnost Vaší organizace"
+  },
+  "reviewApplications": {
+    "message": "Zkontrolovat aplikace"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Upřednostnit kritické aplikace"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Vyberte, které aplikace jsou pro Vaši organizaci nejkritičtější. Potom budete moci přidělit členům bezpečnostní úkoly pro odebrání rizik."
+  },
+  "reviewNewApplications": {
+    "message": "Zkontrolovat nové aplikace"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Zkontrolujte nové aplikace s citlivými položkami a označte ty, které chcete pečlivě sledovat jako kritické. Potom budete moci přidělit členům bezpečnostní úkoly, abyste odebrali rizika."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Klepnutím na ikonu hvězdičky označte aplikaci jako kritickou"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Funkce označení jako kritické bude implementována v budoucí aktualizaci"
+  },
+  "applicationReviewSaved": {
+    "message": "Kontrola aplikace uložena"
+  },
+  "newApplicationsReviewed": {
+    "message": "Nové aplikace zkontrolovány"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Chyba při ukládání stavu kontroly"
+  },
+  "pleaseTryAgain": {
+    "message": "Zkuste to znovu"
+  },
   "unmarkAsCritical": {
     "message": "Zrušit označení jako kritické"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Oblíbené"
   },
+  "taskSummary": {
+    "message": "Shrnutí úkolů"
+  },
   "types": {
     "message": "Typy"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Ponechte toto okno otevřené a postupujte podle dotazů z Vašeho prohlížeče."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Ověření přístupového klíče se nezdařilo. Zkuste to znovu."
+  },
   "useADifferentLogInMethod": {
     "message": "Použít jinou metodu přihlášení"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Použít jednotné přihlášení"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Vaše organizace vyžaduje jednotné přihlášení."
+  },
   "welcomeBack": {
     "message": "Vítejte zpět"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Chybné hlavní heslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Neplatné hlavní heslo. Potvrďte správnost e-mailu a zda byl Váš účet vytvořen na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Neplatné heslo souboru, použijte heslo zadané při vytvoření souboru exportu."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Žádné položky k zobrazení."
   },
+  "noItemsInTrash": {
+    "message": "Žádné položky v koši"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Položky, které smažete, se zde zobrazí a budou trvale smazány po 30 dnech"
+  },
+  "noItemsInVault": {
+    "message": "Žádné položky v trezoru"
+  },
+  "emptyVaultDescription": {
+    "message": "Trezor chrání více než jen Vaše hesla. Bezpečně zde uložte zabezpečená přihlášení, ID, karty a poznámky."
+  },
+  "emptyFavorites": {
+    "message": "Nemáte oblíbené žádné položky"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Přidejte často používané položky do oblíbených pro rychlý přístup."
+  },
+  "noSearchResults": {
+    "message": "Nebyly vráceny žádné výsledky hledání"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Vymažte filtry nebo zkuste jiný hledaný výraz"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Nemáte oprávnění k zobrazení všech položek v této sbírce."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Nastavení šifrovacího klíče"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritmus KDF"
-  },
   "kdfIterations": {
     "message": "Iterace KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Vyšší hodnota iterací KDF, paměti a paralelity pomáhá chránit Vaše hlavní heslo před útokem hrubou silou (brute force attack)."
   },
-  "changeKdf": {
-    "message": "Změnit KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Nastavení šifrovacího klíče bylo uloženo"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Ujistěte se, že je na Vašem účtu dostatečný kredit pro provedení tohoto nákupu. Nemáte-li na účtu dostatečný kredit, bude pro doplacení rozdílu použita Vaše výchozí platební metoda. Kredit si můžete navýšit prostřednictvím stránky Fakturace."
   },
+  "notEnoughAccountCredit": {
+    "message": "Pro tento nákup nemáte na účtu dostatek prostředků. Prostředky na účet můžete přidat na stránce Fakturace."
+  },
   "creditAppliedDesc": {
     "message": "Pro nákupy bude použit kredit z Vašeho účtu. Jakýkoli dostupný kredit bude automaticky použit pro faktury vystavené pro tento účet."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Další platba"
   },
+  "nextChargeHeader": {
+    "message": "Další platba"
+  },
+  "plan": {
+    "message": "Plán"
+  },
   "details": {
     "message": "Podrobnosti"
   },
+  "discount": {
+    "message": "sleva"
+  },
   "downloadLicense": {
     "message": "Stáhnout licenci"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Aktualizovat prohlížeč"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generování poznatků o rizicích..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generování Vaší přístupové inteligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Načítání dat člena..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzování zdraví hesla..."
+  },
+  "calculatingRiskScores": {
+    "message": "Výpočet skóre rizik..."
+  },
+  "generatingReportData": {
+    "message": "Generování dat hlášení..."
+  },
+  "savingReport": {
+    "message": "Ukládání hlášení..."
+  },
+  "compilingInsights": {
+    "message": "Sestavování přehledů..."
+  },
+  "loadingProgress": {
+    "message": "Průběh načítání"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Může to trvat několik minut."
+  },
+  "riskInsightsRunReport": {
+    "message": "Spustit hlášení"
   },
   "updateBrowserDesc": {
     "message": "Používáte nepodporovaný webový prohlížeč. Webový trezor nemusí pracovat správně."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Pozvánka byla přijata"
   },
-  "inviteAcceptedDesc": {
-    "message": "K této organizaci můžete přistupovat, jakmile správce potvrdí Vaše členství. Až se tak stane, pošleme Vám e-mail."
+  "invitationAcceptedDesc": {
+    "message": "Vaše pozvánka byla úspěšně přijata."
   },
   "inviteInitAcceptedDesc": {
     "message": "Nyní můžete přistupovat k této organizaci."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organizace byla deaktivována"
   },
+  "organizationIsSuspended": {
+    "message": "Organizace je deaktivována"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "K položkám v deaktivované organizaci nemáte přístup. Požádejte o pomoc vlastníka organizace."
+  },
   "secretsAccessSuspended": {
     "message": "K deaktivované organizaci nemáte přístup. Požádejte o pomoc vlastníka organizace."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Servisní účty nelze vytvořit v pozastavených organizacích. Požádejte o pomoc vlastníka organizace."
   },
-  "disabledOrganizationFilterError": {
-    "message": "K položkám v deaktivované organizaci nemáte přístup. Požádejte o pomoc vlastníka organizace."
-  },
   "licenseIsExpired": {
     "message": "Licence vypršela."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifikátor"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Poskytněte toto ID Vašim členům pro přihlášení pomocí SSO. Chcete-li obejít tento krok, nastavte ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Zadejte toto ID svým členům a přihlaste se pomocí SSO. Členové mohou přeskočit zadání tohoto identifikátoru během SSO, pokud je nastavena požadovaná doména. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Dozvědět se více",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Zrušit propojení s SSO"
@@ -5518,9 +5809,9 @@
     "message": "Vyžaduje, aby byly všechny položky vlastněny organizací s odebráním volby ukládat položky na úrovni účtu.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
+  "organizationDataOwnershipDescContent": {
     "message": "Všechny položky budou vlastněny a uloženy v organizaci, což umožní organizaci ovládání, viditelnost a hlášení. Pokud je zapnuto, bude k dispozici výchozí sbírka pro každého člena pro ukládání položek. Další informace o správě ",
-    "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.'"
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "životního cyklu pověření",
@@ -5545,6 +5836,65 @@
     "message": "Více informací o ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Nyní k dispozici"
+  },
+  "autoConfirm": {
+    "message": "Automatické potvrzení nových uživatelů"
+  },
+  "autoConfirmDescription": {
+    "message": "Noví uživatelé pozvaní do organizace budou automaticky potvrzeni při odemknutí zařízení správce.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Jak zapnout automatické potvrzení uživatele"
+  },
+  "autoConfirmExtension1": {
+    "message": "Otevřít rozšíření Bitwarden"
+  },
+  "autoConfirmExtension2": {
+    "message": "Vybrat",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Zapnout",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Rozšíření prohlížeče Bitwarden bylo úspěšně otevřeno. Nyní můžete aktivovat automatické potvrzení uživatele."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Noví uživatelé pozvaní do organizace budou automaticky potvrzeni při odemknutí zařízení správce. Před zapnutím této zásady zkontrolujte a odsouhlaste následující: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potenciální bezpečnostní riziko. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatické potvrzení uživatele by mohlo představovat bezpečnostní riziko pro data Vaší organizace."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Více o rizicích",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Vyžadují se jednotné zásady organizace. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Pro aktivaci této automatizace musí všichni členové patřit pouze do této organizace."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Jednotné zásady organizace se budou vztahovat na všechny role. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Žádný nouzový přístup. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Nouzový přístup bude odebrán."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Přijímám tato rizika a aktualizace zásad"
+  },
   "personalOwnership": {
     "message": "Odebrat osobní trezor"
   },
@@ -5597,6 +5947,19 @@
     "message": "Při vytváření nebo úpravách Send vždy zobrazí e-mailovou adresu člena s příjemci.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Výchozí zjišťování shody URI"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Určete, kdy jsou přihlášení navržena pro automatické vyplňování. Administrátoři a vlastníci jsou od těchto zásad osvobozeni."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Výchozí zjišťování shody URI"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Vyberte platnou volbu detekce shody URI.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Byly změněny zásady $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Vaše hlavní heslo nesplňuje jednu nebo více zásad Vaší organizace. Pro přístup k trezoru musíte nyní aktualizovat své hlavní heslo. Pokračování Vás odhlásí z Vaší aktuální relace a bude nutné se přihlásit. Aktivní relace na jiných zařízeních mohou zůstat aktivní až po dobu jedné hodiny."
   },
-  "automaticAppLogin": {
-    "message": "Automaticky přihlásit uživatele pro povolené aplikace"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatické přihlášení pomocí SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Přihlašovací formuláře budou automaticky vyplněny a odeslány pro aplikace spuštěné od Vašeho nakonfigurovaného poskytovatele identity."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Rozšiřte zabezpečení a pohodlí SSO i na nespravované aplikace. Když uživatelé spustí aplikaci od Vašeho poskytovatele identit, jejich přihlašovací údaje se automaticky vyplní a odešlou, čímž se vytvoří bezpečný tok od poskytovatele identit k aplikaci jedním klepnutím."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Hostitel poskytovatele identity"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Vaše organizace aktualizovala možnosti dešifrování. Nastavte hlavní heslo pro přístup k Vašemu trezoru."
   },
-  "maximumVaultTimeout": {
-    "message": "Časový limit trezoru"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Časový limit relace"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Nastaví maximální časový limit trezoru pro všechny uživatele."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Nastavte maximální časový limit relace pro všechny členy kromě vlastníků."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximální časový limit trezoru"
+  "maximumAllowedTimeout": {
+    "message": "Maximální povolený časový limit"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Neplatný maximální časový limit trezoru."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Je vyžadován maximální povolený časový limit."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Čas je neplatný. Změňte alespoň jednu hodnotu."
+  },
+  "sessionTimeoutAction": {
+    "message": "Akce časového limitu relace"
+  },
+  "immediately": {
+    "message": "Okamžitě"
+  },
+  "onSystemLock": {
+    "message": "Při uzamknutí systému"
+  },
+  "onAppRestart": {
+    "message": "Při restartu aplikace"
   },
   "hours": {
     "message": "Hodiny"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuty"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Jste si jisti, že chcete povolit maximální časový limit \"Nikdy\" pro všechny členy?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Tato volba uloží šifrovací klíče Vašich členů do jejich zařízení. Pokud zvolíte tuto volbu, ujistěte se, že jsou jejich zařízení náležitě chráněna."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Další informace o ochraně zařízení"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "Volba \"Při uzamknutí systému\" se bude vztahovat jen na prohlížeč a desktopovou aplikaci"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Mobilní a webová aplikace bude používat \"Při restartu aplikace\" jako maximální povolený časový limit, protože tato volba není podporována."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Zásady Vaší organizace nastavily maximální povolený časový limit trezoru na $HOURS$ hodin a $MINUTES$ minut.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Musíte přidat buď základní adresu URL serveru nebo alespoň jedno vlastní prostředí."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL adresy musí používat HTTPS."
+  },
   "apiUrl": {
     "message": "URL API serveru"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Bude exportován jen trezor organizace přidružený k $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Bude exportován jen trezor organizace přidružený k $ORGANIZATION$. Položky mých sbírek nebudou zahrnuty.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Přístup byl odepřen. Nemáte oprávnění k zobrazení této stránky."
   },
+  "noPageAccess": {
+    "message": "Nemáte přístup k této stránce"
+  },
   "masterPassword": {
     "message": "Hlavní heslo"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Neznámý tajný klíč. Možná budete muset požádat o oprávnění pro přístup k tomuto tajnému klíči."
   },
+  "unknownServiceAccount": {
+    "message": "Neznámý strojový účet. Možná budete muset požádat o oprávnění pro přístup k tomuto strojovému účtu."
+  },
   "unknownProject": {
     "message": "Neznámý projekt. Možná budete muset požádat o oprávnění pro přístup k tomuto projektu."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Skupina/Uživatel"
   },
-  "lowKdfIterations": {
-    "message": "Nízke iterace KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Aktualizujte své nastavení šifrování tak, aby splňovalo nová bezpečnostní doporučení a zlepšilo ochranu účtu."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Pokračováním se odhlásíte ze všech aktivních relací. Budete se muset znovu přihlásit a dokončit nastavení dvoufázového přihlášení, pokud nějaké máte. Před změnou nastavení šifrování doporučujeme exportovat trezor, aby nedošlo ke ztrátě dat."
   },
@@ -8485,7 +8899,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "Přístup k projektu s ID: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "ID smazaného strojového účtu: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Úprava projektu s ID: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Přidán uživatel $USER_ID$ do strojového účtu s ID $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Smazaný uživatel $USER_ID$ ze strojového účtu s ID $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Odebrána skupina $GROUP_ID$ ze strojového účtu s ID $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Vytvořený strojový účet s ID $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Přidána skupina $GROUP_ID$ do strojového účtu s ID $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Smazán strojový účet s ID $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Smazání projektu s ID: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Přihlášeno!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Přiřadit přístup ke sbírce"
   },
@@ -9330,6 +9820,14 @@
     "message": "Příliš drahé",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Přepínání na bezplatný tarif",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Přepínání na bezplatnou organizaci",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Zdarma na 1 rok"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Přiřadit"
   },
+  "assignTasks": {
+    "message": "Přiřadit úkoly"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Odeslat oznámení pro změnu hesla"
+  },
   "assignToCollections": {
     "message": "Přiřadit ke sbírkám"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Odeslat data události do Vaší instance Logscale"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Odeslat data o trezoru do Vaší instance Datadog"
+  },
   "failedToSaveIntegration": {
     "message": "Nepodařilo se uložit integraci. Opakujte akci později."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Pro provedení této akce musíte být vlastníkem organizace."
+  },
   "failedToDeleteIntegration": {
     "message": "Nepodařilo se smazat integraci. Opakujte akci později."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Nízké iterace KDF. Zvyšte iterace pro zvýšení bezpečnosti Vašeho účtu."
-  },
-  "changeKDFSettings": {
-    "message": "Změnit nastavení KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Zabezpečte Vaši infrastrukturu"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Vypnuto"
   },
-  "higherKDFIterations": {
-    "message": "Více iterací KDF Vám může pomoci ochránit hlavní heslo před útočníkem, který by ho vylákal hrubou silou."
-  },
-  "incrementsOf100,000": {
-    "message": "přírůstky po 100 000"
-  },
-  "smallIncrements": {
-    "message": "malé přírůstky"
-  },
   "kdfIterationRecommends": {
     "message": "Doporučujeme 600 000 nebo více"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "U starších zařízení může příliš vysoké nastavení KDF vést k problémům s výkonem. Zvyšte hodnotu v $VALUE$ a otestujte svá zařízení.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Pro obnovení předplatného se obraťte na zákaznickou podporu."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Doména uplatněna"
   },
+  "itemAddedToFavorites": {
+    "message": "Položka byla přidána do oblíbených"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Položka byla odebrána z oblíbených"
+  },
+  "copyNote": {
+    "message": "Kopírovat poznámku"
+  },
   "organizationNameMaxLength": {
     "message": "Název organizace nesmí přesáhnout 50 znaků."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Rozšíření Bitwarden pro prohlížeč bylo úspěšně otevřeno. Nyní můžete zkontrolovat Vaše ohrožená hesla."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Měli jsme potíže s otevřením rozšíření Bitwarden pro pohlížeč. Klepněte na ikonu Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "na panelu nástrojů.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Vaše předplatné se brzy obnoví. Chcete-li zajistit nepřerušenou službu, kontaktujte $RESELLER$ pro potvrzení obnovení před $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Hledat v archivu"
   },
-  "archive": {
-    "message": "Archivovat"
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archivovat",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Odebrat z archivu"
+  },
+  "itemsInArchive": {
+    "message": "Položky v archivu"
   },
   "noItemsInArchive": {
     "message": "Žádné položky v archivu"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Zde se zobrazí archivované položky a budou vyloučeny z obecných výsledků vyhledávání a návrhů automatického vyplňování."
   },
+  "itemWasSentToArchive": {
+    "message": "Položka byla přesunuta do archivu"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Položky byly přesunuty do archivu"
+  },
+  "itemUnarchived": {
+    "message": "Položka byla odebrána z archivu"
+  },
+  "bulkArchiveItems": {
+    "message": "Archivované položky"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Položky odebrané z archivu"
+  },
+  "archiveItem": {
+    "message": "Archivovat položku",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archivované položky jsou vyloučeny z obecných výsledků vyhledávání a z návrhů automatického vyplňování. Jste si jisti, že chcete tuto položku archivovat?"
+  },
+  "archiveBulkItems": {
+    "message": "Archivovat položky",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archivované položky jsou vyloučeny z obecných výsledků vyhledávání a z návrhů automatického vyplňování. Jste si jisti, že chcete tyto položky archivovat?"
+  },
   "businessUnit": {
     "message": "Obchodní jednotka"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Rozšíření Bitwarden nainstalováno!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Rozšíření Bitwarden je nainstalováno!"
+  },
   "openExtensionToAutofill": {
     "message": "Otevřete rozšíření pro příhlášení a spuštění automatického vyplňování."
   },
@@ -11154,6 +11684,14 @@
     "message": "Centrum výuky",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Pokud není rozšíření otevřeno, možná budete muset otevřít Bitwarden z ikony ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " na panelu nástrojů.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Centrum nápovědy",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Hladká integrace"
+  },
+  "families": {
+    "message": "Rodiny"
+  },
+  "upgradeToFamilies": {
+    "message": "Aktualizovat na Rodiny"
+  },
+  "upgradeToPremium": {
+    "message": "Aktualizovat na Premium"
+  },
+  "familiesUpdated": {
+    "message": "Aktualizovali jste na Rodiny!"
+  },
+  "taxCalculationError": {
+    "message": "Došlo k chybě při výpočtu daně pro Vaši polohu. Zkuste to znovu."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Vítejte v Bitwardenu"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Odemkněte více bezpečnostních funkcí s lidencí Premium, nebo začněte sdílet položky s Rodinami"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Ceny nezahrnují daň a účtují se každoročně."
+  },
+  "organizationNameDescription": {
+    "message": "Název Vaší organizace se zobrazí v pozvánkách, které posíláte členům."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Pokračovat bez aktualizace"
+  },
+  "upgradeYourPlan": {
+    "message": "Aktualizovat plán"
+  },
+  "upgradeNow": {
+    "message": "Aktualizovat nyní"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Vyplněním tohoto formuláře vytvoříte novou organizaci Rodin. Můžete vylepšit svou bezplatnou organizaci z konzole správce."
+  },
+  "upgradeErrorMessage": {
+    "message": "Při zpracování aktualizace došlo k chybě. Zkuste to znovu."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Máte bezplatný plán Bitwarden"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Aktualizujte pro úplné zabezpečení"
+  },
+  "viewbusinessplans": {
+    "message": "Zobrazit obchodní plány"
+  },
+  "updateEncryptionSettings": {
+    "message": "Aktualizovat nastavení šifrování"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Aktualizujte nastavení šifrování"
+  },
+  "updateSettings": {
+    "message": "Aktualizovat nastavení"
+  },
+  "algorithm": {
+    "message": "Algoritmus"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Vyberte, jak by Bitwarden měl šifrovat Vaše data trezoru. Všechny volby jsou bezpečné, ale silnější metody poskytují lepší ochranu - zejména proti útokům silou. Bitwarden doporučuje výchozí nastavení pro většinu uživatelů."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Zvýšení hodnot nad výchozím nastavením zvýší zabezpečení, ale odemknutí Vašeho trezoru může trvat déle."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "O šifrovacích algoritmech"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 je dobře testovaná šifrovací metoda, která vyvažuje bezpečnost a výkon. Dobré pro všechny uživatele."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id nabízí silnější ochranu proti moderním útokům. Nejlepší pro pokročilé uživatele s výkonnými zařízeními."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / PSČ"
+  },
+  "cardNumberLabel": {
+    "message": "Číslo karty"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Zahájit bezplatnou zkušební verzi pro rodiny"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Blokovat vytvoření účtu pro nárokované domény"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Zabrání uživatelům ve vytváření účtů mimo Vaši organizaci pomocí e-mailových adres z nárokovaných domén."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Před aktivací této zásady musí být nárokována doména."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Nastavte metodu odemknutí, abyste změnili časový limit Vašeho trezoru."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Na volby časového limitu byly uplatněny požadavky podnikových zásad"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Časový limit Vašeho trezoru překračuje omezení stanovená Vaší organizací."
+  },
+  "neverLockWarning": {
+    "message": "Opravdu chcete použít volbu \"Nikdy\"? Nastavením volby uzamčení na \"Nikdy\" bude šifrovací klíč k trezoru uložen přímo ve Vašem zařízení. Pokud tuto možnost použijete, měli byste Vaše zařízení řádně zabezpečit a chránit."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Akce vypršení časového limitu"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Časový limit relace"
+  },
+  "appearance": {
+    "message": "Vzhled"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Časový limit překračuje omezení stanovené Vaší organizací: maximálně $HOURS$ hodin a $MINUTES$ minut",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Nejsou vybrány žádné kritické aplikace"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Opravdu chcete pokračovat?"
+  },
+  "userVerificationFailed": {
+    "message": "Ověření uživatele se nezdařilo."
   }
 }
diff --git a/apps/web/src/locales/cy/messages.json b/apps/web/src/locales/cy/messages.json
index 43fc75230a9..46876fa947c 100644
--- a/apps/web/src/locales/cy/messages.json
+++ b/apps/web/src/locales/cy/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json
index f5441544b96..0316c1d2f0c 100644
--- a/apps/web/src/locales/da/messages.json
+++ b/apps/web/src/locales/da/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Adgangsefterretning"
   },
-  "riskInsights": {
-    "message": "Risikoindsigt"
-  },
   "passwordRisk": {
     "message": "Adgangskoderisiko"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Gennemgå risikobetonede adgangskoder (svage, eksponerede eller genbrugte) på tværs af applikationer. Vælg de mest kritiske applikationer for at prioritere sikkerhedshandlinger for brugerne til at håndtere risikobetonede adgangskoder."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data senest opdateret: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Underrettede medlemmer"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Opret nyt login-emne"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Kritiske apps ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Underrettede medlemmer ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Ingen apps fundet i $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Når brugerne gemmer logins, vil apps med udsatte adgangskoder fremgå her. Markér kritiske apps og giv brugerne besked om at opdatere adgangskoder."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Markér app som kritisk"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Applikation"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Udsatte medlemmer"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Disse medlemmer logger ind på programmer med svage, udsatte eller genbrugte adgangskoder."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Applikationer i alt"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoritter"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Typer"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Hold dette vindue åbent, og følg prompterne fra webbrowseren."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Benyt en anden login-metode"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Brug Single Sign-On"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Velkommen tilbage"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Ugyldig hovedadgangskode"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Ugyldig filadgangskode. Brug samme adgangskode, som da du oprettede eksportfilen."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Der er ingen emner at vise."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Ingen tilladelse til at se alle emner i denne samling."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Indstillinger for krypteringsnøgle"
   },
-  "kdfAlgorithm": {
-    "message": "KDF-algoritme"
-  },
   "kdfIterations": {
     "message": "KDF-iterationer"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Øget KDF-iterationer, hukommelse og parallelitet kan hjælpe med at beskytte hovedadgangskoden mod brute force-angreb."
   },
-  "changeKdf": {
-    "message": "Ændr KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Indstillinger for krypteringsnøgle gemt"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Sørg for, at din konto har tilstrækkelig indestående til rådighed for dette køb. Hvis din konto ikke har tilstrækkelig indestående til rådighed, bruges din normale betalingsmetode til at dække forskellen. Du kan indbetale til din konto på faktureringssiden."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Din kontos indestående kan bruges til at foretage køb. Ledig indestående vil automatisk blive anvendt til fakturaer for denne konto."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Næste betaling"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detaljer"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download licens"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Opdatér browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Du bruger en ikke-understøttet webbrowser. Web-boksen fungerer muligvis ikke korrekt."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepteret"
   },
-  "inviteAcceptedDesc": {
-    "message": "Du kan få adgang til denne organisation, når en administrator bekræfter dit medlemskab. Vi sender dig en e-mail, når dette sker."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Denne organisation kan nu tilgås."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisation suspenderet"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspenderede organisationer kan ikke tilgås. Kontakt organisationsejeren for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Tjenestekonti kan ikke oprettes i suspenderede organisationer. Kontakt organisationsejeren for hjælp."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Emner i deaktiverede organisationer kan ikke tilgås. Kontakt oganisationsejeren for hjælp."
-  },
   "licenseIsExpired": {
     "message": "Licensen er udløbet."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO-identifikator"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Giv medlemmerne dette ID til indlogning med SSO. For at omgå dette trin, opsæt ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Fjern SSO-tilknytning"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Fjern individuel boks"
   },
@@ -5597,6 +5947,19 @@
     "message": "Vis altid medlemmets e-mailadresse med modtagere, når Sends oprettes eller redigeres.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Redigerede politik $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Din hovedadgangskode opfylder ikke et eller flere organisationspolitikkrav. For at kunne tilgå boksen skal hovedadgangskode derfor opdateres nu. Fortsættes, logges du ud af den nuværende session og vil skulle logge ind igen. Aktive sessioner på andre enheder kan forblive aktive i op til én time."
   },
-  "automaticAppLogin": {
-    "message": "Log automatisk brugere på tilladte applikationer"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login-formularer udfyldes og indsendes automatisk for apps startet fra den opsatte identitetsudbyder."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identitetsudbydervært"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Organisationen har opdateret brugernes dekrypteringsmuligheder. Opsæt en hovedadgangskode for at tilgå boksen."
   },
-  "maximumVaultTimeout": {
-    "message": "Boks-timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Opsæt en maksimal boks-timeout for medlemmer."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maksimal boks-timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Ugyldig maksimal boks-timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Timer"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutter"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Organisationspolitikker har sat din maks. tilladte boks-timeout. til $HOURS$ time(r) og $MINUTES$ minut(ter).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Der skal tilføjes enten basis Server-URL'en eller mindst ét tilpasset miljø."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API-server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Adgang nægtet. Nødvendig tilladelse til at se siden mangler."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Hovedadgangskode"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Gruppe/Bruger"
   },
-  "lowKdfIterations": {
-    "message": "Få KDF-iterationer"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Opdatér krypteringsindstillingerne for at opfylde nye sikkerhedsanbefalinger og forbedre kontobeskyttelsen."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Fortsættes, logges alle aktive sessioner af. Man vil skulle logge ind igen og færdiggøre opsætningen af totrinsindlogning. Eksport af boksen inden krypteringsindstillingerne ændres anbefales for at forhindre datatab."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Indlogget!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Tildel samlingsadgang"
   },
@@ -9330,6 +9820,14 @@
     "message": "For dyrt",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Gratis i 1 år"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Tildel"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Tildel til samlinger"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Få KDF-iterationer. Forøg iterationer for at forbedre kontosikkerheden."
-  },
-  "changeKDFSettings": {
-    "message": "Skift KDF-indstillinger"
-  },
   "secureYourInfrastructure": {
     "message": "Sikr infrastrukturen"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Fra"
   },
-  "higherKDFIterations": {
-    "message": "Højere KDF-iterationer kan hjælpe med at beskytte hovedadgangskoden mod brute force-angreb."
-  },
-  "incrementsOf100,000": {
-    "message": "forøgelsesintervaller på 100.000"
-  },
-  "smallIncrements": {
-    "message": "små forøgelser"
-  },
   "kdfIterationRecommends": {
     "message": "Vi anbefaler 600.000 eller højere"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Indstilling af for høj KDF kan på ældre enheder medføre ydeevneproblemer. Forøg værdien i $VALUE$ og test på enhederne.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Kontakt kundesupport for at genoprette abonnementet."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domæne registreret"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organisationsnavn må ikke overstige 50 tegn."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Abonnementet fornyes snart. For at sikre uafbrudt tjeneste, kontakt $RESELLER$ inden $RENEWAL_DATE$ for at bekræfte fornyelsen.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/de/messages.json b/apps/web/src/locales/de/messages.json
index 012f562fe8c..4b623bf8170 100644
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
@@ -3,7 +3,7 @@
     "message": "Alle Anwendungen"
   },
   "activity": {
-    "message": "Activity"
+    "message": "Aktivität"
   },
   "appLogoLabel": {
     "message": "Bitwarden-Logo"
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Zugriff auf Informationen"
   },
-  "riskInsights": {
-    "message": "Risiko-Überblick"
-  },
   "passwordRisk": {
     "message": "Passwort-Risiko"
   },
+  "noEditPermissions": {
+    "message": "Du bist nicht berechtigt, diesen Eintrag zu bearbeiten"
+  },
   "reviewAtRiskPasswords": {
     "message": "Überprüfe gefährdete Passwörter (schwach, kompromittiert oder wiederverwendet) in allen Anwendungen. Wähle deine kritischsten Anwendungen aus, um die Sicherheitsmaßnahmen für deine Benutzer zu priorisieren, um gefährdete Passwörter zu beseitigen."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Überprüfung gefährdeter Zugangsdaten"
+  },
   "dataLastUpdated": {
     "message": "Daten zuletzt aktualisiert: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Du hast bis jetzt noch keinen Bericht erstellt"
+  },
   "notifiedMembers": {
     "message": "Benachrichtigte Mitglieder"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "Neuen Zugangsdaten-Eintrag erstellen"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "Zu $PERCENT$% abgeschlossen",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ von $TOTAL$ Sicherheitsaufgaben abgeschlossen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Fortschritt der Passwortänderung"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Mitglieder Aufgaben zuweisen, um den Fortschritt zu überwachen"
+  },
+  "onceYouReviewApplications": {
+    "message": "Sobald du Anwendungen überprüft und als kritisch markiert hast, weist du deinen Mitgliedern Aufgaben zu, damit diese ihre Passwörter ändern."
+  },
+  "sendReminders": {
+    "message": "Erinnerungen senden"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Sobald du Anwendungen als kritisch markierst, werden sie hier angezeigt."
+  },
+  "viewAtRiskMembers": {
+    "message": "Gefährdete Mitglieder anzeigen"
+  },
+  "viewAtRiskApplications": {
+    "message": "Gefährdete Anwendungen anzeigen"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ von $TOTAL$ kritischen Anwendungen sind aufgrund gefährdeter Passwörter gefährdet",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "Kritische Anwendungen ($COUNT$)",
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "kritische Anwendungen markiert"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "$COUNT$ kritische Anwendungen",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ gefährdete Anwendungen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ Passwörter gefährdet",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ neue gefährdete Passwörter",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Benachrichtigte Mitglieder ($COUNT$)",
     "placeholders": {
@@ -89,33 +178,75 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Keine Anwendungen in $ORG NAME$ gefunden",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Keine Daten gefunden"
   },
-  "noAppsInOrgDescription": {
-    "message": "Während Benutzer Zugangsdaten speichern, werden hier Anwendungen angezeigt, die alle gefährdeten Passwörter anzeigen. Markiere kritische Anwendungen und benachrichtige Benutzer, um Passwörter zu ändern."
+  "noDataInOrgDescription": {
+    "message": "Importiere die Zugangsdaten deiner Organisation, um mit der Zugangsintelligenz zu beginnen. Sobald du dies getan hast, kannst du:"
+  },
+  "feature1Title": {
+    "message": "Anwendungen als kritisch markieren"
+  },
+  "feature1Description": {
+    "message": "Dadurch kannst du Risiken für deine wichtigsten Anwendungen zuerst beseitigen."
+  },
+  "feature2Title": {
+    "message": "Helfe Mitgliedern, ihre Sicherheit zu verbessern"
+  },
+  "feature2Description": {
+    "message": "Weise gefährdeten Mitgliedern gezielte Sicherheitsaufgaben zu, um Zugangsdaten zu aktualisieren."
+  },
+  "feature3Title": {
+    "message": "Fortschritt überwachen"
+  },
+  "feature3Description": {
+    "message": "Änderungen im Laufe der Zeit verfolgen, um Sicherheitsverbesserungen anzuzeigen."
+  },
+  "noReportsRunTitle": {
+    "message": "Bericht generieren"
+  },
+  "noReportsRunDescription": {
+    "message": "Du bist so weit, Berichte zu generieren. Sobald du sie generierst, kannst du folgendes tun:"
   },
   "noCriticalApplicationsTitle": {
-    "message": "You haven’t marked any applications as critical"
+    "message": "Du hast keine Anwendung als kritisch markiert"
   },
   "noCriticalApplicationsDescription": {
-    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
+    "message": "Wähle deine kritischsten Anwendungen aus, um Sicherheitsmaßnahmen für deine Benutzer zu priorisieren und gefährdete Passwörter zu beheben."
   },
   "markCriticalApplications": {
-    "message": "Select critical applications"
+    "message": "Kritische Anwendungen auswählen"
   },
   "markAppAsCritical": {
     "message": "Anwendung als kritisch markieren"
   },
+  "markAsCritical": {
+    "message": "Als kritisch markieren"
+  },
+  "applicationsSelected": {
+    "message": "ausgewählte Anwendungen"
+  },
+  "selectApplication": {
+    "message": "Anwendung auswählen"
+  },
+  "unselectApplication": {
+    "message": "Anwendung abwählen"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Als kritisch markierte Anwendungen"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ Anwendungen als kritisch markiert",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Anwendungen konnten nicht als kritisch markiert werden"
+  },
   "application": {
     "message": "Anwendung"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Gefährdete Mitglieder"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Diese Mitglieder haben Zugriff auf sensible Einträge für kritische Anwendungen."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Mitglieder mit gefährdeten Passwörtern"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Den Mitgliedern deiner Organisation wird die Aufgabe zugewiesen, sensible Passwörter zu ändern. Sie erhalten eine Benachrichtigung innerhalb ihrer Bitwarden Browser-Erweiterung."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ gefährdete Mitglieder",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Diese Mitglieder melden sich bei Anwendungen mit schwachen, kompromittierten oder wiederverwendeten Passwörtern an."
+  "atRiskMemberDescription": {
+    "message": "Diese Mitglieder melden sich bei kritischen Anwendungen mit schwachen, kompromittierten oder wiederverwendeten Passwörtern an."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Dies sind keine Mitglieder, die sich in Anwendungen mit schwachen, kompromittierten oder wiederverwendeten Passwörtern anmelden."
@@ -203,11 +340,83 @@
   "totalApplications": {
     "message": "Anwendungen insgesamt"
   },
+  "applicationsNeedingReview": {
+    "message": "Anwendungen, die geprüft werden müssen"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Neue Anwendungen überprüfen"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ neue Anwendungen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Überprüfe neue Anwendungen, um sie als kritisch zu markieren und deine Organisation sicher zu halten"
+  },
+  "reviewNow": {
+    "message": "Jetzt prüfen"
+  },
+  "allCaughtUp": {
+    "message": "Alles erledigt!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Derzeit gibt es keine neuen Anwendungen zum Überprüfen"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Deine Organisation hat Einträge für $COUNT$ Anwendungen gespeichert",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Überprüfe Anwendungen, um die für die Sicherheit deiner Organisation wichtigsten Einträge zu sichern"
+  },
+  "reviewApplications": {
+    "message": "Anwendungen überprüfen"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Kritische Anwendungen priorisieren"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Wähle die für deine Organisation kritischsten Anwendungen aus. Danach kannst du Mitgliedern Sicherheitsaufgaben zuweisen, um Risiken zu beseitigen."
+  },
+  "reviewNewApplications": {
+    "message": "Neue Anwendungen überprüfen"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Überprüfe neue Anwendungen mit sensiblen Einträgen und kennzeichne diejenigen, die du genau überwachen möchtest, als kritisch. Anschließend kannst du Mitgliedern Sicherheitsaufgaben zuweisen, um Risiken zu beseitigen."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Klicke auf das Sternsymbol, um eine App als kritisch zu markieren"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Die Funktion \"Als kritisch markieren\" wird in einer zukünftigen Aktualisierung implementiert"
+  },
+  "applicationReviewSaved": {
+    "message": "Anwendungsüberprüfung gespeichert"
+  },
+  "newApplicationsReviewed": {
+    "message": "Neue Anwendungen überprüft"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Fehler beim Speichern des Überprüfungsstatus"
+  },
+  "pleaseTryAgain": {
+    "message": "Bitte versuche es erneut"
+  },
   "unmarkAsCritical": {
-    "message": "Unmark as critical"
+    "message": "Markierung als kritisch aufheben"
   },
   "criticalApplicationUnmarkedSuccessfully": {
-    "message": "Successfully unmarked application as critical"
+    "message": "Markierung der Anwendung als kritisch erfolgreich aufgehoben"
   },
   "whatTypeOfItem": {
     "message": "Um welche Art von Eintrag handelt es sich hierbei?"
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoriten"
   },
+  "taskSummary": {
+    "message": "Aufgaben-Übersicht"
+  },
   "types": {
     "message": "Typen"
   },
@@ -762,79 +974,79 @@
     "message": "Eintrag anzeigen"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "Neue Zugangsdaten",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "Neue Karte",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "Neue Identität",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "Neue Notiz",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "Neuer SSH-Schlüssel",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Neues Text-Send",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Neues Datei-Send",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "Zugangsdaten bearbeiten",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "Karte bearbeiten",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "Identität bearbeiten",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "Notiz bearbeiten",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "SSH-Schlüssel bearbeiten",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Text-Send bearbeiten",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Datei-Send bearbeiten",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Zugangsdaten anzeigen",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Karte anzeigen",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "Identität anzeigen",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "Notiz anzeigen",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "SSH-Schlüssel anzeigen",
     "description": "Header for view SSH key item type"
   },
   "new": {
@@ -944,13 +1156,13 @@
     "message": "Lizenznummer kopieren"
   },
   "copyPrivateKey": {
-    "message": "Copy private key"
+    "message": "Privaten Schlüssel kopieren"
   },
   "copyPublicKey": {
-    "message": "Copy public key"
+    "message": "Öffentlichen Schlüssel kopieren"
   },
   "copyFingerprint": {
-    "message": "Copy fingerprint"
+    "message": "Fingerabdruck kopieren"
   },
   "copyName": {
     "message": "Name kopieren"
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Behalte dieses Fenster geöffnet und folge den Anweisungen deines Browsers."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey-Authentifizierung fehlgeschlagen. Bitte versuche es erneut."
+  },
   "useADifferentLogInMethod": {
     "message": "Eine andere Anmeldemethode verwenden"
   },
@@ -1184,7 +1399,10 @@
     "message": "Mit Passkey anmelden"
   },
   "useSingleSignOn": {
-    "message": "Single Sign-on verwenden"
+    "message": "Single Sign-On verwenden"
+  },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Deine Organisation erfordert Single Sign-On."
   },
   "welcomeBack": {
     "message": "Willkommen zurück"
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Ungültiges Master-Passwort"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ungültiges Master-Passwort. Überprüfe, ob deine E-Mail-Adresse korrekt ist und dein Konto auf $HOST$ erstellt wurde.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Ungültiges Dateipasswort. Bitte verwende das Passwort, das du beim Erstellen der Exportdatei eingegeben hast."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Keine Einträge vorhanden."
   },
+  "noItemsInTrash": {
+    "message": "Keine Einträge im Papierkorb"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Einträge, die du löschst, erscheinen hier und werden nach 30 Tagen dauerhaft gelöscht"
+  },
+  "noItemsInVault": {
+    "message": "Keine Einträge im Tresor"
+  },
+  "emptyVaultDescription": {
+    "message": "Der Tresor schützt mehr als nur deine Passwörter. Speicher hier sichere Zugangsdaten, Identitäten, Karten und Notizen."
+  },
+  "emptyFavorites": {
+    "message": "Du hast keine Einträge zu Favoriten hinzugefügt"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Füge häufig verwendete Einträge zu Favoriten hinzu, um schnell darauf zuzugreifen."
+  },
+  "noSearchResults": {
+    "message": "Keine Suchergebnisse gefunden"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Filter löschen oder es mit einem anderen Suchbegriff versuchen"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Du hast nicht die Berechtigung, alle Einträge in dieser Sammlung anzuzeigen."
   },
@@ -1590,7 +1841,7 @@
     "message": "Wiederherstellungscode"
   },
   "invalidRecoveryCode": {
-    "message": "Invalid recovery code"
+    "message": "Ungültiger Wiederherstellungscode"
   },
   "authenticatorAppTitle": {
     "message": "Authenticator App"
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Verschlüsselungsschlüssel-Einstellungen"
   },
-  "kdfAlgorithm": {
-    "message": "KDF-Algorithmus"
-  },
   "kdfIterations": {
     "message": "KDF-Iterationen"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Höhere KDF-Iterationen, -Speicher und -Parallelität helfen dabei, dein Master-Passwort besser vor Brute-Force-Angriffen zu schützen."
   },
-  "changeKdf": {
-    "message": "KDF ändern"
-  },
   "encKeySettingsChanged": {
     "message": "Verschlüsselungsschlüssel-Einstellungen wurden geändert"
   },
@@ -2136,10 +2381,10 @@
     "message": "Sammlung auswählen"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "Wähle diese Option, wenn die Inhalte der Import-Datei in eine Sammlung verschoben werden sollen"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "Wähle diese Option, wenn die Inhalte der Import-Datei in einen Ordner verschoben werden sollen"
   },
   "importUnassignedItemsError": {
     "message": "Die Datei enthält nicht zugewiesene Einträge."
@@ -2188,7 +2433,7 @@
     "message": "Die Sprache des Web-Tresors ändern."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Website-Symbole anzeigen und URLs zum Ändern von Passwörtern abrufen"
   },
   "default": {
     "message": "Standard"
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Bitte vergewissere dich, dass auf deinem Konto genügend Guthaben für diesen Kauf vorhanden ist. Wenn dein Konto nicht über genügend Guthaben verfügt, wird die Differenz mit deiner Standardzahlungsmethode beglichen. Du kannst deinem Konto auf der Seite \"Abrechnung\" Guthaben hinzufügen."
   },
+  "notEnoughAccountCredit": {
+    "message": "Du hast nicht genug Guthaben für diesen Kauf. Du kannst auf der Seite „Abrechnung“ Guthaben auf dein Konto laden."
+  },
   "creditAppliedDesc": {
     "message": "Das Guthaben deines Kontos kann für Einkäufe verwendet werden. Das verfügbare Guthaben wird automatisch auf die für dieses Konto erstellten Rechnungen angerechnet."
   },
@@ -2900,10 +3148,10 @@
     }
   },
   "showPricingSummary": {
-    "message": "Show pricing summary"
+    "message": "Preisübersicht anzeigen"
   },
   "hidePricingSummary": {
-    "message": "Hide pricing summary"
+    "message": "Preisübersicht ausblenden"
   },
   "summary": {
     "message": "Zusammenfassung"
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Nächste Abbuchung"
   },
+  "nextChargeHeader": {
+    "message": "Nächste Abbuchung"
+  },
+  "plan": {
+    "message": "Tarif"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "Rabatt"
+  },
   "downloadLicense": {
     "message": "Lizenz herunterladen"
   },
@@ -3404,7 +3661,7 @@
     "message": "Richtlinien"
   },
   "singleSignOn": {
-    "message": "Single Sign-on"
+    "message": "Single Sign-On"
   },
   "editPolicy": {
     "message": "Richtlinie bearbeiten"
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Browser aktualisieren"
   },
-  "generatingYourRiskInsights": {
-    "message": "Dein Risiko-Überblick wird generiert..."
+  "generatingYourAccessIntelligence": {
+    "message": "Deine Zugangsintelligenz wird generiert..."
+  },
+  "fetchingMemberData": {
+    "message": "Mitgliedsdaten werden abgerufen..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Passwortsicherheit wird analysiert..."
+  },
+  "calculatingRiskScores": {
+    "message": "Risikobewertung wird berechnet..."
+  },
+  "generatingReportData": {
+    "message": "Berichtsdaten werden generiert..."
+  },
+  "savingReport": {
+    "message": "Bericht wird gespeichert..."
+  },
+  "compilingInsights": {
+    "message": "Analyse wird zusammengestellt..."
+  },
+  "loadingProgress": {
+    "message": "Ladefortschritt"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Dies kann einige Minuten dauern."
+  },
+  "riskInsightsRunReport": {
+    "message": "Bericht ausführen"
   },
   "updateBrowserDesc": {
     "message": "Du verwendest einen nicht unterstützten Webbrowser. Der Web-Tresor funktioniert möglicherweise nicht richtig."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Einladung angenommen"
   },
-  "inviteAcceptedDesc": {
-    "message": "Du kannst der Organisation beitreten, sobald ein Administrator deine Mitgliedschaft bestätigt hat. Wir werden dich dann per E-Mail benachrichtigen."
+  "invitationAcceptedDesc": {
+    "message": "Deine Einladung wurde erfolgreich angenommen."
   },
   "inviteInitAcceptedDesc": {
     "message": "Du kannst nun auf diese Organisation zugreifen."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisation ist deaktiviert"
   },
+  "organizationIsSuspended": {
+    "message": "Organisation ist deaktiviert"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Auf Einträge in deaktivierten Organisationen kann nicht zugegriffen werden. Kontaktiere den Besitzer deiner Organisation, um Unterstützung zu erhalten."
+  },
   "secretsAccessSuspended": {
     "message": "Auf deaktivierte Organisationen kann nicht zugegriffen werden. Bitte wende dich an deinen Organisationseigentümer."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Dienstkonten können in deaktivierten Organisationen nicht erstellt werden. Bitte kontaktiere deinen Organisationseigentümer, um Unterstützung zu erhalten."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Auf Einträge in deaktivierten Organisationen kann nicht zugegriffen werden. Kontaktiere deinen Organisationseigentümer für Unterstützung."
-  },
   "licenseIsExpired": {
     "message": "Lizenz ist abgelaufen."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO-Kennung"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Gib diese ID deinen Mitgliedern zur Anmeldung über SSO. Um diesen Schritt zu umgehen, aktiviere die ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Gib deinen Mitgliedern diese ID für die Anmeldung mit SSO. Mitglieder können die Eingabe dieser Kennung während des SSO überspringen, wenn eine beanspruchte Domain eingerichtet ist. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Mehr erfahren",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO-Verknüpfung aufheben"
@@ -5518,9 +5809,9 @@
     "message": "Verlangen, dass alle Einträge Eigentum einer Organisation sein müssen, wodurch die Möglichkeit, Einträge auf Kontoebene zu speichern, entfällt.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Alle Einträge sind Eigentum der Organisation und werden in ihr gespeichert, was eine organisationsweite Kontrolle, Sichtbarkeit und Berichterstattung ermöglicht. Wenn diese Funktion aktiviert ist, steht jedem Mitglied eine Standardsammlung zur Verfügung, in der es Einträge speichern kann. Erfahre mehr über die Verwaltung des ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "Alle Einträge sind Eigentum der Organisation und werden dort gespeichert, was organisationsweite Kontrollen, Transparenz und Berichterstellung ermöglicht. Wenn diese Funktion aktiviert ist, steht jedem Mitglied eine Standard-Sammlung zur Speicherung von Einträgen zur Verfügung. Erfahre mehr über die Verwaltung des ",
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "Zugangsdaten-Lebenszyklus",
@@ -5545,6 +5836,65 @@
     "message": "Erfahre mehr über den ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Jetzt verfügbar"
+  },
+  "autoConfirm": {
+    "message": "Automatische Bestätigung neuer Benutzer"
+  },
+  "autoConfirmDescription": {
+    "message": "Neue Benutzer, die in die Organisation eingeladen werden, werden automatisch bestätigt, wenn das Gerät eines Administrators entsperrt wird.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "So aktivierst du die automatische Benutzerbestätigung"
+  },
+  "autoConfirmExtension1": {
+    "message": "Öffne deine Bitwarden-Erweiterung"
+  },
+  "autoConfirmExtension2": {
+    "message": "Wähle",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Einschalten",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Die Bitwarden Browser-Erweiterung wurde erfolgreich geöffnet. Du kannst nun die automatische Benutzerbestätigung aktivieren."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Neue Benutzer, die zur Organisation eingeladen werden, werden automatisch bestätigt, wenn das Gerät eines Administrators entsperrt wird. Bevor du diese Richtlinie aktivierst, lies bitte Folgendes durch und stimme zu: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potenzielles Sicherheitsrisiko. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Eine automatische Benutzerbestätigung könnte ein Sicherheitsrisiko für die Daten deines Unternehmens darstellen."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Erfahre mehr über die Risiken",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Richtlinie einer einzelnen Organisation erforderlich. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Alle Mitglieder dürfen nur dieser Organisation angehören, um diese Automatisierung zu aktivieren."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Die Richtlinie für einzelne Organisationen wird für alle Rollen gelten. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Kein Notfallzugriff. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Der Notfallzugriff wird entfernt."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Ich akzeptiere diese Risiken und Richtlinien-Aktualisierungen"
+  },
   "personalOwnership": {
     "message": "Persönlichen Tresor entfernen"
   },
@@ -5558,10 +5908,10 @@
     "message": "Aufgrund einer Unternehmensrichtlinie darfst du keine Einträge in deinem persönlichen Tresor speichern. Ändere die Eigentümer-Option in eine Organisation und wähle aus den verfügbaren Sammlungen."
   },
   "desktopAutotypePolicy": {
-    "message": "Desktop Autotype Default Setting"
+    "message": "Desktop-Autotype-Standard­einstellung"
   },
   "desktopAutotypePolicyDesc": {
-    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "message": "Aktiviere Desktop-Autotype standardmäßig für Mitglieder. Mitglieder können Autotype im Desktop-Client manuell deaktivieren.",
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
@@ -5597,6 +5947,19 @@
     "message": "Benutzern nicht gestatten, ihre E-Mail-Adresse vor Empfängern zu verstecken, wenn sie ein Send erstellen oder bearbeiten.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Standard URI-Übereinstimmungserkennung"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Lege fest, wann Zugangsdaten für Auto-Ausfüllen vorgeschlagen werden. Administratoren und Eigentümer sind von dieser Richtlinie ausgenommen."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Standard URI-Übereinstimmungserkennung"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Bitte wähle eine gültige URI-Übereinstimmungserkennungs-Option aus.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Richtlinie $ID$ geändert.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Dein Master-Passwort entspricht nicht einer oder mehreren Richtlinien deiner Organisation. Um auf den Tresor zugreifen zu können, musst du dein Master-Passwort jetzt aktualisieren. Wenn du fortfährst, wirst du von deiner aktuellen Sitzung abgemeldet und musst dich erneut anmelden. Aktive Sitzungen auf anderen Geräten können noch bis zu einer Stunde lang aktiv bleiben."
   },
-  "automaticAppLogin": {
-    "message": "Benutzer automatisch bei erlaubten Anwendungen anmelden"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatische Anmeldung mit SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Anmeldeformulare von Apps, die über deinen konfigurierten Identitätsanbieter gestartet wurden, werden automatisch ausgefüllt und abgesendet."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Erweitere die Sicherheit und den Komfort von SSO auf nicht verwaltete Anwendungen. Wenn Benutzer eine Anwendung über Ihren Identitätsanbieter starten, werden deren Anmeldedaten automatisch ausgefüllt und übermittelt, sodass ein sicherer Ablauf mit nur einem Klick vom Identitätsanbieter zur Anwendung entsteht."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identitätsanbieter Host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Deine Organisation hat deine Entschlüsselungsoptionen aktualisiert. Bitte lege ein Master-Passwort fest, um auf deinen Tresor zuzugreifen."
   },
-  "maximumVaultTimeout": {
-    "message": "Tresor-Timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Sitzungs-Timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Konfiguriere ein maximales Tresor-Timeout für alle Benutzer."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Lege ein maximales Sitzungs-Timeout für alle Mitglieder außer für Eigentümer fest."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximales Tresor-Timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximal zulässiges Timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Ungültiger maximaler Tresor-Timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Ein maximal zulässiges Timeout ist erforderlich."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Die Zeit ist ungültig. Ändere mindestens einen Wert."
+  },
+  "sessionTimeoutAction": {
+    "message": "Aktion bei Sitzungs-Timeout"
+  },
+  "immediately": {
+    "message": "Sofort"
+  },
+  "onSystemLock": {
+    "message": "Wenn System gesperrt"
+  },
+  "onAppRestart": {
+    "message": "Beim Neustart der App"
   },
   "hours": {
     "message": "Stunden"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuten"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Bist du sicher, dass du für alle Mitglieder ein maximales Timeout von \"Nie\" zulassen möchtest?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Mit dieser Option werden die Verschlüsselungsschlüssel deiner Mitglieder auf deren Geräten gespeichert. Wenn du diese Option wählst, stelle sicher, dass deren Geräte ausreichend geschützt sind."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Erfahre mehr über den Geräteschutz"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"Wenn System gesperrt\" gilt nur für die Browser-Erweiterung und die Desktop-App"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Die Smartphone und Web-App verwenden \"Beim Neustart der App\" als maximal zulässiges Timeout, da die Option nicht unterstützt wird."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Deine Unternehmensrichtlinien haben das maximal zulässige Tresor-Timeout auf $HOURS$ Stunde(n) und $MINUTES$ Minute(n) festgelegt.",
     "placeholders": {
@@ -6729,7 +7122,7 @@
     "message": "SSO deaktiviert"
   },
   "emailMustLoginWithSso": {
-    "message": "$EMAIL$ must login with Single Sign-on",
+    "message": "$EMAIL$ muss sich mit Single Sign-On anmelden",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Du musst entweder die Basis-Server-URL oder mindestens eine benutzerdefinierte Umgebung hinzufügen."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs müssen HTTPS verwenden."
+  },
   "apiUrl": {
     "message": "API Server-URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Nur der mit $ORGANIZATION$ verknüpfte Organisations-Tresor wird exportiert.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Nur der mit $ORGANIZATION$ verknüpfte Organisations-Tresor wird exportiert. Meine Eintrags-Sammlungen werden nicht eingeschlossen.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Zugriff verweigert. Du hast keine Berechtigung, diese Seite zu sehen."
   },
+  "noPageAccess": {
+    "message": "Du hast keinen Zugriff auf diese Seite"
+  },
   "masterPassword": {
     "message": "Master-Passwort"
   },
@@ -7127,10 +7544,13 @@
     "message": "Unbekannter Eintrag. Du musst möglicherweise eine Berechtigung anfordern, um auf diesen Eintrag zuzugreifen."
   },
   "unknownSecret": {
-    "message": "Unknown secret, you may need to request permission to access this secret."
+    "message": "Unbekanntes Geheimnis, möglicherweise müssen Sie eine Berechtigung anfordern, um auf dieses Geheimnis zuzugreifen."
+  },
+  "unknownServiceAccount": {
+    "message": "Unbekanntes Gerätekonto. Du musst möglicherweise eine Berechtigung anfordern, um auf dieses Gerätekonto zuzugreifen."
   },
   "unknownProject": {
-    "message": "Unknown project, you may need to request permission to access this project."
+    "message": "Unbekanntes Projekt. Du musst möglicherweise eine Berechtigung anfordern, um auf dieses Projekt zuzugreifen."
   },
   "cannotSponsorSelf": {
     "message": "Du kannst nicht für das aktive Konto einlösen. Gib eine andere E-Mail ein."
@@ -7520,7 +7940,7 @@
     "message": "Aus"
   },
   "connected": {
-    "message": "Connected"
+    "message": "Verbunden"
   },
   "members": {
     "message": "Mitglieder"
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Gruppe/Benutzer"
   },
-  "lowKdfIterations": {
-    "message": "Geringe KDF-Iterationen"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Aktualisiere deine Verschlüsselungseinstellungen, um neue Sicherheitsempfehlungen zu erfüllen und den Kontoschutz zu verbessern."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Wenn du fortfährst, wirst du von allen aktiven Sitzungen abgemeldet. Du musst dich erneut anmelden und, falls eingerichtet, die Zwei-Faktor-Authentifizierung durchführen. Wir empfehlen, deinen Tresor zu exportieren, bevor du deine Verschlüsselungseinstellungen änderst, um Datenverluste zu vermeiden."
   },
@@ -8459,7 +8873,7 @@
     }
   },
   "permanentlyDeletedSecretWithId": {
-    "message": "Permanently deleted a secret with identifier: $SECRET_ID$",
+    "message": "Ein Geheimnis mit der Kennung $SECRET_ID$ wurde dauerhaft gelöscht",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8468,7 +8882,7 @@
     }
   },
   "restoredSecretWithId": {
-    "message": "Restored a secret with identifier: $SECRET_ID$",
+    "message": "Ein Geheimnis mit der Kennung $SECRET_ID$ wurde wiederhergestellt",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Auf ein Projekt zugegriffen mit der Kennung: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8495,7 +8909,7 @@
     }
   },
   "nameUnavailableProjectDeleted": {
-    "message": "Deleted project Id: $PROJECT_ID$",
+    "message": "Projekt mit der ID $PROJECT_ID$ gelöscht",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8504,7 +8918,7 @@
     }
   },
   "nameUnavailableSecretDeleted": {
-    "message": "Deleted secret Id: $SECRET_ID$",
+    "message": "Geheimnis mit der ID $SECRET_ID$ gelöscht",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8512,8 +8926,17 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Gelöschtes Gerätekonto mit der Kennung: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
-    "message": "Edited a project with identifier: $PROJECT_ID$",
+    "message": "Ein Projekt mit der Kennung $PROJECT_ID$ bearbeitet",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8521,8 +8944,78 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Benutzer: $USER_ID$ hinzugefügt zu Gerätekonto mit der Kennung: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Benutzer: $USER_ID$ entfernt aus dem Gerätekonto mit der Kennung: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Gruppe: $GROUP_ID$ entfernt aus dem Gerätekonto mit der Kennung: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Gerätekonto erstellt mit der Kennung: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Gruppe: $GROUP_ID$ hinzugefügt zu Gerätekonto mit der Kennung: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Gelöschtes Gerätekonto mit der Kennung: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
-    "message": "Deleted a project with identifier: $PROJECT_ID$",
+    "message": "Ein Projekt mit der Kennung $PROJECT_ID$ gelöscht",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8531,7 +9024,7 @@
     }
   },
   "createdProjectWithId": {
-    "message": "Created a new project with identifier: $PROJECT_ID$",
+    "message": "Ein neues Projekt mit der Kennung $PROJECT_ID$ erstellt",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -9028,23 +9521,23 @@
     "message": "Verwaltung der Sammlungen"
   },
   "collectionManagementDescription": {
-    "message": "Configure the collection behavior for the organization"
+    "message": "Konfiguriere das Sammlungs-Verhalten für die Organisation"
   },
   "allowAdminAccessToAllCollectionItemsDescription": {
-    "message": "Allow owners and admins to manage all collections and items from the Admin Console"
+    "message": "Erlaube Besitzern und Administratoren, alle Sammlungen und Einträge über die Admin-Konsole zu verwalten"
   },
   "restrictCollectionCreationDescription": {
-    "message": "Restrict collection creation to owners and admins"
+    "message": "Beschränke die Erstellung von Sammlungen auf Besitzer und Administratoren"
   },
   "restrictCollectionDeletionDescription": {
-    "message": "Restrict collection deletion to owners and admins"
+    "message": "Beschränke das Löschen von Sammlungen auf Besitzer und Administratoren"
   },
   "restrictItemDeletionDescriptionStart": {
-    "message": "Restrict item deletion to members with the ",
+    "message": "Beschränke das Löschen von Einträgen auf Mitglieder mit der ",
     "description": "This will be used as part of a larger sentence, broken up to allow styling of the middle portion. Full sentence: 'Restrict item deletion to members with the [Manage collection] permission'"
   },
   "restrictItemDeletionDescriptionEnd": {
-    "message": " permission",
+    "message": " Berechtigung",
     "description": "This will be used as part of a larger sentence, broken up to allow styling of the middle portion. Full sentence: 'Restrict item deletion to members with the [Manage collection] permission'"
   },
   "updatedCollectionManagement": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Angemeldet!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Sammlungszugriff zuweisen"
   },
@@ -9124,7 +9614,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "Die Einstellung Sammlungs-Erstellung einschränken wurde für $ID$ aktiviert.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9133,7 +9623,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "Die Einstellung Sammlungs-Erstellung einschränken wurde für $ID$ deaktiviert.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9142,7 +9632,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "Die Einstellung Sammlungs-Löschung einschränken wurde für $ID$ aktiviert.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9151,7 +9641,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "Die Einstellung Sammlungs-Löschung einschränken wurde für $ID$ deaktiviert.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9160,7 +9650,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "Die Einstellung Eintrags-Löschung einschränken wurde für $ID$ aktiviert.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9169,7 +9659,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "Die Einstellung Eintrags-Löschung einschränken wurde für $ID$ deaktiviert.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9178,7 +9668,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Die Einstellung Besitzern und Administratoren erlauben, alle Sammlungen und Einträge zu verwalten wurde für $ID$ aktiviert.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9187,7 +9677,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Die Einstellung Besitzern und Administratoren erlauben, alle Sammlungen und Einträge zu verwalten wurde für $ID$ deaktiviert.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9330,6 +9820,14 @@
     "message": "Zu teuer",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Wechseln zum kostenlosen Tarif",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Wechseln zur kostenlosen Organisation",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Kostenlos für 1 Jahr"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Zuweisen"
   },
+  "assignTasks": {
+    "message": "Aufgaben zuweisen"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Benachrichtigungen zum Ändern von Passwörtern senden"
+  },
   "assignToCollections": {
     "message": "Sammlungen zuweisen"
   },
@@ -9752,11 +10256,17 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Ereignisdaten an deine Logscale-Instanz senden"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Tresor-Ereignisdaten an deine Datadog-Instanz senden"
+  },
   "failedToSaveIntegration": {
     "message": "Fehler beim Speichern der Integration. Bitte versuche es später erneut."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Du musst der Besitzer der Organisation sein, um diese Aktion auszuführen."
+  },
   "failedToDeleteIntegration": {
-    "message": "Failed to delete integration. Please try again later."
+    "message": "Löschen der Integration fehlgeschlagen. Bitte versuche es später erneut."
   },
   "deviceIdMissing": {
     "message": "Geräte-ID fehlt"
@@ -9783,7 +10293,7 @@
     }
   },
   "updateIntegrationButtonDesc": {
-    "message": "Update $INTEGRATION$",
+    "message": "$INTEGRATION$ aktualisieren",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9855,13 +10365,13 @@
     "message": "Bearer-Token"
   },
   "repositoryNameHint": {
-    "message": "Name of the repository to ingest into"
+    "message": "Name des Codespeichers, in den importiert werden soll"
   },
   "index": {
     "message": "Index"
   },
   "selectAPlan": {
-    "message": "Ein Abo auswählen"
+    "message": "Einen Tarif auswählen"
   },
   "thirtyFivePercentDiscount": {
     "message": "35% Rabatt"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Geringe KDF-Iterationen. Erhöhe deine Iterationen, um die Sicherheit deines Kontos zu steigern."
-  },
-  "changeKDFSettings": {
-    "message": "KDF-Einstellungen ändern"
-  },
   "secureYourInfrastructure": {
     "message": "Sichere deine Infrastruktur"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Aus"
   },
-  "higherKDFIterations": {
-    "message": "Höhere KDF-Iterationen können helfen, dein Master-Passwort vor Brute-Force-Attacken durch einen Angreifer zu schützen."
-  },
-  "incrementsOf100,000": {
-    "message": "Schritten von 100.000"
-  },
-  "smallIncrements": {
-    "message": "kleinen Schritten"
-  },
   "kdfIterationRecommends": {
     "message": "Wir empfehlen 600.000 oder mehr"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Auf älteren Geräten kann es durch zu hohe KDF-Iterationen zu Leistungsproblemen kommen. Erhöhe den Wert in $VALUE$ und teste es auf deinen Geräten.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Kontaktiere den Kundensupport, um dein Abonnement wiederherzustellen."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain beansprucht"
   },
+  "itemAddedToFavorites": {
+    "message": "Eintrag zu Favoriten hinzugefügt"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Eintrag aus Favoriten entfernt"
+  },
+  "copyNote": {
+    "message": "Notiz kopieren"
+  },
   "organizationNameMaxLength": {
     "message": "Der Name der Organisation darf 50 Zeichen nicht überschreiten."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Die Bitwarden Browser-Erweiterung wurde erfolgreich geöffnet. Du kannst jetzt deine gefährdeten Passwörter überprüfen."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Wir hatten Probleme beim Öffnen der Bitwarden-Browser-Erweiterung. Öffne das Bitwarden-Symbol",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "in der Symbolleiste.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Dein Abonnement wird bald verlängert. Um einen ununterbrochenen Betrieb zu gewährleisten, kontaktiere $RESELLER$ um deine Verlängerung vor dem $RENEWAL_DATE$ zu bestätigen.",
     "placeholders": {
@@ -10995,10 +11482,10 @@
     "message": "Gefährdetes Passwort ändern"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Diese Zugangsdaten sind gefährdet und es fehlt eine Website. Füge eine Website hinzu und ändere das Passwort für mehr Sicherheit."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Fehlende Webseite"
   },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Entsperren mit PIN entfernen"
@@ -11016,22 +11503,62 @@
     "message": "Diese Ereignisse sind nur Beispiele und spiegeln keine realen Ereignisse in deiner Bitwarden-Organisation wider."
   },
   "viewEvents": {
-    "message": "View Events"
+    "message": "Ereignisse anzeigen"
   },
   "cannotCreateCollection": {
     "message": "Kostenlose Organisationen können bis zu 2 Sammlungen haben. Upgrade auf ein kostenpflichtiges Abo, um mehr Sammlungen hinzuzufügen."
   },
   "searchArchive": {
-    "message": "Search archive"
+    "message": "Archiv durchsuchen"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archivieren",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Nicht mehr archivieren"
+  },
+  "itemsInArchive": {
+    "message": "Einträge im Archiv"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Keine Einträge im Archiv"
   },
-  "archivedItemsDescription": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  "noItemsInArchiveDesc": {
+    "message": "Archivierte Einträge werden hier angezeigt und von allgemeinen Suchergebnissen und Auto-Ausfüllen-Vorschlägen ausgeschlossen."
+  },
+  "itemWasSentToArchive": {
+    "message": "Eintrag wurde ins Archiv verschoben"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Einträge wurden ins Archiv verschoben"
+  },
+  "itemUnarchived": {
+    "message": "Eintrag wird nicht mehr archiviert"
+  },
+  "bulkArchiveItems": {
+    "message": "Einträge archiviert"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Eintrag nicht mehr archiviert"
+  },
+  "archiveItem": {
+    "message": "Eintrag archivieren",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archivierte Einträge werden von allgemeinen Suchergebnissen und Auto-Ausfüllen-Vorschlägen ausgeschlossen. Bist du sicher, dass du diesen Eintrag archivieren möchtest?"
+  },
+  "archiveBulkItems": {
+    "message": "Einträge archivieren",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archivierte Einträge werden von allgemeinen Suchergebnissen und Auto-Ausfüllen-Vorschlägen ausgeschlossen. Bist du sicher, dass du diese Einträge archivieren möchtest?"
   },
   "businessUnit": {
     "message": "Geschäftsbereich"
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden-Erweiterung installiert!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden-Erweiterung wurde installiert!"
+  },
   "openExtensionToAutofill": {
     "message": "Öffne die Erweiterung, um dich anzumelden und Auto-Ausfüllen zu nutzen."
   },
@@ -11154,6 +11684,14 @@
     "message": "Lernzentrum",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Falls sich die Erweiterung nicht geöffnet hat, musst du möglicherweise Bitwarden über das Symbol ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " in der Symbolleiste öffnen.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Hilfezentrum",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11188,10 +11726,10 @@
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Über diese Einstellung"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden verwendet gespeicherte Zugangsdaten-URIs, um zu bestimmen, welches Symbol oder welche Passwort-Ändern-URL verwendet werden soll, um dein Erlebnis zu verbessern. Es werden keine Informationen erfasst oder gespeichert, wenn du diesen Dienst nutzt."
   },
   "billingAddress": {
     "message": "Rechnungsadresse"
@@ -11311,7 +11849,7 @@
     "message": "Maßnahme erforderlich: In den Zahlungsdetails fehlt eine Steueridentifikationsnummer. Wenn keine Steuernummer hinzugefügt wird, können deine Rechnungen zusätzliche Steuern enthalten."
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "Weitere Navigationspfade",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "addTaxId": {
@@ -11355,46 +11893,46 @@
     }
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Key Connector-Domain bestätigen"
   },
   "requiredToVerifyBankAccountWithStripe": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "Zahlungen mit einem Bankkonto sind nur für Kunden in den Vereinigten Staaten verfügbar. Du musst dein Bankkonto verifizieren. Wir werden innerhalb der nächsten 1–2 Werktage eine geringfügige Einzahlung vornehmen. Wenn das Bankkonto nicht verifiziert wird, führt dies zu einer verpassten Zahlung und dein Abonnement wird ausgesetzt."
   },
   "verifyBankAccountWithStripe": {
-    "message": "We have made a micro-deposit to your bank account. This may take 1-2 business days. When you see the deposit in your account, you can verify your bank account. Failure to verify your bank account will result in a missed payment and your subscription will be suspended."
+    "message": "Wir haben eine geringfügige Einzahlung auf dein Bankkonto vorgenommen. Dies kann 1–2 Werktage dauern. Sobald du die Einzahlung auf deinem Konto siehst, kannst du dein Bankkonto verifizieren. Wenn das Bankkonto nicht verifiziert wird, führt dies zu einer verpassten Zahlung und dein Abonnement wird ausgesetzt."
   },
   "verifyNow": {
-    "message": "Verify now."
+    "message": "Jetzt verifizieren."
   },
   "additionalStorageGB": {
-    "message": "Additional storage GB"
+    "message": "Zusätzlicher Speicher GB"
   },
   "additionalServiceAccountsV2": {
-    "message": "Additional machine accounts"
+    "message": "Zusätzliche Gerätekonten"
   },
   "secretsManagerSeats": {
-    "message": "Secrets Manager seats"
+    "message": "Secrets-Manager-Plätze"
   },
   "additionalStorage": {
-    "message": "Additional Storage"
+    "message": "Zusätzlicher Speicher"
   },
   "expandPurchaseDetails": {
-    "message": "Expand purchase details"
+    "message": "Kaufdetails erweitern"
   },
   "collapsePurchaseDetails": {
-    "message": "Collapse purchase details"
+    "message": "Kaufdetails einklappen"
   },
   "familiesMembership": {
-    "message": "Families membership"
+    "message": "Families-Mitgliedschaft"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Umfassende Online-Sicherheit"
   },
   "planDescFamiliesV2": {
-    "message": "Premium security for your family"
+    "message": "Premium-Sicherheit für deine Familie"
   },
   "planDescFreeV2": {
-    "message": "Share with $COUNT$ other user",
+    "message": "Mit $COUNT$ anderen Benutzer teilen",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11403,37 +11941,37 @@
     }
   },
   "planDescEnterpriseV2": {
-    "message": "Advanced capabilities for any organization"
+    "message": "Erweiterte Funktionen für jede Organisation"
   },
   "planNameCustom": {
-    "message": "Custom plan"
+    "message": "Individueller Plan"
   },
   "planDescCustom": {
-    "message": "Bitwarden scales with businesses of all sizes to secure passwords and sensitive information. If you're part of a large enterprise, contact sales to request a quote."
+    "message": "Bitwarden wächst mit Unternehmen jeder Größe mit, um Passwörter und vertrauliche Informationen zu sichern. Wenn du Teil eines großen Unternehmens bist, kontaktiere den Vertrieb, um ein Angebot anzufordern."
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "Integrierter Authenticator"
   },
   "breachMonitoring": {
-    "message": "Breach monitoring"
+    "message": "Datenpannen-Überwachung"
   },
   "andMoreFeatures": {
-    "message": "And more!"
+    "message": "Und mehr!"
   },
   "secureFileStorage": {
-    "message": "Secure file storage"
+    "message": "Sicherer Dateispeicher"
   },
   "familiesUnlimitedSharing": {
-    "message": "Unlimited sharing - choose who sees what"
+    "message": "Unbegrenztes Teilen – wähle, wer was sieht"
   },
   "familiesUnlimitedCollections": {
-    "message": "Unlimited family collections"
+    "message": "Unbegrenzte Familiensammlungen"
   },
   "familiesSharedStorage": {
-    "message": "Shared storage for important family info"
+    "message": "Gemeinsamer Speicher für wichtige Familieninformationen"
   },
   "limitedUsersV2": {
-    "message": "Up to $COUNT$ members",
+    "message": "Bis zu $COUNT$ Mitglieder",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11442,7 +11980,7 @@
     }
   },
   "limitedCollectionsV2": {
-    "message": "Up to $COUNT$ collections",
+    "message": "Bis zu $COUNT$ Sammlungen",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11451,13 +11989,13 @@
     }
   },
   "alwaysFree": {
-    "message": "Always free"
+    "message": "Immer kostenlos"
   },
   "twoSecretsIncluded": {
-    "message": "2 secrets"
+    "message": "2 Geheimnisse"
   },
   "projectsIncludedV2": {
-    "message": "$COUNT$ project(s)",
+    "message": "$COUNT$ Projekt(e)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11466,13 +12004,13 @@
     }
   },
   "secureItemSharing": {
-    "message": "Secure item sharing"
+    "message": "Sicheres Teilen von Einträgen"
   },
   "scimSupport": {
-    "message": "SCIM support"
+    "message": "SCIM-Unterstützung"
   },
   "includedMachineAccountsV2": {
-    "message": "$COUNT$ machine accounts",
+    "message": "$COUNT$ Gerätekonten",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11481,21 +12019,160 @@
     }
   },
   "enterpriseSecurityPolicies": {
-    "message": "Enterprise security policies"
+    "message": "Sicherheitsrichtlinien für Unternehmen"
   },
   "selfHostOption": {
-    "message": "Self-host option"
+    "message": "Selbsthosting-Option"
   },
   "complimentaryFamiliesPlan": {
-    "message": "Complimentary families plan for all users"
+    "message": "Kostenloser Families-Plan für alle Benutzer"
   },
   "strengthenCybersecurity": {
-    "message": "Strengthen cybersecurity"
+    "message": "Cybersicherheit stärken"
   },
   "boostProductivity": {
-    "message": "Boost productivity"
+    "message": "Produktivität steigern"
   },
   "seamlessIntegration": {
-    "message": "Seamless integration"
+    "message": "Nahtlose Integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade auf Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade auf Premium"
+  },
+  "familiesUpdated": {
+    "message": "Du hast ein Upgrade auf Families durchgeführt!"
+  },
+  "taxCalculationError": {
+    "message": "Es gab einen Fehler bei der Berechnung der Steuer für deinen Standort. Bitte versuche es erneut."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Willkommen bei Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Schalte mehr Sicherheitsfunktionen mit Premium frei oder teile Einträge mit Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Die Preise enthalten keine Steuern und werden jährlich in Rechnung gestellt."
+  },
+  "organizationNameDescription": {
+    "message": "Dein Organisationsname wird in Einladungen angezeigt, die du an Mitglieder sendest."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Fortfahren, ohne ein Upgrade durchzuführen"
+  },
+  "upgradeYourPlan": {
+    "message": "Tarif upgraden"
+  },
+  "upgradeNow": {
+    "message": "Jetzt upgraden"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Durch das Ausfüllen dieses Formulars wird eine neue Families-Organisation erstellt. Du kannst deine kostenlose Organisation über die Administrator-Konsole upgraden."
+  },
+  "upgradeErrorMessage": {
+    "message": "Bei der Verarbeitung deines Upgrades ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Du nutzt den Bitwarden Free-Tarif"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade für umfassende Sicherheit"
+  },
+  "viewbusinessplans": {
+    "message": "Unternehmens-Tarife anzeigen"
+  },
+  "updateEncryptionSettings": {
+    "message": "Verschlüsselungseinstellungen aktualisieren"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Aktualisiere deine Verschlüsselungseinstellungen"
+  },
+  "updateSettings": {
+    "message": "Einstellungen aktualisieren"
+  },
+  "algorithm": {
+    "message": "Algorithmus"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Wähle aus, wie Bitwarden deine Tresordaten verschlüsseln soll. Alle Optionen sind sicher, aber stärkere Methoden bieten besseren Schutz - vor allem gegen Brute-Force-Angriffe. Bitwarden empfiehlt die Standardeinstellung für die meisten Benutzer."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Die Erhöhung der Werte über den Standard hinaus wird die Sicherheit verbessern, aber es kann dann länger dauern, bis dein Tresor entsperrt wird."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Über Verschlüsselungsalgorithmen"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 ist eine bewährte Verschlüsselungsmethode, die Sicherheit und Leistung in einem ausgewogenen Verhältnis vereint. Gut für alle Benutzer."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id bietet einen stärkeren Schutz gegen moderne Attacken. Am besten geeignet für fortgeschrittene Benutzer mit leistungsstarken Geräten."
+  },
+  "zipPostalCodeLabel": {
+    "message": "PLZ / Postleitzahl"
+  },
+  "cardNumberLabel": {
+    "message": "Kartennummer"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Kostenlose Families-Testversion starten"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Erstellung von Konten für beanspruchte Domains blockieren"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Verhindere, dass Benutzer außerhalb deiner Organisation Konten mit E-Mail-Adressen aus beanspruchten Domains erstellen."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Vor der Aktivierung dieser Richtlinie muss eine Domain beansprucht werden."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Richte eine Entsperrmethode ein, um deine Aktion bei Tresor-Timeout zu ändern."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Die Unternehmens-Richtlinienanforderungen wurden auf deine Timeout-Optionen angewendet"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Dein Tresor-Timeout überschreitet die von deinem Unternehmen festgelegten Beschränkungen."
+  },
+  "neverLockWarning": {
+    "message": "Bist du sicher, dass du die Option \"Nie\" verwenden möchtest? Durch das Setzen der Sperroptionen zu \"Nie\" wird der Verschlüsselungsschlüssel deines Tresors auf deinem Gerät gespeichert. Wenn du diese Option verwendest, solltest du sicherstellen, dass dein Gerät ausreichend geschützt ist."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout-Aktion"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sitzungs-Timeout"
+  },
+  "appearance": {
+    "message": "Aussehen"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Das Timeout überschreitet die von deiner Organisation festgelegte Beschränkung: Maximal $HOURS$ Stunde(n) und $MINUTES$ Minute(n)",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Es sind keine kritischen Anwendungen ausgewählt"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Bist du sicher, dass du fortfahren möchtest?"
+  },
+  "userVerificationFailed": {
+    "message": "Benutzerverifizierung fehlgeschlagen."
   }
 }
diff --git a/apps/web/src/locales/el/messages.json b/apps/web/src/locales/el/messages.json
index 0c876ddd282..3a23bb286ea 100644
--- a/apps/web/src/locales/el/messages.json
+++ b/apps/web/src/locales/el/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Πληροφορίες Πρόσβασης"
   },
-  "riskInsights": {
-    "message": "Insights Κινδύνου"
-  },
   "passwordRisk": {
     "message": "Ρίσκος Κωδικού Πρόσβασης"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Ελέξτε τους κωδικούς πρόσβασης (αδύναμους, εκτεθειμένους ή επαναχρησιμοποιούμενους) σε όλες τις εφαρμογές. Επιλέξτε τις πιο κρίσιμες εφαρμογές σας για να δώσετε προτεραιότητα στις ενέργειες ασφαλείας για τους χρήστες σας ώστε να αντιμετωπίσουν τους εκτεθειμένους κωδικούς πρόσβασης."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Τελευταία ενημέρωση δεδομένων: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Ειδοποιημένα μέλη"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Κρίσιμες εφαρμογές ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Ειδοποιημένα μέλη ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Εφαρμογή"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Σύνολο εφαρμογών"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Αγαπημένα"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Τύποι"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Κρατήστε αυτό το παράθυρο ανοιχτό και ακολουθήστε τις οδηγίες απ' τον περιηγητή σας."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Χρήση διαφορετικής μεθόδου σύνδεσης"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Χρήση καθολικής σύνδεσης"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Καλώς ορίσατε και πάλι"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Μη έγκυρος κύριος κωδικός πρόσβασης"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Μη έγκυρος κωδικός πρόσβασης αρχείου, χρησιμοποιήστε τον κωδικό πρόσβασης που καταχωρήσατε όταν δημιουργήσατε το αρχείο εξαγωγής."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Δεν υπάρχουν στοιχεία στη λίστα."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Δεν έχετε άδεια να δείτε όλα τα στοιχεία σε αυτήν τη συλλογή."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Ρυθμίσεις Κλειδιού Κρυπτογράφησης"
   },
-  "kdfAlgorithm": {
-    "message": "Αλγόριθμος KDF"
-  },
   "kdfIterations": {
     "message": "Επαναλήψεις KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Οι περισσότερες επαναλήψεις KDF, η μνήμη και ο παραλληλισμός μπορούν να συμβάλουν στην προστασία του κύριου κωδικού πρόσβασής σας από επιθέσεις τύπου «brute force»."
   },
-  "changeKdf": {
-    "message": "Αλλαγή KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Οι Ρυθμίσεις του Κλειδιού Κρυπτογράφησης Αλλαξαν"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Βεβαιωθείτε ότι ο λογαριασμός σας έχει αρκετές μονάδες για αυτήν την αγορά. Αν ο λογαριασμός σας δεν διαθέτει αρκετές μονάδες, θα χρησιμοποιηθεί η προκαθορισμένη μέθοδος πληρωμής για τη διαφορά. Μπορείτε να προσθέσετε μονάδες στο λογαριασμό σας από τη σελίδα Χρέωσης."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Οι μονάδες του λογαριασμού σας, μπορούν να χρησιμοποιηθούν για να κάνετε αγορές. Κάθε διαθέσιμη μονάδα θα εφαρμοστεί αυτόματα στα παραστατικά που δημιουργούνται για αυτόν το λογαριασμό."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Επόμενη Χρέωση"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Λεπτομέρειες"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Λήψη Άδειας"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Ενημερώστε τον Browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Χρησιμοποιείτε ένα μη υποστηριζόμενο browser. Το web vault ενδέχεται να μην λειτουργεί σωστά."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Η Πρόσκληση έγινε αποδεκτή"
   },
-  "inviteAcceptedDesc": {
-    "message": "Μπορείτε να αποκτήσετε πρόσβαση σε αυτόν τον οργανισμό μόλις ο διαχειριστής σας επιβεβαιώσει την ιδιότητα μέλους. Θα σας στείλουμε ένα email όταν αυτό συμβεί."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Ο οργανισμός είναι απενεργοποιημένος."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "Η άδεια χρήσης έληξε."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Αναγνωριστικό SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Δώστε αυτό το αναγνωριστικό στα μέλη σας για να συνδεθείτε με SSO. Για να παρακάμψετε αυτό το βήμα, ρυθμίστε την ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Αποσύνδεση SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Προσωπική Ιδιοκτησία"
   },
@@ -5597,6 +5947,19 @@
     "message": "Μην επιτρέπετε στους χρήστες να αποκρύψουν τη διεύθυνση email τους από τους παραλήπτες κατά τη δημιουργία ή την επεξεργασία ενός send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Τροποποιημένη πολιτική $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ο κύριος κωδικός πρόσβασής σας δεν πληροί μία ή περισσότερες πολιτικές του οργανισμού σας. Για να αποκτήσετε πρόσβαση στην κρύπτη, πρέπει να ενημερώσετε τον κύριο κωδικό πρόσβασής σας τώρα. Η διαδικασία αυτή θα σας αποσυνδέσει από την τρέχουσα συνεδρία σας, απαιτώντας από εσάς να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να παραμείνουν ενεργές για μία ώρα."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Οι φόρμες σύνδεσης θα συμπληρώνονται αυτόματα και θα υποβάλλονται για τις εφαρμογές που εκκινούνται από τον καθορισμένο πάροχο ταυτότητάς σας."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Χρόνος Λήξης Vault"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Ρύθμιση μέγιστου χρονικού ορίου vault για όλους τους χρήστες."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Μέγιστο Χρονικό Όριο Vault"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Μη Έγκυρο Μέγιστο Χρονικό Όριο Vault."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Ώρες"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Λεπτά"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Οι πολιτικές του οργανισμού σας επηρεάζουν το χρονικό όριο vault σας. Το μέγιστο επιτρεπόμενο Χρονικό όριο Vault είναι $HOURS$ ώρα(ες) και $MINUTES$ λεπτό(ά)",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "URL διακομιστή API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Κύριος κωδικός πρόσβασης"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Ομάδα/Χρήστης"
   },
-  "lowKdfIterations": {
-    "message": "Λίγες επαναλήψεις KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Ενημερώστε τις ρυθμίσεις κρυπτογράφησής σας για να ανταποκριθείτε στις νέες συστάσεις ασφαλείας και να βελτιώσετε την προστασία του λογαριασμού."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Έχετε συνδεθεί!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Ανάθεση πρόσβασης συλλογής"
   },
@@ -9330,6 +9820,14 @@
     "message": "Πολύ ακριβό",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Δωρεάν για 1 χρόνο"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Ανάθεση"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Ανάθεση σε συλλογές"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Λίγες επαναλήψεις KDF. Αυξήστε τις επαναλήψεις σας για να βελτιώσετε την ασφάλεια του λογαριασμού σας."
-  },
-  "changeKDFSettings": {
-    "message": "Αλλαγή ρυθμίσεων KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Ασφαλίστε την υποδομή σας"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Ανενεργή"
   },
-  "higherKDFIterations": {
-    "message": "Οι περισσότερες επαναλήψεις KDF μπορούν να συμβάλουν στην προστασία του κύριου κωδικού πρόσβασής σας από επιθέσεις τύπου «brute force»."
-  },
-  "incrementsOf100,000": {
-    "message": "προσαυξήσεις των 100.000"
-  },
-  "smallIncrements": {
-    "message": "μικρές προσαυξήσεις"
-  },
   "kdfIterationRecommends": {
     "message": "Προτείνουμε 600.000 ή περισσότερα"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Για τις παλαιότερες συσκευές, η επιλογή πάρα πολλών επαναλήψεων KDF ενδέχεται να προκαλέσει ζητήματα επιδόσεων. Αυξήστε την τιμή σε $VALUE$ και δοκιμάστε τις συσκευές σας.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index b4ad8f2b2b2..90468c61d5c 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -11,21 +11,24 @@
   "criticalApplications": {
     "message": "Critical applications"
   },
-  "noCriticalAppsAtRisk":{
+  "noCriticalAppsAtRisk": {
     "message": "No critical applications at risk"
   },
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription":{
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1558,7 +1809,6 @@
       }
     }
   },
-
   "dontAskAgainOnThisDeviceFor30Days": {
     "message": "Don't ask again on this device for 30 days"
   },
@@ -1929,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1966,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -1985,22 +2229,22 @@
     "message": "Proceeding will also log you out of your current session, requiring you to log back in. You will also be prompted for two-step login again, if set up. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "newDeviceLoginProtection": {
-    "message":"New device login"
+    "message": "New device login"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message":"Turn off new device login protection"
+    "message": "Turn off new device login protection"
   },
   "turnOnNewDeviceLoginProtection": {
-    "message":"Turn on new device login protection"
+    "message": "Turn on new device login protection"
   },
   "turnOffNewDeviceLoginProtectionModalDesc": {
-    "message":"Proceed below to turn off the verification emails bitwarden sends when you login from a new device."
+    "message": "Proceed below to turn off the verification emails bitwarden sends when you login from a new device."
   },
   "turnOnNewDeviceLoginProtectionModalDesc": {
-    "message":"Proceed below to have bitwarden send you verification emails when you login from a new device."
+    "message": "Proceed below to have bitwarden send you verification emails when you login from a new device."
   },
   "turnOffNewDeviceLoginProtectionWarning": {
-    "message":"With new device login protection turned off, anyone with your master password can access your account from any device. To protect your account without verification emails, set up two-step login."
+    "message": "With new device login protection turned off, anyone with your master password can access your account from any device. To protect your account without verification emails, set up two-step login."
   },
   "accountNewDeviceLoginProtectionSaved": {
     "message": "New device login protection changes saved"
@@ -2136,7 +2380,7 @@
   "selectImportCollection": {
     "message": "Select a collection"
   },
-    "importTargetHintCollection": {
+  "importTargetHintCollection": {
     "message": "Select this option if you want the imported file contents moved to a collection"
   },
   "importTargetHintFolder": {
@@ -2799,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2997,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+   "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4207,8 +4463,36 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4292,8 +4576,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4776,6 +5060,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4788,9 +5078,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5164,9 +5451,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5522,11 +5813,11 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
-  "organizationDataOwnershipContentAnchor":{
+  "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
     "description": "This will be used as a hyperlink"
   },
@@ -5549,6 +5840,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5601,6 +5951,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+    "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6254,11 +6617,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6269,17 +6632,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6287,6 +6665,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6828,6 +7221,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6979,9 +7375,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7133,6 +7550,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8380,12 +8800,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8489,8 +8903,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-  "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+  "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8515,6 +8929,15 @@
         "example": "4d34e8a8"
       }
     }
+  },
+  "nameUnavailableServiceAccountDeleted": {
+  "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
   },
    "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
@@ -8524,6 +8947,76 @@
         "example": "4d34e8a8"
       }
     }
+  },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
   },
    "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
@@ -9081,9 +9574,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9252,7 +9742,7 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
-     "uriMatchDefaultStrategyHint": {
+    "uriMatchDefaultStrategyHint": {
     "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
@@ -9334,6 +9824,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9361,6 +9859,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9756,6 +10260,9 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
@@ -10003,12 +10510,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10106,27 +10607,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10769,6 +11252,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10802,7 +11294,7 @@
   "orgTrustWarning1": {
     "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
   },
-  "trustUser":{
+  "trustUser": {
     "message": "Trust user"
   },
   "sshKeyWrongPassword": {
@@ -10838,7 +11330,7 @@
   "openingExtension": {
     "message": "Opening the Bitwarden browser extension"
   },
-  "somethingWentWrong":{
+  "somethingWentWrong": {
     "message": "Something went wrong..."
   },
   "openingExtensionError": {
@@ -10859,14 +11351,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -10925,7 +11409,7 @@
       }
     }
   },
-  "accountDeprovisioningNotification" : {
+  "accountDeprovisioningNotification": {
     "message": "Administrators now have the ability to delete member accounts that belong to a claimed domain."
   },
   "deleteManagedUserWarningDesc": {
@@ -11016,14 +11500,14 @@
   "upgradeForFullEventsMessage": {
     "message": "Event logs are not stored for your organization. Upgrade to a Teams or Enterprise plan to get full access to organization event logs."
   },
-  "upgradeEventLogTitleMessage" : {
-    "message" : "Upgrade to see event logs from your organization."
+  "upgradeEventLogTitleMessage": {
+    "message": "Upgrade to see event logs from your organization."
   },
-  "upgradeEventLogMessage":{
-    "message" : "These events are examples only and do not reflect real events within your Bitwarden organization."
+  "upgradeEventLogMessage": {
+    "message": "These events are examples only and do not reflect real events within your Bitwarden organization."
   },
-  "viewEvents":{
-    "message" : "View Events"
+  "viewEvents": {
+    "message": "View Events"
   },
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
@@ -11031,15 +11515,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11147,6 +11671,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11161,6 +11688,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11296,14 +11831,14 @@
       }
     }
   },
-   "unlimitedSecretsAndProjects": {
+  "unlimitedSecretsAndProjects": {
     "message": "Unlimited secrets and projects"
   },
-   "providersubscriptionCanceled": {
+  "providersubscriptionCanceled": {
     "message": "Subscription canceled"
   },
   "providersubCanceledmessage": {
-    "message" : "To resubscribe, contact Bitwarden Customer Support."
+    "message": "To resubscribe, contact Bitwarden Customer Support."
   },
   "showMore": {
     "message": "Show more"
@@ -11504,5 +12039,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json
index edf4b59c5bd..643601f54fe 100644
--- a/apps/web/src/locales/en_GB/messages.json
+++ b/apps/web/src/locales/en_GB/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritise security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organisation's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organisation will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organisation secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organisation has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organisation's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritise critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organisation. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favourites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organisation requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in the bin"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favourited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favourites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings changed"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download licence"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analysing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organisation once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organisation."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisation suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organisation is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organisations cannot be accessed. Contact your organisation owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organisations cannot be accessed. Please contact your organisation owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organisations. Please contact your organisation owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organisations cannot be accessed. Contact your organisation owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "Licence is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "message": "Require all items to be owned by an organisation, 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 organisation, enabling organisation-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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organisation, enabling organisation-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organisation will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organisation will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organisation’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organisation policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organisation to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organisation policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organisation policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organisation has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organisation policies are affecting your vault timeout. Maximum allowed vault timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organisation",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organisation owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favourites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favourites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organisation name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Centre",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Centre",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organisation name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organisation. You can upgrade your Free organisation from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside your organisation using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organisation."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organisation: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/en_IN/messages.json b/apps/web/src/locales/en_IN/messages.json
index ed092371092..29271d771d2 100644
--- a/apps/web/src/locales/en_IN/messages.json
+++ b/apps/web/src/locales/en_IN/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritise security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organisation's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organisation will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organisation secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organisation has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organisation's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritise critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organisation. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favourites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organisation requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in the bin"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favourited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favourites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings changed"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download licence"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analysing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organisation once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organisation."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisation is disabled."
   },
+  "organizationIsSuspended": {
+    "message": "Organisation is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organisations cannot be accessed. Contact your organisation owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organisations cannot be accessed. Please contact your organisation owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organisations. Please contact your organisation owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organisations cannot be accessed. Contact your organisation owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "Licence is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "message": "Require all items to be owned by an organisation, 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 organisation, enabling organisation-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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organisation, enabling organisation-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organisation will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organisation will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organisation’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organisation policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organisation to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organisation policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Personal Ownership"
   },
@@ -5597,6 +5947,19 @@
     "message": "Do not allow users to hide their email address from recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organisation policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organisation has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organisation policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organisation",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organisation owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favourites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favourites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organisation name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Centre",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Centre",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organisation name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organisation. You can upgrade your Free organisation from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "PIN"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside your organisation using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organisation."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organisation: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/eo/messages.json b/apps/web/src/locales/eo/messages.json
index 39ee969de3b..da4490d0495 100644
--- a/apps/web/src/locales/eo/messages.json
+++ b/apps/web/src/locales/eo/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Sciigitaj membroj"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Krei novan salutan eron"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Sciigitaj membroj ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Aplikaĵo"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoratoj"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tipoj"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Uzi diferentan motodon salutan"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Bonrevenon"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Nevalida majstra pasvorto"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Nevalida pasvorto de la dosiero, bonvolu uzi la pasvorton, kiun vi enmetis kiam vi kreis la elportan dosieron."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Estas neniu ero por listi"
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Agordoj pri ĉifra ŝlosilo"
   },
-  "kdfAlgorithm": {
-    "message": "KDF-Algoritmo"
-  },
   "kdfIterations": {
     "message": "KDF-Ripetoj"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Ŝanĝi KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Ŝanĝaj Ŝlosilaj Agordoj Ŝanĝiĝis"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Bonvolu certigi, ke via konto havas sufiĉe da kredito havebla por ĉi tiu aĉeto. Se via konto ne havas sufiĉe da kredito havebla, via defaŭlta pagmaniero uzata por la diferenco. Vi povas aldoni krediton al via konto de la Faktura paĝo. "
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "La kredito de via konto povas esti uzata por aĉeti. Ĉiu havebla kredito aŭtomate aplikiĝos al fakturoj generitaj por ĉi tiu konto."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Sekva Akuzo"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detaloj"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Elŝuti Permesilon"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Ĝisdatigi retumilon"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Vi uzas nesubtenatan tTT-legilon. La ttt-volbo eble ne funkcias ĝuste."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invito Akceptita"
   },
-  "inviteAcceptedDesc": {
-    "message": "Vi povas aliri ĉi tiun organizon post kiam administranto konfirmos vian membrecon. Ni sendos al vi retpoŝton kiam tio okazos."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "La organizo suspendiĝis"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "Licenco eksvalidiĝis."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Malkonekti SSO-n"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Persona Posedo"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Tempolimo de trezorejo"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Horoj"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutoj"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Ĉefa pasvorto"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grupo/Uzanto"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Jam salutis!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Ŝanĝi agordojn pri KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Malŝaltita"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "el la ilarbreto",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/es/messages.json b/apps/web/src/locales/es/messages.json
index 7d76870ddc6..ac5ca868b0f 100644
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Inteligencia de Acceso"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Riesgo de contraseña"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Miembros notificados"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Crear nuevo elemento de inicio de sesión"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Aplicaciones críticas ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Miembros notificados ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No se encontraron aplicaciones en $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Aplicación"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total de aplicaciones"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoritos"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tipos"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Mantenga esta ventana abierta y siga las instrucciones de su navegador."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Utilizar otro método de inicio de sesión"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Usar inicio de sesión único"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Bienvenido de nuevo"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Contraseña maestra no válida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Contraseña de archivo no válida, por favor utilice la contraseña que introdujo cuando creó el archivo de exportación."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "No hay elementos que listar."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "No tiene los permisos para ver todos los elementos de esta colección."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Configuración de clave de cifrado"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritmo KDF"
-  },
   "kdfIterations": {
     "message": "Iteraciones de KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Las iteraciones, memorias y paralelismos de KDF más altos pueden ayudar a proteger su contraseña maestra de ser calculada por un atacante."
   },
-  "changeKdf": {
-    "message": "Modificar KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Se cambió la configuración de clave de cifrado"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Por favor, asegúrese de que su cuenta tiene suficiente crédito disponible para esta compra. Si su cuenta no tiene suficiente crédito disponible, su método de pago por defecto se utilizará para la diferencia. Puede agregar crédito a su cuenta desde la página de facturación."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "El crédito de su cuenta puede utilizarse para realizar compras. Cualquier crédito disponible se aplicará automáticamente a las facturas generadas para esta cuenta."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Siguiente cobro"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detalles"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Descargar licencia"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Actualizar navegador"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Está utilizando un navegador web no compatible. Es posible que la caja fuerte web no funcione correctamente."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitación Aceptada"
   },
-  "inviteAcceptedDesc": {
-    "message": "Puede acceder a esta organización una vez que un administrador confirme su membresía. Te enviaremos un correo electrónico cuando eso suceda."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Ahora puede acceder a esta organización."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "La organización está desactivada."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "No se puede acceder a las organizaciones suspendidas. Póngase en contacto con el propietario de su organización para obtener ayuda."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "No se pueden crear cuentas de servicio en organizaciones suspendidas. Póngase en contacto con el propietario de su organización para obtener ayuda."
   },
-  "disabledOrganizationFilterError": {
-    "message": "No se puede acceder a los elementos que pertenecen a organizaciones que estén deshabilitadas. Por favor, póngase en contacto con el propietario de la organización para obtener ayuda."
-  },
   "licenseIsExpired": {
     "message": "Licencia expirada."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Identificador SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Proporcione este ID a sus miembros para iniciar sesión con SSO. Para evitar este paso, configure ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Desenlazar SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Propiedad personal"
   },
@@ -5597,6 +5947,19 @@
     "message": "No permitir a los usuarios ocultar su dirección de correo electrónico a los destinatarios al crear o editar un Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Política modificada $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Su contraseña maestra no cumple con una o más de las políticas de su organización. Para acceder a la caja fuerte, debe actualizar su contraseña maestra ahora. Proceder le desconectará de su sesión actual, requiriendo que vuelva a iniciar sesión. Las sesiones activas en otros dispositivos pueden seguir estando activas durante hasta una hora."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Tiempo de espera de la caja fuerte excedido"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Configurar un tiempo de espera máximo para la caja fuerte de todos los usuarios."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Tiempo de espera máximo de la caja fuerte"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Tiempo de espera máximo de la caja fuerte inválido."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Horas"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutos"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Las políticas de tu organización están afectando al tiempo de espera de tu caja fuerte. El máximo permitido de espera es de $HOURS$ hora(s) y de $MINUTES$ minuto(s)",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Debes añadir o bien la URL del servidor base, o al menos un entorno personalizado."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "URL del servidor de la API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Acceso denegado. No tiene permiso para ver esta página."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Contraseña maestra"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grupo/Usuario"
   },
-  "lowKdfIterations": {
-    "message": "Iteraciones KDF bajas"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Actualice sus ajustes de cifrado para cumplir con las nuevas recomendaciones de seguridad y mejorar la protección de la cuenta."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "¡Ha iniciado sesión!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Asignar acceso a colecciones"
   },
@@ -9330,6 +9820,14 @@
     "message": "Demasiado caro",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Gratis durante 1 año"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Asignar"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Asignar a colecciones"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "incrementos de 100.000"
-  },
-  "smallIncrements": {
-    "message": "pequeños incrementos"
-  },
   "kdfIterationRecommends": {
     "message": "Recomendamos 600.000 o más"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/et/messages.json b/apps/web/src/locales/et/messages.json
index 83ff0028e0d..186c0f1f256 100644
--- a/apps/web/src/locales/et/messages.json
+++ b/apps/web/src/locales/et/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Viimati uuendatud: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Teavitatud liikmed"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Loo uus kirje"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Teavitatud liikmed ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Lemmikud"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tüübid"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Hoia see aken lahti ja järgi brauseri juhiseid."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Kasuta teist logimismeetodit"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Tere tulemast tagasi"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Vale ülemparool"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Vale parool, palun kasuta seda parooli mille sisestasid eksport faili loomisel."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Puuduvad kirjed, mida kuvada."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Sul ei ole õigust vaadata kõiki asju selles kogus."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Krüpteerimise võtme seaded"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algoritm"
-  },
   "kdfIterations": {
     "message": "KDF iteratsioonid"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Rohkem KDF kordusi, mälumahtu ja paralleelsust aitab sul kaitsta ülemparooli toore jõuga lahti murdmisest ründaja poolt."
   },
-  "changeKdf": {
-    "message": "Muuda KDF-i"
-  },
   "encKeySettingsChanged": {
     "message": "Krüpteerimise võtme seaded on muudetud"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Veendu, et kontol on selle ostu tegemiseks piisavalt krediiti. Ebapiisava krediidi puhul võetakse puuduolev summa teiselt (vaike) maksemeetodilt. Kontole saab krediiti lisada \"Maksmine\" menüü alt."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Konto krediiti saab kasutada maksete tegemiseks. Uue arve laekumisel kasutatakse selle tasumiseks esmajärjekorras kontol olevat krediiti."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Järgmine makse"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Andmed"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Laadi litsents alla"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Uuenda brauserit"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Kasutad brauserit, mida ei toetata. Veebihoidla ei pruugi hästi töötada."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Kutse on vastu võetud"
   },
-  "inviteAcceptedDesc": {
-    "message": "Pääsed organisatsiooni kirjetele ligi niipea, kui administraator sinu liikmelisuse kinnitab. Teavitame sind sellest e-posti teel."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Sul on nüüd ligipääs sellele organisatsioonile."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisatsioon on määramata ajaks peatatud"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Peatatud organisatsioonidele ei ole võimalik ligi pääseda. Palun kontakteeruge oma organisatsiooni haldajaga."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Peatatud organisatsioonides ei ole võimalik luua uusi kontosid. Palun kontakteeruge oma organisatsiooni haldajaga."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Organisatsiooni alla kuuluvatele kirjetele ei ole ligipääsu. Kontakteeru oma organisatsiooni omanikuga."
-  },
   "licenseIsExpired": {
     "message": "Litsents on aegunud."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Ühenda SSO lahti"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Personaalne salvestamine"
   },
@@ -5597,6 +5947,19 @@
     "message": "Ära luba kasutajatel Sendi loomisel või muutmisel oma e-posti aadressi saajate eest peita.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Muutis poliitikat $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Logi kasutajad lubatud rakendustesse automaatselt sisse"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Hoidla ajalõpp"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Tundi"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutit"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Organisatsiooni poliitikad mõjutavad sinu hoidla ajalõppu. Maksimaalne lubatud hoidla ajalõpp on $HOURS$ tund(i) ja $MINUTES$ minut(it)",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Ligipääs keelatud. Sul pole lubatud seda lehekülge vaadata."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Ülemparool"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json
index 0dc74e0bb94..e494c663b74 100644
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Gogokoak"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Motak"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Master pasahitz baliogabea"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Fitxategi pasahitzak ez du balio; mesedez, erabili esportazio fitxategia sortzean sartutako pasahitza."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Ez dago erakusteko elementurik."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Zifratze-gakoaren ezarpenak"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algoritmoa"
-  },
   "kdfIterations": {
     "message": "KDF iterazioak"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Aldatu KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Zifratze-gakoaren ezarpenak aldatuta"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Ziurtatu zure kontuak nahikoa kreditu duela erosketa honetarako. Zure kontuak behar adina kreditu erabilgarri ez badu, fitxategian lehenespenez ezarrita dagoen ordainketa modua ezberdintasuna ordaintzeko erabiliko da. Zure kontuan kreditua gehitu dezakezu fakturazio orritik."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Zure kontuko kreditua erosketak egiteko erabil daiteke. Erabilgarri dagoen edozein kreditu automatikoki aplikatuko zaie kontu honetarako sortutako fakturei."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Hurrengo kobrantza"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Xehetasunak"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Lizentzia deskargatu"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Nabigatzailea eguneratu"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Euskarririk gabeko web nabigatzailea erabiltzen ari zara. Baliteke webguneko kutxa gotorrak behar bezala ez funtzionatzea."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Gonbidapena onartua"
   },
-  "inviteAcceptedDesc": {
-    "message": "Erakundeko kudeatzaile batek berresten zaituenean sartu ahal izango zara. Email bat bidaliko dizugu hori gertatzen denean."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Erakundea desgaituta dago."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Ezin da sartu desgaitutako erakundeetako elementuetara. Laguntza lortzeko, jarri harremanetan zure erakundearekin."
-  },
   "licenseIsExpired": {
     "message": "Lizentzia iraungi da."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifikatzailea"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO deskonektatu"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Ezabatu kutxa gotor pertsonala"
   },
@@ -5597,6 +5947,19 @@
     "message": "Send bat sortzean edo editatzean, erakutsi beti kidearen emaila hartzaileari.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "$ID$ politika aldatua.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Kutxa gotorraren itxaronaldia"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Ezarri kutxa gotorraren gehienezko itxaronaldia kideentzat."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Kutxa gotorreko gehienezko itxaronaldia"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Kutxa gotorreko itxaronaldia baliogabea."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Ordu"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutu"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Zure erakundearen politikek zure itxaronaldiari eragiten diote. Itxaronaldiak gehienez ere $HOURS$ ordu eta $MINUTES$ minutu izango ditu",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Sarbidea ukatuta. Ez duzu baimenik orri hau ikusteko."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Pasahitz nagusia"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/fa/messages.json b/apps/web/src/locales/fa/messages.json
index 0211b3a7d12..ff39b14c05f 100644
--- a/apps/web/src/locales/fa/messages.json
+++ b/apps/web/src/locales/fa/messages.json
@@ -3,7 +3,7 @@
     "message": "همه‌ برنامه‌ها"
   },
   "activity": {
-    "message": "Activity"
+    "message": "فعالیت"
   },
   "appLogoLabel": {
     "message": "لوگو Bitwarden"
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "دسترسی به هوش مصنوعی"
   },
-  "riskInsights": {
-    "message": "دیدگاه‌های خطر"
-  },
   "passwordRisk": {
     "message": "خطر کلمه عبور"
   },
+  "noEditPermissions": {
+    "message": "شما مجاز به ویرایش این مورد نیستید"
+  },
   "reviewAtRiskPasswords": {
     "message": "کلمات عبور در معرض خطر (ضعیف، افشا شده یا تکراری) را در برنامه‌ها بررسی کنید. برنامه‌های حیاتی خود را انتخاب کنید تا اقدامات امنیتی را برای کاربران‌تان اولویت‌بندی کنید و به کلمات عبور در معرض خطر رسیدگی کنید."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "بررسی ورودهای پرخطر"
+  },
   "dataLastUpdated": {
     "message": "آخرین به‌روزرسانی داده‌ها: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "شما هنوز گزارشی ایجاد نکرده‌اید"
+  },
   "notifiedMembers": {
     "message": "اعضای مطلع شده"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "ایجاد مورد ورود جدید"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "$PERCENT$ درصد انجام شده",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ مورد از $TOTAL$ کار امنیتی انجام شده است",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "وضعیت تغییر رمزهای عبور"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "به اعضا وظیفه بدهید تا روند کار را رصد کنند"
+  },
+  "onceYouReviewApplications": {
+    "message": "وقتی برنامه‌ها را بررسی کردید و آنها را به عنوان مهم علامت زدید، به اعضای تیم خود وظیفه دهید که رمزهایشان را تغییر دهند."
+  },
+  "sendReminders": {
+    "message": "ارسال يادآوری"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "وقتی برنامه‌ای را مهم علامت بزنید، اینجا نمایش داده می‌شود."
+  },
+  "viewAtRiskMembers": {
+    "message": "مشاهده اعضای در خطر"
+  },
+  "viewAtRiskApplications": {
+    "message": "مشاهده برنامه‌های در خطر"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ مورد از $TOTAL$ برنامه مهم به دلیل رمزهای ضعیف در خطر هستند",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "برنامه‌های حیاتی ($COUNT$)",
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "برنامه‌های مهم علامت‌گذاری شده"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "$COUNT$ برنامه مهم",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ رمز عبور در خطر",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ رمز عبور جدید در خطر",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ رمز عبور جدید در خطر",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "اعضا مطلع شدند ($COUNT$)",
     "placeholders": {
@@ -89,33 +178,75 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "هیچ برنامه‌ای در $ORG NAME$ یافت نشد",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "اطلاعاتی وجود ندارد"
   },
-  "noAppsInOrgDescription": {
-    "message": "با ذخیره‌ی اطلاعات ورود توسط کاربران، برنامه‌ها در اینجا نمایش داده می‌شوند و کلمات عبور در معرض خطر مشخص می‌گردند. برنامه‌های حیاتی را علامت‌گذاری کرده و کاربران را برای به‌روزرسانی کلمات عبور مطلع کنید."
+  "noDataInOrgDescription": {
+    "message": "اطلاعات ورود سازمان خود را وارد کنید تا با هوش دسترسی شروع کنید. بعد از این کار می‌توانید:"
+  },
+  "feature1Title": {
+    "message": "علامت‌گذاری برنامه‌ها به عنوان مهم"
+  },
+  "feature1Description": {
+    "message": "این کار به شما کمک می‌کند ابتدا خطرات برنامه‌های مهم خود را برطرف کنید."
+  },
+  "feature2Title": {
+    "message": "کمک به اعضا برای بهبود امنیتشان"
+  },
+  "feature2Description": {
+    "message": "به اعضای در خطر وظایف امنیتی راهنما شده بدهید تا اطلاعات ورودشان را به‌روز کنند."
+  },
+  "feature3Title": {
+    "message": "نظارت بر پیشرفت"
+  },
+  "feature3Description": {
+    "message": "تغییرات را در طول زمان دنبال کنید تا بهبود امنیت را نشان دهید."
+  },
+  "noReportsRunTitle": {
+    "message": "ایجاد گزارش"
+  },
+  "noReportsRunDescription": {
+    "message": "شما آماده ایجاد گزارش هستید. بعد از ایجاد گزارش می‌توانید:"
   },
   "noCriticalApplicationsTitle": {
-    "message": "You haven’t marked any applications as critical"
+    "message": "شما هیچ برنامه‌ای را به عنوان مهم علامت نزده‌اید"
   },
   "noCriticalApplicationsDescription": {
-    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
+    "message": "مهم‌ترین برنامه‌های خود را انتخاب کنید تا اقدامات امنیتی برای کاربران در مورد رمزهای ضعیف اولویت‌بندی شود."
   },
   "markCriticalApplications": {
-    "message": "Select critical applications"
+    "message": "انتخاب برنامه‌های مهم"
   },
   "markAppAsCritical": {
     "message": "برنامه را به عنوان حیاتی علامت‌گذاری کنید"
   },
+  "markAsCritical": {
+    "message": "علامت‌گذاری به عنوان مهم"
+  },
+  "applicationsSelected": {
+    "message": "برنامه انتخاب شده"
+  },
+  "selectApplication": {
+    "message": "برنامه را انتخاب کنید"
+  },
+  "unselectApplication": {
+    "message": "لغو انتخاب برنامه"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "برنامه‌های علامت گذاری شده به عنوان حیاتی"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ برنامه به عنوان مهم علامت زده شد",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "علامت‌گذاری برنامه‌ها به عنوان مهم ناموفق بود"
+  },
   "application": {
     "message": "برنامه"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "اعضای در معرض خطر"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "این اعضا به موارد آسیب‌پذیر برنامه‌های مهم دسترسی دارند."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "اعضایی با رمزهای عبور ضعیف"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "به اعضای سازمان شما وظیفه تغییر رمزهای آسیب‌پذیر داده می‌شود. آن‌ها در افزونه مرورگر Bitwarden خود اعلان دریافت می‌کنند."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ عضو در خطر",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "این اعضا با کلمات عبور ضعیف، افشا شده یا تکراری وارد برنامه‌ها می‌شوند."
+  "atRiskMemberDescription": {
+    "message": "این اعضا با رمزهای ضعیف، افشا شده یا تکراری وارد برنامه‌های مهم می‌شوند."
   },
   "atRiskMembersDescriptionNone": {
     "message": "هیچ عضوی با کلمات عبور ضعیف، افشا شده یا تکراری وارد برنامه‌ها نمی‌شود."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "کل برنامه‌ها"
   },
+  "applicationsNeedingReview": {
+    "message": "برنامه‌هایی که نیاز به بررسی دارند"
+  },
+  "newApplicationsCardTitle": {
+    "message": "بررسی برنامه‌های جدید"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ برنامه جدید",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "برنامه‌های جدید را بررسی کنید، آنها را به عنوان مهم علامت بزنید و سازمان خود را ایمن نگه دارید"
+  },
+  "reviewNow": {
+    "message": "همین حالا بررسی کنید"
+  },
+  "allCaughtUp": {
+    "message": "همه چیز انجام شد!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "در حال حاضر برنامه جدیدی برای بررسی وجود ندارد"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "مورد علاقه‌ها"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "انواع"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "این پنجره را باز نگه دارید و دستورهای مرورگر خود را دنبال کنید."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "از روش ورود متفاوتی استفاده کنید"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "استفاده از ورود تک مرحله‌ای"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "خوش آمدید"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "کلمه عبور اصلی نامعتبر است"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "کلمه عبور پرونده نامعتبر است، لطفاً از کلمه عبوری که هنگام ایجاد پرونده‌ی برون ریزی وارد کردید استفاده کنید."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "هیچ موردی برای نمایش وجود ندارد."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "شما اجازه مشاهده همه موارد در این مجموعه را ندارید."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "تنظیمات کلید رمزگذاری"
   },
-  "kdfAlgorithm": {
-    "message": "الگوریتم KDF"
-  },
   "kdfIterations": {
     "message": "تکرار KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "تکرارهای KDF بالاتر، حافظه و موازی سازی می‌تواند به محافظت از کلمه عبور اصلی شما در برابر حمله بروت فورث توسط مهاجم کمک کند."
   },
-  "changeKdf": {
-    "message": "تغییر KDF"
-  },
   "encKeySettingsChanged": {
     "message": "تنظیمات کلید رمزگذاری ذخیره شد"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "لطفاً مطمئن شوید که اعتبار حساب شما برای این خرید کافی است. اگر حساب شما اعتبار کافی ندارد، از روش پرداخت پیش‌فرض موجود در پرونده برای ما به‌ تفاوت استفاده می‌شود. می‌توانید از صفحه صورتحساب اعتبار به حساب خود اضافه کنید."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "اعتبار حساب شما می‌تواند برای خرید استفاده شود. هر اعتبار موجود به طور خودکار برای فاکتورهای ایجاد شده برای این حساب اعمال می‌شود."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "شارژ بعدی"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "جزئیات"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "دانلود مجوز"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "به‌روزرسانی مرورگر"
   },
-  "generatingYourRiskInsights": {
-    "message": "در حال تولید تحلیل‌های ریسک شما..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "شما از یک مرورگر وب پشتیبانی نشده استفاده می‌کنید. گاوصندوق وب ممکن است به درستی کار نکند."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "دعوتنامه پذیرفته شد"
   },
-  "inviteAcceptedDesc": {
-    "message": "زمانی که یک سرپرست عضویت شما را تأیید کرد، می‌توانید به این سازمان دسترسی داشته باشید. زمانی که این اتفاق بیفتد، یک ایمیل برای شما ارسال خواهیم کرد."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "اکنون می‌توانید به این سازمان دسترسی داشته باشید."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "سازمان از کار افتاده است"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "سازمان‌های تعلیق شده قابل دسترسی نیستند. لطفاً برای کمک با مالک سازمان خود تماس بگیرید."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "حساب‌های خدماتی را نمی‌توان در سازمان‌های معلق ایجاد کرد. لطفاً برای کمک با مالک سازمان خود تماس بگیرید."
   },
-  "disabledOrganizationFilterError": {
-    "message": "موارد موجود در سازمان‌های غیرفعال، قابل دسترسی نیستند. برای دریافت کمک با مالک سازمان خود تماس بگیرید."
-  },
   "licenseIsExpired": {
     "message": "مجوز منقضی شده است."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "شناسه SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "این شناسه را در اختیار اعضای خود قرار دهید تا با SSO وارد شوند. برای دور زدن این مرحله، راه‌اندازی کنید ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "لغو پیوند SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "حذف گاوصندوق شخصی"
   },
@@ -5597,6 +5947,19 @@
     "message": "هنگام ایجاد یا ویرایش ارسال، همیشه نشانی ایمیل اعضا را به گیرندگان نشان بده.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "سیاست تغییر یافته $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
   },
-  "automaticAppLogin": {
-    "message": "ورود خودکار کاربران به برنامه‌های مجاز"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "فرم‌های ورود به‌صورت خودکار پر شده و برای برنامه‌هایی که از ارائه‌دهنده هویت پیکربندی شده شما اجرا می‌شوند، ارسال خواهند شد."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "میزبان ارائه دهنده هویت"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "سازمان شما گزینه‌های رمزگشایی را به‌روزرسانی کرده است. لطفاً برای دسترسی به گاوصندوق خود، یک کلمه عبور اصلی تنظیم کنید."
   },
-  "maximumVaultTimeout": {
-    "message": "متوقف شدن گاو‌صندوق"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "حداکثر بازه زمانی گاوصندوق را برای اعضا تنظیم کنید."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "حداکثر مهلت گاوصندوق"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "پایان زمان گاوصندوق نامعتبر است."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "ساعت"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "دقیقه"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "خط مشی های سازمانتان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق $HOURS$ ساعت و $MINUTES$ دقیقه است",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "شما باید یا نشانی اینترنتی پایه سرور را اضافه کنید، یا حداقل یک محیط سفارشی تعریف کنید."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "نشانی API سرور"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "دسترسی رد شد. شما اجازه مشاهده این صفحه را ندارید."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "کلمه عبور اصلی"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "گروه/کاربر"
   },
-  "lowKdfIterations": {
-    "message": "تکرار KDF کم"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "تنظیمات رمزگذاری خود را برای رعایت توصیه‌های امنیتی جدید و بهبود حفاظت از حساب به‌روزرسانی کنید."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "ادامه دادن باعث خروج شما از تمام نشست‌های فعال خواهد شد. برای ادامه باید دوباره وارد شوید و در صورت فعال بودن، ورود دو مرحله‌ای را کامل کنید. توصیه می‌کنیم قبل از تغییر تنظیمات رمزنگاری، از گاوصندوق خود خروجی بگیرید تا از دست رفتن داده‌ها جلوگیری شود."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "وارد شده!"
   },
-  "beta": {
-    "message": "آزمایشی"
-  },
   "assignCollectionAccess": {
     "message": "اختصاص دسترسی به مجموعه"
   },
@@ -9330,6 +9820,14 @@
     "message": "خیلی گران است",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "رایگان برای یک سال"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "اختصاص بدهید"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "اختصاص به مجموعه‌ها"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "تعداد تکرارهای KDF پایین است. برای افزایش امنیت حساب کاربری خود، تعداد تکرارها را افزایش دهید."
-  },
-  "changeKDFSettings": {
-    "message": "تغییر تنظیمات KDF"
-  },
   "secureYourInfrastructure": {
     "message": "زیرساخت خود را ایمن کنید"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "خاموش"
   },
-  "higherKDFIterations": {
-    "message": "افزایش تعداد تکرارهای KDF می‌تواند به محافظت از کلمه عبور اصلی شما در برابر حملات بروت‌فورس کمک کند."
-  },
-  "incrementsOf100,000": {
-    "message": "افزایش‌ها به صورت ۱۰۰,۰۰۰ تایی"
-  },
-  "smallIncrements": {
-    "message": "افزایش‌های کوچک"
-  },
   "kdfIterationRecommends": {
     "message": "ما توصیه می‌کنیم ۶۰۰,۰۰۰ یا بیشتر باشد"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "برای دستگاه‌های قدیمی‌تر، تنظیم KDF خیلی بالا ممکن است باعث مشکلات عملکردی شود. مقدار را در $VALUE$ افزایش دهید و دستگاه‌های خود را تست کنید.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " برای بازیابی اشتراک خود با پشتیبانی مشتری تماس بگیرید."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "دامنه ثبت شده است"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "نام سازمان نمی‌تواند بیش از ۵۰ کاراکتر باشد."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "افزونه مرورگر Bitwarden با موفقیت باز شد. اکنون می‌توانید کلمات عبور در معرض خطر خود را بررسی کنید."
   },
-  "openExtensionManuallyPart1": {
-    "message": "در باز کردن افزونه مرورگر Bitwarden مشکل داشتیم. آیکون Bitwarden را باز کنید",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "از نوار ابزار.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "اشتراک شما به‌زودی تمدید می‌شود. برای تضمین ادامه‌ی بدون وقفه‌ی خدمات، قبل از تاریخ $RENEWAL_DATE$ با $RESELLER$ تماس بگیرید و تمدید خود را تأیید کنید.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "واحد کسب و کار"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "افزونه Bitwarden نصب شد!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "افزونه را باز کنید تا وارد شوید و پر کردن خودکار را آغاز کنید."
   },
@@ -11154,6 +11684,14 @@
     "message": "مرکز آموزش",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "مرکز راهنمایی",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/fi/messages.json b/apps/web/src/locales/fi/messages.json
index 98f37b43cf4..9710db5f285 100644
--- a/apps/web/src/locales/fi/messages.json
+++ b/apps/web/src/locales/fi/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Salasanariski"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Tiedot päivitetty viimeksi: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Ilmoitetut jäsenet"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Luo uusi kirjautumiskohde"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Kriittiset sovellukset ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Ilmoitetut jäsenet ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Sovelluksia ei löytynyt organisaatiosta $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Merkitse sovellus kriittiseksi"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Sovellus"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Riskialttiit jäsenet"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Sovelluksia yhteensä"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Suosikit"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tyypit"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Pidä tämä ikkuna avoinna ja seuraa selaimesi opasteita."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Käytä vaihtoehtoista kirjautumistapaa"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Käytä kertakirjautumista"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Tervetuloa takaisin"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Virheellinen pääsalasana"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Tiedoston salasana on virheellinen. Käytä vientitiedoston luonnin yhteydessä syötettyä salasanaa."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Näytettäviä kohteita ei ole."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Sinulla ei ole kokoelman kaikkien kohteiden tarkastelun sallivia käyttöoikeuksia."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Salausavainten asetukset"
   },
-  "kdfAlgorithm": {
-    "message": "KDF-algoritmi"
-  },
   "kdfIterations": {
     "message": "KDF-toistot"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Korkeammat KDF-toistojen, -muistin ja -rinnakkaisuuksien määrät vahvistavat pääsalasanasi suojausta väsytyshyökkäyksien varalta."
   },
-  "changeKdf": {
-    "message": "Vaihda KDF-asetuksia"
-  },
   "encKeySettingsChanged": {
     "message": "Salausavainten asetukset tallennettiin"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Varmista, että tililläsi on riittävästi saldoa tälle ostolle. Jos tililläsi ei ole tarpeeksi saldoa, voidaan erotus veloittaa tallennettua oletusmaksutapaa käyttäen. Voit lisätä tilillesi saldoa \"Laskutus\" -sivulta."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Tilisi saldoa voidaan käyttää ostoksiin. Kaikki käytettävissä oleva saldo kohdistetaan automaattisesti tälle tilille luotuihin laskuihin."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Seuraava veloitus"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Tiedot"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Lataa lisenssi"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Päivitä selain"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Käytät selainta, jota ei tueta. Verkkoholvi ei välttämättä toimi oikein."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Kutsu hyväksyttiin"
   },
-  "inviteAcceptedDesc": {
-    "message": "Saat organisaation käyttöoikeudet ylläpitäjän vahvistettua jäsentyytesi. Saat vahvistuksesta ilmoituksen sähköpostitse."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Sinulla on nyt organisaation käyttöoikeus."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisaatio on jäädytetty"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Jäädytettyjen organisaatioiden kohteet eivät ole käytettävissä. Ole yhteydessä organisaatiosi omistajaan saadaksesi apua."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Palvelutilien luonti ei ole mahdollista jäädytetyissä organisaatioissa. Ole yhteydessä organisaatiosi omistajaan saadaksesi apua."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Jäädytettyjen organisaatioiden kohteet eivät ole käytettävissä. Ole yhteydessä organisaation omistajaan saadaksesi apua."
-  },
   "licenseIsExpired": {
     "message": "Lisenssi on erääntynyt."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Kertakirjautumistunniste"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Toimita tämä tunniste jäsenillesi kertakirjautumista varten. Ohita vaihe määritämällä ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Poista kertakirjautumisliitos"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Poista yksityinen holvi"
   },
@@ -5597,6 +5947,19 @@
     "message": "Näytä jäsenen sähköpostiosoite aina vastaanottajien ohessa, kun Send luodaan tai sitä muokataan.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Muokkasi käytäntöä \"$ID$\".",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Pääsalasanasi ei täytä yhden tai useamman organisaatiokäytännön vaatimuksia ja holvin käyttämiseksi sinun on vaihdettava se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan."
   },
-  "automaticAppLogin": {
-    "message": "Kirjaa käyttäjät automaattisesti sisään sallittuihin sovelluksiin"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Kirjautumislomakkeet täytetään ja lähetetään automaattisesti määritetyltä identiteettitarjoaltasi käynnistetyissä sovelluksissa."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identiteettitarjoajan osoite"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Organisaatiosi on muuttanut salauksen purun asetuksia. Avaa holvisi asettamalla pääsalasana."
   },
-  "maximumVaultTimeout": {
-    "message": "Holvin aikakatkaisu"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Aseta jäsenille holvin aikakatkaisun enimmäisaika."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Holvin aikakatkaisun enimmäisaika"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Virheellinen holvin aikakatkaisun enimmäisaika."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Tuntia"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuuttia"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Organisaatiokäytännöt ovat määrittäneet holvisi aikakatkaisun enimmäisajaksi $HOURS$ tuntia $MINUTES$ minuuttia.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Sinun on lisättävä joko palvelimen perusosoite tai ainakin yksi mukautettu palvelinympäristö."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API-palvelimen URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Pääsy estetty. Sinulla ei ole oikeutta avata sivua."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Pääsalasana"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Ryhmä/käyttäjä"
   },
-  "lowKdfIterations": {
-    "message": "Alhainen KDF-toistomäärä"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Päivitä salausasetuksesi uusien suojaussuositusten mukaisiksi ja vahvista tilisi suojausta."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Jos jatkat, kirjataan kaikki aktiiviset istunnot ulos, jonka jälkeen sinun on kirjauduttava sisään uudelleen ja suoritettava mahdollisesti määritetty kaksivaiheinen tunnistautuminen. Tietojesi säilyvyyden varmistamiseksi suosittelemme, että viet holvisi sisällön ennen salausasetustesi muuttamista."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Kirjautuminen onnistui"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Määritä kokoelmien käyttöoikeudet"
   },
@@ -9330,6 +9820,14 @@
     "message": "Liian kallis",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Ilmainen 1 vuoden ajan"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Määritä"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Määritä kokoelmiin"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Alhainen KDF-toistojen määrä. Paranna tilisi suojausta korottamalla määrää."
-  },
-  "changeKDFSettings": {
-    "message": "Muuta KDF-asetuksia"
-  },
   "secureYourInfrastructure": {
     "message": "Suojaa infrastruktuurisi"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Ei käytössä"
   },
-  "higherKDFIterations": {
-    "message": "Korkeampi KDF-toistojen määrä vahvistaa pääsalasanasi suojausta väsytyshyökkäyksien varalta."
-  },
-  "incrementsOf100,000": {
-    "message": "100 000 välein"
-  },
-  "smallIncrements": {
-    "message": "vähitellen"
-  },
   "kdfIterationRecommends": {
     "message": "Vähimmäissuositus on 600 000"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Vanhemmilla laitteilla liian korkea KDF-arvo voi aiheuttaa suorituskykyongelmiin. Lisää arvoa $VALUE$ ja kokeile muutoksia laitteillasi.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Aktivoi tilauksesi uudelleen olemalla yhteydessä asiakaspalveluun."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/fil/messages.json b/apps/web/src/locales/fil/messages.json
index 8bb6d1fa53c..85b5797e634 100644
--- a/apps/web/src/locales/fil/messages.json
+++ b/apps/web/src/locales/fil/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Mga Paborito"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Mga uri"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Hindi wasto ang master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Hindi wasto ang password ng file, mangyaring gamitin ang password na inilagay mo noong ginawa mo ang export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Walang maililistang item."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Wala kang pahintulot na makita lahat ng mga item sa koleksyong ito."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Mga setting ng encryption key"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritmo ng KDF"
-  },
   "kdfIterations": {
     "message": "Iterasyon ng KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Makakatulong maprotektahan ng mataas na iterasyon ng KDF, memorya, at pararelismo ang master password mo na ma-brute force ng masasamang-loob."
   },
-  "changeKdf": {
-    "message": "Baguhin ang KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Na-save ang mga setting ng encryption key"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Siguraduhing may sapat na credit ang account mo para sa pagbiling ito. Kung walang sapat na credit ang account mo, gagamitin ang default na paraan sa pagbabayad ng account mo at gagamiting pantapal sa kulang. Makakapagdagdag ka ng credit sa account mo sa pahina ng Pagsingil."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Magagamit ang credit ng account mo para mamili. Mailalapat sa anumang bayarin sa account na ito ang available na credit."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Susunod na singil"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Mga Detalye"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Mag-download ng lisensya"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update sa browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Gumagamit ka ng isang hindi suportado na web browser. Ang web vault ay maaaring hindi gumana nang maayos."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Tinanggap ang paanyaya"
   },
-  "inviteAcceptedDesc": {
-    "message": "Maaari mong ma access ang organisasyong ito sa sandaling kumpirmahin ng isang administrator ang iyong pagiging miyembro. Ipapadala namin sa iyo ang isang email kapag nangyari iyon."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisasyon ay suspindido."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Mga item sa mga naka-suspindong Organisasyon ay hindi ma-access. Mangyaring makipag-ugnayan sa may-ari ng iyong Organisasyon para sa tulong."
-  },
   "licenseIsExpired": {
     "message": "Ang lisensya ay expired na."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Tagatukoy ng SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "I-unlink ang SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Alisin ang indibidwal na vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Laging ipakita ang email address ng miyembro sa mga tatanggap kapag lumilikha o nag edit ng isang Ipadala.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Binagong patakaran $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Magtakda ng maximum vault timeout para sa mga miyembro."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum na timeout sa vault"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Imbalidong maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Oras"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuto"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Nakakaapekto ang mga patakaran ng iyong organisasyon sa iyong vault timeout. Ang pinakamataas na pinapayagang Vault Timeout ay $HOURS$ oras at $MINUTES$ minuto",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Hindi natanggap ang access. Wala kang pahintulot na tingnan ang pahinang ito."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master Password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grupo/User"
   },
-  "lowKdfIterations": {
-    "message": "Mababang KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/fr/messages.json b/apps/web/src/locales/fr/messages.json
index e0c6cf2287d..8103dcde46e 100644
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Accéder à Intelligence"
   },
-  "riskInsights": {
-    "message": "Aperçus des Risques"
-  },
   "passwordRisk": {
     "message": "Risque du mot de passe"
   },
+  "noEditPermissions": {
+    "message": "Vous n'avez pas l'autorisation de modifier cet élément"
+  },
   "reviewAtRiskPasswords": {
     "message": "Examinez les mots de passe à risque (faibles, exposés ou réutilisés) à travers les applications. Sélectionnez vos applications les plus critiques pour prioriser les actions de sécurité pour que vos utilisateurs s'occupent des mots de passe à risque."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Examiner les identifiants à risque"
+  },
   "dataLastUpdated": {
     "message": "Dernière mise à jour des données : $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Vous n'avez pas encore créé de rapport"
+  },
   "notifiedMembers": {
     "message": "Membres notifiés"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "Créer un nouvel élément de connexion"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Une fois que vous avez marqué des applications comme critiques, elles s'afficheront ici."
+  "percentageCompleted": {
+    "message": "$PERCENT$% complété",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ sur $TOTAL$ tâches de sécurité terminées",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Progression du changement de mot de passe"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Affecter des tâches aux membres pour surveiller la progression"
+  },
+  "onceYouReviewApplications": {
+    "message": "Une fois que vous passez en revue les demandes et que vous les marquez comme critiques, attribuez des tâches à vos membres pour changer leurs mots de passe."
+  },
+  "sendReminders": {
+    "message": "Envoyer des rappels"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Une fois que vous avez marqué les applications critiques, elles s'afficheront ici."
+  },
+  "viewAtRiskMembers": {
+    "message": "Afficher les membres à risque"
+  },
+  "viewAtRiskApplications": {
+    "message": "Afficher les applications à risque"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ sur $TOTAL$ applications critiques sont à risque en raison de mots de passe à risque",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "Applications critiques ($COUNT$)",
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "applications critiques marquées"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ applications critiques",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications à risque",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ mots de passe à risque",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ mots de passe à risque",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membres notifiés ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Aucune application trouvée dans $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Aucune donnée n’a été trouvée"
   },
-  "noAppsInOrgDescription": {
-    "message": "Au fur et à mesure que les utilisateurs enregistrent des identifiants, les applications apparaissent ici, montrant les mots de passe à risque. Marquez les applications critiques et avertissez les utilisateurs de mettre à jour les mots de passe."
+  "noDataInOrgDescription": {
+    "message": "Importez les données de connexion de votre organisation pour commencer avec Intelligence. Une fois que vous aurez fait cela, vous pourrez :"
+  },
+  "feature1Title": {
+    "message": "Marquer les applications comme critiques"
+  },
+  "feature1Description": {
+    "message": "Cela vous aidera à éliminer les risques pour vos applications les plus importantes en premier."
+  },
+  "feature2Title": {
+    "message": "Aider les membres à améliorer leur sécurité"
+  },
+  "feature2Description": {
+    "message": "Assigner des membres à risque des tâches de sécurité guidées pour mettre à jour les identifiants."
+  },
+  "feature3Title": {
+    "message": "Suivre la progression"
+  },
+  "feature3Description": {
+    "message": "Suivez les changements au fil du temps pour afficher les améliorations de sécurité."
+  },
+  "noReportsRunTitle": {
+    "message": "Générer un rapport"
+  },
+  "noReportsRunDescription": {
+    "message": "Vous êtes prêt à commencer à générer des rapports. Une fois que vous en aurez généré, vous pourrez :"
   },
   "noCriticalApplicationsTitle": {
     "message": "Vous n'avez marqué aucune application comme critique"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Marquer l'application comme critique"
   },
+  "markAsCritical": {
+    "message": "Marquer comme critique"
+  },
+  "applicationsSelected": {
+    "message": "applications sélectionnées"
+  },
+  "selectApplication": {
+    "message": "Sélectionner l'application"
+  },
+  "unselectApplication": {
+    "message": "Désélectionner l'application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marquées comme critiques"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marquées comme critiques",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Échec du marquage de l'application comme étant critique"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Membres à risque"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Membres pouvant modifier les éléments à risque pour les applications critiques"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Ces membres ont accès à des éléments vulnérables pour des applications critiques."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Membres avec des mots de passe à risque"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Les membres de votre organisation seront assignés à une tâche pour changer les mots de passe vulnérables. Ils recevront une notification dans leur extension de navigateur Bitwarden."
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ membres à risque",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Ces membres se connectent à des applications avec des mots de passe faibles, exposés ou réutilisés."
+  "atRiskMemberDescription": {
+    "message": "Ces membres se connectent à des applications critiques avec des mots de passe faibles, exposés ou réutilisés."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Aucun membre ne se connecte dans des applications avec des mots de passe faibles, exposés ou réutilisés."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total des applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications nécessitant un examen"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Examiner les nouvelles applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ nouvelles applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Examiner les nouvelles applications à marquer comme critiques et garder votre organisation sécuritaire"
+  },
+  "reviewNow": {
+    "message": "Examiner maintenant"
+  },
+  "allCaughtUp": {
+    "message": "Tout est à jour !"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Aucune nouvelle application à examiner pour le moment"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Votre organisation a des éléments enregistrés pour $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Examiner les applications pour sécuriser les éléments les plus critiques pour la sécurité de votre organisation"
+  },
+  "reviewApplications": {
+    "message": "Examiner les applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioriser les applications critiques"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Sélectionnez les applications les plus importantes pour votre organisation. Ensuite, vous pourrez assigner des tâches de sécurité aux membres pour supprimer les risques."
+  },
+  "reviewNewApplications": {
+    "message": "Examiner les nouvelles applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Examinez les nouvelles applications avec des éléments vulnérables et marquez celles que vous souhaitez surveiller de près comme étant critiques. Ensuite, vous pourrez assigner des tâches de sécurité aux membres pour supprimer les risques."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Cliquez sur l'icône étoile pour marquer une application comme critique"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Marquer comme fonctionnalité critique sera implémentée dans une mise à jour future"
+  },
+  "applicationReviewSaved": {
+    "message": "Révision de l'application enregistrée"
+  },
+  "newApplicationsReviewed": {
+    "message": "Nouvelles demandes examinées"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Erreur lors de l'enregistrement du statut de la révision"
+  },
+  "pleaseTryAgain": {
+    "message": "Veuillez réessayer"
+  },
   "unmarkAsCritical": {
     "message": "Retirer la cote critique"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoris"
   },
+  "taskSummary": {
+    "message": "Résumé de tâche"
+  },
   "types": {
     "message": "Types"
   },
@@ -1172,11 +1384,14 @@
     "message": "Se connecter avec le mot de passe principal"
   },
   "readingPasskeyLoading": {
-    "message": "Lecture de la Passkey..."
+    "message": "Lecture de la clé d'accès..."
   },
   "readingPasskeyLoadingInfo": {
     "message": "Gardez cette fenêtre ouverte et suivez les instructions de votre navigateur."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Échec de l'authentification par clé d'accès. Veuillez réessayer."
+  },
   "useADifferentLogInMethod": {
     "message": "Utiliser une méthode de connexion différente"
   },
@@ -1186,20 +1401,23 @@
   "useSingleSignOn": {
     "message": "Utiliser l'authentification unique"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Votre organisation nécessite une authentification unique."
+  },
   "welcomeBack": {
     "message": "Content de vous revoir"
   },
   "invalidPasskeyPleaseTryAgain": {
-    "message": "Passkey invalide. Veuillez réessayer de nouveau."
+    "message": "Clé d'accès invalide. Veuillez réessayer."
   },
   "twoFactorForPasskeysNotSupportedOnClientUpdateToLogIn": {
-    "message": "La 2FA pour les Passkey n'est pas pris en charge. Mettez à jour l'application pour vous connecter."
+    "message": "La 2FA pour les clé d'accès n'est pas pris en charge. Mettez à jour l'application pour vous connecter."
   },
   "loginWithPasskeyInfo": {
     "message": "Utilisez une clé d'accès générée qui vous connectera automatiquement sans mot de passe. La biométrie, comme la reconnaissance faciale ou les empreintes digitales, ou une autre méthode de sécurité FIDO2 vérifiera votre identité."
   },
   "newPasskey": {
-    "message": "Nouvelle clé d'identification (passkey)"
+    "message": "Nouvelle clé d'accès"
   },
   "learnMoreAboutPasswordless": {
     "message": "En savoir plus sur l'identification sans mots de passe"
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Mot de passe principal invalide"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Mot de passe principal invalide. Confirmez que votre adresse courriel est correcte et que votre compte a été créé sur $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Mot de passe de fichier invalide, veuillez utiliser le mot de passe que vous avez entré lorsque vous avez créé le fichier d'exportation."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Aucun élément à afficher."
   },
+  "noItemsInTrash": {
+    "message": "Aucun élément dans la corbeille"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Les éléments que vous supprimez apparaîtront ici et seront définitivement supprimés après 30 jours"
+  },
+  "noItemsInVault": {
+    "message": "Aucun élément dans le coffre"
+  },
+  "emptyVaultDescription": {
+    "message": "Le coffre protège bien plus que vos mots de passe. Stockez vos identifiants, IDs, cartes et notes en toute sécurité ici."
+  },
+  "emptyFavorites": {
+    "message": "Vous n'avez mis aucun élément en favori"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Ajouter les éléments fréquemment utilisés aux favoris pour un accès rapide."
+  },
+  "noSearchResults": {
+    "message": "Aucun résultat de recherche retourné"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Effacer les filtres ou essayer un autre terme de recherche"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Vous n'avez pas l'autorisation d'afficher tous les éléments de cette collection."
   },
@@ -1620,7 +1871,7 @@
     "message": "Clé de sécurité FIDO U2F"
   },
   "webAuthnTitle": {
-    "message": "WebAuthn FIDO2"
+    "message": "Clé d'accès"
   },
   "webAuthnDesc": {
     "message": "Utilisez n'importe quelle clé de sécurité compatible avec WebAuthn pour accéder à votre compte."
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Paramètres de la clé de chiffrement"
   },
-  "kdfAlgorithm": {
-    "message": "Algorithme KDF"
-  },
   "kdfIterations": {
     "message": "Itérations KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Des itérations KDF, une mémoire et un parallélisme plus élevés peuvent contribuer à protéger votre mot de passe principal contre l'attaque par force brute d'un assaillant."
   },
-  "changeKdf": {
-    "message": "Changer KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Paramètres de la clé de chiffrement modifiés"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Veuillez vous assurer que votre compte dispose d'un crédit suffisant pour cet achat. Si le crédit de votre compte n'est pas suffisant, votre mode de paiement par défaut sera utilisé pour régler la différence. Vous pouvez ajouter du crédit à votre compte à partir de la page Facturation."
   },
+  "notEnoughAccountCredit": {
+    "message": "Vous n'avez pas assez de crédit pour cet achat. Vous pouvez ajouter du crédit à votre compte à partir de la page de facturation."
+  },
   "creditAppliedDesc": {
     "message": "Le crédit de votre compte peut être utilisé pour régler vos achats. Tout crédit disponible sera automatiquement appliqué aux factures générées pour ce compte."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Prochain paiement"
   },
+  "nextChargeHeader": {
+    "message": "Prochain paiement"
+  },
+  "plan": {
+    "message": "Forfait"
+  },
   "details": {
     "message": "Détails"
   },
+  "discount": {
+    "message": "réduction"
+  },
   "downloadLicense": {
     "message": "Télécharger la licence"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Mettre à jour le navigateur"
   },
-  "generatingYourRiskInsights": {
-    "message": "Génération de vos Aperçus de Risque..."
+  "generatingYourAccessIntelligence": {
+    "message": "Génération de votre Intelligence d'Accès..."
+  },
+  "fetchingMemberData": {
+    "message": "Récupération des données des membres..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyse de la santé du mot de passe..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calcul des niveaux de risque..."
+  },
+  "generatingReportData": {
+    "message": "Génération des données du rapport..."
+  },
+  "savingReport": {
+    "message": "Enregistrement du rapport..."
+  },
+  "compilingInsights": {
+    "message": "Compilation des aperçus..."
+  },
+  "loadingProgress": {
+    "message": "Chargement de la progression"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Cela peut prendre quelques minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Exécuter le rapport"
   },
   "updateBrowserDesc": {
     "message": "Vous utilisez un navigateur non supporté. Le coffre web pourrait ne pas fonctionner correctement."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation acceptée"
   },
-  "inviteAcceptedDesc": {
-    "message": "Vous pourrez accéder à cette organisation dès qu'un administrateur aura confirmé votre adhésion. Nous vous enverrons un courriel lorsque cela se produira."
+  "invitationAcceptedDesc": {
+    "message": "Votre invitation a été acceptée avec succès."
   },
   "inviteInitAcceptedDesc": {
     "message": "Vous pouvez maintenant accéder à cette organisation."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "L'organisation est désactivée."
   },
+  "organizationIsSuspended": {
+    "message": "L'organisation est suspendue"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Les éléments des organisations suspendues ne sont pas accessibles. Contactez le propriétaire de votre organisation pour obtenir de l'aide."
+  },
   "secretsAccessSuspended": {
     "message": "Impossible d'accéder aux organisations suspendues. Veuillez contacter le propriétaire de votre organisation pour obtenir de l'aide."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Les comptes de service ne peuvent pas être créés dans les organisations suspendues. Veuillez contacter le propriétaire de votre organisation pour obtenir de l'aide."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Les éléments des Organisations désactivées ne sont pas accessibles. Contactez le propriétaire de votre Organisation pour obtenir de l'aide."
-  },
   "licenseIsExpired": {
     "message": "La licence a expiré."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Identifiant SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Fournir cet ID à vos membres pour se connecter avec SSO. Pour contourner cette étape, configurer ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Fournir cet ID à vos membres pour se connecter avec SSO. Les membres peuvent passer la saisie de cet identifiant pendant SSO si un domaine revendiqué est configuré. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "En savoir plus",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Délier SSO"
@@ -5518,9 +5809,9 @@
     "message": "Exiger que tous les éléments appartiennent à une organisation, en supprimant la possibilité de sauvegarder des éléments au niveau du compte.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Tous les éléments seront détenus et enregistrés dans l'organisation, ce qui activera les contrôles, la visibilité et les rapports à l'échelle de l'organisation. Quand activé, une collection par défaut est disponible pour chaque membre pour enregistrer des éléments. En savoir plus sur la gestion de ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "Tous les éléments seront détenus et enregistrés dans l'organisation, ce qui activera les contrôles, la visibilité et les rapports à l'échelle de l'organisation. Une fois activé, une collection par défaut sera disponible pour chaque membre pour enregistrer des éléments. En savoir plus sur la gestion de ",
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "cycle de vie des identifiants",
@@ -5545,6 +5836,65 @@
     "message": "Apprenez-en plus sur ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Disponible maintenant"
+  },
+  "autoConfirm": {
+    "message": "Confirmation automatique des nouveaux utilisateurs"
+  },
+  "autoConfirmDescription": {
+    "message": "Les nouveaux utilisateurs invités à rejoindre l'organisation seront automatiquement confirmés lorsque l'appareil d'un administrateur est déverrouillé.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Comment activer la confirmation automatique de l'utilisateur"
+  },
+  "autoConfirmExtension1": {
+    "message": "Ouvrez votre extension Bitwarden"
+  },
+  "autoConfirmExtension2": {
+    "message": "Sélectionner",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Activer",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Ouverture réussie de l'extension du navigateur Bitwarden. Vous pouvez maintenant activer le paramètre de confirmation automatique de l'utilisateur."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Les nouveaux utilisateurs invités à rejoindre l'organisation seront automatiquement confirmés lorsque l'appareil d'un administrateur est déverrouillé. Avant d'activer cette politique de sécurité, veuillez revoir et accepter les éléments suivants : ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Risque de sécurité potentiel. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "La confirmation automatique de l'utilisateur peut présenter un risque pour la sécurité des données de votre organisation."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "En savoir plus sur les risques",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Une politique d'organisation unique est requise. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Tous les membres doivent appartenir uniquement à cette organisation pour activer cette automatisation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "La politique d'organisation unique s'étendra à tous les rôles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Pas d'accès d'urgence. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "L'accès d'urgence sera retiré."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "J'accepte ces risques et mises à jour de la politique de sécurité"
+  },
   "personalOwnership": {
     "message": "Supprimer le coffre individuel"
   },
@@ -5597,6 +5947,19 @@
     "message": "Toujours afficher l'adresse électronique du membre avec les destinataires lors de la création ou de l'édition d'un Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Détection de correspondance URL par défaut"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Détermine quand des identifiants sont suggérées pour la saisie automatique. Les administrateurs et les propriétaires sont exemptés de cette politique de sécurité."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Détection de correspondance URL par défaut"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Veuillez sélectionner une option de détection de correspondance URL valide.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Politique $ID$ modifiée.",
     "placeholders": {
@@ -6088,7 +6451,7 @@
     "message": "Bitwarden n'a pas pu déchiffrer le(s) élément(s) du coffre listé(s) ci-dessous."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contacter Customer Success",
+    "message": "Contacter Succès Client",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Votre mot de passe principal ne répond pas aux exigences des politiques de sécurité de cette organisation. Pour pouvoir accéder au coffre, vous devez mettre à jour votre mot de passe principal dès maintenant. En poursuivant, vous serez déconnecté de votre session actuelle et vous devrez vous reconnecter. Les sessions actives sur d'autres appareils peuver rester actives pendant encore une heure."
   },
-  "automaticAppLogin": {
-    "message": "Se connecter automatiquement aux utilisateurs pour les applications autorisées"
+  "automaticAppLoginWithSSO": {
+    "message": "Connexion automatique avec SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Les formulaires de connexion seront automatiquement remplis et soumis pour les applications lancées à partir de votre fournisseur d'identité configuré."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Étendre la sécurité et la commodité SSO aux applications non gérées. Lorsque les utilisateurs lancent une application à partir de votre fournisseur d'identité, leurs identifiants de connexion sont automatiquement saisis et soumis, créant une connexion sécuriséw en un clic depuis le fournisseur d'identité vers l'application."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Hôte du fournisseur d'identité"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Votre organisation a mis à jour vos options de déchiffrement. Veuillez définir un mot de passe principal pour accéder à votre coffre."
   },
-  "maximumVaultTimeout": {
-    "message": "Délai d'expiration du coffre"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Délai d'expiration de la session"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Configurer un délai maximum d'expiration du coffre pour tous les utilisateurs."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Définir un délai d'expiration maximum de session pour tous les membres sauf les propriétaires."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Délai maximum d'expiration du coffre"
+  "maximumAllowedTimeout": {
+    "message": "Délai d'expiration maximum autorisé"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Délai maximum d'expiration du coffre invalide."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Le délai d'expiration maximum autorisé est requis."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Le temps n'est pas valide. Changez au moins une valeur."
+  },
+  "sessionTimeoutAction": {
+    "message": "Action après délai d'expiration de la session"
+  },
+  "immediately": {
+    "message": "Immédiatement"
+  },
+  "onSystemLock": {
+    "message": "Au verrouillage du système"
+  },
+  "onAppRestart": {
+    "message": "Au redémarrage de l'application"
   },
   "hours": {
     "message": "Heures"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Êtes-vous certain de vouloir autoriser un délai d'expiration maximum de \"Jamais\" pour tous les membres ?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Cette option enregistrera les clés de chiffrement de vos membres sur leurs appareils. Si vous choisissez cette option, assurez-vous que leurs appareils sont correctement protégés."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "En savoir plus sur la protection de l'appareil"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "Le \"Verrouillage du système\" ne s'appliquera qu'au navigateur et à l'application bureau"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Les applications mobile et web utiliseront \"au redémarrage de l'application\" comme délai d'expiration maximum autorisé, puisque l'option n'est pas prise en charge."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Les politiques de sécurité de votre organisation ont défini le délai d'expiration de votre coffre à $HOURS$ heure(s) et $MINUTES$ minute(s) maximum.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Vous devez ajouter soit l'URL du Serveur de base, soit au moins un environnement personnalisé."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Les URLs doivent utiliser HTTPS."
+  },
   "apiUrl": {
     "message": "URL du serveur API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Seul le coffre de l'organisation associé à $ORGANIZATION$ sera exporté.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Seul le coffre de l'organisation associé à $ORGANIZATION$ sera exporté. Mes éléments de mes collections ne seront pas inclus.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Accès Refusé. Vous n'avez pas l'autorisation d'afficher cette page."
   },
+  "noPageAccess": {
+    "message": "Vous n'avez pas accès à cette page"
+  },
   "masterPassword": {
     "message": "Mot de passe principal"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Secret inconnu, vous devrez peut-être demander l'autorisation d'accéder à ce secret."
   },
+  "unknownServiceAccount": {
+    "message": "Compte machine inconnu, vous devrez peut-être demander l'autorisation d'accéder à ce compte machine."
+  },
   "unknownProject": {
     "message": "Projet inconnu, vous devrez peut-être demander l'autorisation d'accéder à ce projet."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Groupe/Utilisateur"
   },
-  "lowKdfIterations": {
-    "message": "Itérations KDF basses"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Mettez à jour vos paramètres de chiffrement pour répondre à de nouvelles recommandations de sécurité et améliorer la protection de votre compte."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Effectuer cette action vous déconnectera de toutes les sessions actives. Vous devrez vous connecter à nouveau et compléter votre authentification à 2 facteurs, s'il y a lieu. Nous vous recommandons d'exporter votre coffre avant de modifier vos paramètres de chiffrement pour prévenir la perte de vos données."
   },
@@ -8485,7 +8899,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "A accédé à un projet avec l'identifiant : $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "A supprimé le compte machine ID : $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "A modifié un projet avec l'identifiant : $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Utilisateur ajouté : $USER_ID$ au compte machine avec l'ID : $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "A supprimé l'utilisateur : $USER_ID$ du compte machine avec l'ID : $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "A supprimé le groupe : $GROUP_ID$ du compte machine avec l'ID : $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "A créé le compte machine avec l'ID : $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "A ajouté le groupe : $GROUP_ID$ du compte machine avec l'ID : $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "A supprimé le compte machine avec l'ID : $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "A supprimé un projet avec l'identifiant : $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Connecté !"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assigner l'accès à la collection"
   },
@@ -9109,10 +9599,10 @@
     "message": "Passkey"
   },
   "passkeyNotCopied": {
-    "message": "La Passkey ne sera pas copiée"
+    "message": "La clé d'accès ne sera pas copiée"
   },
   "passkeyNotCopiedAlert": {
-    "message": "La passkey ne sera pas copiée à l'item cloné. Voulez-vous continuez à cloner cet élément?"
+    "message": "La clé d'accès ne sera pas copiée à l'item cloné. Voulez-vous continuez à cloner cet élément?"
   },
   "modifiedCollectionManagement": {
     "message": "Paramètre de gestion de la collection modifiée $ID$.",
@@ -9330,6 +9820,14 @@
     "message": "Trop cher",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Passage à l'abonnement gratuit",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Passage à l'organisation gratuite",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Gratuit pour 1 an"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assigner"
   },
+  "assignTasks": {
+    "message": "Assigner des tâches"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Envoyer des notifications pour modifier les mots de passe"
+  },
   "assignToCollections": {
     "message": "Assigner aux collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Envoyer les données de l'événement à votre instance Logscale"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Envoyer les données de l'événement du coffre à votre instance Datadog"
+  },
   "failedToSaveIntegration": {
     "message": "Impossible d'enregistrer l'intégration. Veuillez réessayer plus tard."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Vous devez être le propriétaire de l'organisation pour effectuer cette action."
+  },
   "failedToDeleteIntegration": {
     "message": "La suppression de l'intégration échouée. Veuillez réessayer plus tard."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Nombres d'itérations KDF bas. Augmentez vos itérations pour améliorer la sécurité de votre compte."
-  },
-  "changeKDFSettings": {
-    "message": "Modifier les paramètres KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Sécurisez votre infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Désactivé"
   },
-  "higherKDFIterations": {
-    "message": "Des itérations KDF plus élevées peuvent aider à protéger votre mot de passe principal contre la force brute d'un assaillant."
-  },
-  "incrementsOf100,000": {
-    "message": "incréments de 100 000"
-  },
-  "smallIncrements": {
-    "message": "petits incréments"
-  },
   "kdfIterationRecommends": {
     "message": "Nous vous recommandons 600 000 ou plus"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Pour les appareils plus anciens, régler le nombre d'itérations KDF trop haut peut entraîner des problèmes de performance. Augmentez la valeur dans $VALUE$ et testez vos appareils.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contactez le Support Client pour rétablir votre abonnement."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domaine réclamé"
   },
+  "itemAddedToFavorites": {
+    "message": "Élément ajouté aux favoris"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Élément retiré des favoris"
+  },
+  "copyNote": {
+    "message": "Copier la note"
+  },
   "organizationNameMaxLength": {
     "message": "Le nom de l'organisation ne doit pas dépasser 50 caractères."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Ouverture réussie de l'extension du navigateur Bitwarden. Vous pouvez maintenant revoir vos mots de passe à risque."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Nous avons eu des difficultés à ouvrir l'extension de navigateur Bitwarden. Ouvrez l'icône Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "de la barre d'outils.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Votre abonnement sera renouvelé bientôt. Pour assurer un service ininterrompu, contactez $RESELLER$ pour confirmer votre renouvellement avant le $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Rechercher dans l'archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Désarchiver"
+  },
+  "itemsInArchive": {
+    "message": "Éléments dans l'archive"
   },
   "noItemsInArchive": {
     "message": "Aucun élément dans l'archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Les éléments archivés apparaîtront ici et seront exclus des résultats de recherche généraux et des suggestions de remplissage automatique."
   },
+  "itemWasSentToArchive": {
+    "message": "L'élément a été envoyé à l'archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Les éléments ont été envoyés à l'archive"
+  },
+  "itemUnarchived": {
+    "message": "L'élément a été désarchivé"
+  },
+  "bulkArchiveItems": {
+    "message": "Éléments archivés"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Éléments désarchivés"
+  },
+  "archiveItem": {
+    "message": "Archiver l'élément",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Les éléments archivés sont exclus des résultats de recherche généraux et des suggestions de remplissage automatique. Êtes-vous sûr de vouloir archiver cet élément ?"
+  },
+  "archiveBulkItems": {
+    "message": "Archiver les éléments",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Les éléments archivés sont exclus des résultats de recherche généraux et des suggestions de remplissage automatique. Êtes-vous sûr de vouloir archiver ces éléments ?"
+  },
   "businessUnit": {
     "message": "Unité d'affaires"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "L'extension Bitwarden est installée !"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "L'extension Bitwarden est installée !"
+  },
   "openExtensionToAutofill": {
     "message": "Ouvrez l'extension pour vous connecter et démarrer le remplissage automatique."
   },
@@ -11154,6 +11684,14 @@
     "message": "Centre d'apprentissage",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Si l'extension n'est pas ouverte, vous devrez peut-être ouvrir Bitwarden à partir de l'icône ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " sur la barre d'outils.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Centre d’aide",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Intégrations transparentes"
+  },
+  "families": {
+    "message": "Familles"
+  },
+  "upgradeToFamilies": {
+    "message": "Mettre à niveau vers les Familles"
+  },
+  "upgradeToPremium": {
+    "message": "Mettre à niveau vers Premium"
+  },
+  "familiesUpdated": {
+    "message": "Vous avez mis à niveau vers Familles!"
+  },
+  "taxCalculationError": {
+    "message": "Une erreur s'est produite lors du calcul de la taxe pour votre emplacement. Veuillez réessayer."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Bienvenue sur Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Déverrouillez plus de fonctionnalités de sécurité avec Premium, ou commencez à partager des éléments avec Familles"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Les prix excluent les taxes et sont facturés annuellement."
+  },
+  "organizationNameDescription": {
+    "message": "Le nom de votre organisation apparaîtra dans les invitations que vous envoyez aux membres."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continuer sans mettre à niveau"
+  },
+  "upgradeYourPlan": {
+    "message": "Mettez votre forfait à niveau"
+  },
+  "upgradeNow": {
+    "message": "Mettre à niveau maintenant"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Compléter ce formulaire créera une nouvelle organisation Familles. Vous pouvez mettre à niveau votre organisation gratuite à partir de la Console Admin."
+  },
+  "upgradeErrorMessage": {
+    "message": "Nous avons rencontré une erreur lors du traitement de votre mise à niveau. Veuillez réessayer."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Vous avez le forfait Bitwarden Gratuit"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Passez au forfait supérieur pour une sécurité complète"
+  },
+  "viewbusinessplans": {
+    "message": "Voir les forfaits d'affaires"
+  },
+  "updateEncryptionSettings": {
+    "message": "Mettre à jour les paramètres de chiffrement"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Mettre à jour vos paramètres de chiffrement"
+  },
+  "updateSettings": {
+    "message": "Mettre à jour les paramètres"
+  },
+  "algorithm": {
+    "message": "Algorithme"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choisissez comment Bitwarden devrait chiffrer les données de votre coffre. Toutes les options sont sécures, mais les méthodes plus robustes offrent une meilleure protection - en particulier contre les attaques par force brute. Bitwarden recommande le réglage par défaut pour la plupart des utilisateurs."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Augmenter les valeurs au-dessus des valeurs par défaut améliorera la sécurité, mais votre coffre peut prendre plus de temps à déverrouiller dû à cela."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "À propos des algorithmes de chiffrement"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 est une méthode de cryptage bien testée qui offre un équilibre entre la sécurité et les performances. Il est adéquat pour tous les utilisateurs."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offre une protection renforcée contre les attaques modernes. Il est le meilleur pour les utilisateurs avancés utilisant des appareils puissants."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Code postal"
+  },
+  "cardNumberLabel": {
+    "message": "Numéro de carte"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Commencez l'essai gratuit au forfait Familles"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Bloquer la création de compte pour les domaines réclamés"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Empêcher les utilisateurs de créer des comptes en dehors de votre organisation en utilisant les adresses courriel des domaines revendiqués."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Un domaine doit être réclamé avant d'activer cette politique de sécurité."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Configurez une méthode de déverrouillage pour changer le délai d'expiration de votre coffre."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Les exigences de la politique de sécurité d'Entreprise ont été appliquées à vos options de délai d'expiration"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Le délai d'expiration de votre coffre dépasse les restrictions définies par votre organisation."
+  },
+  "neverLockWarning": {
+    "message": "Êtes-vous sûr de vouloir utiliser l'option \"Jamais\" ? Définir le verrouillage sur \"Jamais\" stocke la clé de chiffrement de votre coffre sur votre appareil. Si vous utilisez cette option, vous devez vous assurer de correctement protéger votre appareil."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Action à l’expiration"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Expiration de la session"
+  },
+  "appearance": {
+    "message": "Apparence"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Le délai d'expiration dépasse la restriction définie par votre organisation : $HOURS$ heure(s) et $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Aucune application critique n'est sélectionnée"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Êtes-vous sûr de vouloir continuer ?"
+  },
+  "userVerificationFailed": {
+    "message": "La vérification de l'utilisateur a échoué."
   }
 }
diff --git a/apps/web/src/locales/gl/messages.json b/apps/web/src/locales/gl/messages.json
index 8c163ef4f6a..ce34dee8f42 100644
--- a/apps/web/src/locales/gl/messages.json
+++ b/apps/web/src/locales/gl/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoritos"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tipos"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/he/messages.json b/apps/web/src/locales/he/messages.json
index 72a63ab210a..6560e2f2222 100644
--- a/apps/web/src/locales/he/messages.json
+++ b/apps/web/src/locales/he/messages.json
@@ -3,7 +3,7 @@
     "message": "כל היישומים"
   },
   "activity": {
-    "message": "Activity"
+    "message": "פעילות"
   },
   "appLogoLabel": {
     "message": "הלוגו של Bitwarden"
@@ -15,17 +15,20 @@
     "message": "אין יישומים קריטיים בסיכון"
   },
   "accessIntelligence": {
-    "message": "גישה למודיעין"
-  },
-  "riskInsights": {
-    "message": "תובנות סיכון"
+    "message": "מודיעין גישות"
   },
   "passwordRisk": {
     "message": "סיכון סיסמה"
   },
+  "noEditPermissions": {
+    "message": "אין לך הרשאות לערוך את הפריט הזה"
+  },
   "reviewAtRiskPasswords": {
     "message": "סקור סיסמאות בסיכון (חלשות, חשופות, או משומשות) בין יישומים. בחר את היישומים הכי קריטיים שלך על מנת לתעדף פעולות אבטחה עבור המשתמשים שלך כדי לטפל בסיסמאות בסיכון."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "סקור כניסות בסיכון"
+  },
   "dataLastUpdated": {
     "message": "הנתונים עודכנו לאחרונה: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "עדיין לא יצרת דוח"
+  },
   "notifiedMembers": {
     "message": "חברים שהודיעו להם"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "צור פריט כניסה חדש"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "$PERCENT$% הושלמו",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ מתוך $TOTAL$ משימות אבטחה הושלמו",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "התקדמות שינוי סיסמה"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "הקצה משימות לחברים כדי לנטר התקדמות"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "שלח תזכורות"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "לאחר שתסמן יישומים כקריטיים, הם יופיעו כאן."
+  },
+  "viewAtRiskMembers": {
+    "message": "הצג חברים בסיכון"
+  },
+  "viewAtRiskApplications": {
+    "message": "הצג יישומים בסיכון"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ מתוך $TOTAL$ יישומים קריטיים הם בסיכון בשל סיסמאות בסיכון",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "יישומים קריטיים ($COUNT$)",
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "יישומים קריטיים סומנו"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "$COUNT$ יישומים קריטיים",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ יישומים בסיכון",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ סיסמאות בסיכון",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ סיסמאות חדשות בסיכון",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "חברים שהודיעו להם ($COUNT$)",
     "placeholders": {
@@ -89,23 +178,41 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "לא נמצאו יישומים אצל $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "ככל שמשתמשים שומרים כניסות, יישומים מופיעים כאן, ומוצגות כל הסיסמאות בסיכון. סמן יישומים קריטיים והודע למשתמשים לעדכן סיסמאות."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "לא סימנת אף יישום כקריטי"
   },
   "noCriticalApplicationsDescription": {
-    "message": "בחר את האפליקציות הקריטיות ביותר שלך כדי לתעדף פעולות אבטחה עבור המשתמשים שלך כדי לטפל בסיסמאות בסיכון."
+    "message": "בחר את היישומים הקריטיים ביותר שלך כדי לתעדף פעולות אבטחה עבור המשתמשים שלך על מנת לטפל בסיסמאות בסיכון."
   },
   "markCriticalApplications": {
     "message": "בחר יישומים קריטיים"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "סמן יישום כקריטי"
   },
+  "markAsCritical": {
+    "message": "סמן כקריטי"
+  },
+  "applicationsSelected": {
+    "message": "יישומים נבחרו"
+  },
+  "selectApplication": {
+    "message": "בחר יישום"
+  },
+  "unselectApplication": {
+    "message": "בטל בחירת יישום"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "יישומים המסומנים כקריטיים"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ יישומים סומנו כקריטיים",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "סימון יישומים כקריטיים נכשל"
+  },
   "application": {
     "message": "יישום"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "חברים בסיכון"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "חברים עם סיסמאות בסיכון"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ חברים בסיכון",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "חברים אלה נכנסו אל יישומים עם סיסמאות חלשות, חשופות, או משומשות."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "אין חברים שנכנסו אל יישומים עם סיסמאות חלשות, חשופות, או משומשות."
@@ -203,11 +340,83 @@
   "totalApplications": {
     "message": "סה\"כ יישומים"
   },
+  "applicationsNeedingReview": {
+    "message": "יישומים צריכים סקירה"
+  },
+  "newApplicationsCardTitle": {
+    "message": "סקור יישומים חדשים"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ יישומים חדשים",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "סקור יישומים חדשים לסימון כקריטיים ושמור על אבטחת הארגון שלך"
+  },
+  "reviewNow": {
+    "message": "סקור עכשיו"
+  },
+  "allCaughtUp": {
+    "message": "הכל טופל!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "סקור יישומים"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "תעדוף יישומים קריטיים"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "סקור יישומים חדשים"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "שימושיות 'סמן כקריטי' תיושם בעדכון עתידי"
+  },
+  "applicationReviewSaved": {
+    "message": "סקירת היישום נשמרה"
+  },
+  "newApplicationsReviewed": {
+    "message": "יישומים חדשים נסקרו"
+  },
+  "errorSavingReviewStatus": {
+    "message": "שגיאה בשמירת מצב סקירה"
+  },
+  "pleaseTryAgain": {
+    "message": "נא לנסות שוב"
+  },
   "unmarkAsCritical": {
     "message": "בטל סימון כקריטי"
   },
   "criticalApplicationUnmarkedSuccessfully": {
-    "message": "ביטול הסימון של האפליקציה כקריטית בוצע בהצלחה"
+    "message": "בוטל בהצלחה הסימון של היישום כקריטי"
   },
   "whatTypeOfItem": {
     "message": "מאיזה סוג פריט זה?"
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "מועדפים"
   },
+  "taskSummary": {
+    "message": "סיכום משימה"
+  },
   "types": {
     "message": "סוגים"
   },
@@ -762,79 +974,79 @@
     "message": "הצג פריט"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "כניסה חדשה",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "כרטיס חדש",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "זהות חדשה",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "הערה חדשה",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "מפתח SSH חדש",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "סֵנְד של טקסט חדש",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "סֵנְד של קובץ חדש",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "ערוך כניסה",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "ערוך כרטיס",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "ערוך זהות",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "ערוך הערה",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "ערוך מפתח SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "ערוך סֵנְד של טקסט",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "ערוך סֵנְד של קובץ",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "הצג כניסה",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "הצג כרטיס",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "הצג זהות",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "הצג הערה",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "הצג מפתח SSH",
     "description": "Header for view SSH key item type"
   },
   "new": {
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "השאר חלון זה פתוח ועקוב אחר ההנחיות מהדפדפן שלך."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "אימות מפתח גישה נכשל. נא לנסות שוב."
+  },
   "useADifferentLogInMethod": {
     "message": "השתמש בשיטת כניסה אחרת"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "השתמש בכניסה יחידה"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "הארגון שלך דורש כניסה יחידה."
+  },
   "welcomeBack": {
     "message": "ברוך שובך"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "סיסמה ראשית שגויה"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "סיסמה ראשית אינה תקינה. יש לאשר שהדוא\"ל שלך נכון ושהחשבון שלך נוצר ב־$HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "סיסמת קובץ שגויה, נא להשתמש בסיסמה שהזנת כשיצרת את קובץ הייצוא."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "אין פריטים להצגה ברשימה."
   },
+  "noItemsInTrash": {
+    "message": "אין פריטים באשפה"
+  },
+  "noItemsInTrashDesc": {
+    "message": "פריטים שאתה מוחק יופיעו כאן ויימחקו לצמיתות לאחר 30 יום"
+  },
+  "noItemsInVault": {
+    "message": "אין פריטים בכספת"
+  },
+  "emptyVaultDescription": {
+    "message": "הכספת מגנה על יותר מרק הסיסמאות שלך. אחסן כניסות מאובטחות, זהויות, כרטיסים והערות באופן מאובטח כאן."
+  },
+  "emptyFavorites": {
+    "message": "לא הוספת למועדפים פריטים כלשהם"
+  },
+  "emptyFavoritesDesc": {
+    "message": "הוסף פריטים בשימוש תכוף למועדפים עבור גישה מהירה."
+  },
+  "noSearchResults": {
+    "message": "לא הוחזרו תוצאות חיפוש"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "נקה מסננים או נסה מונח חיפוש אחר"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "אין לך הרשאה להציג את כל הפריטים באוסף זה."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "הגדרות מפתח הצפנה"
   },
-  "kdfAlgorithm": {
-    "message": "אלגוריתם KDF"
-  },
   "kdfIterations": {
     "message": "חזרות KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "ערכי חזרות, זיכרון, ומקבילות KDF גבוהים יותר יכולים לעזור להגן על הסיסמה הראשית מפני תקיפה כוחנית על ידי תוקף."
   },
-  "changeKdf": {
-    "message": "שנה KDF"
-  },
   "encKeySettingsChanged": {
     "message": "הגדרות מפתח ההצפנה נשמרו"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "אנא ודא כי יש בחשבונך מספיק קרדיט עבור רכישה זו. אם בחשבונך אין די קרדיט, נשתמש בשיטת התשלום המועדפת בחשבונך כדי לגבות את הפער. באפשרותך להוסיף קרדיט לחשבונך דרך עמוד החיוב."
   },
+  "notEnoughAccountCredit": {
+    "message": "אין לך מספיק אשראי בחשבון עבורו רכישה זו. באפשרותך להוסיף אשראי לחשבון שלך מדף החיוב."
+  },
   "creditAppliedDesc": {
     "message": "ניתן להשתמש בקרדיט שבחשבונך כדי לבצע רכישות. נשתמש בקרדיט הראשון הזמין עבור חשבוניות בחשבון זה."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "החיוב הבא"
   },
+  "nextChargeHeader": {
+    "message": "החיוב הבא"
+  },
+  "plan": {
+    "message": "תוכנית"
+  },
   "details": {
     "message": "פרטים"
   },
+  "discount": {
+    "message": "הנחה"
+  },
   "downloadLicense": {
     "message": "הורד רישיון"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "עדכן דפדפן"
   },
-  "generatingYourRiskInsights": {
-    "message": "מייצר את תובנות הסיכון שלך..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "הרץ דוח"
   },
   "updateBrowserDesc": {
     "message": "אתה משתמש בדפדפן אינטרנט שאיננו נתמך. כספת הרשת עלולה שלא לפעול כראוי."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "ההזמנה התקבלה"
   },
-  "inviteAcceptedDesc": {
-    "message": "תוכל לקבל גישה לארגון זה כשאחד המנהלים יאשר את החברות שלך. נשלח לך מייל כשזה יקרה."
+  "invitationAcceptedDesc": {
+    "message": "קיבל בהצלחה את ההזמנה שלך."
   },
   "inviteInitAcceptedDesc": {
     "message": "אתה יכול עכשיו לגשת אל ארגון זה."
@@ -4770,7 +5054,13 @@
     "description": "ex. Date this password was updated"
   },
   "organizationIsDisabled": {
-    "message": "הארגון הושעה"
+    "message": "ארגון מושעה"
+  },
+  "organizationIsSuspended": {
+    "message": "הארגון מושעה"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "לא ניתן לגשת לפריטים בארגון מושעה. פנה אל בעל הארגון שלך עבור סיוע."
   },
   "secretsAccessSuspended": {
     "message": "לא ניתן לגשת אל ארגונים מושעים. נא לפנות לבעל הארגון שלך עבור סיוע."
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "לא ניתן ליצור חשבונות שירות בארגונים מושעים. נא לפנות אל בעל הארגון שלך עבור סיוע."
   },
-  "disabledOrganizationFilterError": {
-    "message": "לא ניתן לגשת לפריטים בארגון מושעה. פנה אל בעל הארגון שלך עבור סיוע."
-  },
   "licenseIsExpired": {
     "message": "תוקף הרשיון הסתיים."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "מזהה SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "ספק את המזהה הזה לחברים שלך כדי שיכנסו עם SSO. כדי לעקוף את השלב הזה, הגדר ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "ספק את המזהה הזה לחברים שלך כדי שיכנסו באמצעות SSO. חברים יכולים לדלג על הזנת מזהה זה במהלך SSO אם הוגדר דומיין שנדרש. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "למד עוד",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "נתק SSO"
@@ -5198,10 +5489,10 @@
     "message": "תנאים מקדימים"
   },
   "requireSsoPolicyReq": {
-    "message": "יש להפעיל את המדיניות הארגונית של הארגון היחיד לפני הפעלת מדיניות זו."
+    "message": "יש להפעיל את המדיניות הארגונית של הארגון היחידי לפני הפעלת מדיניות זו."
   },
   "requireSsoPolicyReqError": {
-    "message": "מדיניות ארגון יחיד לא הוגדרה."
+    "message": "מדיניות ארגון יחידי לא הוגדרה."
   },
   "requireSsoExemption": {
     "message": "מנהלי ובעלי הארגון פטורים מהאכיפה של מדיניות זו."
@@ -5518,9 +5809,9 @@
     "message": "דרוש שכל הפריטים יהיו בבעלות ארגון, מה שמסיר את האפשרות לאחסן פריטים ברמת החשבון.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "כל הפריטים יהיו בבעלות הארגון ויישמרו בו, מה שמאפשר בקרות, נראות, ודיווח כלל־ארגוניות. כאשר אפשרות זו מופעלת, אוסף ברירת מחדל יהיה זמין עבור כל חבר כדי לאחסן פריטים. למד עוד על ניהול ה",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "מחזור החיים של אישורים",
@@ -5545,6 +5836,65 @@
     "message": "למד עוד על ה",
     "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.'"
   },
+  "availableNow": {
+    "message": "זמין עכשיו"
+  },
+  "autoConfirm": {
+    "message": "אישור אוטומטי של משתמשים חדשים"
+  },
+  "autoConfirmDescription": {
+    "message": "משתמשים חדשים המוזמנים לארגון יאושרו באופן אוטומטי כאשר מכשיר של מנהל נפתח.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "איך להפעיל אישור משתמש אוטומטי"
+  },
+  "autoConfirmExtension1": {
+    "message": "פתח את הרחבת Bitwarden שלך"
+  },
+  "autoConfirmExtension2": {
+    "message": "בחר",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " הפעל",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "הרחבת Bitwarden לדפדפן נפתחה בהצלחה. כעת ביכולתך להפעיל את הגדרת אישור אוטומטי של משתמשים."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "משתמשים חדשים המוזמנים לארגון יאושרו באופן אוטומטי כאשר מכשיר של מנהל נפתח. לפני הפעלת מדיניות זו, נא לסקור ולהסכים לדברים הבאים: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "סיכון אבטחה פוטנציאלי. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "אישור אוטומטי של משתמשים עלול להוות סיכון אבטחה לנתוני הארגון שלך."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "למד על הסיכונים",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "נדרשת מדיניות ארגון יחידי. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "מדיניות ארגון יחידי תורחב לכל התפקידים. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "אין גישת חירום. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "גישת חירום תוסר."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "אני מסכים לסיכונים ועדכוני מדיניות אלה"
+  },
   "personalOwnership": {
     "message": "הסר כספת אישית"
   },
@@ -5558,10 +5908,10 @@
     "message": "בשל מדיניות ארגונית, אתה מוגבל מלשמור פריטים לכספת האישית שלך. שנה את אפשרות הבעלות לארגון ובחר מאוספים זמינים."
   },
   "desktopAutotypePolicy": {
-    "message": "Desktop Autotype Default Setting"
+    "message": "הגדרת ברירת מחדל עבור הקלדה אוטומטית בשולחן עבודה"
   },
   "desktopAutotypePolicyDesc": {
-    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "message": "הפעל הקלדה אוטומטית בשולחן עבודה כברירת מחדל עבור חברים. חברים יכולים להשבית הקלדה אוטומטית באופן ידני בלקוח שולחן העבודה.",
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
@@ -5597,6 +5947,19 @@
     "message": "הצג תמיד את כתובת הדוא\"ל של חבר מנמענים בעת יצירת או עריכת סֵנְד.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "ברירת מחדל לזיהוי התאמת URI"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "ברירת מחדל לזיהוי התאמת URI"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "מדיניות $ID$ שונתה.",
     "placeholders": {
@@ -5977,7 +6340,7 @@
     "message": "חברים בעלי חשבונות קיימים עם סיסמאות ראשיות יידרשו להירשם בעצמם לפני שמנהלים יוכלו לשחזר את החשבונות שלהם. הרשמה אוטומטית תפעיל שחזור חשבון עבור חברים חדשים."
   },
   "accountRecoverySingleOrgRequirementDesc": {
-    "message": "יש להפעיל את המדיניות הארגונית של הארגון היחיד לפני הפעלת מדיניות זו."
+    "message": "יש להפעיל את המדיניות הארגונית של הארגון היחידי לפני הפעלת מדיניות זו."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "הרשמה אוטומטית"
@@ -6070,7 +6433,7 @@
     "message": "חברים שאינם עומדים בדרישות"
   },
   "nonCompliantMembersError": {
-    "message": "חברים שאינם עומדים בדרישות מדיניות הארגון היחיד או הכניסה הדו־שלבית אינם ניתנים לשחזור עד שהם יעמדו בדרישות המדיניות"
+    "message": "חברים שאינם עומדים בדרישות מדיניות הארגון היחידי או הכניסה הדו־שלבית אינם ניתנים לשחזור עד שהם יעמדו בדרישות המדיניות"
   },
   "fingerprint": {
     "message": "טביעת אצבע"
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "הסיסמה הראשית שלך אינה עומדת באחת או יותר מפוליסות הארגון שלך. כדי לגשת לכספת, אתה מוכרח לעדכן את הסיסמה הראשית שלך עכשיו. בהמשך תנותק מההפעלה הנוכחית שלך, מה שידרוש ממך להיכנס חזרה. הפעלות פעילות במכשירים אחרים עלולות להישאר פעילות למשך עד שעה אחת."
   },
-  "automaticAppLogin": {
-    "message": "הכנס באופן אוטומטי משתמשים עבור יישומים מותרים"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "טפסי כניסה ימולאו ויוגשו באופן אוטומטי עבור יישומים שנפתחו מספק הזהות המוגדר שלך."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "מארח ספק זהות"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "הארגון שלך עדכן את אפשרויות הפענוח שלך. נא להגדיר סיסמה ראשית כדי לגשת לכספת שלך."
   },
-  "maximumVaultTimeout": {
-    "message": "פסק זמן לכספת"
+  "sessionTimeoutPolicyTitle": {
+    "message": "פסק זמן להפעלה"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "הגדר פסק זמן מרבי לכספת עבור חברים."
+  "sessionTimeoutPolicyDescription": {
+    "message": "הגדר פסק זמן להפעלה מרבי עבור כל החברים חוץ מבעלים."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "פסק זמן מרבי לכספת"
+  "maximumAllowedTimeout": {
+    "message": "פסק הזמן המרבי המותר"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "פסק זמן מרבי לכספת לא חוקי."
+  "maximumAllowedTimeoutRequired": {
+    "message": "נדרש פסק הזמן המרבי המותר."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "הזמן אינו חוקי. שנה לפחות ערך אחד."
+  },
+  "sessionTimeoutAction": {
+    "message": "פעולת פסק זמן להפעלה"
+  },
+  "immediately": {
+    "message": "באופן מיידי"
+  },
+  "onSystemLock": {
+    "message": "בנעילת המערכת"
+  },
+  "onAppRestart": {
+    "message": "בהפעלת היישום מחדש"
   },
   "hours": {
     "message": "שעות"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "דקות"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "האם אתה בטוח שברצונך להתיר פסק זמן מרבי של \"לעולם לא\" עבור כל החברים?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "אפשרות זו תשמור את מפתחות ההצפנה של החברים שלך במכשירים שלהם. אם אתה בוחר אפשרות זו, תוודא שהמכשירים שלהם מוגנים במידה מספקת."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "למד עוד על הגנת מכשיר"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"נעילת מערכת\" חלה רק על היישום לדפדפן ולשולחן העבודה"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "היישום לנייד וברשת ישתמש באפשרות \"בהפעלת היישום מחדש\" בתור פסק הזמן המרבי המותר, מאחר והאפשרות אינה נתמכת."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "פוליסות הארגון שלך הגדירו את פסק הזמן לכספת המרבי שלך ל־$HOURS$ שעות ו־$MINUTES$ דקות.",
     "placeholders": {
@@ -6729,7 +7122,7 @@
     "message": "SSO כבוי"
   },
   "emailMustLoginWithSso": {
-    "message": "$EMAIL$ must login with Single Sign-on",
+    "message": "$EMAIL$ מוכרח להיכנס עם כניסה יחידה",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "אתה מוכרח להוסיף או את בסיס ה־URL של השרת או לפחות סביבה מותאמת אישית אחת."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "כתובות URL מוכרחות להשתמש ב־HTTPS."
+  },
   "apiUrl": {
     "message": "URL של שרת ה־API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "רק הכספת הארגונית המשויכת עם $ORGANIZATION$ תיוצא.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "רק הכספת הארגונית המשויכת עם $ORGANIZATION$ תיוצא. פריטי האוספים שלי לא יכללו.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "גישה נדחתה. אין לך הרשאות כדי לצפות בעמוד זה."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "סיסמה ראשית"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "סוד לא ידוע, ייתכן שאתה צריך לבקש הרשאה כדי לגשת אל סוד זה."
   },
+  "unknownServiceAccount": {
+    "message": "חשבון מכונה לא ידוע, ייתכן שתצטרך לבקש הרשאה לגשת לחשבון מכונה זה."
+  },
   "unknownProject": {
     "message": "פרויקט לא ידוע, ייתכן שאתה צריך לבקש הרשאה כדי לגשת אל פרויקט זה."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "קבוצה/משתמש"
   },
-  "lowKdfIterations": {
-    "message": "חזרות KDF נמוכות"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "שדרג את הגדרות ההצפנה שלך כדי לעמוד בהמלצות אבטחה חדשות ולשפר את הגנת החשבון."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "המשך התהליך יוציא אותך מכל ההפעלות הפעילות שלך. תידרש להיכנס חזרה כדי להמשיך כניסה דו-שלבית, אם ישנה. אנו ממליצים על ייצוא הכספת שלך לפני שינוי הגדרות ההצפנה שלך כדי למנוע איבוד נתונים."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "ניגש אל פרויקט עם מזהה: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "ניגש לפרויקט עם מזהה: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "מזהה חשבון המכונה שנמחק: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "ערך פרויקט עם מזהה: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "הוסיף משתמש: $USER_ID$ לחשבון מכונה עם מזהה: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "הסיר משתמש: $USER_ID$ מחשבון מכונה עם מזהה: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "הסיר קבוצה: $GROUP_ID$ מחשבון מכונה עם מזהה: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "יצר חשבון מכונה עם מזהה: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "הוסיף קבוצה: $GROUP_ID$ לחשבון מכונה עם מזהה: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "מחק חשבון מכונה עם מזהה: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "מחק פרויקט עם מזהה: $PROJECT_ID$",
     "placeholders": {
@@ -8728,7 +9221,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink1": {
-    "message": "מדיניות הארגון היחיד",
+    "message": "מדיניות הארגון היחידי",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart2": {
@@ -9031,20 +9524,20 @@
     "message": "הגדר את התנהגות האוספים עבור הארגון"
   },
   "allowAdminAccessToAllCollectionItemsDescription": {
-    "message": "אפשר לבעלים ומנהלים לנהל את כל האוספים והפריטים ממסוף המנהל"
+    "message": "אפשר לבעלים ולמנהלים לנהל את כל האוספים והפריטים ממסוף המנהל"
   },
   "restrictCollectionCreationDescription": {
-    "message": "הגבל יצירת אוספים לבעלים ומנהלים"
+    "message": "הגבל יצירת אוספים לבעלים ולמנהלים"
   },
   "restrictCollectionDeletionDescription": {
-    "message": "הגבל מחיקת אוספים לבעלים ומנהלים"
+    "message": "הגבל מחיקת אוספים לבעלים ולמנהלים"
   },
   "restrictItemDeletionDescriptionStart": {
-    "message": "Restrict item deletion to members with the ",
+    "message": "הגבל מחיקת פריטים לחברים עם הרשאת ",
     "description": "This will be used as part of a larger sentence, broken up to allow styling of the middle portion. Full sentence: 'Restrict item deletion to members with the [Manage collection] permission'"
   },
   "restrictItemDeletionDescriptionEnd": {
-    "message": " permission",
+    "message": "​",
     "description": "This will be used as part of a larger sentence, broken up to allow styling of the middle portion. Full sentence: 'Restrict item deletion to members with the [Manage collection] permission'"
   },
   "updatedCollectionManagement": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "נכנסת!"
   },
-  "beta": {
-    "message": "בטא"
-  },
   "assignCollectionAccess": {
     "message": "הקצה גישה לאוסף"
   },
@@ -9178,7 +9668,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "הופעלה הגדרת הרשה לבעלים ומנהלים לנהל את כל האוספים והפריטים $ID$.",
+    "message": "הופעלה הגדרת 'אפשר לבעלים ולמנהלים לנהל את כל האוספים והפריטים' $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9187,7 +9677,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "כובתה הגדרת הרשה לבעלים ומנהלים לנהל את כל האוספים והפריטים $ID$.",
+    "message": "כובתה הגדרת 'אפשר לבעלים ולמנהלים לנהל את כל האוספים והפריטים' $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9330,6 +9820,14 @@
     "message": "יקר מדי",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "חינם לשנה אחת"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "הקצה"
   },
+  "assignTasks": {
+    "message": "הקצה משימות"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "הקצה לאוספים"
   },
@@ -9752,11 +10256,17 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "שלח נתוני אירועים אל מופע ה־Logscale שלך"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "שלח נתוני אירועי כספת אל מופע ה־Datadog שלך"
+  },
   "failedToSaveIntegration": {
     "message": "שמירת האינטגרציה נכשלה. נא לנסות שוב מאוחר יותר."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "אתה מוכרח להיות מנהל הארגון כדי לבצע פעולה זו."
+  },
   "failedToDeleteIntegration": {
-    "message": "Failed to delete integration. Please try again later."
+    "message": "מחיקת האינטגרציה נכשלה. נא לנסות שוב מאוחר יותר."
   },
   "deviceIdMissing": {
     "message": "מזהה המכשיר חסר"
@@ -9855,7 +10365,7 @@
     "message": "אסימון נושא"
   },
   "repositoryNameHint": {
-    "message": "Name of the repository to ingest into"
+    "message": "שם המאגר להטמעה"
   },
   "index": {
     "message": "אינדקס"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "חזרות KDF נמוכות. הגדל את מספר החזרות שלך כדי לשפר את האבטחה של חשבונך."
-  },
-  "changeKDFSettings": {
-    "message": "שנה הגדרות KDF"
-  },
   "secureYourInfrastructure": {
     "message": "אבטח את התשתית שלך"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "כבוי"
   },
-  "higherKDFIterations": {
-    "message": "ערכי חזרות KDF גבוהים יותר יכולים לעזור להגן על הסיסמה הראשית מפני תקיפה כוחנית על ידי תוקף."
-  },
-  "incrementsOf100,000": {
-    "message": "במרווחים של 100,000"
-  },
-  "smallIncrements": {
-    "message": "במרווחים קטנים"
-  },
   "kdfIterationRecommends": {
     "message": "אנו ממליצים על 600,000 או יותר"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "עבור מכשירים ישנים יותר, הגדרת ה־KDF שלך לערך גבוה מדי עשויה להוביל לבעיות ביצועים. הגדל את הערך ב־$VALUE$ ובדוק את המכשירים שלך.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " צור קשר עם שירות הלקוחות כדי להחזיר את המנוי שלך."
   },
@@ -10561,7 +11047,7 @@
     "message": "אירוח עצמי"
   },
   "claim-domain-single-org-warning": {
-    "message": "דרישת דומיין תפעיל את מדיניות הארגון היחיד."
+    "message": "דרישת דומיין תפעיל את מדיניות הארגון היחידי."
   },
   "single-org-revoked-user-warning": {
     "message": "חברים שאינם עומדים בדרישות יבוטלו. מנהלים יכולים לשחזר חברים ברגע שהם עזבו את כל הארגונים האחרים."
@@ -10651,7 +11137,7 @@
     "message": "אל תאפשר לחברים לממש תוכנית משפחות דרך ארגון זה."
   },
   "verifyBankAccountWithStatementDescriptorWarning": {
-    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי עסקים. הזן את קוד המתאר של ההצהרה מהפקדה זו בדף החיוב של הארגון כדי לאמת את חשבון הבנק. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
+    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי העסקים הבאים. הזן את קוד המתאר של ההצהרה מהפקדה זו בדף החיוב של הארגון כדי לאמת את חשבון הבנק. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
   },
   "verifyBankAccountWithStatementDescriptorInstructions": {
     "message": "ביצענו מיקרו־הפקדה לחשבון הבנק שלך (זה עשוי לקחת 1-2 ימי עסקים). הזן את הקוד בן שש הספרות המתחיל ב־'SM' הנמצא בתיאור ההפקדה. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "דומיין נדרש"
   },
+  "itemAddedToFavorites": {
+    "message": "פריט נוסף למועדפים"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "פריט הוסר מהמועדפים"
+  },
+  "copyNote": {
+    "message": "העתק הערה"
+  },
   "organizationNameMaxLength": {
     "message": "שם ארגון לא יכול לחרוג מ־50 תווים."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "פתח בהצלחה את הרחבת הדפדפן של Bitwarden. אתה יכול לסקור עכשיו את הסיסמאות בסיכון שלך."
   },
-  "openExtensionManuallyPart1": {
-    "message": "התקשינו לפתוח את הרחבת הדפדפן של Bitwarden. פתח את הסמל של Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "מסרגל הכלים.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "המנוי שלך יתחדש בקרוב. כדי להבטיח שירות רציף, צור קשר עם $RESELLER$ כדי לאשר את החידוש שלך לפני $RENEWAL_DATE$.",
     "placeholders": {
@@ -10995,10 +11482,10 @@
     "message": "שנה סיסמה בסיכון"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "כניסה זו נמצאת בסיכון וחסר בה אתר אינטרנט. הוסף אתר אינטרנט ושנה את הסיסמה לאבטחה חזקה יותר."
+    "message": "כניסה זו נמצאת בסיכון וחסר לה אתר אינטרנט. הוסף אתר אינטרנט ושנה את הסיסמה עבור אבטחה חזקה יותר."
   },
   "missingWebsite": {
-    "message": "לא נמצא אתר אינטרנט"
+    "message": "אתר אינטרנט חסר"
   },
   "removeUnlockWithPinPolicyTitle": {
     "message": "הסר ביטול נעילה עם PIN"
@@ -11022,16 +11509,56 @@
     "message": "לארגונים חינמיים יכולים להיות עד 2 אוספים. שדרג לתוכנית בתשלום כדי להוסיף עוד אוספים."
   },
   "searchArchive": {
-    "message": "Search archive"
+    "message": "חיפוש בארכיון"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "ארכיון",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "העבר לארכיון",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "הסר מהארכיון"
+  },
+  "itemsInArchive": {
+    "message": "פריטים בארכיון"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "אין פריטים בארכיון"
   },
-  "archivedItemsDescription": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  "noItemsInArchiveDesc": {
+    "message": "פריטים בארכיון יופיעו כאן ויוחרגו מתוצאות חיפוש כללי והצעות למילוי אוטומטי."
+  },
+  "itemWasSentToArchive": {
+    "message": "הפריט נשלח לארכיון"
+  },
+  "itemsWereSentToArchive": {
+    "message": "פריטים שנשלחו לארכיון"
+  },
+  "itemUnarchived": {
+    "message": "הפריט הוסר מהארכיון"
+  },
+  "bulkArchiveItems": {
+    "message": "הפריטים הועברו לארכיון"
+  },
+  "bulkUnarchiveItems": {
+    "message": "הפריטים הוסרו מהארכיון"
+  },
+  "archiveItem": {
+    "message": "העבר פריט לארכיון",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "פריטים בארכיון מוחרגים מתוצאות חיפוש כללי והצעות למילוי אוטומטי. האם אתה בטוח שברצונך להעביר פריט זה לארכיון?"
+  },
+  "archiveBulkItems": {
+    "message": "העבר פריטים לארכיון",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "פריטים בארכיון מוחרגים מתוצאות חיפוש כללי והצעות למילוי אוטומטי. האם אתה בטוח שברצונך להעביר פריטים אלה לארכיון?"
   },
   "businessUnit": {
     "message": "יחידת עסקים"
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "הרחבת Bitwarden הותקנה!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "פתח את ההרחבה כדי להיכנס ולהתחיל למלא אוטומטית."
   },
@@ -11154,6 +11684,14 @@
     "message": "מרכז הלמידה",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "מרכז העזרה",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11165,7 +11703,7 @@
     "message": "הפעל מחדש"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
-    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי עסקים. הזן את קוד המתאר של ההצהרה מהפקדה זו בדף המנוי של הספק כדי לאמת את חשבון הבנק. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
+    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי העסקים הבאים. הזן את קוד המתאר של ההצהרה מהפקדה זו בדף המנוי של הספק כדי לאמת את חשבון הבנק. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
   },
   "clickPayWithPayPal": {
     "message": "נא ללחוץ על הלחצן 'שלם עם PayPal' כדי להוסיף את שיטת התשלום שלך."
@@ -11230,7 +11768,7 @@
     "message": "קוד האבטחה של הכרטיס, הידוע גם כ־CVV או CVC, הוא בדרך כלל מספר בן 3 ספרות המודפס על גבי כרטיס האשראי שלך או מספר בן 4 ספרות המודפס מקדימה מעל מספר הכרטיס שלך."
   },
   "verifyBankAccountWarning": {
-    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי עסקים. הזן את קוד המתאר של ההצהרה מהפקדה זו בדף פרטי התשלום כדי לאמת את חשבון הבנק. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
+    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי העסקים הבאים. הזן את קוד המתאר של ההצהרה מהפקדה זו בדף פרטי התשלום כדי לאמת את חשבון הבנק. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
   },
   "taxId": {
     "message": "מזהה מס: $TAX_ID$",
@@ -11358,43 +11896,43 @@
     "message": "אשר דומיין של Key Connector"
   },
   "requiredToVerifyBankAccountWithStripe": {
-    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי עסקים. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
+    "message": "תשלום באמצעות חשבון בנק זמין רק ללקוחות בארצות הברית. אתה תידרש לאמת את חשבון הבנק שלך. אנחנו נבצע מיקרו־הפקדה בתוך 1-2 ימי העסקים הבאים. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
   },
   "verifyBankAccountWithStripe": {
-    "message": "ביצענו מיקרו־הפקדה לחשבון הבנק שלך. זה עשוי לקחת 1-2 ימי עסקים. כאשר תראה את ההפקדה בחשבונך, תוכל לאמת את חשבון הבנק שלך. כשל באימות חשבון הבנק יגרום לפספוס תשלום ולהשעיית המנוי שלך."
+    "message": "ביצענו מיקרו־הפקדה לחשבון הבנק שלך. זה עשוי לקחת 1-2 ימי עסקים. כאשר תראה את ההפקדה בחשבונך, תוכל לאמת את חשבון הבנק שלך. כשל באימות חשבון הבנק שלך יגרום לפספוס תשלום ולהשעיית המנוי שלך."
   },
   "verifyNow": {
     "message": "אמת כעת."
   },
   "additionalStorageGB": {
-    "message": "Additional storage GB"
+    "message": "אחסון נוסף ב־GB"
   },
   "additionalServiceAccountsV2": {
-    "message": "Additional machine accounts"
+    "message": "חשבונות מכונה נוספים"
   },
   "secretsManagerSeats": {
-    "message": "Secrets Manager seats"
+    "message": "מקומות במנהל הסודות"
   },
   "additionalStorage": {
-    "message": "Additional Storage"
+    "message": "אחסון נוסף"
   },
   "expandPurchaseDetails": {
-    "message": "Expand purchase details"
+    "message": "הרחב פריטי רכישה"
   },
   "collapsePurchaseDetails": {
-    "message": "Collapse purchase details"
+    "message": "כווץ פריטי רכישה"
   },
   "familiesMembership": {
-    "message": "Families membership"
+    "message": "חברות למשפחות"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "השלם אבטחה מקוונת"
   },
   "planDescFamiliesV2": {
-    "message": "Premium security for your family"
+    "message": "אבטחת פרימיום למשפחה שלך"
   },
   "planDescFreeV2": {
-    "message": "Share with $COUNT$ other user",
+    "message": "שתף עם משתמש $COUNT$ אחר",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11403,37 +11941,37 @@
     }
   },
   "planDescEnterpriseV2": {
-    "message": "Advanced capabilities for any organization"
+    "message": "יכולות מתקדמות עבור כל ארגון"
   },
   "planNameCustom": {
-    "message": "Custom plan"
+    "message": "תוכנית מותאמת אישית"
   },
   "planDescCustom": {
-    "message": "Bitwarden scales with businesses of all sizes to secure passwords and sensitive information. If you're part of a large enterprise, contact sales to request a quote."
+    "message": "Bitwarden מתרחבת עם עסקים בכל הגדלים כדי לאבטח סיסמאות ומידע רגיש. אם אתה חלק מארגון גדול, צור קשר עם המכירות כדי לבקש הצעת מחיר."
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "מאמת מובנה"
   },
   "breachMonitoring": {
-    "message": "Breach monitoring"
+    "message": "ניטור פרצות"
   },
   "andMoreFeatures": {
-    "message": "And more!"
+    "message": "ועוד!"
   },
   "secureFileStorage": {
-    "message": "Secure file storage"
+    "message": "אחסון קבצים מאובטח"
   },
   "familiesUnlimitedSharing": {
-    "message": "Unlimited sharing - choose who sees what"
+    "message": "שיתוף ללא הגבלה - בחר מי רואה מה"
   },
   "familiesUnlimitedCollections": {
-    "message": "Unlimited family collections"
+    "message": "אוספים משפחתיים ללא הגבלה"
   },
   "familiesSharedStorage": {
-    "message": "Shared storage for important family info"
+    "message": "אחסון משותף עבור מידע משפחתי חשוב"
   },
   "limitedUsersV2": {
-    "message": "Up to $COUNT$ members",
+    "message": "עד $COUNT$ חברים",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11442,7 +11980,7 @@
     }
   },
   "limitedCollectionsV2": {
-    "message": "Up to $COUNT$ collections",
+    "message": "עד $COUNT$ אוספים",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11451,13 +11989,13 @@
     }
   },
   "alwaysFree": {
-    "message": "Always free"
+    "message": "תמיד חינם"
   },
   "twoSecretsIncluded": {
-    "message": "2 secrets"
+    "message": "2 סודות"
   },
   "projectsIncludedV2": {
-    "message": "$COUNT$ project(s)",
+    "message": "$COUNT$ פרויקט(ים)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11466,13 +12004,13 @@
     }
   },
   "secureItemSharing": {
-    "message": "Secure item sharing"
+    "message": "שיתוף פריטים מאובטח"
   },
   "scimSupport": {
-    "message": "SCIM support"
+    "message": "תמיכת SCIM"
   },
   "includedMachineAccountsV2": {
-    "message": "$COUNT$ machine accounts",
+    "message": "$COUNT$ חשבונות מכונה",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11481,21 +12019,160 @@
     }
   },
   "enterpriseSecurityPolicies": {
-    "message": "Enterprise security policies"
+    "message": "פוליסות אבטחה ארגוניות"
   },
   "selfHostOption": {
-    "message": "Self-host option"
+    "message": "אפשרות לאירוח עצמי"
   },
   "complimentaryFamiliesPlan": {
-    "message": "Complimentary families plan for all users"
+    "message": "תוכנית למשפחות על חשבון הבית לכל המשתמשים"
   },
   "strengthenCybersecurity": {
-    "message": "Strengthen cybersecurity"
+    "message": "חזק את אבטחת הסייבר"
   },
   "boostProductivity": {
-    "message": "Boost productivity"
+    "message": "שיפור פרודוקטיביות"
   },
   "seamlessIntegration": {
-    "message": "Seamless integration"
+    "message": "אינטגרציה חלקה"
+  },
+  "families": {
+    "message": "משפחות"
+  },
+  "upgradeToFamilies": {
+    "message": "שדרג למשפחות"
+  },
+  "upgradeToPremium": {
+    "message": "שדרג לפרימיום"
+  },
+  "familiesUpdated": {
+    "message": "שדרגת למשפחות!"
+  },
+  "taxCalculationError": {
+    "message": "אירעה שגיאה בחישוב המס עבור המיקום שלך. נא לנסות שוב."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "ברוך בואך אל Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "פתח תכונות אבטחה נוספות עם פרימיום, או התחל בשיתוף פריטים עם משפחות"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "המחירים אינם כוללים מס ומחויבים מדי שנה."
+  },
+  "organizationNameDescription": {
+    "message": "שם הארגון שלך יופיע בהזמנות שאתה שולח לחברים."
+  },
+  "continueWithoutUpgrading": {
+    "message": "המשך ללא שדרוג"
+  },
+  "upgradeYourPlan": {
+    "message": "שדרג את התוכנית שלך"
+  },
+  "upgradeNow": {
+    "message": "שדרג עכשיו"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "השלמת טופס זה תיצור ארגון משפחות חדש. באפשרותך לשדרג את הארגון החינמי שלך ממסוף המנהל."
+  },
+  "upgradeErrorMessage": {
+    "message": "נתקלנו בשגיאה בעת עיבוד השדרוג שלך. נא לנסות שוב."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "יש לך תוכנית Bitwarden בחינם"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "שדרג עבור אבטחה מלאה"
+  },
+  "viewbusinessplans": {
+    "message": "הצג תוכניות עסקיות"
+  },
+  "updateEncryptionSettings": {
+    "message": "עדכן הגדרות הצפנה"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "עדכן את הגדרות ההצפנה שלך"
+  },
+  "updateSettings": {
+    "message": "עדכן הגדרות"
+  },
+  "algorithm": {
+    "message": "אלגוריתם"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "בחר כיצד על Bitwarden להצפין את נתוני הכספת שלך. כל האפשרויות בטוחות, אבל שיטות חזקות יותר מציעות הגנה טובה יותר - במיוחד נגד מתקפות כוחניות. Bitwarden ממליצה על הגדרת ברירת המחדל עבור רוב המשתמשים."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "שיפור הערכים מעל ברירת המחדל ישפרו אבטחה, אבל לכספת שלך עשוי לקחת יותר זמן להיפתח כתוצאה."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "אודות אלגוריתמי הצפנה"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "האלגוריתם PBKDF2-SHA256 הוא שיטת הצפנה בדוקה היטב אשר מאזנת אבטחה וביצועים. טוב עבור רוב המשתמשים."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "האלגוריתם Argon2id מציע הגנה חזקה יותר נגד מתקפות מודרניות. טוב ביותר עבור משתמשים מתקדמים עם מכשירים חזקים."
+  },
+  "zipPostalCodeLabel": {
+    "message": "מיקוד"
+  },
+  "cardNumberLabel": {
+    "message": "מספר כרטיס"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "התחל ניסיון משפחות בחינם"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "הגדר שיטת ביטול נעילה כדי לשנות את פעולת פסק הזמן לכספת שלך."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "דרישות מדיניות ארגונית הוחלו על אפשרויות פסק הזמן שלך"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "פסק הזמן לכספת שלך חורג מהמגבלות שנקבעו על ידי הארגון שלך."
+  },
+  "neverLockWarning": {
+    "message": "האם אתה בטוח שברצונך להשתמש באפשרות \"אף פעם לא\"? במצב זה הסיסמה לכספת שלך תשמר על המכשיר שלך. אם תשתמש באפשרות זו עליך לוודא כי המכשיר מאובטח כראוי."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "פעולת פסק זמן"
+  },
+  "sessionTimeoutHeader": {
+    "message": "פסק זמן להפעלה"
+  },
+  "appearance": {
+    "message": "מראה"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "פסק זמן חורג את ההגבלה שהוגדרה על ידי הארגון שלך: $HOURS$ שעות ו־$MINUTES$ דקות לכל היותר",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "לא סומנו יישומים קריטים"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/hi/messages.json b/apps/web/src/locales/hi/messages.json
index 9cdcabf7423..67dede6f1e7 100644
--- a/apps/web/src/locales/hi/messages.json
+++ b/apps/web/src/locales/hi/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "पसंदीदा"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "प्रकार"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/hr/messages.json b/apps/web/src/locales/hr/messages.json
index 66eca3f69a9..8c548a71dee 100644
--- a/apps/web/src/locales/hr/messages.json
+++ b/apps/web/src/locales/hr/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Pristup inteligenciji"
   },
-  "riskInsights": {
-    "message": "Uvid u rizik"
-  },
   "passwordRisk": {
     "message": "Rizik lozinke"
   },
+  "noEditPermissions": {
+    "message": "Nemaš dozvolu za uređivanje ove stavke"
+  },
   "reviewAtRiskPasswords": {
     "message": "Pregledaj rizične lozinke (slabe, izložene ili ponovno korištene) u svim aplikacijama. Odaberi svoje najkritičnije aplikacije za davanje prioriteta sigurnosnim radnjama da tvoji korisnici riješe rizične lozinke."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Pregledaj rizične prijave"
+  },
   "dataLastUpdated": {
     "message": "Zadnje ažuriranje: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Nema stvorenih izvješčća"
+  },
   "notifiedMembers": {
     "message": "Obaviješteni članovi"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Stvori novu stavku prijave"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "dovršeno $PERCENT$ %",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "završeni sigurnosni zadaci $COUNT$ od $TOTAL$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Napredak promjene lozinke"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Dodijeli članovima zadatke za praćenje napretka"
+  },
+  "onceYouReviewApplications": {
+    "message": "Nakon što pregledaš aplikacije i označiš ih kao kritične, dodijeli svojim članovima zadatke za promjenu lozinki."
+  },
+  "sendReminders": {
+    "message": "Pošalji podsjetnike"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Aplikacije označene kao kritične će biti prikazane ovdje."
   },
+  "viewAtRiskMembers": {
+    "message": "Rizični korisnici"
+  },
+  "viewAtRiskApplications": {
+    "message": "Rizične aplikacije"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ od $TOTAL$ kritilčnih aplikacija su ugrožene zbog rizičnih lozinki",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Kritične aplikacije ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "kritičnih aplikacija označeno"
+  },
   "countOfCriticalApplications": {
     "message": "Kritičnih aplikacija: $COUNT$",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ aplikacija/e ugroženo",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "Rizičnih lozinki: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "Novih rizičnih lozinki: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Obaviješteni članovi ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Nisu nađene aplikacije u $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Nisu pronađeni podaci"
   },
-  "noAppsInOrgDescription": {
-    "message": "Kako korisnici spremaju podatke za prijavu, ovdje se pojavljuju aplikacije koje prikazuju sve rizične lozinke. Označi kritične aplikacije i obavijesti korisnike da ažuriraju lozinke."
+  "noDataInOrgDescription": {
+    "message": "Uvezi podatke za prijavu svoje organizacije za korištenje usluge Access Intelligence. Nakon toga, moći ćeš:"
+  },
+  "feature1Title": {
+    "message": "Označi aplikacije kao kritične"
+  },
+  "feature1Description": {
+    "message": "To će ti pomoći prvo ukloniti rizike za tvoje najvažnije aplikacije."
+  },
+  "feature2Title": {
+    "message": "Pomoći povećati sigurnost članova"
+  },
+  "feature2Description": {
+    "message": "Dodijeli vođene sigurnosne zadatke članovima u riziku za ažuriranje vjerodajnica."
+  },
+  "feature3Title": {
+    "message": "Pratiti napredak"
+  },
+  "feature3Description": {
+    "message": "Praćenje promjena tijekom vremena za prikaz sigurnosnih poboljšanja."
+  },
+  "noReportsRunTitle": {
+    "message": "Stvarati izvješća"
+  },
+  "noReportsRunDescription": {
+    "message": "Počni generirati izvješća. Nakon što ih generiraš, moći ćeš:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Niti jedna aplikacija nije označena kao kritična"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Označi aplikacije kao kritične"
   },
+  "markAsCritical": {
+    "message": "Označi kao kritično"
+  },
+  "applicationsSelected": {
+    "message": "odabranih aplikacija"
+  },
+  "selectApplication": {
+    "message": "Odaberi aplikaciju"
+  },
+  "unselectApplication": {
+    "message": "Poništi odabir aplikacije"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Aplikacije označene kao kritične"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ aplikacija označeno kao kritično",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Nije uspjelo označavanje aplikacija kao kritičnih"
+  },
   "application": {
     "message": "Aplikacija"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Rizični korisnici"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Članovi koji mogu uređivati stavke za aplikacije označene kao kritične"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Ovi članovi imaju pristup ranjivim stavkama za kritične aplikacije."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Članovi s rizičnim lozinkama"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Članovima tvoje organizacije biti će dodijeljen zadatak promjene ranjivih lozinki. Primiti će obavijest unutar Bitwarden proširenja preglednika."
+  },
+  "membersAtRiskCount": {
     "message": "Rizičnih članova: $COUNT$",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Ovi članovi se prijavljuju u aplikacije slabim, izloženim ili ponovno korištenim lozinkama."
+  "atRiskMemberDescription": {
+    "message": "Ovi članovi se prijavljuju u kritične aplikacije slabim, otkrivenim ili ponovno korištenim lozinkama."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Nema članova koji se prijavljuju slabim, izloženim ili ponovno korištenim lozinkama."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Ukupno aplikacija"
   },
+  "applicationsNeedingReview": {
+    "message": "Aplikacije koje je potrebno pregledati"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Pregledaj nove prijave"
+  },
+  "newApplicationsWithCount": {
+    "message": "Novih aplikacija: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Pregledaj nove aplikacije i po potrebi označi kritične za zaštitu svoje organizacije"
+  },
+  "reviewNow": {
+    "message": "Pregledaj sada"
+  },
+  "allCaughtUp": {
+    "message": "Sve ažurno!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Trenutno nema novih aplikacija za pregled"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Tvoja organizacija ima spremljene stavke za ovoliko aplikacija: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Pregledaj aplikacije za zaštitu stavki najvažnijih za sigurnost tvoje organizacije"
+  },
+  "reviewApplications": {
+    "message": "Pregledaj aplikacije"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Daj prioritet kritičnim aplikacijama"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Odaberi koje su aplikacije najvažnije za tvoju organizaciju. Zatim ćeš moći dodijeliti sigurnosne zadatke članovima kako bi se uklonili rizici."
+  },
+  "reviewNewApplications": {
+    "message": "Pregledaj nove prijave"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Pregledaj nove aplikacije s ranjivim stavkama i označi one koje želiš pomno pratiti kao kritične. Zatim ćeš moći dodijeliti sigurnosne zadatke članovima kako bi se uklonili rizici."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Klikni ikonu zvjezdice za označavanje aplikacije kao kritične"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Funkcionalnost „Označi kao kritično” bit će implementirana u budućem ažuriranju"
+  },
+  "applicationReviewSaved": {
+    "message": "Provjera aplikacija spremljena"
+  },
+  "newApplicationsReviewed": {
+    "message": "Nove aplikacije pregledane"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Pogreška pri spremanju statusa pregleda"
+  },
+  "pleaseTryAgain": {
+    "message": "Molimo pokušaj ponovno"
+  },
   "unmarkAsCritical": {
     "message": "Odznači kao kritično"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoriti"
   },
+  "taskSummary": {
+    "message": "Sažetak zadatka"
+  },
   "types": {
     "message": "Vrste"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Ostavi ovaj prozor otvorenim i slijedi upute preglednika."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Autentifikacija pristupnim ključem nije uspjela. Pokušaj ponovno."
+  },
   "useADifferentLogInMethod": {
     "message": "Koristi drugi način prijave"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Jedinstvena prijava (SSO)"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tvoje organizacija zahtijeva jedinstvenu prijavu."
+  },
   "welcomeBack": {
     "message": "Dobro došli natrag"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Neispravna glavna lozinka"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Nevažeća glavna lozinka. Provjeri je li tvoja adresa e-pošta ispravna i je li račun kreiran na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Nesipravna lozinka datoteke. Unesi lozinku izvozne datoteke."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Nema stavki za prikaz."
   },
+  "noItemsInTrash": {
+    "message": "Nema stavki u smeću"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Stavke koje obrišeš biti će premještene ovdje, a nakon 30 dana biti će trajno izbrisane"
+  },
+  "noItemsInVault": {
+    "message": "Nema stavaka u trezoru"
+  },
+  "emptyVaultDescription": {
+    "message": "Trezor štiti više od lozinki. Sigurno spremi prijave, identitete, kartice i bilješke."
+  },
+  "emptyFavorites": {
+    "message": "Niti jedna stavka nije dodana u favorite"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Za brzi pristup često korištenim stavkama dodaj ih u favorite."
+  },
+  "noSearchResults": {
+    "message": "Nema rezultata pretrage"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Očisti filtre ili pokušaj s drugačijom pretragom"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Nemaš prava vidjeti sve stavke u ovoj zbirci."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Postavke ključa za šifriranje"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algoritam"
-  },
   "kdfIterations": {
     "message": "KDF iteracija"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Više KDF iteracije, memiorije i paralelizmi mogu pomoći zaštititi tvoju glavnu lozinku od bute force napada."
   },
-  "changeKdf": {
-    "message": "Promijeni KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Postavke ključa za šifriranje promijenjene"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Osiguraj da tvoj račun ima dovoljno raspoloživih sredstava za kupnju. Ako tvoj račun nema dovoljno sredstava za kupnju, sredstva će biti dopunjena iz tvojeg zadanog spremljenog načina plaćanja. Sredstva svojem računu možeš dodati na stranici Naplata."
   },
+  "notEnoughAccountCredit": {
+    "message": "Nemaš dovoljno kredita na računu za ovu kupnju. Kredit možeš dodati na svoj račun na stranici Naplata."
+  },
   "creditAppliedDesc": {
     "message": "Sredstva na tvojem računu mogu se koristiti za kupnju. Sva raspoloživa sredstva će automatski biti upotrijebljena za plaćanje kupnji napravljenih na tvojem računu."
   },
@@ -2940,7 +3188,7 @@
     "message": "Sve neplaćene pretplate naplatiti će se na tvoj način plaćanja."
   },
   "paymentChargedWithTrial": {
-    "message": "Plan dolazi s besplatnom probnom verzijom od 7 dana. Tvoj način plaćanja neće biti terećen dok ne završi probno razdoblje. Možeš otkazati u bilo kojem trenutku."
+    "message": "Paket dolazi s besplatnom probnom verzijom od 7 dana. Tvoj način plaćanja neće biti terećen dok ne završi probno razdoblje. Možeš otkazati u bilo kojem trenutku."
   },
   "paymentInformation": {
     "message": "Podaci o plaćanju"
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Sljedeća naplata"
   },
+  "nextChargeHeader": {
+    "message": "Sljedeća naplata"
+  },
+  "plan": {
+    "message": "Paket"
+  },
   "details": {
     "message": "Detalji"
   },
+  "discount": {
+    "message": "popust"
+  },
   "downloadLicense": {
     "message": "Preuzmi licencu"
   },
@@ -3162,7 +3419,7 @@
     "message": "Naziv tvrtke"
   },
   "chooseYourPlan": {
-    "message": "Odaberi svoj plan"
+    "message": "Odaberi svoj paket"
   },
   "users": {
     "message": "Korisnici"
@@ -3212,7 +3469,7 @@
     "message": "Za privatnu upotrebu, za dijeljenje s obitelji i prijateljima."
   },
   "planNameTeams": {
-    "message": "Timovi"
+    "message": "Teams"
   },
   "planDescTeams": {
     "message": "Za male tvtke ili druge manje organizacije."
@@ -3341,7 +3598,7 @@
     }
   },
   "trialPaidInfoMessage": {
-    "message": "Tvoj plan $PLAN$ će biti pretvoren u plaćenu pretplatu nakon isteka besplatnog probnog razdoblja od 7 dana.",
+    "message": "Tvoj paket $PLAN$ će biti pretvoren u plaćenu pretplatu nakon isteka besplatnog probnog razdoblja od 7 dana.",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Ažuriraj preglednik"
   },
-  "generatingYourRiskInsights": {
-    "message": "Stvaranje tvojih uvida u rizik..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generiranje tvoje pristupne inteligencije..."
+  },
+  "fetchingMemberData": {
+    "message": "Dohvaćanje podataka o članu…"
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analiziranje zdravlja lozinke…"
+  },
+  "calculatingRiskScores": {
+    "message": "Izračun ocjene rizika…"
+  },
+  "generatingReportData": {
+    "message": "Generiranje izvješća…"
+  },
+  "savingReport": {
+    "message": "Spremanje izvještaja…"
+  },
+  "compilingInsights": {
+    "message": "Sastavljanje uvida…"
+  },
+  "loadingProgress": {
+    "message": "Učitavanje napretka"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Ovo može potrajati nekoliko minuta."
+  },
+  "riskInsightsRunReport": {
+    "message": "Pokreni izvješće"
   },
   "updateBrowserDesc": {
     "message": "Koristiš nepodržani preglednik. Web trezor možda neće ispravno raditi."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Poziv prihvaćen"
   },
-  "inviteAcceptedDesc": {
-    "message": "Pristup organizaciji biti će ti omogućen čim administrator potvrdi tvoje članstvo, o čemu ćemo te obavijestiti e-poštom."
+  "invitationAcceptedDesc": {
+    "message": "Tvoj poziv uspješno prihvaćen."
   },
   "inviteInitAcceptedDesc": {
     "message": "Sada imaš pristup organizaciji."
@@ -4529,7 +4813,7 @@
     }
   },
   "subscriptionUserSeatsWithoutAdditionalSeatsOption": {
-    "message": "Možeš pozvati do $COUNT$ članova bez dodatnih troškova. Kontaktiraj korisničku podršku za nadogradnju plana i pozivanje više članova.",
+    "message": "Možeš pozvati do $COUNT$ članova bez dodatnih troškova. Kontaktiraj korisničku podršku za nadogradnju paketa i pozivanje više članova.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4538,7 +4822,7 @@
     }
   },
   "subscriptionFreePlan": {
-    "message": "Nije moguće pozvati više od $COUNT$ korisnika bez nadogradnje plana.",
+    "message": "Nije moguće pozvati više od $COUNT$ korisnika bez nadogradnje paketa.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4547,7 +4831,7 @@
     }
   },
   "subscriptionUpgrade": {
-    "message": "Nije moguće pozvati više od $COUNT$ korisnika bez nadogradnje plana.",
+    "message": "Nije moguće pozvati više od $COUNT$ korisnika bez nadogradnje paketa.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organizacija suspendirana"
   },
+  "organizationIsSuspended": {
+    "message": "Organizacija je suspendirana"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Stavkama u suspendiranoj Organizaciji se ne može pristupiti. Kontaktiraj vlasnika Organizacije za pomoć."
+  },
   "secretsAccessSuspended": {
     "message": "Stavkama u suspendiranoj Organizaciji se ne može pristupiti. Kontaktiraj vlasnika Organizacije za pomoć."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Nije moguće stvoriti Servisne račune u suspendiranim organizacijama. Kontaktiraj vlasnika tvoje organizacije za pomoć."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Stavkama u suspendiranoj Organizaciji se ne može pristupiti. Kontaktiraj vlasnika Organizacije za pomoć."
-  },
   "licenseIsExpired": {
     "message": "Licenca je istekla."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifikator"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Dajte ovaj ID svojim članovima za prijavu putem SSO-a. Za zaobilazak ovog koraka, postavi ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Daj ovaj ID svojim članovima za prijavu putem SSO-a. Članovi mogu preskočiti unos ovog identifikatora tijekom SSO-a ako je postavljena domena za koju su prijavljeni. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Saznaj više",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Odspoji SSO"
@@ -5518,9 +5809,9 @@
     "message": "Zahtijevaj da su sve stavke u vlasništvu organizacije čime se onemogućuje spremanje stavki na osobnoj razini.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
+  "organizationDataOwnershipDescContent": {
     "message": "Sve će stavke biti u vlasništvu i spremljene u organizaciji, što će omogućiti kontrolu, vidljivost i izvještavanje na razini cijele organizacije. Kada je uključeno, svakom će članu biti dostupna zadana kolekcija za pohranu stavki. Saznaj više o upravljanju ",
-    "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.'"
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "životnim ciklusom vjerodajnica",
@@ -5545,6 +5836,65 @@
     "message": "Saznaj više o ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Dostupno sada"
+  },
+  "autoConfirm": {
+    "message": "Automatska potvrda novih korisnika"
+  },
+  "autoConfirmDescription": {
+    "message": "Novi korisnici pozvani u organizaciju bit će automatski potvrđeni kada se uređaj administratora otključa.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Kako uključiti automatsku potvrdu korisnika"
+  },
+  "autoConfirmExtension1": {
+    "message": "Otvori svoje Bitwarden proširenje"
+  },
+  "autoConfirmExtension2": {
+    "message": "Odaberi",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Uključi",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Uspješno otvoreno Bitwarden proširenje za preglednik. Sada možeš aktivirati postavku automatske potvrde korisnika."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Novi korisnici pozvani u organizaciju bit će automatski potvrđeni kada se uređaj administratora otključa. Prije uključivanja ove politike, pregledaj i prihvati sljedeće: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Mogući sigurnosni rizik. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatska potvrda korisnika mogla bi predstavljati sigurnosni rizik za podatke tvoje organizacije."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Više o rizicima",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Potrebno je pravilo Isključive organizacije. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Svi članovi moraju pripadati samo ovoj organizaciji kako bi aktivirali ovu automatizaciju."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Pravilo Isključive organizacija će biti primijenjeno na sve uloge."
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Nema pristupa u nuždi. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Pristup u nuždi biti će uklonjen."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Prihavaćam ove rizike i ažurirana pravila"
+  },
   "personalOwnership": {
     "message": "Ukloni osobni trezor"
   },
@@ -5558,10 +5908,10 @@
     "message": "Pravila tvrtke onemogućuju spremanje stavki u osobni trezor. Promijeni vlasništvo stavke na tvrtku i odaberi dostupnu Zbirku."
   },
   "desktopAutotypePolicy": {
-    "message": "Desktop Autotype Default Setting"
+    "message": "Zadana postavka automatskog tipkanja na radnoj površini"
   },
   "desktopAutotypePolicyDesc": {
-    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "message": "Uključi automatsko tipkanje na radnoj površini prema zadanim postavkama za članove. Članovi mogu ručno isključiti automatsko tipkanje u klijentu za radnu površinu.",
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
@@ -5597,6 +5947,19 @@
     "message": "Ne dopusti skrivanje e-pošte kod stvaranja Senda.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Zadano otkrivanje podudaranja URI-ja"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Odredi kada se prijave predlažu za auto-ispunu. Administratori i vlasnici su izuzeti od ovog pravila."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Zadano otkrivanje podudaranja URI-ja"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Odaberite valjanu opciju otkrivanja podudaranja URI-ja.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Izmijenjena polica $ID$.",
     "placeholders": {
@@ -5631,7 +5994,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
   },
   "customNonEnterpriseError": {
-    "message": "Za uključivanje prilagođenih uloga, organizacija mora biti na planu Enterprise 2020."
+    "message": "Za uključivanje prilagođenih uloga organizacija mora biti na paketu Enterprise 2020."
   },
   "permissions": {
     "message": "Dozvole"
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Tvoja glavna lozinka ne zadovoljava pravila ove organizacije. Za pristup trezoru moraš odmah ažurirati svoju glavnu lozinku. Ako nastaviš, odjaviti ćeš se iz trenutne sesije te ćeš se morati ponovno prijaviti. Aktivne sesije na drugim uređajima mogu ostati aktivne do jedan sat."
   },
-  "automaticAppLogin": {
-    "message": "Automatski prijavi korisnike za dopuštene aplikacije"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatska jedinstvena prijava"
   },
-  "automaticAppLoginDesc": {
-    "message": "Obrasci za prijavu će biti automatski ispunjeni i poslani za aplikacije pokrenute od strane konfiguriranog davatelja identiteta."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Proširi sigurnost i praktičnost SSO-a na neupravljane aplikacije. Kada korisnici pokrenu aplikaciju vašeg davatelja identiteta, njihovi se podaci za prijavu automatski popunjavaju i šalju, stvarajući siguran tijek od davatelja identiteta do aplikacije jednim klikom."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Poslužitelj pružatelja identiteta"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Tvoja je organizacija ažurirala tvoje opcije dešifriranja. Postavi glavnu lozinku za pristup svom trezoru."
   },
-  "maximumVaultTimeout": {
-    "message": "Istek trezora"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Istek sesije"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Najveći dozvoljeni istek trezora za sve korisnike."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Odredi najveće vrijeme isteka sesije za sve članove, osim vlasnika."
   },
-  "maximumVaultTimeoutLabel": {
+  "maximumAllowedTimeout": {
     "message": "Najveći istek trezora"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Najveći istek trezora nije ispravan."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Potreban najveći dozvoljeni istek."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Vrijeme nije ispravno. Promijeni barem jednu vrijednost."
+  },
+  "sessionTimeoutAction": {
+    "message": "Radnja kod isteka sesije"
+  },
+  "immediately": {
+    "message": "Odmah"
+  },
+  "onSystemLock": {
+    "message": "Pri zaključavanju sustava"
+  },
+  "onAppRestart": {
+    "message": "Pri ponovnom pokretanju"
   },
   "hours": {
     "message": "sat(i)"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "min."
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Sigurno želiš odrediti „Nikada” kao najveći istek za sve članove?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Ova će opcija spremiti ključeve za šifriranje tvojih članova na njihove uređaje. Prije uključivanja ove opcije, provjeri jesu li njihovi uređaji adekvatno zaštićeni."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Saznaj više o zaštiti uređaja"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "„Zaključavanje sustava” će se odnositi samo na aplikaciju radne površine i proširenje"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Mobilna i web aplikacija koristiti će „pri ponovnom pokretanju” kao najveći dozvoljeni istek, jer opcija još nije podržana."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Pravilo tvoje organizacije utječe na istek trezora. Najveće dozvoljeno vrijeme isteka je $HOURS$:$MINUTES$ h.",
     "placeholders": {
@@ -6498,7 +6891,7 @@
     "message": "Nema sponzoriranog Families paketa"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "Sponzorirani ne-obiteljski paketi biti će prikazani ovdje"
+    "message": "Sponzorirani ne-obiteljski paketi će biti prikazani ovdje"
   },
   "sponsorshipFreeBitwardenFamilies": {
     "message": "Članovi tvoje organizacije ispunjavaju uvjete za besplatni Bitwarden Families paket. Možeš sponzorirati besplatni Bitwarden Families paket za zaposlenike koji nisu članovi tvoje Bitwarden organizacije. Sponzoriranje ne-člana zahtijeva dostupno mjesto unutar vaše organizacije."
@@ -6546,7 +6939,7 @@
     "message": "Veza više nije valjana. Zamoli sponzora da pošalje novu ponudu."
   },
   "reclaimedFreePlan": {
-    "message": "Obnovljeni besplatni plan"
+    "message": "Obnovljeni besplatni paket"
   },
   "redeem": {
     "message": "Iskoristi"
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Moraš dodati ili osnovni URL poslužitelja ili barem jedno prilagođeno okruženje."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL mora koristiti HTTPS."
+  },
   "apiUrl": {
     "message": "URL API poslužitelja"
   },
@@ -6846,7 +7242,7 @@
     "message": "Vlastiti poslužitelj"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
-    "message": "Za postavljanje svoje organizacije na vlastitom poslužitelju, morat ćeš prenijeti datoteku licence. Kako bi podržali besplatne Families pakete i napredne mogućnosti naplate za svoju samostalnu organizaciju, morat ćeš postaviti sinkronizaciju naplate."
+    "message": "Za postavljanje svoje organizacije na vlastitom poslužitelju, morat ćeš prenijeti datoteku licence. Kako bi besplatni Families paketi i napredne mogućnosti naplate bili podržani u tvojoj samostalnoj organizaciji, morat ćeš postaviti sinkronizaciju naplate."
   },
   "billingSyncApiKeyRotated": {
     "message": "Token rotiran"
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Izvezt će se samo trezor organizacije povezan s $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Izvezt će se samo trezor organizacije povezan s $ORGANIZATION$. Zbirka mojih stavki neće biti uključena.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Pristup odbijen. Nemaš prava vijdeti ovu stranicu."
   },
+  "noPageAccess": {
+    "message": "Nemaš pristup ovoj stranici"
+  },
   "masterPassword": {
     "message": "Glavna lozinka"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Nepoznata tajna. Možda trebaš tražiti dozvolu za pristup ovoj tajni."
   },
+  "unknownServiceAccount": {
+    "message": "Nepoznati mašinski račun. Možda trebaš tražiti dozvolu za pristup ovom mašinskom računu."
+  },
   "unknownProject": {
     "message": "Nepoznati projekt. Možda trebaš tražiti dozvolu za pristup ovom projektu."
   },
@@ -8206,7 +8626,7 @@
     "message": "Zamijeni proizvode"
   },
   "freeOrgInvLimitReachedManageBilling": {
-    "message": "Besplatne organizacije mogu imati do $SEATCOUNT$ članova. Nadogradi na plaćeni plan za pozivanje više članova.",
+    "message": "Besplatne organizacije mogu imati do $SEATCOUNT$ članova. Nadogradi na plaćeni paket za pozivanje više članova.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8224,7 +8644,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedManageBilling": {
-    "message": "Teams Starter plan može imati do $SEATCOUNT$ članova. Nadogradi svoj plan za pozivanje više članova.",
+    "message": "Teams Starter paket može imati do $SEATCOUNT$ članova. Nadogradi svoj paket za pozivanje više članova.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8233,7 +8653,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedNoManageBilling": {
-    "message": "Teams Starter plan može imati do $SEATCOUNT$ članova. Kontaktiraj vlasnika svoje organizacije za nadogradnju plana i pozivanje više članova.",
+    "message": "Teams Starter paket može imati do $SEATCOUNT$ članova. Kontaktiraj vlasnika svoje organizacije za nadogradnju paketa i pozivanje više članova.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8242,7 +8662,7 @@
     }
   },
   "freeOrgMaxCollectionReachedManageBilling": {
-    "message": "Besplatne organizacije mogu imati do $COLLECTIONCOUNT$ zbirki. Nadogradi na plaćeni plan za dodavanje više zbirki.",
+    "message": "Besplatne organizacije mogu imati do $COLLECTIONCOUNT$ zbirki. Nadogradi na plaćeni paket za dodavanje više zbirki.",
     "placeholders": {
       "COLLECTIONCOUNT": {
         "content": "$1",
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grupa/korisnik"
   },
-  "lowKdfIterations": {
-    "message": "Niske KDF iteracije"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Ažuriraj svoje postavke enkripcije kako bi zadovoljili nove sigurnosne preporuke i poboljšali zaštitu računa."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Nastavkom ćeš se odjaviti iz svih aktivnih sesija. Morat ćeš se ponovno prijaviti i izvršiti dvostruku autentifikaciju, ako je aktivna. Preporučujemo izvoz tvog trezora prije promjene postavki enkripcije kako bi spriječili gubitak podataka."
   },
@@ -8485,7 +8899,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "Pristupljeno projektu s identifikatorom: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Obrisan mašinski račun s id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Uređen projekt s identifikatorom: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Korisnik: $USER_ID$ dodan mašinskom računu $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Korisnik $USER_ID$ uklonjen iz mašinskog računa $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Grupa $GROUP_ID$ uklonjena iz mašinskog računa$SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Stvoren mašinski račun $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Grupa $GROUP_ID$ dodana mašinskom računu $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Obrisan mašinski račun $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Izbrisan projekt s identifkatorom: $PROJECT_ID$",
     "placeholders": {
@@ -9001,13 +9494,13 @@
     "message": "Predbilježi se za Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
-    "message": "Dodajte Secrets Manager svojem nadograđenom planu za zadržavanje pristupa svim tajnama stvorenim sa svojim prethodnim planom."
+    "message": "Dodajte Secrets Manager svojem nadograđenom paketu za zadržavanje pristupa svim tajnama stvorenim sa svojim prethodnim planom."
   },
   "additionalServiceAccounts": {
     "message": "Dodani servisni računi"
   },
   "includedServiceAccounts": {
-    "message": "Plan uključuje $COUNT$ servisnih računa.",
+    "message": "Paket uključuje $COUNT$ servisnih računa.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9051,7 +9544,7 @@
     "message": "Ažurirane postavke upravljanja zbirkama"
   },
   "passwordManagerPlanPrice": {
-    "message": "Cijena plana za Upravitelj lozinkama"
+    "message": "Cijena paketa za Upravitelj lozinkama"
   },
   "secretsManagerPlanPrice": {
     "message": "Cjenik Secrets Managera"
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Prijava uspješna!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Dodijeli pristup zbirki"
   },
@@ -9330,6 +9820,14 @@
     "message": "Preskupo",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Prebacivanje na besplatni paket",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Prebacivanje na besplatnu organizaciju",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Besplatno godinu dana"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Dodijeli"
   },
+  "assignTasks": {
+    "message": "Dodijeli zadatke"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Pošalji podsjetnike za promjenu lozinki"
+  },
   "assignToCollections": {
     "message": "Dodijeli zbirkama"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Pošaljite podatke o događajima svojoj Logscale instanci"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Pošalji podatke o događajima trezora svojoj Datadog instanci"
+  },
   "failedToSaveIntegration": {
     "message": "Spremanje integracije nije uspjelo. Pokušaj ponovno kasnije."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Za ovo, moraš biti vlasnik organizacije."
+  },
   "failedToDeleteIntegration": {
     "message": "Brisanje integracije nije uspjelo. Pokušaj ponovno kasnije."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Niske KDF iteracije. Povećaj svoje iteracije za poboljšanje sigurnost računa."
-  },
-  "changeKDFSettings": {
-    "message": "Promijeni KDF postavke"
-  },
   "secureYourInfrastructure": {
     "message": "Osiguraj svoju infrastrukturu"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Isklj."
   },
-  "higherKDFIterations": {
-    "message": "Veće KDF iteracije mogu pomoći u zaštiti tvoje glavne lozinke od napadača."
-  },
-  "incrementsOf100,000": {
-    "message": "koracima od 100.000"
-  },
-  "smallIncrements": {
-    "message": "malim koracima"
-  },
   "kdfIterationRecommends": {
     "message": "Preporučujemo 600.000 ili više"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Previsoko postavljen KDF-a kod starijih uređaja, može dovesti do problema s performansama. Povećaj vrijednost u $VALUE$ i testiraj svoj uređaj.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Za ponovno uspostavljanje pretplate, obratite se korisničkoj podršci."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domena potvrđena"
   },
+  "itemAddedToFavorites": {
+    "message": "Stavka dodana u omiljene"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Stavka uklonjenja iz omiljenih"
+  },
+  "copyNote": {
+    "message": "Kopiraj bilješku"
+  },
   "organizationNameMaxLength": {
     "message": "Naziv organizacije ne može biti duži od 50 znakova."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Uspjšeno otvoreno Bitwarden proširenje preglednika. Sada možeš pregledati svoje rizične lozinke."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Nismo mogli otvoriti Bitwarden proširenje preglednika. Otvori Bitwarden ikonu",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "na alatnoj traci.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Tvoja će se pretplata uskoro obnoviti. Za neprekinutu uslugu, kontaktiraj $RESELLER$ za potvrdu obnove prije $RENEWAL_DATE$.",
     "placeholders": {
@@ -11019,20 +11506,60 @@
     "message": "Pregled događaja"
   },
   "cannotCreateCollection": {
-    "message": "Besplatne organizacije mogu imati do 2 zbirke. Nadogradi na plaćeni plan za dodavanje više zbirki."
+    "message": "Besplatne organizacije mogu imati do 2 zbirke. Nadogradi na plaćeni paket za dodavanje više zbirki."
   },
   "searchArchive": {
     "message": "Pretraži arhivu"
   },
-  "archive": {
-    "message": "Arhiva"
+  "archiveNoun": {
+    "message": "Arhiva",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arhiviraj",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Poništi arhiviranje"
+  },
+  "itemsInArchive": {
+    "message": "Stavke u arhivi"
   },
   "noItemsInArchive": {
     "message": "Nema stavki u arhivi"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Arhivirane stavke biti će prikazane ovdje i biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune."
   },
+  "itemWasSentToArchive": {
+    "message": "Stavka poslana u arhivu"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Stavke poslane u arhivu"
+  },
+  "itemUnarchived": {
+    "message": "Stavka vraćena iz arhive"
+  },
+  "bulkArchiveItems": {
+    "message": "Stavke arhivirane"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Stavke vraćene iz arhive"
+  },
+  "archiveItem": {
+    "message": "Arhiviraj stavku",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Arhivirane stavke biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune. Sigurno želiš arhivirati?"
+  },
+  "archiveBulkItems": {
+    "message": "Arhiviraj stavke",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Arhivirane stavke biti će izuzete iz rezultata općih pretraga i preporuka auto-ispune. Sigurno želiš arhivirati?"
+  },
   "businessUnit": {
     "message": "Poslovna jedinica"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden proširenje je instalirano!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Otvori proširenje i prijavi se za početak korištenja auto-ispune."
   },
@@ -11154,6 +11684,14 @@
     "message": "centar za učenje",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "centar za pomoć",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11281,7 +11819,7 @@
     }
   },
   "subscribeEnterpriseSubtitle": {
-    "message": "Tvoj 7-dnevni probni rok za plan $PLAN$ počinje danas. Dodaj način plaćanja za nastavak korištenja značajki nakon završetka probnog roka: ",
+    "message": "Tvoj 7-dnevni probni rok za paket $PLAN$ počinje danas. Dodaj način plaćanja za nastavak korištenja značajki nakon završetka probnog roka: ",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -11406,7 +11944,7 @@
     "message": "Napredne mogućnosti za bilo koju organizaciju"
   },
   "planNameCustom": {
-    "message": "Vlastiti plan"
+    "message": "Vlastiti paket"
   },
   "planDescCustom": {
     "message": "Bitwarden se prilagođava tvrtkama svih veličina kako bi osigurao lozinke i osjetljive podatke. Ako si dio velike tvrtke, zatraži ponudu od odjela prodaje."
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Jednostavna integracija"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Nadogradi na Families"
+  },
+  "upgradeToPremium": {
+    "message": " Nadogradi na Premium"
+  },
+  "familiesUpdated": {
+    "message": "Families nadogradnja uspješna!"
+  },
+  "taxCalculationError": {
+    "message": "Došlo je do pogreške prilikom izračuna poreza za tvoju lokaciju. Pokušaj ponovno."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Dobrodošli u Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Otključaj više sigurnosnih značajki uz Premium ili počni dijeliti stavke s obitelji pomoću Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Cijene ne uključuju porez i naplaćuju se godišnje."
+  },
+  "organizationNameDescription": {
+    "message": "Naziv tvoje organizacije prikazivat će se u pozivnicama koje pošalješ članovima."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Nastavi bez nadogradnje"
+  },
+  "upgradeYourPlan": {
+    "message": "Nadogradi svoj paket"
+  },
+  "upgradeNow": {
+    "message": "Nadogradi sada"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Ispunjavanjem ovog obrasca stvorit ćeš novu obiteljsku organizaciju. Svoju besplatnu organizaciju možeš nadograditi u administratorskoj konzoli."
+  },
+  "upgradeErrorMessage": {
+    "message": "Došlo je do pogreške prilikom obrade nadogradnje. Pokušaj ponovno."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Imaš besplatni Bitwarden paket"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Nadogradi za potpunu sigurnost"
+  },
+  "viewbusinessplans": {
+    "message": "Pogledaj poslovne pakete"
+  },
+  "updateEncryptionSettings": {
+    "message": "Ažuriraj postakve šifriranja"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Ažuriraj svoje postakve šifriranja"
+  },
+  "updateSettings": {
+    "message": "Ažuriraj postavke"
+  },
+  "algorithm": {
+    "message": "Algoritam"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Odaberi kako Bitwarden treba šifrirati podatke tvojeg trezora. Sve opcije su sigurne, ali jače metode nude bolju zaštitu - posebno od napada grubom silom. Bitwarden preporučuje zadanu postavku za većinu korisnika."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Povećanje vrijednosti iznad zadanih poboljšat će sigurnost, ali će zbog toga otključavanje tvojeg trezora možda trajati dulje."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "O algoritmima šifriranja"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 je dobro testirana metoda šifriranja koja uravnotežuje sigurnost i performanse. Dobra je za sve korisnike."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id nudi jaču zaštitu od modernih napada. Najbolje za napredne korisnike s moćnim uređajima."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Poštanski broj"
+  },
+  "cardNumberLabel": {
+    "message": "Broj kartice"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Započni besplatno probno razdoblje za Families"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Blokiraj stvaranje računa za potvrđene domene"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Spriječi korisnike da stvaraju račune izvan organizacije koristeći adrese e-pošte s potvrđenim domenama."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Domena mora biti potvrđena prije aktiviranja ovog pravila."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Postavi metodu otključavanja za promjenu radnje nakon isteka vremenskog ograničenja trezora."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Pravila tvrtke primijenjena su na tvoje mogućnosti vremenskog isteka"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Istek vremenskog ograničenja tvojeg trezora premašuje ograničenje koja je postavila tvoja organizacija."
+  },
+  "neverLockWarning": {
+    "message": "Sigurni želiš koristiti opciju „Nikad”? Postavljanjem opcije zaključavanja na „Nikad” ključ za šifriranje tvojeg trezora sprema se na tvoj uređaj. Pri korištenju ove opcije osiguraj da je tvoj uređaj pravilno zaštićen."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Radnja kod isteka"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Istek sesije"
+  },
+  "appearance": {
+    "message": "Izgled"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Istek vremenskog ograničenja premašuje ograničenje koje je postavila tvoja organizacija: najviše $HOURS$:$MINUTES$.",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Nisu odabrane kritične aplikacije"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Sigurno želiš nastaviti?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/hu/messages.json b/apps/web/src/locales/hu/messages.json
index 910447f236c..f626e348e73 100644
--- a/apps/web/src/locales/hu/messages.json
+++ b/apps/web/src/locales/hu/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Elérés intelligencia"
   },
-  "riskInsights": {
-    "message": "Kockázati betekintés"
-  },
   "passwordRisk": {
     "message": "Jelszó kockázat"
   },
+  "noEditPermissions": {
+    "message": "Nincs jogosulltság ezen elem szerkesztéséhez."
+  },
   "reviewAtRiskPasswords": {
     "message": "Tekintsük meg a veszélyeztetett jelszavakat (gyenge, nyilvános vagy újrafelhasznált) az alkalmazásokban. Válasszuk ki a legkritikusabb alkalmazásokat, hogy előnyben részesítsük a biztonsági műveleteket a felhasználók számára a veszélyeztetett jelszavak kezeléséhez."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Kockázatos bejelentkezések áttekintése"
+  },
   "dataLastUpdated": {
     "message": "Az adatok utolsó frissítése: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Még nem készült jelentés."
+  },
   "notifiedMembers": {
     "message": "Értesített tagok"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "Új bejelentkezési elem létrehozása"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Miután megjelöltük a kritikus alkalmazásokat, azok itt jelennek meg."
+  "percentageCompleted": {
+    "message": "$PERCENT$% kész",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ / $TOTAL$ biztonsági feladatok elvégzésre került.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Jelszócsere feldolgozás"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Rendeljünk a tagokhoz feladatokat az előrehaladás monitorozására."
+  },
+  "onceYouReviewApplications": {
+    "message": "Az alkalmazások áttekintése és azok kritikusként megjelölése után rendeljünk feladatokat a tagoknak a jelszavak megváltoztatásához."
+  },
+  "sendReminders": {
+    "message": "Emlékeztető küldés"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "A kritikus alkalmazások megjelölésével azok itt jelennek meg."
+  },
+  "viewAtRiskMembers": {
+    "message": "Kockázatos tagok megtekintése"
+  },
+  "viewAtRiskApplications": {
+    "message": "Kockázatos alkalmazások megtekintése"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ / $TOTAL$ kritikus alkalmazás veszélyben van a kockázatos jelszavak miatt.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "Kritikus alkalmazások ($COUNT$)",
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "A kritikus alkalmazások megjelölésre kerültek."
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ kritikus alkalmazás",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ kockázatos alkalmazás",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ kockázatos jelszó",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ új kockázatos jelszó",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Értesített tagok ($COUNT$)",
     "placeholders": {
@@ -89,20 +178,38 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Nem találhatók alkalmazások: $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Nem található adat."
   },
-  "noAppsInOrgDescription": {
-    "message": "Amint a felhasználók elmentik a bejelentkezéseket, itt megjelennek az alkalmazások és megjelenítik a veszélyeztetett jelszavakat. Jelöljük meg a kritikus alkalmazásokat és értesítsük a felhasználókat a jelszavak frissítéséről."
+  "noDataInOrgDescription": {
+    "message": "Importáljuk a szervezet bejelentkezési adatait az Access Intelligence használatának megkezdéséhez. Ezután a következőket tehetjük:"
+  },
+  "feature1Title": {
+    "message": "Alkalmazások megjelölése kritikusként"
+  },
+  "feature1Description": {
+    "message": "Ez először is segít eltávolítani a legfontosabb alkalmazások kockázatait."
+  },
+  "feature2Title": {
+    "message": "Segítsünk a tagoknak biztonságuk javításában."
+  },
+  "feature2Description": {
+    "message": "Rendeljünk a veszélyeztetett tagoknak irányított biztonsági feladatokat a hitelesítő adatok frissítéséhez."
+  },
+  "feature3Title": {
+    "message": "Folyamat nyomonkövetése"
+  },
+  "feature3Description": {
+    "message": "Kövessük nyomon az időbeli változásokat a biztonsági fejlesztések megjelenítéséhez."
+  },
+  "noReportsRunTitle": {
+    "message": "Jelentés generálása"
+  },
+  "noReportsRunDescription": {
+    "message": "Készen állunk a jelentések generálására. A generálás után a következőket teheti meg:"
   },
   "noCriticalApplicationsTitle": {
-    "message": "You haven’t marked any applications as critical"
+    "message": "Egyetlen alkalmazás sem lett megjelölve kritikusként."
   },
   "noCriticalApplicationsDescription": {
     "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Alkalmazások megjelölése kritikusként"
   },
+  "markAsCritical": {
+    "message": "Megjelölés kritikusként"
+  },
+  "applicationsSelected": {
+    "message": "alkalmazás lett kiválasztva."
+  },
+  "selectApplication": {
+    "message": "Alkalmazás kiválasztása"
+  },
+  "unselectApplication": {
+    "message": "Alkalmazás kiválasztás negszüntetése"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Kritikusként megjelölt alkalmazások"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ alkalmazás kritikusként lett megjelölve.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Nem sikerült kritikusként megjelölni a kérelmeket."
+  },
   "application": {
     "message": "Alkalmazás"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Veszélyes tagok"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Tagok szerkesztési hozzáféréssel a kritikus alkalmazások veszélyeztetett elemeihez"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Ezek a tagok hozzáférhetnek a kritikus alkalmazásoknál a sebezhető elemekhez."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Kockázatos jelszavú tagok"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "A szervezet tagjaira feladat hárul a sebezhető jelszavak megváltoztatására. Értesítést kapnak a Bitwarden böngésző bővítményen belül."
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ kockázatos tag",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Ezek a tagok gyenge, nyílt vagy újrafelhasznált jelszavakkal jelentkeznek be az alkalmazásokba."
+  "atRiskMemberDescription": {
+    "message": "Ezek a tagok gyenge, kitett vagy újrafelhasznált jelszavakkal jelentkeznek be az alkalmazásokba."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Ezek nem olyan tagok, akik gyenge, kitett vagy újrafelhasznált jelszavakkal jelentkeznek be az alkalmazásokba."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Összes alkalmazás"
   },
+  "applicationsNeedingReview": {
+    "message": "Felülvizsgálatot igénylő kérelmek"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Új alkalmazások felülvizsgálata"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ új alkalmazás",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Tekintsük át az új alkalmazásokat a kritikusként megjelöléshez és tartsuk biztonságban szervezetet."
+  },
+  "reviewNow": {
+    "message": "Áttekintés most"
+  },
+  "allCaughtUp": {
+    "message": "Minden rendben!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Jelenleg nincs új falkalmazás felülvizsgálatra."
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "A szervezet $COUNT$ alkalmazáshoz mentett elemeket tartalmaz.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Tekintsük át az alkalmazásokat, hogy biztosítsuk a szervezet biztonsága szempontjából legkritikusabb elemeket."
+  },
+  "reviewApplications": {
+    "message": "Alkalmazások áttekintése"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Kritikus alkalmazások rangsorolása"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Válasszuk ki, hogy mely alkalmazások a legkritikusabbak a szervezet számára. Ezután rendeljünk biztonsági feladatokat a tagokhoz a kockázatok eltávolítása érdekében."
+  },
+  "reviewNewApplications": {
+    "message": "Új alkalmazások felülvizsgálata"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Tekintsük át a sebezhető elemeket tartalmazó új alkalmazásokat és jelöljük meg kritikusnak azokat, amelyeket szorosan figyelemmel szeretnénk kísérni. Ezután biztonsági feladatokat rendelhetünk a tagokhoz a kockázatok eltávolítása érdekében."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Kattintsunk a csillag ikonra egy alkalmazás kritikusként megjelöléséhez."
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "A kritikus funkcióként megjelölés egy jövőbeli frissítésben lesz megvalósítva."
+  },
+  "applicationReviewSaved": {
+    "message": "Az alkalmazás átvizsgálása mentésre került."
+  },
+  "newApplicationsReviewed": {
+    "message": "Úh alkalmazások lettek átvizsgálva."
+  },
+  "errorSavingReviewStatus": {
+    "message": "Hiba történt az átvizsgálási állapot mentésekor."
+  },
+  "pleaseTryAgain": {
+    "message": "Próbáljuk újra"
+  },
   "unmarkAsCritical": {
     "message": "Ktritkus jelölés eltávolítása"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Kedvencek"
   },
+  "taskSummary": {
+    "message": "Feladat összefoglaló"
+  },
   "types": {
     "message": "Típusok"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Tartsuk nyitva ezt az ablakot és kövessük a böngésző utasításait."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "A hozzáférési kulcs hitelesítés sikertelen volt. Próbáljuk újra."
+  },
   "useADifferentLogInMethod": {
     "message": "Más bejelentkezési mód használata"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Egyszeri bejelentkezés használata"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A szervezet egyszeri bejelentkezést igényel."
+  },
   "welcomeBack": {
     "message": "Üdvözlet újra"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "A mesterjelszó érvénytelen."
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "A mesterjelszó érvénytelen. Erősítsük meg, hogy email cím helyes és a fiók létrehozásának helye: $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Érvénytelen a fájl jelszó. Használjuk az exportálás fájl létrehozásakor megadott jelszót."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Nincsenek megjeleníthető elemek."
   },
+  "noItemsInTrash": {
+    "message": "Nincs elem a lomtárban."
+  },
+  "noItemsInTrashDesc": {
+    "message": "A törölt elemek itt jelennek meg és 30 nap elteltével véglegesen törlődnek."
+  },
+  "noItemsInVault": {
+    "message": "Nincsenek elemek a széfben."
+  },
+  "emptyVaultDescription": {
+    "message": "A széf nemcsak a jelszavakat védi. Itt biztonságosan tárolhatjuk a bejelentkezési adatokat, egyéb azonosítókat, kártyákat és jegyzeteket."
+  },
+  "emptyFavorites": {
+    "message": "Nem lett kedvencnek minősítve egyetlen elem sem."
+  },
+  "emptyFavoritesDesc": {
+    "message": "Gyakran használt elemek hozzáadása a kedvencekhez a gyors hozzáférés érdekében."
+  },
+  "noSearchResults": {
+    "message": "Nincsenek visszakapott keresési eredmények."
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Töröljük a szűrőket vagy próbálkozzunk másik keresési kifejezéssel."
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Nincs jogosultság a gyűjtemény összes elemének megtekintésére."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Kulcs beállítások titkosítása"
   },
-  "kdfAlgorithm": {
-    "message": "KDF  algoritmus"
-  },
   "kdfIterations": {
     "message": "KDF iterációk"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "A magasabb szintű KDF iterációk, a memória és a párhuzamosság segíthet megvédeni mesterjelszót a támadók erőszakossága ellen."
   },
-  "changeKdf": {
-    "message": "KDF megváltoztatása"
-  },
   "encKeySettingsChanged": {
     "message": "A kulcs beállítás titkosítása megváltozott."
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Ellenőrizzük, hogy a fióknak elég hitelkerete van a vásárláshoz. Ha nincs elég keret, akkor az alapértelmezett fizetési mód kerül használatba a különbségnél. Hitelkeretet a Számlázás oldalon adhatunk hozzá."
   },
+  "notEnoughAccountCredit": {
+    "message": "Nincs elegendő fiók egyenleg ehhez a vásárláshoz. Feltölthetjük az egyenleget a Számlázás oldalon."
+  },
   "creditAppliedDesc": {
     "message": "A fiók hitelkeret vásárlásra használható. A rendelkezésre álló keret automatikusan ehhez a fiókhoz generálódó számlákra kerül alkalmazásra."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Következő terhelés"
   },
+  "nextChargeHeader": {
+    "message": "Következő terhelés"
+  },
+  "plan": {
+    "message": "Csomag"
+  },
   "details": {
     "message": "Részletek"
   },
+  "discount": {
+    "message": "kedvezmény"
+  },
   "downloadLicense": {
     "message": "Licensz letöltése"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Böngésző frissítése"
   },
-  "generatingYourRiskInsights": {
-    "message": "A kockázati betekintések generálása..."
+  "generatingYourAccessIntelligence": {
+    "message": "Hozzáférési intelligencia generálása..."
+  },
+  "fetchingMemberData": {
+    "message": "Tagi adatok lekérése..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "A jelszó állapot elemzése..."
+  },
+  "calculatingRiskScores": {
+    "message": "Kockázati pontszámok kiszámítása..."
+  },
+  "generatingReportData": {
+    "message": "Jelentés adatok generálása..."
+  },
+  "savingReport": {
+    "message": "Jelentés mentése..."
+  },
+  "compilingInsights": {
+    "message": "Betekintések összeállítása..."
+  },
+  "loadingProgress": {
+    "message": "Feldolgozás betöltése"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Ez eltarthat pár percig."
+  },
+  "riskInsightsRunReport": {
+    "message": "Jelentés futtatása"
   },
   "updateBrowserDesc": {
     "message": "Nem támogatott böngészőt használunk. Előfordulhat, hogy a webes széf nem működik megfelelően."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "A meghívás elfogadásra került."
   },
-  "inviteAcceptedDesc": {
-    "message": "A szervezet elérhető, amikor az adminisztrátor jóváhagyja a tagságot.  Amint ez megtörténik, értesítő email érkezik."
+  "invitationAcceptedDesc": {
+    "message": "A meghívó sikeresen elfogadásra került."
   },
   "inviteInitAcceptedDesc": {
     "message": "Mostantól elérhető ez a szervezet."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "A szervezet letiltásra került."
   },
+  "organizationIsSuspended": {
+    "message": "A szervezet felfüggesztésre került."
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "A letiltott szervezetek elemei nem érhetők el. Vegyük fel a kapcsolatot a szervezet tulajdonosával segítségért."
+  },
   "secretsAccessSuspended": {
     "message": "A felfüggesztett szervezetekhez nem lehet hozzáférni. Segítségért forduljunk a szervezet tulajdonosához."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "A felfüggesztett szervezetekben nem hozhatók létre szolgáltatásfiókok. Segítségért forduljunk a szervezet tulajdonosához."
   },
-  "disabledOrganizationFilterError": {
-    "message": "A letiltott szervezetek elemei nem érhetők el. Vegyük fel a kapcsolatot a szervezet tulajdonosával segítségért."
-  },
   "licenseIsExpired": {
     "message": "A licensz lejárt."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Egyszeri azonosító"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Adjuk meg ezt az azonosítót a tagoknak a bejelentkezéshez SSO-val. A lépés megkerüléséhez üzemeljük be ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Adjuk meg ezt az azonosítót a tagokinak az SSO-val bejelentkezéshez. A tagok kihagyhatják ennek az azonosítónak a megadását az SSO során, ha egy igényelt tartomány be van állítva.",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "További információ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO szétkapcsolása"
@@ -5518,9 +5809,9 @@
     "message": "Szükséges, hogy minden elem egy szervezet tulajdonában legyen, megújítva a fiókszintű elemek tárolásának lehetőségét.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
+  "organizationDataOwnershipDescContent": {
     "message": "Minden elem a szervezet tulajdonába és elmentésre kerül, lehetővé téve az egész szervezetre kiterjedő vezérlést, láthatóságot és jelentést. Ha be van kapcsolva, minden tag számára elérhető egy alapértelmezett gyűjtemény az elemek tárolására. Tudjunk meg többet a kezelésről:",
-    "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.'"
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "hitelesítő életciklus",
@@ -5545,6 +5836,65 @@
     "message": "Bővebben:",
     "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.'"
   },
+  "availableNow": {
+    "message": "Elérhető most"
+  },
+  "autoConfirm": {
+    "message": "Új felhasználók automatikus megerősítése"
+  },
+  "autoConfirmDescription": {
+    "message": "A szervezetbe meghívott új felhasználók automatikusan megerősítést kapnak, ha egy adminisztrátor eszköz feloldásra kerül.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Hogyan kapcsolható be az automatikus felhasználó megerősítés"
+  },
+  "autoConfirmExtension1": {
+    "message": "Nyissuk meg a Bitwarden bővítményt."
+  },
+  "autoConfirmExtension2": {
+    "message": "Kiválasztás",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Bekapcsolás",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Sikeresen megnyitásra került a Bitwarden böngésző bővítmény. Most már aktiválhatjuk az automatikus felhasználó megerősítés beállítást."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "A szervezetbe meghívott új felhasználók automatikusan megerősítést kapnak, ha egy adminisztrátor eszköz feloldásra kerül. Mielőtt bekapcsolnánk ezt a szabályzatot, tekintsük át és fogadjuk el a következőket: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potenciális biztonsági kockázat. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Az automatikus felhasználói megerőstíés biztonsági kockázatot jelenthet a szervezet adataira nézve."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "További információ a kockázatokról",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Az önálló szervezet irányelv nem engedélyezett. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Minden tagnak csak ehhez a szervezethez kell tartoznia az automatizálás aktiválásához."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Az egységes szervezeti irányelv minden szerepkörre kiterjed. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Nincs vészhelyzeti hozzáférés. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "A vészhelyzeti hozzáférés eltávolításra került."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Elfogadom ezeket a kockázatokat és a szabályzat frissítéseit."
+  },
   "personalOwnership": {
     "message": "Személyes tulajdon"
   },
@@ -5597,6 +5947,19 @@
     "message": "Ne engedjük, hogy a felhasználók elrejtsék email címüket a címzettek elől a Send elem létrehozása vagy szerkesztése során.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Alapértelmezett URI egyezés érzékelés"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Határozzuk meg, hogy mikor javasolt a bejelentkezés az automatikus kitöltéshez. Az adminisztrátorok és tulajdonosok mentesülnek e szabály alól."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Alapértelmezett URI egyezés érzékelés"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Válasszunk egy érvényes URI egyezés észlelési lehetőséget.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "$ID$ szabály módosításra került.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "A mesterjelszó nem felel meg egy vagy több szervezeti szabályzatnak. A széf eléréséhez frissíteni kell a meszerjelszót. A továbblépés kijelentkeztet az aktuális munkamenetből és újra be kell jelentkezni. A többi eszközön lévő aktív munkamenetek akár egy óráig is aktívak maradhatnak."
   },
-  "automaticAppLogin": {
-    "message": "A felhasználók automatikus bejelentkezése az engedélyezett alkalmazásokhoz"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatikus bejelentkezés az SSO-val"
   },
-  "automaticAppLoginDesc": {
-    "message": "A bejelentkezési űrlapok automatikusan kitöltésre és elküldésre kerülnek a konfigurált azonosság szolgáltatótól indított alkalmazásokhoz."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Az SSO biztonságának és kényelmének kiterjesztése a nem-felügyelt alkalmazásokra. Amikor a felhasználók elindítanak egy alkalmazást a saját azonosítás szolgáltatónktól, a bejelentkezési adatokk automatikusan kitöltésre és elküldésre kerülnek, így egy kattintással biztonságos áramlás jön létre az azonosítás szolgáltatótól az alkalmazás felé."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Azonosság szolgáltató kiszolgáló"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "A szervezete frissítette a visszafejtési beállításokat. Állítsunk be egy mestarjelszót a széf eléréséhez."
   },
-  "maximumVaultTimeout": {
-    "message": "Széf időkifutás"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Munkamenet időkifutás"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Állítsunk be maximális széf időtúllépést minden felhasználó számára."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Állítsunk be egy maximális munkamenet időtúllépést minden tag számára a tulajdonosokat kivéve."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximális széf időkifutás"
+  "maximumAllowedTimeout": {
+    "message": "Maximálisan engedélyezett időkifutás"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "A maximális széf időkifutás érvénytelen."
+  "maximumAllowedTimeoutRequired": {
+    "message": "A maximális megengedett időkifutás megadása szükséges."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Az idő érvénytelen. Legalább egy értéket módosításunk."
+  },
+  "sessionTimeoutAction": {
+    "message": "Munkamenet időkifutási művelet"
+  },
+  "immediately": {
+    "message": "Azonnal"
+  },
+  "onSystemLock": {
+    "message": "Rendszer zárolásakor"
+  },
+  "onAppRestart": {
+    "message": "Alkalmazás újraindításakor"
   },
   "hours": {
     "message": "Óra"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Perc"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Biztosan szeretnénk minden tag számára engedélyezni a \"Soha\" maximálisi időkifutást?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Ez az opció elmenti tagjai titkosítási kulcsait az eszközeikre. Ha ezt a lehetőséget választjuk, gondoskodjunk arról, hogy eszközeik megfelelő védelemben részesüljenek."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "További információ az eszköz védelemről"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "A \"rendszerzár\" csak a böngészőre és az asztali alkalmazásra vonatkozik."
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "A mobil- és webalkalmazás az \"alkalmazás újraindításakor“ kifejezést használja a maximális megengedett időkifutásként, mivel az opció nem támogatott."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "A szervezeti házirendek hatással vannak a széf időkorlátjára. A széf időkorlátja legfeljebb $HOURS$ óra és $MINUTES$ perc lehet.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Hozzá kell adni az alapszerver webcímét vagy legalább egy egyedi környezetet."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "A webcímeknek HTTPS-t kell használniuk."
+  },
   "apiUrl": {
     "message": "API szerver webcím"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Csak a $ORGANIZATION$ szervezetehez kapcsolódó szervezeti széf kerül exportálásra.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Csak a $ORGANIZATION$ szervezethez kapcsolódó szervezeti széf kerül exportálásra. A saját elem gyűjtemények nem lesznek benne.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "A hozzáférés megtagadásra került. Nincs jogosultság az oldal megtekintésére."
   },
+  "noPageAccess": {
+    "message": "Nincs hozzáférés ehhez az oldalhoz."
+  },
   "masterPassword": {
     "message": "Mesterjelszó"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Ismeretlen a titkos kód, előfordulhat, hogy engedélyt kell kérni a titkos kód eléréséhez."
   },
+  "unknownServiceAccount": {
+    "message": "A gép fiók ismeeretlen, előfordulhat, hogy engedélyt kell kérni a gép fiók eléréséhez."
+  },
   "unknownProject": {
     "message": "Ismeretlen a projekt, előfordulhat, hogy engedélyt kell kérni a projekt eléréséhez."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Csoport/Felhasználó"
   },
-  "lowKdfIterations": {
-    "message": "Alacsony KDF iterációk"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Frissítsük a titkosítási beállításokat, hogy megfeleljünk az új biztonsági ajánlásoknak és javítsuk a fiókvédelmet."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "A folytatás kijelentkeztet az összes aktív munkamenetből. Újra be kell jelentkezni és kétlépcsős bejelentkezést kell végrehajtani, ha van ilyen. Célszerű a titkosítási beállítások módosítása előtt a széf exportálása az adatvesztés elkerülése érdekében."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Egy projekt hozzáférésre került egy azonosítóval: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Egy projekt elérése megtörtént egy azonosítóval: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "A gép fiók törlésre került egy azonosítóval: $SERVICE_ACCOUNT_ID$.",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Egy projekt szerkesztése megtörtént egy azonosítóval: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Egy felhasználó került hozzáadásra: $USER_ID$ a gépi fiókhoz egy azonosítóval: $SERVICE_ACCOUNT_ID$.",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Egy felhasználó lett eltávolítva: $USER_ID$ a gépi fiókból egy azonosítóval: $SERVICE_ACCOUNT_ID$.",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Egy csoport lett eltávolítva: $GROUP_ID$ a gépi fiókból egy azonosítóval: $SERVICE_ACCOUNT_ID$.",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Egy gép fiók lett létrehozva egy azonosítóval: $SERVICE_ACCOUNT_ID$.",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Egy csoport lett hozzáadva: $GROUP_ID$ a gép fiókhoz egy azonosítóval: $SERVICE_ACCOUNT_ID$.",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Egy gép fiók került tötlésre egy azonosítóval: $SERVICE_ACCOUNT_ID$.",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Egy projekt törlése megtörtént egy azonosítóval: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Megtörtént a bejelentkezés."
   },
-  "beta": {
-    "message": "Béta"
-  },
   "assignCollectionAccess": {
     "message": "Gyűjtemény elérés hozzárendelése"
   },
@@ -9330,6 +9820,14 @@
     "message": "Túl drága",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Váltás ingyenes díkcsomagra",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Váltás ingyenes szervezetre",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Díjmentes 1 évre"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Hozzárendelés"
   },
+  "assignTasks": {
+    "message": "Feladatok hozzárendelése"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Értesítések küldése a jelszavak megváltoztatásához"
+  },
   "assignToCollections": {
     "message": "Hozzárendelés gyűjteményekhez"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Eseményadatok küldése a Logscale példánynak"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Széf eseményadatok küldése a Datadog példánynak"
+  },
   "failedToSaveIntegration": {
     "message": "Nem sikerült menteni az integrációt. Próbáljuk újra később."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Ennek a műveletnek a végrehajtásához a szervezet tulajdonosának kell lenni."
+  },
   "failedToDeleteIntegration": {
     "message": "Nem sikerült törölni az integrációt. Próbáljuk újra később."
   },
@@ -9873,7 +10383,7 @@
     "message": "hónap tagonként éves számlázással"
   },
   "seats": {
-    "message": "Seats"
+    "message": "Helyek"
   },
   "addOrganization": {
     "message": "Szervezet hozzáadása"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Alacsony a KDF iterációk száma. Növeljük az iterációk számát a fiók biztonságának javítása érdekében."
-  },
-  "changeKDFSettings": {
-    "message": "KDF beállítások megváltoztatása"
-  },
   "secureYourInfrastructure": {
     "message": "Infrastruktúra biztosítása"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Ki"
   },
-  "higherKDFIterations": {
-    "message": "A magasabb szintű KDF iterációk segíthetnek megvédeni mesterjelszót a támadók erőszakossága ellen."
-  },
-  "incrementsOf100,000": {
-    "message": "100 000-es lépésekben"
-  },
-  "smallIncrements": {
-    "message": "kis lépésekben"
-  },
   "kdfIterationRecommends": {
     "message": "Célszerű 600 000 vagy nagyobb lépésben"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Régebbi eszközökön a KDF túl magas beállítása teljesítmény problémákat okozhat. Növeljük az értéket $VALUE$ lépésbern és teszteljük az eszközöket.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Lépjünk kapcsolatba az ügyfélszolgálattal az előfizetés visszaállításához."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "A tartomány követelésre került."
   },
+  "itemAddedToFavorites": {
+    "message": "Az elem bekerült a kedvencekhez.."
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Az elem eltávolítva a kedvencek közül."
+  },
+  "copyNote": {
+    "message": "Jegyzet másolása"
+  },
   "organizationNameMaxLength": {
     "message": "A szervezet neve nem haladhatja meg az 50 karaktert."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Sikeresen megnyitottuk a Bitwarden böngésző bővítményt. Mostantól áttekinthetjük a veszélyeztetett jelszavakat."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Probléma merült fel a Bitward böngésző bővítmény megnyitásakor. Nyissuk meg a Bitwarden ikont",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "az eszköztárból.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Az előfizetés hamarosan megújul. A folyamatos szolgáltatás biztosítása érdekében lépjünk kapcsolatba $RESELLER$ viszonteladóval és erősítsük meg a megújítást $RENEWAL_DATE$ előtt.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Keresés archívum"
   },
-  "archive": {
-    "message": "Archívum"
+  "archiveNoun": {
+    "message": "Archívum",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archívum",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Visszavétel archívumból"
+  },
+  "itemsInArchive": {
+    "message": "Archiválandó elemek"
   },
   "noItemsInArchive": {
     "message": "Nincs elem az archívumban."
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Az archivált elemek itt jelennek meg és kizárásra kerülnek az általános keresési eredményekből és az automatikus kitöltési javaslatokból."
   },
+  "itemWasSentToArchive": {
+    "message": "Az elem az archivumba került."
+  },
+  "itemsWereSentToArchive": {
+    "message": "Az elemek az archivumba kerültek."
+  },
+  "itemUnarchived": {
+    "message": "Az elemek visszavéelre kerültek az archivumból."
+  },
+  "bulkArchiveItems": {
+    "message": "Az elemek archiválásra kerültek."
+  },
+  "bulkUnarchiveItems": {
+    "message": "Az elemek visszavéelre kerültek az archivumból."
+  },
+  "archiveItem": {
+    "message": "Elem archiválása",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Az archivált elemek ki vannak zárva az általános keresési eredményekből és az automatikus kitöltési javaslatokból. Biztosan archiválni szeretnénk ezt az elemet?"
+  },
+  "archiveBulkItems": {
+    "message": "Elemek archiválása",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Az archivált elemek ki vannak zárva az általános keresési eredményekből és az automatikus kitöltési javaslatokból. Biztosan archiválni szeretnénk ezeket az elemeket?"
+  },
   "businessUnit": {
     "message": "Üzleti egység"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "A Bitwarden kiterjesztés telepítésre került!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Ha a bővítmény nem nyílt meg, előfordulhat, hogy meg kell nyitni a Bitwardent az ikonról ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": "az eszköztárból.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Zökkenőmentes integráció"
+  },
+  "families": {
+    "message": "Családok"
+  },
+  "upgradeToFamilies": {
+    "message": "Áttérés Családok csomagra"
+  },
+  "upgradeToPremium": {
+    "message": "Áttérés Prémium csomagra"
+  },
+  "familiesUpdated": {
+    "message": "Megtörtént az áttérés a Családok csomagra."
+  },
+  "taxCalculationError": {
+    "message": "Hiba történt a tartózkodási helyre vonatkozó adó kiszámításakor. Próbáljuk újra."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Üdvözlet a Bitwardenben"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Szabadítsunk fel meg több biztonsági funkciót a Prémium segítségével vagy kezdjük el megosztani az elemeket a Családok csomaggal."
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Az árak nem tartalmazzák az adót és évente kerülnek számlázásra."
+  },
+  "organizationNameDescription": {
+    "message": "A szervezet neve megjelenik a tagoknak küldött meghívókban."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Folytatás áttérés nélkül"
+  },
+  "upgradeYourPlan": {
+    "message": "Csomag áttérés"
+  },
+  "upgradeNow": {
+    "message": "Áttérés most"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Az űrlap kitöltésével egy új Családok szervezet jön létre. Az Adminisztrációs konzolban lehet áttérni az Ingyenes szervezetről."
+  },
+  "upgradeErrorMessage": {
+    "message": "Hiba történt az áttérés feldolgozása közben. Próbáljuk újra."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Jelenleg a Bitwarden Ingyenes csomaggal rendelkezünk."
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Áttérés a teljes biztonságért"
+  },
+  "viewbusinessplans": {
+    "message": "Üzleti csomagok megtekintése"
+  },
+  "updateEncryptionSettings": {
+    "message": "Titkosítási beállítások frissítése"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Frissítsük a titkosítási beállításokat."
+  },
+  "updateSettings": {
+    "message": "Beállítások frissítése"
+  },
+  "algorithm": {
+    "message": "Algoritmus"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Válasszuk ki, hogy a Bitwarden hogyan titkosítsa a széf adatokat. Minden lopció biztonságos, de az erősebb módszerek jobb védelmet nyújtanak - különösen a brute force típusú támadások ellen. A Bitwarden a legtöbb felhasználó számára az alapértelmezett beállítást ajánlja."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Az értékek alapértelmezett fölé emelése javítja a biztonságot, de ennek eredményeként a széf feloldása hosszabb időt vehet igénybe."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "A titkosítási algoritmusokról"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "A PBKDF2-SHA256 egy jól tesztelt titkosítási módszer, amely egyensúlyban tartja a biztonságot és a teljesítményt. Minden felhasználó számára jó."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Az Argon2id erősebb védelmet nyújt a modern támadásokkal szemben. A legjobb a nagy teljesítményű eszközökkel rendelkező haladó felhasználók számára."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Irányítószám"
+  },
+  "cardNumberLabel": {
+    "message": "Kártya szám"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Az ingyenes Családok próbaverzió elindítása"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Fiók létrehozásának letiltása az igényelt tartományokhoz"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Megakadályozza, hogy a felhasználók a szervezetén kívül fiókokat hozzanak létre az igényelt tartományokból származó email címek használatával."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A házirend aktiválása előtt egy tartományt igényelni kell."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Állítsunk be egy feloldási módot a széf időkifutási műveletének módosításához."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "A vállalkozáspolitikai követelményeket alkalmazásra kerültek az időkifutási opciókra."
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "A széf időkorlátja túllépi a szervezet által beállított korlátozást."
+  },
+  "neverLockWarning": {
+    "message": "Biztosan szeretnénk használni a \"Soha\" opciót? A zárolási opciók \"Soha\" értékre állítása a széf titkosítási kulcsát az eszközön tárolja. Ennek az opciónak a használatakor célszerű az eszköz megfelelő védettségét biztosítani."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Időkifutási művelet"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Munkamenet időkifutás"
+  },
+  "appearance": {
+    "message": "Megjelenés"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Az időkifutás meghaladja a szervezet által beállított korlátozást: $HOURS$ óra és $MINUTES$ perc maximum.",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Nincsenek veszélyben levő kritikus alkalmazások."
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Biztos folytatni szeretnénk?"
+  },
+  "userVerificationFailed": {
+    "message": "A felhasználó ellenőrzése sikertelen volt."
   }
 }
diff --git a/apps/web/src/locales/id/messages.json b/apps/web/src/locales/id/messages.json
index 39f4232a707..639063ca304 100644
--- a/apps/web/src/locales/id/messages.json
+++ b/apps/web/src/locales/id/messages.json
@@ -3,31 +3,34 @@
     "message": "Semua aplikasi"
   },
   "activity": {
-    "message": "Activity"
+    "message": "Aktivitas"
   },
   "appLogoLabel": {
     "message": "Logo Bitwarden"
   },
   "criticalApplications": {
-    "message": "Aplikasi genting"
+    "message": "Aplikasi penting"
   },
   "noCriticalAppsAtRisk": {
-    "message": "Tidak ada aplikasi genting berisiko"
+    "message": "Tidak ada aplikasi penting berisiko"
   },
   "accessIntelligence": {
     "message": "Akses Pintar"
   },
-  "riskInsights": {
-    "message": "Wawasan Risiko"
-  },
   "passwordRisk": {
     "message": "Petunjuk Sandi"
   },
+  "noEditPermissions": {
+    "message": "Anda tidak memiliki izin untuk mengubah item ini"
+  },
   "reviewAtRiskPasswords": {
-    "message": "Tinjau sandi berisiko (mis. lemah, tersingkap, atau digunakan ulang) lintas aplikasi. Pilih aplikasi paling genting Anda untuk mengutamakan aksi keamanan untuk pengguna Anda guna menyiasati sandi berisiko."
+    "message": "Tinjau sandi berisiko (lemah, bocor, atau digunakan ulang) lintas aplikasi. Pilih aplikasi paling genting Anda untuk mengutamakan aksi keamanan untuk pengguna Anda guna menangani sandi berisiko."
+  },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Tinjau login yang berisiko"
   },
   "dataLastUpdated": {
-    "message": "Data terakhir diperbarui pada: $DATE$",
+    "message": "Data terakhir diperbarui: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Anda belum membuat laporan"
+  },
   "notifiedMembers": {
     "message": "Anggota yang diberitahukan"
   },
@@ -59,11 +65,64 @@
   "createNewLoginItem": {
     "message": "Buat entri masuk baru"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "$PERCENT$% selesai",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ dari $TOTAL$ tugas keamanan telah diselesaikan",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Progres perubahan sandi"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Tetapkan tugas ke anggota untuk memantau progres"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Kirim pengingat"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Setelah Anda menandainya sebagai penting, itu akan muncul di sini."
+  },
+  "viewAtRiskMembers": {
+    "message": "Lihat anggota yang berisiko"
+  },
+  "viewAtRiskApplications": {
+    "message": "Lihat aplikasi yang berisiko"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ dari $TOTAL$ aplikasi penting berisiko karena sandi yang berisiko",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
-    "message": "Semua aplikasi ($COUNT$)",
+    "message": "Aplikasi penting ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "aplikasi penting ditandai"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "$COUNT$ aplikasi penting",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ aplikasi dalam risiko",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ sandi dalam risiko",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ sandi baru berisiko",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Anggota yang diberitahukan ($COUNT$)",
     "placeholders": {
@@ -89,56 +178,104 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Tidak menemukan aplikasi di $ORG NAME$",
+  "noDataInOrgTitle": {
+    "message": "No data found"
+  },
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
+  },
+  "noCriticalApplicationsTitle": {
+    "message": "Anda belum menandai aplikasi apa pun sebagai penting"
+  },
+  "noCriticalApplicationsDescription": {
+    "message": "Pilih aplikasi paling penting untuk memprioritaskan tindakan keamanan agar pengguna dapat menangani sandi yang berisiko."
+  },
+  "markCriticalApplications": {
+    "message": "Pilih aplikasi penting"
+  },
+  "markAppAsCritical": {
+    "message": "Tandai sebagai apl penting"
+  },
+  "markAsCritical": {
+    "message": "Tandai sebagai penting"
+  },
+  "applicationsSelected": {
+    "message": "aplikasi dipilih"
+  },
+  "selectApplication": {
+    "message": "Pilih aplikasi"
+  },
+  "unselectApplication": {
+    "message": "Batalkan pilih apl"
+  },
+  "applicationsMarkedAsCriticalSuccess": {
+    "message": "Aplikasi ditandai sebagai penting"
+  },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
     "placeholders": {
-      "org name": {
+      "count": {
         "content": "$1",
-        "example": "Company Name"
+        "example": "3"
       }
     }
   },
-  "noAppsInOrgDescription": {
-    "message": "Setelah pengguna menyimpan info masuk, aplikasi akan muncul di sini menampilkan sandi yang berisiko. Tandai aplikasi penting dan beri tahukan pengguna untuk memperbarui sandi."
-  },
-  "noCriticalApplicationsTitle": {
-    "message": "You haven’t marked any applications as critical"
-  },
-  "noCriticalApplicationsDescription": {
-    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
-  },
-  "markCriticalApplications": {
-    "message": "Select critical applications"
-  },
-  "markAppAsCritical": {
-    "message": "Mark app as critical"
-  },
-  "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Gagal menandai aplikasi sebagai penting"
   },
   "application": {
     "message": "Aplikasi"
   },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "Sandi berisiko"
   },
   "requestPasswordChange": {
-    "message": "Minta petunjuk kata sandi"
+    "message": "Minta perubahan sandi"
   },
   "totalPasswords": {
-    "message": "Jumlah Kata Sandi"
+    "message": "Jumlah sandi"
   },
   "searchApps": {
     "message": "Cari aplikasi"
   },
   "atRiskMembers": {
-    "message": "At-risk members"
+    "message": "Anggota berisiko"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ anggota berisiko",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -147,7 +284,7 @@
     }
   },
   "atRiskMembersWithCount": {
-    "message": "At-risk members ($COUNT$)",
+    "message": "Anggota berisiko ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,20 +301,20 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "Anggota ini masuk ke aplikasi dengan sandi yang lemah, terekspos, atau sama."
   },
   "atRiskApplicationsDescription": {
-    "message": "These applications have weak, exposed, or reused passwords."
+    "message": "Aplikasi ini memiliki sandi yang lemah, terekspos, atau sama."
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "These are no applications with weak, exposed, or reused passwords."
+    "message": "Aplikasi ini memiliki sandi yang lemah, terekspos, atau sama."
   },
   "atRiskMembersDescriptionWithApp": {
-    "message": "These members are logging into $APPNAME$ with weak, exposed, or reused passwords.",
+    "message": "Anggota ini masuk ke $APPNAME$ dengan sandi yang lemah, terekspos, atau sama.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -186,7 +323,7 @@
     }
   },
   "atRiskMembersDescriptionWithAppNone": {
-    "message": "There are no at risk members for $APPNAME$.",
+    "message": "Tidak ada anggota yang berisiko untuk $APPNAME$.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -198,19 +335,91 @@
     "message": "Jumlah Anggota"
   },
   "atRiskApplications": {
-    "message": "At-risk applications"
+    "message": "Aplikasi berisiko"
   },
   "totalApplications": {
     "message": "Semua aplikasi"
   },
+  "applicationsNeedingReview": {
+    "message": "Aplikasi yang perlu ditinjau"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ aplikasi baru",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Tinjau aplikasi baru untuk ditandai sebagai penting dan jaga keamanan organisasi Anda"
+  },
+  "reviewNow": {
+    "message": "Tinjau sekarang"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritaskan aplikasi penting"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Fungsi tandai sebagai penting akan diterapkan pada pembaruan mendatang"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
-    "message": "Unmark as critical"
+    "message": "Batalkan sebagai penting"
   },
   "criticalApplicationUnmarkedSuccessfully": {
-    "message": "Successfully unmarked application as critical"
+    "message": "Berhasil membatalkan apl sebagai penting"
   },
   "whatTypeOfItem": {
-    "message": "Jenis barang apa ini?"
+    "message": "Jenis item apa ini?"
   },
   "name": {
     "message": "Nama"
@@ -235,10 +444,10 @@
     "message": "Nama Pengguna"
   },
   "password": {
-    "message": "Kata Sandi"
+    "message": "Sandi"
   },
   "newPassword": {
-    "message": "Kata Sandi baru"
+    "message": "Sandi baru"
   },
   "passphrase": {
     "message": "Frasa sandi"
@@ -253,13 +462,13 @@
     "message": "Catatan"
   },
   "customFields": {
-    "message": "Kolom Ubahsuai"
+    "message": "Bidang ubahsuai"
   },
   "cardholderName": {
     "message": "Nama Pemegang Kartu"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Kredensial login"
   },
   "personalDetails": {
     "message": "Rincian pribadi"
@@ -283,7 +492,7 @@
     }
   },
   "itemHistory": {
-    "message": "Riwayat barang"
+    "message": "Riwayat item"
   },
   "authenticatorKey": {
     "message": "Kunci Autentikator"
@@ -305,16 +514,16 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Situs web ditambahkan"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Tambah situs web"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Hapus situs web"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "Bawaan ($VALUE$)",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -324,7 +533,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "Tampilkan deteksi kecocokan $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -333,7 +542,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "Sembunyikan deteksi kecocokan $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -342,7 +551,7 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Autofill on page load?"
+    "message": "Isi otomatis saat halaman dimuat?"
   },
   "number": {
     "message": "Nomor"
@@ -351,13 +560,13 @@
     "message": "Merek"
   },
   "expiration": {
-    "message": "Masa Berlaku"
+    "message": "Masa berlaku"
   },
   "securityCode": {
     "message": "Kode Keamanan (CVV)"
   },
   "securityCodeSlashCVV": {
-    "message": "Security code / CVV"
+    "message": "Kode keamanan / CVV"
   },
   "identityName": {
     "message": "Nama Identitas"
@@ -375,7 +584,7 @@
     "message": "Nomor Lisensi"
   },
   "email": {
-    "message": "Surel"
+    "message": "Email"
   },
   "phone": {
     "message": "Telepon"
@@ -435,10 +644,10 @@
     "message": "Dr"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Kartu kedaluwarsa"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Jika kartu telah diperbarui, ubah informasi kartu"
   },
   "expirationMonth": {
     "message": "Bulan Kedaluwarsa"
@@ -450,16 +659,16 @@
     "message": "Kunci Autentikasi (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Buat verifikasi 2-langkah mudah"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden dapat menyimpan dan mengisi kode verifikasi 2 langkah. Salin dan tempel kunci ke kolom ini."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden dapat menyimpan dan mengisi kode verifikasi 2 langkah. Pilih ikon kamera untuk mengambil tangkapan layar kode QR autentikator situs web ini, atau salin dan tempel kuncinya ke kolom ini."
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Pelajari lebih lanjut tentang autentikator"
   },
   "folder": {
     "message": "Direktori"
@@ -510,7 +719,7 @@
     "message": "Edit Folder"
   },
   "editWithName": {
-    "message": "Sunting $ITEM$: $NAME$",
+    "message": "Ubah $ITEM$: $NAME$",
     "placeholders": {
       "item": {
         "content": "$1",
@@ -575,7 +784,7 @@
     "description": "Toggling an expand/collapse state."
   },
   "checkPassword": {
-    "message": "Periksa apakah kata sandi telah terekspos."
+    "message": "Periksa apakah sandi telah terekspos."
   },
   "passwordExposed": {
     "message": "Sandi ini telah terekspos $VALUE$ kali dalam kebocoran data. Sebaiknya, anda mengubahnya.",
@@ -587,13 +796,13 @@
     }
   },
   "passwordSafe": {
-    "message": "Kata sandi ini tidak ditemukan dalam kebocoran data yang diketahui. Kata sandi tersebut seharusnya aman untuk digunakan."
+    "message": "Sandi ini tidak ditemukan dalam pelanggaran data apa pun. Seharusnya aman digunakan."
   },
   "save": {
     "message": "Simpan"
   },
   "cancel": {
-    "message": "Batalkan"
+    "message": "Batal"
   },
   "later": {
     "message": "Nanti"
@@ -614,7 +823,7 @@
     "message": "Batalkan favorit"
   },
   "edit": {
-    "message": "Sunting"
+    "message": "Ubah"
   },
   "searchCollection": {
     "message": "Cari koleksi"
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorit"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Jenis"
   },
@@ -711,7 +923,7 @@
     "message": "Nama Tengah"
   },
   "lastName": {
-    "message": "Nama Belakang"
+    "message": "Nama belakang"
   },
   "fullName": {
     "message": "Nama Lengkap"
@@ -735,7 +947,7 @@
     "message": "Negara Bagian / Provinsi"
   },
   "zipPostalCode": {
-    "message": "Kode Pos"
+    "message": "Zip / Kode pos"
   },
   "country": {
     "message": "Negara"
@@ -750,7 +962,7 @@
     "message": "Pilih"
   },
   "newItem": {
-    "message": "Barang baru"
+    "message": "Item baru"
   },
   "addItem": {
     "message": "Tambah Item"
@@ -762,79 +974,79 @@
     "message": "Lihat Item"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "Login Baru",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "Kartu Baru",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "Identitas Baru",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "Catatan Baru",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "Kunci SSH Baru",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Teks Kirim baru",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Berkas Kirim baru",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "Ubah Login",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "Ubah Kartu",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "Ubah Identitas",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "Ubah Catatan",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "Ubah kunci SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Ubah Teks Kirim",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Ubah Berkas Kirim",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Lihat Login",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Lihat Kartu",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "Lihat Identitas",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "Lihat Catatan",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "Lihat kunci SSH",
     "description": "Header for view SSH key item type"
   },
   "new": {
@@ -842,13 +1054,13 @@
     "description": "for adding new items"
   },
   "item": {
-    "message": "Barang"
+    "message": "Item"
   },
   "itemDetails": {
-    "message": "Rincian barang"
+    "message": "Rincian item"
   },
   "itemName": {
-    "message": "Nama barang"
+    "message": "Nama item"
   },
   "ex": {
     "message": "cth.",
@@ -881,7 +1093,7 @@
     "description": "Copy value to clipboard"
   },
   "copyPassword": {
-    "message": "Salin Kata Sandi",
+    "message": "Salin sandi",
     "description": "Copy password to clipboard"
   },
   "copyPassphrase": {
@@ -892,15 +1104,15 @@
     "message": "Sandi disalin"
   },
   "copyUsername": {
-    "message": "Salin Nama Pengguna",
+    "message": "Salin nama pengguna",
     "description": "Copy username to clipboard"
   },
   "copyNumber": {
-    "message": "Salin Nomor",
+    "message": "Salin nomor",
     "description": "Copy credit card number"
   },
   "copySecurityCode": {
-    "message": "Salin Kode Keamanan",
+    "message": "Salin kode keamanan",
     "description": "Copy credit card security code (CVV)"
   },
   "copyUri": {
@@ -929,7 +1141,7 @@
     "message": "Salin nomor telepon"
   },
   "copyEmail": {
-    "message": "Salin alamat surat elektronik"
+    "message": "Salin email"
   },
   "copyCompany": {
     "message": "Salin perusahaan"
@@ -976,13 +1188,13 @@
     "message": "Saya"
   },
   "myItems": {
-    "message": "Barang saya"
+    "message": "Item saya"
   },
   "myVault": {
     "message": "Brankas Saya"
   },
   "allVaults": {
-    "message": "Semua Vault"
+    "message": "Semua Brankas"
   },
   "vault": {
     "message": "Brankas"
@@ -991,7 +1203,7 @@
     "message": "Brankas"
   },
   "vaultItems": {
-    "message": "Item Brankas"
+    "message": "Item brankas"
   },
   "filter": {
     "message": "Filter"
@@ -1052,7 +1264,7 @@
     }
   },
   "itemsMovedToOrg": {
-    "message": "Barang dipindahkan ke $ORGNAME$",
+    "message": "Item dipindahkan ke $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -1061,7 +1273,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Barang dipindahkan ke $ORGNAME$",
+    "message": "Item dipindahkan ke $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -1169,16 +1381,19 @@
     "message": "Perlu pilihan lainnya?"
   },
   "loginWithMasterPassword": {
-    "message": "Masuk dengan kata sandi utama"
+    "message": "Masuk dengan sandi utama"
   },
   "readingPasskeyLoading": {
-    "message": "Reading passkey..."
+    "message": "Membaca kunci sandi..."
   },
   "readingPasskeyLoadingInfo": {
-    "message": "Keep this window open and follow prompts from your browser."
+    "message": "Biarkan jendela ini terbuka dan ikuti petunjuk dari peramban Anda."
+  },
+  "passkeyAuthenticationFailed": {
+    "message": "Autentikasi kunci sandi gagal. Coba lagi nanti."
   },
   "useADifferentLogInMethod": {
-    "message": "Use a different log in method"
+    "message": "Gunakan metode masuk berbeda"
   },
   "logInWithPasskey": {
     "message": "Masuk dengan kunci sandi"
@@ -1186,32 +1401,35 @@
   "useSingleSignOn": {
     "message": "Gunakan masuk tunggal"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Selamat datang kembali"
   },
   "invalidPasskeyPleaseTryAgain": {
-    "message": "Invalid Passkey. Please try again."
+    "message": "Kunci Sandi Tidak Valid. Silakan coba lagi."
   },
   "twoFactorForPasskeysNotSupportedOnClientUpdateToLogIn": {
-    "message": "2FA for passkeys is not supported. Update the app to log in."
+    "message": "2FA untuk kunci sandi tidak didukung. Perbarui aplikasi untuk masuk."
   },
   "loginWithPasskeyInfo": {
-    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+    "message": "Gunakan kunci sandi yang dibuat khusus untuk login otomatis tanpa sandi. Biometrik, seperti pengenalan wajah atau sidik jari, atau metode keamanan FIDO2 lainnya, akan memverifikasi identitas Anda."
   },
   "newPasskey": {
-    "message": "New passkey"
+    "message": "Kunci sandi baru"
   },
   "learnMoreAboutPasswordless": {
-    "message": "Learn more about passwordless"
+    "message": "Pelajari lebih lanjut tentang tanpa sandi"
   },
   "creatingPasskeyLoading": {
-    "message": "Creating passkey..."
+    "message": "Membaca kunci sandi..."
   },
   "creatingPasskeyLoadingInfo": {
-    "message": "Keep this window open and follow prompts from your browser."
+    "message": "Biarkan jendela ini terbuka dan ikuti petunjuk dari peramban Anda."
   },
   "errorCreatingPasskey": {
-    "message": "Error creating passkey"
+    "message": "Kesalahan membuat kunci sandi"
   },
   "errorCreatingPasskeyInfo": {
     "message": "Terdapat masalah mengimpor kuncimu."
@@ -1220,22 +1438,22 @@
     "message": "Akun berhasil dibuat!"
   },
   "customPasskeyNameInfo": {
-    "message": "Name your passkey to help you identify it."
+    "message": "Beri nama kunci sandi untuk membantu Anda mengidentifikasinya."
   },
   "useForVaultEncryption": {
-    "message": "Use for vault encryption"
+    "message": "Gunakan untuk enkripsi brankas"
   },
   "useForVaultEncryptionInfo": {
-    "message": "Log in and unlock on supported devices without your master password. Follow the prompts from your browser to finalize setup."
+    "message": "Masuk dan buka kunci di perangkat yang didukung tanpa sandi utama Anda. Ikuti petunjuk dari peramban Anda untuk menyelesaikan setelan."
   },
   "useForVaultEncryptionErrorReadingPasskey": {
-    "message": "Error reading passkey. Try again or uncheck this option."
+    "message": "Terjadi kesalahan saat membaca kunci sandi. Coba lagi atau hapus centang opsi ini."
   },
   "encryptionNotSupported": {
-    "message": "Encryption not supported"
+    "message": "Enkripsi tidak didukung"
   },
   "enablePasskeyEncryption": {
-    "message": "Set up encryption"
+    "message": "Siapkan enkripsi"
   },
   "usedForEncryption": {
     "message": "Digunakan untuk enkripsi"
@@ -1292,7 +1510,7 @@
     "message": "Masuk ke Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Masukkan kode yang dikirim ke surel Anda"
+    "message": "Masukkan kode yang dikirim ke email Anda"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
     "message": "Masukkan kode dari aplikasi autentikator Anda"
@@ -1304,13 +1522,13 @@
     "message": "Batas waktu otentikasi tercapai"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "Sesi autentikasi telah habis waktu. Silakan mulai ulang proses login."
   },
   "verifyYourIdentity": {
     "message": "Verifikasikan identitas Anda"
   },
   "weDontRecognizeThisDevice": {
-    "message": "Kami tidak mengenali perangkat ini. Masukkan kode yang dikirim ke surel Anda untuk memverifikasi identitas Anda."
+    "message": "Kami tidak mengenali perangkat ini. Masukkan kode yang dikirim ke email Anda untuk memverifikasi identitas Anda."
   },
   "continueLoggingIn": {
     "message": "Lanjutkan masuk"
@@ -1340,31 +1558,31 @@
     "message": "Apakah kami harus memanggil Anda?"
   },
   "masterPass": {
-    "message": "Kata Sandi Utama"
+    "message": "Sandi utama"
   },
   "masterPassDesc": {
-    "message": "Kata sandi utama adalah kata sandi yang Anda gunakan untuk mengakses brankas Anda. Sangat penting bahwa Anda tidak lupa kata sandi utama Anda. Tidak ada cara untuk memulihkan kata sandi jika Anda melupakannya."
+    "message": "Sandi utama adalah sandi yang digunakan untuk mengakses brankas Anda. Sangat penting untuk tidak melupakan sandi utama Anda. Tidak ada cara untuk memulihkan sandi jika Anda lupa."
   },
   "masterPassImportant": {
-    "message": "Kata sandi utama tidak dapat dipulihkan jika Anda melupakannya!"
+    "message": "Sandi utama tidak dapat dipulihkan jika Anda melupakannya!"
   },
   "masterPassHintDesc": {
-    "message": "Petunjuk kata sandi utama dapat membantu Anda mengingat kata sandi Anda jika Anda melupakannya."
+    "message": "Petunjuk sandi utama dapat membantu Anda mengingat sandi jika Anda melupakannya."
   },
   "reTypeMasterPass": {
-    "message": "Ketik ulang Kata Sandi Utama"
+    "message": "Ketik ulang sandi utama"
   },
   "masterPassHint": {
-    "message": "Petunjuk Kata Sandi Utama (pilihan)"
+    "message": "Petunjuk sandi utama (pilihan)"
   },
   "newMasterPassHint": {
-    "message": "New master password hint (optional)"
+    "message": "Petunjuk sandi utama (opsional)"
   },
   "masterPassHintLabel": {
-    "message": "Petunjuk Kata Sandi Utama"
+    "message": "Petunjuk sandi utama"
   },
   "masterPassHintText": {
-    "message": "If you forget your password, the password hint can be sent to your email. $CURRENT$/$MAXIMUM$ character maximum.",
+    "message": "Jika Anda lupa sandi, petunjuk sandi dapat dikirim ke email Anda. Maksimum karakter $CURRENT$/$MAXIMUM$.",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -1380,34 +1598,34 @@
     "message": "Setelan"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "Akun email"
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "Minta petunjuk"
   },
   "requestPasswordHint": {
-    "message": "Request password hint"
+    "message": "Minta petunjuk sandi"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "Masukkan alamat email akun dan petunjuk sandi Anda akan dikirimkan kepada Anda"
   },
   "getMasterPasswordHint": {
     "message": "Dapatkan petunjuk sandi utama"
   },
   "emailRequired": {
-    "message": "Alamat surel diperlukan."
+    "message": "Alamat email diperlukan."
   },
   "invalidEmail": {
-    "message": "Alamat surel tidak valid."
+    "message": "Alamat email tidak valid."
   },
   "masterPasswordRequired": {
-    "message": "Kata sandi utama diperlukan."
+    "message": "Sandi utama diperlukan."
   },
   "confirmMasterPasswordRequired": {
-    "message": "Diperlukan pengetikan ulang kata sandi utama."
+    "message": "Pengetikan ulang sandi utama diperlukan."
   },
   "masterPasswordMinlength": {
-    "message": "Master password must be at least $VALUE$ characters long.",
+    "message": "Sandi utama minimal harus $VALUE$ karakter.",
     "description": "The Master Password must be at least a specific number of characters long.",
     "placeholders": {
       "value": {
@@ -1423,10 +1641,10 @@
     "message": "Akun baru Anda telah dibuat! Sekarang Anda bisa masuk."
   },
   "newAccountCreated2": {
-    "message": "Your new account has been created!"
+    "message": "Akun baru Anda telah dibuat!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "You have been logged in!"
+    "message": "Anda telah masuk!"
   },
   "trialAccountCreated": {
     "message": "Akun berhasil dibuat."
@@ -1438,16 +1656,16 @@
     "message": "Terjadi kesalahan yang tak diduga."
   },
   "expirationDateError": {
-    "message": "Please select an expiration date that is in the future."
+    "message": "Silakan pilih tanggal kedaluwarsa yang akan datang."
   },
   "emailAddress": {
-    "message": "Alamat Surel"
+    "message": "Alamat email"
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "Brankas Anda terkunci"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "Akun Anda terkunci"
   },
   "uuid": {
     "message": "UUID"
@@ -1471,8 +1689,17 @@
   "invalidMasterPassword": {
     "message": "Sandi utama tidak valid"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Sandi utama tidak valid. Pastikan email benar dan akun Anda dibuat di $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
-    "message": "Kata sandi berkas tidak valid, harap menggunakan kata sandi yang anda masukkan saat anda membuat berkas ekspor."
+    "message": "Sandi berkas tidak valid, harap gunakan sandi yang Anda masukkan saat membuat berkas ekspor."
   },
   "lockNow": {
     "message": "Kunci Sekarang"
@@ -1480,11 +1707,35 @@
   "noItemsInList": {
     "message": "Tidak ada item yang dapat dicantumkan."
   },
+  "noItemsInTrash": {
+    "message": "Tidak ada item di sampah"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Item yang Anda hapus akan muncul di sini dan dihapus secara permanen setelah 30 hari"
+  },
+  "noItemsInVault": {
+    "message": "Tidak ada item di brankas"
+  },
+  "emptyVaultDescription": {
+    "message": "Brankas ini melindungi lebih dari sekadar sandi Anda. Simpan info login, ID, kartu, dan catatan yang aman di sini."
+  },
+  "emptyFavorites": {
+    "message": "Anda belum memfavoritkan item apa pun"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Tambahkan item yang sering digunakan ke favorit untuk akses cepat."
+  },
+  "noSearchResults": {
+    "message": "Tidak ada hasil pencarian yang cocok"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Hapus filter atau coba istilah pencarian lainnya"
+  },
   "noPermissionToViewAllCollectionItems": {
-    "message": "You do not have permission to view all items in this collection."
+    "message": "Anda tidak memiliki izin untuk melihat semua item dalam koleksi ini."
   },
   "youDoNotHavePermissions": {
-    "message": "You do not have permissions to this collection"
+    "message": "Anda tidak memiliki izin untuk koleksi ini"
   },
   "noCollectionsInList": {
     "message": "Tidak ada koleksi yang akan ditampilkan."
@@ -1496,7 +1747,7 @@
     "message": "Tidak ada pengguna untuk dicantumkan."
   },
   "noMembersInList": {
-    "message": "There are no members to list."
+    "message": "Tidak ada anggota untuk ditampilkan."
   },
   "noEventsInList": {
     "message": "Tidak ada acara untuk dicantumkan."
@@ -1508,13 +1759,13 @@
     "message": "Anda tidak berada dalam organisasi apapun. Organisasi memungkinkan Anda dengan aman berbagi item dengan pengguna lainnya."
   },
   "notificationSentDevice": {
-    "message": "A notification has been sent to your device."
+    "message": "Pemberitahuan telah dikirim ke perangkat Anda."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "Buka kunci Bitwarden di perangkat Anda atau di "
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Upaya akses oleh $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1523,22 +1774,22 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Konfirmasi akses"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Tolak akses"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "apl web"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Pastikan frasa Sidik Jari cocok dengan yang di bawah ini sebelum menyetujui."
   },
   "notificationSentDeviceComplete": {
-    "message": "Unlock Bitwarden on your device. Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Buka kunci Bitwarden di perangkat Anda. Pastikan frasa Sidik Jari sesuai dengan frasa di bawah ini sebelum menyetujui."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Pemberitahuan telah dikirim ke perangkat Anda"
   },
   "versionNumber": {
     "message": "Versi $VERSION_NUMBER$",
@@ -1559,14 +1810,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "Jangan tanya lagi di perangkat ini selama 30 hari"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Pilih metode lain",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Gunakan kode pemulihan Anda"
   },
   "insertU2f": {
     "message": "Masukkan kunci keamanan ke port USB komputer Anda. Jika ada tombolnya, tekanlah."
@@ -1584,29 +1835,29 @@
     "message": "Opsi login dua-langkah"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Pilih metode login dua langkah"
   },
   "recoveryCodeTitle": {
     "message": "Kode Pemulihan"
   },
   "invalidRecoveryCode": {
-    "message": "Invalid recovery code"
+    "message": "Kode pemulihan tidak valid"
   },
   "authenticatorAppTitle": {
     "message": "Aplikasi Autentikasi"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "Masukkan kode yang dibuat oleh apl autentikator seperti Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
-    "message": "Yubico OTP security key"
+    "message": "Kunci keamanan OTP Yubico"
   },
   "yubiKeyDesc": {
     "message": "Gunakan YubiKey untuk mengakses akun Anda. Bekerja dengan YubiKey 4, 4 Nano, 4C, dan peranti NEO."
   },
   "duoDescV2": {
-    "message": "Enter a code generated by Duo Security.",
+    "message": "Masukkan kode yang dibuat oleh Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -1629,13 +1880,13 @@
     "message": "(Dipindahkan dari FIDO)"
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Buka di tab baru"
   },
   "emailTitle": {
-    "message": "Surel"
+    "message": "Email"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "Masukkan kode yang dikirim ke email Anda."
   },
   "continue": {
     "message": "Lanjutkan"
@@ -1662,7 +1913,7 @@
     }
   },
   "deleteSelectedCollectionsDesc": {
-    "message": "$COUNT$ collection(s) will be permanently deleted.",
+    "message": "$COUNT$ koleksi akan dihapus secara permanen.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1671,10 +1922,10 @@
     }
   },
   "deleteSelectedConfirmation": {
-    "message": "Are you sure you want to continue?"
+    "message": "Apakah Anda yakin ingin melanjutkan?"
   },
   "moveSelectedItemsDesc": {
-    "message": "Choose a folder that you would like to add the $COUNT$ selected item(s) to.",
+    "message": "Pilih folder tempat Anda ingin menambahkan $COUNT$ item yang dipilih.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1686,16 +1937,16 @@
     "message": "Kode Verifikasi (TOTP)"
   },
   "copyVerificationCode": {
-    "message": "Salin Kode Verifikasi"
+    "message": "Salin kode verifikasi"
   },
   "copyUuid": {
-    "message": "Copy UUID"
+    "message": "Salin UUID"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "Kesalahan Penyegaran Token Akses"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "Token penyegaran atau kunci API tidak ditemukan. Silakan coba keluar dan masuk kembali."
   },
   "warning": {
     "message": "Peringatan"
@@ -1704,13 +1955,13 @@
     "message": "Konfirmasi Ekspor Brankas"
   },
   "confirmSecretsExport": {
-    "message": "Confirm secrets export"
+    "message": "Konfirmasi ekspor rahasia"
   },
   "exportWarningDesc": {
     "message": "Ekspor ini berisi data vault Anda dalam format yang tidak dienkripsi. Anda tidak boleh menyimpan atau mengirim file yang diekspor melalui saluran yang tidak aman (seperti email). Hapus segera setelah Anda selesai menggunakannya."
   },
   "exportSecretsWarningDesc": {
-    "message": "This export contains your secrets data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
+    "message": "Ekspor ini berisi data rahasia dalam format yang tidak terenkripsi. Anda tidak boleh menyimpan atau mengirim berkas yang diekspor melalui saluran tidak aman (seperti email). Hapus berkas tersebut segera setelah Anda selesai menggunakannya."
   },
   "encExportKeyWarningDesc": {
     "message": "Ekspor ini mengenkripsi data Anda menggunakan kunci enkripsi akun Anda. Jika Anda pernah memutar kunci enkripsi akun Anda, Anda harus mengekspor lagi karena Anda tidak akan dapat mendekripsi file ekspor ini."
@@ -1722,40 +1973,40 @@
     "message": "Ekspor"
   },
   "exportFrom": {
-    "message": "Export from"
+    "message": "Ekspor dari"
   },
   "exportVault": {
     "message": "Ekspor Brankas"
   },
   "exportSecrets": {
-    "message": "Export secrets"
+    "message": "Ekspor rahasia"
   },
   "fileFormat": {
     "message": "Format Berkas"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "This file export will be password protected and require the file password to decrypt."
+    "message": "Ekspor berkas ini akan dilindungi sandi dan memerlukan sandi berkas untuk mendekripsi."
   },
   "exportPasswordDescription": {
-    "message": "Kata sandi ini akan digunakan untuk mengekspor dan mengimpor berkas ini"
+    "message": "Sandi ini akan digunakan untuk mengekspor dan mengimpor file ini"
   },
   "confirmMasterPassword": {
-    "message": "Konfirmasi kata sandi utama"
+    "message": "Konfirmasi sandi utama"
   },
   "confirmFormat": {
     "message": "Konfirmasi format"
   },
   "filePassword": {
-    "message": "File kata sandi"
+    "message": "Sandi berkas"
   },
   "confirmFilePassword": {
-    "message": "Konfirmasi file kata sandi"
+    "message": "Konfirmasi sandi berkas"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Use your account encryption key, derived from your account's username and Master Password, to encrypt the export and restrict import to only the current Bitwarden account."
+    "message": "Gunakan kunci enkripsi akun Anda, yang berasal dari nama pengguna dan Sandi Utama akun Anda, untuk mengenkripsi ekspor dan membatasi impor hanya ke akun Bitwarden saat ini."
   },
   "passwordProtectedOptionDescription": {
-    "message": "Set a file password to encrypt the export and import it to any Bitwarden account using the password for decryption."
+    "message": "Tetapkan sandi berkas untuk mengenkripsi ekspor dan impor ke akun Bitwarden mana pun menggunakan sandi untuk dekripsi."
   },
   "exportTypeHeading": {
     "message": "Jenis ekspor"
@@ -1764,31 +2015,31 @@
     "message": "Akun dibatasi"
   },
   "passwordProtected": {
-    "message": "Dilindungi kata sandi"
+    "message": "Dilindungi sandi"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "“File password”  and “Confirm file password“ do not match."
+    "message": "\"Sandi berkas\" dan \"Konfirmasi sandi berkas\" tidak cocok."
   },
   "confirmVaultImport": {
     "message": "Konfirmasi impor berangkas"
   },
   "confirmVaultImportDesc": {
-    "message": "This file is password-protected. Please enter the file password to import data."
+    "message": "Berkas ini dilindungi sandi. Silakan masukkan sandi berkas untuk mengimpor data."
   },
   "exportSuccess": {
     "message": "Data brankas Anda telah diekspor."
   },
   "passwordGenerator": {
-    "message": "Pembuat Kata Sandi"
+    "message": "Pembuat sandi"
   },
   "minComplexityScore": {
-    "message": "Skor Kompleksitas Minimum"
+    "message": "Skor kompleksitas minimum"
   },
   "minNumbers": {
-    "message": "Angka Minimum"
+    "message": "Angka minimum"
   },
   "minSpecial": {
-    "message": "Karakter Khusus Minimum",
+    "message": "Minimum karakter spesial",
     "description": "Minimum special characters"
   },
   "ambiguous": {
@@ -1796,14 +2047,14 @@
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "Hindari karakter ambigu",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "length": {
     "message": "Panjang"
   },
   "passwordMinLength": {
-    "message": "Minimum password length"
+    "message": "Panjang sandi minimum"
   },
   "uppercase": {
     "message": "Huruf Kapital (A-Z)",
@@ -1821,10 +2072,10 @@
     "message": "Karakter Khusus (!@#$%^&*)"
   },
   "numWords": {
-    "message": "Jumlah Kata"
+    "message": "Jumlah kata"
   },
   "wordSeparator": {
-    "message": "Pemisah Kata"
+    "message": "Pemisah kata"
   },
   "capitalize": {
     "message": "Gunakan Huruf Besar",
@@ -1834,32 +2085,32 @@
     "message": "Sertakan Digit"
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Persyaratan kebijakan perusahaan telah diterapkan pada pilihan generator Anda.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "passwordHistory": {
-    "message": "Riwayat Kata Sandi"
+    "message": "Riwayat sandi"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Riwayat generator"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Hapus riwayat generator"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Jika Anda melanjutkan, semua entri akan dihapus secara permanen dari riwayat generator. Yakin ingin melanjutkan?"
   },
   "noPasswordsInList": {
     "message": "Tidak ada sandi yang dapat dicantumkan."
   },
   "clearHistory": {
-    "message": "Clear history"
+    "message": "Hapus riwayat"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Kosong"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "Anda belum menghasilkan apa pun baru-baru ini"
   },
   "clear": {
     "message": "Bersihkan",
@@ -1869,13 +2120,13 @@
     "message": "Akun Diperbarui"
   },
   "changeEmail": {
-    "message": "Ubah Surel"
+    "message": "Ubah email"
   },
   "changeEmailTwoFactorWarning": {
     "message": "Melanjutkan proses ini akan mengubah alamat email akun Anda. Tindakan ini tidak akan mengubah alamat email yang digunakan untuk autentikasi dua-faktor. Anda bisa mengubah alamat email tersebut di pengaturan Login Dua-Langkah."
   },
   "newEmail": {
-    "message": "Surel Baru"
+    "message": "Email baru"
   },
   "code": {
     "message": "Kode"
@@ -1893,49 +2144,46 @@
     "message": "Melanjutkan akan mengeluarkan Anda dari sesi saat ini, mengharuskan Anda untuk masuk kembali. Sesi aktif di perangkat lain dapat terus aktif hingga satu jam."
   },
   "changePasswordWarning": {
-    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+    "message": "Setelah mengubah sandi, Anda harus masuk dengan sandi baru. Sesi aktif di perangkat lain akan dihapus dalam waktu satu jam."
   },
   "emailChanged": {
-    "message": "Surel Diubah"
+    "message": "Email disimpan"
   },
   "logBackIn": {
     "message": "Harap masuk kembali."
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "Sesi saat ini"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "Permintaan tertunda"
   },
   "logBackInOthersToo": {
     "message": "Harap masuk kembali. Jika Anda menggunakan aplikasi Bitwarden lain, keluarlah dan masuk kembali ke sana juga."
   },
   "changeMasterPassword": {
-    "message": "Ubah Kata Sandi Utama"
+    "message": "Ubah sandi utama"
   },
   "masterPasswordChanged": {
-    "message": "Kata Sandi Utama Berubah"
+    "message": "Sandi utama disimpan"
   },
   "currentMasterPass": {
-    "message": "Kata Sandi Utama Saat Ini"
+    "message": "Sandi utama saat Ini"
   },
   "newMasterPass": {
-    "message": "Kata Sandi Utama Baru"
+    "message": "Sandi utama baru"
   },
   "confirmNewMasterPass": {
-    "message": "Konfirmasi Kata Sandi Utama Baru"
+    "message": "Konfirmasi sandi utama baru"
   },
   "encKeySettings": {
     "message": "Pengaturan Kunci Enkripsi"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritma KDF"
-  },
   "kdfIterations": {
     "message": "Iterasi KDF"
   },
   "kdfIterationsDesc": {
-    "message": "Iterasi KDF yang lebih tinggi dapat membantu melindungi kata sandi utama Anda agar tidak dipaksakan secara brutal oleh penyerang. Kami merekomendasikan nilai $VALUE$ atau lebih.",
+    "message": "Iterasi KDF yang lebih tinggi dapat membantu melindungi sandi utama Anda dari serangan brute force oleh penyerang. Kami merekomendasikan nilai $VALUE$ atau lebih.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -1953,62 +2201,59 @@
     }
   },
   "kdfMemory": {
-    "message": "KDF memory (MB)",
+    "message": "Memori KDF (MB)",
     "description": "Memory refers to computer memory (RAM). MB is short for megabytes."
   },
   "argon2Warning": {
-    "message": "Setting your KDF iterations, memory, and parallelism too high could result in poor performance when logging into (and unlocking) Bitwarden on slower or older devices. We recommend changing these individually in small increments and then test all of your devices."
+    "message": "Mengatur iterasi, memori, dan paralelisme KDF Anda terlalu tinggi dapat mengakibatkan kinerja yang buruk saat masuk (dan membuka kunci) Bitwarden pada perangkat yang lebih lambat atau lebih lama. Kami menyarankan Anda untuk mengubah pengaturan ini satu per satu secara bertahap, lalu menguji semua perangkat Anda."
   },
   "kdfParallelism": {
-    "message": "KDF parallelism"
+    "message": "Paralelisme KDF"
   },
   "argon2Desc": {
-    "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
-  },
-  "changeKdf": {
-    "message": "Ubah KDF"
+    "message": "Iterasi KDF, memori, dan paralelisme yang lebih tinggi dapat membantu melindungi sandi utama Anda dari serangan brute forced oleh penyerang."
   },
   "encKeySettingsChanged": {
     "message": "Pengaturan Kunci Enkripsi Berubah"
   },
   "dangerZone": {
-    "message": "Zona Bahaya"
+    "message": "Zona bahaya"
   },
   "deauthorizeSessions": {
-    "message": "Batalkan Otorisasi Sesi"
+    "message": "Cabut otorisasi sesi"
   },
   "deauthorizeSessionsDesc": {
-    "message": "Khawatir akun Anda masuk di perangkat lain? Lanjutkan di bawah untuk membatalkan otorisasi semua komputer atau perangkat yang pernah Anda gunakan sebelumnya. Langkah keamanan ini disarankan jika Anda sebelumnya menggunakan komputer publik atau secara tidak sengaja menyimpan sandi Anda di perangkat yang bukan milik Anda. Langkah ini juga akan menghapus semua sesi login dua langkah yang diingat sebelumnya."
+    "message": "Khawatir akun Anda masih aktif di perangkat lain? Lanjutkan cabut otorisasi semua perangkat yang pernah digunakan. Ini disarankan jika Anda memakai komputer umum atau menyimpan sandi di perangkat orang lain. Semua sesi login dua langkah juga akan dihapus."
   },
   "deauthorizeSessionsWarning": {
     "message": "Melanjutkan juga akan mengeluarkan Anda dari sesi saat ini, mengharuskan Anda untuk masuk kembali. Anda juga akan diminta untuk masuk dua langkah lagi, jika diaktifkan. Sesi aktif di perangkat lain dapat terus aktif hingga satu jam."
   },
   "newDeviceLoginProtection": {
-    "message": "New device login"
+    "message": "Login perangkat baru"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message": "Turn off new device login protection"
+    "message": "Matikan perlindungan login perangkat baru"
   },
   "turnOnNewDeviceLoginProtection": {
-    "message": "Turn on new device login protection"
+    "message": "Aktifkan perlindungan login perangkat baru"
   },
   "turnOffNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to turn off the verification emails bitwarden sends when you login from a new device."
+    "message": "Lanjutkan di bawah ini untuk menonaktifkan email verifikasi yang dikirim bitwarden saat Anda masuk dari perangkat baru."
   },
   "turnOnNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to have bitwarden send you verification emails when you login from a new device."
+    "message": "Lanjutkan di bawah ini agar bitwarden mengirimkan email verifikasi saat Anda masuk dari perangkat baru."
   },
   "turnOffNewDeviceLoginProtectionWarning": {
-    "message": "With new device login protection turned off, anyone with your master password can access your account from any device. To protect your account without verification emails, set up two-step login."
+    "message": "Dengan menonaktifkan perlindungan login perangkat baru, siapa pun yang memiliki sandi utama Anda dapat mengakses akun Anda dari perangkat apa pun. Untuk melindungi akun Anda tanpa email verifikasi, atur login dua langkah."
   },
   "accountNewDeviceLoginProtectionSaved": {
-    "message": "New device login protection changes saved"
+    "message": "Perubahan perlindungan login perangkat baru disimpan"
   },
   "sessionsDeauthorized": {
     "message": "Semua Sesi Dicabut Izinnya"
   },
   "accountIsOwnedMessage": {
-    "message": "This account is owned by $ORGANIZATIONNAME$",
+    "message": "Akun ini dimiliki oleh $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -2017,7 +2262,7 @@
     }
   },
   "purgeVault": {
-    "message": "Kosongkan Brankas"
+    "message": "Hapus brankas"
   },
   "purgedOrganizationVault": {
     "message": "Kubah organisasi yang dibersihkan."
@@ -2026,16 +2271,16 @@
     "message": "Brankas diakses oleh provider."
   },
   "purgeVaultDesc": {
-    "message": "Lanjutkan di bawah untuk menghapus semua item dan folder di lemari besi Anda. Item milik organisasi yang Anda bagikan tidak akan dihapus."
+    "message": "Lanjutkan di bawah ini untuk menghapus semua item dan folder di brankas Anda. Item milik organisasi yang Anda bagikan tidak akan dihapus."
   },
   "purgeOrgVaultDesc": {
-    "message": "Lanjutkan di bawah untuk menghapus semua item di lemari besi organisasi."
+    "message": "Lanjutkan di bawah ini untuk menghapus semua item di brankas organisasi."
   },
   "purgeVaultWarning": {
-    "message": "Membersihkan lemari besi Anda bersifat permanen. Itu tidak bisa dibatalkan."
+    "message": "Menghapus brankas Anda bersifat permanen. Tindakan ini tidak dapat dibatalkan."
   },
   "vaultPurged": {
-    "message": "Lemari besi Anda telah dibersihkan."
+    "message": "Brankas dibersihkan."
   },
   "deleteAccount": {
     "message": "Hapus akun"
@@ -2053,7 +2298,7 @@
     "message": "Akun Anda telah ditutup dan semua data terkait telah dihapus."
   },
   "deleteOrganizationWarning": {
-    "message": "Deleting your organization is permanent. It cannot be undone."
+    "message": "Penghapusan organisasi Anda bersifat permanen. Tindakan ini tidak dapat dibatalkan."
   },
   "myAccount": {
     "message": "Akun Saya"
@@ -2065,23 +2310,23 @@
     "message": "Impor Data"
   },
   "onboardingImportDataDetailsPartOne": {
-    "message": "If you don't have any data to import, you can create a ",
+    "message": "Jika Anda tidak memiliki data untuk diimpor, Anda dapat membuat ",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLink": {
-    "message": "new item",
+    "message": "item baru",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLoginLink": {
-    "message": "new login",
+    "message": "login baru",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new login instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsPartTwoNoOrgs": {
-    "message": " instead.",
+    "message": " saja.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead."
   },
   "onboardingImportDataDetailsPartTwoWithOrgs": {
-    "message": " instead. You may need to wait until your administrator confirms your organization membership.",
+    "message": " saja. Anda mungkin perlu menunggu hingga administrator mengonfirmasi keanggotaan organisasi Anda.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. You may need to wait until your administrator confirms your organization membership."
   },
   "importError": {
@@ -2091,10 +2336,10 @@
     "message": "Ada masalah dengan data yang Anda coba impor. Harap selesaikan kesalahan yang tercantum di bawah ini di file sumber Anda dan coba lagi."
   },
   "importSuccess": {
-    "message": "Data telah berhasil diimpor ke lemari besi Anda."
+    "message": "Data berhasil diimpor"
   },
   "importSuccessNumberOfItems": {
-    "message": "A total of $AMOUNT$ items were imported.",
+    "message": "Sebanyak $AMOUNT$ item diimpor.",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -2103,7 +2348,7 @@
     }
   },
   "dataExportSuccess": {
-    "message": "Data successfully exported"
+    "message": "Data berhasil diekspor"
   },
   "importWarning": {
     "message": "Anda mengimpor data ke $ORGANIZATION$. Data Anda dapat dibagikan dengan anggota organisasi ini. Apakah Anda ingin melanjutkan?",
@@ -2124,10 +2369,10 @@
     "message": "Tidak dapat mendekripsi file yang diekspor. Kunci enkripsi Anda tidak cocok dengan kunci enkripsi yang digunakan untuk menekspor data terkait."
   },
   "destination": {
-    "message": "Destination"
+    "message": "Tujuan"
   },
   "learnAboutImportOptions": {
-    "message": "Learn about your import options"
+    "message": "Pelajari tentang pilihan impor Anda"
   },
   "selectImportFolder": {
     "message": "Pilih folder"
@@ -2136,13 +2381,13 @@
     "message": "Pilih koleksi"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "Pilih opsi ini jika Anda ingin konten file yang diimpor dipindahkan ke koleksi"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "Pilih opsi ini jika Anda ingin konten file yang diimpor dipindahkan ke folder"
   },
   "importUnassignedItemsError": {
-    "message": "File contains unassigned items."
+    "message": "Berkas berisi item yang belum ditetapkan."
   },
   "selectFormat": {
     "message": "Pilih format file impor"
@@ -2157,7 +2402,7 @@
     "message": "Tidak ada berkas yang dipilih"
   },
   "orCopyPasteFileContents": {
-    "message": "atau salin / tempel konten file impor"
+    "message": "atau salin/tempel konten berkas impor"
   },
   "instructionsFor": {
     "message": "$NAME$ Instruksi",
@@ -2188,7 +2433,7 @@
     "message": "Ubah bahasa yang digunakan oleh brankas web."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Tampilkan ikon situs web dan ambil URL perubahan sandi"
   },
   "default": {
     "message": "Bawaan"
@@ -2200,10 +2445,10 @@
     "message": "Jika Anda memiliki info masuk yang sama di beberapa domain situs web yang berbeda, Anda dapat menandai situs web tersebut sebagai \"setara\". Domain \"Global\" sudah dibuat untuk Anda oleh Bitwarden."
   },
   "globalEqDomains": {
-    "message": "Domain Setara Global"
+    "message": "Domain setara global"
   },
   "customEqDomains": {
-    "message": "Domain Setara Kustom"
+    "message": "Domain setara khusus"
   },
   "exclude": {
     "message": "Mengecualikan"
@@ -2215,7 +2460,7 @@
     "message": "Sesuaikan"
   },
   "newCustomDomain": {
-    "message": "Domain Kustom Baru"
+    "message": "Domain khusus baru"
   },
   "newCustomDomainDesc": {
     "message": "Masukkan daftar domain yang dipisahkan dengan koma. Hanya domain \"dasar\" yang diperbolehkan. Jangan masukkan subdomain. Misalnya, masukkan \"google.com\", bukan \"www.google.com\". Anda juga dapat memasukkan \"androidapp: //package.name\" untuk mengaitkan aplikasi android dengan domain situs lain."
@@ -2236,23 +2481,23 @@
     "message": "Login dua-langkah"
   },
   "twoStepLoginEnforcement": {
-    "message": "Two-step Login Enforcement"
+    "message": "Penegakan Login Dua Langkah"
   },
   "twoStepLoginDesc": {
     "message": "Amankan akun Anda dengan meminta langkah tambahan saat masuk."
   },
   "twoStepLoginTeamsDesc": {
-    "message": "Enable two-step login for your organization."
+    "message": "Aktifkan login dua langkah untuk organisasi Anda."
   },
   "twoStepLoginEnterpriseDescStart": {
-    "message": "Enforce Bitwarden Two-step Login options for members by using the ",
+    "message": "Terapkan opsi Login Dua Langkah Bitwarden untuk anggota dengan menggunakan ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
   },
   "twoStepLoginPolicy": {
-    "message": "Two-step Login Policy"
+    "message": "Kebijakan Login Dua Langkah"
   },
   "twoStepLoginOrganizationDuoDesc": {
-    "message": "To enforce Two-step Login through Duo, use the options below."
+    "message": "Untuk menerapkan Login Dua Langkah melalui Duo, gunakan opsi di bawah ini."
   },
   "twoStepLoginOrganizationSsoDesc": {
     "message": "If you have setup SSO or plan to, Two-step Login may already be enforced through your Identity Provider."
@@ -2273,7 +2518,7 @@
     "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
   },
   "yourSingleUseRecoveryCode": {
-    "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
+    "message": "Kode pemulihan sekali pakai ini bisa digunakan untuk menonaktifkan login dua langkah jika Anda kehilangan akses ke penyedia login dua langkah. Bitwarden menyarankan Anda mencatat kode ini dan menyimpannya dengan aman."
   },
   "viewRecoveryCode": {
     "message": "Lihat Kode Pemulihan"
@@ -2299,7 +2544,7 @@
     "message": "Keanggotaan Premium"
   },
   "premiumRequired": {
-    "message": "Memerlukan Keanggotaan Premium"
+    "message": "Tingkatkan premium"
   },
   "premiumRequiredDesc": {
     "message": "Keanggotaan premium diperlukan untuk menggunakan fitur ini."
@@ -2344,7 +2589,7 @@
     "message": "Penyedia proses masuk dua langkah ini diaktifkan di akun Anda."
   },
   "twoStepLoginAuthDesc": {
-    "message": "Masukkan kata sandi utama Anda untuk mengubah pengaturan login dua langkah."
+    "message": "Masukkan sandi utama Anda untuk mengubah pengaturan login dua langkah."
   },
   "twoStepAuthenticatorInstructionPrefix": {
     "message": "Download an authenticator app such as"
@@ -2353,13 +2598,13 @@
     "message": ","
   },
   "twoStepAuthenticatorInstructionInfix2": {
-    "message": "or"
+    "message": "atau"
   },
   "twoStepAuthenticatorInstructionSuffix": {
     "message": "."
   },
   "continueToExternalUrlTitle": {
-    "message": "Continue to $URL$?",
+    "message": "Lanjut ke $URL$?",
     "placeholders": {
       "url": {
         "content": "$1",
@@ -2374,19 +2619,19 @@
     "message": "Continue to bitwarden.com?"
   },
   "twoStepContinueToBitwardenUrlDesc": {
-    "message": "Bitwarden Authenticator allows you to store authenticator keys and generate TOTP codes for 2-step verification flows. Learn more on the bitwarden.com website."
+    "message": "Bitwarden Authenticator memungkinkan Anda menyimpan kunci autentikator dan menghasilkan kode TOTP untuk verifikasi 2-langkah. Pelajari lebih lanjut di situs web bitwarden.com."
   },
   "twoStepAuthenticatorScanCodeV2": {
-    "message": "Scan the QR code below with your authenticator app or enter the key."
+    "message": "Pindai kode QR di bawah ini dengan apl autentikator Anda atau masukkan kuncinya."
   },
   "twoStepAuthenticatorQRCanvasError": {
-    "message": "Could not load QR code. Try again or use the key below."
+    "message": "Tidak dapat memuat kode QR. Coba lagi atau gunakan kunci di bawah ini."
   },
   "key": {
     "message": "Kunci"
   },
   "twoStepAuthenticatorEnterCodeV2": {
-    "message": "Verification code"
+    "message": "Kode verifikasi"
   },
   "twoStepAuthenticatorReaddDesc": {
     "message": "Jika Anda perlu menambahkannya ke perangkat lain, di bawah ini adalah kode QR (atau kunci) yang diperlukan oleh aplikasi autentikator Anda."
@@ -2467,10 +2712,10 @@
     "message": "Masukkan informasi aplikasi Bitwarden dari panel Duo Admin Anda."
   },
   "twoFactorDuoClientId": {
-    "message": "Client Id"
+    "message": "Id Klien"
   },
   "twoFactorDuoClientSecret": {
-    "message": "Client Secret"
+    "message": "Rahasia Klien"
   },
   "twoFactorDuoApiHostname": {
     "message": "Nama Host API"
@@ -2485,7 +2730,7 @@
     "message": "Masukkan 6 digit kode verifikasi yang dihasilkan dari email"
   },
   "sendEmail": {
-    "message": "Kirim Surel"
+    "message": "Kirim email"
   },
   "twoFactorU2fAdd": {
     "message": "Tambahkan kunci keamanan FIDO U2F ke akun Anda"
@@ -2543,7 +2788,7 @@
     "message": "Laporan"
   },
   "reportsDesc": {
-    "message": "Identifikasi dan tutup celah keamanan di akun-akun online Anda dengan meng-klik laporan di bawah ini.",
+    "message": "Identifikasi dan tutup celah keamanan di akun online Anda dengan memilih laporan di bawah ini.",
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "orgsReportsDesc": {
@@ -2551,7 +2796,7 @@
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "unsecuredWebsitesReport": {
-    "message": "Laporan Situs Web Tidak Aman"
+    "message": "Situs Web Tidak Aman"
   },
   "unsecuredWebsitesReportDesc": {
     "message": "Menggunakan situs web tidak aman dengan skema http: // dapat berbahaya. Jika situs web memungkinkan, Anda harus selalu mengaksesnya menggunakan skema https: // sehingga koneksi Anda terenkripsi."
@@ -2576,7 +2821,7 @@
     "message": "Tidak ada item di vault Anda yang memiliki URI tidak aman."
   },
   "inactive2faReport": {
-    "message": "Laporan 2FA tidak aktif"
+    "message": "Login Dua-Langkah Nonaktif"
   },
   "inactive2faReportDesc": {
     "message": "Otentikasi dua faktor (2FA) adalah pengaturan keamanan penting yang membantu mengamankan akun Anda. Jika situs web menawarkannya, Anda harus selalu mengaktifkan otentikasi dua faktor."
@@ -2598,19 +2843,19 @@
     }
   },
   "noInactive2fa": {
-    "message": "Tidak ada situs web yang ditemukan di lemari besi Anda dengan konfigurasi otentikasi dua faktor yang hilang."
+    "message": "Tidak ada situs web yang ditemukan di brankas Anda dengan konfigurasi login dua langkah yang hilang."
   },
   "instructions": {
     "message": "Instruksi"
   },
   "exposedPasswordsReport": {
-    "message": "Kata Sandi yang Terpapar"
+    "message": "Sandi Terekspos"
   },
   "exposedPasswordsReportDesc": {
-    "message": "Kata yang terpapar di sebuah kebocoran data adalah sasaran empuk untuk para peretas. Ubah kata sandi terkait untuk mencegah potensi terjadinya peretasan."
+    "message": "Sandi yang terekspos saat terjadi pelanggaran data merupakan target mudah bagi penyerang. Ubah sandi ini untuk mencegah potensi pembobolan."
   },
   "exposedPasswordsFound": {
-    "message": "Kata Sandi Terkena Ditemukan"
+    "message": "Sandi yang terekspos ditemukan"
   },
   "exposedPasswordsFoundReportDesc": {
     "message": "We found $COUNT$ items in your $VAULT$ that have passwords that were exposed in known data breaches. You should change them to use a new password.",
@@ -2626,10 +2871,10 @@
     }
   },
   "noExposedPasswords": {
-    "message": "Tidak ada item di lemari besi Anda yang memiliki kata sandi yang telah terungkap dalam pelanggaran data yang diketahui."
+    "message": "Tidak ada item di brankas Anda yang memiliki sandi yang telah terekspos dalam pelanggaran data yang diketahui."
   },
   "checkExposedPasswords": {
-    "message": "Periksa Kata Sandi yang Terpapar"
+    "message": "Periksa sandi yang terekspos"
   },
   "timesExposed": {
     "message": "Times exposed"
@@ -2644,16 +2889,16 @@
     }
   },
   "weakPasswordsReport": {
-    "message": "Laporan Kata Sandi Lemah"
+    "message": "Sandi Lemah"
   },
   "weakPasswordsReportDesc": {
-    "message": "Kata sandi yang lemah dapat dengan mudah ditebak oleh peretas dan alat otomatis yang digunakan untuk memecahkan kata sandi. Pembuat kata sandi Bitwarden dapat membantu Anda membuat kata sandi yang kuat."
+    "message": "Sandi yang lemah dapat dengan mudah ditebak oleh penyerang. Ubah sandi tersebut menjadi sandi yang kuat menggunakan generator sandi."
   },
   "weakPasswordsFound": {
-    "message": "Kata Sandi Lemah Ditemukan"
+    "message": "Ditemukan sandi yang lemah"
   },
   "weakPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ with passwords that are not strong. You should update them to use stronger passwords.",
+    "message": "Kami menemukan $COUNT$ item di $VAULT$ Anda dengan sandi lemah. Anda harus memperbaruinya agar menggunakan sandi yang lebih kuat.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2666,22 +2911,22 @@
     }
   },
   "noWeakPasswords": {
-    "message": "Tidak ada item di lemari besi Anda yang memiliki kata sandi yang lemah."
+    "message": "Tidak ada item di brankas Anda yang memiliki sandi lemah."
   },
   "weakness": {
-    "message": "Weakness"
+    "message": "Kelemahan"
   },
   "reusedPasswordsReport": {
-    "message": "Laporan Kata Sandi yang Digunakan Kembali"
+    "message": "Sandi Digunakan Berulang"
   },
   "reusedPasswordsReportDesc": {
-    "message": "Jika layanan yang Anda gunakan disusupi, menggunakan kembali kata sandi yang sama di tempat lain dapat memungkinkan peretas untuk dengan mudah mendapatkan akses ke lebih banyak akun online Anda. Anda harus menggunakan kata sandi unik untuk setiap akun atau layanan."
+    "message": "Menggunakan sandi berulang akan memudahkan penyerang membobol banyak akun. Ubah sandi ini agar masing-masing unik."
   },
   "reusedPasswordsFound": {
-    "message": "Kata Sandi yang Digunakan Kembali Ditemukan"
+    "message": "Sandi yang digunakan berulang ditemukan"
   },
   "reusedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ passwords that are being reused in your $VAULT$. You should change them to a unique value.",
+    "message": "Kami menemukan $COUNT$ sandi yang digunakan kembali di $VAULT$ Anda. Anda harus mengubahnya ke sandi yang unik.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2697,7 +2942,7 @@
     "message": "Tidak ada login di vault Anda yang memiliki sandi yang sedang digunakan kembali."
   },
   "timesReused": {
-    "message": "Times reused"
+    "message": "Digunakan berulang"
   },
   "reusedXTimes": {
     "message": "Digunakan kembali $COUNT$ kali",
@@ -2709,7 +2954,7 @@
     }
   },
   "dataBreachReport": {
-    "message": "Laporan Pelanggaran Data"
+    "message": "Pelanggaran Data"
   },
   "breachDesc": {
     "message": "\"Pelanggaran\" adalah insiden ketika data situs telah diakses secara ilegal oleh peretas dan kemudian dirilis ke publik. Tinjau jenis data yang disusupi (alamat email, sandi, kartu kredit, dll.) Dan lakukan tindakan yang sesuai, seperti mengubah sandi."
@@ -2798,8 +3043,11 @@
   "makeSureEnoughCredit": {
     "message": "Harap pastikan bahwa akun Anda memiliki cukup kredit yang tersedia untuk pembelian ini. Jika akun Anda tidak memiliki cukup kredit yang tersedia, metode pembayaran default Anda yang tercatat akan digunakan untuk selisihnya. Anda dapat menambahkan kredit ke akun Anda dari halaman Penagihan."
   },
+  "notEnoughAccountCredit": {
+    "message": "Anda tidak memiliki cukup kredit akun untuk pembelian ini. Anda dapat menambahkan kredit ke akun Anda dari halaman Penagihan."
+  },
   "creditAppliedDesc": {
-    "message": "Saldo akun Anda dapat digunakan untuk melakukan pembelian. Semua saldo yang tersedia akan secara otomatis ditagihkan ke faktur yang dibuat untuk akun ini."
+    "message": "Kredit akun Anda dapat digunakan untuk melakukan pembelian. Semua kredit yang tersedia akan secara otomatis diterapkan ke faktur yang dibuat untuk akun ini."
   },
   "goPremium": {
     "message": "Jadi Anggota Premium",
@@ -2815,16 +3063,16 @@
     "message": "Penyimpanan terenkripsi 1 GB untuk lampiran file."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Proprietary two-step login options such as YubiKey and Duo."
+    "message": "Opsi login dua langkah eksklusif seperti YubiKey dan Duo."
   },
   "premiumSignUpEmergency": {
     "message": "Akses darurat"
   },
   "premiumSignUpReports": {
-    "message": "Kebersihan kata sandi, kesehatan akun, dan laporan pelanggaran data untuk menjaga brankas Anda tetap aman."
+    "message": "Kebersihan sandi, kesehatan akun, dan laporan pelanggaran data untuk menjaga brankas Anda tetap aman."
   },
   "premiumSignUpTotp": {
-    "message": "Generator kode verifikasi TOTP (2FA) untuk login di lemari besi Anda."
+    "message": "Generator kode verifikasi TOTP (2FA) untuk login di brankas Anda."
   },
   "premiumSignUpSupport": {
     "message": "Dukungan pelanggan prioritas."
@@ -2842,7 +3090,7 @@
     }
   },
   "premiumPriceWithFamilyPlan": {
-    "message": "Go premium for just $PRICE$ /year, or get premium accounts for $FAMILYPLANUSERCOUNT$ users and unlimited family sharing with a ",
+    "message": "Dapatkan premium hanya $PRICE$ /tahun, atau dapatkan akun premium untuk pengguna $FAMILYPLANUSERCOUNT$ dan berbagi keluarga tanpa batas dengan ",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2855,7 +3103,7 @@
     }
   },
   "bitwardenFamiliesPlan": {
-    "message": "Bitwarden Families plan."
+    "message": "Paket keluarga Bitwarden."
   },
   "addons": {
     "message": "Pengaya"
@@ -2900,10 +3148,10 @@
     }
   },
   "showPricingSummary": {
-    "message": "Show pricing summary"
+    "message": "Tampilkan ringkasan harga"
   },
   "hidePricingSummary": {
-    "message": "Hide pricing summary"
+    "message": "Sembunyikan ringkasan harga"
   },
   "summary": {
     "message": "Ringkasan"
@@ -2937,7 +3185,7 @@
     }
   },
   "paymentChargedWithUnpaidSubscription": {
-    "message": "Your payment method will be charged for any unpaid subscriptions."
+    "message": "Metode pembayaran Anda akan dikenai biaya untuk setiap langganan yang belum dibayar."
   },
   "paymentChargedWithTrial": {
     "message": "Paket Anda dilengkapi dengan uji coba gratis selama 7 hari. Metode pembayaran Anda tidak akan ditagih hingga uji coba berakhir. Penagihan akan dilakukan secara berulang setiap $INTERVAL$. Anda dapat membatalkannya kapan saja."
@@ -2958,10 +3206,10 @@
     "message": "Klik tombol PayPal untuk masuk ke akun PayPal Anda, lalu klik tombol Kirim di bawah untuk melanjutkan."
   },
   "cancelSubscription": {
-    "message": "Batalkan Langganan"
+    "message": "Batalkan langganan"
   },
   "subscriptionExpiration": {
-    "message": "Subscription expiration"
+    "message": "Kedaluwarsa langganan"
   },
   "subscriptionCanceled": {
     "message": "Langganan telah dibatalkan."
@@ -2996,14 +3244,23 @@
   "nextCharge": {
     "message": "Tagihan Berikutnya"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detail"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Unduh Lisensi"
   },
   "viewBillingToken": {
-    "message": "View Billing Token"
+    "message": "Lihat Token Penagihan"
   },
   "updateLicense": {
     "message": "Perbarui Lisensi"
@@ -3012,7 +3269,7 @@
     "message": "Kelola Langganan"
   },
   "launchCloudSubscription": {
-    "message": "Launch Cloud Subscription"
+    "message": "Luncurkan Langganan Cloud"
   },
   "storage": {
     "message": "Penyimpanan"
@@ -3052,10 +3309,10 @@
     "message": "Faktur"
   },
   "noUnpaidInvoices": {
-    "message": "No unpaid invoices."
+    "message": "Tidak ada faktur yang belum dibayar."
   },
   "noPaidInvoices": {
-    "message": "No paid invoices."
+    "message": "Tidak ada faktur yang dibayar."
   },
   "paid": {
     "message": "Dibayar",
@@ -3114,7 +3371,7 @@
     "message": "Hubungi Dukungan Pelanggan"
   },
   "contactSupportShort": {
-    "message": "Contact Support"
+    "message": "Hubungi Dukungan"
   },
   "updatedPaymentMethod": {
     "message": "Metode pembayaran yang diperbarui."
@@ -3144,7 +3401,7 @@
     "message": "Alamat email akun Anda harus diverifikasi."
   },
   "newOrganizationDesc": {
-    "message": "Organisasi memungkinkan Anda berbagi bagian lemari besi Anda dengan orang lain serta mengelola pengguna terkait untuk entitas tertentu seperti keluarga, tim kecil, atau perusahaan besar."
+    "message": "Organisasi memungkinkan Anda berbagi bagian brankas Anda dengan orang lain serta mengelola pengguna terkait untuk entitas tertentu seperti keluarga, tim kecil, atau perusahaan besar."
   },
   "generalInformation": {
     "message": "Informasi Umum"
@@ -3332,7 +3589,7 @@
     }
   },
   "trialSecretsManagerThankYou": {
-    "message": "Thanks for signing up for Bitwarden Secrets Manager for $PLAN$!",
+    "message": "Terima kasih telah mendaftar di Bitwarden Secrets Manager untuk $PLAN$!",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -3419,13 +3676,13 @@
     "message": "Tambahkan Grup"
   },
   "editGroup": {
-    "message": "Sunting Grup"
+    "message": "Ubah grup"
   },
   "deleteGroupConfirmation": {
     "message": "Apakah Anda yakin ingin menghapus grup ini?"
   },
   "deleteMultipleGroupsConfirmation": {
-    "message": "Are you sure you want to delete the following $QUANTITY$ group(s)?",
+    "message": "Apakah Anda yakin ingin menghapus $QUANTITY$ grup berikut?",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -3443,7 +3700,7 @@
     "message": "Ketika status keanggotaan dicabut, mereka tidak lagi memiliki akses ke data organisasi. Untuk mengembalikan akses anggota secara cepat, buka tab Dicabut."
   },
   "removeUserConfirmationKeyConnector": {
-    "message": "Peringatan! Pengguna ini memerlukan Key Connector untuk mengelola enkripsi mereka. Menghapus pengguna ini dari organisasi Anda akan menonaktifkan akun mereka secara permanen. Tindakan ini tidak dapat dibatalkan. Apakah Anda ingin melanjutkan?"
+    "message": "Peringatan! Pengguna ini memerlukan Key Connector untuk mengelola enkripsinya. Menghapus pengguna ini dari organisasi Anda akan menonaktifkan akunnya secara permanen. Tindakan ini tidak dapat dibatalkan. Ingin melanjutkan?"
   },
   "externalId": {
     "message": "Id Eksternal"
@@ -3452,10 +3709,10 @@
     "message": "Id eksternal dapat digunakan sebagai referensi atau untuk menautkan sumber daya ini ke sistem eksternal seperti direktori pengguna."
   },
   "ssoExternalId": {
-    "message": "SSO External ID"
+    "message": "Eksternal SSO ID"
   },
   "ssoExternalIdDesc": {
-    "message": "SSO External ID is an unencrypted reference between Bitwarden and your configured SSO provider."
+    "message": "ID Eksternal SSO adalah referensi tidak terenkripsi antara Bitwarden dan penyedia SSO yang Anda konfigurasikan."
   },
   "nestCollectionUnder": {
     "message": "Nest collection under"
@@ -3587,22 +3844,22 @@
     "message": "Brankas web"
   },
   "webApp": {
-    "message": "Web app"
+    "message": "Aplikasi web"
   },
   "cli": {
     "message": "CLI"
   },
   "bitWebVault": {
-    "message": "Bitwarden Web vault"
+    "message": "Brankas Web Bitwarden"
   },
   "bitSecretsManager": {
-    "message": "Bitwarden Secrets Manager"
+    "message": "Manajer Rahasia Bitwarden"
   },
   "loggedIn": {
     "message": "Sudah masuk."
   },
   "changedPassword": {
-    "message": "Kata sandi akun diubah."
+    "message": "Sandi akun telah diubah"
   },
   "enabledUpdated2fa": {
     "message": "Proses masuk dua langkah diaktifkan / diperbarui."
@@ -3620,13 +3877,13 @@
     "message": "Upaya masuk gagal dengan proses masuk dua langkah yang salah."
   },
   "incorrectPassword": {
-    "message": "Incorrect password"
+    "message": "Sandi salah"
   },
   "incorrectCode": {
-    "message": "Incorrect code"
+    "message": "Kode salah"
   },
   "incorrectPin": {
-    "message": "Incorrect PIN"
+    "message": "PIN salah"
   },
   "pin": {
     "message": "PIN",
@@ -3678,7 +3935,7 @@
     }
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "Lihat semua pilihan masuk"
   },
   "viewAllLoginOptions": {
     "message": "Lihat semua opsi log in"
@@ -3693,7 +3950,7 @@
     }
   },
   "viewedPasswordItemId": {
-    "message": "Melihat kata sandi untuk item $ID$.",
+    "message": "Melihat sandi untuk item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3729,7 +3986,7 @@
     }
   },
   "viewCollectionWithName": {
-    "message": "View collection - $NAME$",
+    "message": "Lihat koleksi - $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -3738,7 +3995,7 @@
     }
   },
   "editItemWithName": {
-    "message": "Edit item - $NAME$",
+    "message": "Ubah item - $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -3801,7 +4058,7 @@
     }
   },
   "deletedCollections": {
-    "message": "Deleted collections"
+    "message": "Koleksi yang dihapus"
   },
   "deletedCollectionId": {
     "message": "Koleksi $ID$ dihapus.",
@@ -3849,7 +4106,7 @@
     }
   },
   "deletedManyGroups": {
-    "message": "Deleted $QUANTITY$ group(s).",
+    "message": "Menghapus $QUANTITY$ grup.",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -4017,22 +4274,22 @@
     "message": "Perangkat"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "Status login"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "Login pertama"
   },
   "trusted": {
-    "message": "Trusted"
+    "message": "Terpercaya"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "Perlu persetujuan"
   },
   "areYouTryingtoLogin": {
-    "message": "Are you trying to log in?"
+    "message": "Apakah Anda mencoba masuk?"
   },
   "logInAttemptBy": {
-    "message": "Login attempt by $EMAIL$",
+    "message": "Upaya masuk oleh $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4041,22 +4298,22 @@
     }
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "Jenis Perangkat"
   },
   "ipAddress": {
-    "message": "IP Address"
+    "message": "Alamat IP"
   },
   "confirmLogIn": {
-    "message": "Confirm login"
+    "message": "Konfirmasi masuk"
   },
   "denyLogIn": {
-    "message": "Deny login"
+    "message": "Tolak masuk"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "Permintaan ini tidak lagi valid."
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "Permintaan masuk disetujui untuk $EMAIL$ di $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4069,16 +4326,16 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "Anda menolak upaya masuk dari perangkat lain. Jika ini Anda, coba masuk lagi dengan perangkat tersebut."
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "Login request has already expired."
+    "message": "Permintaan masuk telah kedaluwarsa."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "Baru saja"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "Diminta $MINUTES$ menit yang lalu",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -4087,25 +4344,25 @@
     }
   },
   "creatingAccountOn": {
-    "message": "Creating account on"
+    "message": "Membuat akun di"
   },
   "checkYourEmail": {
-    "message": "Check your email"
+    "message": "Periksa email Anda"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Follow the link in the email sent to"
+    "message": "Ikuti tautan di email yang dikirim ke"
   },
   "andContinueCreatingYourAccount": {
-    "message": "and continue creating your account."
+    "message": "dan lanjutkan membuat akun Anda."
   },
   "noEmail": {
-    "message": "No email?"
+    "message": "Tidak ada email?"
   },
   "goBack": {
-    "message": "Go back"
+    "message": "Kembali"
   },
   "toEditYourEmailAddress": {
-    "message": "to edit your email address."
+    "message": "untuk mengubah alamat email Anda."
   },
   "view": {
     "message": "Tampilan"
@@ -4189,7 +4446,7 @@
     "message": "Email Anda telah diverifikasi."
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "Email terverifikasi"
   },
   "emailVerifiedFailed": {
     "message": "Tidak dapat memverifikasi email Anda. Coba kirim email verifikasi baru."
@@ -4203,23 +4460,50 @@
   "updateBrowser": {
     "message": "Perbarui Browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Jalankan laporan"
   },
   "updateBrowserDesc": {
     "message": "Anda menggunakan browser web yang tidak didukung. Kubah web mungkin tidak berfungsi dengan baik."
   },
   "youHaveAPendingLoginRequest": {
-    "message": "You have a pending login request from another device."
+    "message": "Anda memiliki permintaan masuk tertunda dari perangkat lain."
   },
   "reviewLoginRequest": {
-    "message": "Review login request"
+    "message": "Tinjau permintaan masuk"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "Permintaan masuk"
   },
   "freeTrialEndPromptCount": {
-    "message": "Your free trial ends in $COUNT$ days.",
+    "message": "Uji coba gratis Anda berakhir dalam $COUNT$ hari.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4228,7 +4512,7 @@
     }
   },
   "freeTrialEndPromptMultipleDays": {
-    "message": "$ORGANIZATION$, your free trial ends in $COUNT$ days.",
+    "message": "$ORGANIZATION$, uji coba gratis Anda berakhir dalam $COUNT$ hari.",
     "placeholders": {
       "count": {
         "content": "$2",
@@ -4241,7 +4525,7 @@
     }
   },
   "freeTrialEndPromptTomorrow": {
-    "message": "$ORGANIZATION$, your free trial ends tomorrow.",
+    "message": "$ORGANIZATION$, uji coba gratis Anda berakhir besok.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4250,10 +4534,10 @@
     }
   },
   "freeTrialEndPromptTomorrowNoOrgName": {
-    "message": "Your free trial ends tomorrow."
+    "message": "Uji coba gratis Anda berakhir besok."
   },
   "freeTrialEndPromptToday": {
-    "message": "$ORGANIZATION$, your free trial ends today.",
+    "message": "$ORGANIZATION$, uji coba gratis Anda berakhir hari ini.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4262,16 +4546,16 @@
     }
   },
   "freeTrialEndingTodayWithoutOrgName": {
-    "message": "Your free trial ends today."
+    "message": "Uji coba gratis Anda berakhir hari ini."
   },
   "clickHereToAddPaymentMethod": {
-    "message": "Click here to add a payment method."
+    "message": "Klik di sini untuk menambahkan metode pembayaran."
   },
   "joinOrganization": {
     "message": "Bergabunglah dengan Organisasi"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "Gabung $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -4283,16 +4567,16 @@
     "message": "Anda telah diundang untuk bergabung dengan organisasi yang tercantum di atas. Untuk menerima undangan, Anda harus masuk atau membuat akun Bitwarden baru."
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "Selesaikan bergabung dengan organisasi ini dengan menetapkan sandi utama."
   },
   "inviteAccepted": {
     "message": "Undangan Diterima"
   },
-  "inviteAcceptedDesc": {
-    "message": "Anda dapat mengakses organisasi ini setelah administrator mengonfirmasi keanggotaan Anda. Kami akan mengirimi Anda email jika itu terjadi."
+  "invitationAcceptedDesc": {
+    "message": "Berhasil menerima undangan Anda."
   },
   "inviteInitAcceptedDesc": {
-    "message": "You can now access this organization."
+    "message": "Anda sekarang dapat mengakses organisasi ini."
   },
   "inviteAcceptFailed": {
     "message": "Tidak dapat menerima undangan. Minta admin organisasi untuk mengirim undangan baru."
@@ -4313,7 +4597,7 @@
     "message": "Jika Anda tidak dapat mengakses akun Anda melalui metode masuk dua langkah biasa, Anda dapat menggunakan kode pemulihan masuk dua langkah untuk menonaktifkan semua penyedia dua langkah di akun Anda."
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
-    "message": "Log in below using your single-use recovery code. This will turn off all two-step providers on your account."
+    "message": "Masuk di bawah ini menggunakan kode pemulihan sekali pakai. Ini akan menonaktifkan semua penyedia dua langkah di akun Anda."
   },
   "recoverAccountTwoStep": {
     "message": "Pulihkan Akun Dua Langkah Masuk"
@@ -4334,7 +4618,7 @@
     "message": "Anda telah meminta untuk menghapus akun Bitwarden Anda. Klik tombol di bawah untuk konfirmasi."
   },
   "deleteRecoverOrgConfirmDesc": {
-    "message": "You have requested to delete your Bitwarden organization."
+    "message": "Anda telah meminta untuk menghapus organisasi Bitwarden Anda."
   },
   "myOrganization": {
     "message": "Organisasi Saya"
@@ -4346,7 +4630,7 @@
     "message": "Hapus Organisasi"
   },
   "deletingOrganizationContentWarning": {
-    "message": "Masukan kata sandi utama untuk mengonfirmasi penghapusan $ORGANIZATION$ serta semua data yang terkait. Data brankas di $ORGANIZATION$ termasuk:",
+    "message": "Masukkan sandi utama untuk mengonfirmasi penghapusan $ORGANIZATION$ serta semua data yang terkait. Data brankas di $ORGANIZATION$ termasuk:",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4404,10 +4688,10 @@
     }
   },
   "viewInvoice": {
-    "message": "Lihat Faktur"
+    "message": "Lihat faktur"
   },
   "downloadInvoice": {
-    "message": "Mengunduh Faktur"
+    "message": "Unduh faktur"
   },
   "verifyBankAccount": {
     "message": "Verifikasi Rekening Bank"
@@ -4463,7 +4747,7 @@
     "message": "Tetapkan jumlah kuota untuk langganan Anda. Begitu batas ini tercapai, Anda tidak akan bisa mengundang pengguna baru."
   },
   "limitSmSubscriptionDesc": {
-    "message": "Set a seat limit for your Secrets Manager subscription. Once this limit is reached, you will not be able to invite new members."
+    "message": "Setel batas kuota untuk langganan Manajer Rahasia Anda. Setelah batas ini tercapai, Anda tidak akan dapat mengundang anggota baru."
   },
   "maxSeatLimit": {
     "message": "Batas Kuota (opsional)",
@@ -4502,7 +4786,7 @@
     "message": "Langganan diperbarui"
   },
   "subscribedToSecretsManager": {
-    "message": "Subscription updated. You now have access to Secrets Manager."
+    "message": "Langganan diperbarui. Anda sekarang memiliki akses ke Manajer Rahasia."
   },
   "additionalOptions": {
     "message": "Opsi Tambahan"
@@ -4514,7 +4798,7 @@
     "message": "Penyesuaian pada paket langganan Anda akan mengakibatkan perubahan prorata pada total tagihan Anda. Jika anggota yang baru diundang melampaui kuota langganan Anda, Anda akan langsung dikenakan biaya prorata untuk pengguna tambahan tersebut."
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment1": {
-    "message": "If you want to add additional"
+    "message": "Jika Anda ingin menambahkan tambahan"
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment2": {
     "message": "seats without the bundled offer, please contact"
@@ -4604,7 +4888,7 @@
     }
   },
   "editFieldLabel": {
-    "message": "Edit $LABEL$",
+    "message": "Ubah $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4613,7 +4897,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "Atur ulang $LABEL$. Gunakan tombol panah untuk memindahkan item ke atas atau ke bawah.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4671,7 +4955,7 @@
     "message": "Memuat"
   },
   "upgrade": {
-    "message": "Meningkatkan"
+    "message": "Tingkatkan"
   },
   "upgradeOrganization": {
     "message": "Tingkatkan Organisasi"
@@ -4695,19 +4979,19 @@
     "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
   },
   "subscribe": {
-    "message": "Subscribe"
+    "message": "Langganan"
   },
   "unsubscribe": {
-    "message": "Unsubscribe"
+    "message": "Berhenti langganan"
   },
   "atAnyTime": {
-    "message": "at any time."
+    "message": "kapan pun."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "Dengan melanjutkan, Anda menyetujui"
   },
   "and": {
-    "message": "and"
+    "message": "dan"
   },
   "acceptPolicies": {
     "message": "Dengan mencentang kotak ini, anda menyetujui yang berikut:"
@@ -4725,16 +5009,16 @@
     "message": "Filter"
   },
   "vaultTimeout": {
-    "message": "Batas Waktu Brankas"
+    "message": "Batas waktu brankas"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "Batas waktu"
   },
   "vaultTimeoutDesc": {
     "message": "Pilih batas waktu untuk brankas Anda mengambil tindakan yang dipilih."
   },
   "vaultTimeoutLogoutDesc": {
-    "message": "Choose when your vault will be logged out."
+    "message": "Pilih kapan brankas Anda akan keluar."
   },
   "oneMinute": {
     "message": "1 menit"
@@ -4766,17 +5050,23 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Kata Sandi Diperbarui",
+    "message": "Sandi diperbarui",
     "description": "ex. Date this password was updated"
   },
   "organizationIsDisabled": {
     "message": "Organisasi dinonaktifkan."
   },
+  "organizationIsSuspended": {
+    "message": "Organisasi ditangguhkan"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Item dalam organisasi yang ditangguhkan tidak dapat diakses. Hubungi pemilik organisasi Anda untuk mendapatkan bantuan."
+  },
   "secretsAccessSuspended": {
-    "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
+    "message": "Organisasi yang ditangguhkan tidak dapat diakses. Silakan hubungi pemilik organisasi Anda untuk mendapatkan bantuan."
   },
   "secretsCannotCreate": {
-    "message": "Secrets cannot be created in suspended organizations. Please contact your organization owner for assistance."
+    "message": "Rahasia tidak dapat dibuat dalam organisasi yang ditangguhkan. Silakan hubungi pemilik organisasi Anda untuk mendapatkan bantuan."
   },
   "projectsCannotCreate": {
     "message": "Projects cannot be created in suspended organizations. Please contact your organization owner for assistance."
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Item di Organisasi yang dinonaktifkan tidak bisa diakses. Hubungi pemilik Organisasi Anda untuk mendapatkan bantuan."
-  },
   "licenseIsExpired": {
     "message": "Lisensi sudah kadaluarsa."
   },
@@ -4822,10 +5109,10 @@
     "description": "ex. A very weak password. Scale: Very Weak -> Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Kata Sandi Utama Lemah"
+    "message": "Sandi utama lemah"
   },
   "weakMasterPasswordDesc": {
-    "message": "Kata sandi utama yang Anda pilih lemah. Anda harus menggunakan kata sandi utama yang kuat (atau frasa sandi) untuk melindungi akun Bitwarden Anda dengan benar. Apakah Anda yakin ingin menggunakan kata sandi utama ini?"
+    "message": "Sandi lemah teridentifikasi. Gunakan sandi yang kuat untuk melindungi akun Anda. Apakah Anda yakin ingin menggunakan sandi yang lemah?"
   },
   "rotateAccountEncKey": {
     "message": "Juga rotasikan kunci enkripsi akun saya"
@@ -4847,7 +5134,7 @@
     "description": "This is a verb. ex. 'Fix The Car'"
   },
   "oldAttachmentsNeedFixDesc": {
-    "message": "Ada lampiran file lama di lemari besi Anda yang perlu diperbaiki sebelum Anda dapat merotasi kunci enkripsi akun Anda."
+    "message": "Ada lampiran berkas lama di brankas Anda yang perlu diperbaiki sebelum Anda dapat memutar kunci enkripsi akun Anda."
   },
   "yourAccountsFingerprint": {
     "message": "Frase sidik jari akun Anda",
@@ -4909,16 +5196,16 @@
     "message": "Kami tidak dapat menagih kartu Anda. Harap lihat dan bayar faktur yang belum dibayar yang tercantum di bawah."
   },
   "minLength": {
-    "message": "Panjang Minimum"
+    "message": "Panjang minimum"
   },
   "clone": {
-    "message": "Klon"
+    "message": "Duplikat"
   },
   "masterPassPolicyTitle": {
-    "message": "Kata sandi utama diperlukan"
+    "message": "Persyaratan sandi utama"
   },
   "masterPassPolicyDesc": {
-    "message": "Tetapkan persyaratan minimum untuk kekuatan kata sandi utama."
+    "message": "Tetapkan persyaratan untuk kekuatan sandi utama."
   },
   "passwordStrengthScore": {
     "message": "Password strength score $SCORE$",
@@ -4939,13 +5226,13 @@
     "message": "Anggota organisasi yang tidak mengaktifkan login dua langkah untuk akun pribadinya akan dihapus dari organisasi dan akan menerima email yang memberi tahu mereka tentang perubahan tersebut."
   },
   "twoStepLoginPolicyUserWarning": {
-    "message": "Anda adalah anggota organisasi yang memerlukan login dua langkah untuk diaktifkan di akun pengguna Anda. Jika Anda menonaktifkan semua penyedia proses masuk dua langkah, Anda akan secara otomatis dihapus dari organisasi ini."
+    "message": "Anda adalah anggota organisasi yang mewajibkan pengaturan login dua langkah pada akun pengguna Anda. Jika Anda menonaktifkan semua penyedia login dua langkah, Anda akan otomatis dihapus dari organisasi tersebut."
   },
   "passwordGeneratorPolicyDesc": {
-    "message": "Tetapkan persyaratan minimum untuk konfigurasi pembuat kata sandi."
+    "message": "Tetapkan persyaratan untuk pembuat sandi."
   },
   "masterPasswordPolicyInEffect": {
-    "message": "Satu atau lebih kebijakan organisasi memerlukan kata sandi utama Anda untuk memenuhi persyaratan berikut:"
+    "message": "Satu atau lebih kebijakan organisasi memerlukan sandi utama Anda untuk memenuhi persyaratan berikut:"
   },
   "policyInEffectMinComplexity": {
     "message": "Skor kompleksitas minimum $SCORE$",
@@ -4984,26 +5271,26 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Kata sandi utama Anda yang baru tidak memenuhi persyaratan kebijakan."
+    "message": "Sandi utama Anda yang baru tidak memenuhi persyaratan kebijakan."
   },
   "minimumNumberOfWords": {
-    "message": "Jumlah Kata Minimum"
+    "message": "Jumlah kata minimum"
   },
   "overridePasswordTypePolicy": {
-    "message": "Password Type",
+    "message": "Jenis Sandi",
     "description": "Name of the password generator policy that overrides the user's password/passphrase selection."
   },
   "userPreference": {
     "message": "Preferensi Pengguna"
   },
   "vaultTimeoutAction": {
-    "message": "Tindakan ketika Batas Waktu Brankas Habis"
+    "message": "Tindakan batas waktu brankas"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "Kubah yang terkunci mengharuskan Anda memasukkan kembali kata sandi utama Anda untuk mengaksesnya lagi."
+    "message": "Sandi utama atau metode pembukaan kunci lainnya diperlukan untuk mengakses brankas Anda lagi."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "Vault keluar mengharuskan Anda mengautentikasi ulang untuk mengaksesnya lagi."
+    "message": "Autentikasi ulang diperlukan untuk mengakses brankas Anda lagi."
   },
   "lock": {
     "message": "Mengunci",
@@ -5074,13 +5361,13 @@
     }
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Keluar akan menghapus semua akses ke lemari besi Anda dan memerlukan otentikasi online setelah periode batas waktu. Anda yakin ingin menggunakan pengaturan ini?"
+    "message": "Keluar akan menghapus semua akses ke brankas Anda dan memerlukan autentikasi online setelah batas waktu habis. Anda yakin ingin menggunakan pengaturan ini?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Konfirmasi Tindakan Timeout"
+    "message": "Konfirmasi tindakan batas waktu"
   },
   "hidePasswords": {
-    "message": "Sembunyikan Kata Sandi"
+    "message": "Sembunyikan sandi"
   },
   "countryPostalCodeRequiredDesc": {
     "message": "Kami memerlukan informasi ini untuk menghitung pajak penjualan dan pelaporan keuangan saja."
@@ -5095,7 +5382,7 @@
     "message": "Informasi pajak diperbarui."
   },
   "setMasterPassword": {
-    "message": "Atur Kata Sandi Utama"
+    "message": "Atur sandi utama"
   },
   "identifier": {
     "message": "Pengenal"
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Batalkan tautan SSO"
@@ -5207,14 +5498,14 @@
     "message": "Pemilik dan Administrator Organisasi dibebaskan dari penegakan kebijakan ini."
   },
   "limitSendViews": {
-    "message": "Limit views"
+    "message": "Batasi tampilan"
   },
   "limitSendViewsHint": {
-    "message": "No one can view this Send after the limit is reached.",
+    "message": "Tidak seorang pun dapat melihat Kirim ini setelah batas tercapai.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ views left",
+    "message": "$ACCESSCOUNT$ tampilan tersisa",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -5224,11 +5515,11 @@
     }
   },
   "sendDetails": {
-    "message": "Send details",
+    "message": "Detail Kirim",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeTextToShare": {
-    "message": "Text to share"
+    "message": "Teks untuk dibagikan"
   },
   "sendTypeFile": {
     "message": "Berkas"
@@ -5237,27 +5528,27 @@
     "message": "Teks"
   },
   "sendPasswordDescV3": {
-    "message": "Add an optional password for recipients to access this Send.",
+    "message": "Tambahkan sandi opsional bagi penerima untuk mengakses Kirim ini.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Buat Pengiriman Baru",
+    "message": "Kirim baru",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
-    "message": "Edit Kirim",
+    "message": "Ubah Kirim",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Dibuat Kirim",
+    "message": "Kirim disimpan",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Pengiriman diedit",
+    "message": "Kirim disimpan",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletedSend": {
-    "message": "Kirim Dihapus",
+    "message": "Kirim dihapus",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSend": {
@@ -5265,14 +5556,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Are you sure you want to permanently delete this Send?",
+    "message": "Anda yakin ingin menghapus Kirim ini selamanya?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
     "message": "Tanggal Penghapusan"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "Kirim ini akan dihapus selamanya pada tanggal ini.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -5303,13 +5594,13 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "removePassword": {
-    "message": "Hapus Kata Sandi"
+    "message": "Hapus sandi"
   },
   "removedPassword": {
-    "message": "Kata Sandi yang Dihapus"
+    "message": "Sandi dihapus"
   },
   "removePasswordConfirmation": {
-    "message": "Anda yakin ingin menghapus kata sandi?"
+    "message": "Anda yakin ingin menghapus sandi?"
   },
   "allSends": {
     "message": "Semua Dikirim"
@@ -5332,11 +5623,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPassword": {
-    "message": "Pengiriman ini dilindungi dengan kata sandi. Silakan ketikkan kata sandi di bawah ini untuk melanjutkan.",
+    "message": "Kirim ini dilindungi dengan sandi. Silakan ketik sandi di bawah ini untuk melanjutkan.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPasswordDontKnow": {
-    "message": "Tidak tahu kata sandinya? Minta sandi yang dibutuhkan Pengirim untuk mengakses Kirim ini.",
+    "message": "Tidak tahu sandinya? Tanyakan pengirim untuk sandi yang diperlukan untuk mengakses Kirim ini.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendHiddenByDefault": {
@@ -5344,14 +5635,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "downloadAttachments": {
-    "message": "Download attachments"
+    "message": "Unduh lampiran"
   },
   "sendAccessPasswordTitle": {
-    "message": "Enter the password to view this Send",
+    "message": "Masukkan sandi untuk melihat Kirim ini",
     "description": "Title of the Send password authentication screen."
   },
   "sendAccessContentTitle": {
-    "message": "View Send",
+    "message": "Lihat Kirim",
     "description": "Title of the Send view content screen."
   },
   "sendAccessUnavailable": {
@@ -5406,13 +5697,13 @@
     "message": "Akses Darurat Disetujui"
   },
   "viewDesc": {
-    "message": "Dapat melihat semua item di lemari besi Anda sendiri."
+    "message": "Dapat melihat semua item dalam brankas Anda sendiri."
   },
   "takeover": {
     "message": "Pengambilalihan"
   },
   "takeoverDesc": {
-    "message": "Dapat mengatur ulang akun Anda dengan kata sandi utama baru."
+    "message": "Dapat mengatur ulang akun Anda dengan sandi utama baru."
   },
   "waitTime": {
     "message": "Waktu Tunggu"
@@ -5503,7 +5794,7 @@
     "message": "Grantor details not found"
   },
   "passwordResetFor": {
-    "message": "Setel ulang sandi untuk $USER$. Sekarang Anda dapat masuk menggunakan kata sandi baru.",
+    "message": "Atur ulang sandi untuk $USER$. Sekarang Anda dapat masuk menggunakan sandi baru.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Ekstensi peramban Bitwarden berhasil dibuka. Anda sekarang dapat mengaktifkan pengaturan konfirmasi pengguna otomatis."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Pengguna baru yang diundang ke organisasi akan otomatis dikonfirmasi saat perangkat admin dibuka kuncinya. Sebelum mengaktifkan kebijakan ini, harap tinjau dan setujui hal-hal berikut: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potensi risiko keamanan. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Konfirmasi pengguna otomatis dapat menimbulkan risiko keamanan terhadap data organisasi Anda."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Pelajari tentang risikonya",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Diperlukan kebijakan organisasi tunggal. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Kebijakan organisasi tunggal akan diperluas ke semua peran. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Tidak ada akses darurat. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Akses Darurat akan dihapus."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Saya menerima risiko dan pembaruan kebijakan ini"
+  },
   "personalOwnership": {
     "message": "Kepemilikan Pribadi"
   },
@@ -5555,7 +5905,7 @@
     "message": "Pemilik dan Administrator Organisasi dibebaskan dari penegakan kebijakan ini."
   },
   "personalOwnershipSubmitError": {
-    "message": "Karena Kebijakan Perusahaan, Anda dilarang menyimpan item ke lemari besi pribadi Anda. Ubah opsi Kepemilikan ke organisasi dan pilih dari Koleksi yang tersedia."
+    "message": "Karena kebijakan Enterprise, Anda tidak dapat menyimpan item ke brankas individual Anda. Ubah opsi kepemilikan menjadi organisasi dan pilih dari koleksi yang tersedia."
   },
   "desktopAutotypePolicy": {
     "message": "Desktop Autotype Default Setting"
@@ -5597,6 +5947,19 @@
     "message": "Pengguna tidak boleh menyembunyikan alamat email dari penerima ketika membuat atau mengubah Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Kebijakan yang diubah $ID$.",
     "placeholders": {
@@ -5613,10 +5976,10 @@
     "message": "Cukai taksiran"
   },
   "custom": {
-    "message": "Adat"
+    "message": "Khusus"
   },
   "customDesc": {
-    "message": "Memungkinkan kontrol yang lebih terperinci atas izin pengguna untuk konfigurasi lanjutan."
+    "message": "Berikan izin khusus kepada anggota"
   },
   "customDescNonEnterpriseStart": {
     "message": "Custom roles is an ",
@@ -5701,7 +6064,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineProductDesc": {
-    "message": "Bitwarden mengirim mentransmisikan informasi sementara yang sensitif kepada orang lain dengan mudah dan aman.",
+    "message": "Bitwarden Kirim mengirimkan informasi sensitif dan sementara kepada orang lain dengan mudah dan aman.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineLearnMore": {
@@ -5728,10 +6091,10 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, **or** try it now.'"
   },
   "developmentDevOpsAndITTeamsChooseBWSecret": {
-    "message": "Development, DevOps, and IT teams choose Bitwarden Secrets Manager to securely manage and deploy their infrastructure and machine secrets."
+    "message": "Tim pengembangan, DevOps, dan TI memilih Bitwarden Manajer Rahasia untuk mengelola dan menerapkan infrastruktur dan rahasia mesin mereka secara aman."
   },
   "centralizeSecretsManagement": {
-    "message": "Centralize secrets management."
+    "message": "Sentralisasikan pengelolaan rahasia."
   },
   "centralizeSecretsManagementDescription": {
     "message": "Securely store and manage secrets in one location to prevent secret sprawl across your organization."
@@ -5791,7 +6154,7 @@
     "message": "Open your organization's"
   },
   "usingTheMenuSelect": {
-    "message": "Using the menu, select"
+    "message": "Menggunakan menu, pilih"
   },
   "toGrantAccessToSelectedMembers": {
     "message": "to grant access to selected members."
@@ -5822,7 +6185,7 @@
     }
   },
   "viewSend": {
-    "message": "View Send",
+    "message": "Lihat Kirim",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "viewSendHiddenEmailWarning": {
@@ -5869,7 +6232,7 @@
     "message": "Your new password cannot be the same as your current password."
   },
   "hintEqualsPassword": {
-    "message": "Petunjuk kata sandi Anda tidak boleh sama dengan kata sandi Anda."
+    "message": "Petunjuk sandi Anda tidak boleh sama dengan sandi Anda."
   },
   "enrollAccountRecovery": {
     "message": "Enroll in account recovery"
@@ -5905,7 +6268,7 @@
     }
   },
   "eventAdminPasswordReset": {
-    "message": "Kata sandi utama sudah diubah untuk pengguna $ID$.",
+    "message": "Sandi utama diatur ulang untuk pengguna $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5932,7 +6295,7 @@
     }
   },
   "resetPassword": {
-    "message": "Atur Ulang Kata Sandi"
+    "message": "Atur ulang sandi"
   },
   "resetPasswordLoggedOutWarning": {
     "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
@@ -5956,16 +6319,16 @@
     "message": "pengguna ini"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
-    "message": "Satu atau lebih kebijakan organisasi memerlukan kata sandi utama Anda untuk memenuhi persyaratan berikut:"
+    "message": "Satu atau lebih kebijakan organisasi memerlukan sandi utama Anda untuk memenuhi persyaratan berikut:"
   },
   "changePasswordDelegationMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
   "resetPasswordSuccess": {
-    "message": "Ubah kata kunci berhasil!"
+    "message": "Atur ulang kata sandi berhasil!"
   },
   "resetPasswordEnrollmentWarning": {
-    "message": "Dengan mengikuti fitur ini mengijinkan admin organisasi untuk merubah kata sandi utama anda. Anda yakin mau masuk fitur ini?"
+    "message": "Pendaftaran akan memungkinkan administrator organisasi untuk mengubah sandi utama Anda"
   },
   "accountRecoveryPolicy": {
     "message": "Account recovery administration"
@@ -5998,7 +6361,7 @@
     "message": "Items that have been in trash more than 30 days will be automatically deleted."
   },
   "trashCleanupWarningSelfHosted": {
-    "message": "Items that have been in trash for a while will be automatically deleted."
+    "message": "Item yang telah lama berada di tempat sampah akan dihapus secara otomatis."
   },
   "passwordPrompt": {
     "message": "Pengingat ulang sandi utama"
@@ -6019,7 +6382,7 @@
     "message": "This action is not applicable to any of the selected users."
   },
   "removeUsersWarning": {
-    "message": "Apakah Anda yakin ingin menghapus pengguna berikut? Proses ini mungkin memerlukan waktu beberapa detik untuk menyelesaikannya dan tidak dapat diinterupsi atau dibatalkan."
+    "message": "Yakin ingin menghapus pengguna berikut? Proses ini mungkin memerlukan waktu beberapa detik dan tidak dapat dihentikan atau dibatalkan."
   },
   "removeOrgUsersConfirmation": {
     "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
@@ -6230,10 +6593,10 @@
     "message": "Master password successfully set"
   },
   "updatedMasterPassword": {
-    "message": "Kata Sandi Telah Diperbarui"
+    "message": "Sandi utama disimpan"
   },
   "updateMasterPassword": {
-    "message": "Perbarui Kata Sandi Utama"
+    "message": "Perbarui sandi utama"
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
     "message": "Change your master password to complete account recovery."
@@ -6248,13 +6611,13 @@
     "message": "Your master password does not meet the policy requirements of this organization. In order to join the organization, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Sandi utama Anda tidak memenuhi satu atau lebih kebijakan organisasi. Untuk mengakses brankas, Anda harus memperbarui sandi utama sekarang. Melanjutkan akan mengeluarkan Anda dari sesi saat ini dan mengharuskan login ulang. Sesi aktif di perangkat lain mungkin tetap aktif hingga satu jam."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Batas Waktu Brankas"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Batas waktu sesi"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Setel batas waktu sesi maksimum untuk semua anggota, kecuali pemilik."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Batas waktu Maksimal Brankas"
+  "maximumAllowedTimeout": {
+    "message": "Batas waktu habis yang diizinkan"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Batas waktu Maksimal Brankas tidak valid."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Batas waktu habis yang diizinkan diperlukan."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Waktu tidak valid. Ubah setidaknya satu nilai."
+  },
+  "sessionTimeoutAction": {
+    "message": "Tindakan batas waktu sesi"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "Saat apl dimulai ulang"
   },
   "hours": {
     "message": "Jam"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Menit"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Anda yakin ingin memberikan batas waktu maksimum \"Tidak pernah\" untuk semua anggota?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6339,7 +6732,7 @@
     "message": "Your vault timeout exceeds the restriction set by your organization."
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimum custom timeout is 1 minute."
+    "message": "Batas waktu kustom minimum adalah 1 menit."
   },
   "vaultTimeoutRangeError": {
     "message": "Vault timeout is not within allowed range."
@@ -6354,7 +6747,7 @@
     "message": "Ekspor Brankas Dinonaktifkan"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your individual vault."
+    "message": "Satu atau beberapa kebijakan organisasi mencegah Anda mengekspor brankas individual Anda."
   },
   "activateAutofill": {
     "message": "Activate auto-fill"
@@ -6399,7 +6792,7 @@
     "message": "Rahasia Klien"
   },
   "metadataAddress": {
-    "message": "Alamat Metadata"
+    "message": "Alamat metadata"
   },
   "oidcRedirectBehavior": {
     "message": "OIDC redirect behavior"
@@ -6444,7 +6837,7 @@
     "message": "Signing behavior"
   },
   "spMinIncomingSigningAlgorithm": {
-    "message": "Minimum incoming signing algorithm"
+    "message": "Algoritma persetujuan masuk minimum"
   },
   "spWantAssertionsSigned": {
     "message": "Expect signed assertions"
@@ -6675,7 +7068,7 @@
     "message": "Tinggalkan Organisasi"
   },
   "removeMasterPassword": {
-    "message": "Hapus Kata Sandi Utama"
+    "message": "Hapus sandi utama"
   },
   "removedMasterPassword": {
     "message": "Sandi utama dihapus"
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6940,16 +7336,16 @@
     "message": "Pisahkan beberapa nilai dengan tanda koma."
   },
   "sessionTimeout": {
-    "message": "Your session has timed out. Please go back and try logging in again."
+    "message": "Sesi Anda telah habis waktu. Silakan kembali dan coba masuk lagi."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Exporting individual vault"
+    "message": "Mengekspor brankas individual"
   },
   "exportingOrganizationVaultTitle": {
     "message": "Exporting organization vault"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated attachments.",
+    "message": "Hanya item brankas individual yang terkait dengan $EMAIL$ yang akan diekspor. Item brankas organisasi tidak akan disertakan. Hanya informasi item brankas yang akan diekspor dan tidak akan menyertakan lampiran terkait.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6958,7 +7354,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Hanya item brankas individual, termasuk lampiran yang terkait dengan $EMAIL$, yang akan diekspor. Item brankas organisasi tidak akan disertakan",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6967,7 +7363,25 @@
     }
   },
   "exportingOrganizationVaultDesc": {
-    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Items in individual vaults or other organizations will not be included.",
+    "message": "Hanya brankas organisasi yang terkait dengan $ORGANIZATION$ yang akan diekspor. Item dalam brankas individual atau organisasi lain tidak akan disertakan.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -6978,8 +7392,11 @@
   "accessDenied": {
     "message": "Akses ditolak. Anda tidak mempunyai izin untuk melihat halaman ini."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
-    "message": "Kata Sandi Utama"
+    "message": "Sandi utama"
   },
   "security": {
     "message": "Keamanan"
@@ -6994,7 +7411,7 @@
     "message": "Kembali ke Laporan"
   },
   "organizationPicker": {
-    "message": "Organization picker"
+    "message": "Pemilih organisasi"
   },
   "currentOrganization": {
     "message": "Current organization",
@@ -7023,7 +7440,7 @@
     "message": "Generate email"
   },
   "generatePassword": {
-    "message": "Buat Kata Sandi"
+    "message": "Buat sandi"
   },
   "generatePassphrase": {
     "message": "Buat frasa sandi"
@@ -7041,7 +7458,7 @@
     "message": "Email generated"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "Nilai harus ada di antara $MIN$ dan $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -7075,7 +7492,7 @@
     }
   },
   "plusAddressedEmail": {
-    "message": "Plus addressed email",
+    "message": "Alamat email plus",
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -7163,7 +7583,7 @@
     }
   },
   "lastSync": {
-    "message": "Last sync",
+    "message": "Sinkron terakhir",
     "description": "Used as a prefix to indicate the last time a sync occurred. Example \"Last sync 1968-11-16 00:00:00\""
   },
   "sponsorshipsSynced": {
@@ -7532,10 +7952,10 @@
     "message": "Jumplah pengguna"
   },
   "pickAnAvatarColor": {
-    "message": "Pick an avatar color"
+    "message": "Pilih warna avatar"
   },
   "customizeAvatar": {
-    "message": "Customize avatar"
+    "message": "Sesuaikan avatar"
   },
   "avatarUpdated": {
     "message": "Avatar updated"
@@ -7571,19 +7991,19 @@
     "message": "Custom Color"
   },
   "selectPlaceholder": {
-    "message": "-- Select --"
+    "message": "-- Pilih --"
   },
   "multiSelectPlaceholder": {
     "message": "-- Ketik untuk menyaring --"
   },
   "multiSelectLoading": {
-    "message": "Retrieving options..."
+    "message": "Mengambil pilihan..."
   },
   "multiSelectNotFound": {
-    "message": "No items found"
+    "message": "Tidak ada item ditemukan"
   },
   "multiSelectClearAll": {
-    "message": "Clear all"
+    "message": "Bersihkan semua"
   },
   "toggleCharacterCount": {
     "message": "Toggle character count",
@@ -7601,7 +8021,7 @@
     "description": "Description for the Projects field."
   },
   "lastEdited": {
-    "message": "Last edited",
+    "message": "Terakhir diubah",
     "description": "The label for the date and time when a item was last edited."
   },
   "editSecret": {
@@ -8104,7 +8524,7 @@
     "message": "Status"
   },
   "lastChecked": {
-    "message": "Last checked"
+    "message": "Terakhir diperiksa"
   },
   "editDomain": {
     "message": "Edit domain"
@@ -8200,7 +8620,7 @@
     "message": "Member role"
   },
   "moreFromBitwarden": {
-    "message": "More from Bitwarden"
+    "message": "Lainnya dari Bitwarden"
   },
   "switchProducts": {
     "message": "Switch products"
@@ -8323,7 +8743,7 @@
     "message": "Successfully uploaded license"
   },
   "lastLicenseSync": {
-    "message": "Last license sync"
+    "message": "Sinkron lisensi terakhir"
   },
   "billingSyncHelp": {
     "message": "Billing Sync help"
@@ -8376,17 +8796,11 @@
   "groupSlashUser": {
     "message": "Kelompok/Pengguna"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
-    "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
+    "message": "Melanjutkan proses ini akan membuat Anda keluar dari semua sesi aktif. Anda perlu masuk kembali dan menyelesaikan login dua langkah jika ada. Kami menyarankan Anda mengekspor brankas sebelum mengubah pengaturan enkripsi untuk mencegah kehilangan data."
   },
   "secretsManager": {
-    "message": "Secrets Manager"
+    "message": "Manajer Rahasia"
   },
   "secretsManagerAccessDescription": {
     "message": "Activate user access to Secrets Manager."
@@ -8395,7 +8809,7 @@
     "message": "This user can access Secrets Manager"
   },
   "important": {
-    "message": "Important:"
+    "message": "Penting:"
   },
   "viewAll": {
     "message": "View all"
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8624,7 +9117,7 @@
     "message": "Remove access"
   },
   "checkForBreaches": {
-    "message": "Check known data breaches for this password"
+    "message": "Periksa kebocoran data yang diketahui untuk sandi ini"
   },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
@@ -8639,7 +9132,7 @@
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
   "characterMinimum": {
-    "message": "$LENGTH$ character minimum",
+    "message": "Minimum karakter $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -8648,7 +9141,7 @@
     }
   },
   "masterPasswordMinimumlength": {
-    "message": "Master password must be at least $LENGTH$ characters long.",
+    "message": "Sandi utama minimal harus $LENGTH$ karakter.",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -8721,7 +9214,7 @@
     "message": "Trusted device encryption"
   },
   "trustedDevices": {
-    "message": "Trusted devices"
+    "message": "Perangkat terpercaya"
   },
   "memberDecryptionOptionTdeDescPart1": {
     "message": "Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The",
@@ -9051,13 +9544,13 @@
     "message": "Updated collection management setting"
   },
   "passwordManagerPlanPrice": {
-    "message": "Password Manager plan price"
+    "message": "Harga paket Pengelola Sandi"
   },
   "secretsManagerPlanPrice": {
     "message": "Secrets Manager plan price"
   },
   "passwordManager": {
-    "message": "Password Manager"
+    "message": "Pengelola Sandi"
   },
   "freeOrganization": {
     "message": "Free Organization"
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9249,7 +9739,7 @@
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "message": "Deteksi kecocokan URI mengatur cara Bitwarden mengenali saran isi otomatis.",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
@@ -9307,7 +9797,7 @@
     "description": "Used as a form field label for a select input on the offboarding survey."
   },
   "anyOtherFeedback": {
-    "message": "Is there any other feedback you'd like to share?",
+    "message": "Apakah ada masukan lain yang ingin Anda sampaikan?",
     "description": "Used as a form field label for a textarea input on the offboarding survey."
   },
   "missingFeatures": {
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9392,7 +9896,7 @@
     }
   },
   "addField": {
-    "message": "Add field"
+    "message": "Tambah bidang"
   },
   "editField": {
     "message": "Edit field"
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9906,10 +10416,10 @@
     "message": "Continue setting up your free trial of Bitwarden"
   },
   "continueSettingUpPasswordManager": {
-    "message": "Continue setting up Bitwarden Password Manager"
+    "message": "Lanjutkan pengaturan Pengelola Sandi Bitwarden"
   },
   "continueSettingUpFreeTrialPasswordManager": {
-    "message": "Continue setting up your free trial of Bitwarden Password Manager"
+    "message": "Lanjutkan pengaturan uji coba gratis Pengelola Sandi Bitwarden Anda"
   },
   "continueSettingUpSecretsManager": {
     "message": "Continue setting up Bitwarden Secrets Manager"
@@ -9937,7 +10447,7 @@
     }
   },
   "backTo": {
-    "message": "Back to $NAME$",
+    "message": "Kembali ke $NAME$",
     "description": "Navigate back to a previous folder or collection",
     "placeholders": {
       "name": {
@@ -9947,7 +10457,7 @@
     }
   },
   "back": {
-    "message": "Back",
+    "message": "Kembali",
     "description": "Button text to navigate back"
   },
   "removeItem": {
@@ -9996,17 +10506,11 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
   "protectYourFamilyOrBusiness": {
-    "message": "Protect your family or business"
+    "message": "Lindungi keluarga atau bisnis Anda"
   },
   "upgradeOrganizationCloseSecurityGaps": {
     "message": "Close security gaps with monitoring reports"
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10200,7 +10686,7 @@
     "message": "After making updates in the Bitwarden cloud server, upload your license file to apply the most recent changes."
   },
   "addToFolder": {
-    "message": "Add to folder"
+    "message": "Tambah ke folder"
   },
   "selectFolder": {
     "message": "Select folder"
@@ -10306,10 +10792,10 @@
     "message": "Learn more about Bitwarden's API"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "Berkas Kirim"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "Teks Kirim"
   },
   "includesXMembers": {
     "message": "for $COUNT$ member",
@@ -10396,7 +10882,7 @@
     "message": "Access to Premium features"
   },
   "additionalStorageGbMessage": {
-    "message": "GB additional storage"
+    "message": "GB penyimpanan tambahan"
   },
   "sshKeyAlgorithm": {
     "message": "Key algorithm"
@@ -10477,7 +10963,7 @@
     "message": "Your Secrets Manager subscription will upgrade based on the plan selected"
   },
   "bitwardenPasswordManager": {
-    "message": "Bitwarden Password Manager"
+    "message": "Pengelola Sandi Bitwarden"
   },
   "secretsManagerComplimentaryPasswordManager": {
     "message": "Your complimentary one year Password Manager subscription will upgrade to the selected plan. You will not be charged until the complimentary period is over."
@@ -10633,13 +11119,13 @@
     "message": "Contact your organization owner for assistance."
   },
   "suspendedOwnerOrgMessage": {
-    "message": "To regain access to your organization, add a payment method."
+    "message": "Untuk kembali mengakses ke organisasi Anda, tambahkan metode pembayaran."
   },
   "deleteMembers": {
     "message": "Delete members"
   },
   "noSelectedMembersApplicable": {
-    "message": "This action is not applicable to any of the selected members."
+    "message": "Tindakan ini tidak berlaku untuk anggota mana pun yang dipilih."
   },
   "deletedSuccessfully": {
     "message": "Deleted successfully"
@@ -10672,13 +11158,13 @@
     "message": "Remove members"
   },
   "devices": {
-    "message": "Devices"
+    "message": "Perangkat"
   },
   "deviceListDescription": {
-    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+    "message": "Akun Anda telah masuk di perangkat di bawah ini. Jika Anda tidak mengenali perangkat tersebut, hapus sekarang juga."
   },
   "deviceListDescriptionTemp": {
-    "message": "Your account was logged in to each of the devices below."
+    "message": "Akun Anda masuk di perangkat di bawah ini."
   },
   "claimedDomains": {
     "message": "Claimed domains"
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item ditambahkan ke favorit"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10769,7 +11264,7 @@
     "message": "Key rotation successful"
   },
   "rotationCompletedDesc": {
-    "message": "Your master password and encryption keys have been updated. Your other devices have been logged out."
+    "message": "Sandi utama dan kunci enkripsi Anda telah diperbarui. Perangkat Anda yang lain telah dikeluarkan."
   },
   "trustUserEmergencyAccess": {
     "message": "Trust and confirm user"
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -10944,7 +11431,7 @@
     "message": "Existing organization"
   },
   "selectOrganizationProviderPortal": {
-    "message": "Select an organization to add to your Provider Portal."
+    "message": "Pilih organisasi untuk ditambahkan ke Portal Penyedia Anda."
   },
   "noOrganizations": {
     "message": "There are no organizations to list"
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11043,7 +11570,7 @@
     "message": "New business unit"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Kirim informasi sensitif dengan aman",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11209,7 +11747,7 @@
     "message": "Your billing address has been updated."
   },
   "paymentDetails": {
-    "message": "Payment details"
+    "message": "Detail pembayaran"
   },
   "paymentMethodUpdated": {
     "message": "Your payment method has been updated."
@@ -11218,7 +11756,7 @@
     "message": "Your bank account has been verified."
   },
   "availableCreditAppliedToInvoice": {
-    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+    "message": "Setiap kredit yang tersedia akan secara otomatis diterapkan terhadap faktur yang dibuat untuk akun ini."
   },
   "mustBePositiveNumber": {
     "message": "Must be a positive number"
@@ -11227,7 +11765,7 @@
     "message": "Card security code"
   },
   "cardSecurityCodeDescription": {
-    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+    "message": "Kode keamanan kartu, juga dikenal sebagai CVV atau CVC, biasanya berupa angka 3 digit yang tercetak di belakang kartu kredit Anda atau angka 4 digit yang tercetak di bagian depan di atas nomor kartu Anda."
   },
   "verifyBankAccountWarning": {
     "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
@@ -11430,7 +11968,7 @@
     "message": "Unlimited family collections"
   },
   "familiesSharedStorage": {
-    "message": "Shared storage for important family info"
+    "message": "Penyimpanan bersama untuk info penting keluarga"
   },
   "limitedUsersV2": {
     "message": "Up to $COUNT$ members",
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id menawarkan perlindungan lebih kuat terhadap serangan modern. Bagus untuk pengguna tingkat lanjut dengan perangkat canggih."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/it/messages.json b/apps/web/src/locales/it/messages.json
index 3875bcb42f2..14da6d6be56 100644
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -17,17 +17,20 @@
   "accessIntelligence": {
     "message": "Intelligence sugli accessi"
   },
-  "riskInsights": {
-    "message": "Approfondimento rischi"
-  },
   "passwordRisk": {
     "message": "Rischio password"
   },
+  "noEditPermissions": {
+    "message": "Non hai i permessi per modificare questo elemento"
+  },
   "reviewAtRiskPasswords": {
     "message": "Controlla le password a rischio (deboli, esposte o riutilizzate). Seleziona le applicazioni critiche per determinare la priorità delle azioni di sicurezza."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Rivedi i login a rischio"
+  },
   "dataLastUpdated": {
-    "message": "Ultimo aggiornamento: $DATE$",
+    "message": "Ultimo aggiornamento dei dati: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Non hai ancora generato un rapporto"
+  },
   "notifiedMembers": {
     "message": "Membri notificati"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "Crea nuovo elemento di login"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "$PERCENT$% completato",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "Completate $COUNT$ attività relative alla sicurezza su $TOTAL$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Modifica password in corso"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assegna compiti ai membri per monitorarne i progressi"
+  },
+  "onceYouReviewApplications": {
+    "message": "Dopo aver esaminato le applicazioni e contrassegnato quelle critiche, comunica ai membri dell'organizzazione di cambiare le loro password."
+  },
+  "sendReminders": {
+    "message": "Invia promemoria"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Le applicazioni contrassegnate come critiche saranno visualizzate qui."
+  },
+  "viewAtRiskMembers": {
+    "message": "Visualizza membri a rischio"
+  },
+  "viewAtRiskApplications": {
+    "message": "Visualizza applicazioni a rischio"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ applicazioni critiche su $TOTAL$ sono a rischio a causa di password deboli o trapelate",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "Applicazioni critiche ($COUNT$)",
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "applicazioni critiche contrassegnate"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "$COUNT$ applicazioni critiche",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applicazioni a rischio",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ password a rischio",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ nuove password a rischio",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membri notificati ($COUNT$)",
     "placeholders": {
@@ -89,33 +178,75 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Nessuna applicazione trovata in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Nessun dato disponibile"
   },
-  "noAppsInOrgDescription": {
-    "message": "Quando gli utenti salvano i login, i relativi dati e le password a rischio sono mostrati qui. Contrassegna le applicazioni critiche e notifica agli utenti di aggiornare le password."
+  "noDataInOrgDescription": {
+    "message": "Importa i dati di accesso della tua organizzazione per configurare Access Intelligence. Una volta fatto, sarai in grado di:"
+  },
+  "feature1Title": {
+    "message": "Contrassegna l'applicazione come critica"
+  },
+  "feature1Description": {
+    "message": "Ti sarà utile per rimuovere i rischi innanzi tutto per le tue applicazioni più importanti."
+  },
+  "feature2Title": {
+    "message": "Aiuta i membri a migliorare la loro sicurezza"
+  },
+  "feature2Description": {
+    "message": "Assegna ai membri a rischio attività di sicurezza guidate per aggiornare, migliorare o rafforzare le loro credenziali di accesso."
+  },
+  "feature3Title": {
+    "message": "Tieni sotto controllo i progressi"
+  },
+  "feature3Description": {
+    "message": "Traccia i cambiamenti per monitorare i miglioramenti di sicurezza."
+  },
+  "noReportsRunTitle": {
+    "message": "Genera un report"
+  },
+  "noReportsRunDescription": {
+    "message": "Sei pronto per iniziare a generare report. Una volta generati, sarai in grado di:"
   },
   "noCriticalApplicationsTitle": {
-    "message": "You haven’t marked any applications as critical"
+    "message": "Non hai contrassegnato nessuna applicazione come critica"
   },
   "noCriticalApplicationsDescription": {
-    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
+    "message": "Seleziona le tue applicazioni critiche più importanti per dare priorità alle azioni di sicurezza che i tuoi utenti devono completare per affrontare le password a rischio."
   },
   "markCriticalApplications": {
-    "message": "Select critical applications"
+    "message": "Seleziona applicazioni critiche"
   },
   "markAppAsCritical": {
     "message": "Contrassegna l'applicazione come critica"
   },
+  "markAsCritical": {
+    "message": "Contrassegna l'elemento come critico"
+  },
+  "applicationsSelected": {
+    "message": "applicazioni selezionate"
+  },
+  "selectApplication": {
+    "message": "Seleziona applicazione"
+  },
+  "unselectApplication": {
+    "message": "Deseleziona"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applicazioni contrassegnate come critiche"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applicazioni contrassegnate come critiche",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Impossibile contrassegnare le applicazioni come critiche"
+  },
   "application": {
     "message": "Applicazione"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Membri a rischio"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Questi membri hanno accesso a elementi vulnerabili per applicazioni critiche."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Membri con password a rischio"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "I membri della tua organizzazione dovranno cambiare le password vulnerabili. Riceveranno una notifica all'interno dell'estensione Bitwarden del loro browser."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ membri a rischio",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,20 +301,20 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Questi membri accedono ad applicazioni con parole d'accesso deboli, esposte, o riutilizzate."
+  "atRiskMemberDescription": {
+    "message": "Questi membri accedono ad applicazioni con password deboli, esposte, o riutilizzate."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Non ci sono utenti connessi con password deboli, esposte o riutilizzate."
   },
   "atRiskApplicationsDescription": {
-    "message": "Queste applicazioni hanno parole d'accesso deboli, esposte o riutilizzate."
+    "message": "Queste applicazioni hanno password deboli, esposte o riutilizzate."
   },
   "atRiskApplicationsDescriptionNone": {
     "message": "Non ci sono applicazioni con password deboli, esposte o riutilizzate."
   },
   "atRiskMembersDescriptionWithApp": {
-    "message": "Questi membri stanno entrando in $APPNAME$ con parole d'accesso deboli, esposte, o riutilizzate.",
+    "message": "Questi membri stanno entrando in $APPNAME$ con password deboli, esposte, o riutilizzate.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -203,11 +340,83 @@
   "totalApplications": {
     "message": "Applicazioni totali"
   },
+  "applicationsNeedingReview": {
+    "message": "Applicazioni in attesa di revisione"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Verifica le nuove applicazioni"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ nuove applicazioni",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Esamina le nuove applicazioni per contrassegnare quelle critiche e mantenere sicura la tua organizzazione"
+  },
+  "reviewNow": {
+    "message": "Controlla adesso"
+  },
+  "allCaughtUp": {
+    "message": "Nessuna notifica"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Nessuna nuova applicazione da verificare"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "La tua organizzazione ha elementi salvati per $COUNT$ applicazioni",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Controlla le applicazioni e proteggi gli elementi critici per la sicurezza della tua organizzazione"
+  },
+  "reviewApplications": {
+    "message": "Verifica le nuove applicazioni"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Priorità alle applicazioni critiche"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Indica quali sono le applicazioni più importanti la tua organizzazione. Potrai assegnare ai membri delle attività da completare per mettere in sicurezza le loro credenziali."
+  },
+  "reviewNewApplications": {
+    "message": "Verifica le nuove applicazioni"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Rivedi le nuove applicazioni con elementi vulnerabili e contrassegna come critiche quelle che desideri monitorare da vicino. Potrai assegnare ai membri delle attività da completare per mettere in sicurezza le loro credenziali."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Clicca sull'icona stella per contrassegnare un'app come critica"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "La funzionalità per contrassegnare gli elementi critici sarà implementata in un aggiornamento futuro"
+  },
+  "applicationReviewSaved": {
+    "message": "Applicazione verificata"
+  },
+  "newApplicationsReviewed": {
+    "message": "Nuove applicazioni verificate"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Errore nell'aggiornamento dello stato di verifica"
+  },
+  "pleaseTryAgain": {
+    "message": "Riprova"
+  },
   "unmarkAsCritical": {
     "message": "Contrassegna l'elemento come non critico"
   },
   "criticalApplicationUnmarkedSuccessfully": {
-    "message": "Successfully unmarked application as critical"
+    "message": "Applicazione impostata come non critica"
   },
   "whatTypeOfItem": {
     "message": "Che tipo di elemento è questo?"
@@ -357,7 +566,7 @@
     "message": "Codice di sicurezza (CVV)"
   },
   "securityCodeSlashCVV": {
-    "message": "Codice di sicurezza (CVV)"
+    "message": "Codice di sicurezza / CVV"
   },
   "identityName": {
     "message": "Nome identità"
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Preferiti"
   },
+  "taskSummary": {
+    "message": "Riepilogo attività"
+  },
   "types": {
     "message": "Tipi"
   },
@@ -782,11 +994,11 @@
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Nuovo Send (testo)",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Nuovo Send (file)",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
@@ -802,39 +1014,39 @@
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "Modifica nota",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "Modifica chiave SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Modifica Send testuale",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Modifica Send con file",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Mostra login",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Mostra carta",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "Mostra identità",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "Mostra nota",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "Mostra chiave SSH",
     "description": "Header for view SSH key item type"
   },
   "new": {
@@ -956,7 +1168,7 @@
     "message": "Copia nome"
   },
   "cardNumber": {
-    "message": "numero carta"
+    "message": "Numero carta"
   },
   "copyFieldCipherName": {
     "message": "Copia $FIELD$, $CIPHERNAME$",
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Mantieni questa finestra aperta e segui le istruzioni del tuo browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Autenticazione con passkey non riuscita. Riprova."
+  },
   "useADifferentLogInMethod": {
     "message": "Usa un altro metodo di accesso"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Usa login unificato (SSO)"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "La tua organizzazione richiede un accesso Single Sign-On (SSO)."
+  },
   "welcomeBack": {
     "message": "Bentornato/a"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Password principale errata"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Password principale errata. Verifica che l'email sia corretta e che l'account sia stato creato su $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Password errata, usa la password che hai inserito alla creazione del file di esportazione."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Non ci sono elementi da mostrare."
   },
+  "noItemsInTrash": {
+    "message": "Non ci sono elementi nel cestino"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Gli elementi cancellati appariranno qui e saranno eliminati definitivamente dopo 30 giorni"
+  },
+  "noItemsInVault": {
+    "message": "La cassaforte è vuota"
+  },
+  "emptyVaultDescription": {
+    "message": "La cassaforte protegge non solo le password: archivia in modo sicuro anche passkey, identità, carte di pagamento e note."
+  },
+  "emptyFavorites": {
+    "message": "La lista dei preferiti è vuota"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Aggiungi ai preferiti gli elementi che usi più spesso per un accesso rapido."
+  },
+  "noSearchResults": {
+    "message": "Nessun risultato"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Elimina i filtri di ricerca o prova con altri termini"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Non hai i permessi necessari per visualizzare tutti gli elementi in questa raccolta."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Impostazioni chiave di crittografia"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritmo KDF"
-  },
   "kdfIterations": {
     "message": "Iterazioni KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Un numero di iterazioni KDF, memoria, e parallelismo più elevato può aiutare a proteggere la tua password principale dall'essere forzata da un utente malintenzionato."
   },
-  "changeKdf": {
-    "message": "Cambia KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Impostazioni chiave di crittografia salvate"
   },
@@ -2188,7 +2433,7 @@
     "message": "Cambia la lingua utilizzata dalla cassaforte web."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Mostra le icone dei siti e recupera gli URL di cambio password"
   },
   "default": {
     "message": "Predefinito"
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Assicurati che il tuo account abbia abbastanza credito disponibile per questo acquisto. Se il tuo account non ha abbastanza credito disponibile, il tuo metodo di pagamento predefinito sarà utilizzato per la differenza. Puoi aggiungere credito al tuo account dalla sezione Fatturazione."
   },
+  "notEnoughAccountCredit": {
+    "message": "Non hai abbastanza credito per questo acquisto. Puoi aggiungere credito al tuo account dalla pagina di fatturazione."
+  },
   "creditAppliedDesc": {
     "message": "Il credito del tuo account può essere usato per effettuare acquisti. Ogni credito disponibile sarà automaticamente applicato alle fatture generate per questo account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Prossimo addebito"
   },
+  "nextChargeHeader": {
+    "message": "Prossimo addebito"
+  },
+  "plan": {
+    "message": "Piano"
+  },
   "details": {
     "message": "Dettagli"
   },
+  "discount": {
+    "message": "sconto"
+  },
   "downloadLicense": {
     "message": "Scarica licenza"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Aggiorna browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generazione delle tue informazioni sui rischi..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generazione del tuo Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Recupero dei dati dei membri..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analisi della salute della password..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calcolo dei punteggi di rischio..."
+  },
+  "generatingReportData": {
+    "message": "Generazione dati del rapporto..."
+  },
+  "savingReport": {
+    "message": "Salvataggio..."
+  },
+  "compilingInsights": {
+    "message": "Compilazione dei dati..."
+  },
+  "loadingProgress": {
+    "message": "Caricamento in corso"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Attendi..."
+  },
+  "riskInsightsRunReport": {
+    "message": "Avvia report"
   },
   "updateBrowserDesc": {
     "message": "Stai utilizzando un browser non supportato. La cassaforte web potrebbe non funzionare correttamente."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invito accettato"
   },
-  "inviteAcceptedDesc": {
-    "message": "Puoi accedere a questa organizzazione se l'amministratore conferma la tua iscrizione. Ti invieremo un'email quando sarà confermata."
+  "invitationAcceptedDesc": {
+    "message": "Hai accettato l'invito."
   },
   "inviteInitAcceptedDesc": {
     "message": "Ora puoi accedere a questa organizzazione."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organizzazione disabilitata"
   },
+  "organizationIsSuspended": {
+    "message": "Organizzazione sospesa"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Non è possibile accedere agli elementi delle organizzazioni sospese. Contatta il proprietario dell'organizzazione per ricevere assistenza."
+  },
   "secretsAccessSuspended": {
     "message": "Non è possibile accedere alle organizzazioni disabilitate. Contatta il proprietario della tua organizzazione per assistenza."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Non è possibile creare account di servizio nelle organizzazioni disabilitate. Contatta il proprietario della tua organizzazione per assistenza."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Non è possibile accedere agli elementi nelle organizzazioni disabilitate. Contatta il proprietario della tua organizzazione per assistenza."
-  },
   "licenseIsExpired": {
     "message": "La licenza è scaduta."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Identificativo SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Fornisci questo ID ai tuoi membri per accedere con SSO. Per saltare questo passaggio, configura la ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Fornisci questo ID ai membri della tua organizzazione per accedere con SSO. I membri possono saltare l'inserimento di questo identificatore durante l'accesso SSO se è configurato un dominio verificato.",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Scopri di più",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Scollega SSO"
@@ -5518,9 +5809,9 @@
     "message": "Richiede che tutti gli elementi siano di proprietà di un'organizzazione. Disabilita per memorizzare gli elementi a livello di account personale.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
+  "organizationDataOwnershipDescContent": {
     "message": "Tutti gli elementi saranno posseduti e memorizzati dall'organizzazione, e saranno disponibili controlli, visibilità e reporting. Quando attivato, è disponibile una raccolta predefinita per ogni utente. Per sapere di più sulla gestione del ",
-    "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.'"
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "ciclo di vita delle credenziali",
@@ -5545,6 +5836,65 @@
     "message": "Scopri di più su ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Disponibile ora"
+  },
+  "autoConfirm": {
+    "message": "Conferma automatica dei nuovi utenti"
+  },
+  "autoConfirmDescription": {
+    "message": "I nuovi utenti invitati ad accedere all'organizzazione saranno automaticamente confermati quando il dispositivo di un amministratore è sbloccato.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Come attivare la conferma automatica dell'utente"
+  },
+  "autoConfirmExtension1": {
+    "message": "Apri l'estensione di Bitwarden"
+  },
+  "autoConfirmExtension2": {
+    "message": "Seleziona",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Attiva",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "L'estensione del browser Bitwarden è stata aperta con successo. Ora è possibile attivare l'impostazione di conferma automatica dell'utente."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "I nuovi utenti invitati ad accedere all'organizzazione saranno automaticamente confermati quando il dispositivo di un amministratore è sbloccato. Prima di attivare questa funzione, leggi attentamente e conferma di accettare quanto segue: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potenziale rischio per la sicurezza. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "La conferma automatica dell'utente potrebbe rappresentare un rischio per la sicurezza dei dati della tua organizzazione."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Scopri i rischi",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "È richiesto il Single Sign-On (SSO)."
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Tutti i membri devono appartenere esclusivamente a questa organizzazione per attivare questa automazione."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "La politica di organizzazione unica si estenderà a tutti i ruoli. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Non è stato configurato l'accesso d'emergenza. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "L'accesso d'emergenza sarà rimosso."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Accetto questi rischi e aggiornamenti sulle politiche"
+  },
   "personalOwnership": {
     "message": "Rimuovi cassaforte individuale"
   },
@@ -5558,10 +5908,10 @@
     "message": "A causa di una politica aziendale, non puoi salvare elementi nella tua cassaforte personale. Cambia l'opzione di proprietà in un'organizzazione e scegli tra le raccolte disponibili."
   },
   "desktopAutotypePolicy": {
-    "message": "Desktop Autotype Default Setting"
+    "message": "Impostazione predefinita per Desktop Autotype"
   },
   "desktopAutotypePolicyDesc": {
-    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "message": "Desktop Autotype abilitato per i membri. Ogni membro può scegliere di disattivarlo manualmente nel client desktop.",
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
@@ -5597,6 +5947,19 @@
     "message": "Mostra sempre l'indirizzo email del membro ai destinatari durante la creazione o la modifica di un Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Metodo di corrispondenza degli URL predefinito"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determina con quale logica i login sono suggeriti in base all'URL visitato. Amministratori e proprietari possono modificare questa impostazione."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Metodo di corrispondenza predefinito"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Scegli un metodo di corrispondenza valido.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Politica $ID$ modificata.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "La tua password principale non soddisfa uno o più politiche della tua organizzazione. Per accedere alla cassaforte, aggiornala ora. Procedere ti farà uscire dalla sessione corrente, richiedendoti di accedere di nuovo. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora."
   },
-  "automaticAppLogin": {
-    "message": "Accesso automatico degli utenti per le applicazioni consentite"
+  "automaticAppLoginWithSSO": {
+    "message": "Accesso automatico con SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "I moduli di accesso verranno automaticamente compilati e inviati per le applicazioni lanciate dall'identity provider configurato."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Estendi la sicurezza e la comodità del Single Sign-On (SSO) alle app non gestite. Quando gli utenti lanciano un'app collegata, i dati di accesso sono inseriti e inviati automaticamente: si tratta di un flusso a singolo clic, velocissimo e sicuro, che unisce il provider d'identità all'applicazione."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Host Identity provider"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "La tua organizzazione ha aggiornato le tue opzioni di decrittazione. Per favore, imposta una master password per accedere alla tua cassaforte."
   },
-  "maximumVaultTimeout": {
-    "message": "Timeout cassaforte"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Timeout della sessione"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Imposta un timeout massimo della cassaforte per i membri."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Imposta un timeout di sessione massimo per tutti i membri tranne i proprietari."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Timeout massimo della cassaforte"
+  "maximumAllowedTimeout": {
+    "message": "Timeout massimo consentito"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Timeout massimo della cassaforte non valido."
+  "maximumAllowedTimeoutRequired": {
+    "message": "È necessario impostare un limite massimo di timeout."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Valore non valido: prova ad inserirlo nuovamente."
+  },
+  "sessionTimeoutAction": {
+    "message": "Azione al timeout della sessione"
+  },
+  "immediately": {
+    "message": "Subito"
+  },
+  "onSystemLock": {
+    "message": "Al blocco del dispositivo"
+  },
+  "onAppRestart": {
+    "message": "Al riavvio dell'app"
   },
   "hours": {
     "message": "Ore"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuti"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Sei sicuro di voler disabilitare il valore massimo di timeout per tutti i membri?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Questa opzione salverà localmente la chiave crittografica di ogni membro sul suo dispositivo. Se scegli questa opzione, assicurati che i loro dispositivi siano adeguatamente protetti."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Ulteriori informazioni sulla protezione dei dispositivi"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "'Blocco di sistema' si applica solo all'estensione del browser e all'app desktop"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Le versioni mobile e Web imposteranno un timeout al riavvio dell'app, perché l'opzione non è supportata."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Le politiche della tua organizzazione hanno impostato il timeout massimo consentito della tua cassaforte su $HOURS$ ore e $MINUTES$ minuti.",
     "placeholders": {
@@ -6729,7 +7122,7 @@
     "message": "SSO disattivato"
   },
   "emailMustLoginWithSso": {
-    "message": "$EMAIL$ must login with Single Sign-on",
+    "message": "$EMAIL$ deve accedere con Single Sign-on",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Devi aggiungere lo URL del server di base o almeno un ambiente personalizzato."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Gli indirizzi devono usare il protocollo HTTPS."
+  },
   "apiUrl": {
     "message": "URL del server API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Solo la cassaforte dell'organizzazione associata a $ORGANIZATION$ sarà esportata.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Solo la cassaforte dell'organizzazione associata a $ORGANIZATION$ sarà esportata. Eventuali raccolte di elementi non saranno incluse.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Accesso negato. Non hai i permessi necessari per visualizzare questa pagina."
   },
+  "noPageAccess": {
+    "message": "Non hai accesso a questa pagina"
+  },
   "masterPassword": {
     "message": "Password principale"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Segreto sconosciuto, potrebbe essere necessario richiedere l'autorizzazione per l'accesso."
   },
+  "unknownServiceAccount": {
+    "message": "Account macchina sconosciuto, potrebbe essere necessario richiedere l'autorizzazione per accedere a questo account macchina."
+  },
   "unknownProject": {
     "message": "Progetto sconosciuto, potrebbe essere necessario richiedere l'autorizzazione per l'accesso."
   },
@@ -7520,7 +7940,7 @@
     "message": "No"
   },
   "connected": {
-    "message": "Connected"
+    "message": "Connesso"
   },
   "members": {
     "message": "Membri"
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Gruppo/Utente"
   },
-  "lowKdfIterations": {
-    "message": "Iterazioni KDF basse"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Aggiorna le tue impostazioni di crittografia per soddisfare le nuove raccomandazioni sulla sicurezza e migliorare la protezione del tuo account."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Procedere ti farà uscire da tutte le sessioni attive. Dovrai accedere di nuovo e completare la verifica in due passaggi, se impostata. Ti consigliamo di esportare la tua cassaforte prima di cambiare le impostazioni di crittografia per prevenire perdite di dati."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accesso al progetto con identificatore $PROJECT_ID$ riuscito.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accesso al progetto con identificatore $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Account macchina con ID $SERVICE_ACCOUNT_ID$ eliminato",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Progetto con identificatore $PROJECT_ID$ modificato",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Utente $USER_ID$ aggiunto all'account macchina con identificatore $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Utente $USER_ID$ rimosso dall'account macchina con identificatore $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Gruppo $GROUP_ID$ rimosso dall'account macchina con identificatore $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Account macchina con identificatore $SERVICE_ACCOUNT_ID$ creato",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Gruppo $GROUP_ID$ aggiunto all'account macchina con identificatore $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Account macchina con identificatore $SERVICE_ACCOUNT_ID$ eliminato",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Progetto con identificatore $PROJECT_ID$ eliminato",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Accesso effettuato!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assegna accesso alla raccolta"
   },
@@ -9124,7 +9614,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "Attivata l'impostazione di limitazione della creazione di raccolte $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9133,7 +9623,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "Limitazione della creazione di raccolte $ID$ disattivata.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9142,7 +9632,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "Attivata l'impostazione di limitazione dell'eliminazione di raccolte $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9151,7 +9641,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "Limitazione dell'eliminazione di raccolte $ID$ disattivata.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9160,7 +9650,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "Attivata l'impostazione di limitazione dell'eliminazione di elementi $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9169,7 +9659,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "Limitazione dell'eliminazione di elementi $ID$ disattivata.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9178,7 +9668,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Gestione di tutte le raccolte e degli elementi $ID$ per proprietari e amministratori attivata.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9187,7 +9677,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Gestione di tutte le raccolte e degli elementi $ID$ per proprietari e amministratori disattivata.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9330,6 +9820,14 @@
     "message": "Troppo costoso",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Passaggio al piano gratuito",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Passaggio all'organizzazione gratuita",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Gratis per un anno"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assegna"
   },
+  "assignTasks": {
+    "message": "Assegna attività"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Invia notifiche ai membri per invitarli a modificare le loro password"
+  },
   "assignToCollections": {
     "message": "Assegna alle raccolte"
   },
@@ -9752,11 +10256,17 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Invia i dati dell'evento all'istanza Logscale"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Invia i dati dell'evento della cassaforte all'istanza di Datadog"
+  },
   "failedToSaveIntegration": {
     "message": "Impossibile salvare l'integrazione. Riprova più tardi."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Devi essere il proprietario dell'organizzazione per eseguire questa azione."
+  },
   "failedToDeleteIntegration": {
-    "message": "Failed to delete integration. Please try again later."
+    "message": "Impossibile eliminare l'integrazione. Riprova più tardi."
   },
   "deviceIdMissing": {
     "message": "ID dispositivo mancante"
@@ -9783,7 +10293,7 @@
     }
   },
   "updateIntegrationButtonDesc": {
-    "message": "Update $INTEGRATION$",
+    "message": "Aggiorna $INTEGRATION$",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9855,7 +10365,7 @@
     "message": "Token portatore"
   },
   "repositoryNameHint": {
-    "message": "Name of the repository to ingest into"
+    "message": "Nome del repository di destinazione"
   },
   "index": {
     "message": "Indice"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Iterazioni KDF basse. Aumenta le tue iterazioni per migliorare la sicurezza del tuo account."
-  },
-  "changeKDFSettings": {
-    "message": "Cambia impostazioni KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Proteggi la tua infrastruttura"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Disattivo"
   },
-  "higherKDFIterations": {
-    "message": "Un numero di iterazioni KDF più elevato può aiutare a proteggere la tua password principale dall'essere forzata da un attaccante."
-  },
-  "incrementsOf100,000": {
-    "message": "incrementi di 100.000"
-  },
-  "smallIncrements": {
-    "message": "piccoli incrementi"
-  },
   "kdfIterationRecommends": {
     "message": "Consigliamo 600,000 o più"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Per i dispositivi più vecchi, impostare il tuo KDF troppo alto potrebbe causare problemi di prestazioni. Aumenta il valore in $VALUE$ e prova i tuoi dispositivi.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contatta il Servizio Clienti per ripristinare il tuo abbonamento."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Dominio verificato"
   },
+  "itemAddedToFavorites": {
+    "message": "Elemento aggiunto ai preferiti"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Elemento rimosso dai preferiti"
+  },
+  "copyNote": {
+    "message": "Copia nota"
+  },
   "organizationNameMaxLength": {
     "message": "Il nome dell'organizzazione non può superare i 50 caratteri."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "L'estensione di Bitwarden è installata e funzionante. Ora è possibile avere una panoramica delle password a rischio."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Non è stato possibile aprire l'estensione di Bitwarden. Clicca sull'icona di Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "dalla barra degli strumenti.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Il tuo abbonamento sarà rinnovato a breve. Per assicurarti un servizio continuativo, contatta $RESELLER$ e conferma il tuo rinnovo prima del $RENEWAL_DATE$.",
     "placeholders": {
@@ -10995,10 +11482,10 @@
     "message": "Cambia parola d'accesso a rischio"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Questo login è a rischio e non contiene un sito web. Aggiungi un sito web e cambia la password per maggiore sicurezza."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Sito web mancante"
   },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Rimuovi sblocco con PIN"
@@ -11022,16 +11509,56 @@
     "message": "Le organizzazioni gratuite possono avere fino a 2 raccolte. Aggiorna ad un piano a pagamento per crearne di più."
   },
   "searchArchive": {
-    "message": "Search archive"
+    "message": "Cerca nell'archivio"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archivio",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archivia",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Togli dall'archivio"
+  },
+  "itemsInArchive": {
+    "message": "Elementi archiviati"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Nessun elemento nell'archivio"
   },
-  "archivedItemsDescription": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  "noItemsInArchiveDesc": {
+    "message": "Gli elementi archiviati appariranno qui e saranno esclusi dai risultati di ricerca e dall'auto-riempimento."
+  },
+  "itemWasSentToArchive": {
+    "message": "Elemento archiviato"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Elementi archiviati"
+  },
+  "itemUnarchived": {
+    "message": "Elemento rimosso dall'archivio"
+  },
+  "bulkArchiveItems": {
+    "message": "Elementi archiviati"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Elementi rimossi dall'archivio"
+  },
+  "archiveItem": {
+    "message": "Archivia elemento",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Gli elementi archiviati sono esclusi dai risultati di ricerca e dall'auto-riempimento. Vuoi davvero archiviare questo elemento?"
+  },
+  "archiveBulkItems": {
+    "message": "Archivia elementi",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Gli elementi archiviati sono esclusi dai risultati di ricerca e dall'auto-riempimento. Vuoi davvero archiviare questi elementi?"
   },
   "businessUnit": {
     "message": "Business Unit"
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Estensione di Bitwarden installata!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Estensione di Bitwarden installata!"
+  },
   "openExtensionToAutofill": {
     "message": "Apri l'estensione cliccando sul tasto della barra degli strumenti e accedi con i tuoi dati per attivare il riempimento automatico."
   },
@@ -11154,6 +11684,14 @@
     "message": "Guida introduttiva",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Se l'estensione non s'è avviata, potrebbe essere necessario cliccare sull'icona di Bitwarden ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " nella barra degli strumenti del browser.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "il Manuale di Bitwarden",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11188,10 +11726,10 @@
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Informazioni su questa opzione"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden userà gli URL memorizzati in ogni login per mostrare, se possibile, l'icona del sito Web e l'URL di modifica password per facilitare la modifica delle credenziali. Nessuna informazione è raccolta o archiviata per il funzionamento di questo servizio."
   },
   "billingAddress": {
     "message": "Indirizzo di fatturazione"
@@ -11358,43 +11896,43 @@
     "message": "Conferma dominio Key Connector"
   },
   "requiredToVerifyBankAccountWithStripe": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "Il pagamento con conto corrente bancario è disponibile solo per i clienti negli Stati Uniti. Sarà necessario verificare il conto corrente. Faremo un micro-versamento entro 1-2 giorni lavorativi. La mancata verifica del conto bancario risulterà come un mancato pagamento e causerà la sospensione del tuo abbonamento."
   },
   "verifyBankAccountWithStripe": {
-    "message": "We have made a micro-deposit to your bank account. This may take 1-2 business days. When you see the deposit in your account, you can verify your bank account. Failure to verify your bank account will result in a missed payment and your subscription will be suspended."
+    "message": "Abbiamo effettuato un micro-versamento sul tuo conto bancario. L'operazione potrebbe essere visibile in 1-2 giorni lavorativi. Quando vedrai il versamento sul conto bancario, potrai verificarlo. La mancata verifica del conto bancario risulterà come un mancato pagamento e causerà la sospensione del tuo abbonamento."
   },
   "verifyNow": {
-    "message": "Verify now."
+    "message": "Verifica adesso."
   },
   "additionalStorageGB": {
-    "message": "Additional storage GB"
+    "message": "Spazio di archiviazione aggiuntivo (GB)"
   },
   "additionalServiceAccountsV2": {
-    "message": "Additional machine accounts"
+    "message": "Account macchina aggiuntivi"
   },
   "secretsManagerSeats": {
-    "message": "Secrets Manager seats"
+    "message": "Postazioni Secrets Manager"
   },
   "additionalStorage": {
-    "message": "Additional Storage"
+    "message": "Spazio di archiviazione aggiuntivo"
   },
   "expandPurchaseDetails": {
-    "message": "Expand purchase details"
+    "message": "Espandi i dettagli dell'acquisto"
   },
   "collapsePurchaseDetails": {
-    "message": "Collapse purchase details"
+    "message": "Comprimi i dettagli dell'acquisto"
   },
   "familiesMembership": {
-    "message": "Families membership"
+    "message": "Abbonamento famiglie"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Sicurezza online completa"
   },
   "planDescFamiliesV2": {
-    "message": "Premium security for your family"
+    "message": "Sicurezza Premium per la tua famiglia"
   },
   "planDescFreeV2": {
-    "message": "Share with $COUNT$ other user",
+    "message": "Condividi con altri $COUNT$ utenti",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11403,37 +11941,37 @@
     }
   },
   "planDescEnterpriseV2": {
-    "message": "Advanced capabilities for any organization"
+    "message": "Capacità avanzate per qualsiasi organizzazione"
   },
   "planNameCustom": {
-    "message": "Custom plan"
+    "message": "Piano personalizzato"
   },
   "planDescCustom": {
-    "message": "Bitwarden scales with businesses of all sizes to secure passwords and sensitive information. If you're part of a large enterprise, contact sales to request a quote."
+    "message": "Bitwarden si adatta a imprese e organizzazioni di tutte le dimensioni, e utilizza le migliori tecnologie per proteggere password e informazioni sensibili. Se fai parte di una grande azienda, contatta l'ufficio vendite per chiedere un preventivo."
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "Autenticatore per 2FA incorporato"
   },
   "breachMonitoring": {
-    "message": "Breach monitoring"
+    "message": "Monitoraggio delle violazioni"
   },
   "andMoreFeatures": {
-    "message": "And more!"
+    "message": "E molto altro!"
   },
   "secureFileStorage": {
-    "message": "Secure file storage"
+    "message": "Archiviazione file sicura"
   },
   "familiesUnlimitedSharing": {
-    "message": "Unlimited sharing - choose who sees what"
+    "message": "Condivisione illimitata e granulare: decidi tu chi vede cosa"
   },
   "familiesUnlimitedCollections": {
-    "message": "Unlimited family collections"
+    "message": "Collezioni illimitate per gli abbonamenti famiglia"
   },
   "familiesSharedStorage": {
-    "message": "Shared storage for important family info"
+    "message": "Archiviazione condivisa per documenti importanti della famiglia"
   },
   "limitedUsersV2": {
-    "message": "Up to $COUNT$ members",
+    "message": "Fino a $COUNT$ membri",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11442,7 +11980,7 @@
     }
   },
   "limitedCollectionsV2": {
-    "message": "Up to $COUNT$ collections",
+    "message": "Fino a $COUNT$ collezioni",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11451,13 +11989,13 @@
     }
   },
   "alwaysFree": {
-    "message": "Always free"
+    "message": "Gratis per sempre"
   },
   "twoSecretsIncluded": {
-    "message": "2 secrets"
+    "message": "2 segreti"
   },
   "projectsIncludedV2": {
-    "message": "$COUNT$ project(s)",
+    "message": "$COUNT$ progetti",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11466,13 +12004,13 @@
     }
   },
   "secureItemSharing": {
-    "message": "Secure item sharing"
+    "message": "Condivisione sicura"
   },
   "scimSupport": {
-    "message": "SCIM support"
+    "message": "Supporto SCIM"
   },
   "includedMachineAccountsV2": {
-    "message": "$COUNT$ machine accounts",
+    "message": "$COUNT$ account macchina",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11481,21 +12019,160 @@
     }
   },
   "enterpriseSecurityPolicies": {
-    "message": "Enterprise security policies"
+    "message": "Politiche di sicurezza Enterprise"
   },
   "selfHostOption": {
-    "message": "Self-host option"
+    "message": "Opzione self-host"
   },
   "complimentaryFamiliesPlan": {
-    "message": "Complimentary families plan for all users"
+    "message": "Piani famiglia complementari per tutti gli utenti"
   },
   "strengthenCybersecurity": {
-    "message": "Strengthen cybersecurity"
+    "message": "Cybersicurezza rafforzata"
   },
   "boostProductivity": {
-    "message": "Boost productivity"
+    "message": "Produttività migliorata"
   },
   "seamlessIntegration": {
-    "message": "Seamless integration"
+    "message": "Integrazione perfetta"
+  },
+  "families": {
+    "message": "Famiglie"
+  },
+  "upgradeToFamilies": {
+    "message": "Passa al piano Famiglia"
+  },
+  "upgradeToPremium": {
+    "message": "Passa a Premium"
+  },
+  "familiesUpdated": {
+    "message": "Hai fatto l'upgrade al piano Famiglia!"
+  },
+  "taxCalculationError": {
+    "message": "Si è verificato un errore nel calcolo dell'imposta per la tua posizione. Riprova in un secondo momento."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Bitwarden ti dà il benvenuto"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Sblocca più funzionalità di sicurezza con Premium, o inizia a condividere oggetti con il piano Famiglia"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "I prezzi non includono le imposte e sono fatturati annualmente."
+  },
+  "organizationNameDescription": {
+    "message": "Il nome della tua organizzazione apparirà negli inviti che invii ai membri."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Ignora e continua"
+  },
+  "upgradeYourPlan": {
+    "message": "Aggiorna il tuo piano"
+  },
+  "upgradeNow": {
+    "message": "Effettua l'upgrade"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Il completamento di questo modulo creerà una nuova organizzazione per le famiglie. Puoi fare l'upgrade della tua organizzazione gratuita dalla console di amministrazione."
+  },
+  "upgradeErrorMessage": {
+    "message": "Errore nell'elaborazione dell'upgrade. Fai un altro tentativo dopo aver verificato di aver inserito correttamente i dati."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Hai il piano Bitwarden Free"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Fai l'upgrade per una maggiore sicurezza"
+  },
+  "viewbusinessplans": {
+    "message": "Vedi i piani Business"
+  },
+  "updateEncryptionSettings": {
+    "message": "Aggiorna le impostazioni di crittografia"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Aggiorna le impostazioni di crittografia"
+  },
+  "updateSettings": {
+    "message": "Aggiorna le impostazioni"
+  },
+  "algorithm": {
+    "message": "Algoritmo"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Scegli la modalità di crittografia per la tua cassaforte. Tutte le opzioni sono assolutamente sicure, ma alcuni metodi avanzati offrono una protezione superiore. Bitwarden consiglia l'impostazione predefinita per la maggior parte degli utenti."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Scegliere un valore superiore al predefinito aumenta il livello di sicurezza, ma la cassaforte potrebbe impiegare più tempo a sbloccarsi."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Informazioni sugli algoritmi di crittografia"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 è un metodo di crittografia ben testato che bilancia sicurezza e prestazioni. Consigliato per tutti gli utenti."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offre una protezione più forte contro gli attacchi moderni. Consigliato per gli utenti avanzati con dispositivi potenti."
+  },
+  "zipPostalCodeLabel": {
+    "message": "CAP / codice postale"
+  },
+  "cardNumberLabel": {
+    "message": "Numero di carta"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Inizia la prova gratuita Famiglie"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Blocca la creazione di account per domini rivendicati"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Impedisci agli utenti di creare account al di fuori della tua organizzazione utilizzando indirizzi email da domini rivendicati."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Prima di attivare questa politica è necessario attivare un dominio."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Imposta un metodo di sblocco per modificare l'azione al timeout della cassaforte."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Le impostazioni di timeout sono state impostate secondo le politiche aziendali"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Il timeout della tua cassaforte supera i limiti impostati dalla tua organizzazione."
+  },
+  "neverLockWarning": {
+    "message": "Vuoi davvero impostare il blocco su 'Mai'? In questa modalità, la chiave di decrittazione della cassaforte sarà conservata localmente sul tuo dispositivo: assicurati di mantenerlo protetto e al sicuro."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Azione al timeout"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Timeout della sessione"
+  },
+  "appearance": {
+    "message": "Aspetto"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Il timeout supera la restrizione imposta dalla tua organizzazione: massimo $HOURS$ ora/e e $MINUTES$ minuto/i",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Non ci sono applicazioni contrassegnate come critiche"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Vuoi davvero continuare?"
+  },
+  "userVerificationFailed": {
+    "message": "Verifica dell'utente non riuscita."
   }
 }
diff --git a/apps/web/src/locales/ja/messages.json b/apps/web/src/locales/ja/messages.json
index 3f2a2ada371..7143e958f99 100644
--- a/apps/web/src/locales/ja/messages.json
+++ b/apps/web/src/locales/ja/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "アクセス インテリジェンス"
   },
-  "riskInsights": {
-    "message": "リスク分析"
-  },
   "passwordRisk": {
     "message": "パスワードのリスク"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "危険なパスワード（強度が低い、流出済み、再利用）を、アプリをまたいで調査します。特に重要なアプリを選択して、危険なパスワードに優先対応するようユーザーに促しましょう。"
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "データの最終更新: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "通知済みメンバー"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "新しいログインアイテムを作成"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "特に重要なアプリ ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "通知済みメンバー ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "$ORG NAME$ にアプリが見つかりませんでした",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "ユーザーがログイン情報を保存すると、アプリがここに表示され、リスクの高いパスワードがあれば表示されます。特に重要なアプリはマークして、パスワードを更新するようにユーザーに通知しましょう。"
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "重要なアプリとしてマーク"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "アプリ"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "リスクがあるメンバー"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "これらのメンバーは、脆弱な、または流出したか再利用されたパスワードでアプリにログインしています。"
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "合計アプリ数"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "お気に入り"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "タイプ"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "このウィンドウを開いたままにして、ブラウザの指示に従ってください。"
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "別のログイン方法を使用する"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "シングルサインオンを使用する"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "ようこそ"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "マスターパスワードが間違っています"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "無効なファイルパスワードです。エクスポートファイルを作成したときに入力したパスワードを使用してください。"
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "表示するアイテムがありません"
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "このコレクション内のアイテムをすべて表示する権限がありません。"
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "暗号化の設定"
   },
-  "kdfAlgorithm": {
-    "message": "KDFアルゴリズム"
-  },
   "kdfIterations": {
     "message": "KDF反復回数"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "KDF のイテレーション、メモリ、並列性が高いほど、攻撃者によるマスターパスワードのブルートフォース攻撃を防止できます。"
   },
-  "changeKdf": {
-    "message": "KDFの変更"
-  },
   "encKeySettingsChanged": {
     "message": "暗号化キーの設定が変更されました"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "購入に使用できるだけのクレジットが登録されているか確認してください。使用可能なクレジットが不足している場合、差額にはデフォルトのお支払い方法が利用されます。「料金」ページから悪ントにクレジットを追加できます。"
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "アカウントに登録されたクレジットは購入に使用できます。使用可能なクレジットは、このアカウントへの請求に自動的に適用されます。"
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "次回の請求"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "詳細"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "ライセンスのダウンロード"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "ブラウザを更新"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "サポートされていないブラウザを使用しています。ウェブ保管庫が正しく動作しないかもしれません。"
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "招待が承諾されました。"
   },
-  "inviteAcceptedDesc": {
-    "message": "組織の管理者が承認すると組織へアクセスできるようになります。アクセスできるようになったらメールでお知らせします。"
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "この組織にアクセスできるようになりました。"
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "組織は無効です。"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "一時停止された組織にはアクセスできません。組織の所有者にお問い合わせください。"
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "一時停止中の組織ではサービスアカウントを作成できません。組織の所有者に問い合わせてください。"
   },
-  "disabledOrganizationFilterError": {
-    "message": "無効な組織のアイテムにアクセスすることはできません。組織の所有者に連絡してください。"
-  },
   "licenseIsExpired": {
     "message": "ライセンスの有効期限が切れています。"
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO 識別子"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "SSO でログインできるようこの ID をメンバーに提供してください。この手順をバイパスするには、以下の設定をしてください：",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO のリンクを解除"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "個別の保管庫を削除"
   },
@@ -5597,6 +5947,19 @@
     "message": "Send を作成または編集するとき、常にメンバーのメールアドレスを受信者と一緒に表示します。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "変更されたポリシー $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "マスターパスワードが組織のポリシーに適合していません。保管庫にアクセスするには、今すぐマスターパスワードを更新しなければなりません。続行すると現在のセッションからログアウトし、再度ログインする必要があります。 他のデバイス上のアクティブなセッションは、最大1時間アクティブであり続けることがあります。"
   },
-  "automaticAppLogin": {
-    "message": "許可されたアプリでユーザーを自動的にログインする"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "ログインフォームは自動的に入力され、設定された ID プロバイダーから起動されたアプリに送信されます。"
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "ID プロバイダーホスト"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "組織が復号オプションを更新しました。保管庫にアクセスするにはマスターパスワードを設定してください。"
   },
-  "maximumVaultTimeout": {
-    "message": "保管庫のタイムアウト"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "メンバーの保管庫の最大タイムアウトを設定します。"
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "保管庫の最大タイムアウト"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "保管庫の最大タイムアウト時間が不正です。"
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "時間"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "分"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "保管庫のタイムアウトは組織のポリシーの影響下にあります。保管庫の最大タイムアウト時間は $HOURS$ 時間 $MINUTES$ 分です。",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "ベース サーバー URL または少なくとも 1 つのカスタム環境を追加する必要があります。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API サーバー URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "アクセスが拒否されました。このページを表示する権限がありません。"
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "マスターパスワード"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "グループ/ユーザー"
   },
-  "lowKdfIterations": {
-    "message": "低 KDF イテレーション"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "新しいセキュリティの推奨事項に対応し、アカウントの保護を向上させるために、暗号化設定を更新してください。"
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "続行すると、すべてのアクティブなセッションからログアウトします。再度ログインし、2段階認証を完了する必要があります。 暗号化設定を変更する前に、保管庫をエクスポートしてデータの損失を防ぐことをおすすめします。"
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "ログインしました!"
   },
-  "beta": {
-    "message": "ベータ"
-  },
   "assignCollectionAccess": {
     "message": "コレクションへのアクセスを割り当て"
   },
@@ -9330,6 +9820,14 @@
     "message": "料金が高すぎる",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "1年間無料"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "割り当て"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "コレクションに割り当てる"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "KDF 反復回数が少ないです。あなたのアカウントのセキュリティを向上させるために反復回数を増やしてください。"
-  },
-  "changeKDFSettings": {
-    "message": "KDF 設定の変更"
-  },
   "secureYourInfrastructure": {
     "message": "インフラストラクチャの保護"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "オフ"
   },
-  "higherKDFIterations": {
-    "message": "KDF 反復回数を多くすることで、攻撃者による総当たり攻撃からマスターパスワードを守ることができます。"
-  },
-  "incrementsOf100,000": {
-    "message": "100,000回"
-  },
-  "smallIncrements": {
-    "message": "少ない回数で"
-  },
   "kdfIterationRecommends": {
     "message": "600,000以上がおすすめです"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "古いデバイスでは、KDF を高く設定するとパフォーマンスの問題が発生する可能性があります。 $VALUE$増やしてデバイスをテストしてください。",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " サブスクリプションを復活させるには、カスタマーサポートにご連絡ください。"
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/ka/messages.json b/apps/web/src/locales/ka/messages.json
index 170b989ff5d..108df6dcddb 100644
--- a/apps/web/src/locales/ka/messages.json
+++ b/apps/web/src/locales/ka/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "რჩეულები"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "ტიპები"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "არასწორი მთავარი პაროლი"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "არასწორი ფაილის პაროლი, გთხოვთ გამოიყენოთ პაროლი რომელიც თქვენ შეიყვანეთ როცა შექმენით ექსპორტ ფაილი."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "არაა საგნები სიაში ჩამოსათველალდ."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "თქვენ არ გაქვთ უფლება ნახოთ ყველა საგანი ამ კოლექციაში."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/km/messages.json b/apps/web/src/locales/km/messages.json
index 526b7567d99..0d08d207748 100644
--- a/apps/web/src/locales/km/messages.json
+++ b/apps/web/src/locales/km/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/kn/messages.json b/apps/web/src/locales/kn/messages.json
index 13f72bed6c0..c3b4fe8ebd3 100644
--- a/apps/web/src/locales/kn/messages.json
+++ b/apps/web/src/locales/kn/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "ಮೆಚ್ಚುಗೆಗಳು"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "ರೀತಿಯ"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "ಈ ವಿಂಡೋವನ್ನು ತೆರೆದಿಡಿ ಮತ್ತು ನಿಮ್ಮ ಬ್ರೌಸರ್‌ನಿಂದ ಪ್ರಾಂಪ್ಟ್‌ಗಳನ್ನು ಅನುಸರಿಸಿ."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "ಅಮಾನ್ಯ ಮಾಸ್ಟರ್ ಪಾಸ್‌ವರ್ಡ್"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "ಪಟ್ಟಿ ಮಾಡಲು ಯಾವುದೇ ಐಟಂಗಳಿಲ್ಲ."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "ಗೂಢ ಲಿಪೀಕರಣ ಕೀ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"
   },
-  "kdfAlgorithm": {
-    "message": "ಕೆಡಿಎಫ್ ಅಲ್ಗಾರಿದಮ್"
-  },
   "kdfIterations": {
     "message": "ಕೆಡಿಎಫ್ ಪುನರಾವರ್ತನೆಗಳು"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "ಕೆಡಿಎಫ್ ಬದಲಾಯಿಸಿ"
-  },
   "encKeySettingsChanged": {
     "message": "ಗೂಢ ಲಿಪೀಕರಣ ಕೀ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "ಈ ಖರೀದಿಗೆ ನಿಮ್ಮ ಖಾತೆಗೆ ಸಾಕಷ್ಟು ಕ್ರೆಡಿಟ್ ಲಭ್ಯವಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ನಿಮ್ಮ ಖಾತೆಗೆ ಸಾಕಷ್ಟು ಕ್ರೆಡಿಟ್ ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ, ಫೈಲ್‌ನಲ್ಲಿ ನಿಮ್ಮ ಡೀಫಾಲ್ಟ್ ಪಾವತಿ ವಿಧಾನವನ್ನು ವ್ಯತ್ಯಾಸಕ್ಕಾಗಿ ಬಳಸಲಾಗುತ್ತದೆ. ಬಿಲ್ಲಿಂಗ್ ಪುಟದಿಂದ ನಿಮ್ಮ ಖಾತೆಗೆ ನೀವು ಕ್ರೆಡಿಟ್ ಸೇರಿಸಬಹುದು."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "ನಿಮ್ಮ ಖಾತೆಯ ಕ್ರೆಡಿಟ್ ಅನ್ನು ಖರೀದಿ ಮಾಡಲು ಬಳಸಬಹುದು. ಲಭ್ಯವಿರುವ ಯಾವುದೇ ಕ್ರೆಡಿಟ್ ಅನ್ನು ಈ ಖಾತೆಗಾಗಿ ರಚಿಸಲಾದ ಇನ್‌ವಾಯ್ಸ್‌ಗಳಿಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "ಮುಂದಿನ ಶುಲ್ಕ"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "ವಿವರಗಳು"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "ಪರವಾನಗಿ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "ಬ್ರೌಸರ್ ನವೀಕರಿಸಿ"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "ನೀವು ಬೆಂಬಲಿಸದ ವೆಬ್ ಬ್ರೌಸರ್ ಅನ್ನು ಬಳಸುತ್ತಿರುವಿರಿ. ವೆಬ್ ವಾಲ್ಟ್ ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೆ ಇರಬಹುದು."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "ಆಮಂತ್ರಣವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ"
   },
-  "inviteAcceptedDesc": {
-    "message": "ನಿರ್ವಾಹಕರು ನಿಮ್ಮ ಸದಸ್ಯತ್ವವನ್ನು ಖಚಿತಪಡಿಸಿದ ನಂತರ ನೀವು ಈ ಸಂಸ್ಥೆಯನ್ನು ಪ್ರವೇಶಿಸಬಹುದು. ಅದು ಸಂಭವಿಸಿದಾಗ ನಾವು ನಿಮಗೆ ಇಮೇಲ್ ಕಳುಹಿಸುತ್ತೇವೆ."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "ಸಂಘಟನೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "ಪರವಾನಗಿ ಅವಧಿ ಮೀರಿದೆ."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "ಎಸ್‌ಎಸ್‌ಒ ಅನ್ಲಿಂಕ್ ಮಾಡಿ"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "ವೈಯಕ್ತಿಕ ಮಾಲೀಕತ್ವ"
   },
@@ -5597,6 +5947,19 @@
     "message": "ಕಳುಹಿಸುವಿಕೆಯನ್ನು ರಚಿಸುವಾಗ ಅಥವಾ ಸಂಪಾದಿಸುವಾಗ ಬಳಕೆದಾರರು ತಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಸ್ವೀಕರಿಸುವವರಿಂದ ಮರೆಮಾಡಲು ಅನುಮತಿಸಬೇಡಿ.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "ಮಾರ್ಪಡಿಸಿದ ನೀತಿ $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/ko/messages.json b/apps/web/src/locales/ko/messages.json
index 33ccaee2b5c..4063e7c62da 100644
--- a/apps/web/src/locales/ko/messages.json
+++ b/apps/web/src/locales/ko/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "즐겨찾기"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "유형"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "잘못된 마스터 비밀번호"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "파일 암호가 잘못되었습니다. 내보낸 파일을 생성했을 때 사용한 암호를 입력하세요."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "항목이 없습니다."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "이 컬렉션의 모든 항목을 볼 권한이 없습니다."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "암호화 키 설정"
   },
-  "kdfAlgorithm": {
-    "message": "KDF 알고리즘"
-  },
   "kdfIterations": {
     "message": "KDF 이터레이션"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "KDF 변경"
-  },
   "encKeySettingsChanged": {
     "message": "암호화 키 설정 변경됨"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "이 구매에 사용할 수 있는 크레딧이 충분한지 확인하십시오. 만약 계정에 충분한 크레딧이 없다면, 그 차액만큼 기본 결제 방식에서 지불될 것입니다. 청구 페이지를 통해 계정에 크레딧을 추가할 수 있습니다."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "계정의 크레딧을 구매에 사용할 수 있습니다. 사용 가능한 모든 크레딧이 이 계정에 대해 생성된 청구서에 자동으로 적용됩니다."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "다음 지불"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "세부사항"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "라이선스 다운로드"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "브라우저 업데이트"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "지원하지 않는 웹 브라우저를 사용하고 있습니다. 웹 보관함 기능이 제대로 동작하지 않을 수 있습니다."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "초대 수락됨"
   },
-  "inviteAcceptedDesc": {
-    "message": "관리자의 확인을 받으면 조직에 액세스할 수 있습니다. 승인이 이뤄지면 이메일을 보내드리겠습니다."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "조직이 비활성화됨"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "라이선스가 만료되었습니다."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO 연결 해제"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "개인 소유권"
   },
@@ -5597,6 +5947,19 @@
     "message": "사용자가 Send를 생성하거나 수정할 때 받는 사람으로부터 자신의 이메일 주소를 숨기지 못하게 합니다.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "$ID$ 정책을 편집했습니다.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "보관함 시간 제한"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "최대 보관함 시간 제한"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "시"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "분"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/lv/messages.json b/apps/web/src/locales/lv/messages.json
index bdf7dbef0fb..120b06b8024 100644
--- a/apps/web/src/locales/lv/messages.json
+++ b/apps/web/src/locales/lv/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Piekļuves inteliģence"
   },
-  "riskInsights": {
-    "message": "Risku ieskats"
-  },
   "passwordRisk": {
     "message": "Paroļu risks"
   },
+  "noEditPermissions": {
+    "message": "Nav nepieciešamo atļauju, lai labotu šo vienumu"
+  },
   "reviewAtRiskPasswords": {
     "message": "Riskam pakļautu (vāju, atklātu vai vairākkārt izmantotu) paroļu pārskatīšana dažādās lietotnēs. Jāatlasa viskritiskākās paroles, lai noteiktu svarīgas drošības darbības, ko lietotājiem pielietot riskam pakļautām parolēm."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Pārskatīt riskam pakļautos pieteikšanās vienumus"
+  },
   "dataLastUpdated": {
     "message": "Dati pēdējoreiz atjaunināti: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Vēl nav izveidota neviena atskaite"
+  },
   "notifiedMembers": {
     "message": "Apziņotie dalībnieki"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Izveidot jaunu pieteikšanās vienumu"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% pabeigti",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "Pabeigti $COUNT$ no $TOTAL$ drošības uzdevumiem",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Paroles nomaiņas virzība"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Piešķirt dalībniekiem uzdevumus, lai pārraudzītu virzību"
+  },
+  "onceYouReviewApplications": {
+    "message": "Tiklīdz lietotnes ir izskatītas un atzīmētas kā būtiskas, piešķir uzdevumus dalībniekiem nomainīt savas paroles!"
+  },
+  "sendReminders": {
+    "message": "Nosūtīt atgādinājumus"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Tiklīz lietotnes tiks atzīmētas kā būtiskas, tās tiks parādītas šeit."
   },
+  "viewAtRiskMembers": {
+    "message": "Apskatīt riskam pakļautos dalībniekus"
+  },
+  "viewAtRiskApplications": {
+    "message": "Apskatīt riskam pakļautās lietotnes"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ no $TOTAL$ būtiskajām lietotnēm ir apdraudētas riskam pakļautu paroļu dēļ",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Kritiskās lietotnes ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "būtiskas lietotnes atzīmētas"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ būtiskas lietotnes",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ lietotnes ir pakļautas riskam",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ paroles pakļautas riskam",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ jaunas riskam pakļautas paroles",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Apziņotie dalībnieki ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "$ORG NAME$ netika atrasta neviena lietotne",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Dati netika atrasti"
   },
-  "noAppsInOrgDescription": {
-    "message": "Tiklīdz lietotāji saglabā pieteikšanās vienumus, šeit parādās lietotnes, norādot uz jebkurām riskam pakļautām parolēm. Atzīmēt kritiskās lietotnēs un apziņot lietotājus, lai atjaunina paroles."
+  "noDataInOrgDescription": {
+    "message": "Ievieto savas apvienības pieteikšanās datus, lai uzsāktu Access Intelligence izmantošanu. Tiklīdz to izdarīsi, varēsi:"
+  },
+  "feature1Title": {
+    "message": "Atzīmēt lietotnes kā būtiskas"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Neviena lietotne nav atzīmēta kā kritiska"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Atzīmēt lietotni kā kritisku"
   },
+  "markAsCritical": {
+    "message": "Atzīmēt kā būtisku"
+  },
+  "applicationsSelected": {
+    "message": "lietotnes atlasītas"
+  },
+  "selectApplication": {
+    "message": "Atlasīt lietotni"
+  },
+  "unselectApplication": {
+    "message": "Atcelt lietotnes atlasīšanu"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Lietotnes, kas atzīmētas kā kritiskas"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ lietotnes atzīmētas kā būtiskas",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Neizdevās lietotnes atzīmēt kā būtiskas"
+  },
   "application": {
     "message": "Lietotne"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Riskam pakļautie dalībnieki"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Dalībnieki ar labošanas piekluvi riskam pakļautajiem vienumiem būtiskajām lietotnēm"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ riskam pakļauti dalībnieki",
+  "membersWithAtRiskPasswords": {
+    "message": "Dalībnieki ar riskam pakļautām parolēm"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ dalībnieki ir pakļauti riskam",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Šie dalībnieki piesakās lietotnēs ar vājām, atklātām vai atkārtoti izmantotām parolēm."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Nav dalībnieku, kas piesakās lietotnēs ar vājām, atklātām vai atkārtoti izmantotām parolēm."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Kopējais lietotņu skaits"
   },
+  "applicationsNeedingReview": {
+    "message": "Lietotnes, kuras ir nepieciešams izskatīt"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Pārskatīt jaunās lietotnes"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ jaunas lietotnes",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Jaunu lietotņu izskatīšana, lai atzīmētu tās kā būtiskas un uzturētu apvienību drošu"
+  },
+  "reviewNow": {
+    "message": "Izskatīt tagad"
+  },
+  "allCaughtUp": {
+    "message": "Viss ir paveikts."
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Pašreiz nav jaunu izskatāmu lietotņu"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Tavā apvienībā ir saglabāti vienumi $COUNT$ lietotnēm",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Pārskati lietotnes, lai pastiprinātu drošību vienumiem, kuri ir visbūtiskākie apvienības drošībai"
+  },
+  "reviewApplications": {
+    "message": "Pārskatīt lietotnes"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Paaugstināt būtisko lietotņu svarīgumu"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Pārskatīt jaunās lietotnes"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Jāklikšķina uz zvaigznes, lai atzīmētu lietotni kā būtisku"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Iespēja atzīmēt kā būtisku tiks ieviesta nākotnes atjauninājumā"
+  },
+  "applicationReviewSaved": {
+    "message": "Lietotnes pārskats saglabāts"
+  },
+  "newApplicationsReviewed": {
+    "message": "Izskatītas jaunas lietotnes"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Kļūda izskatīšanas stāvokļa saglabāšanā"
+  },
+  "pleaseTryAgain": {
+    "message": "Lūgums mēģināt vēlreiz"
+  },
   "unmarkAsCritical": {
     "message": "Noņemt kritiskuma atzīmi"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Izlase"
   },
+  "taskSummary": {
+    "message": "Uzdevuma kopsavilkums"
+  },
   "types": {
     "message": "Veidi"
   },
@@ -1018,7 +1230,7 @@
     "message": "Pielikums izdzēsts"
   },
   "deleteAttachmentConfirmation": {
-    "message": "Vai tiešām vēlaties dzēst šo pielikumu?"
+    "message": "Vai tiešām izdzēst šo pielikumu?"
   },
   "attachmentSaved": {
     "message": "Pielikums tika saglabāts."
@@ -1091,7 +1303,7 @@
     "message": "Vienumi pārvietoti"
   },
   "overwritePasswordConfirmation": {
-    "message": "Vai tiešām vēlaties pārrakstīt pašreizējo paroli?"
+    "message": "Vai tiešām pārrakstīt pašreizējo paroli?"
   },
   "editedFolder": {
     "message": "Mape labota"
@@ -1100,7 +1312,7 @@
     "message": "Mape pievienota"
   },
   "deleteFolderConfirmation": {
-    "message": "Vai tiešām vēlaties izdzēst šo mapi?"
+    "message": "Vai tiešām izdzēst šo mapi?"
   },
   "deletedFolder": {
     "message": "Mape izdzēsta"
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Šis logs ir jāpatur atvērts un jāseko uzvednēm pārlūkā."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Autentificēšanās ar piekļuves atslēgu neizdevās. Lūgums mēģināt vēlreiz."
+  },
   "useADifferentLogInMethod": {
     "message": "Jāizmanto cits pieteikšanās veids"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Izmantot vienoto pieteikšanos"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tava apvienība pieprasa vienoto pieteikšanos."
+  },
   "welcomeBack": {
     "message": "Laipni lūdzam atpakaļ"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Nederīga galvenā parole"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Nederīga galvenā parole. Jāpārliecinās, ka e-pasta adrese ir pareiza un konts tika izveidots $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Nederīga datnes parole, lūgums izmantot to paroli, kas tika ievadīta izgūšanas datnes izveidošanas brīdī."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Nav vienumu, ko parādīt."
   },
+  "noItemsInTrash": {
+    "message": "Atkritnē nav vienumu"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Izdzēstie vienumi parādīsies šeit, un tie tiks neatgriezeniski izdzēsti pēc 30 dienām"
+  },
+  "noItemsInVault": {
+    "message": "Glabātavā nav vienumu"
+  },
+  "emptyVaultDescription": {
+    "message": "Glabātava aizsargā vairāk kā tikai paroles. Drošā veidā glabā šeit pieteikšanās vienumus, identitātes, kartes un piezīmes!"
+  },
+  "emptyFavorites": {
+    "message": "Izlasē nav neviena vienuma"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Šeit ir pievienojami bieži izmantoti vienumi ātrākai piekļuvei."
+  },
+  "noSearchResults": {
+    "message": "Nekas netika atrasts"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Jānotīra atsijātāji vai jāmēģina cits meklēšanas vaicājums"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Nav atļaujas apskatīt visus šī krājuma vienumus."
   },
@@ -1671,7 +1922,7 @@
     }
   },
   "deleteSelectedConfirmation": {
-    "message": "Vai tiešām vēlaties turpināt?"
+    "message": "Vai tiešām turpināt?"
   },
   "moveSelectedItemsDesc": {
     "message": "Jāizvelas mape, kurā pievienot $COUNT$ atlasīto(s) vienumu(s).",
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Šifrēšanas atslēgas iestatījumi"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algoritms"
-  },
   "kdfIterations": {
     "message": "KDF atkārtojumi"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Lielāks KDF atkārtojumu skaits, atmiņa un paralelitāte var palīdzēt aizsargāt galveno paroli pārlases uzbrukuma gadījumā."
   },
-  "changeKdf": {
-    "message": "Mainīt KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Šifrēšanas atslēgas iestatījumi mainīti"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Lūgums pārliecināties, ka kontā ir pieejams pietiekami daudz kredīta šim pirkumam. Ja kontā nav pieejams pietiekami daudz kredīta, tiks izmantots noklusējuma norēķinu veids, lai segtu starpību. Kredītu kontam var pievienot norēķinu sadaļā."
   },
+  "notEnoughAccountCredit": {
+    "message": "Šim pirkumam nav pietiekami daudz konta kredītu. To var pievienot sadaļā \"Norēķini\"."
+  },
   "creditAppliedDesc": {
     "message": "Konta kredīts var tikt izmantots, lai veiktu pirkumus. Viss pieejamais kredīts tiks automātiski izmantots kontam veidotajiem rēķiniem."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Nākamais maksājums"
   },
+  "nextChargeHeader": {
+    "message": "Nākamais maksājums"
+  },
+  "plan": {
+    "message": "Plāns"
+  },
   "details": {
     "message": "Izklāsts"
   },
+  "discount": {
+    "message": "atlaide"
+  },
   "downloadLicense": {
     "message": "Lejupielādēt licenci"
   },
@@ -3422,10 +3679,10 @@
     "message": "Labot kopu"
   },
   "deleteGroupConfirmation": {
-    "message": "Vai tiešām vēlaties dzēst šo kopu?"
+    "message": "Vai tiešām izdzēst šo kopu?"
   },
   "deleteMultipleGroupsConfirmation": {
-    "message": "Vai tiešām vēlaties dzēst šādu $QUANTITY$ grupu(-as)?",
+    "message": "Vai tiešām izdzēst šo (šīs) $QUANTITY$ kopu(as)?",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Atjaunināt pārlūku"
   },
-  "generatingYourRiskInsights": {
-    "message": "Tiek veidots ieskats par riskiem..."
+  "generatingYourAccessIntelligence": {
+    "message": "Izveido informāciju par Tavu piekļuvi…"
+  },
+  "fetchingMemberData": {
+    "message": "Iegūst dalībnieku datus…"
+  },
+  "analyzingPasswordHealth": {
+    "message": "Izvērtē paroļu veselību…"
+  },
+  "calculatingRiskScores": {
+    "message": "Aprēķina risku novērtējumu…"
+  },
+  "generatingReportData": {
+    "message": "Izveido atskaites datus…"
+  },
+  "savingReport": {
+    "message": "Saglabā atskaiti…"
+  },
+  "compilingInsights": {
+    "message": "Apkopo ieskatus…"
+  },
+  "loadingProgress": {
+    "message": "Ielādē virzību"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Tas var aizņemt dažas minūtes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Izveidot atskaiti"
   },
   "updateBrowserDesc": {
     "message": "Tiek izmantots neatbalstīts tīmekļa pārlūks. Tīmekļa glabātava var nedarboties pareizi."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Uzaicinājums pieņemts"
   },
-  "inviteAcceptedDesc": {
-    "message": "Piekļūt apvienībai varēs, kad tās pārvaldnieks apstiprinās dalību. Tiks nosūtīts e-pasta ziņojums, kad tas notiks."
+  "invitationAcceptedDesc": {
+    "message": "Sekmīgi pieņēma Tavu uzaicinājumu."
   },
   "inviteInitAcceptedDesc": {
     "message": "Tagad vari piekļūt šai apvienībai."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Apvienība ir atspējota."
   },
+  "organizationIsSuspended": {
+    "message": "Apvienība ir apturēta"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Apturētu apvienību vienumiem nevar piekļūt. Jāsazinās ar apvienības īpašnieku, lai iegūtu palīdzību."
+  },
   "secretsAccessSuspended": {
     "message": "Apturētām apvienībām nav iespējams piekļūt. Lūgums vērsties pie savas apvienības īpašnieka pēc palīdzības."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Pakalpojumu kontus nav iespējams izveidot apturētās apvienībās. Lūgums vērsties pie savas apvienības īpašnieka pēc palīdzības."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Atspējotu apvienību vienumiem nevar piekļūt. Jāsazinās ar apvienības īpašnieku, lai iegūtu palīdzību."
-  },
   "licenseIsExpired": {
     "message": "Ir beidzies licences izmantošanas laiks."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Vienotās pieteikšanās identifikators"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Šis Id ir sniedzams dalībniekiem, lai pieteiktos ar vienoto pieteikšanos. Lai apietu šo soli, jāuzstāda ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Atsaistīt SSO"
@@ -5518,9 +5809,9 @@
     "message": "Visiem vienumiem jāpieder apvienībai, tādējādi noņemot iespēju glabāt tos konta līmenī.",
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "Visi vienumi piederēs apvienībai un tiks tajā saglabāti, iespējojot visaptverošu pārvaldību, redzamību un ziņošanu apvienībā. Kad ieslēgta, noklusējuma krājums, kurā glabātat vienumus, būs pieejams katram dalībniekam. Uzzināt vairāk par ",
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "message": "Uzzināt vairāk par ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Pieejams tagad"
+  },
+  "autoConfirm": {
+    "message": "Automātiska jaunu lietotāju apstiprināšana"
+  },
+  "autoConfirmDescription": {
+    "message": "Jauni apvienībā uzaicinātie lietotāji tiks automātiski apstiprināti, kad pārvaldītāja ierīce tiks atslēgta.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Kā ieslēgt automātisku lietotōtāju apstiprināšanu"
+  },
+  "autoConfirmExtension1": {
+    "message": "Jāatver Bitwarden paplašinājums"
+  },
+  "autoConfirmExtension2": {
+    "message": "Jāatlasa",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " “Ieslēgt”",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Bitwarden pārlūka paplašīnājums atvērts sekmīgi. Tagad var ieslēgt automātisko lietotāju apstiprināšanas iestatījumu."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Jauni apvienībā uzaicinātie lietotāji tiks automātiski apstiprināti, kad pārvaldītāja ierīce tiks atslēgta. Pirms šīs pamatnostādnes ieslēgšanas lūgums pārskatīt un piekrist šim: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Iespējams drošības risks. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automātiska lietotāju apstiprināšana var radīt drošības risku apvienības datiem."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Uzzināt par riskiem",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Nepieciešama vienas vienīgas apvienības pamatnostādne. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Visiem dalībniekiem ir jābūt šajā apvienībā, lai aktivētu šo automatizēšanu."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Vienas vienīgas apvienības pamatnostādne paplašināsies līdz visām lomām. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Nav ārkārtas piekļuves. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Ārkārtas piekļuve tiks noņemta."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Es pieņemu šos riskus un pamatnostādnes atjauninājumus"
+  },
   "personalOwnership": {
     "message": "Personīgās īpašumtiesības"
   },
@@ -5597,6 +5947,19 @@
     "message": "Vienmēr rādīt dalībnieka e-pasta adresi saņēmējiem, kad tiek izveidots vai labots Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Noklusējuma URI atbilstības noteikšana"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Nosaka, kad pieteikšanās vienumi tiek ieteikti automātiskajai aizpildei. Šī pamatnostādne neattiecas uz pārvaldītājiem un īpašniekiem."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Noklusējuma URI atbilstības noteikšana"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Lūgums atlasīt derīgu URI atbilstības noteikšanas iespēju.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Nosacījums $ID$ izmainīts.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Galvenā parole neatbilst vienam vai vairākiem apvienības nosacījumiem. Ir jāatjaunina galvenā parole, lai varētu piekļūt glabātavai. Turpinot notiks atteikšanās no pašreizējās sesijas, un būs nepieciešams pieteikties no jauna. Citās ierīcēs esošās sesijas var turpināt darboties līdz vienai stundai."
   },
-  "automaticAppLogin": {
-    "message": "Automātiski pieteikt lietotājus atļautajās lietotnēs"
+  "automaticAppLoginWithSSO": {
+    "message": "Automātiska pieteikšanās ar SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Pieteikšanās veidlapas tiks automātiski aizpildītas un iesniegtas tajās lietotnēs, kuras ir palaistas no uzstādītā identitāšu nodrošinātāja."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Izvērst SSO drošību un ērtumu nepārvaldītām lietotnēm. Kad lietotāji palaidīs lietotni no identitāšu nodrošinātāja, viņu pieteikšanās informācija tiks automātiski aizpildīta un iesniegta, izveidojot viena klikšķa drošu plūsmu no identitāšu nodrošinātāja uz lietotni."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identitātes nodrošinātāja resursdators"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Tava apvienība ir atjauninājusi tavas atšifrēšanas iespējas. Lūgums iestatīt galveno paroli, lai piekļūtu savai glabātavai."
   },
-  "maximumVaultTimeout": {
-    "message": "Glabātavas noildze"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Sesijas noildze"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Uzstādīt lielāko iespējamo glabātavas noildzi visiem lietotājiem."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Lielākās pieļaujamās sesijas noildzes iestatīšana visiem dalībniekiem, izņemot īpašniekus."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Lielākā iespējamā glabātavas noildze"
+  "maximumAllowedTimeout": {
+    "message": "Lielakā atļautā noildze"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Nederīga lielākās iespējamās glabātavas noildzes vērtība."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Lielākā atļautā noildze ir nepieciešama."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Laiks ir nederīgs. Jānomaina vismaz viena vērtība."
+  },
+  "sessionTimeoutAction": {
+    "message": "Sesijas noildzes darbība"
+  },
+  "immediately": {
+    "message": "Nekavējoties"
+  },
+  "onSystemLock": {
+    "message": "Pēc sistēmas aizslēgšanas"
+  },
+  "onAppRestart": {
+    "message": "Pēc lietotnes atkārtotas palaišanas"
   },
   "hours": {
     "message": "Stundas"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minūtes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Vai tiešām ļaut lielāko pieļaujamo noildzi “Nekad” visiem dalībniekiem?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Šī iespēja saglabās dalībnieku šifrēšanas atslēgas viņu ierīcēs. Ja izvēlas šo iespēju, jāpārliecinās, ka dalībnieku ierīces ir pienācīgi aizsargātas."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Uzzināt vairāk par ierīču aizsardzību"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"Sistēmas aizslēgšana\" attieksies tikai uz pārlūka un darbvirsmas lietotni"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Viedierīču un tīmekļa lietotne izmantos “Pēc lietotnes atkārtotas palaišanas” kā lielāko atļauto noildzi, jo šī iespēja netiek nodrošināta."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Apvienības nosacījumi ietekmē glabātavas noildzi. Lielākā atļautā glabātavas noildze ir $HOURS$ stunda(s) un $MINUTES$ minūte(s)",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Jāpievieno vai nu servera pamata URL vai vismaz viena pielāgota vide."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL ir jābūt HTTPS."
+  },
   "apiUrl": {
     "message": "API servera URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Piekļuve liegta. Nav nepieciešamo atļauju, lai apskatītu šo lapu."
   },
+  "noPageAccess": {
+    "message": "Nav piekļuves šai lapai"
+  },
   "masterPassword": {
     "message": "Galvenā parole"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Nezināms noslēpums, var būt nepieciešams pieprasīt atļauju piekļūt tam."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Nezināms projekts, var būt nepieciešams pieprasīt atļauju piekļūt tam."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Kopa/Lietotājs"
   },
-  "lowKdfIterations": {
-    "message": "Zems KDF atkārtojumu skaits"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Jāatjaunina šifrēšanas iestatījumi, lai atbilstu jaunajiem drošības ieteikumiem un uzlabotu konta aizsardzību."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Turpinot notiks atteikšanās no visām esošajām sesijām. Būs atkārtoti jāpiesakās un jāpabeidz divpakāpju pieteikšanās, ja tāda ir. Mēs iesakām pirms šifrēšanas iestatījumu mainīšanas izgūt glabātavas saturu, lai novērstu datu zudumu."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Piekļuva projektam ar Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Laboja projektu ar identifikatoru: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Izdzēsa projektu ar identifikatoru: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Pieteicies."
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Piešķirt krājumu piekļuvi"
   },
@@ -9330,6 +9820,14 @@
     "message": "Pārāk dārgi",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Pārslēdzas uz bezmaksas plānu",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Pārslēdzas uz bezmaksas apvienību",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "1 gadu bez maksas"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Piešķirt"
   },
+  "assignTasks": {
+    "message": "Piešķirt uzdevumus"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Piešķirt krājumiem"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Nosūtīt notikum udatus uz savu Logscale instanci"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Nosūtīt glabātavas notikumu datus uz savu Datadog serveri"
+  },
   "failedToSaveIntegration": {
     "message": "Neizdevās saglabāt iekļaušanu. Lūgums vēlāk mēģināt vēlreiz."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Jābūt apvienības īpašniekam, lai veiktu šo darbību."
+  },
   "failedToDeleteIntegration": {
     "message": "Neizdevās izdzēst iekļaušanu. Lūgums vēlāk mēģināt vēlreiz."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Zems KDF atkārtojumu skaits. Tas jāpalielina, lai uzlabotu sava konta drošību."
-  },
-  "changeKDFSettings": {
-    "message": "Mainīt KDF iestatījumus"
-  },
   "secureYourInfrastructure": {
     "message": "Nodrošini savu infrastruktūru"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Izslēgts"
   },
-  "higherKDFIterations": {
-    "message": "Lielāks KDF atkārtojumu skaits var palīdzēt aizsargāt galveno paroli pārlases uzbrukuma gadījumā."
-  },
-  "incrementsOf100,000": {
-    "message": "palielinājumiem par 100 000"
-  },
-  "smallIncrements": {
-    "message": "nelieliem palielinājumiem"
-  },
   "kdfIterationRecommends": {
     "message": "Mēs iesakām 600 000 vai vairāk"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Pārāk augsta KDF iestatīšana vecākās ierīcēs var novest pie veiktspējas sarežģījumiem. Jāpalielina vērtība ar $VALUE$ un jāpārbauda savas ierīces.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Jāsazinās ar klientu atbalstu, lai atjaunotu Tavu abonementu."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domēns pieteikts"
   },
+  "itemAddedToFavorites": {
+    "message": "Vienums pievienots izlasei"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Vienums noņemts no izlases"
+  },
+  "copyNote": {
+    "message": "Ievietot piezīmi starpliktuvē"
+  },
   "organizationNameMaxLength": {
     "message": "Apvienības nosaukums nevar pārsniegt 50 rakstzīmes."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Bitwarden pārlūka paplašinājums tika veiksmīgi atvērts. Tagad var pārskatīt savas riskam pakļautās paroles."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Mums bija sarežģījumi Bitwarden pārlūka paplašinājuma atvēršanā. Rīkjoslā jāatver Bitwarden ikona",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "rīkjoslā.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Abonements drīz tiks atjaunots. Lai nodrošinātu nepārtrauktu pakalpojumu, pirms $RENEWAL_DATE$ jāsazinās ar $RESELLER$, lai apstiprinātu atjaunošanu.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Meklēt arhīvā"
   },
-  "archive": {
-    "message": "Arhivēt"
+  "archiveNoun": {
+    "message": "Arhīvs",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arhivēt",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Atcelt arhivēšanu"
+  },
+  "itemsInArchive": {
+    "message": "Vienumi arhīvā"
   },
   "noItemsInArchive": {
     "message": "Arhīvā nav vienumu"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Šeit parādīsies arhivētie vienumi, un tie netiks iekļauti vispārējās meklēšanas iznākumos un automātiskās aizpildes ieteikumos."
   },
+  "itemWasSentToArchive": {
+    "message": "Vienums tika ievietots arhīvā"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Vienumi tika ievietoti arhīvā"
+  },
+  "itemUnarchived": {
+    "message": "Vienums tika izņemts no arhīva"
+  },
+  "bulkArchiveItems": {
+    "message": "Vienumi tika arhivēti"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Vienumi tika izņemti no arhīva"
+  },
+  "archiveItem": {
+    "message": "Arhivēt vienumu",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Arhivētie vienumi netiek iekļauti vispārējās meklēšanas iznākumos un automātiskās aizpildes ieteikumos. Vai tiešām ahrivēt šo vienumu?"
+  },
+  "archiveBulkItems": {
+    "message": "Arhivēt vienumus",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Arhivētie vienumi netiek iekļauti vispārējās meklēšanas iznākumos un automātiskās aizpildes ieteikumos. Vai tiešām ahrivēt šos vienumus?"
+  },
   "businessUnit": {
     "message": "Uzņēmējdarbības vienība"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden paplašinājums uzstādīts."
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden paplašinājums ir uzstādīts."
+  },
   "openExtensionToAutofill": {
     "message": "Jāatver paplašinājums, lai pieteiktos un uzsāktu automātisko aizpildi."
   },
@@ -11154,6 +11684,14 @@
     "message": "Mācīšanāš centrs",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Ja paplašinājums neatvērās, var būt nepieciešams atvērt Bitwarden ar ikonu ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " rīkjoslā.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Palīdzības centrs",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11308,7 +11846,7 @@
     "message": "Trūkst nodokļu Id"
   },
   "missingTaxIdWarning": {
-    "message": "Action required: You're missing a Tax ID number in payment details. If a Tax ID is not added, your invoices may include additional tax."
+    "message": "Nepieciešama darbība: maksājuma informācijā trūkst nodokļu identifikatora numura. Ja nodokļu identifikators nav pievienots, rēķinos var tikt iekļauts papildu nodoklis."
   },
   "moreBreadcrumbs": {
     "message": "Vairāk norāžu",
@@ -11318,19 +11856,19 @@
     "message": "Pievienot nodokļu Id"
   },
   "missingTaxIdCalloutTitle": {
-    "message": "Action required: Missing Tax ID"
+    "message": "Nepieciešama darbība: trūkst nodokļu identifikatora"
   },
   "missingTaxIdCalloutDescription": {
-    "message": "If a Tax ID is not added, your invoices may include additional tax."
+    "message": "Ja nodokļu identifikators nav pievienots, rēķinos var tikt iekļauts papildu nodoklis."
   },
   "unverifiedTaxIdWarning": {
-    "message": "Action required: Your Tax ID number is unverified. If your Tax ID is left unverified, your invoices may include additional tax."
+    "message": "Nepieciešama darbība: nodokļu identifikatora numurs nav apliecināts. Ja nodokļu identifikators netiek apliecināts, rēķinos var tikt iekļauts papildu nodoklis."
   },
   "editTaxId": {
     "message": "Labot savu nodokļu Id"
   },
   "unverifiedTaxIdCalloutTitle": {
-    "message": "Tax ID unverified"
+    "message": "Nodokļu identifikators nav apliecināts"
   },
   "unverifiedTaxIdCalloutDescription": {
     "message": "Check your Tax ID to verify the format is correct and there are no typos."
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Plūdena iekļaušana"
+  },
+  "families": {
+    "message": "Ģimenes"
+  },
+  "upgradeToFamilies": {
+    "message": "Uzlabot uz ģimeņu plānu"
+  },
+  "upgradeToPremium": {
+    "message": "Uzlabot uz Premium"
+  },
+  "familiesUpdated": {
+    "message": "Konts tika uzlabots uz ģimeņu plānu."
+  },
+  "taxCalculationError": {
+    "message": "Bija kļūda Tavas atrašanās vietas nodokļu aprēķināšanā. Lūgums mēģināt vēlreiz."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Laipni lūdzam Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Atslēdz vairāk drošības iespēju ar “Premium” vai uzsāc vienumu kopīgošanu ar plānu ģimenēm"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Cenās nav iekļauts nodoklis, un maksa tiek ieturēta reizi gadā."
+  },
+  "organizationNameDescription": {
+    "message": "Apvienības nosaukums parādīsies dalībniekiem nosūtītajos uzaicinājumos."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Turpināt bez uzlabošanas"
+  },
+  "upgradeYourPlan": {
+    "message": "Uzlabot savu plānu"
+  },
+  "upgradeNow": {
+    "message": "Uzlabot tagad"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Šīs veidlapas pabeigšana izveidos jaunu ģimeņu apvienību. Uzlabot savu bezmaksas apvienību var pārvaldības konsolē."
+  },
+  "upgradeErrorMessage": {
+    "message": "Mēs saskārāmies ar kļūdu uzlabošanas apstrādes laikā. Lūgums mēģināt vēlreiz."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Tev ir Bitwarden bezmaksas plāns"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Uzlabo pilnīgas drošības iegūšanai"
+  },
+  "viewbusinessplans": {
+    "message": "Apskatīt uzņēmējdarbības plānus"
+  },
+  "updateEncryptionSettings": {
+    "message": "Atjaunināt šifrēšanas iestatījumus"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Atjaunini savus šifrēšanas iestatījumus"
+  },
+  "updateSettings": {
+    "message": "Atjaunināt Iestatījumus"
+  },
+  "algorithm": {
+    "message": "Algoritms"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Jāizvēlas, kā Bitwarden vajadzētu šifrēt glabātavas datus. Visas iespējas ir drošanas, bet spēcīgāki veidi sniedz labāku aizsardzību ‒ jo īpaši pret pārlases uzbrukumiem. Bitwarden vairumam lietotāju iesaka noklusējuma iestatījumu."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Vērtību palielināšana virs noklusējuma uzlabos drošību, bet iznākumā var būt nepieciešams ilgāks laiks glabātavas atslēgšanai."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Par šifrēšanas algoritmiem"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 ir labi pārbaudīts šifrēšanas veids, kas salāgo drošību un veiktspēju. Labs visiem lietotājiem."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id sniedz spēcīgāku aizsardzību pret mūsdienu uzbrukumiem. Vislabāk piemērots lietpratējiem ar jaudīgām ierīcēm."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Pasta indekss"
+  },
+  "cardNumberLabel": {
+    "message": "Kartes numurs"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Uzsākt ģimenes plāna bezmaksas izmēģinājumu"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Liegt konta izveidošanu pieteiktajiem domēniem"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Neļaut lietotājiem kontu izveidošanu ārpus apvienības ar e-pasta adresēm no pieteikajiem domēniem."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Domēnam jābūt pieteiktam pirms šīs pamatnostādnes aktivēšanas."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Jāuzstāda atslēgšanas veids, lai mainītu glabātavas noildzes darbību."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Noildzes iespējām tika piemērotas uzņēmējdarbības pamatnostādņu prasības"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Glabātavas noildze pārsniedz apvienības uzstādītos ierobežojumus."
+  },
+  "neverLockWarning": {
+    "message": "Vai tiešām izmantot uzstādījumu \"Nekad\"? Uzstādot aizslēgšanas iespēju uz \"Nekad\", šifrēšanas atslēga tiek glabāta ierīcē. Ja šī iespēja tiek izmantota, jāpārliecinās, ka ierīce tiek pienācīgi aizsargāta."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Noildzes darbība"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sesijas noildze"
+  },
+  "appearance": {
+    "message": "Izskats"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Noildze pārsniedz apvienības iestatīto ierobežojumu: ne vairāk kā $HOURS$ stunda(s) un $MINUTES$ minūte(s)",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Neviena būtiska lietotne nav atlasīta"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Vai tiešām turpināt?"
+  },
+  "userVerificationFailed": {
+    "message": "Lietotāja apliecināšana neizdevās."
   }
 }
diff --git a/apps/web/src/locales/ml/messages.json b/apps/web/src/locales/ml/messages.json
index 7f345a5b85c..5d7c304216c 100644
--- a/apps/web/src/locales/ml/messages.json
+++ b/apps/web/src/locales/ml/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "പ്രിയങ്കരങ്ങള്‍"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "തരങ്ങൾ"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "അസാധുവായ പ്രാഥമിക പാസ്‌വേഡ്"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "പ്രദർശിപ്പിക്കാൻ ഇനങ്ങളൊന്നുമില്ല."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "എൻക്രിപ്ഷൻ കീയുടെ ക്രമീകരണങ്ങൾ"
   },
-  "kdfAlgorithm": {
-    "message": "KDF അൽഗോരിതം"
-  },
   "kdfIterations": {
     "message": "KDF Iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "KDF മാറ്റുക"
-  },
   "encKeySettingsChanged": {
     "message": "എൻക്രിപ്ഷൻ കീയുടെ ക്രമീകരണങ്ങൾ മാറ്റി"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next Charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "ലൈസൻസ് ഡൌൺലോഡ് ചെയ്യുക"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "ബ്രൌസർ അപ്‌ഡേറ്റുചെയ്യുക"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "ക്ഷണം സ്വീകരിച്ചു"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "സംഘടന അപ്രാപ്‌തമാക്കി."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "ലൈസൻസ് കാലഹരണപ്പെട്ടു."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "വ്യക്തിഗത ഉടമസ്ഥാവകാശം"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/mr/messages.json b/apps/web/src/locales/mr/messages.json
index b25c6fb16ea..82585984958 100644
--- a/apps/web/src/locales/mr/messages.json
+++ b/apps/web/src/locales/mr/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "अ‍ॅक्सेस इंटेलिजेंस"
   },
-  "riskInsights": {
-    "message": "जोखीम अंतर्दृष्टी"
-  },
   "passwordRisk": {
     "message": "पासवर्डचा धोका"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "नवीन लॉगिन आयटम तयार करा"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "अ‍ॅपला गंभीर म्हणून चिन्हांकित करा"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/my/messages.json b/apps/web/src/locales/my/messages.json
index 526b7567d99..0d08d207748 100644
--- a/apps/web/src/locales/my/messages.json
+++ b/apps/web/src/locales/my/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/nb/messages.json b/apps/web/src/locales/nb/messages.json
index 3cfcd87ec64..87664f952a1 100644
--- a/apps/web/src/locales/nb/messages.json
+++ b/apps/web/src/locales/nb/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Program"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoritter"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Typer"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Hold dette vinduet åpent og følg anvisningene fra nettleseren."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Bruk en annen innloggingsmetode"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Bruk singulær pålogging"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Velkommen tilbake"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Ugyldig hovedpassord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Ugyldig filpassord, bruk passordet du skrev inn da du opprettet eksportfilen."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Det er ingen elementer å vise."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Du har ikke tillatelse til å se alle elementer i denne samlingen."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Innstillinger for krypteringsnøkkel"
   },
-  "kdfAlgorithm": {
-    "message": "KDF-algoritme"
-  },
   "kdfIterations": {
     "message": "KDF-iterasjoner"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Høyere KDF-iterasjoner, minne og parallellitet kan hjelpe til med å beskytte hovedpassordet ditt fra å bli gjettet med rå kraft av en angriper."
   },
-  "changeKdf": {
-    "message": "Endre KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Krypteringsnøkkelinnstillingene endret"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Vær sikker på at kontoen din har nok kreditt tilgjengelig for dette kjøpet. Hvis kontoen din ikke har nok kreditt tilgjengelig, vil standard betalingsmåten din bli brukt til forskjellen. Du kan legge til kreditt på kontoen din på Faktureringssiden."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Kontoens kreditt kan brukes til kjøp. Eventuell tilgjengelig kreditt vil automatisk bli brukt mot fakturaer generert for denne kontoen."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Neste trekk"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detaljer"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Last ned lisens"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Oppdater nettleseren"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Du bruker en ustøttet nettleser. Netthvelvet vil kanskje ikke fungere ordentlig."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitasjonen ble godkjent"
   },
-  "inviteAcceptedDesc": {
-    "message": "Du kan få tilgang til denne organisasjonen så fort en administrator godkjenner ditt medlemskap. Vi vil sende deg E-post når det skjer."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisasjonen er skrudd av."
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Gjenstander i deaktiverte organisasjoner kan ikke åpnes. Ta kontakt med eieren av organisasjonen for hjelp."
-  },
   "licenseIsExpired": {
     "message": "Lisensen har utløpt."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO-identifikator"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Koble fra SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Personlig eierskap"
   },
@@ -5597,6 +5947,19 @@
     "message": "Ikke tillat brukere å skjule sin e-postadresse fra mottakere når de oppretter eller endrer en Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modifisert policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Tidsavbrudd i hvelvet"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Konfigurere en maks tidsavbrudd for hvelvet for alle brukere."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maksimal hvelv tidsavbrudd"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Ugyldig maksimal hvelv tidsavbrudd."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Åpningstider"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutter"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Organisasjonens retningslinjer påvirker tidsavbruddet for hvelvet ditt. Maksimalt tillatt tidsavbrudd for hvelv er $HOURS$ time(r) og $MINUTES$ minutt(er)",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API-tjenernettadresse"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Ingen tilgang. Du har ikke tillatelse til å se denne siden."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Hovedpassord"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Gruppe/Bruker"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Innlogget!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "For dyrt",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Gratis i 1 år"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Knytt"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Legg til i samlinger"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Av"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Hjelpesenter",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/ne/messages.json b/apps/web/src/locales/ne/messages.json
index 7dff2786a5d..e2e310d7031 100644
--- a/apps/web/src/locales/ne/messages.json
+++ b/apps/web/src/locales/ne/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/nl/messages.json b/apps/web/src/locales/nl/messages.json
index 1ad5b20745a..fadbaa923d5 100644
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Toegangsintelligentie"
   },
-  "riskInsights": {
-    "message": "Risicoinzichten"
-  },
   "passwordRisk": {
     "message": "Wachtwoordrisico"
   },
+  "noEditPermissions": {
+    "message": "Je hebt geen toestemming om dit item te bewerken"
+  },
   "reviewAtRiskPasswords": {
     "message": "Herzie risicovolle wachtwoorden (zwak, blootgelegd of herbruikt) tussen applicaties. Selecteer je meest belangrijke applicaties om prioriteit te geven aan beveiligingsacties voor je gebruikers om risicovolle wachtwoorden aan te pakken."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Risicovolle logins bekijken"
+  },
   "dataLastUpdated": {
     "message": "Datum laatste wijziging: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Je hebt nog geen rapport aangemaakt"
+  },
   "notifiedMembers": {
     "message": "Geînformeerde leden"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Nieuw login item aanmaken"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% compleet",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ van $TOTAL$ beveiligingstaken voltooid",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Voortgang veranderen wachtwoord"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Leden taken toewijzen om de voortgang te controleren"
+  },
+  "onceYouReviewApplications": {
+    "message": "Zodra je applicaties beoordeelt en als belangrijk markeert, wijs je taken toe aan je leden om hun wachtwoorden te wijzigen."
+  },
+  "sendReminders": {
+    "message": "Herinneringen versturen"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Als je toepassingen als belangrijk markeert, verschijnen ze hier."
   },
+  "viewAtRiskMembers": {
+    "message": "Leden met risico bekijken"
+  },
+  "viewAtRiskApplications": {
+    "message": "Applicaties met risico bekijken"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ van de $TOTAL$ kritische applicaties zijn in gevaar als gevolg van risicovolle wachtwoorden",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Belangrijke applicaties ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "belangrijke applicaties gemarkeerd"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ belangrijke applicaties",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applicaties in gevaar",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ wachtwoorden lopen risico",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ nieuwe wachtwoorden lopen risico",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Geînformeerde leden ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Nieuwe applicaties gevonden in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Geen gegevens gevonden"
   },
-  "noAppsInOrgDescription": {
-    "message": "Als gebruikers inloggegevens opslaan, verschijnen hier applicaties met wachtwoorden die risico lopen. Markeer belangrijke applicaties en attendeer gebruikers op het bijwerken van wachtwoorden."
+  "noDataInOrgDescription": {
+    "message": "Importeer de inloggegevens van je organisatie om aan de slag te gaan met Access Intelligence. Zodra je dat doet, kun je:"
+  },
+  "feature1Title": {
+    "message": "Applicaties als belangrijk markeren"
+  },
+  "feature1Description": {
+    "message": "Hiermee kun je eerst risico's voor je belangrijkste applicaties weghalen."
+  },
+  "feature2Title": {
+    "message": "Help leden hun beveiliging te verbeteren"
+  },
+  "feature2Description": {
+    "message": "Risicovolle leden begeleide beveiligingstaken toewijzien om inloggegevens bij te werken."
+  },
+  "feature3Title": {
+    "message": "Voortgang monitoren"
+  },
+  "feature3Description": {
+    "message": "Bijhouden van wijzigingen over tijd voor het weergeven van beveiligingsverbeteringen."
+  },
+  "noReportsRunTitle": {
+    "message": "Rapport genereren"
+  },
+  "noReportsRunDescription": {
+    "message": "Je bent klaar om rapporten te genereren. Zodra je rapporten maakt, kun je:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Je hebt nog geen applicaties als belangrijk aangewezen"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "App aanwijzen als belangrijk"
   },
+  "markAsCritical": {
+    "message": "App aanwijzen als belangrijk"
+  },
+  "applicationsSelected": {
+    "message": "applicaties geselecteerd"
+  },
+  "selectApplication": {
+    "message": "Applicatie selecteren"
+  },
+  "unselectApplication": {
+    "message": "Applicatie deselecteren"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Als belangrijk gemarkeerde applicaties"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applicaties als belangrijk gemarkeerd",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Kon applicaties niet als kritiek markeren"
+  },
   "application": {
     "message": "Applicatie"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Leden in gevaar"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Leden met toegang voor bewerken van risico-items voor belangrijke applicaties"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Deze leden hebben toegang tot kwetsbare items voor belangrijke applicaties."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Leden met risicovolle wachtwoorden"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Leden van jew organisatie krijgen een taak om kwetsbare wachtwoorden te wijzigen. Ze ontvangen een melding binnen hun Bitwarden-browserextensie."
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ leden lopen risico",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Deze leden loggen in op toepassingen met zwakke, blootgestelde of hergebruikte wachtwoorden."
+  "atRiskMemberDescription": {
+    "message": "Deze leden loggen in op applicaties met zwakke, blootgestelde of hergebruikte wachtwoorden."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Deze niet-leden loggen in op toepassingen met zwakke, blootgestelde of hergebruikte wachtwoorden."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Totaal applicaties"
   },
+  "applicationsNeedingReview": {
+    "message": "Aanvragen die herzien moeten worden"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Nieuwe toepassingen beoordelen"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ nieuwe applicaties",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Controleer nieuwe applicaties om ze als kritiek te markeren en je organisatie veilig te houden"
+  },
+  "reviewNow": {
+    "message": "Nu beoordelen"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Je organisatie heeft items opgeslagen voor $COUNT$ applicaties",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Beoordeel applicaties om de items die het meest belangrijk zijn voor de veiligheid van je organisatie te beveiligen"
+  },
+  "reviewApplications": {
+    "message": "Applicaties beoordelen"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Belangrijke applicaties prioriteren"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Selecteer welke toepassingen het meest belangrijk zijn voor je organisatie. Vervolgens kun je leden beveiligingstaken toewijzen om risico's weg te halen."
+  },
+  "reviewNewApplications": {
+    "message": "Nieuwe toepassingen beoordelen"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Bekijk nieuwe applicaties met kwetsbare items en markeer degenen die je wilt monitoren als belangrijk. Vervolgens kun je beveiligingstaken toewijzen aan leden om risico's weg te halen."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Klik op het sterpictogram om een app als belangrijk te markeren"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Markeren als kritieke functionaliteit wordt geïmplementeerd in een toekomstige update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Markeren als belangrijk ongedaan maken"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorieten"
   },
+  "taskSummary": {
+    "message": "Taaksamenvatting"
+  },
   "types": {
     "message": "Categorieën"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Houd dit venster open en volg de aanwijzingen van je browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey-authenticatie mislukt. Probeer het opnieuw."
+  },
   "useADifferentLogInMethod": {
     "message": "Gebruik een andere loginmethode"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Single sign-on gebruiken"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welkom terug"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Ongeldig hoofdwachtwoord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ongeldig hoofdwachtwoord. Check of je e-mailadres klopt en of je account is aangemaakt op $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Onjuist bestandswachtwoord, gebruik het wachtwoord dat je hebt ingevoerd bij het aanmaken van het exportbestand."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Er zijn geen items om weer te geven."
   },
+  "noItemsInTrash": {
+    "message": "Geen items in prullenbak"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items die je verwijdert verschijnen hier en worden na 30 dagen definitief verwijderd"
+  },
+  "noItemsInVault": {
+    "message": "Geen items in de kluis"
+  },
+  "emptyVaultDescription": {
+    "message": "De kluis beschermt meer dan alleen je wachtwoorden. Sla hier beveiligde inloggegevens, ID's, kaarten en notities op."
+  },
+  "emptyFavorites": {
+    "message": "Je hebt geen favoriete items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Voeg veelgebruikte items toe aan favorieten voor snelle toegang."
+  },
+  "noSearchResults": {
+    "message": "Geen resultaten teruggekregen"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Wis filters of probeer een andere zoekterm"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Je hebt geen rechten om alle items in deze collectie te zien."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Instellingen encryptiesleutel"
   },
-  "kdfAlgorithm": {
-    "message": "KDF-algortime"
-  },
   "kdfIterations": {
     "message": "KDF-iteraties"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Hogere instellingen voor KDF-iteraties, geheugen en parallellisatie kunnen je hoofdwachtwoord beschermen tegen brute-foce-aanvallen."
   },
-  "changeKdf": {
-    "message": "KDF wijzigen"
-  },
   "encKeySettingsChanged": {
     "message": "Instellingen encryptiesleutel zijn gewijzigd"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Verzeker jezelf ervan dat je account voldoende krediet voor deze aankoop beschikbaar heeft. Als je account niet genoeg krediet heeft, zal je standaard betaalmethode worden gebruikt voor het verschil. Je kunt krediet aan je account toevoegen vanaf de factuurpagina."
   },
+  "notEnoughAccountCredit": {
+    "message": "Je hebt niet genoeg accountkrediet voor deze aankoop. Je kunt krediet aan je account toevoegen vanaf de factuurpagina."
+  },
   "creditAppliedDesc": {
     "message": "Je kunt het krediet van je account voor aankopen gebruiken. Elk beschikbaar krediet zal automatisch worden toegepast op facturen die gegenereerd zijn voor dit account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Volgende betaling"
   },
+  "nextChargeHeader": {
+    "message": "Volgende betaling"
+  },
+  "plan": {
+    "message": "Pakket"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "korting"
+  },
   "downloadLicense": {
     "message": "Licentie downloaden"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Webbrowser bijwerken"
   },
-  "generatingYourRiskInsights": {
-    "message": "Je risico-inzichten genereren..."
+  "generatingYourAccessIntelligence": {
+    "message": "Je toegangsinlichtingen genereren..."
+  },
+  "fetchingMemberData": {
+    "message": "Ledengegevens ophalen..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Wachtwoordgezondheid analyseren..."
+  },
+  "calculatingRiskScores": {
+    "message": "Risicoscores berekenen..."
+  },
+  "generatingReportData": {
+    "message": "Rapportgegevens genereren..."
+  },
+  "savingReport": {
+    "message": "Rapport opslaan..."
+  },
+  "compilingInsights": {
+    "message": "Inzichten compileren..."
+  },
+  "loadingProgress": {
+    "message": "Voortgang laden"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Dit kan een paar minuten duren."
+  },
+  "riskInsightsRunReport": {
+    "message": "Rapport uitvoeren"
   },
   "updateBrowserDesc": {
     "message": "Je maakt gebruik van webbrowser die we niet ondersteunen. De webkluis werkt mogelijk niet goed."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Uitnodiging geaccepteerd"
   },
-  "inviteAcceptedDesc": {
-    "message": "Je krijgt toegang tot deze organisatie zodra een beheerder je lidmaatschap bevestigt. We sturen je een e-mail zodra dat gebeurt."
+  "invitationAcceptedDesc": {
+    "message": "Je uitnodiging is geaccepteerd."
   },
   "inviteInitAcceptedDesc": {
     "message": "Je hebt nu toegang tot deze organisatie."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisatie opgeschort"
   },
+  "organizationIsSuspended": {
+    "message": "Organisatie is opgeschort"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Je kunt items in opgeschorte organisaties niet benaderen. Neem contact op met de eigenaar van je organisatie voor hulp."
+  },
   "secretsAccessSuspended": {
     "message": "Opgeschorte organisaties zijn niet toegankelijk. Neem contact op met de eigenaar van je organisatie voor hulp."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Je kunt geen service accounts aanmaken in opgeschorte organisaties. Neem contact op met de eigenaar van je organisatie voor hulp."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Je kunt uitgeschakelde items in een organisatie niet benaderen. Neem contact op met de eigenaar van je organisatie voor hulp."
-  },
   "licenseIsExpired": {
     "message": "Licentie verlopen."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO Identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Geef dit ID aan je leden voor inloggen met SSO. Om deze stap te omzeilen, configureer je ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Geef dit ID aan je leden om in te loggen met SSO. Leden kunnen het invoeren van deze identificatie overslaan tijdens SSO als een geclaimde domein is ingesteld ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Meer informatie",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO ontkoppelen"
@@ -5518,9 +5809,9 @@
     "message": "Verplicht dat items eigendom zijn van een organisatie, dit verwijdert de mogelijkheid van het opslaan van items op accountniveau.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Alle items worden eigendom en opgeslagen bij de organisatie, wat organisatiebrede controle, zichtbaarheid en rapportage mogelijk maakt. Bij inschakelen is er een standaardcollectie beschikbaar voor elk lid voor het opslaan van items. Meer informatie over het beheren van de ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "Alle items worden eigendom van en opgeslagen bij de organisatie, wat organisatiebrede controle, zichtbaarheid en rapportage mogelijk maakt. Bij inschakelen is er een standaardcollectie beschikbaar voor elk lid voor het opslaan van items. Meer informatie over het beheren van de ",
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "levenscyclus van inloggegevens",
@@ -5545,6 +5836,65 @@
     "message": "Leer meer over de ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Nu beschikbaar"
+  },
+  "autoConfirm": {
+    "message": "Automatische bevestiging van nieuwe gebruikers"
+  },
+  "autoConfirmDescription": {
+    "message": "Nieuwe uitgenodigde gebruikers in de organisatie worden automatisch bevestigd wanneer het apparaat van een beheerder is ontgrendeld.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Automatische bevestiging van gebruikers inschakelen"
+  },
+  "autoConfirmExtension1": {
+    "message": "Bitwarden-extensie openen"
+  },
+  "autoConfirmExtension2": {
+    "message": "Selecteer",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Inschakelen",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "De Bitwarden-browserextensie is succesvol geopend. Je kunt nu de automatische bevestiging van de gebruiker activeren."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Nieuwe uitgenodigde gebruikers in de organisatie worden automatisch bevestigd wanneer het apparaat van een beheerder is ontgrendeld. Voordat je dit beleid gaat inschakelt, graag het volgende lezen en instemmen: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Mogelijk beveiligingsrisico. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatische gebruikersbevestiging kan een beveiligingsrisico vormen voor de gegevens van je organisatie."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Meer informatie over de risico's",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Enkele Organisatie-beleid vereist "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Alle leden mogen alleen lid zijn van deze organisatie om deze automatisering te activeren."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Het beleid inzake één organisatie strekt zich uit tot alle rollen. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Geen noodtoegang. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Noodtoegang zal worden verwijderd."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Ik accepteer deze risico's en beleidsupdates"
+  },
   "personalOwnership": {
     "message": "Persoonlijk eigendom"
   },
@@ -5597,6 +5947,19 @@
     "message": "Gebruikers mogen hun e-mailadres niet verbergen voor ontvangers bij het aanmaken of bewerken van een Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Standaard URI-overeenkomstdetectie"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Bepaal wanneer logins voor autofill worden voorgesteld. Beheerders en eigenaren zijn vrijgesteld van dit beleid."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Standaard URI-overeenkomstdetectie"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Selecteer een geldige optie voor URI match-detectie.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Bewerkt beleid $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Je hoofdwachtwoord voldoet niet aan en of meerdere oganisatiebeleidsonderdelen. Om toegang te krijgen tot de kluis, moet je je hoofdwachtwoord nu bijwerken. Doorgaan zal je huidige sessie uitloggen, waarna je opnieuw moet inloggen. Actieve sessies op andere apparaten blijven mogelijk nog een uur actief."
   },
-  "automaticAppLogin": {
-    "message": "Gebruikers automatisch inloggen voor toegestane applicaties"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatische login met SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Inlogformulieren automatisch invullen en indienen voor apps die zijn gestart vanuit je geconfigureerde identiteitsprovider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Bereid het gemak en beveiliging van SSO uit naar niet-beheerde apps. Wanneer gebruikers een app starten van je identiteitsprovider, worden de inloggegevens automatisch ingevuld en verzonden, voor een één-klik, beveiligde flow van de identiteitsprovider naar de app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identiteitsproviderhost"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Je organisatie heeft je versleutelingsopties gewijzigd. Stel een hoofdwachtwoord in om toegang te krijgen tot je kluis."
   },
-  "maximumVaultTimeout": {
-    "message": "Time-out van de kluis"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Sessie time-out"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Stel een maximale time-out van de kluis in voor alle gebruikers."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Stel een maximale sessie time-out in voor alle leden behalve eigenaren."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximale time-out van de kluis"
+  "maximumAllowedTimeout": {
+    "message": "Maximaal toegestane time-out"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Ongeldige maximale time-out van de kluis."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximaal toegestane time-out is vereist."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Tijd is ongeldig. Wijzig ten minste één waarde."
+  },
+  "sessionTimeoutAction": {
+    "message": "Actie voor sessie time-out"
+  },
+  "immediately": {
+    "message": "Onmiddellijk"
+  },
+  "onSystemLock": {
+    "message": "Bij systeemvergrendeling"
+  },
+  "onAppRestart": {
+    "message": "Na opnieuw starten"
   },
   "hours": {
     "message": "Uren"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuten"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Weet je zeker dat je een maximale time-out van \"Nooit\" wilt toestaan voor alle leden?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Deze optie slaat de encryptiesleutels van je leden op hun apparaten op. Als je deze optie kiest, zorg er dan voor dat hun apparaten voldoende worden beschermd."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Lees meer over apparaatbescherming"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"Systeem vergrendeling\" zal alleen van toepassing zijn op de browser en desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "De mobiele en web-app gebruikt \"bij herstarten van de app\" als maximaal toegestane time-out, aangezien de optie niet wordt ondersteund."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Het beleid van je organisatie heeft invloed op de time-out van je kluis. De maximaal toegestane time-out voor je kluis is $HOURS$ uur en $MINUTES$ minuten.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Je moet de basis URL van de server of ten minste één aangepaste omgeving toevoegen."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL's moeten HTTPS gebruiken."
+  },
   "apiUrl": {
     "message": "API-server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Alleen de organisatiekluis die gekoppeld is aan $ORGANIZATION$ wordt geëxporteerd.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Exporteert alleen de organisatiekluis van $ORGANIZATION$. Geen persoonlijke kluis-items.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Toegang geweigerd. Je hebt geen toestemming om deze pagina te bekijken."
   },
+  "noPageAccess": {
+    "message": "Je hebt geen toegang tot deze pagina"
+  },
   "masterPassword": {
     "message": "Hoofdwachtwoord"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Onbekend secret, je moet misschien toegang vragen om dit secret te benaderen."
   },
+  "unknownServiceAccount": {
+    "message": "Onbekend machine-account, je moet misschien toegang vragen om dit machine-acount te benaderen."
+  },
   "unknownProject": {
     "message": "Onbekend project, je moet misschien toegang vragen om dit project te benaderen."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Groep/Gebruiker"
   },
-  "lowKdfIterations": {
-    "message": "Weinig KDF-iteraties"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Werk je versleutelingsinstellingen bij om aan de nieuwe beveiligingsaanbevelingen te voldoen en de bescherming van je account te verbeteren."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Als je doorgaat, log je uit van alle actieve sessies. Je zult opnieuw moeten inloggen en, indien van toepassing, tweestapsverificatie moeten voltooien. We raden aan om je kluis te exporteren voordat je je versleutelingsinstellingen wijzigt om gegevensverlies te voorkomen."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Project gekoppeld met Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Project bekeken met identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Machine-account ID verwijderd: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Project bewerkt met identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Gebruiker toegevoegd: $USER_ID$ naar machine-account met identificatie: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Gebruiker verwijderd: $USER_ID$ van machine-account met identificatie: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Groep verwijderd: $USER_ID$ van machine-account met identificatie: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Machine-account aangemaakt met identificatie: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Groep toegevoegd: $GROUP_ID$ van machine-account met identificatie: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Machine-account verwijderd met identificatie: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Project verwijderd met identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Ingelogd!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Toegang collectie toewijzen"
   },
@@ -9330,6 +9820,14 @@
     "message": "Te duur",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Overstappen naar gratis abonnement",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Overstappen naar gratis organisatie",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "1 jaar gratis"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Toewijzen"
   },
+  "assignTasks": {
+    "message": "Taken toewijzen"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Meldingen verzenden om wachtwoorden te wijzigen"
+  },
   "assignToCollections": {
     "message": "Toewijzen aan collecties"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Stuur eventgegevens naar je Logscale-instantie"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Stuur gebeurtenisgegevens van je kluis naar je Datadog-instance"
+  },
   "failedToSaveIntegration": {
     "message": "Opslaan van integratie mislukt. Probeer het later opnieuw."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Je moet de eigenaar van de organisatie zijn om deze actie uit te voeren."
+  },
   "failedToDeleteIntegration": {
     "message": "Verwijderen van integratie mislukt. Probeer het later opnieuw."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Laag aantal KDF-iteraties. Verhoog je iteraties om de veiligheid van je account te verbeteren."
-  },
-  "changeKDFSettings": {
-    "message": "KDF-instellingen wijzigen"
-  },
   "secureYourInfrastructure": {
     "message": "Beveilig je infrastructuur"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Uit"
   },
-  "higherKDFIterations": {
-    "message": "Hogere KDF-iteraties beschermen je hoofdwachtwoord tegen brute-foce-aanvallen."
-  },
-  "incrementsOf100,000": {
-    "message": "verhogingen van 100.000"
-  },
-  "smallIncrements": {
-    "message": "kleine verhogingen"
-  },
   "kdfIterationRecommends": {
     "message": "We adviseren 600.000 of meer"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Voor oudere apparaten kan het te hoog instellen van je KDF tot prestatieproblemen leiden. Verhoog de waarde in $VALUE$ en test je apparaten.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Neem contact op met de klantenservice om je abonnement te herstellen."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domein geverifieerd"
   },
+  "itemAddedToFavorites": {
+    "message": "Item toegevoegd aan favorieten"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item verwijderd uit favorieten"
+  },
+  "copyNote": {
+    "message": "Notitie kopiëren"
+  },
   "organizationNameMaxLength": {
     "message": "Organisatienaam mag niet langer zijn dan 50 tekens."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "De Bitwarden-browserextensie is geopend. Je kunt nu je risicovolle wachtwoorden bekijken."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We konden de Bitwarden-browserextensie niet openen. Open het Bitwarden-pictogram",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "vanaf de werkbalk.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Je abonnement wordt binnenkort verlengd. Neem voor $RENEWAL_DATE$ contact op met $RESELLER$ om je verlenging te bevestigen en een ononderbroken service te verzekeren.",
     "placeholders": {
@@ -11024,14 +11511,54 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archief",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archiveren",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Dearchiveren"
+  },
+  "itemsInArchive": {
+    "message": "Items in archief"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  "noItemsInArchiveDesc": {
+    "message": "Gearchiveerde items verschijnen hier en worden uitgesloten van algemene zoekresultaten en automatisch invulsuggesties."
+  },
+  "itemWasSentToArchive": {
+    "message": "Item naar archief verzonden"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Item naar archief verzonden"
+  },
+  "itemUnarchived": {
+    "message": "Item uit het archief gehaald"
+  },
+  "bulkArchiveItems": {
+    "message": "Items gearchiveerd"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Item gedearchiveerd"
+  },
+  "archiveItem": {
+    "message": "Item archiveren",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Gearchiveerde items worden uitgesloten van algemene zoekresultaten en automatische invulsuggesties. Weet je zeker dat je dit item wilt archiveren?"
+  },
+  "archiveBulkItems": {
+    "message": "Items archiveren",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Gearchiveerde items worden uitgesloten van algemene zoekresultaten en automatische invulsuggesties. Weet je zeker dat je deze items wilt archiveren?"
   },
   "businessUnit": {
     "message": "Bedrijfseenheid"
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extensie geïnstalleerd!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden-extensie geïnstalleerd!"
+  },
   "openExtensionToAutofill": {
     "message": "Open de extensie om in te loggen en te beginnen met automatisch invullen."
   },
@@ -11154,6 +11684,14 @@
     "message": "Leercentrum",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Als de extensie niet is geopend, moet je misschien Bitwarden via het pictogram ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " op de werkbalk openen.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Helpcentrum",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Naadloze integratie"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Opwaarderen naar Families"
+  },
+  "upgradeToPremium": {
+    "message": "Opwaarderen naar Premium"
+  },
+  "familiesUpdated": {
+    "message": "Je hebt opgewaardeerd naar Families!"
+  },
+  "taxCalculationError": {
+    "message": "Er is een fout opgetreden bij het berekenen van de belasting voor je locatie. Probeer het opnieuw."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welkom bij Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Ontgrendel meer beveiligingsfuncties met Premium, of begin met het delen van items met Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prijzen exclusief btw en worden jaarlijks gefactureerd."
+  },
+  "organizationNameDescription": {
+    "message": "De naam van je organisatie verschijnt in uitnodigingen die je aan leden verstuurt."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Doorgaan zonder opwaarderen"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade je abonnement"
+  },
+  "upgradeNow": {
+    "message": "Nu upgraden"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Met het invullen van dit formulier maak je een nieuwe Familie-organisatie. Je kunt je gratis organisatie upgraden vanuit de Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "Er is een fout opgetreden tijdens het verwerken van het opwaarderen. Probeer het opnieuw."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Je hebt het gratis Bitwarden-abonnement"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade voor volledige beveiliging"
+  },
+  "viewbusinessplans": {
+    "message": "Bedrijfsabonnementen bekijken"
+  },
+  "updateEncryptionSettings": {
+    "message": "Versleutelingsinstellingen bijwerken"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Je versleutelingsinstellingen bijwerken"
+  },
+  "updateSettings": {
+    "message": "Instellingen bijwerken"
+  },
+  "algorithm": {
+    "message": "Algoritme"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Kies hoe Bitwarden je kluisgegevens moet versleutelen. Alle opties zijn veilig, maar sterkere methoden bieden betere bescherming - vooral tegen brute-force aanvallen. Bitwarden beveelt de standaardinstelling voor de meeste gebruikers aan."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Het verhogen van de waarden boven de standaard zal de veiligheid verbeteren, maar het ontgrendelen van je kluis kan langer duren."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Over versleutelingsalgoritmen"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is een goed geteste versleutelingsmethode met evenwicht tussen veiligheid en prestaties. Goed voor alle gebruikers."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id biedt een sterkere bescherming tegen moderne aanvallen. Het beste voor geavanceerde gebruikers met krachtige apparaten."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postcode"
+  },
+  "cardNumberLabel": {
+    "message": "Kaartnummer"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start gratis Families-proefperiode"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Blokkeer het aanmaken van een account voor geclaimde domeinen"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Voorkom dat gebruikers buiten je organisatie accounts aanmaken met behulp van e-mailadressen van geclaimde domeinen."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Voordat dit beleid geactiveerd kan worden, moet je een domein claimen."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Stel een ontgrendelingsmethode in om je kluis time-out actie te wijzigen."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Bedrijfsbeleidseisen zijn toegepast op je time-out instellingen"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Je kluis time-out is hoger dan het maximum van jouw organisatie."
+  },
+  "neverLockWarning": {
+    "message": "Weet je zeker dat je de optie \"Nooit\" wilt gebruiken? De vergrendelingsoptie \"Nooit\" bewaart de sleutel van je kluis op je apparaat. Als je deze optie gebruikt, moet je ervoor zorgen dat je je apparaat naar behoren beschermt."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Time-out actie"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sessietime-out"
+  },
+  "appearance": {
+    "message": "Uiterlijk"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Time-out overschrijdt de beperking van je organisatie: $HOURS$ uur en $MINUTES$ minu(u) t(en) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Geen belangrijke applicaties geselecteerd"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Weet je zeker dat je wilt doorgaan?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/nn/messages.json b/apps/web/src/locales/nn/messages.json
index 54323d9b12a..8dc4b88b647 100644
--- a/apps/web/src/locales/nn/messages.json
+++ b/apps/web/src/locales/nn/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorittar"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Typar"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Ugild hovudpassord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Det er inga oppføringar å lista opp."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/or/messages.json b/apps/web/src/locales/or/messages.json
index 526b7567d99..0d08d207748 100644
--- a/apps/web/src/locales/or/messages.json
+++ b/apps/web/src/locales/or/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json
index 8254d28f142..5db5acc944f 100644
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Dostęp do informacji"
   },
-  "riskInsights": {
-    "message": "Spostrzeżenia dotyczące ryzyka"
-  },
   "passwordRisk": {
     "message": "Ryzyko związne z hasłem"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Przejrzyj hasła zagrożone (słabe, ujawnione lub ponownie używane) we wszystkich aplikacjach. Wybierz swoje najbardziej krytyczne aplikacje, aby nadać priorytet działaniom bezpieczeństwa swoim użytkownikom, aby zająć się hasłami zagrożonymi."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data ostatniej aktualizacji: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Powiadomieni członkowie"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Utwórz nowy element logowania"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Aplikacje krytyczne ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Powiadomieni członkowie ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Nie znaleziono aplikacji w $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Jako użytkownicy zapisują logowania, pojawiają się tutaj aplikacje, pokazujące wszelkie hasła zagrożone. Zaznacz kluczowe aplikacje i powiadamiaj użytkowników o potrzebie aktualizacji haseł."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Oznacz aplikację jako krytyczną"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Aplikacje oznaczone jako krytyczne"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Aplikacja"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Zagrożeni użytkownicy"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Ci członkowie logują się do aplikacji ze słabymi, ujawnionymi lub ponownie używanymi hasłami."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Ci członkowie nie logują się do aplikacji ze słabymi, ujawnionymi lub ponownie używanymi hasłami."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Wszystkie aplikacje"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Ulubione"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Rodzaje"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Pozostaw to okno otwarte i postępuj zgodnie z instrukcjami z przeglądarki."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Użyj innej metody logowania"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Użyj jednokrotnego logowania"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Witaj ponownie"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Hasło główne jest nieprawidłowe"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Hasło pliku jest nieprawidłowe. Użyj prawidłowego hasła."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Brak elementów."
   },
+  "noItemsInTrash": {
+    "message": "Brak elementów w koszu"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Usunięte elementy pojawią się tutaj i zostaną trwale usunięte po 30 dniach"
+  },
+  "noItemsInVault": {
+    "message": "Brak elementów w sejfie"
+  },
+  "emptyVaultDescription": {
+    "message": "Sejf chroni nie tylko hasła. Przechowuj bezpiecznie dane logowania, identyfikatory, karty i notatki."
+  },
+  "emptyFavorites": {
+    "message": "Brak ulubionych elementów"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Dodaj do ulubionych często używane elementy dla szybkiego dostępu."
+  },
+  "noSearchResults": {
+    "message": "Brak pasujących elementów"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Wyczyść filtry lub użyj innej frazy"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Nie masz uprawnień do przeglądania wszystkich elementów w tej kolekcji."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Ustawienia klucza szyfrowania"
   },
-  "kdfAlgorithm": {
-    "message": "Algorytm KDF"
-  },
   "kdfIterations": {
     "message": "Iteracje KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Wyższe wartości iteracji KDF, pamięci i współbieżności mogą pomóc chronić Twoje hasło główne przed złamaniem przez atakującego."
   },
-  "changeKdf": {
-    "message": "Zmień KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Ustawienia klucza szyfrowania zostały zapisane"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Upewnij się, że na koncie posiadasz wystarczająca ilość środków do dokonania tego zakupu. Jeśli na koncie nie ma wystarczających środków, do opłacenia brakującej różnicy zostanie użyta domyślna metoda płatności. Możesz też dodać środki do swojego konta na stronie Płatności."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Środki dodane do konta mogą zostać użyte do dokonywania płatności. Dostępne środki będą automatycznie wykorzystane do opłacenia faktur wygenerowanych dla tego konta."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Następna opłata"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Szczegóły"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Pobierz licencję"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Aktualizuj przeglądarkę"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generowanie informacji o ryzyku..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Używasz nieobsługiwanej przeglądarki. Sejf internetowy może działać niewłaściwie."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Zaproszenie zostało zaakceptowane"
   },
-  "inviteAcceptedDesc": {
-    "message": "Dostęp do tej organizacji otrzymasz po potwierdzeniu członkostwa przez administratora. Dostaniesz wtedy wiadomość e-mail."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Możesz teraz uzyskać dostęp do tej organizacji."
@@ -4766,12 +5050,18 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Hasło zostało zaktualizowane",
+    "message": "Ostatnia aktualizacja hasła",
     "description": "ex. Date this password was updated"
   },
   "organizationIsDisabled": {
     "message": "Organizacja została zawieszona"
   },
+  "organizationIsSuspended": {
+    "message": "Organizacja została zawieszona"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Nie można uzyskać dostępu do elementów w zawieszonych organizacjach. Skontaktuj się z właścicielem organizacji, aby uzyskać pomoc."
+  },
   "secretsAccessSuspended": {
     "message": "Nie można uzyskać dostępu do zawieszonych organizacji. Skontaktuj się z właścicielem organizacji, aby uzyskać pomoc."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Konta serwisowe nie mogą być tworzone w zawieszonych organizacjach. Skontaktuj się z właścicielem organizacji, aby uzyskać pomoc."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Nie można uzyskać dostępu do elementów w zawieszonych organizacjach. Skontaktuj się z właścicielem organizacji, aby uzyskać pomoc."
-  },
   "licenseIsExpired": {
     "message": "Licencja wygasła."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Identyfikator SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Podaj ten identyfikator swoim członkowm, aby zalogować się za pomocą SSO. Aby pominąć ten krok, ustaw ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Dowiedz się więcej",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Odłącz logowanie jednokrotne SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Własność osobista"
   },
@@ -5597,6 +5947,19 @@
     "message": "Nie zezwalaj użytkownikom na ukrywanie ich adresów e-mail przed odbiorcami, podczas tworzenia lub edytowania wysyłek.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Zasada $ID$ została zaktualizowana.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Twoje hasło główne nie spełnia jednej lub kilku zasad organizacji. Aby uzyskać dostęp do sejfu, musisz teraz zaktualizować swoje hasło główne. Kontynuacja wyloguje Cię z bieżącej sesji, wymagając zalogowania się ponownie. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie jedną godzinę."
   },
-  "automaticAppLogin": {
-    "message": "Automatycznie zaloguj użytkowników dla dozwolonych aplikacji"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Formularze logowania zostaną automatycznie wypełnione i przesłane dla aplikacji uruchomionych od skonfigurowanego dostawcy tożsamości."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Host dostawcy tożsamości"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Twoja organizacja zaktualizowała opcje szyfrowania. Ustaw hasło główne, aby uzyskać dostęp do sejfu."
   },
-  "maximumVaultTimeout": {
-    "message": "Blokowanie sejfu"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Ustaw maksymalny czas blokowania sejfu dla wszystkich użytkowników."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maksymalny czas blokowania sejfu"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Maksymalny czas blokowania sejfu jest nieprawidłowy."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Godziny"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuty"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Zasady organizacji mają wpływ na czas blokowania sejfu. Maksymalny dozwolony czas wynosi $HOURS$ godz. i $MINUTES$ min.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Musisz dodać podstawowy adres URL serwera lub co najmniej jedno niestandardowe środowisko."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "Adres URL serwera API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Odmowa dostępu. Nie masz uprawnień do przeglądania tej strony."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Hasło główne"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grupa/Użytkownik"
   },
-  "lowKdfIterations": {
-    "message": "Niska liczba iteracji KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Zaktualizuj ustawienia szyfrowania, aby spełnić nowe zalecenia bezpieczeństwa i poprawić ochronę konta."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Kontynuowanie spowoduje wylogowanie ze wszystkich aktywnych sesji. Będzie trzeba zalogować się ponownie i wykonać logowanie dwuetapowe, jeśli jest włączone. Zalecamy wyeksportowanie sejfu przed zmianą ustawień szyfrowania, aby zapobiec utracie danych."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Zalogowano!"
   },
-  "beta": {
-    "message": "Wersja beta"
-  },
   "assignCollectionAccess": {
     "message": "Przypisz dostęp do kolekcji"
   },
@@ -9330,6 +9820,14 @@
     "message": "Zbyt drogo",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Za darmo na 1 rok"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Przypisz"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Przypisz do kolekcji"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Niska liczba iteracji KDF. Zwiększ liczbę iteracji, aby zwiększyć bezpieczeństwo Twojego konta."
-  },
-  "changeKDFSettings": {
-    "message": "Zmień ustawienia KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Zabezpiecz swoją infrastrukturę"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Wył."
   },
-  "higherKDFIterations": {
-    "message": "Wyższe wartości iteracji KDF mogą pomóc chronić Twoje hasło główne przed złamaniem przez atakującego."
-  },
-  "incrementsOf100,000": {
-    "message": "zwiększa o 100 000"
-  },
-  "smallIncrements": {
-    "message": "małe przyrosty"
-  },
   "kdfIterationRecommends": {
     "message": "Zalecamy 600 000 lub więcej"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Dla starszych urządzeń, ustawienie KDF zbyt wysokie może prowadzić do problemów z wydajnością. Zwiększ wartość o $VALUE$ i przetestuj swoje urządzenia.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Skontaktuj się z działem obsługi klienta w celu przywrócenia subskrypcji."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domena zgłoszona"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Nazwa organizacji nie może przekraczać 50 znaków."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Pomyślnie otwarto rozszerzenie do przeglądarki. Teraz możesz przejrzeć swoje hasła zagrożone."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Wystąpił problem z otwarciem rozszerzenia przeglądarki. Otwórz ikonę Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "z paska narzędzi.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Twoja subskrypcja wkrótce zostanie odnowiona. Aby zapewnić ciągłość usług, skontaktuj się z $RESELLER$, aby potwierdzić odnowienie przed $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Jednostka Biznesowa"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Rozszerzenie Bitwarden zainstalowane!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Otwórz rozszerzenie, aby zalogować się i rozpocząć autouzupełnianie."
   },
@@ -11154,6 +11684,14 @@
     "message": "Centrum Szkoleniowe",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Centrum Pomocy",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/pt_BR/messages.json b/apps/web/src/locales/pt_BR/messages.json
index b2a2924b28b..a1fd3f271b7 100644
--- a/apps/web/src/locales/pt_BR/messages.json
+++ b/apps/web/src/locales/pt_BR/messages.json
@@ -1,12 +1,12 @@
 {
   "allApplications": {
-    "message": "Todas as aplicações"
+    "message": "Todos os aplicativos"
   },
   "activity": {
-    "message": "Activity"
+    "message": "Atividade"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logo do Bitwarden"
   },
   "criticalApplications": {
     "message": "Aplicativos críticos"
@@ -15,19 +15,22 @@
     "message": "Nenhum aplicativo crítico em risco"
   },
   "accessIntelligence": {
-    "message": "Acessar a Inteligência"
-  },
-  "riskInsights": {
-    "message": "Intuições de risco"
+    "message": "Inteligência de acesso"
   },
   "passwordRisk": {
-    "message": "Risco de senha"
+    "message": "Risco de senhas"
+  },
+  "noEditPermissions": {
+    "message": "Você não tem permissão para editar este item"
   },
   "reviewAtRiskPasswords": {
-    "message": "Revise as senhas de risco (fracas, expostas ou reutilizadas) em todos os aplicativos. Selecione seus aplicativos mais críticos para priorizar ações de segurança para seus usuários resolverem senhas de risco."
+    "message": "Revise senhas em risco (fracas, expostas, ou reutilizadas) entre aplicativos. Selecione seus aplicativos mais críticos para priorizar ações de segurança para que seus usuários resolvem senhas em risco."
+  },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Revisar credenciais em risco"
   },
   "dataLastUpdated": {
-    "message": "Dados atualizados pela última vez: $DATE$",
+    "message": "Última atualização dos dados: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -35,20 +38,23 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Você não criou um relatório ainda"
+  },
   "notifiedMembers": {
     "message": "Membros notificados"
   },
   "revokeMembers": {
-    "message": "Remover membro"
+    "message": "Revogar membros"
   },
   "restoreMembers": {
-    "message": "Restaurar membro"
+    "message": "Restaurar membros"
   },
   "cannotRestoreAccessError": {
     "message": "Não é possível restaurar acesso à organização"
   },
   "allApplicationsWithCount": {
-    "message": "Todas as aplicações ($COUNT$)",
+    "message": "Todas os aplicativos ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -57,10 +63,63 @@
     }
   },
   "createNewLoginItem": {
-    "message": "Criar item de \"login\""
+    "message": "Criar item de credencial"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "$PERCENT$% concluído",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ tarefas de segurança concluídas das $TOTAL$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Progresso de alteração de senha"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Atribua tarefas a membros para monitorar o progresso"
+  },
+  "onceYouReviewApplications": {
+    "message": "Depois que você revisar aplicativos e os marcar como críticos, atribua tarefas aos seus membros para alterar suas senhas."
+  },
+  "sendReminders": {
+    "message": "Enviar lembretes"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Ao marcar aplicativos como críticos, eles aparecerão aqui."
+  },
+  "viewAtRiskMembers": {
+    "message": "Ver membros em risco"
+  },
+  "viewAtRiskApplications": {
+    "message": "Ver aplicativos em risco"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ aplicativos críticos dos $TOTAL$ estão em risco devido a senhas em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "Aplicativos críticos ($COUNT$)",
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "aplicativos críticos marcados"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "$COUNT$ aplicativos críticos",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ aplicativos em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ senhas em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ novas senhas em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membros notificados ($COUNT$)",
     "placeholders": {
@@ -89,38 +178,80 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Nenhum aplicativo encontrado em $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Nenhum dado encontrado"
   },
-  "noAppsInOrgDescription": {
-    "message": "Como os usuários salvam as credenciais, os aplicativos aparecem aqui, mostrando qualquer senha de risco. Marque aplicativos críticos e notifique os usuários a atualizar senhas."
+  "noDataInOrgDescription": {
+    "message": "Importe os dados de autenticação da sua organização para começar com a Inteligência de Acesso. Depois de fazer isso, você poderá:"
+  },
+  "feature1Title": {
+    "message": "Marque aplicativos como críticos"
+  },
+  "feature1Description": {
+    "message": "Isso te ajudará a remover riscos dos seus aplicativos mais importantes primeiro."
+  },
+  "feature2Title": {
+    "message": "Ajude os membros a melhorar sua segurança"
+  },
+  "feature2Description": {
+    "message": "Atribua membros em risco tarefas guiadas de segurança para atualizar as credenciais."
+  },
+  "feature3Title": {
+    "message": "Monitore o progresso"
+  },
+  "feature3Description": {
+    "message": "Rastreie alterações ao longo do tempo para mostrar melhorias de segurança."
+  },
+  "noReportsRunTitle": {
+    "message": "Gerar relatório"
+  },
+  "noReportsRunDescription": {
+    "message": "Você está pronto para começar a gerar relatórios. Depois de gerar, você poderá:"
   },
   "noCriticalApplicationsTitle": {
-    "message": "You haven’t marked any applications as critical"
+    "message": "Você não marcou nenhum aplicativo como crítico"
   },
   "noCriticalApplicationsDescription": {
-    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
+    "message": "Selecione os seus aplicativos mais críticos para priorizar ações de segurança dos seus usuários de correção de senhas em risco."
   },
   "markCriticalApplications": {
-    "message": "Select critical applications"
+    "message": "Selecionar aplicativos críticos"
   },
   "markAppAsCritical": {
     "message": "Marcar aplicativo como crítico"
   },
+  "markAsCritical": {
+    "message": "Marcar como crítico"
+  },
+  "applicationsSelected": {
+    "message": "aplicativos selecionados"
+  },
+  "selectApplication": {
+    "message": "Selecionar aplicativo"
+  },
+  "unselectApplication": {
+    "message": "Desselecionar aplicativo"
+  },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Aplicações marcadas como críticas"
+    "message": "Aplicativos marcados como críticos"
+  },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ aplicativos marcados como críticos",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Falha ao marcar aplicativos como críticos"
   },
   "application": {
     "message": "Aplicativo"
   },
   "atRiskPasswords": {
-    "message": "Senhas de risco"
+    "message": "Senhas em risco"
   },
   "requestPasswordChange": {
     "message": "Solicitar alteração de senha"
@@ -129,16 +260,22 @@
     "message": "Total de senhas"
   },
   "searchApps": {
-    "message": "Procurar aplicativos"
+    "message": "Buscar aplicativos"
   },
   "atRiskMembers": {
-    "message": "Membros de risco"
+    "message": "Membros em risco"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Esses membros têm acesso a itens vulneráveis de aplicativos críticos."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Membros com senhas em risco"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Membros da sua organização serão atribuídos a uma tarefa para alterar senhas vulneráveis. Eles receberão uma notificação dentro da sua extensão de navegador do Bitwarden."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ membros em risco",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -156,7 +293,7 @@
     }
   },
   "atRiskApplicationsWithCount": {
-    "message": "Aplicações em risco ($COUNT$)",
+    "message": "Aplicativos em risco ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,20 +301,20 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Esses membros estão logando em aplicativos com senhas fracas, expostas ou reutilizadas."
+  "atRiskMemberDescription": {
+    "message": "Esses membros estão se conectando a aplicativos críticos com senhas fracas, expostas, ou reutilizadas."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "Não há nenhum membro se conectando a aplicativos com senhas fracas, expostas, ou reutilizadas."
   },
   "atRiskApplicationsDescription": {
-    "message": "Esses aplicativos têm senhas fracas, expostas ou reutilizadas."
+    "message": "Esses aplicativos têm senhas fracas, expostas, ou reutilizadas."
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "Não há aplicativos com senhas fracas, expostas ou reutilizadas."
+    "message": "Não há aplicativos com senhas fracas, expostas, ou reutilizadas."
   },
   "atRiskMembersDescriptionWithApp": {
-    "message": "Esses membros estão logando no $APPNAME$ com senhas fracas, expostas ou reutilizadas.",
+    "message": "Esses membros estão se conectando a $APPNAME$ com senhas fracas, expostas, ou reutilizadas.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -198,16 +335,88 @@
     "message": "Total de membros"
   },
   "atRiskApplications": {
-    "message": "Aplicações de risco"
+    "message": "Aplicativos em risco"
   },
   "totalApplications": {
-    "message": "Todos os aplicativos"
+    "message": "Total de aplicativos"
+  },
+  "applicationsNeedingReview": {
+    "message": "Aplicativos que precisam de revisão"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Revisar aplicativos novos"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ aplicativos novos",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Revise aplicativos novos para marcar como críticos e manter sua organização segura"
+  },
+  "reviewNow": {
+    "message": "Revisar agora"
+  },
+  "allCaughtUp": {
+    "message": "Tudo pronto!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Não há aplicativos novos para revisar neste momento"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "A sua organização tem itens salvos para $COUNT$ aplicativos",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Revise os aplicativos para proteger os itens mais críticos para a segurança da sua organização"
+  },
+  "reviewApplications": {
+    "message": "Revisar aplicativos"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Priorizar aplicativos críticos"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Selecione quais aplicativos são os mais críticos para a sua organização. E então, você poderá atribuir tarefas de segurança aos membros, para se livrar dos riscos."
+  },
+  "reviewNewApplications": {
+    "message": "Revisar aplicativos novos"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Revise aplicativos novos com itens vulneráveis e marque aqueles que você gostaria de monitorar com atenção, como crítico. E então, você poderá atribuir tarefas de segurança aos membros, para se livrar de riscos."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Clique no ícone de estrela para marcar um aplicativo como crítico"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "O recurso de marcar como crítico será implementado em uma atualização futura"
+  },
+  "applicationReviewSaved": {
+    "message": "Revisão de aplicativo salva"
+  },
+  "newApplicationsReviewed": {
+    "message": "Novos aplicativos revisados"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Erro ao salvar o estado da revisão"
+  },
+  "pleaseTryAgain": {
+    "message": "Tente novamente"
   },
   "unmarkAsCritical": {
     "message": "Desmarcar como crítico"
   },
   "criticalApplicationUnmarkedSuccessfully": {
-    "message": "Successfully unmarked application as critical"
+    "message": "Aplicativo desmarcado como crítico com sucesso"
   },
   "whatTypeOfItem": {
     "message": "Que tipo de item é este?"
@@ -232,34 +441,34 @@
     "message": "Novo URI"
   },
   "username": {
-    "message": "Nome de Usuário"
+    "message": "Nome de usuário"
   },
   "password": {
     "message": "Senha"
   },
   "newPassword": {
-    "message": "Nova senha"
+    "message": "Senha nova"
   },
   "passphrase": {
-    "message": "Frase Secreta"
+    "message": "Frase secreta"
   },
   "notes": {
-    "message": "Notas"
+    "message": "Anotações"
   },
   "privateNote": {
-    "message": "Nota privada"
+    "message": "Anotação privada"
   },
   "note": {
-    "message": "Nota"
+    "message": "Anotação"
   },
   "customFields": {
-    "message": "Campos Personalizados"
+    "message": "Campos personalizados"
   },
   "cardholderName": {
     "message": "Nome do titular do cartão"
   },
   "loginCredentials": {
-    "message": "Credenciais de login"
+    "message": "Credenciais de acesso"
   },
   "personalDetails": {
     "message": "Detalhes pessoais"
@@ -274,7 +483,7 @@
     "message": "Detalhes do cartão"
   },
   "cardBrandDetails": {
-    "message": "Detalhes $BRAND$",
+    "message": "Detalhes da $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -311,7 +520,7 @@
     "message": "Adicionar site"
   },
   "deleteWebsite": {
-    "message": "Excluir site"
+    "message": "Apagar site"
   },
   "defaultLabel": {
     "message": "Padrão ($VALUE$)",
@@ -324,7 +533,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Exibir detecção de correspondência $WEBSITE$",
+    "message": "Mostrar detecção de correspondência $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -354,25 +563,25 @@
     "message": "Vencimento"
   },
   "securityCode": {
-    "message": "Código de Segurança (CVV)"
+    "message": "Código de segurança (CVV)"
   },
   "securityCodeSlashCVV": {
     "message": "Código de segurança / CVV"
   },
   "identityName": {
-    "message": "Nome de Identidade"
+    "message": "Nome da identidade"
   },
   "company": {
     "message": "Empresa"
   },
   "ssn": {
-    "message": "Cadastro de Pessoas Físicas (CPF)"
+    "message": "Número de CPF"
   },
   "passportNumber": {
-    "message": "Número do Passaporte"
+    "message": "Número do passaporte"
   },
   "licenseNumber": {
-    "message": "Número da Licença"
+    "message": "Número da licença"
   },
   "email": {
     "message": "E-mail"
@@ -429,34 +638,34 @@
     "message": "Sra"
   },
   "mx": {
-    "message": "Mx"
+    "message": "Sre"
   },
   "dr": {
     "message": "Dr"
   },
   "cardExpiredTitle": {
-    "message": "Cartão expirado"
+    "message": "Cartão vencido"
   },
   "cardExpiredMessage": {
     "message": "Se você o renovou, atualize as informações do cartão"
   },
   "expirationMonth": {
-    "message": "Mês de Vencimento"
+    "message": "Mês de vencimento"
   },
   "expirationYear": {
-    "message": "Ano de Vencimento"
+    "message": "Ano de vencimento"
   },
   "authenticatorKeyTotp": {
-    "message": "Chave de Autenticação (TOTP)"
+    "message": "Chave do autenticador (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Tornar a verificação em duas etapas fácil"
+    "message": "Torne a verificação em 2 etapas mais simples"
   },
   "totpHelper": {
     "message": "O Bitwarden pode armazenar e preencher códigos de verificação de duas etapas. Copie e cole a chave neste campo."
   },
   "totpHelperWithCapture": {
-    "message": "O Bitwarden pode armazenar e preencher códigos de verificação de duas etapas. Selecione o ícone de câmera para tirar uma captura da tela do código QR de autenticador deste site, ou copie e cole a chave neste campo."
+    "message": "O Bitwarden pode armazenar e preencher códigos de verificação de 2 etapas. Selecione o ícone da câmera e tire uma captura de tela do código QR do autenticador nesse site ou copie e cole a chave nesse campo."
   },
   "learnMoreAboutAuthenticators": {
     "message": "Saiba mais sobre os autenticadores"
@@ -471,7 +680,7 @@
     "message": "Texto"
   },
   "cfTypeHidden": {
-    "message": "Ocultado"
+    "message": "Oculto"
   },
   "cfTypeBoolean": {
     "message": "Booleano"
@@ -496,7 +705,7 @@
     "message": "Não atribuído"
   },
   "noneFolder": {
-    "message": "Nenhuma Pasta",
+    "message": "Sem pasta",
     "description": "This is the folder for uncategorized items"
   },
   "selfOwnershipLabel": {
@@ -504,10 +713,10 @@
     "description": "Used as a label to indicate that the user is the owner of an item."
   },
   "addFolder": {
-    "message": "Adicionar Pasta"
+    "message": "Adicionar pasta"
   },
   "editFolder": {
-    "message": "Editar Pasta"
+    "message": "Editar pasta"
   },
   "editWithName": {
     "message": "Editar $ITEM$: $NAME$",
@@ -529,10 +738,10 @@
     "message": "Nome da pasta"
   },
   "folderHintText": {
-    "message": "Aninhe uma pasta adicionando o nome da pasta pai seguido de uma \"/\". Exemplo: Social/Fóruns"
+    "message": "Agrupe uma pasta adicionando o nome da pasta mãe seguido de uma \"/\". Exemplo: Social/Fóruns"
   },
   "deleteFolderPermanently": {
-    "message": "Você tem certeza que deseja excluir esta pasta permanentemente?"
+    "message": "Tem certeza que quer apagar esta pasta para sempre?"
   },
   "baseDomain": {
     "message": "Domínio de base",
@@ -557,7 +766,7 @@
     "description": "A programming term, also known as 'RegEx'."
   },
   "matchDetection": {
-    "message": "Detecção de Correspondência",
+    "message": "Detecção de correspondência",
     "description": "URI match detection for auto-fill."
   },
   "defaultMatchDetection": {
@@ -568,17 +777,17 @@
     "message": "Nunca"
   },
   "toggleVisibility": {
-    "message": "Alternar Visibilidade"
+    "message": "Habilitar visibilidade"
   },
   "toggleCollapse": {
-    "message": "Alternar Colapso",
+    "message": "Guardar/mostrar",
     "description": "Toggling an expand/collapse state."
   },
   "checkPassword": {
-    "message": "Verifique se a senha foi exposta."
+    "message": "Confira se a senha foi exposta."
   },
   "passwordExposed": {
-    "message": "Esta senha foi exposta $VALUE$ vez(es) em violações de dados. Você deve alterá-la.",
+    "message": "Esta senha foi exposta $VALUE$ vez(es) em vazamentos de dados. Você deve alterá-la.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -587,7 +796,7 @@
     }
   },
   "passwordSafe": {
-    "message": "Esta senha não foi encontrada em violações de dados conhecidos. Deve ser seguro de usar."
+    "message": "Esta senha não foi encontrada em vazamentos de dados conhecidos. Deve ser segura de usar."
   },
   "save": {
     "message": "Salvar"
@@ -605,10 +814,10 @@
     "message": "Fechar"
   },
   "delete": {
-    "message": "Excluir"
+    "message": "Apagar"
   },
   "favorite": {
-    "message": "Favorito"
+    "message": "Favoritar"
   },
   "unfavorite": {
     "message": "Desfavoritar"
@@ -617,32 +826,32 @@
     "message": "Editar"
   },
   "searchCollection": {
-    "message": "Pesquisar Coleção"
+    "message": "Buscar no conjunto"
   },
   "searchFolder": {
-    "message": "Pesquisar Pasta"
+    "message": "Buscar na pasta"
   },
   "searchFavorites": {
-    "message": "Pesquisar Favoritos"
+    "message": "Buscar nos favoritos"
   },
   "searchLogin": {
-    "message": "Buscar credenciais",
+    "message": "Buscar nas credenciais",
     "description": "Search Login type"
   },
   "searchCard": {
-    "message": "Buscar cartões",
+    "message": "Buscar nos cartões",
     "description": "Search Card type"
   },
   "searchIdentity": {
-    "message": "Buscar identidades",
+    "message": "Buscar nas identidades",
     "description": "Search Identity type"
   },
   "searchSecureNote": {
-    "message": "Buscar notas seguras",
+    "message": "Buscar nas anotações seguras",
     "description": "Search Secure Note type"
   },
   "searchVault": {
-    "message": "Pesquisar no Cofre"
+    "message": "Buscar no cofre"
   },
   "searchMyVault": {
     "message": "Buscar no meu cofre"
@@ -651,20 +860,23 @@
     "message": "Buscar na organização"
   },
   "searchMembers": {
-    "message": "Buscar membros"
+    "message": "Buscar nos membros"
   },
   "searchGroups": {
-    "message": "Buscar grupos"
+    "message": "Buscar nos grupos"
   },
   "resetSearch": {
-    "message": "Redefinir busca"
+    "message": "Apagar busca"
   },
   "allItems": {
-    "message": "Todos os Itens"
+    "message": "Todos os itens"
   },
   "favorites": {
     "message": "Favoritos"
   },
+  "taskSummary": {
+    "message": "Resumo de tarefas"
+  },
   "types": {
     "message": "Tipos"
   },
@@ -678,16 +890,16 @@
     "message": "Identidade"
   },
   "typeSecureNote": {
-    "message": "Nota Segura"
+    "message": "Anotação segura"
   },
   "typeNote": {
-    "message": "Nota"
+    "message": "Anotação"
   },
   "typeSshKey": {
     "message": "Chave SSH"
   },
   "typeLoginPlural": {
-    "message": "Logins"
+    "message": "Credenciais"
   },
   "typeCardPlural": {
     "message": "Cartões"
@@ -696,25 +908,25 @@
     "message": "Identidades"
   },
   "typeSecureNotePlural": {
-    "message": "Notas Seguras"
+    "message": "Anotações seguras"
   },
   "folders": {
     "message": "Pastas"
   },
   "collections": {
-    "message": "Coleções"
+    "message": "Conjuntos"
   },
   "firstName": {
-    "message": "Primeiro Nome"
+    "message": "Primeiro nome"
   },
   "middleName": {
-    "message": "Nome do Meio"
+    "message": "Nome do meio"
   },
   "lastName": {
-    "message": "Último Nome"
+    "message": "Sobrenome"
   },
   "fullName": {
-    "message": "Nome Completo"
+    "message": "Nome completo"
   },
   "address": {
     "message": "Endereço"
@@ -735,7 +947,7 @@
     "message": "Estado"
   },
   "zipPostalCode": {
-    "message": "CEP / Código Postal"
+    "message": "CEP / Código postal"
   },
   "country": {
     "message": "País"
@@ -753,88 +965,88 @@
     "message": "Novo item"
   },
   "addItem": {
-    "message": "Adicionar Item"
+    "message": "Adicionar item"
   },
   "editItem": {
-    "message": "Editar Item"
+    "message": "Editar item"
   },
   "viewItem": {
-    "message": "Visualizar Item"
+    "message": "Ver item"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "Nova credencial",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "Novo cartão",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "Nova identidade",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "Nova anotação",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "Nova chave SSH",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Novo Send de texto",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Novo Send de arquivo",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "Editar credencial",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "Editar cartão",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "Editar identidade",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "Editar anotação",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "Editar chave SSH",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Editar Send de texto",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Editar Send de arquivo",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "Ver credencial",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "Ver cartão",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "Ver identidade",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "Ver anotação",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "Ver chave SSH",
     "description": "Header for view SSH key item type"
   },
   "new": {
@@ -851,7 +1063,7 @@
     "message": "Nome do item"
   },
   "ex": {
-    "message": "ex.",
+    "message": "p. ex.",
     "description": "Short abbreviation for 'example'."
   },
   "other": {
@@ -861,7 +1073,7 @@
     "message": "Compartilhar"
   },
   "moveToOrganization": {
-    "message": "Mover para a Organização"
+    "message": "Mover para organização"
   },
   "valueCopied": {
     "message": "$VALUE$ copiado(a)",
@@ -877,30 +1089,30 @@
     "message": "Copiado com sucesso"
   },
   "copyValue": {
-    "message": "Copiar Valor",
+    "message": "Copiar valor",
     "description": "Copy value to clipboard"
   },
   "copyPassword": {
-    "message": "Copiar Senha",
+    "message": "Copiar senha",
     "description": "Copy password to clipboard"
   },
   "copyPassphrase": {
-    "message": "Copiar senha",
+    "message": "Copiar frase secreta",
     "description": "Copy passphrase to clipboard"
   },
   "passwordCopied": {
     "message": "Senha copiada"
   },
   "copyUsername": {
-    "message": "Copiar Nome de Usuário",
+    "message": "Copiar nome do usuário",
     "description": "Copy username to clipboard"
   },
   "copyNumber": {
-    "message": "Copiar Número",
+    "message": "Copiar número",
     "description": "Copy credit card number"
   },
   "copySecurityCode": {
-    "message": "Copiar Código de Segurança",
+    "message": "Copiar código de segurança",
     "description": "Copy credit card security code (CVV)"
   },
   "copyUri": {
@@ -920,7 +1132,7 @@
     "message": "Copiar site"
   },
   "copyNotes": {
-    "message": "Copiar Notas"
+    "message": "Copiar anotações"
   },
   "copyAddress": {
     "message": "Copiar endereço"
@@ -935,13 +1147,13 @@
     "message": "Copiar empresa"
   },
   "copySSN": {
-    "message": "Cadastro de Pessoas Físicas"
+    "message": "Copiar número de CPF"
   },
   "copyPassportNumber": {
     "message": "Copiar número do passaporte"
   },
   "copyLicenseNumber": {
-    "message": "Copiar número da CNH"
+    "message": "Copiar número da licença"
   },
   "copyPrivateKey": {
     "message": "Copiar chave privada"
@@ -979,10 +1191,10 @@
     "message": "Meus itens"
   },
   "myVault": {
-    "message": "Meu Cofre"
+    "message": "Meu cofre"
   },
   "allVaults": {
-    "message": "Todos os Cofres"
+    "message": "Todos os cofres"
   },
   "vault": {
     "message": "Cofre"
@@ -991,37 +1203,37 @@
     "message": "Cofres"
   },
   "vaultItems": {
-    "message": "Itens do Cofre"
+    "message": "Itens do cofre"
   },
   "filter": {
-    "message": "Filtro"
+    "message": "Filtrar"
   },
   "deleteSelected": {
-    "message": "Excluir Selecionados"
+    "message": "Apagar selecionados"
   },
   "moveSelected": {
-    "message": "Mover Selecionados"
+    "message": "Mover selecionados"
   },
   "selectAll": {
-    "message": "Selecionar Todos"
+    "message": "Selecionar tudo"
   },
   "unselectAll": {
-    "message": "Desmarcar Todos"
+    "message": "Deselecionar tudo"
   },
   "launch": {
     "message": "Abrir"
   },
   "newAttachment": {
-    "message": "Adicionar Novo Anexo"
+    "message": "Adicionar novo anexo"
   },
   "deletedAttachment": {
-    "message": "Anexo excluído"
+    "message": "Anexo apagado"
   },
   "deleteAttachmentConfirmation": {
-    "message": "Tem certeza que deseja excluir esse anexo?"
+    "message": "Tem certeza que quer apagar este anexo?"
   },
   "attachmentSaved": {
-    "message": "O anexo foi salvo."
+    "message": "Anexo salvo"
   },
   "file": {
     "message": "Arquivo"
@@ -1036,7 +1248,7 @@
     "message": "Item adicionado"
   },
   "editedItem": {
-    "message": "Item editado"
+    "message": "Item salvo"
   },
   "movedItemToOrg": {
     "message": "$ITEMNAME$ movido para $ORGNAME$",
@@ -1070,16 +1282,16 @@
     }
   },
   "deleteItem": {
-    "message": "Excluir Item"
+    "message": "Apagar item"
   },
   "deleteFolder": {
-    "message": "Excluir pasta"
+    "message": "Apagar pasta"
   },
   "deleteAttachment": {
-    "message": "Excluir anexo"
+    "message": "Apagar anexo"
   },
   "deleteItemConfirmation": {
-    "message": "Você tem certeza que deseja enviar este item para a lixeira?"
+    "message": "Tem certeza que quer enviar este item para a lixeira?"
   },
   "deletedItem": {
     "message": "Item enviado para a lixeira"
@@ -1091,22 +1303,22 @@
     "message": "Itens movidos"
   },
   "overwritePasswordConfirmation": {
-    "message": "Você tem certeza que deseja substituir a senha atual?"
+    "message": "Tem certeza que quer substituir a senha atual?"
   },
   "editedFolder": {
-    "message": "Pasta editada"
+    "message": "Pasta salva"
   },
   "addedFolder": {
     "message": "Pasta adicionada"
   },
   "deleteFolderConfirmation": {
-    "message": "Você tem certeza que deseja excluir esta pasta?"
+    "message": "Você tem certeza que deseja apagar esta pasta?"
   },
   "deletedFolder": {
-    "message": "Pasta excluída"
+    "message": "Pasta apagada"
   },
   "editInfo": {
-    "message": "Editar info"
+    "message": "Editar informações"
   },
   "access": {
     "message": "Acesso"
@@ -1118,7 +1330,7 @@
     "message": "Acessando"
   },
   "loggedOut": {
-    "message": "Sessão encerrada"
+    "message": "Desconectado"
   },
   "loggedOutDesc": {
     "message": "Você foi desconectado de sua conta."
@@ -1127,22 +1339,22 @@
     "message": "A sua sessão expirou."
   },
   "restartRegistration": {
-    "message": "Reiniciar registro"
+    "message": "Reiniciar cadastro"
   },
   "expiredLink": {
-    "message": "Link expirado"
+    "message": "Link vencido"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Por favor, reinicie o registro ou tente fazer login."
+    "message": "Reinicie o cadastro ou tente conectar-se."
   },
   "youMayAlreadyHaveAnAccount": {
     "message": "Você pode já ter uma conta"
   },
   "logOutConfirmation": {
-    "message": "Você tem certeza que deseja sair?"
+    "message": "Tem certeza que quer se desconectar?"
   },
   "logOut": {
-    "message": "Encerrar sessão"
+    "message": "Desconectar"
   },
   "ok": {
     "message": "Ok"
@@ -1157,52 +1369,58 @@
     "message": "Localização"
   },
   "loginOrCreateNewAccount": {
-    "message": "Inicie a sessão ou crie uma nova conta para acessar seu cofre seguro."
+    "message": "Conecte-se ou crie uma conta para acessar seu cofre seguro."
   },
   "loginWithDevice": {
-    "message": "Fazer login com dispositivo"
+    "message": "Conectar-se com dispositivo"
   },
   "loginWithDeviceEnabledNote": {
-    "message": "Login com dispositivo deve ser habilitado nas configurações do aplicativo móvel do Bitwarden. Necessita de outra opção?"
+    "message": "A autenticação com dispositivo deve ser configurada nas configurações do aplicativo móvel do Bitwarden. Precisa de outra opção?"
   },
   "needAnotherOptionV1": {
     "message": "Precisa de outra opção?"
   },
   "loginWithMasterPassword": {
-    "message": "Entrar com senha mestra"
+    "message": "Conectar-se com senha principal"
   },
   "readingPasskeyLoading": {
-    "message": "Lendo a senha..."
+    "message": "Lendo a chave de acesso..."
   },
   "readingPasskeyLoadingInfo": {
     "message": "Mantenha esta janela aberta e siga as instruções do seu navegador."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "A autenticação da chave de acesso falhou. Tente novamente."
+  },
   "useADifferentLogInMethod": {
-    "message": "Use um método de login diferente"
+    "message": "Usar um método de autenticação diferente"
   },
   "logInWithPasskey": {
-    "message": "Iniciar sessão com a chave de acesso"
+    "message": "Conectar-se com chave de acesso"
   },
   "useSingleSignOn": {
-    "message": "Usar login único"
+    "message": "Usar autenticação única"
+  },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A sua organização requer o uso da autenticação única."
   },
   "welcomeBack": {
-    "message": "Bem vindo de volta"
+    "message": "Boas-vindas de volta"
   },
   "invalidPasskeyPleaseTryAgain": {
-    "message": "Senha inválida. Por favor, tente novamente."
+    "message": "Chave de acesso inválida. Tente novamente."
   },
   "twoFactorForPasskeysNotSupportedOnClientUpdateToLogIn": {
-    "message": "2FA para senhas não é suportada. Atualize o aplicativo para iniciar a sessão."
+    "message": "A 2FA não é suportada para chaves de acesso. Atualize o aplicativo para se conectar."
   },
   "loginWithPasskeyInfo": {
-    "message": "Use uma senha gerada que fará o login automaticamente sem uma senha. Biometrias como reconhecimento facial ou impressão digital, ou outro método de segurança FIDO2 verificarão sua identidade."
+    "message": "Use uma chave de acesso gerada que te conectará automaticamente sem uma senha. A biometria, como a reconhecimento facial ou impressão digital, ou outro método de segurança do FIDO2 verificarão sua identidade."
   },
   "newPasskey": {
     "message": "Nova chave de acesso"
   },
   "learnMoreAboutPasswordless": {
-    "message": "Saiba mais sobre acesso sem senha"
+    "message": "Saiba mais sobre o passwordless"
   },
   "creatingPasskeyLoading": {
     "message": "Criando chave de acesso..."
@@ -1226,10 +1444,10 @@
     "message": "Usar para criptografia do cofre"
   },
   "useForVaultEncryptionInfo": {
-    "message": "Faça login e desbloqueie em dispositivos suportados sem a sua senha mestra. Siga as instruções do seu navegador para finalizar a instalação."
+    "message": "Conecte-se e desbloqueie em dispositivos suportados sem a sua senha principal. Siga as instruções do seu navegador para finalizar a configuração."
   },
   "useForVaultEncryptionErrorReadingPasskey": {
-    "message": "Erro ao ler a senha. Tente novamente ou desmarque esta opção."
+    "message": "Erro ao ler a chave de acesso. Tente novamente ou desmarque esta opção."
   },
   "encryptionNotSupported": {
     "message": "Criptografia não suportada"
@@ -1238,13 +1456,13 @@
     "message": "Configurar criptografia"
   },
   "usedForEncryption": {
-    "message": "Usado para criptografia"
+    "message": "Usada para criptografia"
   },
   "loginWithPasskeyEnabled": {
-    "message": "Iniciar sessão com a chave de acesso ativada"
+    "message": "Autenticação com chave de acesso ativada"
   },
   "passkeySaved": {
-    "message": "$NAME$ salvo",
+    "message": "$NAME$ salva",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -1259,13 +1477,13 @@
     "message": "Remover chave de acesso"
   },
   "removePasskeyInfo": {
-    "message": "Se todas as chaves de acesso forem removidas, não será mais possível fazer login em novos dispositivos sem sua senha mestra."
+    "message": "Se todas as chaves de acesso forem removidas, não será mais possível se conectar em novos dispositivos sem sua senha principal."
   },
   "passkeyLimitReachedInfo": {
     "message": "Limite de chaves de acesso atingido. Remova uma chave de acesso para adicionar outra."
   },
   "tryAgain": {
-    "message": "Tente Novamente"
+    "message": "Tentar novamente"
   },
   "createAccount": {
     "message": "Criar conta"
@@ -1274,37 +1492,37 @@
     "message": "Novo no Bitwarden?"
   },
   "setAStrongPassword": {
-    "message": "Defina uma senha forte"
+    "message": "Configure uma senha forte"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Termine de criar a sua conta definindo uma senha"
+    "message": "Termine de criar a sua conta configurando uma senha"
   },
   "newAroundHere": {
     "message": "Novo por aqui?"
   },
   "startTrial": {
-    "message": "Iniciar Período de Testes"
+    "message": "Iniciar período de teste"
   },
   "logIn": {
-    "message": "Iniciar sessão"
+    "message": "Conectar-se"
   },
   "logInToBitwarden": {
-    "message": "Inicie a sessão no Bitwarden"
+    "message": "Conecte-se ao Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Digite o código enviado por e-mail"
+    "message": "Digite o código enviado ao seu e-mail"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Insira o código do seu aplicativo autenticador"
+    "message": "Digite o código do seu aplicativo autenticador"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Pressione seu YubiKey para autenticar"
+    "message": "Pressione sua YubiKey para autenticar-se"
   },
   "authenticationTimeout": {
-    "message": "Tempo de autenticação esgotado"
+    "message": "Tempo limite da autenticação atingido"
   },
   "authenticationSessionTimedOut": {
-    "message": "A sessão de autenticação expirou. Por favor, reinicie o processo de “login”."
+    "message": "A sessão de autenticação expirou. Reinicie o processo de autenticação."
   },
   "verifyYourIdentity": {
     "message": "Verifique sua identidade"
@@ -1313,58 +1531,58 @@
     "message": "Não reconhecemos este dispositivo. Digite o código enviado por e-mail para verificar a sua identidade."
   },
   "continueLoggingIn": {
-    "message": "Continue acessando"
+    "message": "Continuar acessando"
   },
   "whatIsADevice": {
     "message": "O que é um dispositivo?"
   },
   "aDeviceIs": {
-    "message": "Um dispositivo é uma instalação única do aplicativo Bitwarden onde você se conectou. Reinstalar, limpar dados do aplicativo ou limpar seus cookies pode resultar em um dispositivo aparecendo várias vezes."
+    "message": "Um dispositivo é uma instalação única do aplicativo do Bitwarden em qual você se conectou. Reinstalar, limpar os dados do aplicativo ou limpar seus cookies pode resultar em um dispositivo aparecendo várias vezes."
   },
   "logInInitiated": {
-    "message": "Login iniciado"
+    "message": "Autenticação iniciada"
   },
   "logInRequestSent": {
-    "message": "Pedido enviado"
+    "message": "Solicitação enviada"
   },
   "submit": {
     "message": "Enviar"
   },
   "emailAddressDesc": {
-    "message": "Você usará o seu endereço de e-mail para a iniciar sessão."
+    "message": "Você usará o seu endereço de e-mail para se conectar."
   },
   "yourName": {
     "message": "Seu nome"
   },
   "yourNameDesc": {
-    "message": "Como devemos chamá-lo?"
+    "message": "Como devemos te chamar?"
   },
   "masterPass": {
-    "message": "Senha mestra"
+    "message": "Senha principal"
   },
   "masterPassDesc": {
-    "message": "A senha mestra é a senha que você usa para acessar o seu cofre. É muito importante que você não esqueça sua senha mestra. Não há maneira de recuperar a senha caso você se esqueça."
+    "message": "A senha principal é a senha que você usa para acessar o seu cofre. É muito importante que você não esqueça sua senha principal. Não há maneira de recuperar a senha caso você se esqueça."
   },
   "masterPassImportant": {
-    "message": "Senhas mestres não podem ser recuperadas se você esquecê-la!"
+    "message": "Sua senha principal não pode ser recuperada se esquecê-la!"
   },
   "masterPassHintDesc": {
-    "message": "Uma dica de senha mestra pode ajudá-lo(a) a lembrar a senha caso você esqueça."
+    "message": "Uma dica de senha principal pode ajudá-lo(a) a lembrar a senha caso você esqueça."
   },
   "reTypeMasterPass": {
-    "message": "Digite novamente a senha mestra"
+    "message": "Redigitar senha principal"
   },
   "masterPassHint": {
-    "message": "Dica da senha mestra (opcional)"
+    "message": "Dica da senha principal (opcional)"
   },
   "newMasterPassHint": {
-    "message": "Nova dica de senha mestra (opcional)"
+    "message": "Nova dica de senha principal (opcional)"
   },
   "masterPassHintLabel": {
-    "message": "Dica da senha mestra"
+    "message": "Dica da senha principal"
   },
   "masterPassHintText": {
-    "message": "Se você esquecer sua senha, a dica da senha pode ser enviada ao seu e-mail. $CURRENT$/$MAXIMUM$ caracteres máximos.",
+    "message": "Se você esquecer sua senha, a dica da senha pode ser enviada ao seu e-mail. $CURRENT$ do máximo de $MAXIMUM$ caracteres.",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -1380,19 +1598,19 @@
     "message": "Configurações"
   },
   "accountEmail": {
-    "message": "Email da conta"
+    "message": "E-mail da conta"
   },
   "requestHint": {
-    "message": "Pedir dica"
+    "message": "Solicitar dica"
   },
   "requestPasswordHint": {
-    "message": "Dica da senha mestra"
+    "message": "Solicitar dica da senha"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Digite o endereço de e-mail da sua conta e sua dica da senha será enviada para você"
+    "message": "Digite o endereço de e-mail da sua conta e dica da sua senha será enviada para você"
   },
   "getMasterPasswordHint": {
-    "message": "Obter dica da senha mestra"
+    "message": "Receber dica da senha principal"
   },
   "emailRequired": {
     "message": "O endereço de e-mail é obrigatório."
@@ -1401,13 +1619,13 @@
     "message": "Endereço de e-mail inválido."
   },
   "masterPasswordRequired": {
-    "message": "A senha mestra é obrigatória."
+    "message": "A senha principal é obrigatória."
   },
   "confirmMasterPasswordRequired": {
-    "message": "A senha mestra é necessária."
+    "message": "É necessário redigitar a senha principal."
   },
   "masterPasswordMinlength": {
-    "message": "A senha mestra deve ter pelo menos $VALUE$ caracteres.",
+    "message": "A senha principal deve ter pelo menos $VALUE$ caracteres.",
     "description": "The Master Password must be at least a specific number of characters long.",
     "placeholders": {
       "value": {
@@ -1417,28 +1635,28 @@
     }
   },
   "masterPassDoesntMatch": {
-    "message": "A confirmação da senha mestra não corresponde."
+    "message": "A confirmação da senha principal não corresponde."
   },
   "newAccountCreated": {
-    "message": "A sua nova conta foi criada! Agora você pode iniciar a sessão."
+    "message": "A sua conta nova foi criada! Agora você pode se conectar."
   },
   "newAccountCreated2": {
-    "message": "Sua nova conta foi criada!"
+    "message": "Sua conta nova foi criada!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "Você está conectado!"
+    "message": "Você foi conectado!"
   },
   "trialAccountCreated": {
     "message": "Conta criada com sucesso."
   },
   "masterPassSent": {
-    "message": "Enviamos um e-mail com a dica da sua senha mestra."
+    "message": "Enviamos um e-mail com a dica da sua senha principal."
   },
   "unexpectedError": {
     "message": "Ocorreu um erro inesperado."
   },
   "expirationDateError": {
-    "message": "Por favor, selecione uma data de expiração que seja no futuro."
+    "message": "Selecione uma data de vencimento que seja no futuro."
   },
   "emailAddress": {
     "message": "Endereço de e-mail"
@@ -1456,7 +1674,7 @@
     "message": "Desbloquear"
   },
   "loggedInAsEmailOn": {
-    "message": "Entrou como $EMAIL$ em $HOSTNAME$.",
+    "message": "Conectado como $EMAIL$ em $HOSTNAME$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1469,10 +1687,19 @@
     }
   },
   "invalidMasterPassword": {
-    "message": "Senha mestra inválida"
+    "message": "Senha principal inválida"
+  },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Senha principal inválida. Confirme que seu e-mail está correto e que sua conta foi criada em $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
   },
   "invalidFilePassword": {
-    "message": "Senha do arquivo inválida, por favor informe a senha utilizada quando criou o arquivo de exportação."
+    "message": "Senha do arquivo inválida, informe a senha utilizada quando criou o arquivo de exportação."
   },
   "lockNow": {
     "message": "Bloquear agora"
@@ -1480,14 +1707,38 @@
   "noItemsInList": {
     "message": "Não há itens para listar."
   },
+  "noItemsInTrash": {
+    "message": "Nenhum item na lixeira"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Os itens que você apagar aparecerão aqui, e serão apagados para sempre depois de 30 dias"
+  },
+  "noItemsInVault": {
+    "message": "Nenhum item no cofre"
+  },
+  "emptyVaultDescription": {
+    "message": "O cofre protege mais do que só suas senhas. Armazene credenciais, identidades, cartões, e anotações com segurança aqui."
+  },
+  "emptyFavorites": {
+    "message": "Você não favoritou nenhum item"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Adicione itens usados frequentemente aos favoritos para acesso rápido."
+  },
+  "noSearchResults": {
+    "message": "Nenhum resultado de busca"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Limpe os filtros ou tente outro termo de busca"
+  },
   "noPermissionToViewAllCollectionItems": {
-    "message": "Você não tem permissão para visualizar todos os itens desta coleção."
+    "message": "Você não tem permissão para ver todos os itens neste conjunto."
   },
   "youDoNotHavePermissions": {
-    "message": "Você não tem permissões para essa coleção"
+    "message": "Você não tem permissões para esse conjunto"
   },
   "noCollectionsInList": {
-    "message": "Não há coleções para listar."
+    "message": "Não há conjuntos para listar."
   },
   "noGroupsInList": {
     "message": "Não há grupos para listar."
@@ -1505,7 +1756,7 @@
     "message": "Nova organização"
   },
   "noOrganizationsList": {
-    "message": "Você não pertence a nenhuma organização. Organizações permitem-lhe compartilhar itens em segurança com outros usuários."
+    "message": "Você não pertence à nenhuma organização. Organizações te permitem compartilhar itens em segurança com outros usuários."
   },
   "notificationSentDevice": {
     "message": "Uma notificação foi enviada para seu dispositivo."
@@ -1532,10 +1783,10 @@
     "message": "aplicativo web"
   },
   "notificationSentDevicePart2": {
-    "message": "Certifique-se de que a frase Biométrica corresponde à abaixo antes de aprovar."
+    "message": "Certifique-se de que a frase biométrica corresponde à de baixo antes de aprovar."
   },
   "notificationSentDeviceComplete": {
-    "message": "Desbloqueie o Bitwarden em seu dispositivo. Certifique-se de que a frase biométrica corresponda à abaixo antes de aprovar."
+    "message": "Desbloqueie o Bitwarden em seu dispositivo. Certifique-se de que a frase biométrica corresponda à de baixo antes de aprovar."
   },
   "aNotificationWasSentToYourDevice": {
     "message": "Uma notificação foi enviada para seu dispositivo."
@@ -1566,25 +1817,25 @@
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use seu código de recuperação"
+    "message": "Usar seu código de recuperação"
   },
   "insertU2f": {
-    "message": "Insira a sua chave de segurança na porta USB do seu computador. Se ele tiver um botão, toque nele."
+    "message": "Insira a sua chave de segurança na porta USB do seu computador. Se ela tiver um botão, toque nele."
   },
   "loginUnavailable": {
-    "message": "Sessão indisponível"
+    "message": "Autenticação indisponível"
   },
   "noTwoStepProviders": {
     "message": "Esta conta tem a autenticação em duas etapas ativada. No entanto, nenhum dos provedores de autenticação em duas etapas configurados são suportados por este navegador web."
   },
   "noTwoStepProviders2": {
-    "message": "Por favor utilize um navegador web suportado (tal como o Chrome) e/ou inclua provedores adicionais que são melhor suportados entre navegadores web (tal como um aplicativo de autenticação)."
+    "message": "Utilize um navegador web suportado (tal como o Chrome) e/ou inclua provedores adicionais que são melhor suportados entre navegadores web (tal como um aplicativo de autenticação)."
   },
   "twoStepOptions": {
-    "message": "Opções de login em duas etapas"
+    "message": "Opções de autenticação em duas etapas"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Selecionar método de login em duas etapas"
+    "message": "Selecionar método de autenticação em duas etapas"
   },
   "recoveryCodeTitle": {
     "message": "Código de recuperação"
@@ -1593,43 +1844,43 @@
     "message": "Chave de recuperação inválida"
   },
   "authenticatorAppTitle": {
-    "message": "Aplicativo de autenticação"
+    "message": "Aplicativo autenticador"
   },
   "authenticatorAppDescV2": {
-    "message": "Insira um código gerado por um aplicativo autenticador como o Bitwarden Authenticator.",
+    "message": "Digite um código gerado por um aplicativo autenticador como o Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
     "message": "Chave de segurança Yubico OTP"
   },
   "yubiKeyDesc": {
-    "message": "Utilize uma YubiKey para acessar a sua conta. Funciona com YubiKey 4, 4 Nano, 4C, e dispositivos NEO."
+    "message": "Utilize um dispositivo YubiKey 4, 5, ou NEO."
   },
   "duoDescV2": {
-    "message": "Insira um código gerado pelo Duo Security.",
+    "message": "Digite um código gerado pelo Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Verifique com o Duo Security utilizando o aplicativo Duo Mobile, SMS, chamada telefônica, ou chave de segurança U2F.",
+    "message": "Verifique com o Duo Security para sua organização utilizando o aplicativo Duo Mobile, SMS, chamada telefônica, ou chave de segurança U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "u2fDesc": {
-    "message": "Utilize qualquer chave de segurança ativada por FIDO U2F para acessar à sua conta."
+    "message": "Utilize qualquer chave de segurança com FIDO U2F para acessar sua conta."
   },
   "u2fTitle": {
     "message": "Chave de segurança FIDO U2F"
   },
   "webAuthnTitle": {
-    "message": "FIDO2 WebAuthn"
+    "message": "Chave de acesso"
   },
   "webAuthnDesc": {
-    "message": "Utilize qualquer chave de segurança ativada por WebAuthn para acessar a sua conta."
+    "message": "Utilize a biometria do seu dispositivo ou uma chave de segurança compatível com o FIDO2."
   },
   "webAuthnMigrated": {
-    "message": "(Migrado de FIDO)"
+    "message": "(Migrada do FIDO)"
   },
   "openInNewTab": {
-    "message": "Abrir numa nova aba"
+    "message": "Abrir em uma nova aba"
   },
   "emailTitle": {
     "message": "E-mail"
@@ -1647,13 +1898,13 @@
     "message": "Organizações"
   },
   "moveToOrgDesc": {
-    "message": "Escolha uma organização para a qual deseja mover este item. Mudar para uma organização transfere a propriedade do item para essa organização. Você não será mais o proprietário direto deste item depois que ele for movido."
+    "message": "Escolha uma organização para a qual deseja mover este item. Mover para uma organização transfere a propriedade do item para essa organização. Você não será mais o proprietário direto deste item depois que ele for movido."
   },
   "collectionsDesc": {
-    "message": "Edite as coleções com as quais este item está sendo compartilhado. Somente usuários da organização com acesso a estas coleções poderão ver esse item."
+    "message": "Edite os conjuntos com os quais este item está sendo compartilhado. Somente usuários da organização com acesso a estes conjuntos poderão ver esse item."
   },
   "deleteSelectedItemsDesc": {
-    "message": "Você selecionou $COUNT$ item(ns) para excluir. Tem certeza que deseja excluir todos estes itens?",
+    "message": "$COUNT$ item(ns) serão enviados para a lixeira.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1662,7 +1913,7 @@
     }
   },
   "deleteSelectedCollectionsDesc": {
-    "message": "$COUNT$ coleção(ões) serão excluídas permanentemente.",
+    "message": "$COUNT$ conjunto(s) serão apagadas para sempre.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1674,7 +1925,7 @@
     "message": "Tem certeza que deseja continuar?"
   },
   "moveSelectedItemsDesc": {
-    "message": "Escolha a pasta para a qual você deseja mover os $COUNT$ itens selecionados.",
+    "message": "Escolha a pasta para a qual você deseja adicionar o(s) $COUNT$ item(ns) selecionado(s).",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1686,31 +1937,31 @@
     "message": "Código de verificação (TOTP)"
   },
   "copyVerificationCode": {
-    "message": "Copiar Código de Verificação"
+    "message": "Copiar código de verificação"
   },
   "copyUuid": {
-    "message": "Copiar URL"
+    "message": "Copiar UUID"
   },
   "errorRefreshingAccessToken": {
-    "message": "Erro ao Atualizar Token"
+    "message": "Erro de recarregamento do token de acesso"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "Nenhum token de atualização ou chave de API foi encontrado. Tente sair e entrar novamente."
+    "message": "Nenhum token de atualização ou chave de API foi encontrado. Tente se desconectar e se conectar novamente."
   },
   "warning": {
-    "message": "Aviso"
+    "message": "Atenção"
   },
   "confirmVaultExport": {
-    "message": "Confirmar Exportação de Cofre"
+    "message": "Confirmar exportação do cofre"
   },
   "confirmSecretsExport": {
     "message": "Confirmar exportação de segredos"
   },
   "exportWarningDesc": {
-    "message": "Esta exportação contém os dados do seu cofre em um formato não criptografado. Você não deve armazenar ou enviar o arquivo exportado por canais inseguros (como e-mail). Exclua o arquivo imediatamente após terminar de usá-lo."
+    "message": "Esta exportação contém os dados do seu cofre em um formato não criptografado. Você não deve armazenar ou enviar o arquivo exportado por canais inseguros (como e-mail). Apague o arquivo imediatamente após terminar de usá-lo."
   },
   "exportSecretsWarningDesc": {
-    "message": "Esta exportação contém seus dados de segredos em um formato não criptografado. Você não deve armazenar ou enviar o arquivo exportado por canais inseguros (como e-mail). Exclua imediatamente após terminar de usá-lo."
+    "message": "Esta exportação contém seus dados de segredos em um formato não criptografado. Você não deve armazenar ou enviar o arquivo exportado por canais inseguros (como e-mail). Apague-o imediatamente após terminar de usá-lo."
   },
   "encExportKeyWarningDesc": {
     "message": "Esta exportação criptografa seus dados usando a chave de criptografia da sua conta. Se você rotacionar a chave de criptografia da sua conta, você deve exportar novamente, já que você não será capaz de descriptografar este arquivo de exportação."
@@ -1725,74 +1976,74 @@
     "message": "Exportar de"
   },
   "exportVault": {
-    "message": "Exportar Cofre"
+    "message": "Exportar cofre"
   },
   "exportSecrets": {
     "message": "Exportar segredos"
   },
   "fileFormat": {
-    "message": "Formato do Arquivo"
+    "message": "Formato do arquivo"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "Esta exportação de arquivo será protegida por senha e exigirá a senha do arquivo para descriptografar."
+    "message": "Este arquivo de exportação será protegido por senha e precisará da mesma para ser descriptografado."
   },
   "exportPasswordDescription": {
     "message": "Esta senha será usada para exportar e importar este arquivo"
   },
   "confirmMasterPassword": {
-    "message": "Confirme a Senha Mestra"
+    "message": "Confirmar senha principal"
   },
   "confirmFormat": {
-    "message": "Confirmar Formato"
+    "message": "Confirmar formato"
   },
   "filePassword": {
-    "message": "Senha do Arquivo"
+    "message": "Senha do arquivo"
   },
   "confirmFilePassword": {
     "message": "Confirmar senha do arquivo"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Use sua chave criptográfica da conta, derivada do nome de usuário e Senha Mestra da sua conta, para criptografar a exportação e restringir importação para apenas a conta atual do Bitwarden."
+    "message": "Use a chave de criptografia da sua conta, derivada do nome de usuário e senha principal da sua conta, para criptografar a exportação e restringir a importação para apenas a conta atual do Bitwarden."
   },
   "passwordProtectedOptionDescription": {
-    "message": "Defina uma senha para criptografar a exportação e importá-la para qualquer conta do Bitwarden usando a senha para descriptografar."
+    "message": "Configure uma senha de arquivo para criptografar a exportação e importá-la para qualquer conta do Bitwarden usando a senha para descriptografá-la."
   },
   "exportTypeHeading": {
     "message": "Tipo da exportação"
   },
   "accountRestricted": {
-    "message": "Conta restrita"
+    "message": "Restrita à conta"
   },
   "passwordProtected": {
-    "message": "Protegido por Senha"
+    "message": "Protegida por senha"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "\"Senha do arquivo\" e \"Confirmação de senha\" não correspondem."
+    "message": "\"Senha do arquivo\" e \"Confirmar senha do arquivo\" não correspondem."
   },
   "confirmVaultImport": {
-    "message": "Confirmar Importação do Cofre"
+    "message": "Confirmar importação do cofre"
   },
   "confirmVaultImportDesc": {
-    "message": "Este arquivo é protegido por senha. Por favor, digite a senha do arquivo para importar os dados."
+    "message": "Este arquivo é protegido por senha. Digite a senha do arquivo para importar os dados."
   },
   "exportSuccess": {
-    "message": "Os dados do seu cofre foram exportados."
+    "message": "Dados do cofre exportados"
   },
   "passwordGenerator": {
-    "message": "Gerador de Senha"
+    "message": "Gerador de senhas"
   },
   "minComplexityScore": {
-    "message": "Pontuação Mínima de Complexidade"
+    "message": "Pontuação mínima de complexidade"
   },
   "minNumbers": {
-    "message": "Números Mínimos"
+    "message": "Mínimo de números"
   },
   "minSpecial": {
-    "message": "Especiais Mínimos",
+    "message": "Mínimo de caracteres especiais",
     "description": "Minimum special characters"
   },
   "ambiguous": {
-    "message": "Evitar Caracteres Ambíguos",
+    "message": "Evitar caracteres ambíguos",
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
@@ -1818,27 +2069,27 @@
     "description": "deprecated. Use numbersLabel instead."
   },
   "specialCharacters": {
-    "message": "Caracteres Especiais (!@#$%^&*)"
+    "message": "Caracteres especiais (!@#$%^&*)"
   },
   "numWords": {
-    "message": "Número de Palavras"
+    "message": "Número de palavras"
   },
   "wordSeparator": {
-    "message": "Separador de Palavra"
+    "message": "Separador das palavras"
   },
   "capitalize": {
-    "message": "Iniciais em Maiúsculas",
+    "message": "Iniciais maiúsculas",
     "description": "Make the first letter of a word uppercase."
   },
   "includeNumber": {
-    "message": "Incluir Número"
+    "message": "Incluir número"
   },
   "generatorPolicyInEffect": {
-    "message": "Os requisitos de política empresarial foram aplicados às suas opções de gerador.",
+    "message": "Os requisitos da política empresarial foram aplicados às opções do seu gerador.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "passwordHistory": {
-    "message": "Histórico de Senha"
+    "message": "Histórico de senhas"
   },
   "generatorHistory": {
     "message": "Histórico do gerador"
@@ -1847,16 +2098,16 @@
     "message": "Limpar histórico do gerador"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "Se continuar, todas as entradas serão permanentemente excluídas do histórico do gerador. Tem certeza que deseja continuar?"
+    "message": "Se continuar, todos os itens serão apagados para sempre do histórico do gerador. Tem certeza que deseja continuar?"
   },
   "noPasswordsInList": {
-    "message": "Não existem senhas para listar."
+    "message": "Não há senhas para listar."
   },
   "clearHistory": {
     "message": "Limpar histórico"
   },
   "nothingToShow": {
-    "message": "Nada a mostrar"
+    "message": "Nada para mostrar"
   },
   "nothingGeneratedRecently": {
     "message": "Você não gerou nada recentemente"
@@ -1866,16 +2117,16 @@
     "description": "To clear something out. Example: To clear browser history."
   },
   "accountUpdated": {
-    "message": "Conta Atualizada"
+    "message": "Conta salva"
   },
   "changeEmail": {
-    "message": "Alterar E-mail"
+    "message": "Alterar e-mail"
   },
   "changeEmailTwoFactorWarning": {
-    "message": "Prosseguir irá alterar o endereço de e-mail da sua conta. Isso não mudará o endereço de e-mail usado para autenticação de dois fatores. Você pode alterar esse endereço de e-mail nas configurações de Login em Duas Etapas."
+    "message": "Prosseguir irá alterar o endereço de e-mail da sua conta. Isso não mudará o endereço de e-mail usado para autenticação de duas etapas. Você pode alterar esse endereço de e-mail nas configurações de autenticação de duas etapas."
   },
   "newEmail": {
-    "message": "Novo E-mail"
+    "message": "Novo e-mail"
   },
   "code": {
     "message": "Código"
@@ -1893,13 +2144,13 @@
     "message": "O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
   "changePasswordWarning": {
-    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+    "message": "Ao alterar sua senha, você precisará se conectar com a sua senha nova. Sessões ativas em outros dispositivos serão desconectadas dentro de uma hora."
   },
   "emailChanged": {
     "message": "E-mail salvo"
   },
   "logBackIn": {
-    "message": "Por favor, reinicie a sessão."
+    "message": "Conecte-se novamente."
   },
   "currentSession": {
     "message": "Sessão atual"
@@ -1908,34 +2159,31 @@
     "message": "Solicitação pendente"
   },
   "logBackInOthersToo": {
-    "message": "Por favor, reinicie a sessão. Se estiver usando outros aplicativos do Bitwarden, encerre a sessão e reinicie também."
+    "message": "Conecte-se novamente. Se estiver usando outros aplicativos do Bitwarden, desconecte-se e conecte-se neles também."
   },
   "changeMasterPassword": {
-    "message": "Alterar Senha Mestra"
+    "message": "Alterar senha principal"
   },
   "masterPasswordChanged": {
-    "message": "Senha Mestra Alterada"
+    "message": "Senha principal salva"
   },
   "currentMasterPass": {
-    "message": "Senha mestra atual"
+    "message": "Senha principal atual"
   },
   "newMasterPass": {
-    "message": "Nova senha mestra"
+    "message": "Nova senha principal"
   },
   "confirmNewMasterPass": {
-    "message": "Confirme a nova senha mestra"
+    "message": "Confirmar nova senha principal"
   },
   "encKeySettings": {
     "message": "Configurações da chave de criptografia"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritmo KDF"
-  },
   "kdfIterations": {
-    "message": "Iterações KDF"
+    "message": "Iterações da KDF"
   },
   "kdfIterationsDesc": {
-    "message": "As iterações KDF mais altas podem ajudar a proteger a sua senha mestra de ser descoberta pela força bruta de um invasor. Recomendamos um valor de $VALUE$ ou mais.",
+    "message": "Ter iterações de KDF mais altas podem ajudar a proteger a sua senha principal de ser descoberta pela força bruta de um invasor. Recomendamos um valor de $VALUE$ ou mais.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -1944,7 +2192,7 @@
     }
   },
   "kdfIterationsWarning": {
-    "message": "Configurar as suas iterações KDF muito alta pode resultar em baixo desempenho ao iniciar sessão (e desbloquear) no Bitwarden em dispositivos com CPUs mais lentas. Recomendamos que você aumente o valor em incrementos de $INCREMENT$ e, em seguida, teste em todos os seus dispositivos.",
+    "message": "Configurar as suas iterações da KDF muito altas pode resultar em baixo desempenho ao se conectar no (e desbloquear o) Bitwarden em dispositivos mais lentos ou antigos. Recomendamos que você aumente o valor em incrementos de $INCREMENT$ e, em seguida, teste em todos os seus dispositivos.",
     "placeholders": {
       "increment": {
         "content": "$1",
@@ -1953,20 +2201,17 @@
     }
   },
   "kdfMemory": {
-    "message": "Memória KDF (MB)",
+    "message": "Memória da KDF (MB)",
     "description": "Memory refers to computer memory (RAM). MB is short for megabytes."
   },
   "argon2Warning": {
-    "message": "Configurar as suas iterações KDF, memória e paralelismo muito altos pode resultar em baixo desempenho ao iniciar (e desbloquear) o Bitwarden em dispositivos mais lentos ou mais antigos. Recomendamos alterá-los individualmente em pequenos incrementos e, em seguida, testar todos os seus dispositivos."
+    "message": "Configurar valores altos para as iterações, memória, e paralelismo da KDF pode resultar em baixo desempenho ao se conectar (e desbloquear) o Bitwarden em dispositivos mais lentos ou antigos. Recomendamos alterar estes valores individualmente em incrementos pequenos, e então, testar em todos os seus dispositivos."
   },
   "kdfParallelism": {
-    "message": "Paralelismo KDF"
+    "message": "Paralelismo da KDF"
   },
   "argon2Desc": {
-    "message": "Mais iterações KDF, memória e paralelismo podem ajudar a proteger sua senha mestra de ser descoberta por força bruta por um invasor."
-  },
-  "changeKdf": {
-    "message": "Alterar KDF"
+    "message": "Mais iterações, memória, e paralelismo da KDF podem ajudar a proteger sua senha principal de ser descoberta por força bruta por um invasor."
   },
   "encKeySettingsChanged": {
     "message": "As configurações da chave de criptografia foram salvas"
@@ -1978,34 +2223,34 @@
     "message": "Desautorizar sessões"
   },
   "deauthorizeSessionsDesc": {
-    "message": "Preocupado por ter iniciado a sessão em outro dispositivo? Prossiga abaixo para desautorizar todos os computadores e dispositivos que tenha usado. Esta medida de segurança é recomendada se usou um computador público ou guardou acidentalmente a sua senha num dispositivo que não lhe pertence. Esta ação também apagará todas as sessões anteriores registadas iniciadas com autenticação em duas etapas."
+    "message": "Preocupado que sua conta esteja conectada em outro dispositivo? Prossiga abaixo para desautorizar todos os computadores e dispositivos que tenha usado. Esta medida de segurança é recomendada se usou um computador público ou salvou acidentalmente a sua senha num dispositivo que não lhe pertence. Isso também limpará todas as sessões lembradas de autenticação com duas etapas."
   },
   "deauthorizeSessionsWarning": {
-    "message": "O processo também desconectará você da sua sessão atual, exigindo que você inicie a sessão novamente. Você também será solicitado a efetuar login em duas etapas novamente, se estiver ativado. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
+    "message": "O processo também desconectará você da sua sessão atual, exigindo que você se conecte novamente. Você também será solicitado a efetuar a autenticação em duas etapas novamente, se estiver ativada. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
   "newDeviceLoginProtection": {
-    "message": "Novo login de dispositivo"
+    "message": "Autenticação de dispositivos novos"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message": "Desativar nova proteção de login de dispositivo"
+    "message": "Desativar proteção de autenticação de dispositivos novos"
   },
   "turnOnNewDeviceLoginProtection": {
-    "message": "Ative a nova proteção de login de dispositivo"
+    "message": "Ativar proteção de autenticação de dispositivos novos"
   },
   "turnOffNewDeviceLoginProtectionModalDesc": {
-    "message": "Continue abaixo para desativar os e-mails de verificação que o Bitwarden enviará quando você fizer “login” a partir de um novo dispositivo."
+    "message": "Continue abaixo para desativar os e-mails de verificação que o Bitwarden enviará quando se conectar a partir de um novo dispositivo."
   },
   "turnOnNewDeviceLoginProtectionModalDesc": {
-    "message": "Prossiga abaixo para o Bitwarden enviar e-mails de verificação quando você fizer o “login” a partir de um novo dispositivo."
+    "message": "Prossiga abaixo para que o Bitwarden envie e-mails de verificação quando você se conectar a partir de um novo dispositivo."
   },
   "turnOffNewDeviceLoginProtectionWarning": {
-    "message": "Com a nova proteção de login de dispositivo desativada, qualquer pessoa com a sua senha mestra pode acessar a sua conta de qualquer dispositivo. Para proteger sua conta sem e-mails de verificação, configure o login em duas etapas."
+    "message": "Com a proteção de autenticação de dispositivos novos desativada, qualquer um com a sua senha principal pode acessar sua conta de qualquer dispositivo. Para proteger sua conta sem e-mails de verificação, configure a autenticação em duas etapas."
   },
   "accountNewDeviceLoginProtectionSaved": {
-    "message": "Mudanças na proteção de novo “login” de dispositivo foram salvas"
+    "message": "Alterações na proteção na autenticação de dispositivos novos salvas"
   },
   "sessionsDeauthorized": {
-    "message": "Todas as Sessões Desautorizadas"
+    "message": "Todas as sessões desautorizadas"
   },
   "accountIsOwnedMessage": {
     "message": "Esta conta pertence a $ORGANIZATIONNAME$",
@@ -2020,60 +2265,60 @@
     "message": "Limpar cofre"
   },
   "purgedOrganizationVault": {
-    "message": "Cofre da organização limpado."
+    "message": "Cofre da organização limpo."
   },
   "vaultAccessedByProvider": {
     "message": "Cofre acessado pelo provedor."
   },
   "purgeVaultDesc": {
-    "message": "Continue abaixo para excluir todos os itens e pastas do seu cofre. Itens que pertencem a uma organização com a qual você compartilha não serão excluídos."
+    "message": "Continue abaixo para apagar todos os itens e pastas no seu cofre. Itens que pertencem a uma organização com a qual você compartilha não serão apagados."
   },
   "purgeOrgVaultDesc": {
-    "message": "Continue abaixo para excluir todos os itens no cofre da organização."
+    "message": "Continue abaixo para apagar todos os itens no cofre da organização."
   },
   "purgeVaultWarning": {
-    "message": "Limpando o seu cofre permanentemente. Não pode ser desfeito."
+    "message": "Limpar seu cofre é para sempre. Não pode ser desfeito."
   },
   "vaultPurged": {
-    "message": "O seu cofre foi limpo."
+    "message": "O cofre foi limpo."
   },
   "deleteAccount": {
-    "message": "Excluir a Conta"
+    "message": "Apagar conta"
   },
   "deleteAccountDesc": {
-    "message": "Prossiga abaixo para excluir sua conta e todos os dados associados."
+    "message": "Prossiga abaixo para apagar sua conta e todos os dados do cofre."
   },
   "deleteAccountWarning": {
-    "message": "A exclusão de sua conta é permanente. Não pode ser desfeito."
+    "message": "O apagamento da sua conta é permanente. Não pode ser desfeito."
   },
   "accountDeleted": {
-    "message": "Conta Excluída"
+    "message": "Conta apagada"
   },
   "accountDeletedDesc": {
-    "message": "A sua conta foi fechada e todos os dados associados foram excluídos."
+    "message": "A sua conta foi fechada e todos os dados associados foram apagados."
   },
   "deleteOrganizationWarning": {
-    "message": "A exclusão da organização é permanente. Não pode ser desfeita."
+    "message": "O apagamento da sua organização é permanente. Não pode ser desfeito."
   },
   "myAccount": {
-    "message": "Minha Conta"
+    "message": "Minha conta"
   },
   "tools": {
     "message": "Ferramentas"
   },
   "importData": {
-    "message": "Importar Dados"
+    "message": "Importar dados"
   },
   "onboardingImportDataDetailsPartOne": {
-    "message": "Se você não tem dados para importar, você pode criar uma ",
+    "message": "Se você não tem dados para importar, você pode criar um(a) ",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLink": {
-    "message": "Novo item",
+    "message": "novo item",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLoginLink": {
-    "message": "novo login",
+    "message": "nova credencial",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new login instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsPartTwoNoOrgs": {
@@ -2081,17 +2326,17 @@
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead."
   },
   "onboardingImportDataDetailsPartTwoWithOrgs": {
-    "message": " em vez disso, você pode precisar esperar até que o seu administrador confirme a sua associação à organização.",
+    "message": " em vez disso. Pode ser necessário esperar até que o seu administrador confirme a sua associação à organização.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. You may need to wait until your administrator confirms your organization membership."
   },
   "importError": {
     "message": "Erro de importação"
   },
   "importErrorDesc": {
-    "message": "Houve um problema com os dados que você tentou importar. Por favor, resolva os erros listados abaixo em seu arquivo de origem e tente novamente."
+    "message": "Houve um problema com os dados que você tentou importar. Resolva os erros listados abaixo em seu arquivo-fonte e tente novamente."
   },
   "importSuccess": {
-    "message": "Os dados foram importados com sucesso para o seu cofre."
+    "message": "Dados importados com sucesso"
   },
   "importSuccessNumberOfItems": {
     "message": "Um total de $AMOUNT$ itens foram importados.",
@@ -2115,7 +2360,7 @@
     }
   },
   "importFormatError": {
-    "message": "Os dados não estão formatados corretamente. Por favor, verifique o seu arquivo de importação e tente novamente."
+    "message": "Os dados não estão formatados corretamente. Verifique o seu arquivo de importação e tente novamente."
   },
   "importNothingError": {
     "message": "Nada foi importado."
@@ -2133,13 +2378,13 @@
     "message": "Selecione uma pasta"
   },
   "selectImportCollection": {
-    "message": "Selecione uma coleção"
+    "message": "Selecione um conjunto"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "Selecione esta opção caso queira importar os conteúdos do arquivo para um conjunto"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "Selecione esta opção caso queira importar os conteúdos do arquivo para uma pasta"
   },
   "importUnassignedItemsError": {
     "message": "Arquivo contém itens não atribuídos."
@@ -2151,7 +2396,7 @@
     "message": "Selecione o arquivo de importação"
   },
   "chooseFile": {
-    "message": "Selecionar Arquivo"
+    "message": "Selecionar arquivo"
   },
   "noFileChosen": {
     "message": "Nenhum arquivo escolhido"
@@ -2160,7 +2405,7 @@
     "message": "ou copie/cole o conteúdo do arquivo de importação"
   },
   "instructionsFor": {
-    "message": "$NAME$ instruções",
+    "message": "Instruções para $NAME$",
     "description": "The title for the import tool instructions.",
     "placeholders": {
       "name": {
@@ -2179,7 +2424,7 @@
     "message": "Personalize sua experiência no cofre web."
   },
   "preferencesUpdated": {
-    "message": "Preferências atualizadas"
+    "message": "Preferências salvas"
   },
   "language": {
     "message": "Idioma"
@@ -2188,22 +2433,22 @@
     "message": "Altere o idioma usado pelo cofre web."
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "Mostrar ícones de sites e obter URLs de alteração de senha"
   },
   "default": {
     "message": "Padrão"
   },
   "domainRules": {
-    "message": "Regras de Domínio"
+    "message": "Regras de domínios"
   },
   "domainRulesDesc": {
     "message": "Se você tiver a mesma credencial em vários domínios de sites diferentes, poderá marcar o site como \"equivalente\". Domínios \"globais\" são aqueles já criados para você pelo Bitwarden."
   },
   "globalEqDomains": {
-    "message": "Domínios Equivalentes Globais"
+    "message": "Domínios equivalentes globais"
   },
   "customEqDomains": {
-    "message": "Domínios Equivalentes Personalizados"
+    "message": "Domínios equivalentes personalizados"
   },
   "exclude": {
     "message": "Excluir"
@@ -2215,13 +2460,13 @@
     "message": "Personalizar"
   },
   "newCustomDomain": {
-    "message": "Novo Domínio Personalizado"
+    "message": "Novo domínio personalizado"
   },
   "newCustomDomainDesc": {
-    "message": "Digite uma lista de domínios separados por vírgulas. Apenas domínios \"base\" são permitidos. Não insira subdomínios. Por exemplo, digite \"google.com.br\" em vez de \"www.google.com.br\". Você também pode digitar \"androidapp://package.name\" para associar um aplicativo Android a outros domínios de site."
+    "message": "Digite uma lista de domínios separados por vírgulas. Apenas domínios \"base\" são permitidos. Não digite subdomínios. Por exemplo, digite \"google.com\" em vez de \"www.google.com\". Você também pode digitar \"androidapp://package.name\" para associar um aplicativo Android a outros domínios."
   },
   "customDomainX": {
-    "message": "Domínio Personalizado $INDEX$",
+    "message": "Domínio personalizado $INDEX$",
     "placeholders": {
       "index": {
         "content": "$1",
@@ -2230,50 +2475,50 @@
     }
   },
   "domainsUpdated": {
-    "message": "Domínios atualizados"
+    "message": "Domínios salvos"
   },
   "twoStepLogin": {
-    "message": "Login em Duas Etapas"
+    "message": "Autenticação em duas etapas"
   },
   "twoStepLoginEnforcement": {
-    "message": "Requerer Login em Duas Etapas"
+    "message": "Aplicação da autenticação em duas etapas"
   },
   "twoStepLoginDesc": {
-    "message": "Proteja a sua conta exigindo uma etapa adicional ao iniciar sessão."
+    "message": "Proteja a sua conta exigindo uma etapa adicional ao se conectar."
   },
   "twoStepLoginTeamsDesc": {
-    "message": "Ative o login em duas etapas para sua organização."
+    "message": "Ative a autenticação em duas etapas para sua organização."
   },
   "twoStepLoginEnterpriseDescStart": {
-    "message": "Reforçar as opções de login em duas etapas do Bitwarden para membros usando o ",
+    "message": "Aplique as opções de autenticação em duas etapas do Bitwarden para membros usando a ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
   },
   "twoStepLoginPolicy": {
-    "message": "Política de login em duas etapas"
+    "message": "Política de autenticação em duas etapas"
   },
   "twoStepLoginOrganizationDuoDesc": {
-    "message": "Para aplicar o Login em Duas Etapas pelo Duo, use as opções abaixo."
+    "message": "Para aplicar a autenticação em duas etapas pelo Duo, use as opções abaixo."
   },
   "twoStepLoginOrganizationSsoDesc": {
-    "message": "Se você tem SSO configurado ou planeja ter, o Login em Duas Etapas já pode ser requerido por meio do seu Provedor de Identidade."
+    "message": "Se você tem o SSO configurado ou planeja ter, a autenticação em duas etapas já pode ser aplicada por meio do seu provedor de identidade."
   },
   "twoStepLoginRecoveryWarning": {
-    "message": "A configuração de login em duas etapas pode bloqueá-lo permanentemente da sua conta no Bitwarden. Um código de recuperação permite que você acesse sua conta no caso de não poder mais usar seu provedor de login em duas etapas normalmente (exemplo: você perde seu dispositivo). O suporte do Bitwarden não será capaz de ajudá-lo se você perder o acesso à sua conta. Recomendamos que você anote ou imprima o código de recuperação e o mantenha em um lugar seguro."
+    "message": "A configuração de autenticação em duas etapas pode bloqueá-lo permanentemente da sua conta no Bitwarden. Um código de recuperação permite que você acesse sua conta no caso de não poder mais usar seu provedor de login em duas etapas normalmente (exemplo: você perde seu dispositivo). O suporte do Bitwarden não será capaz de ajudá-lo se você perder o acesso à sua conta. Recomendamos que você anote ou imprima o código de recuperação e o mantenha em um lugar seguro."
   },
   "restrictedItemTypePolicy": {
-    "message": "Remove card item type"
+    "message": "Remover tipo de item de cartão"
   },
   "restrictedItemTypePolicyDesc": {
-    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+    "message": "Não permita que membros criem cartões. Cartões existentes serão apagados automaticamente."
   },
   "restrictCardTypeImport": {
-    "message": "Cannot import card item types"
+    "message": "Não é possível importar itens do tipo cartão"
   },
   "restrictCardTypeImportDesc": {
-    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+    "message": "Uma política configurada por uma ou mais organizações impede que você importe cartões em seus cofres."
   },
   "yourSingleUseRecoveryCode": {
-    "message": "Seu código de recuperação de uso único pode ser usado para desativar o login em duas etapas no caso de você perder acesso ao seu provedor de login em duas etapas. O Bitwarden recomenda que você anote o código de recuperação e o mantenha em um lugar seguro."
+    "message": "Seu código de recuperação de uso único pode ser usado para desativar a autenticação em duas etapas no caso de você perder acesso ao seu provedor de autenticação em duas etapas. O Bitwarden recomenda que você anote o código de recuperação e o mantenha em um lugar seguro."
   },
   "viewRecoveryCode": {
     "message": "Ver código de recuperação"
@@ -2283,41 +2528,41 @@
     "description": "Two-step login providers such as YubiKey, Duo, Authenticator apps, Email, etc."
   },
   "enable": {
-    "message": "Habilitar"
+    "message": "Ativar"
   },
   "enabled": {
-    "message": "Habilitado"
+    "message": "Ativado"
   },
   "restoreAccess": {
-    "message": "Recuperar acesso"
+    "message": "Restaurar acesso"
   },
   "premium": {
     "message": "Premium",
     "description": "Premium membership"
   },
   "premiumMembership": {
-    "message": "Assinatura Premium"
+    "message": "Plano Premium"
   },
   "premiumRequired": {
-    "message": "Requer assinatura premium"
+    "message": "Requer Premium"
   },
   "premiumRequiredDesc": {
-    "message": "É necessário ter uma conta premium para usar esse recurso."
+    "message": "Um plano Premium é necessário para usar esse recurso."
   },
   "youHavePremiumAccess": {
-    "message": "Você tem acesso premium"
+    "message": "Você tem acesso Premium"
   },
   "alreadyPremiumFromOrg": {
-    "message": "Você já tem acesso às funcionalidades premium por causa de uma organização da qual é um membro."
+    "message": "Você já tem acesso às funcionalidades do Premium por causa de uma organização da qual é um membro."
   },
   "manage": {
     "message": "Gerenciar"
   },
   "manageCollection": {
-    "message": "Gerenciar Coleção"
+    "message": "Gerenciar conjunto"
   },
   "viewItems": {
-    "message": "Visualizar itens"
+    "message": "Ver itens"
   },
   "viewItemsHidePass": {
     "message": "Ver itens, senhas ocultas"
@@ -2329,10 +2574,10 @@
     "message": "Editar itens, senhas ocultas"
   },
   "disable": {
-    "message": "Desabilitar"
+    "message": "Desativar"
   },
   "orgUserDetailsNotFound": {
-    "message": "Member details not found."
+    "message": "Detalhes do membro não encontrados."
   },
   "revokeAccess": {
     "message": "Revogar acesso"
@@ -2341,13 +2586,13 @@
     "message": "Revogar"
   },
   "twoStepLoginProviderEnabled": {
-    "message": "Este provedor de login em duas etapas está ativado em sua conta."
+    "message": "Este provedor de autenticação em duas etapas está ativo em sua conta."
   },
   "twoStepLoginAuthDesc": {
-    "message": "Insira a sua senha mestra para modificar as configurações de login em duas etapas."
+    "message": "Digite a sua senha principal para modificar as configurações de autenticação em duas etapas."
   },
   "twoStepAuthenticatorInstructionPrefix": {
-    "message": "Baixe um app autenticador como"
+    "message": "Baixe um app autenticador como o"
   },
   "twoStepAuthenticatorInstructionInfix1": {
     "message": ","
@@ -2359,7 +2604,7 @@
     "message": "."
   },
   "continueToExternalUrlTitle": {
-    "message": "Continuar para $URL$?",
+    "message": "Continuar em $URL$?",
     "placeholders": {
       "url": {
         "content": "$1",
@@ -2368,16 +2613,16 @@
     }
   },
   "continueToExternalUrlDesc": {
-    "message": "Você está saindo do Bitwarden e lançando um site externo em uma nova janela."
+    "message": "Você está saindo do Bitwarden e abrindo um site externo em uma nova janela."
   },
   "twoStepContinueToBitwardenUrlTitle": {
-    "message": "Continuar para bitwarden.com?"
+    "message": "Continuar em bitwarden.com?"
   },
   "twoStepContinueToBitwardenUrlDesc": {
-    "message": "O Bitwarden Authenticator permite que você armazene as chaves de autenticador e gera códigos TOTP para fluxos de verificação de 2 etapas. Saiba mais no site bitwarden.com."
+    "message": "O Bitwarden Authenticator permite que você armazene as chaves de autenticador e gere códigos TOTP para fluxos de verificação de 2 etapas. Saiba mais no site bitwarden.com."
   },
   "twoStepAuthenticatorScanCodeV2": {
-    "message": "Escaneie o código QR abaixo com o seu aplicativo de autenticação ou insira a chave."
+    "message": "Leia o código QR abaixo com o seu app de autenticação ou cole a chave."
   },
   "twoStepAuthenticatorQRCanvasError": {
     "message": "Não foi possível carregar o código QR. Tente novamente ou use a chave abaixo."
@@ -2392,34 +2637,34 @@
     "message": "Caso você precise adicioná-lo a outro dispositivo, abaixo está o código QR (ou chave) exigido pelo aplicativo autenticador."
   },
   "twoStepDisableDesc": {
-    "message": "Tem certeza que deseja desativar este provedor de login em duas etapas?"
+    "message": "Tem certeza que deseja desativar este provedor de autenticação em duas etapas?"
   },
   "twoStepDisabled": {
-    "message": "Provedor de login em duas etapas desativado."
+    "message": "Provedor de autenticação em duas etapas desativado."
   },
   "twoFactorYubikeyAdd": {
-    "message": "Adicionar um novo Yubikey à sua conta"
+    "message": "Adicione uma nova YubiKey à sua conta"
   },
   "twoFactorYubikeyPlugIn": {
-    "message": "Conecte o YubiKey na porta USB do seu computador."
+    "message": "Conecte a YubiKey na porta USB do seu computador."
   },
   "twoFactorYubikeySelectKey": {
-    "message": "Selecione o YubiKey no primeiro campo vazio abaixo."
+    "message": "Selecione o primeiro campo vazio de entrada da YubiKey."
   },
   "twoFactorYubikeyTouchButton": {
-    "message": "Toque o botão do Yubikey."
+    "message": "Toque o botão da YubiKey."
   },
   "twoFactorYubikeySaveForm": {
     "message": "Salve o formulário."
   },
   "twoFactorYubikeyWarning": {
-    "message": "Devido as limitações da plataforma, YubiKeys não podem ser usados em todos os aplicativos do Bitwarden. Você deve habilitar outro provedor de login em duas etapas, para que você possa acessar a sua conta quando YubiKeys não puderem ser usados. Plataformas suportadas:"
+    "message": "Devido as limitações da plataforma, YubiKeys não podem ser usadas em todos os aplicativos do Bitwarden. Você deve ativar outro provedor de autenticação em duas etapas, para que você possa acessar a sua conta quando YubiKeys não puderem ser usadas. Plataformas suportadas:"
   },
   "twoFactorYubikeySupportUsb": {
-    "message": "Cofre Web, aplicativo de desktop, CLI e todas as extensões do navegador em um dispositivo com uma porta USB que pode aceitar o seu YubiKey."
+    "message": "Cofre web, aplicativo de computador, CLI, e todas as extensões de navegador em um dispositivo com uma porta USB que pode aceitar a sua YubiKey."
   },
   "twoFactorYubikeySupportMobile": {
-    "message": "Aplicativos móveis em um dispositivo com capacidades de NFC ou uma porta USB que pode aceitar o seu YubiKey."
+    "message": "Aplicativos móveis em um dispositivo com capacidades de NFC ou uma porta USB que pode aceitar a sua YubiKey."
   },
   "yubikeyX": {
     "message": "YubiKey $INDEX$",
@@ -2455,34 +2700,34 @@
     "message": "Uma das minhas chaves suporta NFC."
   },
   "twoFactorYubikeySupportsNfcDesc": {
-    "message": "Se um dos seus YubiKeys oferece suporte a NFC (como um NEO YubiKey), você será solicitado em dispositivos móveis sempre que for detectada disponibilidade de NFC."
+    "message": "Se uma das suas YubiKeys oferece suporte a NFC (como uma YubiKey NEO), você será solicitado em dispositivos móveis sempre que for detectada disponibilidade da NFC."
   },
   "yubikeysUpdated": {
-    "message": "YubiKeys atualizado"
+    "message": "YubiKeys atualizadas"
   },
   "disableAllKeys": {
     "message": "Desativar todas as chaves"
   },
   "twoFactorDuoDesc": {
-    "message": "Insira as informações do aplicativo Bitwarden no painel do administrador do Duo."
+    "message": "Digite as informações do aplicativo Bitwarden no painel de administração do Duo."
   },
   "twoFactorDuoClientId": {
-    "message": "Id do cliente"
+    "message": "ID do cliente"
   },
   "twoFactorDuoClientSecret": {
     "message": "Segredo do cliente"
   },
   "twoFactorDuoApiHostname": {
-    "message": "Nome do domínio da API"
+    "message": "Nome do servidor da API"
   },
   "twoFactorEmailDesc": {
-    "message": "Siga estas etapas para configurar o login em duas etapas com e-mail:"
+    "message": "Siga estas etapas para configurar a autenticação em duas etapas com e-mail:"
   },
   "twoFactorEmailEnterEmail": {
-    "message": "Insira o e-mail que você deseja receber o códigos de verificação"
+    "message": "Digite o e-mail que você deseja receber os códigos de verificação"
   },
   "twoFactorEmailEnterCode": {
-    "message": "Insira o código de verificação de 6 dígitos que foi enviado pro seu e-mail"
+    "message": "Digite o código de verificação de 6 dígitos que foi enviado pro seu e-mail"
   },
   "sendEmail": {
     "message": "Enviar e-mail"
@@ -2506,34 +2751,34 @@
     "message": "Dê à chave de segurança um nome amigável para identificá-la."
   },
   "twoFactorU2fPlugInReadKey": {
-    "message": "Conecte a chave de segurança na porta USB do seu computador e clique no botão \"Ler Chave\"."
+    "message": "Conecte a chave de segurança na porta USB do seu computador e clique no botão \"Ler chave\"."
   },
   "twoFactorU2fTouchButton": {
     "message": "Se a chave de segurança tiver um botão, toque nele."
   },
   "twoFactorU2fSaveForm": {
-    "message": "Salvar o formulário."
+    "message": "Salve o formulário."
   },
   "twoFactorU2fWarning": {
-    "message": "Devido as limitações da plataforma, o FIDO U2F não pode ser usado em todas as aplicações do Bitwarden. Deve configurar outro provedor de login em duas etapas para poder acessar a sua conta quando o FIDO U2F não puder ser usado. Plataformas suportadas:"
+    "message": "Devido às limitações da plataforma, o FIDO U2F não pode ser usado em todos os aplicativos do Bitwarden. Você deve configurar outro provedor de autenticação em duas etapas para poder acessar a sua conta quando o FIDO U2F não puder ser usado. Plataformas suportadas:"
   },
   "twoFactorU2fSupportWeb": {
-    "message": "Cofre web e extensões de navegador em um desktop/laptop com um navegador habilitado para U2F (Chrome, Opera, Vivaldi ou Firefox com o FIDO U2F ativado)."
+    "message": "Cofre web e extensões de navegador em um computador com um navegador que suporte U2F (Chrome, Opera, Vivaldi ou Firefox com o FIDO U2F ativado)."
   },
   "twoFactorU2fWaiting": {
-    "message": "Esperando que você toque no botão da sua chave de segurança"
+    "message": "Aguardando que você toque no botão da sua chave de segurança"
   },
   "twoFactorU2fClickSave": {
-    "message": "Clique no botão \"Salvar\" abaixo para ativar essa chave de segurança para o login em duas etapas."
+    "message": "Clique no botão de \"Salvar\" abaixo para ativar essa chave de segurança para a autenticação em duas etapas."
   },
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Houve um problema ao ler a chave de segurança. Tente novamente."
   },
   "twoFactorRecoveryYourCode": {
-    "message": "Seu código de recuperação de login em duas etapas do Bitwarden"
+    "message": "Seu código de recuperação da autenticação em duas etapas do Bitwarden"
   },
   "twoFactorRecoveryNoCode": {
-    "message": "Você ainda não habilitou nenhum provedor de login em duas etapas. Depois de ativar um provedor de login em duas etapas, você pode conferir aqui o seu código de recuperação."
+    "message": "Você ainda não ativou nenhum provedor de autenticação em duas etapas. Depois de ativar um provedor de autenticação em duas etapas, você pode conferir aqui o seu código de recuperação."
   },
   "printCode": {
     "message": "Imprimir código",
@@ -2543,24 +2788,24 @@
     "message": "Relatórios"
   },
   "reportsDesc": {
-    "message": "Identifique e feche as lacunas de segurança em suas contas online clicando nos relatórios abaixo.",
+    "message": "Identifique e resolva falhas de segurança em suas contas on-line clicando nos relatórios abaixo.",
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "orgsReportsDesc": {
-    "message": "Identifique e feche as brechas de segurança nas contas da sua organização clicando nos relatórios abaixo.",
+    "message": "Identifique e resolva falhas de segurança nas contas da sua organização clicando nos relatórios abaixo.",
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "unsecuredWebsitesReport": {
-    "message": "Relatório de sites inseguros"
+    "message": "Sites sem segurança"
   },
   "unsecuredWebsitesReportDesc": {
-    "message": "Usar sites inseguros com o esquema http:// pode ser perigoso. Se o site permitir, você deve sempre acessá-lo utilizando o esquema https:// para que a sua conexão seja criptografada."
+    "message": "URLs que começam com http:// não utilizam a melhor criptografia disponível. Mude os URIs dessas credenciais para https:// para navegação mais segura."
   },
   "unsecuredWebsitesFound": {
-    "message": "Sites inseguros encontrados"
+    "message": "Sites sem segurança encontrados"
   },
   "unsecuredWebsitesFoundReportDesc": {
-    "message": "Encontramos $COUNT$ item(ns) em seu cofre com URIs não segura(s). Se o site permitir, altere o esquema da URI para https://.",
+    "message": "Encontramos $COUNT$ itens em seu(s) $VAULT$ com URIs sem segurança. Se o site permitir, altere o esquema da URI para https://.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2573,19 +2818,19 @@
     }
   },
   "noUnsecuredWebsites": {
-    "message": "Nenhum item no seu cofre tem URIs inseguros."
+    "message": "Nenhum item no seu cofre tem URIs sem segurança."
   },
   "inactive2faReport": {
-    "message": "Relatório de 2FA Inativo"
+    "message": "Autenticação em duas etapas inativa"
   },
   "inactive2faReportDesc": {
-    "message": "A autenticação de duas etapas (2FA) é uma configuração de segurança importante que ajuda a proteger suas contas. Se o site oferecer, você deve sempre ativar a autenticação de duas etapas."
+    "message": "A autenticação em duas etapas adiciona uma camada de proteção às suas contas. Configure a autenticação em duas etapas usando o Bitwarden Authenticator para estas contas ou use um método alternativo."
   },
   "inactive2faFound": {
-    "message": "Credenciais Sem 2FA Encontradas"
+    "message": "Credenciais encontradas sem autenticação em duas etapas"
   },
   "inactive2faFoundReportDesc": {
-    "message": "Encontramos $COUNT$ site(s) no seu $VAULT$ que pode(m) não estar configurado com o login em duas etapas (de acordo com 2fa. irectory). Para proteger ainda mais essas contas, você deve configurar o login em duas etapas.",
+    "message": "Encontramos $COUNT$ site(s) em seu(s) $VAULT$ que pode(m) não estar configurado(s) com a autenticação em duas etapas (de acordo com 2fa.directory). Para proteger ainda mais essas contas, você deve configurar a autenticação em duas etapas.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2604,16 +2849,16 @@
     "message": "Instruções"
   },
   "exposedPasswordsReport": {
-    "message": "Relatório de senhas expostas"
+    "message": "Senhas expostas"
   },
   "exposedPasswordsReportDesc": {
     "message": "As senhas expostas em um vazamento de dados são alvos fáceis para os atacantes. Altere estas senhas para evitar possíveis invasões."
   },
   "exposedPasswordsFound": {
-    "message": "Senhas Expostas Encontradas"
+    "message": "Senhas expostas encontradas"
   },
   "exposedPasswordsFoundReportDesc": {
-    "message": "Encontramos no seu cofre $COUNT$ item(ns) com senha(s) que foi(ram) exposta(s) em violações de dado conhecida. Você deve alterá-las para usar uma nova senha.",
+    "message": "Encontramos $COUNT$ itens em seu(s) cofre(s) $VAULT$ com senhas expostas em vazamentos conhecidos de dados. Você deve alterá-las para uma nova senha.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2626,13 +2871,13 @@
     }
   },
   "noExposedPasswords": {
-    "message": "Nenhum item no seu cofre tem senhas que foram expostas em violações de dados conhecidas."
+    "message": "Nenhum item em seu cofre tem senhas expostas em vazamentos de dados conhecidos."
   },
   "checkExposedPasswords": {
-    "message": "Verificar Senhas Expostas"
+    "message": "Conferir senhas expostas"
   },
   "timesExposed": {
-    "message": "Vezes expostas"
+    "message": "Vezes exposta"
   },
   "exposedXTimes": {
     "message": "Exposta $COUNT$ vez(es)",
@@ -2644,16 +2889,16 @@
     }
   },
   "weakPasswordsReport": {
-    "message": "Relatório de Senhas Fracas"
+    "message": "Senhas fracas"
   },
   "weakPasswordsReportDesc": {
-    "message": "Senhas fracas podem ser facilmente descobertas por hackers e ferramentas automatizadas que são usadas para quebrar senhas. O gerador de senhas do Bitwarden pode ajudá-lo a criar senhas fortes."
+    "message": "Senhas fracas podem ser facilmente descobertas por invasores. Altere essas para senhas mais fortes usando o gerador de senha."
   },
   "weakPasswordsFound": {
-    "message": "Senhas Fracas Encontradas"
+    "message": "Senhas fracas encontradas"
   },
   "weakPasswordsFoundReportDesc": {
-    "message": "Encontramos $COUNT$ item(ns) no seu cofre com senha(s) que não é/são fortes. Você deve atualizá-las para usar senhas mais fortes.",
+    "message": "Encontramos $COUNT$ item(ns) em seu(s) $VAULT$ com senhas que não são fortes. Você deve atualizá-las para usar senhas mais fortes.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2672,16 +2917,16 @@
     "message": "Fraqueza"
   },
   "reusedPasswordsReport": {
-    "message": "Relatório de Senhas Reutilizadas"
+    "message": "Senhas reutilizadas"
   },
   "reusedPasswordsReportDesc": {
-    "message": "Se um serviço que você usa for comprometido, a reutilização da mesma senha em outro local pode permitir que hackers acessem facilmente mais de suas contas online. Você deve usar uma senha exclusiva para cada conta ou serviço."
+    "message": "Ao reutilizar senhas, fica mais fácil que um invasor entre em várias contas. Altere estas senhas para que cada uma seja única."
   },
   "reusedPasswordsFound": {
-    "message": "Senhas Reutilizadas Encontradas"
+    "message": "Senhas reutilizadas encontradas"
   },
   "reusedPasswordsFoundReportDesc": {
-    "message": "Nós encontramos $COUNT$ senha(s) que esta(ão) sendo reutilizadas no seu cofre. Você deve alterá-los para um valor único.",
+    "message": "Encontramos $COUNT$ senhas que estão sendo reutilizadas em seu(s) $VAULT$. Você deve alterá-las para um valor único.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2697,7 +2942,7 @@
     "message": "Nenhuma credencial no seu cofre tem senhas que estão sendo reutilizadas."
   },
   "timesReused": {
-    "message": "Vezes reutilizadas"
+    "message": "Vezes reutilizada"
   },
   "reusedXTimes": {
     "message": "Reutilizada $COUNT$ vez(es)",
@@ -2709,19 +2954,19 @@
     }
   },
   "dataBreachReport": {
-    "message": "Relatório de Violação de Dados"
+    "message": "Vazamento de dados"
   },
   "breachDesc": {
-    "message": "Uma \"brecha\" é um incidente em que os dados de um site foram acessados ilegalmente por hackers e liberados publicamente. Revise os tipos de dados que foram comprometidos (endereços de e-mail, senhas, cartões de crédito etc.) e tome as medidas adequadas, como a alteração de senhas."
+    "message": "Contas comprometidas podem expor sua informação pessoal. Proteja as contas vazadas ativando o 2FA ou criando uma senha mais forte."
   },
   "breachCheckUsernameEmail": {
-    "message": "Verifique qualquer nome de usuário ou endereço de e-mail que você usa."
+    "message": "Confira quaisquer nomes de usuário ou endereços de e-mail que você usa."
   },
   "checkBreaches": {
-    "message": "Verificar Brechas"
+    "message": "Conferir vazamentos"
   },
   "breachUsernameNotFound": {
-    "message": "$USERNAME$ não foi encontrado em nenhuma violação de dados conhecida.",
+    "message": "$USERNAME$ não foi encontrado em nenhum vazamento de dados conhecido.",
     "placeholders": {
       "username": {
         "content": "$1",
@@ -2730,11 +2975,11 @@
     }
   },
   "goodNews": {
-    "message": "Boas Notícias",
+    "message": "Boas notícias",
     "description": "ex. Good News, No Breached Accounts Found!"
   },
   "breachUsernameFound": {
-    "message": "$USERNAME$ foi encontrado em $COUNT$ violações de dados diferentes on-line.",
+    "message": "$USERNAME$ foi encontrado em $COUNT$ vazamentos de dados diferentes on-line.",
     "placeholders": {
       "username": {
         "content": "$1",
@@ -2747,7 +2992,7 @@
     }
   },
   "breachFound": {
-    "message": "Contas com Brechas Encontradas"
+    "message": "Contas comprometidas encontradas"
   },
   "compromisedData": {
     "message": "Dados comprometidos"
@@ -2756,13 +3001,13 @@
     "message": "Site"
   },
   "affectedUsers": {
-    "message": "Usuários Afetados"
+    "message": "Usuários afetados"
   },
   "breachOccurred": {
-    "message": "Ocorreu uma Brecha"
+    "message": "Ocorreu um vazamento"
   },
   "breachReported": {
-    "message": "Brecha Reportada"
+    "message": "Vazamento relatado"
   },
   "reportError": {
     "message": "Ocorreu um erro ao tentar carregar o relatório. Tente novamente"
@@ -2774,29 +3019,32 @@
     "message": "Plano de cobrança"
   },
   "paymentType": {
-    "message": "Tipo de Pagamento"
+    "message": "Tipo de pagamento"
   },
   "accountCredit": {
-    "message": "Crédito da Conta",
+    "message": "Crédito da conta",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
   },
   "accountBalance": {
-    "message": "Saldo da Conta",
+    "message": "Saldo da conta",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
   },
   "addCredit": {
-    "message": "Adicionar Crédito",
+    "message": "Adicionar crédito",
     "description": "Add more credit to your account's balance."
   },
   "amount": {
-    "message": "Montante",
+    "message": "Valor",
     "description": "Dollar amount, or quantity."
   },
   "creditDelayed": {
     "message": "O crédito adicionado aparecerá em sua conta após o pagamento ser totalmente processado. Alguns métodos de pagamento são mais lentos e podem levar mais tempo para processar do que outros."
   },
   "makeSureEnoughCredit": {
-    "message": "Por favor, certifique-se de que sua conta tenha crédito suficiente para esta compra. Se sua conta não tiver crédito suficiente disponível, seu método de pagamento padrão será usado para completar a diferença. Você pode adicionar crédito à sua conta na página de Cobrança."
+    "message": "Certifique-se de que sua conta tenha crédito suficiente para esta compra. Se sua conta não tiver crédito suficiente disponível, seu método de pagamento padrão será usado para completar a diferença. Você pode adicionar crédito à sua conta na página de Cobrança."
+  },
+  "notEnoughAccountCredit": {
+    "message": "Você não tem crédito suficiente na conta para esta compra. Você pode adicionar crédito à sua conta na página de Cobrança."
   },
   "creditAppliedDesc": {
     "message": "O crédito da sua conta pode ser usado para efetuar compras. Qualquer crédito disponível será automaticamente usado em faturas geradas nesta conta."
@@ -2806,34 +3054,34 @@
     "description": "Another way of saying \"Get a Premium membership\""
   },
   "premiumUpdated": {
-    "message": "Você atualizou para premium."
+    "message": "Você fez upgrade para o Premium."
   },
   "premiumUpgradeUnlockFeatures": {
-    "message": "Atualize a sua conta para uma conta premium e desbloqueie ótimos recursos adicionais."
+    "message": "Faça upgrade da sua conta para um plano Premium e desbloqueie ótimos recursos adicionais."
   },
   "premiumSignUpStorage": {
-    "message": "1 GB de armazenamento de arquivos encriptados."
+    "message": "1 GB de armazenamento criptografado para anexo de arquivos."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Opções adicionais de login em duas etapas, como YubiKey, FIDO U2F e Duo."
+    "message": "Opções de autenticação em duas etapas proprietárias como YubiKey e Duo."
   },
   "premiumSignUpEmergency": {
-    "message": "Acesso de Emergência"
+    "message": "Acesso de emergência"
   },
   "premiumSignUpReports": {
-    "message": "Higiene de senha, saúde da conta, e relatórios sobre violação de dados para manter o seu cofre seguro."
+    "message": "Higiene de senhas, saúde da conta, e relatórios sobre vazamentos de dados para manter o seu cofre seguro."
   },
   "premiumSignUpTotp": {
-    "message": "Gerador de código de verificação TOTP (2FA) para logins no seu cofre."
+    "message": "Gerador de código de verificação TOTP (2FA) para credenciais no seu cofre."
   },
   "premiumSignUpSupport": {
     "message": "Prioridade no suporte ao cliente."
   },
   "premiumSignUpFuture": {
-    "message": "Todos os recursos premium no futuro. Mais em breve!"
+    "message": "Todos as recursos do Premium no futuro. Mais em breve!"
   },
   "premiumPrice": {
-    "message": "Tudo por apenas $PRICE$ /ano!",
+    "message": "Tudo por apenas $PRICE$ por ano!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2842,7 +3090,7 @@
     }
   },
   "premiumPriceWithFamilyPlan": {
-    "message": "Seja premium por apenas $PRICE$ /ano, ou obtenha contas premium para $FAMILYPLANUSERCOUNT$ usuários e compartilhamento familiar ilimitado com um ",
+    "message": "Torne-se Premium por apenas $PRICE$ por ano, ou obtenha contas Premium para $FAMILYPLANUSERCOUNT$ usuários e compartilhamento familiar ilimitado com um ",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2855,16 +3103,16 @@
     }
   },
   "bitwardenFamiliesPlan": {
-    "message": "Bitwarden plano Família."
+    "message": "Plano Bitwarden Familías."
   },
   "addons": {
-    "message": "Complementos"
+    "message": "Extensões"
   },
   "premiumAccess": {
     "message": "Acesso Premium"
   },
   "premiumAccessDesc": {
-    "message": "Você pode adicionar acesso premium a todos os membros da sua organização por $PRICE$ /$INTERVAL$.",
+    "message": "Você pode adicionar acesso ao Premium a todos os membros da sua organização por $PRICE$ ao $INTERVAL$.",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2877,13 +3125,13 @@
     }
   },
   "additionalStorageGb": {
-    "message": "Armazenamento Adicional (GB)"
+    "message": "Armazenamento adicional (GB)"
   },
   "additionalStorageGbDesc": {
-    "message": "# de GB adicional"
+    "message": "Número de GB adicionais"
   },
   "additionalStorageIntervalDesc": {
-    "message": "Seu plano tem $SIZE$ de armazenamento criptografado de arquivos. Você pode adicionar armazenamento adicional por $PRICE$ por GB /$INTERVAL$.",
+    "message": "Seu plano vem com $SIZE$ de armazenamento criptografado de arquivos. Você pode adicionar armazenamento adicional por $PRICE$ por GB ao $INTERVAL$.",
     "placeholders": {
       "size": {
         "content": "$1",
@@ -2900,10 +3148,10 @@
     }
   },
   "showPricingSummary": {
-    "message": "Show pricing summary"
+    "message": "Mostrar resumo de preços"
   },
   "hidePricingSummary": {
-    "message": "Hide pricing summary"
+    "message": "Ocultar resumo de preços"
   },
   "summary": {
     "message": "Resumo"
@@ -2921,7 +3169,7 @@
     "message": "mês"
   },
   "monthAbbr": {
-    "message": "mês.",
+    "message": "mês",
     "description": "Short abbreviation for 'month'"
   },
   "paymentChargedAnnually": {
@@ -2940,40 +3188,40 @@
     "message": "Seu método de pagamento será cobrado por qualquer assinatura não paga."
   },
   "paymentChargedWithTrial": {
-    "message": "Seu plano vem com um teste gratuito de 7 dias. Seu cartão não será cobrado até que o período de teste termine e de forma recorrente a cada $INTERVAL$. Você pode cancelar a qualquer momento."
+    "message": "Seu plano vem com um teste grátis de 7 dias. Seu cartão não será cobrado até que o período de teste termine. Você pode cancelar a qualquer momento."
   },
   "paymentInformation": {
-    "message": "Informação de Pagamento"
+    "message": "Informações de pagamento"
   },
   "billingInformation": {
-    "message": "Informações de Pagamento"
+    "message": "Informações de cobrança"
   },
   "billingTrialSubLabel": {
-    "message": "Seu método de pagamento não será cobrado durante o teste gratuito de 7 dias."
+    "message": "Seu método de pagamento não será cobrado durante o teste grátis de 7 dias."
   },
   "creditCard": {
-    "message": "Cartão de Crédito"
+    "message": "Cartão de crédito"
   },
   "paypalClickSubmit": {
-    "message": "Clique no botão PayPal para entrar na sua conta do PayPal e, em seguida, clique no botão Enviar abaixo para continuar."
+    "message": "Clique no botão do PayPal para se conectar à sua conta do PayPal e, em seguida, clique no botão Enviar abaixo para continuar."
   },
   "cancelSubscription": {
-    "message": "Cancelar Assinatura"
+    "message": "Cancelar assinatura"
   },
   "subscriptionExpiration": {
-    "message": "Sua assinatura expirou"
+    "message": "Sua assinatura venceu"
   },
   "subscriptionCanceled": {
     "message": "A assinatura foi cancelada."
   },
   "pendingCancellation": {
-    "message": "Cancelamento Pendente"
+    "message": "Cancelamento pendente"
   },
   "subscriptionPendingCanceled": {
     "message": "A assinatura foi marcada para ser cancelada no final do período de faturamento atual."
   },
   "reinstateSubscription": {
-    "message": "Restabelecer Assinatura"
+    "message": "Restabelecer assinatura"
   },
   "reinstateConfirmation": {
     "message": "Você tem certeza que deseja remover a solicitação de cancelamento pendente e restabelecer sua assinatura?"
@@ -2985,31 +3233,40 @@
     "message": "Você tem certeza que deseja cancelar? Você perderá o acesso a todos os recursos dessa assinatura no final deste ciclo de faturamento."
   },
   "canceledSubscription": {
-    "message": "A assinatura foi cancelada."
+    "message": "Assinatura cancelada"
   },
   "neverExpires": {
-    "message": "Nunca Expirar"
+    "message": "Nunca vence"
   },
   "status": {
     "message": "Estado"
   },
   "nextCharge": {
-    "message": "Próxima Cobrança"
+    "message": "Próxima cobrança"
+  },
+  "nextChargeHeader": {
+    "message": "Próxima cobrança"
+  },
+  "plan": {
+    "message": "Plano"
   },
   "details": {
     "message": "Detalhes"
   },
+  "discount": {
+    "message": "desconto"
+  },
   "downloadLicense": {
-    "message": "Baixar Licença"
+    "message": "Baixar licença"
   },
   "viewBillingToken": {
-    "message": "Ver Token de Cobrança"
+    "message": "Ver token de faturamento"
   },
   "updateLicense": {
-    "message": "Atualizar Licença"
+    "message": "Atualizar licença"
   },
   "manageSubscription": {
-    "message": "Gerenciar Assinatura"
+    "message": "Gerenciar assinatura"
   },
   "launchCloudSubscription": {
     "message": "Iniciar Assinatura na Nuvem"
@@ -3018,13 +3275,13 @@
     "message": "Armazenamento"
   },
   "addStorage": {
-    "message": "Adicionar Armazenamento"
+    "message": "Adicionar armazenamento"
   },
   "removeStorage": {
-    "message": "Remover Armazenamento"
+    "message": "Remover armazenamento"
   },
   "subscriptionStorage": {
-    "message": "A sua assinatura tem um total de $MAX_STORAGE$ GB de armazenamento de arquivos criptografados. Você está usando $USED_STORAGE$ no momento.",
+    "message": "A sua assinatura tem um total de $MAX_STORAGE$ GB de armazenamento criptografado de arquivos. Você está usando $USED_STORAGE$ no momento.",
     "placeholders": {
       "max_storage": {
         "content": "$1",
@@ -3037,32 +3294,32 @@
     }
   },
   "paymentMethod": {
-    "message": "Forma de Pagamento"
+    "message": "Método de pagamento"
   },
   "noPaymentMethod": {
     "message": "Nenhum método de pagamento selecionado."
   },
   "addPaymentMethod": {
-    "message": "Adicionar Forma de Pagamento"
+    "message": "Adicionar método de pagamento"
   },
   "changePaymentMethod": {
-    "message": "Alterar Forma de Pagamento"
+    "message": "Alterar método de pagamento"
   },
   "invoices": {
     "message": "Faturas"
   },
   "noUnpaidInvoices": {
-    "message": "Sem faturas não pagas."
+    "message": "Nenhuma fatura sem pagar."
   },
   "noPaidInvoices": {
-    "message": "Sem faturas pagas."
+    "message": "Nenhuma fatura paga."
   },
   "paid": {
-    "message": "Pago",
+    "message": "Paga",
     "description": "Past tense status of an invoice. ex. Paid or unpaid."
   },
   "unpaid": {
-    "message": "Por pagar",
+    "message": "Não paga",
     "description": "Past tense status of an invoice. ex. Paid or unpaid."
   },
   "transactions": {
@@ -3073,7 +3330,7 @@
     "message": "Sem transações."
   },
   "chargeNoun": {
-    "message": "Carregar",
+    "message": "Cobrança",
     "description": "Noun. A charge from a payment method."
   },
   "refundNoun": {
@@ -3090,16 +3347,16 @@
     }
   },
   "gbStorageAdd": {
-    "message": "GB de Armazenamento Para Adicionar"
+    "message": "GB de armazenamento para adicionar"
   },
   "gbStorageRemove": {
-    "message": "GB de Armazenamento Para Remover"
+    "message": "GB de armazenamento para remover"
   },
   "storageAddNote": {
-    "message": "A adição de armazenamento resultará em ajustes no valor total da fatura e será cobrado imediatamente pela forma de pagamento registrada. A primeira cobrança será rateada pelo restante do ciclo de faturamento atual."
+    "message": "A adição de armazenamento resultará em ajustes no valor total da fatura e será cobrado imediatamente pela forma de pagamento cadastrada. A primeira cobrança será rateada pelo restante do ciclo de faturamento atual."
   },
   "storageRemoveNote": {
-    "message": "A remoção do armazenamento resultará em ajustes no valor total da fatura que serão divididos em sua próxima cobrança de faturamento."
+    "message": "A remoção do armazenamento resultará em ajustes no valor total da fatura que serão rateados na sua próxima cobrança de faturamento."
   },
   "adjustedStorage": {
     "message": "Ajustado $AMOUNT$ GB de armazenamento.",
@@ -3111,19 +3368,19 @@
     }
   },
   "contactSupport": {
-    "message": "Contato com o Suporte ao Cliente"
+    "message": "Contatar suporte ao cliente"
   },
   "contactSupportShort": {
-    "message": "Entrar em contato com Suporte"
+    "message": "Contatar suporte"
   },
   "updatedPaymentMethod": {
-    "message": "Atualizar forma de pagamento."
+    "message": "Método de pagamento atualizado."
   },
   "purchasePremium": {
     "message": "Comprar Premium"
   },
   "licenseFile": {
-    "message": "Arquivo de Licença"
+    "message": "Arquivo da licença"
   },
   "licenseFileDesc": {
     "message": "Seu arquivo de licença terá o nome de algo como $FILE_NAME$",
@@ -3135,49 +3392,49 @@
     }
   },
   "uploadLicenseFilePremium": {
-    "message": "Para atualizar sua conta para uma assinatura premium, você precisa fazer o upload de um arquivo de licença válido."
+    "message": "Para fazer upgrade da sua conta para um plano Premium, você precisa enviar um arquivo de licença válido."
   },
   "uploadLicenseFileOrg": {
-    "message": "Para criar uma organização hospedada localmente, você precisa fazer o upload de um arquivo de licença válido."
+    "message": "Para criar uma organização hospedada localmente, você precisa enviar um arquivo de licença válido."
   },
   "accountEmailMustBeVerified": {
     "message": "O endereço de e-mail da sua conta deve ser verificado."
   },
   "newOrganizationDesc": {
-    "message": "As organizações permitem que você compartilhe partes do seu cofre com outras pessoas, além de gerenciar usuários relacionados para uma entidade específica, como uma família, uma equipe pequena ou uma empresa grande."
+    "message": "As organizações permitem que você compartilhe partes do seu cofre com outras pessoas, além de gerenciar usuários relacionados a uma entidade específica, como uma família, uma equipe pequena, ou uma empresa grande."
   },
   "generalInformation": {
-    "message": "Informação Geral"
+    "message": "Informações gerais"
   },
   "organizationName": {
-    "message": "Nome da Organização"
+    "message": "Nome da organização"
   },
   "accountOwnedBusiness": {
-    "message": "Esta conta pertence a uma empresa."
+    "message": "Esta conta pertence à uma empresa."
   },
   "billingEmail": {
-    "message": "E-mail de Cobrança"
+    "message": "E-mail de cobrança"
   },
   "businessName": {
-    "message": "Nome da Empresa"
+    "message": "Nome da empresa"
   },
   "chooseYourPlan": {
-    "message": "Escolhe Seu Plano"
+    "message": "Escolha seu plano"
   },
   "users": {
     "message": "Usuários"
   },
   "userSeats": {
-    "message": "Vagas de Usuário"
+    "message": "Vagas de usuários"
   },
   "additionalUserSeats": {
-    "message": "Vagas de Usuário Adicionais"
+    "message": "Vagas de usuários adicionais"
   },
   "userSeatsDesc": {
-    "message": "# de assentos de usuário"
+    "message": "Número de vagas de usuário"
   },
   "userSeatsAdditionalDesc": {
-    "message": "O seu plano vem com assentos de usuário de $BASE_SEATS$. Você pode adicionar mais usuários por $SEAT_PRICE$ por usuário /mês.",
+    "message": "Seu plano vem com $BASE_SEATS$ vagas de usuário. Você pode adicionar usuários adicionais por $SEAT_PRICE$ por usuário ao mês.",
     "placeholders": {
       "base_seats": {
         "content": "$1",
@@ -3190,14 +3447,14 @@
     }
   },
   "userSeatsHowManyDesc": {
-    "message": "Quanto mais assentos de usuário você precisa? Você também pode adicionar mais assentos depois, se necessário."
+    "message": "Quanto mais vagas de usuário você precisa? Você também pode adicionar mais vagas depois, se necessário."
   },
   "planNameFree": {
     "message": "Grátis",
     "description": "Free as in 'free beer'."
   },
   "planDescFree": {
-    "message": "Para usuários de testes ou pessoais para compartilhar com $COUNT$ outro usuário.",
+    "message": "Para testes ou usuários pessoais para compartilhar com $COUNT$ outro usuário.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3206,10 +3463,10 @@
     }
   },
   "planNameFamilies": {
-    "message": "Families"
+    "message": "Famílias"
   },
   "planDescFamilies": {
-    "message": "Para uso pessoal, para compartilhar com a família & amigos."
+    "message": "Para uso pessoal, para compartilhar com a família e amigos."
   },
   "planNameTeams": {
     "message": "Equipes"
@@ -3218,7 +3475,7 @@
     "message": "Para empresas e outras organizações de equipe."
   },
   "planNameTeamsStarter": {
-    "message": "Equipes iniciates"
+    "message": "Equipes Iniciantes"
   },
   "planNameEnterprise": {
     "message": "Empresarial"
@@ -3227,7 +3484,7 @@
     "message": "Para empresas e outras organizações de grande porte."
   },
   "freeForever": {
-    "message": "Grátis para Sempre"
+    "message": "Grátis para sempre"
   },
   "includesXUsers": {
     "message": "inclui $COUNT$ usuários",
@@ -3239,7 +3496,7 @@
     }
   },
   "additionalUsers": {
-    "message": "Usuários Adicionais"
+    "message": "Usuários adicionais"
   },
   "costPerUser": {
     "message": "$COST$ por usuário",
@@ -3260,7 +3517,7 @@
     }
   },
   "limitedCollections": {
-    "message": "Limitado a $COUNT$ coleções",
+    "message": "Limitado a $COUNT$ conjuntos",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3281,10 +3538,10 @@
     "message": "Adicione e compartilhe com usuários ilimitados"
   },
   "createUnlimitedCollections": {
-    "message": "Crie Coleções ilimitadas"
+    "message": "Crie conjuntos ilimitados"
   },
   "gbEncryptedFileStorage": {
-    "message": "$SIZE$ de armazenamento encriptado",
+    "message": "$SIZE$ de armazenamento criptografado",
     "placeholders": {
       "size": {
         "content": "$1",
@@ -3293,28 +3550,28 @@
     }
   },
   "onPremHostingOptional": {
-    "message": "Hospedagem Local (opcional)"
+    "message": "Hospedagem local (opcional)"
   },
   "usersGetPremium": {
-    "message": "Usuários obtém acesso a Funcionalidades Premium"
+    "message": "Usuários recebem acesso a recursos Premium"
   },
   "controlAccessWithGroups": {
-    "message": "Controle o acesso do usuário com Grupos"
+    "message": "Controle o acesso de usuários com grupos"
   },
   "syncUsersFromDirectory": {
-    "message": "Sincronize seus usuários e Grupos de um diretório"
+    "message": "Sincronize seus usuários e grupos por um diretório"
   },
   "trackAuditLogs": {
     "message": "Acompanhe as ações do usuário com os registros de auditoria"
   },
   "enforce2faDuo": {
-    "message": "Reforçar o 2FA com o Duo"
+    "message": "Aplique o 2FA com o Duo"
   },
   "priorityCustomerSupport": {
-    "message": "Suporte prioritário ao cliente"
+    "message": "Suporte ao cliente com prioridade"
   },
   "xDayFreeTrial": {
-    "message": "Avaliação gratuita de $COUNT$ dia(s), cancele a qualquer momento",
+    "message": "Teste grátis de $COUNT$ dia(s), cancele a qualquer momento",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3332,7 +3589,7 @@
     }
   },
   "trialSecretsManagerThankYou": {
-    "message": "Obrigado por se inscrever no Bitwarden Secrets Manager para $PLAN$!",
+    "message": "Obrigado por se inscrever no Bitwarden Gerenciador de Segredos para $PLAN$!",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -3341,7 +3598,7 @@
     }
   },
   "trialPaidInfoMessage": {
-    "message": "Seu $PLAN$ de 7 dias será convertido em uma assinatura paga após 7 dias.",
+    "message": "Seu teste de 7 dias do $PLAN$ será convertido em uma assinatura paga após 7 dias.",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -3353,25 +3610,25 @@
     "message": "Enviamos um e-mail de confirmação para o e-mail de cobrança da sua equipe em "
   },
   "monthly": {
-    "message": "Mensal"
+    "message": "Mensalmente"
   },
   "annually": {
-    "message": "Anual"
+    "message": "Anualmente"
   },
   "annual": {
     "message": "Anual"
   },
   "basePrice": {
-    "message": "Preço Base"
+    "message": "Preço base"
   },
   "organizationCreated": {
-    "message": "Organização Criada"
+    "message": "Organização criada"
   },
   "organizationReadyToGo": {
     "message": "A sua nova organização está pronta!"
   },
   "organizationUpgraded": {
-    "message": "Sua organização foi atualizada."
+    "message": "Upgrade feito na organização"
   },
   "leave": {
     "message": "Sair"
@@ -3383,19 +3640,19 @@
     "message": "Você saiu da organização."
   },
   "defaultCollection": {
-    "message": "Coleção Padrão"
+    "message": "Conjunto padrão"
   },
   "getHelp": {
-    "message": "Obter Ajuda"
+    "message": "Receber ajuda"
   },
   "getApps": {
-    "message": "Obtenha os Aplicativos"
+    "message": "Baixar os apps"
   },
   "loggedInAs": {
-    "message": "Sessão iniciada como"
+    "message": "Conectado como"
   },
   "eventLogs": {
-    "message": "Registro de Eventos"
+    "message": "Registro de eventos"
   },
   "people": {
     "message": "Pessoas"
@@ -3404,28 +3661,28 @@
     "message": "Políticas"
   },
   "singleSignOn": {
-    "message": "Logon Único"
+    "message": "Autenticação única"
   },
   "editPolicy": {
-    "message": "Editar Política"
+    "message": "Editar política"
   },
   "groups": {
     "message": "Grupos"
   },
   "newGroup": {
-    "message": "Novo Grupo"
+    "message": "Novo grupo"
   },
   "addGroup": {
-    "message": "Adicionar Grupo"
+    "message": "Adicionar grupo"
   },
   "editGroup": {
-    "message": "Editar Grupo"
+    "message": "Editar grupo"
   },
   "deleteGroupConfirmation": {
-    "message": "Você tem certeza que deseja excluir este grupo?"
+    "message": "Você tem certeza que deseja apagar este grupo?"
   },
   "deleteMultipleGroupsConfirmation": {
-    "message": "Você tem certeza que deseja excluir os seguintes $QUANTITY$ grupo(s)?",
+    "message": "Você tem certeza que deseja apagar os seguintes $QUANTITY$ grupo(s)?",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -3434,58 +3691,58 @@
     }
   },
   "removeUserConfirmation": {
-    "message": "Você tem certeza que deseja remover este(a) usuário(a)?"
+    "message": "Você tem certeza que deseja remover este usuário?"
   },
   "removeOrgUserConfirmation": {
-    "message": "Quando um membro é removido, ele não tem mais acesso aos dados da organização, e esta ação é irreversível. Para adicionar o membro de volta à organização, ele deve ser convidado e integrado novamente."
+    "message": "Quando um membro é removido, ele já não mais acesso aos dados da organização, e esta ação é irreversível. Para adicionar o membro de volta à organização, ele deve ser convidado e integrado novamente."
   },
   "revokeUserConfirmation": {
-    "message": "Quando um membro é revogado, ele não tem mais acesso aos dados da organização. Para restaurar rapidamente o acesso ao membro vá para a aba Revogada."
+    "message": "Quando um membro é revogado, ele não tem mais acesso aos dados da organização. Para restaurar rapidamente o acesso do membro vá para a aba de Revogados."
   },
   "removeUserConfirmationKeyConnector": {
-    "message": "Aviso! Este usuário precisa do Conector de Chave para gerenciar sua criptografia. Remover este usuário de sua organização desativará permanentemente sua conta. Essa ação não pode ser desfeita. Você quer prosseguir?"
+    "message": "Alerta! Este usuário precisa do Key Connector para gerenciar sua criptografia. Remover este usuário de sua organização desativará permanentemente a conta dele. Essa ação não pode ser desfeita. Você quer prosseguir?"
   },
   "externalId": {
-    "message": "ID externa"
+    "message": "ID externo"
   },
   "externalIdDesc": {
-    "message": "O ID externo pode ser usado como referência ou vincular esse recurso a um sistema externo, como um diretório de usuários."
+    "message": "O ID externo pode ser usado como uma referência sem criptografia usada pelo Conector de Diretório e API do Bitwarden."
   },
   "ssoExternalId": {
-    "message": "SSO External ID"
+    "message": "ID externo do SSO"
   },
   "ssoExternalIdDesc": {
-    "message": "SSO External ID is an unencrypted reference between Bitwarden and your configured SSO provider."
+    "message": "O ID externo do SSO é uma referência não criptografada entre o Bitwarden e seu provedor de SSO configurado."
   },
   "nestCollectionUnder": {
-    "message": "Aninhar coleção em"
+    "message": "Agrupar conjunto em"
   },
   "accessControl": {
-    "message": "Controle de Acesso"
+    "message": "Controle de acesso"
   },
   "readOnly": {
-    "message": "Somente Leitura"
+    "message": "Somente leitura"
   },
   "newCollection": {
-    "message": "Nova Coleção"
+    "message": "Novo conjunto"
   },
   "addCollection": {
-    "message": "Adicionar Coleção"
+    "message": "Adicionar conjunto"
   },
   "editCollection": {
-    "message": "Editar Coleção"
+    "message": "Editar conjunto"
   },
   "collectionInfo": {
-    "message": "Informações da coleção"
+    "message": "Informações do conjunto"
   },
   "deleteCollectionConfirmation": {
-    "message": "Você tem certeza que deseja excluir esta coleção?"
+    "message": "Você tem certeza que deseja apagar este conjunto?"
   },
   "editMember": {
     "message": "Editar membro"
   },
   "fieldOnTabRequiresAttention": {
-    "message": "Um campo na aba '$TAB$' requer sua atenção.",
+    "message": "Um campo na aba de '$TAB$' requer sua atenção.",
     "placeholders": {
       "tab": {
         "content": "$1",
@@ -3497,7 +3754,7 @@
     "message": "Convide um novo usuário para sua organização digitando o endereço de e-mail da conta Bitwarden dele abaixo. Se ele não tiver uma conta no Bitwarden, ele será solicitado a criar uma nova conta."
   },
   "inviteMultipleEmailDesc": {
-    "message": "Você pode convidar até $COUNT$ usuários por vez. Utilize a vírgula para separar uma lista de endereços de e-mail.",
+    "message": "Digite até $COUNT$ e-mails, separados com vírgula.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3512,25 +3769,25 @@
     "message": "Você tem 0 convites restantes."
   },
   "userUsingTwoStep": {
-    "message": "Este usuário está usando o login em duas etapas para proteger a sua conta."
+    "message": "Este usuário está usando a autenticação em duas etapas para proteger a sua conta."
   },
   "search": {
-    "message": "Pesquisar"
+    "message": "Buscar"
   },
   "invited": {
-    "message": "Convidado"
+    "message": "Convidados"
   },
   "confirmed": {
-    "message": "Confirmado"
+    "message": "Confirmados"
   },
   "clientOwnerEmail": {
-    "message": "Email do Proprietário do Cliente"
+    "message": "Email do proprietário do cliente"
   },
   "owner": {
     "message": "Proprietário"
   },
   "ownerDesc": {
-    "message": "O maior usuário de acesso que pode gerenciar todos os aspectos da sua organização."
+    "message": "Gerencie todos os aspectos da sua organização, incluindo cobrança e assinaturas"
   },
   "clientOwnerDesc": {
     "message": "Este usuário deve ser independente do Provedor. Se o Provedor estiver desassociado da organização, este usuário manterá a propriedade da organização."
@@ -3539,28 +3796,28 @@
     "message": "Administrador"
   },
   "adminDesc": {
-    "message": " Os administradores podem acessar e gerenciar todos os itens, coleções e usuários em sua organização."
+    "message": "Gerencie o acesso à organização, todos os conjuntos, membros, relatórios, e configurações de segurança"
   },
   "user": {
     "message": "Usuário"
   },
   "userDesc": {
-    "message": "Um usuário comum com acesso às coleções da sua organização."
+    "message": "Acesse e adicione itens aos conjuntos atribuídos"
   },
   "all": {
-    "message": "Todos"
+    "message": "Tudo"
   },
   "addAccess": {
-    "message": "Adicionar Acesso"
+    "message": "Adicionar acesso"
   },
   "addAccessFilter": {
-    "message": "Adicionar Filtro de Acesso"
+    "message": "Adicionar filtro de acesso"
   },
   "refresh": {
-    "message": "Atualizar"
+    "message": "Recarregar"
   },
   "timestamp": {
-    "message": "Timestamp"
+    "message": "Horário"
   },
   "event": {
     "message": "Evento"
@@ -3569,7 +3826,7 @@
     "message": "Desconhecido"
   },
   "loadMore": {
-    "message": "Carregar Mais"
+    "message": "Carregar mais"
   },
   "mobile": {
     "message": "Celular",
@@ -3580,44 +3837,44 @@
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Área de Trabalho",
+    "message": "Computador",
     "description": "Desktop app"
   },
   "webVault": {
-    "message": "Cofre Web"
+    "message": "Cofre web"
   },
   "webApp": {
-    "message": "Web app"
+    "message": "Aplicativo web"
   },
   "cli": {
     "message": "CLI"
   },
   "bitWebVault": {
-    "message": "Cofre Web do Bitwarden"
+    "message": "Cofre web do Bitwarden"
   },
   "bitSecretsManager": {
-    "message": "Gerenciador de Segredos Bitwarden"
+    "message": "Bitwarden Gerenciador de Segredos"
   },
   "loggedIn": {
-    "message": "Conectado(a)."
+    "message": "Conectou-se"
   },
   "changedPassword": {
-    "message": "Senha da conta alterada."
+    "message": "Senha da conta alterada"
   },
   "enabledUpdated2fa": {
-    "message": "Habilitado/atualizado o login em duas etapas."
+    "message": "Autenticação em duas etapas salva"
   },
   "disabled2fa": {
-    "message": "Desabilitar login em duas etapas."
+    "message": "Autenticação em duas etapas desativada"
   },
   "recovered2fa": {
-    "message": "Conta recuperada do login em duas etapas."
+    "message": "Conta recuperada da autenticação em duas etapas."
   },
   "failedLogin": {
-    "message": "Falha na tentativa de login com senha incorreta."
+    "message": "Falha na tentativa de autenticação com senha incorreta."
   },
   "failedLogin2fa": {
-    "message": "A tentativa de login falhou com o login incorreto em duas etapas."
+    "message": "Falha na tentativa de autenticação com autenticação em duas etapas errada."
   },
   "incorrectPassword": {
     "message": "Senha incorreta"
@@ -3633,16 +3890,16 @@
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "exportedVault": {
-    "message": "Cofre exportado."
+    "message": "Cofre exportado"
   },
   "exportedOrganizationVault": {
-    "message": "Cofre da organização exportado."
+    "message": "Exportou o cofre da organização."
   },
   "editedOrgSettings": {
-    "message": "Configurações de organização editadas."
+    "message": "Editou as configurações da organização."
   },
   "createdItemId": {
-    "message": "Item criado $ID$.",
+    "message": "Criou o item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3651,7 +3908,7 @@
     }
   },
   "editedItemId": {
-    "message": "Item editado $ID$.",
+    "message": "Editou o item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3660,7 +3917,7 @@
     }
   },
   "deletedItemId": {
-    "message": "Item $ID$ enviado para lixeira.",
+    "message": "Enviou o item $ID$ para a lixeira.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3669,7 +3926,7 @@
     }
   },
   "movedItemIdToOrg": {
-    "message": "Item $ID$ movido para uma organização.",
+    "message": "Moveu o item $ID$ para uma organização.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3678,13 +3935,13 @@
     }
   },
   "viewAllLogInOptions": {
-    "message": "Ver todas as opções de “login”"
+    "message": "Ver todas as opções de autenticação"
   },
   "viewAllLoginOptions": {
-    "message": "Ver todas as opções de login"
+    "message": "Ver todas as opções de autenticação"
   },
   "viewedItemId": {
-    "message": "Item $ID$ visualizado.",
+    "message": "Visualizou o item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3693,7 +3950,7 @@
     }
   },
   "viewedPasswordItemId": {
-    "message": "Senha visualizada para o item $ID$.",
+    "message": "Visualizou a senha do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3702,7 +3959,7 @@
     }
   },
   "viewedHiddenFieldItemId": {
-    "message": "Campo oculto visualizado para o item $ID$.",
+    "message": "Visualizou o campo oculto do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3711,7 +3968,7 @@
     }
   },
   "viewedCardNumberItemId": {
-    "message": "Número do cartão visualizado para o item $ID$.",
+    "message": "Visualizou o número do cartão do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3720,7 +3977,7 @@
     }
   },
   "viewedSecurityCodeItemId": {
-    "message": "Código de segurança visualizado para o item $ID$.",
+    "message": "Visualizou o código de segurança do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3729,7 +3986,7 @@
     }
   },
   "viewCollectionWithName": {
-    "message": "Ver coleção - $NAME$",
+    "message": "Ver conjunto - $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -3747,7 +4004,7 @@
     }
   },
   "copiedPasswordItemId": {
-    "message": "Senha copiada para o item $ID$.",
+    "message": "Copiou a senha do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3756,7 +4013,7 @@
     }
   },
   "copiedHiddenFieldItemId": {
-    "message": "Campo oculto copiado para o item $ID$.",
+    "message": "Copiou o campo oculto do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3765,7 +4022,7 @@
     }
   },
   "copiedSecurityCodeItemId": {
-    "message": "Código de segurança copiado para o item $ID$.",
+    "message": "Copiou o código de segurança do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3774,7 +4031,7 @@
     }
   },
   "autofilledItemId": {
-    "message": "Item $ID$ auto-preenchido.",
+    "message": "Preencheu automaticamente o item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3783,7 +4040,7 @@
     }
   },
   "createdCollectionId": {
-    "message": "Coleção criada $ID$.",
+    "message": "Criou o conjunto $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3792,7 +4049,7 @@
     }
   },
   "editedCollectionId": {
-    "message": "Coleção editada $ID$.",
+    "message": "Editou o conjunto $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3801,10 +4058,10 @@
     }
   },
   "deletedCollections": {
-    "message": "Coleções excluídas"
+    "message": "Conjuntos apagados"
   },
   "deletedCollectionId": {
-    "message": "Coleção excluída $ID$.",
+    "message": "Apagou o conjunto $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3813,7 +4070,7 @@
     }
   },
   "editedPolicyId": {
-    "message": "Política $ID$ editada.",
+    "message": "Editou a política $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3822,7 +4079,7 @@
     }
   },
   "createdGroupId": {
-    "message": "Grupo criado $ID$.",
+    "message": "Criou o grupo $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3831,7 +4088,7 @@
     }
   },
   "editedGroupId": {
-    "message": "Grupo editado $ID$.",
+    "message": "Editou o grupo $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3840,7 +4097,7 @@
     }
   },
   "deletedGroupId": {
-    "message": "Grupo excluído $ID$.",
+    "message": "Apagou o grupo $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3849,7 +4106,7 @@
     }
   },
   "deletedManyGroups": {
-    "message": "$QUANTITY$ grupo(s) excluídos.",
+    "message": "Apagou $QUANTITY$ grupo(s).",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -3858,7 +4115,7 @@
     }
   },
   "removedUserId": {
-    "message": "Usuário removido $ID$.",
+    "message": "Removeu o usuário $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3876,7 +4133,7 @@
     }
   },
   "revokedUserId": {
-    "message": "Acesso revogado da organização para $ID$.",
+    "message": "Revogou o acesso de $ID$ à organização.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3885,7 +4142,7 @@
     }
   },
   "restoredUserId": {
-    "message": "Acesso restaurado da organização para $ID$.",
+    "message": "Restaurou o acesso de $ID$ à organização.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3903,7 +4160,7 @@
     }
   },
   "createdAttachmentForItem": {
-    "message": "Anexo criado para o item $ID$.",
+    "message": "Criou anexo para o item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3912,7 +4169,7 @@
     }
   },
   "deletedAttachmentForItem": {
-    "message": "Anexo excluído para o item $ID$.",
+    "message": "Apagou anexo do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3921,7 +4178,7 @@
     }
   },
   "editedCollectionsForItem": {
-    "message": "Coleção editada para o item $ID$.",
+    "message": "Editou conjuntos do item $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3930,7 +4187,7 @@
     }
   },
   "invitedUserId": {
-    "message": "Usuário(a) convidado(a) $ID$.",
+    "message": "Convidou o usuário $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3939,7 +4196,7 @@
     }
   },
   "confirmedUserId": {
-    "message": "Usuário(a) confirmado(a) $ID$.",
+    "message": "Confirmou o usuário $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3948,7 +4205,7 @@
     }
   },
   "editedUserId": {
-    "message": "Usuário(a) editado(a) $ID$.",
+    "message": "Editou o usuário $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3957,7 +4214,7 @@
     }
   },
   "editedGroupsForUser": {
-    "message": "Grupo editado para usuário(a) $ID$.",
+    "message": "Editou grupos para o usuário $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3966,10 +4223,10 @@
     }
   },
   "unlinkedSso": {
-    "message": "SSO desvinculado."
+    "message": "Desvinculou o SSO."
   },
   "unlinkedSsoUser": {
-    "message": "SSO desvinculado para o usuário $ID$.",
+    "message": "Desvinculou o SSO para o usuário $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3978,7 +4235,7 @@
     }
   },
   "createdOrganizationId": {
-    "message": "A organização $ID$ foi criada.",
+    "message": "Criou a organização $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3987,7 +4244,7 @@
     }
   },
   "addedOrganizationId": {
-    "message": "A organização $ID$ foi adicionada.",
+    "message": "Adicionou a organização $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3996,7 +4253,7 @@
     }
   },
   "removedOrganizationId": {
-    "message": "Organização $ID$ removida.",
+    "message": "Removeu a organização $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4005,7 +4262,7 @@
     }
   },
   "accessedClientVault": {
-    "message": "Cofre da organização $ID$ acessado.",
+    "message": "Acessou o cofre da organização $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4017,22 +4274,22 @@
     "message": "Dispositivo"
   },
   "loginStatus": {
-    "message": "Status do login"
+    "message": "Estado de autenticação"
   },
   "firstLogin": {
     "message": "Primeiro acesso"
   },
   "trusted": {
-    "message": "Confiável"
+    "message": "Confiado"
   },
   "needsApproval": {
     "message": "Precisa de aprovação"
   },
   "areYouTryingtoLogin": {
-    "message": "Você está tentando fazer login?"
+    "message": "Você está tentando se conectar?"
   },
   "logInAttemptBy": {
-    "message": "Tentativa de login por $EMAIL$",
+    "message": "Tentativa de acesso por $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4041,10 +4298,10 @@
     }
   },
   "deviceType": {
-    "message": "Tipo de dispositivo"
+    "message": "Tipo do dispositivo"
   },
   "ipAddress": {
-    "message": "Endereço IP"
+    "message": "Endereço de IP"
   },
   "confirmLogIn": {
     "message": "Confirmar acesso"
@@ -4053,10 +4310,10 @@
     "message": "Negar acesso"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "Este pedido não é mais válido."
+    "message": "Esta solicitação não é mais válida."
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "Solicitação de autenticação aprovada para $EMAIL$ em $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4069,13 +4326,13 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "Você negou uma tentativa de autenticação de outro dispositivo. Se era você, tente se conectar com o dispositivo novamente."
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "O pedido de login já expirou."
+    "message": "A solicitação de autenticação já expirou."
   },
   "justNow": {
-    "message": "Agora mesmo"
+    "message": "Agora há pouco"
   },
   "requestedXMinutesAgo": {
     "message": "Solicitado há $MINUTES$ minutos",
@@ -4090,19 +4347,19 @@
     "message": "Criando conta em"
   },
   "checkYourEmail": {
-    "message": "Verifique seu e-mail"
+    "message": "Confira seu e-mail"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Siga o link no e-mail enviado para"
+    "message": "Abra o link no e-mail enviado para"
   },
   "andContinueCreatingYourAccount": {
     "message": "e continue criando a sua conta."
   },
   "noEmail": {
-    "message": "Sem e-mail?"
+    "message": "Nenhum e-mail?"
   },
   "goBack": {
-    "message": "Voltar"
+    "message": "Volte"
   },
   "toEditYourEmailAddress": {
     "message": "para editar o seu endereço de e-mail."
@@ -4117,28 +4374,28 @@
     "message": "Ocorreu um erro."
   },
   "userAccess": {
-    "message": "Acesso de Usuário"
+    "message": "Acesso do usuário"
   },
   "userType": {
-    "message": "Tipo de Usuário"
+    "message": "Tipo do usuário"
   },
   "groupAccess": {
-    "message": "Grupo de Acesso"
+    "message": "Acesso a grupos"
   },
   "groupAccessUserDesc": {
-    "message": "Edite os grupos aos quais este usuário pertence."
+    "message": "Conceda acesso ao membro a conjuntos adicionado-o a um ou mais grupos."
   },
   "invitedUsers": {
-    "message": "Usuário(a)(s) convidado(a)(s)."
+    "message": "Usuário(s) convidado(s)"
   },
   "resendInvitation": {
-    "message": "Reenviar o Convite"
+    "message": "Reenviar convite"
   },
   "resendEmail": {
-    "message": "Reenviar E-mail"
+    "message": "Reenviar e-mail"
   },
   "hasBeenReinvited": {
-    "message": "$USER$ foi convidado(a).",
+    "message": "$USER$ reconvidado",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -4150,10 +4407,10 @@
     "message": "Confirmar"
   },
   "confirmUser": {
-    "message": "Confirmar Usuário"
+    "message": "Confirmar usuário"
   },
   "hasBeenConfirmed": {
-    "message": "$USER$ foi confirmado(a).",
+    "message": "$USER$ confirmado.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -4162,64 +4419,91 @@
     }
   },
   "confirmUsers": {
-    "message": "Confirmar Usuários"
+    "message": "Confirmar membros"
   },
   "usersNeedConfirmed": {
-    "message": "Você tem usuários que aceitaram o convite, mas ainda precisam ser confirmados. Os usuários não terão acesso à organização até que sejam confirmados."
+    "message": "Você tem membros que aceitaram o convite, mas ainda precisam ser confirmados. Os usuários não terão acesso à organização até que sejam confirmados."
   },
   "startDate": {
-    "message": "Data de Início"
+    "message": "Data de início"
   },
   "endDate": {
-    "message": "Data do Término"
+    "message": "Data de término"
   },
   "verifyEmail": {
-    "message": "Verificar E-mail"
+    "message": "Verificar e-mail"
   },
   "verifyEmailDesc": {
-    "message": "Confirme o endereço de e-mail da sua conta para desbloquear o acesso a todos os recursos."
+    "message": "Verifique o endereço de e-mail da sua conta para desbloquear o acesso a todos os recursos."
   },
   "verifyEmailFirst": {
-    "message": "Primeiro, o endereço de e-mail da sua conta precisa ser confirmado."
+    "message": "Primeiro, o endereço de e-mail da sua conta precisa ser verificado."
   },
   "checkInboxForVerification": {
-    "message": "Verifique sua caixa de entrada do e-mail para obter o código de verificação."
+    "message": "Confira sua caixa de entrada do e-mail por um link de verificação."
   },
   "emailVerified": {
-    "message": "O seu e-mail foi verificado."
+    "message": "E-mail da conta verificado"
   },
   "emailVerifiedV2": {
     "message": "E-mail verificado"
   },
   "emailVerifiedFailed": {
-    "message": "Não é possível confirmar o seu e-mail. Tente enviar um novo e-mail de verificação."
+    "message": "Não é possível verificar o seu e-mail. Tente enviar um novo e-mail de verificação."
   },
   "emailVerificationRequired": {
-    "message": "Verificação de E-mail Necessária"
+    "message": "Verificação de e-mail necessária"
   },
   "emailVerificationRequiredDesc": {
     "message": "Você precisa verificar o seu e-mail para usar este recurso."
   },
   "updateBrowser": {
-    "message": "Atualizar Navegador"
+    "message": "Atualizar navegador"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Gerando sua Inteligência de Acesso..."
+  },
+  "fetchingMemberData": {
+    "message": "Buscando dados de membros..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analisando saúde das senhas..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculando pontuações de risco..."
+  },
+  "generatingReportData": {
+    "message": "Gerando dados do relatório..."
+  },
+  "savingReport": {
+    "message": "Salvando relatório..."
+  },
+  "compilingInsights": {
+    "message": "Compilando conhecimentos..."
+  },
+  "loadingProgress": {
+    "message": "Progresso de carregamento"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Isto pode levar alguns minutos."
+  },
+  "riskInsightsRunReport": {
+    "message": "Executar relatório"
   },
   "updateBrowserDesc": {
-    "message": "Você está usando um navegador da Web não suportado. O cofre web pode não funcionar corretamente."
+    "message": "Você está usando um navegador da web não suportado. O cofre web pode não funcionar corretamente."
   },
   "youHaveAPendingLoginRequest": {
-    "message": "Você tem uma solicitação de login pendente de outro dispositivo."
+    "message": "Você tem uma solicitação de autenticação pendente de outro dispositivo."
   },
   "reviewLoginRequest": {
-    "message": "Revisar solicitação de login"
+    "message": "Revisar solicitação de autenticação"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "Solicitação de autenticação"
   },
   "freeTrialEndPromptCount": {
-    "message": "Seu teste gratuito termina em $COUNT$ dias.",
+    "message": "Seu teste grátis termina em $COUNT$ dias.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4228,7 +4512,7 @@
     }
   },
   "freeTrialEndPromptMultipleDays": {
-    "message": "$ORGANIZATION$, seu período de teste gratuito termina em $COUNT$ dias.",
+    "message": "$ORGANIZATION$, seu teste grátis termina em $COUNT$ dias.",
     "placeholders": {
       "count": {
         "content": "$2",
@@ -4241,7 +4525,7 @@
     }
   },
   "freeTrialEndPromptTomorrow": {
-    "message": "$ORGANIZATION$, o seu teste gratuito termina amanhã.",
+    "message": "$ORGANIZATION$, o seu teste grátis termina amanhã.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4250,10 +4534,10 @@
     }
   },
   "freeTrialEndPromptTomorrowNoOrgName": {
-    "message": "Seu teste gratuito termina amanhã."
+    "message": "Seu teste grátis termina amanhã."
   },
   "freeTrialEndPromptToday": {
-    "message": "$ORGANIZATION$, seu período de teste gratuito termina hoje.",
+    "message": "$ORGANIZATION$, seu teste grátis termina hoje.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4262,16 +4546,16 @@
     }
   },
   "freeTrialEndingTodayWithoutOrgName": {
-    "message": "Seu teste gratuito termina hoje."
+    "message": "Seu teste grátis termina hoje."
   },
   "clickHereToAddPaymentMethod": {
     "message": "Clique aqui para adicionar um método de pagamento."
   },
   "joinOrganization": {
-    "message": "Junte-se a Organização"
+    "message": "Juntar-se à organização"
   },
   "joinOrganizationName": {
-    "message": "Entrar em $ORGANIZATIONNAME$",
+    "message": "Juntar-se à $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -4280,25 +4564,25 @@
     }
   },
   "joinOrganizationDesc": {
-    "message": "Você foi convidado para participar da organização listada acima. Para aceitar o convite, você precisa iniciar sessão ou criar uma nova conta no Bitwarden."
+    "message": "Você foi convidado para participar da organização listada acima. Para aceitar o convite, você precisa se conectar ou criar uma nova conta no Bitwarden."
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Termine de juntar-se nessa organização definindo uma senha mestra."
+    "message": "Termine de juntar-se à organização configurando uma senha principal."
   },
   "inviteAccepted": {
-    "message": "Convite Aceito"
+    "message": "Convite aceito"
   },
-  "inviteAcceptedDesc": {
-    "message": "Você pode acessar essa organização quando um administrador confirmar sua associação. Enviaremos um e-mail quando isso acontecer."
+  "invitationAcceptedDesc": {
+    "message": "Seu convite foi aceito com sucesso."
   },
   "inviteInitAcceptedDesc": {
-    "message": "Você agora pode acessar esta organização."
+    "message": "Agora, você pode acessar esta organização."
   },
   "inviteAcceptFailed": {
     "message": "Não é possível aceitar o convite. Peça a um administrador da organização para enviar um novo convite."
   },
   "inviteAcceptFailedShort": {
-    "message": "Não foi possível aceitar o convite. $DESCRIPTION$",
+    "message": "Não é possível aceitar o convite. $DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
@@ -4310,43 +4594,43 @@
     "message": "Lembrar e-mail"
   },
   "recoverAccountTwoStepDesc": {
-    "message": "Se você não puder acessar sua conta por meio de seus métodos normais de login em duas etapas, poderá usar seu código de recuperação de login em duas etapas para desativar a funcionalidade de duas etapas da sua conta."
+    "message": "Se você não puder acessar sua conta por meio de seus métodos normais de autenticação em duas etapas, poderá usar seu código de recuperação para desativar todos os provedores de duas etapas da sua conta."
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
-    "message": "Faça o login abaixo usando seu código de recuperação de uso único. Isso irá desativar todos os provedores de duas etapas na sua conta."
+    "message": "Conecte-se abaixo usando seu código de recuperação de uso único. Isso irá desativar todos os provedores de duas etapas na sua conta."
   },
   "recoverAccountTwoStep": {
-    "message": "Recuperar login em duas etapas da conta"
+    "message": "Recuperar autenticação em duas etapas da conta"
   },
   "twoStepRecoverDisabled": {
-    "message": "O login em duas etapas foi desativado em sua conta."
+    "message": "A autenticação em duas etapas foi desativada da sua conta."
   },
   "learnMore": {
     "message": "Saiba mais"
   },
   "deleteRecoverDesc": {
-    "message": "Insira seu endereço de e-mail abaixo para recuperar e excluir sua conta."
+    "message": "Digite seu endereço de e-mail abaixo para recuperar e apagar sua conta."
   },
   "deleteRecoverEmailSent": {
     "message": "Se a sua conta existir, enviamos um e-mail para você com mais instruções."
   },
   "deleteRecoverConfirmDesc": {
-    "message": "Você pediu para excluir a sua conta no Bitwarden. Clique no botão abaixo para confirmar."
+    "message": "Você pediu para apagar a sua conta do Bitwarden. Clique no botão abaixo para confirmar."
   },
   "deleteRecoverOrgConfirmDesc": {
-    "message": "Você pediu para excluir a sua organização do Bitwarden."
+    "message": "Você pediu para apagar a sua organização do Bitwarden."
   },
   "myOrganization": {
-    "message": "Minha Organização"
+    "message": "Minha organização"
   },
   "organizationInfo": {
     "message": "Informações da organização"
   },
   "deleteOrganization": {
-    "message": "Excluir Organização"
+    "message": "Apagar organização"
   },
   "deletingOrganizationContentWarning": {
-    "message": "Digite a senha mestra para confirmar a exclusão de $ORGANIZATION$ e todos os dados associados. Os dados do cofre no $ORGANIZATION$ incluem:",
+    "message": "Digite a senha principal para confirmar o apagamento de $ORGANIZATION$ e todos os dados associados. Os dados do cofre no $ORGANIZATION$ incluem:",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4355,10 +4639,10 @@
     }
   },
   "deletingOrganizationActiveUserAccountsWarning": {
-    "message": "As contas de usuários permanecerão ativas após a exclusão, mas não estarão mais associadas a essa organização."
+    "message": "As contas de usuários permanecerão ativas após apagar, mas não estarão mais associadas a essa organização."
   },
   "deletingOrganizationIsPermanentWarning": {
-    "message": "A exclusão de $ORGANIZATION$ é permanente e irreversível.",
+    "message": "Apagar $ORGANIZATION$ é permanente e irreversível.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4367,30 +4651,30 @@
     }
   },
   "organizationDeleted": {
-    "message": "Organização Excluida"
+    "message": "Organização apagada"
   },
   "organizationDeletedDesc": {
-    "message": "A organização e todos os dados associados foram excluídos."
+    "message": "A organização e todos os dados associados foram apagados."
   },
   "organizationUpdated": {
-    "message": "Organização atualizada"
+    "message": "Organização salva"
   },
   "taxInformation": {
-    "message": "Informações de Impostos"
+    "message": "Informações de tributos"
   },
   "taxInformationDesc": {
-    "message": "Para clientes dentro dos EUA, o código postal (ZIP code) é necessário para satisfazer os requisitos fiscais das vendas. para outros países você pode opcionalmente fornecer um número de identificação fiscal (VAT/GST) e/ou um endereço para aparecer nas suas faturas."
+    "message": "Para clientes dentro dos EUA, o código postal (ZIP code) é necessário para satisfazer os requisitos fiscais das vendas, para outros países você pode opcionalmente fornecer um número de identificação fiscal (VAT/GST) e/ou um endereço para aparecer nas suas faturas."
   },
   "billingPlan": {
     "message": "Plano",
     "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "changeBillingPlan": {
-    "message": "Atualizar Plano",
+    "message": "Fazer upgrade do plano",
     "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "changeBillingPlanUpgrade": {
-    "message": "Atualize sua conta para outro plano fornecendo as informações abaixo. Por favor, verifique se você tem um método de pagamento ativo adicionado à conta.",
+    "message": "Faça upgrade da sua conta para outro plano fornecendo as informações abaixo. Certifique-se que você tem um método de pagamento ativo adicionado à conta.",
     "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "invoiceNumber": {
@@ -4404,31 +4688,31 @@
     }
   },
   "viewInvoice": {
-    "message": "Ver Fatura"
+    "message": "Ver fatura"
   },
   "downloadInvoice": {
-    "message": "Baixar Fatura"
+    "message": "Baixar fatura"
   },
   "verifyBankAccount": {
-    "message": "Verificar Conta Bancária"
+    "message": "Verificar conta bancária"
   },
   "verifyBankAccountDesc": {
-    "message": "Fizemos dois micro-depósitos em sua conta bancária (pode demorar de 1 a 2 dias úteis para aparecer). Insira esses valores para confirmar a conta bancária."
+    "message": "Fizemos dois micro-depósitos em sua conta bancária (pode demorar de 1 a 2 dias úteis para aparecer). Digite esses valores para confirmar a conta bancária."
   },
   "verifyBankAccountInitialDesc": {
-    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Você será solicitado a confirmar sua conta bancária. Vamos fazer dois micro-depósitos nos próximos 1-2 dias úteis. Insira esses valores na página de faturamento da organização para confirmar a conta bancária."
+    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Você precisará verificar sua conta bancária. Faremos um micro-depósito nos próximos 1-2 dias úteis. Digite os valores na página de assinatura da organização para verificar a conta bancária."
   },
   "verifyBankAccountFailureWarning": {
-    "message": "A não verificação da conta bancária resultará em um pagamento não atendido e sua assinatura será desativada."
+    "message": "A falha na verificação da conta bancária resultará em um pagamento não atendido e sua assinatura será suspensa."
   },
   "verifiedBankAccount": {
-    "message": "A conta bancária foi verificada."
+    "message": "Conta bancária verificada"
   },
   "bankAccount": {
-    "message": "Conta Bancária"
+    "message": "Conta bancária"
   },
   "amountX": {
-    "message": "Montante $COUNT$",
+    "message": "Valor $COUNT$",
     "description": "Used in bank account verification of micro-deposits. Amount, as in a currency amount. Ex. Amount 1 is $2.00, Amount 2 is $1.50",
     "placeholders": {
       "count": {
@@ -4438,53 +4722,53 @@
     }
   },
   "routingNumber": {
-    "message": "Routing Number",
+    "message": "Número de roteamento",
     "description": "Bank account routing number"
   },
   "accountNumber": {
-    "message": "Numero da Conta"
+    "message": "Numero da conta"
   },
   "accountHolderName": {
-    "message": "Nome do Titular da Conta"
+    "message": "Nome do titular da conta"
   },
   "bankAccountType": {
-    "message": "Tipo de Conta"
+    "message": "Tipo da conta"
   },
   "bankAccountTypeCompany": {
-    "message": "Empresa (Profissional)"
+    "message": "Empresa (negócio)"
   },
   "bankAccountTypeIndividual": {
-    "message": "Individual (Pessoal)"
+    "message": "Individual (pessoal)"
   },
   "enterInstallationId": {
-    "message": "Insira o seu ID de instalação"
+    "message": "Digite o seu ID de instalação"
   },
   "limitSubscriptionDesc": {
-    "message": "Defina um limite de vagas para sua assinatura. Quando esse limite for atingido, você não poderá convidar novos usuários."
+    "message": "Configure um limite de vagas para sua assinatura. Quando esse limite for atingido, você não poderá convidar novos usuários."
   },
   "limitSmSubscriptionDesc": {
-    "message": "Defina um limite de assento para sua assinatura do Gerenciador Secretos. Uma vez que este limite for atingido, você não poderá convidar novos membros."
+    "message": "Configure um limite de vagas para sua assinatura do Gerenciador de Segredos. Ao atingir este limite, você não poderá convidar novos membros."
   },
   "maxSeatLimit": {
-    "message": "Limite Máximo de Vaga (opcional)",
+    "message": "Limite de vagas (opcional)",
     "description": "Upper limit of seats to allow through autoscaling"
   },
   "maxSeatCost": {
-    "message": "Custo de vaga máximo potencial"
+    "message": "Custo máximo possível de vagas"
   },
   "addSeats": {
-    "message": "Adicionar Vagas",
+    "message": "Adicionar vagas",
     "description": "Seat = User Seat"
   },
   "removeSeats": {
-    "message": "Remover Vagas",
+    "message": "Remover vagas",
     "description": "Seat = User Seat"
   },
   "subscriptionDesc": {
     "message": "Ajustes em sua assinatura resultarão em alterações rateadas em seus totais de cobrança. Se os usuários recém-convidados excederem o número de vagas de sua assinatura, você receberá imediatamente uma cobrança proporcional pelos usuários adicionais."
   },
   "subscriptionUserSeats": {
-    "message": "Sua assinatura permite um total de $COUNT$ usuários.",
+    "message": "Sua assinatura permite um total de $COUNT$ membros.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4493,10 +4777,10 @@
     }
   },
   "limitSubscription": {
-    "message": "Assinatura Limite (Opcional)"
+    "message": "Limitar assinatura (opcional)"
   },
   "subscriptionSeats": {
-    "message": "Vagas de Assinatura"
+    "message": "Vagas da assinatura"
   },
   "subscriptionUpdated": {
     "message": "Assinatura atualizada"
@@ -4505,7 +4789,7 @@
     "message": "Assinatura atualizada. Agora você tem acesso ao Gerenciador de Segredos."
   },
   "additionalOptions": {
-    "message": "Opções Adicionais"
+    "message": "Opções adicionais"
   },
   "additionalOptionsDesc": {
     "message": "Para ajuda adicional no gerenciamento de sua assinatura, entre em contato com o suporte ao cliente."
@@ -4517,7 +4801,7 @@
     "message": "Se você quiser adicionar mais"
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment2": {
-    "message": "assentos sem a oferta empacotada, por favor contacte"
+    "message": "vagas sem a oferta empacotada, contate"
   },
   "subscriptionUserSeatsLimitedAutoscale": {
     "message": "Ajustes em sua assinatura resultarão em alterações rateadas em seus totais de cobrança. Se os usuários recém-convidados excederem o número de vagas de sua assinatura, você receberá imediatamente uma cobrança proporcional para os usuários adicionais até que seu limite de $MAX$ de vaga seja atingido.",
@@ -4529,7 +4813,7 @@
     }
   },
   "subscriptionUserSeatsWithoutAdditionalSeatsOption": {
-    "message": "Você pode convidar até $COUNT$ membros sem custos adicionais. Entre em contato com o Suporte ao Cliente para melhorar seu plano e convidar mais membros.",
+    "message": "Você pode convidar até $COUNT$ membros sem custos adicionais. Entre em contato com o Suporte ao Cliente para fazer upgrade do seu plano e convidar mais membros.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4538,7 +4822,7 @@
     }
   },
   "subscriptionFreePlan": {
-    "message": "Você não pode convidar mais do que $COUNT$ usuários sem atualizar seu plano.",
+    "message": "Você não pode convidar mais do que $COUNT$ usuários sem fazer upgrade do seu plano.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4547,7 +4831,7 @@
     }
   },
   "subscriptionUpgrade": {
-    "message": "Você não pode convidar mais de $COUNT$ membros sem atualizar seu plano.",
+    "message": "Você não pode convidar mais de $COUNT$ membros sem fazer upgrade do seu plano.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4565,7 +4849,7 @@
     }
   },
   "subscriptionMaxReached": {
-    "message": "Ajustes em sua assinatura resultarão em alterações rateadas em seus totais de cobrança. Você não pode convidar mais de $COUNT$ usuários sem aumentar suas vagas de assinatura.",
+    "message": "Ajustes em sua assinatura resultarão em alterações rateadas em seus totais de cobrança. Você não pode convidar mais de $COUNT$ usuários sem aumentar as vagas da sua assinatura.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4574,7 +4858,7 @@
     }
   },
   "subscriptionSeatMaxReached": {
-    "message": "Você não pode convidar mais de $COUNT$ membro(s) sem atualizar seu plano.",
+    "message": "Você não pode convidar mais de $COUNT$ membros sem aumentar as vagas da sua assinatura.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4583,19 +4867,19 @@
     }
   },
   "seatsToAdd": {
-    "message": "Vagas Para Adicionar"
+    "message": "Vagas a adicionar"
   },
   "seatsToRemove": {
-    "message": "Vagas Para Remover"
+    "message": "Vagas a remover"
   },
   "seatsAddNote": {
-    "message": "A adição de assentos de usuário resultará em ajustes no total da cobrança, e será cobrada imediatamente pela sua forma de pagamento registrada. A primeira cobrança será rateada pelo restante do ciclo do faturamento atual."
+    "message": "A adição de vagas de usuário resultará em ajustes no total da cobrança, e será cobrada imediatamente pela sua forma de pagamento cadastrada. A primeira cobrança será rateada pelo restante do ciclo do faturamento atual."
   },
   "seatsRemoveNote": {
-    "message": "A remoção dos assentos de usuário resultará em ajustes no total do faturamento, que será rateado como crédito para sua próxima cobrança."
+    "message": "A remoção de vagas de usuário resultará em ajustes no total do faturamento, que será rateado como crédito para sua próxima cobrança."
   },
   "adjustedSeats": {
-    "message": "Ajustado $AMOUNT$ assentos de usuário.",
+    "message": "Ajustou $AMOUNT$ vagas de usuário.",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -4613,7 +4897,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reordene $LABEL$. Use a tecla de seta para mover o item para cima ou para baixo.",
+    "message": "Reordenar $LABEL$. Use a tecla de seta para mover o item para cima ou para baixo.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4656,13 +4940,13 @@
     }
   },
   "updateEncryptionKeyWarning": {
-    "message": "Depois de atualizar sua chave de criptografia, é necessário encerrar e iniciar a sessão em todos os aplicativos do Bitwarden que você está usando atualmente (como o aplicativo móvel ou as extensões do navegador). Não encerrar e iniciar sessão (que baixa sua nova chave de criptografia) pode resultar em corrupção de dados. Nós tentaremos desconectá-lo automaticamente, mas isso pode demorar um pouco."
+    "message": "Depois de atualizar sua chave de criptografia, é necessário se desconectar e reconectar em todos os aplicativos do Bitwarden que você está usando atualmente (como o aplicativo móvel ou as extensões do navegador). Não fazer isso (que descarrega sua nova chave de criptografia) pode resultar em corrupção de dados. Nós tentaremos desconectá-lo automaticamente, mas isso pode demorar um pouco."
   },
   "updateEncryptionKeyAccountExportWarning": {
-    "message": "Any account restricted exports you have saved will become invalid."
+    "message": "Quaisquer exportações que você tem salvas que são restritas à conta se tornarão inválidas."
   },
   "legacyEncryptionUnsupported": {
-    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+    "message": "A criptografia legada não é mais suportada. Entre em contato com o suporte para recuperar a sua conta."
   },
   "subscription": {
     "message": "Assinatura"
@@ -4671,16 +4955,16 @@
     "message": "Carregando"
   },
   "upgrade": {
-    "message": "Atualizar"
+    "message": "Fazer upgrade"
   },
   "upgradeOrganization": {
-    "message": "Atualizar Organização"
+    "message": "Fazer upgrade da organização"
   },
   "upgradeOrganizationDesc": {
     "message": "Este recurso não está disponível para organizações gratuitas. Mude para um plano pago para desbloquear mais recursos."
   },
   "createOrganizationStep1": {
-    "message": "Criar Organização: Passo 1"
+    "message": "Criar organização: 1° passo"
   },
   "createOrganizationCreatePersonalAccount": {
     "message": "Antes de criar sua organização, primeiro você precisa criar uma conta pessoal gratuita."
@@ -4689,16 +4973,16 @@
     "message": "Reembolsado"
   },
   "nothingSelected": {
-    "message": "Você selecionou nada."
+    "message": "Voce não selecionou nada."
   },
   "receiveMarketingEmailsV2": {
-    "message": "Obtenha conselhos, novidades, e oportunidades de pesquisa do Bitwarden em sua caixa de entrada."
+    "message": "Receba conselhos, novidades, e oportunidades de pesquisa do Bitwarden em sua caixa de entrada."
   },
   "subscribe": {
-    "message": "Subscribe"
+    "message": "Inscreva-se"
   },
   "unsubscribe": {
-    "message": "Cancelar subscrição"
+    "message": "Desinscreva-se"
   },
   "atAnyTime": {
     "message": "a qualquer momento."
@@ -4725,13 +5009,13 @@
     "message": "Filtros"
   },
   "vaultTimeout": {
-    "message": "Tempo Limite do Cofre"
+    "message": "Tempo limite do cofre"
   },
   "vaultTimeout1": {
-    "message": "Tempo esgotado"
+    "message": "Tempo limite"
   },
   "vaultTimeoutDesc": {
-    "message": "Escolha quando o tempo limite do seu cofre irá se esgotar e execute a ação selecionada."
+    "message": "Escolha quando o seu cofre executará a ação do tempo limite do cofre."
   },
   "vaultTimeoutLogoutDesc": {
     "message": "Escolha quando seu cofre será desconectado."
@@ -4755,7 +5039,7 @@
     "message": "4 horas"
   },
   "onRefresh": {
-    "message": "Quando Reiniciar o Navegador"
+    "message": "No reinício do navegador"
   },
   "dateUpdated": {
     "message": "Atualizado",
@@ -4766,11 +5050,17 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Senha Atualizada",
+    "message": "Senha atualizada",
     "description": "ex. Date this password was updated"
   },
   "organizationIsDisabled": {
-    "message": "Organização está desabilitada."
+    "message": "Organização suspensa"
+  },
+  "organizationIsSuspended": {
+    "message": "A organização está suspensa"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Itens em organizações suspensas não podem ser acessados. Contate o proprietário da sua organização para obter ajuda."
   },
   "secretsAccessSuspended": {
     "message": "As organizações suspensas não podem ser acessadas. Entre em contato com o proprietário da organização para obter assistência."
@@ -4784,11 +5074,8 @@
   "serviceAccountsCannotCreate": {
     "message": "Contas de serviço não podem ser criadas em organizações suspensas. Entre em contato com o proprietário da organização para obter assistência."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Itens em Organizações Desativadas não podem ser acessados. Entre em contato com o proprietário da sua Organização para obter ajuda."
-  },
   "licenseIsExpired": {
-    "message": "A licença está expirada."
+    "message": "A licença está vencida."
   },
   "updatedUsers": {
     "message": "Usuários atualizados"
@@ -4803,7 +5090,7 @@
     "message": "Propriedade"
   },
   "whoOwnsThisItem": {
-    "message": "Quem possui este item?"
+    "message": "Quem é o proprietário deste item?"
   },
   "strong": {
     "message": "Forte",
@@ -4818,39 +5105,39 @@
     "description": "ex. A weak password. Scale: Very Weak -> Weak -> Good -> Strong"
   },
   "veryWeak": {
-    "message": "Muito Fraca",
+    "message": "Muito fraca",
     "description": "ex. A very weak password. Scale: Very Weak -> Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Senha Mestra Fraca"
+    "message": "Senha principal fraca"
   },
   "weakMasterPasswordDesc": {
-    "message": "A senha mestra que você selecionou está fraca. Você deve usar uma senha mestra forte (ou uma frase-passe) para proteger a sua conta Bitwarden adequadamente. Tem certeza que deseja usar esta senha mestra?"
+    "message": "Senha fraca identificada. Você deve usar uma senha principal forte para proteger a sua conta. Tem certeza que quer usar esta senha principal?"
   },
   "rotateAccountEncKey": {
-    "message": "Também rodar a chave de encriptação da minha conta"
+    "message": "Rotacionar a chave de criptografia da minha conta"
   },
   "rotateEncKeyTitle": {
-    "message": "Rodar Chave de Encriptação"
+    "message": "Rotacionar chave de criptografia"
   },
   "rotateEncKeyConfirmation": {
-    "message": "Você tem certeza que quer rodar a chave de encriptação da sua conta?"
+    "message": "Tem certeza que quer rotacionar a chave de criptografia da sua conta?"
   },
   "attachmentsNeedFix": {
     "message": "Este item tem anexos de arquivos antigos que precisam ser corrigidos."
   },
   "attachmentFixDescription": {
-    "message": "Este anexo utiliza criptografia desatualizada. Selecione 'Corrigir' para baixar, re-criptografar e recarregar o anexo."
+    "message": "Este anexo utiliza criptografia desatualizada. Selecione 'Corrigir' para baixar, recriptografar e reenviar o anexo."
   },
   "fix": {
     "message": "Corrigir",
     "description": "This is a verb. ex. 'Fix The Car'"
   },
   "oldAttachmentsNeedFixDesc": {
-    "message": "Há anexos de arquivos antigos no seu cofre que precisam ser corrigidos antes que você possa girar a chave de criptografia da sua conta."
+    "message": "Há anexos de arquivos antigos no seu cofre que precisam ser corrigidos antes que você possa rotacionar a chave de criptografia da sua conta."
   },
   "yourAccountsFingerprint": {
-    "message": "A sua frase biométrica",
+    "message": "A frase biométrica da sua conta",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "fingerprintEnsureIntegrityVerify": {
@@ -4858,67 +5145,67 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "fingerprintMatchInfo": {
-    "message": "Por favor, certifique-se de que o seu cofre esteja desbloqueado e a frase de identificação corresponda ao outro dispositivo."
+    "message": "Certifique-se de que o seu cofre está desbloqueado e a frase biométrica corresponda ao do outro dispositivo."
   },
   "fingerprintPhraseHeader": {
-    "message": "Frase de identificação"
+    "message": "Frase biométrica"
   },
   "dontAskFingerprintAgain": {
-    "message": "Não peça para verificar a frase biométrica novamente",
+    "message": "Nunca pedir para verificar a frase biométrica de usuários convidados (não recomendado)",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "Você será notificado assim que o pedido for aprovado"
+    "message": "Você será notificado assim que a solicitação ser aprovada"
   },
   "free": {
-    "message": "Gratuito",
+    "message": "Grátis",
     "description": "Free, as in 'Free beer'"
   },
   "apiKey": {
-    "message": "Chave API"
+    "message": "Chave da API"
   },
   "apiKeyDesc": {
-    "message": "Sua chave API pode ser usada para autenticar na API pública do Bitwarden."
+    "message": "Sua chave da API pode ser usada para autenticar na API pública do Bitwarden."
   },
   "apiKeyRotateDesc": {
-    "message": "Girar a chave da API invalidará a chave anterior. Você pode girar sua chave de API se acreditar que a chave atual não é mais segura de usar."
+    "message": "Rotacionar a chave da API invalidará a chave anterior. Você pode rotacionar sua chave de API se acreditar que a chave atual não é mais segura de usar."
   },
   "apiKeyWarning": {
-    "message": "Sua chave de API tem acesso total à organização. Deve ser mantido em segredo."
+    "message": "Sua chave de API tem acesso total à organização. Deve ser mantida em segredo."
   },
   "userApiKeyDesc": {
-    "message": "Sua chave API pode ser usada para autenticar no Bitwarden CLI."
+    "message": "Sua chave da API pode ser usada para autenticar no Bitwarden CLI."
   },
   "userApiKeyWarning": {
-    "message": "Sua chave de API é um mecanismo de autenticação alternativo. Deve ser mantido em segredo."
+    "message": "Sua chave de API é um mecanismo de autenticação alternativo. Deve ser mantida em segredo."
   },
   "oauth2ClientCredentials": {
     "message": "Credenciais do cliente OAuth 2.0",
     "description": "'OAuth 2.0' is a programming protocol. It should probably not be translated."
   },
   "viewApiKey": {
-    "message": "Ver chave API"
+    "message": "Ver chave da API"
   },
   "rotateApiKey": {
-    "message": "Girar chave API"
+    "message": "Rotacionar chave da API"
   },
   "selectOneCollection": {
-    "message": "Você deve selecionar pelo menos uma coleção."
+    "message": "Você deve selecionar pelo menos um conjunto."
   },
   "couldNotChargeCardPayInvoice": {
-    "message": "Não foi possível cobrar no seu cartão. Por favor, veja e pague a fatura pendente listada abaixo."
+    "message": "Não foi possível cobrar o seu cartão. Veja e pague a fatura pendente listada abaixo."
   },
   "minLength": {
-    "message": "Comprimento Mínimo"
+    "message": "Comprimento mínimo"
   },
   "clone": {
     "message": "Clonar"
   },
   "masterPassPolicyTitle": {
-    "message": "Requisitos de senha mestra"
+    "message": "Requisitos da senha principal"
   },
   "masterPassPolicyDesc": {
-    "message": "Defina os requisitos mínimos para a força da senha mestra."
+    "message": "Configure os requisitos para a força da senha principal."
   },
   "passwordStrengthScore": {
     "message": "Pontuação de força da senha $SCORE$",
@@ -4930,22 +5217,22 @@
     }
   },
   "twoStepLoginPolicyTitle": {
-    "message": "Exigir login em duas etapas"
+    "message": "Exigir autenticação em duas etapas"
   },
   "twoStepLoginPolicyDesc": {
-    "message": "Exigir que os usuários definam a autenticação de dois passos nas suas contas pessoais."
+    "message": "Exija que os membros configurem a autenticação de duas etapas."
   },
   "twoStepLoginPolicyWarning": {
-    "message": "Os membros da organização que não possuam a autenticação de dois passos ativa para sua conta pessoal serão removidos da organização e receberão um e-mail notificando-os da mudança."
+    "message": "Membros da organização que não são proprietários ou administradores e não têm a autenticação em duas etapas configurada em sua conta serão removidos da organização e receberão um e-mail notificando-os sobre a mudança."
   },
   "twoStepLoginPolicyUserWarning": {
     "message": "Você é um membro de uma organização que exige que a autenticação de dois passos seja ativada na sua conta de usuário. Se desativar todos os serviços de autenticação de dois passos, você será automaticamente removido dessas organizações."
   },
   "passwordGeneratorPolicyDesc": {
-    "message": "Defina os requisitos mínimos para configuração do gerador de senhas."
+    "message": "Configure requisitos para o gerador de senhas."
   },
   "masterPasswordPolicyInEffect": {
-    "message": "Uma ou mais políticas da organização exigem que a sua senha mestra cumpra aos seguintes requisitos:"
+    "message": "Uma ou mais políticas da organização exigem que a sua senha principal cumpra aos seguintes requisitos:"
   },
   "policyInEffectMinComplexity": {
     "message": "Pontuação mínima de complexidade de $SCORE$",
@@ -4966,16 +5253,16 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "Contém um ou mais caracteres em maiúsculo"
+    "message": "Conter um ou mais caracteres em maiúsculo"
   },
   "policyInEffectLowercase": {
-    "message": "Contém um ou mais caracteres em minúsculo"
+    "message": "Conter um ou mais caracteres em minúsculo"
   },
   "policyInEffectNumbers": {
-    "message": "Contém um ou mais números"
+    "message": "Conter um ou mais números"
   },
   "policyInEffectSpecial": {
-    "message": "Contém um ou mais dos seguintes caracteres especiais $CHARS$",
+    "message": "Conter um ou mais dos seguintes caracteres especiais $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -4984,26 +5271,26 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "A sua nova senha mestra não cumpre aos requisitos da política."
+    "message": "A sua nova senha principal não cumpre aos requisitos da política."
   },
   "minimumNumberOfWords": {
-    "message": "Número Mínimo de Palavras"
+    "message": "Número mínimo de palavras"
   },
   "overridePasswordTypePolicy": {
     "message": "Tipo de senha",
     "description": "Name of the password generator policy that overrides the user's password/passphrase selection."
   },
   "userPreference": {
-    "message": "Preferência do Usuário"
+    "message": "Preferência do usuário"
   },
   "vaultTimeoutAction": {
-    "message": "Ação de Tempo Limite do Cofre"
+    "message": "Ação do tempo limite do cofre"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "Um cofre bloqueado requer que você reinsira a sua senha mestra para entrar novamente."
+    "message": "A senha principal ou outro método de desbloqueio é necessário para acessar seu cofre novamente."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "Uma sessão encerrada com o cofre requer que você autentique-se novamente para acessá-lo de novo."
+    "message": "Reautenticação é necessária para acessar seu cofre novamente."
   },
   "lock": {
     "message": "Bloquear",
@@ -5014,28 +5301,28 @@
     "description": "Noun: A special folder for holding deleted items that have not yet been permanently deleted"
   },
   "searchTrash": {
-    "message": "Pesquisar na Lixeira"
+    "message": "Buscar na lixeira"
   },
   "permanentlyDelete": {
-    "message": "Excluir Permanentemente"
+    "message": "Apagar permanentemente"
   },
   "permanentlyDeleteSelected": {
-    "message": "Excluir Permanentemente Selecionados"
+    "message": "Apagar selecionados permanentemente"
   },
   "permanentlyDeleteItem": {
-    "message": "Excluir o Item Permanentemente"
+    "message": "Apagar item permanentemente"
   },
   "permanentlyDeleteItemConfirmation": {
-    "message": "Você tem certeza que deseja excluir permanentemente esse item?"
+    "message": "Você tem certeza que deseja apagar permanentemente esse item?"
   },
   "permanentlyDeletedItem": {
-    "message": "Item Permanentemente Excluído"
+    "message": "Item apagado permanentemente"
   },
   "permanentlyDeletedItems": {
-    "message": "Itens Permanentemente Excluídos"
+    "message": "Itens apagados permanentemente"
   },
   "permanentlyDeleteSelectedItemsDesc": {
-    "message": "Você selecionou $COUNT$ item(ns) para excluir permanentemente. Tem certeza que deseja excluir permanentemente todos estes itens?",
+    "message": "Você selecionou $COUNT$ item(ns) para apagar permanentemente. Tem certeza que quer apagar todos estes itens permanentemente?",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -5044,7 +5331,7 @@
     }
   },
   "permanentlyDeletedItemId": {
-    "message": "Item $ID$ Excluído Permanentemente.",
+    "message": "Item $ID$ apagado permanentemente",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5056,16 +5343,16 @@
     "message": "Restaurar"
   },
   "restoreSelected": {
-    "message": "Restaurar Selecionados"
+    "message": "Restaurar selecionados"
   },
   "restoredItem": {
-    "message": "Item Restaurado"
+    "message": "Item restaurado"
   },
   "restoredItems": {
-    "message": "Itens Restaurados"
+    "message": "Itens restaurados"
   },
   "restoredItemId": {
-    "message": "Item $ID$ restaurado.",
+    "message": "Item $ID$ restaurado",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5074,13 +5361,13 @@
     }
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Sair irá remover todo o acesso ao seu cofre e requer autenticação online após o período de tempo limite. Tem certeza de que deseja usar esta configuração?"
+    "message": "Desconectar-se irá remover todo o acesso ao seu cofre e requirirá autenticação on-line após o período de tempo limite. Tem certeza de que deseja usar esta configuração?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Confirmação de Ação de Tempo Limite"
+    "message": "Confirmação de ação do tempo limite"
   },
   "hidePasswords": {
-    "message": "Esconder Senhas"
+    "message": "Ocultar senhas"
   },
   "countryPostalCodeRequiredDesc": {
     "message": "Exigimos essa informação apenas para o cálculo do imposto sobre as vendas e informação financeira."
@@ -5089,37 +5376,37 @@
     "message": "Incluir informações sobre IVA/GST (opcional)"
   },
   "taxIdNumber": {
-    "message": "ID de Imposto VAT/GST"
+    "message": "ID de imposto VAT/GST"
   },
   "taxInfoUpdated": {
     "message": "Informações de impostos atualizadas."
   },
   "setMasterPassword": {
-    "message": "Definir Senha Mestra"
+    "message": "Configurar senha principal"
   },
   "identifier": {
     "message": "Identificador"
   },
   "organizationIdentifier": {
-    "message": "Identificador da Organização"
+    "message": "Identificador da organização"
   },
   "ssoLogInWithOrgIdentifier": {
-    "message": "Faça o login usando o portal de login único da sua organização. Por favor, insira o identificador da sua organização para começar."
+    "message": "Conecte-se usando o portal de autenticação única da sua organização. Digite o identificador de SSO da sua organização para começar."
   },
   "singleSignOnEnterOrgIdentifier": {
-    "message": "Insira o identificador SSO da sua organização para começar"
+    "message": "Digite o identificador de SSO da sua organização para começar"
   },
   "singleSignOnEnterOrgIdentifierText": {
-    "message": "Para fazer login com seu provedor SSO, insira o identificador SSO da sua organização para começar. Talvez seja necessário inserir este identificador SSO quando fizer login a partir de um novo dispositivo."
+    "message": "Para se conectar com seu provedor de SSO, digite o identificador de SSO da sua organização para começar. Talvez seja necessário digitar este identificador de SSO quando se conectar com um novo dispositivo."
   },
   "enterpriseSingleSignOn": {
-    "message": "Iniciar Sessão Empresarial Única"
+    "message": "Autenticação única empresarial"
   },
   "ssoHandOff": {
     "message": "Agora você pode fechar esta aba e continuar na extensão."
   },
   "youSuccessfullyLoggedIn": {
-    "message": "Você logou na sua conta com sucesso"
+    "message": "Você se conectou com sucesso"
   },
   "thisWindowWillCloseIn5Seconds": {
     "message": "Esta janela será fechada automaticamente em 5 segundos"
@@ -5128,13 +5415,13 @@
     "message": "Você pode fechar esta janela"
   },
   "includeAllTeamsFeatures": {
-    "message": "Recursos para Todas as Equipes, além de:"
+    "message": "Todos os recursos do Equipes, mais:"
   },
   "includeAllTeamsStarterFeatures": {
-    "message": "Recursos para todas as equipes iniciantes, além de:"
+    "message": "Todos os recursos do Equipes Iniciantes, mais:"
   },
   "chooseMonthlyOrAnnualBilling": {
-    "message": "Escolha faturamento mensal ou anual"
+    "message": "Escolha cobrança mensal ou anual"
   },
   "abilityToAddMoreThanNMembers": {
     "message": "Capacidade de adicionar mais que $COUNT$ membros",
@@ -5149,20 +5436,24 @@
     "message": "Autenticação SSO via SAML2.0 e OpenID Connect"
   },
   "includeEnterprisePolicies": {
-    "message": "Políticas Empresariais"
+    "message": "Políticas empresariais"
   },
   "ssoValidationFailed": {
-    "message": "Falha na Validação SSO"
+    "message": "Falha na validação do SSO"
   },
   "ssoIdentifierRequired": {
-    "message": "O Identificador da Organização é obrigatório."
+    "message": "O identificador de SSO da organização é obrigatório."
   },
   "ssoIdentifier": {
-    "message": "Identificador SSO"
+    "message": "Identificador de SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Forneça esse ID aos seus membros para logar com SSO. Para ignorar essa etapa, configure ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Forneça este ID aos seus membros para acessarem com o SSO. Os membros podem pular a digitação deste identificador durante o SSO se um domínio reivindicado estiver configurado. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Saiba mais",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Desvincular SSO"
@@ -5174,47 +5465,47 @@
     "message": "Vincular SSO"
   },
   "singleOrg": {
-    "message": "Organização Única"
+    "message": "Organização única"
   },
   "singleOrgDesc": {
-    "message": "Restringir os usuários de poderem entrar em outras organizações."
+    "message": "Restrinja os usuários de poderem entrar em outras organizações."
   },
   "singleOrgPolicyDesc": {
-    "message": "Restringir membros de ingressarem em outras organizações. Essa política é necessária para organizações que tenham habilitado a verificação de domínio."
+    "message": "Restrinja membros de entrar em outras organizações. Essa política é necessária para organizações que tenham ativado a verificação de domínio."
   },
   "singleOrgBlockCreateMessage": {
-    "message": "Sua organização atual tem uma política que não permite que você entre em mais de uma organização. Por favor, entre em contato com os administradores da sua organização ou cadastre-se a partir de uma conta do Bitwarden diferente."
+    "message": "Sua organização atual tem uma política que não permite que você entre em mais de uma organização. Entre em contato com os administradores da sua organização ou cadastre-se a partir de uma conta do Bitwarden diferente."
   },
   "singleOrgPolicyMemberWarning": {
-    "message": "Membros não conformes serão colocados no estado revogado até que saiam de todas as outras organizações. Administradores estão isentos e podem restaurar os membros assim que cumprir."
+    "message": "Membros não adequados serão colocados no estado revogado até que saiam de todas as outras organizações. Administradores estão isentos e podem restaurar os membros assim que se adequarem."
   },
   "requireSso": {
-    "message": "Autenticação de Acesso Único"
+    "message": "Exigir autenticação única"
   },
   "requireSsoPolicyDesc": {
-    "message": "Exige que os usuários façam login com o método de Login Único da Empresa."
+    "message": "Exija que os usuários se conectem com o método de autenticação única empresarial."
   },
   "prerequisite": {
     "message": "Pré-requisito"
   },
   "requireSsoPolicyReq": {
-    "message": "A política das empresas da Organização Única tem de ser viabilizada antes da ativação desta política."
+    "message": "A política empresarial da organização única tem que estar ativada antes de ativar esta política."
   },
   "requireSsoPolicyReqError": {
-    "message": "Política da Organização Única não ativada."
+    "message": "Política de organização única não configurada."
   },
   "requireSsoExemption": {
-    "message": "Os Proprietários e Administradores da Organização estão isentos da aplicação desta política."
+    "message": "Os proprietários e administradores estão isentos da aplicação desta política."
   },
   "limitSendViews": {
-    "message": "Limitar visualização"
+    "message": "Limitar visualizações"
   },
   "limitSendViewsHint": {
-    "message": "Ninguém pode visualizar este envio depois que o limite foi atingido.",
+    "message": "Ninguém pode visualizar este Send depois que o limite foi atingido.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ Visualizações restantes",
+    "message": "$ACCESSCOUNT$ visualizações restantes",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -5224,7 +5515,7 @@
     }
   },
   "sendDetails": {
-    "message": "Enviar detalhes",
+    "message": "Detalhes do Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeTextToShare": {
@@ -5237,11 +5528,11 @@
     "message": "Texto"
   },
   "sendPasswordDescV3": {
-    "message": "Adicione uma senha opcional para os destinatários acessarem este Envio.",
+    "message": "Adicione uma senha opcional para que os destinatários acessem este Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Criar Novo Send",
+    "message": "Novo Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -5249,47 +5540,47 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Send Criado",
+    "message": "Send salvo",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Send Editado",
+    "message": "Send salvo",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletedSend": {
-    "message": "Send Excluído",
+    "message": "Send apagado",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSend": {
-    "message": "Excluir Send",
+    "message": "Apagar Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Tem certeza de que deseja excluir permanentemente este Envio?",
+    "message": "Tem certeza de que quer apagar este Send permanentemente?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
-    "message": "Data de Exclusão"
+    "message": "Data de apagamento"
   },
   "deletionDateDescV2": {
-    "message": "O envio será permanentemente excluído nesta data.",
+    "message": "O Send será apagado permanentemente nesta data.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
-    "message": "Data de Validade"
+    "message": "Data de validade"
   },
   "expirationDateDesc": {
-    "message": "Se definido, o acesso a este Send expirará na data e hora especificadas.",
+    "message": "Se configurado, o acesso a este Send acabará no horário especificado.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
-    "message": "Contagem Máxima de Acessos"
+    "message": "Número máximo de acessos"
   },
   "disabled": {
     "message": "Desativado"
   },
   "revoked": {
-    "message": "Revogado"
+    "message": "Revogados"
   },
   "sendLink": {
     "message": "Link do Send",
@@ -5299,14 +5590,14 @@
     "message": "Copiar link"
   },
   "copySendLink": {
-    "message": "Copiar Link do Send",
+    "message": "Copiar link do Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "removePassword": {
-    "message": "Remover Senha"
+    "message": "Remover senha"
   },
   "removedPassword": {
-    "message": "Senha Removida"
+    "message": "Senha removida"
   },
   "removePasswordConfirmation": {
     "message": "Você tem certeza que deseja remover a senha?"
@@ -5319,24 +5610,24 @@
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "pendingDeletion": {
-    "message": "Exclusão pendente"
+    "message": "Apagamento pendente"
   },
   "hideTextByDefault": {
     "message": "Ocultar texto por padrão"
   },
   "expired": {
-    "message": "Expirado"
+    "message": "Vencido"
   },
   "searchSends": {
-    "message": "Pesquisar Sends",
+    "message": "Buscar nos Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPassword": {
-    "message": "Este Send está protegido com uma senha. Por favor, digite a senha abaixo para continuar.",
+    "message": "Este Send está protegido com uma senha. Digite a senha abaixo para continuar.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPasswordDontKnow": {
-    "message": "Não sabe a senha? Peça ao Remetente a senha necessária para acessar esse Send.",
+    "message": "Não sabe a senha? Peça ao remetente a senha necessária para acessar esse Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendHiddenByDefault": {
@@ -5347,11 +5638,11 @@
     "message": "Baixar anexos"
   },
   "sendAccessPasswordTitle": {
-    "message": "Enter the password to view this Send",
+    "message": "Digite a senha para ver este Send",
     "description": "Title of the Send password authentication screen."
   },
   "sendAccessContentTitle": {
-    "message": "View Send",
+    "message": "Ver Send",
     "description": "Title of the Send view content screen."
   },
   "sendAccessUnavailable": {
@@ -5359,7 +5650,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "missingSendFile": {
-    "message": "O arquivo associado a este Send não foi encontrado.",
+    "message": "O arquivo associado com este Send não foi encontrado.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "noSendsInList": {
@@ -5367,16 +5658,16 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "emergencyAccess": {
-    "message": "Acesso de Emergência"
+    "message": "Acesso de emergência"
   },
   "emergencyAccessDesc": {
-    "message": "Conceda e gerencie o acesso de emergência para contatos confiáveis. Contatos confiáveis podem solicitar acesso a Visualizar ou Assumir o Controle da sua conta em caso de emergência. Visite a nossa página de ajuda para obter mais informações e detalhes sobre como o compartilhamento de conhecimento zero funciona."
+    "message": "Conceda e gerencie o acesso de emergência para contatos de confiança. Contatos de confiança podem solicitar acesso para ver ou assumir o controle da sua conta em caso de emergência. Visite a nossa página de ajuda para obter mais informações e detalhes sobre como o compartilhamento de conhecimento zero funciona."
   },
   "emergencyAccessOwnerWarning": {
-    "message": "Você é o Proprietário de uma ou mais organizações. Se você conceder acesso a um contato de emergência, eles serão capazes de usar todas as suas permissões como Proprietário após uma concessão."
+    "message": "Você é o proprietário de uma ou mais organizações. Se você conceder o assumir controle a um contato de emergência, eles serão capazes de usar todas as suas permissões como proprietário ao assumir controle."
   },
   "trustedEmergencyContacts": {
-    "message": "Contatos de emergência confiáveis"
+    "message": "Contatos de emergência confiados"
   },
   "noTrustedContacts": {
     "message": "Você ainda não adicionou nenhum contato de emergência, convide um contato confiável para começar."
@@ -5397,25 +5688,25 @@
     "message": "Editar contato de emergência"
   },
   "inviteEmergencyContactDesc": {
-    "message": "Convide um novo contato de emergência digitando o endereço de e-mail da conta Bitwarden abaixo. Se eles não tiverem uma conta no Bitwarden, eles serão solicitados a criar uma nova conta."
+    "message": "Convide um novo contato de emergência digitando o endereço de e-mail da sua conta Bitwarden abaixo. Se não tiverem uma conta no Bitwarden, serão solicitados a criar uma nova conta."
   },
   "emergencyAccessRecoveryInitiated": {
-    "message": "Acesso de Emergência Iniciado"
+    "message": "Acesso de emergência iniciado"
   },
   "emergencyAccessRecoveryApproved": {
-    "message": "Acesso de Emergência Aprovado"
+    "message": "Acesso de emergência aprovado"
   },
   "viewDesc": {
-    "message": "Você pode ver todos os itens no seu próprio cofre."
+    "message": "Pode ver todos os itens no seu próprio cofre."
   },
   "takeover": {
-    "message": "Assumir o Controle"
+    "message": "Assumir controle"
   },
   "takeoverDesc": {
-    "message": "Pode redefinir a sua conta com uma nova senha mestra."
+    "message": "Pode reconfigurar a sua conta com uma nova senha principal."
   },
   "waitTime": {
-    "message": "Tempo de Espera"
+    "message": "Tempo de espera"
   },
   "waitTimeDesc": {
     "message": "Tempo necessário antes de conceder acesso automaticamente."
@@ -5436,13 +5727,13 @@
     "message": "Usuário convidado."
   },
   "acceptEmergencyAccess": {
-    "message": "Você foi convidado para se tornar um contato de emergência para o usuário listado acima. Para aceitar o convite, você precisa iniciar sessão ou criar uma nova conta no Bitwarden."
+    "message": "Você foi convidado para se tornar um contato de emergência para o usuário listado acima. Para aceitar o convite, você precisa se conectar ou criar uma nova conta no Bitwarden."
   },
   "emergencyInviteAcceptFailed": {
-    "message": "Não foi possível aceitar o convite. Peça ao usuário para enviar um novo convite."
+    "message": "Não é possível aceitar o convite. Peça ao usuário para enviar um novo convite."
   },
   "emergencyInviteAcceptFailedShort": {
-    "message": "Não foi possível aceitar o convite. $DESCRIPTION$",
+    "message": "Não é possível aceitar o convite. $DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
@@ -5454,10 +5745,10 @@
     "message": "Você pode acessar as opções de emergência para esse usuário após a confirmação da sua identidade. Enviaremos um e-mail a você quando isso acontecer."
   },
   "requestAccess": {
-    "message": "Solicitar Acesso"
+    "message": "Solicitar acesso"
   },
   "requestAccessConfirmation": {
-    "message": "Tem certeza que deseja solicitar acesso de emergência? Você receberá acesso após $WAITTIME$ dia(s) ou sempre que o usuário aprovar manualmente a solicitação.",
+    "message": "Tem certeza que deseja solicitar acesso de emergência? Você receberá acesso após $WAITTIME$ dia(s) ou se o usuário aprovar manualmente a solicitação.",
     "placeholders": {
       "waittime": {
         "content": "$1",
@@ -5478,10 +5769,10 @@
     "message": "Aprovar"
   },
   "reject": {
-    "message": "Rejeitar"
+    "message": "Recusar"
   },
   "approveAccessConfirmation": {
-    "message": "Tem certeza de que deseja aprovar o acesso de emergência? Isto permitirá que $USER$ possa $ACTION$ da sua conta.",
+    "message": "Tem certeza de que deseja aprovar o acesso de emergência? Isto permitirá que $USER$ possa $ACTION$ sua conta.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -5494,16 +5785,16 @@
     }
   },
   "emergencyApproved": {
-    "message": "Acesso de emergência aprovado."
+    "message": "Acesso de emergência aprovado"
   },
   "emergencyRejected": {
-    "message": "Acesso de emergência rejeitado"
+    "message": "Acesso de emergência recusado"
   },
   "grantorDetailsNotFound": {
-    "message": "Grantor details not found"
+    "message": "Detalhes do concedente não encontrados"
   },
   "passwordResetFor": {
-    "message": "Redefinição de senha para $USER$. Agora você pode acessar usando a nova senha.",
+    "message": "Senha reconfigurada para $USER$. Agora você pode se conectar usando a nova senha.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -5512,74 +5803,133 @@
     }
   },
   "organizationDataOwnership": {
-    "message": "Enforce organization data ownership"
+    "message": "Aplicar propriedade de dados da organização"
   },
   "organizationDataOwnershipDesc": {
-    "message": "Require all items to be owned by an organization, removing the option to store items at the account level.",
+    "message": "Exija que todos os itens sejam propriedade de uma organização, removendo a opção de armazenar itens ao nível da conta.",
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "Todos os itens serão propriedade da e salvos na organização, ativando controles, visibilidade, e relatórios ao nível da organização. Quando ativado, um conjunto padrão ficará disponível para que cada membro armazene seus itens. Saiba mais sobre gerenciar o ",
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
-    "message": "credential lifecycle",
+    "message": "ciclo de vida de credenciais",
     "description": "This will be used as a hyperlink"
   },
   "organizationDataOwnershipWarningTitle": {
-    "message": "Are you sure you want to proceed?"
+    "message": "Tem certeza que quer prosseguir?"
   },
   "organizationDataOwnershipWarning1": {
-    "message": "will remain accessible to members"
+    "message": "continuará acessível para membros"
   },
   "organizationDataOwnershipWarning2": {
-    "message": "will not be automatically selected when creating new items"
+    "message": "não será selecionado automaticamente ao criar itens"
   },
   "organizationDataOwnershipWarning3": {
-    "message": "cannot be managed from the Admin Console until the user is offboarded"
+    "message": "não pode ser gerenciado pelo painel de administração até que o usuário seja removido"
   },
   "organizationDataOwnershipWarningContentTop": {
-    "message": "By turning this policy off, the default collection: "
+    "message": "Ao desativar esta política, o conjunto padrão: "
   },
   "organizationDataOwnershipWarningContentBottom": {
-    "message": "Learn more about the ",
+    "message": "Saiba mais sobre o ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Disponível agora"
+  },
+  "autoConfirm": {
+    "message": "Confirmação automática de novos usuários"
+  },
+  "autoConfirmDescription": {
+    "message": "Novos usuários convidados para a organização serão confirmados automaticamente quando o dispositivo de um administrador for desbloqueado.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Como ativar a confirmação automática de usuários"
+  },
+  "autoConfirmExtension1": {
+    "message": "Abra a sua extensão do Bitwarden"
+  },
+  "autoConfirmExtension2": {
+    "message": "Selecione",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Ativar",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "A extensão de navegador do Bitwarden foi aberta com sucesso. Agora você pode ativar a configuração de confirmação automática de usuários."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Novos usuários convidados para a organização serão confirmados automaticamente quando o dispositivo de um administrador for desbloqueado. Antes de ativar esta política, revisa e concorde com o seguinte: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potencial risco de segurança. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "A confirmação automática de usuários pode representar um risco para a segurança dos dados da sua organização."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Saiba mais sobre os riscos",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Política de organização única necessária. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Todos os membros devem pertencer somente a esta organização para ativar esta automação."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "A política de organização única estenderá a todos os cargos. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Sem acesso de emergência. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "O acesso de emergência será removido."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Eu aceito estes riscos e atualizações de política"
+  },
   "personalOwnership": {
-    "message": "Propriedade Pessoal"
+    "message": "Remover cofre individual"
   },
   "personalOwnershipPolicyDesc": {
-    "message": "Exigir que os usuários salvem itens de cofre em uma organização removendo a opção de propriedade pessoal."
+    "message": "Exija que os usuários salvem itens em uma organização removendo a opção de cofre individual."
   },
   "personalOwnershipExemption": {
-    "message": "Os proprietários e administradores da organização estão isentos da aplicação desta política."
+    "message": "Os proprietários e administradores da organização são isentos da aplicação desta política."
   },
   "personalOwnershipSubmitError": {
-    "message": "Devido a uma Política Empresarial, você está restrito de salvar itens para seu cofre pessoal. Altere a opção de propriedade para uma organização e escolha entre as Coleções disponíveis."
+    "message": "Devido a uma política empresarial, você não pode salvar itens no seu cofre individual. Altere a opção de propriedade para uma organização e escolha entre os conjuntos disponíveis."
   },
   "desktopAutotypePolicy": {
-    "message": "Desktop Autotype Default Setting"
+    "message": "Configuração padrão da digitação automática no computador"
   },
   "desktopAutotypePolicyDesc": {
-    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "message": "Ative a digitação automática por padrão pros membros. Os membros podem desativar a digitação automática manualmente no app de computador.",
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
-    "message": "Desabilitar Send"
+    "message": "Remover Send"
   },
   "disableSendPolicyDesc": {
-    "message": "Não permite que usuários criem ou editem um Send no Bitwarden. Excluir um Send existente ainda é permitido.",
+    "message": "Não permita que usuários criem ou editem Sends.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disableSendExemption": {
-    "message": "Os usuários da organização que podem gerenciar as políticas da organização estão isentos da aplicação desta política."
+    "message": "Os usuários da organização que podem gerenciar as políticas da organização são isentos da aplicação desta política."
   },
   "sendDisabled": {
-    "message": "Send desabilitado",
+    "message": "Send removido",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
-    "message": "Devido a uma política corporativa, você só é capaz de excluir um Send existente.",
+    "message": "Devido a uma política corporativa, você só pode apagar um Send existente.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptions": {
@@ -5587,18 +5937,31 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsPolicyDesc": {
-    "message": "Definir opções para a criação e edição de Sends.",
+    "message": "Configure opções para a criação e edição de Sends.",
     "description": "'Sends' is a plural noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsExemption": {
-    "message": "Os usuários da organização que podem gerenciar as políticas da organização estão isentos da aplicação desta política."
+    "message": "Os usuários da organização que podem gerenciar as políticas da organização são isentos da aplicação desta política."
   },
   "disableHideEmail": {
-    "message": "Não permitir que os usuários ocultem seus endereços de e-mail dos destinatários ao criar ou editar um Send.",
+    "message": "Sempre mostrar o endereço de e-mail do membro com destinatários ao criar ou editar um Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Detecção de correspondência padrão de URI"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine quando as credenciais são sugeridas para preenchimento automático. Administradores e proprietários ficam isentos desta política."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Detecção de correspondência padrão de URI"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Selecione uma opção de detecção de correspondência de URI válida.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
-    "message": "Política modificada $ID$.",
+    "message": "Modificou a política $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5607,31 +5970,31 @@
     }
   },
   "planPrice": {
-    "message": "Valor do plano"
+    "message": "Preço do plano"
   },
   "estimatedTax": {
-    "message": "Impostos estimados"
+    "message": "Estimativa de tributos"
   },
   "custom": {
     "message": "Personalizado"
   },
   "customDesc": {
-    "message": "Permite controle mais granular das permissões de usuário para configurações avançadas."
+    "message": "Conceda permissões personalizadas aos membros"
   },
   "customDescNonEnterpriseStart": {
-    "message": "Papéis personalizados é um ",
+    "message": "Cargos personalizados são um ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
   },
   "customDescNonEnterpriseLink": {
-    "message": "funcionalidade empresarial",
+    "message": "recurso empresarial",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
   },
   "customDescNonEnterpriseEnd": {
-    "message": ". Contacte a nossa equipe de suporte para atualizar a sua assinatura",
+    "message": ". Contate a nossa equipe de suporte para fazer upgrade da sua assinatura",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
   },
   "customNonEnterpriseError": {
-    "message": "Para ativar as permissões personalizadas, a organização deve estar em um plano Enterprise 2020."
+    "message": "Para ativar as permissões personalizadas, a organização deve estar em um plano Empresarial 2020."
   },
   "permissions": {
     "message": "Permissões"
@@ -5640,46 +6003,46 @@
     "message": "Permissão"
   },
   "accessEventLogs": {
-    "message": "Acessar Registro de Eventos"
+    "message": "Acessar registro de eventos"
   },
   "accessImportExport": {
-    "message": "Acessar Importar/Exportar"
+    "message": "Acessar importação e exportação"
   },
   "accessReports": {
-    "message": "Acessar Relatórios"
+    "message": "Acessar relatórios"
   },
   "missingPermissions": {
     "message": "Você não tem a permissão necessária para executar esta ação."
   },
   "manageAllCollections": {
-    "message": "Gerenciar Todas as Coleções"
+    "message": "Gerenciar todos os conjuntos"
   },
   "createNewCollections": {
-    "message": "Criar Novas Coleções"
+    "message": "Criar novos conjuntos"
   },
   "editAnyCollection": {
-    "message": "Editar Qualquer Coleção"
+    "message": "Editar qualquer conjunto"
   },
   "deleteAnyCollection": {
-    "message": "Excluir Qualquer Coleção"
+    "message": "Apagar qualquer conjunto"
   },
   "manageGroups": {
-    "message": "Gerenciar Grupos"
+    "message": "Gerenciar grupos"
   },
   "managePolicies": {
-    "message": "Gerenciar Políticas"
+    "message": "Gerenciar políticas"
   },
   "manageSso": {
     "message": "Gerenciar SSO"
   },
   "manageUsers": {
-    "message": "Gerenciar Usuários"
+    "message": "Gerenciar usuários"
   },
   "manageAccountRecovery": {
-    "message": "Gerencie recuperação de conta"
+    "message": "Gerenciar recuperação de conta"
   },
   "disableRequiredError": {
-    "message": "Você deve desativar manualmente a política $POLICYNAME$ antes que esta política possa ser desativada.",
+    "message": "Você deve desativar manualmente a política de $POLICYNAME$ antes que esta política possa ser desativada.",
     "placeholders": {
       "policyName": {
         "content": "$1",
@@ -5691,10 +6054,10 @@
     "message": "Uma política de organização está afetando suas opções de propriedade."
   },
   "personalOwnershipPolicyInEffectImports": {
-    "message": "Uma política da organização desativou a importação de itens para o seu cofre pessoal."
+    "message": "Uma política da organização bloqueou a importação de itens em seu cofre individual."
   },
   "personalOwnershipCheckboxDesc": {
-    "message": "Desativar propriedade pessoal para usuários da organização"
+    "message": "Remova a propriedade individual para usuários da organização"
   },
   "send": {
     "message": "Send",
@@ -5705,7 +6068,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineLearnMore": {
-    "message": "Saiba mais",
+    "message": "Saiba mais sobre o",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read '**Learn more about** Bitwarden Send or sign up to try it today.'"
   },
   "sendVaultCardProductDesc": {
@@ -5728,34 +6091,34 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, **or** try it now.'"
   },
   "developmentDevOpsAndITTeamsChooseBWSecret": {
-    "message": "Desenvolvimento, DevOps e equipes de TI escolhem o Gerenciador de Segredos do Bitwarden para gerenciar e implantar seus segredos de infraestrutura e máquina de forma segura."
+    "message": "Equipes de desenvolvimento, DevOps e TI escolhem o Bitwarden Gerenciador de Segredos para gerenciar e implementar seus segredos de infraestrutura e máquina de forma segura."
   },
   "centralizeSecretsManagement": {
     "message": "Centralize o gerenciamento de segredos."
   },
   "centralizeSecretsManagementDescription": {
-    "message": "Armazene e gerencie com segurança segredos em um único local para impedir sprawl secreto em sua organização."
+    "message": "Armazene e gerencie segredos com segurança em um único local para impedir dispersão de segredos em sua organização."
   },
   "preventSecretLeaks": {
-    "message": "Prevenir fugas secretas."
+    "message": "Impeça vazamentos de segredos."
   },
   "preventSecretLeaksDescription": {
-    "message": "Proteja segredos com criptografia de ponta a ponta. Não há mais segredos de codificação rígida ou compartilhamento através de arquivos .env."
+    "message": "Proteja segredos com criptografia de ponta a ponta. Nada mais de segredos hard-coded ou compartilhamento através de arquivos .env."
   },
   "enhanceDeveloperProductivity": {
-    "message": "Melhorar a produtividade do desenvolvedor."
+    "message": "Melhore a produtividade dos desenvolvedores."
   },
   "enhanceDeveloperProductivityDescription": {
-    "message": "Recuperar e implantar segredos programaticamente em tempo de execução para que os desenvolvedores possam se concentrar no que mais importa, como melhorar a qualidade do código."
+    "message": "Recupere e implemente segredos programaticamente em tempo de execução para que os desenvolvedores possam se concentrar no que mais importa, como melhorar a qualidade do código."
   },
   "strengthenBusinessSecurity": {
-    "message": "Fortalecer a segurança do negócio."
+    "message": "Fortaleça a segurança da empresa."
   },
   "strengthenBusinessSecurityDescription": {
-    "message": "Mantenha controle apertado sobre o acesso de máquina e humano a segredos com integrações SSO, logs de eventos e rotação de acesso."
+    "message": "Mantenha controle rígido sobre o acesso de máquina e humano a segredos com integrações de SSO, registros de eventos e rotação de acesso."
   },
   "tryItNow": {
-    "message": "Experimente agora"
+    "message": "Experimentar agora"
   },
   "sendRequest": {
     "message": "Enviar solicitação"
@@ -5764,31 +6127,31 @@
     "message": "Adicione uma anotação"
   },
   "bitwardenSecretsManager": {
-    "message": "Gerenciador de Segredos Bitwarden"
+    "message": "Bitwarden Gerenciador de Segredos"
   },
   "moreProductsFromBitwarden": {
     "message": "Mais produtos do Bitwarden"
   },
   "requestAccessToSecretsManager": {
-    "message": "Solicitar acesso ao gerente secreto"
+    "message": "Solicitar acesso ao Gerenciador de Segredos"
   },
   "youNeedApprovalFromYourAdminToTrySecretsManager": {
-    "message": "Você precisa de aprovação do seu administrador para testar o Gerenciador de Segredos."
+    "message": "Você precisa de aprovação do seu administrador para experimentar o Gerenciador de Segredos."
   },
   "smAccessRequestEmailSent": {
-    "message": "Solicitação de acesso ao e-mail gerente de segredos enviada aos administradores."
+    "message": "Solicitação de acesso para o gerenciador de segredos enviada ao e-mail dos administradores."
   },
   "requestAccessSMDefaultEmailContent": {
-    "message": "Olá,\n\nestou solicitando uma assinatura do Bitwarden Secrets Manager para a nossa equipe. O vosso apoio significaria muito!\n\nO Gerenciador de Segredos do Bitwarden é uma solução de gerenciamento de segredos criptografados de ponta a ponta para armazenamento seguro, Compartilhar e implantar credenciais de máquina como chaves API, senhas de banco de dados e certificados de autenticação.\n\nGerenciador de segredos nos ajudará a:\n\n- Melhorar a segurança\n- Operações de streaming\n- Evitar fugas de segredos dispendiosas\n\nPara solicitar uma avaliação gratuita para nossa equipe, por favor, entre em contato com o Bitwarden.\n\nObrigado pela sua ajuda!"
+    "message": "Olá,\n\nEstou solicitando uma assinatura do Bitwarden Gerenciador de Segredos para a nossa equipe. O vosso apoio significaria muito!\n\nO Gerenciador de Segredos do Bitwarden é uma solução de gerenciamento de segredos criptografados de ponta a ponta para armazenamento seguro, compartilhamento, e implementação de credenciais de máquina como chaves de API, senhas de banco de dados e certificados de autenticação.\n\nEle nos ajudará a:\n\n- Melhorar a segurança\n- Otimizar o fluxo\n- Impedir caros vazamentos de segredos\n\nPara solicitar uma avaliação gratuita para nossa equipe, por favor, entre em contato com o Bitwarden.\n\nObrigado pela sua ajuda!"
   },
   "giveMembersAccess": {
-    "message": "Dar acesso aos membros:"
+    "message": "Dê acesso aos membros:"
   },
   "viewAndSelectTheMembers": {
     "message": "veja e selecione os membros que você deseja dar acesso ao Gerenciador de Segredos."
   },
   "openYourOrganizations": {
-    "message": "Abrir sua organização"
+    "message": "Abra o da sua organização"
   },
   "usingTheMenuSelect": {
     "message": "Usando o menu, selecione"
@@ -5797,7 +6160,7 @@
     "message": "para conceder acesso aos membros selecionados."
   },
   "sendVaultCardTryItNow": {
-    "message": "teste agora",
+    "message": "experimente-o agora",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, or **try it now**.'"
   },
   "sendAccessTaglineOr": {
@@ -5805,11 +6168,11 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send **or** sign up to try it today.'"
   },
   "sendAccessTaglineSignUp": {
-    "message": "registre-se",
+    "message": "cadastre-se",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or **sign up** to try it today.'"
   },
   "sendAccessTaglineTryToday": {
-    "message": "para testar hoje mesmo.",
+    "message": "para experimentá-lo hoje mesmo.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or sign up to **try it today.**'"
   },
   "sendAccessCreatorIdentifier": {
@@ -5822,7 +6185,7 @@
     }
   },
   "viewSend": {
-    "message": "Ver Enviar",
+    "message": "Ver Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "viewSendHiddenEmailWarning": {
@@ -5833,22 +6196,22 @@
     "message": "A data de validade fornecida não é válida."
   },
   "deletionDateIsInvalid": {
-    "message": "A data de exclusão fornecida não é válida."
+    "message": "A data de apagamento fornecida não é válida."
   },
   "expirationDateAndTimeRequired": {
-    "message": "Uma data e hora de expiração são obrigatórias."
+    "message": "Uma data e hora de validade são obrigatórias."
   },
   "deletionDateAndTimeRequired": {
-    "message": "Uma data e hora de exclusão são obrigatórias."
+    "message": "Uma data e hora de apagamento são obrigatórias."
   },
   "dateParsingError": {
-    "message": "Ocorreu um erro ao salvar as suas datas de exclusão e validade."
+    "message": "Ocorreu um erro ao salvar as suas datas de apagamento e validade."
   },
   "hideYourEmail": {
-    "message": "Oculte seu endereço de e-mail dos visualizadores."
+    "message": "Ocultar seu endereço de e-mail dos visualizadores."
   },
   "webAuthnFallbackMsg": {
-    "message": "Para verificar seu 2FA, por favor, clique no botão abaixo."
+    "message": "Para verificar sua 2FA, clique no botão abaixo."
   },
   "webAuthnAuthenticate": {
     "message": "Autenticar WebAuthn"
@@ -5863,13 +6226,13 @@
     "message": "O WebAuthn não é suportado neste navegador."
   },
   "webAuthnSuccess": {
-    "message": "<strong>WebAuthn verificado com sucesso!</strong><br>Você pode fechar esta guia."
+    "message": "WebAuthn verificado com sucesso! Você pode fechar esta aba."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Sua nova senha não pode ser a mesma que a sua atual."
+    "message": "Sua senha nova não pode ser a mesma que a sua atual."
   },
   "hintEqualsPassword": {
-    "message": "Sua dica de senha senha não pode ser a mesma que a sua senha."
+    "message": "A dica da sua senha não pode ser a mesma coisa que sua senha."
   },
   "enrollAccountRecovery": {
     "message": "Inscrever-se na recuperação de conta"
@@ -5878,10 +6241,10 @@
     "message": "Inscrito na recuperação de conta"
   },
   "withdrawAccountRecovery": {
-    "message": "Retirar da recuperação de conta"
+    "message": "Retirar-se da recuperação de conta"
   },
   "enrollPasswordResetSuccess": {
-    "message": "Inscrição com sucesso!"
+    "message": "Inscrito com sucesso!"
   },
   "withdrawPasswordResetSuccess": {
     "message": "Retirada com sucesso!"
@@ -5896,7 +6259,7 @@
     }
   },
   "eventWithdrawAccountRecovery": {
-    "message": "O usuário $ID$ retirou da recuperação de conta.",
+    "message": "O usuário $ID$ retirou-se da recuperação de conta.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5905,7 +6268,7 @@
     }
   },
   "eventAdminPasswordReset": {
-    "message": "Redefinir senha mestra para o usuário $ID$.",
+    "message": "Senha principal do usuário $ID$ reconfigurada.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5914,7 +6277,7 @@
     }
   },
   "eventResetSsoLink": {
-    "message": "Redefinir link Sso para o usuário $ID$",
+    "message": "Reconfigurou o link do SSO para o usuário $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5923,7 +6286,7 @@
     }
   },
   "firstSsoLogin": {
-    "message": "$ID$ se conectou usando o Sso pela primeira vez",
+    "message": "$ID$ conectou-se usando o SSO pela primeira vez",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5932,10 +6295,10 @@
     }
   },
   "resetPassword": {
-    "message": "Redefinir Senha"
+    "message": "Reconfigurar senha"
   },
   "resetPasswordLoggedOutWarning": {
-    "message": "O processo desconectará $NAME$ de sua sessão atual, exigindo que eles iniciem a sessão novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora.",
+    "message": "O processo desconectará $NAME$ de sua sessão atual, obrigando que eles se conectem novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora.",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -5944,7 +6307,7 @@
     }
   },
   "emergencyAccessLoggedOutWarning": {
-    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "message": "O processo desconectará $NAME$ de sua sessão atual, obrigando que eles se conectem novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora.",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -5956,61 +6319,61 @@
     "message": "este usuário"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
-    "message": "Uma ou mais políticas da organização exigem que a senha mestra cumpra aos seguintes requisitos:"
+    "message": "Uma ou mais políticas da organização exigem que a senha principal cumpra aos seguintes requisitos:"
   },
   "changePasswordDelegationMasterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require the master password to meet the following requirements:"
+    "message": "Uma ou mais políticas da organização exigem que a senha principal cumpra aos seguintes requisitos:"
   },
   "resetPasswordSuccess": {
-    "message": "Senha redefinida com sucesso!"
+    "message": "Senha reconfigurada com sucesso!"
   },
   "resetPasswordEnrollmentWarning": {
-    "message": "A inscrição permitirá que os administradores da organização alterem sua senha mestra. Tem certeza que deseja se inscrever?"
+    "message": "A inscrição permitirá que os administradores da organização alterem sua senha principal"
   },
   "accountRecoveryPolicy": {
-    "message": "Gerenciar recuperação de conta"
+    "message": "Gerenciamento da recuperação de conta"
   },
   "accountRecoveryPolicyDesc": {
-    "message": "Baseado no método de criptografia, recupere contas quando senhas mestras ou dispositivos confiáveis forem esquecidos ou perdidos."
+    "message": "Baseado no método de criptografia, recupere contas quando senhas principais ou dispositivos confiados forem esquecidos ou perdidos."
   },
   "accountRecoveryPolicyWarning": {
-    "message": "Contas existentes com senhas mestras exigirá que os membros se inscrevam antes que os administradores possam recuperar suas contas. A inscrição automática irá ativar a recuperação de conta para novos membros."
+    "message": "Contas existentes com senhas principais exigirão que os membros se inscrevam si mesmos antes que os administradores possam recuperar suas contas. A inscrição automática irá ativar a recuperação de conta para novos membros."
   },
   "accountRecoverySingleOrgRequirementDesc": {
     "message": "A política empresarial de organização única deve ser ativada antes de ativar esta política."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Inscrição Automática"
+    "message": "Inscrição automática"
   },
   "resetPasswordPolicyAutoEnrollCheckbox": {
-    "message": "Inscrever automaticamente novos usuários"
+    "message": "Exigir que novos membros sejam inscritos automaticamente"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "Esta organização possui uma política empresarial que irá inscrevê-lo automaticamente na redefinição de senha. A inscrição permitirá que os administradores da organização alterem sua senha mestra."
+    "message": "Esta organização possui uma política empresarial que irá inscrevê-lo automaticamente na reconfiguração de senha. A inscrição permitirá que os administradores da organização alterem sua senha principal."
   },
   "resetPasswordOrgKeysError": {
-    "message": "A resposta das Chaves da Organização é nula"
+    "message": "A resposta das chaves da organização é nula"
   },
   "resetPasswordDetailsError": {
-    "message": "A resposta para Redefinir os Detalhes da Senha é nula"
+    "message": "A resposta para os detalhes de reconfiguração de senha é nula"
   },
   "trashCleanupWarning": {
-    "message": "As cifras que ficarem na lixeira por mais de 30 dias serão excluídas automaticamente."
+    "message": "Items que estão na lixeira por mais de 30 dias serão apagados automaticamente."
   },
   "trashCleanupWarningSelfHosted": {
-    "message": "As cifras que estiverem na Lixeira por um tempo serão excluídas automaticamente."
+    "message": "Itens que ficarem na lixeira por um tempo serão apagados automaticamente."
   },
   "passwordPrompt": {
-    "message": "Nova solicitação de senha mestra"
+    "message": "Resolicitar senha principal"
   },
   "passwordConfirmation": {
-    "message": "Confirmação de senha mestra"
+    "message": "Confirmação de senha principal"
   },
   "passwordConfirmationDesc": {
-    "message": "Esta ação está protegida. Para continuar, por favor, reinsira a sua senha mestra para verificar sua identidade."
+    "message": "Esta ação está protegida. Para continuar, digite a sua senha principal novamente para verificar sua identidade."
   },
   "reinviteSelected": {
-    "message": "Reenviar Convites"
+    "message": "Reenviar convites"
   },
   "resendNotification": {
     "message": "Reenviar notificação"
@@ -6022,7 +6385,7 @@
     "message": "Tem certeza de que deseja remover os seguintes usuários? O processo pode levar alguns segundos para ser concluído e não pode ser interrompido ou cancelado."
   },
   "removeOrgUsersConfirmation": {
-    "message": "Quando membro(s) são removidos, eles não têm acesso aos dados da organização e esta ação é irreversível. Para adicionar o membro de volta à organização, ele deve ser convidado e integrado novamente. O processo pode demorar alguns segundos para ser concluído e não pode ser interrompido ou cancelado."
+    "message": "Quando membro(s) são removidos, eles não têm mais acesso aos dados da organização e esta ação é irreversível. Para adicionar o membro de volta à organização, ele deve ser convidado e integrado novamente. O processo pode demorar alguns segundos para ser concluído e não pode ser interrompido ou cancelado."
   },
   "revokeUsersWarning": {
     "message": "Quando membro(s) são revogados, eles não têm mais acesso aos dados da organização. Para restaurar o acesso rapidamente, vá para a aba Revogados. O processo pode demorar alguns segundos para ser concluído e não pode ser interrompido ou cancelado."
@@ -6034,7 +6397,7 @@
     "message": "Escolha um tema para o seu cofre web."
   },
   "themeSystem": {
-    "message": "Usar Tema do Sistema"
+    "message": "Usar tema do sistema"
   },
   "themeDark": {
     "message": "Escuro"
@@ -6043,16 +6406,16 @@
     "message": "Claro"
   },
   "confirmSelected": {
-    "message": "Confirmar Selecionado(s)"
+    "message": "Confirmar selecionados"
   },
   "bulkConfirmStatus": {
-    "message": "Status de ação em massa"
+    "message": "Estado de ação em massa"
   },
   "bulkConfirmMessage": {
-    "message": "Confirmado com sucesso."
+    "message": "Confirmado com sucesso"
   },
   "bulkReinviteMessage": {
-    "message": "Convidado novamente com sucesso."
+    "message": "Re-convidado com sucesso"
   },
   "bulkRemovedMessage": {
     "message": "Removido com sucesso"
@@ -6064,13 +6427,13 @@
     "message": "Acesso à organização restaurado com sucesso"
   },
   "bulkFilteredMessage": {
-    "message": "Excluído, não aplicável para esta ação."
+    "message": "Excluído, não aplicável para esta ação"
   },
   "nonCompliantMembersTitle": {
-    "message": "Membros não compatíveis"
+    "message": "Membros não adequados"
   },
   "nonCompliantMembersError": {
-    "message": "Os membros que não estão em conformidade com a política de “login” único ou de duas etapas não poderão ser restaurados até cumprirem os requisitos da política"
+    "message": "Os membros que não estão em conformidade com a política de organização única ou de duas etapas não poderão ser restaurados até cumprirem os requisitos da política"
   },
   "fingerprint": {
     "message": "Impressão digital"
@@ -6082,13 +6445,13 @@
     "message": "Erro"
   },
   "decryptionError": {
-    "message": "Erro ao descriptografar"
+    "message": "Erro de descriptografia"
   },
   "couldNotDecryptVaultItemsBelow": {
     "message": "O Bitwarden não pôde descriptografar o(s) item(ns) do cofre listado abaixo."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contato com o cliente feito com sucesso",
+    "message": "Contate o costumer success",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
@@ -6099,19 +6462,19 @@
     "message": "Gerenciar usuários também devem ser concedidos com a permissão de gerenciar a recuperação de contas"
   },
   "setupProvider": {
-    "message": "Configuração do Provedor"
+    "message": "Configuração do provedor"
   },
   "setupProviderLoginDesc": {
-    "message": "Você foi convidado para configurar um novo provedor. Para continuar, você precisa iniciar sessão ou criar uma nova conta no Bitwarden."
+    "message": "Você foi convidado para configurar um novo provedor. Para continuar, você precisa se conectar ou criar uma nova conta no Bitwarden."
   },
   "setupProviderDesc": {
-    "message": "Por favor, insira os detalhes abaixo para completar a configuração do provedor. Entre em Contato com o Suporte ao Cliente se tiver alguma dúvida."
+    "message": "Digite os detalhes abaixo para completar a configuração do provedor. Entre em contato com o suporte ao cliente se tiver alguma dúvida."
   },
   "providerName": {
-    "message": "Nome do Provedor"
+    "message": "Nome do provedor"
   },
   "providerSetup": {
-    "message": "O provedor foi configurado."
+    "message": "Provedor configurado com sucesso"
   },
   "clients": {
     "message": "Clientes"
@@ -6121,13 +6484,13 @@
     "description": "This is used as a table header to describe which client application created an event log."
   },
   "providerAdmin": {
-    "message": "Administrador do Provedor"
+    "message": "Administrador do provedor"
   },
   "providerAdminDesc": {
     "message": "O usuário de maior acesso que pode gerenciar todos os aspectos do seu provedor, bem como acessar e gerenciar organizações de clientes."
   },
   "serviceUser": {
-    "message": "Usuário de Serviço"
+    "message": "Usuário do serviço"
   },
   "serviceUserDesc": {
     "message": "Os usuários do serviço podem acessar e gerenciar todas as organizações de clientes."
@@ -6136,10 +6499,10 @@
     "message": "Convide um novo usuário para seu provedor digitando o endereço de e-mail da conta Bitwarden dele abaixo. Se ele não tiver uma conta no Bitwarden, ele será solicitado a criar uma nova conta."
   },
   "joinProvider": {
-    "message": "Participar do Provedor"
+    "message": "Juntar-se ao provedor"
   },
   "joinProviderDesc": {
-    "message": "Você foi convidado para participar do provedor listado acima. Para aceitar o convite, você precisa iniciar sessão ou criar uma nova conta no Bitwarden."
+    "message": "Você foi convidado para participar do provedor listado acima. Para aceitar o convite, você precisa se conectar ou criar uma nova conta no Bitwarden."
   },
   "providerInviteAcceptFailed": {
     "message": "Não foi possível aceitar o convite. Peça ao administrador do provedor para enviar um novo convite."
@@ -6154,25 +6517,25 @@
     "message": "Provedor"
   },
   "newClientOrganization": {
-    "message": "Nova Organização de Cliente"
+    "message": "Nova organização de cliente"
   },
   "newClientOrganizationDesc": {
-    "message": "Crie uma nova organização de cliente que será associada a você como o provedor. Você poderá acessar e gerenciar esta organização."
+    "message": "Crie uma organização de cliente que será associada a você como o provedor. Você poderá acessar e gerenciar esta organização."
   },
   "newClient": {
     "message": "Novo cliente"
   },
   "addExistingOrganization": {
-    "message": "Adicionar Organização Existente"
+    "message": "Adicionar organização existente"
   },
   "addNewOrganization": {
     "message": "Adicionar nova organização"
   },
   "myProvider": {
-    "message": "Meu Provedor"
+    "message": "Meu provedor"
   },
   "addOrganizationConfirmation": {
-    "message": "Tem certeza de que deseja adicionar $ORGANIZATION$ como um cliente a $PROVIDER$?",
+    "message": "Tem certeza de que deseja adicionar $ORGANIZATION$ como um cliente de $PROVIDER$?",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -6197,10 +6560,10 @@
     }
   },
   "providerIsDisabled": {
-    "message": "O provedor está desativado."
+    "message": "Provedor suspenso"
   },
   "providerUpdated": {
-    "message": "Provedor atualizado"
+    "message": "Provedor salvo"
   },
   "yourProviderIs": {
     "message": "Seu provedor é $PROVIDER$. Eles têm privilégios administrativos e de cobrança para sua organização.",
@@ -6227,55 +6590,70 @@
     "message": "Adicionar"
   },
   "masterPasswordSuccessfullySet": {
-    "message": "Master password successfully set"
+    "message": "Senha principal configurada com sucesso"
   },
   "updatedMasterPassword": {
-    "message": "Senha Mestra Atualizada"
+    "message": "Senha principal salva"
   },
   "updateMasterPassword": {
-    "message": "Atualizar Senha Mestra"
+    "message": "Atualizar senha principal"
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
-    "message": "Change your master password to complete account recovery."
+    "message": "Altere a sua senha principal para concluir a recuperação da conta."
   },
   "updateMasterPasswordSubtitle": {
-    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+    "message": "Sua senha principal não corresponde aos requisitos dessa organização. Altere a sua senha principal para continuar."
   },
   "updateMasterPasswordWarning": {
-    "message": "Sua Senha Mestra foi alterada recentemente por um administrador em sua organização. Para acessar o cofre, você deve atualizar sua Senha Mestra agora. Prosseguir irá desconectá-lo da sessão atual, exigindo que você faça login novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
+    "message": "Sua senha principal foi alterada recentemente por um administrador na sua organização. Para acessar o cofre, você deve atualizar sua senha principal agora. Prosseguir irá desconectá-lo da sessão atual, exigindo que você se conecte novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
   "masterPasswordInvalidWarning": {
-    "message": "Sua Senha Mestra foi alterada recentemente por um administrador de sua organização. Para acessar o cofre, você precisa atualizar sua Senha Mestra agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
+    "message": "A sua senha principal não atende aos requisitos da política desta organização. Para poder se juntar à organização, você precisa atualizar sua senha principal agora. O processo te desconectará da sua sessão atual, exigindo que você se conecte novamente. Sessões ativas em outros dispositivos podem ficar ativas por até uma hora."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "A sua senha mestra não atende a uma ou mais das políticas da sua organização. Para acessar o cofre, você deve atualizar a sua senha mestra agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
+    "message": "A sua senha principal não atende aos requisitos da política desta organização. Para poder acessar o cofre, você precisa atualizar sua senha principal agora. O processo te desconectará da sua sessão atual, exigindo que você se conecte novamente. Sessões ativas em outros dispositivos podem ficar ativas por até uma hora."
   },
-  "automaticAppLogin": {
-    "message": "Fazer login automaticamente em usuários para aplicativos permitidos"
+  "automaticAppLoginWithSSO": {
+    "message": "Autenticação automática com SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Os formulários de login serão automaticamente preenchidos e enviados para aplicativos iniciados por seu provedor de identidade configurado."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Estenda a segurança e conveniência do SSO para aplicativos não gerenciados. Quando usuários abrir um aplicativo pelo seu provedor de identidade, os detalhes de autenticação serão preenchidos e enviados automaticamente, criando um fluxo seguro e de um só clique do provedor de identidade ao aplicativo."
   },
   "automaticAppLoginIdpHostLabel": {
-    "message": "Provedor de identidade"
+    "message": "Servidor do provedor de identidade"
   },
   "automaticAppLoginIdpHostDesc": {
-    "message": "Digite a URL do seu provedor de identidade. Insira vários URLs, separando com uma vírgula."
+    "message": "Digite o URL do seu provedor de identidade. Digite vários URLs separando com uma vírgula."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Sua organização atualizou suas opções de descriptografia. Por favor, defina uma senha mestra para acessar seu cofre."
+    "message": "Sua organização atualizou suas opções de descriptografia. Configure uma senha principal para acessar seu cofre."
   },
-  "maximumVaultTimeout": {
-    "message": "Tempo Limite do Cofre"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Tempo limite da sessão"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Configure o tempo máximo para o cofre para todos os usuários."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Configure um tempo limite máximo para a sessão de todos os membros, exceto os proprietários."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Tempo Limite Máximo do Cofre"
+  "maximumAllowedTimeout": {
+    "message": "Tempo limite máximo permitido"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Tempo Máximo de Cofre Inválido."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Tempo limite máximo permitido é necessário."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Tempo é inválido. Altere pelo menos um valor."
+  },
+  "sessionTimeoutAction": {
+    "message": "Ação do tempo limite da sessão"
+  },
+  "immediately": {
+    "message": "Imediatamente"
+  },
+  "onSystemLock": {
+    "message": "No bloqueio do sistema"
+  },
+  "onAppRestart": {
+    "message": "No reinício do aplicativo"
   },
   "hours": {
     "message": "Horas"
@@ -6283,8 +6661,23 @@
   "minutes": {
     "message": "Minutos"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Você tem certeza de que deseja permitir um tempo limite máximo de \"Nunca\" para todos os membros?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Esta opção salvará as chaves criptográficas dos seus membros em seus dispositivos. Se escolher esta opção, certifique-se de que seus dispositivos estão adequadamente protegidos."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Saiba mais sobre a proteção de dispositivos"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"Bloqueio de sistema\" só será aplicado ao navegador e aplicativo de computador"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "O aplicativo móvel e web usarão \"no reinício do aplicativo\" como tempo máximo permitido, já que a opção não é suportada."
+  },
   "vaultTimeoutPolicyInEffect": {
-    "message": "As políticas da sua organização estão afetando o tempo limite do seu cofre. O Tempo Limite Máximo permitido do Cofre é $HOURS$ hora(s) e $MINUTES$ minuto(s)",
+    "message": "As políticas da sua organização configuraram o seu máximo permitido do tempo limite do cofre para $HOURS$ hora(s) e $MINUTES$ minuto(s).",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6310,7 +6703,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "As políticas da sua organização estão afetando o tempo limite do seu cofre. O Tempo Limite Máximo permitido do Cofre é {0} hora(s) e {1} minuto(s). Seu tempo limite do cofre está definido em {2}.",
+    "message": "As políticas da sua organização estão afetando o tempo limite do seu cofre. \nO tempo limite máximo permitido para o cofre é $HOURS$ hora(s) e $MINUTES$ minuto(s). A ação de tempo limite do seu cofre está configurada como $ACTION$.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6327,7 +6720,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "As políticas da sua organização definiram a ação tempo limite do seu cofre para $ACTION$.",
+    "message": "As políticas da sua organização configuraram a ação do tempo limite do seu cofre para $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -6336,205 +6729,205 @@
     }
   },
   "vaultTimeoutToLarge": {
-    "message": "O tempo limite do seu cofre excede a restrição definida por sua organização."
+    "message": "O tempo limite do seu cofre excede as restrições estabelecidas pela sua organização."
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Tempo limite mínimo personalizado é 1 minuto."
+    "message": "O mínimo do tempo limite personalizado é de 1 minuto."
   },
   "vaultTimeoutRangeError": {
     "message": "Tempo limite do cofre não está dentro do intervalo permitido."
   },
   "disablePersonalVaultExport": {
-    "message": "Desabilitar Exportação de Cofre Pessoal"
+    "message": "Remover exportação do cofre individual"
   },
   "disablePersonalVaultExportDescription": {
     "message": "Não permita que os membros exportem dados do seu cofre individual."
   },
   "vaultExportDisabled": {
-    "message": "Exportação de Cofre Desabilitada"
+    "message": "Exportação de cofre removida"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "Uma ou mais políticas da organização impdem que você exporte seu cofre pessoal."
+    "message": "Uma ou mais políticas da organização impedem que você exporte seu cofre individual."
   },
   "activateAutofill": {
     "message": "Ativar preenchimento automático"
   },
   "activateAutofillPolicyDesc": {
-    "message": "Ative a configuração de preenchimento automático ao carregamento de página na extensão do navegador para todos os membros existentes e novos."
+    "message": "Ative a configuração de preenchimento automático no carregamento da página na extensão do navegador para todos os membros existentes e novos."
   },
   "experimentalFeature": {
-    "message": "Sites comprometidos ou não confiáveis podem tomar vantagem do autopreenchimento ao carregar a página."
+    "message": "Sites comprometidos ou não confiáveis podem tomar vantagem do preenchimento automático ao carregar a página."
   },
   "learnMoreAboutAutofill": {
     "message": "Saiba mais sobre o preenchimento automático"
   },
   "selectType": {
-    "message": "Selecionar Tipo de SSO"
+    "message": "Selecionar tipo de SSO"
   },
   "type": {
     "message": "Tipo"
   },
   "openIdConnectConfig": {
-    "message": "Configuração OpenID Connect"
+    "message": "Configuração do OpenID Connect"
   },
   "samlSpConfig": {
-    "message": "Configuração do Provedor de Serviço SAML"
+    "message": "Configuração do provedor de serviço SAML"
   },
   "samlIdpConfig": {
-    "message": "Configuração do Provedor de Identidade SAML"
+    "message": "Configuração do provedor de identidade SAML"
   },
   "callbackPath": {
-    "message": "Caminho de Retorno"
+    "message": "Caminho de callback"
   },
   "signedOutCallbackPath": {
-    "message": "Caminho de Retorno de Chamada Desconectado"
+    "message": "Caminho de callback desconectado"
   },
   "authority": {
     "message": "Autoridade"
   },
   "clientId": {
-    "message": "ID do Cliente"
+    "message": "ID do cliente"
   },
   "clientSecret": {
-    "message": "Segredo do Cliente"
+    "message": "Segredo do cliente"
   },
   "metadataAddress": {
-    "message": "Endereço dos Metadados"
+    "message": "Endereço dos metadados"
   },
   "oidcRedirectBehavior": {
-    "message": "Comportamento de Redirecionamento OIDC"
+    "message": "Comportamento de redirecionamento OIDC"
   },
   "getClaimsFromUserInfoEndpoint": {
-    "message": "Obter Reivindicações do Terminal de Informações do Usuário"
+    "message": "Obter reivindicações do link de informações de usuário"
   },
   "additionalScopes": {
-    "message": "Escopos Adicionais/Personalizados (delimitado por vírgulas)"
+    "message": "Escopos personalizados"
   },
   "additionalUserIdClaimTypes": {
-    "message": "Tipos de Reivindicação de ID de Usuário Adicionais/Personalizados (delimitado por vírgulas)"
+    "message": "Tipos de reivindicação de ID de usuário personalizado"
   },
   "additionalEmailClaimTypes": {
-    "message": "Tipos de Reivindicação de E-mail Adicionais/Personalizados (delimitado por vírgulas)"
+    "message": "Tipos de reivindicação de e-mail"
   },
   "additionalNameClaimTypes": {
-    "message": "Tipos de Reivindicação de Nome Adicionais/Personalizados (delimitado por vírgulas)"
+    "message": "Tipos de reivindicação de nomes personalizados"
   },
   "acrValues": {
-    "message": "Valores de Referência de Classe de Contexto de Autenticação Solicitada (acr_values)"
+    "message": "Valores de referência de classe de contexto de autenticação solicitados"
   },
   "expectedReturnAcrValue": {
-    "message": "Esperado Valor de Reivindicação \"acr\" Na Resposta (validação acr)"
+    "message": "Era esperado o valor de reivindicação \"acr\" na resposta"
   },
   "spEntityId": {
-    "message": "ID da Entidade SP"
+    "message": "ID da entidade SP"
   },
   "spMetadataUrl": {
-    "message": "URL de Metadados SAML 2.0"
+    "message": "URL de metadados do SAML 2.0"
   },
   "spAcsUrl": {
-    "message": "URL do Serviço de Declaração de Consumidor (ACS)"
+    "message": "URL do serviço de declaração de consumidor (ACS)"
   },
   "spNameIdFormat": {
-    "message": "Formato ID do Nome"
+    "message": "Formato do ID do nome"
   },
   "spOutboundSigningAlgorithm": {
-    "message": "Algoritmo de Assinatura de Saída"
+    "message": "Algoritmo de assinatura de saída"
   },
   "spSigningBehavior": {
-    "message": "Comportamento de Assinatura"
+    "message": "Comportamento de assinatura"
   },
   "spMinIncomingSigningAlgorithm": {
-    "message": "Algoritmo de Assinatura de Entrada Mínima"
+    "message": "Algoritmo mínimo de assinatura de entrada"
   },
   "spWantAssertionsSigned": {
-    "message": "Precisa de Declarações Assinadas"
+    "message": "Supor declarações assinadas"
   },
   "spValidateCertificates": {
-    "message": "Validar Certificados"
+    "message": "Validar certificados"
   },
   "spUniqueEntityId": {
-    "message": "Defina um ID único de entidade SP"
+    "message": "Configurar ID único para entidade SP"
   },
   "spUniqueEntityIdDesc": {
-    "message": "Gerar um identificador que seja exclusivo para sua organização"
+    "message": "Gere um identificador que é único para a sua organização"
   },
   "idpEntityId": {
-    "message": "ID da Entidade"
+    "message": "ID da entidade"
   },
   "idpBindingType": {
-    "message": "Tipo de Ligação"
+    "message": "Tipo de vínculo"
   },
   "idpSingleSignOnServiceUrl": {
-    "message": "URL de Serviço de Logon Único"
+    "message": "URL do serviço de autenticação única"
   },
   "idpSingleLogoutServiceUrl": {
-    "message": "URL de Serviço de Desconexão Único"
+    "message": "URL do serviço de desconexão única"
   },
   "idpX509PublicCert": {
-    "message": "Certificado Público X509"
+    "message": "Certificado público X509"
   },
   "idpOutboundSigningAlgorithm": {
-    "message": "Algoritmo de Assinatura de Saída"
+    "message": "Algoritmo de assinatura de saída"
   },
   "idpAllowUnsolicitedAuthnResponse": {
-    "message": "Permitir Retorno de Autenticação Não Solicitada"
+    "message": "Permitir respostas não solicitadas de autenticação"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Permitir pedidos de saída"
+    "message": "Permitir solicitações de desconexão de saída"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Assinar pedidos de autenticação"
+    "message": "Assinar solicitações de autenticação"
   },
   "ssoSettingsSaved": {
-    "message": "Configuração de logon único foi salva."
+    "message": "Configuração da autenticação única salva"
   },
   "sponsoredFamilies": {
-    "message": "Bitwarden Families Gratuito"
+    "message": "Bitwarden Famílias Grátis"
   },
   "sponsoredBitwardenFamilies": {
-    "message": "Sponsored families"
+    "message": "Famílias financiadas"
   },
   "noSponsoredFamiliesMessage": {
-    "message": "No sponsored families"
+    "message": "Nenhuma família financiada"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "Sponsored non-member families plans will display here"
+    "message": "Planos familiares financiados de não membros aparecerão aqui"
   },
   "sponsorshipFreeBitwardenFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. You can sponsor Free Bitwarden Families for employees who are not a member of your Bitwarden organization. Sponsoring a non-member requires an available seat within your organization."
+    "message": "Os membros da sua organização são elegíveis para o Bitwarden Famílias Grátis. Você pode financiar o Bitwarden Famílias de graça para funcionários que não são membros da sua organização do Bitwarden. Para financiar um não membro, é necessária uma vaga disponível dentro da sua organização."
   },
   "sponsoredFamiliesRemoveActiveSponsorship": {
-    "message": "When you remove an active sponsorship, a seat within your organization will be available after the renewal date of the sponsored organization."
+    "message": "Quando você remove um financiamento ativo, uma vaga dentro da sua organização ficará disponível após a data de renovação da organização financiada."
   },
   "sponsoredFamiliesEligible": {
-    "message": "Você e sua família estão elegíveis para o Bitwarden Families Gratuito. Resgate com seu e-mail pessoal para manter seus dados seguros mesmo quando você não estiver no trabalho."
+    "message": "Você e a sua família são elegíveis para o Bitwarden Famílias Grátis. Resgate com seu e-mail pessoal para manter seus dados seguros mesmo quando você não estiver no trabalho."
   },
   "sponsoredFamiliesEligibleCard": {
-    "message": "Resgate o seu plano Bitwarden for Families Grátis hoje para manter seus dados seguros mesmo quando você não estiver no trabalho."
+    "message": "Resgate o seu plano Bitwarden Famílias Grátis hoje para manter seus dados seguros mesmo quando não estiver no trabalho."
   },
   "sponsoredFamiliesIncludeMessage": {
-    "message": "The Bitwarden for Families plan includes"
+    "message": "O plano Bitwarden Famílias inclui"
   },
   "sponsoredFamiliesPremiumAccess": {
-    "message": "Acesso premium para até 6 usuários"
+    "message": "Acesso Premium para até 6 usuários"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "Shared collections for family members"
+    "message": "Conjuntos compartilhados para membros da família"
   },
   "memberFamilies": {
-    "message": "Member families"
+    "message": "Famílias de membros"
   },
   "noMemberFamilies": {
-    "message": "No member families"
+    "message": "Nenhuma família de membros"
   },
   "noMemberFamiliesDescription": {
-    "message": "Members who have redeemed family plans will display here"
+    "message": "Os membros que resgataram os planos familiares aparecerão aqui"
   },
   "membersWithSponsoredFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. Here you can see members who have sponsored a Families organization."
+    "message": "Os membros da sua organização são elegíveis para o Bitwarden Famílias Grátis. Aqui você pode ver os membros que financiaram uma organização do Famílias."
   },
   "organizationHasMemberMessage": {
-    "message": "A sponsorship cannot be sent to $EMAIL$ because they are a member of your organization.",
+    "message": "Um financiamento não pode ser enviado para $EMAIL$ porque eles são um membro da sua organização.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6543,31 +6936,31 @@
     }
   },
   "badToken": {
-    "message": "O link não é mais válido. Peça ao patrocinador para reenviar a oferta."
+    "message": "O link não é mais válido. Peça ao financiador para reenviar a oferta."
   },
   "reclaimedFreePlan": {
-    "message": "Plano gratuito recuperado"
+    "message": "Plano gratuito resgatado"
   },
   "redeem": {
     "message": "Resgatar"
   },
   "sponsoredFamiliesSelectOffer": {
-    "message": "Selecione a organização que você gostaria de patrocinar"
+    "message": "Selecione a organização que você gostaria de financiar"
   },
   "familiesSponsoringOrgSelect": {
-    "message": "Qual oferta do Families Grátis você gostaria de resgatar?"
+    "message": "Qual oferta do Famílias Grátis você gostaria de resgatar?"
   },
   "sponsoredFamiliesEmail": {
-    "message": "Digite seu e-mail pessoal para resgatar o Bitwarden Families"
+    "message": "Digite o seu e-mail pessoal para resgatar o Bitwarden Famílias"
   },
   "sponsoredFamiliesLeaveCopy": {
-    "message": "Se você sair ou for removido desta organização, seu plano do Families irá expirar no final do período de cobrança."
+    "message": "Se você remover uma oferta ou ser removido da organização financiante, o seu financiamento irá expirar na próxima data de renovação."
   },
   "acceptBitwardenFamiliesHelp": {
-    "message": "Aceite a oferta de uma organização existente ou crie uma nova organização de Famílias."
+    "message": "Aceite a oferta de uma organização existente ou crie uma organização de Famílias."
   },
   "setupSponsoredFamiliesLoginDesc": {
-    "message": "Foi oferecida a você uma Organização do Plano Bitwarden Families gratuita. Para continuar, você precisa entrar na conta que recebeu a oferta."
+    "message": "Foi oferecida a você uma organização do plano Bitwarden Famílias Grátis. Para continuar, você precisa se conectar à conta que recebeu a oferta."
   },
   "sponsoredFamiliesAcceptFailed": {
     "message": "Não é possível aceitar a oferta. Reenvie o e-mail da oferta da conta corporativa e tente novamente."
@@ -6582,10 +6975,10 @@
     }
   },
   "sponsoredFamiliesOffer": {
-    "message": "Resgatar Oferta de Organização do Bitwarden Families Gratuita"
+    "message": "Aceitar Bitwarden Familías Grátis"
   },
   "sponsoredFamiliesOfferRedeemed": {
-    "message": "A Oferta Gratuita do Bitwarden Families foi resgatada com sucesso"
+    "message": "Oferta do Bitwarden Familías Grátis resgatada com sucesso"
   },
   "redeemed": {
     "message": "Resgatado"
@@ -6594,7 +6987,7 @@
     "message": "Conta resgatada"
   },
   "revokeAccountMessage": {
-    "message": "Revoke account $NAME$",
+    "message": "Revogar conta $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6603,7 +6996,7 @@
     }
   },
   "resendEmailLabel": {
-    "message": "Reenviar e-mail de Patrocínio para $NAME$ patrocínio",
+    "message": "Reenviar o e-mail de financiamento para o financiamento do $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6612,7 +7005,7 @@
     }
   },
   "freeFamiliesPlan": {
-    "message": "Plano de famílias gratuitas"
+    "message": "Plano Famílias grátis"
   },
   "redeemNow": {
     "message": "Resgatar agora"
@@ -6621,37 +7014,37 @@
     "message": "Destinatário"
   },
   "removeSponsorship": {
-    "message": "Remover Patrocínio"
+    "message": "Remover financiamento"
   },
   "removeSponsorshipConfirmation": {
-    "message": "Após remover um patrocínio, você será responsável por esta assinatura e faturas relacionadas. Você tem certeza que deseja continuar?"
+    "message": "Após remover um financiamento, você ficará responsável por esta assinatura e as faturas relacionadas. Você tem certeza que deseja continuar?"
   },
   "sponsorshipCreated": {
-    "message": "Patrocínio criado"
+    "message": "Financiamento criado"
   },
   "emailSent": {
     "message": "E-mail enviado"
   },
   "removeSponsorshipSuccess": {
-    "message": "Patrocínio Removido"
+    "message": "Financiamento removido"
   },
   "ssoKeyConnectorError": {
-    "message": "Erro de Key Connector: certifique-se de que a Key Connector está disponível e funcionando corretamente."
+    "message": "Erro do Key Connector: certifique-se de que o Key Connector está disponível e funcionando corretamente."
   },
   "keyConnectorUrl": {
-    "message": "URL de Conector de Chave"
+    "message": "URL do Key Connector"
   },
   "sendVerificationCode": {
     "message": "Enviar um código de verificação para o seu e-mail"
   },
   "sendCode": {
-    "message": "Enviar Código"
+    "message": "Enviar código"
   },
   "codeSent": {
-    "message": "Código Enviado"
+    "message": "Código enviado"
   },
   "verificationCode": {
-    "message": "Código de Verificação"
+    "message": "Código de verificação"
   },
   "confirmIdentity": {
     "message": "Confirme a sua identidade para continuar."
@@ -6660,76 +7053,76 @@
     "message": "O código de verificação é necessário."
   },
   "webauthnCancelOrTimeout": {
-    "message": "A autenticação foi cancelada ou demorou muito. Por favor tente novamente."
+    "message": "A autenticação foi cancelada ou demorou muito. Tente novamente."
   },
   "invalidVerificationCode": {
     "message": "Código de verificação inválido"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Uma senha principal não é mais necessária para membros da seguinte organização. Confirme o domínio abaixo com o administrador da sua organização."
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Domínio do Key Connector"
   },
   "leaveOrganization": {
-    "message": "Sair da Organização"
+    "message": "Sair da organização"
   },
   "removeMasterPassword": {
-    "message": "Remover Senha Mestra"
+    "message": "Remover senha principal"
   },
   "removedMasterPassword": {
-    "message": "Senha mestra removida."
+    "message": "Senha principal removida."
   },
   "allowSso": {
     "message": "Permitir autenticação por SSO"
   },
   "allowSsoDesc": {
-    "message": "Uma vez definida, sua configuração será salva e os membros poderão se autenticar usando suas credenciais de Provedor de Identidade."
+    "message": "Uma vez configurada, sua configuração será salva e os membros poderão se autenticar usando suas credenciais do Provedor de Identidade."
   },
   "ssoPolicyHelpStart": {
-    "message": "Ativar o",
+    "message": "Use a",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpAnchor": {
-    "message": "requer política de autenticação de logon único",
+    "message": "política de aplicação da autenticação única",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpEnd": {
-    "message": "para exigir que todos os membros entrem com o SSO.",
+    "message": "para exigir que todos os membros se conectem com o SSO.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "memberDecryptionOption": {
-    "message": "Opções de Descriptografia de Membro"
+    "message": "Opções de descriptografia do membro"
   },
   "memberDecryptionPassDesc": {
-    "message": "Uma vez autenticados, os membros irão descriptografar os dados do cofre usando suas Senhas Mestras."
+    "message": "Ao se autenticar, os membros descriptografarão os dados do cofre usando suas senhas principais."
   },
   "keyConnector": {
-    "message": "Conector de Chave"
+    "message": "Key Connector"
   },
   "memberDecryptionKeyConnectorDescStart": {
-    "message": "Conecte o login com SSO ao seu servidor de chave de descriptografia auto-hospedado. Usando essa opção, os membros não precisarão usar suas senhas mestres para descriptografar os dados",
+    "message": "Conecte a autenticação com SSO ao seu servidor de chave de descriptografia auto-hospedado. Usando essa opção, os membros não precisarão usar suas senhas principais para descriptografar os dados dos cofres. As",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
   },
   "memberDecryptionKeyConnectorDescLink": {
-    "message": "requer autenticação SSO e políticas de organização única",
+    "message": "políticas de autenticação única e de organização única",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
   },
   "memberDecryptionKeyConnectorDescEnd": {
-    "message": "são necessários para configurar a descriptografia do conector chave. Contacte o suporte do Bitwarden para configurar a assistência.",
+    "message": "são necessárias para configurar a descriptografia do Key Connector. Entre em contato com o suporte do Bitwarden para assistência na configuração.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
   },
   "keyConnectorPolicyRestriction": {
-    "message": "\"Entrar com o SSO e Descriptografia de Conector de Chave\" está habilitado. Esta política se aplica apenas a Proprietários e Administradores."
+    "message": "\"Conectar-se com SSO e descriptografia do Key Connector\" está ativado. Esta política se aplica apenas a proprietários e administradores."
   },
   "enabledSso": {
-    "message": "Ativado o SSO"
+    "message": "SSO foi ativado"
   },
   "disabledSso": {
-    "message": "Desativado o SSO"
+    "message": "SSO foi desativado"
   },
   "emailMustLoginWithSso": {
-    "message": "$EMAIL$ must login with Single Sign-on",
+    "message": "$EMAIL$ deve se conectar com a autenticação única",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6738,58 +7131,58 @@
     }
   },
   "enabledKeyConnector": {
-    "message": "Ativado o Conector de Chave"
+    "message": "Key Connector foi ativado"
   },
   "disabledKeyConnector": {
-    "message": "Desativado o Conector de Chave"
+    "message": "Key Connector foi desativado"
   },
   "keyConnectorWarning": {
-    "message": "Depois que o Conector de Chave é configurado, as Opções de Descriptografia de Membro não podem ser alteradas."
+    "message": "Quando os membros começarem a usar o Key Connector, a sua organização não poderá reverter para a descriptografia com a senha principal. Prossiga somente se você está confortável com a implementação e gerenciamento de um servidor de chaves."
   },
   "migratedKeyConnector": {
-    "message": "Migrado para o Conector de Chave"
+    "message": "Migrado para o Key Connector"
   },
   "paymentSponsored": {
-    "message": "Por favor, forneça uma forma de pagamento para associar à organização. Não se preocupe, não cobraremos nada, a menos que você selecione recursos adicionais ou seu patrocínio expire. "
+    "message": "Forneça uma forma de pagamento para associar à organização. Não se preocupe, não cobraremos nada, a menos que você selecione recursos adicionais ou seu financiamento expire. "
   },
   "orgCreatedSponsorshipInvalid": {
-    "message": "A oferta de patrocínio expirou, você pode excluir a organização que criou para evitar uma cobrança no final do seu teste de 7 dias. Caso contrário, você pode fechar este alerta para manter a organização e assumir a responsabilidade pela cobrança."
+    "message": "A oferta de financiamento expirou, você pode apagar a organização que criou para evitar uma cobrança no final do seu teste de 7 dias. Caso contrário, você pode fechar este alerta para manter a organização e assumir a responsabilidade pela cobrança."
   },
   "newFamiliesOrganization": {
-    "message": "Nova Organização de Famílias"
+    "message": "Nova organização de Famílias"
   },
   "acceptOffer": {
-    "message": "Aceitar Oferta"
+    "message": "Aceitar oferta"
   },
   "sponsoringOrg": {
-    "message": "Organização Patrocinadora"
+    "message": "Organização financiante"
   },
   "keyConnectorTest": {
     "message": "Testar"
   },
   "keyConnectorTestSuccess": {
-    "message": "Sucesso! Conector de Chave acessado."
+    "message": "Sucesso! O Key Connector foi contatado."
   },
   "keyConnectorTestFail": {
-    "message": "Não foi possível acessar o Conector de Chave. Verifique a URL."
+    "message": "Não é possível acessar o Key Connector. Verifique o URL."
   },
   "sponsorshipTokenHasExpired": {
-    "message": "A oferta de patrocínio expirou."
+    "message": "A oferta de financiamento expirou."
   },
   "freeWithSponsorship": {
-    "message": "GRÁTIS com patrocínio"
+    "message": "GRÁTIS com financiamento"
   },
   "viewBillingSyncToken": {
-    "message": "Ver Token de Faturamento Sync"
+    "message": "Ver token de sincronização de faturamento"
   },
   "generateBillingToken": {
     "message": "Gerar token de faturamento"
   },
   "copyPasteBillingSync": {
-    "message": "Copie e cole esse token nas configurações de Faturamento Sync da sua organização auto-hospedada."
+    "message": "Copie e cole esse token nas configurações de sincronização de faturamento da sua organização auto-hospedada."
   },
   "billingSyncCanAccess": {
-    "message": "Seu token de faturamento Sync pode acessar e editar as configurações de assinatura desta organização."
+    "message": "Seu token de sincronização de faturamento pode acessar e editar as configurações de assinatura desta organização."
   },
   "manageBillingTokenSync": {
     "message": "Gerenciar token de faturamento"
@@ -6798,16 +7191,16 @@
     "message": "Configurar sincronização de faturamento"
   },
   "generateToken": {
-    "message": "Gerar o token"
+    "message": "Gerar token"
   },
   "rotateToken": {
-    "message": "Renovar Token"
+    "message": "Rotacionar token"
   },
   "rotateBillingSyncTokenWarning": {
-    "message": "Se você continuar, precisará re-configurar a sincronização de cobrança no seu servidor auto-hospedado."
+    "message": "Se você continuar, precisará reconfigurar a sincronização de faturamento no seu servidor auto-hospedado."
   },
   "rotateBillingSyncTokenTitle": {
-    "message": "Renovar o Token de Sincronização de Cobrança invalidará o token anterior."
+    "message": "Rotacionar o token de sincronização de faturamento invalidará o token anterior."
   },
   "selfHostedServer": {
     "message": "auto-hospedado"
@@ -6819,46 +7212,49 @@
     "message": "Especifique a URL de base da sua instalação local do Bitwarden. Exemplo: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "Para usuários avançados. Você pode especificar a URL de base de cada serviço independentemente."
+    "message": "Para configuração avançada, você pode especificar o URL de base de cada serviço independentemente."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "Você deve adicionar um URL do servidor de base ou pelo menos um ambiente personalizado."
+    "message": "Você deve adicionar um URL de base de um servidor ou pelo menos um ambiente personalizado."
+  },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs devem usar HTTPS."
   },
   "apiUrl": {
-    "message": "URL do servidor API"
+    "message": "URL do servidor da API"
   },
   "webVaultUrl": {
-    "message": "URL do servidor do Cofre Web"
+    "message": "URL do servidor do cofre web"
   },
   "identityUrl": {
     "message": "URL do servidor de identidade"
   },
   "notificationsUrl": {
-    "message": "URL do servidor notificações"
+    "message": "URL do servidor de notificações"
   },
   "iconsUrl": {
-    "message": "URL do Servidor de Ícones"
+    "message": "URL do servidor de ícones"
   },
   "environmentSaved": {
-    "message": "URLs para ambiente salvo"
+    "message": "URLs do ambiente salvas"
   },
   "selfHostingTitle": {
-    "message": "Auto-hospedado"
+    "message": "Auto-hospedagem"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
-    "message": "Para configurar sua organização no seu próprio servidor, você precisará fazer o upload do arquivo de licença. Para oferecer suporte a planos de famílias gratuitas e recursos avançados de faturamento para a sua organização auto-hospedada, você precisará configurar a sincronização de cobrança."
+    "message": "Para configurar sua organização no seu próprio servidor, você precisará enviar o arquivo da licença. Para oferecer suporte a planos do Famílias Grátis e recursos avançados de faturamento para a sua organização auto-hospedada, você precisará configurar a sincronização de faturamento."
   },
   "billingSyncApiKeyRotated": {
-    "message": "Token renovado"
+    "message": "Token rotacionado"
   },
   "billingSyncKeyDesc": {
-    "message": "Um Token de sincronização de faturamento das configurações de assinatura da sua organização da nuvem é necessário para completar este formulário."
+    "message": "Um token de sincronização de faturamento das configurações de assinatura da sua organização da nuvem é necessário para completar este formulário."
   },
   "billingSyncKey": {
-    "message": "Token de Sincronização de Faturamento"
+    "message": "Token de sincronização de faturamento"
   },
   "automaticBillingSyncDesc": {
-    "message": "Sincronização automática desbloqueia os patrocínios das famílias e permite-lhe sincronizar sua licença sem enviar um arquivo. Depois de fazer atualizações no servidor da nuvem do Bitwarden, selecione Sincronizar licença para aplicar as alterações."
+    "message": "A sincronização automática desbloqueia o financiamento das famílias e te permite sincronizar sua licença sem enviar um arquivo. Depois de atualizar o servidor da nuvem do Bitwarden, selecione Sincronizar licença para aplicar as alterações."
   },
   "active": {
     "message": "Ativo"
@@ -6867,13 +7263,13 @@
     "message": "Inativo"
   },
   "sentAwaitingSync": {
-    "message": "Enviado (Aguardando Sincronização)"
+    "message": "Enviado (aguardando sincronização)"
   },
   "sent": {
     "message": "Enviado"
   },
   "requestRemoved": {
-    "message": "Removido (Aguardando Sincronização)"
+    "message": "Removido (aguardando sincronização)"
   },
   "requested": {
     "message": "Solicitado"
@@ -6925,7 +7321,7 @@
     }
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Necessário se o ID da Entidade não for um URL."
+    "message": "Necessário se o ID da entidade não for um URL."
   },
   "offerNoLongerValid": {
     "message": "Esta oferta não é mais válida. Entre em contato com os administradores da sua organização para obter mais informações."
@@ -6937,19 +7333,19 @@
     "message": "Necessário se a autoridade não for válida."
   },
   "separateMultipleWithComma": {
-    "message": "Separe várias tags com vírgula."
+    "message": "Separe vários com uma vírgula."
   },
   "sessionTimeout": {
-    "message": "Sua sessão expirou. Volte e tente iniciar a sessão novamente."
+    "message": "Sua sessão expirou. Volte e tente se conectar novamente."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Exportando Cofre Pessoal"
+    "message": "Exportando cofre individual"
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Exportando o Cofre da Organização"
+    "message": "Exportando cofre da organização"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Apenas os itens individuais do cofre associados a $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos. Apenas as informações de item do cofre serão exportadas e não incluirão anexos associados.",
+    "message": "Apenas os itens do cofre individual associados a $EMAIL$ serão exportados. Os itens do cofre de organizações não serão incluídos. Apenas as informações dos itens do cofre serão exportadas e não incluirão anexos associados.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6958,7 +7354,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Apenas os itens individuais do cofre, incluindo anexos associados ao $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos",
+    "message": "Apenas os itens do cofre individual, incluindo anexos associados com $EMAIL$ serão exportados. Os itens do cofre de organizações não serão incluídos",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6967,7 +7363,25 @@
     }
   },
   "exportingOrganizationVaultDesc": {
-    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado. Itens do cofre pessoal e itens de outras organizações não serão incluídos.",
+    "message": "Apenas o cofre da organização associado a $ORGANIZATION$ será exportado. Itens de cofres individuais e de outras organizações não serão incluídos.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado. Os itens dos meus conjuntos não serão incluídos.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -6978,8 +7392,11 @@
   "accessDenied": {
     "message": "Acesso negado. Você não tem permissão para ver esta página."
   },
+  "noPageAccess": {
+    "message": "Você não tem acesso a esta página"
+  },
   "masterPassword": {
-    "message": "Senha Mestra"
+    "message": "Senha principal"
   },
   "security": {
     "message": "Segurança"
@@ -6988,10 +7405,10 @@
     "message": "Chaves"
   },
   "billingHistory": {
-    "message": "Histórico de Cobrança"
+    "message": "Histórico de cobrança"
   },
   "backToReports": {
-    "message": "Voltar para Relatórios"
+    "message": "Voltar aos relatórios"
   },
   "organizationPicker": {
     "message": "Seletor de organização"
@@ -7010,35 +7427,35 @@
     }
   },
   "accountSettings": {
-    "message": "Configurações da Conta"
+    "message": "Configurações da conta"
   },
   "generator": {
     "message": "Gerador",
     "description": "Short for 'credential generator'."
   },
   "generateUsername": {
-    "message": "Gerar Usuário"
+    "message": "Gerar nome de usuário"
   },
   "generateEmail": {
     "message": "Gerar e-mail"
   },
   "generatePassword": {
-    "message": "Gerar Senha"
+    "message": "Gerar senha"
   },
   "generatePassphrase": {
     "message": "Gerar frase secreta"
   },
   "passwordGenerated": {
-    "message": "Password generated"
+    "message": "Senha gerada"
   },
   "passphraseGenerated": {
-    "message": "Passphrase generated"
+    "message": "Frase secreta gerada"
   },
   "usernameGenerated": {
-    "message": "Username generated"
+    "message": "Nome de usuário gerado"
   },
   "emailGenerated": {
-    "message": "Email generated"
+    "message": "E-mail gerado"
   },
   "spinboxBoundariesHint": {
     "message": "Valor deve ser entre $MIN$ e $MAX$.",
@@ -7055,7 +7472,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ caracteres ou mais para gerar uma senha forte.",
+    "message": " Utilize $RECOMMENDED$ ou mais caracteres para gerar um senha forte.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -7065,7 +7482,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use palavras $RECOMMENDED$ ou mais para gerar uma frase secreta forte.",
+    "message": " Utilize $RECOMMENDED$ ou mais palavras para gerar uma frase secreta forte.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -7075,7 +7492,7 @@
     }
   },
   "plusAddressedEmail": {
-    "message": "E-mail alternativo (com um +)",
+    "message": "E-mail endereçado com +",
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
@@ -7085,7 +7502,7 @@
     "message": "E-mail pega-tudo"
   },
   "catchallEmailDesc": {
-    "message": "Use o catch-all configurado no seu domínio."
+    "message": "Use a caixa de entrada pega-tudo configurada no seu domínio."
   },
   "useThisEmail": {
     "message": "Usar este e-mail"
@@ -7095,25 +7512,25 @@
     "description": "Generates domain-based username using random letters"
   },
   "randomWord": {
-    "message": "Palavra Aleatória"
+    "message": "Palavra aleatória"
   },
   "usernameGenerator": {
-    "message": "Gerador de usuário"
+    "message": "Gerador de nome de usuário"
   },
   "useThisPassword": {
-    "message": "Use esta senha"
+    "message": "Usar esta senha"
   },
   "useThisPassphrase": {
-    "message": "Use this passphrase"
+    "message": "Usar esta frase secreta"
   },
   "useThisUsername": {
-    "message": "Use este nome de usuário"
+    "message": "Usar este nome de usuário"
   },
   "securePasswordGenerated": {
-    "message": "Senha segura gerada! Não se esqueça de atualizar também sua senha no site."
+    "message": "Senha segura gerada! Não se esqueça de atualizar sua senha no site também."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Usar o gerador",
+    "message": "Use o gerador",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
@@ -7124,16 +7541,19 @@
     "message": "Serviço"
   },
   "unknownCipher": {
-    "message": "Item desconhecido, talvez você precise fazer login com outra conta para acessar este item."
+    "message": "Item desconhecido, talvez você precise pedir permissão para acessar este item."
   },
   "unknownSecret": {
-    "message": "Unknown secret, you may need to request permission to access this secret."
+    "message": "Segredo desconhecido, talvez você precise pedir permissão para acessar este segredo."
+  },
+  "unknownServiceAccount": {
+    "message": "Conta de máquina desconhecida, talvez você precise pedir permissão para acessar esta conta de máquina."
   },
   "unknownProject": {
-    "message": "Unknown project, you may need to request permission to access this project."
+    "message": "Projeto desconhecido, talvez você precise pedir permissão para acessar este projeto."
   },
   "cannotSponsorSelf": {
-    "message": "Você não pode resgatar a conta ativa. Digite um e-mail diferente."
+    "message": "Você não pode resgatar para conta ativa. Digite um e-mail diferente."
   },
   "revokeWhenExpired": {
     "message": "Expira em $DATE$",
@@ -7145,7 +7565,7 @@
     }
   },
   "awaitingSyncSingular": {
-    "message": "Token renovado há $DAYS$ dia atrás. Atualize o token de sincronização de cobrança nas configurações da organização auto-hospedada.",
+    "message": "Token rotacionado há $DAYS$ dia atrás. Atualize o token de sincronização de faturamento nas configurações da organização auto-hospedada.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -7154,7 +7574,7 @@
     }
   },
   "awaitingSyncPlural": {
-    "message": "Token renovado há $DAYS$ dias. Atualize o token de sincronização de cobrança nas configurações da sua organização auto-hospedada.",
+    "message": "Token rotacionado há $DAYS$ dias atrás. Atualize o token de sincronização de faturamento nas configurações da organização auto-hospedada.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -7163,11 +7583,11 @@
     }
   },
   "lastSync": {
-    "message": "Última Sincronização",
+    "message": "Última sincronização",
     "description": "Used as a prefix to indicate the last time a sync occurred. Example \"Last sync 1968-11-16 00:00:00\""
   },
   "sponsorshipsSynced": {
-    "message": "Patrocínios auto-hospedados sincronizados."
+    "message": "Faturamentos auto-hospedados sincronizados."
   },
   "billingManagedByProvider": {
     "message": "Gerenciado por $PROVIDER$",
@@ -7179,11 +7599,11 @@
     }
   },
   "billingContactProviderForAssistance": {
-    "message": "Por favor, entre em contato com eles para obter mais ajuda",
+    "message": "Entre em contato com eles para obter mais ajuda",
     "description": "This text is displayed if an organization's billing is managed by a Provider. It tells the user to contact the Provider for assistance."
   },
   "forwardedEmail": {
-    "message": "Alias de E-mail Encaminhado"
+    "message": "Alias de encaminhamento de e-mail"
   },
   "forwardedEmailDesc": {
     "message": "Gere um alias de e-mail com um serviço externo de encaminhamento."
@@ -7197,7 +7617,7 @@
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
-    "message": "Erro $SERVICENAME$ : $ERRORMESSAGE$",
+    "message": "Erro do $SERVICENAME$: $ERRORMESSAGE$",
     "description": "Reports an error returned by a forwarding service to the user.",
     "placeholders": {
       "servicename": {
@@ -7225,7 +7645,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Token de API $SERVICENAME$ inválido",
+    "message": "Token de API do $SERVICENAME$ inválido",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7235,7 +7655,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Token de API $SERVICENAME$ inválido: $ERRORMESSAGE$",
+    "message": "Token de API da $SERVICENAME$ inválido: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -7273,7 +7693,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Não foi possível obter a máscara do ID da conta de email $SERVICENAME$.",
+    "message": "Não é possível obter o ID da conta de e-mail mascarado do $SERVICENAME$.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -7283,7 +7703,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Domínio $SERVICENAME$ inválido.",
+    "message": "Domínio inválido do $SERVICENAME$.",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7293,7 +7713,7 @@
     }
   },
   "forwarderNoUrl": {
-    "message": "URL $SERVICENAME$ inválida.",
+    "message": "URL inválido do $SERVICENAME$.",
     "description": "Displayed when the url of the forwarding service wasn't supplied.",
     "placeholders": {
       "servicename": {
@@ -7303,7 +7723,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Ocorreu um erro $SERVICENAME$ desconhecido.",
+    "message": "Ocorreu um erro desconhecido do $SERVICENAME$.",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -7323,23 +7743,23 @@
     }
   },
   "hostname": {
-    "message": "Hostname",
+    "message": "Nome do servidor",
     "description": "Part of a URL."
   },
   "deviceVerification": {
-    "message": "Verificação do dispositivo"
+    "message": "Verificação de dispositivo"
   },
   "enableDeviceVerification": {
-    "message": "Habilitar Verificação do Dispositivo"
+    "message": "Ativar verificação de dispositivo"
   },
   "deviceVerificationDesc": {
-    "message": "Quando ativado, são enviados códigos de verificação para o seu endereço de e-mail ao fazer login a partir de um dispositivo não reconhecido"
+    "message": "Códigos de recuperação serão enviados ao seu endereço de e-mail ao se conectar a partir de um dispositivo desconhecido"
   },
   "updatedDeviceVerification": {
-    "message": "Verificação do Dispositivo Atualizada"
+    "message": "Verificação de dispositivo atualizada"
   },
   "areYouSureYouWantToEnableDeviceVerificationTheVerificationCodeEmailsWillArriveAtX": {
-    "message": "Tem certeza de que deseja habilitar o Verificação do Dispositivo? O código de verificação de e-mail chegarão em: $EMAIL$",
+    "message": "Tem certeza de que deseja ativar a verificação de dispositivo? Os e-mails dos códigos de verificação chegarão em: $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -7348,41 +7768,41 @@
     }
   },
   "premiumSubcriptionRequired": {
-    "message": "Assinatura Premium necessária"
+    "message": "Plano Premium necessário"
   },
   "scim": {
     "message": "Provisionamento de SCIM",
     "description": "The text, 'SCIM', is an acronym and should not be translated."
   },
   "scimDescription": {
-    "message": "Provisionar automaticamente usuários e grupos com seu provedor de identidade preferido via provisionamento de SCIM",
+    "message": "Provisione automaticamente usuários e grupos com seu provedor de identidade preferido via provisionamento de SCIM",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimIntegrationDescription": {
-    "message": "Provisionar automaticamente usuários e grupos com seu provedor de identidade preferido via provisionamento de SCIM. Encontre suporte para as integrações",
+    "message": "Provisione automaticamente usuários e grupos com seu provedor de identidade preferido via provisionamento de SCIM. Procure integrações suportadas",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimEnabledCheckboxDesc": {
-    "message": "Habilitar SCIM",
+    "message": "Ativar SCIM",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimEnabledCheckboxDescHelpText": {
-    "message": "Configure seu provedor de identidade preferido, configurando a URL e a chave de API SCIM",
+    "message": "Configure seu provedor de identidade preferido, configurando a URL e a chave da API do SCIM",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimApiKeyHelperText": {
     "message": "Esta chave de API tem acesso para gerenciar os usuários da sua organização. Deve ser mantida em segredo."
   },
   "copyScimKey": {
-    "message": "Copie a chave API do SCIM para a área de transferência",
+    "message": "Copie a chave da API do SCIM para a área de transferência",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "rotateScimKey": {
-    "message": "Rotacionar a chave API SCIM",
+    "message": "Rotacionar a chave de API do SCIM",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "rotateScimKeyWarning": {
-    "message": "Você tem certeza que deseja rotacionar a chave de API SCIM? A chave atual não funcionará mais para quaisquer integrações existentes.",
+    "message": "Você tem certeza que deseja rotacionar a chave de API do SCIM? A chave atual não funcionará mais para quaisquer integrações existentes.",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "rotateKey": {
@@ -7393,7 +7813,7 @@
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "copyScimUrl": {
-    "message": "Copie a URL do endpoint SCIM para a área de transferência",
+    "message": "Copie a URL do endpoint do SCIM para a área de transferência",
     "description": "the text, 'SCIM' and 'URL', are acronyms and should not be translated."
   },
   "scimUrl": {
@@ -7401,11 +7821,11 @@
     "description": "the text, 'SCIM' and 'URL', are acronyms and should not be translated."
   },
   "scimApiKeyRotated": {
-    "message": "A chave de API SCIM foi rotacionada com sucesso",
+    "message": "A chave da API do SCIM foi rotacionada com sucesso",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "scimSettingsSaved": {
-    "message": "As configurações de SCIM foram salvas com sucesso",
+    "message": "Configurações do SCIM salvas",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "inputRequired": {
@@ -7472,7 +7892,7 @@
     }
   },
   "fieldsNeedAttention": {
-    "message": "$COUNT$ campos(s) acima precisam de sua atenção.",
+    "message": "$COUNT$ campo(s) acima precisam de sua atenção.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7484,7 +7904,7 @@
     "message": "1 campo precisa de sua atenção."
   },
   "multipleFieldsNeedAttention": {
-    "message": "Campos $COUNT$ precisam de sua atenção.",
+    "message": "$COUNT$ campos precisam da sua atenção.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7499,34 +7919,34 @@
     "message": "A autenticação em duas etapas do Duo é necessária para sua conta."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "A autenticação de dois fatores do Duo é necessária para sua conta. Siga os passos abaixo para conseguir entrar."
+    "message": "A autenticação de duas etapas do Duo é necessária para sua conta. Siga os passos abaixo para conseguir se conectar."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Siga os passos abaixo para finalizar o login."
+    "message": "Siga os passos abaixo para terminar de se conectar."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Siga os passos abaixo para terminar de se conectar com a sua chave de segurança."
   },
   "launchDuo": {
-    "message": "Abrir o Duo"
+    "message": "Abrir Duo"
   },
   "turnOn": {
-    "message": "Ligar"
+    "message": "Ativar"
   },
   "on": {
-    "message": "Ligado"
+    "message": "Ativado"
   },
   "off": {
-    "message": "Desligado"
+    "message": "Desativado"
   },
   "connected": {
-    "message": "Connected"
+    "message": "Conectado"
   },
   "members": {
     "message": "Membros"
   },
   "reporting": {
-    "message": "Reportando"
+    "message": "Relatórios"
   },
   "numberOfUsers": {
     "message": "Número de usuários"
@@ -7577,16 +7997,16 @@
     "message": "-- Digite para filtrar --"
   },
   "multiSelectLoading": {
-    "message": "Carrgando Opções..."
+    "message": "Carrgando opções..."
   },
   "multiSelectNotFound": {
     "message": "Nenhum item encontrado"
   },
   "multiSelectClearAll": {
-    "message": "Limpar todos"
+    "message": "Limpar tudo"
   },
   "toggleCharacterCount": {
-    "message": "Alternar contagem de caracteres",
+    "message": "Habilitar contagem de caracteres",
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "passwordCharacterCount": {
@@ -7621,18 +8041,18 @@
     "description": "Action to copy the value of a secret to the system's clipboard."
   },
   "deleteSecret": {
-    "message": "Excluir segredo",
+    "message": "Apagar segredo",
     "description": "Action to delete a single secret from the system."
   },
   "deleteSecrets": {
-    "message": "Excluir segredos",
+    "message": "Apagar segredos",
     "description": "The action to delete multiple secrets from the system."
   },
   "hardDeleteSecret": {
-    "message": "Excluir permanentemente o segredo"
+    "message": "Apagar segredo permanentemente"
   },
   "hardDeleteSecrets": {
-    "message": "Excluir permanentemente os segredos"
+    "message": "Apagar segredos permanentemente"
   },
   "secretProjectAssociationDescription": {
     "message": "Selecione os projetos aos quais o segredo será associado. Somente os usuários da organização com acesso a estes projetos poderão ver o segredo.",
@@ -7643,11 +8063,11 @@
     "description": "A label for a type-to-filter input field to choose projects."
   },
   "searchProjects": {
-    "message": "Pesquisar projetos",
+    "message": "Buscar nos projetos",
     "description": "Label for the search bar used to search projects."
   },
   "project": {
-    "message": "Projecto",
+    "message": "Projeto",
     "description": "Similar to collections, projects can be used to group secrets."
   },
   "editProject": {
@@ -7659,11 +8079,11 @@
     "description": "The action to view details of a project."
   },
   "deleteProject": {
-    "message": "Excluir projeto",
+    "message": "Apagar projeto",
     "description": "The action to delete a project from the system."
   },
   "deleteProjects": {
-    "message": "Excluir projetos",
+    "message": "Apagar projetos",
     "description": "The action to delete multiple projects from the system."
   },
   "secret": {
@@ -7675,7 +8095,7 @@
     "description": "A machine user which can be used to automate processes and access secrets in the system."
   },
   "serviceAccounts": {
-    "message": "Contas de Serviço",
+    "message": "Contas de serviço",
     "description": "The title for the section that deals with service accounts."
   },
   "secrets": {
@@ -7683,11 +8103,11 @@
     "description": "The title for the section of the application that deals with secrets."
   },
   "nameValuePair": {
-    "message": "Par de Nome/Valor",
+    "message": "Par de nome/valor",
     "description": "Title for a name/ value pair. Secrets typically consist of a name and value pair."
   },
   "secretEdited": {
-    "message": "Secreto editado",
+    "message": "Segredo editado",
     "description": "Notification for the successful editing of a secret."
   },
   "secretCreated": {
@@ -7703,7 +8123,7 @@
     "description": "Title for creating a new service account."
   },
   "secretsNoItemsTitle": {
-    "message": "Sem segredos para mostrar",
+    "message": "Nenhum segredo para mostrar",
     "description": "Empty state to indicate that there are no secrets to display."
   },
   "secretsNoItemsMessage": {
@@ -7711,10 +8131,10 @@
     "description": "Message to encourage the user to start adding secrets."
   },
   "secretsTrashNoItemsMessage": {
-    "message": "Não há segredos no lixo."
+    "message": "Não há segredos na lixeira."
   },
   "serviceAccountsNoItemsMessage": {
-    "message": "Crie uma nova conta de serviço para começar a automatizar o acesso secreto.",
+    "message": "Crie uma nova conta de serviço para começar a automatizar o acesso aos segredos.",
     "description": "Message to encourage the user to start creating service accounts."
   },
   "serviceAccountsNoItemsTitle": {
@@ -7722,15 +8142,15 @@
     "description": "Title to indicate that there are no service accounts to display."
   },
   "searchSecrets": {
-    "message": "Pesquisar segredos",
+    "message": "Buscar nos segredos",
     "description": "Placeholder text for searching secrets."
   },
   "deleteServiceAccounts": {
-    "message": "Excluir contas de serviço",
+    "message": "Apagar contas de serviço",
     "description": "Title for the action to delete one or multiple service accounts."
   },
   "deleteServiceAccount": {
-    "message": "Excluir conta de serviço",
+    "message": "Apagar conta de serviço",
     "description": "Title for the action to delete a single service account."
   },
   "viewServiceAccount": {
@@ -7738,7 +8158,7 @@
     "description": "Action to view the details of a service account."
   },
   "deleteServiceAccountDialogMessage": {
-    "message": "Excluir conta de serviço $SERVICE_ACCOUNT$ é permanente e irreversível.",
+    "message": "Apagar a conta de serviço $SERVICE_ACCOUNT$ é permanente e irreversível.",
     "placeholders": {
       "service_account": {
         "content": "$1",
@@ -7747,10 +8167,10 @@
     }
   },
   "deleteServiceAccountsDialogMessage": {
-    "message": "A exclusão de projetos é permanente e irreversível."
+    "message": "O apagamento de contas de serviço é permanente e irreversível."
   },
   "deleteServiceAccountsConfirmMessage": {
-    "message": "Excluir $COUNT$ contas de serviço",
+    "message": "Apagar $COUNT$ contas de serviço",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7759,13 +8179,13 @@
     }
   },
   "deleteServiceAccountToast": {
-    "message": "Conta de serviço excluída"
+    "message": "Conta de serviço apagada"
   },
   "deleteServiceAccountsToast": {
-    "message": "Contas de serviço excluídas"
+    "message": "Contas de serviço apagadas"
   },
   "searchServiceAccounts": {
-    "message": "Pesquisar contas de serviço",
+    "message": "Buscar nas contas de serviço",
     "description": "Placeholder text for searching service accounts."
   },
   "editServiceAccount": {
@@ -7797,7 +8217,7 @@
     "description": "Title for creating a new project."
   },
   "softDeleteSecretWarning": {
-    "message": "Excluir segredos pode afetar integrações existentes.",
+    "message": "Apagar segredos pode afetar integrações existentes.",
     "description": "Warns that deleting secrets can have consequences on integrations"
   },
   "softDeletesSuccessToast": {
@@ -7805,13 +8225,13 @@
     "description": "Notifies that the selected secrets have been moved to the trash"
   },
   "hardDeleteSecretConfirmation": {
-    "message": "Tem certeza de que deseja excluir permanentemente este segredo?"
+    "message": "Tem certeza de que deseja apagar permanentemente este segredo?"
   },
   "hardDeleteSecretsConfirmation": {
-    "message": "Tem certeza que deseja excluir estes segredos permanentemente?"
+    "message": "Tem certeza que deseja apagar estes segredos permanentemente?"
   },
   "hardDeletesSuccessToast": {
-    "message": "Segredos excluídos permanentemente"
+    "message": "Segredos apagados permanentemente"
   },
   "smAccess": {
     "message": "Acesso",
@@ -7834,7 +8254,7 @@
     "description": "Notifies that a service account has been updated"
   },
   "typeOrSelectProjects": {
-    "message": "Type or select projects",
+    "message": "Digite ou selecione projetos",
     "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
@@ -7842,15 +8262,15 @@
     "description": "Instructions for filtering a list of projects or secrets"
   },
   "deleteProjectsToast": {
-    "message": "Projetos excluídos",
+    "message": "Projetos apagados",
     "description": "Notifies that the selected projects have been deleted"
   },
   "deleteProjectToast": {
-    "message": "O projeto e todos os segredos associados foram excluídos",
+    "message": "Projeto apagado",
     "description": "Notifies that a project has been deleted"
   },
   "deleteProjectDialogMessage": {
-    "message": "Excluir o projeto $PROJECT$ é permanente e irreversível.",
+    "message": "Apagar o projeto $PROJECT$ é permanente e irreversível.",
     "description": "Informs users that projects are hard deleted and not sent to trash",
     "placeholders": {
       "project": {
@@ -7870,7 +8290,7 @@
     }
   },
   "deleteProjectConfirmMessage": {
-    "message": "Excluir $PROJECT$",
+    "message": "Apagar $PROJECT$",
     "description": "Confirmation prompt to delete a specific project, where '$PROJECT$' is a placeholder for the name of the project.",
     "placeholders": {
       "project": {
@@ -7880,7 +8300,7 @@
     }
   },
   "deleteProjectsConfirmMessage": {
-    "message": "Excluir $COUNT$ Projetos",
+    "message": "Apagar $COUNT$ projetos",
     "description": "Confirmation prompt to delete multiple projects, where '$COUNT$' is a placeholder for the number of projects to be deleted.",
     "placeholders": {
       "count": {
@@ -7890,7 +8310,7 @@
     }
   },
   "deleteProjectsDialogMessage": {
-    "message": "A exclusão de projetos é permanente e irreversível.",
+    "message": "Apagar projetos é permanente e irreversível.",
     "description": "This message is displayed in a dialog box as a warning before proceeding with project deletion."
   },
   "projectsNoItemsTitle": {
@@ -7906,7 +8326,7 @@
     "description": "Indicates that user confirmation is required for an action to proceed."
   },
   "bulkDeleteProjectsErrorMessage": {
-    "message": "Os seguintes projetos não puderam ser excluídos:",
+    "message": "Os seguintes projetos não puderam ser apagados:",
     "description": "Message to be displayed when there is an error during bulk project deletion."
   },
   "softDeleteSuccessToast": {
@@ -7914,14 +8334,14 @@
     "description": "Notification to be displayed when a secret is successfully sent to the trash."
   },
   "hardDeleteSuccessToast": {
-    "message": "Segredo excluído permanentemente"
+    "message": "Segredo apagado permanentemente"
   },
   "accessTokens": {
     "message": "Tokens de acesso",
     "description": "Title for the section displaying access tokens."
   },
   "createAccessToken": {
-    "message": "Create access token",
+    "message": "Criar token de acesso",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7933,7 +8353,7 @@
     "description": "Label for the access level of an access token (Read only)."
   },
   "accessTokensNoItemsTitle": {
-    "message": "Nenhum token de acesso para exibir",
+    "message": "Nenhum token de acesso para mostrar",
     "description": "Title to be displayed when there are no access tokens to display in the list."
   },
   "accessTokensNoItemsDesc": {
@@ -7961,7 +8381,7 @@
     "description": "A unique string that gives a client application (eg. CLI) access to a secret or set of secrets."
   },
   "accessTokenExpirationRequired": {
-    "message": "Data de validade requerida",
+    "message": "Data de validade necessária",
     "description": "Error message indicating that an expiration date for the access token must be set."
   },
   "accessTokenCreatedAndCopied": {
@@ -7990,10 +8410,10 @@
     "message": "Submenu"
   },
   "from": {
-    "message": "De"
+    "message": "Desde"
   },
   "to": {
-    "message": "Para"
+    "message": "Até"
   },
   "member": {
     "message": "Membro"
@@ -8002,7 +8422,7 @@
     "message": "Atualizar"
   },
   "plusNMore": {
-    "message": "+ $QUANTITY$ mais",
+    "message": "+ mais $QUANTITY$",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -8014,34 +8434,34 @@
     "message": "Informações do grupo"
   },
   "editGroupMembersDesc": {
-    "message": "Conceder acesso às coleções atribuídas ao grupo."
+    "message": "Conceda acesso dos conjuntos atribuídos do grupo aos membros."
   },
   "editGroupCollectionsDesc": {
-    "message": "Conceder acesso às coleções adicionando-as a este grupo."
+    "message": "Conceda acesso aos conjuntos adicionando-os a este grupo."
   },
   "restrictedCollectionAssignmentDesc": {
-    "message": "Você só pode atribuir coleções que você gerencia."
+    "message": "Você só pode atribuir conjuntos que você gerencia."
   },
   "selectMembers": {
     "message": "Selecionar membros"
   },
   "selectCollections": {
-    "message": "Selecionar coleções"
+    "message": "Selecionar conjuntos"
   },
   "role": {
-    "message": "Função"
+    "message": "Cargo"
   },
   "removeMember": {
     "message": "Remover membro"
   },
   "collection": {
-    "message": "Coleção"
+    "message": "Conjunto"
   },
   "noCollection": {
-    "message": "Sem coleções"
+    "message": "Sem conjunto"
   },
   "noCollectionsAdded": {
-    "message": "Nenhuma coleção adicionada"
+    "message": "Nenhum conjunto adicionado"
   },
   "noMembersAdded": {
     "message": "Nenhum membro adicionado"
@@ -8053,7 +8473,7 @@
     "message": "Grupo"
   },
   "domainVerification": {
-    "message": "Verificação de Domínio"
+    "message": "Verificação de domínio"
   },
   "newDomain": {
     "message": "Novo domínio"
@@ -8062,13 +8482,13 @@
     "message": "Sem domínio"
   },
   "noDomainsSubText": {
-    "message": "Conectar um domínio permite que os membros pulem o campo identificador SSO durante o Login com SSO."
+    "message": "Conectar um domínio permite que os membros pulem o campo do identificador de SSO durante a autenticação única."
   },
   "copyDnsTxtRecord": {
-    "message": "Copiar registro do DNS TXT"
+    "message": "Copiar registro TXT do DNS"
   },
   "dnsTxtRecord": {
-    "message": "Registro DNS TXT"
+    "message": "Registro TXT do DNS"
   },
   "dnsTxtRecordInputHint": {
     "message": "Copie e cole o registro TXT no seu provedor de DNS."
@@ -8101,10 +8521,10 @@
     "message": "Nome"
   },
   "domainStatusTh": {
-    "message": "Status"
+    "message": "Estado"
   },
   "lastChecked": {
-    "message": "Última verificação:"
+    "message": "Última verificação"
   },
   "editDomain": {
     "message": "Editar domínio"
@@ -8131,25 +8551,25 @@
     }
   },
   "verificationRequiredForActionSetPinToContinue": {
-    "message": "Verificação necessária para esta ação. Defina um PIN para continuar."
+    "message": "Verificação necessária para esta ação. Configure um PIN para continuar."
   },
   "setPin": {
-    "message": "Definir PIN"
+    "message": "Configurar PIN"
   },
   "verifyWithBiometrics": {
-    "message": "Desbloquear com a biometria"
+    "message": "Verificar com biometria"
   },
   "awaitingConfirmation": {
     "message": "Aguardando confirmação"
   },
   "couldNotCompleteBiometrics": {
-    "message": "Não foi possível completar a biometria."
+    "message": "Não foi possível concluir a biometria."
   },
   "needADifferentMethod": {
     "message": "Precisa de um método diferente?"
   },
   "useMasterPassword": {
-    "message": "Usar a senha mestra"
+    "message": "Usar senha principal"
   },
   "usePin": {
     "message": "Usar PIN"
@@ -8158,7 +8578,7 @@
     "message": "Usar biometria"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Digite o código de verificação que foi enviado para o seu e-mail."
+    "message": "Digite o código de verificação enviado para o seu e-mail."
   },
   "resendCode": {
     "message": "Reenviar código"
@@ -8170,40 +8590,40 @@
     "message": "Grupo/Membro"
   },
   "selectGroupsAndMembers": {
-    "message": "Selecione grupos e membros"
+    "message": "Selecionar grupos e membros"
   },
   "selectGroups": {
-    "message": "Selecione grupos"
+    "message": "Selecionar grupos"
   },
   "userPermissionOverrideHelperDesc": {
-    "message": "Permissões definidas para um membro substituirão as permissões definidas pelo grupo desse membro."
+    "message": "As permissões configuradas para um membro substituirão as permissões configuradas pelo grupo desse membro."
   },
   "noMembersOrGroupsAdded": {
     "message": "Nenhum membro ou grupo adicionado"
   },
   "deleted": {
-    "message": "Excluído"
+    "message": "Apagado"
   },
   "memberStatusFilter": {
-    "message": "Filtro de status de membros"
+    "message": "Filtro do estado de membros"
   },
   "inviteMember": {
     "message": "Convidar membro"
   },
   "addSponsorship": {
-    "message": "Add sponsorship"
+    "message": "Adicionar financiamento"
   },
   "needsConfirmation": {
     "message": "Precisa de confirmação"
   },
   "memberRole": {
-    "message": "Função de membro"
+    "message": "Cargo do membro"
   },
   "moreFromBitwarden": {
     "message": "Mais do Bitwarden"
   },
   "switchProducts": {
-    "message": "Trocar Produtos"
+    "message": "Trocar de produto"
   },
   "freeOrgInvLimitReachedManageBilling": {
     "message": "Organizações gratuitas podem ter até $SEATCOUNT$ membros. Faça upgrade para um plano pago para convidar mais membros.",
@@ -8224,7 +8644,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedManageBilling": {
-    "message": "Planos de Times Starter podem ter até $SEATCOUNT$ membros. Atualize para o seu plano para convidar mais membros.",
+    "message": "Planos do Equipes Iniciantes podem ter até $SEATCOUNT$ membros. Faça upgrade do seu plano para convidar mais membros.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8233,7 +8653,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedNoManageBilling": {
-    "message": "Planos para Equipes Iniciantes podem ter até $SEATCOUNT$ membros. Entre em contato com o proprietário da organização para melhorar o seu plano e convidar mais membros.",
+    "message": "Planos do Equipes Iniciantes podem ter até $SEATCOUNT$ membros. Entre em contato com o proprietário da organização para fazer upgrade do seu plano e convidar mais membros.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8242,7 +8662,7 @@
     }
   },
   "freeOrgMaxCollectionReachedManageBilling": {
-    "message": "Organizações gratuitas podem ter até $COLLECTIONCOUNT$ coleções. Faça o upgrade para um plano pago para adicionar mais coleções.",
+    "message": "Organizações gratuitas podem ter até $COLLECTIONCOUNT$ conjuntos. Faça upgrade para um plano pago para adicionar mais conjuntos.",
     "placeholders": {
       "COLLECTIONCOUNT": {
         "content": "$1",
@@ -8251,7 +8671,7 @@
     }
   },
   "freeOrgMaxCollectionReachedNoManageBilling": {
-    "message": "Organizações gratuitas podem ter até $COLLECTIONCOUNT$ membros. Entre em contato com o proprietário da sua organização para fazer upgrade.",
+    "message": "Organizações gratuitas podem ter até $COLLECTIONCOUNT$ conjuntos. Entre em contato com o proprietário da sua organização para fazer upgrade.",
     "placeholders": {
       "COLLECTIONCOUNT": {
         "content": "$1",
@@ -8266,10 +8686,10 @@
     "message": "Exportar dados"
   },
   "exportingOrganizationSecretDataTitle": {
-    "message": "Exportando dados secretos da organização"
+    "message": "Exportando dados de segredos da organização"
   },
   "exportingOrganizationSecretDataDescription": {
-    "message": "Apenas o cofre da organização associado com $ORGANIZATION$ será exportado. Itens do cofre pessoal e itens de outras organizações não serão incluídos.",
+    "message": "Apenas os dados do Gerenciador de Segredos associados com $ORGANIZATION$ serão exportados. Itens em outros produtos ou de outras organizações não serão incluídos.",
     "placeholders": {
       "ORGANIZATION": {
         "content": "$1",
@@ -8278,28 +8698,28 @@
     }
   },
   "fileUpload": {
-    "message": "Enviar de arquivo"
+    "message": "Envio de arquivo"
   },
   "upload": {
-    "message": "Fazer upload"
+    "message": "Enviar"
   },
   "acceptedFormats": {
-    "message": "Formatos Aceitos:"
+    "message": "Formatos aceitos:"
   },
   "copyPasteImportContents": {
-    "message": "Copiar e colar conteúdo para importação:"
+    "message": "Copie e cole o conteúdo de importação:"
   },
   "or": {
     "message": "ou"
   },
   "unlockWithBiometrics": {
-    "message": "Desbloquear com a biometria"
+    "message": "Desbloquear com biometria"
   },
   "unlockWithPin": {
-    "message": "Desbloquear com o PIN"
+    "message": "Desbloquear com PIN"
   },
   "unlockWithMasterPassword": {
-    "message": "Desbloquear com a senha mestra"
+    "message": "Desbloquear com senha principal"
   },
   "licenseAndBillingManagement": {
     "message": "Gerenciamento da licença e faturamento"
@@ -8308,10 +8728,10 @@
     "message": "Sincronização automática"
   },
   "manualUpload": {
-    "message": "Upload manual"
+    "message": "Envio manual"
   },
   "manualBillingTokenUploadDesc": {
-    "message": "Se você não deseja optar pela sincronização de faturamento, carregue sua licença manualmente aqui. Isto não desbloqueará automaticamente os patrocinadores das Famílias."
+    "message": "Se você não deseja optar pela sincronização de faturamento, envie sua licença manualmente aqui. Isto não desbloqueará automaticamente os financiamentos do Famílias."
   },
   "syncLicense": {
     "message": "Sincronizar licença"
@@ -8326,13 +8746,13 @@
     "message": "Última sincronização de licença"
   },
   "billingSyncHelp": {
-    "message": "Ajuda da Sincronização de faturamento"
+    "message": "Ajuda com sincronização de faturamento"
   },
   "licensePaidFeaturesHelp": {
-    "message": "Ajuda dos recursos de licença paga"
+    "message": "Ajuda com recursos de licença paga"
   },
   "selfHostGracePeriodHelp": {
-    "message": "Após a expiração da assinatura, você tem 60 dias para aplicar um arquivo de licença atualizado à sua organização. Fim do período de carência $GRACE_PERIOD_END_DATE$.",
+    "message": "Após a expiração da assinatura, você tem 60 dias para aplicar um arquivo de licença atualizado à sua organização. O fim do período de tolerância é em $GRACE_PERIOD_END_DATE$.",
     "placeholders": {
       "GRACE_PERIOD_END_DATE": {
         "content": "$1",
@@ -8344,13 +8764,13 @@
     "message": "Enviar licença"
   },
   "projectPeopleDescription": {
-    "message": "Conceder acesso a este projeto ou grupos de pessoas."
+    "message": "Conceda acesso ao projeto para grupos ou pessoas."
   },
   "projectPeopleSelectHint": {
     "message": "Digite ou selecione pessoas ou grupos"
   },
   "projectServiceAccountsDescription": {
-    "message": "Conceder acesso a contas de serviço a este projeto."
+    "message": "Conceda acesso a contas de serviço a este projeto."
   },
   "projectServiceAccountsSelectHint": {
     "message": "Digite ou selecione contas de serviço"
@@ -8362,13 +8782,13 @@
     "message": "Adicione contas de serviço para conceder acesso"
   },
   "serviceAccountPeopleDescription": {
-    "message": "Conceder acesso a esta conta de serviço a grupos ou pessoas."
+    "message": "Conceda acesso a esta conta de serviço a grupos ou pessoas."
   },
   "serviceAccountProjectsDescription": {
-    "message": "Atribuir projetos para esta conta de serviço. "
+    "message": "Atribua projetos a esta conta de serviço. "
   },
   "serviceAccountEmptyProjectAccesspolicies": {
-    "message": "Adicionar projetos para conceder acesso"
+    "message": "Adicione projetos para conceder acesso"
   },
   "canReadWrite": {
     "message": "Pode ler e gravar"
@@ -8376,29 +8796,23 @@
   "groupSlashUser": {
     "message": "Grupo/Usuário"
   },
-  "lowKdfIterations": {
-    "message": "Iterações KDF baixas"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Atualize suas configurações de criptografia para atender às novas recomendações de segurança e melhorar a proteção da conta."
-  },
   "kdfSettingsChangeLogoutWarning": {
-    "message": "O processo desconectará você de todas as sessões ativas. Você precisará iniciar a sessão novamente e concluir o login em duas etapas, se houver. Recomendamos exportar seu cofre antes de alterar suas configurações de criptografia para evitar perda de dados."
+    "message": "O processo desconectará você de todas as sessões ativas. Você precisará se conectar novamente, e fazer a autenticação em duas etapas, se configurada. Recomendamos exportar seu cofre antes de alterar suas configurações de criptografia para evitar perda de dados."
   },
   "secretsManager": {
     "message": "Gerenciador de Segredos"
   },
   "secretsManagerAccessDescription": {
-    "message": "Ative o acesso do usuário ao Gerenciador Secretos."
+    "message": "Ative o acesso de usuários ao Gerenciador de Segredos."
   },
   "userAccessSecretsManagerGA": {
-    "message": "Este usuário pode acessar o gerente secreto"
+    "message": "Este usuário pode acessar o Gerenciador de Segredos"
   },
   "important": {
     "message": "Importante:"
   },
   "viewAll": {
-    "message": "Visualizar tudo"
+    "message": "Ver tudo"
   },
   "showingPortionOfTotal": {
     "message": "Mostrando $PORTION$ de $TOTAL$",
@@ -8423,7 +8837,7 @@
     "message": "Ocorreu um erro ao tentar ler o arquivo de importação"
   },
   "accessedSecretWithId": {
-    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "message": "Acessou um segredo com o identificador: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8432,7 +8846,7 @@
     }
   },
   "accessedSecret": {
-    "message": "$SECRET_ID$ secreto acessado.",
+    "message": "Acessou o segredo $SECRET_ID$.",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8441,7 +8855,7 @@
     }
   },
   "editedSecretWithId": {
-    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "message": "Editou um segredo com o identificador: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8450,7 +8864,7 @@
     }
   },
   "deletedSecretWithId": {
-    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "message": "Apagou um segredo com o identificador: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8459,7 +8873,7 @@
     }
   },
   "permanentlyDeletedSecretWithId": {
-    "message": "Permanently deleted a secret with identifier: $SECRET_ID$",
+    "message": "Apagou permanentemente um segredo com o identificador: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8468,7 +8882,7 @@
     }
   },
   "restoredSecretWithId": {
-    "message": "Restored a secret with identifier: $SECRET_ID$",
+    "message": "Restaurou o segredo com o identificador: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8477,7 +8891,7 @@
     }
   },
   "createdSecretWithId": {
-    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "message": "Criou um segredo com o identificador: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Acessou um projeto com o identificador: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8495,7 +8909,7 @@
     }
   },
   "nameUnavailableProjectDeleted": {
-    "message": "Deleted project Id: $PROJECT_ID$",
+    "message": "Apagou o projeto com ID: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8504,7 +8918,7 @@
     }
   },
   "nameUnavailableSecretDeleted": {
-    "message": "Deleted secret Id: $SECRET_ID$",
+    "message": "Apagou segredo com o ID: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8512,8 +8926,17 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Apagou conta de máquina com o ID: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
-    "message": "Edited a project with identifier: $PROJECT_ID$",
+    "message": "Editou um projeto com o identificador: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8521,8 +8944,78 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Adicionou o usuário: $USER_ID$ a conta de máquina com identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removeu o usuário: $USER_ID$ da conta de máquina com identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removeu o grupo: $GROUP_ID$ da conta de máquina com identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Criou a conta de máquina com identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Adicionou o grupo: $GROUP_ID$ a conta de máquina com identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Apagou a conta de máquina com identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
-    "message": "Deleted a project with identifier: $PROJECT_ID$",
+    "message": "Apagou um projeto com o identificador: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8531,7 +9024,7 @@
     }
   },
   "createdProjectWithId": {
-    "message": "Created a new project with identifier: $PROJECT_ID$",
+    "message": "Criou um projeto com o identificador: $PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8544,16 +9037,16 @@
     "description": "Software Development Kit"
   },
   "createAnAccount": {
-    "message": "Criar uma conta"
+    "message": "Crie uma conta"
   },
   "createSecret": {
     "message": "Crie um segredo"
   },
   "createProject": {
-    "message": "Criar um projeto"
+    "message": "Crie um projeto"
   },
   "createServiceAccount": {
-    "message": "Criar conta de serviço"
+    "message": "Crie uma conta de serviço"
   },
   "downloadThe": {
     "message": "Baixe o",
@@ -8569,7 +9062,7 @@
     "message": "Vamos começar"
   },
   "complete": {
-    "message": "$COMPLETED$/$TOTAL$ Completos",
+    "message": "$COMPLETED$ concluídos dos $TOTAL$",
     "placeholders": {
       "COMPLETED": {
         "content": "$1",
@@ -8609,13 +9102,13 @@
     "message": "Remover pessoas de uma conta de serviço não remove os tokens de acesso que criaram. Para a melhor prática de segurança, é recomendável revogar os tokens de acesso criados por pessoas removidas de uma conta de serviço."
   },
   "smAccessRemovalWarningProjectTitle": {
-    "message": "Remover acesso para esse projeto"
+    "message": "Remova o acesso a esse projeto"
   },
   "smAccessRemovalWarningProjectMessage": {
     "message": "Esta ação removerá seu acesso ao projeto."
   },
   "smAccessRemovalWarningSaTitle": {
-    "message": "Remover acesso a essa conta de serviço"
+    "message": "Remova o acesso a essa conta de serviço"
   },
   "smAccessRemovalWarningSaMessage": {
     "message": "Essa ação removerá seu acesso à conta de serviço."
@@ -8624,16 +9117,16 @@
     "message": "Remover acesso"
   },
   "checkForBreaches": {
-    "message": "Verificar se essa senha aparece em vazamento de dados conhecidos"
+    "message": "Conferir vazamentos de dados conhecidos por esta senha"
   },
   "exposedMasterPassword": {
-    "message": "Senha mestre exposta"
+    "message": "Senha principal exposta"
   },
   "exposedMasterPasswordDesc": {
-    "message": "A senha foi encontrada em violação de dados. Use uma senha única para proteger sua conta. Tem certeza de que deseja usar uma senha exposta?"
+    "message": "Senha encontrada em um vazamento de dados. Use uma senha única para proteger sua conta. Tem certeza que quer usar uma senha exposta?"
   },
   "weakAndExposedMasterPassword": {
-    "message": "Senha Mestra Fraca e Exposta"
+    "message": "Senha principal fraca e comprometida"
   },
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Senha fraca identificada e encontrada em um vazamento de dados. Use uma senha forte e única para proteger a sua conta. Tem certeza de que deseja usar essa senha?"
@@ -8648,7 +9141,7 @@
     }
   },
   "masterPasswordMinimumlength": {
-    "message": "A senha mestra deve ter pelo menos $LENGTH$ caracteres.",
+    "message": "A senha principal deve ter pelo menos $LENGTH$ caracteres.",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -8664,31 +9157,31 @@
     "message": "Descartar"
   },
   "notAvailableForFreeOrganization": {
-    "message": "Este recurso não está disponível para organizações gratuitas. Entre em contato com o seu proprietário para atualizar."
+    "message": "Este recurso não está disponível para organizações gratuitas. Entre em contato com o seu proprietário para fazer upgrade."
   },
   "smProjectSecretsNoItemsNoAccess": {
     "message": "Entre em contato com o administrador da sua organização para gerenciar segredos para este projeto.",
     "description": "The message shown to the user under a project's secrets tab when the user only has read access to the project."
   },
   "enforceOnLoginDesc": {
-    "message": "Exigir que os membros existentes alterem suas senhas"
+    "message": "Exija que membros existentes alterem suas senhas"
   },
   "smProjectDeleteAccessRestricted": {
-    "message": "Você não tem permissão para excluir este projeto",
+    "message": "Você não tem permissão para apagar este projeto",
     "description": "The individual description shown to the user when the user doesn't have access to delete a project."
   },
   "smProjectsDeleteBulkConfirmation": {
-    "message": "Os projetos a seguir não podem ser excluídos. Deseja continuar?",
+    "message": "Os projetos a seguir não podem ser apagados. Deseja continuar?",
     "description": "The message shown to the user when bulk deleting projects and the user doesn't have access to some projects."
   },
   "updateKdfSettings": {
-    "message": "Atualizar as definições do KDF"
+    "message": "Atualizar configurações da KDF"
   },
   "loginInitiated": {
-    "message": "Sessão iniciada"
+    "message": "Autenticação iniciada"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Lembre-se deste dispositivo para permanecer conectado"
+    "message": "Lembrar deste dispositivo para tornar futuras autenticações simples"
   },
   "deviceApprovalRequired": {
     "message": "Aprovação do dispositivo necessária. Selecione uma opção de aprovação abaixo:"
@@ -8712,35 +9205,35 @@
     "message": "Solicitar aprovação do administrador"
   },
   "unableToCompleteLogin": {
-    "message": "Unable to complete login"
+    "message": "Não é possível concluir a autenticação"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
-    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+    "message": "Você precisa se conectar com um dispositivo confiado ou solicitar ao administrador que lhe atribua uma senha."
   },
   "trustedDeviceEncryption": {
-    "message": "Criptografia de dispositivo confiável"
+    "message": "Criptografia de dispositivo confiado"
   },
   "trustedDevices": {
-    "message": "Dispositivos confiáveis"
+    "message": "Dispositivos confiados"
   },
   "memberDecryptionOptionTdeDescPart1": {
-    "message": "Os membros não precisarão de uma senha mestra ao fazer login com SSO. A senha mestra é substituída por uma chave de criptografia armazenada no dispositivo, fazendo com que esse dispositivo seja confiável. O primeiro dispositivo que um membro cria sua conta e os logins serão confiáveis. Novos dispositivos precisarão ser aprovados por um dispositivo confiável existente ou por um administrador. O",
+    "message": "Os membros não precisarão de uma senha principal ao se conectar com SSO. A senha principal é substituída por uma chave de criptografia armazenada no dispositivo, fazendo com que esse dispositivo seja confiado. O primeiro dispositivo que um membro cria sua conta e se conecta serão confiados. Novos dispositivos precisarão ser aprovados por um dispositivo confiado existente ou por um administrador. A",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink1": {
-    "message": "organização única",
+    "message": "política de",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart2": {
-    "message": "política,",
+    "message": "organização única,",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink2": {
-    "message": "Necessário SSO",
+    "message": "política de",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart3": {
-    "message": "política, e",
+    "message": "SSO obrigatória, e a política de",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink3": {
@@ -8748,19 +9241,19 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart4": {
-    "message": "política será ativada quando esta opção for utilizada.",
+    "message": "ativarão quando esta opção for utilizada.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "orgPermissionsUpdatedMustSetPassword": {
-    "message": "As permissões da sua organização foram atualizadas, exigindo que você defina uma senha mestra.",
+    "message": "As permissões da sua organização foram atualizadas, exigindo que você configure uma senha principal.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "orgRequiresYouToSetPassword": {
-    "message": "Sua organização requer que você defina uma senha mestra.",
+    "message": "Sua organização requer que você configure uma senha principal.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "fora do $TOTAL$",
+    "message": "dos $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -8769,7 +9262,7 @@
     }
   },
   "notFound": {
-    "message": "$RESOURCE$ não encontrado",
+    "message": "$RESOURCE$ não encontrado(a)",
     "placeholders": {
       "resource": {
         "content": "$1",
@@ -8795,7 +9288,7 @@
     "message": "Ativar acesso"
   },
   "bulkEnableSecretsManagerDescription": {
-    "message": "Conceda aos seguintes membros acesso ao Gerenciador de Segredos. A função concedida no Gerenciador de Senhas será aplicada ao Gerenciador de Segredos.",
+    "message": "Conceda aos seguintes membros acesso ao Gerenciador de Segredos. O cargo concedido no Gerenciador de Senhas será aplicado ao Gerenciador de Segredos.",
     "description": "This description is shown to an admin when they are attempting to add more users to Secrets Manager."
   },
   "activateSecretsManager": {
@@ -8806,10 +9299,10 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their organization's public key with another user, for the purposes of sharing."
   },
   "deviceApprovals": {
-    "message": "Aprovações do dispositivo"
+    "message": "Aprovações de dispositivo"
   },
   "deviceApprovalsDesc": {
-    "message": "Aprovar as solicitações de login abaixo para permitir que o membro solicitante termine o login. Solicitações não aprovadas expiram após 1 semana. Verifique as informações do membro antes de aprovar."
+    "message": "Aprove as solicitações de acesso abaixo para permitir que o membro solicitante se conecte. Solicitações não aprovadas expiram após 1 semana. Verifique as informações do membro antes de aprovar."
   },
   "deviceInfo": {
     "message": "Informações do dispositivo"
@@ -8821,7 +9314,7 @@
     "message": "Negar todas as solicitações"
   },
   "denyRequest": {
-    "message": "Negar pedido"
+    "message": "Negar solicitação"
   },
   "approveRequest": {
     "message": "Aprovar solicitação"
@@ -8839,25 +9332,25 @@
     "message": "Tem certeza de que deseja remover este dispositivo?"
   },
   "noDeviceRequests": {
-    "message": "Nenhum pedido de dispositivo"
+    "message": "Nenhuma solicitação de dispositivo"
   },
   "noDeviceRequestsDesc": {
-    "message": "Os pedidos de aprovação de dispositivo de membro aparecerão aqui"
+    "message": "As solicitações de aprovação de dispositivo dos membros aparecerão aqui"
   },
   "loginRequestDenied": {
-    "message": "Solicitação de login negada"
+    "message": "Solicitação de acesso negada"
   },
   "allLoginRequestsDenied": {
-    "message": "Todas as solicitações de login negadas"
+    "message": "Todas as solicitações de autenticação foram negadas"
   },
   "loginRequestApproved": {
-    "message": "Solicitação de login aprovada"
+    "message": "Solicitação de acesso aprovada"
   },
   "removeOrgUserNoMasterPasswordTitle": {
-    "message": "A conta não tem uma senha mestre"
+    "message": "A conta não tem uma senha principal"
   },
   "removeOrgUserNoMasterPasswordDesc": {
-    "message": "Remover $USER$ sem definir uma senha mestra pode restringir o acesso deles à conta toda. Tem certeza de que deseja continuar?",
+    "message": "Remover $USER$ sem configurar uma senha principal para eles pode restringir o acesso à conta toda. Tem certeza de que deseja continuar?",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -8866,10 +9359,10 @@
     }
   },
   "noMasterPassword": {
-    "message": "Nenhuma senha mestre"
+    "message": "Sem senha principal"
   },
   "removeMembersWithoutMasterPasswordWarning": {
-    "message": "Remover membros que não têm senhas mestres sem definir uma para eles pode restringir o acesso à sua conta completa."
+    "message": "Remover membros que não têm senhas principais sem configurar uma para eles pode restringir o acesso à conta toda."
   },
   "approvedAuthRequest": {
     "message": "Dispositivo aprovado para $ID$.",
@@ -8893,10 +9386,10 @@
     "message": "Aprovação do dispositivo solicitada."
   },
   "tdeOffboardingPasswordSet": {
-    "message": "Usuário definiu uma senha mestra durante o offboard TDE."
+    "message": "Usuário configurou uma senha principal durante o offboarding da criptografia de dispositivo confiado."
   },
   "startYour7DayFreeTrialOfBitwardenFor": {
-    "message": "Comece o seu período de teste gratuito de 7 dias do Bitwarden para $ORG$",
+    "message": "Comece o seu teste grátis de 7 dias do Bitwarden para $ORG$",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -8905,7 +9398,7 @@
     }
   },
   "startYour7DayFreeTrialOfBitwardenSecretsManagerFor": {
-    "message": "Inicie o seu período de teste gratuito de 7 dias do Bitwarden Secrets Manager para $ORG$",
+    "message": "Comece o seu teste grátis de 7 dias do Bitwarden Gerenciador de Segredos para $ORG$",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -8917,10 +9410,10 @@
     "message": "Avançar"
   },
   "ssoLoginIsRequired": {
-    "message": "Login SSO é obrigatório"
+    "message": "Autenticação com SSO é necessário"
   },
   "selectedRegionFlag": {
-    "message": "Sinalização de região selecionada"
+    "message": "Bandeira da região selecionada"
   },
   "accountSuccessfullyCreated": {
     "message": "Conta criada com sucesso!"
@@ -8929,28 +9422,28 @@
     "message": "Aprovação do administrador necessária"
   },
   "adminApprovalRequestSentToAdmins": {
-    "message": "Seu pedido foi enviado para seu administrador."
+    "message": "Sua solicitação foi enviada para seu administrador."
   },
   "troubleLoggingIn": {
-    "message": "Problemas em efetuar login?"
+    "message": "Problemas para acessar?"
   },
   "loginApproved": {
-    "message": "Sessão aprovada"
+    "message": "Autenticação aprovada"
   },
   "userEmailMissing": {
     "message": "E-mail do usuário ausente"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Endereço eletrônico de usuário ativo não encontrado. Você será desconectado"
+    "message": "E-mail do usuário ativo não encontrado. Desconectando você."
   },
   "deviceTrusted": {
-    "message": "Dispositivo confiável"
+    "message": "Dispositivo confiado"
   },
   "inviteUsers": {
     "message": "Convidar usuários"
   },
   "secretsManagerForPlan": {
-    "message": "Gerenciador de segredos para $PLAN$",
+    "message": "Gerenciador de Segredos para $PLAN$",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -8962,7 +9455,7 @@
     "message": "Para equipes de engenharia e DevOps gerenciar segredos durante todo o ciclo de vida do desenvolvimento de software."
   },
   "free2PersonOrganization": {
-    "message": "Organizações gratuitas com 2 pessoas"
+    "message": "Organizações grátis de 2 pessoas"
   },
   "unlimitedSecrets": {
     "message": "Segredos ilimitados"
@@ -8998,10 +9491,10 @@
     }
   },
   "subscribeToSecretsManager": {
-    "message": "Assine o Gerenciador de Segredos"
+    "message": "Assinar o Gerenciador de Segredos"
   },
   "addSecretsManagerUpgradeDesc": {
-    "message": "Adicione o Gerenciador de Segredos ao seu plano atualizado para manter o acesso a todos os segredos criados com seu plano anterior."
+    "message": "Adicione o Gerenciador de Segredos ao seu plano com upgrade para manter o acesso a todos os segredos criados com seu plano anterior."
   },
   "additionalServiceAccounts": {
     "message": "Contas de serviço adicionais"
@@ -9025,97 +9518,94 @@
     }
   },
   "collectionManagement": {
-    "message": "Gerenciamento da coleção"
+    "message": "Gerenciamento de conjuntos"
   },
   "collectionManagementDescription": {
-    "message": "Configure the collection behavior for the organization"
+    "message": "Configure o comportamento dos conjuntos da organização"
   },
   "allowAdminAccessToAllCollectionItemsDescription": {
-    "message": "Allow owners and admins to manage all collections and items from the Admin Console"
+    "message": "Permita que proprietários e administradores gerenciem todos os conjuntos e itens pelo painel de administração"
   },
   "restrictCollectionCreationDescription": {
-    "message": "Restrict collection creation to owners and admins"
+    "message": "Restrinja a criação de conjuntos a proprietários e administradores"
   },
   "restrictCollectionDeletionDescription": {
-    "message": "Restrict collection deletion to owners and admins"
+    "message": "Restrinja o apagamento de conjuntos a proprietários e administradores"
   },
   "restrictItemDeletionDescriptionStart": {
-    "message": "Restrict item deletion to members with the ",
+    "message": "Restrinja o apagamento de itens a membros com a permissão de ",
     "description": "This will be used as part of a larger sentence, broken up to allow styling of the middle portion. Full sentence: 'Restrict item deletion to members with the [Manage collection] permission'"
   },
   "restrictItemDeletionDescriptionEnd": {
-    "message": " permission",
+    "message": "‎",
     "description": "This will be used as part of a larger sentence, broken up to allow styling of the middle portion. Full sentence: 'Restrict item deletion to members with the [Manage collection] permission'"
   },
   "updatedCollectionManagement": {
-    "message": "Configuração da gestão de coleção atualizada"
+    "message": "Configuração de gerenciamento de conjuntos atualizada"
   },
   "passwordManagerPlanPrice": {
-    "message": "Preço do plano do Gerenciador de Senha"
+    "message": "Preço do plano do Gerenciador de Senhas"
   },
   "secretsManagerPlanPrice": {
     "message": "Preço do plano do Gerenciador de Segredos"
   },
   "passwordManager": {
-    "message": "Gerenciador de senha"
+    "message": "Gerenciador de Senhas"
   },
   "freeOrganization": {
-    "message": "Organização gratuita"
+    "message": "Organização Grátis"
   },
   "limitServiceAccounts": {
     "message": "Limitar contas de serviço (opcional)"
   },
   "limitServiceAccountsDesc": {
-    "message": "Defina um limite para suas contas de máquina. Quando este limite for atingido, você não poderá criar novas contas de máquina."
+    "message": "Configure um limite para suas contas de serviço. Quando este limite for atingido, você não poderá criar novas contas de serviço."
   },
   "serviceAccountLimit": {
     "message": "Limite de contas de serviço (opcional)"
   },
   "maxServiceAccountCost": {
-    "message": "Custo máximo da conta de serviço potencial"
+    "message": "Custo potencial máximo de contas de serviço"
   },
   "loggedInExclamation": {
     "message": "Conectado!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
-    "message": "Atribuir acesso à coleção"
+    "message": "Atribuir acesso a conjuntos"
   },
   "editedCollections": {
-    "message": "Coleções editadas"
+    "message": "Conjuntos editados"
   },
   "baseUrl": {
-    "message": "URL do Servidor"
+    "message": "URL do servidor"
   },
   "selfHostBaseUrl": {
-    "message": "URL do servidor auto-host",
+    "message": "URL do servidor auto-hospedado",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "alreadyHaveAccount": {
     "message": "Já tem uma conta?"
   },
   "toggleSideNavigation": {
-    "message": "Ativar/desativar navegação lateral"
+    "message": "Habilitar navegação lateral"
   },
   "skipToContent": {
-    "message": "Pular para o conteúdo"
+    "message": "Ir para o conteúdo"
   },
   "managePermissionRequired": {
-    "message": "Pelo menos um membro ou grupo deve ter poder gerenciar a permissão."
+    "message": "Pelo menos um membro ou grupo deve ter permissões de gerenciamento."
   },
   "typePasskey": {
     "message": "Chave de acesso"
   },
   "passkeyNotCopied": {
-    "message": "A senha não será copiada"
+    "message": "A chave de acesso não será copiada"
   },
   "passkeyNotCopiedAlert": {
-    "message": "A senha não será copiada para o item clonado. Deseja continuar clonando este item?"
+    "message": "A chave de acesso não será copiada para o item clonado. Deseja continuar clonando este item?"
   },
   "modifiedCollectionManagement": {
-    "message": "Definição de gerenciamento da coleção $ID$ modificada.",
+    "message": "Modificou a configuração de gerenciamento de conjuntos $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9124,7 +9614,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "Ativou a configuração de restrição de criação de conjuntos $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9133,7 +9623,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "Desativou a configuração de restrição de criação de conjuntos $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9142,7 +9632,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "Ativou a configuração de restrição de apagamento de conjuntos $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9151,7 +9641,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "Desativou a configuração de restrição de apagamento de conjuntos $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9160,7 +9650,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "Ativou a configuração de restrição de apagamento de itens $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9169,7 +9659,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "Desativou a configuração de restrição de apagamento de itens $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9178,7 +9668,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Ativou a configuração de permitir que todos os proprietários e administradores gerenciem todos os conjuntos e itens $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9187,7 +9677,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "Desativou a configuração de permitir que todos os proprietários e administradores gerenciem todos os conjuntos e itens $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9200,80 +9690,80 @@
     "description": "This is followed a by a hyperlink to the help website."
   },
   "installBrowserExtension": {
-    "message": "Instalar extensões de navegador"
+    "message": "Instalar extensão de navegador"
   },
   "installBrowserExtensionDetails": {
-    "message": "Use a extensão para salvar rapidamente credenciais e formulários de autopreenchimento sem abrir o aplicativo web."
+    "message": "Use a extensão para salvar credenciais e preencher automaticamente formulários de forma rápida, sem abrir o aplicativo web."
   },
   "projectAccessUpdated": {
     "message": "Acesso ao projeto atualizado"
   },
   "unexpectedErrorSend": {
-    "message": "Ocorreu um erro inesperado ao carregar este Envio. Tente novamente mais tarde."
+    "message": "Ocorreu um erro inesperado ao carregar este Send. Tente novamente mais tarde."
   },
   "seatLimitReached": {
-    "message": "Limite de lugares foi atingido"
+    "message": "Limite de vagas foi atingido"
   },
   "contactYourProvider": {
-    "message": "Entre em contato com seu provedor para comprar lugares adicionais."
+    "message": "Entre em contato com seu provedor para comprar vagas adicionais."
   },
   "seatLimitReachedContactYourProvider": {
-    "message": "O limite de lugares foi atingido. Entre em contato com seu provedor para comprar lugares adicionais."
+    "message": "O limite de vagas foi atingido. Entre em contato com seu provedor para comprar vagas adicionais."
   },
   "collectionAccessRestricted": {
-    "message": "O acesso à coleção está restrito"
+    "message": "O acesso ao conjunto está restrito"
   },
   "readOnlyCollectionAccess": {
-    "message": "Você não tem acesso para gerenciar esta coleção."
+    "message": "Você não tem acesso para gerenciar este conjunto."
   },
   "grantManageCollectionWarningTitle": {
-    "message": "Faltando Permissões para Gerenciar Coleção"
+    "message": "Permissões de gerenciamento de conjunto ausentes"
   },
   "grantManageCollectionWarning": {
-    "message": "Conceda permissões de Gerenciamento de Coleções para permitir o gerenciamento completo da coleção, incluindo a exclusão da coleção."
+    "message": "Conceda permissões de gerenciamento de conjuntos para permitir o gerenciamento completo do conjunto, incluindo o apagamento do conjunto."
   },
   "grantCollectionAccess": {
-    "message": "Conceder acesso de grupos ou membros a esta coleção."
+    "message": "Conceda o acesso de grupos ou membros a este conjunto."
   },
   "grantCollectionAccessMembersOnly": {
-    "message": "Conceder acesso a essa coleção."
+    "message": "Conceda acesso de membros a este conjunto."
   },
   "adminCollectionAccess": {
-    "message": "Os administradores podem acessar e gerenciar coleções."
+    "message": "Os administradores podem acessar e gerenciar conjuntos."
   },
   "serviceAccountAccessUpdated": {
-    "message": "Acesso à conta de serviço atualizado"
+    "message": "Acesso da conta de serviço atualizado"
   },
   "commonImportFormats": {
     "message": "Formatos comuns",
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "message": "Detecção de correspondência de URI é como o Bitwarden identifica sugestões de preenchimento automático.",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
-    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "message": "\"Expressão regular\" é uma opção avançada com maior risco de exposição das credenciais.",
     "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
   },
   "startsWithAdvancedOptionWarning": {
-    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "message": "\"Começa com\" é uma opção avançada com maior risco de exposição de credenciais.",
     "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
   },
   "uriMatchWarningDialogLink": {
-    "message": "More about match detection",
+    "message": "Mais sobre a detecção de correspondência",
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
-    "message": "Advanced options",
+    "message": "Opções avançadas",
     "description": "Advanced option placeholder for uri option component"
   },
   "warningCapitalized": {
-    "message": "Warning",
+    "message": "Atenção",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "maintainYourSubscription": {
-    "message": "Para manter sua assinatura para $ORG$, ",
+    "message": "Para manter sua assinatura de $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
     "placeholders": {
       "org": {
@@ -9287,13 +9777,13 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method'"
   },
   "organizationInformation": {
-    "message": "Informação da Organização"
+    "message": "Informações da organização"
   },
   "confirmationDetails": {
     "message": "Detalhes da confirmação"
   },
   "smFreeTrialThankYou": {
-    "message": "Obrigado por se inscrever no Bitwarden Secrets Manager!"
+    "message": "Obrigado por se inscrever no Bitwarden Gerenciador de Segredos!"
   },
   "smFreeTrialConfirmationEmail": {
     "message": "Enviamos um e-mail de confirmação para seu e-mail em "
@@ -9315,7 +9805,7 @@
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "movingToAnotherTool": {
-    "message": "Trocando de ferramenta",
+    "message": "Migrando para outra ferramenta",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooDifficultToUse": {
@@ -9323,21 +9813,29 @@
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "notUsingEnough": {
-    "message": "Não está usando o suficiente",
+    "message": "Falta de uso",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooExpensive": {
     "message": "Muito caro",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Migrando para o plano grátis",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Migrando para uma organização grátis",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Grátis por 1 ano"
   },
   "newWebApp": {
-    "message": "Bem-vindo ao novo e melhorado aplicativo da web. Saiba mais sobre o que mudou."
+    "message": "Boas-vindas ao novo e melhorado aplicativo web. Saiba mais sobre o que mudou."
   },
   "releaseBlog": {
-    "message": "Ler o blog do lançamento"
+    "message": "Ler o post do lançamento no blog"
   },
   "adminConsole": {
     "message": "Painel de administração"
@@ -9352,31 +9850,37 @@
     "message": "Você não pode se adicionar aos grupos."
   },
   "cannotAddYourselfToCollections": {
-    "message": "Você não pode se adicionar às coleções."
+    "message": "Você não pode se adicionar aos conjuntos."
   },
   "assign": {
     "message": "Atribuir"
   },
+  "assignTasks": {
+    "message": "Atribuir tarefas"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Envie notificações para alteração de senhas"
+  },
   "assignToCollections": {
-    "message": "Atribuir à coleções"
+    "message": "Atribuir a conjuntos"
   },
   "assignToTheseCollections": {
-    "message": "Atribuir a estas coleções"
+    "message": "Atribuir a estes conjuntos"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Apenas membros da organização com acesso a essas coleções poderão ver o item."
+    "message": "Apenas membros da organização com acesso a estes conjuntos poderão ver o item."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Apenas membros da organização com acesso à essas coleções poderão ver os itens."
+    "message": "Apenas membros da organização com acesso a estes conjuntos poderão ver os itens."
   },
   "selectCollectionsToAssign": {
-    "message": "Selecione as coleções para atribuir"
+    "message": "Selecione conjuntos a atribuir"
   },
   "noCollectionsAssigned": {
-    "message": "Nenhuma coleção foi atribuída"
+    "message": "Nenhum conjunto foi atribuído"
   },
   "successfullyAssignedCollections": {
-    "message": "Coleções atribuídas com sucesso"
+    "message": "Conjuntos atribuídos com sucesso"
   },
   "bulkCollectionAssignmentWarning": {
     "message": "Você selecionou $TOTAL_COUNT$ itens. Você não pode atualizar $READONLY_COUNT$ destes itens porque você não tem permissão para edição.",
@@ -9401,44 +9905,44 @@
     "message": "Itens"
   },
   "assignedSeats": {
-    "message": "Lugares Atribuídos"
+    "message": "Vagas atribuídas"
   },
   "assigned": {
-    "message": "Atribuído"
+    "message": "Atribuídas"
   },
   "used": {
-    "message": "Utilizado"
+    "message": "Usadas"
   },
   "remaining": {
-    "message": "Restante"
+    "message": "Restantes"
   },
   "unlinkOrganization": {
     "message": "Desvincular organização"
   },
   "manageSeats": {
-    "message": "GERENCIAR LUGARES"
+    "message": "GERENCIAR VAGAS"
   },
   "manageSeatsDescription": {
-    "message": "Os ajustes nos lugares serão refletidos no próximo ciclo de faturamento."
+    "message": "Os ajustes nas vagas serão refletidos no próximo ciclo de faturamento."
   },
   "unassignedSeatsDescription": {
-    "message": "Assinatura de assentos desvinculada"
+    "message": "Vagas não atribuídas"
   },
   "purchaseSeatDescription": {
-    "message": "Assentos adicionais comprados"
+    "message": "Vagas adicionais compradas"
   },
   "assignedSeatCannotUpdate": {
-    "message": "Os assentos atribuídos não podem ser atualizados. Por favor, entre em contato com o proprietário da sua organização para obter assistência."
+    "message": "Os assentos atribuídos não podem ser atualizados. Entre em contato com o proprietário da sua organização para obter assistência."
   },
   "subscriptionUpdateFailed": {
     "message": "Atualização da assinatura falhou"
   },
   "trial": {
-    "message": "Avaliação",
+    "message": "Teste grátis",
     "description": "A subscription status label."
   },
   "pastDue": {
-    "message": "Atrasado",
+    "message": "Atrasada",
     "description": "A subscription status label"
   },
   "subscriptionExpired": {
@@ -9446,7 +9950,7 @@
     "description": "The date header used when a subscription is past due."
   },
   "pastDueWarningForChargeAutomatically": {
-    "message": "Você tem um período de carência de $DAYS$ dias a contar da data de expiração para manter sua assinatura. Por favor, resolva as faturas vencidas até $SUSPENSION_DATE$.",
+    "message": "Você tem um período de tolerância de $DAYS$ dias a contar da data de expiração para manter sua assinatura. Resolva as faturas atrasadas até $SUSPENSION_DATE$.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9460,7 +9964,7 @@
     "description": "A warning shown to the user when their subscription is past due and they are charged automatically."
   },
   "pastDueWarningForSendInvoice": {
-    "message": "Você tem um período de licença de $DAYS$, contados a partir da data de vencimento da sua primeira fatura em aberto para manter a sua assinatura. Por favor, resolva as faturas vencidas até $SUSPENSION_DATE$.",
+    "message": "Você tem um período de tolerância de $DAYS$ dias para manter a sua assinatura, contados a partir da data de vencimento da sua primeira fatura em aberto. Resolva as faturas atrasadas até $SUSPENSION_DATE$.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9478,7 +9982,7 @@
     "description": "The header of a warning box shown to a user whose subscription is unpaid."
   },
   "toReactivateYourSubscription": {
-    "message": "Para reativar sua assinatura, por favor resolva as faturas vencidas.",
+    "message": "Para reativar sua assinatura, resolva as faturas atrasadas.",
     "description": "The body of a warning box shown to a user whose subscription is unpaid."
   },
   "cancellationDate": {
@@ -9501,19 +10005,19 @@
     "description": "Title for creating a new machine account."
   },
   "machineAccountsNoItemsMessage": {
-    "message": "Crie uma nova conta de máquina para começar a automatizar o acesso secreto.",
+    "message": "Crie uma conta de máquina para começar a automatizar o acesso aos segredos.",
     "description": "Message to encourage the user to start creating machine accounts."
   },
   "machineAccountsNoItemsTitle": {
-    "message": "Ainda não há nada a ser exibido",
+    "message": "Nada para mostrar ainda",
     "description": "Title to indicate that there are no machine accounts to display."
   },
   "deleteMachineAccounts": {
-    "message": "Excluir contas de máquina",
+    "message": "Apagar contas de serviço",
     "description": "Title for the action to delete one or multiple machine accounts."
   },
   "deleteMachineAccount": {
-    "message": "Excluir conta de máquina",
+    "message": "Apagar conta de serviço",
     "description": "Title for the action to delete a single machine account."
   },
   "viewMachineAccount": {
@@ -9521,7 +10025,7 @@
     "description": "Action to view the details of a machine account."
   },
   "deleteMachineAccountDialogMessage": {
-    "message": "A exclusão da conta de máquina $MACHINE_ACCOUNT$ é permanente e irreversível.",
+    "message": "Apagar a conta de máquina $MACHINE_ACCOUNT$ é permanente e irreversível.",
     "placeholders": {
       "machine_account": {
         "content": "$1",
@@ -9530,10 +10034,10 @@
     }
   },
   "deleteMachineAccountsDialogMessage": {
-    "message": "Excluir contas de máquina é permanente e irreversível."
+    "message": "Apagar contas de máquina é permanente e irreversível."
   },
   "deleteMachineAccountsConfirmMessage": {
-    "message": "Excluir $COUNT$ contas de máquina",
+    "message": "Apagar $COUNT$ contas de máquina",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9542,17 +10046,17 @@
     }
   },
   "deleteMachineAccountToast": {
-    "message": "Conta de máquina excluída"
+    "message": "Conta de máquina apagada"
   },
   "deleteMachineAccountsToast": {
-    "message": "Contas de máquina excluídas"
+    "message": "Contas de máquina apagadas"
   },
   "searchMachineAccounts": {
-    "message": "Pesquisar contas de máquina",
+    "message": "Buscar contas de máquina",
     "description": "Placeholder text for searching machine accounts."
   },
   "editMachineAccount": {
-    "message": "Editar conta da máquina",
+    "message": "Editar conta de máquina",
     "description": "Title for editing a machine account."
   },
   "machineAccountName": {
@@ -9568,7 +10072,7 @@
     "description": "Notifies that a machine account has been updated"
   },
   "projectMachineAccountsDescription": {
-    "message": "Conceder acesso a contas de máquina a este projeto."
+    "message": "Conceda acesso do projeto a contas de máquina."
   },
   "projectMachineAccountsSelectHint": {
     "message": "Digite ou selecione contas de máquina"
@@ -9577,13 +10081,13 @@
     "message": "Adicione contas de máquina para conceder acesso"
   },
   "machineAccountPeopleDescription": {
-    "message": "Conceder acesso de grupos ou pessoas a esta conta de máquina."
+    "message": "Conceda acesso a esta conta de máquina a grupos ou pessoas."
   },
   "machineAccountProjectsDescription": {
-    "message": "Atribuir projetos a esta conta de máquina. "
+    "message": "Atribua projetos a esta conta de máquina. "
   },
   "createMachineAccount": {
-    "message": "Criar uma conta de máquina"
+    "message": "Crie uma conta de serviço"
   },
   "maPeopleWarningMessage": {
     "message": "Remover pessoas de uma conta de máquina não remove os tokens de acesso que elas criaram. Por melhores práticas de segurança, é recomendado revogar os tokens de acesso criados por pessoas que foram removidas de uma conta de máquina."
@@ -9595,7 +10099,7 @@
     "message": "Esta ação irá remover seu acesso à conta de máquina."
   },
   "machineAccountsIncluded": {
-    "message": "$COUNT$ contas de serviço incluídas",
+    "message": "$COUNT$ contas de máquina incluídas",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9604,7 +10108,7 @@
     }
   },
   "additionalMachineAccountCost": {
-    "message": "$COST$ mensal para contas de máquina adicionais",
+    "message": "$COST$ mensais por contas de máquina adicionais",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9625,7 +10129,7 @@
     }
   },
   "addAdditionalMachineAccounts": {
-    "message": "Você pode adicionar contas de máquina extras por $COST$ mensais.",
+    "message": "Você pode adicionar contas de máquina adicionais por $COST$ mensais.",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9637,28 +10141,28 @@
     "message": "Limitar contas de máquina (opcional)"
   },
   "limitMachineAccountsDesc": {
-    "message": "Defina um limite para suas contas de máquina. Quando este limite for atingido, você não poderá criar novas contas de máquina."
+    "message": "Configure um limite para suas contas de máquina. Quando este limite for atingido, você não poderá criar contas de máquina."
   },
   "machineAccountLimit": {
-    "message": "Limite de conta de máquina (opcional)"
+    "message": "Limite de contas de máquina (opcional)"
   },
   "maxMachineAccountCost": {
-    "message": "Custo máximo de conta de máquina"
+    "message": "Custo potencial máximo de contas de máquina"
   },
   "machineAccountAccessUpdated": {
-    "message": "Acesso a conta de máquina atualizado"
+    "message": "Acesso da conta de máquina atualizado"
   },
   "restrictedGroupAccessDesc": {
-    "message": "Você não pode adicionar você mesmo a um grupo."
+    "message": "Você não pode se adicionar a um grupo."
   },
   "deleteProvider": {
-    "message": "Excluir Provedor"
+    "message": "Apagar provedor"
   },
   "deleteProviderConfirmation": {
-    "message": "A exclusão de um provedor é permanente e irreversível. Digite sua senha mestra para confirmar a exclusão do provedor e de todos os dados associados."
+    "message": "Apagar um provedor é permanente e irreversível. Digite sua senha principal para confirmar o apagamento do provedor e de todos os dados associados."
   },
   "deleteProviderName": {
-    "message": "Não é possível excluir $ID$",
+    "message": "Não é possível apagar $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9667,7 +10171,7 @@
     }
   },
   "deleteProviderWarningDescription": {
-    "message": "Você deve desvincular todos os clientes antes de excluir $ID$.",
+    "message": "Você deve desvincular todos os clientes antes de apagar $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9676,19 +10180,19 @@
     }
   },
   "providerDeleted": {
-    "message": "Provedor excluído"
+    "message": "Provedor apagado"
   },
   "providerDeletedDesc": {
-    "message": "O provedor e todos os dados associados foram excluídos."
+    "message": "O provedor e todos os dados associados foram apagados."
   },
   "deleteProviderRecoverConfirmDesc": {
-    "message": "Você pediu para excluir este Provedor. Clique no botão abaixo para confirmar."
+    "message": "Você pediu para apagar este provedor. Clique no botão abaixo para confirmar."
   },
   "deleteProviderWarning": {
-    "message": "A exclusão do seu provedor é permanente. Não pode ser desfeita."
+    "message": "O apagamento do seu provedor é permanente. Não pode ser desfeito."
   },
   "errorAssigningTargetCollection": {
-    "message": "Erro ao atribuir coleção de destino."
+    "message": "Erro ao atribuir conjunto de destino."
   },
   "errorAssigningTargetFolder": {
     "message": "Erro ao atribuir pasta de destino."
@@ -9701,20 +10205,20 @@
     "message": "Integrações"
   },
   "integrationsDesc": {
-    "message": "Sincronize automaticamente segredos do Bitwarden Secrets Manager para um serviço de terceiros."
+    "message": "Sincronize segredos do Bitwarden Gerenciador de Segredos automaticamente para um serviço de terceiros."
   },
   "sdks": {
     "message": "SDKs"
   },
   "sdksDesc": {
-    "message": "Utilize o Bitwarden Secrets Manager SDK nas seguintes linguagens de programação para construir seus próprios aplicativos."
+    "message": "Utilize o SDK do Bitwarden Gerenciador de Segredos nas seguintes linguagens de programação para construir seus próprios aplicativos."
   },
   "ssoDescStart": {
-    "message": "Configurar",
+    "message": "Configure a",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "ssoDescEnd": {
-    "message": "Para o Bitwarden usar o guia de implementação Para o seu provedor de identidade.",
+    "message": "para o BItwarden usando o guia de implementação do seu provedor de identidade.",
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "userProvisioning": {
@@ -9724,57 +10228,63 @@
     "message": "SCIM"
   },
   "scimIntegrationDescStart": {
-    "message": "Configurar",
+    "message": "Configure o",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "scimIntegrationDescEnd": {
-    "message": "(Sistema de Gerenciamento de Identidade de Domínio) para fornecer automaticamente usuários e grupos ao Bitwarden usando o guia de implementação do seu Provedor de Identidade.",
+    "message": "(Sistema de Gerenciamento de Identidade Entre Domínios) para provisionar automaticamente usuários e grupos ao Bitwarden usando o guia de implementação do seu provedor de identidade.",
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "bwdc": {
-    "message": "Conector de Diretório Bitwarden"
+    "message": "Bitwarden Conector de Diretório"
   },
   "bwdcDesc": {
-    "message": "Configure o conector de diretório do Bitwarden para fornecer automaticamente usuários e grupos usando o guia de implementação para o seu provedor de identidade."
+    "message": "Configure o Bitwarden Conector de Diretório para provisionar automaticamente usuários e grupos usando o guia de implementação para o seu provedor de identidade."
   },
   "eventManagement": {
-    "message": "Gerenciador de eventos"
+    "message": "Gerenciamento de eventos"
   },
   "eventManagementDesc": {
-    "message": "Integre os logs de eventos do Bitwarden ao seu sistema SIEM (informações do sistema e gerenciamento de eventos) utilizando o guia de implementação da sua plataforma."
+    "message": "Integre os registros de eventos do Bitwarden ao seu sistema SIEM (gerenciamento de eventos e informações do sistema) utilizando o guia de implementação da sua plataforma."
   },
   "deviceManagement": {
-    "message": "Gerenciamento do dispositivo"
+    "message": "Gerenciamento de dispositivos"
   },
   "deviceManagementDesc": {
     "message": "Configure o gerenciamento de dispositivos para o Bitwarden usando o guia de implementação da sua plataforma."
   },
   "crowdstrikeEventIntegrationDesc": {
-    "message": "Send event data to your Logscale instance"
+    "message": "Envie dados de eventos a sua instância do Logscale"
+  },
+  "datadogEventIntegrationDesc": {
+    "message": "Envie dados de eventos do cofre a sua instância do Datadog"
   },
   "failedToSaveIntegration": {
-    "message": "Failed to save integration. Please try again later."
+    "message": "Falha ao salvar a integração. Tente novamente mais tarde."
+  },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Você precisa ser o proprietário da organização para executar esta ação."
   },
   "failedToDeleteIntegration": {
-    "message": "Failed to delete integration. Please try again later."
+    "message": "Falha ao apagar a integração. Tente novamente mais tarde."
   },
   "deviceIdMissing": {
     "message": "ID do dispositivo está faltando"
   },
   "deviceTypeMissing": {
-    "message": "O tipo de dispositivo está faltando"
+    "message": "O tipo do dispositivo está faltando"
   },
   "deviceCreationDateMissing": {
-    "message": "Data de criação do dispositivo ausente"
+    "message": "A data de criação do dispositivo está faltando"
   },
   "desktopRequired": {
-    "message": "Desktop necessário"
+    "message": "Computador necessário"
   },
   "reopenLinkOnDesktop": {
-    "message": "Reabra este link a partir do seu e-mail em um desktop."
+    "message": "Reabra este link a partir do seu e-mail em um computador."
   },
   "connectIntegrationButtonDesc": {
-    "message": "Connect $INTEGRATION$",
+    "message": "Conectar $INTEGRATION$",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9783,7 +10293,7 @@
     }
   },
   "updateIntegrationButtonDesc": {
-    "message": "Update $INTEGRATION$",
+    "message": "Atualizar $INTEGRATION$",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9792,7 +10302,7 @@
     }
   },
   "integrationCardTooltip": {
-    "message": "Inicie o guia de implementação $INTEGRATION$.",
+    "message": "Abra o guia de implementação do $INTEGRATION$.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9801,7 +10311,7 @@
     }
   },
   "smIntegrationTooltip": {
-    "message": "Configure $INTEGRATION$.",
+    "message": "Configure o $INTEGRATION$.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9810,7 +10320,7 @@
     }
   },
   "smSdkTooltip": {
-    "message": "Visualizar repositório Rust",
+    "message": "Ver repositório do $SDK$",
     "placeholders": {
       "sdk": {
         "content": "$1",
@@ -9819,7 +10329,7 @@
     }
   },
   "integrationCardAriaLabel": {
-    "message": "Abrir guia de implementação $INTEGRATION$ em uma nova aba.",
+    "message": "abra o guia de implementação do $INTEGRATION$ em uma nova aba.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9828,7 +10338,7 @@
     }
   },
   "smSdkAriaLabel": {
-    "message": "Veja o repositório $SDK$ em uma nova guia.",
+    "message": "veja o repositório do $SDK$ em uma nova guia.",
     "placeholders": {
       "sdk": {
         "content": "$1",
@@ -9837,7 +10347,7 @@
     }
   },
   "smIntegrationCardAriaLabel": {
-    "message": "Configurar guia de implementação $INTEGRATION$ em uma nova aba.",
+    "message": "configure o guia de implementação do $INTEGRATION$ em uma nova aba.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9846,25 +10356,25 @@
     }
   },
   "createNewClientToManageAsProvider": {
-    "message": "Crie uma nova organização de cliente para gerenciar como um Provedor. Posições adicionais serão refletidas no próximo ciclo de faturamento."
+    "message": "Crie uma nova organização de cliente para gerenciar como um provedor. Vagas adicionais serão refletidas no próximo ciclo de faturamento."
   },
   "url": {
     "message": "URL"
   },
   "bearerToken": {
-    "message": "Bearer Token"
+    "message": "Token de portador"
   },
   "repositoryNameHint": {
-    "message": "Name of the repository to ingest into"
+    "message": "Nome do repositório que irá ser ingerido"
   },
   "index": {
-    "message": "Index"
+    "message": "Índice"
   },
   "selectAPlan": {
     "message": "Selecione um plano"
   },
   "thirtyFivePercentDiscount": {
-    "message": "35% de Desconto"
+    "message": "Desconto de 35%"
   },
   "monthPerMember": {
     "message": "mês por membro"
@@ -9873,10 +10383,10 @@
     "message": "mês por membro cobrado anualmente"
   },
   "seats": {
-    "message": "Lugares"
+    "message": "Vagas"
   },
   "addOrganization": {
-    "message": "Adicionar Organização"
+    "message": "Adicionar organização"
   },
   "createdNewClient": {
     "message": "Novo cliente criado com sucesso"
@@ -9885,49 +10395,49 @@
     "message": "Sem acesso"
   },
   "collectionAdminConsoleManaged": {
-    "message": "Esta coleção só é acessível a partir do console de administração"
+    "message": "Este conjunto só é acessível a partir do painel de administração"
   },
   "organizationOptionsMenu": {
-    "message": "Alternar Menu da Organização"
+    "message": "Habilitar menu da organização"
   },
   "vaultItemSelect": {
     "message": "Selecionar item do cofre"
   },
   "collectionItemSelect": {
-    "message": "Selecionar item da coleção"
+    "message": "Selecionar item do conjunto"
   },
   "manageBillingFromProviderPortalMessage": {
-    "message": "Gerenciar faturamento a partir do Portal do Provedor"
+    "message": "Gerenciar faturamento pelo Portal do Provedor"
   },
   "continueSettingUp": {
-    "message": "Continue setting up Bitwarden"
+    "message": "Continuar configurando o Bitwarden"
   },
   "continueSettingUpFreeTrial": {
-    "message": "Continue a configurar a sua avaliação gratuita do Bitwarden"
+    "message": "Continuar configurando o seu teste grátis do Bitwarden"
   },
   "continueSettingUpPasswordManager": {
-    "message": "Continue setting up Bitwarden Password Manager"
+    "message": "Continuar configurando o Bitwarden Gerenciador de Senhas"
   },
   "continueSettingUpFreeTrialPasswordManager": {
-    "message": "Continue a configurar sua avaliação gratuita do Gerenciador de Senhas do Bitwarden"
+    "message": "Continuar configurando o teste grátis do Bitwarden Gerenciador de Senhas"
   },
   "continueSettingUpSecretsManager": {
-    "message": "Continue setting up Bitwarden Secrets Manager"
+    "message": "Continuar configurando o Bitwarden Gerenciador de Segredos"
   },
   "continueSettingUpFreeTrialSecretsManager": {
-    "message": "Continue configurando seu teste gratuito do Gerenciador de Segredos do Bitwarden"
+    "message": "Continuar configurando seu teste grátis do Bitwarden Gerenciador de Segredos"
   },
   "enterTeamsOrgInfo": {
-    "message": "Insira as informações da organização de suas equipes"
+    "message": "Digite as informações da organização do Equipes"
   },
   "enterFamiliesOrgInfo": {
-    "message": "Digite as informações da organização das suas famílias"
+    "message": "Digite as informações da organização do Famílias"
   },
   "enterEnterpriseOrgInfo": {
-    "message": "Insira suas informações da organização empresarial"
+    "message": "Digite as informações da sua organização do Empresarial"
   },
   "viewItemsIn": {
-    "message": "Visualizar itens em $NAME$",
+    "message": "Ver itens em $NAME$",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -9964,10 +10474,10 @@
     "message": "Ver informações"
   },
   "viewAccess": {
-    "message": "Acesso à visualização"
+    "message": "Ver acesso"
   },
   "noCollectionsSelected": {
-    "message": "Você não selecionou nenhuma coleção."
+    "message": "Você não selecionou nenhum conjunto."
   },
   "updateName": {
     "message": "Atualizar nome"
@@ -9979,13 +10489,13 @@
     "message": "Provedor de Serviços Gerenciados"
   },
   "managedServiceProvider": {
-    "message": "Provedor de serviço gerenciado"
+    "message": "Provedor de serviços gerenciados"
   },
   "multiOrganizationEnterprise": {
-    "message": "multi-empresa organizacional"
+    "message": "Empresa multi-organizacional"
   },
   "orgSeats": {
-    "message": "Lugares da Organização"
+    "message": "Vagas da organização"
   },
   "providerDiscount": {
     "message": "Desconto de $AMOUNT$%",
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Iterações baixas do KDF. Aumente as suas iterações para melhorar a segurança da sua conta."
-  },
-  "changeKDFSettings": {
-    "message": "Atualizar as definições do KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Proteja sua infraestrutura"
   },
@@ -10009,16 +10513,16 @@
     "message": "Proteja sua família ou empresa"
   },
   "upgradeOrganizationCloseSecurityGaps": {
-    "message": "Fechar lacunas de segurança com relatórios de monitoramento"
+    "message": "Resolva problemas de segurança com relatórios de monitoramento"
   },
   "upgradeOrganizationCloseSecurityGapsDesc": {
-    "message": "Fique à frente das vulnerabilidades de segurança atualizando para um plano pago para um monitoramento melhorado."
+    "message": "Fique à frente das vulnerabilidades de segurança fazendo upgrade para um plano pago para um monitoramento aprimorado."
   },
   "approveAllRequests": {
     "message": "Aprovar todas as solicitações"
   },
   "allLoginRequestsApproved": {
-    "message": "Todas as solicitações de login aprovadas"
+    "message": "Todas as solicitações de acesso aprovadas"
   },
   "payPal": {
     "message": "PayPal"
@@ -10030,13 +10534,13 @@
     "message": "Informações fiscais atualizadas"
   },
   "billingInvalidTaxIdError": {
-    "message": "CPF/CNPJ inválido, se você acredita que isto é um erro, contate o suporte."
+    "message": "ID de imposto (tax ID) inválido, se você acredita que isto é um erro, entre em contato com o suporte."
   },
   "billingTaxIdTypeInferenceError": {
-    "message": "Não foi possível validar seu CPF/CNPJ, se você acredita que isto é um erro, contate o suporte."
+    "message": "Não foi possível validar seu ID de imposto (tax ID), se você acredita que isto é um erro, entre em contato com o suporte."
   },
   "billingPreviewInvalidTaxIdError": {
-    "message": "CPF/CNPJ inválido, se você acredita que isto é um erro, contate o suporte."
+    "message": "ID de imposto (tax ID) inválido, se você acredita que isto é um erro, entre em contato com o suporte."
   },
   "billingPreviewInvoiceError": {
     "message": "Ocorreu um erro ao pré-visualizar a fatura. Tente novamente mais tarde."
@@ -10058,10 +10562,10 @@
     "description": "A hint that shows up on the Provider setup page to inform the admin the billing email will receive the provider's invoices."
   },
   "upgradeOrganizationEnterprise": {
-    "message": "Identifique os riscos de segurança ao verificar o acesso de membros"
+    "message": "Identifique riscos de segurança verificando o acesso dos membros"
   },
   "onlyAvailableForEnterpriseOrganization": {
-    "message": "Visualize rapidamente o acesso de membros em toda a organização atualizando para um plano empresarial."
+    "message": "Veja o acesso de membros em toda a organização de forma rápida fazendo upgrade para um plano Empresarial."
   },
   "date": {
     "message": "Data"
@@ -10070,73 +10574,55 @@
     "message": "Exportar relatório do cliente"
   },
   "memberAccessReport": {
-    "message": "Acesso de membros"
+    "message": "Acesso dos membros"
   },
   "memberAccessReportDesc": {
-    "message": "Garanta que membros tenham acesso às credenciais certas e que suas contas estejam seguras. Utilize este relatório para obter um CSV do acesso de membros e configurações de conta."
+    "message": "Garanta que membros tenham acesso às credenciais certas e que suas contas estejam seguras. Utilize este relatório para obter um CSV do acesso e configurações das contas dos membros."
   },
   "memberAccessReportPageDesc": {
-    "message": "Avalie o acesso de membros da organização entre grupos, coleções e itens de coleções. O exporte CSV fornece informações detalhadas por membro, incluindo informações sobre permissões de coleção e configurações de conta."
+    "message": "Fiscalize o acesso dos membros da organização entre grupos, conjuntos e os itens dos conjuntos. A exportação em CSV fornece informações detalhadas por membro, incluindo informações sobre permissões de conjuntos e configurações de conta."
   },
   "memberAccessReportNoCollection": {
-    "message": "(Sem coleção)"
+    "message": "(Sem conjunto)"
   },
   "memberAccessReportNoCollectionPermission": {
-    "message": "(Nenhuma permissão de coleção)"
+    "message": "(Sem permissão de conjunto)"
   },
   "memberAccessReportNoGroup": {
-    "message": "(Sem Grupo)"
+    "message": "(Sem grupo)"
   },
   "memberAccessReportTwoFactorEnabledTrue": {
-    "message": "Ligado"
+    "message": "Ativada"
   },
   "memberAccessReportTwoFactorEnabledFalse": {
-    "message": "Desligado"
+    "message": "Desativada"
   },
   "memberAccessReportAuthenticationEnabledTrue": {
-    "message": "Ligado"
+    "message": "Ativada"
   },
   "memberAccessReportAuthenticationEnabledFalse": {
-    "message": "Desligado"
-  },
-  "higherKDFIterations": {
-    "message": "Iterações KDF mais altas podem ajudar a proteger sua senha mestra de ser descoberta por força bruta por alguém mal-intencionado."
-  },
-  "incrementsOf100,000": {
-    "message": "incrementos de 100.000"
-  },
-  "smallIncrements": {
-    "message": "pequenos incrementos"
+    "message": "Desativada"
   },
   "kdfIterationRecommends": {
     "message": "Recomendamos 600.000 ou mais"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Para dispositivos mais antigos, configurar seu KDF muito alto pode causar problemas de desempenho. Aumente o valor em $VALUE$ e teste seus dispositivos.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
-    "message": " Contate o Atendimento ao Cliente para restabelecer sua assinatura."
+    "message": " Contate o suporte ao cliente para restabelecer sua assinatura."
   },
   "secretPeopleDescription": {
-    "message": "Conceder acesso a este segredo a grupos ou pessoas. As permissões definidas para pessoas irão substituir as permissões definidas por grupos."
+    "message": "Conceda acesso a este segredo a grupos ou pessoas. As permissões configuradas para pessoas substituirão as permissões configuradas por grupos."
   },
   "secretPeopleEmptyMessage": {
     "message": "Adicione pessoas ou grupos para compartilhar o acesso a este segredo"
   },
   "secretMachineAccountsDescription": {
-    "message": "Conceda contas de máquinas acesso a este segredo."
+    "message": "Conceda contas de máquina acesso a este segredo."
   },
   "secretMachineAccountsEmptyMessage": {
     "message": "Adicione contas de máquina para conceder acesso a este segredo"
   },
   "smAccessRemovalWarningSecretTitle": {
-    "message": "Remover acesso a este segredo"
+    "message": "Remova acesso a este segredo"
   },
   "smAccessRemovalSecretMessage": {
     "message": "Esta ação removerá seu acesso a este segredo."
@@ -10155,18 +10641,18 @@
     "description": "A message showing how many unassigned seats are available for a provider."
   },
   "contactYourProviderForAdditionalSeats": {
-    "message": "Entre em contato com o administrador do seu provedor para comprar lugares adicionais."
+    "message": "Entre em contato com o administrador do seu provedor para comprar vagas adicionais."
   },
   "open": {
-    "message": "Abrir",
+    "message": "Em aberto",
     "description": "The status of an invoice."
   },
   "uncollectible": {
-    "message": "Incolecionável",
+    "message": "Incobrável",
     "description": "The status of an invoice."
   },
   "clientDetails": {
-    "message": "Detalhes de cliente"
+    "message": "Detalhes do cliente"
   },
   "downloadCSV": {
     "message": "Baixar CSV"
@@ -10178,15 +10664,15 @@
     "message": "Os ajustes à sua assinatura resultarão em cobranças rateadas em um ciclo de faturamento mensal. "
   },
   "billingHistoryDescription": {
-    "message": "Baixe um CSV para obter detalhes do cliente para cada data de faturamento. As taxas pagas não estão incluídas no CSV e podem variar da factura vinculada. Para obter dados de faturamento mais precisos, consulte suas faturas mensais.",
+    "message": "Baixe um CSV para obter detalhes do cliente para cada data de faturamento. As taxas rateadas não estão incluídas no CSV e podem variar da fatura vinculada. Para obter dados de faturamento mais precisos, consulte suas faturas mensais.",
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "noInvoicesToList": {
-    "message": "Não há itens para listar",
+    "message": "Não há faturas para listar",
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "providerClientVaultPrivacyNotification": {
-    "message": "Aviso: No final deste mês, a privacidade do cofre cliente será melhorada e os membros do provedor não terão mais acesso direto aos itens do cofre do cliente. Para dúvidas,",
+    "message": "Atenção: No final deste mês, a privacidade do cofre dos clientes será melhorada e os membros do provedor não terão mais acesso direto aos itens do cofre do cliente. Para dúvidas,",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'."
   },
   "contactBitwardenSupport": {
@@ -10194,10 +10680,10 @@
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'. 'Bitwarden' should not be translated"
   },
   "sponsored": {
-    "message": "Patrocinado"
+    "message": "Financiado"
   },
   "licenseAndBillingManagementDesc": {
-    "message": "Após fazer atualizações no servidor da nuvem do Bitwarden, envie o arquivo de licença para aplicar as alterações mais recentes."
+    "message": "Após fazer atualizações no servidor da nuvem do Bitwarden, envie o arquivo da sua licença para aplicar as alterações mais recentes."
   },
   "addToFolder": {
     "message": "Adicionar à pasta"
@@ -10206,10 +10692,10 @@
     "message": "Selecionar pastas"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item será transferido permanentemente para a organização selecionada. Você não irá mais possuir este item."
+    "message": "1 item será transferido permanentemente para a organização selecionada. Você não irá mais ser o proprietário deste item."
   },
   "personalItemsTransferWarningPlural": {
-    "message": "Itens $PERSONAL_ITEMS_COUNT$ serão transferidos permanentemente para a organização selecionada. Você não irá mais possuir esses itens.",
+    "message": "$PERSONAL_ITEMS_COUNT$ itens serão transferidos permanentemente para a organização selecionada. Você não irá mais ser o proprietário desses itens.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -10218,7 +10704,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item será transferido permanentemente para $ORG$. Você não irá mais possuir este item.",
+    "message": "1 item será transferido permanentemente para $ORG$. Você não irá mais ser o proprietário deste item.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -10227,7 +10713,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "Os itens $PERSONAL_ITEMS_COUNT$ serão transferidos permanentemente para $ORG$. Você não irá mais possuir esses itens.",
+    "message": "$PERSONAL_ITEMS_COUNT$ itens serão transferidos permanentemente para $ORG$. Você não irá mais ser o proprietário desses itens.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -10240,55 +10726,55 @@
     }
   },
   "data": {
-    "message": "Dado"
+    "message": "Dados"
   },
   "purchasedSeatsRemoved": {
-    "message": "assentos comprados removidos"
+    "message": "vagas compradas removidas"
   },
   "environmentVariables": {
-    "message": "Variáveis de ambiente"
+    "message": "Variáveis do ambiente"
   },
   "organizationId": {
-    "message": "ID da Organização"
+    "message": "ID da organização"
   },
   "projectIds": {
     "message": "IDs do projeto"
   },
   "projectId": {
-    "message": "ID do Projeto"
+    "message": "ID do projeto"
   },
   "projectsAccessedByMachineAccount": {
     "message": "Os seguintes projetos podem ser acessados por esta conta de máquina."
   },
   "config": {
-    "message": "Configuraçao"
+    "message": "Configuração"
   },
   "learnMoreAboutEmergencyAccess": {
-    "message": "Saiba mais sobre acesso de emergência"
+    "message": "Saiba mais sobre o acesso de emergência"
   },
   "learnMoreAboutMatchDetection": {
-    "message": "Saiba mais sobre a detecção de partidas"
+    "message": "Saiba mais sobre a detecção de correspondência"
   },
   "learnMoreAboutMasterPasswordReprompt": {
-    "message": "Saiba mais sobre a redefinição da senha mestra"
+    "message": "Saiba mais sobre a resolicitação da senha principal"
   },
   "learnMoreAboutSearchingYourVault": {
-    "message": "Saiba mais sobre como pesquisar no seu cofre"
+    "message": "Saiba mais sobre buscar no seu cofre"
   },
   "learnMoreAboutYourAccountFingerprintPhrase": {
-    "message": "Saiba mais sobre a sua frase biométrica"
+    "message": "Saiba mais sobre a frase biométrica da sua conta"
   },
   "impactOfRotatingYourEncryptionKey": {
-    "message": "Impacto ao girar sua chave de criptografia"
+    "message": "Consequências de rotacionar sua chave de criptografia"
   },
   "learnMoreAboutEncryptionAlgorithms": {
     "message": "Saiba mais sobre os algoritmos de criptografia"
   },
   "learnMoreAboutKDFIterations": {
-    "message": "Aprenda mais sobre iterações KDF"
+    "message": "Saiba mais sobre as iterações da KDF"
   },
   "learnMoreAboutLocalization": {
-    "message": "Saiba mais sobre a localização"
+    "message": "Saiba mais sobre a tradução"
   },
   "learnMoreAboutWebsiteIcons": {
     "message": "Saiba mais sobre como usar os ícones dos sites"
@@ -10297,22 +10783,22 @@
     "message": "Saiba mais sobre o acesso aos usuários"
   },
   "learnMoreAboutMemberRoles": {
-    "message": "Saiba mais sobre os papéis e permissões dos membros"
+    "message": "Saiba mais sobre os cargos e permissões dos membros"
   },
   "whatIsACvvNumber": {
-    "message": "O que é um número CVVV?"
+    "message": "O que é um número de CVV?"
   },
   "learnMoreAboutApi": {
     "message": "Saiba mais sobre a API do Bitwarden"
   },
   "fileSends": {
-    "message": "Arquivos enviados"
+    "message": "Sends de arquivo"
   },
   "textSends": {
-    "message": "Texto enviado"
+    "message": "Sends de texto"
   },
   "includesXMembers": {
-    "message": "para $COUNT$ membro",
+    "message": "por $COUNT$ membro(s)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -10333,7 +10819,7 @@
     "message": "Hospedagem local opcional"
   },
   "upgradeFreeOrganization": {
-    "message": "Atualize sua organização $NAME$ ",
+    "message": "Faça upgrade da sua organização do $NAME$ ",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10342,10 +10828,10 @@
     }
   },
   "includeSsoAuthenticationMessage": {
-    "message": "Autenticação SSO"
+    "message": "Autenticação única"
   },
   "familiesPlanInvLimitReachedManageBilling": {
-    "message": "Organizações familiares podem ter até membros da $SEATCOUNT$. Faça o upgrade para um plano pago para convidar mais membros.",
+    "message": "Organizações familiares podem ter até $SEATCOUNT$ membros. Faça upgrade para um plano pago para convidar mais membros.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10354,7 +10840,7 @@
     }
   },
   "familiesPlanInvLimitReachedNoManageBilling": {
-    "message": "Organizações familiares podem ter até membros $SEATCOUNT$. Entre em contato com o proprietário da sua organização para atualizar.",
+    "message": "Organizações familiares podem ter até $SEATCOUNT$ membros. Entre em contato com o proprietário da sua organização para fazer upgrade.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10363,7 +10849,7 @@
     }
   },
   "upgradePlans": {
-    "message": "Atualize o seu plano para convidar membros e experimentar poderosos recursos de segurança."
+    "message": "Faça upgrade do seu plano para convidar membros e experimentar poderosos recursos de segurança."
   },
   "upgradeDiscount": {
     "message": "Economize $AMOUNT$%",
@@ -10375,25 +10861,25 @@
     }
   },
   "enterprisePlanUpgradeMessage": {
-    "message": "Recursos avançados para organizações maiores"
+    "message": "Capacidades avançadas para organizações maiores"
   },
   "teamsPlanUpgradeMessage": {
-    "message": "Proteção residencial para o cultivo das equipes"
+    "message": "Proteção resiliente para o crescimento das equipes"
   },
   "teamsInviteMessage": {
-    "message": "Convide membros ilimitados"
+    "message": "Convide ilimitados membros"
   },
   "accessToCreateGroups": {
     "message": "Acesso para criar grupos"
   },
   "syncGroupsAndUsersFromDirectory": {
-    "message": "Sincronizar grupos e usuários de um diretório"
+    "message": "Sincronize grupos e usuários de um diretório"
   },
   "familyPlanUpgradeMessage": {
-    "message": "Proteja seus logins familiares"
+    "message": "Proteja as credenciais da sua família"
   },
   "accessToPremiumFeatures": {
-    "message": "Acesso às funcionalidades Premium"
+    "message": "Acesso aos recursos do Premium"
   },
   "additionalStorageGbMessage": {
     "message": "GB de armazenamento adicional"
@@ -10423,40 +10909,40 @@
     "message": "ED25519"
   },
   "sshKeyAlgorithmRSA2048": {
-    "message": "RSA 2048-Bit"
+    "message": "RSA de 2048 bits"
   },
   "sshKeyAlgorithmRSA3072": {
-    "message": "RSA 3072-Bit"
+    "message": "RSA de 3072 bits"
   },
   "sshKeyAlgorithmRSA4096": {
-    "message": "RSA 4096-Bit"
+    "message": "RSA de 4096 bits"
   },
   "premiumAccounts": {
-    "message": "6 contas premium"
+    "message": "6 contas Premium"
   },
   "unlimitedSharing": {
     "message": "Compartilhamento ilimitado"
   },
   "unlimitedCollections": {
-    "message": "Coleções ilimitadas"
+    "message": "Conjuntos ilimitados"
   },
   "secureDataSharing": {
-    "message": "Compartilhamento de dados seguro"
+    "message": "Compartilhamento seguro de dados"
   },
   "eventLogMonitoring": {
     "message": "Monitoramento do registro de eventos"
   },
   "directoryIntegration": {
-    "message": "Integração de diretório"
+    "message": "Integração de diretórios"
   },
   "passwordLessSso": {
-    "message": "SSO Senha-Chaves"
+    "message": "Autenticação sem senha"
   },
   "accountRecovery": {
     "message": "Recuperação de conta"
   },
   "customRoles": {
-    "message": "Funções personalizadas"
+    "message": "Cargos personalizados"
   },
   "unlimitedSecretsStorage": {
     "message": "Armazenamento ilimitado de segredos"
@@ -10474,13 +10960,13 @@
     "message": "Atual"
   },
   "secretsManagerSubscriptionInfo": {
-    "message": "Sua assinatura do Gerenciador de Segredos será atualizada com base no plano selecionado"
+    "message": "Sua assinatura do Gerenciador de Segredos terá o upgrade feito de acordo com o plano selecionado"
   },
   "bitwardenPasswordManager": {
-    "message": "Gerenciador de Senhas Bitwarden"
+    "message": "Bitwarden Gerenciador de Senhas"
   },
   "secretsManagerComplimentaryPasswordManager": {
-    "message": "Sua cortesia de um ano de assinatura do Gerenciador de Senhas vai atualizar para o plano selecionado. Você não será cobrado até que o período complementar acabe."
+    "message": "Sua assinatura de cortesia de um ano do Gerenciador de Senhas terá o upgrade feito para o plano selecionado. Você não será cobrado até que o período de cortesia acabe."
   },
   "fileSavedToDevice": {
     "message": "Arquivo salvo no dispositivo. Gerencie a partir das transferências do seu dispositivo."
@@ -10490,28 +10976,28 @@
     "description": "The text, 'API', is an acronym and should not be translated."
   },
   "showCharacterCount": {
-    "message": "Mostrar contagem de caracteres"
+    "message": "Mostrar número de caracteres"
   },
   "hideCharacterCount": {
-    "message": "Esconder contagem de caracteres"
+    "message": "Ocultar número de caracteres"
   },
   "editAccess": {
     "message": "Editar acesso"
   },
   "textHelpText": {
-    "message": "Utilize campos de texto para dados como perguntas de segurança"
+    "message": "Use campos de texto para dados como questões de segurança"
   },
   "hiddenHelpText": {
-    "message": "Use campos ocultos para dados confidenciais como uma senha"
+    "message": "Use campos ocultos para dados sensíveis como senhas"
   },
   "checkBoxHelpText": {
-    "message": "Use caixas de seleção se gostaria de preencher automaticamente a caixa de seleção de um formulário, como um e-mail de lembrança"
+    "message": "Use caixas de seleção se gostaria de preencher automaticamente a caixa de seleção de um formulário, como um lembrar e-mail"
   },
   "linkedHelpText": {
     "message": "Use um campo vinculado quando estiver enfrentando problemas com o preenchimento automático em um site específico."
   },
   "linkedLabelHelpText": {
-    "message": "Digite o Id html do campo, nome, nome aria-label, ou marcador de posição"
+    "message": "Digite o ID html, nome, aria-label, ou placeholder do campo."
   },
   "uppercaseDescription": {
     "message": "Incluir caracteres maiúsculos",
@@ -10534,7 +11020,7 @@
     "description": "Full description for the password generator numbers checkbox"
   },
   "numbersLabel": {
-    "message": "0 – 9",
+    "message": "0-9",
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
@@ -10548,26 +11034,26 @@
     "message": "O tamanho máximo do arquivo é 500 MB"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Tem certeza de que deseja excluir permanentemente esse anexo?"
+    "message": "Tem certeza de que deseja apagar esse anexo permanentemente?"
   },
   "manageSubscriptionFromThe": {
-    "message": "Gerenciar assinatura do",
+    "message": "Gerenciar assinatura pelo",
     "description": "This represents the beginning of a sentence. The full sentence will be 'Manage subscription from the Provider Portal', but 'Provider Portal' will be a link and thus cannot be included in the translation file."
   },
   "toHostBitwardenOnYourOwnServer": {
-    "message": "Para hospedar o Bitwarden no seu próprio servidor, você precisará enviar seu arquivo de licença. Para apoiar planos de famílias gratuitas e recursos avançados de faturamento para sua organização auto-hospedada, você precisará configurar a sincronização automática em sua organização auto-hospedada."
+    "message": "Para hospedar o Bitwarden no seu próprio servidor, você precisará enviar o arquivo da sua licença. Para apoiar planos grátis do Famílias e recursos avançados de faturamento para sua organização auto-hospedada, você precisará configurar a sincronização automática nela."
   },
   "selfHostingTitleProper": {
-    "message": "Auto-hospedado"
+    "message": "Auto-hospedagem"
   },
   "claim-domain-single-org-warning": {
-    "message": "Reivindicar um domínio ligará a política de organização única."
+    "message": "Reivindicar um domínio ativará a política de organização única."
   },
   "single-org-revoked-user-warning": {
     "message": "Membros não conformes serão revogados. Os administradores podem restaurar os membros assim que saírem de todas as outras organizações."
   },
   "deleteOrganizationUser": {
-    "message": "Excluir $NAME$",
+    "message": "Apagar $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10577,7 +11063,7 @@
     }
   },
   "deleteOrganizationUserWarningDesc": {
-    "message": "Isto irá excluir permanentemente todos os itens pertencentes a $NAME$. Os itens de coleção não são impactados.",
+    "message": "Isto apagará permanentemente todos os itens pertencentes a $NAME$. Os itens de conjuntos não são impactados.",
     "description": "Warning description for the delete organization user dialog",
     "placeholders": {
       "name": {
@@ -10587,11 +11073,11 @@
     }
   },
   "deleteManyOrganizationUsersWarningDesc": {
-    "message": "Isto irá excluir permanentemente todos os itens pertencentes a $NAME$. Os itens de coleção não são impactados.",
+    "message": "Isso apagará permanentemente todos os itens pertencentes aos seguintes membros. Os itens de conjuntos não são impactados.",
     "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
-    "message": "$NAME$ Excluído",
+    "message": "Apagou $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10600,10 +11086,10 @@
     }
   },
   "organizationUserDeletedDesc": {
-    "message": "O usuário foi removido da organização e todos os dados de usuários associados foram excluídos."
+    "message": "O usuário foi removido da organização e todos os dados de usuários associados foram apagados."
   },
   "deletedUserIdEventMessage": {
-    "message": "Deleted user $ID$",
+    "message": "Apagou o usuário $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10621,7 +11107,7 @@
     }
   },
   "suspendedOrganizationTitle": {
-    "message": "O $ORGANIZATION$ está suspenso",
+    "message": "A $ORGANIZATION$ está suspensa",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -10636,31 +11122,31 @@
     "message": "Para recuperar o acesso à sua organização, adicione um método de pagamento."
   },
   "deleteMembers": {
-    "message": "Excluir membros"
+    "message": "Apagar membros"
   },
   "noSelectedMembersApplicable": {
     "message": "Esta ação não se aplica a nenhum dos membros selecionados."
   },
   "deletedSuccessfully": {
-    "message": "Excluído com sucesso"
+    "message": "Apagado com sucesso"
   },
   "freeFamiliesSponsorship": {
-    "message": "Remova o patrocínio das famílias do Bitwarden"
+    "message": "Remover financiamento do Bitwarden Famílias grátis"
   },
   "freeFamiliesSponsorshipPolicyDesc": {
-    "message": "Não permita que os membros resgatem um plano de Famílias por meio desta organização."
+    "message": "Não permita que os membros resgatem um plano do Famílias por meio desta organização."
   },
   "verifyBankAccountWithStatementDescriptorWarning": {
-    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Você será obrigado a verificar sua conta bancária. Nós faremos um micro-depósito nos próximos 1-2 dias úteis. Digite o código do descritor da instrução a partir deste depósito na página de faturamento da organização para verificar a conta bancária. A não verificação da conta bancária resultará em um pagamento não atendido e sua assinatura será suspensa."
+    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Você precisará verificar sua conta bancária. Faremos um micro-depósito nos próximos 1-2 dias úteis. Digite o código descritor do extrato deste depósito na página de faturamento da organização para verificar a conta bancária. A falha na verificação da conta bancária resultará em um pagamento atrasado e a sua assinatura será suspensa."
   },
   "verifyBankAccountWithStatementDescriptorInstructions": {
-    "message": "Fizemos um microdepósito em sua conta bancária (isso pode levar 1-2 dias úteis). Digite o código de seis dígitos começando com 'SM' encontrado na descrição de depósito. A não verificação da conta bancária resultará em um pagamento não atendido e sua assinatura será suspensa."
+    "message": "Fizemos um micro-depósito em sua conta bancária (isso pode levar 1-2 dias úteis). Digite o código de seis dígitos começando com 'SM' encontrado na descrição do depósito. A falha da verificação da conta bancária resultará em um pagamento atrasado, e a sua assinatura será suspensa."
   },
   "descriptorCode": {
-    "message": "Código do descritor"
+    "message": "Código descritor"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "Você não pode remover coleções com permissões de Somente leitura: $COLLECTIONS$",
+    "message": "Você não pode remover conjuntos com permissões de Apenas ver: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -10669,7 +11155,7 @@
     }
   },
   "removeMembers": {
-    "message": "Remover membro?"
+    "message": "Remover membros"
   },
   "devices": {
     "message": "Dispositivos"
@@ -10690,16 +11176,16 @@
     "message": "Recuperar domínio"
   },
   "claimDomainNameInputHint": {
-    "message": "Exemplo: meudominio.com. Subdomínios requerem entradas separadas para serem reivindicadas."
+    "message": "Exemplo: meudominio.com. Subdomínios requerem entradas separadas para serem reivindicados."
   },
   "automaticClaimedDomains": {
-    "message": "Domínios Reivindicados Automaticamente"
+    "message": "Domínios reivindicados automaticamente"
   },
   "automaticDomainClaimProcess": {
-    "message": "O Bitwarden tentará reivindicar o domínio 3 vezes durante as primeiras 72 horas. Se o domínio não puder ser reivindicado, verifique o registro DNS no seu host e reivindique manualmente. O domínio será removido da sua organização em 7 dias, se não for reivindicado."
+    "message": "O Bitwarden tentará reivindicar o domínio 3 vezes durante as primeiras 72 horas. Se o domínio não poder ser reivindicado, confira o registro de DNS no seu servidor e reivindique manualmente. Se não for reivindicado, o domínio será removido da sua organização em 7 dias."
   },
   "domainNotClaimed": {
-    "message": "$DOMAIN$ não reivindicado. Verifique seus registros DNS.",
+    "message": "$DOMAIN$ não reivindicado. Confira os seus registros de DNS.",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10714,10 +11200,10 @@
     "message": "Em verificação"
   },
   "claimedDomainsDescription": {
-    "message": "Claim a domain to own member accounts. The SSO identifier page will be skipped during login for members with claimed domains and administrators will be able to delete claimed accounts."
+    "message": "Reivindique um domínio para ser o proprietário das contas dos membros. A página do identificador do SSO será pulada durante a autenticação dos membros com os domínios reivindicados, e os administradores poderão apagar contas reivindicadas."
   },
   "invalidDomainNameClaimMessage": {
-    "message": "Entrada não é um formato válido. Formato: meudominio.com. Subdomínios requerem entradas separadas para serem reivindicados."
+    "message": "A entrada não está em um formato válido. Formato: meudominio.com. Subdomínios requerem entradas separadas a serem reivindicadas."
   },
   "domainClaimedEvent": {
     "message": "$DOMAIN$ reivindicado",
@@ -10738,7 +11224,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForSentSponsorship": {
-    "message": "Se você remover $EMAIL$, o pagamento deste plano Família não poderá ser resgatado. Tem certeza que deseja continuar?",
+    "message": "Se você remover $EMAIL$, o pagamento deste plano familiar não poderá ser resgatado. Tem certeza que deseja continuar?",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10747,7 +11233,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForAcceptedSponsorship": {
-    "message": "Se remover $EMAIL$, o pagamento para este plano Família terminará e o método de pagamento salvo será cobrado por US$ 40 + imposto aplicável em $DATE$. Você não poderá resgatar um novo pagamento até $DATE$. Tem certeza que deseja continuar?",
+    "message": "Se remover $EMAIL$, o financiamento deste plano familiar terminará e o método de pagamento salvo será cobrado por 40$ USD + impostos aplicáveis em $DATE$. Você não poderá resgatar um novo financiamento até $DATE$. Tem certeza que deseja continuar?",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domínio reivindicado"
   },
+  "itemAddedToFavorites": {
+    "message": "Item adicionado aos favoritos"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removido dos favoritos"
+  },
+  "copyNote": {
+    "message": "Copiar anotação"
+  },
   "organizationNameMaxLength": {
     "message": "O nome da organização não pode exceder 50 caracteres."
   },
@@ -10769,55 +11264,55 @@
     "message": "Rotação de chave bem-sucedida"
   },
   "rotationCompletedDesc": {
-    "message": "Sua senha mestra e chave de criptografia foram atualizadas. Seus outros dispositivos foram desconectados."
+    "message": "Sua senha principal e chave de criptografia foram atualizadas. Seus outros dispositivos foram desconectados."
   },
   "trustUserEmergencyAccess": {
     "message": "Confiar e confirmar usuário"
   },
   "trustOrganization": {
-    "message": "Organização de confiança"
+    "message": "Confiar na organização"
   },
   "trust": {
-    "message": "Confiança"
+    "message": "Confiar"
   },
   "doNotTrust": {
     "message": "Não confiar"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organização não é confiada"
   },
   "emergencyAccessTrustWarning": {
-    "message": "Para a segurança de sua conta, só confirme se você concedeu acesso de emergência a este usuário e sua impressão digital corresponde ao que é exibido na conta dele"
+    "message": "Para a segurança da sua conta, apenas confirme que você permitiu o acesso de emergência a esse usuário e se a frase biométrica dele coincide com a que é exibida na conta deles"
   },
   "orgTrustWarning": {
-    "message": "Para a segurança da sua conta, prossiga somente se você for um membro desta organização, tem a recuperação de conta ativada, e a impressão digital exibida abaixo corresponde à impressão digital da organização."
+    "message": "Para a segurança da sua conta, prossiga apenas se você for um membro dessa organização, tem a recuperação de conta ativa, e a frase biométrica exibida abaixo corresponde com a da organização."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Esta organização tem uma política empresarial que lhe inscreverá na recuperação de conta. A inscrição permitirá que os administradores da organização alterem sua senha. Prossiga somente se você reconhecer esta organização e se a frase biométrica exibida abaixo corresponde com a da organização."
   },
   "trustUser": {
     "message": "Confiar no usuário"
   },
   "sshKeyWrongPassword": {
-    "message": "A senha está incorreta."
+    "message": "A senha que você digitou está incorreta."
   },
   "importSshKey": {
     "message": "Importar"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirme a senha"
+    "message": "Confirmar senha"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Insira a senha da chave SSH."
+    "message": "Digite a senha da chave SSH."
   },
   "enterSshKeyPassword": {
-    "message": "Insira a senha"
+    "message": "Digitar senha"
   },
   "invalidSshKey": {
     "message": "A chave SSH é inválida"
   },
   "sshKeyTypeUnsupported": {
-    "message": "O tipo de chave SSH não é compatível"
+    "message": "O tipo de chave SSH não é suportado"
   },
   "importSshKeyFromClipboard": {
     "message": "Importar chave da área de transferência"
@@ -10829,36 +11324,28 @@
     "message": "Copiar chave privada"
   },
   "openingExtension": {
-    "message": "Abrir a extensão do navegador Bitwarden"
+    "message": "Abrindo a extensão de navegador do Bitwarden"
   },
   "somethingWentWrong": {
-    "message": "Ocorreu um problema..."
+    "message": "Algo deu errado..."
   },
   "openingExtensionError": {
-    "message": "Tivemos problemas ao abrir a extensão Bitwarden. Clique no botão para abri-la agora."
+    "message": "Tivemos problemas ao abrir a extensão de navegador do Bitwarden. Clique no botão para abri-la agora."
   },
   "openExtension": {
     "message": "Abrir extensão"
   },
   "doNotHaveExtension": {
-    "message": "Não tem a extensão do Bitwarden?"
+    "message": "Não tem a extensão de navegador do Bitwarden?"
   },
   "installExtension": {
-    "message": "Instalar a extensão"
+    "message": "Instalar extensão"
   },
   "openedExtension": {
-    "message": "Abriu a extensão do navegador"
+    "message": "Extensão de navegador foi aberta"
   },
   "openedExtensionViewAtRiskPasswords": {
-    "message": "A extensão do Bitwarden foi aberta com sucesso. Agora você pode rever suas senhas em risco."
-  },
-  "openExtensionManuallyPart1": {
-    "message": "Tivemos problemas ao abrir a extensão Bitwarden. Abra o ícone do Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "da barra de ferramentas.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
+    "message": "A extensão de navegador do Bitwarden foi aberta com sucesso. Agora você pode revisar suas senhas em risco."
   },
   "resellerRenewalWarningMsg": {
     "message": "Sua assinatura será renovada em breve. Para garantir o serviço sem interrupções, entre em contato com $RESELLER$ para confirmar sua renovação antes de $RENEWAL_DATE$.",
@@ -10874,7 +11361,7 @@
     }
   },
   "resellerOpenInvoiceWarningMgs": {
-    "message": "Uma fatura para sua assinatura foi emitida em $ISSUED_DATE$. Para garantir o serviço ininterrupto, entre em contato com $RESELLER$ para confirmar a sua renovação antes de $DUE_DATE$.",
+    "message": "Uma fatura para sua assinatura foi emitida em $ISSUED_DATE$. Para garantir o serviço sem interrupções, entre em contato com $RESELLER$ para confirmar a sua renovação antes de $DUE_DATE$.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10891,7 +11378,7 @@
     }
   },
   "resellerPastDueWarningMsg": {
-    "message": "A fatura da sua assinatura não foi paga. Para garantir o serviço ininterrupto, entre em contato com $RESELLER$ para confirmar sua renovação antes de $GRACE_PERIOD_END$.",
+    "message": "A fatura da sua assinatura não foi paga. Para garantir o serviço sem interrupções, entre em contato com $RESELLER$ para confirmar sua renovação antes de $GRACE_PERIOD_END$.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10910,7 +11397,7 @@
     "message": "Reinicie sua assinatura"
   },
   "suspendedManagedOrgMessage": {
-    "message": "Entre em contato com $PROVIDER$ para assistência.",
+    "message": "Entre em contato com $PROVIDER$ para ter assistência.",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10919,16 +11406,16 @@
     }
   },
   "accountDeprovisioningNotification": {
-    "message": "Os administradores agora têm a capacidade de excluir contas de membros que pertencem a um domínio reivindicado."
+    "message": "Os administradores agora conseguem apagar contas de membros que pertencem a um domínio reivindicado."
   },
   "deleteManagedUserWarningDesc": {
-    "message": "Esta ação irá excluir a conta de membro, incluindo todos os itens do seu cofre. Isso substitui a ação de Remover anterior."
+    "message": "Esta ação irá apagar a conta do membro, incluindo todos os itens do seu cofre. Isso substitui a ação anterior de Remover."
   },
   "deleteManagedUserWarning": {
-    "message": "Excluir é uma nova ação!"
+    "message": "Apagar é uma nova ação!"
   },
   "seatsRemaining": {
-    "message": "Você tem $REMAINING$ assentos restantes de $TOTAL$ atribuídos a essa organização. Entre em contato com seu provedor para gerenciar sua assinatura.",
+    "message": "Você tem $REMAINING$ vagas restantes das $TOTAL$ atribuídas para esta organização. Entre em contato com seu provedor para gerenciar sua assinatura.",
     "placeholders": {
       "remaining": {
         "content": "$1",
@@ -10944,7 +11431,7 @@
     "message": "Organização existente"
   },
   "selectOrganizationProviderPortal": {
-    "message": "Selecione uma organização para adicionar ao seu Portal do Provedor."
+    "message": "Selecione uma organização para adicionar ao seu portal de provedor."
   },
   "noOrganizations": {
     "message": "Não há organizações para listar"
@@ -10965,10 +11452,10 @@
     "message": "Organização existente adicionada"
   },
   "assignedExceedsAvailable": {
-    "message": "Os assentos atribuídos excedem os disponíveis."
+    "message": "As vagas atribuídas excedem as disponíveis."
   },
   "userkeyRotationDisclaimerEmergencyAccessText": {
-    "message": "Frase de impressão digital para contatos $NUM_USERS$ para os quais você ativou o acesso de emergência.",
+    "message": "A frase biométrica dos $NUM_USERS$ contatos para os quais você ativou o acesso de emergência.",
     "placeholders": {
       "num_users": {
         "content": "$1",
@@ -10977,7 +11464,7 @@
     }
   },
   "userkeyRotationDisclaimerAccountRecoveryOrgsText": {
-    "message": "Frase de impressão digital para a organização $ORG_NAME$ para a qual você ativou a recuperação de conta.",
+    "message": "A frase biométrica da organização $ORG_NAME$ para a qual você ativou a recuperação de conta.",
     "placeholders": {
       "org_name": {
         "content": "$1",
@@ -10986,55 +11473,95 @@
     }
   },
   "userkeyRotationDisclaimerDescription": {
-    "message": "Girar suas chaves de criptografia exigirá que você confie nas chaves de qualquer organização que possa recuperar sua conta, e quaisquer contatos que você ativou o acesso de emergência. Para continuar, certifique-se de que pode verificar o seguinte:"
+    "message": "Rotacionar suas chaves de criptografia exigirá que você confie nas chaves de quaisquer organizações que possam recuperar sua conta, e quaisquer contatos que você ativou o acesso de emergência. Para continuar, certifique-se de que pode verificar o seguinte:"
   },
   "userkeyRotationDisclaimerTitle": {
-    "message": "Chaves criptográficas não confiáveis"
+    "message": "Chaves criptográficas não confiadas"
   },
   "changeAtRiskPassword": {
-    "message": "Alterar senhas vulneráveis"
+    "message": "Alterar senhas em risco"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Esta credencial está em risco e está sem um site. Adicione um site e altere a senha para segurança melhor."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Site ausente"
   },
   "removeUnlockWithPinPolicyTitle": {
-    "message": "Remover desbloqueio com o PIN"
+    "message": "Remover desbloqueio com PIN"
   },
   "removeUnlockWithPinPolicyDesc": {
-    "message": "Não permitir que os membros desbloqueiem sua conta com um PIN."
+    "message": "Não permita que os membros desbloqueiem sua conta com um PIN."
   },
   "upgradeForFullEventsMessage": {
-    "message": "Event logs are not stored for your organization. Upgrade to a Teams or Enterprise plan to get full access to organization event logs."
+    "message": "O registro de eventos não é armazenado para a sua organização. Faça upgrade para um plano Equipes ou Empresarial para ter acesso completo ao registro de eventos da organização."
   },
   "upgradeEventLogTitleMessage": {
-    "message": "Upgrade to see event logs from your organization."
+    "message": "Faça upgrade para ver o registro de eventos da sua organização."
   },
   "upgradeEventLogMessage": {
     "message": "Esses eventos são apenas exemplos e não refletem eventos reais na sua organização do Bitwarden."
   },
   "viewEvents": {
-    "message": "View Events"
+    "message": "Ver eventos"
   },
   "cannotCreateCollection": {
-    "message": "Organizações gratuitas podem ter até duas coleções. Faça o upgrade para um plano pago para adicionar mais coleções."
+    "message": "Organizações gratuitas podem ter até dois conjuntos. Faça upgrade para um plano pago para adicionar mais conjuntos."
   },
   "searchArchive": {
-    "message": "Search archive"
+    "message": "Buscar no arquivo"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Desarquivar"
+  },
+  "itemsInArchive": {
+    "message": "Itens no arquivo"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Nenhum item no arquivo"
   },
-  "archivedItemsDescription": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  "noItemsInArchiveDesc": {
+    "message": "Os itens arquivados aparecerão aqui e serão excluídos dos resultados gerais de busca e das sugestões de preenchimento automático."
+  },
+  "itemWasSentToArchive": {
+    "message": "O item foi enviado para o arquivo"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Itens foram enviados para o arquivo"
+  },
+  "itemUnarchived": {
+    "message": "O item foi desarquivado"
+  },
+  "bulkArchiveItems": {
+    "message": "Itens arquivados"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Itens desarquivados"
+  },
+  "archiveItem": {
+    "message": "Arquivar item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Itens arquivados são excluídos dos resultados gerais de busca e das sugestões de preenchimento automático. Tem certeza de que deseja arquivar este item?"
+  },
+  "archiveBulkItems": {
+    "message": "Arquivar itens",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Itens arquivados são excluídos dos resultados gerais de busca e das sugestões de preenchimento automático. Tem certeza de que deseja arquivar esses itens?"
   },
   "businessUnit": {
-    "message": "Unidades de Negócio"
+    "message": "Unidade de négocio"
   },
   "businessUnits": {
     "message": "Unidades de Negócio"
@@ -11043,135 +11570,146 @@
     "message": "Nova unidade de negócio"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Envie informações sensíveis com segurança",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Compartilhe dados e arquivos com segurança com qualquer pessoa, em qualquer plataforma. Suas informações permanecerão criptografadas de ponta a ponta, limitando a exposição.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Crie senhas de forma rápida"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Crie senhas únicas e fortes com facilidade clicando em",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "para ajudá-lo a manter suas credenciais seguras.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Crie senhas únicas e fortes com facilidade clicando no botão de gerar senha para ajudá-lo a manter suas credenciais seguras.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Economize tempo com o preenchimento automático"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Inclua um",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Site",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "para que esta credencial apareça como uma sugestão de preenchimento automático.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Pagamento on-line simplificado"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Preencha automaticamente formulários de pagamento com cartões de forma segura e precisa."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Simplifique a criação de contas"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Com identidades, preencha formulários de cadastro ou contato longos rapidamente, de forma automática."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Mantenha seus dados sensíveis seguros"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Com anotações, armazene com segurança dados sensíveis como detalhes de informações bancárias ou de seguro."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Acesso SSH amigável para desenvolvedores"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Armazene suas chaves e conecte com o agente SSH para uma autenticação rápida e criptografada.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Saiba mais sobre o agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "setupExtensionPageTitle": {
-    "message": "Autofill your passwords securely with one click"
+    "message": "Autopreencha com segurança as suas senhas com um clique"
   },
   "setupExtensionPageDescription": {
-    "message": "Get the Bitwarden browser extension and start autofilling today"
+    "message": "Baixe a extensão de navegador do Bitwarden e use o preenchimento automático hoje"
   },
   "getTheExtension": {
-    "message": "Get the extension"
+    "message": "Baixar extensão"
   },
   "addItLater": {
-    "message": "Add it later"
+    "message": "Adicionar mais tarde"
   },
   "cannotAutofillPasswordsWithoutExtensionTitle": {
-    "message": "You can't autofill passwords without the browser extension"
+    "message": "Você não pode preencher senhas automaticamente sem a extensão de navegador"
   },
   "cannotAutofillPasswordsWithoutExtensionDesc": {
-    "message": "Are you sure you don't want to add the extension now?"
+    "message": "Você tem certeza de que não quer adicionar a extensão agora?"
   },
   "skipToWebApp": {
-    "message": "Skip to web app"
+    "message": "Ir para o aplicativo web"
   },
   "bitwardenExtensionInstalled": {
-    "message": "Bitwarden extension installed!"
+    "message": "Extensão do Bitwarden instalada!"
+  },
+  "bitwardenExtensionIsInstalled": {
+    "message": "A extensão do Bitwarden está instalada!"
   },
   "openExtensionToAutofill": {
-    "message": "Open the extension to log in and start autofilling."
+    "message": "Abra a extensão, se conecte, e comece a usar o preenchimento automático."
   },
   "openBitwardenExtension": {
-    "message": "Open Bitwarden extension"
+    "message": "Abrir extensão do Bitwarden"
   },
   "gettingStartedWithBitwardenPart1": {
-    "message": "For tips on getting started with Bitwarden visit the",
+    "message": "Para dicas em começar a usar o Bitwarden, visite o",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
   "gettingStartedWithBitwardenPart2": {
-    "message": "Learning Center",
+    "message": "Centro de Aprendizagem",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Se a extensão não abrir, você pode precisar abrir o Bitwarden pelo ícone ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " na barra de ferramentas.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
-    "message": "Help Center",
+    "message": "Central de Ajuda",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
   "setupExtensionContentAlt": {
-    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+    "message": "Com a extensão de navegador do Bitwarden, você pode criar credenciais, acessar suas credenciais salvas diretamente pela barra do seu navegador, e se conectar a contas rapidamente usando o preenchimento automático do Bitwarden."
   },
   "restart": {
-    "message": "Restart"
+    "message": "Reiniciar"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the provider's subscription page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Você precisará verificar sua conta bancária. Faremos um micro-depósito nos próximos 1-2 dias úteis. Digite o código descritor do extrato deste depósito na página de assinatura do provedor para verificar a conta bancária. A falha na verificação da conta bancária resultará em um pagamento atrasado e a sua assinatura será suspensa."
   },
   "clickPayWithPayPal": {
-    "message": "Please click the Pay with PayPal button to add your payment method."
+    "message": "Clique no botão de Pagar com PayPal para adicionar seu método de pagamento."
   },
   "revokeActiveSponsorshipConfirmation": {
-    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "message": "Se remover $EMAIL$, o financiamento deste plano familiar terminará. Uma vaga na sua organização ficará disponível para membros ou financiamentos após a data de renovação da organização financiada em $DATE$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -11184,56 +11722,56 @@
     }
   },
   "billingAddressRequiredToAddCredit": {
-    "message": "Billing address required to add credit.",
+    "message": "O endereço de cobrança é necessário para adicionar créditos.",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "Sobre esta configuração"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "O Bitwarden usará URIs de credenciais salvas para identificar qual ícone ou URL de alteração de senha deverá ser usado para melhorar sua experiência. Nenhuma informação é coletada ou salva quando você utiliza este serviço."
   },
   "billingAddress": {
-    "message": "Billing address"
+    "message": "Endereço de cobrança"
   },
   "addBillingAddress": {
-    "message": "Add billing address"
+    "message": "Adicionar endereço de cobrança"
   },
   "editBillingAddress": {
-    "message": "Edit billing address"
+    "message": "Editar endereço de cobrança"
   },
   "noBillingAddress": {
-    "message": "No address on file."
+    "message": "Nenhum endereço cadastrado."
   },
   "billingAddressUpdated": {
-    "message": "Your billing address has been updated."
+    "message": "Seu endereço de cobrança foi atualizado."
   },
   "paymentDetails": {
-    "message": "Payment details"
+    "message": "Detalhes de pagamento"
   },
   "paymentMethodUpdated": {
-    "message": "Your payment method has been updated."
+    "message": "Seu método de pagamento foi atualizado."
   },
   "bankAccountVerified": {
-    "message": "Your bank account has been verified."
+    "message": "Sua conta bancária foi verificada."
   },
   "availableCreditAppliedToInvoice": {
-    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+    "message": "Qualquer crédito disponível será automaticamente aplicado em faturas geradas para esta conta."
   },
   "mustBePositiveNumber": {
-    "message": "Must be a positive number"
+    "message": "Deve ser um número positivo"
   },
   "cardSecurityCode": {
-    "message": "Card security code"
+    "message": "Código de segurança do cartão"
   },
   "cardSecurityCodeDescription": {
-    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+    "message": "O código de segurança do cartão, também conhecido como CVV ou CVC, normalmente é um número de 3 dígitos impresso no verso do seu cartão de crédito ou um número de 4 dígitos impresso na frente acima do número do seu cartão."
   },
   "verifyBankAccountWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Você precisará verificar sua conta bancária. Faremos um micro-depósito nos próximos 1-2 dias úteis. Digite o código descritor do extrato deste depósito na página de detalhes de pagamento para verificar a conta bancária. A falha na verificação da conta bancária resultará em um pagamento atrasado e a sua assinatura será suspensa."
   },
   "taxId": {
-    "message": "Tax ID: $TAX_ID$",
+    "message": "ID de imposto (Tax ID): $TAX_ID$",
     "placeholders": {
       "tax_id": {
         "content": "$1",
@@ -11242,14 +11780,14 @@
     }
   },
   "unpaidInvoices": {
-    "message": "Unpaid invoices"
+    "message": "Faturas não pagas"
   },
   "unpaidInvoicesForServiceUser": {
-    "message": "Your subscription has not been paid. Contact your provider administrator to restore service to you and your clients.",
+    "message": "Sua assinatura não foi paga. Contate o administrador do seu provedor para restaurar o serviço a você e aos seus clientes.",
     "description": "A message shown in a non-dismissible dialog to service users of unpaid providers."
   },
   "providerSuspended": {
-    "message": "$PROVIDER$ is suspended",
+    "message": "$PROVIDER$ está suspenso",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -11258,11 +11796,11 @@
     }
   },
   "restoreProviderPortalAccessViaCustomerSupport": {
-    "message": "To restore access to your provider portal, contact Bitwarden Customer Support to renew your subscription.",
+    "message": "Para restaurar o acesso ao portal do seu provedor, contacte o suporte ao cliente do Bitwarden para renovar sua assinatura.",
     "description": "A message shown in a non-dismissible dialog to any user of a suspended providers."
   },
   "restoreProviderPortalAccessViaPaymentMethod": {
-    "message": "Your subscription has not been paid. To restore service to you and your clients, add a payment method by $CANCELLATION_DATE$.",
+    "message": "Sua assinatura não foi paga. Para restaurar o serviço a você e aos seus clientes, adicione um método de pagamento até $CANCELLATION_DATE$.",
     "placeholders": {
       "cancellation_date": {
         "content": "$1",
@@ -11272,7 +11810,7 @@
     "description": "A message shown in a non-dismissible dialog to admins of unpaid providers."
   },
   "subscribetoEnterprise": {
-    "message": "Subscribe to $PLAN$",
+    "message": "Assinar o $PLAN$",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -11281,7 +11819,7 @@
     }
   },
   "subscribeEnterpriseSubtitle": {
-    "message": "Your 7-day $PLAN$ trial starts today. Add a payment method now to continue using these features after your trial ends: ",
+    "message": "O seu teste grátis de 7 dias do $PLAN$ começa hoje. Adicione um método de pagamento agora para continuar usando esses recursos quando o teste terminar: ",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -11290,13 +11828,13 @@
     }
   },
   "unlimitedSecretsAndProjects": {
-    "message": "Unlimited secrets and projects"
+    "message": "Segredos e projetos ilimitados"
   },
   "providersubscriptionCanceled": {
-    "message": "Subscription canceled"
+    "message": "Assinatura cancelada"
   },
   "providersubCanceledmessage": {
-    "message": "To resubscribe, contact Bitwarden Customer Support."
+    "message": "Para assinar novamente, entre em contato com o suporte ao cliente do Bitwarden."
   },
   "showMore": {
     "message": "Mostrar mais"
@@ -11305,44 +11843,44 @@
     "message": "Mostrar menos"
   },
   "missingTaxId": {
-    "message": "Missing Tax ID"
+    "message": "ID de imposto (Tax ID) ausente"
   },
   "missingTaxIdWarning": {
-    "message": "Action required: You're missing a Tax ID number in payment details. If a Tax ID is not added, your invoices may include additional tax."
+    "message": "Ação necessária: está faltando o número do ID de imposto (Tax ID) nos detalhes de pagamento. Se um ID de imposto não for adicionado, suas faturas podem incluir impostos adicionais."
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "Mais trilhas",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "addTaxId": {
-    "message": "Add a Tax ID"
+    "message": "Adicione um ID de imposto"
   },
   "missingTaxIdCalloutTitle": {
-    "message": "Action required: Missing Tax ID"
+    "message": "Ação necessária: ID de imposto ausente"
   },
   "missingTaxIdCalloutDescription": {
-    "message": "If a Tax ID is not added, your invoices may include additional tax."
+    "message": "Se um ID de imposto não for adicionado, as suas faturas podem incluir impostos adicionais."
   },
   "unverifiedTaxIdWarning": {
-    "message": "Action required: Your Tax ID number is unverified. If your Tax ID is left unverified, your invoices may include additional tax."
+    "message": "Ação necessária: O número do seu ID de imposto não foi verificado. Se o seu ID de imposto não for verificado, as suas faturas podem incluir impostos adicionais."
   },
   "editTaxId": {
-    "message": "Edit your Tax ID"
+    "message": "Edite seu ID de imposto"
   },
   "unverifiedTaxIdCalloutTitle": {
-    "message": "Tax ID unverified"
+    "message": "ID de imposto não verificado"
   },
   "unverifiedTaxIdCalloutDescription": {
-    "message": "Check your Tax ID to verify the format is correct and there are no typos."
+    "message": "Confira o seu ID de imposto para verificar se o formato está correto e não há erros de digitação."
   },
   "pendingVerification": {
-    "message": "Pending verification"
+    "message": "Verificação pendente"
   },
   "checkInputFormat": {
-    "message": "Check input format for typos."
+    "message": "Confira o formato de entrada por erros de digitação."
   },
   "exampleTaxIdFormat": {
-    "message": "Example $CODE$ format: $EXAMPLE$",
+    "message": "Exemplo do formato de $CODE$: $EXAMPLE$",
     "placeholders": {
       "code": {
         "content": "$1",
@@ -11355,46 +11893,46 @@
     }
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "Confirmar domínio do Key Connector"
   },
   "requiredToVerifyBankAccountWithStripe": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Você precisará verificar sua conta bancária. Faremos um micro-depósito nos próximos 1-2 dias úteis. A falha na verificação da conta bancária resultará em um pagamento atrasado e a sua assinatura será suspensa."
   },
   "verifyBankAccountWithStripe": {
-    "message": "We have made a micro-deposit to your bank account. This may take 1-2 business days. When you see the deposit in your account, you can verify your bank account. Failure to verify your bank account will result in a missed payment and your subscription will be suspended."
+    "message": "Fizemos um micro-depósito em sua conta bancária. Isso pode levar 1-2 dias úteis. Quando ver o depósito na sua conta, você poderá verificar a sua conta bancária. A falha da verificação da conta bancária resultará em um pagamento atrasado, e a sua assinatura será suspensa."
   },
   "verifyNow": {
-    "message": "Verify now."
+    "message": "Verifique agora."
   },
   "additionalStorageGB": {
-    "message": "Additional storage GB"
+    "message": "GB de armazenamento adicional"
   },
   "additionalServiceAccountsV2": {
-    "message": "Additional machine accounts"
+    "message": "Contas de máquina adicionais"
   },
   "secretsManagerSeats": {
-    "message": "Secrets Manager seats"
+    "message": "Vagas do Gerenciador de Segredos"
   },
   "additionalStorage": {
-    "message": "Additional Storage"
+    "message": "Armazenamento adicional"
   },
   "expandPurchaseDetails": {
-    "message": "Expand purchase details"
+    "message": "Expandir detalhes da compra"
   },
   "collapsePurchaseDetails": {
-    "message": "Collapse purchase details"
+    "message": "Recolher detalhes da compra"
   },
   "familiesMembership": {
-    "message": "Families membership"
+    "message": "Assinatura do Famílias"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Segurança on-line completa"
   },
   "planDescFamiliesV2": {
-    "message": "Premium security for your family"
+    "message": "Segurança Premium para a sua família"
   },
   "planDescFreeV2": {
-    "message": "Share with $COUNT$ other user",
+    "message": "Compartilhe com $COUNT$ usuário(s)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11403,37 +11941,37 @@
     }
   },
   "planDescEnterpriseV2": {
-    "message": "Advanced capabilities for any organization"
+    "message": "Capacidades avançadas para qualquer organização"
   },
   "planNameCustom": {
-    "message": "Custom plan"
+    "message": "Plano personalizado"
   },
   "planDescCustom": {
-    "message": "Bitwarden scales with businesses of all sizes to secure passwords and sensitive information. If you're part of a large enterprise, contact sales to request a quote."
+    "message": "O Bitwarden escala com empresas de todos os tamanos para proteger senhas e informações sensíveis. Se faz parte de uma grande empresa, entre em contato com o setor financeiro para solicitar um orçamento."
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "Autenticador integrado"
   },
   "breachMonitoring": {
-    "message": "Breach monitoring"
+    "message": "Monitoramento de vazamentos"
   },
   "andMoreFeatures": {
-    "message": "And more!"
+    "message": "E mais!"
   },
   "secureFileStorage": {
-    "message": "Secure file storage"
+    "message": "Armazenamento seguro de arquivos"
   },
   "familiesUnlimitedSharing": {
-    "message": "Unlimited sharing - choose who sees what"
+    "message": "Compartilhamento ilimitado - escolha quem vê o quê"
   },
   "familiesUnlimitedCollections": {
-    "message": "Unlimited family collections"
+    "message": "Conjuntos familiares ilimitados"
   },
   "familiesSharedStorage": {
-    "message": "Shared storage for important family info"
+    "message": "Armazenamento compartilhado para informações importantes da família"
   },
   "limitedUsersV2": {
-    "message": "Up to $COUNT$ members",
+    "message": "Até $COUNT$ membros",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11442,7 +11980,7 @@
     }
   },
   "limitedCollectionsV2": {
-    "message": "Up to $COUNT$ collections",
+    "message": "Até $COUNT$ conjuntos",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11451,13 +11989,13 @@
     }
   },
   "alwaysFree": {
-    "message": "Always free"
+    "message": "Grátis para sempre"
   },
   "twoSecretsIncluded": {
-    "message": "2 secrets"
+    "message": "2 segredos"
   },
   "projectsIncludedV2": {
-    "message": "$COUNT$ project(s)",
+    "message": "$COUNT$ projeto(s)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11466,13 +12004,13 @@
     }
   },
   "secureItemSharing": {
-    "message": "Secure item sharing"
+    "message": "Compartilhamento seguro de itens"
   },
   "scimSupport": {
-    "message": "SCIM support"
+    "message": "Suporte a SCIM"
   },
   "includedMachineAccountsV2": {
-    "message": "$COUNT$ machine accounts",
+    "message": "$COUNT$ contas de máquina",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11481,21 +12019,160 @@
     }
   },
   "enterpriseSecurityPolicies": {
-    "message": "Enterprise security policies"
+    "message": "Políticas empresariais de segurança"
   },
   "selfHostOption": {
-    "message": "Self-host option"
+    "message": "Opção auto-hospedada"
   },
   "complimentaryFamiliesPlan": {
-    "message": "Complimentary families plan for all users"
+    "message": "Plano de cortesia para famílias de todos os usuários"
   },
   "strengthenCybersecurity": {
-    "message": "Strengthen cybersecurity"
+    "message": "Fortaleça a cibersegurança"
   },
   "boostProductivity": {
-    "message": "Boost productivity"
+    "message": "Aumente a produtividade"
   },
   "seamlessIntegration": {
-    "message": "Seamless integration"
+    "message": "Integração harmoniosa"
+  },
+  "families": {
+    "message": "Famílias"
+  },
+  "upgradeToFamilies": {
+    "message": "Fazer upgrade para o Famílias"
+  },
+  "upgradeToPremium": {
+    "message": "Fazer upgrade para o Premium"
+  },
+  "familiesUpdated": {
+    "message": "Você fez upgrade para o Famílias!"
+  },
+  "taxCalculationError": {
+    "message": "Houve um erro ao calcular o imposto para a sua localização. Tente novamente."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Boas-vindas ao Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Desbloqueie mais recursos de segurança com o Premium, ou comece a compartilhar itens com o Famílias"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Os preços excluem os impostos e são cobrados anualmente."
+  },
+  "organizationNameDescription": {
+    "message": "O nome da sua organização aparecerá nos convites que você enviar para os membros."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continuar sem fazer upgrade"
+  },
+  "upgradeYourPlan": {
+    "message": "Faça upgrade do seu plano"
+  },
+  "upgradeNow": {
+    "message": "Fazer upgrade agora"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completar este formulário criará uma organização do Famílias. Você pode fazer upgrade da sua organização grátis pelo painel de administração."
+  },
+  "upgradeErrorMessage": {
+    "message": "Encontramos um erro ao processar seu upgrade. Tente novamente."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Você tem o plano grátis do Bitwarden"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Faça upgrade para segurança completa"
+  },
+  "viewbusinessplans": {
+    "message": "Ver planos empresariais"
+  },
+  "updateEncryptionSettings": {
+    "message": "Atualizar configurações de criptografia"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Atualize suas configurações de criptografia"
+  },
+  "updateSettings": {
+    "message": "Atualizar configurações"
+  },
+  "algorithm": {
+    "message": "Algoritmo"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Escolha como que o Bitwarden deve criptografar os dados do seu cofre. Todas as opções são seguras, mas métodos mais fortes oferecem proteção melhor - especialmente contra ataques de força bruta. O Bitwarden recomenda a pré-configuração para a maioria dos usuários."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Aumentar os valores acima do padrão melhorará a segurança, mas como resultado, o seu cofre pode demorar mais tempo para ser desbloqueado."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Sobre algoritmos de criptografia"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "O PBKDF2-SHA256 é um método de criptografia bem testado que equilibra a segurança e o desempenho. Bom para todos os usuários."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "O Argon2id oferece uma proteção mais forte contra ataques modernos. É melhor para usuários avançados com dispositivos robustos."
+  },
+  "zipPostalCodeLabel": {
+    "message": "CEP / Código postal"
+  },
+  "cardNumberLabel": {
+    "message": "Número do cartão"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Iniciar teste grátis do Famílias"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Bloquear criação de conta para domínios reivindicados"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Impeça que os usuários criem contas fora da sua organização usando endereços de e-mail de domínios reivindicados."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Um domínio deve ser reivindicado antes de ativar esta política."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Configure um método de desbloqueio para alterar a ação do tempo limite do cofre."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Os requisitos de política empresarial foram aplicados às suas opções de tempo limite"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "O tempo limite do seu cofre excede as restrições estabelecidas pela sua organização."
+  },
+  "neverLockWarning": {
+    "message": "Você tem certeza que deseja usar a opção \"Nunca\"? Ao usar o \"Nunca\", a chave de criptografia do seu cofre é armazenada no seu dispositivo. Se você usar esta opção, deve garantir que mantém seu dispositivo devidamente protegido."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Ação do tempo limite"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Tempo limite da sessão"
+  },
+  "appearance": {
+    "message": "Aparência"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "O tempo limite excede a restrição configurada pela sua organização: máximo de $HOURS$ hora(s) e $MINUTES$ minuto(s)",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Nenhum aplicativo crítico foi selecionado"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Tem certeza que deseja continuar?"
+  },
+  "userVerificationFailed": {
+    "message": "Falha na verificação do usuário."
   }
 }
diff --git a/apps/web/src/locales/pt_PT/messages.json b/apps/web/src/locales/pt_PT/messages.json
index 6f8e4d9c11c..2227710d093 100644
--- a/apps/web/src/locales/pt_PT/messages.json
+++ b/apps/web/src/locales/pt_PT/messages.json
@@ -15,17 +15,20 @@
     "message": "Não há aplicações críticas em risco"
   },
   "accessIntelligence": {
-    "message": "Aceder à informação"
-  },
-  "riskInsights": {
-    "message": "Perceções do risco"
+    "message": "Inteligência de Acesso"
   },
   "passwordRisk": {
     "message": "Risco da palavra-passe"
   },
+  "noEditPermissions": {
+    "message": "Não tem permissão para editar este item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Reveja as palavras-passe em risco (fracas, expostas ou reutilizadas) em todas as aplicações. Selecione as suas aplicações mais críticas para dar prioridade a ações de segurança para os seus utilizadores para resolver as palavras-passe em risco."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Rever credenciais em risco"
+  },
   "dataLastUpdated": {
     "message": "Última atualização dos dados: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Ainda não criou um relatório"
+  },
   "notifiedMembers": {
     "message": "Membros notificados"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Criar nova credencial"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% concluído",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ de $TOTAL$ tarefas de segurança concluídas",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Progresso da alteração da palavra-passe"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Atribuir tarefas aos membros para monitorizar o progresso"
+  },
+  "onceYouReviewApplications": {
+    "message": "Depois de rever as aplicações e marcá-las como críticas, atribua tarefas aos seus membros para que alterem as respetivas palavras-passe."
+  },
+  "sendReminders": {
+    "message": "Enviar lembretes"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Depois de marcar as aplicações como críticas, estas serão apresentadas aqui."
   },
+  "viewAtRiskMembers": {
+    "message": "Ver membros em risco"
+  },
+  "viewAtRiskApplications": {
+    "message": "Ver aplicações em risco"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ de $TOTAL$ aplicações críticas estão em risco devido a palavras-passe em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Aplicações críticas ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "aplicações críticas marcadas"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ aplicações críticas",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ aplicações em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ palavras-passe em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ novas palavras-passe em risco",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Membros notificados ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Não foram encontradas aplicações em $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Não foram encontrados dados"
   },
-  "noAppsInOrgDescription": {
-    "message": "À medida que os utilizadores guardam as credenciais, as aplicações aparecem aqui, mostrando quaisquer palavras-passe em risco. Marque as aplicações críticas e notifique os utilizadores para atualizarem as palavras-passe."
+  "noDataInOrgDescription": {
+    "message": "Importe os dados de início de sessão da sua organização para começar a utilizar a Inteligência de Acesso. Depois disso, poderá:"
+  },
+  "feature1Title": {
+    "message": "Marcar aplicações como críticas"
+  },
+  "feature1Description": {
+    "message": "Isto ajudá-lo-á a eliminar primeiro os riscos nas suas aplicações mais importantes."
+  },
+  "feature2Title": {
+    "message": "Ajude os membros a melhorar a sua segurança"
+  },
+  "feature2Description": {
+    "message": "Atribua aos membros em risco tarefas de segurança orientadas para atualizarem as suas credenciais."
+  },
+  "feature3Title": {
+    "message": "Monitorizar o progresso"
+  },
+  "feature3Description": {
+    "message": "Acompanhe as alterações ao longo do tempo para mostrar as melhorias na segurança."
+  },
+  "noReportsRunTitle": {
+    "message": "Gerar relatório"
+  },
+  "noReportsRunDescription": {
+    "message": "Está pronto para começar a gerar relatórios. Depois de os gerar, poderá:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Não marcou nenhuma aplicação como crítica"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Marcar a app como crítica"
   },
+  "markAsCritical": {
+    "message": "Marcar como crítica"
+  },
+  "applicationsSelected": {
+    "message": "aplicações selecionadas"
+  },
+  "selectApplication": {
+    "message": "Selecionar aplicação"
+  },
+  "unselectApplication": {
+    "message": "Desmarcar aplicação"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Aplicações marcadas como críticas"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ marcadas como críticas",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Falha ao marcar aplicações como críticas"
+  },
   "application": {
     "message": "Aplicação"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Membros em risco"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Membros com acesso de edição a itens em risco para aplicações críticas"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Estes membros têm acesso a itens vulneráveis de aplicações críticas."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Membros com palavras-passe em risco"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Os membros da sua organização serão atribuídos a uma tarefa para alterar palavras-passe vulneráveis. Receberão uma notificação na extensão do Bitwarden do navegador."
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ membros em risco",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Estes membros estão a iniciar sessão em aplicações com palavras-passe fracas, expostas ou reutilizadas."
+  "atRiskMemberDescription": {
+    "message": "Estes membros estão a iniciar sessão em aplicações críticas com palavras-passe fracas, expostas ou reutilizadas."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Estes não são membros que iniciam sessão em aplicações com palavras-passe fracas, expostas ou reutilizadas."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Todas de aplicações"
   },
+  "applicationsNeedingReview": {
+    "message": "Aplicações que necessitam de análise"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Rever novas aplicações"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ novas aplicações",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Analise novas aplicações para marcar como críticas e manter a sua organização segura"
+  },
+  "reviewNow": {
+    "message": "Analisar agora"
+  },
+  "allCaughtUp": {
+    "message": "Tudo em dia!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Não há novas aplicações para rever neste momento"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "A sua organização tem itens guardados para $COUNT$ aplicações",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Reveja as aplicações para proteger os itens mais críticos para a segurança da sua organização"
+  },
+  "reviewApplications": {
+    "message": "Rever aplicações"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Dê prioridade a aplicações críticas"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Selecione quais aplicações são mais críticas para a sua organização. Depois, poderá atribuir tarefas de segurança aos membros para eliminar os riscos."
+  },
+  "reviewNewApplications": {
+    "message": "Rever novas aplicações"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Reveja as novas aplicações com itens vulneráveis e marque como críticas aquelas que pretende monitorizar de perto. Depois, poderá atribuir tarefas de segurança aos membros para eliminar os riscos."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Clique no ícone de estrela para marcar uma app como crítica"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "A funcionalidade marcada como crítica será implementada numa atualização futura"
+  },
+  "applicationReviewSaved": {
+    "message": "Revisão da aplicação guardada"
+  },
+  "newApplicationsReviewed": {
+    "message": "Novas aplicações revistas"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Erro ao guardar o estado da revisão"
+  },
+  "pleaseTryAgain": {
+    "message": "Por favor, tente novamente"
+  },
   "unmarkAsCritical": {
     "message": "Desmarcar como crítica"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoritos"
   },
+  "taskSummary": {
+    "message": "Resumo da tarefa"
+  },
   "types": {
     "message": "Tipos"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Mantenha esta janela aberta e siga as indicações do seu navegador."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Falha na autenticação da chave de acesso. Por favor, tente novamente."
+  },
   "useADifferentLogInMethod": {
     "message": "Utilizar um método de início de sessão diferente"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Utilizar início de sessão único"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "A sua organização exige o início de sessão único."
+  },
   "welcomeBack": {
     "message": "Bem-vindo de volta"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Palavra-passe mestra inválida"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Palavra-passe mestra inválida. Confirme se o seu e-mail está correto e se a sua conta foi criada em $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Palavra-passe de ficheiro inválida, utilize a palavra-passe que introduziu quando criou o ficheiro de exportação."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Não existem itens para listar."
   },
+  "noItemsInTrash": {
+    "message": "Nenhum item no lixo"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Os itens que eliminar aparecerão aqui e serão permanentemente eliminados após 30 dias"
+  },
+  "noItemsInVault": {
+    "message": "Nenhum item no cofre"
+  },
+  "emptyVaultDescription": {
+    "message": "O cofre protege mais do que apenas as suas palavras-passe. Guarde aqui credenciais, IDs, cartões e notas de forma segura."
+  },
+  "emptyFavorites": {
+    "message": "Não adicionou nenhum item aos favoritos"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Adicione itens utilizados frequentemente aos favoritos para um acesso rápido."
+  },
+  "noSearchResults": {
+    "message": "Não foram apresentados resultados de pesquisa"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Limpe os filtros ou tente outro termo de pesquisa"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Não tem permissão para ver todos os itens desta coleção."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Definições da chave de encriptação"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritmo KDF"
-  },
   "kdfIterations": {
     "message": "Iterações KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Iterações KDF mais altas, memória e paralelismo podem ajudar a proteger a sua palavra-passe mestra de ser forçada por um atacante."
   },
-  "changeKdf": {
-    "message": "Alterar KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Definições da chave de encriptação alteradas"
   },
@@ -2798,11 +3043,14 @@
   "makeSureEnoughCredit": {
     "message": "Por favor, certifique-se de que a sua conta tem crédito suficiente disponível para esta compra. Se a sua conta não tiver crédito suficiente disponível, será utilizado o seu método de pagamento predefinido registado para cobrir a diferença. Pode adicionar crédito à sua conta a partir da página de faturação."
   },
+  "notEnoughAccountCredit": {
+    "message": "Não tem crédito suficiente na sua conta para esta compra. Pode adicionar crédito à sua conta na página Faturação."
+  },
   "creditAppliedDesc": {
     "message": "O crédito da sua conta pode ser utilizado para efetuar compras. Qualquer crédito disponível será automaticamente aplicado às faturas geradas para esta conta."
   },
   "goPremium": {
-    "message": "Tornar-se Premium",
+    "message": "Torne-se Premium",
     "description": "Another way of saying \"Get a Premium membership\""
   },
   "premiumUpdated": {
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Próxima cobrança"
   },
+  "nextChargeHeader": {
+    "message": "Próxima cobrança"
+  },
+  "plan": {
+    "message": "Plano"
+  },
   "details": {
     "message": "Detalhes"
   },
+  "discount": {
+    "message": "desconto"
+  },
   "downloadLicense": {
     "message": "Transferir licença"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Atualizar navegador"
   },
-  "generatingYourRiskInsights": {
-    "message": "A gerar as suas perceções de riscos..."
+  "generatingYourAccessIntelligence": {
+    "message": "A gerar a sua Inteligência de Acesso..."
+  },
+  "fetchingMemberData": {
+    "message": "A obter dados dos membros..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "A analisar a segurança da palavra-passe..."
+  },
+  "calculatingRiskScores": {
+    "message": "A calcular pontuações de risco..."
+  },
+  "generatingReportData": {
+    "message": "A gerar dados do relatório..."
+  },
+  "savingReport": {
+    "message": "A guardar relatório..."
+  },
+  "compilingInsights": {
+    "message": "A compilar insights..."
+  },
+  "loadingProgress": {
+    "message": "A carregar progresso"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Isto pode demorar alguns minutos."
+  },
+  "riskInsightsRunReport": {
+    "message": "Executar relatório"
   },
   "updateBrowserDesc": {
     "message": "Está a utilizar um navegador web não suportado. O cofre web pode não funcionar corretamente."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Convite aceite"
   },
-  "inviteAcceptedDesc": {
-    "message": "Pode aceder a esta organização quando um administrador confirmar a sua inscrição. Enviar-lhe-emos um e-mail quando tal acontecer."
+  "invitationAcceptedDesc": {
+    "message": "O seu convite foi aceite com sucesso."
   },
   "inviteInitAcceptedDesc": {
     "message": "Já pode aceder a esta organização."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organização suspensa"
   },
+  "organizationIsSuspended": {
+    "message": "A organização está suspensa"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Não é possível aceder aos itens de organizações suspensas. Contacte o proprietário da organização para obter assistência."
+  },
   "secretsAccessSuspended": {
     "message": "Não é possível aceder a organizações suspensas. Por favor, contacte o proprietário da organização para obter assistência."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "As contas de serviço não podem ser criadas em organizações suspensas. Por favor, contacte o proprietário da organização para obter assistência."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Não é possível aceder aos itens de organizações suspensas. Contacte o proprietário da organização para obter assistência."
-  },
   "licenseIsExpired": {
     "message": "A licença expirou."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Identificador SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Forneça este ID aos seus membros para iniciarem sessão com o SSO. Para ignorar este passo, configure a ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Forneça este ID aos seus membros para iniciarem sessão com o SSO. Os membros podem ignorar a introdução deste identificador durante o SSO se estiver configurado um domínio reivindicado. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Saiba mais",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Desvincular SSO"
@@ -5518,9 +5809,9 @@
     "message": "Exigir que todos os itens sejam propriedade de uma organização, removendo a opção de armazenar itens ao nível da conta.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Todos os itens pertencerão e serão guardados na organização, permitindo controlos, visibilidade e relatórios para toda a organização. Quando ativada, estará disponível uma coleção predefinida para cada membro armazenar itens. Saiba mais sobre como gerir o ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "Todos os itens passarão a ser propriedade da organização e serão aí guardados, permitindo controlos, visibilidade e relatórios a nível organizacional. Quando esta opção estiver ativa, ficará disponível uma coleção predefinida para cada membro guardar itens. Saiba mais sobre a gestão do ",
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "ciclo de vida das credenciais",
@@ -5545,6 +5836,65 @@
     "message": "Saiba mais sobre o ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Já disponível"
+  },
+  "autoConfirm": {
+    "message": "Confirmação automática de novos utilizadores"
+  },
+  "autoConfirmDescription": {
+    "message": "Os novos utilizadores convidados para a organização serão automaticamente confirmados quando o dispositivo de um administrador for desbloqueado.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Como ativar a confirmação automática do utilizador"
+  },
+  "autoConfirmExtension1": {
+    "message": "Abra a sua extensão Bitwarden"
+  },
+  "autoConfirmExtension2": {
+    "message": "Selecione",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Ativar",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "A extensão do navegador Bitwarden foi aberta com sucesso. Agora pode ativar a configuração de confirmação automática do utilizador."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Os novos utilizadores convidados para a organização serão automaticamente confirmados quando o dispositivo de um administrador for desbloqueado. Antes de ativar esta política, reveja e concorde com o seguinte: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potencial risco de segurança. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "A confirmação automática do utilizador pode representar um risco de segurança para os dados da sua organização."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Saiba mais sobre os riscos",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "É necessária uma política de organização única. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Todos os membros devem pertencer exclusivamente a esta organização para ativar esta automação."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "A política de organização única será estendida a todos os papéis. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Sem acesso de emergência. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "O acesso de emergência será removido."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Aceito estes riscos e atualizações da política"
+  },
   "personalOwnership": {
     "message": "Remover cofre pessoal"
   },
@@ -5597,6 +5947,19 @@
     "message": "Mostrar sempre o endereço de e-mail do membro com os destinatários ao criar ou editar um Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Deteção de correspondência de URI predefinida"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine quando as credenciais são sugeridas para preenchimento automático. Administradores e proprietários estão isentos desta política."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Deteção de correspondência de URI predefinida"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Por favor, selecione uma opção válida de deteção de correspondência de URI.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Política $ID$ modificada.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "A sua palavra-passe mestra não cumpre uma ou mais políticas da sua organização. Para aceder ao cofre, tem de atualizar a sua palavra-passe mestra agora. Ao prosseguir, terminará a sua sessão atual e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora."
   },
-  "automaticAppLogin": {
-    "message": "Iniciar automaticamente a sessão dos utilizadores nas aplicações permitidas"
+  "automaticAppLoginWithSSO": {
+    "message": "Início de sessão automático com SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Os formulários de início de sessão serão automaticamente preenchidos e submetidos para aplicações lançadas a partir do seu fornecedor de identidade configurado."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Estenda a segurança e a conveniência do SSO para apps não geridas. Quando os utilizadores iniciam uma aplicação a partir do seu fornecedor de identidade, as suas credenciais são preenchidas e enviadas automaticamente, criando um fluxo seguro com um clique do fornecedor de identidade para a app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Anfitrião do fornecedor de identidade"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "A sua organização atualizou as opções de desencriptação. Por favor, defina uma palavra-passe mestra para aceder ao seu cofre."
   },
-  "maximumVaultTimeout": {
-    "message": "Tempo limite do cofre"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Tempo limite da sessão"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Definir um tempo limite máximo do cofre para os membros."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Defina um tempo limite máximo de sessão para todos os membros, exceto proprietários."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Tempo limite máximo do cofre"
+  "maximumAllowedTimeout": {
+    "message": "Tempo limite máximo permitido"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Tempo limite máximo do cofre inválido."
+  "maximumAllowedTimeoutRequired": {
+    "message": "É necessário o tempo limite máximo permitido."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "O tempo é inválido. Altere pelo menos um valor."
+  },
+  "sessionTimeoutAction": {
+    "message": "Ação de tempo limite da sessão"
+  },
+  "immediately": {
+    "message": "Imediatamente"
+  },
+  "onSystemLock": {
+    "message": "Ao bloquear o sistema"
+  },
+  "onAppRestart": {
+    "message": "Ao reiniciar a app"
   },
   "hours": {
     "message": "Horas"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutos"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Tem a certeza de que deseja permitir um tempo limite máximo de \"Nunca\" para todos os membros?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Esta opção guardará as chaves de encriptação dos seus membros nos seus dispositivos. Se escolher esta opção, certifique-se de que os dispositivos deles estão adequadamente protegidos."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Saiba mais sobre a proteção de dispositivos"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "O \"bloqueio do sistema\" só se aplicará ao navegador e à app para computador"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "A app móvel e Web utilizará \"ao reiniciar a app\" como o tempo limite máximo permitido, uma vez que a opção não é suportada."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "As políticas da sua organização definiram o tempo limite máximo permitido do cofre de $HOURS$ hora(s) e $MINUTES$ minuto(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Deve adicionar o URL do servidor de base ou pelo menos um ambiente personalizado."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Os URLs devem usar HTTPS."
+  },
   "apiUrl": {
     "message": "URL do servidor da API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado a $ORGANIZATION$ será exportado.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Apenas o cofre da organização associado a $ORGANIZATION$ será exportado. As coleções dos meus itens não serão incluídas.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Acesso negado. Não tem permissão para ver esta página."
   },
+  "noPageAccess": {
+    "message": "Não tem acesso a esta página"
+  },
   "masterPassword": {
     "message": "Palavra-passe mestra"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Segredo desconhecido, poderá ser necessário pedir autorização para aceder a este segredo."
   },
+  "unknownServiceAccount": {
+    "message": "Conta automática desconhecida, poderá precisar de pedir autorização para aceder a esta conta automática."
+  },
   "unknownProject": {
     "message": "Projeto desconhecido, poderá ser necessário pedir autorização para aceder a este projeto."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grupo/Utilizador"
   },
-  "lowKdfIterations": {
-    "message": "Iterações KDF baixas"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Atualize as suas definições de encriptação para cumprir as novas recomendações de segurança e melhorar a proteção da conta."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Ao prosseguir, sairá de todas as sessões ativas. Terá de voltar a iniciar sessão e concluir a verificação de dois passos, caso exista. Recomendamos que exporte o seu cofre antes de alterar as definições de encriptação para evitar a perda de dados."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Acedeu a um projeto com o ID: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Acedeu a um projeto com o identificador: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "ID da conta automática eliminada: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Editou um projeto com o identificador: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Utilizador adicionado: $USER_ID$ à conta automática com o identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Utilizador removido: $USER_ID$ da conta automática com o identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Grupo removido: $GROUP_ID$ da conta automática com o identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Conta automática criada com o identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Grupo adicionado: $GROUP_ID$ à conta automática com o identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Conta automática eliminada com o identificador: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Eliminou um projeto com o identificador: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Sessão iniciada!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Atribuir acesso à coleção"
   },
@@ -9330,6 +9820,14 @@
     "message": "Demasiado caro",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "A passar para o plano gratuito",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "A passar para uma organização gratuita",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Gratuito durante 1 ano"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Atribuir"
   },
+  "assignTasks": {
+    "message": "Atribuir tarefas"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Enviar notificações para alterar palavras-passe"
+  },
   "assignToCollections": {
     "message": "Atribuir às coleções"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Enviar dados de eventos para a sua instância Logscale"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Envie dados de eventos do cofre para a sua instância da Datadog"
+  },
   "failedToSaveIntegration": {
     "message": "Falha ao guardar a integração. Por favor, tente novamente mais tarde."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Precisa de ser o proprietário da organização para executar esta ação."
+  },
   "failedToDeleteIntegration": {
     "message": "Falha ao eliminar a integração. Por favor, tente novamente mais tarde."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Baixa quantidade de iterações do KDF. Aumente as suas iterações para melhorar a segurança da sua conta."
-  },
-  "changeKDFSettings": {
-    "message": "Alterar as definições do KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Proteja a sua infraestrutura"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Desativado"
   },
-  "higherKDFIterations": {
-    "message": "Iterações KDF mais altas podem ajudar a proteger a sua palavra-passe mestra de ser forçada por um atacante."
-  },
-  "incrementsOf100,000": {
-    "message": "incrementos de 100.000"
-  },
-  "smallIncrements": {
-    "message": "pequenos incrementos"
-  },
   "kdfIterationRecommends": {
     "message": "Recomendamos 600.000 ou mais"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Para dispositivos mais antigos, definir um KDF demasiado alto pode levar a problemas de desempenho. Aumente o valor em $VALUE$ e teste os seus dispositivos.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contacte o Apoio ao Cliente para restabelecer a sua subscrição."
   },
@@ -10288,7 +10774,7 @@
     "message": "Saiba mais sobre as iterações do KDF"
   },
   "learnMoreAboutLocalization": {
-    "message": "Saiba mais sobre a localização"
+    "message": "Saiba mais sobre a tradução"
   },
   "learnMoreAboutWebsiteIcons": {
     "message": "Saiba mais sobre a utilização de ícones de sites"
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domínio reivindicado"
   },
+  "itemAddedToFavorites": {
+    "message": "Item adicionado aos favoritos"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removido dos favoritos"
+  },
+  "copyNote": {
+    "message": "Copiar nota"
+  },
   "organizationNameMaxLength": {
     "message": "O nome da organização não pode exceder 50 caracteres."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Abriu com sucesso a extensão de navegador Bitwarden. Pode agora rever as suas palavras-passe em risco."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Tivemos problemas ao abrir a extensão de navegador Bitwarden. Abra o ícone do Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "da barra de ferramentas.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "A sua subscrição será renovada em breve. Para garantir um serviço ininterrupto, contacte a $RESELLER$ para confirmar a sua renovação antes de $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Procurar no arquivo"
   },
-  "archive": {
-    "message": "Arquivar"
+  "archiveNoun": {
+    "message": "Arquivo",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arquivar",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Desarquivar"
+  },
+  "itemsInArchive": {
+    "message": "Itens no arquivo"
   },
   "noItemsInArchive": {
     "message": "Nenhum item no arquivo"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Os itens arquivados aparecerão aqui e serão excluídos dos resultados gerais da pesquisa e das sugestões de preenchimento automático."
   },
+  "itemWasSentToArchive": {
+    "message": "O item foi movido para o arquivo"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Os itens foram movidos para o arquivo"
+  },
+  "itemUnarchived": {
+    "message": "O item foi desarquivado"
+  },
+  "bulkArchiveItems": {
+    "message": "Itens arquivados"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Itens desarquivados"
+  },
+  "archiveItem": {
+    "message": "Arquivar item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Os itens arquivados são excluídos dos resultados gerais da pesquisa e das sugestões de preenchimento automático. Tem a certeza de que pretende arquivar este item?"
+  },
+  "archiveBulkItems": {
+    "message": "Arquivar itens",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Os itens arquivados são excluídos dos resultados gerais da pesquisa e das sugestões de preenchimento automático. Tem a certeza de que pretende arquivar estes itens?"
+  },
   "businessUnit": {
     "message": "Unidade de negócio"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Extensão Bitwarden instalada!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "A extensão Bitwarden está instalada!"
+  },
   "openExtensionToAutofill": {
     "message": "Abra a extensão para iniciar sessão e começar o preenchimento automático."
   },
@@ -11154,6 +11684,14 @@
     "message": "Centro de aprendizagem",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Se a extensão não tiver sido aberta, poderá ter de abrir o Bitwarden através do ícone ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " na barra de ferramentas.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Centro de ajuda",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Integração perfeita"
+  },
+  "families": {
+    "message": "Familiar"
+  },
+  "upgradeToFamilies": {
+    "message": "Atualizar para o Familiar"
+  },
+  "upgradeToPremium": {
+    "message": "Atualizar para o Premium"
+  },
+  "familiesUpdated": {
+    "message": "Atualizou para o Familiar!"
+  },
+  "taxCalculationError": {
+    "message": "Ocorreu um erro ao calcular o imposto para a sua localização. Por favor, tente novamente."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Bem-vindo ao Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Desbloqueie mais funcionalidades de segurança com o Premium ou comece a partilhar itens com o Familiar"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Os preços não incluem impostos e são cobrados anualmente."
+  },
+  "organizationNameDescription": {
+    "message": "O nome da sua organização aparecerá nos convites que enviar aos membros."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continuar sem atualizar"
+  },
+  "upgradeYourPlan": {
+    "message": "Atualize o seu plano"
+  },
+  "upgradeNow": {
+    "message": "Atualizar agora"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Ao preencher este formulário, será criada uma nova organização Familiar. Pode atualizar a sua organização gratuita a partir da Consola de administração."
+  },
+  "upgradeErrorMessage": {
+    "message": "Ocorreu um erro durante o processamento da sua atualização. Por favor, tente novamente."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Tem o plano gratuito do Bitwarden"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Atualize para obter segurança total"
+  },
+  "viewbusinessplans": {
+    "message": "Ver planos empresariais"
+  },
+  "updateEncryptionSettings": {
+    "message": "Atualizar definições de encriptação"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Atualize as suas definições de encriptação"
+  },
+  "updateSettings": {
+    "message": "Atualizar definições"
+  },
+  "algorithm": {
+    "message": "Algoritmo"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Escolha como o Bitwarden deve encriptar os dados do seu cofre. Todas as opções são seguras, mas métodos mais fortes oferecem melhor proteção, especialmente contra ataques de força bruta. O Bitwarden recomenda a configuração predefinida para a maioria dos utilizadores."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Aumentar os valores acima do predefinido melhorará a segurança, mas o seu cofre poderá demorar mais tempo a desbloquear como resultado."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Sobre algoritmos de encriptação"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "O PBKDF2-SHA256 é um método de encriptação bem testado que equilibra segurança e desempenho. Adequado para todos os utilizadores."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "O Argon2id oferece uma proteção mais forte contra ataques modernos. Ideal para utilizadores avançados com dispositivos potentes."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Código postal"
+  },
+  "cardNumberLabel": {
+    "message": "Número do cartão"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Comece o teste gratuito do plano Familiar"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Bloquear a criação de contas para domínios reclamados"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Impedir que os utilizadores criem contas fora da sua organização utilizando endereços de e-mail de domínios reclamados."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Um domínio tem de ser reclamado antes de ativar esta política."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Configure um método de desbloqueio para alterar a ação de tempo limite do seu cofre."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Os requisitos da política empresarial foram aplicados às suas opções de tempo limite"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "O tempo limite do seu cofre excede as restrições definidas pela sua organização."
+  },
+  "neverLockWarning": {
+    "message": "Tem a certeza de que deseja utilizar a opção \"Nunca\"? Ao definir as opções de bloqueio para \"Nunca\" armazena a chave de encriptação do seu cofre no seu dispositivo. Se utilizar esta opção deve assegurar-se de que mantém o seu dispositivo devidamente protegido."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Ação de tempo limite"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Tempo limite da sessão"
+  },
+  "appearance": {
+    "message": "Aspeto"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "O tempo limite excede a restrição definida pela sua organização: $HOURS$ hora(s) e $MINUTES$ minuto(s) no máximo",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Não foram selecionadas aplicações críticas"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Tem a certeza de que deseja continuar?"
+  },
+  "userVerificationFailed": {
+    "message": "Falha na verificação do utilizador."
   }
 }
diff --git a/apps/web/src/locales/ro/messages.json b/apps/web/src/locales/ro/messages.json
index 364e7f86e64..c3c2b7d9c4b 100644
--- a/apps/web/src/locales/ro/messages.json
+++ b/apps/web/src/locales/ro/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Risc Parola"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Membri notificați"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Marchează aplicația drept critică"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Aplicații marcate drept critice"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Aplicație"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Toate aplicațiile"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorite"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tipuri"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Păstrează această fereastră deschisă și urmează instrucțiunile din browser-ul tău."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Folosiți o metodă diferită de autentificare"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Autentificare unică"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Bine ați revenit!"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Parolă principală incorectă"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Parola fișierului nu este validă, utilizați parola introdusă atunci când ați creat fișierul de export."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Niciun articol de afișat."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Setări cheie de criptare"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritm KDF"
-  },
   "kdfIterations": {
     "message": "Iterații KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Modificare KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Setările cheii de criptare salvate"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Vă rugăm să vă asigurați că aveți suficient credit disponibil în cont pentru această achiziție. Dacă nu aveți suficient credit în cont, metoda dvs. implicită de plată înregistrată va fi folosită pentru diferență. Puteți adăuga credit în contul dvs. din pagina Facturare."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Creditul contului dvs. se poate utiliza pentru a face cumpărături. Orice credit disponibil va fi aplicat automat pentru facturile generate pentru acest cont."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Următoarea plată"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detalii"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Descărcare licență"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Actualizare browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Utilizați un browser nesuportat. Seiful web ar putea să nu funcționeze corect."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitație acceptată"
   },
-  "inviteAcceptedDesc": {
-    "message": "Puteți accesa această organizație după ce un administrator vă confirmă abonamentul. Vă vom trimite un e-mail  când se întâmplă acest lucru."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organizație suspendată"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Articolele din organizațiile suspendate nu pot fi accesate. Contactați proprietarul organizației pentru asistență."
-  },
   "licenseIsExpired": {
     "message": "Licența a expirat."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Deconectare SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Înlăturați seiful personal"
   },
@@ -5597,6 +5947,19 @@
     "message": "Afișați întotdeauna adresa de e-mail a membrului împreună cu destinatarii atunci când creați sau editați un Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Politica $ID$ a fost editată.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Timp de expirare seif"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Setează un timp de expirare maxim a seifului pentru membri."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Timpul maxim de expirare a seifului"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Timpul maxim de expirare a seifului invalid."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Ore"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minute"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Politicile organizației afectează timpul de expirare a seifului. Timpul maxim de expirare a seifului este de $HOURS$ oră(e) și $MINUTES$ minut(e)",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Acces refuzat. Nu aveți permisiunea de a vizualiza această pagină."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Parola principală"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json
index 753b5745f36..c1b2e3f1dc1 100644
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
@@ -12,19 +12,22 @@
     "message": "Критичные приложения"
   },
   "noCriticalAppsAtRisk": {
-    "message": "Никакие критически важные приложения не подвергаются риску"
+    "message": "Никакие критичные приложения не подвергаются риску"
   },
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Информация о рисках"
-  },
   "passwordRisk": {
     "message": "Риск пароля"
   },
+  "noEditPermissions": {
+    "message": "У вас нет разрешения на редактирование этого элемента"
+  },
   "reviewAtRiskPasswords": {
-    "message": "Проанализируйте пароли, подверженные риску (слабые, скомпрометированные или повторно используемые), во всех приложениях. Выберите наиболее важные приложения, чтобы определить приоритетные меры безопасности для пользователей, направленные на устранение подверженных риску паролей."
+    "message": "Проанализируйте пароли, подверженные риску (слабые, скомпрометированные или повторно используемые), во всех приложениях. Выберите наиболее критичные приложения, чтобы определить приоритетные меры безопасности для пользователей, направленные на устранение подверженных риску паролей."
+  },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Обзор логинов, подверженных риску"
   },
   "dataLastUpdated": {
     "message": "Последнее обновление: $DATE$",
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Вы еще не создали отчет"
+  },
   "notifiedMembers": {
     "message": "Уведомленные участники"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "Создать новый логин"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "Завершено: $PERCENT$%",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "Завершено $COUNT$ из $TOTAL$ задач безопасности",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Прогресс смены пароля"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Назначайте членам команды задачи по мониторингу прогресса"
+  },
+  "onceYouReviewApplications": {
+    "message": "После того как вы просмотрите приложения и отметите их как критичные, назначьте своим пользователям задачи по смене паролей."
+  },
+  "sendReminders": {
+    "message": "Отправить напоминания"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Как только вы пометите приложения как критичные, они отобразятся здесь."
+  },
+  "viewAtRiskMembers": {
+    "message": "Просмотр участников подверженных риску"
+  },
+  "viewAtRiskApplications": {
+    "message": "Просмотр приложений, подверженных риску"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ из $TOTAL$ критичных приложений подвержены риску из-за уязвимых паролей",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "Критичные приложения ($COUNT$)",
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "критичные приложения помечены"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "$COUNT$ критичных приложений",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ приложений, подверженных риску",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ паролей, подверженных риску",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ новых паролей, подверженных риску",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Уведомленные участники ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Не найдено приложений в $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Данные не найдены"
   },
-  "noAppsInOrgDescription": {
-    "message": "По мере сохранения пользователями логинов, здесь отображаются приложения, с подверженными риску паролями. Отметьте критичные приложения и уведомите пользователей об необходимости обновления пароля."
+  "noDataInOrgDescription": {
+    "message": "Импортируйте данные логинов вашей организации, чтобы начать работу с Access Intelligence. Как только вы это сделаете, вы сможете:"
+  },
+  "feature1Title": {
+    "message": "Пометить приложения как критичные"
+  },
+  "feature1Description": {
+    "message": "Это поможет вам в первую очередь устранить риски для ваших наиболее важных приложений."
+  },
+  "feature2Title": {
+    "message": "Помогите пользователями повысить безопасность"
+  },
+  "feature2Description": {
+    "message": "Назначайте участникам, находящимся в группе риска, управляемые задачи по обеспечению безопасности для обновления учетных данных."
+  },
+  "feature3Title": {
+    "message": "Отслеживать прогресс"
+  },
+  "feature3Description": {
+    "message": "Отслеживать изменения с течением времени, чтобы показать улучшения безопасности."
+  },
+  "noReportsRunTitle": {
+    "message": "Создать отчет"
+  },
+  "noReportsRunDescription": {
+    "message": "Вы готовы приступить к созданию отчетов. После создания вы сможете:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Вы не отметили ни одного приложения в качестве критичного"
@@ -111,10 +218,34 @@
     "message": "Выбрать критичные приложения"
   },
   "markAppAsCritical": {
-    "message": "Пометить приложение как критическое"
+    "message": "Пометить приложение как критичное"
+  },
+  "markAsCritical": {
+    "message": "Пометить как критичное"
+  },
+  "applicationsSelected": {
+    "message": "приложений выбрано"
+  },
+  "selectApplication": {
+    "message": "Выбрать приложение"
+  },
+  "unselectApplication": {
+    "message": "Снять выбор с приложения"
   },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Приложения помечены как критические"
+    "message": "Приложения помечены как критичные"
+  },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "Помечены как критичные приложений: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Не удалось пометить приложения как критичные"
   },
   "application": {
     "message": "Приложение"
@@ -132,13 +263,19 @@
     "message": "Поиск приложений"
   },
   "atRiskMembers": {
-    "message": "Участники группы риска"
+    "message": "Участники, подверженные риску"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "Эти пользователи имеют доступ к уязвимым элементам критичных приложений."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Пользователи, пароли которых подверженны риску"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Сотрудникам вашей организации будет поручено изменить уязвимые пароли. Они получат уведомление в своем расширении Bitwarden для браузера."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ участников, подверженных риску",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -147,7 +284,7 @@
     }
   },
   "atRiskMembersWithCount": {
-    "message": "Пользователи повышенного риска ($COUNT$)",
+    "message": "Участники, подверженные риску ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -156,7 +293,7 @@
     }
   },
   "atRiskApplicationsWithCount": {
-    "message": "Приложения с повышенным риском ($COUNT$)",
+    "message": "Приложения, подверженные риску ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Эти пользователи входят в приложения со слабыми, скомпрометированными или повторно используемыми паролями."
+  "atRiskMemberDescription": {
+    "message": "Эти пользователи входят в критичные приложения со слабыми, скомпрометированными или повторно используемыми паролями."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Нет пользователей, входящих в приложения со слабыми, скомпрометированными или повторно используемыми паролями."
@@ -198,13 +335,85 @@
     "message": "Всего участников"
   },
   "atRiskApplications": {
-    "message": "Приложения повышенного риска"
+    "message": "Приложения, подверженные риску"
   },
   "totalApplications": {
     "message": "Всего приложений"
   },
+  "applicationsNeedingReview": {
+    "message": "Приложения, требующие проверки"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Обзор новых приложений"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ новых приложений",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Проверяйте новые приложения, чтобы пометить их как критичные и обеспечить защиту вашей организации"
+  },
+  "reviewNow": {
+    "message": "Проверить сейчас"
+  },
+  "allCaughtUp": {
+    "message": "Все сделано!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "На данный момент новых приложений для рассмотрения нет"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "В вашей организации есть элементы, сохраненные для $COUNT$ приложений",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Просмотрите приложения, чтобы защитить элементы, наиболее критичные для безопасности вашей организации"
+  },
+  "reviewApplications": {
+    "message": "Обзор приложений"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Приоритет критичных приложений"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Выберите, какие приложения наиболее критичны для вашей организации. Затем вы сможете назначить пользователям задачи по обеспечению безопасности по устранению рисков."
+  },
+  "reviewNewApplications": {
+    "message": "Обзор новых приложений"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Просмотрите новые приложения, содержащие уязвимые элементы, и отметьте те, за которыми вы хотели бы внимательно следить, как критичные. После этого вы сможете назначать пользователям задачи по обеспечению безопасности для устранения рисков."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Нажмите на значок звездочки, чтобы отметить приложение как критичное"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Функционал отметки как критического будет реализован в будущем обновлении"
+  },
+  "applicationReviewSaved": {
+    "message": "Обзор приложения сохранен"
+  },
+  "newApplicationsReviewed": {
+    "message": "Рассмотрены новые заявки"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Ошибка сохранения статуса обзора"
+  },
+  "pleaseTryAgain": {
+    "message": "Попробуйте еще раз"
+  },
   "unmarkAsCritical": {
-    "message": "Снять отметку критического"
+    "message": "Снять отметку критичного"
   },
   "criticalApplicationUnmarkedSuccessfully": {
     "message": "Приложение больше не является критичным"
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Избранные"
   },
+  "taskSummary": {
+    "message": "Сводка по задаче"
+  },
   "types": {
     "message": "Типы элементов"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Не закрывайте это окно и следуйте запросам браузера."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Не удалось выполнить аутентификацию с помощью passkey. Попробуйте еще раз."
+  },
   "useADifferentLogInMethod": {
     "message": "Использовать другой способ авторизации"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Использовать единый вход"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Ваша организация требует единого входа."
+  },
   "welcomeBack": {
     "message": "С возвращением"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Неверный мастер-пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неверный мастер-пароль. Подтвердите, что ваш адрес email указан верно и ваш аккаунт был создан на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Неверный пароль к файлу. Используйте пароль, введенный при создании файла экспорта."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Нет элементов для отображения."
   },
+  "noItemsInTrash": {
+    "message": "Нет элементов в корзине"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Элементы, которые вы удаляете, появятся здесь и будут удалены навсегда через 30 дней"
+  },
+  "noItemsInVault": {
+    "message": "В хранилище нет элементов"
+  },
+  "emptyVaultDescription": {
+    "message": "Хранилище защищает не только ваши пароли. Логины, идентификаторы, карты и заметки в нем надежно защищены."
+  },
+  "emptyFavorites": {
+    "message": "В избранном нет элементов"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Добавляйте часто используемые элементы в избранное для быстрого доступа."
+  },
+  "noSearchResults": {
+    "message": "Поиск не дал результатов"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Очистите фильтры или попробуйте другой поисковый запрос"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "У вас нет разрешения на просмотр всех элементов этой коллекции."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Настройки ключа шифрования"
   },
-  "kdfAlgorithm": {
-    "message": "Алгоритм KDF"
-  },
   "kdfIterations": {
     "message": "Итерации KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Увеличение числа итераций KDF, памяти и параллелизма может помочь защитить ваш мастер-пароль от взлома его злоумышленником."
   },
-  "changeKdf": {
-    "message": "Изменить KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Настройки ключа шифрования сохранены"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Убедитесь, что на вашем счету достаточно средств для этой покупки. Если на вашем счете недостаточно средств, то для покрытия разницы будет использован ваш метод оплаты по умолчанию. Вы можете добавить денежные средства в свой аккаунт на странице оплаты."
   },
+  "notEnoughAccountCredit": {
+    "message": "У вас недостаточно средств для этой покупки. Вы можете сделать пополнение на странице выставления счета."
+  },
   "creditAppliedDesc": {
     "message": "Средства на вашем счете могут быть использованы для совершения платежей. Любой доступный остаток будет автоматически использован для оплаты счетов, выставленных этому аккаунту."
   },
@@ -2900,10 +3148,10 @@
     }
   },
   "showPricingSummary": {
-    "message": "Show pricing summary"
+    "message": "Показать сведения о ценах"
   },
   "hidePricingSummary": {
-    "message": "Hide pricing summary"
+    "message": "Скрыть сведения о ценах"
   },
   "summary": {
     "message": "Итого"
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Следующий платеж"
   },
+  "nextChargeHeader": {
+    "message": "Следующий платеж"
+  },
+  "plan": {
+    "message": "План"
+  },
   "details": {
     "message": "Подробности"
   },
+  "discount": {
+    "message": "скидка"
+  },
   "downloadLicense": {
     "message": "Загрузить лицензию"
   },
@@ -3206,7 +3463,7 @@
     }
   },
   "planNameFamilies": {
-    "message": "Семья"
+    "message": "Families"
   },
   "planDescFamilies": {
     "message": "Для личного использования, чтобы поделиться с семьей и друзьями."
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Обновить браузер"
   },
-  "generatingYourRiskInsights": {
-    "message": "Генерация информации о рисках..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Получение данных о пользователях..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Анализ здоровья пароля..."
+  },
+  "calculatingRiskScores": {
+    "message": "Расчет показателей риска..."
+  },
+  "generatingReportData": {
+    "message": "Генерация данных отчета..."
+  },
+  "savingReport": {
+    "message": "Сохранение отчета..."
+  },
+  "compilingInsights": {
+    "message": "Компиляция информации..."
+  },
+  "loadingProgress": {
+    "message": "Прогресс загрузки"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Это может занять несколько минут."
+  },
+  "riskInsightsRunReport": {
+    "message": "Запустить отчет"
   },
   "updateBrowserDesc": {
     "message": "Вы используете неподдерживаемый браузер. Веб-хранилище может работать некорректно."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Приглашение принято"
   },
-  "inviteAcceptedDesc": {
-    "message": "Вы получите доступ к этой организации, как только администратор подтвердит ваше членство. Когда это произойдет, мы отправим вам email."
+  "invitationAcceptedDesc": {
+    "message": "Ваше приглашение успешно принято."
   },
   "inviteInitAcceptedDesc": {
     "message": "Теперь вы можете получить доступ к этой организации."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Организация приостановлена"
   },
+  "organizationIsSuspended": {
+    "message": "Организация приостановлена"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Доступ к элементам в отключенных организациях невозможен. Обратитесь за помощью к владельцу организации."
+  },
   "secretsAccessSuspended": {
     "message": "Доступ к отключенным организациям невозможен. Обратитесь за помощью к владельцу организации."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Сервисные аккаунты не могут быть созданы в отключенных организациях. Обратитесь за помощью к владельцу организации."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Доступ к элементам в отключенных организациях невозможен. Обратитесь за помощью к владельцу организации."
-  },
   "licenseIsExpired": {
     "message": "Срок действия лицензии истек."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO идентификатор"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Предоставьте этот ID пользователям для авторизации с помощью SSO. Чтобы обойти этот шаг, настройте ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Предоставьте этот ID своим пользователям для авторизации при помощи единого входа. Пользователи могут не вводить этот идентификатор во время единого входа, если настроен заявленный домен. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Подробнее",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Отключить SSO"
@@ -5518,9 +5809,9 @@
     "message": "Необходимо, чтобы все элементы принадлежали организации, что исключает возможность их хранения на уровне аккаунта.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
+  "organizationDataOwnershipDescContent": {
     "message": "Все элементы будут принадлежать организации и сохраняться в ней, что позволит осуществлять контроль, видимость и отчетность в масштабах всей организации. При включении для каждого участника будет доступна коллекция по умолчанию для хранения элементов. Узнайте больше об управлении ",
-    "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.'"
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "жизненным циклом учетных данных",
@@ -5536,7 +5827,7 @@
     "message": "не будет автоматически выбираться при создании новых элементов"
   },
   "organizationDataOwnershipWarning3": {
-    "message": "невозможно управлять из консоли администратора до тех пор, пока пользователь не будет удален"
+    "message": "невозможно управлять из консоли администратора пока пользователь не будет удален"
   },
   "organizationDataOwnershipWarningContentTop": {
     "message": "При отключении этой политики коллекция по умолчанию: "
@@ -5545,6 +5836,65 @@
     "message": "Узнайте больше о ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Уже доступно"
+  },
+  "autoConfirm": {
+    "message": "Автоматическое подтверждение новых пользователей"
+  },
+  "autoConfirmDescription": {
+    "message": "Новые пользователи, приглашенные в организацию, будут автоматически подтверждены, когда устройство администратора будет разблокировано.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Как включить автоматическое подтверждение пользователя"
+  },
+  "autoConfirmExtension1": {
+    "message": "Откройте свое расширение Bitwarden"
+  },
+  "autoConfirmExtension2": {
+    "message": "Выбрать",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Включить",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Успешно открыто расширение браузера Bitwarden. Теперь вы можете активировать автоматическое подтверждение пользователя."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Новые пользователи, приглашенные в организацию, будут автоматически подтверждены, когда устройство администратора будет разблокировано. Перед включением этой политики, пожалуйста, ознакомьтесь со следующими условиями и согласитесь с ними: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Потенциальные риски безопасности. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Автоматическое подтверждение пользователя может представлять угрозу безопасности данных вашей организации."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Узнайте о рисках",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Требуется политика единой организации. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Все участники должны принадлежать только этой организации для активации этой автоматизации."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Политика единой организации распространяется на все роли. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Нет экстренного доступа. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Экстренный доступ будет удален."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Я принимаю эти риски и политики обновления"
+  },
   "personalOwnership": {
     "message": "Удалить личное хранилище"
   },
@@ -5558,10 +5908,10 @@
     "message": "В соответствии с корпоративной политикой вам запрещено сохранять элементы в личном хранилище. Измените владельца на организацию и выберите из доступных Коллекций."
   },
   "desktopAutotypePolicy": {
-    "message": "Desktop Autotype Default Setting"
+    "message": "Настройки по умолчанию для автозаполнения на компьютере"
   },
   "desktopAutotypePolicyDesc": {
-    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "message": "Включите автозаполнение на компьютере по умолчанию для участников. Участники могут отключить автозаполнение вручную в клиентском приложении для компьютера.",
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
@@ -5597,6 +5947,19 @@
     "message": "Всегда показывать email пользователя получателям при создании или редактировании Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Обнаружение совпадения URI по умолчанию"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Определяет, когда логины будут предлагаться для автозаполнения. Администраторы и владельцы освобождаются от этой политики."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Обнаружение совпадения URI по умолчанию"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Пожалуйста, выберите допустимый вариант определения соответствия URI.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Изменена политика $ID$.",
     "placeholders": {
@@ -5728,7 +6091,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, **or** try it now.'"
   },
   "developmentDevOpsAndITTeamsChooseBWSecret": {
-    "message": "Команды разработчиков, DevOps и ИТ-специалистов выбирают Bitwarden Secrets Manager для защищенного управления и развертывания своих инфраструктурных и машинных секретов."
+    "message": "Команды разработчиков, DevOps и ИТ-специалистов выбирают Bitwarden Secrets Manager для защищенного управления и развертывания своих инфраструктурных и компьютерных секретов."
   },
   "centralizeSecretsManagement": {
     "message": "Централизуйте управление секретами."
@@ -5752,7 +6115,7 @@
     "message": "Укрепление безопасности бизнеса."
   },
   "strengthenBusinessSecurityDescription": {
-    "message": "Обеспечение жесткого контроля над доступом машин и людей к секретам с помощью интеграции SSO, журналов событий и ротации доступа."
+    "message": "Обеспечение жесткого контроля над доступом компьютеров и людей к секретам с помощью интеграции SSO, журналов событий и ротации доступа."
   },
   "tryItNow": {
     "message": "Попробуйте сейчас"
@@ -5779,7 +6142,7 @@
     "message": "Запрос доступа к Менеджеру секретов отправлен администраторам по email."
   },
   "requestAccessSMDefaultEmailContent": {
-    "message": "Привет,\n\nЯ запрашиваю подписку на Менеджер секретов Bitwarden для нашей команды. Ваша поддержка будет иметь большое значение!\n\nМенеджер секретов Bitwarden — это комплексное решение для управления секретами с шифрованием, предназначенное для защищенного хранения, совместного использования и развертывания машинных учетных данных, таких как ключи API, пароли баз данных и сертификаты аутентификации.\n\nМенеджер секретов поможет нам:\n\n- улучшить защищенность\n- отимизировать операции\n- предотвратить дорогостоящие утечки секретной информации\n\nЧтобы запросить бесплатную пробную версию для нашей команды, обратитесь в Bitwarden.\n\nСпасибо за помощь!"
+    "message": "Привет,\n\nЯ запрашиваю подписку на Менеджер секретов Bitwarden для нашей команды. Ваша поддержка будет иметь большое значение!\n\nМенеджер секретов Bitwarden — это комплексное решение для управления секретами с шифрованием, предназначенное для защищенного хранения, совместного использования и развертывания аккакунтов компьютеров таких как ключи API, пароли баз данных и сертификаты аутентификации.\n\nМенеджер секретов поможет нам:\n\n- улучшить защищенность\n- отимизировать операции\n- предотвратить дорогостоящие утечки секретной информации\n\nЧтобы запросить бесплатную пробную версию для нашей команды, обратитесь в Bitwarden.\n\nСпасибо за помощь!"
   },
   "giveMembersAccess": {
     "message": "Предоставить участникам доступ:"
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ваш мастер-пароль не соответствует требованиям политики вашей организации. Для доступа к хранилищу вы должны обновить свой мастер-пароль прямо сейчас. При этом текущий сеанс будет завершен и потребуется повторная авторизация. Сеансы на других устройствах могут оставаться активными в течение часа."
   },
-  "automaticAppLogin": {
-    "message": "Автоматическая авторизация пользователей в разрешенные приложения"
+  "automaticAppLoginWithSSO": {
+    "message": "Автовход с помощью SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Формы авторизаций будут автоматически заполняться и отправляться для приложений, запущенных с помощью настроенного провайдера идентификационных данных."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Повысьте безопасность и удобство единого входа в неуправляемые приложения. Когда пользователи запускают приложение у вашего провайдера идентификации, их регистрационные данные автоматически заполняются и отправляются, создавая безопасный поток от провайдера к приложению в один клик."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Хост провайдера идентификации"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Ваша организация обновила параметры расшифровки. Пожалуйста, установите мастер-пароль для доступа к вашему хранилищу."
   },
-  "maximumVaultTimeout": {
-    "message": "Тайм-аут хранилища"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Тайм-аут сеанса"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Установить максимальный тайм-аут хранилища для пользователей."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Установите максимальный тайм-аут сеанса для всех участников, кроме владельцев."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Максимальный тайм-аут хранилища"
+  "maximumAllowedTimeout": {
+    "message": "Максимально допустимый тайм-аут"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Недопустимый максимальный тайм-аут хранилища."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Требуется максимально допустимый тайм-аут."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Время указано неверно. Измените хотя бы одно значение."
+  },
+  "sessionTimeoutAction": {
+    "message": "Действие при тайм-ауте сеанса"
+  },
+  "immediately": {
+    "message": "Немедленно"
+  },
+  "onSystemLock": {
+    "message": "Вместе с компьютером"
+  },
+  "onAppRestart": {
+    "message": "При перезапуске приложения"
   },
   "hours": {
     "message": "Час."
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Мин."
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Вы действительно хотите установить максимальное ограничение по времени \"Никогда\" для всех пользователей?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Этот параметр сохранит ключи шифрования ваших пользователей на их устройствах. Если вы выберете этот параметр, убедитесь, что их устройства должным образом защищены."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Узнайте больше о защите устройств"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"Блокировка системы\" будет применяться только к браузеру и приложению для компьютера"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Мобильное и веб-приложение будут использовать \"при перезапуске приложения\" в качестве максимально допустимого тайм-аута, поскольку эта опция не поддерживается."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "В соответствии с политиками вашей организации максимально допустимый тайм-аут хранилища составляет $HOURS$ час. и $MINUTES$ мин.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Вы должны добавить либо базовый URL сервера, либо хотя бы одно пользовательское окружение."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL должны использовать HTTPS."
+  },
   "apiUrl": {
     "message": "URL API сервера"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Будет экспортировано только хранилище организации, связанное с $ORGANIZATION$. Коллекции Мои элементы включены не будут.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Доступ запрещен. У вас нет разрешения на просмотр этой страницы."
   },
+  "noPageAccess": {
+    "message": "У вас нет доступа к этой странице"
+  },
   "masterPassword": {
     "message": "Мастер-пароль"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Неизвестный секрет. Вам может потребоваться запросить разрешение на доступ к этому секрету."
   },
+  "unknownServiceAccount": {
+    "message": "Неизвестный аккаунт компьютера, возможно, вам потребуется запросить разрешение на доступ к этому аккаунту компьютера."
+  },
   "unknownProject": {
     "message": "Неизвестный проект. Вам может потребоваться запросить разрешение на доступ к этому проекту."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Группа/Пользователь"
   },
-  "lowKdfIterations": {
-    "message": "Низкие итерации KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Обновите настройки шифрования в соответствии с новыми рекомендациями по безопасности и улучшите защиту аккаунта."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "При продолжении все активные сессии будут завершены. Вам потребуется авторизоваться повторно и выполнить двухэтапную аутентификацию, если она включена. Мы рекомендуем экспортировать хранилище перед изменением настроек шифрования, чтобы предотвратить потерю данных."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Получен доступ к проекту с ID: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Получен доступ к проекту с идентификатором: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Удален аккаунт компьютера Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Изменен проект с идентификатором: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Добавлен пользователь: $USER_ID$ в аккаунт компьютера с идентификатором: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Удален пользователь: $USER_ID$ из аккаунта компьютера с идентификатором: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Удалена группа: $GROUP_ID$ из аккаунта компьютера с идентификатором: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Создан аккаунт компьютера с идентификатором: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Добавлена группа: $GROUP_ID$ в аккаунт компьютера с идентификатором: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Удален аккаунт компьютера с идентификатором: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Удален проект с идентификатором: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Выполнен вход!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Назначить доступ к коллекциям"
   },
@@ -9330,6 +9820,14 @@
     "message": "Слишком дорого",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Переход на бесплатный план",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Переключение на бесплатную организацию",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Бесплатно на 1 год"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Назначить"
   },
+  "assignTasks": {
+    "message": "Назначить задачи"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Отправляйте уведомления о смене паролей"
+  },
   "assignToCollections": {
     "message": "Назначить коллекциям"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Отправлять данные о событиях в ваш инстанс Logscale"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Отправляйте данные о событиях хранилища в ваш экземпляр Datadog"
+  },
   "failedToSaveIntegration": {
     "message": "Не удалось сохранить интеграцию. Пожалуйста, повторите попытку позже."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Для выполнения этого действия вы должны быть владельцем организации."
+  },
   "failedToDeleteIntegration": {
     "message": "Не удалось удалить интеграцию. Пожалуйста, повторите попытку позже."
   },
@@ -9852,10 +10362,10 @@
     "message": "URL"
   },
   "bearerToken": {
-    "message": "Токен на предъявителя"
+    "message": "Bearer Token"
   },
   "repositoryNameHint": {
-    "message": "Name of the repository to ingest into"
+    "message": "Название репозитория для импорта"
   },
   "index": {
     "message": "Индекс"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Низкое количество итераций KDF. Увеличьте количество итераций, чтобы повысить защищенность вашего аккаунта."
-  },
-  "changeKDFSettings": {
-    "message": "Изменить параметры KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Защитите вашу инфраструктуру"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Выкл"
   },
-  "higherKDFIterations": {
-    "message": "Увеличение числа итераций KDF может помочь защитить ваш мастер-пароль от взлома его злоумышленником."
-  },
-  "incrementsOf100,000": {
-    "message": "с шагом 100 000"
-  },
-  "smallIncrements": {
-    "message": "небольшие приращения"
-  },
   "kdfIterationRecommends": {
     "message": "Мы рекомендуем 600000 или более"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Для устаревших устройств слишком высокое значение KDF может привести к проблемам с производительностью. Увеличьте значение до $VALUE$ и протестируйте свои устройства.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Обратитесь в службу поддержки клиентов, чтобы восстановить подписку."
   },
@@ -10258,7 +10744,7 @@
     "message": "ID проекта"
   },
   "projectsAccessedByMachineAccount": {
-    "message": "С помощью этого машинного аккаунта можно получить доступ к следующим проектам."
+    "message": "С помощью этого аккаунта компьютера можно получить доступ к следующим проектам."
   },
   "config": {
     "message": "Конфигурация"
@@ -10465,10 +10951,10 @@
     "message": "Неограниченное количество пользователей"
   },
   "UpTo50MachineAccounts": {
-    "message": "До 50 машинных аккаунтов"
+    "message": "До 50 аккаунтов компьютеров"
   },
   "UpTo20MachineAccounts": {
-    "message": "До 20 машинных аккаунтов"
+    "message": "До 20 аккаунтов компьютеров"
   },
   "current": {
     "message": "Текущий"
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Домен зарегистрирован"
   },
+  "itemAddedToFavorites": {
+    "message": "Элемент добавлен в избранное"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Элемент удален из избранного"
+  },
+  "copyNote": {
+    "message": "Скопировать заметку"
+  },
   "organizationNameMaxLength": {
     "message": "Название организации не может превышать 50 символов."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Расширение для браузера Bitwarden успешно открыто. Теперь вы можете просмотреть свои пароли, подверженные риску."
   },
-  "openExtensionManuallyPart1": {
-    "message": "У нас возникли проблемы с открытием расширения для браузера Bitwarden. Нажмите на значок Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "на панели инструментов.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Ваша подписка скоро будет продлена. Чтобы обеспечить непрерывность сервиса, свяжитесь с $RESELLER$ для подтверждения продления до $RENEWAL_DATE$.",
     "placeholders": {
@@ -10995,10 +11482,10 @@
     "message": "Изменить пароль, подверженный риску"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "Этот логин подвержен риску и у него отсутствует веб-сайт. Добавьте веб-сайт и смените пароль для большей безопасности."
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "Отсутствует сайт"
   },
   "removeUnlockWithPinPolicyTitle": {
     "message": "Отключить разблокировку PIN-кодом"
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Поиск в архиве"
   },
-  "archive": {
-    "message": "Архив"
+  "archiveNoun": {
+    "message": "Архив",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архивировать",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Разархивировать"
+  },
+  "itemsInArchive": {
+    "message": "Элементы в архиве"
   },
   "noItemsInArchive": {
     "message": "В архиве нет элементов"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Архивированные элементы появятся здесь и будут исключены из общих результатов поиска и предложений автозаполнения."
   },
+  "itemWasSentToArchive": {
+    "message": "Элемент был отправлен в архив"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Элементы были отправлены в архив"
+  },
+  "itemUnarchived": {
+    "message": "Элемент был разархивирован"
+  },
+  "bulkArchiveItems": {
+    "message": "Элементы архивированы"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Элементы разархивированы"
+  },
+  "archiveItem": {
+    "message": "Архивировать элемент",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Архивированные элементы исключены из общих результатов поиска и предложений автозаполнения. Вы уверены, что хотите архивировать этот элемент?"
+  },
+  "archiveBulkItems": {
+    "message": "Архивировать элементы",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Архивированные элементы исключены из общих результатов поиска и предложений автозаполнения. Вы уверены, что хотите архивировать эти элементы?"
+  },
   "businessUnit": {
     "message": "Бизнес-единица"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Расширение Bitwarden установлено!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Расширение Bitwarden установлено!"
+  },
   "openExtensionToAutofill": {
     "message": "Откройте расширение, чтобы авторизоваться и начать использовать автозаполнение."
   },
@@ -11154,6 +11684,14 @@
     "message": "База знаний",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Если расширение не открылось, возможно, вам потребуется открыть Bitwarden с помощью значка ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " на панели инструментов.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Центр поддержки",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11311,7 +11849,7 @@
     "message": "Необходимые действия: В платежных реквизитах не указан идентификационный номер налогоплательщика. Если идентификационный номер налогоплательщика не указан, в ваших счетах могут быть указаны дополнительные налоги."
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "Дополнительная навигация",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "addTaxId": {
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Простая интеграция"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Обновить до Families"
+  },
+  "upgradeToPremium": {
+    "message": "Обновить до Премиум"
+  },
+  "familiesUpdated": {
+    "message": "Вы обновились до Families!"
+  },
+  "taxCalculationError": {
+    "message": "Произошла ошибка при расчете налога для вашего местоположения. Повторите попытку."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Добро пожаловать в Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Разблокируйте дополнительные функции безопасности с Премиум или начните делиться элементами с семьей"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Цены указаны без учета налогов и оплачиваются ежегодно."
+  },
+  "organizationNameDescription": {
+    "message": "Название вашей организации будет отображаться в приглашениях, которые вы отправляете участникам."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Продолжить без обновления"
+  },
+  "upgradeYourPlan": {
+    "message": "Изменить план"
+  },
+  "upgradeNow": {
+    "message": "Изменить сейчас"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Заполнение этой формы приведет к созданию новой организации Families. Вы можете обновить свою бесплатную организацию в консоли администратора."
+  },
+  "upgradeErrorMessage": {
+    "message": "При обработке вашего изменения произошла ошибка. Повторите попытку."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "У вас есть план Bitwarden Free"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Перейти для полной защищенности"
+  },
+  "viewbusinessplans": {
+    "message": "Посмотреть бизнес-планы"
+  },
+  "updateEncryptionSettings": {
+    "message": "Обновить настройки шифрования"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Обновите настройки шифрования"
+  },
+  "updateSettings": {
+    "message": "Обновить настройки"
+  },
+  "algorithm": {
+    "message": "Алгоритм"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Выберите, каким образом Bitwarden должен шифровать данные вашего хранилища. Все варианты защищены, но более надежные методы обеспечивают лучшую защиту, особенно от атак методом перебора. Большинству пользователей Bitwarden рекомендует использовать настройки по умолчанию."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Увеличение значений выше значений по умолчанию повысит защищенность, но в итоге разблокировка вашего хранилища может занять больше времени."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Об алгоритмах шифрования"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 - это хорошо протестированный метод шифрования, который обеспечивает баланс между безопасностью и производительностью. Подходит для всех пользователей."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id обеспечивает более надежную защиту от современных атак. Лучше всего подходит для опытных пользователей с мощными устройствами."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Почтовый индекс"
+  },
+  "cardNumberLabel": {
+    "message": "Номер карты"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Начать пробную версию Families"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Блокировать создание аккаунта для заявленных доменов"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Запретите пользователям создавать аккаунты за пределами вашей организации, используя адреса email из заявленных доменов."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "Перед активацией этой политики необходимо заявить домен."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Настройте способ разблокировки для изменения действия по тайм-ауту хранилища."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "К настройкам тайм-аута были применены требования корпоративной политики"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Критичные приложения не выбраны"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Вы действительно хотите продолжить?"
+  },
+  "userVerificationFailed": {
+    "message": "Проверка пользователя не удалась."
   }
 }
diff --git a/apps/web/src/locales/si/messages.json b/apps/web/src/locales/si/messages.json
index b2b9714e766..03f68be3c03 100644
--- a/apps/web/src/locales/si/messages.json
+++ b/apps/web/src/locales/si/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "ප්‍රියතමයන්"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "වර්ග"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/sk/messages.json b/apps/web/src/locales/sk/messages.json
index 396d37e157e..3e19422e07e 100644
--- a/apps/web/src/locales/sk/messages.json
+++ b/apps/web/src/locales/sk/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Prehľad o prístupe"
   },
-  "riskInsights": {
-    "message": "Prehľad o rizikách"
-  },
   "passwordRisk": {
     "message": "Ohrozenie hesla"
   },
+  "noEditPermissions": {
+    "message": "Na úpravu tejto položky nemáte oprávnenie"
+  },
   "reviewAtRiskPasswords": {
     "message": "Skontrolujte ohrozené heslá (slabé, odhalené, alebo opätovne použité) naprieč aplikáciami. Vyberte najkritickejšie aplikácie a priorizujte vaším používateľom bezpečnostné opatrenia ohľadom ohrozených hesiel."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Prehľad ohrozených prihlasovacích mien"
+  },
   "dataLastUpdated": {
     "message": "Posledná aktualizácia dát: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Ešte ste nevytvorili report"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Pridať novu položku s prihlásením"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% splnených",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ z $TOTAL$ bezpečnostných úloh splnených",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Progres pri zmene hesla"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Pre sledovanie progresu, priraďte členom úlohy"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Poslať upomienky"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Tu sa zobrazia aplikácie, ktoré označíte za kritické."
   },
+  "viewAtRiskMembers": {
+    "message": "Zobraziť ohrozených členov"
+  },
+  "viewAtRiskApplications": {
+    "message": "Zobraziť ohrozené aplikácie"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ z $TOTAL$ kritických aplikácii je ohrozených nebezpečnými heslami",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Kritické aplikácie ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ kritických aplikácií",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ aplikácií ohrozených",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ ohrozených hesiel",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ nových ohrozených hesiel",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Neboli nájdené žiadne aplikácie v $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Keď používatelia uložia prihlasovacie údaje, tu sa zobrazia aplikácie a ohrozené heslá. Označte kritické aplikácie a upozornite používateľov, aby si aktualizovali heslá."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Neoznačili ste žiadne aplikácie ako kritické"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Označiť aplikáciu ako kritickú"
   },
+  "markAsCritical": {
+    "message": "Označiť za kritické"
+  },
+  "applicationsSelected": {
+    "message": "vybrané aplikácie"
+  },
+  "selectApplication": {
+    "message": "Vybrať aplikáciu"
+  },
+  "unselectApplication": {
+    "message": "Nevybrať aplikáciu"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Aplikácie označené ako kritické"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ aplikácií označených ako kritické",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Nepodarilo sa označiť aplikácie za kritické"
+  },
   "application": {
     "message": "Aplikácia"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Ohrozených členov"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Členovia s oprávnením upravovať ohrozené položky kritických aplikácii"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Členovia s ohrozenými heslami"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ ohrozených členov",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Títo členovia sa prihlasujú do aplikácií so slabým, uniknutým alebo viacnásobne použitým heslom."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Všetkých aplikácii"
   },
+  "applicationsNeedingReview": {
+    "message": "Aplikácie vyžadujú kontrolu"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Skontrolovať nové aplikácie"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ nových aplikácií",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Skontrolujte nové aplikácie a ich označenie za kritické a udržujte tak vašu organizáciu v bezpečí"
+  },
+  "reviewNow": {
+    "message": "Skontrolovať teraz"
+  },
+  "allCaughtUp": {
+    "message": "Všetko hotové!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Žiadne nové aplikácie na kontrolu"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Vaša organizácia ma uložené položky pre $COUNT$ aplikácii",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Pre zabezpečenie položiek najkritickejších pre bezpečnosť vašej organizácie, skontrolujte aplikácie"
+  },
+  "reviewApplications": {
+    "message": "Skontrolovať aplikácie"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Uprednostniť kritické aplikácie"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Aplikáciu označíte za kritickú kliknutím na ikonu hviezdičky"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Funkcia označovania za kritické bude implementovaná v budúcej aktualizácii"
+  },
+  "applicationReviewSaved": {
+    "message": "Hodnotenie aplikácie uložené"
+  },
+  "newApplicationsReviewed": {
+    "message": "Nové hodnotené aplikácie"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Chyba pri ukladaní stavu hodnotenia"
+  },
+  "pleaseTryAgain": {
+    "message": "Prosím, skúste to znova"
+  },
   "unmarkAsCritical": {
     "message": "Zrušiť označenie za kritické"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Obľúbené"
   },
+  "taskSummary": {
+    "message": "Zhrnutie úloh"
+  },
   "types": {
     "message": "Typy"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Ponechajte toto okno otvorené a nasledujte pokyny vášho prehliadača."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Overenie prístupovým kľúčom zlyhalo. Skúste to znova."
+  },
   "useADifferentLogInMethod": {
     "message": "Použiť iný spôsob prihlásenia"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Použiť jednotné prihlásenie"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Vaša organizácia vyžaduje jednotné prihlasovanie."
+  },
   "welcomeBack": {
     "message": "Vitajte späť"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Neplatné hlavné heslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Neplatné hlavné heslo. Overte, že váš e-mail je správny a účet bol vytvorený na $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Neplatné heslo súboru, použite heslo, ktoré ste zadali pri vytváraní exportného súboru."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Neexistujú žiadne položky na zobrazenie."
   },
+  "noItemsInTrash": {
+    "message": "V koši nie sú žiadne položky"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Položky, ktoré odstránite, sa zobrazia tu a po 30 dňoch sa odstránia natrvalo"
+  },
+  "noItemsInVault": {
+    "message": "V trezore nie sú žiadne položky"
+  },
+  "emptyVaultDescription": {
+    "message": "Trezor chráni viac ako len heslá. Môžete tu bezpečne ukladať prihlasovacie údaje, identifikačné údaje, karty a poznámky."
+  },
+  "emptyFavorites": {
+    "message": "Neoznačili ste žiadnu položku za obľúbenú"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Pre rýchly prístup, pridajte položky medzi obľúbené."
+  },
+  "noSearchResults": {
+    "message": "Nenašli sa žiadne výsledky vyhľadávania"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Vymažte filtre alebo zmeňte vyhľadávaný výraz"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Nemáte povolenie pre zobrazenie všetkých položiek v tejto zbierke."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Nastavenia šifrovacieho kľúča"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algoritmus"
-  },
   "kdfIterations": {
     "message": "KDF iterácií"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Zvýšenie počtu KDF iterácií, pamäti a paralelizmu môže pomôcť chrániť vaše hlavné heslo pri brute force útoku."
   },
-  "changeKdf": {
-    "message": "Zmeniť KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Nastavenia šifrovacieho kľúča zmenené"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Prosím uistite sa, že váš účet má k dispozícii dostatok kreditu pre tento nákup. Ak konto nemá k dispozícii dostatok kreditu, rozdiel sa zaplatí vašou predvolenou platobnou metódou. Kredit si môžete pridať na stránke fakturácie."
   },
+  "notEnoughAccountCredit": {
+    "message": "Na tento nakúp nemáte na vašom účte dostatočný kredit. Kredit môžete pridať na stránke fakturácie."
+  },
   "creditAppliedDesc": {
     "message": "Kredit na vašom účte sa dá použiť na nákupy. Akýkoľvek dostupný kredit bude automaticky použitý na zaplatenie faktúr pre tento účet."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Ďalšia platba"
   },
+  "nextChargeHeader": {
+    "message": "Ďalšia platba"
+  },
+  "plan": {
+    "message": "Plán"
+  },
   "details": {
     "message": "Podrobnosti"
   },
+  "discount": {
+    "message": "zľava"
+  },
   "downloadLicense": {
     "message": "Stiahnuť licenciu"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Aktualizovať prehliadač"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generuje sa váš prehľad o rizikách..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generuje sa prehľad o prístupe..."
+  },
+  "fetchingMemberData": {
+    "message": "Sťahujú sa dáta o členoch..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzuje sa odolnosť hesiel..."
+  },
+  "calculatingRiskScores": {
+    "message": "Vypočítava sa úroveň ohrozenia..."
+  },
+  "generatingReportData": {
+    "message": "Generujú sa dáta reportu..."
+  },
+  "savingReport": {
+    "message": "Ukladá sa report..."
+  },
+  "compilingInsights": {
+    "message": "Kompiluje sa prehľad..."
+  },
+  "loadingProgress": {
+    "message": "Priebeh načítania"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Môže to trvať niekoľko minút."
+  },
+  "riskInsightsRunReport": {
+    "message": "Generovať report"
   },
   "updateBrowserDesc": {
     "message": "Používate nepodporovaný prehliadač. Webový trezor nemusí úplne fungovať."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Pozvánka prijatá"
   },
-  "inviteAcceptedDesc": {
-    "message": "Prístup k organizácii získate keď administrátor potvrdí vaše členstvo. Keď sa tak stane, pošleme vám email."
+  "invitationAcceptedDesc": {
+    "message": "Pozvánka úspešne akceptovaná."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organizácia je vypnutá."
   },
+  "organizationIsSuspended": {
+    "message": "Organizácia je pozastavená"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "K položkám v pozastavenej organizácii nie je možné pristupovať. Požiadajte o pomoc vlastníka organizácie."
+  },
   "secretsAccessSuspended": {
     "message": "K pozastaveným organizáciám nie je možné pristupovať. Požiadajte o pomoc vlastníka organizácie."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "V pozastavených organizáciám nie je možné vytvárať služobné kontá. Požiadajte o pomoc vlastníka organizácie."
   },
-  "disabledOrganizationFilterError": {
-    "message": "K položkám vo vypnutej organizácii nie je možné pristupovať. Požiadajte o pomoc vlastníka organizácie."
-  },
   "licenseIsExpired": {
     "message": "Licencia vypršala."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifikátor"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Zdieľajte toto ID s vašimi členmi pre prihlásenie prostredníctvom SSO. Ak nastavíte privlastnenú doménu, členovia sa môžu prihlásiť prostredníctvom SSO bez zadávania tohto identifikátora. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Zistiť viac",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Odpojiť SSO"
@@ -5214,7 +5505,7 @@
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "Zostáva $ACCESSCOUNT$ zobrazení",
+    "message": "Zostávajúce zobrazenia: $ACCESSCOUNT$",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -5257,11 +5548,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletedSend": {
-    "message": "Send zmazaný",
+    "message": "Send bol odstránený",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSend": {
-    "message": "Zmazať Send",
+    "message": "Odstrániť Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
@@ -5518,9 +5809,9 @@
     "message": "Odstrániť možnosť uložiť položku pod kontom a požadovať aby všetky položky boli vlastnené organizáciou.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Všetky položky budú vo vlastníctve organizácie a uložené v nej, čo umožní kontrolu, prehľadnosť a vykazovanie v rámci celej organizácie. Po zapnutí bude každému členovi k dispozícii predvolená zbierka na ukladanie položiek. Dozvedieť sa viac o správe ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "životného cyklu položiek",
@@ -5545,6 +5836,65 @@
     "message": "Viac informácií o ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Dostupné teraz"
+  },
+  "autoConfirm": {
+    "message": "Automatické potvrdzovanie nových členov"
+  },
+  "autoConfirmDescription": {
+    "message": "Noví používatelia pozvaní do organizácie budú automaticky potvrdení ak je zariadene správcu odomknuté.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Ako zapnúť automatické potvrdzovanie používateľov"
+  },
+  "autoConfirmExtension1": {
+    "message": "Otvoriť rozšírenie Bitwarden"
+  },
+  "autoConfirmExtension2": {
+    "message": "Vybrať",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Zapnúť",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Rozšírenie Bitwarden pre prehliadače úspešne otvorene. Teraz môžete v nastaveniach zapnúť automatické potvrdzovanie používateľov."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Noví používatelia pozvaní do organizácie budú automaticky potvrdení ak je zariadene správcu odomknuté. Pred zapnutím tohto pravidla skontrolujte a odsúhlaste následujúce: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potencionálne bezpečnostné riziko. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatické potvrdzovanie používateľov môže predstavovať bezpečnostné ohrozenie dát vašej organizácie."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Dozvedieť sa viac o rizikách",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Vyžaduje sa pravidlo jednej organizácie. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Pre zapnutie tejto automatizácie musia všetci členovia patriť len do tejto organizácie."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Pravidlo jednej organizácie sa rozšíri na všetky roly. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Žiadny núdzový prístup. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Núdzový prístup bude odstránený."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Akceptujem tieto riziká a aktualizácie pravidiel"
+  },
   "personalOwnership": {
     "message": "Zakázať osobný trezor"
   },
@@ -5597,6 +5947,19 @@
     "message": "Nedovoľte používateľom skryť svoju e-mailovú adresu pred príjemcami pri vytváraní alebo úpravách Sendu.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Predvolené zisťovanie zhody URI"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Určite kedy budú ponúknuté položky pre automatické vypĺňanie. Správcovia a majitelia majú pre toto pravidlo výnimku."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Predvolené zisťovanie zhody URI"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Prosím vyberte platnú predvoľbu zisťovania zhody URI.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Upravená politika $ID$.",
     "placeholders": {
@@ -5705,7 +6068,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineLearnMore": {
-    "message": "Viac informácií o",
+    "message": "Zistite viac o",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read '**Learn more about** Bitwarden Send or sign up to try it today.'"
   },
   "sendVaultCardProductDesc": {
@@ -5805,11 +6168,11 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send **or** sign up to try it today.'"
   },
   "sendAccessTaglineSignUp": {
-    "message": "zaregistrujte",
+    "message": "sa zaregistrujte a",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or **sign up** to try it today.'"
   },
   "sendAccessTaglineTryToday": {
-    "message": "skúste to ešte dnes.",
+    "message": "vyskúšajte ho ešte dnes.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or sign up to **try it today.**'"
   },
   "sendAccessCreatorIdentifier": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Vaše hlavné heslo nespĺňa jednu alebo viacero podmienok vašej organizácie. Ak chcete získať prístup k trezoru, musíte teraz aktualizovať svoje hlavné heslo. Pokračovaním sa odhlásite z aktuálnej relácie a budete sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatické prihlásenie prostredníctvom SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Rozšírte bezpečnosť a pohodlie jednotného prihlásenia (SSO) na nespravované aplikácie. Keď používatelia spustia aplikáciu od vášho poskytovateľa identít, ich prihlasovacie údaje sa automaticky vyplnia a odošlú, čím sa umožní bezpečná cesta jedným kliknutím od poskytovateľa identít do aplikácie."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Vaša organizácia aktualizovala možnosti dešifrovania. Na prístup k trezoru nastavte hlavné heslo."
   },
-  "maximumVaultTimeout": {
-    "message": "Časový limit pre trezor"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Časový limit relácie"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Nastaviť maximálny časový limit trezora pre všetkých používateľov."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Nastaviť maximálny časový limit relácie pre všetkých členov okrem vlastníkov."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximálny časový limit pre trezor"
+  "maximumAllowedTimeout": {
+    "message": "Maximálny povolený časový limit"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Neplatný maximálny časový limit pre trezor."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximálny povolený časový limit je povinný."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Čas nie je platný. Zmeňte aspoň jednu hodnotu."
+  },
+  "sessionTimeoutAction": {
+    "message": "Akcia po vypršaní relácie"
+  },
+  "immediately": {
+    "message": "Okamžite"
+  },
+  "onSystemLock": {
+    "message": "Keď je systém uzamknutý"
+  },
+  "onAppRestart": {
+    "message": "Po reštarte aplikácie"
   },
   "hours": {
     "message": "Hodiny"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minúty"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Naozaj chcete povoliť maximálny časový limit \"Nikdy\" pre všetkých členov?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Táto voľba uloží šifrovacie kľúče členov na ich zariadeniach. Ak zvolíte tuto možnosť, uistite sa ze ich zariadenia sú dostatočne zabezpečené."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Dozvedieť sa viac o zabezpečení zariadení"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "Nastavenie \"Uzamknutý systém\" sa aplikuje iba na rozšírenie pre prehliadač a aplikáciu pre desktop"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Keďže mobilná a webová aplikácia nepodporuje túto predvoľbu pre maximálny povolený časový limit, bude namiesto toho použité nastavenie \"po reštarte aplikácie\"."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Zásady vašej organizácie ovplyvňujú časový limit trezoru. Maximálny povolený časový limit trezoru je $HOURS$ h a $MINUTES$ m",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Adresy URL musia používať HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Exportuje sa len trezor organizácie spojený s $ORGANIZATION$.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Exportuje sa len trezor organizácie spojený s $ORGANIZATION$. Moje zbierky položiek nebudú zahrnuté.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Prístup zamietnutý. Nemáte oprávnenie na zobrazenie tejto stránky."
   },
+  "noPageAccess": {
+    "message": "Na túto stránku nemáte prístup"
+  },
   "masterPassword": {
     "message": "Hlavné heslo"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Neznáma položka možno potrebujete požiadať o prístup k tejto položke."
   },
+  "unknownServiceAccount": {
+    "message": "Neznáme strojové konto, možno potrebujete požiadať o prístup k tomuto kontu."
+  },
   "unknownProject": {
     "message": "Neznámy projekt, možno potrebujete požiadať o prístup k tomuto projektu."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Skupina/Používateľ"
   },
-  "lowKdfIterations": {
-    "message": "Nízky počet iterácií KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Aktualizujte vaše nastavenie šifrovania aby ste boli v súlade s bezpečnostnými odporúčaniami a vylepšili si tak ochranu vášho konta."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,7 +8899,7 @@
       }
     }
   },
-  "accessedProjectWithId": {
+  "accessedProjectWithIdentifier": {
     "message": "Pristúp k projektu s identifikátorom: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Vymazané strojové konto s identifikátorom: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Upravený projekt s identifikátorom: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Pridaný používateľ: $USER_ID$ k strojovému účtu s identifikátorom: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Odstránený používateľ: $USER_ID$ zo strojového účtu s identifikátorom: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Odstránená skupina: $GROUP_ID$ zo strojového účtu s identifikátorom: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Vytvorený strojový účet s identifikátorom: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Pridaná skupina: $GROUP_ID$ do strojového účtu s identifikátorom: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Odstránený strojový účet s identifikátorom: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Odstránený projekt s identifikátorom: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Prihlásený!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Udeliť prístup k zbierke"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Prideliť"
   },
+  "assignTasks": {
+    "message": "Priradiť úlohy"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Prideliť k zbierkam"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Pošlite dáta z denníka udalostí do vašej inštancie Logscale"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Pošlite dáta z denníka udalostí do vašej inštancie Datadog"
+  },
   "failedToSaveIntegration": {
     "message": "Nepodarilo sa uložiť integráciu. Prosím skúste to neskôr."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Pre vykonanie tejto akcie musíte by vlastník organizácie."
+  },
   "failedToDeleteIntegration": {
     "message": "Nepodarilo sa odstrániť integráciu. Prosím skúste to neskôr."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Nízky počet iterácií KDF. Pre zlepšenie bezpečnosti vášho konta, zvýšte počet iterácií."
-  },
-  "changeKDFSettings": {
-    "message": "Zmeniť nastavenia KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Zabezpečte si infraštruktúru"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Vypnuté"
   },
-  "higherKDFIterations": {
-    "message": "Zvýšenie počtu KDF iterácií môže pomôcť chrániť vaše hlavné heslo pri brute force útoku."
-  },
-  "incrementsOf100,000": {
-    "message": "prírastok po 100 000"
-  },
-  "smallIncrements": {
-    "message": "malý prírastok"
-  },
   "kdfIterationRecommends": {
     "message": "Odporúčame aspoň 600 000"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Nastavenie príliš vysokého počtu KDF iterácii môže viesť k problémom vo výkone na starších zariadeniach. Zvýšte hodnotu $VALUE$ a otestujte na vašich zariadeniach.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Ak chcete obnoviť vaše predplatné, kontaktujte zákaznícku podporu."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Doména privlastnená"
   },
+  "itemAddedToFavorites": {
+    "message": "Položka pridaná medzi obľúbené"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Položka odobraná z obľúbených"
+  },
+  "copyNote": {
+    "message": "Kopírovať poznámku"
+  },
   "organizationNameMaxLength": {
     "message": "Meno organizácie nemôže mať viac ako 50 znakov."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Rozšírenie pre prehliadač Bitwarden úspešne otvorené. Teraz môžete skontrolovať vaše ohrozene heslá."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Mali sme problém otvoriť Bitwarden rozšírenie pre prehliadač. Otvorte ikonu Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "na paneli nástrojov.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Vaše predplatné sa čoskoro obnoví. Aby ste si zabezpečili nepretržitú prevádzku, kontaktujte $RESELLER$ a potvrďte obnovenie pred $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Prehľadať archív"
   },
-  "archive": {
-    "message": "Archív"
+  "archiveNoun": {
+    "message": "Archív",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archivovať",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Zrušiť archiváciu"
+  },
+  "itemsInArchive": {
+    "message": "Položky v archíve"
   },
   "noItemsInArchive": {
     "message": "Žiadne položky v archíve"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Tu sa zobrazia archivované položky, ktoré budú vylúčené zo všeobecného vyhľadávania a z návrhov automatického vypĺňania."
   },
+  "itemWasSentToArchive": {
+    "message": "Položka bola archivovaná"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Položky boli archivované"
+  },
+  "itemUnarchived": {
+    "message": "Položka bola odobraná z archívu"
+  },
+  "bulkArchiveItems": {
+    "message": "Položky archivované"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Položky boli odobrané z archívu"
+  },
+  "archiveItem": {
+    "message": "Archivovať položku",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archivované položky sú vylúčené zo všeobecného vyhľadávania a z návrhov automatického vypĺňania. Naozaj chcete archivovať túto položku?"
+  },
+  "archiveBulkItems": {
+    "message": "Archivovať položky",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archivované položky sú vylúčené zo všeobecného vyhľadávania a z návrhov automatického vypĺňania. Naozaj chcete archivovať tieto položky?"
+  },
   "businessUnit": {
     "message": "Organizačná jednotka"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Rozšírenie Bitwarden nainštalované!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Otvorte rozšírenie, prihláste sa a začnite automatické vypĺňanie."
   },
@@ -11154,6 +11684,14 @@
     "message": "Vzdelávacie centrum",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Centrum pomoci",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Rodiny"
+  },
+  "upgradeToFamilies": {
+    "message": "Povýšiť na verziu Rodiny"
+  },
+  "upgradeToPremium": {
+    "message": "Povýšiť na verziu Prémium"
+  },
+  "familiesUpdated": {
+    "message": "Povýšili ste na verziu Rodiny!"
+  },
+  "taxCalculationError": {
+    "message": "Pri výpočte dane pre vašu lokalitu došlo k chybe. Prosím skúste to znova."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Vítajte v Bitwardene"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Odomknite ďalšie bezpečnostné funkcie s Prémium, alebo začnite zdieľať položky s predplatným Rodiny"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Ceny sú uvedené bez dane a účtujú sa ročne."
+  },
+  "organizationNameDescription": {
+    "message": "Názov vašej organizácie sa objaví v pozvánkach ktoré zašlete členom."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Pokračovať bez povýšenia"
+  },
+  "upgradeYourPlan": {
+    "message": "Navýšte si svoje predplatné"
+  },
+  "upgradeNow": {
+    "message": "Navýšiť teraz"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Vyplnením tohto formulára sa vytvorí organizácia Rodiny. Povýšiť vašu organizáciu Zdarma môžete v konzole správcu."
+  },
+  "upgradeErrorMessage": {
+    "message": "Pri spracovaní povýšenia došlo k chybe. Prosím skúste to znova."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Mate predplatné Bitwarden Zadarmo"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Navýšte predplatné pre kompletnú bezpečnosť"
+  },
+  "viewbusinessplans": {
+    "message": "Zobraziť predplatné pre firmy"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "PSČ"
+  },
+  "cardNumberLabel": {
+    "message": "Číslo karty"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Začať bezplatnú skúšku pre predplatné Rodiny"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "Nie sú vybrané žiadne kritické aplikácie"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Ste si istí, že chcete pokračovať?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/sl/messages.json b/apps/web/src/locales/sl/messages.json
index e54ef8bb4b6..09a882fe7e5 100644
--- a/apps/web/src/locales/sl/messages.json
+++ b/apps/web/src/locales/sl/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Analiza dostopa"
   },
-  "riskInsights": {
-    "message": "Vpogled v tveganja"
-  },
   "passwordRisk": {
     "message": "Varnostno tveganje gesla"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Priljubljeno"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Vrste"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Napačno glavno geslo"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Napačno geslo za datoteko. Prosimo, vnesite geslo, ki ste ga vnesli, ko ste izvozili datoteko."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Ni elementov za prikaz."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Nimate dovoljenja za ogled vseh elementov v tej zbirki."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Nastavitve kodirnega ključa"
   },
-  "kdfAlgorithm": {
-    "message": "Algoritem KDF"
-  },
   "kdfIterations": {
     "message": "Ponovitev KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Spremeni KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Podrobnosti"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Prenesi licenco"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "Licenca je potekla"
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Časovna omejite trezorja"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Glavno geslo"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Nizko število ponovitev KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Popravite svoje nastavitve šifriranja, da bodo v skladu z novimi priporočili za varnost, in izboljšajte zaščito svojega računa."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/sr_CS/messages.json b/apps/web/src/locales/sr_CS/messages.json
index 8b8edaa1ec3..367d4ddbace 100644
--- a/apps/web/src/locales/sr_CS/messages.json
+++ b/apps/web/src/locales/sr_CS/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Pristupi inteligenciji"
   },
-  "riskInsights": {
-    "message": "Uvid u rizik"
-  },
   "passwordRisk": {
     "message": "Rizik od lozinke"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Pregledaj rizične lozinke (slabe, izložene ili ponovo korišćene) u aplikacijama. Izaberi svoje najkritičnije aplikacije da bi dao prioritet bezbednosnim radnjama kako bi tvoji korisnici adresirali rizične lozinke."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Podaci su poslednji put ažurirani: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Obavešteni članovi"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Kreirajte novu stavku za prijavu"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Kritične aplikacije ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Obavešteni članovi ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Nije pronađena nijedna aplikacija u $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Dok korisnici čuvaju prijave, aplikacije se pojavljuju ovde, prikazujući sve rizične lozinke. Označite kritične aplikacije i obavestite korisnike da ažuriraju lozinke."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Omiljene stavke"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Tipovi"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Nema stavki u listi."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Sledeće Plaćanje"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detalji"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/sr_CY/messages.json b/apps/web/src/locales/sr_CY/messages.json
index 68a440646a3..aea5a1d9733 100644
--- a/apps/web/src/locales/sr_CY/messages.json
+++ b/apps/web/src/locales/sr_CY/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Приступи интелигенцији"
   },
-  "riskInsights": {
-    "message": "Увид у ризик"
-  },
   "passwordRisk": {
     "message": "Ризик од лозинке"
   },
+  "noEditPermissions": {
+    "message": "Немате дозволу да уређујете ову ставку"
+  },
   "reviewAtRiskPasswords": {
     "message": "Прегледај ризичне лозинке (слабе, изложене или поново коришћене) у апликацијама. Изабери своје најкритичније апликације да би дао приоритет безбедносним радњама како би твоји корисници адресирали ризичне лозинке."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Прегледајте ризичне пријаве"
+  },
   "dataLastUpdated": {
     "message": "Подаци су последњи пут ажурирани: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Још увек нисте направили извештај"
+  },
   "notifiedMembers": {
     "message": "Обавештени чланови"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Креирајте нову ставку за пријаву"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% завршено",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "Завршени сигурносни задаци: $COUNT$ од $TOTAL$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Напредак промене лозинке"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Доделите задатке чланова да прате напредак"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Пошаљи подсетнике"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Апликације обележене као критичне, су приказане овде."
   },
+  "viewAtRiskMembers": {
+    "message": "Преглед чланова под ризиком"
+  },
+  "viewAtRiskApplications": {
+    "message": "Преглед апликација под ризиком"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "Критичне апликације ризиковне због ризичнр лозинке: $COUNT$ од $TOTAL$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Критичне апликације ($COUNT$)",
     "placeholders": {
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "Критичне апликације: $COUNT$",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "Апликације у ризику: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "Лозинке у ризику: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Обавештени чланови ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Није пронађена ниједна апликација у $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Док корисници чувају пријаве, апликације се појављују овде, приказујући све ризичне лозинке. Означите критичне апликације и обавестите кориснике да ажурирају лозинке."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Нисте означили ниједну апликацију као критичну"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Означите апликацију као критичну"
   },
+  "markAsCritical": {
+    "message": "Постави као критично"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Бирање апликације"
+  },
+  "unselectApplication": {
+    "message": "Скини одабирања апликације"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Апликације означене као критичне"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "Апликације означене као критичне: $COUNT$",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Означавање апликација као критичних није успело"
+  },
   "application": {
     "message": "Апликација"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Чланови под ризиком"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Чланови са правом уређивања за угрожене ставке критичних апликација"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Чланови са ризичним лозинкама"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
     "message": "Угрожени чланови: $COUNT$",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Ови чланови се пријављују у апликације са слабим, откривеним или поново коришћеним лозинкама."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Нема чланова пријављена у апликације са слабим, откривеним или поново коришћеним лозинкама."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Укупно апликација"
   },
+  "applicationsNeedingReview": {
+    "message": "Апликације које треба прегледати"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Прегледајте нове апликације да бисте их означили као критичне и заштитили своју организацију"
+  },
+  "reviewNow": {
+    "message": "Прегледај сада"
+  },
+  "allCaughtUp": {
+    "message": "Сви ухваћени!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Тренутно нема нових апликација за преглед"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Дајте приоритет критичним апликацијама"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Прегледајте нове апликације"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Кликните на икону звездице да бисте означили апликацију као критичну"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Означи као критичну функционалност ће бити имплементирана у будућем ажурирању"
+  },
+  "applicationReviewSaved": {
+    "message": "Преглед апликације је сачуван"
+  },
+  "newApplicationsReviewed": {
+    "message": "Нове апликације су прегледане"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Грешка при чувању статуса прегледа"
+  },
+  "pleaseTryAgain": {
+    "message": "Покушајте поново"
+  },
   "unmarkAsCritical": {
     "message": "Уклони као критично"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Омиљени"
   },
+  "taskSummary": {
+    "message": "Резиме задатка"
+  },
   "types": {
     "message": "Врсте"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Држите овај прозор отворен и пратите упутства из прегледача."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Потврда приступачног кључа није успела. Покушајте поново."
+  },
   "useADifferentLogInMethod": {
     "message": "Користи други начин пријављивања"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Употребити једнократну пријаву"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Ваша организација захтева јединствену пријаву."
+  },
   "welcomeBack": {
     "message": "Добродошли назад"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Погрешна главна лозинка"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Неважећа главна лозинка. Потврдите да је ваш имејл тачан и ваш рачун је креиран на $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Неважећа лозинка за датотеку, користите лозинку коју сте унели када сте креирали датотеку за извоз."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Нама ставке у листи."
   },
+  "noItemsInTrash": {
+    "message": "Нема ставки у смећу"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Ставке које избришете ће се појавити овде и биће трајно избрисане након 30 дана"
+  },
+  "noItemsInVault": {
+    "message": "Сеф је празан"
+  },
+  "emptyVaultDescription": {
+    "message": "Сеф штити више од само ваших лозинки. Овде безбедно чувајте безбедне пријаве, личне карте, картице и белешке."
+  },
+  "emptyFavorites": {
+    "message": "Нисте фаворизовали никакве ставке"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Додајте често кориштене ставке у фаворите за брз приступ."
+  },
+  "noSearchResults": {
+    "message": "Нема резултата претраге"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Обришите филтере или покушајте са другим термином"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Немате дозволу да видите све ставке у овој колекцији."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Подешавања кључа шифровања"
   },
-  "kdfAlgorithm": {
-    "message": "KDF Алгоритам"
-  },
   "kdfIterations": {
     "message": "KDF понављања"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Веће KDF итерације, меморија и паралелизам могу помоћи у заштити ваше главне лозинке од грубе присиле од стране нападача."
   },
-  "changeKdf": {
-    "message": "Променити KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Подешавања кључа шифровања промењена"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Уверите се да је на вашем рачуну доступно довољно кредита за ову куповину. Ако на вашем рачуну нема довољно кредита, за разлику ће се користити ваш подразумевани начин плаћања у евиденцији. На свој рачун можете да додате кредит на страници Обрачун."
   },
+  "notEnoughAccountCredit": {
+    "message": "Немате довољно кредита на рачуну за ову куповину. Можете да додате кредит на свој налог са странице Обрачун."
+  },
   "creditAppliedDesc": {
     "message": "Кредит вашег рачуна може се користити за куповину. Сав расположиви кредит аутоматски ће се применити на фактуре генерисане за овај рачун."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Следеће пуњење"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Детаљи"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Преузимање лиценце"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Ажурирајте Претраживач"
   },
-  "generatingYourRiskInsights": {
-    "message": "Генерисање прегледа вашег ризика..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Преузимање података о члановима..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Анализа здравља лозинки..."
+  },
+  "calculatingRiskScores": {
+    "message": "Израчунавање резултата ризика..."
+  },
+  "generatingReportData": {
+    "message": "Генерисање података извештаја..."
+  },
+  "savingReport": {
+    "message": "Чување извештаја..."
+  },
+  "compilingInsights": {
+    "message": "Састављање увида..."
+  },
+  "loadingProgress": {
+    "message": "Учитавање напретка"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Ово може потрајати неколико минута."
+  },
+  "riskInsightsRunReport": {
+    "message": "Покрените извештај"
   },
   "updateBrowserDesc": {
     "message": "Користите неподржани веб прегледач. Веб сеф можда неће правилно функционисати."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Позив прихваћен"
   },
-  "inviteAcceptedDesc": {
-    "message": "Овој организацији можете приступити када администратор потврди ваше чланство. Послаћемо вам имејл када се то догоди."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Сада можете приступити овој организацији."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Организација је онемогућена."
   },
+  "organizationIsSuspended": {
+    "message": "Организација је онемогућена"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Суспендованим организацијама се не може приступити. За помоћ контактирајте власника своје организације."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Сервисни налози се не могу креирати у суспендованим организацијама. За помоћ контактирајте власника своје организације."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Није могуће приступити ставкама у онемогућене организације. Обратите се власнику организације за помоћ."
-  },
   "licenseIsExpired": {
     "message": "Лиценца је истекла."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO идентификација"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Дајте овај ИД својим члановима да се пријаве са ССО. Да бисте заобишли овај корак, подесите ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Сазнај више",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Откачи SSO"
@@ -5518,9 +5809,9 @@
     "message": "Захтевајте све ставке да буду у власништву организације, уклањајући опцију за чување предмета на нивоу рачуна.",
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "message": "Сазнајте више о ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Доступно сада"
+  },
+  "autoConfirm": {
+    "message": "Аутоматска потврда нових корисника"
+  },
+  "autoConfirmDescription": {
+    "message": "Нови корисници позвани у организацију биће аутоматски потврђени када се администраторски уређај откључа.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Како укључити аутоматску потврду корисника"
+  },
+  "autoConfirmExtension1": {
+    "message": "Отворити Bitwarden екстензију"
+  },
+  "autoConfirmExtension2": {
+    "message": "Изабери",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Укључи",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Успешно је отворена екстензија прегледача Bitwarden-а. Сада можете активирати поставку аутоматске потврде корисника."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Нови корисници позвани у организацију биће аутоматски потврђени када се администраторски уређај откључа. Пре него што укључите ову политику, прегледајте и прихватите следеће: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Потенцијални безбедносни ризик. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Аутоматска потврда корисника може представљати безбедносни ризик за податке ваше организације."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Сазнајте више о ризицима",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Смернице за јединствену организацију су потребне. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Сви чланови морају припадати само овој организацији да би активирали ову аутоматизацију."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Политика једне организације прошириће се на све улоге. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Нема хитан приступ. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Хитан приступ ће бити уклоњен."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Прихватам ове ризике и ажурирања политика"
+  },
   "personalOwnership": {
     "message": "Лично власништво"
   },
@@ -5597,6 +5947,19 @@
     "message": "Не дозволите корисницима да сакрију своју е-пошту од примаоца приликом креирања или уређивања „Send“-а.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Стандардно налажење УРЛ"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Одредите када се предлажу пријаве за ауто-попуњавање. Администратори и власници су изузети од ове политике."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Стандардно налажење УРЛ"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Изаберите важећу опцију откривања налажења УРЛ-а.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Политика $ID$ промењена.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ваша главна лозинка не испуњава једну или више смерница ваше организације. Да бисте приступили сефу, морате одмах да ажурирате главну лозинку. Ако наставите, одјавићете се са ваше тренутне сесије, што захтева да се поново пријавите. Активне сесије на другим уређајима могу да остану активне до један сат."
   },
-  "automaticAppLogin": {
-    "message": "Аутоматски пријавите кориснике за дозвољене апликације"
+  "automaticAppLoginWithSSO": {
+    "message": "Аутоматско пријављивање са ССО"
   },
-  "automaticAppLoginDesc": {
-    "message": "Обрасци за пријаву ће аутоматски бити попуњени и послати за апликације које покреће ваш провајдер идентитета."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Хост добављача идентитета"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Ваша организација је ажурирала опције дешифровања. Поставите главну лозинку за приступ вашем сефу."
   },
-  "maximumVaultTimeout": {
-    "message": "Тајмаут сефа"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Истек сесије"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Конфигуришите максимално време сефа за све кориснике."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Подесите максимално временско ограничење сесије за све чланове осим власника."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Максимални тајмаут сефа"
+  "maximumAllowedTimeout": {
+    "message": "Максимално временско ограничење"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Погрешан максимални тајмаут сефа."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Максимално временско ограничење је обавезно."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Време је неважеће. Промените бар једну вредност."
+  },
+  "sessionTimeoutAction": {
+    "message": "Акција на истек сесије"
+  },
+  "immediately": {
+    "message": "Одмах"
+  },
+  "onSystemLock": {
+    "message": "На закључавање система"
+  },
+  "onAppRestart": {
+    "message": "На поновно покретање"
   },
   "hours": {
     "message": "Сати/а"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Минути/а"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Да ли сте сигурни да желите да дозволите максимално временско ограничење „Никад“ за све чланове?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Ова опција ће сачувати кључеве за шифровање ваших чланова на њиховим уређајима. Ако одаберете ову опцију, уверите се да су њихови уређаји адекватно заштићени."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Сазнајте више о заштити уређаја"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "„Закључавање система“ ће се примењивати само на прегледач и десктоп апликацију"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Мобилна и веб апликација ће користити „при поновном покретању апликације“ као максимално дозвољено временско ограничење, пошто опција није подржана."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Полиса ваше организације утиче на време истека сефа. Максимално дозвољено време истека је $HOURS$ сат(и) и $MINUTES$ minut(а)",
     "placeholders": {
@@ -6570,7 +6963,7 @@
     "message": "You've been offered a free Bitwarden Families plan organization. To continue, you need to log in to the account that received the offer."
   },
   "sponsoredFamiliesAcceptFailed": {
-    "message": "Unable to accept offer. Please resend the offer email from your Enterprise account and try again."
+    "message": "Није могуће прихватити понуду. Пошаљите имејл са свог Enterprise налога и покушајте поново."
   },
   "sponsoredFamiliesAcceptFailedShort": {
     "message": "Није могуће прихватити понуду. $DESCRIPTION$",
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Морате додати или основни УРЛ сервера или бар једно прилагођено окружење."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Везе морају да користе HTTPS."
+  },
   "apiUrl": {
     "message": "УРЛ АПИ Сервера"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Одбијен приступ. Немате дозволу да видите ову страницу."
   },
+  "noPageAccess": {
+    "message": "Немате приступ овој страници"
+  },
   "masterPassword": {
     "message": "Главна Лозинка"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -7389,7 +7809,7 @@
     "message": "Променити кључ"
   },
   "scimApiKey": {
-    "message": "SCIM API key",
+    "message": "SCIM API кључ",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "copyScimUrl": {
@@ -7433,7 +7853,7 @@
     }
   },
   "inputForbiddenCharacters": {
-    "message": "The following characters are not allowed: $CHARACTERS$",
+    "message": "Следећи знакови нису дозвољени: $CHARACTERS$",
     "placeholders": {
       "characters": {
         "content": "$1",
@@ -7499,10 +7919,10 @@
     "message": "DUO пријава у два корака је потребна за ваш налог."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "За ваш налог је потребан два корака. Следите наведене кораке да бисте завршили пријављивање."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Следите наведене кораке да бисте завршили пријављивање."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
     "message": "Следите наведене кораке да бисте завршили пријаву са својим безбедносним кључем."
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Група/Корисник"
   },
-  "lowKdfIterations": {
-    "message": "Ниска KDF понављања"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Ажурирајте подешавања шифровања да бисте испунили нове безбедносне препоруке и побољшали заштиту налога."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Ако наставите, одјавићете се са свих активних сесија. Мораћете поново да се пријавите и завршитепријаве у два корака, ако имате. Препоручујемо да извезете трезор пре него што промените подешавања шифровања да бисте спречили губитак података."
   },
@@ -8389,7 +8803,7 @@
     "message": "Менаџер тајни"
   },
   "secretsManagerAccessDescription": {
-    "message": "Activate user access to Secrets Manager."
+    "message": "Активирај приступ кориснику Secrets Manager-у."
   },
   "userAccessSecretsManagerGA": {
     "message": "Овај корисник може приступити Менаџеру Тајни"
@@ -8459,7 +8873,7 @@
     }
   },
   "permanentlyDeletedSecretWithId": {
-    "message": "Permanently deleted a secret with identifier: $SECRET_ID$",
+    "message": "Тајна трајно избрисана са идентификатором: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8468,7 +8882,7 @@
     }
   },
   "restoredSecretWithId": {
-    "message": "Restored a secret with identifier: $SECRET_ID$",
+    "message": "Тајна враћена са идентификатором: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Приступљен пројекат са ИД: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Уређен пројекат са ИД: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Избрисан пројекат са ИД: $PROJECT_ID$",
     "placeholders": {
@@ -8941,7 +9434,7 @@
     "message": "Недостаје имејл корисника"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "Имејл активног корисника није пронађен. Одјављивање."
   },
   "deviceTrusted": {
     "message": "Уређај поуздан"
@@ -8950,7 +9443,7 @@
     "message": "Позови кориснике"
   },
   "secretsManagerForPlan": {
-    "message": "Secrets Manager for $PLAN$",
+    "message": "Secrets Manager за $PLAN$",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Пријављено!"
   },
-  "beta": {
-    "message": "Бета"
-  },
   "assignCollectionAccess": {
     "message": "Додели приступ збирке"
   },
@@ -9330,6 +9820,14 @@
     "message": "Превише скупо",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Бесплатно 1 годину"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Додели"
   },
+  "assignTasks": {
+    "message": "Додели задатке"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Додели колекцијама"
   },
@@ -9364,10 +9868,10 @@
     "message": "Додели овим колекцијама"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "Само чланови организације са приступом овим збиркама ће моћи да виде ставку."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "Само чланови организације са приступом овим збиркама ће моћи да виде ставке."
   },
   "selectCollectionsToAssign": {
     "message": "Изаберите колекције за доделу"
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Пошаљите податке о догађају на вашу инстанцу Logscale-а"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Није успело сачувавање интеграције. Покушајте поново касније."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9979,7 +10489,7 @@
     "message": "Управљени провајдери сервиса"
   },
   "managedServiceProvider": {
-    "message": "Managed service provider"
+    "message": "Управљачки провајдер сервиса"
   },
   "multiOrganizationEnterprise": {
     "message": "Multi-organization enterprise"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Ниске KDF итерације. Повећајте број понављања да бисте побољшали безбедност свог налога."
-  },
-  "changeKDFSettings": {
-    "message": "Променити KDF подешавања"
-  },
   "secureYourInfrastructure": {
     "message": "Обезбедите своју инфраструктуру"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Не"
   },
-  "higherKDFIterations": {
-    "message": "Веће KDF итерације може помоћи у заштити ваше главне лозинке од грубе присиле од стране нападача."
-  },
-  "incrementsOf100,000": {
-    "message": "повећање од 100.000"
-  },
-  "smallIncrements": {
-    "message": "малим корацима"
-  },
   "kdfIterationRecommends": {
     "message": "Препоручујемо 600.000 или више"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "За старије уређаје, постављање вашег КДФ-а превисоко може довести до проблема са перформансама. Повећајте вредност у $VALUE$ и тестирајте своје уређаје.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Контактирајте корисничку подршку да бисте обновили претплату."
   },
@@ -10681,16 +11167,16 @@
     "message": "Ваш рачун је пријављен на сваку од доле наведених уређаја."
   },
   "claimedDomains": {
-    "message": "Claimed domains"
+    "message": "Захтевани домене"
   },
   "claimDomain": {
-    "message": "Claim domain"
+    "message": "Захтевај домен"
   },
   "reclaimDomain": {
-    "message": "Reclaim domain"
+    "message": "Поновно уахтевање домена"
   },
   "claimDomainNameInputHint": {
-    "message": "Example: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "Пример: mydomain.com. Под-домени захтевају посебне уносе да би били захтевани."
   },
   "automaticClaimedDomains": {
     "message": "Automatic Claimed Domains"
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Домен захтеван"
   },
+  "itemAddedToFavorites": {
+    "message": "Ставка је додата у фаворите"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Ставка је уклоњена из фаворите"
+  },
+  "copyNote": {
+    "message": "Копирај белешку"
+  },
   "organizationNameMaxLength": {
     "message": "Име организације не може прећи 50 знакова."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Успешно је отворен додатак. Сада можете да прегледате своје ризичне лозинке."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Имали смо проблема са отварањем додатка. Отворите Bitwarden иконицу",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "са алатне траке.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Ваша претплата ће ускоро бити обновљена. Да бисте обезбедили непрекинуто пружање услуге, контактирајте $RESELLER$ ради потврде обновљења пре $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,23 +11511,63 @@
   "searchArchive": {
     "message": "Претражи архиву"
   },
-  "archive": {
-    "message": "Архива"
+  "archiveNoun": {
+    "message": "Архива",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Архива",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "Нема ставка у архиви"
   },
-  "archivedItemsDescription": {
-    "message": "Архивиране ставке ће се овде појавити и бити искључени из општих резултата претраге и сугестија о ауто-пуњењу."
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
   },
   "businessUnit": {
     "message": "Пословна јединица"
   },
   "businessUnits": {
-    "message": "Business Units"
+    "message": "Пословне јединице"
   },
   "newBusinessUnit": {
-    "message": "New business unit"
+    "message": "Нова пословна јединица"
   },
   "sendsTitleNoItems": {
     "message": "Шаљите бзбедно осетљиве информације",
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden екстензија инсталираана!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Отворите екстензију да бисте се пријавили и започели ауто-попуњавање."
   },
@@ -11154,6 +11684,14 @@
     "message": "Центар за учење",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Центар за помоћ",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11188,10 +11726,10 @@
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "О овом подешавању"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden ће користити сачуване URI-јеве за пријаву да би одредио коју икону или URL за промену лозинке треба користити како би побољшао ваше искуство. Никакви подаци нису сакупљени нити сачувани приликом коришћења ове услуге."
   },
   "billingAddress": {
     "message": "Адреса рачуна"
@@ -11293,7 +11831,7 @@
     "message": "Неограничене тајне и пројекте"
   },
   "providersubscriptionCanceled": {
-    "message": "Subscription canceled"
+    "message": "Претплата је отказана"
   },
   "providersubCanceledmessage": {
     "message": "To resubscribe, contact Bitwarden Customer Support."
@@ -11406,13 +11944,13 @@
     "message": "Advanced capabilities for any organization"
   },
   "planNameCustom": {
-    "message": "Custom plan"
+    "message": "Прилагођени план"
   },
   "planDescCustom": {
     "message": "Bitwarden scales with businesses of all sizes to secure passwords and sensitive information. If you're part of a large enterprise, contact sales to request a quote."
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "Уграђени аутентификатор"
   },
   "breachMonitoring": {
     "message": "Праћење повreda безбедности"
@@ -11427,7 +11965,7 @@
     "message": "Неограничено дељење – изаберите ко шта може да види"
   },
   "familiesUnlimitedCollections": {
-    "message": "Unlimited family collections"
+    "message": "Неограничене фамилија колекције"
   },
   "familiesSharedStorage": {
     "message": "Заједничко складиштење важних породичних информација"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Бешавна интеграција"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Ажурирајте поставке за шифровање"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Ажурирајте своје поставке за шифровање"
+  },
+  "updateSettings": {
+    "message": "Ажурирај подешавања"
+  },
+  "algorithm": {
+    "message": "Алгоритам"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Изаберите како Bitwarden треба да шифрује ваше податке у сефу. Све опције су безбедне, али јаче методе нуде бољу заштиту - посебно од напада грубом силом. Bitwarden препоручује подразумевану поставку за већину корисника."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Повећање вредности изнад подразумеваних ће побољшати безбедност, али због тога ће вашем сефу бити потребно више времена да се откључа."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "О алгоритмима за шифровање"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 је добро тестиран метод шифровања који балансира безбедност и перформансе. Добро за све кориснике."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id нуди јачу заштиту од модерних напада. Најбоље за напредне кориснике са моћним уређајима."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP/Поштански број"
+  },
+  "cardNumberLabel": {
+    "message": "Број картице"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json
index 853e60c95bc..6432029d219 100644
--- a/apps/web/src/locales/sv/messages.json
+++ b/apps/web/src/locales/sv/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Riskinsikter"
-  },
   "passwordRisk": {
     "message": "Lösenordsrisk"
   },
+  "noEditPermissions": {
+    "message": "Du har inte behörighet att redigera detta objekt"
+  },
   "reviewAtRiskPasswords": {
     "message": "Granska risklösenord (svaga, exponerade eller återanvända) i olika applikationer. Välj ut de mest kritiska applikationerna för att prioritera säkerhetsåtgärder för användarna för att hantera risklösenord."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Granska inloggningar i riskzonen"
+  },
   "dataLastUpdated": {
     "message": "Data senast uppdaterade: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Du har inte skapat en rapport än"
+  },
   "notifiedMembers": {
     "message": "Meddelade medlemmar"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "Skapa nytt inloggningsobjekt"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "$PERCENT$% färdigt",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ av $TOTAL$ säkerhetsuppgifter slutförda",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Lösenordsändringsförlopp"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Tilldela medlemmar uppgifter för att övervaka framsteg"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Skicka påminnelser"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "När du markerar applikationer som kritiska kommer de att visas här."
+  },
+  "viewAtRiskMembers": {
+    "message": "Visa medlemmar i riskzonen"
+  },
+  "viewAtRiskApplications": {
+    "message": "Visa applikationer i riskzonen"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ av $TOTAL$ kritiska applikationer är i riskzonen på grund av lösenord i riskzonen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "Kritiska applikationer ($COUNT$)",
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "kritiska applikationer markerade"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ kritiska applikationer",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applikationer i riskzonen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ lösenord i riskzonen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ nya lösenord i riskzonen",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Meddelade medlemmar ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Inga applikationer hittades i $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "Ingen data hittades"
   },
-  "noAppsInOrgDescription": {
-    "message": "När användare sparar inloggningar visas applikationer här och visar eventuella riskfyllda lösenord. Markera kritiska appar och meddela användarna att de ska uppdatera lösenorden."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Markera applikationer som kritiska"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Hjälp medlemmar att förbättra sin säkerhet"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Övervaka framsteg"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generera rapport"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Du har inte markerat några applikationer som kritiska"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Markera app som kritisk"
   },
+  "markAsCritical": {
+    "message": "Markera som kritisk"
+  },
+  "applicationsSelected": {
+    "message": "applikationer markerade"
+  },
+  "selectApplication": {
+    "message": "Välj applikation"
+  },
+  "unselectApplication": {
+    "message": "Avmarkera applikation"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applikationer markerade som kritiska"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Misslyckades med att markera applikationer som kritiska"
+  },
   "application": {
     "message": "Applikation"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Riskutsatta medlemmar"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ medlemmar i riskzonen",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Dessa medlemmar loggar in i applikationer med svaga, exponerade eller återanvända lösenord."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Det finns inga medlemmar som loggar in i applikationer med svaga, exponerade eller återanvända lösenord."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Totalt antal applikationer"
   },
+  "applicationsNeedingReview": {
+    "message": "Applikationer som behöver granskning"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Granska nya applikationer"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ nya applikationer",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Granska nya applikationer för att markera som kritiska och hålla din organisation säker"
+  },
+  "reviewNow": {
+    "message": "Granska nu"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Inga nya applikationer att granska just nu"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Granska applikationer"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritera kritiska applikationer"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Granska nya applikationer"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Markera som kritisk funktionalitet kommer att implementeras i en framtida uppdatering"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "Nya applikationer granskade"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Fel vid sparande av granskningsstatus"
+  },
+  "pleaseTryAgain": {
+    "message": "Försök igen"
+  },
   "unmarkAsCritical": {
     "message": "Avmarkera som kritisk"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoriter"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Typer"
   },
@@ -782,11 +994,11 @@
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "Ny textsändning",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "Ny filsändning",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
@@ -810,11 +1022,11 @@
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "Redigera textsändning",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "Redigera filsändning",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Håll det här fönstret öppet och följ anvisningarna från din webbläsare."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Autentisering med inloggningsnyckel misslyckades. Försök igen."
+  },
   "useADifferentLogInMethod": {
     "message": "Använd en annan inloggningsmetod"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Använd Single Sign-On"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Din organisation kräver single sign-on."
+  },
   "welcomeBack": {
     "message": "Välkommen tillbaka"
   },
@@ -1301,7 +1519,7 @@
     "message": "Tryck på din YubiKey för att autentisera"
   },
   "authenticationTimeout": {
-    "message": "Timeout för autentisering"
+    "message": "Tidsgräns för autentisering"
   },
   "authenticationSessionTimedOut": {
     "message": "Autentiseringssessionen timade ut. Vänligen starta om inloggningsprocessen."
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Ogiltigt huvudlösenord"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ogiltigt huvudlösenord. Bekräfta att din e-postadress är korrekt och ditt konto skapades på $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Ogiltigt fillösenord, använd lösenordet du angav när du skapade exportfilen."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Det finns inga objekt att visa."
   },
+  "noItemsInTrash": {
+    "message": "Inga objekt i papperskorgen"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Objekt som du tar bort kommer att visas här och raderas permanent efter 30 dagar"
+  },
+  "noItemsInVault": {
+    "message": "Inga objekt i valvet"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "Du har inga favoritobjekt"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Lägg till ofta använda objekt till favoriter för snabb åtkomst."
+  },
+  "noSearchResults": {
+    "message": "Inga sökresultat returnerades"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Töm filter eller försök med en annan sökterm"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Du har inte behörighet att se alla objekt i denna samling."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Inställningar för krypteringsnyckel"
   },
-  "kdfAlgorithm": {
-    "message": "KDF-algoritm"
-  },
   "kdfIterations": {
     "message": "KDF-iterationer"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Högre KDF-iterationer, minne och parallellism kan hjälpa till att skydda ditt huvudlösenord från att bli brutalt tvingad av en angripare."
   },
-  "changeKdf": {
-    "message": "Ändra KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Inställningarna för krypteringsnyckel ändrades"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Se till att ditt konto har tillräckligt mycket tillgänglig kredit för detta köp. Om ditt konto inte har tillräckligt med tillgänglig kredit, kommer din sparade standardbetalningsmetod användas för skillnaden. Du kan lägga till kredit till ditt konto från faktureringssidan."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Kontots kredit kan användas för att göra köp. Tillgänglig kredit kommer automatiskt tillämpas mot fakturor som genereras för detta konto."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Nästa debitering"
   },
+  "nextChargeHeader": {
+    "message": "Nästa betalning"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Detaljer"
   },
+  "discount": {
+    "message": "rabatt"
+  },
   "downloadLicense": {
     "message": "Hämta licens"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Uppdatera webbläsare"
   },
-  "generatingYourRiskInsights": {
-    "message": "Skapa din riskinsikt..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Hämtar medlemsdata..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyserar lösenordshälsa..."
+  },
+  "calculatingRiskScores": {
+    "message": "Beräknar riskpoäng..."
+  },
+  "generatingReportData": {
+    "message": "Genererar rapportdata..."
+  },
+  "savingReport": {
+    "message": "Sparar rapport..."
+  },
+  "compilingInsights": {
+    "message": "Sammanställer insikter..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "Detta kan ta några minuter."
+  },
+  "riskInsightsRunReport": {
+    "message": "Kör rapport"
   },
   "updateBrowserDesc": {
     "message": "Du använder en webbläsare som inte stöds. Webbvalvet kanske inte fungerar som det ska."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Inbjudan accepterades"
   },
-  "inviteAcceptedDesc": {
-    "message": "Du kan komma åt denna organisation när en administratör har bekräftat ditt medlemskap. Vi skickar ett e-postmeddelande till dig när det sker."
+  "invitationAcceptedDesc": {
+    "message": "Accepterade din inbjudan."
   },
   "inviteInitAcceptedDesc": {
     "message": "Du har nu tillgång till denna organisation."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organisationen är inaktiverad"
   },
+  "organizationIsSuspended": {
+    "message": "Organisationen är avstängd"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Avstängda organisationer kan inte nås. Kontakta din organisationsägare för hjälp."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Servicekonton kan inte skapas i avstängda organisationer. Kontakta din organisationsägare för att få hjälp."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Det går inte att komma åt objekt i avstängda organisationer. Kontakta din organisationsägare för hjälp."
-  },
   "licenseIsExpired": {
     "message": "Licensen har upphört att gälla."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO-identifierare"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Ge detta ID till dina medlemmar så att de kan logga in med SSO. För att kringgå detta steg, konfigurera ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Läs mer",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Avlänka SSO"
@@ -5518,9 +5809,9 @@
     "message": "Kräv att alla objekt ägs av en organisation och ta bort möjligheten att lagra objekt på kontonivå.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Alla objekt kommer att ägas och sparas i organisationen, vilket möjliggör kontroll, synlighet och rapportering för hela organisationen. När funktionen är aktiverad finns en standardsamling tillgänglig för varje medlem att lagra objekt i. Läs mer om hur du hanterar ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "livscykel för inloggningsuppgifter",
@@ -5545,6 +5836,65 @@
     "message": "Läs mer om ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Tillgänglig nu"
+  },
+  "autoConfirm": {
+    "message": "Automatisk bekräftelse av nya användare"
+  },
+  "autoConfirmDescription": {
+    "message": "Nya användare som bjuds in till organisationen kommer automatiskt att bekräftas när en administratörs enhet är upplåst.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Så här aktiverar du automatisk användarbekräftelse"
+  },
+  "autoConfirmExtension1": {
+    "message": "Öppna ditt Bitwarden-tillägg"
+  },
+  "autoConfirmExtension2": {
+    "message": "Välj",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Slå på",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Nya användare som bjuds in till organisationen kommer automatiskt att bekräftas när en administratörs enhet är upplåst. Innan du aktiverar denna policy, granska och godkänn följande: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potentiell säkerhetsrisk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Läs mer om riskerna",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "En organisationspolicy krävs. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Ingen nödåtkomst. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Nödåtkomst kommer att tas bort."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Jag accepterar dessa risker och policyuppdateringar"
+  },
   "personalOwnership": {
     "message": "Radera individuellt valv"
   },
@@ -5558,10 +5908,10 @@
     "message": "På grund av en av företagets policyer är du begränsad från att spara objekt till ditt personliga valv. Ändra ägarskap till en organisation och välj från tillgängliga samlingar."
   },
   "desktopAutotypePolicy": {
-    "message": "Desktop Autotype Default Setting"
+    "message": "Standardinställning för autotype"
   },
   "desktopAutotypePolicyDesc": {
-    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "message": "Aktivera Desktop Autotype som standard för medlemmar. Medlemmar kan stänga av Desktop Autotype manuellt i skrivbordsklienten.",
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
@@ -5597,6 +5947,19 @@
     "message": "Tillåt inte användare att dölja sin e-postadress från mottagare när de skapar eller redigerar en Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Standardmatchning för URI"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Avgör när inloggningar föreslås för autofyll. Administratörer och ägare undantas från denna policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Standardmatchning för URI"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Ändrade policyn $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ditt huvudlösenord uppfyller inte en eller flera av organisationens policyer. För att få tillgång till valvet måste du uppdatera ditt huvudlösenord nu. Om du fortsätter loggas du ut från din nuvarande session och måste logga in igen. Aktiva sessioner på andra enheter kan fortsätta att vara aktiva i upp till en timme."
   },
-  "automaticAppLogin": {
-    "message": "Automatiskt logga in användare för tillåtna applikationer"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Inloggningsformulär fylls i och skickas automatiskt för appar som startas från din konfigurerade identitetsleverantör."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identitetsleverantörens värd"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Din organisation har uppdaterat dina dekrypteringsalternativ. Ange ett huvudlösenord för att komma åt ditt valv."
   },
-  "maximumVaultTimeout": {
-    "message": "Timeout för valv"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Tidsgräns för session"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Ange en maximal tidsgräns för valv för medlemmar."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Ställ in en maximal tidsgräns för sessioner för alla medlemmar förutom ägare."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximal tidsgräns för valv"
+  "maximumAllowedTimeout": {
+    "message": "Maximalt tillåten tidsgräns"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Ogiltig maximal tidsgräns för valv."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximalt tillåten tidsgräns krävs."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Tiden är ogiltig. Ändra minst ett värde."
+  },
+  "sessionTimeoutAction": {
+    "message": "Åtgärd vid sessions­tidsgräns"
+  },
+  "immediately": {
+    "message": "Omedelbart"
+  },
+  "onSystemLock": {
+    "message": "Vid låsning av datorn"
+  },
+  "onAppRestart": {
+    "message": "Vid omstart av app"
   },
   "hours": {
     "message": "Timmar"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minuter"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Är du säker på att du vill tillåta en maximal timeout av \"Aldrig\" för alla medlemmar?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Det här alternativet kommer att spara dina medlemmars krypteringsnycklar på deras enheter. Om du väljer det här alternativet, se till att deras enheter är tillräckligt skyddade."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Läs mer om enhetsskydd"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" kommer endast att gälla för webbläsare och skrivbordsapp"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Mobil- och webbappen kommer att använda \"vid omstart av app\" som deras högsta tillåtna timeout, eftersom alternativet inte stöds."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "I organisationens policyer har den maximalt tillåtna tidsgränsen för valvet angetts till $HOURS$ timme(n) och $MINUTES$ minut(er).",
     "placeholders": {
@@ -6729,7 +7122,7 @@
     "message": "SSO inaktiverad"
   },
   "emailMustLoginWithSso": {
-    "message": "$EMAIL$ must login with Single Sign-on",
+    "message": "$EMAIL$ måste logga in med Single Sign-on",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Du måste lägga till antingen basserverns URL eller minst en anpassad miljö."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "Webbadresser måste använda HTTPS."
+  },
   "apiUrl": {
     "message": "URL till API-server"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Åtkomst nekad. Du har inte behörighet att visa den här sidan."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Huvudlösenord"
   },
@@ -7075,11 +7492,11 @@
     }
   },
   "plusAddressedEmail": {
-    "message": "Plus adresserad e-post",
+    "message": "Plusadresserad e-post",
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
-    "message": "Använd din e-postleverantörs funktioner för underadressering."
+    "message": "Använd din e-postleverantörs funktion för subadressering."
   },
   "catchallEmail": {
     "message": "E-post för alla"
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Okänd hemlighet, du kan behöver begära behörighet för att komma åt denna hemlighet."
   },
+  "unknownServiceAccount": {
+    "message": "Okänt maskinkonto. Du kan behöva begära tillstånd för att få tillgång till detta maskinkonto."
+  },
   "unknownProject": {
     "message": "Okänt projekt, du kan behöver begära behörighet för att komma åt detta projekt."
   },
@@ -7671,11 +8091,11 @@
     "description": "Label for a secret (key/value pair)"
   },
   "serviceAccount": {
-    "message": "Tjänstkonto",
+    "message": "Tjänstekonto",
     "description": "A machine user which can be used to automate processes and access secrets in the system."
   },
   "serviceAccounts": {
-    "message": "Tjänstkonton",
+    "message": "Tjänstekonton",
     "description": "The title for the section that deals with service accounts."
   },
   "secrets": {
@@ -7699,7 +8119,7 @@
     "description": "Title for creating a new secret."
   },
   "newServiceAccount": {
-    "message": "Nytt tjänstkonto",
+    "message": "Nytt tjänstekonto",
     "description": "Title for creating a new service account."
   },
   "secretsNoItemsTitle": {
@@ -7714,7 +8134,7 @@
     "message": "Det finns inga hemligheter i papperskorgen."
   },
   "serviceAccountsNoItemsMessage": {
-    "message": "Skapa ett nytt tjänstkonto för att komma igång med automatisering av hemlig åtkomst.",
+    "message": "Skapa ett nytt tjänstekonto för att komma igång med automatisering av hemlig åtkomst.",
     "description": "Message to encourage the user to start creating service accounts."
   },
   "serviceAccountsNoItemsTitle": {
@@ -7726,19 +8146,19 @@
     "description": "Placeholder text for searching secrets."
   },
   "deleteServiceAccounts": {
-    "message": "Ta bort tjänstkonton",
+    "message": "Ta bort tjänstekonton",
     "description": "Title for the action to delete one or multiple service accounts."
   },
   "deleteServiceAccount": {
-    "message": "Ta bort tjänstkonto",
+    "message": "Ta bort tjänstekonto",
     "description": "Title for the action to delete a single service account."
   },
   "viewServiceAccount": {
-    "message": "Visa tjänstkonto",
+    "message": "Visa tjänstekonto",
     "description": "Action to view the details of a service account."
   },
   "deleteServiceAccountDialogMessage": {
-    "message": "Att ta bort tjänstkontot $SERVICE_ACCOUNT$ är permanent och kan inte ångras.",
+    "message": "Att ta bort tjänstekontot $SERVICE_ACCOUNT$ är permanent och kan inte ångras.",
     "placeholders": {
       "service_account": {
         "content": "$1",
@@ -7747,7 +8167,7 @@
     }
   },
   "deleteServiceAccountsDialogMessage": {
-    "message": "Att ta bort tjänstkonton är permanent och kan inte ångras."
+    "message": "Att ta bort tjänstekonton är permanent och kan inte ångras."
   },
   "deleteServiceAccountsConfirmMessage": {
     "message": "Radera $COUNT$ tjänstkonton",
@@ -7762,14 +8182,14 @@
     "message": "Servicekonto raderat"
   },
   "deleteServiceAccountsToast": {
-    "message": "Tjänstkonton togs bort"
+    "message": "Tjänstekonton togs bort"
   },
   "searchServiceAccounts": {
-    "message": "Sök efter tjänstkonton",
+    "message": "Sök efter tjänstekonton",
     "description": "Placeholder text for searching service accounts."
   },
   "editServiceAccount": {
-    "message": "Redigera tjänstkonto",
+    "message": "Redigera tjänstekonto",
     "description": "Title for editing a service account."
   },
   "addProject": {
@@ -7822,15 +8242,15 @@
     "description": ""
   },
   "serviceAccountName": {
-    "message": "Tjänstkontonamn",
+    "message": "Tjänstekontonamn",
     "description": "Label for the name of a service account"
   },
   "serviceAccountCreated": {
-    "message": "Tjänstkonto skapat",
+    "message": "Tjänstekonto skapat",
     "description": "Notifies that a new service account has been created"
   },
   "serviceAccountUpdated": {
-    "message": "Tjänstkonto uppdaterat",
+    "message": "Tjänstekonto uppdaterat",
     "description": "Notifies that a service account has been updated"
   },
   "typeOrSelectProjects": {
@@ -8359,13 +8779,13 @@
     "message": "Lägg till personer eller grupper för att börja samarbeta"
   },
   "projectEmptyServiceAccountAccessPolicies": {
-    "message": "Lägg till tjänstkonton för att bevilja åtkomst"
+    "message": "Lägg till tjänstekonton för att bevilja åtkomst"
   },
   "serviceAccountPeopleDescription": {
     "message": "Ge grupper eller personer åtkomst till detta servicekonto."
   },
   "serviceAccountProjectsDescription": {
-    "message": "Tilldela projekt till detta tjänstkonto. "
+    "message": "Tilldela projekt till detta tjänstekonto. "
   },
   "serviceAccountEmptyProjectAccesspolicies": {
     "message": "Lägg till projekt för att bevilja åtkomst"
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grupp/Användare"
   },
-  "lowKdfIterations": {
-    "message": "Låga KDF-iterationer"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Uppdatera dina krypteringsinställningar så att de uppfyller nya säkerhetsrekommendationer och förbättrar kontots skydd."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Om du fortsätter loggas du ut från alla aktiva sessioner. Du måste logga in igen och genomföra tvåstegsinloggning, om sådan finns. Vi rekommenderar att du exporterar ditt valv innan du ändrar dina krypteringsinställningar för att förhindra dataförlust."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Gick in i ett projekt med id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Redigerade ett projekt med identifieraren: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Tog bort grupp $GROUP_ID$ från maskinkonto med identifierare $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Skapade maskinkonto med identifierare: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Lade till grupp: $GROUP_ID$ till maskinkonto med identifierare: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Tog bort maskinkonto med identifierare: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Tog bort ett projekt med identifieraren: $PROJECT_ID$",
     "placeholders": {
@@ -8553,7 +9046,7 @@
     "message": "Skapa ett projekt"
   },
   "createServiceAccount": {
-    "message": "Skapa ett tjänstkonto"
+    "message": "Skapa ett tjänstekonto"
   },
   "downloadThe": {
     "message": "Ladda ner",
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Inloggad!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Tilldela samlingsåtkomst"
   },
@@ -9330,6 +9820,14 @@
     "message": "För dyrt",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Växlar till kostnadsfri plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Växlar till kostnadsfri organisation",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Gratis i 1 år"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Tilldela"
   },
+  "assignTasks": {
+    "message": "Tilldela uppgifter"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Skicka aviseringar om att ändra lösenord"
+  },
   "assignToCollections": {
     "message": "Tilldela till samlingar"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Skicka händelsedata till din Logscale-instans"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Skicka data om valvhändelser till din Datadog-instans"
+  },
   "failedToSaveIntegration": {
     "message": "Misslyckades med att spara integration. Försök igen senare."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Du måste vara organisationens ägare för att utföra denna åtgärd."
+  },
   "failedToDeleteIntegration": {
     "message": "Misslyckades med att ta bort integrationen. Försök igen senare."
   },
@@ -9855,7 +10365,7 @@
     "message": "Bärartoken"
   },
   "repositoryNameHint": {
-    "message": "Name of the repository to ingest into"
+    "message": "Namn på arkivet som ska importeras till"
   },
   "index": {
     "message": "Index"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Låga KDF-iterationer. Öka dina iterationer för att förbättra säkerheten för ditt konto."
-  },
-  "changeKDFSettings": {
-    "message": "Ändra KDF-inställningar"
-  },
   "secureYourInfrastructure": {
     "message": "Säkra din infrastruktur"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Av"
   },
-  "higherKDFIterations": {
-    "message": "Högre KDF-iterationer kan hjälpa till att skydda ditt huvudlösenord från att bli brute forced av en angripare."
-  },
-  "incrementsOf100,000": {
-    "message": "steg om 100.000"
-  },
-  "smallIncrements": {
-    "message": "små steg"
-  },
   "kdfIterationRecommends": {
     "message": "Vi rekommenderar 600.000 eller mer"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "För äldre enheter kan det leda till prestandaproblem om du ställer in KDF för högt. Öka värdet i $VALUE$ och testa dina enheter.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Kontakta kundtjänst för att återupprätta din prenumeration."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domänanspråk"
   },
+  "itemAddedToFavorites": {
+    "message": "Objekt tillagt i favoriter"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Objekt borttaget från favoriter"
+  },
+  "copyNote": {
+    "message": "Kopiera anteckning"
+  },
   "organizationNameMaxLength": {
     "message": "Organisationsnamnet får inte överstiga 50 tecken."
   },
@@ -10838,13 +11333,13 @@
     "message": "Vi hade problem med att öppna webbläsartillägget Bitwarden. Klicka på knappen för att öppna det nu."
   },
   "openExtension": {
-    "message": "Öppen förlängning"
+    "message": "Öppna tillägg"
   },
   "doNotHaveExtension": {
     "message": "Har du inte webbläsartillägget Bitwarden?"
   },
   "installExtension": {
-    "message": "Installera förlängning"
+    "message": "Installera tillägg"
   },
   "openedExtension": {
     "message": "Öppnade webbläsartillägget"
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Framgångsrikt öppnat webbläsartillägget Bitwarden. Du kan nu granska dina risklösenord."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Vi hade problem med att öppna webbläsartillägget Bitwarden. Öppna Bitwarden-ikonen",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "från verktygsfältet.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Din prenumeration kommer snart att förnyas. För att säkerställa oavbruten service, kontakta $RESELLER$ för att bekräfta din förnyelse före $RENEWAL_DATE$.",
     "placeholders": {
@@ -11022,16 +11509,56 @@
     "message": "Gratisorganisationer kan ha upp till 2 samlingar. Uppgradera till en betald plan för att lägga till fler samlingar."
   },
   "searchArchive": {
-    "message": "Search archive"
+    "message": "Sök i arkiv"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Arkiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arkivera",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Avarkivera"
+  },
+  "itemsInArchive": {
+    "message": "Objekt i arkivet"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "Inga objekt i arkivet"
   },
-  "archivedItemsDescription": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  "noItemsInArchiveDesc": {
+    "message": "Arkiverade objekt visas här och undantas från allmänna sökresultat och autofyllförslag."
+  },
+  "itemWasSentToArchive": {
+    "message": "Objektet skickades till arkivet"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Objekten har skickats till arkivet"
+  },
+  "itemUnarchived": {
+    "message": "Objektet har avarkiverats"
+  },
+  "bulkArchiveItems": {
+    "message": "Objekt arkiverade"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Objekt avarkiverade"
+  },
+  "archiveItem": {
+    "message": "Arkivera objekt",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Arkiverade objekt undantas från allmänna sökresultat och autofyllförslag. Är du säker på att du vill arkivera det här objektet?"
+  },
+  "archiveBulkItems": {
+    "message": "Arkivera objekt",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Arkiverade objekt undantas från allmänna sökresultat och autofyllförslag. Är du säker på att du vill arkivera dessa objekt?"
   },
   "businessUnit": {
     "message": "Affärsenhet"
@@ -11138,13 +11665,16 @@
     "message": "Hoppa till webbapp"
   },
   "bitwardenExtensionInstalled": {
-    "message": "Bitvärdesförlängningen installerad!"
+    "message": "Bitwarden-tillägg installerat!"
+  },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden-tillägget är installerat!"
   },
   "openExtensionToAutofill": {
     "message": "Öppna tillägget för att logga in och starta autofyllning."
   },
   "openBitwardenExtension": {
-    "message": "Öppna Bitwarden-förlängning"
+    "message": "Öppna Bitwarden-tillägget"
   },
   "gettingStartedWithBitwardenPart1": {
     "message": "För tips om hur du kommer igång med Bitwarden besök",
@@ -11154,6 +11684,14 @@
     "message": "Lärcentrum",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Om tillägget inte öppnades kan du behöva öppna Bitwarden från ikonen ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " på verktygsfältet.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Hjälpcenter",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11367,34 +11905,34 @@
     "message": "Verifiera nu."
   },
   "additionalStorageGB": {
-    "message": "Additional storage GB"
+    "message": "Ytterligare lagringsplats (GB)"
   },
   "additionalServiceAccountsV2": {
-    "message": "Additional machine accounts"
+    "message": "Ytterligare maskinkonton"
   },
   "secretsManagerSeats": {
-    "message": "Secrets Manager seats"
+    "message": "Secrets Manager-licenser"
   },
   "additionalStorage": {
     "message": "Ytterligare lagring"
   },
   "expandPurchaseDetails": {
-    "message": "Expand purchase details"
+    "message": "Visa köpuppgifter"
   },
   "collapsePurchaseDetails": {
-    "message": "Collapse purchase details"
+    "message": "Dölj köpuppgifter"
   },
   "familiesMembership": {
     "message": "Familjemedlemskap"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Komplett säkerhet online"
   },
   "planDescFamiliesV2": {
-    "message": "Premium security for your family"
+    "message": "Premiumsäkerhet för din familj"
   },
   "planDescFreeV2": {
-    "message": "Share with $COUNT$ other user",
+    "message": "Dela med $COUNT$ annan användare",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11403,37 +11941,37 @@
     }
   },
   "planDescEnterpriseV2": {
-    "message": "Advanced capabilities for any organization"
+    "message": "Avancerade förmågor för alla organisationer"
   },
   "planNameCustom": {
-    "message": "Custom plan"
+    "message": "Anpassad plan"
   },
   "planDescCustom": {
-    "message": "Bitwarden scales with businesses of all sizes to secure passwords and sensitive information. If you're part of a large enterprise, contact sales to request a quote."
+    "message": "Bitwarden skalar med företag i alla storlekar för att säkra lösenord och känslig information. Om du är en del av ett stort företag, kontakta vår försäljningsavdelning för att begära en offert."
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "Inbyggd authenticator"
   },
   "breachMonitoring": {
-    "message": "Breach monitoring"
+    "message": "Intrångsmonitorering"
   },
   "andMoreFeatures": {
     "message": "Och mer!"
   },
   "secureFileStorage": {
-    "message": "Secure file storage"
+    "message": "Säker fillagring"
   },
   "familiesUnlimitedSharing": {
-    "message": "Unlimited sharing - choose who sees what"
+    "message": "Obegränsad delning - välj vem som ser vad"
   },
   "familiesUnlimitedCollections": {
-    "message": "Unlimited family collections"
+    "message": "Obegränsade familjesamlingar"
   },
   "familiesSharedStorage": {
-    "message": "Shared storage for important family info"
+    "message": "Delad lagring för viktig familjeinformation"
   },
   "limitedUsersV2": {
-    "message": "Up to $COUNT$ members",
+    "message": "Upp till $COUNT$ medlemmar",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11442,7 +11980,7 @@
     }
   },
   "limitedCollectionsV2": {
-    "message": "Up to $COUNT$ collections",
+    "message": "Upp till $COUNT$ samlingar",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11451,13 +11989,13 @@
     }
   },
   "alwaysFree": {
-    "message": "Always free"
+    "message": "Alltid gratis"
   },
   "twoSecretsIncluded": {
-    "message": "2 secrets"
+    "message": "2 hemligheter"
   },
   "projectsIncludedV2": {
-    "message": "$COUNT$ project(s)",
+    "message": "$COUNT$ projekt",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11466,13 +12004,13 @@
     }
   },
   "secureItemSharing": {
-    "message": "Secure item sharing"
+    "message": "Säker objektdelning"
   },
   "scimSupport": {
-    "message": "SCIM support"
+    "message": "SCIM-stöd"
   },
   "includedMachineAccountsV2": {
-    "message": "$COUNT$ machine accounts",
+    "message": "$COUNT$ maskinkonton",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11481,21 +12019,160 @@
     }
   },
   "enterpriseSecurityPolicies": {
-    "message": "Enterprise security policies"
+    "message": "Säkerhetspolicyer för företag"
   },
   "selfHostOption": {
-    "message": "Self-host option"
+    "message": "Alternativ för self-hosting"
   },
   "complimentaryFamiliesPlan": {
-    "message": "Complimentary families plan for all users"
+    "message": "Kostnadsfri familjeplan för alla användare"
   },
   "strengthenCybersecurity": {
-    "message": "Strengthen cybersecurity"
+    "message": "Förbättrad cybersäkerhet"
   },
   "boostProductivity": {
-    "message": "Boost productivity"
+    "message": "Maximera produktiviteten"
   },
   "seamlessIntegration": {
-    "message": "Seamless integration"
+    "message": "Sömlös integration"
+  },
+  "families": {
+    "message": "Familjer"
+  },
+  "upgradeToFamilies": {
+    "message": "Uppgradera till Familjer"
+  },
+  "upgradeToPremium": {
+    "message": "Uppgradera till Premium"
+  },
+  "familiesUpdated": {
+    "message": "Du har uppgraderat till Familjer!"
+  },
+  "taxCalculationError": {
+    "message": "Ett fel uppstod vid beräkning av skatt för din plats. Försök igen."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Välkommen till Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Lås upp fler säkerhetsfunktioner med Premium, eller börja dela objekt med Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Priser exklusive moms och faktureras årligen."
+  },
+  "organizationNameDescription": {
+    "message": "Ditt organisationsnamn visas i inbjudningar som du skickar till medlemmar."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Fortsätt utan att uppgradera"
+  },
+  "upgradeYourPlan": {
+    "message": "Uppgradera ditt abonnemang"
+  },
+  "upgradeNow": {
+    "message": "Uppgradera nu"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Genom att fylla i detta formulär skapas en ny Familjer-organisation. Du kan uppgradera din kostnadsfria organisation från administratörskonsolen."
+  },
+  "upgradeErrorMessage": {
+    "message": "Vi stötte på ett fel vid bearbetningen av din uppgradering. Försök igen."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Du har Bitwarden Free-planen"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Uppgradera för fullständig säkerhet"
+  },
+  "viewbusinessplans": {
+    "message": "Visa prismodeller"
+  },
+  "updateEncryptionSettings": {
+    "message": "Uppdatera krypteringsinställningar"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Uppdatera dina krypteringsinställningar"
+  },
+  "updateSettings": {
+    "message": "Uppdatera inställningar"
+  },
+  "algorithm": {
+    "message": "Algoritm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Välj hur Bitwarden ska kryptera dina valvdata. Alla alternativ är säkra, men starkare metoder ger bättre skydd - särskilt mot uttömmande attacker. Bitwarden rekommenderar standardinställningen för de flesta användare."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Att öka värdena ovanför standard kommer att förbättra säkerheten, men ditt valv kan ta längre tid att låsa upp som ett resultat."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Om krypteringsalgoritmer"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 är en vältestad krypteringsmetod som balanserar säkerhet och prestanda. Bra för alla användare."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id erbjuder ett starkare skydd mot moderna attacker. Bäst för avancerade användare med kraftfulla enheter."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Postnummer"
+  },
+  "cardNumberLabel": {
+    "message": "Kortnummer"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Starta gratis testperiod för Families"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Konfigurera en upplåsningsmetod för att ändra tidsgränsåtgärden för valvet."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Företagets policykrav har tillämpats på dina tidsgränsalternativ"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Ditt valvs tidsgräns överskrider de begränsningar som fastställts av din organisation."
+  },
+  "neverLockWarning": {
+    "message": "Är du säker på att du vill använda alternativet ”Aldrig”? Att ställa in låsningsalternativet till ”Aldrig” lagrar valvets krypteringsnyckel på din enhet. Om du använder det här alternativet bör du se till att du håller enheten ordentligt skyddad."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Tidsgränsåtgärd"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Sessionstidsgräns"
+  },
+  "appearance": {
+    "message": "Utseende"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Tidsgränsen överskrider den begränsning som din organisation har ställt in: $HOURS$ timmar och $MINUTES$ minut(er) maximalt",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Är du säker på att du vill fortsätta?"
+  },
+  "userVerificationFailed": {
+    "message": "Verifiering av användare misslyckades."
   }
 }
diff --git a/apps/web/src/locales/ta/messages.json b/apps/web/src/locales/ta/messages.json
index dc3e32726d4..d6154ae9fcb 100644
--- a/apps/web/src/locales/ta/messages.json
+++ b/apps/web/src/locales/ta/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "அணுகல் நுண்ணறிவு"
   },
-  "riskInsights": {
-    "message": "ஆபத்து நுண்ணறிவு"
-  },
   "passwordRisk": {
     "message": "கடவுச்சொல் ஆபத்து"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "பயன்பாடுகள் முழுவதும் ஆபத்தான கடவுச்சொற்களை (பலவீனமான, அம்பலப்படுத்தப்பட்ட, அல்லது மீண்டும் பயன்படுத்தப்பட்ட) மதிப்பாய்வு செய்யவும். உங்கள் பயனர்களுக்கான ஆபத்தான கடவுச்சொற்களை நிவர்த்தி செய்ய பாதுகாப்பு நடவடிக்கைகளுக்கு முன்னுரிமை அளிக்க, உங்கள் மிக முக்கியமான பயன்பாடுகளைத் தேர்ந்தெடுக்கவும்."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "கடைசியாகத் தரவு புதுப்பிக்கப்பட்டது: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "அறிவிக்கப்பட்ட உறுப்பினர்கள்"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "புதிய உள்நுழைவு உருப்படியை உருவாக்கவும்"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "முக்கியமான பயன்பாடுகள் ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "அறிவிக்கப்பட்ட உறுப்பினர்கள் ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "$ORG NAME$ இல் எந்தப் பயன்பாடுகளும் கண்டறியப்படவில்லை",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "பயனர்கள் உள்நுழைவுகளை சேமிக்கும்போது, ​​பயன்பாடுகள் இங்கே தோன்றி, எந்தவொரு ஆபத்தான கடவுச்சொற்களையும் காண்பிக்கும். முக்கியமான பயன்பாடுகளைக் குறியிட்டு, கடவுச்சொற்களைப் புதுப்பிக்க பயனர்களுக்குத் தெரிவிக்கவும்."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "பயன்பாட்டை முக்கியமானதாகக் குறியிடு"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "பயன்பாடுகள் முக்கியமானதாகக் குறியிடப்பட்டன"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "பயன்பாடு"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "ஆபத்தில் உள்ள உறுப்பினர்கள்"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "இந்த உறுப்பினர்கள் பலவீனமான, அம்பலப்படுத்தப்பட்ட அல்லது மீண்டும் பயன்படுத்தப்பட்ட கடவுச்சொற்களுடன் பயன்பாடுகளில் உள்நுழைகிறார்கள்."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "பலவீனமான, அம்பலப்படுத்தப்பட்ட அல்லது மீண்டும் பயன்படுத்தப்பட்ட கடவுச்சொற்களுடன் பயன்பாடுகளில் உள்நுழையும் உறுப்பினர்கள் யாரும் இல்லை."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "மொத்த பயன்பாடுகள்"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "முக்கியமானதாக இருந்து குறியீட்டை நீக்கு"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "பிடித்தவை"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "வகைகள்"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "இந்த சாளரத்தை திறந்து வைத்து, உங்கள் உலாவியில் கேட்கப்படும் வழிமுறைகளைப் பின்பற்றவும்."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "வேறு உள்நுழைவு முறையைப் பயன்படுத்து"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "ஒற்றை உள்நுழைவைப் பயன்படுத்து"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "மீண்டும் வருக"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "தவறான முதன்மை கடவுச்சொல்"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "தவறான கோப்பு கடவுச்சொல், ஏற்றுமதி கோப்பை உருவாக்கியபோது நீங்கள் உள்ளிட்ட கடவுச்சொல்லைப் பயன்படுத்தவும்."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "பட்டியலிட உருப்படிகள் எதுவும் இல்லை."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "இந்தத் தொகுப்பிலுள்ள எல்லா உருப்படிகளையும் பார்க்க உங்களுக்கு அனுமதி இல்லை."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "என்க்ரிப்ஷன் சாவி அமைப்புகள்"
   },
-  "kdfAlgorithm": {
-    "message": "KDF அல்காரிதம்"
-  },
   "kdfIterations": {
     "message": "KDF மறுநிகழ்வுகள்"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "அதிக KDF இட்டரேஷன்கள், நினைவகம் மற்றும் பாரலலிசம் உங்கள் முதன்மை கடவுச்சொல்லை தாக்குபவர் ப்ரூட் ஃபோர்ஸ் செய்வதிலிருந்து பாதுகாக்க உதவும்."
   },
-  "changeKdf": {
-    "message": "KDF-ஐ மாற்றவும்"
-  },
   "encKeySettingsChanged": {
     "message": "என்கிரிப்ஷன் கீ அமைப்புகள் சேமிக்கப்பட்டன"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "இந்த வாங்குதலுக்கு உங்கள் கணக்கில் போதுமான கடன் இருப்பதை உறுதிசெய்யவும். உங்கள் கணக்கில் போதுமான கடன் இல்லையென்றால், வேறுபாட்டிற்கு கோப்பில் உள்ள உங்கள் இயல்புநிலை கட்டண முறை பயன்படுத்தப்படும். பில்லிங் பக்கத்திலிருந்து உங்கள் கணக்கில் நீங்கள் கடனைச் சேர்க்கலாம்."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "உங்கள் கணக்கின் கடனை வாங்குதல்களுக்குப் பயன்படுத்தலாம். கிடைக்கக்கூடிய எந்தக் கடனும் இந்த கணக்கிற்காக உருவாக்கப்பட்ட பில்களுக்கு தானாகவே பயன்படுத்தப்படும்."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "அடுத்த கட்டணம்"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "விவரங்கள்"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "லைசன்ஸ் கோப்பைப் பதிவிறக்கவும்"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "உலாவியைப் புதுப்பிக்கவும்"
   },
-  "generatingYourRiskInsights": {
-    "message": "உங்கள் இடர் நுண்ணறிவுகளை உருவாக்குகிறது..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "ஆதரிக்கப்படாத இணைய உலாவியைப் பயன்படுத்துகிறீர்கள். இணையப் பெட்டகம் சரியாகச் செயல்படாமல் போகலாம்."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "அழைப்பு ஏற்கப்பட்டது"
   },
-  "inviteAcceptedDesc": {
-    "message": "ஒரு நிர்வாகி உங்கள் உறுப்பினரை உறுதிப்படுத்தியவுடன் இந்த நிறுவனத்தை நீங்கள் அணுகலாம். அது நடக்கும்போது நாங்கள் உங்களுக்கு ஒரு மின்னஞ்சல் அனுப்புவோம்."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "நீங்கள் இப்போது இந்த நிறுவனத்தை அணுகலாம்."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "நிறுவனம் இடைநிறுத்தப்பட்டது"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "இடைநிறுத்தப்பட்ட நிறுவனங்களை அணுக முடியாது. உதவிக்கு உங்கள் நிறுவன உரிமையாளரைத் தொடர்புகொள்ளவும்."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "இடைநிறுத்தப்பட்ட நிறுவனங்களில் சேவை கணக்குகளை உருவாக்க முடியாது. உதவிக்கு உங்கள் நிறுவன உரிமையாளரைத் தொடர்புகொள்ளவும்."
   },
-  "disabledOrganizationFilterError": {
-    "message": "இடைநிறுத்தப்பட்ட நிறுவனங்களில் உள்ள பொருட்களை அணுக முடியாது. உதவிக்கு உங்கள் நிறுவன உரிமையாளரைத் தொடர்புகொள்ளவும்."
-  },
   "licenseIsExpired": {
     "message": "உரிமம் காலாவதியாகிவிட்டது."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO அடையாளங்காட்டி"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "SSO உடன் உள்நுழைய இந்த ஐடியை உங்கள் உறுப்பினர்களுக்கு வழங்கவும். இந்த படியைத் தவிர்க்க, அமைக்கவும் ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO இணைப்பை நீக்கு"
@@ -5518,9 +5809,9 @@
     "message": "கணக்கு மட்டத்தில் பொருட்களை சேமிக்கும் விருப்பத்தை நீக்கி, அனைத்து பொருட்களும் ஒரு நிறுவனத்திற்கு சொந்தமானதாக இருக்க வேண்டும்.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "அனைத்து பொருட்களும் நிறுவனத்திற்குச் சொந்தமானதாகவும், சேமிக்கப்படுவதாகவும் இருக்கும், இது நிறுவனம் முழுவதும் கட்டுப்பாடுகள், தெரிவுநிலை மற்றும் அறிக்கையிடலை செயல்படுத்துகிறது. இயக்கப்படும் போது, ஒவ்வொரு உறுப்பினருக்கும் பொருட்களைச் சேமிக்க ஒரு இயல்புநிலை கலெக்‌ஷன் கிடைக்கும். நிர்வகிப்பது பற்றி மேலும் அறிக ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "சான்றளிப்பு வாழ்க்கைச் சுழற்சி",
@@ -5545,6 +5836,65 @@
     "message": "பற்றி மேலும் அறிக ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "தனிப்பட்ட வால்ட்டை அகற்று"
   },
@@ -5597,6 +5947,19 @@
     "message": "ஒரு Send-ஐ உருவாக்கும்போது அல்லது திருத்தும்போது பெறுநர்களுடன் உறுப்பினரின் மின்னஞ்சல் முகவரியை எப்போதும் காட்டவும்.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "$ID$ கொள்கை மாற்றியமைக்கப்பட்டது.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "உங்கள் மாஸ்டர் கடவுச்சொல் ஒன்று அல்லது அதற்கு மேற்பட்ட உங்கள் நிறுவன கொள்கைகளைப் பூர்த்தி செய்யவில்லை. பெட்டகத்தை அணுக, நீங்கள் இப்போது உங்கள் மாஸ்டர் கடவுச்சொல்லைப் புதுப்பிக்க வேண்டும். தொடர்வது உங்கள் தற்போதைய அமர்விலிருந்து உங்களை வெளியேற்றும், மேலும் நீங்கள் மீண்டும் உள்நுழைய வேண்டும். பிற சாதனங்களில் உள்ள செயலில் உள்ள அமர்வுகள் ஒரு மணி நேரம் வரை செயலில் இருக்கலாம்."
   },
-  "automaticAppLogin": {
-    "message": "அனுமதிக்கப்பட்ட பயன்பாடுகளுக்குப் பயனர்களைத் தானாகவே உள்நுழை"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "உங்கள் கட்டமைக்கப்பட்ட அடையாள வழங்குநரிடமிருந்து தொடங்கப்பட்ட பயன்பாடுகளுக்கு உள்நுழைவு படிவங்கள் தானாகவே நிரப்பப்பட்டு சமர்ப்பிக்கப்படும்."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "அடையாள வழங்குநர் ஹோஸ்ட்"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "உங்கள் நிறுவனம் உங்கள் குறியாக்க நீக்குதல் விருப்பங்களை புதுப்பித்துள்ளது. உங்கள் பெட்டகத்தை அணுக ஒரு மாஸ்டர் கடவுச்சொல்லை அமைக்கவும்."
   },
-  "maximumVaultTimeout": {
-    "message": "பெட்டக காலக்கெடு"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "உறுப்பினர்களுக்கான அதிகபட்ச பெட்டக காலக்கெடுவை அமைக்கவும்."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "அதிகபட்ச பெட்டக காலக்கெடு"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "செல்லாத அதிகபட்ச பெட்டக காலக்கெடு."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "மணிநேரம்"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "நிமிடங்கள்"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "உங்கள் நிறுவன கொள்கைகள் உங்கள் அதிகபட்ச அனுமதிக்கப்பட்ட பெட்டக காலக்கெடுவை $HOURS$ மணிநேரங்கள் மற்றும் $MINUTES$ நிமிடங்களுக்கு அமைத்துள்ளன.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "நீங்கள் அடிப்படை சேவையக URL அல்லது குறைந்தபட்சம் ஒரு தனிப்பயன் சூழலையாவது சேர்க்க வேண்டும்."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API சேவையக URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "அணுகல் மறுக்கப்பட்டது. இந்தப் பக்கத்தைப் பார்க்க உங்களுக்கு அனுமதி இல்லை."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "மாஸ்டர் கடவுச்சொல்"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "அறியப்படாத ரகசியம், இந்த ரகசியத்தை அணுகுவதற்கு நீங்கள் அனுமதி கோர வேண்டியிருக்கலாம்."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "அறியப்படாத திட்டம், இந்த திட்டத்தை அணுகுவதற்கு நீங்கள் அனுமதி கோர வேண்டியிருக்கலாம்."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "குழு/பயனர்"
   },
-  "lowKdfIterations": {
-    "message": "குறைந்த KDF இட்டரேஷன்ஸ்"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "புதிய பாதுகாப்புப் பரிந்துரைகளை பூர்த்தி செய்யவும் மற்றும் கணக்கு பாதுகாப்பை மேம்படுத்தவும் உங்கள் குறியாக்க அமைப்புகளைப் புதுப்பிக்கவும்."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "தொடர்வது அனைத்து செயலில் உள்ள அமர்வுகளிலிருந்தும் உங்களை வெளியேற்றும். நீங்கள் மீண்டும் உள்நுழைய வேண்டும் மற்றும் இரண்டு-படி உள்நுழைவை முடிக்க வேண்டும், ஏதேனும் இருந்தால். தரவு இழப்பைத் தடுக்க உங்கள் குறியாக்க அமைப்புகளை மாற்றுவதற்கு முன் உங்கள் பெட்டகத்தை ஏற்றுமதி செய்யுமாறு பரிந்துரைக்கிறோம்."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "திட்டம் Id: $PROJECT_ID$ அணுகப்பட்டது.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "ஒரு திட்டத்தை திருத்தப்பட்டது: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "ஒரு திட்டத்தை நீக்கப்பட்டது: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "உள்நுழைந்துவிட்டீர்கள்!"
   },
-  "beta": {
-    "message": "பீட்டா"
-  },
   "assignCollectionAccess": {
     "message": "சேகரிப்பு அணுகலை ஒதுக்கவும்"
   },
@@ -9330,6 +9820,14 @@
     "message": "மிகவும் விலை உயர்ந்தது",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "1 வருடத்திற்கு இலவசம்"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "ஒதுக்கு"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "சேகரிப்புகளுக்கு ஒதுக்கு"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "உங்கள் Logscale இன்ஸ்டன்ஸுக்கு நிகழ்வுத் தரவை அனுப்பவும்"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "ஒருங்கிணைப்பைச் சேமிக்கத் தவறிவிட்டது. பின்னர் மீண்டும் முயற்சிக்கவும்."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "குறைந்த KDF இட்டரேஷன்கள். உங்கள் கணக்கின் பாதுகாப்பை மேம்படுத்த, உங்கள் இட்டரேஷன்களை அதிகரிக்கவும்."
-  },
-  "changeKDFSettings": {
-    "message": "KDF அமைப்புகளை மாற்றவும்"
-  },
   "secureYourInfrastructure": {
     "message": "உங்கள் கட்டமைப்பைப் பாதுகாக்கவும்"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "முடக்கப்பட்டுள்ளது"
   },
-  "higherKDFIterations": {
-    "message": "அதிக KDF இட்டரேஷன்கள், தாக்குபவரால் உங்கள் முதன்மை கடவுச்சொல் வலுக்கட்டாயமாகப் பயன்படுத்தப்படுவதிலிருந்து பாதுகாக்க உதவும்."
-  },
-  "incrementsOf100,000": {
-    "message": "100,000 ஆக அதிகரிப்பது"
-  },
-  "smallIncrements": {
-    "message": "சிறிய அதிகரிப்புகள்"
-  },
   "kdfIterationRecommends": {
     "message": "600,000 அல்லது அதற்கு மேல் இருக்க நாங்கள் பரிந்துரைக்கிறோம்"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "பழைய சாதனங்களுக்கு, உங்கள் KDF-ஐ மிக அதிகமாக அமைப்பது, செயல்திறன் சிக்கல்களுக்கு வழிவகுக்கலாம். $VALUE$-இல் மதிப்பை அதிகரித்து, உங்கள் சாதனங்களைச் சோதிக்கவும்.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " உங்கள் சந்தாவை மீண்டும் செயல்படுத்த, வாடிக்கையாளர் ஆதரவைத் தொடர்பு கொள்ளவும்."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "டொமைன் கோரப்பட்டது"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "அமைப்பின் பெயர் 50 எழுத்துகளைத் தாண்டக்கூடாது."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Bitwarden உலாவி நீட்டிப்பு வெற்றிகரமாக திறக்கப்பட்டது. உங்கள் ஆபத்தில் உள்ள கடவுச்சொற்களை இப்போது நீங்கள் மதிப்பாய்வு செய்யலாம்."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Bitwarden உலாவி நீட்டிப்பைத் திறப்பதில் எங்களுக்குச் சிக்கல் ஏற்பட்டது. Bitwarden ஐகானைத் திறக்கவும்",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "பணிப்பட்டி யிலிருந்து.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "உங்கள் சந்தா விரைவில் புதுப்பிக்கப்படும். தடையற்ற சேவையை உறுதிப்படுத்த, $RENEWAL_DATE$-க்கு முன் உங்கள் புதுப்பித்தலை உறுதிப்படுத்த $RESELLER$-ஐத் தொடர்பு கொள்ளவும்.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "வணிகப் பிரிவு"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden நீட்டிப்பு நிறுவப்பட்டது!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "உள்நுழைந்து தானாக நிரப்பத் தொடங்க நீட்டிப்பைத் திறக்கவும்."
   },
@@ -11154,6 +11684,14 @@
     "message": "கற்றல் மையம்",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "உதவி மையம்",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/te/messages.json b/apps/web/src/locales/te/messages.json
index 526b7567d99..0d08d207748 100644
--- a/apps/web/src/locales/te/messages.json
+++ b/apps/web/src/locales/te/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favorites"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Types"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/th/messages.json b/apps/web/src/locales/th/messages.json
index 0f9c3bea24d..fca56729464 100644
--- a/apps/web/src/locales/th/messages.json
+++ b/apps/web/src/locales/th/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
     "message": "Password Risk"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Data last updated: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Notified members"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Create new login item"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Notified members ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "You haven’t marked any applications as critical"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Mark app as critical"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Application"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "These are no members logging into applications with weak, exposed, or reused passwords."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Total applications"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "รายการโปรด"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "ชนิด"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Keep this window open and follow prompts from your browser."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Use a different log in method"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "Welcome back"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "รหัสผ่านหลักไม่ถูกต้อง"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Invalid file password, please use the password you entered when you created the export file."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "ไม่มีรายการการสำหรับแสดง"
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "You do not have permission to view all items in this collection."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Encryption key settings"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algorithm"
-  },
   "kdfIterations": {
     "message": "KDF iterations"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
   },
-  "changeKdf": {
-    "message": "Change KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Encryption key settings saved"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Next charge"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Details"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Download license"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Update browser"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "You are using an unsupported web browser. The web vault may not function properly."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Invitation accepted"
   },
-  "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "You can now access this organization."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Organization suspended"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
-  },
   "licenseIsExpired": {
     "message": "License is expired."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO identifier"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Unlink SSO"
@@ -5518,9 +5809,9 @@
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "credential lifecycle",
@@ -5545,6 +5836,65 @@
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5597,6 +5947,19 @@
     "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Modified policy $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Identity provider host"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
   },
-  "maximumVaultTimeout": {
-    "message": "Vault timeout"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Hours"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Minutes"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "You must add either the base Server URL or at least one custom environment."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "API server URL"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Access denied. You do not have permission to view this page."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Master password"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Group/User"
   },
-  "lowKdfIterations": {
-    "message": "Low KDF Iterations"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Logged in!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Assign collection access"
   },
@@ -9330,6 +9820,14 @@
     "message": "Too expensive",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Free for 1 year"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Assign"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Assign to collections"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
-  },
-  "changeKDFSettings": {
-    "message": "Change KDF settings"
-  },
   "secureYourInfrastructure": {
     "message": "Secure your infrastructure"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Off"
   },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
-  },
   "kdfIterationRecommends": {
     "message": "We recommend 600,000 or more"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Contact Customer Support to reinstate your subscription."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Domain claimed"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
   },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden extension installed!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Open the extension to log in and start autofilling."
   },
@@ -11154,6 +11684,14 @@
     "message": "Learning Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Help Center",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json
index f36a336a4d1..70136be6086 100644
--- a/apps/web/src/locales/tr/messages.json
+++ b/apps/web/src/locales/tr/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "Risk İçgörüleri"
-  },
   "passwordRisk": {
     "message": "Parola Riski"
   },
+  "noEditPermissions": {
+    "message": "Bu kaydı düzenleme yetkisine sahip değilsiniz"
+  },
   "reviewAtRiskPasswords": {
     "message": "Uygulamalar genelinde risk altındaki parolaları (zayıf, açığa çıkmış veya farklı yerlerde kullanılan) gözden geçirin. Kullanıcılarınız için risk altındaki parolalara yönelik güvenlik eylemlerine öncelik vermek üzere en kritik uygulamalarınızı seçin."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Risk altındaki hesapları inceleyin"
+  },
   "dataLastUpdated": {
     "message": "Son veri güncellemesi: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Bildirilen üyeler"
   },
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "Yeni hesap kaydı oluştur"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Uygulamaları kritik olarak işaretlediğinizde, bunlar burada görüntülenir."
+  "percentageCompleted": {
+    "message": "%$PERCENT$ tamamlandı",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "Once you mark applications critical, they will display here."
+  },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "Kritik uygulamalar ($COUNT$)",
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ kritik uygulama",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ yeni parola risk altında",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Bildirilen üyeler ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "$ORG NAME$ kuruluşunda hiçbir uygulama bulunmadı",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Kullanıcılar hesaplarını kaydettikçe uygulamalar burada görünür ve risk altındaki parolaları gösterir. Kritik uygulamaları işaretleyerek kullanıcıları parolalarını güncellemeleri için bilgilendirebilirsiniz."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Hiçbir uygulamayı kritik olarak işaretlemediniz"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Uygulamayı kritik olarak işaretle"
   },
+  "markAsCritical": {
+    "message": "Kritik olarak işaretle"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Kritik olarak işaretlenmiş uygulamalar"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Uygulama"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "Riskli üyeler"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Kritik uygulamalar için risk altındaki kayıtlara düzenleme erişimi olan üyeler"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ üye risk altında",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Bu üyeler uygulamalara zayıf, ele geçirilmiş veya tekrar kullanılan parolalarla giriş yapmaktadır."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Zayıf, ele geçirilmiş veya tekrar kullanılan parolayla uygulamalara giriş yapan üye yok."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Toplam uygulama"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "Şimdilik bu kadar!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Lütfen yeniden deneyin"
+  },
   "unmarkAsCritical": {
     "message": "Kritik olarak işaretlemeyi kaldır"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Favoriler"
   },
+  "taskSummary": {
+    "message": "Görev özeti"
+  },
   "types": {
     "message": "Türler"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Bu pencereyi açık tutun ve tarayıcınızdan gelen talimatları uygulayın."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Başka bir giriş yöntemi kullan"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Çoklu oturum açma kullan"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Kuruluşunuz çoklu oturum açma gerektiriyor."
+  },
   "welcomeBack": {
     "message": "Tekrar hoş geldiniz"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Geçersiz ana parola"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Ana parola geçersiz. E-posta adresinizin doğru olduğunu ve hesabınızın $HOST$ üzerinde oluşturulduğunu kontrol edin.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Geçersiz dosya parolası. Lütfen dışa aktardığınız dosyayı oluştururken girdiğiniz parolayı kullanın."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Listelenecek kayıt yok."
   },
+  "noItemsInTrash": {
+    "message": "Çöp kutusunda hiç kayıt yok"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Sildiğiniz kayıtlar burada görünecek ve 30 gün sonra kalıcı olarak silinecektir"
+  },
+  "noItemsInVault": {
+    "message": "Kasada hiç kayıt yok"
+  },
+  "emptyVaultDescription": {
+    "message": "Kasanız sadece parolalarınız için değil. Hesaplarınızı, kimliklerinizi, kredi kartlarınızı ve notlarınızı da güvenle burada depolayabilirsiniz."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Filtreleri temizleyin veya başka bir arama yapmayı deneyin"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Bu koleksiyondaki tüm kayıtları görmek için izniniz yok."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Şifreleme anahtarı ayarları"
   },
-  "kdfAlgorithm": {
-    "message": "KDF algoritması"
-  },
   "kdfIterations": {
     "message": "KDF iterasyonu"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "KDF iterasyonu, bellek ve paralelliğin yüksek olması; ana parolanızın kaba kuvvet saldırılarından korunmasına yardımcı olabilir."
   },
-  "changeKdf": {
-    "message": "KDF'i değiştir"
-  },
   "encKeySettingsChanged": {
     "message": "Şifreleme anahtarı ayarları kaydedildi"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Lütfen hesabınızda bu ödemeyi yapabilecek kadar kredi olduğundan emin olun. Eğer hesabınızda yeteri kadar kredi yoksa, aradaki fark varsayılan ödeme yöntemizinden karşılanacaktır. Faturalandırma sayfasından hesabınıza kredi ekleyebilirsiniz."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Hesabınızdaki krediyi satın alımlarda kullanabilirsiniz. Mevcut krediniz bu hesap için oluşturulan faturalardan otomatik olarak düşülecektir."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Sonraki ödeme"
   },
+  "nextChargeHeader": {
+    "message": "Sonraki ödeme"
+  },
+  "plan": {
+    "message": "Paket"
+  },
   "details": {
     "message": "Ayrıntılar"
   },
+  "discount": {
+    "message": "indirim"
+  },
   "downloadLicense": {
     "message": "Lisansı indir"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Tarayıcıyı güncelle"
   },
-  "generatingYourRiskInsights": {
-    "message": "Risk içgörüleriniz oluşturuluyor..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Desteklenmeyen bir web tarayıcısı kullanıyorsunuz. Web kasası düzgün çalışmayabilir."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Davet kabul edildi"
   },
-  "inviteAcceptedDesc": {
-    "message": "Yöneticiler üyeliğinizi onayladıktan sonra kuruluşa erişebilirsiniz. Üyeliğiniz onaylandığında size e-posta göndereceğiz."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Artık bu kuruluşa erişebilirsiniz."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Kuruluş askıya alındı"
   },
+  "organizationIsSuspended": {
+    "message": "Kuruluş askıya alındı"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Askıya alınmış kuruluşlardaki kayıtlara erişilemez. Destek almak için kuruluş sahibinizle iletişime geçin."
+  },
   "secretsAccessSuspended": {
     "message": "Askıya alınan kuruluşlara erişilemez. Lütfen yardım için kuruluşunuzun sahibiyle iletişime geçin."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Askıya alınan kuruluşlarda hizmet hesapları oluşturulamaz. Lütfen yardım için kuruluşunuzun sahibiyle iletişime geçin."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Askıya alınmış kuruluşlardaki kayıtlara erişilemez. Destek almak için kuruluş sahibinizle iletişime geçin."
-  },
   "licenseIsExpired": {
     "message": "Lisans süresi doldu."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO tanımlayıcı"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "SSO ile giriş yapmaları için bu kimliği üyelerinize sağlayın. Bu adımı atlamak için kurulum yapın ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "SSO bağlantısını kes"
@@ -5518,9 +5809,9 @@
     "message": "Tüm kayıtların bir kuruluşa ait olmasını zorunlu kılın ve kayıtları hesap düzeyinde depolama seçeneğini kaldırın.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Tüm kayıtlar kuruluşun mülkiyetinde olacak ve kuruluşta saklanacak, böylece kuruluş genelinde kontrol, görünürlük ve raporlama sağlanacaktır. Etkinleştirildiğinde, her üyenin kayıtları depolaması için varsayılan bir koleksiyon kullanılabilir hale gelir. Yönetme hakkında daha fazla bilgi edinin ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "kimlik bilgisi yaşam döngüsü",
@@ -5545,6 +5836,65 @@
     "message": "Hakkında daha fazla bilgi edinin ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Bitwarden uzantınızı açın"
+  },
+  "autoConfirmExtension2": {
+    "message": "Etkinleştir",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " seçeneğini seçin",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Kişisel kasayı kaldır"
   },
@@ -5597,6 +5947,19 @@
     "message": "Send oluştururken veya düzenlerken üyelerin e-posta adreslerini her zaman alıcılara göster.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Varsayılan URI eşleşme tespiti"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Varsayılan URI eşleşme tespiti"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "$ID$ ilkesi düzenlendi.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ana parolanız kuruluş ilkelerinizi karşılamıyor. Kasanıza erişmek için ana parolanızı güncellemelisiniz. Devam ettiğinizde oturumunuz kapanacak ve yeniden oturum açmanız gerekecektir. Diğer cihazlardaki aktif oturumlar bir saate kadar aktif kalabilir."
   },
-  "automaticAppLogin": {
-    "message": "İzin verilen uygulamalar için kullanıcıların otomatik olarak oturum açması"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Hesap formları, yapılandırılmış kimlik sağlayıcınızdan başlatılan uygulamalar için otomatik olarak doldurulacak ve gönderilecektir."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Kimlik sağlayıcı ana bilgisayarı"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Kuruluşunuz deşifre seçeneklerinizi güncelledi. Kasanıza erişmek için lütfen bir ana şifre belirleyin."
   },
-  "maximumVaultTimeout": {
-    "message": "Kasa zaman aşımı"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Oturum zaman aşımı"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Üyeler için maksimum kasa zaman aşımı ayarlayın."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Maksimum kasa zaman aşımı"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Geçersiz maksimum kasa zaman aşımı."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Oturum zaman aşımı eylemi"
+  },
+  "immediately": {
+    "message": "Hemen"
+  },
+  "onSystemLock": {
+    "message": "Sistem kilitlenince"
+  },
+  "onAppRestart": {
+    "message": "Uygulama yeniden başlatılınca"
   },
   "hours": {
     "message": "Saat"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Dakika"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Kuruluş ilkeleriniz izin verilen maksimum kasa zaman aşımını $HOURS$ saat $MINUTES$ dakika olarak belirlemiş.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Temel Sunucu URL’sini veya en az bir özel ortam eklemelisiniz."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL'ler HTTPS kullanmalıdır."
+  },
   "apiUrl": {
     "message": "API sunucusu URL'si"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Erişim engellendi. Bu sayfayı görüntüleme iznine sahip değilsiniz."
   },
+  "noPageAccess": {
+    "message": "Bu sayfaya erişiminiz yok"
+  },
   "masterPassword": {
     "message": "Ana parola"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Bilinmeyen sır, bu sırra erişmek için izin istemeniz gerekebilir."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Bilinmeyen proje, bu projeye erişmek için izin istemeniz gerekebilir."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Grup/Kullanıcı"
   },
-  "lowKdfIterations": {
-    "message": "Düşük KDF iterasyonu"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Yeni güvenlik önerilerini karşılamak ve hesap korumasını iyileştirmek için şifreleme ayarlarınızı güncelleyin."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Devam ettiğinizde tüm aktif oturumlardan çıkış yapacaksınız. Tekrar oturum açmanız ve varsa iki aşamalı oturum açma işlemini tamamlamanız gerekecektir. Veri kaybını önlemek için şifreleme ayarlarınızı değiştirmeden önce kasayı dışa aktarmanızı öneririz."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Kimliği: $PROJECT_ID$ olan bir projeye erişildi.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Tanımlayıcısı: $PROJECT_ID$ olan bir proje düzenlendi",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Tanımlayıcısı: $PROJECT_ID$ olan bir proje silindi",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Giriş yapıldı!"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "Koleksiyon erişimi ata"
   },
@@ -9330,6 +9820,14 @@
     "message": "Çok pahalı",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "1 yıl boyunca ücretsiz"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Ata"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Koleksiyonlara ata"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Etkinlik verilerini Logscale'e gönderin"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Entegrasyon kaydedilemedi. Lütfen daha sonra tekrar deneyin."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Entegrasyon silinemedi. Lütfen daha sonra tekrar deneyin."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Düşük KDF iterasyonları. Hesabınızın güvenliğini artırmak için iterasyonları artırın."
-  },
-  "changeKDFSettings": {
-    "message": "KDF ayarlarını değiştir"
-  },
   "secureYourInfrastructure": {
     "message": "Altyapınızı güvence altına alın"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Kapalı"
   },
-  "higherKDFIterations": {
-    "message": "KDF iterasyonunun daha yüksek olması ana parolanızı kaba kuvvet saldırılarına karşı daha iyi korur."
-  },
-  "incrementsOf100,000": {
-    "message": "100.000'lik artışlar"
-  },
-  "smallIncrements": {
-    "message": "küçük artışlar"
-  },
   "kdfIterationRecommends": {
     "message": "600.000 veya üstünü öneriyoruz"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "KDF'in çok yüksek olması eski cihazlarda performans sorunlarına yol açabilir. Değeri $VALUE$ halinde artırıp cihazlarınızı test edebilirsiniz.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Aboneliğinizi yeniden başlatmak için müşteri hizmetleri ile iletişime geçebilirsiniz."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Alan adı alındı"
   },
+  "itemAddedToFavorites": {
+    "message": "Kayıt favorilere eklendi"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Kayıt favorilerden silindi"
+  },
+  "copyNote": {
+    "message": "Notu kopyala"
+  },
   "organizationNameMaxLength": {
     "message": "Kuruluş adı 50 karakteri geçemez."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Bitwarden tarayıcı uzantısı başarıyla açıldı. Artık risk altındaki parolalarınızı gözden geçirebilirsiniz."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Bitwarden tarayıcı uzantısını açarken sorun yaşadık. Araç çubuğundan Bitwarden simgesini",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "açın.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Aboneliğiniz yakında yenilenecektir. Kesintisiz hizmet için, $RENEWAL_DATE$ tarihinden önce $RESELLER$ ile iletişime geçerek yenileme işleminizi onaylayın.",
     "placeholders": {
@@ -11024,14 +11511,54 @@
   "searchArchive": {
     "message": "Arşivde ara"
   },
-  "archive": {
-    "message": "Arşiv"
+  "archiveNoun": {
+    "message": "Arşiv",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Arşivle",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Arşivden çıkar"
+  },
+  "itemsInArchive": {
+    "message": "Arşivdeki kayıtlar"
   },
   "noItemsInArchive": {
     "message": "Arşivde kayıt yok"
   },
-  "archivedItemsDescription": {
-    "message": "Arşivlenen kayıtlar burada görünecek ve genel arama sonuçlarından ve otomatik doldurma önerilerinden hariç tutulacaktır."
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Kaydı arşivle",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
   },
   "businessUnit": {
     "message": "İş Birimi"
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden uzantısı yüklendi!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden uzantısı yüklendi!"
+  },
   "openExtensionToAutofill": {
     "message": "Otomatik doldurmaya başlamak için uzantıyı açıp giriş yapın."
   },
@@ -11154,6 +11684,14 @@
     "message": "Öğrenim Merkezi",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "Uzantı açılmadıysa araç çubuğundaki simgeye ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " tıklayarak Bitwarden'ı açmanız gerekebilir.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Yardım Merkezi",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Sorunsuz entegrasyon"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Upgrade to Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Unlock more security features with Premium, or start sharing items with Families"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Planınızı yükseltin"
+  },
+  "upgradeNow": {
+    "message": "Şimdi yükselt"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Şifreleme ayarlarını güncelle"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Şifreleme ayarlarınızı güncelleyin"
+  },
+  "updateSettings": {
+    "message": "Ayarları güncelle"
+  },
+  "algorithm": {
+    "message": "Algoritma"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Kasa zaman aşımı eyleminizi değiştirmek için kilit açma yönteminizi ayarlayın."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Zaman aşımı ayarlarınıza kurumsal ilke gereksinimleri uygulandı"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Kasa zaman aşımınız, kuruluşunuz tarafından belirlenen kısıtlamaları aşıyor."
+  },
+  "neverLockWarning": {
+    "message": "\"Asla\" seçeneğini kullanmak istediğinizden emin misiniz? Kilit seçeneklerinizi \"Asla\" olarak ayarlarsanız kasanızın şifreleme anahtarı cihazınızda saklanacaktır. Bu seçeneği kullanırsanız cihazınızı çok iyi korumalısınız."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Zaman aşımı eylemi"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Oturum zaman aşımı"
+  },
+  "appearance": {
+    "message": "Görünüm"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Zaman aşımınız kuruluşunuzun belirlediği maksimum süreyi aşıyor: Maksimum $HOURS$ saat $MINUTES$ dakika",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Devam etmek istediğinizden emin misiniz?"
+  },
+  "userVerificationFailed": {
+    "message": "Kullanıcı doğrulaması başarısız oldu."
   }
 }
diff --git a/apps/web/src/locales/uk/messages.json b/apps/web/src/locales/uk/messages.json
index f68cf42627d..1ccabaeddfb 100644
--- a/apps/web/src/locales/uk/messages.json
+++ b/apps/web/src/locales/uk/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Управління доступом"
   },
-  "riskInsights": {
-    "message": "Інформація щодо ризику"
-  },
   "passwordRisk": {
     "message": "Ризиковані паролі"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
     "message": "Переглядайте ризиковані паролі в різних програмах (слабкі, викриті, або повторно використані). Виберіть найбільш критичні програми, щоб визначити пріоритети дій щодо безпеки для користувачів, які використовують ризиковані паролі."
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Review at-risk logins"
+  },
   "dataLastUpdated": {
     "message": "Дані востаннє оновлено: $DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "You have not created a report yet"
+  },
   "notifiedMembers": {
     "message": "Сповіщення учасників"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Створити новий запис"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "$PERCENT$% complete",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "$COUNT$ out of $TOTAL$ security tasks completed",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Password change progress"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Assign members tasks to monitor progress"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Send reminders"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Once you mark applications critical, they will display here."
   },
+  "viewAtRiskMembers": {
+    "message": "View at-risk members"
+  },
+  "viewAtRiskApplications": {
+    "message": "View at-risk applications"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ out of $TOTAL$ critical applications are at-risk due to at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Критичні програми ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "critical applications marked"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ critical applications",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ applications at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ new passwords at-risk",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Сповіщення учасників ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Не знайдено програм в $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Коли користувачі зберігатимуть записи, тут з'являтимуться програми з ризикованими паролями. Позначте критичні програми та сповіщайте користувачів про необхідність зміни паролів."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Ви не відмітили жодного додатку в якості критичного"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Позначити програму критичною"
   },
+  "markAsCritical": {
+    "message": "Mark as critical"
+  },
+  "applicationsSelected": {
+    "message": "applications selected"
+  },
+  "selectApplication": {
+    "message": "Select application"
+  },
+  "unselectApplication": {
+    "message": "Unselect application"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Позначені критичні програми"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ applications marked as critical",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Failed to mark applications as critical"
+  },
   "application": {
     "message": "Програма"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Ризиковані учасники"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "Members with at-risk passwords"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ members at-risk",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Ці учасники використовують у програмах слабкі, викриті, або повторювані паролі."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Немає учасників, які використовують у програмах слабкі, викриті, або повторювані паролі."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Всього програм"
   },
+  "applicationsNeedingReview": {
+    "message": "Applications needing review"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ new applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Review new applications to mark as critical and keep your organization secure"
+  },
+  "reviewNow": {
+    "message": "Review now"
+  },
+  "allCaughtUp": {
+    "message": "All caught up!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "No new applications to review at this time"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Prioritize critical applications"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Click the star icon to mark an app as critical"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Mark as critical functionality will be implemented in a future update"
+  },
+  "applicationReviewSaved": {
+    "message": "Application review saved"
+  },
+  "newApplicationsReviewed": {
+    "message": "New applications reviewed"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Error saving review status"
+  },
+  "pleaseTryAgain": {
+    "message": "Please try again"
+  },
   "unmarkAsCritical": {
     "message": "Unmark as critical"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Обране"
   },
+  "taskSummary": {
+    "message": "Task summary"
+  },
   "types": {
     "message": "Типи"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Не закривайте це вікно та дотримуйтесь підказок у браузері."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Passkey authentication failed. Please try again."
+  },
   "useADifferentLogInMethod": {
     "message": "Використати інший спосіб входу"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Використати єдиний вхід"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Your organization requires single sign-on."
+  },
   "welcomeBack": {
     "message": "З поверненням"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Неправильний головний пароль"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Invalid master password. Confirm your email is correct and your account was created on $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Неправильний пароль файлу. Використайте пароль, який ви вводили під час створення експортованого файлу."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Немає записів."
   },
+  "noItemsInTrash": {
+    "message": "No items in trash"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+  },
+  "noItemsInVault": {
+    "message": "No items in the vault"
+  },
+  "emptyVaultDescription": {
+    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+  },
+  "emptyFavorites": {
+    "message": "You haven't favorited any items"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Add frequently used items to favorites for quick access."
+  },
+  "noSearchResults": {
+    "message": "No search results returned"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Clear filters or try another search term"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "У вас немає повноважень на перегляд усіх записів у цій збірці."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Налаштування ключа шифрування"
   },
-  "kdfAlgorithm": {
-    "message": "Алгоритм KDF"
-  },
   "kdfIterations": {
     "message": "Ітерації KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Вищі значення KDF-ітерацій, пам'яті й паралелізму можуть допомогти захистити ваш головний пароль від грубого зламу зловмисником."
   },
-  "changeKdf": {
-    "message": "Змінити KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Налаштування ключа шифрування збережено"
   },
@@ -2292,23 +2537,23 @@
     "message": "Відновити доступ"
   },
   "premium": {
-    "message": "Преміум",
+    "message": "Premium",
     "description": "Premium membership"
   },
   "premiumMembership": {
-    "message": "Преміум статус"
+    "message": "Передплата Premium"
   },
   "premiumRequired": {
-    "message": "Необхідна передплата преміум"
+    "message": "Необхідна передплата Premium"
   },
   "premiumRequiredDesc": {
-    "message": "Для використання цієї функції необхідна передплата преміум."
+    "message": "Для використання цієї функції необхідна передплата Premium."
   },
   "youHavePremiumAccess": {
-    "message": "У вас є преміумдоступ"
+    "message": "У вас є Premium"
   },
   "alreadyPremiumFromOrg": {
-    "message": "У вас вже є доступ до преміумфункцій, тому що ви входите до організації, яка вам їх надає."
+    "message": "У вас вже є доступ до функцій Premium, тому що ви входите до організації, яка вам їх надає."
   },
   "manage": {
     "message": "Керувати"
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Будь ласка, переконайтеся, що на вашому рахунку достатньо коштів для цієї покупки. Якщо на вашому рахунку недостатньо коштів, то різниця спишеться з використанням вашого типового способу оплати. Ви можете додати кошти до свого рахунку на сторінці Оплата."
   },
+  "notEnoughAccountCredit": {
+    "message": "You do not have enough account credit for this purchase. You can add credit to your account from the Billing page."
+  },
   "creditAppliedDesc": {
     "message": "Кредит вашого рахунку можна використовувати для покупок. Будь-який наявний кредит автоматично використовуватиметься для рахунків, згенерованих для цього облікового запису."
   },
@@ -2830,10 +3078,10 @@
     "message": "Пріоритетну технічну підтримку."
   },
   "premiumSignUpFuture": {
-    "message": "Усі майбутні преміумфункції. Їх буде більше!"
+    "message": "Усі майбутні функції Premium. Їх буде більше!"
   },
   "premiumPrice": {
-    "message": "Всього лише $PRICE$ / за рік!",
+    "message": "Лише $PRICE$ / рік!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2842,7 +3090,7 @@
     }
   },
   "premiumPriceWithFamilyPlan": {
-    "message": "Отримайте преміум – лише $PRICE$ /рік. Або отримайте преміум обліковий запис для користувачів $FAMILYPLANUSERCOUNT$ та необмежений спільний доступ з ",
+    "message": "Отримайте Premium – лише $PRICE$ /рік. Або отримайте обліковий запис Premium для користувачів $FAMILYPLANUSERCOUNT$ та необмежений спільний доступ з ",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Наступна оплата"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Подробиці"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Завантажити ліцензію"
   },
@@ -3120,7 +3377,7 @@
     "message": "Спосіб оплати оновлено."
   },
   "purchasePremium": {
-    "message": "Придбати преміум"
+    "message": "Придбати Premium"
   },
   "licenseFile": {
     "message": "Файл ліцензії"
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Оновити браузер"
   },
-  "generatingYourRiskInsights": {
-    "message": "Генерується інформація щодо ризиків..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Run report"
   },
   "updateBrowserDesc": {
     "message": "Ви використовуєте непідтримуваний браузер. Вебсховище може працювати неправильно."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Запрошення прийнято"
   },
-  "inviteAcceptedDesc": {
-    "message": "Ви можете отримати доступ до цієї організації одразу після підтвердження адміністратором. Ми надішлемо вам електронне повідомлення, коли це станеться."
+  "invitationAcceptedDesc": {
+    "message": "Successfully accepted your invitation."
   },
   "inviteInitAcceptedDesc": {
     "message": "Тепер ви маєте доступ до цієї організації."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Організацію призупинено"
   },
+  "organizationIsSuspended": {
+    "message": "Organization is suspended"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+  },
   "secretsAccessSuspended": {
     "message": "До призупинених організацій не можна отримати доступ. Зверніться до власника вашої організації для отримання допомоги."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "У призупинених організаціях не можна створювати службові облікові записи. Зверніться до власника вашої організації для отримання допомоги."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Записи у призупинених організаціях недоступні. Зверніться до власника вашої організації для отримання допомоги."
-  },
   "licenseIsExpired": {
     "message": "Термін дії ліцензії завершився."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO-ідентифікатор"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Надайте цей ID своїм учасникам для входу з використанням SSO. Щоб обійти цей крок, налаштуйте ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Learn more",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Від'єднати SSO"
@@ -5518,9 +5809,9 @@
     "message": "Вимагати, щоб усіма записами володіла організація, вилучивши функцію збереження на рівні облікового запису.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Усі записи зберігатимуться в організації та належатимуть їй, забезпечуючи керування, доступність і звітування на рівні організації. Якщо ввімкнути цю функцію, кожен учасник зможе зберігати записи в типовій збірці. Докладніше про ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "життєвий цикл облікових даних",
@@ -5545,6 +5836,65 @@
     "message": "Докладніше про ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Available now"
+  },
+  "autoConfirm": {
+    "message": "Automatic confirmation of new users"
+  },
+  "autoConfirmDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "How to turn on automatic user confirmation"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Successfully opened the Bitwarden browser extension. You can now activate the automatic user confirmation setting."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "New users invited to the organization will be automatically confirmed when an admin’s device is unlocked. Before turning on this policy, please review and agree to the following: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Potential security risk. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Automatic user confirmation could pose a security risk to your organization’s data."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Learn about the risks",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Single organization policy required. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "All members must only belong to this organization to activate this automation."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Single organization policy will extend to all roles. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "No emergency access. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Emergency Access will be removed."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "I accept these risks and policy updates"
+  },
   "personalOwnership": {
     "message": "Вилучити особисте сховище"
   },
@@ -5597,6 +5947,19 @@
     "message": "Завжди показувати отримувачам адресу е-пошти учасників під час створення чи редагування відправлень.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Default URI match detection"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Determine when logins are suggested for autofill. Admins and owners are exempt from this policy."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Default URI match detection"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Please select a valid URI match detection option.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Змінено політику $ID$.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ваш головний пароль не відповідає одній або більше політикам вашої організації. Щоб отримати доступ до сховища, вам необхідно оновити свій головний пароль зараз. Продовживши, ви вийдете з поточного сеансу, після чого потрібно буде повторно виконати вхід. Сеанси на інших пристроях можуть залишатися активними протягом однієї години."
   },
-  "automaticAppLogin": {
-    "message": "Автоматичний вхід користувачів для дозволених програм"
+  "automaticAppLoginWithSSO": {
+    "message": "Automatic login with SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Форми входу автоматично заповнюватимуться і надсилатимуться для програм, запущених від налаштованого провайдера ідентифікації."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Extend SSO security and convenience to unmanaged apps. When users launch an app from your identity provider, their login details are automatically filled and submitted, creating a one-click, secure flow from the identity provider to the app."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Вузол провайдера ідентифікації"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Ваша організація оновила параметри дешифрування. Встановіть головний пароль для доступу до сховища."
   },
-  "maximumVaultTimeout": {
-    "message": "Час очікування сховища"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Session timeout"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Встановити максимальний час очікування сховища для учасників."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Set a maximum session timeout for all members except owners."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Максимальний час очікування сховища"
+  "maximumAllowedTimeout": {
+    "message": "Maximum allowed timeout"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Недійсний максимальний час очікування сховища."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Maximum allowed timeout is required."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Time is invalid. Change at least one value."
+  },
+  "sessionTimeoutAction": {
+    "message": "Session timeout action"
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "onSystemLock": {
+    "message": "On system lock"
+  },
+  "onAppRestart": {
+    "message": "On app restart"
   },
   "hours": {
     "message": "Годин"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Хвилин"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Are you certain you want to allow a maximum timeout of \"Never\" for all members?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Learn more about device protection"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"System lock\" will only apply to the browser and desktop app"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Політикою вашої організації встановлено максимальний дозволений час очікування сховища $HOURS$ годин, $MINUTES$ хвилин.",
     "placeholders": {
@@ -6516,7 +6909,7 @@
     "message": "План Bitwarden Families включає"
   },
   "sponsoredFamiliesPremiumAccess": {
-    "message": "Преміумдоступ до 6 користувачів"
+    "message": "Доступ Premium для 6 користувачів"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
     "message": "Спільні збірки для учасників родини"
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Необхідно додати URL-адресу основного сервера, або принаймні одне користувацьке середовище."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URLs must use HTTPS."
+  },
   "apiUrl": {
     "message": "URL-адреса сервера API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. My items collections will not be included.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Доступ заборонено. У вас немає дозволу на перегляд цієї сторінки."
   },
+  "noPageAccess": {
+    "message": "You do not have access to this page"
+  },
   "masterPassword": {
     "message": "Головний пароль"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Unknown secret, you may need to request permission to access this secret."
   },
+  "unknownServiceAccount": {
+    "message": "Unknown machine account, you may need to request permission to access this machine account."
+  },
   "unknownProject": {
     "message": "Unknown project, you may need to request permission to access this project."
   },
@@ -7348,7 +7768,7 @@
     }
   },
   "premiumSubcriptionRequired": {
-    "message": "Необхідна передплата преміум"
+    "message": "Необхідна передплата Premium"
   },
   "scim": {
     "message": "Розгортання SCIM",
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Група/Користувач"
   },
-  "lowKdfIterations": {
-    "message": "Низьке значення ітерацій KDF"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Оновіть свої налаштування шифрування згідно з новими рекомендаціями щодо безпеки для вдосконалення захисту облікового запису."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Продовжуючи, ви вийдете з усіх активних сеансів. Необхідно буде повторно виконати вхід і пройти двоетапну перевірку, якщо вона увімкнена. Перед зміною налаштувань шифрування ми рекомендуємо експортувати ваше сховище, щоб запобігти можливій втраті даних."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Accessed a project with identifier: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Deleted machine account Id: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Edited a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Added user: $USER_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Removed user: $USER_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Removed group: $GROUP_ID$ from machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Created machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Added group: $GROUP_ID$ to machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Deleted machine account with identifier: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Deleted a project with identifier: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Ви увійшли!"
   },
-  "beta": {
-    "message": "Бета"
-  },
   "assignCollectionAccess": {
     "message": "Призначити доступ до збірки"
   },
@@ -9330,6 +9820,14 @@
     "message": "Висока ціна",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Безплатно на 1 рік"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Призначити"
   },
+  "assignTasks": {
+    "message": "Assign tasks"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Призначити до збірок"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Send event data to your Logscale instance"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Send vault event data to your Datadog instance"
+  },
   "failedToSaveIntegration": {
     "message": "Failed to save integration. Please try again later."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "You must be the organization owner to perform this action."
+  },
   "failedToDeleteIntegration": {
     "message": "Failed to delete integration. Please try again later."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Низьке значення ітерацій KDF. Збільште значення для посилення безпеки свого облікового запису."
-  },
-  "changeKDFSettings": {
-    "message": "Змінити налаштування KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Захистіть свою інфраструктуру"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Вимк"
   },
-  "higherKDFIterations": {
-    "message": "Вищі значення ітерацій KDF можуть допомогти захистити ваш головний пароль від грубого зламу зловмисником."
-  },
-  "incrementsOf100,000": {
-    "message": "кроком 100 000"
-  },
-  "smallIncrements": {
-    "message": "невеликі кроки"
-  },
   "kdfIterationRecommends": {
     "message": "Ми рекомендуємо 600 000 або більше"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Для старіших пристроїв занадто високе значення KDF може призвести до проблем зі швидкодією. Збільшуйте значення з $VALUE$ і тестуйте роботу на пристрої.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Зверніться до служби підтримки для відновлення передплати."
   },
@@ -10393,7 +10879,7 @@
     "message": "Захистіть паролі своєї родини"
   },
   "accessToPremiumFeatures": {
-    "message": "Доступ до преміальних функцій"
+    "message": "Доступ до функцій Premium"
   },
   "additionalStorageGbMessage": {
     "message": "ГБ додаткового сховища"
@@ -10432,7 +10918,7 @@
     "message": "RSA 4096-Bit"
   },
   "premiumAccounts": {
-    "message": "6 облікових записів Преміум"
+    "message": "6 облікових записів Premium"
   },
   "unlimitedSharing": {
     "message": "Необмежений спільний доступ"
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Домен заявлено"
   },
+  "itemAddedToFavorites": {
+    "message": "Item added to favorites"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Item removed from favorites"
+  },
+  "copyNote": {
+    "message": "Copy note"
+  },
   "organizationNameMaxLength": {
     "message": "Назва організації не може перевищувати 50 символів."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Розширення браузера Bitwarden успішно відкрито. Тепер ви можете переглянути свої ризиковані паролі."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Виникли проблеми з відкриттям розширення браузера Bitwarden. Відкрийте піктограму Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "з панелі інструментів.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Ваша передплата невдовзі поновиться. Щоб забезпечити безперебійну роботу, зверніться до $RESELLER$ для підтвердження поновлення до $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "Archive",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Archive",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
   },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Items were sent to archive"
+  },
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
+  },
+  "archiveItem": {
+    "message": "Archive item",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Бізнес-підрозділ"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Розширення Bitwarden встановлено!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Відкрийте розширення, щоб увійти й користуватися автозаповненням."
   },
@@ -11154,6 +11684,14 @@
     "message": "Навчальний центр",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Довідковий центр",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11388,10 +11926,10 @@
     "message": "Families membership"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Повна онлайн-безпека"
   },
   "planDescFamiliesV2": {
-    "message": "Premium security for your family"
+    "message": "Безпека Premium для вашої сім'ї"
   },
   "planDescFreeV2": {
     "message": "Share with $COUNT$ other user",
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Seamless integration"
+  },
+  "families": {
+    "message": "Families"
+  },
+  "upgradeToFamilies": {
+    "message": "Upgrade to Families"
+  },
+  "upgradeToPremium": {
+    "message": "Покращити до Premium"
+  },
+  "familiesUpdated": {
+    "message": "You've upgraded to Families!"
+  },
+  "taxCalculationError": {
+    "message": "There was an error calculating tax for your location. Please try again."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Welcome to Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Розблокуйте більше можливостей безпеки з передплатою Premium, або почніть ділитися записами з родиною"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Prices exclude tax and are billed annually."
+  },
+  "organizationNameDescription": {
+    "message": "Your organization name will appear in invitations you send to members."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Continue without upgrading"
+  },
+  "upgradeYourPlan": {
+    "message": "Upgrade your plan"
+  },
+  "upgradeNow": {
+    "message": "Upgrade now"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Completing this form will create a new Families organization. You can upgrade your Free organization from the Admin Console."
+  },
+  "upgradeErrorMessage": {
+    "message": "We encountered an error while processing your upgrade. Please try again."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "You have the Bitwarden Free plan"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Upgrade for complete security"
+  },
+  "viewbusinessplans": {
+    "message": "View business plans"
+  },
+  "updateEncryptionSettings": {
+    "message": "Update encryption settings"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Update your encryption settings"
+  },
+  "updateSettings": {
+    "message": "Update settings"
+  },
+  "algorithm": {
+    "message": "Algorithm"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Choose how Bitwarden should encrypt your vault data. All options are secure, but stronger methods offer better protection - especially against brute-force attacks. Bitwarden recommends the default setting for most users."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Increasing the values above the default will improve security, but your vault may take longer to unlock as a result."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "About encryption algorithms"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 is a well-tested encryption method that balances security and performance. Good for all users."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id offers stronger protection against modern attacks. Best for advanced users with powerful devices."
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / Postal code"
+  },
+  "cardNumberLabel": {
+    "message": "Card number"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Start free Families trial"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json
index 9a87b3e2c6c..370ca0f5ad4 100644
--- a/apps/web/src/locales/vi/messages.json
+++ b/apps/web/src/locales/vi/messages.json
@@ -17,14 +17,17 @@
   "accessIntelligence": {
     "message": "Trí tuệ truy cập"
   },
-  "riskInsights": {
-    "message": "Thấu hiểu về rủi ro"
-  },
   "passwordRisk": {
     "message": "Mật khẩu rủi ro"
   },
+  "noEditPermissions": {
+    "message": "You don't have permission to edit this item"
+  },
   "reviewAtRiskPasswords": {
-    "message": "Kiểm tra các mật khẩu có nguy cơ (yếu, bị lộ hoặc được sử dụng lại) trên các ứng dụng. Chọn các ứng dụng quan trọng nhất của bạn để ưu tiên các biện pháp bảo mật cho người dùng nhằm giải quyết các mật khẩu có nguy cơ."
+    "message": "Kiểm tra các mật khẩu có rủi ro (yếu, bị lộ hoặc được sử dụng lại) trên các ứng dụng. Chọn các ứng dụng quan trọng nhất của bạn để ưu tiên các biện pháp bảo mật cho người dùng nhằm giải quyết các mật khẩu có rủi ro."
+  },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "Xem lại các đăng nhập có rủi ro"
   },
   "dataLastUpdated": {
     "message": "Dữ liệu được cập nhật lần cuối: $DATE$",
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "Bạn chưa tạo báo cáo nào"
+  },
   "notifiedMembers": {
     "message": "Các thành viên được thông báo"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "Tạo mục đăng nhập mới"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "Hoàn thành $PERCENT$%",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "Hoàn thành $COUNT$ trên tổng số $TOTAL$ tác vụ bảo mật",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "Tiến trình thay đổi mật khẩu"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "Giao tác vụ cho thành viên để theo dõi tiến trình"
+  },
+  "onceYouReviewApplications": {
+    "message": "Once you review applications and mark them as critical, assign tasks to your members to change their passwords."
+  },
+  "sendReminders": {
+    "message": "Gửi lời nhắc"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "Khi bạn đánh dấu các ứng dụng là quan trọng, chúng sẽ hiển thị tại đây."
   },
+  "viewAtRiskMembers": {
+    "message": "Xem các thành viên gặp rủi ro"
+  },
+  "viewAtRiskApplications": {
+    "message": "Xem các ứng dụng gặp rủi ro"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ trên tổng số $TOTAL$ ứng dụng quan trọng đang gặp rủi ro do mật khẩu không an toàn",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "Ứng dụng quan trọng ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "ứng dụng quan trọng đã được đánh dấu"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ ứng dụng quan trọng",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ ứng dụng gặp rủi ro",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ mật khẩu có rủi ro",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ mật khẩu mới có rủi ro",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "Các thành viên đã được thông báo ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "Không tìm thấy ứng dụng nào trong $ORG NAME$",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "No data found"
   },
-  "noAppsInOrgDescription": {
-    "message": "Khi người dùng lưu thông tin đăng nhập, các ứng dụng sẽ hiển thị tại đây, bao gồm cả các mật khẩu có nguy cơ bị lộ. Đánh dấu các ứng dụng quan trọng và thông báo cho người dùng cập nhật mật khẩu."
+  "noDataInOrgDescription": {
+    "message": "Import your organization's login data to get started with Access Intelligence. Once you do that, you'll be able to:"
+  },
+  "feature1Title": {
+    "message": "Mark applications as critical"
+  },
+  "feature1Description": {
+    "message": "This will help you remove risks to your most important applications first."
+  },
+  "feature2Title": {
+    "message": "Help members improve their security"
+  },
+  "feature2Description": {
+    "message": "Assign at-risk members guided security tasks to update credentials."
+  },
+  "feature3Title": {
+    "message": "Monitor progress"
+  },
+  "feature3Description": {
+    "message": "Track changes over time to show security improvements."
+  },
+  "noReportsRunTitle": {
+    "message": "Generate report"
+  },
+  "noReportsRunDescription": {
+    "message": "You’re ready to start generating reports. Once you generate, you’ll be able to:"
   },
   "noCriticalApplicationsTitle": {
     "message": "Bạn chưa đánh dấu ứng dụng nào là quan trọng"
@@ -113,9 +220,33 @@
   "markAppAsCritical": {
     "message": "Đánh dấu các ứng dụng quan trọng"
   },
+  "markAsCritical": {
+    "message": "Đánh dấu là quan trọng"
+  },
+  "applicationsSelected": {
+    "message": "ứng dụng đã chọn"
+  },
+  "selectApplication": {
+    "message": "Chọn ứng dụng"
+  },
+  "unselectApplication": {
+    "message": "Bỏ chọn ứng dụng"
+  },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Các ứng dụng được đánh dấu là quan trọng"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ ứng dụng được đánh dấu là quan trọng",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "Không thể đánh dấu các ứng dụng là quan trọng"
+  },
   "application": {
     "message": "Ứng dụng"
   },
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "Các thành viên có rủi ro"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Thành viên có quyền chỉnh sửa đối với các mục có nguy cơ cho các ứng dụng quan trọng"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "These members have access to vulnerable items for critical applications."
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ thành viên có nguy cơ",
+  "membersWithAtRiskPasswords": {
+    "message": "Thành viên có mật khẩu rủi ro"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "Members of your organization will be assigned a task to change vulnerable passwords. They’ll receive a notification within their Bitwarden browser extension."
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ thành viên gặp rủi ro",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "Các thành viên này đang đăng nhập vào các ứng dụng bằng mật khẩu yếu, dễ bị lộ hoặc được sử dụng lại."
+  "atRiskMemberDescription": {
+    "message": "These members are logging into critical applications with weak, exposed, or reused passwords."
   },
   "atRiskMembersDescriptionNone": {
     "message": "Không có thành viên nào đăng nhập vào ứng dụng bằng mật khẩu yếu, dễ bị lộ hoặc được sử dụng lại."
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "Tổng số ứng dụng"
   },
+  "applicationsNeedingReview": {
+    "message": "Ứng dụng cần xem lại"
+  },
+  "newApplicationsCardTitle": {
+    "message": "Review new applications"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ ứng dụng mới",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "Xem lại các ứng dụng mới để đánh dấu là quan trọng và giữ an toàn cho tổ chức của bạn"
+  },
+  "reviewNow": {
+    "message": "Đánh giá ngay"
+  },
+  "allCaughtUp": {
+    "message": "Tất cả đã hoàn tất!"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "Hiện tại không có ứng dụng mới nào để đánh giá"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "Your organization has items saved for $COUNT$ applications",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "Review applications to secure the items most critical to your organization's security"
+  },
+  "reviewApplications": {
+    "message": "Review applications"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "Ưu tiên các ứng dụng quan trọng"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "Select which applications are most critical to your organization. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "reviewNewApplications": {
+    "message": "Review new applications"
+  },
+  "reviewNewAppsDescription": {
+    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "Nhấp vào biểu tượng ngôi sao để đánh dấu một ứng dụng là quan trọng"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "Chức năng đánh dấu là quan trọng sẽ được triển khai trong bản cập nhật sau"
+  },
+  "applicationReviewSaved": {
+    "message": "Đã lưu đánh giá ứng dụng"
+  },
+  "newApplicationsReviewed": {
+    "message": "Các ứng dụng mới đã được đánh giá"
+  },
+  "errorSavingReviewStatus": {
+    "message": "Lỗi lưu trạng thái đánh giá"
+  },
+  "pleaseTryAgain": {
+    "message": "Vui lòng thử lại"
+  },
   "unmarkAsCritical": {
     "message": "Bỏ đánh dấu là nghiêm trọng"
   },
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "Yêu thích"
   },
+  "taskSummary": {
+    "message": "Tóm tắt nhiệm vụ"
+  },
   "types": {
     "message": "Loại"
   },
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "Giữ cửa sổ này mở và làm theo lời nhắc từ trình duyệt của bạn."
   },
+  "passkeyAuthenticationFailed": {
+    "message": "Xác thực khóa bảo mật không thành công. Vui lòng thử lại."
+  },
   "useADifferentLogInMethod": {
     "message": "Dùng phương thức đăng nhập khác"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "Dùng đăng nhập một lần"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "Tổ chức của bạn yêu cầu đăng nhập một lần."
+  },
   "welcomeBack": {
     "message": "Chào mừng bạn trở lại"
   },
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "Mật khẩu chính không hợp lệ"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "Mật khẩu chính không hợp lệ. Xác nhận email của bạn là chính xác và tài khoản được tạo trên $HOST$.",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "Mật khẩu tập tin không hợp lệ, vui lòng sử dụng mật khẩu bạn đã nhập khi xuất tập tin."
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "Chưa có mục nào."
   },
+  "noItemsInTrash": {
+    "message": "Không có mục nào trong thùng rác"
+  },
+  "noItemsInTrashDesc": {
+    "message": "Các mục bạn xóa sẽ hiển thị tại đây và bị xóa vĩnh viễn sau 30 ngày"
+  },
+  "noItemsInVault": {
+    "message": "Không có mục nào trong kho lưu trữ"
+  },
+  "emptyVaultDescription": {
+    "message": "Kho lưu trữ không chỉ bảo vệ mật khẩu của bạn. Bạn có thể lưu trữ an toàn các thông tin đăng nhập, ID, thẻ và ghi chú tại đây."
+  },
+  "emptyFavorites": {
+    "message": "Bạn chưa đánh dấu mục nào là mục yêu thích"
+  },
+  "emptyFavoritesDesc": {
+    "message": "Thêm các mục thường dùng vào mục yêu thích để truy cập nhanh."
+  },
+  "noSearchResults": {
+    "message": "Không có kết quả tìm kiếm nào được trả về"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "Xóa bộ lọc hoặc thử cụm từ tìm kiếm khác"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "Bạn không có quyền xem tất cả mục trong bộ sưu tập này."
   },
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "Cài đặt mã khóa"
   },
-  "kdfAlgorithm": {
-    "message": "Thuật toán KDF"
-  },
   "kdfIterations": {
     "message": "Số lần KDF"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "Số lần lặp KDF cao hơn, bộ nhớ và khả năng song song có thể giúp bảo vệ mật khẩu chính của bạn khỏi bị tấn công bằng phương pháp dò tìm (brute force) từ phía kẻ tấn công."
   },
-  "changeKdf": {
-    "message": "Thay đổi KDF"
-  },
   "encKeySettingsChanged": {
     "message": "Đã thay đổi cài đặt mã khóa"
   },
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "Vui lòng đảm bảo tài khoản của bạn có đủ số dư để thực hiện giao dịch này. Nếu tài khoản của bạn không đủ số dư, phương thức thanh toán mặc định đã đăng ký sẽ được sử dụng để thanh toán phần chênh lệch. Bạn có thể nạp tiền vào tài khoản từ trang Thanh toán."
   },
+  "notEnoughAccountCredit": {
+    "message": "Bạn không có đủ tín dụng trong tài khoản cho giao dịch mua này. Bạn có thể thêm tín dụng vào tài khoản từ trang Thanh toán."
+  },
   "creditAppliedDesc": {
     "message": "Số dư trong tài khoản của bạn có thể được sử dụng để thực hiện các giao dịch mua hàng. Số dư khả dụng sẽ được tự động áp dụng cho các hóa đơn được tạo ra cho tài khoản này."
   },
@@ -2996,9 +3244,18 @@
   "nextCharge": {
     "message": "Lần thanh toán tiếp theo"
   },
+  "nextChargeHeader": {
+    "message": "Next Charge"
+  },
+  "plan": {
+    "message": "Plan"
+  },
   "details": {
     "message": "Chi tiết"
   },
+  "discount": {
+    "message": "discount"
+  },
   "downloadLicense": {
     "message": "Tải về tệp giấy phép"
   },
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "Cập nhật trình duyệt"
   },
-  "generatingYourRiskInsights": {
-    "message": "Đang tạo báo cáo phân tích rủi ro của bạn..."
+  "generatingYourAccessIntelligence": {
+    "message": "Generating your Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "Fetching member data..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "Analyzing password health..."
+  },
+  "calculatingRiskScores": {
+    "message": "Calculating risk scores..."
+  },
+  "generatingReportData": {
+    "message": "Generating report data..."
+  },
+  "savingReport": {
+    "message": "Saving report..."
+  },
+  "compilingInsights": {
+    "message": "Compiling insights..."
+  },
+  "loadingProgress": {
+    "message": "Loading progress"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "This might take a few minutes."
+  },
+  "riskInsightsRunReport": {
+    "message": "Chạy báo cáo"
   },
   "updateBrowserDesc": {
     "message": "Bạn đang sử dụng trình duyệt web không được hỗ trợ. Kho lưu trữ web có thể không hoạt động đúng cách."
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "Đã chấp nhận lời mời"
   },
-  "inviteAcceptedDesc": {
-    "message": "Bạn có thể truy cập tổ chức này sau khi quản trị viên xác nhận tư cách thành viên của bạn. Chúng tôi sẽ gửi email cho bạn khi được xác nhận."
+  "invitationAcceptedDesc": {
+    "message": "Đã chấp nhận lời mời của bạn thành công."
   },
   "inviteInitAcceptedDesc": {
     "message": "Bạn hiện có thể truy cập tổ chức này."
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "Tổ chức đã bị tạm ngưng"
   },
+  "organizationIsSuspended": {
+    "message": "Tổ chức đã bị tạm dừng"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "Không thể truy cập các mục trong tổ chức đã bị tạm ngưng. Vui lòng liên hệ với chủ sở hữu tổ chức của bạn để được hỗ trợ."
+  },
   "secretsAccessSuspended": {
     "message": "Không thể truy cập các tổ chức đã bị tạm ngưng. Vui lòng liên hệ với chủ sở hữu tổ chức của bạn để được hỗ trợ."
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "Không thể tạo tài khoản dịch vụ trong các tổ chức đã bị tạm ngưng. Vui lòng liên hệ với chủ sở hữu tổ chức của bạn để được hỗ trợ."
   },
-  "disabledOrganizationFilterError": {
-    "message": "Không thể truy cập các mục trong tổ chức đã bị tạm ngưng. Vui lòng liên hệ với chủ sở hữu tổ chức của bạn để được hỗ trợ."
-  },
   "licenseIsExpired": {
     "message": "Giấy phép đã hết hạn."
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "Mã định danh SSO"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "Cung cấp ID này cho các thành viên của bạn để đăng nhập bằng SSO. Để bỏ qua bước này, hãy thiết lập ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "Cung cấp ID này cho thành viên để đăng nhập bằng SSO. Thành viên có thể bỏ qua nhập định danh này trong SSO nếu một tên miền đã xác nhận được thiết lập. ",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "Tìm hiểu thêm",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "Hủy liên kết SSO"
@@ -5518,9 +5809,9 @@
     "message": "Yêu cầu tất cả các mục phải thuộc sở hữu của một tổ chức, loại bỏ tùy chọn lưu trữ mục ở cấp tài khoản.",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "Tất cả các mục sẽ thuộc sở hữu và được lưu vào tổ chức, cho phép kiểm soát, giám sát và báo cáo trên toàn tổ chức. Khi bật, một bộ sưu tập mặc định sẽ có sẵn cho mỗi thành viên để lưu trữ mục. Tìm hiểu thêm về quản lý ",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will 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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
     "message": "vòng đời thông tin xác thực",
@@ -5545,6 +5836,65 @@
     "message": "Tìm hiểu thêm về ",
     "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.'"
   },
+  "availableNow": {
+    "message": "Khả dụng bây giờ"
+  },
+  "autoConfirm": {
+    "message": "Tự động xác nhận người dùng mới"
+  },
+  "autoConfirmDescription": {
+    "message": "Người dùng mới được mời vào tổ chức sẽ tự động được xác nhận khi thiết bị của quản trị viên đang mở khóa.",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "Cách bật xác nhận người dùng tự động"
+  },
+  "autoConfirmExtension1": {
+    "message": "Open your Bitwarden extension"
+  },
+  "autoConfirmExtension2": {
+    "message": "Select",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " Turn on",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "Đã mở tiện ích mở rộng Bitwarden trong trình duyệt. Giờ bạn có thể bật tùy chọn xác nhận người dùng tự động."
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "Người dùng mới được mời vào tổ chức sẽ tự động được xác nhận khi thiết bị của quản trị viên đang mở khóa. Trước khi bật chính sách này, hãy đọc kỹ và đồng ý với các điều sau: ",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "Nguy cơ bảo mật tiềm ẩn. "
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "Tính năng xác nhận người dùng tự động có thể làm tăng rủi ro bảo mật cho dữ liệu của tổ chức bạn."
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "Tìm hiểu về các rủi ro",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "Chính sách một tổ chức là bắt buộc. "
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "Tất cả thành viên chỉ phải thuộc tổ chức này để kích hoạt tự động hóa này."
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "Chính sách một tổ chức sẽ áp dụng cho tất cả các vai trò. "
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "Không có quyền truy cập khẩn cấp. "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "Quyền truy cập khẩn cấp sẽ bị xóa."
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "Tôi chấp nhận những rủi ro và cập nhật chính sách này"
+  },
   "personalOwnership": {
     "message": "Xóa kho lưu trữ riêng lẻ"
   },
@@ -5597,6 +5947,19 @@
     "message": "Luôn hiển thị địa chỉ email của thành viên cho người nhận khi tạo hoặc chỉnh sửa Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "Phát hiện khớp URI mặc định"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "Xác định thời điểm nên đề xuất tự động điền thông tin đăng nhập. Quản trị viên và chủ sở hữu không bị ràng buộc bởi chính sách này."
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "Phát hiện khớp URI mặc định"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "Vui lòng chọn một tùy chọn phát hiện khớp URI hợp lệ.",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "Chính sách $ID$ đã được điều chỉnh.",
     "placeholders": {
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Mật khẩu chính của bạn không đáp ứng một hoặc nhiều chính sách của tổ chức. Để truy cập kho, bạn phải cập nhật mật khẩu chính ngay bây giờ. Việc tiếp tục sẽ đăng xuất phiên hiện tại của bạn và yêu cầu bạn đăng nhập lại. Các phiên hoạt động trên các thiết bị khác có thể vẫn duy trì trong tối đa một giờ."
   },
-  "automaticAppLogin": {
-    "message": "Tự động đăng nhập người dùng cho các ứng dụng được phép"
+  "automaticAppLoginWithSSO": {
+    "message": "Tự động đăng nhập bằng SSO"
   },
-  "automaticAppLoginDesc": {
-    "message": "Các biểu mẫu đăng nhập sẽ tự động được điền và gửi cho các ứng dụng khởi chạy từ nhà cung cấp định danh mà bạn đã cấu hình."
+  "automaticAppLoginWithSSODesc": {
+    "message": "Mở rộng tính năng đăng nhập một lần (SSO) để bảo mật và tiện lợi hơn cho các ứng dụng ngoài hệ thống. Khi người dùng mở một ứng dụng từ nhà cung cấp danh tính của bạn, thông tin đăng nhập sẽ được tự động điền và gửi đi, giúp họ truy cập an toàn chỉ với một lần nhấp."
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "Máy chủ nhà cung cấp định danh"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "Tổ chức của bạn đã cập nhật tùy chọn giải mã. Vui lòng đặt mật khẩu chính để truy cập vào kho lưu trữ của bạn."
   },
-  "maximumVaultTimeout": {
-    "message": "Thời gian chờ của kho"
+  "sessionTimeoutPolicyTitle": {
+    "message": "Thời gian hết phiên"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "Đặt thời gian chờ tối đa cho kho dành cho các thành viên."
+  "sessionTimeoutPolicyDescription": {
+    "message": "Đặt thời gian chờ phiên tối đa cho tất cả thành viên ngoại trừ chủ sở hữu."
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "Thời gian chờ tối đa của kho"
+  "maximumAllowedTimeout": {
+    "message": "Thời gian chờ tối đa được phép"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "Thời gian chờ tối đa của kho không hợp lệ."
+  "maximumAllowedTimeoutRequired": {
+    "message": "Yêu cầu thời gian chờ tối đa được phép."
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "Thời gian không hợp lệ. Hãy thay đổi ít nhất một giá trị."
+  },
+  "sessionTimeoutAction": {
+    "message": "Hành động khi hết thời gian chờ phiên"
+  },
+  "immediately": {
+    "message": "Ngay lập tức"
+  },
+  "onSystemLock": {
+    "message": "Khi khóa hệ thống"
+  },
+  "onAppRestart": {
+    "message": "Khi khởi động lại ứng dụng"
   },
   "hours": {
     "message": "Giờ"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "Phút"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "Bạn có chắc chắn muốn cho phép thời gian chờ tối đa là \"Không bao giờ\" cho tất cả thành viên không?"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "Tùy chọn này sẽ lưu các khóa mã hóa của thành viên trên thiết bị của họ. Nếu bạn chọn tùy chọn này, hãy đảm bảo rằng thiết bị của họ được bảo vệ đầy đủ."
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "Tìm hiểu thêm về bảo vệ thiết bị"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "\"Khóa hệ thống\" sẽ chỉ áp dụng cho trình duyệt và ứng dụng máy tính."
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "Ứng dụng di động và ứng dụng web sẽ đặt giới hạn thời gian chờ tối đa là “khi khởi động lại ứng dụng”, vì tùy chọn này không được hỗ trợ."
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "Chính sách của tổ chức bạn đã đặt thời gian chờ tối đa của kho là $HOURS$ giờ và $MINUTES$ phút.",
     "placeholders": {
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "Bạn phải thêm URL Máy chủ gốc hoặc ít nhất một môi trường tùy chỉnh."
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL phải sử dụng HTTPS."
+  },
   "apiUrl": {
     "message": "URL máy chủ API"
   },
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "Chỉ kho lưu trữ tổ chức liên kết với $ORGANIZATION$ sẽ được xuất.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "Chỉ kho lưu trữ tổ chức liên kết với $ORGANIZATION$ được xuất. Bộ sưu tập mục của tôi sẽ không được bao gồm.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "Truy cập bị từ chối. Bạn không có quyền xem trang này."
   },
+  "noPageAccess": {
+    "message": "Bạn không có quyền truy cập vào trang này"
+  },
   "masterPassword": {
     "message": "Mật khẩu chính"
   },
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "Bí mật không xác định, bạn có thể cần yêu cầu quyền để truy cập bí mật này."
   },
+  "unknownServiceAccount": {
+    "message": "Tài khoản máy không xác định, bạn có thể cần yêu cầu quyền truy cập vào tài khoản máy này."
+  },
   "unknownProject": {
     "message": "Dự án không xác định, bạn có thể cần yêu cầu quyền để truy cập dự án này."
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "Nhóm/Người dùng"
   },
-  "lowKdfIterations": {
-    "message": "Số vòng lặp KDF thấp"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "Cập nhật cài đặt mã hóa của bạn để đáp ứng các khuyến nghị bảo mật mới và cải thiện bảo vệ tài khoản."
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "Tiếp tục sẽ đăng xuất bạn khỏi tất cả các phiên hoạt động. Bạn sẽ cần đăng nhập lại và hoàn tất đăng nhập hai bước (nếu có). Chúng tôi khuyến nghị xuất kho mật khẩu của bạn trước khi thay đổi cài đặt mã hóa để tránh mất dữ liệu."
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Đã truy cập một dự án với ID: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "Đã truy cập dự án với định danh: $PROJECT_ID$.",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "Đã xóa Id tài khoản máy: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "Đã chỉnh sửa một dự án với định danh: $PROJECT_ID$",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "Đã thêm người dùng: $USER_ID$ vào tài khoản máy với định danh: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "Đã xóa người dùng: $USER_ID$ khỏi tài khoản máy với định danh: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "Đã xóa nhóm: $GROUP_ID$ khỏi tài khoản máy với định danh: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "Đã tạo tài khoản máy với định danh: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "Đã thêm nhóm: $GROUP_ID$ vào tài khoản máy với định danh: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "Đã tạo tài khoản máy với định danh: $SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "Đã xóa một dự án với định danh: $PROJECT_ID$",
     "placeholders": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "Đã đăng nhập!"
   },
-  "beta": {
-    "message": "Phiên bản Beta"
-  },
   "assignCollectionAccess": {
     "message": "Gán quyền truy cập bộ sưu tập"
   },
@@ -9330,6 +9820,14 @@
     "message": "Quá đắt",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "Switching to free plan",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "Switching to free organization",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "Miễn phí 1 năm"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "Gán"
   },
+  "assignTasks": {
+    "message": "Giao tác vụ"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "Send notifications to change passwords"
+  },
   "assignToCollections": {
     "message": "Gán vào bộ sưu tập"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "Gửi dữ liệu sự kiện đến thực thể Logscale của bạn"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "Gửi dữ liệu sự kiện kho bảo mật đến phiên bản Datadog của bạn"
+  },
   "failedToSaveIntegration": {
     "message": "Không thể lưu tích hợp. Vui lòng thử lại sau."
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "Bạn phải là chủ sở hữu tổ chức để thực hiện hành động này."
+  },
   "failedToDeleteIntegration": {
     "message": "Không thể xóa tích hợp. Vui lòng thử lại sau."
   },
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "Số vòng lặp KDF thấp. Tăng số vòng lặp để cải thiện bảo mật cho tài khoản của bạn."
-  },
-  "changeKDFSettings": {
-    "message": "Thay đổi cài đặt KDF"
-  },
   "secureYourInfrastructure": {
     "message": "Bảo vệ hạ tầng của bạn"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "Tắt"
   },
-  "higherKDFIterations": {
-    "message": "Số vòng lặp KDF cao hơn có thể giúp bảo vệ mật khẩu chính của bạn khỏi các vụ tấn công brute force."
-  },
-  "incrementsOf100,000": {
-    "message": "tăng theo bội số 100.000"
-  },
-  "smallIncrements": {
-    "message": "bước nhỏ"
-  },
   "kdfIterationRecommends": {
     "message": "Chúng tôi khuyến nghị 600.000 hoặc cao hơn"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "Đối với các thiết bị cũ, đặt KDF quá cao có thể gây ra vấn đề về hiệu suất. Tăng giá trị theo $VALUE$ và kiểm tra thiết bị của bạn.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " Liên hệ với Bộ phận Hỗ trợ Khách hàng để khôi phục gói đăng ký của bạn."
   },
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "Đã xác nhận tên miền"
   },
+  "itemAddedToFavorites": {
+    "message": "Đã thêm mục vào yêu thích"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "Đã xóa mục khỏi yêu thích"
+  },
+  "copyNote": {
+    "message": "Sao chép ghi chú"
+  },
   "organizationNameMaxLength": {
     "message": "Tên tổ chức không được vượt quá 50 ký tự."
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "Đã mở tiện ích mở rộng trình duyệt Bitwarden thành công. Bây giờ bạn có thể xem lại mật khẩu có rủi ro của mình."
   },
-  "openExtensionManuallyPart1": {
-    "message": "Chúng tôi gặp sự cố khi mở tiện ích mở rộng trình duyệt Bitwarden. Mở biểu tượng Bitwarden",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "từ thanh công cụ.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "Đăng ký của bạn sẽ sớm được gia hạn. Để đảm bảo dịch vụ không bị gián đoạn, hãy liên hệ $RESELLER$ để xác nhận gia hạn trước $RENEWAL_DATE$.",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "Tìm kiếm kho lưu trữ"
   },
-  "archive": {
-    "message": "Lưu trữ"
+  "archiveNoun": {
+    "message": "Lưu trữ",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "Lưu trữ",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "Hủy lưu trữ"
+  },
+  "itemsInArchive": {
+    "message": "Các mục trong kho lưu trữ"
   },
   "noItemsInArchive": {
     "message": "Không có mục nào trong kho lưu trữ"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "Các mục đã lưu trữ sẽ hiển thị ở đây và sẽ bị loại khỏi kết quả tìm kiếm và gợi ý tự động điền."
   },
+  "itemWasSentToArchive": {
+    "message": "Mục đã được chuyển vào kho lưu trữ"
+  },
+  "itemsWereSentToArchive": {
+    "message": "Các mục đã được chuyển vào lưu trữ"
+  },
+  "itemUnarchived": {
+    "message": "Mục đã được bỏ lưu trữ"
+  },
+  "bulkArchiveItems": {
+    "message": "Các mục đã được lưu trữ"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Các mục đã được bỏ lưu trữ"
+  },
+  "archiveItem": {
+    "message": "Lưu trữ mục",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Các mục đã lưu trữ sẽ bị loại khỏi kết quả tìm kiếm chung và gợi ý tự động điền. Bạn có chắc chắn muốn lưu trữ mục này không?"
+  },
+  "archiveBulkItems": {
+    "message": "Lưu trữ các mục",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Các mục đã lưu trữ sẽ bị loại trừ khỏi kết quả tìm kiếm chung và gợi ý tự động điền. Bạn có chắc chắn muốn lưu trữ các mục này không?"
+  },
   "businessUnit": {
     "message": "Bộ phận kinh doanh"
   },
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Đã cài đặt tiện ích mở rộng Bitwarden!"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden extension is installed!"
+  },
   "openExtensionToAutofill": {
     "message": "Mở tiện ích mở rộng để đăng nhập và bắt đầu tự động điền."
   },
@@ -11154,6 +11684,14 @@
     "message": "Trung tâm học tập",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "If the extension didn't open, you may need to open Bitwarden from the icon ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " on the toolbar.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "Trung tâm Trợ giúp",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "Tích hợp liền mạch"
+  },
+  "families": {
+    "message": "Gia đình"
+  },
+  "upgradeToFamilies": {
+    "message": "Nâng cấp lên gói Gia đình"
+  },
+  "upgradeToPremium": {
+    "message": "Nâng cấp lên gói Cao cấp"
+  },
+  "familiesUpdated": {
+    "message": "Bạn đã nâng cấp lên Gói Gia đình!"
+  },
+  "taxCalculationError": {
+    "message": "Đã xảy ra lỗi khi tính thuế cho vị trí của bạn. Vui lòng thử lại."
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "Chào mừng đến với Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "Mở khóa thêm các tính năng bảo mật với Premium hoặc bắt đầu chia sẻ mục với Gói Gia đình"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "Giá chưa bao gồm thuế và được thanh toán hằng năm."
+  },
+  "organizationNameDescription": {
+    "message": "Tên tổ chức của bạn sẽ hiển thị trong các lời mời bạn gửi đến các thành viên."
+  },
+  "continueWithoutUpgrading": {
+    "message": "Tiếp tục mà không nâng cấp"
+  },
+  "upgradeYourPlan": {
+    "message": "Nâng cấp gói của bạn"
+  },
+  "upgradeNow": {
+    "message": "Nâng cấp ngay"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "Hoàn tất biểu mẫu này sẽ tạo một tổ chức Gia đình mới. Bạn có thể nâng cấp tổ chức Miễn phí của mình từ Bảng điều khiển quản trị."
+  },
+  "upgradeErrorMessage": {
+    "message": "Chúng tôi gặp lỗi khi xử lý nâng cấp của bạn. Vui lòng thử lại."
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "Bạn đang sử dụng gói Bitwarden Miễn phí"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "Nâng cấp để tăng cường bảo mật toàn diện"
+  },
+  "viewbusinessplans": {
+    "message": "Xem các gói doanh nghiệp"
+  },
+  "updateEncryptionSettings": {
+    "message": "Cập nhật cài đặt mã hóa"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "Cập nhật cài đặt mã hóa của bạn"
+  },
+  "updateSettings": {
+    "message": "Cập nhật cài đặt"
+  },
+  "algorithm": {
+    "message": "Thuật toán"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "Chọn cách Bitwarden mã hóa dữ liệu trong kho của bạn. Mọi tùy chọn đều an toàn, nhưng những phương pháp mạnh hơn sẽ giúp bảo vệ tốt hơn - đặc biệt là trước các cuộc tấn công brute-force. Bitwarden khuyến nghị giữ cài đặt mặc định cho hầu hết người dùng."
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "Tăng các giá trị cao hơn mức mặc định sẽ giúp tăng cường bảo mật, nhưng đồng thời kho của bạn có thể mất nhiều thời gian hơn để mở khóa."
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "Về các thuật toán mã hóa"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 là phương pháp mã hóa đã được kiểm chứng, cân bằng tốt giữa tính bảo mật và hiệu suất. Phù hợp cho mọi người dùng."
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id mang đến khả năng bảo vệ mạnh hơn trước các hình thức tấn công hiện đại, phù hợp nhất cho người dùng nâng cao với thiết bị mạnh mẽ."
+  },
+  "zipPostalCodeLabel": {
+    "message": "Mã ZIP / Bưu điện"
+  },
+  "cardNumberLabel": {
+    "message": "Số thẻ"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "Bắt đầu dùng thử Gói Gia đình miễn phí"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "Block account creation for claimed domains"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "A domain must be claimed before activating this policy."
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "Set up an unlock method to change your vault timeout action."
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "Enterprise policy requirements have been applied to your timeout options"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "neverLockWarning": {
+    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "Timeout action"
+  },
+  "sessionTimeoutHeader": {
+    "message": "Session timeout"
+  },
+  "appearance": {
+    "message": "Appearance"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "No critical applications are selected"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "Are you sure you want to continue?"
+  },
+  "userVerificationFailed": {
+    "message": "User verification failed."
   }
 }
diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json
index 38c585142df..6a436fbb4ac 100644
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -17,15 +17,18 @@
   "accessIntelligence": {
     "message": "Access Intelligence"
   },
-  "riskInsights": {
-    "message": "风险洞察"
-  },
   "passwordRisk": {
     "message": "密码风险"
   },
+  "noEditPermissions": {
+    "message": "您没有编辑此项目的权限"
+  },
   "reviewAtRiskPasswords": {
     "message": "审查各个应用程序中存在风险的密码（弱、暴露或重复使用）。选择最关键的应用程序，优先为您的用户采取安全措施，以处理存在风险的密码。"
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "审查存在风险的登录"
+  },
   "dataLastUpdated": {
     "message": "数据最后更新于：$DATE$",
     "placeholders": {
@@ -35,6 +38,9 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "您还没有创建报告"
+  },
   "notifiedMembers": {
     "message": "已通知的成员"
   },
@@ -59,9 +65,62 @@
   "createNewLoginItem": {
     "message": "创建新的登录项目"
   },
-  "criticalApplicationsActivityDescription": {
+  "percentageCompleted": {
+    "message": "完成 $PERCENT$%",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "总计 $TOTAL$ 个安全任务中的 $COUNT$ 个已完成",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "密码更改进度"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "分配成员任务以监测进度"
+  },
+  "onceYouReviewApplications": {
+    "message": "审查应用程序并将其标记为关键后，将任务分配给您的成员以更改他们的密码。"
+  },
+  "sendReminders": {
+    "message": "发送提醒"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
     "message": "您将应用程序标记为关键后，它们将显示在这里。"
   },
+  "viewAtRiskMembers": {
+    "message": "查看存在风险的成员"
+  },
+  "viewAtRiskApplications": {
+    "message": "查看存在风险的应用程序"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "总计 $TOTAL$ 个关键应用程序中的 $COUNT$ 个因密码风险而存在风险",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
   "criticalApplicationsWithCount": {
     "message": "关键应用程序 ($COUNT$)",
     "placeholders": {
@@ -71,6 +130,9 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "关键应用程序已标记"
+  },
   "countOfCriticalApplications": {
     "message": "$COUNT$ 个关键应用程序",
     "placeholders": {
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ 个应用程序存在风险",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ 个密码存在风险",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ 个新密码存在风险",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "已通知的成员 ($COUNT$)",
     "placeholders": {
@@ -89,17 +178,35 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "在 $ORG NAME$ 中未发现任何应用程序",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "未找到任何数据"
   },
-  "noAppsInOrgDescription": {
-    "message": "当用户保存登录信息时，应用程序会出现在这里，显示所有存在风险的密码。标记关键应用程序并通知用户更新密码。"
+  "noDataInOrgDescription": {
+    "message": "导入您组织的登录数据以开始使用 Access Intelligence。导入完成后，您将能够："
+  },
+  "feature1Title": {
+    "message": "将应用程序标记为关键"
+  },
+  "feature1Description": {
+    "message": "这将帮助您优先消除您最重要的应用程序的风险。"
+  },
+  "feature2Title": {
+    "message": "帮助成员提升他们的安全性"
+  },
+  "feature2Description": {
+    "message": "为存在风险的成员分配指导性安全任务，以更新其凭据。"
+  },
+  "feature3Title": {
+    "message": "监测进度"
+  },
+  "feature3Description": {
+    "message": "追踪一段时间内的变化，以展示安全性的改进。"
+  },
+  "noReportsRunTitle": {
+    "message": "生成报告"
+  },
+  "noReportsRunDescription": {
+    "message": "您已准备好开始生成报告。生成报告后，您将能够："
   },
   "noCriticalApplicationsTitle": {
     "message": "您还没有将任何应用程序标记为关键"
@@ -111,11 +218,35 @@
     "message": "选择关键应用程序"
   },
   "markAppAsCritical": {
-    "message": "标记应用程序为关键"
+    "message": "将 App 标记为关键"
+  },
+  "markAsCritical": {
+    "message": "标记为关键"
+  },
+  "applicationsSelected": {
+    "message": "已选择的应用程序"
+  },
+  "selectApplication": {
+    "message": "选择应用程序"
+  },
+  "unselectApplication": {
+    "message": "取消选择应用程序"
   },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "标记为关键的应用程序"
   },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "$COUNT$ 个标记为关键的应用程序",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "无法将应用程序标记为关键"
+  },
   "application": {
     "message": "应用程序"
   },
@@ -134,10 +265,16 @@
   "atRiskMembers": {
     "message": "存在风险的成员"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "对关键应用程序中存在风险的项目具有编辑权限的成员"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "这些成员拥有对关键应用程序中易受攻击项目的访问权限。"
   },
-  "membersAtRisk": {
+  "membersWithAtRiskPasswords": {
+    "message": "密码存在风险的成员"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "您的组织成员将被分配更改易受攻击的密码的任务。他们将在 Bitwarden 浏览器扩展中收到通知。"
+  },
+  "membersAtRiskCount": {
     "message": "$COUNT$ 个成员存在风险",
     "placeholders": {
       "count": {
@@ -164,8 +301,8 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "这些成员正登录到具有弱的、暴露的或重复使用的密码的应用程序。"
+  "atRiskMemberDescription": {
+    "message": "这些成员正在登录到具有弱的、暴露的或重复使用的密码的关键应用程序。"
   },
   "atRiskMembersDescriptionNone": {
     "message": "没有成员登录到具有弱的、暴露的或重复使用的密码的应用程序。"
@@ -203,6 +340,78 @@
   "totalApplications": {
     "message": "总的应用程序"
   },
+  "applicationsNeedingReview": {
+    "message": "应用程序需要审查"
+  },
+  "newApplicationsCardTitle": {
+    "message": "审查新应用程序"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ 个新应用程序",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "审查新应用程序并将其标记为关键，以确保您的组织安全"
+  },
+  "reviewNow": {
+    "message": "立即审查"
+  },
+  "allCaughtUp": {
+    "message": "全部处理完成！"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "目前没有新应用程序需要审查"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "您的组织已为 $COUNT$ 个应用程序保存了项目",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "审查应用程序以保护对您的组织安全最关键的项目"
+  },
+  "reviewApplications": {
+    "message": "审查应用程序"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "优先处理关键应用程序"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "选择对您的组织最关键的应用程序。然后，您可以将安全任务分配给成员以消除风险。"
+  },
+  "reviewNewApplications": {
+    "message": "审查新应用程序"
+  },
+  "reviewNewAppsDescription": {
+    "message": "审查具有易受攻击项目的新应用程序，并将需要密切监测的应用程序标记为关键。然后，您可以将安全任务分配给成员以消除风险。"
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "点击星形图标以将 App 标记为关键"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "标记为关键功能将在未来更新中实现"
+  },
+  "applicationReviewSaved": {
+    "message": "应用程序审查已保存"
+  },
+  "newApplicationsReviewed": {
+    "message": "新应用程序已审查"
+  },
+  "errorSavingReviewStatus": {
+    "message": "保存审查状态时出错"
+  },
+  "pleaseTryAgain": {
+    "message": "请重试"
+  },
   "unmarkAsCritical": {
     "message": "取消标记为关键"
   },
@@ -250,7 +459,7 @@
     "message": "私密备注"
   },
   "note": {
-    "message": "笔记"
+    "message": "备注"
   },
   "customFields": {
     "message": "自定义字段"
@@ -314,7 +523,7 @@
     "message": "删除网站"
   },
   "defaultLabel": {
-    "message": "默认 ($VALUE$)",
+    "message": "默认（$VALUE$）",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -532,7 +741,7 @@
     "message": "通过在父文件夹名后面添加「/」来嵌套文件夹。示例：Social/Forums"
   },
   "deleteFolderPermanently": {
-    "message": "确定要永久删除这个文件夹吗？"
+    "message": "确定要永久删除此文件夹吗？"
   },
   "baseDomain": {
     "message": "基础域名",
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "收藏夹"
   },
+  "taskSummary": {
+    "message": "任务摘要"
+  },
   "types": {
     "message": "类型"
   },
@@ -735,7 +947,7 @@
     "message": "州 / 省"
   },
   "zipPostalCode": {
-    "message": "邮政编码"
+    "message": "ZIP / 邮政编码"
   },
   "country": {
     "message": "国家"
@@ -959,7 +1171,7 @@
     "message": "卡号"
   },
   "copyFieldCipherName": {
-    "message": "复制 $CIPHERNAME$ 的 $FIELD$",
+    "message": "复制 $CIPHERNAME$ 中的 $FIELD$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -1177,6 +1389,9 @@
   "readingPasskeyLoadingInfo": {
     "message": "保持此窗口打开然后按照浏览器的提示操作。"
   },
+  "passkeyAuthenticationFailed": {
+    "message": "通行密钥验证失败。请重试。"
+  },
   "useADifferentLogInMethod": {
     "message": "使用其他登录方式"
   },
@@ -1186,6 +1401,9 @@
   "useSingleSignOn": {
     "message": "使用单点登录"
   },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "您的组织要求单点登录。"
+  },
   "welcomeBack": {
     "message": "欢迎回来"
   },
@@ -1304,7 +1522,7 @@
     "message": "身份验证超时"
   },
   "authenticationSessionTimedOut": {
-    "message": "身份验证会话超时。请重新启动登录过程。"
+    "message": "身份验证会话超时。请重新开始登录过程。"
   },
   "verifyYourIdentity": {
     "message": "验证您的身份"
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "无效的主密码"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "无效的主密码。请确认您的电子邮箱正确无误，以及您的账户是在 $HOST$ 上创建的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "无效的文件密码，请使用您创建导出文件时输入的密码。"
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "没有可列出的项目。"
   },
+  "noItemsInTrash": {
+    "message": "回收站中没有项目"
+  },
+  "noItemsInTrashDesc": {
+    "message": "您删除的项目将显示在这里，并在 30 天后永久删除"
+  },
+  "noItemsInVault": {
+    "message": "密码库中没有项目"
+  },
+  "emptyVaultDescription": {
+    "message": "密码库不仅保护您的密码。在这里还可以安全地存储登录、ID、支付卡和笔记。"
+  },
+  "emptyFavorites": {
+    "message": "您没有收藏任何项目"
+  },
+  "emptyFavoritesDesc": {
+    "message": "将常用项目添加到收藏夹以便快速访问。"
+  },
+  "noSearchResults": {
+    "message": "未返回搜索结果"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "清除筛选或尝试其他搜索词"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "您没有查看此集合中的所有项目的权限。"
   },
@@ -1893,7 +2144,7 @@
     "message": "继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "changePasswordWarning": {
-    "message": "更改密码后，您需要使用新密码登录。其他设备上的活动会话将在一小时内注销。"
+    "message": "更改密码后，您需要使用新密码登录。在其他设备上的活动会话将在一小时内注销。"
   },
   "emailChanged": {
     "message": "电子邮箱已保存"
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "加密密钥设置"
   },
-  "kdfAlgorithm": {
-    "message": "KDF 算法"
-  },
   "kdfIterations": {
     "message": "KDF 迭代"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "更高的 KDF 迭代、内存占用和并行可以帮助保护您的主密码免遭攻击者的暴力破解。"
   },
-  "changeKdf": {
-    "message": "更改 KDF"
-  },
   "encKeySettingsChanged": {
     "message": "加密密钥设置已保存"
   },
@@ -2245,7 +2490,7 @@
     "message": "为您的组织启用两步登录。"
   },
   "twoStepLoginEnterpriseDescStart": {
-    "message": "要为成员强制实施 Bitwarden 两步登录选项，请使用 ",
+    "message": "要为成员强制实施 Bitwarden 两步登录选项，请使用",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
   },
   "twoStepLoginPolicy": {
@@ -2292,23 +2537,23 @@
     "message": "恢复访问权限"
   },
   "premium": {
-    "message": "高级会员",
+    "message": "高级版",
     "description": "Premium membership"
   },
   "premiumMembership": {
     "message": "高级会员"
   },
   "premiumRequired": {
-    "message": "需要高级会员"
+    "message": "需要高级版"
   },
   "premiumRequiredDesc": {
-    "message": "使用此功能需要高级会员资格。"
+    "message": "需要高级会员才能使用此功能。"
   },
   "youHavePremiumAccess": {
-    "message": "您拥有高级访问权限"
+    "message": "您拥有高级版访问权限"
   },
   "alreadyPremiumFromOrg": {
-    "message": "由于您是拥有高级会员功能的组织的成员，您已经拥有此功能。"
+    "message": "由于您是组织的成员，您已经拥有高级版功能访问权限。"
   },
   "manage": {
     "message": "管理"
@@ -2798,15 +3043,18 @@
   "makeSureEnoughCredit": {
     "message": "请确保您的账户有足够的信用额度来用于此购买。如果您的账户信用额度不足，您的默认付款方式将用于补足差额。您可以从「计费」页面向您的账户添加信用额度。"
   },
+  "notEnoughAccountCredit": {
+    "message": "您没有足够的账户信用额度来用于此购买。您可以从「计费」页面向您的账户添加信用额度。"
+  },
   "creditAppliedDesc": {
     "message": "您账户的信用额度可用于进行消费。任何可用的信用额度将用于自动抵扣此账户的账单。"
   },
   "goPremium": {
-    "message": "升级高级会员",
+    "message": "升级高级版",
     "description": "Another way of saying \"Get a Premium membership\""
   },
   "premiumUpdated": {
-    "message": "您已升级到高级会员。"
+    "message": "您已升级为高级版。"
   },
   "premiumUpgradeUnlockFeatures": {
     "message": "将您的账户升级为高级会员，将解锁一些强大的附加功能。"
@@ -2830,7 +3078,7 @@
     "message": "优先客户支持。"
   },
   "premiumSignUpFuture": {
-    "message": "未来的更多高级功能。敬请期待！"
+    "message": "未来的更多高级版功能。敬请期待！"
   },
   "premiumPrice": {
     "message": "所有功能仅需 $PRICE$ /年！",
@@ -2842,7 +3090,7 @@
     }
   },
   "premiumPriceWithFamilyPlan": {
-    "message": "升级高级会员仅需 $PRICE$ /年，或成为具有 $FAMILYPLANUSERCOUNT$ 位用户以及无限制的家庭共享的高级账户，通过 ",
+    "message": "升级高级版仅需 $PRICE$ /年，或成为具有 $FAMILYPLANUSERCOUNT$ 位用户以及无限制的家庭共享的高级账户，通过 ",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2855,16 +3103,16 @@
     }
   },
   "bitwardenFamiliesPlan": {
-    "message": "Bitwarden 家庭方案。"
+    "message": "Bitwarden 家庭版方案。"
   },
   "addons": {
     "message": "附加项目"
   },
   "premiumAccess": {
-    "message": "高级会员"
+    "message": "高级版访问权限"
   },
   "premiumAccessDesc": {
-    "message": "您可以为您的组织所有成员添加高级访问权限，只需 $PRICE$ /$INTERVAL$ 。",
+    "message": "您可以为您的组织所有成员添加高级版访问权限，只需 $PRICE$ /$INTERVAL$ 。",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2994,11 +3242,20 @@
     "message": "状态"
   },
   "nextCharge": {
-    "message": "下一次扣款"
+    "message": "下一次收费"
+  },
+  "nextChargeHeader": {
+    "message": "下一次收费"
+  },
+  "plan": {
+    "message": "方案"
   },
   "details": {
     "message": "详细信息"
   },
+  "discount": {
+    "message": "折扣"
+  },
   "downloadLicense": {
     "message": "下载许可证"
   },
@@ -3296,7 +3553,7 @@
     "message": "本地托管（可选）"
   },
   "usersGetPremium": {
-    "message": "用户拥有高级会员功能权限"
+    "message": "用户拥有高级版功能访问权限"
   },
   "controlAccessWithGroups": {
     "message": "使用群组控制用户访问权限"
@@ -3350,7 +3607,7 @@
     }
   },
   "trialConfirmationEmail": {
-    "message": "我们已经发送了一封确认邮件到您团队的计费电子邮箱 "
+    "message": "我们已经发送了一封确认电子邮件到您团队的计费电子邮箱 "
   },
   "monthly": {
     "message": "每月"
@@ -3539,7 +3796,7 @@
     "message": "管理员"
   },
   "adminDesc": {
-    "message": "管理组织的访问权限，所有集合、成员、报告，以及安全设置"
+    "message": "管理组织的访问权限、所有集合、成员、报告，以及安全设置"
   },
   "user": {
     "message": "用户"
@@ -3572,7 +3829,7 @@
     "message": "加载更多"
   },
   "mobile": {
-    "message": "手机版应用",
+    "message": "移动端",
     "description": "Mobile app"
   },
   "extension": {
@@ -4203,8 +4460,35 @@
   "updateBrowser": {
     "message": "更新浏览器"
   },
-  "generatingYourRiskInsights": {
-    "message": "正在生成风险洞察..."
+  "generatingYourAccessIntelligence": {
+    "message": "正在生成 Access Intelligence..."
+  },
+  "fetchingMemberData": {
+    "message": "正在获取成员数据..."
+  },
+  "analyzingPasswordHealth": {
+    "message": "正在分析密码健康度..."
+  },
+  "calculatingRiskScores": {
+    "message": "正在计算风险评分..."
+  },
+  "generatingReportData": {
+    "message": "正在生成报告数据..."
+  },
+  "savingReport": {
+    "message": "正在保存报告..."
+  },
+  "compilingInsights": {
+    "message": "正在编译洞察..."
+  },
+  "loadingProgress": {
+    "message": "加载进度"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "这可能需要几分钟时间。"
+  },
+  "riskInsightsRunReport": {
+    "message": "运行报告"
   },
   "updateBrowserDesc": {
     "message": "您使用的是不受支持的网页浏览器。网页密码库可能无法正常运行。"
@@ -4288,8 +4572,8 @@
   "inviteAccepted": {
     "message": "邀请已接受"
   },
-  "inviteAcceptedDesc": {
-    "message": "管理员确认您的成员资格后，您就可以访问此组织了。届时我们会向您发送一封电子邮件。"
+  "invitationAcceptedDesc": {
+    "message": "成功接受了您的邀请。"
   },
   "inviteInitAcceptedDesc": {
     "message": "您现在可以访问这个组织了。"
@@ -4725,10 +5009,10 @@
     "message": "筛选"
   },
   "vaultTimeout": {
-    "message": "密码库超时时间"
+    "message": "密码库超时"
   },
   "vaultTimeout1": {
-    "message": "超时"
+    "message": "超时时间"
   },
   "vaultTimeoutDesc": {
     "message": "选择您的密码库何时执行密码库超时动作。"
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "组织已暂停"
   },
+  "organizationIsSuspended": {
+    "message": "组织已暂停"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "无法访问已暂停组织中的项目。请联系您的组织所有者寻求帮助。"
+  },
   "secretsAccessSuspended": {
     "message": "无法访问已暂停的组织。请联系您的组织所有者寻求帮助。"
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "无法在已暂停的组织中创建服务账户。请联系您的组织所有者寻求帮助。"
   },
-  "disabledOrganizationFilterError": {
-    "message": "无法访问已暂停组织中的项目。请联系您的组织所有者寻求帮助。"
-  },
   "licenseIsExpired": {
     "message": "授权已过期"
   },
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO 标识符"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "将此 ID 提供给您的成员以供 SSO 登录使用。要绕过此步骤，请设置 ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "请将此 ID 提供给您的成员以用于 SSO 登录。如果已设置声明域名，成员可以在 SSO 期间跳过输入此标识符。",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "进一步了解",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "取消链接 SSO"
@@ -5265,7 +5556,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "您确定要永久删除这个 Send 吗？",
+    "message": "确定要永久删除此 Send 吗？",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
@@ -5518,16 +5809,16 @@
     "message": "要求所有项目归组织所有，禁用此选项以在账户级别存储项目。",
     "description": "This is the policy description shown in the policy list."
   },
-  "organizationDataOwnershipContent": {
-    "message": "所有项目都将归组织所有并保存到组织中，从而实现整个组织范围内的控制、可见性和报告。开启后，每个成员都可以使用默认集合来存储项目。进一步了解如何管理",
-    "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "所有项目都将归组织所有并保存至组织中，从而实现组织范围的控制、可见性和报告。启用后，每个成员都可以使用默认集合来存储项目。进一步了解如何管理",
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
-    "message": "凭据的生命周期",
+    "message": "凭据生命周期",
     "description": "This will be used as a hyperlink"
   },
   "organizationDataOwnershipWarningTitle": {
-    "message": "您确定要继续吗？"
+    "message": "确定要继续吗？"
   },
   "organizationDataOwnershipWarning1": {
     "message": "成员仍可以访问"
@@ -5545,6 +5836,65 @@
     "message": "进一步了解",
     "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.'"
   },
+  "availableNow": {
+    "message": "目前可用"
+  },
+  "autoConfirm": {
+    "message": "自动确认新用户"
+  },
+  "autoConfirmDescription": {
+    "message": "当管理员的设备解锁时，邀请加入组织的新用户将被自动确认。",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "如何启用自动用户确认"
+  },
+  "autoConfirmExtension1": {
+    "message": "打开您的 Bitwarden 扩展"
+  },
+  "autoConfirmExtension2": {
+    "message": "选择",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": "启用",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "成功打开 Bitwarden 浏览器扩展。您现在可以激活自动用户确认设置。"
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "当管理员的设备解锁时，邀请加入组织的新用户将被自动确认。启用此策略前，请审查并同意：",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "潜在的安全风险。"
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "自动用户确认可能对您的组织数据带来安全风险。"
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "进一步了解此风险",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "要求单一组织策略。"
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "所有成员必须仅属于此组织才能激活此自动化功能。"
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "单一组织策略将扩展到所有角色。"
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "没有紧急访问权限。"
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "紧急访问权限将被移除。"
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "我接受这些风险和策略更新"
+  },
   "personalOwnership": {
     "message": "禁用个人密码库"
   },
@@ -5597,6 +5947,19 @@
     "message": "创建或编辑 Send 时，始终向接收者显示成员的电子邮箱地址。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "默认 URI 匹配检测"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "确定何时建议登录用于自动填充。管理员和所有者不受此策略的约束。"
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "默认 URI 匹配检测"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "请选择一个有效的 URI 匹配检测选项。",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "修改了策略 $ID$。",
     "placeholders": {
@@ -5752,10 +6115,10 @@
     "message": "加强企业安全。"
   },
   "strengthenBusinessSecurityDescription": {
-    "message": "通过 SSO 集成、事件日志和访问轮换，保持机器和人类对机密访问权限的严格控制。"
+    "message": "通过 SSO 集成、事件日志和访问权限轮换，保持机器和人类对机密访问权限的严格控制。"
   },
   "tryItNow": {
-    "message": "立即试用"
+    "message": "立即体验"
   },
   "sendRequest": {
     "message": "发送请求"
@@ -5914,7 +6277,7 @@
     }
   },
   "eventResetSsoLink": {
-    "message": "重置用户 $ID$ 的 SSO 链接",
+    "message": "重置了用户 $ID$ 的 SSO 链接",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -6250,11 +6613,11 @@
   "updateWeakMasterPasswordWarning": {
     "message": "您的主密码不符合某一项或多项组织策略要求。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
-  "automaticAppLogin": {
-    "message": "为允许的应用程序自动登录用户"
+  "automaticAppLoginWithSSO": {
+    "message": "使用 SSO 自动登录"
   },
-  "automaticAppLoginDesc": {
-    "message": "从您配置的身份提供程序启动的 App 的登录表单将自动填充并提交。"
+  "automaticAppLoginWithSSODesc": {
+    "message": "将 SSO 的安全性和便捷性扩展到非托管 App。当用户通过身份提供程序启动 App 时，他们的登录信息将自动填写并提交，从而实现从身份提供程序到 App 的一键式安全流程。"
   },
   "automaticAppLoginIdpHostLabel": {
     "message": "身份提供程序主机"
@@ -6265,17 +6628,32 @@
   "tdeDisabledMasterPasswordRequired": {
     "message": "您的组织更新了您的解密选项。要访问您的密码库，请设置一个主密码。"
   },
-  "maximumVaultTimeout": {
-    "message": "密码库超时时间"
+  "sessionTimeoutPolicyTitle": {
+    "message": "会话超时"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "为成员配置最大密码库超时时间。"
+  "sessionTimeoutPolicyDescription": {
+    "message": "为除所有者以外的所有成员设置最大会话超时。"
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "最大密码库超时时间"
+  "maximumAllowedTimeout": {
+    "message": "最大允许的超时"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "无效的最大密码库超时时间。"
+  "maximumAllowedTimeoutRequired": {
+    "message": "必须填写最大允许的超时。"
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "时间无效。请更改至少一个值。"
+  },
+  "sessionTimeoutAction": {
+    "message": "会话超时动作"
+  },
+  "immediately": {
+    "message": "立即"
+  },
+  "onSystemLock": {
+    "message": "系统锁定时"
+  },
+  "onAppRestart": {
+    "message": "App 重启时"
   },
   "hours": {
     "message": "小时"
@@ -6283,8 +6661,23 @@
   "minutes": {
     "message": "分钟"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "确定要将所有成员的最大允许的超时设置为「从不」吗？"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "此选项将把成员的加密密钥保存在他们的设备上。若选择此选项，请确保他们的设备已受到充分保护。"
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "进一步了解设备保护"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "「系统锁定时」只适用于浏览器和桌面 App"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "由于不支持该选项，移动端和网页 App 将使用「App 重启时」作为其最大允许的超时。"
+  },
   "vaultTimeoutPolicyInEffect": {
-    "message": "您的组织策略已将您最大允许的密码库超时时间设置为 $HOURS$ 小时 $MINUTES$ 分钟。",
+    "message": "您的组织策略已将您最大允许的密码库超时设置为 $HOURS$ 小时 $MINUTES$ 分钟。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6310,7 +6703,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "您的组织策略正在影响您的密码库超时时间。最大允许的密码库超时时间是 $HOURS$ 小时 $MINUTES$ 分钟。您的密码库超时动作被设置为 $ACTION$。",
+    "message": "您的组织策略正在影响您的密码库超时。最大允许的密码库超时为 $HOURS$ 小时 $MINUTES$ 分钟。您的密码库超时动作被设置为 $ACTION$。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6327,7 +6720,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "您的组织策略已将您的密码库超时动作设置为 $ACTION$。",
+    "message": "您的组织策略已将您的密码库超时动作设置为「$ACTION$」。",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -6336,10 +6729,10 @@
     }
   },
   "vaultTimeoutToLarge": {
-    "message": "您的密码库超时时间超出了您的组织设置的限制。"
+    "message": "您的密码库超时超出了您的组织设置的限制。"
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "自定义超时时间最小为 1 分钟。"
+    "message": "自定义超时最少为 1 分钟。"
   },
   "vaultTimeoutRangeError": {
     "message": "密码库超时不在允许的范围内。"
@@ -6363,7 +6756,7 @@
     "message": "为所有现有成员和新成员激活浏览器扩展上的页面加载时的自动填充设置。"
   },
   "experimentalFeature": {
-    "message": "被入侵或不受信任的网站可以利用页面加载时的自动填充功能。"
+    "message": "被入侵或不受信任的网站可能恶意利用页面加载时的自动填充功能。"
   },
   "learnMoreAboutAutofill": {
     "message": "进一步了解自动填充"
@@ -6489,7 +6882,7 @@
     "message": "单点登录配置已保存"
   },
   "sponsoredFamilies": {
-    "message": "免费 Bitwarden 家庭"
+    "message": "免费的 Bitwarden 家庭版"
   },
   "sponsoredBitwardenFamilies": {
     "message": "赞助的家庭"
@@ -6498,25 +6891,25 @@
     "message": "没有赞助的家庭"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "已赞助的非成员家庭方案将显示在这里"
+    "message": "已赞助的非成员家庭版方案将显示在这里"
   },
   "sponsorshipFreeBitwardenFamilies": {
-    "message": "您的组织成员有资格获得免费的 Bitwarden 家庭计划。您可以为不是您的 Bitwarden 组织成员的员工赞助免费 Bitwarden 家庭。赞助非成员需要您的组织内有可用的席位。"
+    "message": "您的组织成员有资格获得免费的 Bitwarden 家庭版。您可以为不是您的 Bitwarden 组织成员的员工赞助免费的 Bitwarden 家庭版。赞助非成员需要您的组织内有可用的席位。"
   },
   "sponsoredFamiliesRemoveActiveSponsorship": {
     "message": "当您移除某个活动赞助，在被赞助组织的续费日期之后，您的组织中将释放一个可用的席位。"
   },
   "sponsoredFamiliesEligible": {
-    "message": "您和您的家人有资格获得免费的 Bitwarden 家庭版计划。使用您的个人电子邮箱兑换，即使您不在工作中，也能确保您的数据安全。"
+    "message": "您和您的家人有资格获得免费的 Bitwarden 家庭版。使用您的个人电子邮箱兑换，即使您不在工作中，也能确保您的数据安全。"
   },
   "sponsoredFamiliesEligibleCard": {
-    "message": "立即兑换免费的 Bitwarden 家庭方案，即使您不在工作中，也能确保您的数据安全。"
+    "message": "立即兑换免费的 Bitwarden 家庭版方案，即使您不在工作中，也能确保您的数据安全。"
   },
   "sponsoredFamiliesIncludeMessage": {
-    "message": "Bitwarden 家庭方案包含"
+    "message": "Bitwarden 家庭版方案包含"
   },
   "sponsoredFamiliesPremiumAccess": {
-    "message": "最多 6 个用户的高级访问权限"
+    "message": "最多 6 个高级版访问权限的用户"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
     "message": "为家庭成员提供共享集合"
@@ -6528,10 +6921,10 @@
     "message": "没有成员家庭"
   },
   "noMemberFamiliesDescription": {
-    "message": "已兑换家庭方案的成员将在这里显示"
+    "message": "已兑换家庭版方案的成员将在这里显示"
   },
   "membersWithSponsoredFamilies": {
-    "message": "您的组织成员有资格获得免费的 Bitwarden 家庭计划。在这里，您可以看到已赞助了家庭组织的成员。"
+    "message": "您的组织成员有资格获得免费的 Bitwarden 家庭版。在这里，您可以看到已赞助了家庭版组织的成员。"
   },
   "organizationHasMemberMessage": {
     "message": "由于他们是您组织的成员，因此不能将赞助发送给 $EMAIL$。",
@@ -6546,7 +6939,7 @@
     "message": "链接已失效。请让赞助方重新发送邀请。"
   },
   "reclaimedFreePlan": {
-    "message": "收回了免费方案"
+    "message": "已恢复为免费版方案"
   },
   "redeem": {
     "message": "兑换"
@@ -6555,19 +6948,19 @@
     "message": "选择您希望被赞助的组织"
   },
   "familiesSponsoringOrgSelect": {
-    "message": "您想兑换哪一个免费家庭邀请？"
+    "message": "您想兑换哪一个免费家庭版邀请？"
   },
   "sponsoredFamiliesEmail": {
-    "message": "输入您的个人电子邮箱以兑换 Bitwarden 家庭"
+    "message": "输入您的个人电子邮箱以兑换 Bitwarden 家庭版"
   },
   "sponsoredFamiliesLeaveCopy": {
-    "message": "如果您移除邀请或您被从赞助组织中移除，您的家庭赞助将在下一个续费日到期。"
+    "message": "如果您移除邀请或您被从赞助组织中移除，您的家庭版赞助将在下一个续费日到期。"
   },
   "acceptBitwardenFamiliesHelp": {
-    "message": "接受现有组织的邀请或创建一个新的家庭组织。"
+    "message": "接受现有组织的邀请或创建一个新的家庭版组织。"
   },
   "setupSponsoredFamiliesLoginDesc": {
-    "message": "您已被邀请加入免费的 Bitwarden 家庭方案组织。要继续，您需要登录到接收邀请的账户。"
+    "message": "您已被邀请加入免费的 Bitwarden 家庭版方案组织。要继续，您需要登录到接收邀请的账户。"
   },
   "sponsoredFamiliesAcceptFailed": {
     "message": "无法接受邀请。请通过您的企业账户重新发送邀请邮件，然后重试。"
@@ -6582,10 +6975,10 @@
     }
   },
   "sponsoredFamiliesOffer": {
-    "message": "接受免费的 Bitwarden 家庭组织"
+    "message": "接受免费的 Bitwarden 家庭版"
   },
   "sponsoredFamiliesOfferRedeemed": {
-    "message": "免费 Bitwarden 家庭邀请已成功兑换"
+    "message": "免费的 Bitwarden 家庭版邀请已成功兑换"
   },
   "redeemed": {
     "message": "已兑换"
@@ -6612,7 +7005,7 @@
     }
   },
   "freeFamiliesPlan": {
-    "message": "免费家庭方案"
+    "message": "免费家庭版方案"
   },
   "redeemNow": {
     "message": "立即兑换"
@@ -6756,7 +7149,7 @@
     "message": "赞助邀请已过期，您可以删除您创建的组织，以避免 7 天试用期结束时收取费用。您也可以关闭这个提示，以保留此组织并承担计费责任。"
   },
   "newFamiliesOrganization": {
-    "message": "新建家庭组织"
+    "message": "新建家庭版组织"
   },
   "acceptOffer": {
     "message": "接受邀请"
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "您必须添加基础服务器 URL 或至少添加一个自定义环境。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL 必须使用 HTTPS。"
+  },
   "apiUrl": {
     "message": "API 服务器 URL"
   },
@@ -6846,7 +7242,7 @@
     "message": "自托管"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
-    "message": "要在您自己的服务器上设置您的组织，您需要上传您的许可证文件。要为您的自托管组织提供免费家庭方案和高级计费功能，您需要设置计费同步。"
+    "message": "要在您自己的服务器上设置您的组织，您需要上传您的许可证文件。要为您的自托管组织提供免费家庭版方案和高级计费功能，您需要设置计费同步。"
   },
   "billingSyncApiKeyRotated": {
     "message": "令牌已轮换"
@@ -6858,7 +7254,7 @@
     "message": "计费同步令牌"
   },
   "automaticBillingSyncDesc": {
-    "message": "自动同步将解锁家庭赞助功能，并允许您同步许可证而无需上传文件。在 Bitwarden 云服务器中进行更新后，选择「同步许可证」以应用更改。"
+    "message": "自动同步将解锁家庭版赞助功能，并允许您同步许可证而无需上传文件。在 Bitwarden 云服务器中进行更新后，选择「同步许可证」以应用更改。"
   },
   "active": {
     "message": "已生效"
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "仅会导出与 $ORGANIZATION$ 关联的组织密码库。不包括「我的项目」集合。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "访问被拒绝。您没有权限查看此页面。"
   },
+  "noPageAccess": {
+    "message": "您没有访问该页面的权限"
+  },
   "masterPassword": {
     "message": "主密码"
   },
@@ -7001,7 +7418,7 @@
     "description": "This is used by screen readers to indicate the organization that is currently being shown to the user."
   },
   "accountLoggedInAsName": {
-    "message": "账户：已登录为 $NAME$",
+    "message": "账户：已以 $NAME$ 身份登录",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -7129,6 +7546,9 @@
   "unknownSecret": {
     "message": "未知的机密，您可能需要请求权限才能访问此机密。"
   },
+  "unknownServiceAccount": {
+    "message": "未知的机器账户，您可能需要请求权限才能访问此机器账户。"
+  },
   "unknownProject": {
     "message": "未知的工程，您可能需要请求权限才能访问此工程。"
   },
@@ -8376,12 +8796,6 @@
   "groupSlashUser": {
     "message": "群组/用户"
   },
-  "lowKdfIterations": {
-    "message": "较低的 KDF 迭代"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "更新您的加密设置以满足新的安全建议以及增强账户保护。"
-  },
   "kdfSettingsChangeLogoutWarning": {
     "message": "接下来将会注销您所有的活动会话。您需要重新登录并完成两步登录（如果有）。我们建议您在更改加密设置前导出密码库，以防止数据丢失。"
   },
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "访问了 ID 为 $PROJECT_ID$ 的工程。",
+  "accessedProjectWithIdentifier": {
+    "message": "访问了标识符为 $PROJECT_ID$ 的工程。",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8512,6 +8926,15 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "删除了 ID 为 $SERVICE_ACCOUNT_ID$ 的机器账户",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
     "message": "编辑了标识符为 $PROJECT_ID$ 的工程",
     "placeholders": {
@@ -8521,6 +8944,76 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "向标识符为 $SERVICE_ACCOUNT_ID$ 的机器账户添加了用户 $USER_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "从标识符为 $SERVICE_ACCOUNT_ID$ 的机器账户移除了用户 $USER_ID$",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "从标识符为 $SERVICE_ACCOUNT_ID$ 的机器账户移除了群组 $GROUP_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "创建了标识符为 $SERVICE_ACCOUNT_ID$ 的机器账户",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "向标识符为 $SERVICE_ACCOUNT_ID$ 的机器账户添加了群组 $GROUP_ID$",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "删除了标识符为 $SERVICE_ACCOUNT_ID$ 的机器账户",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
     "message": "删除了标识符为 $PROJECT_ID$ 的工程",
     "placeholders": {
@@ -8760,7 +9253,7 @@
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "满分 $TOTAL$",
+    "message": "总计 $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "已登录！"
   },
-  "beta": {
-    "message": "Beta"
-  },
   "assignCollectionAccess": {
     "message": "分配集合访问权限"
   },
@@ -9330,6 +9820,14 @@
     "message": "太贵了",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "正在切换到免费方案",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "正在切换到免费组织",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "免费 1 年"
   },
@@ -9357,6 +9855,12 @@
   "assign": {
     "message": "分配"
   },
+  "assignTasks": {
+    "message": "分配任务"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "发送更改密码的通知"
+  },
   "assignToCollections": {
     "message": "分配到集合"
   },
@@ -9752,9 +10256,15 @@
   "crowdstrikeEventIntegrationDesc": {
     "message": "将事件数据发送到您的 Logscale 实例"
   },
+  "datadogEventIntegrationDesc": {
+    "message": "将密码库事件数据发送到您的 Datadog 实例"
+  },
   "failedToSaveIntegration": {
     "message": "保存集成失败。请稍后再试。"
   },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "您必须是组织所有者才能执行此操作。"
+  },
   "failedToDeleteIntegration": {
     "message": "删除集成失败。请稍后再试。"
   },
@@ -9921,7 +10431,7 @@
     "message": "输入您的团队组织信息"
   },
   "enterFamiliesOrgInfo": {
-    "message": "输入您的家庭组织信息"
+    "message": "输入您的家庭版组织信息"
   },
   "enterEnterpriseOrgInfo": {
     "message": "输入您的企业组织信息"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "KDF 迭代低。请增加迭代次数以提高您账户的安全性。"
-  },
-  "changeKDFSettings": {
-    "message": "更改 KDF 设置"
-  },
   "secureYourInfrastructure": {
     "message": "保护您的基础设施"
   },
@@ -10099,27 +10603,9 @@
   "memberAccessReportAuthenticationEnabledFalse": {
     "message": "关闭"
   },
-  "higherKDFIterations": {
-    "message": "更高的 KDF 迭代可以帮助保护您的主密码免遭攻击者的暴力破解。"
-  },
-  "incrementsOf100,000": {
-    "message": "100,000 增量"
-  },
-  "smallIncrements": {
-    "message": "小增量"
-  },
   "kdfIterationRecommends": {
     "message": "我们推荐 600,000 或更高"
   },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "对于老旧设备，将 KDF 设置得太高可能导致性能问题。以 $VALUE$ 值增加然后测试您的设备。",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
-  },
   "providerReinstate": {
     "message": " 联系客户支持恢复您的订阅。"
   },
@@ -10345,7 +10831,7 @@
     "message": "SSO 身份验证"
   },
   "familiesPlanInvLimitReachedManageBilling": {
-    "message": "家庭组织最多拥有 $SEATCOUNT$ 位成员。要邀请更多成员，请升级到付费方案。",
+    "message": "家庭版组织最多拥有 $SEATCOUNT$ 位成员。要邀请更多成员，请升级到付费方案。",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10354,7 +10840,7 @@
     }
   },
   "familiesPlanInvLimitReachedNoManageBilling": {
-    "message": "家庭组织最多拥有 $SEATCOUNT$ 位成员。请联系您的组织所有者升级。",
+    "message": "家庭版组织最多拥有 $SEATCOUNT$ 位成员。要升级，请联系您的组织所有者。",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10393,7 +10879,7 @@
     "message": "保护您的家庭登录"
   },
   "accessToPremiumFeatures": {
-    "message": "访问高级会员功能"
+    "message": "高级版功能访问权限"
   },
   "additionalStorageGbMessage": {
     "message": "GB 附加存储"
@@ -10432,7 +10918,7 @@
     "message": "RSA 4096-Bit"
   },
   "premiumAccounts": {
-    "message": "6 个高级账户"
+    "message": "6 个高级版账户"
   },
   "unlimitedSharing": {
     "message": "不限数量的共享"
@@ -10555,7 +11041,7 @@
     "description": "This represents the beginning of a sentence. The full sentence will be 'Manage subscription from the Provider Portal', but 'Provider Portal' will be a link and thus cannot be included in the translation file."
   },
   "toHostBitwardenOnYourOwnServer": {
-    "message": "要在您自己的服务器上托管 Bitwarden，您需要上传许可证文件。要支持自托管组织的免费家庭版方案和高级计费功能，您需要在自托管组织中设置自动同步。"
+    "message": "要在您自己的服务器上托管 Bitwarden，您需要上传许可证文件。要支持自托管组织的免费版家庭版方案和高级计费功能，您需要在自托管组织中设置自动同步。"
   },
   "selfHostingTitleProper": {
     "message": "自托管"
@@ -10645,7 +11131,7 @@
     "message": "删除成功"
   },
   "freeFamiliesSponsorship": {
-    "message": "禁用免费 Bitwarden 家庭赞助"
+    "message": "禁用免费的 Bitwarden 家庭版赞助"
   },
   "freeFamiliesSponsorshipPolicyDesc": {
     "message": "不允许成员通过此组织兑换家庭版方案。"
@@ -10762,6 +11248,15 @@
   "domainClaimed": {
     "message": "域名已声明"
   },
+  "itemAddedToFavorites": {
+    "message": "项目已添加到收藏夹"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "项目已移出收藏夹"
+  },
+  "copyNote": {
+    "message": "复制备注"
+  },
   "organizationNameMaxLength": {
     "message": "组织名称不能超过 50 个字符。"
   },
@@ -10852,14 +11347,6 @@
   "openedExtensionViewAtRiskPasswords": {
     "message": "成功打开 Bitwarden 浏览器扩展。您现在可以审查存在风险的密码了。"
   },
-  "openExtensionManuallyPart1": {
-    "message": "我们无法打开 Bitwarden 浏览器扩展。请从工具栏中点击 Bitwarden 图标",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "来打开它。",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
   "resellerRenewalWarningMsg": {
     "message": "您的订阅即将续期。为确保服务不会中断，请在 $RENEWAL_DATE$ 之前联系 $RESELLER$ 确认您的续订。",
     "placeholders": {
@@ -11024,15 +11511,55 @@
   "searchArchive": {
     "message": "搜索归档"
   },
-  "archive": {
-    "message": "归档"
+  "archiveNoun": {
+    "message": "归档",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "归档",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "取消归档"
+  },
+  "itemsInArchive": {
+    "message": "归档中的项目"
   },
   "noItemsInArchive": {
     "message": "归档中没有项目"
   },
-  "archivedItemsDescription": {
+  "noItemsInArchiveDesc": {
     "message": "已归档的项目将显示在此处，并将被排除在一般搜索结果和自动填充建议之外。"
   },
+  "itemWasSentToArchive": {
+    "message": "项目已发送到归档"
+  },
+  "itemsWereSentToArchive": {
+    "message": "项目已发送到归档"
+  },
+  "itemUnarchived": {
+    "message": "项目已取消归档"
+  },
+  "bulkArchiveItems": {
+    "message": "项目已归档"
+  },
+  "bulkUnarchiveItems": {
+    "message": "项目已取消归档"
+  },
+  "archiveItem": {
+    "message": "归档项目",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "已归档的项目将被排除在一般搜索结果和自动填充建议之外。确定要归档此项目吗？"
+  },
+  "archiveBulkItems": {
+    "message": "归档项目",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "已归档的项目将被排除在一般搜索结果和自动填充建议之外。确定要归档这些项目吗？"
+  },
   "businessUnit": {
     "message": "业务单元"
   },
@@ -11132,7 +11659,7 @@
     "message": "您无法在没有浏览器扩展的情况下自动填充密码"
   },
   "cannotAutofillPasswordsWithoutExtensionDesc": {
-    "message": "您确定现在不添加该扩展吗？"
+    "message": "确定现在不添加此扩展吗？"
   },
   "skipToWebApp": {
     "message": "跳转到网页 App"
@@ -11140,6 +11667,9 @@
   "bitwardenExtensionInstalled": {
     "message": "Bitwarden 扩展已安装！"
   },
+  "bitwardenExtensionIsInstalled": {
+    "message": "Bitwarden 扩展已安装！"
+  },
   "openExtensionToAutofill": {
     "message": "打开扩展以登录并开始自动填充。"
   },
@@ -11154,6 +11684,14 @@
     "message": "学习中心",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "如果扩展未打开，您可能需要通过工具栏上的图标 ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " 来打开 Bitwarden。",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
     "message": "帮助中心",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
@@ -11497,5 +12035,144 @@
   },
   "seamlessIntegration": {
     "message": "无缝集成"
+  },
+  "families": {
+    "message": "家庭版"
+  },
+  "upgradeToFamilies": {
+    "message": "升级为家庭版"
+  },
+  "upgradeToPremium": {
+    "message": "升级为高级版"
+  },
+  "familiesUpdated": {
+    "message": "您已升级为家庭版！"
+  },
+  "taxCalculationError": {
+    "message": "计算您所在位置的税费时出错。请重试。"
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "欢迎使用 Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "使用高级版解锁更多安全功能，或使用家庭版开始分享项目"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "价格不含税，按年计费。"
+  },
+  "organizationNameDescription": {
+    "message": "您的组织名称将出现在您发送给成员的邀请中。"
+  },
+  "continueWithoutUpgrading": {
+    "message": "继续但不升级"
+  },
+  "upgradeYourPlan": {
+    "message": "升级您的方案"
+  },
+  "upgradeNow": {
+    "message": "立即升级"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "完成此表单将创建一个新的家庭版组织。您可以从管理控制台升级您的免费版组织。"
+  },
+  "upgradeErrorMessage": {
+    "message": "我们在处理您的升级时遇到错误。请重试。"
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "您拥有 Bitwarden 免费方案"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "升级以获得全面的安全防护"
+  },
+  "viewbusinessplans": {
+    "message": "查看商业方案"
+  },
+  "updateEncryptionSettings": {
+    "message": "更新加密设置"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "更新您的加密设置"
+  },
+  "updateSettings": {
+    "message": "更新设置"
+  },
+  "algorithm": {
+    "message": "算法"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "选择 Bitwarden 加密您的密码库数据的方式。所有选项都是安全的，但更强大的方式提供了更好的保护 - 特别是针对暴力攻击。Bitwarden 建议大多数用户使用默认设置。"
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "将值增加为高于默认值将提高安全性，但您的密码库相应需要更长时间才能解锁。"
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "关于加密算法"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 是一种经过充分测试的加密方式，可以平衡安全性和性能。适合于所有用户。"
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id 为现代攻击提供了更强大的保护。最适合拥有强大设备的高级用户。"
+  },
+  "zipPostalCodeLabel": {
+    "message": "ZIP / 邮政编码"
+  },
+  "cardNumberLabel": {
+    "message": "卡号"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "开始免费家庭版试用"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "阻止使用已声明的域名创建账户"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "禁止用户使用已声明域名的电子邮件地址在组织外部创建账户。"
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "必须先声明域名，然后才能激活此策略。"
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "设置一个解锁方式以更改您的密码库超时动作。"
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "企业策略要求已应用到您的超时选项中"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "您的密码库超时超出了您组织设置的限制。"
+  },
+  "neverLockWarning": {
+    "message": "确定要使用「从不」选项吗？将锁定选项设置为「从不」会将密码库的加密密钥存储在您的设备上。如果使用此选项，您必须确保您的设备安全。"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "超时动作"
+  },
+  "sessionTimeoutHeader": {
+    "message": "会话超时"
+  },
+  "appearance": {
+    "message": "外观"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "超时超出了您组织设置的限制：最多 $HOURS$ 小时 $MINUTES$ 分钟",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "未选择任何关键应用程序"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "确定要继续吗？"
+  },
+  "userVerificationFailed": {
+    "message": "用户验证失败。"
   }
 }
diff --git a/apps/web/src/locales/zh_TW/messages.json b/apps/web/src/locales/zh_TW/messages.json
index 4f9a78c2c02..19456fed39d 100644
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -3,29 +3,32 @@
     "message": "所有應用程式"
   },
   "activity": {
-    "message": "Activity"
+    "message": "活動"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Bitwarden 圖示"
   },
   "criticalApplications": {
     "message": "重要應用程式"
   },
   "noCriticalAppsAtRisk": {
-    "message": "No critical applications at risk"
+    "message": "沒有關鍵應用程式處於風險中"
   },
   "accessIntelligence": {
     "message": "存取資訊"
   },
-  "riskInsights": {
-    "message": "Risk Insights"
-  },
   "passwordRisk": {
-    "message": "Password Risk"
+    "message": "密碼風險"
+  },
+  "noEditPermissions": {
+    "message": "你沒有權限編輯這個項目"
   },
   "reviewAtRiskPasswords": {
     "message": "檢視全部應用中具有風險的密碼 (弱、被暴露或重複使用)。選擇最重要的應用程式並優先採取安全措施，幫助使用者解決具有風險的密碼。"
   },
+  "reviewAtRiskLoginsPrompt": {
+    "message": "檢視有風險的登入資訊"
+  },
   "dataLastUpdated": {
     "message": "上次資料更新日期：$DATE$",
     "placeholders": {
@@ -35,14 +38,17 @@
       }
     }
   },
+  "noReportRan": {
+    "message": "您尚未建立報告"
+  },
   "notifiedMembers": {
     "message": "已被通知的成員"
   },
   "revokeMembers": {
-    "message": "Revoke members"
+    "message": "撤銷成員"
   },
   "restoreMembers": {
-    "message": "Restore members"
+    "message": "還原成員"
   },
   "cannotRestoreAccessError": {
     "message": "無法還原組織存取"
@@ -59,8 +65,61 @@
   "createNewLoginItem": {
     "message": "新增登入項目"
   },
-  "criticalApplicationsActivityDescription": {
-    "message": "Once you mark applications critical, they will display here."
+  "percentageCompleted": {
+    "message": "完成 $PERCENT$%",
+    "placeholders": {
+      "percent": {
+        "content": "$1",
+        "example": "75"
+      }
+    }
+  },
+  "securityTasksCompleted": {
+    "message": "已完成 $COUNT$ / $TOTAL$ 個安全任務",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "passwordChangeProgress": {
+    "message": "密碼變更進度"
+  },
+  "assignMembersTasksToMonitorProgress": {
+    "message": "指派成員任務以監控進度"
+  },
+  "onceYouReviewApplications": {
+    "message": "當您審查應用程式並將其標記為關鍵後，可指派任務給成員以變更其密碼。"
+  },
+  "sendReminders": {
+    "message": "傳送提醒"
+  },
+  "onceYouMarkApplicationsCriticalTheyWillDisplayHere": {
+    "message": "一旦您標記應用程式為關鍵，它們將顯示在此。"
+  },
+  "viewAtRiskMembers": {
+    "message": "檢視有風險的成員"
+  },
+  "viewAtRiskApplications": {
+    "message": "檢視有風險的應用程式"
+  },
+  "criticalApplicationsAreAtRisk": {
+    "message": "$COUNT$ / $TOTAL$ 個關鍵應用程式因密碼風險而處於風險中",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
   },
   "criticalApplicationsWithCount": {
     "message": "重要應用程式($COUNT$)",
@@ -71,8 +130,11 @@
       }
     }
   },
+  "criticalApplicationsMarked": {
+    "message": "已將應用程式標記為關鍵"
+  },
   "countOfCriticalApplications": {
-    "message": "$COUNT$ critical applications",
+    "message": "$COUNT$ 個關鍵應用程式",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -80,6 +142,33 @@
       }
     }
   },
+  "countOfApplicationsAtRisk": {
+    "message": "$COUNT$ 個有風險的應用程式",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "countOfAtRiskPasswords": {
+    "message": "$COUNT$ 個有風險的密碼",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "newPasswordsAtRisk": {
+    "message": "$COUNT$ 組新密碼存在風險",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "notifiedMembersWithCount": {
     "message": "已被通知的成員($COUNT$)",
     "placeholders": {
@@ -89,32 +178,74 @@
       }
     }
   },
-  "noAppsInOrgTitle": {
-    "message": "在$ORG NAME$中找無應用程式",
-    "placeholders": {
-      "org name": {
-        "content": "$1",
-        "example": "Company Name"
-      }
-    }
+  "noDataInOrgTitle": {
+    "message": "找不到資料"
   },
-  "noAppsInOrgDescription": {
-    "message": "在使用者儲存登入後，應用程式將會顯示在這裡，並同時顯示具有風險的密碼。標註重要應用程式並通知使用者以更新密碼。"
+  "noDataInOrgDescription": {
+    "message": "匯入您組織的登入資料以開始使用存取智慧功能。完成後，您將能夠："
+  },
+  "feature1Title": {
+    "message": "將應用程式標記為關鍵"
+  },
+  "feature1Description": {
+    "message": "這將協助您優先消除最重要應用程式的風險。"
+  },
+  "feature2Title": {
+    "message": "協助成員提升其安全性"
+  },
+  "feature2Description": {
+    "message": "指派有風險的成員執行指導式安全任務以更新憑證。"
+  },
+  "feature3Title": {
+    "message": "監控進展"
+  },
+  "feature3Description": {
+    "message": "追蹤隨時間變化的狀況以顯示安全性改善。"
+  },
+  "noReportsRunTitle": {
+    "message": "產生報告"
+  },
+  "noReportsRunDescription": {
+    "message": "您已準備好開始產生報告。產生報告後，您將能夠："
   },
   "noCriticalApplicationsTitle": {
-    "message": "You haven’t marked any applications as critical"
+    "message": "您尚未將任何應用程式標記為關鍵"
   },
   "noCriticalApplicationsDescription": {
-    "message": "Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
+    "message": "選擇您最關鍵的應用程式，以優先處理安全行動，讓使用者解決有風險的密碼。"
   },
   "markCriticalApplications": {
-    "message": "Select critical applications"
+    "message": "選擇重要應用程式"
   },
   "markAppAsCritical": {
     "message": "標註應用程式為重要"
   },
+  "markAsCritical": {
+    "message": "標註應用程式為重要"
+  },
+  "applicationsSelected": {
+    "message": "已選擇的應用程式"
+  },
+  "selectApplication": {
+    "message": "選取應用程式"
+  },
+  "unselectApplication": {
+    "message": "取消選擇應用程式"
+  },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+    "message": "被標註重要的應用程式"
+  },
+  "criticalApplicationsMarkedSuccess": {
+    "message": "已將 $COUNT$ 個應用程式標記為關鍵",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "applicationsMarkedAsCriticalFail": {
+    "message": "標記應用程式為關鍵失敗"
   },
   "application": {
     "message": "應用程式"
@@ -123,7 +254,7 @@
     "message": "具有風險的密碼"
   },
   "requestPasswordChange": {
-    "message": "Request password change"
+    "message": "請求更改密碼"
   },
   "totalPasswords": {
     "message": "全部密碼"
@@ -134,11 +265,17 @@
   "atRiskMembers": {
     "message": "具有風險的成員"
   },
-  "membersAtRiskActivityDescription": {
-    "message": "Members with edit access to at-risk items for critical applications"
+  "membersWithAccessToAtRiskItemsForCriticalApplications": {
+    "message": "這些成員可存取關鍵應用程式中的高風險項目。"
   },
-  "membersAtRisk": {
-    "message": "$COUNT$ members at risk",
+  "membersWithAtRiskPasswords": {
+    "message": "使用有風險密碼的成員"
+  },
+  "membersWillReceiveSecurityTask": {
+    "message": "您組織的成員將被指派變更高風險密碼的任務。他們會在 Bitwarden 瀏覽器擴充套件中收到通知。"
+  },
+  "membersAtRiskCount": {
+    "message": "$COUNT$ 位有風險的成員",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -147,7 +284,7 @@
     }
   },
   "atRiskMembersWithCount": {
-    "message": "At-risk members ($COUNT$)",
+    "message": "有風險的成員 ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -164,20 +301,20 @@
       }
     }
   },
-  "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  "atRiskMemberDescription": {
+    "message": "這些成員正以薄弱、已外洩或重複使用的密碼登入關鍵應用程式。"
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "目前沒有成員使用弱密碼、外洩密碼或重複密碼登入應用程式。"
   },
   "atRiskApplicationsDescription": {
-    "message": "These applications have weak, exposed, or reused passwords."
+    "message": "這些應用程式存在弱密碼、外洩密碼或重複密碼問題。"
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "These are no applications with weak, exposed, or reused passwords."
+    "message": "目前沒有應用程式存在弱密碼、外洩密碼或重複密碼問題。"
   },
   "atRiskMembersDescriptionWithApp": {
-    "message": "These members are logging into $APPNAME$ with weak, exposed, or reused passwords.",
+    "message": "這些成員正在使用弱密碼、外洩密碼或重複密碼登入 $APPNAME$。",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -186,7 +323,7 @@
     }
   },
   "atRiskMembersDescriptionWithAppNone": {
-    "message": "There are no at risk members for $APPNAME$.",
+    "message": "$APPNAME$ 沒有有風險的成員。",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -203,11 +340,83 @@
   "totalApplications": {
     "message": "應用程式總數"
   },
+  "applicationsNeedingReview": {
+    "message": "需要檢視的應用程式"
+  },
+  "newApplicationsCardTitle": {
+    "message": "審查新應用程式"
+  },
+  "newApplicationsWithCount": {
+    "message": "$COUNT$ 個新應用程式",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "13"
+      }
+    }
+  },
+  "newApplicationsDescription": {
+    "message": "檢視新應用程式以標記為關鍵，並維護組織安全"
+  },
+  "reviewNow": {
+    "message": "立即審查"
+  },
+  "allCaughtUp": {
+    "message": "全部完成！"
+  },
+  "noNewApplicationsToReviewAtThisTime": {
+    "message": "目前沒有新的應用程式可供審查"
+  },
+  "organizationHasItemsSavedForApplications": {
+    "message": "您的組織已為 $COUNT$ 個應用程式儲存項目",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "310"
+      }
+    }
+  },
+  "reviewApplicationsToSecureItems": {
+    "message": "審查應用程式以保護對組織安全最重要的項目"
+  },
+  "reviewApplications": {
+    "message": "審核認領"
+  },
+  "prioritizeCriticalApplications": {
+    "message": "優先處理關鍵應用程式"
+  },
+  "selectCriticalAppsDescription": {
+    "message": "選擇哪些應用程式對您的組織最為關鍵。之後，您將能指派安全任務給成員以消除風險。"
+  },
+  "reviewNewApplications": {
+    "message": "審查新應用程式"
+  },
+  "reviewNewAppsDescription": {
+    "message": "審查包含高風險項目的新應用程式，並將您希望密切監控的項目標記為關鍵。之後，您將能指派安全任務給成員以消除風險。"
+  },
+  "clickIconToMarkAppAsCritical": {
+    "message": "點擊星形圖示以將應用程式標記為關鍵"
+  },
+  "markAsCriticalPlaceholder": {
+    "message": "標記為關鍵功能將在未來更新中實現"
+  },
+  "applicationReviewSaved": {
+    "message": "已儲存應用程式審查"
+  },
+  "newApplicationsReviewed": {
+    "message": "新應用程式已審查"
+  },
+  "errorSavingReviewStatus": {
+    "message": "儲存審查狀態時發生錯誤"
+  },
+  "pleaseTryAgain": {
+    "message": "請再試一次"
+  },
   "unmarkAsCritical": {
-    "message": "Unmark as critical"
+    "message": "取消標記為關鍵"
   },
   "criticalApplicationUnmarkedSuccessfully": {
-    "message": "Successfully unmarked application as critical"
+    "message": "已成功取消將應用程式標記為關鍵"
   },
   "whatTypeOfItem": {
     "message": "這是什麼類型的項目？"
@@ -274,7 +483,7 @@
     "message": "支付卡詳細資料"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ 詳細資訊",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -286,7 +495,7 @@
     "message": "項目歷史記錄"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "驗證器金鑰"
   },
   "autofillOptions": {
     "message": "自動填入選項"
@@ -324,7 +533,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "顯示偵測到的吻合 $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -333,7 +542,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "隱藏偵測到的吻合 $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -450,16 +659,16 @@
     "message": "驗證器金鑰 (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "無縫兩步驟驗證"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden 可以儲存並填入兩步驟驗證碼。複製金鑰並貼上到此欄位。"
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden 可以儲存並填入兩步驟驗證碼。選擇相機圖示來截取此網站的驗證器QR code，或手動複製金鑰並貼上到此欄位。"
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "了解更多驗證程式"
   },
   "folder": {
     "message": "資料夾"
@@ -510,7 +719,7 @@
     "message": "編輯資料夾"
   },
   "editWithName": {
-    "message": "Edit $ITEM$: $NAME$",
+    "message": "編輯 $ITEM$：$NAME$",
     "placeholders": {
       "item": {
         "content": "$1",
@@ -529,10 +738,10 @@
     "message": "資料夾名稱"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "在資料夾名稱後面使用「/」來建立樹狀結構。\n例如：社交網路/論壇"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "您確定要永久刪除此資料夾嗎？"
   },
   "baseDomain": {
     "message": "基底網域",
@@ -596,7 +805,7 @@
     "message": "取消"
   },
   "later": {
-    "message": "Later"
+    "message": "以後再說"
   },
   "canceled": {
     "message": "已取消"
@@ -657,7 +866,7 @@
     "message": "搜尋群組"
   },
   "resetSearch": {
-    "message": "Reset search"
+    "message": "重設搜尋"
   },
   "allItems": {
     "message": "所有項目"
@@ -665,6 +874,9 @@
   "favorites": {
     "message": "我的最愛"
   },
+  "taskSummary": {
+    "message": "任務摘要"
+  },
   "types": {
     "message": "類型"
   },
@@ -681,7 +893,7 @@
     "message": "安全筆記"
   },
   "typeNote": {
-    "message": "Note"
+    "message": "備註"
   },
   "typeSshKey": {
     "message": "SSH 金鑰"
@@ -762,79 +974,79 @@
     "message": "檢視項目"
   },
   "newItemHeaderLogin": {
-    "message": "New Login",
+    "message": "新增登入資訊",
     "description": "Header for new login item type"
   },
   "newItemHeaderCard": {
-    "message": "New Card",
+    "message": "新增支付卡",
     "description": "Header for new card item type"
   },
   "newItemHeaderIdentity": {
-    "message": "New Identity",
+    "message": "新增身分",
     "description": "Header for new identity item type"
   },
   "newItemHeaderNote": {
-    "message": "New Note",
+    "message": "新增備註",
     "description": "Header for new note item type"
   },
   "newItemHeaderSshKey": {
-    "message": "New SSH key",
+    "message": "新增 SSH 金鑰",
     "description": "Header for new SSH key item type"
   },
   "newItemHeaderTextSend": {
-    "message": "New Text Send",
+    "message": "新增文字 Send",
     "description": "Header for new text send"
   },
   "newItemHeaderFileSend": {
-    "message": "New File Send",
+    "message": "新增檔案 Send",
     "description": "Header for new file send"
   },
   "editItemHeaderLogin": {
-    "message": "Edit Login",
+    "message": "編輯登入資訊",
     "description": "Header for edit login item type"
   },
   "editItemHeaderCard": {
-    "message": "Edit Card",
+    "message": "編輯支付卡",
     "description": "Header for edit card item type"
   },
   "editItemHeaderIdentity": {
-    "message": "Edit Identity",
+    "message": "編輯身分",
     "description": "Header for edit identity item type"
   },
   "editItemHeaderNote": {
-    "message": "Edit Note",
+    "message": "編輯備註",
     "description": "Header for edit note item type"
   },
   "editItemHeaderSshKey": {
-    "message": "Edit SSH key",
+    "message": "編輯 SSH 金鑰",
     "description": "Header for edit SSH key item type"
   },
   "editItemHeaderTextSend": {
-    "message": "Edit Text Send",
+    "message": "編輯文字 Send",
     "description": "Header for edit text send"
   },
   "editItemHeaderFileSend": {
-    "message": "Edit File Send",
+    "message": "編輯檔案 Send",
     "description": "Header for edit file send"
   },
   "viewItemHeaderLogin": {
-    "message": "View Login",
+    "message": "檢視登入資訊",
     "description": "Header for view login item type"
   },
   "viewItemHeaderCard": {
-    "message": "View Card",
+    "message": "檢視支付卡",
     "description": "Header for view card item type"
   },
   "viewItemHeaderIdentity": {
-    "message": "View Identity",
+    "message": "檢視身分",
     "description": "Header for view identity item type"
   },
   "viewItemHeaderNote": {
-    "message": "View Note",
+    "message": "檢視備註",
     "description": "Header for view note item type"
   },
   "viewItemHeaderSshKey": {
-    "message": "View SSH key",
+    "message": "檢視 SSH 金鑰",
     "description": "Header for view SSH key item type"
   },
   "new": {
@@ -885,7 +1097,7 @@
     "description": "Copy password to clipboard"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase",
+    "message": "複製密碼片語",
     "description": "Copy passphrase to clipboard"
   },
   "passwordCopied": {
@@ -908,7 +1120,7 @@
     "description": "Copy URI to clipboard"
   },
   "copyCustomField": {
-    "message": "Copy $FIELD$",
+    "message": "複製 $FIELD$",
     "placeholders": {
       "field": {
         "content": "$1",
@@ -941,25 +1153,25 @@
     "message": "複製護照號碼"
   },
   "copyLicenseNumber": {
-    "message": "Copy license number"
+    "message": "複製許可證號碼"
   },
   "copyPrivateKey": {
-    "message": "Copy private key"
+    "message": "複製私密金鑰"
   },
   "copyPublicKey": {
-    "message": "Copy public key"
+    "message": "複製公開金鑰"
   },
   "copyFingerprint": {
-    "message": "Copy fingerprint"
+    "message": "複製指紋"
   },
   "copyName": {
-    "message": "Copy name"
+    "message": "複製名稱"
   },
   "cardNumber": {
-    "message": "card number"
+    "message": "支付卡號碼"
   },
   "copyFieldCipherName": {
-    "message": "Copy $FIELD$, $CIPHERNAME$",
+    "message": "複製 $FIELD$，$CIPHERNAME$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -976,7 +1188,7 @@
     "message": "我"
   },
   "myItems": {
-    "message": "My Items"
+    "message": "個人文章"
   },
   "myVault": {
     "message": "我的密碼庫"
@@ -1052,7 +1264,7 @@
     }
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "項目已移到 $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -1061,7 +1273,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "項目已移到 $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -1127,16 +1339,16 @@
     "message": "您的登入工作階段已逾期。"
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "重新啟動註冊"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "過期連結"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "請重新啟動註冊流程或是重試登入。"
   },
   "youMayAlreadyHaveAnAccount": {
-    "message": "You may already have an account"
+    "message": "您可能已經有帳號"
   },
   "logOutConfirmation": {
     "message": "您確定要登出嗎？"
@@ -1166,7 +1378,7 @@
     "message": "必須先在 Bitwarden 應用程式設定中開啟後，才可以使用裝置登入。要改用其他選項嗎？"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "需要另一個選項嗎？"
   },
   "loginWithMasterPassword": {
     "message": "使用主密碼登入"
@@ -1177,17 +1389,23 @@
   "readingPasskeyLoadingInfo": {
     "message": "保持此視窗打開，然後按照瀏覽器的提示進行操作。"
   },
+  "passkeyAuthenticationFailed": {
+    "message": "通行金鑰驗證失敗。請再試一次。"
+  },
   "useADifferentLogInMethod": {
     "message": "改用不同的登入方式"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "使用密碼金鑰登入"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "使用單一登入"
+  },
+  "yourOrganizationRequiresSingleSignOn": {
+    "message": "您的組織要求使用單一登入。"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "歡迎回來"
   },
   "invalidPasskeyPleaseTryAgain": {
     "message": "無效的密碼金鑰，請再試一次。"
@@ -1292,13 +1510,13 @@
     "message": "登入 Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "輸入傳送到您電子郵件信箱的驗證碼"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "請輸入您驗證器應用程式中的代碼"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "請輕觸您的 YubiKey 以進行驗證"
   },
   "authenticationTimeout": {
     "message": "驗證逾時"
@@ -1307,25 +1525,25 @@
     "message": "此驗證工作階段已逾時。請重試登入。"
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "驗證您的身分"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "我們無法辨識這部裝置。請輸入傳送到您電子郵件的驗證碼，以驗證您的身分。"
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "繼續登入"
   },
   "whatIsADevice": {
-    "message": "What is a device?"
+    "message": "什麼是裝置？"
   },
   "aDeviceIs": {
-    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+    "message": "裝置是您登入 Bitwarden 應用程式的唯一安裝環境。重新安裝、清除應用程式資料或清除 Cookie 可能導致裝置出現多次。"
   },
   "logInInitiated": {
     "message": "登入已發起"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "已傳送請求"
   },
   "submit": {
     "message": "送出"
@@ -1358,7 +1576,7 @@
     "message": "主密碼提示（選用）"
   },
   "newMasterPassHint": {
-    "message": "New master password hint (optional)"
+    "message": "新增主密碼提示（選用）"
   },
   "masterPassHintLabel": {
     "message": "主密碼提示"
@@ -1380,7 +1598,7 @@
     "message": "設定"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "帳號電子郵件"
   },
   "requestHint": {
     "message": "請求提示"
@@ -1389,7 +1607,7 @@
     "message": "請求密碼提示"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "輸入您帳號的電子郵件，您的密碼提示會傳送給您"
   },
   "getMasterPasswordHint": {
     "message": "取得主密碼提示"
@@ -1471,6 +1689,15 @@
   "invalidMasterPassword": {
     "message": "無效的主密碼"
   },
+  "invalidMasterPasswordConfirmEmailAndHost": {
+    "message": "主密碼無效。請確認你的電子郵件正確，且帳號是於 $HOST$ 建立的。",
+    "placeholders": {
+      "host": {
+        "content": "$1",
+        "example": "vault.bitwarden.com"
+      }
+    }
+  },
   "invalidFilePassword": {
     "message": "檔案密碼無效，請使用您當初匯出檔案時輸入的密碼。"
   },
@@ -1480,6 +1707,30 @@
   "noItemsInList": {
     "message": "沒有可列出的項目。"
   },
+  "noItemsInTrash": {
+    "message": "垃圾桶中沒有項目"
+  },
+  "noItemsInTrashDesc": {
+    "message": "您刪除的項目會在此顯示，並會在 30 天之後永久刪除"
+  },
+  "noItemsInVault": {
+    "message": "密碼庫中沒有項目"
+  },
+  "emptyVaultDescription": {
+    "message": "除了密碼之外，您也可以儲存安全的登入資訊、身分資訊、支付卡及筆記在您的密碼庫。"
+  },
+  "emptyFavorites": {
+    "message": "您尚未將任何項目設為收藏"
+  },
+  "emptyFavoritesDesc": {
+    "message": "將常用項目加入收藏以快速存取。"
+  },
+  "noSearchResults": {
+    "message": "沒有搜尋結果"
+  },
+  "clearFiltersOrTryAnother": {
+    "message": "清除過濾器或更換另一個搜尋條件"
+  },
   "noPermissionToViewAllCollectionItems": {
     "message": "您沒有檢視此集合中所有項目的權限。"
   },
@@ -1511,10 +1762,10 @@
     "message": "通知已傳送至您的裝置。"
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "在你的裝置或其他裝置上解鎖 Bitwarden "
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "來自 $EMAIL$ 的存取嘗試",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1523,19 +1774,19 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "確認訪問"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "拒絕訪問權限"
   },
   "notificationSentDeviceAnchor": {
     "message": "網頁應用程式"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "在核准前請確保您的指紋短語與下面完全相符。"
   },
   "notificationSentDeviceComplete": {
-    "message": "Unlock Bitwarden on your device. Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "在您的裝置上解鎖 Bitwarden。批准前請確認指紋短語與下方所示相符。"
   },
   "aNotificationWasSentToYourDevice": {
     "message": "已傳送通知至您的裝置"
@@ -1559,10 +1810,10 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "30 天內不要再於這部裝置上詢問"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "選擇其他方式",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
@@ -1584,19 +1835,19 @@
     "message": "兩步驟登入選項"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "選取兩步驟登入方式"
   },
   "recoveryCodeTitle": {
     "message": "復原碼"
   },
   "invalidRecoveryCode": {
-    "message": "Invalid recovery code"
+    "message": "無效的還原代碼"
   },
   "authenticatorAppTitle": {
     "message": "驗證器應用程式"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "輸入驗證器應用程式產生的驗證碼，例如 Bitwarden 驗證器。",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
@@ -1606,7 +1857,7 @@
     "message": "使用 YubiKey 存取您的帳戶。支援 YubiKey 4 系列、5 系列以及 NEO 裝置。"
   },
   "duoDescV2": {
-    "message": "Enter a code generated by Duo Security.",
+    "message": "輸入 Duo 應用程式產生的驗證碼。",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -1629,13 +1880,13 @@
     "message": "（遷移自 FIDO）"
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "在新分頁開啟"
   },
   "emailTitle": {
     "message": "電子郵件"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "輸入寄送到您電子郵件信箱的驗證碼。"
   },
   "continue": {
     "message": "繼續"
@@ -1692,10 +1943,10 @@
     "message": "複製 UUID"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "存取權杖更新失敗"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "未找到存取權杖或 API 密鑰。請重試登出再登入。"
   },
   "warning": {
     "message": "警告"
@@ -1796,7 +2047,7 @@
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "避免易混淆的字元",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "length": {
@@ -1834,20 +2085,20 @@
     "message": "包含數字"
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "企業原則之要求已在您的產生器選項中生效。",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "passwordHistory": {
     "message": "密碼歷史記錄"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "產生器歷史記錄"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "清除產生器歷史記錄"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "若繼續，所有產生器曾經產生的記錄會被刪除。您確定要繼續？"
   },
   "noPasswordsInList": {
     "message": "沒有可列出的密碼。"
@@ -1859,7 +2110,7 @@
     "message": "沒有可顯示的內容"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "您最近未產生任何密碼"
   },
   "clear": {
     "message": "清除",
@@ -1893,7 +2144,7 @@
     "message": "接下來會登出目前工作階段，並要求您重新登入帳戶。其他裝置上的工作階段最多會保持一個小時。"
   },
   "changePasswordWarning": {
-    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+    "message": "變更密碼後，你需要使用新密碼重新登入。其他裝置上的工作階段會在一小時內登出。"
   },
   "emailChanged": {
     "message": "電子郵件已儲存"
@@ -1905,7 +2156,7 @@
     "message": "目前工作階段"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "等待請求"
   },
   "logBackInOthersToo": {
     "message": "請重新登入。若您還在使用其他 Bitwarden 應用程式，也請登出後再重新登入。"
@@ -1928,9 +2179,6 @@
   "encKeySettings": {
     "message": "加密金鑰設定"
   },
-  "kdfAlgorithm": {
-    "message": "KDF 演算法"
-  },
   "kdfIterations": {
     "message": "KDF 疊代"
   },
@@ -1965,9 +2213,6 @@
   "argon2Desc": {
     "message": "更高的 KDF 疊代次數、記憶體占用與平行數量可以避免您的主密碼遭到攻擊者的暴力破解。"
   },
-  "changeKdf": {
-    "message": "變更 KDF"
-  },
   "encKeySettingsChanged": {
     "message": "加密金鑰設定已儲存"
   },
@@ -1984,25 +2229,25 @@
     "message": "接下來會登出目前的工作階段，並要求您重新登入。若您有設定兩步驟登入，也需重新驗證。其他裝置上的活動工作階段最多會保持一個小時。"
   },
   "newDeviceLoginProtection": {
-    "message": "New device login"
+    "message": "新裝置登入"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message": "Turn off new device login protection"
+    "message": "關閉新裝置登入保護"
   },
   "turnOnNewDeviceLoginProtection": {
-    "message": "Turn on new device login protection"
+    "message": "啟用新裝置登入保護"
   },
   "turnOffNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to turn off the verification emails bitwarden sends when you login from a new device."
+    "message": "請在下方繼續操作，以關閉 Bitwarden 在您從新裝置登入時發送的驗證電子郵件。"
   },
   "turnOnNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to have bitwarden send you verification emails when you login from a new device."
+    "message": "請在下方繼續操作，以啟用 Bitwarden 在您從新裝置登入時發送的驗證電子郵件。"
   },
   "turnOffNewDeviceLoginProtectionWarning": {
-    "message": "With new device login protection turned off, anyone with your master password can access your account from any device. To protect your account without verification emails, set up two-step login."
+    "message": "當新裝置登入保護關閉時，任何知道您主密碼的人都可以從任何裝置存取您的帳號。若要在不使用驗證電子郵件的情況下保護帳號，請設定兩步驟登入。"
   },
   "accountNewDeviceLoginProtectionSaved": {
-    "message": "New device login protection changes saved"
+    "message": "新裝置登入保護變更已儲存"
   },
   "sessionsDeauthorized": {
     "message": "已取消所有工作階段授權"
@@ -2053,7 +2298,7 @@
     "message": "您的帳戶已經關閉，所有關聯的資料也已經被刪除。"
   },
   "deleteOrganizationWarning": {
-    "message": "Deleting your organization is permanent. It cannot be undone."
+    "message": "刪除組織是永久性的。這無法撤銷。"
   },
   "myAccount": {
     "message": "我的帳戶"
@@ -2065,7 +2310,7 @@
     "message": "匯入資料"
   },
   "onboardingImportDataDetailsPartOne": {
-    "message": "如果你沒有任何資料要匯入，你可以建立一個",
+    "message": "如果你沒有任何資料要匯入，你可以建立一個 ",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLink": {
@@ -2073,7 +2318,7 @@
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLoginLink": {
-    "message": "new login",
+    "message": "新增登入資訊",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new login instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsPartTwoNoOrgs": {
@@ -2124,7 +2369,7 @@
     "message": "解密匯出的檔案時發生錯誤，您的加密金鑰與匯出資料時使用的金鑰不同。"
   },
   "destination": {
-    "message": "Destination"
+    "message": "目的"
   },
   "learnAboutImportOptions": {
     "message": "瞭解更多匯入選項"
@@ -2136,10 +2381,10 @@
     "message": "選擇一個集合"
   },
   "importTargetHintCollection": {
-    "message": "Select this option if you want the imported file contents moved to a collection"
+    "message": "若你希望將匯入檔案的內容移至集合，請選擇此選項"
   },
   "importTargetHintFolder": {
-    "message": "Select this option if you want the imported file contents moved to a folder"
+    "message": "若你希望將匯入檔案的內容移至資料夾，請選擇此選項"
   },
   "importUnassignedItemsError": {
     "message": "檔案包含未指派的項目。"
@@ -2188,7 +2433,7 @@
     "message": "變更網頁版密碼庫使用的語言。"
   },
   "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+    "message": "顯示網站圖示並取得變更密碼網址"
   },
   "default": {
     "message": "預設"
@@ -2261,19 +2506,19 @@
     "message": "啟用兩步驟登入可能會將您永久鎖定在您的 Bitwarden 帳戶外。如果您無法正常使用兩步驟登入方式（例如，您遺失了裝置），則可以使用復原碼存取您的帳戶。 如果您失去帳戶的存取權限，Bitwarden 也無法幫助您。所以我們建議您記下或列印復原碼，並將其妥善保存。"
   },
   "restrictedItemTypePolicy": {
-    "message": "Remove card item type"
+    "message": "移除支付卡項目類型"
   },
   "restrictedItemTypePolicyDesc": {
-    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+    "message": "不允許成員建立支付卡項目類型。現有支付卡將自動移除。"
   },
   "restrictCardTypeImport": {
-    "message": "Cannot import card item types"
+    "message": "無法匯入支付卡項目類別"
   },
   "restrictCardTypeImportDesc": {
-    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+    "message": "由於一或多個組織設有政策，您無法匯入支付卡至您的密碼庫。"
   },
   "yourSingleUseRecoveryCode": {
-    "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
+    "message": "您的單次使用恢復碼可用於在失去兩步驟登入提供者存取權時關閉兩步驟登入。Bitwarden 建議您將恢復碼寫下並妥善保管。"
   },
   "viewRecoveryCode": {
     "message": "檢視復原碼"
@@ -2314,31 +2559,31 @@
     "message": "管理"
   },
   "manageCollection": {
-    "message": "Manage collection"
+    "message": "管理所有集合"
   },
   "viewItems": {
-    "message": "View items"
+    "message": "檢視項目"
   },
   "viewItemsHidePass": {
-    "message": "View items, hidden passwords"
+    "message": "檢視項目、隱藏密碼"
   },
   "editItems": {
     "message": "編輯項目"
   },
   "editItemsHidePass": {
-    "message": "Edit items, hidden passwords"
+    "message": "編輯項目、隱藏密碼"
   },
   "disable": {
     "message": "停用"
   },
   "orgUserDetailsNotFound": {
-    "message": "Member details not found."
+    "message": "找不到成員詳細資料。"
   },
   "revokeAccess": {
     "message": "撤銷存取權限"
   },
   "revoke": {
-    "message": "Revoke"
+    "message": "撤銷"
   },
   "twoStepLoginProviderEnabled": {
     "message": "您的帳戶已啟用此兩步驟登入方式。"
@@ -2374,19 +2619,19 @@
     "message": "繼續前往 bitwarden.com？"
   },
   "twoStepContinueToBitwardenUrlDesc": {
-    "message": "Bitwarden Authenticator allows you to store authenticator keys and generate TOTP codes for 2-step verification flows. Learn more on the bitwarden.com website."
+    "message": "您可以使用 Bitwarden 驗證器儲存驗證器金鑰，並為兩步驟驗證流程產生 TOTP 代碼。前往 bitwarden.com 網站以了解更多資訊。"
   },
   "twoStepAuthenticatorScanCodeV2": {
     "message": "使用驗證應用程式掃描下方的 QR 碼，或輸入金鑰。"
   },
   "twoStepAuthenticatorQRCanvasError": {
-    "message": "Could not load QR code. Try again or use the key below."
+    "message": "無法載入 QR 碼。請再試一次或使用下方金鑰。"
   },
   "key": {
     "message": "金鑰"
   },
   "twoStepAuthenticatorEnterCodeV2": {
-    "message": "Verification code"
+    "message": "驗證碼"
   },
   "twoStepAuthenticatorReaddDesc": {
     "message": "若您需要將其加入其他裝置，以下是您的驗證器應用程式所需要的 QR Code（或金鑰）。"
@@ -2585,7 +2830,7 @@
     "message": "發現未啟用 2FA 的登入"
   },
   "inactive2faFoundReportDesc": {
-    "message": "We found $COUNT$ website(s) in your $VAULT$ that may not be configured with two-step login (according to 2fa.directory). To further protect these accounts, you should set up two-step login.",
+    "message": "我們在您的密碼庫中找到 $COUNT$ 個可能未設定兩步驟登入的網站（依據 twofactorauth.org）。若要進一步保護這些帳號，您應啟用兩步驟登入。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2632,7 +2877,7 @@
     "message": "檢查洩露的密碼"
   },
   "timesExposed": {
-    "message": "Times exposed"
+    "message": "暴露次數"
   },
   "exposedXTimes": {
     "message": "已暴露 $COUNT$ 次",
@@ -2669,7 +2914,7 @@
     "message": "您的密碼庫中沒有項目具有弱式密碼。"
   },
   "weakness": {
-    "message": "Weakness"
+    "message": "弱"
   },
   "reusedPasswordsReport": {
     "message": "重複使用密碼"
@@ -2681,7 +2926,7 @@
     "message": "發現重複使用的密碼"
   },
   "reusedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ passwords that are being reused in your $VAULT$. You should change them to a unique value.",
+    "message": "我們在您的密碼庫中找到了 $COUNT$ 組密碼重複使用。您應該將它們變更為不同的密碼。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2798,6 +3043,9 @@
   "makeSureEnoughCredit": {
     "message": "請確保您的帳戶有足夠的餘額用於此次購買，若您的帳戶餘額不足，則會以您預設的付款方式補足差額。您可以透過計費頁面對您的帳戶儲值餘額。"
   },
+  "notEnoughAccountCredit": {
+    "message": "您的帳號餘額不足以完成此購買。您可以在帳單頁面為帳號加值。"
+  },
   "creditAppliedDesc": {
     "message": "您帳戶的餘額可用於消費。任何可用的餘額將用於自動繳納此帳戶的帳單。"
   },
@@ -2900,10 +3148,10 @@
     }
   },
   "showPricingSummary": {
-    "message": "Show pricing summary"
+    "message": "顯示價格摘要"
   },
   "hidePricingSummary": {
-    "message": "Hide pricing summary"
+    "message": "隱藏價格摘要"
   },
   "summary": {
     "message": "摘要"
@@ -2996,14 +3244,23 @@
   "nextCharge": {
     "message": "下一次扣款"
   },
+  "nextChargeHeader": {
+    "message": "下一次收費"
+  },
+  "plan": {
+    "message": "方案"
+  },
   "details": {
     "message": "詳細資料"
   },
+  "discount": {
+    "message": "折扣"
+  },
   "downloadLicense": {
     "message": "下載授權證"
   },
   "viewBillingToken": {
-    "message": "View Billing Token"
+    "message": "檢視帳單權杖"
   },
   "updateLicense": {
     "message": "更新授權"
@@ -3052,10 +3309,10 @@
     "message": "帳單"
   },
   "noUnpaidInvoices": {
-    "message": "No unpaid invoices."
+    "message": "沒有未付款發票。"
   },
   "noPaidInvoices": {
-    "message": "No paid invoices."
+    "message": "無帳單。"
   },
   "paid": {
     "message": "已付款",
@@ -3332,7 +3589,7 @@
     }
   },
   "trialSecretsManagerThankYou": {
-    "message": "Thanks for signing up for Bitwarden Secrets Manager for $PLAN$!",
+    "message": "感謝您申請 Bitwarden 機密管理 $PLAN$！",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -3452,10 +3709,10 @@
     "message": "外部 ID 可用於參考，或將此資源與使用者目錄等外部系統連結起來。"
   },
   "ssoExternalId": {
-    "message": "SSO External ID"
+    "message": "SSO 外部 ID"
   },
   "ssoExternalIdDesc": {
-    "message": "SSO External ID is an unencrypted reference between Bitwarden and your configured SSO provider."
+    "message": "SSO 外部 ID 是 Bitwarden 與您設定的 SSO 提供者之間的一個未加密參考。"
   },
   "nestCollectionUnder": {
     "message": "將集合嵌套在"
@@ -3506,10 +3763,10 @@
     }
   },
   "inviteSingleEmailDesc": {
-    "message": "You have 1 invite remaining."
+    "message": "您還有 1 個邀請名額。"
   },
   "inviteZeroEmailDesc": {
-    "message": "You have 0 invites remaining."
+    "message": "您沒有剩餘邀請名額。"
   },
   "userUsingTwoStep": {
     "message": "此使用者正在使用兩步驟登入保護帳戶。"
@@ -3587,7 +3844,7 @@
     "message": "網頁版密碼庫"
   },
   "webApp": {
-    "message": "Web app"
+    "message": "網路應用程式"
   },
   "cli": {
     "message": "CLI 命令列介面"
@@ -3678,7 +3935,7 @@
     }
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "檢視所有登入選項"
   },
   "viewAllLoginOptions": {
     "message": "檢視所有登入選項"
@@ -3966,7 +4223,7 @@
     }
   },
   "unlinkedSso": {
-    "message": "Unlinked SSO."
+    "message": "已取消連結 SSO"
   },
   "unlinkedSsoUser": {
     "message": "已為使用者 $ID$ 取消連結 SSO。",
@@ -4023,16 +4280,16 @@
     "message": "首次登入"
   },
   "trusted": {
-    "message": "Trusted"
+    "message": "已信任"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "需要批准"
   },
   "areYouTryingtoLogin": {
-    "message": "Are you trying to log in?"
+    "message": "您正在嘗試登入嗎？"
   },
   "logInAttemptBy": {
-    "message": "Login attempt by $EMAIL$",
+    "message": "來自 $EMAIL$ 的登入嘗試",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4041,22 +4298,22 @@
     }
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "裝置類型"
   },
   "ipAddress": {
-    "message": "IP Address"
+    "message": "IP 位址"
   },
   "confirmLogIn": {
-    "message": "Confirm login"
+    "message": "確認登入"
   },
   "denyLogIn": {
-    "message": "Deny login"
+    "message": "拒絕登入"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "此請求已失效。"
   },
   "loginRequestApprovedForEmailOnDevice": {
-    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "message": "登入請求已由 $DEVICE$ 上的 $EMAIL$ 批准",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4069,7 +4326,7 @@
     }
   },
   "youDeniedLoginAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+    "message": "您拒絕了來自其他裝置的登入嘗試。如果這是您本人，請嘗試再次使用該裝置登入。"
   },
   "loginRequestHasAlreadyExpired": {
     "message": "登入要求已逾期。"
@@ -4078,7 +4335,7 @@
     "message": "剛剛"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "$MINUTES$ 分鐘前已發起要求",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -4093,10 +4350,10 @@
     "message": "查看你的電子郵件"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Follow the link in the email sent to"
+    "message": "跟隨電子郵件中的連結"
   },
   "andContinueCreatingYourAccount": {
-    "message": "and continue creating your account."
+    "message": "並繼續建立您的帳號"
   },
   "noEmail": {
     "message": "沒有電子郵件？"
@@ -4105,7 +4362,7 @@
     "message": "返回"
   },
   "toEditYourEmailAddress": {
-    "message": "to edit your email address."
+    "message": "來編輯您的電子郵件位址。"
   },
   "view": {
     "message": "檢視"
@@ -4189,7 +4446,7 @@
     "message": "帳戶電子郵件已驗證"
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "電子郵件已驗證"
   },
   "emailVerifiedFailed": {
     "message": "無法驗證電子郵件。請嘗試傳送一封新的驗證電子郵件。"
@@ -4203,20 +4460,47 @@
   "updateBrowser": {
     "message": "更新瀏覽器"
   },
-  "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+  "generatingYourAccessIntelligence": {
+    "message": "正在產生您的存取智慧分析…"
+  },
+  "fetchingMemberData": {
+    "message": "正在擷取成員資料…"
+  },
+  "analyzingPasswordHealth": {
+    "message": "正在分析密碼安全狀況…"
+  },
+  "calculatingRiskScores": {
+    "message": "正在計算風險分數…"
+  },
+  "generatingReportData": {
+    "message": "正在產生報告資料..."
+  },
+  "savingReport": {
+    "message": "正在儲存報告..."
+  },
+  "compilingInsights": {
+    "message": "正在整理洞察結果…"
+  },
+  "loadingProgress": {
+    "message": "載入進度中"
+  },
+  "thisMightTakeFewMinutes": {
+    "message": "這可能需要幾分鐘。"
+  },
+  "riskInsightsRunReport": {
+    "message": "執行報告"
   },
   "updateBrowserDesc": {
     "message": "未支援您使用的瀏覽器。網頁版密碼庫可能無法正常運作。"
   },
   "youHaveAPendingLoginRequest": {
-    "message": "You have a pending login request from another device."
+    "message": "您有來自其他裝置的待處理登入請求。"
   },
   "reviewLoginRequest": {
-    "message": "Review login request"
+    "message": "檢視登入請求"
   },
   "loginRequest": {
-    "message": "Login request"
+    "message": "已要求登入"
   },
   "freeTrialEndPromptCount": {
     "message": "您的免費試用將於 $COUNT$ 天後結束。",
@@ -4283,13 +4567,13 @@
     "message": "您已被邀請加入以上組織。若想接受邀請，您需要登入或建立新的 Bitwarden 帳戶。"
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "設定主密碼以完成加入這個組織"
   },
   "inviteAccepted": {
     "message": "邀請已接受"
   },
-  "inviteAcceptedDesc": {
-    "message": "管理員確認您的成員身分後，您便可以存取此組織。到時我們會向您傳送電子郵件通知。"
+  "invitationAcceptedDesc": {
+    "message": "成功接受您的邀請。"
   },
   "inviteInitAcceptedDesc": {
     "message": "您現在可以存取此組織了。"
@@ -4313,7 +4597,7 @@
     "message": "若您無法透過一般的兩步驟登入方式存取您的帳戶，您可以使用兩步驟登入復原碼以停用帳戶上的所有兩步驟登入方式。"
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
-    "message": "Log in below using your single-use recovery code. This will turn off all two-step providers on your account."
+    "message": "請使用您的單次使用恢復碼在下方登入。這將關閉帳號上的所有兩步驟提供者。"
   },
   "recoverAccountTwoStep": {
     "message": "復原帳戶的兩步驟登入"
@@ -4517,7 +4801,7 @@
     "message": "如果你想新增額外的"
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment2": {
-    "message": "seats without the bundled offer, please contact"
+    "message": "座位未包含捆綁優惠，請聯絡"
   },
   "subscriptionUserSeatsLimitedAutoscale": {
     "message": "調整訂閱將會依比例變更您的計費總額。若新邀請的成員超過您的訂閱席位，您將立即收到依比例收取的額外使用者費用，直到您達到 $MAX$ 席位限制。",
@@ -4574,7 +4858,7 @@
     }
   },
   "subscriptionSeatMaxReached": {
-    "message": "You cannot invite more than $COUNT$ members without increasing your subscription seats.",
+    "message": "在不增加訂閱座位數的情況下，您不能邀請超過 $COUNT$ 位成員。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4604,7 +4888,7 @@
     }
   },
   "editFieldLabel": {
-    "message": "Edit $LABEL$",
+    "message": "編輯 $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4613,7 +4897,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "重新排序 $LABEL$。使用方向鍵來往上或下移動。",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4622,7 +4906,7 @@
     }
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$",
+    "message": "往上移動 $LABEL$，位置 $LENGTH$ 之 $INDEX$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4639,7 +4923,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "往下移動 $LABEL$，位置 $LENGTH$ 之 $INDEX$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4659,10 +4943,10 @@
     "message": "更新加密金鑰後，您需要登出並重新登入目前使用的所有 Bitwarden 應用程式（如行動應用程式或瀏覽器擴充套件）。登出和重新登入（這會下載新的加密金鑰）失敗可能會導致資料損毀。我們將嘗試自動登出，但可能會有所延遲。"
   },
   "updateEncryptionKeyAccountExportWarning": {
-    "message": "Any account restricted exports you have saved will become invalid."
+    "message": "您保存的任何受限制匯出帳號將失效。"
   },
   "legacyEncryptionUnsupported": {
-    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+    "message": "不再支援舊版加密。請聯繫支援團隊以恢復您的帳號。"
   },
   "subscription": {
     "message": "訂閱"
@@ -4692,7 +4976,7 @@
     "message": "您未選取任何内容。"
   },
   "receiveMarketingEmailsV2": {
-    "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
+    "message": "獲得來自 Bitwarden 的公告、建議及研究資訊電子郵件。"
   },
   "subscribe": {
     "message": "訂閱"
@@ -4704,7 +4988,7 @@
     "message": "於任何時間。"
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "若是繼續，則代表您同意"
   },
   "and": {
     "message": "和"
@@ -4772,6 +5056,12 @@
   "organizationIsDisabled": {
     "message": "組織已停用"
   },
+  "organizationIsSuspended": {
+    "message": "組織已停用"
+  },
+  "organizationIsSuspendedDesc": {
+    "message": "無法存取已停用組織中的項目。請聯絡您組織的擁有者以獲取協助。"
+  },
   "secretsAccessSuspended": {
     "message": "無法存取已停用的組織。請聯絡您組織的擁有者以獲取協助。"
   },
@@ -4784,9 +5074,6 @@
   "serviceAccountsCannotCreate": {
     "message": "無法在已停用組織中新增服務帳戶。請聯絡您組織的擁有者以獲取協助。"
   },
-  "disabledOrganizationFilterError": {
-    "message": "無法存取已停用組織中的項目。請聯絡您組織的擁有者以獲取協助。"
-  },
   "licenseIsExpired": {
     "message": "授權已逾期。"
   },
@@ -4868,7 +5155,7 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "一旦您的請求被通過，您會獲得通知。"
   },
   "free": {
     "message": "免費",
@@ -4921,7 +5208,7 @@
     "message": "設定主密碼強度要求。"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "密碼強度分數 $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -5107,10 +5394,10 @@
     "message": "若要使用組織的單一登入入口登入。請先輸入您的組織識別碼。"
   },
   "singleSignOnEnterOrgIdentifier": {
-    "message": "Enter your organization's SSO identifier to begin"
+    "message": "輸入您組織的 SSO 識別碼以開始"
   },
   "singleSignOnEnterOrgIdentifierText": {
-    "message": "To log in with your SSO provider, enter your organization's SSO identifier to begin. You may need to enter this SSO identifier when you log in from a new device."
+    "message": "要使用 SSO 提供者登入，請輸入您組織的 SSO 識別碼以開始。您可能需要在新裝置登入時再次輸入此 SSO 識別碼。"
   },
   "enterpriseSingleSignOn": {
     "message": "企業單一登入"
@@ -5160,9 +5447,13 @@
   "ssoIdentifier": {
     "message": "SSO 識別"
   },
-  "ssoIdentifierHintPartOne": {
-    "message": "將此 ID 提供給您的成員以使用 SSO 登入。若要繞過此步驟，請設定 ",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  "ssoIdentifierHint": {
+    "message": "提供此 ID 給您的成員以使用 SSO 登入。如果已設定認領網域，成員在 SSO 登入時可跳過輸入此識別碼。",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
+  },
+  "claimedDomainsLearnMore": {
+    "message": "了解更多",
+    "description": "This will be used as part of a larger sentence, broken up to include a link. The full sentence will read 'Provide this ID to your members to login with SSO. Members can skip entering this identifier during SSO if a claimed domain is set up. Learn more'"
   },
   "unlinkSso": {
     "message": "取消連結 SSO"
@@ -5180,13 +5471,13 @@
     "message": "限制成員加入其他組織。"
   },
   "singleOrgPolicyDesc": {
-    "message": "Restrict members from joining other organizations. This policy is required for organizations that have enabled domain verification."
+    "message": "限制成員加入其他組織。此政策為已啟用網域驗證的組織所必需。"
   },
   "singleOrgBlockCreateMessage": {
     "message": "您目前的組織原則不允許您加入多個組織。請聯絡您的組織管理員或從其他 Bitwarden 帳戶註冊。"
   },
   "singleOrgPolicyMemberWarning": {
-    "message": "Non-compliant members will be placed in revoked status until they leave all other organizations. Administrators are exempt and can restore members once compliance is met."
+    "message": "不符合規範的成員將被置於撤銷狀態，直到他們離開所有其他組織。管理員不受此限制，並可在符合規範後恢復成員資格。"
   },
   "requireSso": {
     "message": "要求單一登入驗證"
@@ -5207,14 +5498,14 @@
     "message": "組織擁有者與管理員不受此原則的執行影響。"
   },
   "limitSendViews": {
-    "message": "Limit views"
+    "message": "限制查看"
   },
   "limitSendViewsHint": {
-    "message": "No one can view this Send after the limit is reached.",
+    "message": "在達到限額後，沒有人能查看此 Send。",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ views left",
+    "message": "剩餘 $ACCESSCOUNT$ 次查看次數",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -5237,7 +5528,7 @@
     "message": "文字"
   },
   "sendPasswordDescV3": {
-    "message": "Add an optional password for recipients to access this Send.",
+    "message": "新增一個用於收件人存取此 Send 的可選密碼。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
@@ -5265,14 +5556,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Are you sure you want to permanently delete this Send?",
+    "message": "您確定要永久刪除此 Send 嗎？",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
     "message": "刪除日期"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "此 Send 將在指定的日期後被永久刪除。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -5322,7 +5613,7 @@
     "message": "等待刪除"
   },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "默認隱藏文字"
   },
   "expired": {
     "message": "已逾期"
@@ -5347,11 +5638,11 @@
     "message": "下載附件"
   },
   "sendAccessPasswordTitle": {
-    "message": "Enter the password to view this Send",
+    "message": "輸入密碼以查看此 Send 內容",
     "description": "Title of the Send password authentication screen."
   },
   "sendAccessContentTitle": {
-    "message": "View Send",
+    "message": "檢視 Send",
     "description": "Title of the Send view content screen."
   },
   "sendAccessUnavailable": {
@@ -5500,7 +5791,7 @@
     "message": "已拒絕緊急存取"
   },
   "grantorDetailsNotFound": {
-    "message": "Grantor details not found"
+    "message": "找不到授權人詳細資料"
   },
   "passwordResetFor": {
     "message": "$USER$ 的密碼已重設。您現在可以使用新密碼登入了。",
@@ -5512,39 +5803,98 @@
     }
   },
   "organizationDataOwnership": {
-    "message": "Enforce organization data ownership"
+    "message": "強制組織資料所有權"
   },
   "organizationDataOwnershipDesc": {
-    "message": "Require all items to be owned by an organization, removing the option to store items at the account level.",
+    "message": "要求所有項目由組織擁有，移除在帳號層級儲存項目的選項。",
     "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.'"
+  "organizationDataOwnershipDescContent": {
+    "message": "所有項目將由組織擁有並儲存，啟用組織範圍的控管、可見性及報告。啟用後，每位成員將有預設集合可用於儲存項目。瞭解更多關於管理",
+    "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 will be available for each member to store items. Learn more about managing the credential lifecycle.'"
   },
   "organizationDataOwnershipContentAnchor": {
-    "message": "credential lifecycle",
+    "message": "憑證生命週期",
     "description": "This will be used as a hyperlink"
   },
   "organizationDataOwnershipWarningTitle": {
-    "message": "Are you sure you want to proceed?"
+    "message": "您確定要繼續嗎？"
   },
   "organizationDataOwnershipWarning1": {
-    "message": "will remain accessible to members"
+    "message": "將保持成員可存取"
   },
   "organizationDataOwnershipWarning2": {
-    "message": "will not be automatically selected when creating new items"
+    "message": "在建立新項目時不會自動選取"
   },
   "organizationDataOwnershipWarning3": {
-    "message": "cannot be managed from the Admin Console until the user is offboarded"
+    "message": "在使用者離職前，無法從管理控制台管理"
   },
   "organizationDataOwnershipWarningContentTop": {
-    "message": "By turning this policy off, the default collection: "
+    "message": "關閉此政策後，預設集合："
   },
   "organizationDataOwnershipWarningContentBottom": {
-    "message": "Learn more about the ",
+    "message": "了解更多 ",
     "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.'"
   },
+  "availableNow": {
+    "message": "立即可用"
+  },
+  "autoConfirm": {
+    "message": "新使用者自動確認"
+  },
+  "autoConfirmDescription": {
+    "message": "當管理員的裝置已解鎖時，邀請至該組織的新使用者會自動完成確認。",
+    "description": "This is the description of the policy as it appears in the 'Policies' page"
+  },
+  "howToTurnOnAutoConfirm": {
+    "message": "如何開啟自動使用者確認"
+  },
+  "autoConfirmExtension1": {
+    "message": "開啟你的 Bitwarden 瀏覽器擴充套件"
+  },
+  "autoConfirmExtension2": {
+    "message": "選擇",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtension3": {
+    "message": " 開啟",
+    "description": "This is a fragment of a larger sencence. The whole sentence will read: 'Select Turn on'"
+  },
+  "autoConfirmExtensionOpened": {
+    "message": "已成功開啟 Bitwarden 瀏覽器擴充套件。您現在可以啟用自動使用者確認設定。"
+  },
+  "autoConfirmPolicyEditDescription": {
+    "message": "在管理員的裝置解鎖時，邀請到組織的新使用者將自動獲得確認。開啟此原則之前，請先閱讀並同意以下內容：",
+    "description": "This is the description of the policy as it appears inside the policy edit dialog"
+  },
+  "autoConfirmAcceptSecurityRiskTitle": {
+    "message": "可能的安全風險。"
+  },
+  "autoConfirmAcceptSecurityRiskDescription": {
+    "message": "自動使用者確認可能對你組織的資料造成安全風險。"
+  },
+  "autoConfirmAcceptSecurityRiskLearnMore": {
+    "message": "了解風險",
+    "description": "The is the link copy for the first check box option in the edit policy dialog"
+  },
+  "autoConfirmSingleOrgRequired": {
+    "message": "需要啟用單一組織原則。"
+  },
+  "autoConfirmSingleOrgRequiredDesc": {
+    "message": "要使用自動化，所有成員必須僅隸屬於該組織。"
+  },
+  "autoConfirmSingleOrgExemption": {
+    "message": "單一組織原則將套用到所有角色。"
+  },
+  "autoConfirmNoEmergencyAccess": {
+    "message": "無緊急存取。 "
+  },
+  "autoConfirmNoEmergencyAccessDescription": {
+    "message": "將移除緊急存取。"
+  },
+  "autoConfirmCheckBoxLabel": {
+    "message": "我接受這些風險與原則更新"
+  },
   "personalOwnership": {
     "message": "停用個人密碼庫"
   },
@@ -5558,10 +5908,10 @@
     "message": "由於某個企業原則，您被限制為儲存項目至您的個人密碼庫。將擁有權變更為組織，並從可用的集合中選擇。"
   },
   "desktopAutotypePolicy": {
-    "message": "Desktop Autotype Default Setting"
+    "message": "桌面自動填入預設設定"
   },
   "desktopAutotypePolicyDesc": {
-    "message": "Turn Desktop Autotype ON by default for members. Members can turn Autotype off manually in the Desktop client.",
+    "message": "預設為成員啟用桌面自動填入。成員可在桌面端手動關閉自動填入。",
     "description": "This policy will enable Desktop Autotype by default for members on Unlock."
   },
   "disableSend": {
@@ -5597,6 +5947,19 @@
     "message": "建立或編輯 Send 時，始終對收件人顯示成員的電子郵件地址。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "uriMatchDetectionPolicy": {
+    "message": "預設的 URI 一致性偵測方式"
+  },
+  "uriMatchDetectionPolicyDesc": {
+    "message": "決定何時建議登入項目進行自動填入。管理員與擁有者不受此原則限制。"
+  },
+  "uriMatchDetectionOptionsLabel": {
+    "message": "預設的 URI 一致性偵測方式"
+  },
+  "invalidUriMatchDefaultPolicySetting": {
+    "message": "請選擇有效的 URI 比對偵測選項。",
+    "description": "Error message displayed when a user attempts to save URI match detection policy settings with an invalid selection."
+  },
   "modifiedPolicyId": {
     "message": "原則 $ID$ 已修改。",
     "placeholders": {
@@ -5728,73 +6091,73 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, **or** try it now.'"
   },
   "developmentDevOpsAndITTeamsChooseBWSecret": {
-    "message": "Development, DevOps, and IT teams choose Bitwarden Secrets Manager to securely manage and deploy their infrastructure and machine secrets."
+    "message": "開發、DevOps 及 IT 團隊選擇 Bitwarden Secrets Manager 來安全管理和部署其基礎設施及機器憑證。"
   },
   "centralizeSecretsManagement": {
-    "message": "Centralize secrets management."
+    "message": "集中管理憑證。"
   },
   "centralizeSecretsManagementDescription": {
-    "message": "Securely store and manage secrets in one location to prevent secret sprawl across your organization."
+    "message": "將憑證安全地儲存在單一位置，以防止組織內憑證散佈。"
   },
   "preventSecretLeaks": {
-    "message": "Prevent secret leaks."
+    "message": "防止憑證外洩。"
   },
   "preventSecretLeaksDescription": {
-    "message": "Protect secrets with end-to-end encryption. No more hard coding secrets or sharing through .env files."
+    "message": "使用端對端加密保護憑證。不再需要將憑證硬編碼或透過 .env 檔案分享。"
   },
   "enhanceDeveloperProductivity": {
     "message": "提升開發者生產力。"
   },
   "enhanceDeveloperProductivityDescription": {
-    "message": "Programmatically retrieve and deploy secrets at runtime so developers can focus on what matters most, like improving code quality."
+    "message": "在執行時以程式方式擷取和部署憑證，讓開發人員能專注於最重要的事情，例如提升程式碼品質。"
   },
   "strengthenBusinessSecurity": {
     "message": "強化企業安全。"
   },
   "strengthenBusinessSecurityDescription": {
-    "message": "Maintain tight control over machine and human access to secrets with SSO integrations, event logs, and access rotation."
+    "message": "透過 SSO 整合、事件日誌及存取輪換，對機器與人員對憑證的存取保持嚴格控制。"
   },
   "tryItNow": {
     "message": "立即體驗"
   },
   "sendRequest": {
-    "message": "Send request"
+    "message": "傳送請求"
   },
   "addANote": {
     "message": "新增備註"
   },
   "bitwardenSecretsManager": {
-    "message": "Bitwarden Secrets Manager"
+    "message": "Bitwarden 密鑰管理"
   },
   "moreProductsFromBitwarden": {
     "message": "更多來自 Bitwarden 的產品"
   },
   "requestAccessToSecretsManager": {
-    "message": "Request access to Secrets Manager"
+    "message": "請求存取 Secrets Manager"
   },
   "youNeedApprovalFromYourAdminToTrySecretsManager": {
-    "message": "You need approval from your administrator to try Secrets Manager."
+    "message": "您需要管理員批准才能使用 Secrets Manager。"
   },
   "smAccessRequestEmailSent": {
-    "message": "Access request for secrets manager email sent to admins."
+    "message": "Secrets Manager 存取請求已透過電子郵件發送給管理員。"
   },
   "requestAccessSMDefaultEmailContent": {
-    "message": "Hi,\n\nI am requesting a subscription to Bitwarden Secrets Manager for our team. Your support would mean a great deal!\n\nBitwarden Secrets Manager is an end-to-end encrypted secrets management solution for securely storing, sharing, and deploying machine credentials like API keys, database passwords, and authentication certificates.\n\nSecrets Manager will help us to:\n\n- Improve security\n- Streamline operations\n- Prevent costly secret leaks\n\nTo request a free trial for our team, please reach out to Bitwarden.\n\nThank you for your help!"
+    "message": "您好，\n\n我想為我們的團隊申請 Bitwarden Secrets Manager 的訂閱，您的支援對我們非常重要！\n\nBitwarden Secrets Manager 是一套端對端加密的憑證管理解決方案，可安全地儲存、分享及部署機器憑證，例如 API 金鑰、資料庫密碼及驗證憑證。\n\nSecrets Manager 將協助我們：\n\n- 提升安全性\n- 精簡操作流程\n- 防止高成本的憑證外洩\n\n如需為我們的團隊申請免費試用，請聯絡 Bitwarden。\n\n感謝您的協助！"
   },
   "giveMembersAccess": {
-    "message": "Give members access:"
+    "message": "授予成員存取權："
   },
   "viewAndSelectTheMembers": {
-    "message": "view and select the members you want to give access to Secrets Manager."
+    "message": "檢視並選取您想授予 Secrets Manager 存取權的成員。"
   },
   "openYourOrganizations": {
-    "message": "Open your organization's"
+    "message": "開啟您組織的"
   },
   "usingTheMenuSelect": {
-    "message": "Using the menu, select"
+    "message": "使用選單，選擇"
   },
   "toGrantAccessToSelectedMembers": {
-    "message": "to grant access to selected members."
+    "message": "以授予選取成員存取權。"
   },
   "sendVaultCardTryItNow": {
     "message": "立即嘗試",
@@ -5822,7 +6185,7 @@
     }
   },
   "viewSend": {
-    "message": "View Send",
+    "message": "檢視 Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "viewSendHiddenEmailWarning": {
@@ -5845,7 +6208,7 @@
     "message": "儲存刪除日期和逾期日期時發生錯誤。"
   },
   "hideYourEmail": {
-    "message": "Hide your email address from viewers."
+    "message": "對查看者隱藏您的電子郵件地址。"
   },
   "webAuthnFallbackMsg": {
     "message": "要驗證您的 2FA，請點選下方的按鈕。"
@@ -5854,10 +6217,10 @@
     "message": "驗證 WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "讀取安全金鑰"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "等待安全金鑰操作中……"
   },
   "webAuthnNotSupported": {
     "message": "此瀏覽器不支援 WebAuthn。"
@@ -5866,7 +6229,7 @@
     "message": "WebAuthn 驗證成功！您可以關閉此分頁。"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "你的新密碼不能與目前的密碼相同。"
   },
   "hintEqualsPassword": {
     "message": "密碼提示不能與您的密碼相同。"
@@ -5944,7 +6307,7 @@
     }
   },
   "emergencyAccessLoggedOutWarning": {
-    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "message": "接下來會將 $NAME$ 登出目前的工作階段，並要求他們重新登入帳號。其他裝置上的活動工作階段最多會保持一個小時。",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -5959,7 +6322,7 @@
     "message": "一個或多個組織原則要求主密碼須符合下列條件："
   },
   "changePasswordDelegationMasterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require the master password to meet the following requirements:"
+    "message": "一個或多個組織原則要求主密碼須符合下列條件："
   },
   "resetPasswordSuccess": {
     "message": "密碼重設成功！"
@@ -6067,32 +6430,32 @@
     "message": "已排除，不適用於此動作"
   },
   "nonCompliantMembersTitle": {
-    "message": "Non-compliant members"
+    "message": "不符合規範的成員"
   },
   "nonCompliantMembersError": {
-    "message": "Members that are non-compliant with the Single organization or Two-step login policy cannot be restored until they adhere to the policy requirements"
+    "message": "不符合「單一組織」或「兩步驟登入」政策的成員，在遵守政策要求前無法恢復。"
   },
   "fingerprint": {
     "message": "指紋"
   },
   "fingerprintPhrase": {
-    "message": "Fingerprint phrase:"
+    "message": "指紋短語："
   },
   "error": {
     "message": "錯誤"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "解密發生錯誤"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden 無法解密您密碼庫中下面的項目。"
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "聯絡客戶支援部門",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "來避免更多資料遺失。",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "accountRecoveryManageUsers": {
@@ -6227,7 +6590,7 @@
     "message": "新增"
   },
   "masterPasswordSuccessfullySet": {
-    "message": "Master password successfully set"
+    "message": "主密碼設定成功"
   },
   "updatedMasterPassword": {
     "message": "主密碼已儲存"
@@ -6236,10 +6599,10 @@
     "message": "更新主密碼"
   },
   "accountRecoveryUpdateMasterPasswordSubtitle": {
-    "message": "Change your master password to complete account recovery."
+    "message": "變更你的主密碼以完成帳號復原。"
   },
   "updateMasterPasswordSubtitle": {
-    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+    "message": "你的主密碼不符合此組織的要求。請變更主密碼以繼續。"
   },
   "updateMasterPasswordWarning": {
     "message": "您的主密碼最近被您的組織管理者變更過。您必須現在更新主密碼才能存取密碼庫。繼續操作會登出您目前的工作階段，並要求您重新登入帳戶。其他裝置上的活動工作階段最多會保持一個小時。"
@@ -6250,32 +6613,47 @@
   "updateWeakMasterPasswordWarning": {
     "message": "您的主密碼不符合一個或多個組織政策規定。您必須立即更新您的主密碼才能存取密碼庫。進行此動作將登出您目前的工作階段，需要您重新登入。其他裝置上的工作階段可能持續長達一小時。"
   },
-  "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+  "automaticAppLoginWithSSO": {
+    "message": "自動使用SSO登入"
   },
-  "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+  "automaticAppLoginWithSSODesc": {
+    "message": "將SSO的安全和便利拓展至未受管理的應用程式。當使用者用身分識別提供者啟動應用程式時，登入資訊會自動填寫並提交，建立從身分識別提供者到應用程式的一鍵式安全流程。"
   },
   "automaticAppLoginIdpHostLabel": {
-    "message": "Identity provider host"
+    "message": "身份提供者主機"
   },
   "automaticAppLoginIdpHostDesc": {
-    "message": "Enter your identity provider host URL. Enter multiple URLs by separating with a comma."
+    "message": "輸入您的身份提供者主機 URL。若有多個 URL，請以逗號分隔。"
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
+    "message": "您的組織已更新您的解密選項。請設定主密碼以存取您的密碼庫。"
   },
-  "maximumVaultTimeout": {
-    "message": "密碼庫逾時時間"
+  "sessionTimeoutPolicyTitle": {
+    "message": "工作階段逾時"
   },
-  "maximumVaultTimeoutDesc": {
-    "message": "為成員設定最大密碼庫逾時時間。"
+  "sessionTimeoutPolicyDescription": {
+    "message": "為除擁有者外的所有成員設定最長工作階段逾時時間。"
   },
-  "maximumVaultTimeoutLabel": {
-    "message": "最大密碼庫逾時時間"
+  "maximumAllowedTimeout": {
+    "message": "最大允許的逾時時間"
   },
-  "invalidMaximumVaultTimeout": {
-    "message": "無效的最大密碼庫逾時時間。"
+  "maximumAllowedTimeoutRequired": {
+    "message": "需要最大允許的逾時時間"
+  },
+  "sessionTimeoutPolicyInvalidTime": {
+    "message": "時間無效。請至少變更一個值。"
+  },
+  "sessionTimeoutAction": {
+    "message": "工作階段逾時動作"
+  },
+  "immediately": {
+    "message": "立即"
+  },
+  "onSystemLock": {
+    "message": "於系統鎖定時"
+  },
+  "onAppRestart": {
+    "message": "應用程式重新啟動時"
   },
   "hours": {
     "message": "小時"
@@ -6283,6 +6661,21 @@
   "minutes": {
     "message": "分鐘"
   },
+  "sessionTimeoutConfirmationNeverTitle": {
+    "message": "您確定要允許所有成員的最長逾時為「永不」嗎？"
+  },
+  "sessionTimeoutConfirmationNeverDescription": {
+    "message": "此選項會將成員的加密金鑰儲存在其裝置上。若選擇此選項，請確保這些裝置具備充分的防護。"
+  },
+  "learnMoreAboutDeviceProtection": {
+    "message": "進一步了解裝置保護"
+  },
+  "sessionTimeoutConfirmationOnSystemLockTitle": {
+    "message": "「系統鎖定」僅適用於瀏覽器與桌面應用程式"
+  },
+  "sessionTimeoutConfirmationOnSystemLockDescription": {
+    "message": "由於不支援此選項，行動與網頁應用程式將以「在應用程式重新啟動時」作為其最長允許逾時時間。"
+  },
   "vaultTimeoutPolicyInEffect": {
     "message": "您的組織政策已限定您密碼庫逾時的時間長度。密碼庫逾時時間最高可以設定到 $HOURS$ 小時 $MINUTES$ 分鐘。",
     "placeholders": {
@@ -6297,7 +6690,7 @@
     }
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "最多 $HOURS$ 小時 $MINUTES$ 分鐘",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6453,10 +6846,10 @@
     "message": "驗證憑證"
   },
   "spUniqueEntityId": {
-    "message": "Set a unique SP entity ID"
+    "message": "設定唯一的 SP 實體 ID"
   },
   "spUniqueEntityIdDesc": {
-    "message": "Generate an identifier that is unique to your organization"
+    "message": "生成一個對您的組織唯一的識別碼"
   },
   "idpEntityId": {
     "message": "實體 ID"
@@ -6492,19 +6885,19 @@
     "message": "免費的 Bitwarden 家庭方案"
   },
   "sponsoredBitwardenFamilies": {
-    "message": "Sponsored families"
+    "message": "受贊助家庭"
   },
   "noSponsoredFamiliesMessage": {
-    "message": "No sponsored families"
+    "message": "沒有受贊助家庭"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "Sponsored non-member families plans will display here"
+    "message": "受贊助非成員家庭方案將顯示於此"
   },
   "sponsorshipFreeBitwardenFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. You can sponsor Free Bitwarden Families for employees who are not a member of your Bitwarden organization. Sponsoring a non-member requires an available seat within your organization."
+    "message": "您組織的成員符合免費 Bitwarden 家庭方案資格。您可以為非 Bitwarden 組織成員的員工贊助免費 Bitwarden 家庭方案。贊助非成員需要您組織中有可用的座位。"
   },
   "sponsoredFamiliesRemoveActiveSponsorship": {
-    "message": "When you remove an active sponsorship, a seat within your organization will be available after the renewal date of the sponsored organization."
+    "message": "當您移除有效的贊助後，該座位將在受贊助組織的續訂日期後於您的組織中可用。"
   },
   "sponsoredFamiliesEligible": {
     "message": "您與家庭成員可使用免費的 Bitwarden 家庭方案。就算不在上班時間，也可以使用您的私人電子郵件來兌換此方案，以保障您的資料安全。"
@@ -6513,28 +6906,28 @@
     "message": "立即兌換您的免費 Bitwarden 家庭方案，即使不在上班時間也能夠保障您的資料安全。"
   },
   "sponsoredFamiliesIncludeMessage": {
-    "message": "The Bitwarden for Families plan includes"
+    "message": "Bitwarden 家庭方案內容包含"
   },
   "sponsoredFamiliesPremiumAccess": {
     "message": "最多 6 位使用者的付費方案存取權限"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "Shared collections for family members"
+    "message": "家庭成員的共享集合"
   },
   "memberFamilies": {
-    "message": "Member families"
+    "message": "成員家庭"
   },
   "noMemberFamilies": {
-    "message": "No member families"
+    "message": "沒有成員家庭"
   },
   "noMemberFamiliesDescription": {
-    "message": "Members who have redeemed family plans will display here"
+    "message": "已兌換家庭方案的成員將顯示於此"
   },
   "membersWithSponsoredFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. Here you can see members who have sponsored a Families organization."
+    "message": "您組織的成員符合免費 Bitwarden 家庭方案資格。在此可查看已贊助家庭組織的成員。"
   },
   "organizationHasMemberMessage": {
-    "message": "A sponsorship cannot be sent to $EMAIL$ because they are a member of your organization.",
+    "message": "無法向 $EMAIL$ 發送贊助，因為他們是您組織的成員。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6594,7 +6987,7 @@
     "message": "已兌換帳戶"
   },
   "revokeAccountMessage": {
-    "message": "Revoke account $NAME$",
+    "message": "撤銷帳號 $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6660,16 +7053,16 @@
     "message": "必須填入驗證碼。"
   },
   "webauthnCancelOrTimeout": {
-    "message": "The authentication was cancelled or took too long. Please try again."
+    "message": "驗證已被取消或時間超過。請再試一次。"
   },
   "invalidVerificationCode": {
     "message": "無效的驗證碼"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "以下組織的成員已不再需要主密碼。請與你的組織管理員確認下方的網域。"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Key Connector 網域"
   },
   "leaveOrganization": {
     "message": "離開組織"
@@ -6729,7 +7122,7 @@
     "message": "已停用 SSO"
   },
   "emailMustLoginWithSso": {
-    "message": "$EMAIL$ must login with Single Sign-on",
+    "message": "$EMAIL$ 必須使用單一登入 (SSO) 登入",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6783,7 +7176,7 @@
     "message": "檢視計費同步權杖"
   },
   "generateBillingToken": {
-    "message": "Generate billing token"
+    "message": "產生計費權杖"
   },
   "copyPasteBillingSync": {
     "message": "請將本權杖複製後，貼至您自架組織的「計費同步」設定當中。"
@@ -6792,7 +7185,7 @@
     "message": "您的計費同步權杖可以讀取及編輯此組織的訂閱設定。"
   },
   "manageBillingTokenSync": {
-    "message": "Manage Billing Token"
+    "message": "管理帳單權杖"
   },
   "setUpBillingSync": {
     "message": "設定計費同步"
@@ -6824,6 +7217,9 @@
   "selfHostedEnvFormInvalid": {
     "message": "您必須新增伺服器網域 URL 或至少一個自訂環境。"
   },
+  "selfHostedEnvMustUseHttps": {
+    "message": "URL 必須使用 HTTPS。"
+  },
   "apiUrl": {
     "message": "API 伺服器網址"
   },
@@ -6858,7 +7254,7 @@
     "message": "計費同步權杖"
   },
   "automaticBillingSyncDesc": {
-    "message": "Automatic sync unlocks Families sponsorships and allows you to sync your license without uploading a file. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
+    "message": "自動同步可解鎖家庭贊助，並允許您在不上傳檔案的情況下同步授權。在 Bitwarden 雲端伺服器更新後，請選擇「同步授權」以套用更改。"
   },
   "active": {
     "message": "生效中"
@@ -6928,7 +7324,7 @@
     "message": "若 Entity ID 非 URL，則必須填入。"
   },
   "offerNoLongerValid": {
-    "message": "This offer is no longer valid. Contact your organization administrators for more information."
+    "message": "此優惠已不再有效。請聯絡您的組織"
   },
   "openIdOptionalCustomizations": {
     "message": "自訂（選填）"
@@ -6958,7 +7354,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "只會匯出與 $EMAIL$ 關聯的個人密碼庫（包含附件）。組織密碼庫的項目不包含在內。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6975,9 +7371,30 @@
       }
     }
   },
+  "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc": {
+    "message": "只會匯出與 $ORGANIZATION$ 相關的組織密碼庫。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc": {
+    "message": "只會匯出與 $ORGANIZATION$ 相關的組織密碼庫，「我的項目」集合將不會包含在內。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "accessDenied": {
     "message": "拒絕存取。您沒有檢視此頁面的權限。"
   },
+  "noPageAccess": {
+    "message": "您沒有存取頁面的權限"
+  },
   "masterPassword": {
     "message": "主密碼"
   },
@@ -7020,25 +7437,25 @@
     "message": "產生使用者名稱"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "生成電子郵件"
   },
   "generatePassword": {
     "message": "產生密碼"
   },
   "generatePassphrase": {
-    "message": "Generate passphrase"
+    "message": "產生密碼短語"
   },
   "passwordGenerated": {
-    "message": "Password generated"
+    "message": "已產生密碼"
   },
   "passphraseGenerated": {
-    "message": "Passphrase generated"
+    "message": "已產生密碼"
   },
   "usernameGenerated": {
     "message": "已產生使用者名稱"
   },
   "emailGenerated": {
-    "message": "Email generated"
+    "message": "已產生電子郵件"
   },
   "spinboxBoundariesHint": {
     "message": "值必須介於 $MIN$ 及 $MAX$。",
@@ -7055,7 +7472,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "message": " 使用 $RECOMMENDED$ 或更多個字元產生更強的密碼。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -7065,7 +7482,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": " 使用 $RECOMMENDED$ 或更多個單字產生強的密碼短語。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -7088,7 +7505,7 @@
     "message": "使用您的網域設定的 Catch-all 收件匣。"
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "使用此電子郵件"
   },
   "random": {
     "message": "隨機",
@@ -7098,26 +7515,26 @@
     "message": "隨機單字"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "使用者名稱產生器"
   },
   "useThisPassword": {
     "message": "使用此密碼"
   },
   "useThisPassphrase": {
-    "message": "Use this passphrase"
+    "message": "使用此密碼"
   },
   "useThisUsername": {
     "message": "使用此使用者名稱"
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "已產生安全的密碼！請不要忘記同時更新您網站上的密碼。"
   },
   "useGeneratorHelpTextPartOne": {
     "message": "使用產生器",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "來產生高強度且唯一的密碼",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "service": {
@@ -7127,10 +7544,13 @@
     "message": "未知的項目，您可能需要要求權限才能存取此項目。"
   },
   "unknownSecret": {
-    "message": "Unknown secret, you may need to request permission to access this secret."
+    "message": "未知憑證，您可能需要請求存取權限。"
+  },
+  "unknownServiceAccount": {
+    "message": "未知機器帳號，您可能需要請求存取權限。"
   },
   "unknownProject": {
-    "message": "Unknown project, you may need to request permission to access this project."
+    "message": "未知專案，您可能需要請求存取權限。"
   },
   "cannotSponsorSelf": {
     "message": "您無法為已經啟用的帳戶兌換。請輸入其他信箱。"
@@ -7193,7 +7613,7 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "選擇一個所選服務支援的網域",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -7225,7 +7645,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Invalid $SERVICENAME$ API token",
+    "message": "無效的 $SERVICENAME$ API 權杖",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7235,7 +7655,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Invalid $SERVICENAME$ API token: $ERRORMESSAGE$",
+    "message": "無效的 $SERVICENAME$ API 權杖：$ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -7249,7 +7669,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ 拒絕了你的請求。請聯絡你的服務提供者以取得協助。",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7259,7 +7679,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ 拒絕了你的請求：$ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -7273,7 +7693,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Unable to obtain $SERVICENAME$ masked email account ID.",
+    "message": "無法獲得 $SERVICENAME$ 的轉送電子郵件帳號。",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -7303,7 +7723,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Unknown $SERVICENAME$ error occurred.",
+    "message": "發生未知的 $SERVICENAME$ 錯誤。",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -7313,7 +7733,7 @@
     }
   },
   "forwarderUnknownForwarder": {
-    "message": "Unknown forwarder: '$SERVICENAME$'.",
+    "message": "未知的轉送服務提供商：$SERVICENAME$。",
     "description": "Displayed when the forwarding service is not supported.",
     "placeholders": {
       "servicename": {
@@ -7359,7 +7779,7 @@
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimIntegrationDescription": {
-    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning. Find supported integrations",
+    "message": "透過 SCIM 自動提供使用者與群組給您偏好的身份提供者。查看支援的整合",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimEnabledCheckboxDesc": {
@@ -7481,10 +7901,10 @@
     }
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "您需注意上方的 1 個欄位。"
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "您需注意上方的 $COUNT$ 個欄位。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7493,19 +7913,19 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "連接到 Duo 服務時發生錯誤。使用不同的兩階段認證或聯繫 Duo 來獲得支援。"
   },
   "duoRequiredByOrgForAccount": {
-    "message": "Duo two-step login is required for your account."
+    "message": "您的帳號要求使用 Duo 兩步驟驗證登入。"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "您的帳號需要使用 Duo 兩步驟登入。請依照以下步驟完成登入。"
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "請依照以下步驟完成登入"
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "請依照以下步驟使用你的安全金鑰完成登入。"
   },
   "launchDuo": {
     "message": "啟動 Duo"
@@ -7520,7 +7940,7 @@
     "message": "關閉"
   },
   "connected": {
-    "message": "Connected"
+    "message": "已連線"
   },
   "members": {
     "message": "成員"
@@ -7834,7 +8254,7 @@
     "description": "Notifies that a service account has been updated"
   },
   "typeOrSelectProjects": {
-    "message": "Type or select projects",
+    "message": "輸入或選擇項目",
     "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
@@ -7921,7 +8341,7 @@
     "description": "Title for the section displaying access tokens."
   },
   "createAccessToken": {
-    "message": "Create access token",
+    "message": "建立存取權杖",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8020,7 +8440,7 @@
     "message": "將成員加入到此群組，即可授予他們對不同分類的存取權限。"
   },
   "restrictedCollectionAssignmentDesc": {
-    "message": "You can only assign collections you manage."
+    "message": "您只能指派您管理的集合。"
   },
   "selectMembers": {
     "message": "選擇成員"
@@ -8131,7 +8551,7 @@
     }
   },
   "verificationRequiredForActionSetPinToContinue": {
-    "message": "Verification required for this action. Set a PIN to continue."
+    "message": "此操作需要驗證。設定 PIN 碼以繼續。"
   },
   "setPin": {
     "message": "設定 PIN 碼"
@@ -8158,7 +8578,7 @@
     "message": "使用生物辨識"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Enter the verification code that was sent to your email."
+    "message": "輸入傳送到你的電子郵件的驗證碼。"
   },
   "resendCode": {
     "message": "重新傳送驗證碼"
@@ -8176,7 +8596,7 @@
     "message": "選擇群組"
   },
   "userPermissionOverrideHelperDesc": {
-    "message": "Permissions set for a member will replace permissions set by that member's group."
+    "message": "為成員設定的權限將取代該成員所在群組設定的權限。"
   },
   "noMembersOrGroupsAdded": {
     "message": "未新增任何成員或群組"
@@ -8191,7 +8611,7 @@
     "message": "邀請成員"
   },
   "addSponsorship": {
-    "message": "Add sponsorship"
+    "message": "新增贊助"
   },
   "needsConfirmation": {
     "message": "待確認"
@@ -8281,7 +8701,7 @@
     "message": "檔案上傳"
   },
   "upload": {
-    "message": "Upload"
+    "message": "上傳"
   },
   "acceptedFormats": {
     "message": "接受的格式："
@@ -8311,7 +8731,7 @@
     "message": "手動上傳"
   },
   "manualBillingTokenUploadDesc": {
-    "message": "If you do not want to opt into billing sync, manually upload your license here. This will not automatically unlock Families sponsorships."
+    "message": "如果您不想選擇帳單同步，請在此手動上傳授權。這將不會自動解鎖家庭贊助。"
   },
   "syncLicense": {
     "message": "同步授權"
@@ -8376,14 +8796,8 @@
   "groupSlashUser": {
     "message": "群組/使用者"
   },
-  "lowKdfIterations": {
-    "message": "較低的 KDF 迭代次數"
-  },
-  "updateLowKdfIterationsDesc": {
-    "message": "更新您的加密設定以滿足新的安全建議以及提升帳號保護。"
-  },
   "kdfSettingsChangeLogoutWarning": {
-    "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
+    "message": "繼續操作會登出您所有活動工作階段。您需要重新登入並完成兩步驟登入設定。 我們建議在變更加密設定之前匯出您的密碼庫，以防止資料遺失。"
   },
   "secretsManager": {
     "message": "機密管理員"
@@ -8423,7 +8837,7 @@
     "message": "嘗試讀取匯入檔案時發生錯誤"
   },
   "accessedSecretWithId": {
-    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "message": "已存取識別碼為 $SECRET_ID$ 的憑證",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8441,7 +8855,7 @@
     }
   },
   "editedSecretWithId": {
-    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "message": "已編輯識別碼為 $SECRET_ID$ 的憑證",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8450,7 +8864,7 @@
     }
   },
   "deletedSecretWithId": {
-    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "message": "已刪除識別碼為 $SECRET_ID$ 的憑證",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8459,7 +8873,7 @@
     }
   },
   "permanentlyDeletedSecretWithId": {
-    "message": "Permanently deleted a secret with identifier: $SECRET_ID$",
+    "message": "永久刪除識別碼為 $SECRET_ID$ 的憑證",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8468,7 +8882,7 @@
     }
   },
   "restoredSecretWithId": {
-    "message": "Restored a secret with identifier: $SECRET_ID$",
+    "message": "還原識別碼為 $SECRET_ID$ 的憑證",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8477,7 +8891,7 @@
     }
   },
   "createdSecretWithId": {
-    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "message": "建立識別碼為 $SECRET_ID$ 的新憑證",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8485,8 +8899,8 @@
       }
     }
   },
-  "accessedProjectWithId": {
-    "message": "Accessed a project with Id: $PROJECT_ID$.",
+  "accessedProjectWithIdentifier": {
+    "message": "已存取識別碼為 $PROJECT_ID$ 的專案",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8495,7 +8909,7 @@
     }
   },
   "nameUnavailableProjectDeleted": {
-    "message": "Deleted project Id: $PROJECT_ID$",
+    "message": "刪除專案 ID：$PROJECT_ID$",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8504,7 +8918,7 @@
     }
   },
   "nameUnavailableSecretDeleted": {
-    "message": "Deleted secret Id: $SECRET_ID$",
+    "message": "刪除憑證 ID：$SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8512,8 +8926,17 @@
       }
     }
   },
+  "nameUnavailableServiceAccountDeleted": {
+    "message": "刪除機器帳號 ID：$SERVICE_ACCOUNT_ID$",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "editedProjectWithId": {
-    "message": "Edited a project with identifier: $PROJECT_ID$",
+    "message": "編輯識別碼為 $PROJECT_ID$ 的專案",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8521,8 +8944,78 @@
       }
     }
   },
+  "addedUserToServiceAccountWithId": {
+    "message": "將使用者 $USER_ID$ 新增至識別碼為 $SERVICE_ACCOUNT_ID$ 的機器帳號",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedUserToServiceAccountWithId": {
+    "message": "將使用者 $USER_ID$ 從識別碼為 $SERVICE_ACCOUNT_ID$ 的機器帳號移除",
+    "placeholders": {
+      "user_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "removedGroupFromServiceAccountWithId": {
+    "message": "將群組 $GROUP_ID$ 從識別碼為 $SERVICE_ACCOUNT_ID$ 的機器帳號移除",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountCreatedWithId": {
+    "message": "建立識別碼為 $SERVICE_ACCOUNT_ID$ 的機器帳號",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "addedGroupToServiceAccountId": {
+    "message": "將群組 $GROUP_ID$ 新增至識別碼為 $SERVICE_ACCOUNT_ID$ 的機器帳號",
+    "placeholders": {
+      "group_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      },
+      "service_account_id": {
+        "content": "$2",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "serviceAccountDeletedWithId": {
+    "message": "刪除識別碼為 $SERVICE_ACCOUNT_ID$ 的機器帳號",
+    "placeholders": {
+      "service_account_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "deletedProjectWithId": {
-    "message": "Deleted a project with identifier: $PROJECT_ID$",
+    "message": "刪除識別碼為 $PROJECT_ID$ 的專案",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8531,7 +9024,7 @@
     }
   },
   "createdProjectWithId": {
-    "message": "Created a new project with identifier: $PROJECT_ID$",
+    "message": "建立識別碼為 $PROJECT_ID$ 的新專案",
     "placeholders": {
       "project_id": {
         "content": "$1",
@@ -8688,16 +9181,16 @@
     "message": "登入已啟動"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "記住此裝置來讓未來的登入體驗更簡易"
   },
   "deviceApprovalRequired": {
     "message": "裝置需要取得核准。請在下面選擇一個核准選項："
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "需要核准裝置"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "選擇下面的一個核准選項"
   },
   "rememberThisDevice": {
     "message": "記住這個裝置"
@@ -8712,10 +9205,10 @@
     "message": "要求管理員核准"
   },
   "unableToCompleteLogin": {
-    "message": "Unable to complete login"
+    "message": "無法完成登入"
   },
   "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
-    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+    "message": "你需要在受信任的裝置上登入，或請管理員為你指派密碼。"
   },
   "trustedDeviceEncryption": {
     "message": "可信任的裝置加密"
@@ -8724,11 +9217,11 @@
     "message": "可信任的裝置"
   },
   "memberDecryptionOptionTdeDescPart1": {
-    "message": "Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The",
+    "message": "成員在使用 SSO 登入時不需要主密碼。主密碼將由儲存在裝置上的加密金鑰取代，使該裝置成為受信任裝置。成員建立帳號並首次登入的裝置將被視為受信任。新裝置需要經由現有受信任裝置或管理員批准。",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink1": {
-    "message": "single organization",
+    "message": "單一組織",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart2": {
@@ -8744,11 +9237,11 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink3": {
-    "message": "account recovery administration",
+    "message": "帳號復原管理",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart4": {
-    "message": "policy will turn on when this option is used.",
+    "message": "使用此選項時，政策將會啟用。",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "orgPermissionsUpdatedMustSetPassword": {
@@ -8760,7 +9253,7 @@
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "out of $TOTAL$",
+    "message": "$TOTAL$ 不足",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -8827,16 +9320,16 @@
     "message": "核准要求"
   },
   "deviceApproved": {
-    "message": "Device approved"
+    "message": "裝置核准"
   },
   "deviceRemoved": {
-    "message": "Device removed"
+    "message": "裝置移除"
   },
   "removeDevice": {
-    "message": "Remove device"
+    "message": "移除設備"
   },
   "removeDeviceConfirmation": {
-    "message": "Are you sure you want to remove this device?"
+    "message": "是否要移除這個裝置？"
   },
   "noDeviceRequests": {
     "message": "沒有裝置要求"
@@ -8893,7 +9386,7 @@
     "message": "要求了裝置核准。"
   },
   "tdeOffboardingPasswordSet": {
-    "message": "User set a master password during TDE offboarding."
+    "message": "使用者在 TDE 離職流程中設定了主密碼。"
   },
   "startYour7DayFreeTrialOfBitwardenFor": {
     "message": "為 $ORG$ 開始您的 Bitwarden 7 天免費試用",
@@ -8905,7 +9398,7 @@
     }
   },
   "startYour7DayFreeTrialOfBitwardenSecretsManagerFor": {
-    "message": "Start your 7-Day free trial of Bitwarden Secrets Manager for $ORG$",
+    "message": "為 $ORG$ 開始您的 Bitwarden 機密管理 7 天免費試用",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -8941,7 +9434,7 @@
     "message": "缺少使用者電子郵件地址"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "未找到使用中帳號的電子郵件。正在將您登出。"
   },
   "deviceTrusted": {
     "message": "裝置已信任"
@@ -9028,23 +9521,23 @@
     "message": "分類管理"
   },
   "collectionManagementDescription": {
-    "message": "Configure the collection behavior for the organization"
+    "message": "設定組織的集合行為"
   },
   "allowAdminAccessToAllCollectionItemsDescription": {
-    "message": "Allow owners and admins to manage all collections and items from the Admin Console"
+    "message": "允許擁有者和管理員從管理控制台管理所有集合與項目"
   },
   "restrictCollectionCreationDescription": {
-    "message": "Restrict collection creation to owners and admins"
+    "message": "限制集合建立權限僅限擁有者和管理員"
   },
   "restrictCollectionDeletionDescription": {
-    "message": "Restrict collection deletion to owners and admins"
+    "message": "限制集合刪除權限僅限擁有者和管理員"
   },
   "restrictItemDeletionDescriptionStart": {
-    "message": "Restrict item deletion to members with the ",
+    "message": "限制項目刪除權限僅限擁有特定權限的成員",
     "description": "This will be used as part of a larger sentence, broken up to allow styling of the middle portion. Full sentence: 'Restrict item deletion to members with the [Manage collection] permission'"
   },
   "restrictItemDeletionDescriptionEnd": {
-    "message": " permission",
+    "message": "權限",
     "description": "This will be used as part of a larger sentence, broken up to allow styling of the middle portion. Full sentence: 'Restrict item deletion to members with the [Manage collection] permission'"
   },
   "updatedCollectionManagement": {
@@ -9077,9 +9570,6 @@
   "loggedInExclamation": {
     "message": "已登入！"
   },
-  "beta": {
-    "message": "Beta 版"
-  },
   "assignCollectionAccess": {
     "message": "指派分類存取權限"
   },
@@ -9124,7 +9614,7 @@
     }
   },
   "limitCollectionCreationEnabled": {
-    "message": "Turned on Restrict collection creation setting $ID$.",
+    "message": "啟用「限制集合建立」設定 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9133,7 +9623,7 @@
     }
   },
   "limitCollectionCreationDisabled": {
-    "message": "Turned off Restrict collection creation setting $ID$.",
+    "message": "關閉「限制集合建立」設定 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9142,7 +9632,7 @@
     }
   },
   "limitCollectionDeletionEnabled": {
-    "message": "Turned on Restrict collection deletion setting $ID$.",
+    "message": "啟用「限制集合刪除」設定 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9151,7 +9641,7 @@
     }
   },
   "limitCollectionDeletionDisabled": {
-    "message": "Turned off Restrict collection deletion setting $ID$.",
+    "message": "關閉「限制集合刪除」設定 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9160,7 +9650,7 @@
     }
   },
   "limitItemDeletionEnabled": {
-    "message": "Turned on Restrict item deletion setting $ID$.",
+    "message": "啟用「限制項目刪除」設定 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9169,7 +9659,7 @@
     }
   },
   "limitItemDeletionDisabled": {
-    "message": "Turned off Restrict item deletion setting $ID$.",
+    "message": "關閉「限制項目刪除」設定 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9178,7 +9668,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsEnabled": {
-    "message": "Turned on Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "啟用「允許擁有者和管理員管理所有集合與項目」設定 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9187,7 +9677,7 @@
     }
   },
   "allowAdminAccessToAllCollectionItemsDisabled": {
-    "message": "Turned off Allow owners and admins to manage all collections and items setting $ID$.",
+    "message": "關閉「允許擁有者和管理員管理所有集合與項目」設定 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9203,7 +9693,7 @@
     "message": "安裝瀏覽器擴充套件"
   },
   "installBrowserExtensionDetails": {
-    "message": "Use the extension to quickly save logins and auto-fill forms without opening the web app."
+    "message": "使用擴充功能可快速儲存登入資料並自動填入表單，無需開啟網頁應用程式。"
   },
   "projectAccessUpdated": {
     "message": "專案存取權限已更新"
@@ -9224,22 +9714,22 @@
     "message": "有限的分類的存取權限"
   },
   "readOnlyCollectionAccess": {
-    "message": "You do not have access to manage this collection."
+    "message": "您無權管理此集合。"
   },
   "grantManageCollectionWarningTitle": {
-    "message": "Missing Manage Collection Permissions"
+    "message": "缺少「管理集合」權限"
   },
   "grantManageCollectionWarning": {
-    "message": "Grant Manage collection permissions to allow full collection management including deletion of collection."
+    "message": "授予「管理集合」權限以允許完整的集合管理，包括刪除集合。"
   },
   "grantCollectionAccess": {
-    "message": "Grant groups or members access to this collection."
+    "message": "授予群組或成員存取此集合的權限。"
   },
   "grantCollectionAccessMembersOnly": {
-    "message": "Grant members access to this collection."
+    "message": "授予成員存取此集合的權限。"
   },
   "adminCollectionAccess": {
-    "message": "Administrators can access and manage collections."
+    "message": "管理員可以存取並管理集合。"
   },
   "serviceAccountAccessUpdated": {
     "message": "Service account access updated"
@@ -9249,31 +9739,31 @@
     "description": "Label indicating the most common import formats"
   },
   "uriMatchDefaultStrategyHint": {
-    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "message": "URI 匹配偵測是 Bitwarden 用來識別自動填入建議的方式。",
     "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
   },
   "regExAdvancedOptionWarning": {
-    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "message": "「正則表達式」是進階選項，可能會增加憑證外洩的風險。",
     "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
   },
   "startsWithAdvancedOptionWarning": {
-    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "message": "「開頭為」是進階選項，可能會增加憑證外洩的風險。",
     "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
   },
   "uriMatchWarningDialogLink": {
-    "message": "More about match detection",
+    "message": "深入了解匹配偵測",
     "description": "Link to match detection docs on warning dialog for advance match strategy"
   },
   "uriAdvancedOption": {
-    "message": "Advanced options",
+    "message": "進階選項",
     "description": "Advanced option placeholder for uri option component"
   },
   "warningCapitalized": {
-    "message": "Warning",
+    "message": "警告",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "maintainYourSubscription": {
-    "message": "To maintain your subscription for $ORG$, ",
+    "message": "為了維持您在 $ORG$ 的訂閱， ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
     "placeholders": {
       "org": {
@@ -9290,16 +9780,16 @@
     "message": "組織資訊"
   },
   "confirmationDetails": {
-    "message": "Confirmation details"
+    "message": "確認詳情"
   },
   "smFreeTrialThankYou": {
-    "message": "Thank you for signing up for Bitwarden Secrets Manager!"
+    "message": "感謝您註冊 Bitwarden Secrets Manager！"
   },
   "smFreeTrialConfirmationEmail": {
     "message": "我們已向你的電子郵件地址傳送了一封確認電子郵件"
   },
   "sorryToSeeYouGo": {
-    "message": "Sorry to see you go! Help improve Bitwarden by sharing why you're canceling.",
+    "message": "很遺憾您要離開！請透過分享取消原因來協助改善 Bitwarden。",
     "description": "A message shown to users as part of an offboarding survey asking them to provide more information on their subscription cancelation."
   },
   "selectCancellationReason": {
@@ -9307,7 +9797,7 @@
     "description": "Used as a form field label for a select input on the offboarding survey."
   },
   "anyOtherFeedback": {
-    "message": "Is there any other feedback you'd like to share?",
+    "message": "您還有其他想提供的意見嗎？",
     "description": "Used as a form field label for a textarea input on the offboarding survey."
   },
   "missingFeatures": {
@@ -9330,11 +9820,19 @@
     "message": "太貴了",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
+  "switchToFreePlan": {
+    "message": "切換至免費方案",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "switchToFreeOrg": {
+    "message": "切換至免費組織",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
   "freeForOneYear": {
     "message": "免費 1 年"
   },
   "newWebApp": {
-    "message": "Welcome to the new and improved web app. Learn more about what’s changed."
+    "message": "歡迎使用全新改良的網頁應用程式。瞭解更多變更內容。"
   },
   "releaseBlog": {
     "message": "閱讀發佈部落格"
@@ -9352,34 +9850,40 @@
     "message": "你無法將自己新增至群組。"
   },
   "cannotAddYourselfToCollections": {
-    "message": "You cannot add yourself to collections."
+    "message": "您無法將自己加入集合。"
   },
   "assign": {
     "message": "指派"
   },
+  "assignTasks": {
+    "message": "指派任務"
+  },
+  "assignSecurityTasksToMembers": {
+    "message": "傳送變更密碼的通知"
+  },
   "assignToCollections": {
-    "message": "Assign to collections"
+    "message": "指派至集合"
   },
   "assignToTheseCollections": {
-    "message": "Assign to these collections"
+    "message": "指派至這些集合"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "只有可以檢視集合的組織成員才能看到其中的項目。"
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "只有可以檢視集合的組織成員才能看到其中的項目。"
   },
   "selectCollectionsToAssign": {
-    "message": "Select collections to assign"
+    "message": "選擇要指派的集合"
   },
   "noCollectionsAssigned": {
-    "message": "No collections have been assigned"
+    "message": "尚未指派任何集合"
   },
   "successfullyAssignedCollections": {
-    "message": "Successfully assigned collections"
+    "message": "指派集合成功"
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "message": "您已經選擇 $TOTAL_COUNT$ 個項目。由於您沒有編輯權限，無法更新其中的 $READONLY_COUNT$ 個項目。",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -9401,7 +9905,7 @@
     "message": "項目"
   },
   "assignedSeats": {
-    "message": "Assigned seats"
+    "message": "指定席位"
   },
   "assigned": {
     "message": "已指派"
@@ -9416,37 +9920,37 @@
     "message": "取消連結組織"
   },
   "manageSeats": {
-    "message": "MANAGE SEATS"
+    "message": "管理座位"
   },
   "manageSeatsDescription": {
-    "message": "Adjustments to seats will be reflected in the next billing cycle."
+    "message": "席次調整將反映於下一個帳單週期。"
   },
   "unassignedSeatsDescription": {
     "message": "未分配的訂閱席位"
   },
   "purchaseSeatDescription": {
-    "message": "Additional seats purchased"
+    "message": "已購買額外席次"
   },
   "assignedSeatCannotUpdate": {
-    "message": "Assigned Seats can not be updated. Please contact your organization owner for assistance."
+    "message": "無法更新已指派的席次。請聯絡你們組織的擁有者以取得協助。"
   },
   "subscriptionUpdateFailed": {
-    "message": "Subscription update failed"
+    "message": "訂閱更新失敗"
   },
   "trial": {
     "message": "試用",
     "description": "A subscription status label."
   },
   "pastDue": {
-    "message": "Past due",
+    "message": "逾期",
     "description": "A subscription status label"
   },
   "subscriptionExpired": {
-    "message": "Subscription expired",
+    "message": "訂購授權逾期",
     "description": "The date header used when a subscription is past due."
   },
   "pastDueWarningForChargeAutomatically": {
-    "message": "You have a grace period of $DAYS$ days from your subscription expiration date to maintain your subscription. Please resolve the past due invoices by $SUSPENSION_DATE$.",
+    "message": "自訂閱到期日起，你有 $DAYS$ 天的寬限期可維持訂閱。請於 $SUSPENSION_DATE$ 前結清逾期發票。",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9460,7 +9964,7 @@
     "description": "A warning shown to the user when their subscription is past due and they are charged automatically."
   },
   "pastDueWarningForSendInvoice": {
-    "message": "You have a grace period of $DAYS$ days from the date your first unpaid invoice is due to maintain your subscription. Please resolve the past due invoices by $SUSPENSION_DATE$.",
+    "message": "自第一張未付款發票的到期日起，你有 $DAYS$ 天的寬限期可維持訂閱。請於 $SUSPENSION_DATE$ 前結清逾期發票。",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9474,11 +9978,11 @@
     "description": "A warning shown to the user when their subscription is past due and they pay via invoice."
   },
   "unpaidInvoice": {
-    "message": "Unpaid invoice",
+    "message": "未付賬單",
     "description": "The header of a warning box shown to a user whose subscription is unpaid."
   },
   "toReactivateYourSubscription": {
-    "message": "To reactivate your subscription, please resolve the past due invoices.",
+    "message": "若要重新啟用你的訂閱，請結清逾期發票。",
     "description": "The body of a warning box shown to a user whose subscription is unpaid."
   },
   "cancellationDate": {
@@ -9486,7 +9990,7 @@
     "description": "The date header used when a subscription is cancelled."
   },
   "machineAccountsCannotCreate": {
-    "message": "Machine accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
+    "message": "無法在已停用的組織中建立機器帳號。請聯絡你們組織的擁有者以取得協助。"
   },
   "machineAccount": {
     "message": "機器帳戶",
@@ -9497,11 +10001,11 @@
     "description": "The title for the section that deals with machine accounts."
   },
   "newMachineAccount": {
-    "message": "新增機器賬戶",
+    "message": "新增機器帳號",
     "description": "Title for creating a new machine account."
   },
   "machineAccountsNoItemsMessage": {
-    "message": "Create a new machine account to get started automating secret access.",
+    "message": "建立新的機器帳號，以開始自動化機密的存取。",
     "description": "Message to encourage the user to start creating machine accounts."
   },
   "machineAccountsNoItemsTitle": {
@@ -9517,11 +10021,11 @@
     "description": "Title for the action to delete a single machine account."
   },
   "viewMachineAccount": {
-    "message": "檢視機器賬戶",
+    "message": "檢視機器帳號",
     "description": "Action to view the details of a machine account."
   },
   "deleteMachineAccountDialogMessage": {
-    "message": "Deleting machine account $MACHINE_ACCOUNT$ is permanent and irreversible.",
+    "message": "刪除機器帳號 $MACHINE_ACCOUNT$ 為永久動作且無法復原。",
     "placeholders": {
       "machine_account": {
         "content": "$1",
@@ -9530,10 +10034,10 @@
     }
   },
   "deleteMachineAccountsDialogMessage": {
-    "message": "Deleting machine accounts is permanent and irreversible."
+    "message": "刪除機器帳號為永久動作且無法復原。"
   },
   "deleteMachineAccountsConfirmMessage": {
-    "message": "刪除 $COUNT$ 個機器賬戶",
+    "message": "刪除 $COUNT$ 個機器帳號",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9552,50 +10056,50 @@
     "description": "Placeholder text for searching machine accounts."
   },
   "editMachineAccount": {
-    "message": "編輯機器賬戶",
+    "message": "編輯機器帳號",
     "description": "Title for editing a machine account."
   },
   "machineAccountName": {
-    "message": "機器賬戶名稱",
+    "message": "機器帳號名稱",
     "description": "Label for the name of a machine account"
   },
   "machineAccountCreated": {
-    "message": "機器賬戶已建立",
+    "message": "機器帳號已建立",
     "description": "Notifies that a new machine account has been created"
   },
   "machineAccountUpdated": {
-    "message": "機器賬戶已更新",
+    "message": "機器帳號已更新",
     "description": "Notifies that a machine account has been updated"
   },
   "projectMachineAccountsDescription": {
-    "message": "Grant machine accounts access to this project."
+    "message": "授予機器帳號存取此專案的權限。"
   },
   "projectMachineAccountsSelectHint": {
-    "message": "Type or select machine accounts"
+    "message": "輸入或選取機器帳號"
   },
   "projectEmptyMachineAccountAccessPolicies": {
-    "message": "Add machine accounts to grant access"
+    "message": "新增機器帳號以授予存取權"
   },
   "machineAccountPeopleDescription": {
-    "message": "Grant groups or people access to this machine account."
+    "message": "授予群組或人員存取此機器帳號的權限。"
   },
   "machineAccountProjectsDescription": {
-    "message": "Assign projects to this machine account. "
+    "message": "將專案指派給此機器帳號。"
   },
   "createMachineAccount": {
-    "message": "建立機器賬戶"
+    "message": "建立機器帳號"
   },
   "maPeopleWarningMessage": {
-    "message": "Removing people from a machine account does not remove the access tokens they created. For security best practice, it is recommended to revoke access tokens created by people removed from a machine account."
+    "message": "從機器帳號移除人員不會一併移除其建立的存取權杖。基於安全性最佳實務，建議撤銷已被移除人員所建立的存取權杖。"
   },
   "smAccessRemovalWarningMaTitle": {
-    "message": "移除對此機器賬戶的存取權限"
+    "message": "移除對此機器帳號的存取權限"
   },
   "smAccessRemovalWarningMaMessage": {
-    "message": "此動作將移除您對此機器賬戶的存取權限"
+    "message": "此動作將移除您對此機器帳號的存取權限。"
   },
   "machineAccountsIncluded": {
-    "message": "$COUNT$ machine accounts included",
+    "message": "已包含 $COUNT$ 個機器帳號",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9604,7 +10108,7 @@
     }
   },
   "additionalMachineAccountCost": {
-    "message": "$COST$ per month for additional machine accounts",
+    "message": "每月 $COST$ 可新增機器帳號",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9613,10 +10117,10 @@
     }
   },
   "additionalMachineAccounts": {
-    "message": "Additional machine accounts"
+    "message": "額外機器帳號"
   },
   "includedMachineAccounts": {
-    "message": "Your plan comes with $COUNT$ machine accounts.",
+    "message": "你的方案包含 $COUNT$ 個機器帳號。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9625,7 +10129,7 @@
     }
   },
   "addAdditionalMachineAccounts": {
-    "message": "You can add additional machine accounts for $COST$ per month.",
+    "message": "你可以每月 $COST$ 新增機器帳號。",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9634,22 +10138,22 @@
     }
   },
   "limitMachineAccounts": {
-    "message": "Limit machine accounts (optional)"
+    "message": "限制機器帳號數量（選填）"
   },
   "limitMachineAccountsDesc": {
-    "message": "Set a limit for your machine accounts. Once this limit is reached, you will not be able to create new machine accounts."
+    "message": "為機器帳號設定上限。達到上限後，你將無法再建立新的機器帳號。"
   },
   "machineAccountLimit": {
-    "message": "Machine account limit (optional)"
+    "message": "機器帳號上限（選填）"
   },
   "maxMachineAccountCost": {
-    "message": "Max potential machine account cost"
+    "message": "機器帳號的最高潛在費用"
   },
   "machineAccountAccessUpdated": {
-    "message": "機器賬戶存取權限已更新"
+    "message": "機器帳號存取權限已更新"
   },
   "restrictedGroupAccessDesc": {
-    "message": "You cannot add yourself to a group."
+    "message": "你無法將自己新增至群組。"
   },
   "deleteProvider": {
     "message": "刪除提供者"
@@ -9667,7 +10171,7 @@
     }
   },
   "deleteProviderWarningDescription": {
-    "message": "You must unlink all clients before you can delete $ID$.",
+    "message": "在刪除 $ID$ 之前，必須先取消連結所有用戶端。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9679,19 +10183,19 @@
     "message": "提供者已刪除"
   },
   "providerDeletedDesc": {
-    "message": "The Provider and all associated data has been deleted."
+    "message": "已刪除該供應商及其所有相關資料。"
   },
   "deleteProviderRecoverConfirmDesc": {
-    "message": "You have requested to delete this Provider. Use the button below to confirm."
+    "message": "你已提出刪除此供應商的要求。請使用下方按鈕確認。"
   },
   "deleteProviderWarning": {
-    "message": "Deleting your provider is permanent. It cannot be undone."
+    "message": "刪除你的供應商為永久動作，無法復原。"
   },
   "errorAssigningTargetCollection": {
-    "message": "Error assigning target collection."
+    "message": "指定目標集合時發生錯誤。"
   },
   "errorAssigningTargetFolder": {
-    "message": "Error assigning target folder."
+    "message": "指定目標資料夾時發生錯誤。"
   },
   "integrationsAndSdks": {
     "message": "整合和軟體開發工具包",
@@ -9701,7 +10205,7 @@
     "message": "整合"
   },
   "integrationsDesc": {
-    "message": "Automatically sync secrets from Bitwarden Secrets Manager to a third-party service."
+    "message": "自動將 Bitwarden 機密管理中的機密同步到第三方服務。"
   },
   "sdks": {
     "message": "軟體開發工具包"
@@ -9710,71 +10214,77 @@
     "message": "使用 Bitwarden 機密管理軟體開發工具包於下列程式語言來建立你自己的應用程式。"
   },
   "ssoDescStart": {
-    "message": "Configure",
+    "message": "設定",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "ssoDescEnd": {
-    "message": "for Bitwarden using the implementation guide for your Identity Provider.",
+    "message": "於 Bitwarden，並依你的身分識別提供者的實作指南進行設定。",
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "userProvisioning": {
-    "message": "User provisioning"
+    "message": "使用者佈建"
   },
   "scimIntegration": {
     "message": "SCIM"
   },
   "scimIntegrationDescStart": {
-    "message": "Configure ",
+    "message": "已設定",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "scimIntegrationDescEnd": {
-    "message": "(System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider.",
+    "message": "（跨網域身分識別管理系統，SCIM），並依你的身分識別提供者的實作指南，自動將使用者與群組佈建到 Bitwarden。",
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "bwdc": {
-    "message": "Bitwarden Directory Connector"
+    "message": "Bitwarden 目錄連接器"
   },
   "bwdcDesc": {
-    "message": "Configure Bitwarden Directory Connector to automatically provision users and groups using the implementation guide for your Identity Provider."
+    "message": "依你的身分識別提供者的實作指南，設定 Bitwarden 目錄連接器以自動佈建使用者與群組。"
   },
   "eventManagement": {
-    "message": "Event management"
+    "message": "事件管理"
   },
   "eventManagementDesc": {
-    "message": "Integrate Bitwarden event logs with your SIEM (system information and event management) system by using the implementation guide for your platform."
+    "message": "依你的平台實作指南，將 Bitwarden 的事件記錄整合至你的 SIEM（安全資訊與事件管理）系統。"
   },
   "deviceManagement": {
-    "message": "Device management"
+    "message": "裝置管理"
   },
   "deviceManagementDesc": {
-    "message": "Configure device management for Bitwarden using the implementation guide for your platform."
+    "message": "依你的平台實作指南，為 Bitwarden 設定裝置管理。"
   },
   "crowdstrikeEventIntegrationDesc": {
-    "message": "Send event data to your Logscale instance"
+    "message": "將事件資料傳送至你的 Logscale 執行個體"
+  },
+  "datadogEventIntegrationDesc": {
+    "message": "將密碼庫事件資料傳送至你的 Datadog 執行個體"
   },
   "failedToSaveIntegration": {
-    "message": "Failed to save integration. Please try again later."
+    "message": "整合設定儲存失敗。請稍後再試。"
+  },
+  "mustBeOrgOwnerToPerformAction": {
+    "message": "必須是組織擁有者才能執行此動作。"
   },
   "failedToDeleteIntegration": {
-    "message": "Failed to delete integration. Please try again later."
+    "message": "刪除整合失敗。請稍後再試。"
   },
   "deviceIdMissing": {
-    "message": "Device ID is missing"
+    "message": "缺少裝置 ID"
   },
   "deviceTypeMissing": {
-    "message": "Device type is missing"
+    "message": "缺少裝置類型"
   },
   "deviceCreationDateMissing": {
-    "message": "Device creation date is missing"
+    "message": "缺少裝置建立日期"
   },
   "desktopRequired": {
-    "message": "Desktop required"
+    "message": "需要桌面版"
   },
   "reopenLinkOnDesktop": {
-    "message": "Reopen this link from your email on a desktop."
+    "message": "請在桌面裝置上重新開啟您電子郵件中的此連結。"
   },
   "connectIntegrationButtonDesc": {
-    "message": "Connect $INTEGRATION$",
+    "message": "連接 $INTEGRATION$",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9783,7 +10293,7 @@
     }
   },
   "updateIntegrationButtonDesc": {
-    "message": "Update $INTEGRATION$",
+    "message": "更新 $INTEGRATION$",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9792,7 +10302,7 @@
     }
   },
   "integrationCardTooltip": {
-    "message": "Launch $INTEGRATION$ implementation guide.",
+    "message": "啟動 $INTEGRATION$ 實作指南。",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9819,7 +10329,7 @@
     }
   },
   "integrationCardAriaLabel": {
-    "message": "open $INTEGRATION$ implementation guide in a new tab.",
+    "message": "在新分頁中開啟 $INTEGRATION$ 實作指南。",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9837,7 +10347,7 @@
     }
   },
   "smIntegrationCardAriaLabel": {
-    "message": "set up $INTEGRATION$ implementation guide in a new tab.",
+    "message": "在新分頁中設定 $INTEGRATION$ 實作指南。",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9846,19 +10356,19 @@
     }
   },
   "createNewClientToManageAsProvider": {
-    "message": "Create a new client organization to manage as a Provider. Additional seats will be reflected in the next billing cycle."
+    "message": "建立新的客戶組織以作為提供者管理。額外座位將在下一個帳單週期反映。"
   },
   "url": {
     "message": "URL"
   },
   "bearerToken": {
-    "message": "Bearer Token"
+    "message": "Bearer 權杖"
   },
   "repositoryNameHint": {
-    "message": "Name of the repository to ingest into"
+    "message": "要匯入的儲存庫名稱"
   },
   "index": {
-    "message": "Index"
+    "message": "索引"
   },
   "selectAPlan": {
     "message": "選擇一個計劃"
@@ -9867,10 +10377,10 @@
     "message": "35% 折扣"
   },
   "monthPerMember": {
-    "message": "month per member"
+    "message": "每位成員每月"
   },
   "monthPerMemberBilledAnnually": {
-    "message": "month per member billed annually"
+    "message": "每位成員每月（按年計費）"
   },
   "seats": {
     "message": "席位"
@@ -9879,13 +10389,13 @@
     "message": "新增組織"
   },
   "createdNewClient": {
-    "message": "Successfully created new client"
+    "message": "成功建立新客戶"
   },
   "noAccess": {
     "message": "無存取權限"
   },
   "collectionAdminConsoleManaged": {
-    "message": "This collection is only accessible from the admin console"
+    "message": "此集合僅能從管理控制台存取"
   },
   "organizationOptionsMenu": {
     "message": "切換組織選單"
@@ -9900,31 +10410,31 @@
     "message": "從提供者入口網站管理計費"
   },
   "continueSettingUp": {
-    "message": "Continue setting up Bitwarden"
+    "message": "繼續設定 Bitwarden"
   },
   "continueSettingUpFreeTrial": {
     "message": "繼續設定您的 Bitwarden 免費試用"
   },
   "continueSettingUpPasswordManager": {
-    "message": "Continue setting up Bitwarden Password Manager"
+    "message": "繼續設定您的 Bitwarden 密碼管理器"
   },
   "continueSettingUpFreeTrialPasswordManager": {
     "message": "繼續設定您的 Bitwarden 密碼管理器免費試用"
   },
   "continueSettingUpSecretsManager": {
-    "message": "Continue setting up Bitwarden Secrets Manager"
+    "message": "繼續設定您的 Bitwarden 機密管理免費試用"
   },
   "continueSettingUpFreeTrialSecretsManager": {
     "message": "繼續設定您的 Bitwarden 機密管理免費試用"
   },
   "enterTeamsOrgInfo": {
-    "message": "Enter your Teams organization information"
+    "message": "輸入您的團隊組織資訊"
   },
   "enterFamiliesOrgInfo": {
-    "message": "Enter your Families organization information"
+    "message": "輸入您的家庭組織資訊"
   },
   "enterEnterpriseOrgInfo": {
-    "message": "Enter your Enterprise organization information"
+    "message": "輸入您的企業組織資訊"
   },
   "viewItemsIn": {
     "message": "檢視項目位於 $NAME$",
@@ -9979,10 +10489,10 @@
     "message": "代管服務供應商"
   },
   "managedServiceProvider": {
-    "message": "Managed service provider"
+    "message": "代管服務供應商"
   },
   "multiOrganizationEnterprise": {
-    "message": "Multi-organization enterprise"
+    "message": "多組織企業"
   },
   "orgSeats": {
     "message": "組織席位"
@@ -9996,12 +10506,6 @@
       }
     }
   },
-  "lowKDFIterationsBanner": {
-    "message": "低 KDF 迭代。增加迭代次數以提高帳號的安全性。"
-  },
-  "changeKDFSettings": {
-    "message": "變更 KDF 設定"
-  },
   "secureYourInfrastructure": {
     "message": "保護你的基礎設施"
   },
@@ -10012,7 +10516,7 @@
     "message": "透過監控報告以彌補安全漏洞"
   },
   "upgradeOrganizationCloseSecurityGapsDesc": {
-    "message": "Stay ahead of security vulnerabilities by upgrading to a paid plan for enhanced monitoring."
+    "message": "透過升級至付費方案以增強監控，搶先防範安全漏洞。"
   },
   "approveAllRequests": {
     "message": "核准所有請求"
@@ -10030,16 +10534,16 @@
     "message": "已更新稅務資訊"
   },
   "billingInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
+    "message": "無效的稅號，如果您認為這是錯誤，請聯絡支援。"
   },
   "billingTaxIdTypeInferenceError": {
-    "message": "We were unable to validate your tax ID, if you believe this is an error please contact support."
+    "message": "我們無法驗證您的稅號，如果您認為這是錯誤，請聯絡支援。"
   },
   "billingPreviewInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
+    "message": "無效的稅號，如果您認為這是錯誤，請聯絡支援。"
   },
   "billingPreviewInvoiceError": {
-    "message": "An error occurred while previewing the invoice. Please try again later."
+    "message": "預覽發票時發生錯誤。請稍後再試。"
   },
   "unverified": {
     "message": "未驗證"
@@ -10051,17 +10555,17 @@
     "message": "檢視秘密"
   },
   "noClients": {
-    "message": "There are no clients to list"
+    "message": "沒有可列出的客戶"
   },
   "providerBillingEmailHint": {
-    "message": "This email address will receive all invoices pertaining to this provider",
+    "message": "此電子郵件地址將接收所有與此提供者相關的發票",
     "description": "A hint that shows up on the Provider setup page to inform the admin the billing email will receive the provider's invoices."
   },
   "upgradeOrganizationEnterprise": {
-    "message": "Identify security risks by auditing member access"
+    "message": "透過審核成員存取權來識別安全風險"
   },
   "onlyAvailableForEnterpriseOrganization": {
-    "message": "Quickly view member access across the organization by upgrading to an Enterprise plan."
+    "message": "升級至企業方案，可快速檢視組織內的成員存取情況。"
   },
   "date": {
     "message": "日期"
@@ -10073,79 +10577,61 @@
     "message": "成員存取"
   },
   "memberAccessReportDesc": {
-    "message": "Ensure members have access to the right credentials and their accounts are secure. Use this report to obtain a CSV of member access and account configurations."
+    "message": "確保成員存取正確的憑證並保護其帳號安全。使用此報告可取得成員存取權及帳號設定的 CSV 檔。"
   },
   "memberAccessReportPageDesc": {
-    "message": "Audit organization member access across groups, collections, and collection items. The CSV export provides a detailed breakdown per member, including information on collection permissions and account configurations."
+    "message": "審核組織成員在群組、集合及集合項目中的存取權。CSV 匯出將提供每位成員的詳細分析，包括集合權限及帳號設定資訊。"
   },
   "memberAccessReportNoCollection": {
-    "message": "(No Collection)"
+    "message": "（無集合）"
   },
   "memberAccessReportNoCollectionPermission": {
-    "message": "(No Collection Permission)"
+    "message": "（無集合權限）"
   },
   "memberAccessReportNoGroup": {
-    "message": "(No Group)"
+    "message": "（無群組）"
   },
   "memberAccessReportTwoFactorEnabledTrue": {
-    "message": "On"
+    "message": "開啟"
   },
   "memberAccessReportTwoFactorEnabledFalse": {
-    "message": "Off"
+    "message": "關閉"
   },
   "memberAccessReportAuthenticationEnabledTrue": {
-    "message": "On"
+    "message": "開啟"
   },
   "memberAccessReportAuthenticationEnabledFalse": {
-    "message": "Off"
-  },
-  "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
-  },
-  "incrementsOf100,000": {
-    "message": "increments of 100,000"
-  },
-  "smallIncrements": {
-    "message": "small increments"
+    "message": "關閉"
   },
   "kdfIterationRecommends": {
-    "message": "We recommend 600,000 or more"
-  },
-  "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
-    "placeholders": {
-      "value": {
-        "content": "$1",
-        "example": "increments of 100,000"
-      }
-    }
+    "message": "我們建議使用 600,000 或以上"
   },
   "providerReinstate": {
-    "message": " Contact Customer Support to reinstate your subscription."
+    "message": "請聯絡客服以恢復您的訂閱。"
   },
   "secretPeopleDescription": {
-    "message": "Grant groups or people access to this secret. Permissions set for people will override permissions set by groups."
+    "message": "授予群組或人員對此憑證的存取權。對人員設定的權限將覆蓋群組設定的權限。"
   },
   "secretPeopleEmptyMessage": {
-    "message": "Add people or groups to share access to this secret"
+    "message": "新增人員或群組以分享此憑證的存取權"
   },
   "secretMachineAccountsDescription": {
-    "message": "Grant machine accounts access to this secret."
+    "message": "授予機器帳號對此憑證的存取權。"
   },
   "secretMachineAccountsEmptyMessage": {
-    "message": "Add machine accounts to grant access to this secret"
+    "message": "新增機器帳號以授予對此憑證的存取權"
   },
   "smAccessRemovalWarningSecretTitle": {
-    "message": "Remove access to this secret"
+    "message": "移除對此憑證的存取權"
   },
   "smAccessRemovalSecretMessage": {
-    "message": "This action will remove your access to this secret."
+    "message": "此操作將移除您對此憑證的存取權。"
   },
   "invoice": {
-    "message": "Invoice"
+    "message": "發票"
   },
   "unassignedSeatsAvailable": {
-    "message": "You have $SEATS$ unassigned seats available.",
+    "message": "您有 $SEATS$ 個未指派的座位可用。",
     "placeholders": {
       "seats": {
         "content": "$1",
@@ -10155,49 +10641,49 @@
     "description": "A message showing how many unassigned seats are available for a provider."
   },
   "contactYourProviderForAdditionalSeats": {
-    "message": "Contact your provider admin to purchase additional seats."
+    "message": "請聯絡您的提供者管理員以購買額外座位。"
   },
   "open": {
-    "message": "Open",
+    "message": "開啟",
     "description": "The status of an invoice."
   },
   "uncollectible": {
-    "message": "Uncollectible",
+    "message": "無法收集",
     "description": "The status of an invoice."
   },
   "clientDetails": {
-    "message": "Client details"
+    "message": "客戶端詳細資訊"
   },
   "downloadCSV": {
     "message": "下載 CSV"
   },
   "monthlySubscriptionUserSeatsMessage": {
-    "message": "Adjustments to your subscription will result in prorated charges to your billing totals on your next billing period. "
+    "message": "對訂閱的調整將在下一個帳單週期對帳單總額產生按比例計費。 "
   },
   "annualSubscriptionUserSeatsMessage": {
-    "message": "Adjustments to your subscription will result in prorated charges on a monthly billing cycle. "
+    "message": "對訂閱的調整將在每月帳單週期產生按比例計費。 "
   },
   "billingHistoryDescription": {
-    "message": "Download a CSV to obtain client details for each billing date. Prorated charges are not included in the CSV and may vary from the linked invoice. For the most accurate billing details, refer to your monthly invoices.",
+    "message": "下載 CSV 以取得每個帳單日期的客戶詳細資訊。CSV 不包含按比例計費，可能與連結的發票不同。欲取得最準確的帳單資訊，請參考每月發票。",
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "noInvoicesToList": {
-    "message": "There are no invoices to list",
+    "message": "沒有可列出的發票",
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "providerClientVaultPrivacyNotification": {
-    "message": "Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions,",
+    "message": "通知：本月稍晚將提升客戶密碼庫的隱私，供應商成員將不再能直接存取客戶密碼庫項目。如有疑問，",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'."
   },
   "contactBitwardenSupport": {
-    "message": "contact Bitwarden support.",
+    "message": "請聯絡 Bitwarden 支援。",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'. 'Bitwarden' should not be translated"
   },
   "sponsored": {
-    "message": "Sponsored"
+    "message": "贊助"
   },
   "licenseAndBillingManagementDesc": {
-    "message": "After making updates in the Bitwarden cloud server, upload your license file to apply the most recent changes."
+    "message": "在 Bitwarden 雲端伺服器完成更新後，請上傳你的授權檔以套用最新變更。"
   },
   "addToFolder": {
     "message": "新增到資料夾"
@@ -10206,10 +10692,10 @@
     "message": "選擇資料夾"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 個項目會被永久移到選擇的組織。您將不再擁有此項目。"
   },
   "personalItemsTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ 個項目會被永久移到選擇的組織。您將不再擁有這些項目。",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -10218,7 +10704,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "1 個項目會被永久移到 $ORG$。您將不再擁有此項目。",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -10227,7 +10713,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ 個項目會被永久移到 $ORG$。您將不再擁有這些項目。",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -10240,64 +10726,64 @@
     }
   },
   "data": {
-    "message": "Data"
+    "message": "資料"
   },
   "purchasedSeatsRemoved": {
-    "message": "purchased seats removed"
+    "message": "已移除購買的席次"
   },
   "environmentVariables": {
-    "message": "Environment variables"
+    "message": "環境變數"
   },
   "organizationId": {
-    "message": "Organization ID"
+    "message": "組織 ID"
   },
   "projectIds": {
-    "message": "Project IDs"
+    "message": "專案 IDs"
   },
   "projectId": {
-    "message": "Project ID"
+    "message": "專案 ID"
   },
   "projectsAccessedByMachineAccount": {
-    "message": "The following projects can be accessed by this machine account."
+    "message": "此機器帳號可存取以下專案。"
   },
   "config": {
-    "message": "Config"
+    "message": "設定"
   },
   "learnMoreAboutEmergencyAccess": {
-    "message": "Learn more about emergency access"
+    "message": "深入瞭解緊急存取"
   },
   "learnMoreAboutMatchDetection": {
-    "message": "Learn more about match detection"
+    "message": "深入瞭解符合項目偵測"
   },
   "learnMoreAboutMasterPasswordReprompt": {
-    "message": "Learn more about master password re-prompt"
+    "message": "深入瞭解主密碼再次提示"
   },
   "learnMoreAboutSearchingYourVault": {
-    "message": "Learn more about searching your vault"
+    "message": "深入瞭解搜尋你的密碼庫"
   },
   "learnMoreAboutYourAccountFingerprintPhrase": {
-    "message": "Learn about your account fingerprint phrase"
+    "message": "瞭解你的帳號指紋短語"
   },
   "impactOfRotatingYourEncryptionKey": {
-    "message": "Impact of rotating your encryption key"
+    "message": "輪換加密金鑰的影響"
   },
   "learnMoreAboutEncryptionAlgorithms": {
-    "message": "Learn more about encryption algorithms"
+    "message": "深入瞭解加密演算法"
   },
   "learnMoreAboutKDFIterations": {
-    "message": "Learn more about KDF iterations"
+    "message": "深入瞭解 KDF 迭代"
   },
   "learnMoreAboutLocalization": {
-    "message": "Learn more about localization"
+    "message": "深入瞭解在地化"
   },
   "learnMoreAboutWebsiteIcons": {
-    "message": "Learn more about using website icons"
+    "message": "深入瞭解網站圖示的使用"
   },
   "learnMoreAboutUserAccess": {
-    "message": "Learn more about user access"
+    "message": "深入瞭解使用者存取"
   },
   "learnMoreAboutMemberRoles": {
-    "message": "Learn more about member roles and permissions"
+    "message": "深入瞭解成員角色與權限"
   },
   "whatIsACvvNumber": {
     "message": "CVV 號碼是什麼？"
@@ -10306,13 +10792,13 @@
     "message": "瞭解更多關於 Bitwarden API 的資訊"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "檔案 Send"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "文字 Sends"
   },
   "includesXMembers": {
-    "message": "for $COUNT$ member",
+    "message": "供 $COUNT$ 位成員使用",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -10330,10 +10816,10 @@
     }
   },
   "optionalOnPremHosting": {
-    "message": "Optional on-premises hosting"
+    "message": "可選擇自建託管"
   },
   "upgradeFreeOrganization": {
-    "message": "Upgrade your $NAME$ organization ",
+    "message": "升級你的 $NAME$ 組織",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10342,10 +10828,10 @@
     }
   },
   "includeSsoAuthenticationMessage": {
-    "message": "SSO Authentication"
+    "message": "SSO 驗證"
   },
   "familiesPlanInvLimitReachedManageBilling": {
-    "message": "Families organizations may have up to $SEATCOUNT$ members. Upgrade to a paid plan to invite more members.",
+    "message": "家庭組織最多可有 $SEATCOUNT$ 位成員。升級至付費方案以邀請更多成員。",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10354,7 +10840,7 @@
     }
   },
   "familiesPlanInvLimitReachedNoManageBilling": {
-    "message": "Families organizations may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade.",
+    "message": "家庭組織最多可有 $SEATCOUNT$ 位成員。請聯絡你們組織擁有者以進行升級。",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -10363,10 +10849,10 @@
     }
   },
   "upgradePlans": {
-    "message": "Upgrade your plan to invite members and experience powerful security features."
+    "message": "升級你的方案以邀請成員，並體驗更強大的安全功能。"
   },
   "upgradeDiscount": {
-    "message": "Save $AMOUNT$%",
+    "message": "省下 $AMOUNT$%",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -10375,43 +10861,43 @@
     }
   },
   "enterprisePlanUpgradeMessage": {
-    "message": "Advanced capabilities for larger organizations"
+    "message": "為大型組織提供進階能力"
   },
   "teamsPlanUpgradeMessage": {
-    "message": "Resilient protection for growing teams"
+    "message": "為成長中的團隊提供韌性防護"
   },
   "teamsInviteMessage": {
-    "message": "Invite unlimited members"
+    "message": "可邀請不限人數的成員"
   },
   "accessToCreateGroups": {
-    "message": "Access to create groups"
+    "message": "可建立群組"
   },
   "syncGroupsAndUsersFromDirectory": {
-    "message": "Sync groups and users from a directory"
+    "message": "從目錄服務同步群組與使用者"
   },
   "familyPlanUpgradeMessage": {
-    "message": "Secure your family logins"
+    "message": "守護家人的登入安全"
   },
   "accessToPremiumFeatures": {
-    "message": "Access to Premium features"
+    "message": "可使用進階版功能"
   },
   "additionalStorageGbMessage": {
-    "message": "GB additional storage"
+    "message": "GB 額外儲存空間"
   },
   "sshKeyAlgorithm": {
-    "message": "Key algorithm"
+    "message": "金鑰演算法"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "私密金鑰"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "公共金鑰"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "指紋"
   },
   "sshKeyFingerprint": {
-    "message": "Fingerprint"
+    "message": "指紋"
   },
   "sshKeyPrivateKey": {
     "message": "私密金鑰"
@@ -10432,86 +10918,86 @@
     "message": "RSA 4096-Bit"
   },
   "premiumAccounts": {
-    "message": "6 premium accounts"
+    "message": "6 個進階版帳號"
   },
   "unlimitedSharing": {
-    "message": "Unlimited sharing"
+    "message": "無限制分享"
   },
   "unlimitedCollections": {
-    "message": "Unlimited collections"
+    "message": "不限集合數量"
   },
   "secureDataSharing": {
-    "message": "Secure data sharing"
+    "message": "安全的資料分享"
   },
   "eventLogMonitoring": {
-    "message": "Event log monitoring"
+    "message": "事件記錄監控"
   },
   "directoryIntegration": {
-    "message": "Directory integration"
+    "message": "目錄整合"
   },
   "passwordLessSso": {
-    "message": "Passwordless SSO"
+    "message": "免密碼 SSO"
   },
   "accountRecovery": {
-    "message": "Account recovery"
+    "message": "帳號復原"
   },
   "customRoles": {
-    "message": "Custom roles"
+    "message": "自訂角色"
   },
   "unlimitedSecretsStorage": {
-    "message": "Unlimited secrets storage"
+    "message": "機密不限儲存量"
   },
   "unlimitedUsers": {
-    "message": "Unlimited users"
+    "message": "不限使用者數量"
   },
   "UpTo50MachineAccounts": {
-    "message": "Up to 50 machine accounts"
+    "message": "最多 50 個機器帳號"
   },
   "UpTo20MachineAccounts": {
-    "message": "Up to 20 machine accounts"
+    "message": "最多 20 個機器帳號"
   },
   "current": {
-    "message": "Current"
+    "message": "目前"
   },
   "secretsManagerSubscriptionInfo": {
-    "message": "Your Secrets Manager subscription will upgrade based on the plan selected"
+    "message": "你的機密管理訂閱將依所選方案升級"
   },
   "bitwardenPasswordManager": {
-    "message": "Bitwarden Password Manager"
+    "message": "Bitwarden 密碼管理工具"
   },
   "secretsManagerComplimentaryPasswordManager": {
-    "message": "Your complimentary one year Password Manager subscription will upgrade to the selected plan. You will not be charged until the complimentary period is over."
+    "message": "你贈送的一年期密碼管理器訂閱將升級至所選方案。在贈送期間結束前不會收費。"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "檔案已儲存至裝置。在您的裝置中管理下載的檔案。"
   },
   "publicApi": {
-    "message": "Public API",
+    "message": "公共 API",
     "description": "The text, 'API', is an acronym and should not be translated."
   },
   "showCharacterCount": {
-    "message": "Show character count"
+    "message": "顯示字元數"
   },
   "hideCharacterCount": {
-    "message": "Hide character count"
+    "message": "隱藏字元數"
   },
   "editAccess": {
-    "message": "Edit access"
+    "message": "編輯存取權"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "像安全問題之類的資料 請使用文本框"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "敏感資料 如同密碼 使用隱藏字段"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "如果您想自動填充表單的復選框，例如「記住電子郵件」，請使用復選框"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "使用連結欄位若您在特定網站上遇到自動填入問題。"
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "填入欄位的 html id、名稱、標籤或預留字元"
   },
   "uppercaseDescription": {
     "message": "包含大寫字元",
@@ -10548,23 +11034,23 @@
     "message": "最大檔案大小為 500MB"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "你確定要永久刪除此附件嗎？"
   },
   "manageSubscriptionFromThe": {
-    "message": "Manage subscription from the",
+    "message": "從",
     "description": "This represents the beginning of a sentence. The full sentence will be 'Manage subscription from the Provider Portal', but 'Provider Portal' will be a link and thus cannot be included in the translation file."
   },
   "toHostBitwardenOnYourOwnServer": {
-    "message": "To host Bitwarden on your own server, you will need to upload your license file. To support Free Families plans and advanced billing capabilities for your self-hosted organization, you will need to set up automatic sync in your self-hosted organization."
+    "message": "若要在自己的伺服器上託管 Bitwarden，你需要上傳授權檔。為支援自建組織的免費家庭方案與進階計費功能，你需要在自建組織中設定自動同步。"
   },
   "selfHostingTitleProper": {
     "message": "自架"
   },
   "claim-domain-single-org-warning": {
-    "message": "Claiming a domain will turn on the single organization policy."
+    "message": "宣告網域將會啟用單一組織原則。"
   },
   "single-org-revoked-user-warning": {
-    "message": "Non-compliant members will be revoked. Administrators can restore members once they leave all other organizations."
+    "message": "不符合原則的成員將被撤銷。當成員離開所有其他組織後，管理員可將其還原。"
   },
   "deleteOrganizationUser": {
     "message": "刪除 $NAME$",
@@ -10577,7 +11063,7 @@
     }
   },
   "deleteOrganizationUserWarningDesc": {
-    "message": "This will permanently delete all items owned by $NAME$. Collection items are not impacted.",
+    "message": "此動作將永久刪除 $NAME$ 擁有的所有項目。集合中的項目不受影響。",
     "description": "Warning description for the delete organization user dialog",
     "placeholders": {
       "name": {
@@ -10587,7 +11073,7 @@
     }
   },
   "deleteManyOrganizationUsersWarningDesc": {
-    "message": "This will permanently delete all items owned by the following members. Collection items are not impacted.",
+    "message": "此動作將永久刪除以下成員擁有的所有項目。集合中的項目不受影響。",
     "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
@@ -10600,10 +11086,10 @@
     }
   },
   "organizationUserDeletedDesc": {
-    "message": "The user was removed from the organization and all associated user data has been deleted."
+    "message": "該使用者已從組織移除，並已刪除其所有相關使用者資料。"
   },
   "deletedUserIdEventMessage": {
-    "message": "Deleted user $ID$",
+    "message": "已刪除使用者 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10612,7 +11098,7 @@
     }
   },
   "userLeftOrganization": {
-    "message": "User $ID$ left organization",
+    "message": "使用者 $ID$ 已離開組織",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10621,7 +11107,7 @@
     }
   },
   "suspendedOrganizationTitle": {
-    "message": "The $ORGANIZATION$ is suspended",
+    "message": "$ORGANIZATION$ 已被停用",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -10630,37 +11116,37 @@
     }
   },
   "suspendedUserOrgMessage": {
-    "message": "Contact your organization owner for assistance."
+    "message": "請聯絡你們組織的擁有者以取得協助。"
   },
   "suspendedOwnerOrgMessage": {
-    "message": "To regain access to your organization, add a payment method."
+    "message": "若要恢復存取你的組織，請新增付款方式。"
   },
   "deleteMembers": {
-    "message": "Delete members"
+    "message": "刪除群成員"
   },
   "noSelectedMembersApplicable": {
-    "message": "This action is not applicable to any of the selected members."
+    "message": "此動作不適用於任何已選取的成員。"
   },
   "deletedSuccessfully": {
     "message": "刪除成功"
   },
   "freeFamiliesSponsorship": {
-    "message": "Remove Free Bitwarden Families sponsorship"
+    "message": "移除免費的 Bitwarden 家庭贊助"
   },
   "freeFamiliesSponsorshipPolicyDesc": {
-    "message": "Do not allow members to redeem a Families plan through this organization."
+    "message": "不允許成員透過此組織兌換家庭方案。"
   },
   "verifyBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the organization's billing page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "以銀行帳號付款僅適用於美國客戶。你需要驗證你的銀行帳號。我們將於 1–2 個工作天內進行小額入帳。請在組織的帳單頁面輸入此次入帳的敘述代碼以驗證銀行帳號。未完成驗證將導致漏付款並使你的訂閱被停用。"
   },
   "verifyBankAccountWithStatementDescriptorInstructions": {
-    "message": "We have made a micro-deposit to your bank account (this may take 1-2 business days). Enter the six-digit code starting with 'SM' found on the deposit description. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "我們已對你的銀行帳號進行小額入帳（可能需時 1–2 個工作天）。請輸入入帳敘述中以「SM」開頭的 6 位數代碼。未完成銀行帳號驗證將導致漏付款並使你的訂閱被停用。"
   },
   "descriptorCode": {
-    "message": "Descriptor code"
+    "message": "敘述代碼"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "若您只有檢視權限，無法移除集合 $COLLECTIONS$。",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -10669,37 +11155,37 @@
     }
   },
   "removeMembers": {
-    "message": "Remove members"
+    "message": "移除成員"
   },
   "devices": {
-    "message": "Devices"
+    "message": "裝置"
   },
   "deviceListDescription": {
-    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+    "message": "你的帳號已在下列各裝置登入。若有不認得的裝置，請立即將其移除。"
   },
   "deviceListDescriptionTemp": {
-    "message": "Your account was logged in to each of the devices below."
+    "message": "你的帳號已在下列各裝置登入。"
   },
   "claimedDomains": {
-    "message": "Claimed domains"
+    "message": "已宣告的網域"
   },
   "claimDomain": {
-    "message": "Claim domain"
+    "message": "宣告網域"
   },
   "reclaimDomain": {
-    "message": "Reclaim domain"
+    "message": "重新宣告網域"
   },
   "claimDomainNameInputHint": {
-    "message": "Example: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "範例：mydomain.com。子網域需另外個別宣告。"
   },
   "automaticClaimedDomains": {
-    "message": "Automatic Claimed Domains"
+    "message": "自動宣告網域"
   },
   "automaticDomainClaimProcess": {
-    "message": "Bitwarden will attempt to claim the domain 3 times during the first 72 hours. If the domain can’t be claimed, check the DNS record in your host and manually claim. The domain will be removed from your organization in 7 days if it is not claimed."
+    "message": "Bitwarden 會在前 72 小時內嘗試宣告該網域 3 次。若無法宣告，請檢查主機上的 DNS 紀錄並手動宣告。若 7 天內仍未宣告，該網域將自你的組織移除。"
   },
   "domainNotClaimed": {
-    "message": "$DOMAIN$ not claimed. Check your DNS records.",
+    "message": "尚未宣告 $DOMAIN$。請檢查你的 DNS 紀錄。",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10708,19 +11194,19 @@
     }
   },
   "domainStatusClaimed": {
-    "message": "Claimed"
+    "message": "已宣告"
   },
   "domainStatusUnderVerification": {
-    "message": "Under verification"
+    "message": "驗證中"
   },
   "claimedDomainsDescription": {
-    "message": "Claim a domain to own member accounts. The SSO identifier page will be skipped during login for members with claimed domains and administrators will be able to delete claimed accounts."
+    "message": "宣告網域以取得其成員帳號的管理權。擁有已宣告網域的成員在登入時會略過 SSO 識別頁面，且管理員將可刪除已宣告的帳號。"
   },
   "invalidDomainNameClaimMessage": {
-    "message": "Input is not a valid format. Format: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "輸入格式無效。格式：mydomain.com。子網域需另外個別宣告。"
   },
   "domainClaimedEvent": {
-    "message": "$DOMAIN$ claimed",
+    "message": "已宣告 $DOMAIN$",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10729,7 +11215,7 @@
     }
   },
   "domainNotClaimedEvent": {
-    "message": "$DOMAIN$ not claimed",
+    "message": "未宣告 $DOMAIN$",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10738,7 +11224,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForSentSponsorship": {
-    "message": "If you remove $EMAIL$, the sponsorship for this Family plan cannot be redeemed. Are you sure you want to continue?",
+    "message": "如果你移除 $EMAIL$，此家庭方案的贊助將無法兌換。確定要繼續嗎？",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10747,7 +11233,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForAcceptedSponsorship": {
-    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end and the saved payment method will be charged $40 + applicable tax on $DATE$. You will not be able to redeem a new sponsorship until $DATE$. Are you sure you want to continue?",
+    "message": "如果你移除 $EMAIL$，此家庭方案的贊助將結束，並會於 $DATE$ 由已儲存的付款方式收取 $40 + 適用稅金。$DATE$ 之前你將無法兌換新的贊助。確定要繼續嗎？",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10760,108 +11246,109 @@
     }
   },
   "domainClaimed": {
-    "message": "Domain claimed"
+    "message": "已宣告網域"
+  },
+  "itemAddedToFavorites": {
+    "message": "項目已加入到最愛"
+  },
+  "itemRemovedFromFavorites": {
+    "message": "項目已從最愛中移除"
+  },
+  "copyNote": {
+    "message": "複製備註"
   },
   "organizationNameMaxLength": {
-    "message": "Organization name cannot exceed 50 characters."
+    "message": "組織名稱不得超過 50 個字元。"
   },
   "rotationCompletedTitle": {
-    "message": "Key rotation successful"
+    "message": "金鑰輪換成功"
   },
   "rotationCompletedDesc": {
-    "message": "Your master password and encryption keys have been updated. Your other devices have been logged out."
+    "message": "你的主密碼與加密金鑰已更新。你在其他裝置上的登入已登出。"
   },
   "trustUserEmergencyAccess": {
-    "message": "Trust and confirm user"
+    "message": "信任並確認使用者"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "信任組織"
   },
   "trust": {
-    "message": "Trust"
+    "message": "信任"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "不信任"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "機構不被信任"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "為了保護你的帳號安全，僅在你已授予此使用者緊急存取權，且其指紋與其帳號中顯示的指紋相符時才確認。"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "為了保護你的帳號安全，僅在你是此組織的成員、已啟用帳號復原功能，且下方顯示的指紋與組織的指紋相符時才繼續。"
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "此組織有企業政策，會將你加入帳號復原功能。加入後，組織管理員可變更你的密碼。僅在你確認此組織身份，且下方顯示的指紋詞句與該組織的指紋相符時才繼續。"
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "信任使用者"
   },
   "sshKeyWrongPassword": {
-    "message": "The password you entered is incorrect."
+    "message": "您輸入的密碼錯誤。"
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "匯入"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "確認密碼"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Enter the password for the SSH key."
+    "message": "輸入 SSH 金鑰的密碼"
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "請輸入密碼"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "SSH 密鑰不正確"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "SSH 密鑰類型不支援"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "從剪貼簿中匯入密鑰"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "SSH 密鑰成功匯入"
   },
   "copySSHPrivateKey": {
-    "message": "Copy private key"
+    "message": "複製私密金鑰"
   },
   "openingExtension": {
-    "message": "Opening the Bitwarden browser extension"
+    "message": "正在開啟 Bitwarden 瀏覽器擴充套件"
   },
   "somethingWentWrong": {
-    "message": "Something went wrong..."
+    "message": "出了點問題..."
   },
   "openingExtensionError": {
-    "message": "We had trouble opening the Bitwarden browser extension. Click the button to open it now."
+    "message": "開啟 Bitwarden 瀏覽器擴充套件時發生問題。請點擊按鈕立即開啟。"
   },
   "openExtension": {
-    "message": "Open extension"
+    "message": "開啟擴充功能"
   },
   "doNotHaveExtension": {
-    "message": "Don't have the Bitwarden browser extension?"
+    "message": "尚未安裝 Bitwarden 瀏覽器擴充套件？"
   },
   "installExtension": {
-    "message": "Install extension"
+    "message": "安裝擴充套件"
   },
   "openedExtension": {
-    "message": "Opened the browser extension"
+    "message": "已開啟瀏覽器擴充套件"
   },
   "openedExtensionViewAtRiskPasswords": {
-    "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
-  },
-  "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
-  },
-  "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
-    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
+    "message": "已成功開啟 Bitwarden 瀏覽器擴充套件。你現在可以檢視風險密碼。"
   },
   "resellerRenewalWarningMsg": {
-    "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
+    "message": "你的訂閱即將續約。為確保服務不中斷，請於 $RENEWAL_DATE$ 前聯絡 $RESELLER$ 確認續約。",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10874,7 +11361,7 @@
     }
   },
   "resellerOpenInvoiceWarningMgs": {
-    "message": "An invoice for your subscription was issued on $ISSUED_DATE$. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $DUE_DATE$.",
+    "message": "你的訂閱已於 $ISSUED_DATE$ 開立發票。為確保服務不中斷，請於 $DUE_DATE$ 前聯絡 $RESELLER$ 確認續約。",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10891,7 +11378,7 @@
     }
   },
   "resellerPastDueWarningMsg": {
-    "message": "The invoice for your subscription has not been paid. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $GRACE_PERIOD_END$.",
+    "message": "你的訂閱發票尚未付款。為確保服務不中斷，請於 $GRACE_PERIOD_END$ 前聯絡 $RESELLER$ 確認續約。",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10904,10 +11391,10 @@
     }
   },
   "restartOrganizationSubscription": {
-    "message": "Organization subscription restarted"
+    "message": "已重新啟動組織訂閱"
   },
   "restartSubscription": {
-    "message": "Restart your subscription"
+    "message": "重新啟動你的訂閱"
   },
   "suspendedManagedOrgMessage": {
     "message": "聯繫 $PROVIDER$ 以取得協助。",
@@ -10919,16 +11406,16 @@
     }
   },
   "accountDeprovisioningNotification": {
-    "message": "Administrators now have the ability to delete member accounts that belong to a claimed domain."
+    "message": "管理員現在可以刪除屬於已宣告網域的成員帳號。"
   },
   "deleteManagedUserWarningDesc": {
-    "message": "This action will delete the member account including all items in their vault. This replaces the previous Remove action."
+    "message": "此動作將刪除成員帳號，包括其密碼庫中的所有項目。這取代先前的「移除」動作。"
   },
   "deleteManagedUserWarning": {
-    "message": "Delete is a new action!"
+    "message": "「刪除」是新的動作！"
   },
   "seatsRemaining": {
-    "message": "You have $REMAINING$ seats remaining out of $TOTAL$ seats assigned to this organization. Contact your provider to manage your subscription.",
+    "message": "此組織已指派 $TOTAL$ 個席次，你尚餘 $REMAINING$ 個席次。請聯絡你的供應商以管理訂閱。",
     "placeholders": {
       "remaining": {
         "content": "$1",
@@ -10941,19 +11428,19 @@
     }
   },
   "existingOrganization": {
-    "message": "Existing organization"
+    "message": "既有組織"
   },
   "selectOrganizationProviderPortal": {
-    "message": "Select an organization to add to your Provider Portal."
+    "message": "選取要加入你供應商入口網站的組織。"
   },
   "noOrganizations": {
-    "message": "There are no organizations to list"
+    "message": "沒有可列出的組織"
   },
   "yourProviderSubscriptionCredit": {
-    "message": "Your provider subscription will receive a credit for any remaining time in the organization's subscription."
+    "message": "你供應商的訂閱將針對組織訂閱剩餘時間獲得相對應的折抵。"
   },
   "doYouWantToAddThisOrg": {
-    "message": "Do you want to add this organization to $PROVIDER$?",
+    "message": "要將此組織新增至 $PROVIDER$ 嗎？",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10962,13 +11449,13 @@
     }
   },
   "addedExistingOrganization": {
-    "message": "Added existing organization"
+    "message": "已新增既有組織"
   },
   "assignedExceedsAvailable": {
-    "message": "Assigned seats exceed available seats."
+    "message": "指派席次超過可用席次。"
   },
   "userkeyRotationDisclaimerEmergencyAccessText": {
-    "message": "Fingerprint phrase for $NUM_USERS$ contacts for which you have enabled emergency access.",
+    "message": "你已啟用緊急存取的 $NUM_USERS$ 位聯絡人之指紋短語。",
     "placeholders": {
       "num_users": {
         "content": "$1",
@@ -10977,7 +11464,7 @@
     }
   },
   "userkeyRotationDisclaimerAccountRecoveryOrgsText": {
-    "message": "Fingerprint phrase for the organization $ORG_NAME$ for which you have enabled account recovery.",
+    "message": "你已啟用帳號復原之組織 $ORG_NAME$ 的指紋短語。",
     "placeholders": {
       "org_name": {
         "content": "$1",
@@ -10986,192 +11473,243 @@
     }
   },
   "userkeyRotationDisclaimerDescription": {
-    "message": "Rotating your encryption keys will require you to trust keys of any organizations that can recover your account, and any contacts that you have enabled emergency access for. To continue, make sure you can verify the following:"
+    "message": "輪換你的加密金鑰後，你需要信任可復原你帳號的各組織金鑰，以及你已啟用緊急存取之聯絡人的金鑰。若要繼續，請確認你能驗證以下項目："
   },
   "userkeyRotationDisclaimerTitle": {
-    "message": "Untrusted encryption keys"
+    "message": "未受信任的加密金鑰"
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "變更有風險的密碼"
   },
   "changeAtRiskPasswordAndAddWebsite": {
-    "message": "This login is at-risk and missing a website. Add a website and change the password for stronger security."
+    "message": "此登入資訊存在風險，且缺少網站。請新增網站並變更密碼以提升安全性。"
   },
   "missingWebsite": {
-    "message": "Missing website"
+    "message": "缺少網站"
   },
   "removeUnlockWithPinPolicyTitle": {
-    "message": "Remove Unlock with PIN"
+    "message": "移除以 PIN 解鎖"
   },
   "removeUnlockWithPinPolicyDesc": {
-    "message": "Do not allow members to unlock their account with a PIN."
+    "message": "不允許成員使用 PIN 解鎖其帳號。"
   },
   "upgradeForFullEventsMessage": {
-    "message": "Event logs are not stored for your organization. Upgrade to a Teams or Enterprise plan to get full access to organization event logs."
+    "message": "你的組織不會儲存事件記錄。升級至團隊或企業方案以取得完整的組織事件記錄存取。"
   },
   "upgradeEventLogTitleMessage": {
-    "message": "Upgrade to see event logs from your organization."
+    "message": "升級以檢視你組織的事件記錄。"
   },
   "upgradeEventLogMessage": {
-    "message": "These events are examples only and do not reflect real events within your Bitwarden organization."
+    "message": "這些事件僅為範例，並不反映你 Bitwarden 組織內的真實事件。"
   },
   "viewEvents": {
-    "message": "View Events"
+    "message": "檢視事件"
   },
   "cannotCreateCollection": {
-    "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
+    "message": "免費組織最多可有 2 個集合。升級至付費方案即可新增更多集合。"
   },
   "searchArchive": {
-    "message": "Search archive"
+    "message": "搜尋封存"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveNoun": {
+    "message": "封存",
+    "description": "Noun"
+  },
+  "archiveVerb": {
+    "message": "封存",
+    "description": "Verb"
+  },
+  "unArchive": {
+    "message": "取消封存"
+  },
+  "itemsInArchive": {
+    "message": "封存中的項目"
   },
   "noItemsInArchive": {
-    "message": "No items in archive"
+    "message": "封存中沒有項目"
   },
-  "archivedItemsDescription": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  "noItemsInArchiveDesc": {
+    "message": "封存的項目會顯示在此處，且不會出現在一般搜尋結果或自動填入建議中。"
+  },
+  "itemWasSentToArchive": {
+    "message": "項目已移至封存"
+  },
+  "itemsWereSentToArchive": {
+    "message": "項目已移至封存"
+  },
+  "itemUnarchived": {
+    "message": "項目取消封存"
+  },
+  "bulkArchiveItems": {
+    "message": "項目已封存"
+  },
+  "bulkUnarchiveItems": {
+    "message": "項目已取消封存"
+  },
+  "archiveItem": {
+    "message": "封存項目",
+    "description": "Verb"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "封存的項目將不會出現在一般搜尋結果或自動填入建議中。確定要封存此項目嗎？"
+  },
+  "archiveBulkItems": {
+    "message": "封存項目",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "封存的項目將不會出現在一般搜尋結果或自動填入建議中。確定要封存此項目嗎？"
   },
   "businessUnit": {
-    "message": "Business Unit"
+    "message": "營業單位"
   },
   "businessUnits": {
-    "message": "Business Units"
+    "message": "營業單位"
   },
   "newBusinessUnit": {
-    "message": "New business unit"
+    "message": "新事業單位"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "安全傳送機密的資訊",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "安全的和任何人及任何平臺分享檔案及資料。您的資料會受到端對端加密的保護。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "快速建立密碼"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "點擊即可輕鬆產生強且唯一的密碼。",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "協助你維持登入資訊的安全。",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "點擊「產生密碼」按鈕即可輕鬆建立強且唯一的密碼，協助你確保登入資訊的安全。",
     "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "使用自動填入節省時間"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "包含",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "網頁",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "讓此登入顯示為自動填入建議。",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "流暢的線上結帳體驗"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "使用支付卡功能，安全且精準地自動填入付款表單。"
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "簡化帳號建立流程 "
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "使用身份資訊，快速自動填入冗長的註冊或聯絡表單。"
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "保護你的敏感資料安全"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "使用備註功能，安全儲存銀行或保險等敏感資料。"
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "開發者友善的 SSH 存取"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "儲存你的金鑰並透過 SSH 代理程式進行快速、加密的驗證。",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "深入了解 SSH 代理程式",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "setupExtensionPageTitle": {
-    "message": "Autofill your passwords securely with one click"
+    "message": "一鍵安全自動填入你的密碼"
   },
   "setupExtensionPageDescription": {
-    "message": "Get the Bitwarden browser extension and start autofilling today"
+    "message": "取得 Bitwarden 瀏覽器擴充套件，立刻開始自動填入"
   },
   "getTheExtension": {
-    "message": "Get the extension"
+    "message": "取得擴充功能"
   },
   "addItLater": {
-    "message": "Add it later"
+    "message": "稍後再新增"
   },
   "cannotAutofillPasswordsWithoutExtensionTitle": {
-    "message": "You can't autofill passwords without the browser extension"
+    "message": "沒有瀏覽器擴充套件就無法自動填入密碼"
   },
   "cannotAutofillPasswordsWithoutExtensionDesc": {
-    "message": "Are you sure you don't want to add the extension now?"
+    "message": "確定現在不新增擴充套件嗎？"
   },
   "skipToWebApp": {
-    "message": "Skip to web app"
+    "message": "改用網頁版"
   },
   "bitwardenExtensionInstalled": {
-    "message": "Bitwarden extension installed!"
+    "message": "已安裝 Bitwarden 擴充套件！"
+  },
+  "bitwardenExtensionIsInstalled": {
+    "message": "已安裝 Bitwarden 擴充套件！"
   },
   "openExtensionToAutofill": {
-    "message": "Open the extension to log in and start autofilling."
+    "message": "開啟擴充套件以登入並開始自動填入。"
   },
   "openBitwardenExtension": {
-    "message": "Open Bitwarden extension"
+    "message": "開啟 Bitwarden 擴充套件"
   },
   "gettingStartedWithBitwardenPart1": {
-    "message": "For tips on getting started with Bitwarden visit the",
+    "message": "若想取得使用 Bitwarden 的入門技巧，請前往",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
   "gettingStartedWithBitwardenPart2": {
-    "message": "Learning Center",
+    "message": "學習中心",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
+  "openExtensionFromToolbarPart1": {
+    "message": "如果擴充套件沒有開啟，您可能需要從圖示開啟 Bitwarden ",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
+  "openExtensionFromToolbarPart2": {
+    "message": " 在工具列上。",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'If the extension didn't open, you may need to open Bitwarden from the icon [Bitwarden Icon] on the toolbar.'"
+  },
   "gettingStartedWithBitwardenPart3": {
-    "message": "Help Center",
+    "message": "說明中心",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
   },
   "setupExtensionContentAlt": {
-    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+    "message": "透過 Bitwarden 瀏覽器擴充套件，你可以輕鬆建立新的登入、從瀏覽器工具列直接存取已儲存的登入，並使用 Bitwarden 自動填入快速登入帳號。"
   },
   "restart": {
-    "message": "Restart"
+    "message": "重新啟動"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the provider's subscription page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "以銀行帳號付款僅適用於美國客戶。你需要驗證你的銀行帳號。我們將於 1–2 個工作天內進行小額入帳。請在供應商的訂閱頁面輸入此次入帳的敘述代碼以驗證銀行帳號。未完成驗證將導致漏付款並使你的訂閱被停用。"
   },
   "clickPayWithPayPal": {
-    "message": "Please click the Pay with PayPal button to add your payment method."
+    "message": "請點擊「以 PayPal 付款」按鈕以新增你的付款方式。"
   },
   "revokeActiveSponsorshipConfirmation": {
-    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "message": "如果你移除 $EMAIL$，此家庭方案的贊助將結束。在 $DATE$ 受贊助組織的續約日之後，你組織中的一個席次將可供成員或贊助使用。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -11184,56 +11722,56 @@
     }
   },
   "billingAddressRequiredToAddCredit": {
-    "message": "Billing address required to add credit.",
+    "message": "新增儲值需先提供帳單地址。",
     "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
   },
   "aboutThisSetting": {
-    "message": "About this setting"
+    "message": "關於此設定"
   },
   "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
+    "message": "Bitwarden 會使用已儲存的登入 URI 來判斷應顯示的圖示或變更密碼網址，以改善你的使用體驗。使用此服務時，不會收集或儲存任何資訊。"
   },
   "billingAddress": {
-    "message": "Billing address"
+    "message": "帳單地址"
   },
   "addBillingAddress": {
-    "message": "Add billing address"
+    "message": "新增帳單地址"
   },
   "editBillingAddress": {
-    "message": "Edit billing address"
+    "message": "編輯帳單地址"
   },
   "noBillingAddress": {
-    "message": "No address on file."
+    "message": "未提供地址。"
   },
   "billingAddressUpdated": {
-    "message": "Your billing address has been updated."
+    "message": "你的帳單地址已更新。"
   },
   "paymentDetails": {
-    "message": "Payment details"
+    "message": "付款明細"
   },
   "paymentMethodUpdated": {
-    "message": "Your payment method has been updated."
+    "message": "你的付款方式已更新。"
   },
   "bankAccountVerified": {
-    "message": "Your bank account has been verified."
+    "message": "你的銀行帳號已通過驗證。"
   },
   "availableCreditAppliedToInvoice": {
-    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+    "message": "任何可用的儲值都會自動套用至此帳號所產生的發票。"
   },
   "mustBePositiveNumber": {
-    "message": "Must be a positive number"
+    "message": "必須為正數"
   },
   "cardSecurityCode": {
-    "message": "Card security code"
+    "message": "支付卡安全碼"
   },
   "cardSecurityCodeDescription": {
-    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+    "message": "支付卡安全碼（CVV 或 CVC）通常是印在支付卡背面的 3 位數字，或印在支付卡正面卡號上方的 4 位數字。"
   },
   "verifyBankAccountWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "以銀行帳號付款僅適用於美國客戶。你需要驗證你的銀行帳號。我們將於 1–2 個工作天內進行小額入帳。請在「付款明細」頁面輸入此次入帳的敘述代碼以驗證銀行帳號。未完成驗證將導致漏付款並使你的訂閱被停用。"
   },
   "taxId": {
-    "message": "Tax ID: $TAX_ID$",
+    "message": "稅務識別碼：$TAX_ID$",
     "placeholders": {
       "tax_id": {
         "content": "$1",
@@ -11242,14 +11780,14 @@
     }
   },
   "unpaidInvoices": {
-    "message": "Unpaid invoices"
+    "message": "未付款發票"
   },
   "unpaidInvoicesForServiceUser": {
-    "message": "Your subscription has not been paid. Contact your provider administrator to restore service to you and your clients.",
+    "message": "你的訂閱尚未付款。請聯絡供應商管理員以恢復你與客戶的服務。",
     "description": "A message shown in a non-dismissible dialog to service users of unpaid providers."
   },
   "providerSuspended": {
-    "message": "$PROVIDER$ is suspended",
+    "message": "$PROVIDER$ 已被停用",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -11258,11 +11796,11 @@
     }
   },
   "restoreProviderPortalAccessViaCustomerSupport": {
-    "message": "To restore access to your provider portal, contact Bitwarden Customer Support to renew your subscription.",
+    "message": "若要恢復存取你的供應商入口網站，請聯絡 Bitwarden 客戶支援以續約你的訂閱。",
     "description": "A message shown in a non-dismissible dialog to any user of a suspended providers."
   },
   "restoreProviderPortalAccessViaPaymentMethod": {
-    "message": "Your subscription has not been paid. To restore service to you and your clients, add a payment method by $CANCELLATION_DATE$.",
+    "message": "你的訂閱尚未付款。請於 $CANCELLATION_DATE$ 前新增付款方式，以恢復你與客戶的服務。",
     "placeholders": {
       "cancellation_date": {
         "content": "$1",
@@ -11272,7 +11810,7 @@
     "description": "A message shown in a non-dismissible dialog to admins of unpaid providers."
   },
   "subscribetoEnterprise": {
-    "message": "Subscribe to $PLAN$",
+    "message": "訂閱 $PLAN$",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -11281,7 +11819,7 @@
     }
   },
   "subscribeEnterpriseSubtitle": {
-    "message": "Your 7-day $PLAN$ trial starts today. Add a payment method now to continue using these features after your trial ends: ",
+    "message": "你的 $PLAN$ 7 天試用自今日開始。請立即新增付款方式，以便在試用結束後繼續使用以下功能：",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -11290,59 +11828,59 @@
     }
   },
   "unlimitedSecretsAndProjects": {
-    "message": "Unlimited secrets and projects"
+    "message": "不限機密與專案數量"
   },
   "providersubscriptionCanceled": {
-    "message": "Subscription canceled"
+    "message": "訂閱已取消"
   },
   "providersubCanceledmessage": {
-    "message": "To resubscribe, contact Bitwarden Customer Support."
+    "message": "若要重新訂閱，請聯絡 Bitwarden 客戶支援。"
   },
   "showMore": {
-    "message": "Show more"
+    "message": "顯示更多"
   },
   "showLess": {
-    "message": "Show less"
+    "message": "顯示較少"
   },
   "missingTaxId": {
-    "message": "Missing Tax ID"
+    "message": "缺少稅務識別碼"
   },
   "missingTaxIdWarning": {
-    "message": "Action required: You're missing a Tax ID number in payment details. If a Tax ID is not added, your invoices may include additional tax."
+    "message": "需要採取動作：你的付款明細缺少稅務識別碼。若未新增，發票可能會包含額外稅額。"
   },
   "moreBreadcrumbs": {
-    "message": "More breadcrumbs",
+    "message": "更多導覽階層",
     "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   },
   "addTaxId": {
-    "message": "Add a Tax ID"
+    "message": "新增稅務識別碼"
   },
   "missingTaxIdCalloutTitle": {
-    "message": "Action required: Missing Tax ID"
+    "message": "需要採取動作：缺少稅務識別碼"
   },
   "missingTaxIdCalloutDescription": {
-    "message": "If a Tax ID is not added, your invoices may include additional tax."
+    "message": "若未新增稅務識別碼，發票可能會包含額外稅額。"
   },
   "unverifiedTaxIdWarning": {
-    "message": "Action required: Your Tax ID number is unverified. If your Tax ID is left unverified, your invoices may include additional tax."
+    "message": "需要採取動作：你的稅務識別碼尚未驗證。若未完成驗證，發票可能會包含額外稅額。"
   },
   "editTaxId": {
-    "message": "Edit your Tax ID"
+    "message": "編輯你的稅務識別碼"
   },
   "unverifiedTaxIdCalloutTitle": {
-    "message": "Tax ID unverified"
+    "message": "稅務識別碼未驗證"
   },
   "unverifiedTaxIdCalloutDescription": {
-    "message": "Check your Tax ID to verify the format is correct and there are no typos."
+    "message": "請檢查你的稅務識別碼，確認格式正確且沒有錯字。"
   },
   "pendingVerification": {
-    "message": "Pending verification"
+    "message": "待驗證"
   },
   "checkInputFormat": {
-    "message": "Check input format for typos."
+    "message": "請檢查輸入格式是否有錯字。"
   },
   "exampleTaxIdFormat": {
-    "message": "Example $CODE$ format: $EXAMPLE$",
+    "message": "$CODE$ 格式範例：$EXAMPLE$",
     "placeholders": {
       "code": {
         "content": "$1",
@@ -11355,46 +11893,46 @@
     }
   },
   "confirmKeyConnectorDomain": {
-    "message": "Confirm Key Connector domain"
+    "message": "確認 Key Connector 網域"
   },
   "requiredToVerifyBankAccountWithStripe": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "以銀行帳號付款僅適用於美國客戶。你需要驗證你的銀行帳號。我們將於 1–2 個工作天內進行小額入帳。未完成銀行帳號驗證將導致漏付款並使你的訂閱被停用。"
   },
   "verifyBankAccountWithStripe": {
-    "message": "We have made a micro-deposit to your bank account. This may take 1-2 business days. When you see the deposit in your account, you can verify your bank account. Failure to verify your bank account will result in a missed payment and your subscription will be suspended."
+    "message": "我們已對你的銀行帳號進行小額入帳，可能需時 1–2 個工作天。當你在帳號中看到入帳後，即可完成銀行帳號驗證。未完成驗證將導致漏付款並使你的訂閱被停用。"
   },
   "verifyNow": {
-    "message": "Verify now."
+    "message": "立即驗證"
   },
   "additionalStorageGB": {
-    "message": "Additional storage GB"
+    "message": "額外儲存空間 (GB)"
   },
   "additionalServiceAccountsV2": {
-    "message": "Additional machine accounts"
+    "message": "額外機器帳號"
   },
   "secretsManagerSeats": {
-    "message": "Secrets Manager seats"
+    "message": "機密管理席次"
   },
   "additionalStorage": {
-    "message": "Additional Storage"
+    "message": "額外儲存空間"
   },
   "expandPurchaseDetails": {
-    "message": "Expand purchase details"
+    "message": "展開購買明細"
   },
   "collapsePurchaseDetails": {
-    "message": "Collapse purchase details"
+    "message": "收合購買明細"
   },
   "familiesMembership": {
-    "message": "Families membership"
+    "message": "家庭會員"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "完整的線上安全"
   },
   "planDescFamiliesV2": {
-    "message": "Premium security for your family"
+    "message": "為你的家人提供進階安全"
   },
   "planDescFreeV2": {
-    "message": "Share with $COUNT$ other user",
+    "message": "可與 $COUNT$ 位其他使用者分享",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11403,37 +11941,37 @@
     }
   },
   "planDescEnterpriseV2": {
-    "message": "Advanced capabilities for any organization"
+    "message": "適用於各類組織的進階能力"
   },
   "planNameCustom": {
-    "message": "Custom plan"
+    "message": "自訂方案"
   },
   "planDescCustom": {
-    "message": "Bitwarden scales with businesses of all sizes to secure passwords and sensitive information. If you're part of a large enterprise, contact sales to request a quote."
+    "message": "Bitwarden 可隨各種規模的企業擴展，以保護密碼與敏感資訊。若你屬於大型企業，請聯絡業務以索取報價。"
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "內建驗證器"
   },
   "breachMonitoring": {
-    "message": "Breach monitoring"
+    "message": "外洩監控"
   },
   "andMoreFeatures": {
-    "message": "And more!"
+    "message": "以及其他功能功能！"
   },
   "secureFileStorage": {
-    "message": "Secure file storage"
+    "message": "安全檔案儲存"
   },
   "familiesUnlimitedSharing": {
-    "message": "Unlimited sharing - choose who sees what"
+    "message": "不限分享—自訂誰能看到哪些內容"
   },
   "familiesUnlimitedCollections": {
-    "message": "Unlimited family collections"
+    "message": "不限家庭集合數量"
   },
   "familiesSharedStorage": {
-    "message": "Shared storage for important family info"
+    "message": "重要家庭資訊的共享儲存空間"
   },
   "limitedUsersV2": {
-    "message": "Up to $COUNT$ members",
+    "message": "最多 $COUNT$ 位成員",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11442,7 +11980,7 @@
     }
   },
   "limitedCollectionsV2": {
-    "message": "Up to $COUNT$ collections",
+    "message": "最多 $COUNT$ 個集合",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11451,13 +11989,13 @@
     }
   },
   "alwaysFree": {
-    "message": "Always free"
+    "message": "永遠免費"
   },
   "twoSecretsIncluded": {
-    "message": "2 secrets"
+    "message": "2 個機密"
   },
   "projectsIncludedV2": {
-    "message": "$COUNT$ project(s)",
+    "message": "$COUNT$ 個專案",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11466,13 +12004,13 @@
     }
   },
   "secureItemSharing": {
-    "message": "Secure item sharing"
+    "message": "安全分享項目"
   },
   "scimSupport": {
-    "message": "SCIM support"
+    "message": "支援 SCIM"
   },
   "includedMachineAccountsV2": {
-    "message": "$COUNT$ machine accounts",
+    "message": "$COUNT$ 個機器帳號",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -11481,21 +12019,160 @@
     }
   },
   "enterpriseSecurityPolicies": {
-    "message": "Enterprise security policies"
+    "message": "企業安全原則"
   },
   "selfHostOption": {
-    "message": "Self-host option"
+    "message": "自建選項"
   },
   "complimentaryFamiliesPlan": {
-    "message": "Complimentary families plan for all users"
+    "message": "提供所有使用者免費家庭方案"
   },
   "strengthenCybersecurity": {
-    "message": "Strengthen cybersecurity"
+    "message": "強化資安"
   },
   "boostProductivity": {
-    "message": "Boost productivity"
+    "message": "增強生產力"
   },
   "seamlessIntegration": {
-    "message": "Seamless integration"
+    "message": "無縫集成"
+  },
+  "families": {
+    "message": "家庭"
+  },
+  "upgradeToFamilies": {
+    "message": "升級為家庭方案"
+  },
+  "upgradeToPremium": {
+    "message": "升級到 Premium"
+  },
+  "familiesUpdated": {
+    "message": "你已升級為家庭方案！"
+  },
+  "taxCalculationError": {
+    "message": "計算你所在地區的稅額時發生錯誤。請再試一次。"
+  },
+  "individualUpgradeWelcomeMessage": {
+    "message": "歡迎使用 Bitwarden"
+  },
+  "individualUpgradeDescriptionMessage": {
+    "message": "升級進階版解鎖更多安全功能，或使用家庭方案開始分享項目"
+  },
+  "individualUpgradeTaxInformationMessage": {
+    "message": "價格不含稅，並以年繳計費。"
+  },
+  "organizationNameDescription": {
+    "message": "你寄給成員的邀請中會顯示你的組織名稱。"
+  },
+  "continueWithoutUpgrading": {
+    "message": "不更新繼續"
+  },
+  "upgradeYourPlan": {
+    "message": "升級你的方案"
+  },
+  "upgradeNow": {
+    "message": "立即升級"
+  },
+  "formWillCreateNewFamiliesOrgMessage": {
+    "message": "填寫此表單將建立新的家庭組織。你可以從管理主控台升級你的免費組織。"
+  },
+  "upgradeErrorMessage": {
+    "message": "處理你的升級時發生錯誤。請再試一次。"
+  },
+  "bitwardenFreeplanMessage": {
+    "message": "你目前使用 Bitwarden 免費方案"
+  },
+  "upgradeCompleteSecurity": {
+    "message": "升級以獲得完整的安全防護"
+  },
+  "viewbusinessplans": {
+    "message": "檢視商業方案"
+  },
+  "updateEncryptionSettings": {
+    "message": "更新加密設定"
+  },
+  "updateYourEncryptionSettings": {
+    "message": "更新您的加密設定"
+  },
+  "updateSettings": {
+    "message": "更新設定"
+  },
+  "algorithm": {
+    "message": "演算法"
+  },
+  "encryptionKeySettingsHowShouldWeEncryptYourData": {
+    "message": "選擇 Bitwarden 應如何加密你的密碼庫資料。所有選項都很安全，但更強的方法能提供更好的防護——特別是對抗暴力破解攻擊。對多數使用者，Bitwarden 建議使用預設設定。"
+  },
+  "encryptionKeySettingsIncreaseImproveSecurity": {
+    "message": "將上述數值提高到預設以上可以增進安全性，但也可能導致你的密碼庫解鎖時間變長。"
+  },
+  "encryptionKeySettingsAlgorithmPopoverTitle": {
+    "message": "關於加密演算法"
+  },
+  "encryptionKeySettingsAlgorithmPopoverPBKDF2": {
+    "message": "PBKDF2-SHA256 是經過充分驗證的加密方法，在安全性與效能之間取得平衡，適用於所有使用者。"
+  },
+  "encryptionKeySettingsAlgorithmPopoverArgon2Id": {
+    "message": "Argon2id 對抗現代攻擊提供更強的防護，最適合具有高效能裝置的進階使用者。"
+  },
+  "zipPostalCodeLabel": {
+    "message": "郵編 / 郵政代碼"
+  },
+  "cardNumberLabel": {
+    "message": "支付卡號碼"
+  },
+  "startFreeFamiliesTrial": {
+    "message": "開始免費家庭試用"
+  },
+  "blockClaimedDomainAccountCreation": {
+    "message": "封鎖已宣告網域的帳號建立"
+  },
+  "blockClaimedDomainAccountCreationDesc": {
+    "message": "防止使用者使用屬於已宣告網域的電子郵件地址，在組織外建立帳號。"
+  },
+  "blockClaimedDomainAccountCreationPrerequisite": {
+    "message": "在啟用此原則前，必須先宣告網域。"
+  },
+  "unlockMethodNeededToChangeTimeoutActionDesc": {
+    "message": "設定一個解鎖方式來變更您的密碼庫逾時動作。"
+  },
+  "vaultTimeoutPolicyAffectingOptions": {
+    "message": "企業政策已套用至您的逾時選項中"
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "您的密碼庫逾時時間超過組織設定的限制。"
+  },
+  "neverLockWarning": {
+    "message": "您確定要使用「永不」選項嗎？將鎖定選項設定為「永不」會將密碼庫的加密金鑰儲存在您的裝置上。如果使用此選項，應確保您的裝置是安全的。"
+  },
+  "sessionTimeoutSettingsAction": {
+    "message": "逾時後動作"
+  },
+  "sessionTimeoutHeader": {
+    "message": "工作階段逾時"
+  },
+  "appearance": {
+    "message": "外觀"
+  },
+  "vaultTimeoutPolicyMaximumError": {
+    "message": "逾時時間超出了您組織設定的此限制：最多 $HOURS$ 小時 $MINUTES$ 分鐘",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "confirmNoSelectedCriticalApplicationsTitle": {
+    "message": "未選取任何關鍵應用程式"
+  },
+  "confirmNoSelectedCriticalApplicationsDesc": {
+    "message": "您確定要繼續嗎?"
+  },
+  "userVerificationFailed": {
+    "message": "使用者驗證失敗。"
   }
 }
diff --git a/apps/web/src/scss/tailwind.css b/apps/web/src/scss/tailwind.css
index 57332e033b9..a6641a2446e 100644
--- a/apps/web/src/scss/tailwind.css
+++ b/apps/web/src/scss/tailwind.css
@@ -86,11 +86,11 @@
  */
 @layer components {
   .tw-h1 {
-    @apply tw-text-3xl tw-font-semibold;
+    @apply tw-text-3xl tw-font-medium;
   }
 
   .tw-btn {
-    @apply tw-font-semibold tw-py-1.5 tw-px-3 tw-rounded-full tw-transition tw-border-2 tw-border-solid tw-text-center tw-no-underline focus:tw-outline-none;
+    @apply tw-font-medium tw-py-1.5 tw-px-3 tw-rounded-full tw-transition tw-border-2 tw-border-solid tw-text-center tw-no-underline focus:tw-outline-none;
   }
 
   .tw-btn-secondary {
@@ -100,7 +100,7 @@
   }
 
   .tw-link {
-    @apply tw-font-semibold hover:tw-underline hover:tw-decoration-1;
+    @apply tw-font-medium hover:tw-underline hover:tw-decoration-1;
 
     @apply tw-text-primary-600 hover:tw-text-primary-700 focus-visible:before:tw-ring-primary-600;
   }
diff --git a/apps/web/src/scss/vault-filters.scss b/apps/web/src/scss/vault-filters.scss
index 52c85e8f0ae..9edf0be023a 100644
--- a/apps/web/src/scss/vault-filters.scss
+++ b/apps/web/src/scss/vault-filters.scss
@@ -30,7 +30,7 @@
         color: rgb(var(--color-primary-600));
       }
       &.active {
-        font-weight: bold;
+        font-weight: 500;
       }
     }
   }
@@ -59,7 +59,7 @@
     > .filter-buttons {
       .filter-button {
         color: rgb(var(--color-primary-600));
-        font-weight: bold;
+        font-weight: 500;
       }
 
       .edit-button {
diff --git a/apps/web/src/videos/access-intelligence-assign-tasks-dark.mp4 b/apps/web/src/videos/access-intelligence-assign-tasks-dark.mp4
new file mode 100644
index 00000000000..c982d0e9d3f
Binary files /dev/null and b/apps/web/src/videos/access-intelligence-assign-tasks-dark.mp4 differ
diff --git a/apps/web/src/videos/access-intelligence-assign-tasks.mp4 b/apps/web/src/videos/access-intelligence-assign-tasks.mp4
new file mode 100644
index 00000000000..d6f5e01ae22
Binary files /dev/null and b/apps/web/src/videos/access-intelligence-assign-tasks.mp4 differ
diff --git a/apps/web/src/videos/risk-insights-mark-as-critical.mp4 b/apps/web/src/videos/risk-insights-mark-as-critical.mp4
new file mode 100644
index 00000000000..80390804f12
Binary files /dev/null and b/apps/web/src/videos/risk-insights-mark-as-critical.mp4 differ
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index 0e1ae28abd1..865d681e91d 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -1,15 +1,17 @@
 /* eslint-disable no-undef, @typescript-eslint/no-var-requires */
+const path = require("path");
 const config = require("../../libs/components/tailwind.config.base");
 
 config.content = [
-  "./src/**/*.{html,ts}",
-  "../../libs/components/src/**/*.{html,ts}",
-  "../../libs/assets/src/**/*.{html,ts}",
-  "../../libs/auth/src/**/*.{html,ts}",
-  "../../libs/key-management-ui/src/**/*.{html,ts}",
-  "../../libs/vault/src/**/*.{html,ts}",
-  "../../libs/angular/src/**/*.{html,ts}",
-  "../../bitwarden_license/bit-web/src/**/*.{html,ts}",
+  path.resolve(__dirname, "./src/**/*.{html,ts}"),
+  path.resolve(__dirname, "../../libs/components/src/**/*.{html,ts}"),
+  path.resolve(__dirname, "../../libs/assets/src/**/*.{html,ts}"),
+  path.resolve(__dirname, "../../libs/auth/src/**/*.{html,ts}"),
+  path.resolve(__dirname, "../../libs/key-management-ui/src/**/*.{html,ts}"),
+  path.resolve(__dirname, "../../libs/vault/src/**/*.{html,ts}"),
+  path.resolve(__dirname, "../../libs/angular/src/**/*.{html,ts}"),
+  path.resolve(__dirname, "../../libs/tools/generator/components/src/**/*.{html,ts}"),
+  path.resolve(__dirname, "../../bitwarden_license/bit-web/src/**/*.{html,ts}"),
 ];
 config.corePlugins.preflight = true;
 
diff --git a/apps/web/webpack.base.js b/apps/web/webpack.base.js
new file mode 100644
index 00000000000..c39e68bfa83
--- /dev/null
+++ b/apps/web/webpack.base.js
@@ -0,0 +1,494 @@
+const fs = require("fs");
+const path = require("path");
+
+const { AngularWebpackPlugin } = require("@ngtools/webpack");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const HtmlWebpackInjector = require("html-webpack-injector");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const TerserPlugin = require("terser-webpack-plugin");
+const webpack = require("webpack");
+
+const config = require(path.resolve(__dirname, "config.js"));
+const pjson = require(path.resolve(__dirname, "package.json"));
+
+module.exports.getEnv = function getEnv(params) {
+  const ENV = params.env?.ENV ?? process.env?.ENV ?? "development";
+  const NODE_ENV = params.env?.NODE_ENV ?? process.env?.NODE_ENV ?? "development";
+  const LOGGING =
+    params.env?.LOGGING ??
+    (process.env?.LOGGING === undefined ? true : process.env.LOGGING !== "false");
+
+  return { ENV, NODE_ENV, LOGGING };
+};
+
+const DEFAULT_PARAMS = {
+  outputPath: path.resolve(__dirname, "build"),
+};
+
+/**
+ *
+ * @param {{
+ *  configName: string;
+ *  app: {
+ *      entry: string;
+ *      entryModule: string;
+ *  };
+ *  tsConfig: string;
+ *  outputPath?: string;
+ *  mode?: string;
+ *  env?: {
+ *      ENV?: string;
+ *      NODE_ENV?: string;
+ *      LOGGING?: boolean;
+ *    };
+ *  importAliases?: import("webpack").ResolveOptions["alias"];
+ * }} params
+ */
+module.exports.buildConfig = function buildConfig(params) {
+  params = { ...DEFAULT_PARAMS, ...params };
+  const { ENV, NODE_ENV, LOGGING } = module.exports.getEnv(params);
+
+  const envConfig = config.load(ENV);
+  if (LOGGING) {
+    config.log(`Building web - ${params.configName} version`);
+    config.log(envConfig);
+  }
+
+  const moduleRules = [
+    {
+      test: /\.(html)$/,
+      loader: "html-loader",
+    },
+    {
+      test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
+      exclude: /loading(|-white).svg/,
+      generator: {
+        filename: "fonts/[name].[contenthash][ext]",
+      },
+      type: "asset/resource",
+    },
+    {
+      test: /\.(jpe?g|png|gif|svg|webp|avif)$/i,
+      exclude: /.*(bwi-font)\.svg/,
+      generator: {
+        filename: "images/[name][ext]",
+      },
+      type: "asset/resource",
+    },
+    {
+      test: /\.scss$/,
+      use: [
+        {
+          loader: MiniCssExtractPlugin.loader,
+        },
+        "css-loader",
+        "resolve-url-loader",
+        {
+          loader: "sass-loader",
+          options: {
+            sourceMap: true,
+          },
+        },
+      ],
+    },
+    {
+      test: /\.css$/,
+      use: [
+        {
+          loader: MiniCssExtractPlugin.loader,
+        },
+        "css-loader",
+        "resolve-url-loader",
+        {
+          loader: "postcss-loader",
+          options: {
+            sourceMap: true,
+            postcssOptions: {
+              config: path.resolve(__dirname, "postcss.config.js"),
+            },
+          },
+        },
+      ],
+    },
+    {
+      test: /\.[cm]?js$/,
+      use: [
+        {
+          loader: "babel-loader",
+          options: {
+            configFile: path.resolve(__dirname, "../../babel.config.json"),
+            cacheDirectory: NODE_ENV !== "production",
+          },
+        },
+      ],
+    },
+    {
+      test: /\.[jt]sx?$/,
+      loader: "@ngtools/webpack",
+    },
+  ];
+
+  const plugins = [
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "src/index.html"),
+      filename: "index.html",
+      chunks: ["theme_head", "app/polyfills", "app/vendor", "app/main", "styles"],
+    }),
+    new HtmlWebpackInjector(),
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "src/connectors/webauthn.html"),
+      filename: "webauthn-connector.html",
+      chunks: ["connectors/webauthn", "styles"],
+    }),
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "src/connectors/webauthn-mobile.html"),
+      filename: "webauthn-mobile-connector.html",
+      chunks: ["connectors/webauthn", "styles"],
+    }),
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "src/connectors/webauthn-fallback.html"),
+      filename: "webauthn-fallback-connector.html",
+      chunks: ["connectors/webauthn-fallback", "styles"],
+    }),
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "src/connectors/sso.html"),
+      filename: "sso-connector.html",
+      chunks: ["connectors/sso", "styles"],
+    }),
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "src/connectors/redirect.html"),
+      filename: "redirect-connector.html",
+      chunks: ["connectors/redirect", "styles"],
+    }),
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "src/connectors/duo-redirect.html"),
+      filename: "duo-redirect-connector.html",
+      chunks: ["connectors/duo-redirect", "styles"],
+    }),
+    new HtmlWebpackPlugin({
+      template: path.resolve(__dirname, "src/404.html"),
+      filename: "404.html",
+      chunks: ["styles"],
+      // 404 page is a wildcard, this ensures it uses absolute paths.
+      publicPath: "/",
+    }),
+    new CopyWebpackPlugin({
+      patterns: [
+        { from: path.resolve(__dirname, "src/.nojekyll") },
+        { from: path.resolve(__dirname, "src/manifest.json") },
+        { from: path.resolve(__dirname, "src/favicon.ico") },
+        { from: path.resolve(__dirname, "src/browserconfig.xml") },
+        { from: path.resolve(__dirname, "src/app-id.json") },
+        { from: path.resolve(__dirname, "src/images"), to: "images" },
+        { from: path.resolve(__dirname, "src/images/icons"), to: "images" },
+        { from: path.resolve(__dirname, "src/videos"), to: "videos" },
+        { from: path.resolve(__dirname, "src/locales"), to: "locales" },
+        {
+          from: path.resolve(__dirname, "../../node_modules/qrious/dist/qrious.min.js"),
+          to: "scripts",
+        },
+        {
+          from: path.resolve(
+            __dirname,
+            "../../node_modules/braintree-web-drop-in/dist/browser/dropin.js",
+          ),
+          to: "scripts",
+        },
+        {
+          from: path.resolve(__dirname, "src/version.json"),
+          transform(content, path) {
+            return content.toString().replace("process.env.APPLICATION_VERSION", pjson.version);
+          },
+        },
+      ],
+    }),
+    new MiniCssExtractPlugin({
+      filename: "[name].[contenthash].css",
+      chunkFilename: "[id].[contenthash].css",
+    }),
+    new webpack.ProvidePlugin({
+      process: "process/browser.js",
+    }),
+    new webpack.EnvironmentPlugin({
+      ENV: ENV,
+      NODE_ENV: NODE_ENV === "production" ? "production" : "development",
+      APPLICATION_VERSION: pjson.version,
+      CACHE_TAG: Math.random().toString(36).substring(7),
+      URLS: envConfig["urls"] ?? {},
+      STRIPE_KEY: envConfig["stripeKey"] ?? "",
+      BRAINTREE_KEY: envConfig["braintreeKey"] ?? "",
+      PAYPAL_CONFIG: envConfig["paypal"] ?? {},
+      FLAGS: envConfig["flags"] ?? {},
+      DEV_FLAGS: NODE_ENV === "development" ? envConfig["devFlags"] : {},
+      ADDITIONAL_REGIONS: envConfig["additionalRegions"] ?? [],
+    }),
+    new AngularWebpackPlugin({
+      tsconfig: params.tsConfig,
+      entryModule: params.app.entryModule,
+      sourceMap: true,
+    }),
+  ];
+
+  // ref: https://webpack.js.org/configuration/dev-server/#devserver
+  let certSuffix = fs.existsSync(path.resolve(__dirname, "dev-server.local.pem"))
+    ? ".local"
+    : ".shared";
+  const devServer =
+    NODE_ENV !== "development"
+      ? {}
+      : {
+          server: {
+            type: "https",
+            options: {
+              key: fs.readFileSync(path.resolve(__dirname, "dev-server" + certSuffix + ".pem")),
+              cert: fs.readFileSync(path.resolve(__dirname, "dev-server" + certSuffix + ".pem")),
+            },
+          },
+          // host: '192.168.1.9',
+          proxy: [
+            {
+              context: ["/api"],
+              target: envConfig.dev?.proxyApi,
+              pathRewrite: { "^/api": "" },
+              secure: false,
+              changeOrigin: true,
+            },
+            {
+              context: ["/identity"],
+              target: envConfig.dev?.proxyIdentity,
+              pathRewrite: { "^/identity": "" },
+              secure: false,
+              changeOrigin: true,
+            },
+            {
+              context: ["/events"],
+              target: envConfig.dev?.proxyEvents,
+              pathRewrite: { "^/events": "" },
+              secure: false,
+              changeOrigin: true,
+            },
+            {
+              context: ["/notifications"],
+              target: envConfig.dev?.proxyNotifications,
+              pathRewrite: { "^/notifications": "" },
+              secure: false,
+              changeOrigin: true,
+              ws: true,
+            },
+            {
+              context: ["/icons"],
+              target: envConfig.dev?.proxyIcons,
+              pathRewrite: { "^/icons": "" },
+              secure: false,
+              changeOrigin: true,
+            },
+            {
+              context: ["/key-connector"],
+              target: envConfig.dev?.proxyKeyConnector,
+              pathRewrite: { "^/key-connector": "" },
+              secure: false,
+              changeOrigin: true,
+            },
+            {
+              context: ["/seed"],
+              target: envConfig.dev?.proxySeederApi,
+              pathRewrite: { "^/seed": "" },
+              secure: false,
+              changeOrigin: true,
+            },
+          ],
+          headers: (req) => {
+            if (!req.originalUrl.includes("connector.html")) {
+              return {
+                "Content-Security-Policy": `
+                    default-src 'self'
+                    ;script-src
+                    'self'
+                    'wasm-unsafe-eval'
+                    'sha256-ryoU+5+IUZTuUyTElqkrQGBJXr1brEv6r2CA62WUw8w='
+                    https://js.stripe.com
+                    https://js.braintreegateway.com
+                    https://www.paypalobjects.com
+                    ;style-src
+                    'self'
+                    https://assets.braintreegateway.com
+                    https://*.paypal.com
+                    ${"'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='" /* date input polyfill */}
+                    ${"'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4='" /* date input polyfill */}
+                    ${"'sha256-EnIJNDxVnh0++RytXJOkU0sqtLDFt1nYUDOfeJ5SKxg='" /* ng-select */}
+                    ${"'sha256-dbBsIsz2pJ5loaLjhE6xWlmhYdjl6ghbwnGSCr4YObs='" /* cdk-virtual-scroll */}
+                    ${"'sha256-S+uMh1G1SNQDAMG3seBmknQ26Wh+KSEoKdsNiy0joEE='" /* cdk-visually-hidden */}
+                    ;img-src
+                    'self'
+                    data:
+                    https://icons.bitwarden.net
+                    https://*.paypal.com
+                    https://www.paypalobjects.com
+                    https://q.stripe.com
+                    https://haveibeenpwned.com
+                    ;media-src
+                    'self'
+                    https://assets.bitwarden.com
+                    ;child-src
+                    'self'
+                    https://js.stripe.com
+                    https://assets.braintreegateway.com
+                    https://*.paypal.com
+                    https://*.duosecurity.com
+                    ;frame-src
+                    'self'
+                    https://js.stripe.com
+                    https://assets.braintreegateway.com
+                    https://*.paypal.com
+                    https://*.duosecurity.com
+                    ;connect-src
+                    'self'
+                    ${envConfig.dev.wsConnectSrc ?? ""}
+                    wss://notifications.bitwarden.com
+                    https://notifications.bitwarden.com
+                    https://cdn.bitwarden.net
+                    https://api.pwnedpasswords.com
+                    https://api.2fa.directory/v3/totp.json
+                    https://api.stripe.com
+                    https://www.paypal.com
+                    https://api.sandbox.braintreegateway.com
+                    https://api.braintreegateway.com
+                    https://client-analytics.braintreegateway.com
+                    https://*.braintree-api.com
+                    https://*.blob.core.windows.net
+                    http://127.0.0.1:10000
+                    https://app.simplelogin.io/api/alias/random/new
+                    https://quack.duckduckgo.com/api/email/addresses
+                    https://app.addy.io/api/v1/aliases
+                    https://api.fastmail.com
+                    https://api.forwardemail.net
+                    http://localhost:5000
+                    ;object-src
+                    'self'
+                    blob:
+                    ;`
+                  .replace(/\n/g, " ")
+                  .replace(/ +(?= )/g, ""),
+              };
+            }
+          },
+          hot: false,
+          port: envConfig.dev?.port ?? 8080,
+          allowedHosts: envConfig.dev?.allowedHosts ?? "auto",
+          static: {
+            directory: path.resolve(params.outputPath),
+            publicPath: "/",
+          },
+          devMiddleware: {
+            // when running `serve` locally this option writes all built files to `dist`
+            // files are still served from memory, this is just a helpful debug tool
+            writeToDisk: true,
+          },
+          client: {
+            overlay: {
+              errors: true,
+              warnings: false,
+              runtimeErrors: false,
+            },
+          },
+        };
+
+  const webpackConfig = {
+    mode: NODE_ENV,
+    devtool: "source-map",
+    devServer: devServer,
+    target: "web",
+    entry: {
+      "app/polyfills": path.resolve(__dirname, "src/polyfills.ts"),
+      "app/main": params.app.entry,
+      "connectors/webauthn": path.resolve(__dirname, "src/connectors/webauthn.ts"),
+      "connectors/webauthn-fallback": path.resolve(
+        __dirname,
+        "src/connectors/webauthn-fallback.ts",
+      ),
+      "connectors/sso": path.resolve(__dirname, "src/connectors/sso.ts"),
+      "connectors/duo-redirect": path.resolve(__dirname, "src/connectors/duo-redirect.ts"),
+      "connectors/redirect": path.resolve(__dirname, "src/connectors/redirect.ts"),
+      styles: [
+        path.resolve(__dirname, "src/scss/styles.scss"),
+        path.resolve(__dirname, "src/scss/tailwind.css"),
+      ],
+      theme_head: path.resolve(__dirname, "src/theme.ts"),
+    },
+    cache:
+      NODE_ENV === "production"
+        ? false
+        : {
+            type: "filesystem",
+            allowCollectingMemory: true,
+            cacheDirectory: path.resolve(__dirname, "../../node_modules/.cache/webpack"),
+            buildDependencies: {
+              config: [__filename],
+            },
+          },
+    snapshot: {
+      unmanagedPaths: [path.resolve(__dirname, "../../node_modules/@bitwarden/")],
+    },
+    optimization: {
+      splitChunks: {
+        cacheGroups: {
+          commons: {
+            test: /[\\/]node_modules[\\/]/,
+            name: "app/vendor",
+            chunks: (chunk) => {
+              return chunk.name === "app/main";
+            },
+          },
+        },
+      },
+      minimize: NODE_ENV === "production",
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            safari10: true,
+            // Replicate Angular CLI behaviour
+            compress: {
+              global_defs: {
+                ngDevMode: false,
+                ngI18nClosureMode: false,
+              },
+            },
+          },
+        }),
+      ],
+    },
+    resolve: {
+      extensions: [".ts", ".js"],
+      symlinks: false,
+      modules: [
+        path.resolve(__dirname, "../../node_modules"),
+        path.resolve(process.cwd(), "node_modules"),
+      ],
+      fallback: {
+        buffer: false,
+        util: require.resolve("util/"),
+        assert: false,
+        url: false,
+        fs: false,
+        process: false,
+        path: require.resolve("path-browserify"),
+      },
+      alias: params.importAliases,
+    },
+    output: {
+      filename: "[name].[contenthash].js",
+      path: params.outputPath,
+      clean: true,
+    },
+    module: {
+      rules: moduleRules,
+    },
+    experiments: {
+      asyncWebAssembly: true,
+    },
+    plugins: plugins,
+  };
+
+  return webpackConfig;
+};
diff --git a/apps/web/webpack.config.js b/apps/web/webpack.config.js
index 29051925b24..275a6a5f3b0 100644
--- a/apps/web/webpack.config.js
+++ b/apps/web/webpack.config.js
@@ -1,418 +1,30 @@
-const fs = require("fs");
 const path = require("path");
+const { buildConfig } = require(path.resolve(__dirname, "webpack.base"));
 
-const { AngularWebpackPlugin } = require("@ngtools/webpack");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const HtmlWebpackInjector = require("html-webpack-injector");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const TerserPlugin = require("terser-webpack-plugin");
-const webpack = require("webpack");
+module.exports = (webpackConfig, context) => {
+  const isNxBuild = context && context.options;
 
-const config = require("./config.js");
-const pjson = require("./package.json");
-
-const ENV = process.env.ENV == null ? "development" : process.env.ENV;
-const NODE_ENV = process.env.NODE_ENV == null ? "development" : process.env.NODE_ENV;
-const LOGGING = process.env.LOGGING != "false";
-
-const envConfig = config.load(ENV);
-if (LOGGING) {
-  config.log(envConfig);
-}
-
-const moduleRules = [
-  {
-    test: /\.(html)$/,
-    loader: "html-loader",
-  },
-  {
-    test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
-    exclude: /loading(|-white).svg/,
-    generator: {
-      filename: "fonts/[name].[contenthash][ext]",
-    },
-    type: "asset/resource",
-  },
-  {
-    test: /\.(jpe?g|png|gif|svg|webp|avif)$/i,
-    exclude: /.*(bwi-font)\.svg/,
-    generator: {
-      filename: "images/[name][ext]",
-    },
-    type: "asset/resource",
-  },
-  {
-    test: /\.scss$/,
-    use: [
-      {
-        loader: MiniCssExtractPlugin.loader,
+  if (isNxBuild) {
+    return buildConfig({
+      configName: "OSS",
+      app: {
+        entry: context.options.main
+          ? path.resolve(context.context.root, context.options.main)
+          : path.resolve(__dirname, "src/main.ts"),
+        entryModule: "src/app/app.module#AppModule",
       },
-      "css-loader",
-      "resolve-url-loader",
-      {
-        loader: "sass-loader",
-        options: {
-          sourceMap: true,
-        },
+      tsConfig: "apps/web/tsconfig.build.json",
+      outputPath: path.resolve(context.context.root, context.options.outputPath),
+      env: context.options.env,
+    });
+  } else {
+    return buildConfig({
+      configName: "OSS",
+      app: {
+        entry: path.resolve(__dirname, "src/main.ts"),
+        entryModule: "src/app/app.module#AppModule",
       },
-    ],
-  },
-  {
-    test: /\.css$/,
-    use: [
-      {
-        loader: MiniCssExtractPlugin.loader,
-      },
-      "css-loader",
-      "resolve-url-loader",
-      {
-        loader: "postcss-loader",
-        options: {
-          sourceMap: true,
-        },
-      },
-    ],
-  },
-  {
-    test: /\.[cm]?js$/,
-    use: [
-      {
-        loader: "babel-loader",
-        options: {
-          configFile: "../../babel.config.json",
-          cacheDirectory: NODE_ENV !== "production",
-        },
-      },
-    ],
-  },
-  {
-    test: /\.[jt]sx?$/,
-    loader: "@ngtools/webpack",
-  },
-];
-
-const plugins = [
-  new HtmlWebpackPlugin({
-    template: "./src/index.html",
-    filename: "index.html",
-    chunks: ["theme_head", "app/polyfills", "app/vendor", "app/main", "styles"],
-  }),
-  new HtmlWebpackInjector(),
-  new HtmlWebpackPlugin({
-    template: "./src/connectors/webauthn.html",
-    filename: "webauthn-connector.html",
-    chunks: ["connectors/webauthn", "styles"],
-  }),
-  new HtmlWebpackPlugin({
-    template: "./src/connectors/webauthn-mobile.html",
-    filename: "webauthn-mobile-connector.html",
-    chunks: ["connectors/webauthn", "styles"],
-  }),
-  new HtmlWebpackPlugin({
-    template: "./src/connectors/webauthn-fallback.html",
-    filename: "webauthn-fallback-connector.html",
-    chunks: ["connectors/webauthn-fallback", "styles"],
-  }),
-  new HtmlWebpackPlugin({
-    template: "./src/connectors/sso.html",
-    filename: "sso-connector.html",
-    chunks: ["connectors/sso", "styles"],
-  }),
-  new HtmlWebpackPlugin({
-    template: "./src/connectors/redirect.html",
-    filename: "redirect-connector.html",
-    chunks: ["connectors/redirect", "styles"],
-  }),
-  new HtmlWebpackPlugin({
-    template: "./src/connectors/duo-redirect.html",
-    filename: "duo-redirect-connector.html",
-    chunks: ["connectors/duo-redirect", "styles"],
-  }),
-  new HtmlWebpackPlugin({
-    template: "./src/404.html",
-    filename: "404.html",
-    chunks: ["styles"],
-    // 404 page is a wildcard, this ensures it uses absolute paths.
-    publicPath: "/",
-  }),
-  new CopyWebpackPlugin({
-    patterns: [
-      { from: "./src/.nojekyll" },
-      { from: "./src/manifest.json" },
-      { from: "./src/favicon.ico" },
-      { from: "./src/browserconfig.xml" },
-      { from: "./src/app-id.json" },
-      { from: "./src/images", to: "images" },
-      { from: "./src/videos", to: "videos" },
-      { from: "./src/locales", to: "locales" },
-      { from: "../../node_modules/qrious/dist/qrious.min.js", to: "scripts" },
-      { from: "../../node_modules/braintree-web-drop-in/dist/browser/dropin.js", to: "scripts" },
-      {
-        from: "./src/version.json",
-        transform(content, path) {
-          return content.toString().replace("process.env.APPLICATION_VERSION", pjson.version);
-        },
-      },
-    ],
-  }),
-  new MiniCssExtractPlugin({
-    filename: "[name].[contenthash].css",
-    chunkFilename: "[id].[contenthash].css",
-  }),
-  new webpack.ProvidePlugin({
-    process: "process/browser.js",
-  }),
-  new webpack.EnvironmentPlugin({
-    ENV: ENV,
-    NODE_ENV: NODE_ENV === "production" ? "production" : "development",
-    APPLICATION_VERSION: pjson.version,
-    CACHE_TAG: Math.random().toString(36).substring(7),
-    URLS: envConfig["urls"] ?? {},
-    STRIPE_KEY: envConfig["stripeKey"] ?? "",
-    BRAINTREE_KEY: envConfig["braintreeKey"] ?? "",
-    PAYPAL_CONFIG: envConfig["paypal"] ?? {},
-    FLAGS: envConfig["flags"] ?? {},
-    DEV_FLAGS: NODE_ENV === "development" ? envConfig["devFlags"] : {},
-    ADDITIONAL_REGIONS: envConfig["additionalRegions"] ?? [],
-  }),
-  new AngularWebpackPlugin({
-    tsconfig: "tsconfig.build.json",
-    entryModule: "src/app/app.module#AppModule",
-    sourceMap: true,
-  }),
-];
-
-// ref: https://webpack.js.org/configuration/dev-server/#devserver
-let certSuffix = fs.existsSync("dev-server.local.pem") ? ".local" : ".shared";
-const devServer =
-  NODE_ENV !== "development"
-    ? {}
-    : {
-        server: {
-          type: "https",
-          options: {
-            key: fs.readFileSync("dev-server" + certSuffix + ".pem"),
-            cert: fs.readFileSync("dev-server" + certSuffix + ".pem"),
-          },
-        },
-        // host: '192.168.1.9',
-        proxy: [
-          {
-            context: ["/api"],
-            target: envConfig.dev?.proxyApi,
-            pathRewrite: { "^/api": "" },
-            secure: false,
-            changeOrigin: true,
-          },
-          {
-            context: ["/identity"],
-            target: envConfig.dev?.proxyIdentity,
-            pathRewrite: { "^/identity": "" },
-            secure: false,
-            changeOrigin: true,
-          },
-          {
-            context: ["/events"],
-            target: envConfig.dev?.proxyEvents,
-            pathRewrite: { "^/events": "" },
-            secure: false,
-            changeOrigin: true,
-          },
-          {
-            context: ["/notifications"],
-            target: envConfig.dev?.proxyNotifications,
-            pathRewrite: { "^/notifications": "" },
-            secure: false,
-            changeOrigin: true,
-            ws: true,
-          },
-          {
-            context: ["/icons"],
-            target: envConfig.dev?.proxyIcons,
-            pathRewrite: { "^/icons": "" },
-            secure: false,
-            changeOrigin: true,
-          },
-          {
-            context: ["/seed"],
-            target: envConfig.dev?.proxySeederApi,
-            pathRewrite: { "^/seed": "" },
-            secure: false,
-            changeOrigin: true,
-          },
-        ],
-        headers: (req) => {
-          if (!req.originalUrl.includes("connector.html")) {
-            return {
-              "Content-Security-Policy": `
-                default-src 'self'
-                ;script-src
-                  'self'
-                  'wasm-unsafe-eval'
-                  'sha256-ryoU+5+IUZTuUyTElqkrQGBJXr1brEv6r2CA62WUw8w='
-                  https://js.stripe.com
-                  https://js.braintreegateway.com
-                  https://www.paypalobjects.com
-                ;style-src
-                  'self'
-                  https://assets.braintreegateway.com
-                  https://*.paypal.com
-                  ${"'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='" /* date input polyfill */}
-                  ${"'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4='" /* date input polyfill */}
-                  ${"'sha256-EnIJNDxVnh0++RytXJOkU0sqtLDFt1nYUDOfeJ5SKxg='" /* ng-select */}
-                  ${"'sha256-dbBsIsz2pJ5loaLjhE6xWlmhYdjl6ghbwnGSCr4YObs='" /* cdk-virtual-scroll */}
-                  ${"'sha256-S+uMh1G1SNQDAMG3seBmknQ26Wh+KSEoKdsNiy0joEE='" /* cdk-visually-hidden */}
-                ;img-src
-                  'self'
-                  data:
-                  https://icons.bitwarden.net
-                  https://*.paypal.com
-                  https://www.paypalobjects.com
-                  https://q.stripe.com
-                  https://haveibeenpwned.com
-                ;media-src
-                  'self'
-                  https://assets.bitwarden.com
-                ;child-src
-                  'self'
-                  https://js.stripe.com
-                  https://assets.braintreegateway.com
-                  https://*.paypal.com
-                  https://*.duosecurity.com
-                ;frame-src
-                  'self'
-                  https://js.stripe.com
-                  https://assets.braintreegateway.com
-                  https://*.paypal.com
-                  https://*.duosecurity.com
-                ;connect-src
-                  'self'
-                  ${envConfig.dev.wsConnectSrc ?? ""}
-                  wss://notifications.bitwarden.com
-                  https://notifications.bitwarden.com
-                  https://cdn.bitwarden.net
-                  https://api.pwnedpasswords.com
-                  https://api.2fa.directory/v3/totp.json
-                  https://api.stripe.com
-                  https://www.paypal.com
-                  https://api.sandbox.braintreegateway.com
-                  https://api.braintreegateway.com
-                  https://client-analytics.braintreegateway.com
-                  https://*.braintree-api.com
-                  https://*.blob.core.windows.net
-                  http://127.0.0.1:10000
-                  https://app.simplelogin.io/api/alias/random/new
-                  https://quack.duckduckgo.com/api/email/addresses
-                  https://app.addy.io/api/v1/aliases
-                  https://api.fastmail.com
-                  https://api.forwardemail.net
-                  http://localhost:5000
-                ;object-src
-                  'self'
-                  blob:
-                ;`
-                .replace(/\n/g, " ")
-                .replace(/ +(?= )/g, ""),
-            };
-          }
-        },
-        hot: false,
-        port: envConfig.dev?.port ?? 8080,
-        allowedHosts: envConfig.dev?.allowedHosts ?? "auto",
-        client: {
-          overlay: {
-            errors: true,
-            warnings: false,
-            runtimeErrors: false,
-          },
-        },
-      };
-
-const webpackConfig = {
-  mode: NODE_ENV,
-  devtool: "source-map",
-  devServer: devServer,
-  target: "web",
-  entry: {
-    "app/polyfills": "./src/polyfills.ts",
-    "app/main": "./src/main.ts",
-    "connectors/webauthn": "./src/connectors/webauthn.ts",
-    "connectors/webauthn-fallback": "./src/connectors/webauthn-fallback.ts",
-    "connectors/sso": "./src/connectors/sso.ts",
-    "connectors/duo-redirect": "./src/connectors/duo-redirect.ts",
-    "connectors/redirect": "./src/connectors/redirect.ts",
-    styles: ["./src/scss/styles.scss", "./src/scss/tailwind.css"],
-    theme_head: "./src/theme.ts",
-  },
-  cache:
-    NODE_ENV === "production"
-      ? false
-      : {
-          type: "filesystem",
-          allowCollectingMemory: true,
-          cacheDirectory: path.resolve(__dirname, "../../node_modules/.cache/webpack"),
-          buildDependencies: {
-            config: [__filename],
-          },
-        },
-  snapshot: {
-    unmanagedPaths: [path.resolve(__dirname, "../../node_modules/@bitwarden/")],
-  },
-  optimization: {
-    splitChunks: {
-      cacheGroups: {
-        commons: {
-          test: /[\\/]node_modules[\\/]/,
-          name: "app/vendor",
-          chunks: (chunk) => {
-            return chunk.name === "app/main";
-          },
-        },
-      },
-    },
-    minimize: NODE_ENV === "production",
-    minimizer: [
-      new TerserPlugin({
-        terserOptions: {
-          safari10: true,
-          // Replicate Angular CLI behaviour
-          compress: {
-            global_defs: {
-              ngDevMode: false,
-              ngI18nClosureMode: false,
-            },
-          },
-        },
-      }),
-    ],
-  },
-  resolve: {
-    extensions: [".ts", ".js"],
-    symlinks: false,
-    modules: [path.resolve("../../node_modules")],
-    fallback: {
-      buffer: false,
-      util: require.resolve("util/"),
-      assert: false,
-      url: false,
-      fs: false,
-      process: false,
-      path: require.resolve("path-browserify"),
-    },
-  },
-  output: {
-    filename: "[name].[contenthash].js",
-    path: path.resolve(__dirname, "build"),
-    clean: true,
-  },
-  module: {
-    rules: moduleRules,
-  },
-  experiments: {
-    asyncWebAssembly: true,
-  },
-  plugins: plugins,
+      tsConfig: "tsconfig.build.json",
+    });
+  }
 };
-
-module.exports = webpackConfig;
diff --git a/bitwarden_license/bit-browser/src/popup/app.component.ts b/bitwarden_license/bit-browser/src/popup/app.component.ts
index 339681d66da..f880b946cfa 100644
--- a/bitwarden_license/bit-browser/src/popup/app.component.ts
+++ b/bitwarden_license/bit-browser/src/popup/app.component.ts
@@ -2,6 +2,8 @@ import { Component, OnInit } from "@angular/core";
 
 import { AppComponent as BaseAppComponent } from "@bitwarden/browser/popup/app.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-root",
   templateUrl: "../../../../apps/browser/src/popup/app.component.html",
diff --git a/bitwarden_license/bit-browser/tsconfig.build.json b/bitwarden_license/bit-browser/tsconfig.build.json
new file mode 100644
index 00000000000..2a811b3231e
--- /dev/null
+++ b/bitwarden_license/bit-browser/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["**/*.stories.*", "**/*.spec.ts"]
+}
diff --git a/bitwarden_license/bit-browser/tsconfig.json b/bitwarden_license/bit-browser/tsconfig.json
index c3420e280b7..68c52f9d3c6 100644
--- a/bitwarden_license/bit-browser/tsconfig.json
+++ b/bitwarden_license/bit-browser/tsconfig.json
@@ -15,6 +15,8 @@
     "../../apps/browser/src/vault/content/*.ts",
 
     "../../libs/common/src/autofill/constants",
-    "../../libs/common/custom-matchers.d.ts"
+    "../../libs/common/custom-matchers.d.ts",
+
+    "../../bitwarden_license/bit-common/src/platform/sdk/sdk-alias.d.ts"
   ]
 }
diff --git a/bitwarden_license/bit-browser/webpack.config.js b/bitwarden_license/bit-browser/webpack.config.js
index 294e2f16253..a0b1870721b 100644
--- a/bitwarden_license/bit-browser/webpack.config.js
+++ b/bitwarden_license/bit-browser/webpack.config.js
@@ -1,13 +1,66 @@
+const path = require("path");
 const { buildConfig } = require("../../apps/browser/webpack.base");
 
-module.exports = buildConfig({
-  configName: "Commercial",
-  popup: {
-    entry: "../../bitwarden_license/bit-browser/src/popup/main.ts",
-    entryModule: "../../bitwarden_license/bit-browser/src/popup/app.module#AppModule",
-  },
-  background: {
-    entry: "../../bitwarden_license/bit-browser/src/platform/background.ts",
-  },
-  tsConfig: "../../bitwarden_license/bit-browser/tsconfig.json",
-});
+module.exports = (webpackConfig, context) => {
+  // Detect if called by Nx (context parameter exists)
+  const isNxBuild = context && context.options;
+
+  if (isNxBuild) {
+    // Nx build configuration
+    const mode = context.options.mode || "development";
+    if (process.env.NODE_ENV == null) {
+      process.env.NODE_ENV = mode;
+    }
+    const ENV = (process.env.ENV = process.env.NODE_ENV);
+
+    // Set environment variables from Nx context
+    if (context.options.env) {
+      Object.keys(context.options.env).forEach((key) => {
+        process.env[key] = context.options.env[key];
+      });
+    }
+
+    return buildConfig({
+      configName: "Commercial",
+      popup: {
+        entry: path.resolve(__dirname, "src/popup/main.ts"),
+        entryModule: "bitwarden_license/bit-browser/src/popup/app.module#AppModule",
+      },
+      background: {
+        entry: path.resolve(__dirname, "src/platform/background.ts"),
+      },
+      tsConfig: path.resolve(__dirname, "tsconfig.build.json"),
+      outputPath:
+        context.context && context.context.root
+          ? path.resolve(context.context.root, context.options.outputPath)
+          : context.options.outputPath,
+      mode: mode,
+      env: ENV,
+      importAliases: [
+        {
+          name: "@bitwarden/sdk-internal",
+          alias: "@bitwarden/commercial-sdk-internal",
+        },
+      ],
+    });
+  } else {
+    // npm build configuration
+    return buildConfig({
+      configName: "Commercial",
+      popup: {
+        entry: path.resolve(__dirname, "src/popup/main.ts"),
+        entryModule: "bitwarden_license/bit-browser/src/popup/app.module#AppModule",
+      },
+      background: {
+        entry: path.resolve(__dirname, "src/platform/background.ts"),
+      },
+      tsConfig: path.resolve(__dirname, "tsconfig.json"),
+      importAliases: [
+        {
+          name: "@bitwarden/sdk-internal",
+          alias: "@bitwarden/commercial-sdk-internal",
+        },
+      ],
+    });
+  }
+};
diff --git a/bitwarden_license/bit-cli/src/bit-serve-configurator.ts b/bitwarden_license/bit-cli/src/bit-serve-configurator.ts
index c669eb70920..71df651d9d0 100644
--- a/bitwarden_license/bit-cli/src/bit-serve-configurator.ts
+++ b/bitwarden_license/bit-cli/src/bit-serve-configurator.ts
@@ -16,9 +16,9 @@ export class BitServeConfigurator extends OssServeConfigurator {
     super(serviceContainer);
   }
 
-  override configureRouter(router: koaRouter): void {
+  override async configureRouter(router: koaRouter): Promise<void> {
     // Register OSS endpoints
-    super.configureRouter(router);
+    await super.configureRouter(router);
 
     // Register bit endpoints
     this.serveDeviceApprovals(router);
diff --git a/bitwarden_license/bit-cli/tsconfig.json b/bitwarden_license/bit-cli/tsconfig.json
index 6630021232f..68608936abc 100644
--- a/bitwarden_license/bit-cli/tsconfig.json
+++ b/bitwarden_license/bit-cli/tsconfig.json
@@ -1,3 +1,7 @@
 {
-  "extends": "../../apps/cli/tsconfig"
+  "extends": "../../apps/cli/tsconfig",
+  "files": [
+    "../../bitwarden_license/bit-common/src/platform/sdk/sdk-alias.d.ts",
+    "../../bitwarden_license/bit-cli/src/bw.ts"
+  ]
 }
diff --git a/bitwarden_license/bit-cli/webpack.config.js b/bitwarden_license/bit-cli/webpack.config.js
index 3e991f7971e..6d31d0b5e96 100644
--- a/bitwarden_license/bit-cli/webpack.config.js
+++ b/bitwarden_license/bit-cli/webpack.config.js
@@ -1,12 +1,60 @@
-const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
+const path = require("path");
+const { buildConfig } = require("../../apps/cli/webpack.base");
 
-// Re-use the OSS CLI webpack config
-const webpackConfig = require("../../apps/cli/webpack.config");
+module.exports = (webpackConfig, context) => {
+  // Detect if called by Nx (context parameter exists)
+  const isNxBuild = context && context.options;
 
-// Update paths to use the bit-cli entrypoint and tsconfig
-webpackConfig.entry = { bw: "../../bitwarden_license/bit-cli/src/bw.ts" };
-webpackConfig.resolve.plugins = [
-  new TsconfigPathsPlugin({ configFile: "../../bitwarden_license/bit-cli/tsconfig.json" }),
-];
+  if (isNxBuild) {
+    // Nx build configuration
+    const mode = context.options.mode || "development";
+    if (process.env.NODE_ENV == null) {
+      process.env.NODE_ENV = mode;
+    }
+    const ENV = (process.env.ENV = process.env.NODE_ENV);
 
-module.exports = webpackConfig;
+    return buildConfig({
+      configName: "Commercial",
+      entry: context.options.main || "bitwarden_license/bit-cli/src/bw.ts",
+      tsConfig: "tsconfig.base.json",
+      outputPath: path.resolve(context.context.root, context.options.outputPath),
+      mode: mode,
+      env: ENV,
+      modulesPath: [path.resolve("node_modules")],
+      localesPath: "apps/cli/src/locales",
+      externalsModulesDir: "node_modules",
+      watch: context.options.watch || false,
+      importAliases: [
+        {
+          name: "@bitwarden/sdk-internal",
+          alias: "@bitwarden/commercial-sdk-internal",
+        },
+      ],
+    });
+  } else {
+    // npm build configuration
+    if (process.env.NODE_ENV == null) {
+      process.env.NODE_ENV = "development";
+    }
+    const ENV = (process.env.ENV = process.env.NODE_ENV);
+    const mode = ENV;
+
+    return buildConfig({
+      configName: "Commercial",
+      entry: "../../bitwarden_license/bit-cli/src/bw.ts",
+      tsConfig: "../../bitwarden_license/bit-cli/tsconfig.json",
+      outputPath: path.resolve(__dirname, "../../apps/cli/build"),
+      mode: mode,
+      env: ENV,
+      modulesPath: [path.resolve("../../node_modules")],
+      localesPath: "../../apps/cli/src/locales",
+      externalsModulesDir: "../../node_modules",
+      importAliases: [
+        {
+          name: "@bitwarden/sdk-internal",
+          alias: "@bitwarden/commercial-sdk-internal",
+        },
+      ],
+    });
+  }
+};
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/datadog-configuration.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/datadog-configuration.ts
new file mode 100644
index 00000000000..e788ebba7f2
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/configuration/datadog-configuration.ts
@@ -0,0 +1,17 @@
+import { OrganizationIntegrationServiceType } from "../organization-integration-service-type";
+
+export class DatadogConfiguration {
+  uri: string;
+  apiKey: string;
+  service: OrganizationIntegrationServiceType;
+
+  constructor(uri: string, apiKey: string, service: string) {
+    this.uri = uri;
+    this.apiKey = apiKey;
+    this.service = service as OrganizationIntegrationServiceType;
+  }
+
+  toString(): string {
+    return JSON.stringify(this);
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/configuration-template/datadog-template.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/configuration-template/datadog-template.ts
new file mode 100644
index 00000000000..9aa6e34f478
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration-configuration-config/configuration-template/datadog-template.ts
@@ -0,0 +1,17 @@
+import { OrganizationIntegrationServiceType } from "../../organization-integration-service-type";
+
+export class DatadogTemplate {
+  source_type_name = "Bitwarden";
+  title: string = "#Title#";
+  text: string =
+    "ActingUser: #ActingUserId#\nUser: #UserId#\nEvent: #Type#\nOrganization: #OrganizationId#\nPolicyId: #PolicyId#\nIpAddress: #IpAddress#\nDomainName: #DomainName#\nCipherId: #CipherId#\n";
+  service: OrganizationIntegrationServiceType;
+
+  constructor(service: string) {
+    this.service = service as OrganizationIntegrationServiceType;
+  }
+
+  toString(): string {
+    return JSON.stringify(this);
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration.ts
index abd1861caa9..2167694b720 100644
--- a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/integration.ts
@@ -1,6 +1,7 @@
 import { IntegrationType } from "@bitwarden/common/enums/integration-type.enum";
 
 import { OrganizationIntegration } from "./organization-integration";
+import { OrganizationIntegrationType } from "./organization-integration-type";
 
 /** Integration or SDK */
 export type Integration = {
@@ -23,6 +24,7 @@ export type Integration = {
   canSetupConnection?: boolean;
   configuration?: string;
   template?: string;
+  integrationType?: OrganizationIntegrationType | null;
 
   // OrganizationIntegration
   organizationIntegration?: OrganizationIntegration | null;
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration.ts
index d4bbd30055f..0209460b630 100644
--- a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-configuration.ts
@@ -4,6 +4,7 @@ import {
   OrganizationIntegrationId,
 } from "@bitwarden/common/types/guid";
 
+import { DatadogTemplate } from "./integration-configuration-config/configuration-template/datadog-template";
 import { HecTemplate } from "./integration-configuration-config/configuration-template/hec-template";
 import { WebhookTemplate } from "./integration-configuration-config/configuration-template/webhook-template";
 import { WebhookIntegrationConfigurationConfig } from "./integration-configuration-config/webhook-integration-configuration-config";
@@ -14,7 +15,7 @@ export class OrganizationIntegrationConfiguration {
   eventType?: EventType | null;
   configuration?: WebhookIntegrationConfigurationConfig | null;
   filters?: string;
-  template?: HecTemplate | WebhookTemplate | null;
+  template?: HecTemplate | WebhookTemplate | DatadogTemplate | null;
 
   constructor(
     id: OrganizationIntegrationConfigurationId,
@@ -22,7 +23,7 @@ export class OrganizationIntegrationConfiguration {
     eventType?: EventType | null,
     configuration?: WebhookIntegrationConfigurationConfig | null,
     filters?: string,
-    template?: HecTemplate | WebhookTemplate | null,
+    template?: HecTemplate | WebhookTemplate | DatadogTemplate | null,
   ) {
     this.id = id;
     this.integrationId = integrationId;
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-service-type.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-service-type.ts
index dd1b4fb3f6c..e9e93adc0ff 100644
--- a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-service-type.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-service-type.ts
@@ -1,5 +1,6 @@
 export const OrganizationIntegrationServiceType = Object.freeze({
   CrowdStrike: "CrowdStrike",
+  Datadog: "Datadog",
 } as const);
 
 export type OrganizationIntegrationServiceType =
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-type.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-type.ts
index 1c98e174836..3cf68ee9b1d 100644
--- a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-type.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration-type.ts
@@ -4,6 +4,7 @@ export const OrganizationIntegrationType = Object.freeze({
   Slack: 3,
   Webhook: 4,
   Hec: 5,
+  Datadog: 6,
 } as const);
 
 export type OrganizationIntegrationType =
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration.ts
index abbe2271b30..d32c92a460a 100644
--- a/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/models/organization-integration.ts
@@ -1,5 +1,6 @@
 import { OrganizationIntegrationId } from "@bitwarden/common/types/guid";
 
+import { DatadogConfiguration } from "./configuration/datadog-configuration";
 import { HecConfiguration } from "./configuration/hec-configuration";
 import { WebhookConfiguration } from "./configuration/webhook-configuration";
 import { OrganizationIntegrationConfiguration } from "./organization-integration-configuration";
@@ -10,14 +11,14 @@ export class OrganizationIntegration {
   id: OrganizationIntegrationId;
   type: OrganizationIntegrationType;
   serviceType: OrganizationIntegrationServiceType;
-  configuration: HecConfiguration | WebhookConfiguration | null;
+  configuration: HecConfiguration | WebhookConfiguration | DatadogConfiguration | null;
   integrationConfiguration: OrganizationIntegrationConfiguration[] = [];
 
   constructor(
     id: OrganizationIntegrationId,
     type: OrganizationIntegrationType,
     serviceType: OrganizationIntegrationServiceType,
-    configuration: HecConfiguration | WebhookConfiguration | null,
+    configuration: HecConfiguration | WebhookConfiguration | DatadogConfiguration | null,
     integrationConfiguration: OrganizationIntegrationConfiguration[] = [],
   ) {
     this.id = id;
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/services/datadog-organization-integration-service.spec.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/datadog-organization-integration-service.spec.ts
new file mode 100644
index 00000000000..0545f95cb83
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/datadog-organization-integration-service.spec.ts
@@ -0,0 +1,184 @@
+import { mock } from "jest-mock-extended";
+import { firstValueFrom } from "rxjs";
+
+import {
+  OrganizationId,
+  OrganizationIntegrationConfigurationId,
+  OrganizationIntegrationId,
+} from "@bitwarden/common/types/guid";
+
+import { DatadogConfiguration } from "../models/configuration/datadog-configuration";
+import { DatadogTemplate } from "../models/integration-configuration-config/configuration-template/datadog-template";
+import { OrganizationIntegration } from "../models/organization-integration";
+import { OrganizationIntegrationConfiguration } from "../models/organization-integration-configuration";
+import { OrganizationIntegrationConfigurationResponse } from "../models/organization-integration-configuration-response";
+import { OrganizationIntegrationResponse } from "../models/organization-integration-response";
+import { OrganizationIntegrationServiceType } from "../models/organization-integration-service-type";
+import { OrganizationIntegrationType } from "../models/organization-integration-type";
+
+import { DatadogOrganizationIntegrationService } from "./datadog-organization-integration-service";
+import { OrganizationIntegrationApiService } from "./organization-integration-api.service";
+import { OrganizationIntegrationConfigurationApiService } from "./organization-integration-configuration-api.service";
+
+describe("DatadogOrganizationIntegrationService", () => {
+  let service: DatadogOrganizationIntegrationService;
+  const mockIntegrationApiService = mock<OrganizationIntegrationApiService>();
+  const mockIntegrationConfigurationApiService =
+    mock<OrganizationIntegrationConfigurationApiService>();
+  const organizationId = "org-1" as OrganizationId;
+  const integrationId = "int-1" as OrganizationIntegrationId;
+  const configId = "conf-1" as OrganizationIntegrationConfigurationId;
+  const serviceType = OrganizationIntegrationServiceType.CrowdStrike;
+  const url = "https://example.com";
+  const apiKey = "token";
+
+  beforeEach(() => {
+    service = new DatadogOrganizationIntegrationService(
+      mockIntegrationApiService,
+      mockIntegrationConfigurationApiService,
+    );
+
+    jest.resetAllMocks();
+  });
+
+  it("should set organization integrations", (done) => {
+    mockIntegrationApiService.getOrganizationIntegrations.mockResolvedValue([]);
+    service.setOrganizationIntegrations(organizationId);
+    const subscription = service.integrations$.subscribe((integrations) => {
+      expect(integrations).toEqual([]);
+      subscription.unsubscribe();
+      done();
+    });
+  });
+
+  it("should save a new Datadog integration", async () => {
+    service.setOrganizationIntegrations(organizationId);
+
+    const integrationResponse = {
+      id: integrationId,
+      type: OrganizationIntegrationType.Datadog,
+      configuration: JSON.stringify({ url, apiKey, service: serviceType }),
+    } as OrganizationIntegrationResponse;
+
+    const configResponse = {
+      id: configId,
+      template: JSON.stringify({ service: serviceType }),
+    } as OrganizationIntegrationConfigurationResponse;
+
+    mockIntegrationApiService.createOrganizationIntegration.mockResolvedValue(integrationResponse);
+    mockIntegrationConfigurationApiService.createOrganizationIntegrationConfiguration.mockResolvedValue(
+      configResponse,
+    );
+
+    await service.saveDatadog(organizationId, serviceType, url, apiKey);
+
+    const integrations = await firstValueFrom(service.integrations$);
+    expect(integrations.length).toBe(1);
+    expect(integrations[0].id).toBe(integrationId);
+    expect(integrations[0].serviceType).toBe(serviceType);
+  });
+
+  it("should throw error on organization ID mismatch in saveDatadog", async () => {
+    service.setOrganizationIntegrations("other-org" as OrganizationId);
+    await expect(service.saveDatadog(organizationId, serviceType, url, apiKey)).rejects.toThrow(
+      Error("Organization ID mismatch"),
+    );
+  });
+
+  it("should update an existing Datadog integration", async () => {
+    service.setOrganizationIntegrations(organizationId);
+
+    const integrationResponse = {
+      id: integrationId,
+      type: OrganizationIntegrationType.Datadog,
+      configuration: JSON.stringify({ url, apiKey, service: serviceType }),
+    } as OrganizationIntegrationResponse;
+
+    const configResponse = {
+      id: configId,
+      template: JSON.stringify({ service: serviceType }),
+    } as OrganizationIntegrationConfigurationResponse;
+
+    mockIntegrationApiService.updateOrganizationIntegration.mockResolvedValue(integrationResponse);
+    mockIntegrationConfigurationApiService.updateOrganizationIntegrationConfiguration.mockResolvedValue(
+      configResponse,
+    );
+
+    await service.updateDatadog(organizationId, integrationId, configId, serviceType, url, apiKey);
+
+    const integrations = await firstValueFrom(service.integrations$);
+    expect(integrations.length).toBe(1);
+    expect(integrations[0].id).toBe(integrationId);
+  });
+
+  it("should throw error on organization ID mismatch in updateDatadog", async () => {
+    service.setOrganizationIntegrations("other-org" as OrganizationId);
+    await expect(
+      service.updateDatadog(organizationId, integrationId, configId, serviceType, url, apiKey),
+    ).rejects.toThrow(Error("Organization ID mismatch"));
+  });
+
+  it("should get integration by id", async () => {
+    service["_integrations$"].next([
+      new OrganizationIntegration(
+        integrationId,
+        OrganizationIntegrationType.Datadog,
+        serviceType,
+        {} as DatadogConfiguration,
+        [],
+      ),
+    ]);
+    const integration = await service.getIntegrationById(integrationId);
+    expect(integration).not.toBeNull();
+    expect(integration!.id).toBe(integrationId);
+  });
+
+  it("should get integration by service type", async () => {
+    service["_integrations$"].next([
+      new OrganizationIntegration(
+        integrationId,
+        OrganizationIntegrationType.Datadog,
+        serviceType,
+        {} as DatadogConfiguration,
+        [],
+      ),
+    ]);
+    const integration = await service.getIntegrationByServiceType(serviceType);
+    expect(integration).not.toBeNull();
+    expect(integration!.serviceType).toBe(serviceType);
+  });
+
+  it("should get integration configurations", async () => {
+    const config = new OrganizationIntegrationConfiguration(
+      configId,
+      integrationId,
+      null,
+      null,
+      "",
+      {} as DatadogTemplate,
+    );
+
+    service["_integrations$"].next([
+      new OrganizationIntegration(
+        integrationId,
+        OrganizationIntegrationType.Datadog,
+        serviceType,
+        {} as DatadogConfiguration,
+        [config],
+      ),
+    ]);
+    const configs = await service.getIntegrationConfigurations(integrationId);
+    expect(configs).not.toBeNull();
+    expect(configs![0].id).toBe(configId);
+  });
+
+  it("convertToJson should parse valid JSON", () => {
+    const obj = service.convertToJson<{ a: number }>('{"a":1}');
+    expect(obj).toEqual({ a: 1 });
+  });
+
+  it("convertToJson should return null for invalid JSON", () => {
+    const obj = service.convertToJson<{ a: number }>("invalid");
+    expect(obj).toBeNull();
+  });
+});
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/services/datadog-organization-integration-service.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/datadog-organization-integration-service.ts
new file mode 100644
index 00000000000..1fd5e9f8c06
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/datadog-organization-integration-service.ts
@@ -0,0 +1,350 @@
+import { BehaviorSubject, firstValueFrom, map, Subject, switchMap, takeUntil, zip } from "rxjs";
+
+import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
+import {
+  OrganizationId,
+  OrganizationIntegrationId,
+  OrganizationIntegrationConfigurationId,
+} from "@bitwarden/common/types/guid";
+
+import { DatadogConfiguration } from "../models/configuration/datadog-configuration";
+import { DatadogTemplate } from "../models/integration-configuration-config/configuration-template/datadog-template";
+import { OrganizationIntegration } from "../models/organization-integration";
+import { OrganizationIntegrationConfiguration } from "../models/organization-integration-configuration";
+import { OrganizationIntegrationConfigurationRequest } from "../models/organization-integration-configuration-request";
+import { OrganizationIntegrationConfigurationResponse } from "../models/organization-integration-configuration-response";
+import { OrganizationIntegrationRequest } from "../models/organization-integration-request";
+import { OrganizationIntegrationResponse } from "../models/organization-integration-response";
+import { OrganizationIntegrationServiceType } from "../models/organization-integration-service-type";
+import { OrganizationIntegrationType } from "../models/organization-integration-type";
+
+import { OrganizationIntegrationApiService } from "./organization-integration-api.service";
+import { OrganizationIntegrationConfigurationApiService } from "./organization-integration-configuration-api.service";
+
+export type DatadogModificationFailureReason = {
+  mustBeOwner: boolean;
+  success: boolean;
+};
+
+export class DatadogOrganizationIntegrationService {
+  private organizationId$ = new BehaviorSubject<OrganizationId | null>(null);
+  private _integrations$ = new BehaviorSubject<OrganizationIntegration[]>([]);
+  private destroy$ = new Subject<void>();
+
+  integrations$ = this._integrations$.asObservable();
+
+  private fetch$ = this.organizationId$
+    .pipe(
+      switchMap(async (orgId) => {
+        if (orgId) {
+          const data$ = await this.setIntegrations(orgId);
+          return await firstValueFrom(data$);
+        } else {
+          return this._integrations$.getValue();
+        }
+      }),
+      takeUntil(this.destroy$),
+    )
+    .subscribe({
+      next: (integrations) => {
+        this._integrations$.next(integrations);
+      },
+    });
+
+  constructor(
+    private integrationApiService: OrganizationIntegrationApiService,
+    private integrationConfigurationApiService: OrganizationIntegrationConfigurationApiService,
+  ) {}
+
+  /**
+   * Sets the organization Id and will trigger the retrieval of the
+   * integrations for a given org.
+   * @param orgId
+   */
+  setOrganizationIntegrations(orgId: OrganizationId) {
+    this.organizationId$.next(orgId);
+  }
+
+  /**
+   * Saves a new organization integration and updates the integrations$ observable
+   * @param organizationId id of the organization
+   * @param service service type of the integration
+   * @param url url of the service
+   * @param apiKey api token
+   */
+  async saveDatadog(
+    organizationId: OrganizationId,
+    service: OrganizationIntegrationServiceType,
+    url: string,
+    apiKey: string,
+  ): Promise<DatadogModificationFailureReason> {
+    if (organizationId != this.organizationId$.getValue()) {
+      throw new Error("Organization ID mismatch");
+    }
+
+    try {
+      const datadogConfig = new DatadogConfiguration(url, apiKey, service);
+      const newIntegrationResponse = await this.integrationApiService.createOrganizationIntegration(
+        organizationId,
+        new OrganizationIntegrationRequest(
+          OrganizationIntegrationType.Datadog,
+          datadogConfig.toString(),
+        ),
+      );
+
+      const newTemplate = new DatadogTemplate(service);
+      const newIntegrationConfigResponse =
+        await this.integrationConfigurationApiService.createOrganizationIntegrationConfiguration(
+          organizationId,
+          newIntegrationResponse.id,
+          new OrganizationIntegrationConfigurationRequest(null, null, null, newTemplate.toString()),
+        );
+
+      const newIntegration = this.mapResponsesToOrganizationIntegration(
+        newIntegrationResponse,
+        newIntegrationConfigResponse,
+      );
+      if (newIntegration !== null) {
+        this._integrations$.next([...this._integrations$.getValue(), newIntegration]);
+      }
+      return { mustBeOwner: false, success: true };
+    } catch (error) {
+      if (error instanceof ErrorResponse && error.statusCode === 404) {
+        return { mustBeOwner: true, success: false };
+      }
+      throw error;
+    }
+  }
+
+  /**
+   * Updates an existing organization integration and updates the integrations$ observable
+   * @param organizationId id of the organization
+   * @param OrganizationIntegrationId id of the organization integration
+   * @param OrganizationIntegrationConfigurationId id of the organization integration configuration
+   * @param service service type of the integration
+   * @param url url of the service
+   * @param apiKey api token
+   */
+  async updateDatadog(
+    organizationId: OrganizationId,
+    OrganizationIntegrationId: OrganizationIntegrationId,
+    OrganizationIntegrationConfigurationId: OrganizationIntegrationConfigurationId,
+    service: OrganizationIntegrationServiceType,
+    url: string,
+    apiKey: string,
+  ): Promise<DatadogModificationFailureReason> {
+    if (organizationId != this.organizationId$.getValue()) {
+      throw new Error("Organization ID mismatch");
+    }
+
+    try {
+      const datadogConfig = new DatadogConfiguration(url, apiKey, service);
+      const updatedIntegrationResponse =
+        await this.integrationApiService.updateOrganizationIntegration(
+          organizationId,
+          OrganizationIntegrationId,
+          new OrganizationIntegrationRequest(
+            OrganizationIntegrationType.Datadog,
+            datadogConfig.toString(),
+          ),
+        );
+
+      const updatedTemplate = new DatadogTemplate(service);
+      const updatedIntegrationConfigResponse =
+        await this.integrationConfigurationApiService.updateOrganizationIntegrationConfiguration(
+          organizationId,
+          OrganizationIntegrationId,
+          OrganizationIntegrationConfigurationId,
+          new OrganizationIntegrationConfigurationRequest(
+            null,
+            null,
+            null,
+            updatedTemplate.toString(),
+          ),
+        );
+
+      const updatedIntegration = this.mapResponsesToOrganizationIntegration(
+        updatedIntegrationResponse,
+        updatedIntegrationConfigResponse,
+      );
+
+      if (updatedIntegration !== null) {
+        this._integrations$.next([...this._integrations$.getValue(), updatedIntegration]);
+      }
+      return { mustBeOwner: false, success: true };
+    } catch (error) {
+      if (error instanceof ErrorResponse && error.statusCode === 404) {
+        return { mustBeOwner: true, success: false };
+      }
+      throw error;
+    }
+  }
+
+  async deleteDatadog(
+    organizationId: OrganizationId,
+    OrganizationIntegrationId: OrganizationIntegrationId,
+    OrganizationIntegrationConfigurationId: OrganizationIntegrationConfigurationId,
+  ): Promise<DatadogModificationFailureReason> {
+    if (organizationId != this.organizationId$.getValue()) {
+      throw new Error("Organization ID mismatch");
+    }
+
+    try {
+      // delete the configuration first due to foreign key constraint
+      await this.integrationConfigurationApiService.deleteOrganizationIntegrationConfiguration(
+        organizationId,
+        OrganizationIntegrationId,
+        OrganizationIntegrationConfigurationId,
+      );
+
+      // delete the integration
+      await this.integrationApiService.deleteOrganizationIntegration(
+        organizationId,
+        OrganizationIntegrationId,
+      );
+
+      // update the local observable
+      const updatedIntegrations = this._integrations$
+        .getValue()
+        .filter((i) => i.id !== OrganizationIntegrationId);
+      this._integrations$.next(updatedIntegrations);
+
+      return { mustBeOwner: false, success: true };
+    } catch (error) {
+      if (error instanceof ErrorResponse && error.statusCode === 404) {
+        return { mustBeOwner: true, success: false };
+      }
+      throw error;
+    }
+  }
+
+  /**
+   * Gets a OrganizationIntegration for an OrganizationIntegrationId
+   * @param integrationId id of the integration
+   * @returns OrganizationIntegration or null
+   */
+  // TODO: Move to base class when another service integration type is implemented
+  async getIntegrationById(
+    integrationId: OrganizationIntegrationId,
+  ): Promise<OrganizationIntegration | null> {
+    return await firstValueFrom(
+      this.integrations$.pipe(
+        map((integrations) => integrations.find((i) => i.id === integrationId) || null),
+      ),
+    );
+  }
+
+  /**
+   * Gets a OrganizationIntegration for a service type
+   * @param serviceType type of the service
+   * @returns OrganizationIntegration or null
+   */
+  // TODO: Move to base class when another service integration type is implemented
+  async getIntegrationByServiceType(
+    serviceType: OrganizationIntegrationServiceType,
+  ): Promise<OrganizationIntegration | null> {
+    return await firstValueFrom(
+      this.integrations$.pipe(
+        map((integrations) => integrations.find((i) => i.serviceType === serviceType) || null),
+      ),
+    );
+  }
+
+  /**
+   * Gets a OrganizationIntegrationConfigurations for an integration ID
+   * @param integrationId id of the integration
+   * @returns OrganizationIntegration array or null
+   */
+  // TODO: Move to base class when another service integration type is implemented
+  async getIntegrationConfigurations(
+    integrationId: OrganizationIntegrationId,
+  ): Promise<OrganizationIntegrationConfiguration[] | null> {
+    return await firstValueFrom(
+      this.integrations$.pipe(
+        map((integrations) => {
+          const integration = integrations.find((i) => i.id === integrationId);
+          return integration ? integration.integrationConfiguration : null;
+        }),
+      ),
+    );
+  }
+
+  // TODO: Move to data models to be more explicit for future services
+  private mapResponsesToOrganizationIntegration(
+    integrationResponse: OrganizationIntegrationResponse,
+    configurationResponse: OrganizationIntegrationConfigurationResponse,
+  ): OrganizationIntegration | null {
+    const datadogConfig = this.convertToJson<DatadogConfiguration>(
+      integrationResponse.configuration,
+    );
+    const template = this.convertToJson<DatadogTemplate>(configurationResponse.template);
+
+    if (!datadogConfig || !template) {
+      return null;
+    }
+
+    const integrationConfig = new OrganizationIntegrationConfiguration(
+      configurationResponse.id,
+      integrationResponse.id,
+      null,
+      null,
+      "",
+      template,
+    );
+
+    return new OrganizationIntegration(
+      integrationResponse.id,
+      integrationResponse.type,
+      datadogConfig.service,
+      datadogConfig,
+      [integrationConfig],
+    );
+  }
+
+  // Could possibly be moved to a base service. All services would then assume that the
+  // integration configuration would always be an array and this datadog specific service
+  // would just assume a single entry.
+  private setIntegrations(orgId: OrganizationId) {
+    const results$ = zip(this.integrationApiService.getOrganizationIntegrations(orgId)).pipe(
+      switchMap(([responses]) => {
+        const integrations: OrganizationIntegration[] = [];
+        const promises: Promise<void>[] = [];
+
+        responses.forEach((integration) => {
+          if (integration.type === OrganizationIntegrationType.Datadog) {
+            const promise = this.integrationConfigurationApiService
+              .getOrganizationIntegrationConfigurations(orgId, integration.id)
+              .then((response) => {
+                // datadog events will only have one OrganizationIntegrationConfiguration
+                const config = response[0];
+
+                const orgIntegration = this.mapResponsesToOrganizationIntegration(
+                  integration,
+                  config,
+                );
+
+                if (orgIntegration !== null) {
+                  integrations.push(orgIntegration);
+                }
+              });
+            promises.push(promise);
+          }
+        });
+        return Promise.all(promises).then(() => {
+          return integrations;
+        });
+      }),
+    );
+
+    return results$;
+  }
+
+  // TODO: Move to base service when necessary
+  convertToJson<T>(jsonString?: string): T | null {
+    try {
+      return JSON.parse(jsonString || "") as T;
+    } catch {
+      return null;
+    }
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.ts b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.ts
index 6c6a086e0f5..b83ea26e166 100644
--- a/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.ts
+++ b/bitwarden_license/bit-common/src/dirt/organization-integrations/services/hec-organization-integration-service.ts
@@ -171,7 +171,10 @@ export class HecOrganizationIntegrationService {
       );
 
       if (updatedIntegration !== null) {
-        this._integrations$.next([...this._integrations$.getValue(), updatedIntegration]);
+        const unchangedIntegrations = this._integrations$
+          .getValue()
+          .filter((i) => i.id !== OrganizationIntegrationId);
+        this._integrations$.next([...unchangedIntegrations, updatedIntegration]);
       }
       return { mustBeOwner: false, success: true };
     } catch (error) {
@@ -311,22 +314,24 @@ export class HecOrganizationIntegrationService {
         const promises: Promise<void>[] = [];
 
         responses.forEach((integration) => {
-          const promise = this.integrationConfigurationApiService
-            .getOrganizationIntegrationConfigurations(orgId, integration.id)
-            .then((response) => {
-              // Hec events will only have one OrganizationIntegrationConfiguration
-              const config = response[0];
+          if (integration.type === OrganizationIntegrationType.Hec) {
+            const promise = this.integrationConfigurationApiService
+              .getOrganizationIntegrationConfigurations(orgId, integration.id)
+              .then((response) => {
+                // Hec events will only have one OrganizationIntegrationConfiguration
+                const config = response[0];
 
-              const orgIntegration = this.mapResponsesToOrganizationIntegration(
-                integration,
-                config,
-              );
+                const orgIntegration = this.mapResponsesToOrganizationIntegration(
+                  integration,
+                  config,
+                );
 
-              if (orgIntegration !== null) {
-                integrations.push(orgIntegration);
-              }
-            });
-          promises.push(promise);
+                if (orgIntegration !== null) {
+                  integrations.push(orgIntegration);
+                }
+              });
+            promises.push(promise);
+          }
         });
         return Promise.all(promises).then(() => {
           return integrations;
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/risk-insights-data-mappers.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/risk-insights-data-mappers.ts
index 8fbe45efeab..f7d635bb5fe 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/risk-insights-data-mappers.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/risk-insights-data-mappers.ts
@@ -2,16 +2,19 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import {
-  LEGACY_MemberDetailsFlat,
-  LEGACY_CipherHealthReportDetail,
-  LEGACY_CipherHealthReportUriDetail,
-} from "../models/password-health";
-import { ApplicationHealthReportDetail } from "../models/report-models";
-import { MemberCipherDetailsResponse } from "../response/member-cipher-details.response";
+  AtRiskApplicationDetail,
+  AtRiskMemberDetail,
+  MemberCipherDetailsResponse,
+} from "../models";
+import {
+  ApplicationHealthReportDetail,
+  MemberDetails,
+  OrganizationReportSummary,
+} from "../models/report-models";
 
 export function flattenMemberDetails(
   memberCiphers: MemberCipherDetailsResponse[],
-): LEGACY_MemberDetailsFlat[] {
+): MemberDetails[] {
   return memberCiphers.flatMap((member) =>
     member.cipherIds.map((cipherId) => ({
       userGuid: member.userGuid,
@@ -36,7 +39,7 @@ export function getTrimmedCipherUris(cipher: CipherView): string[] {
 
   const uniqueDomains = new Set<string>();
 
-  uris.forEach((u: { uri: string }) => {
+  uris.forEach((u: { uri: string | undefined }) => {
     const domain = Utils.getDomain(u.uri) ?? u.uri;
     uniqueDomains.add(domain);
   });
@@ -44,9 +47,7 @@ export function getTrimmedCipherUris(cipher: CipherView): string[] {
 }
 
 // Returns a deduplicated array of members by email
-export function getUniqueMembers(
-  orgMembers: LEGACY_MemberDetailsFlat[],
-): LEGACY_MemberDetailsFlat[] {
+export function getUniqueMembers(orgMembers: MemberDetails[]): MemberDetails[] {
   const existingEmails = new Set<string>();
   return orgMembers.filter((member) => {
     if (existingEmails.has(member.email)) {
@@ -58,89 +59,76 @@ export function getUniqueMembers(
 }
 
 /**
- * Creates a flattened member details object
- * @param userGuid User GUID
- * @param userName User name
- * @param email User email
- * @param cipherId Cipher ID
- * @returns Flattened member details
+ * Create a new Risk Insights Report Summary
+ *
+ * @returns An empty report summary
  */
-export function getMemberDetailsFlat(
-  userGuid: string,
-  userName: string,
-  email: string,
-  cipherId: string,
-): LEGACY_MemberDetailsFlat {
+export function createNewSummaryData(): OrganizationReportSummary {
   return {
-    userGuid: userGuid,
-    userName: userName,
-    email: email,
-    cipherId: cipherId,
+    totalMemberCount: 0,
+    totalAtRiskMemberCount: 0,
+    totalApplicationCount: 0,
+    totalAtRiskApplicationCount: 0,
+    totalCriticalMemberCount: 0,
+    totalCriticalAtRiskMemberCount: 0,
+    totalCriticalApplicationCount: 0,
+    totalCriticalAtRiskApplicationCount: 0,
   };
 }
+export function getAtRiskApplicationList(
+  cipherHealthReportDetails: ApplicationHealthReportDetail[],
+): AtRiskApplicationDetail[] {
+  const applicationPasswordRiskMap = new Map<string, number>();
+
+  cipherHealthReportDetails
+    .filter((app) => app.atRiskPasswordCount > 0)
+    .forEach((app) => {
+      const atRiskPasswordCount = applicationPasswordRiskMap.get(app.applicationName) ?? 0;
+      applicationPasswordRiskMap.set(
+        app.applicationName,
+        atRiskPasswordCount + app.atRiskPasswordCount,
+      );
+    });
+
+  return Array.from(applicationPasswordRiskMap.entries()).map(
+    ([applicationName, atRiskPasswordCount]) => ({
+      applicationName,
+      atRiskPasswordCount,
+    }),
+  );
+}
+/**
+ * Generates a list of members with at-risk passwords along with the number of at-risk passwords.
+ */
+export function getAtRiskMemberList(
+  cipherHealthReportDetails: ApplicationHealthReportDetail[],
+): AtRiskMemberDetail[] {
+  const memberRiskMap = new Map<string, number>();
+
+  cipherHealthReportDetails.forEach((app) => {
+    app.atRiskMemberDetails.forEach((member) => {
+      const currentCount = memberRiskMap.get(member.email) ?? 0;
+      memberRiskMap.set(member.email, currentCount + 1);
+    });
+  });
+
+  return Array.from(memberRiskMap.entries()).map(([email, atRiskPasswordCount]) => ({
+    email,
+    atRiskPasswordCount,
+  }));
+}
 
 /**
- * Creates a flattened cipher details object for URI reporting
- * @param detail Cipher health report detail
- * @param uri Trimmed URI
- * @returns Flattened cipher health details to URI
+ * Builds a map of passwords to the number of times they are used across ciphers
+ *
+ * @param ciphers List of ciphers to check for password reuse
+ * @returns A map where the key is the password and the value is the number of times it is used
  */
-export function getFlattenedCipherDetails(
-  detail: LEGACY_CipherHealthReportDetail,
-  uri: string,
-): LEGACY_CipherHealthReportUriDetail {
-  return {
-    cipherId: detail.id,
-    reusedPasswordCount: detail.reusedPasswordCount,
-    weakPasswordDetail: detail.weakPasswordDetail,
-    exposedPasswordDetail: detail.exposedPasswordDetail,
-    cipherMembers: detail.cipherMembers,
-    trimmedUri: uri,
-    cipher: detail as CipherView,
-  };
-}
-
-/**
- * Create the new application health report detail object with the details from the cipher health report uri detail object
- * update or create the at risk values if the item is at risk.
- * @param newUriDetail New cipher uri detail
- * @param isAtRisk If the cipher has a weak, exposed, or reused password it is at risk
- * @param existingUriDetail The previously processed Uri item
- * @returns The new or updated application health report detail
- */
-export function getApplicationReportDetail(
-  newUriDetail: LEGACY_CipherHealthReportUriDetail,
-  isAtRisk: boolean,
-  existingUriDetail?: ApplicationHealthReportDetail,
-): ApplicationHealthReportDetail {
-  const reportDetail = {
-    applicationName: existingUriDetail
-      ? existingUriDetail.applicationName
-      : newUriDetail.trimmedUri,
-    passwordCount: existingUriDetail ? existingUriDetail.passwordCount + 1 : 1,
-    memberDetails: existingUriDetail
-      ? getUniqueMembers(existingUriDetail.memberDetails.concat(newUriDetail.cipherMembers))
-      : newUriDetail.cipherMembers,
-    atRiskMemberDetails: existingUriDetail ? existingUriDetail.atRiskMemberDetails : [],
-    atRiskPasswordCount: existingUriDetail ? existingUriDetail.atRiskPasswordCount : 0,
-    atRiskCipherIds: existingUriDetail ? existingUriDetail.atRiskCipherIds : [],
-    atRiskMemberCount: existingUriDetail ? existingUriDetail.atRiskMemberDetails.length : 0,
-    cipherIds: existingUriDetail
-      ? existingUriDetail.cipherIds.concat(newUriDetail.cipherId)
-      : [newUriDetail.cipherId],
-  } as ApplicationHealthReportDetail;
-
-  if (isAtRisk) {
-    reportDetail.atRiskPasswordCount = reportDetail.atRiskPasswordCount + 1;
-    reportDetail.atRiskCipherIds.push(newUriDetail.cipherId);
-
-    reportDetail.atRiskMemberDetails = getUniqueMembers(
-      reportDetail.atRiskMemberDetails.concat(newUriDetail.cipherMembers),
-    );
-    reportDetail.atRiskMemberCount = reportDetail.atRiskMemberDetails.length;
-  }
-
-  reportDetail.memberCount = reportDetail.memberDetails.length;
-
-  return reportDetail;
+export function buildPasswordUseMap(ciphers: CipherView[]): Map<string, number> {
+  const passwordUseMap = new Map<string, number>();
+  ciphers.forEach((cipher) => {
+    const password = cipher.login.password!;
+    passwordUseMap.set(password, (passwordUseMap.get(password) || 0) + 1);
+  });
+  return passwordUseMap;
 }
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/basic-type-guards.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/basic-type-guards.ts
new file mode 100644
index 00000000000..47d638b41e5
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/basic-type-guards.ts
@@ -0,0 +1,162 @@
+// I'm leaving this here as an example of further improvements we can make to check types
+// We can define a nominal type for PositiveSafeNumber to enhance type safety
+// const POSITIVE_SAFE_NUMBER_SYMBOL: unique symbol = Symbol("POSITIVE_SAFE_NUMBER");
+
+// This file sets up basic types and guards for values we expect from decrypted data
+
+// Basic types
+export type BoundedString = string;
+export type BoundedStringOrNull = BoundedString | null;
+export type PositiveSafeNumber = number;
+export type BoundedArray<T> = T[];
+export type DateOrNull = Date | null;
+export type DateString = string;
+export type DateStringOrNull = DateString | null;
+
+// Constants
+/**
+ * Security limits for validation (prevent DoS attacks and ensure reasonable data sizes)
+ */
+export const BOUNDED_STRING_MAX_LENGTH = 1000; // Reasonable limit for names, emails, GUIDs
+export const BOUNDED_ARRAY_MAX_LENGTH = 50000; // Reasonable limit for report arrays
+export const BOUNDED_NUMBER_MAX_COUNT = 10000000; // 10 million - reasonable upper bound for count fields
+
+// Type guard methods
+export function isBoolean(value: unknown): value is boolean {
+  return typeof value === "boolean";
+}
+
+export function isBoundedPositiveNumber(value: unknown): value is PositiveSafeNumber {
+  return (
+    typeof value === "number" &&
+    Number.isFinite(value) &&
+    Number.isSafeInteger(value) &&
+    value >= 0 &&
+    value <= BOUNDED_NUMBER_MAX_COUNT
+  );
+}
+
+export function isBoundedString(value: unknown): value is BoundedString {
+  return typeof value === "string" && value.length > 0 && value.length <= BOUNDED_STRING_MAX_LENGTH;
+}
+
+export function isBoundedStringOrNull(value: unknown): value is BoundedStringOrNull {
+  return value == null || isBoundedString(value);
+}
+
+export const isBoundedStringArray = createBoundedArrayGuard(isBoundedString);
+
+export function isBoundedArray<T>(arr: unknown): arr is BoundedArray<T> {
+  return Array.isArray(arr) && arr.length < BOUNDED_ARRAY_MAX_LENGTH;
+}
+
+/**
+ * A type guard to check if a value is a valid Date object
+ * @param value The value to check
+ * @returns True if the value is a valid Date object, false otherwise
+ */
+export function isDate(value: unknown): value is Date {
+  return value instanceof Date && !isNaN(value.getTime());
+}
+
+/**
+ * A type guard to check if a value is a valid Date object or null
+ * @param value The value to check
+ * @returns True if the value is a valid Date object, false otherwise
+ */
+export function isDateOrNull(value: unknown): value is DateOrNull {
+  return value === null || isDate(value);
+}
+
+/**
+ * A type guard to check if a value is a valid date string
+ * This also checks that the string value can be correctly parsed into a valid Date object
+ * @param value The value to check
+ * @returns True if the value is a valid date string, false otherwise
+ */
+export function isDateString(value: unknown): value is DateString {
+  if (typeof value !== "string") {
+    return false;
+  }
+
+  // Attempt to create a Date object from the string.
+  const date = new Date(value);
+
+  // Return true only if the string produced a valid date.
+  // We use `getTime()` to check for validity, as `new Date('invalid')` returns `NaN` for its time value.
+  return !isNaN(date.getTime());
+}
+
+/**
+ * A type guard to check if a value is a valid date string or null
+ * This also checks that the string value can be correctly parsed into a valid Date object
+ * @param value The value to check
+ * @returns True if the value is a valid date string or null, false otherwise
+ */
+export function isDateStringOrNull(value: unknown): value is DateStringOrNull {
+  return value === null || isDateString(value);
+}
+
+/**
+ * A higher-order function that takes a type guard for T and returns a
+ * new type guard for an array of T.
+ */
+export function createBoundedArrayGuard<T>(isType: (item: unknown) => item is T) {
+  return function (arr: unknown): arr is T[] {
+    return isBoundedArray(arr) && arr.every(isType);
+  };
+}
+
+type TempObject = Record<PropertyKey, unknown>;
+
+/**
+ *
+ * @param validators
+ * @returns
+ */
+export function createValidator<T>(validators: {
+  [K in keyof T]: (value: unknown) => value is T[K];
+}): (obj: unknown) => obj is T {
+  const keys = Object.keys(validators) as (keyof T)[];
+
+  return function (obj: unknown): obj is T {
+    if (typeof obj !== "object" || obj === null) {
+      return false;
+    }
+
+    if (Object.getPrototypeOf(obj) !== Object.prototype) {
+      return false;
+    }
+
+    // Prevent dangerous properties that could be used for prototype pollution
+    // Check for __proto__, constructor, and prototype as own properties
+    const dangerousKeys = ["__proto__", "constructor", "prototype"];
+    for (const key of dangerousKeys) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        return false;
+      }
+    }
+
+    // Type cast to TempObject for key checks
+    const tempObj = obj as TempObject;
+
+    // Commenting out for compatibility of removed keys from data
+    // Leaving the code commented for now for further discussion
+    // Check for unexpected properties
+    // const actualKeys = Object.keys(tempObj);
+    // const expectedKeys = new Set(keys as string[]);
+    // if (actualKeys.some((key) => !expectedKeys.has(key))) {
+    //   return false;
+    // }
+
+    // Check for each property's existence and type
+    return keys.every((key) => {
+      // Use 'in' to check for property existence before accessing it
+      if (!(key in tempObj)) {
+        return false;
+      }
+      // Pass the value to its specific validator
+      return validators[key](tempObj[key]);
+    });
+  };
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/risk-insights-type-guards.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/risk-insights-type-guards.spec.ts
new file mode 100644
index 00000000000..f48437ab006
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/risk-insights-type-guards.spec.ts
@@ -0,0 +1,554 @@
+import { MemberDetails } from "../../models";
+
+import {
+  isApplicationHealthReportDetail,
+  isMemberDetails,
+  isOrganizationReportApplication,
+  isOrganizationReportSummary,
+  validateApplicationHealthReportDetailArray,
+  validateOrganizationReportApplicationArray,
+  validateOrganizationReportSummary,
+} from "./risk-insights-type-guards";
+
+describe("Risk Insights Type Guards", () => {
+  describe("validateApplicationHealthReportDetailArray", () => {
+    it("should validate valid ApplicationHealthReportDetail array", () => {
+      const validData = [
+        {
+          applicationName: "Test App",
+          passwordCount: 10,
+          atRiskPasswordCount: 2,
+          atRiskCipherIds: ["cipher-1", "cipher-2"],
+          memberCount: 5,
+          atRiskMemberCount: 1,
+          memberDetails: [
+            {
+              userGuid: "user-1",
+              userName: "John Doe",
+              email: "john@example.com",
+              cipherId: "cipher-1",
+            },
+          ],
+          atRiskMemberDetails: [
+            {
+              userGuid: "user-2",
+              userName: "Jane Doe",
+              email: "jane@example.com",
+              cipherId: "cipher-2",
+            },
+          ],
+          cipherIds: ["cipher-1", "cipher-2"],
+        },
+      ];
+
+      expect(() => validateApplicationHealthReportDetailArray(validData)).not.toThrow();
+      expect(validateApplicationHealthReportDetailArray(validData)).toEqual(validData);
+    });
+
+    it("should throw error for non-array input", () => {
+      expect(() => validateApplicationHealthReportDetailArray("not an array")).toThrow(
+        "Invalid report data: expected array of ApplicationHealthReportDetail, received non-array",
+      );
+    });
+
+    it("should throw error for array with invalid elements", () => {
+      const invalidData = [
+        {
+          applicationName: "Test App",
+          // missing required fields
+        },
+      ];
+
+      expect(() => validateApplicationHealthReportDetailArray(invalidData)).toThrow(
+        /Invalid report data: array contains 1 invalid ApplicationHealthReportDetail element\(s\) at indices: 0/,
+      );
+    });
+
+    it("should throw error for array with multiple invalid elements", () => {
+      const invalidData = [
+        { applicationName: "App 1" }, // invalid
+        {
+          applicationName: "App 2",
+          passwordCount: 10,
+          atRiskPasswordCount: 2,
+          atRiskCipherIds: ["cipher-1"],
+          memberCount: 5,
+          atRiskMemberCount: 1,
+          memberDetails: [] as MemberDetails[],
+          atRiskMemberDetails: [] as MemberDetails[],
+          cipherIds: ["cipher-1"],
+        }, // valid
+        { applicationName: "App 3" }, // invalid
+      ];
+
+      expect(() => validateApplicationHealthReportDetailArray(invalidData)).toThrow(
+        /Invalid report data: array contains 2 invalid ApplicationHealthReportDetail element\(s\) at indices: 0, 2/,
+      );
+    });
+
+    it("should throw error for invalid memberDetails", () => {
+      const invalidData = [
+        {
+          applicationName: "Test App",
+          passwordCount: 10,
+          atRiskPasswordCount: 2,
+          atRiskCipherIds: ["cipher-1"],
+          memberCount: 5,
+          atRiskMemberCount: 1,
+          memberDetails: [{ userGuid: "user-1" }] as any, // missing required fields
+          atRiskMemberDetails: [] as MemberDetails[],
+          cipherIds: ["cipher-1"],
+        },
+      ];
+
+      expect(() => validateApplicationHealthReportDetailArray(invalidData)).toThrow(
+        /Invalid report data/,
+      );
+    });
+
+    it("should throw error for empty string in atRiskCipherIds", () => {
+      const invalidData = [
+        {
+          applicationName: "Test App",
+          passwordCount: 10,
+          atRiskPasswordCount: 2,
+          atRiskCipherIds: ["cipher-1", "", "cipher-3"], // empty string
+          memberCount: 5,
+          atRiskMemberCount: 1,
+          memberDetails: [] as MemberDetails[],
+          atRiskMemberDetails: [] as MemberDetails[],
+          cipherIds: ["cipher-1"],
+        },
+      ];
+
+      expect(() => validateApplicationHealthReportDetailArray(invalidData)).toThrow(
+        /Invalid report data/,
+      );
+    });
+
+    it("should throw error for empty string in cipherIds", () => {
+      const invalidData = [
+        {
+          applicationName: "Test App",
+          passwordCount: 10,
+          atRiskPasswordCount: 2,
+          atRiskCipherIds: ["cipher-1"],
+          memberCount: 5,
+          atRiskMemberCount: 1,
+          memberDetails: [] as MemberDetails[],
+          atRiskMemberDetails: [] as MemberDetails[],
+          cipherIds: ["", "cipher-2"], // empty string
+        },
+      ];
+
+      expect(() => validateApplicationHealthReportDetailArray(invalidData)).toThrow(
+        /Invalid report data/,
+      );
+    });
+  });
+
+  describe("validateOrganizationReportSummary", () => {
+    it("should validate valid OrganizationReportSummary", () => {
+      const validData = {
+        totalMemberCount: 10,
+        totalApplicationCount: 5,
+        totalAtRiskMemberCount: 2,
+        totalAtRiskApplicationCount: 1,
+        totalCriticalApplicationCount: 3,
+        totalCriticalMemberCount: 4,
+        totalCriticalAtRiskMemberCount: 1,
+        totalCriticalAtRiskApplicationCount: 1,
+      };
+
+      expect(() => validateOrganizationReportSummary(validData)).not.toThrow();
+      expect(validateOrganizationReportSummary(validData)).toEqual(validData);
+    });
+
+    it("should throw error for invalid field types", () => {
+      const invalidData = {
+        totalMemberCount: "10", // should be number
+        totalApplicationCount: 5,
+        totalAtRiskMemberCount: 2,
+        totalAtRiskApplicationCount: 1,
+        totalCriticalApplicationCount: 3,
+        totalCriticalMemberCount: 4,
+        totalCriticalAtRiskMemberCount: 1,
+        totalCriticalAtRiskApplicationCount: 1,
+      };
+
+      expect(() => validateOrganizationReportSummary(invalidData)).toThrow(
+        /Invalid report summary/,
+      );
+    });
+  });
+
+  describe("validateOrganizationReportApplicationArray", () => {
+    it("should validate valid OrganizationReportApplication array", () => {
+      const validData = [
+        {
+          applicationName: "Test App",
+          isCritical: true,
+          reviewedDate: null,
+        },
+        {
+          applicationName: "Another App",
+          isCritical: false,
+          reviewedDate: new Date("2024-01-01"),
+        },
+      ];
+
+      expect(() => validateOrganizationReportApplicationArray(validData)).not.toThrow();
+      const result = validateOrganizationReportApplicationArray(validData);
+      expect(result[0].applicationName).toBe("Test App");
+      expect(result[1].reviewedDate).toBeInstanceOf(Date);
+    });
+
+    it("should convert string dates to Date objects", () => {
+      const validData = [
+        {
+          applicationName: "Test App",
+          isCritical: true,
+          reviewedDate: "2024-01-01T00:00:00.000Z",
+        },
+      ];
+
+      const result = validateOrganizationReportApplicationArray(validData);
+      expect(result[0].reviewedDate).toBeInstanceOf(Date);
+      expect(result[0].reviewedDate?.toISOString()).toBe("2024-01-01T00:00:00.000Z");
+    });
+
+    it("should throw error for invalid date strings", () => {
+      const invalidData = [
+        {
+          applicationName: "Test App",
+          isCritical: true,
+          reviewedDate: "invalid-date",
+        },
+      ];
+
+      expect(() => validateOrganizationReportApplicationArray(invalidData)).toThrow(
+        "Invalid application data: array contains 1 invalid OrganizationReportApplication element(s) at indices: 0",
+      );
+    });
+
+    it("should throw error for non-array input", () => {
+      expect(() => validateOrganizationReportApplicationArray("not an array")).toThrow(
+        "Invalid application data: expected array of OrganizationReportApplication, received non-array",
+      );
+    });
+
+    it("should throw error for array with invalid elements", () => {
+      const invalidData = [
+        {
+          applicationName: "Test App",
+          reviewedDate: null as any,
+          // missing isCritical field
+        } as any,
+      ];
+
+      expect(() => validateOrganizationReportApplicationArray(invalidData)).toThrow(
+        /Invalid application data: array contains 1 invalid OrganizationReportApplication element\(s\) at indices: 0/,
+      );
+    });
+
+    it("should throw error for invalid field types", () => {
+      const invalidData = [
+        {
+          applicationName: 123 as any, // should be string
+          isCritical: true,
+          reviewedDate: null as any,
+        } as any,
+      ];
+
+      expect(() => validateOrganizationReportApplicationArray(invalidData)).toThrow(
+        /Invalid application data/,
+      );
+    });
+
+    it("should accept null reviewedDate", () => {
+      const validData = [
+        {
+          applicationName: "Test App",
+          isCritical: true,
+          reviewedDate: null as any,
+        },
+      ];
+
+      expect(() => validateOrganizationReportApplicationArray(validData)).not.toThrow();
+      const result = validateOrganizationReportApplicationArray(validData);
+      expect(result[0].reviewedDate).toBeNull();
+    });
+  });
+
+  // Tests for exported type guard functions
+  describe("isMemberDetails", () => {
+    it("should return true for valid MemberDetails", () => {
+      const validData = {
+        userGuid: "user-1",
+        userName: "John Doe",
+        email: "john@example.com",
+        cipherId: "cipher-1",
+      };
+      expect(isMemberDetails(validData)).toBe(true);
+    });
+
+    it("should return false for empty userGuid", () => {
+      const invalidData = {
+        userGuid: "",
+        userName: "John Doe",
+        email: "john@example.com",
+        cipherId: "cipher-1",
+      };
+      expect(isMemberDetails(invalidData)).toBe(false);
+    });
+
+    it("should return false for empty userName", () => {
+      const invalidData = {
+        userGuid: "user-1",
+        userName: "",
+        email: "john@example.com",
+        cipherId: "cipher-1",
+      };
+      expect(isMemberDetails(invalidData)).toBe(false);
+    });
+
+    it("should return true for null userName", () => {
+      const validData = {
+        userGuid: "user-1",
+        userName: null as string | null,
+        email: "john@example.com",
+        cipherId: "cipher-1",
+      };
+      expect(isMemberDetails(validData)).toBe(true);
+    });
+
+    it("should return false for empty email", () => {
+      const invalidData = {
+        userGuid: "user-1",
+        userName: "John Doe",
+        email: "",
+        cipherId: "cipher-1",
+      };
+      expect(isMemberDetails(invalidData)).toBe(false);
+    });
+
+    it("should return false for empty cipherId", () => {
+      const invalidData = {
+        userGuid: "user-1",
+        userName: "John Doe",
+        email: "john@example.com",
+        cipherId: "",
+      };
+      expect(isMemberDetails(invalidData)).toBe(false);
+    });
+
+    it("should return false for prototype pollution attempts", () => {
+      const invalidData = {
+        userGuid: "user-1",
+        userName: "John Doe",
+        email: "john@example.com",
+        cipherId: "cipher-1",
+        __proto__: { malicious: "payload" },
+      };
+      expect(isMemberDetails(invalidData)).toBe(false);
+    });
+  });
+
+  describe("isApplicationHealthReportDetail", () => {
+    it("should return true for valid ApplicationHealthReportDetail", () => {
+      const validData = {
+        applicationName: "Test App",
+        passwordCount: 10,
+        atRiskPasswordCount: 2,
+        atRiskCipherIds: ["cipher-1"],
+        memberCount: 5,
+        atRiskMemberCount: 1,
+        memberDetails: [] as MemberDetails[],
+        atRiskMemberDetails: [] as MemberDetails[],
+        cipherIds: ["cipher-1"],
+      };
+      expect(isApplicationHealthReportDetail(validData)).toBe(true);
+    });
+
+    it("should return false for empty applicationName", () => {
+      const invalidData = {
+        applicationName: "",
+        passwordCount: 10,
+        atRiskPasswordCount: 2,
+        atRiskCipherIds: ["cipher-1"],
+        memberCount: 5,
+        atRiskMemberCount: 1,
+        memberDetails: [] as MemberDetails[],
+        atRiskMemberDetails: [] as MemberDetails[],
+        cipherIds: ["cipher-1"],
+      };
+      expect(isApplicationHealthReportDetail(invalidData)).toBe(false);
+    });
+
+    it("should return false for NaN passwordCount", () => {
+      const invalidData = {
+        applicationName: "Test App",
+        passwordCount: NaN,
+        atRiskPasswordCount: 2,
+        atRiskCipherIds: ["cipher-1"],
+        memberCount: 5,
+        atRiskMemberCount: 1,
+        memberDetails: [] as MemberDetails[],
+        atRiskMemberDetails: [] as MemberDetails[],
+        cipherIds: ["cipher-1"],
+      };
+      expect(isApplicationHealthReportDetail(invalidData)).toBe(false);
+    });
+
+    it("should return false for Infinity passwordCount", () => {
+      const invalidData = {
+        applicationName: "Test App",
+        passwordCount: Infinity,
+        atRiskPasswordCount: 2,
+        atRiskCipherIds: ["cipher-1"],
+        memberCount: 5,
+        atRiskMemberCount: 1,
+        memberDetails: [] as MemberDetails[],
+        atRiskMemberDetails: [] as MemberDetails[],
+        cipherIds: ["cipher-1"],
+      };
+      expect(isApplicationHealthReportDetail(invalidData)).toBe(false);
+    });
+
+    it("should return false for negative passwordCount", () => {
+      const invalidData = {
+        applicationName: "Test App",
+        passwordCount: -5,
+        atRiskPasswordCount: 2,
+        atRiskCipherIds: ["cipher-1"],
+        memberCount: 5,
+        atRiskMemberCount: 1,
+        memberDetails: [] as MemberDetails[],
+        atRiskMemberDetails: [] as MemberDetails[],
+        cipherIds: ["cipher-1"],
+      };
+      expect(isApplicationHealthReportDetail(invalidData)).toBe(false);
+    });
+
+    it("should return false for negative memberCount", () => {
+      const invalidData = {
+        applicationName: "Test App",
+        passwordCount: 10,
+        atRiskPasswordCount: 2,
+        atRiskCipherIds: ["cipher-1"],
+        memberCount: -1,
+        atRiskMemberCount: 1,
+        memberDetails: [] as MemberDetails[],
+        atRiskMemberDetails: [] as MemberDetails[],
+        cipherIds: ["cipher-1"],
+      };
+      expect(isApplicationHealthReportDetail(invalidData)).toBe(false);
+    });
+  });
+
+  describe("isOrganizationReportSummary", () => {
+    it("should return true for valid OrganizationReportSummary", () => {
+      const validData = {
+        totalMemberCount: 10,
+        totalApplicationCount: 5,
+        totalAtRiskMemberCount: 2,
+        totalAtRiskApplicationCount: 1,
+        totalCriticalApplicationCount: 3,
+        totalCriticalMemberCount: 4,
+        totalCriticalAtRiskMemberCount: 1,
+        totalCriticalAtRiskApplicationCount: 1,
+      };
+      expect(isOrganizationReportSummary(validData)).toBe(true);
+    });
+
+    it("should return false for NaN totalMemberCount", () => {
+      const invalidData = {
+        totalMemberCount: NaN,
+        totalApplicationCount: 5,
+        totalAtRiskMemberCount: 2,
+        totalAtRiskApplicationCount: 1,
+        totalCriticalApplicationCount: 3,
+        totalCriticalMemberCount: 4,
+        totalCriticalAtRiskMemberCount: 1,
+        totalCriticalAtRiskApplicationCount: 1,
+      };
+      expect(isOrganizationReportSummary(invalidData)).toBe(false);
+    });
+
+    it("should return false for Infinity totalApplicationCount", () => {
+      const invalidData = {
+        totalMemberCount: 10,
+        totalApplicationCount: Infinity,
+        totalAtRiskMemberCount: 2,
+        totalAtRiskApplicationCount: 1,
+        totalCriticalApplicationCount: 3,
+        totalCriticalMemberCount: 4,
+        totalCriticalAtRiskMemberCount: 1,
+        totalCriticalAtRiskApplicationCount: 1,
+      };
+      expect(isOrganizationReportSummary(invalidData)).toBe(false);
+    });
+
+    it("should return false for negative totalAtRiskMemberCount", () => {
+      const invalidData = {
+        totalMemberCount: 10,
+        totalApplicationCount: 5,
+        totalAtRiskMemberCount: -1,
+        totalAtRiskApplicationCount: 1,
+        totalCriticalApplicationCount: 3,
+        totalCriticalMemberCount: 4,
+        totalCriticalAtRiskMemberCount: 1,
+        totalCriticalAtRiskApplicationCount: 1,
+      };
+      expect(isOrganizationReportSummary(invalidData)).toBe(false);
+    });
+  });
+
+  describe("isOrganizationReportApplication", () => {
+    it("should return true for valid OrganizationReportApplication", () => {
+      const validData = {
+        applicationName: "Test App",
+        isCritical: true,
+        reviewedDate: null as Date | null,
+      };
+      expect(isOrganizationReportApplication(validData)).toBe(true);
+    });
+
+    it("should return false for empty applicationName", () => {
+      const invalidData = {
+        applicationName: "",
+        isCritical: true,
+        reviewedDate: null as Date | null,
+      };
+      expect(isOrganizationReportApplication(invalidData)).toBe(false);
+    });
+
+    it("should return true for Date reviewedDate", () => {
+      const validData = {
+        applicationName: "Test App",
+        isCritical: true,
+        reviewedDate: new Date(),
+      };
+      expect(isOrganizationReportApplication(validData)).toBe(true);
+    });
+
+    it("should return true for string reviewedDate", () => {
+      const validData = {
+        applicationName: "Test App",
+        isCritical: false,
+        reviewedDate: "2024-01-01",
+      };
+      expect(isOrganizationReportApplication(validData)).toBe(true);
+    });
+
+    it("should return false for prototype pollution attempts via __proto__", () => {
+      const invalidData = {
+        applicationName: "Test App",
+        isCritical: true,
+        reviewedDate: null as Date | null,
+        __proto__: { polluted: true },
+      };
+      expect(isOrganizationReportApplication(invalidData)).toBe(false);
+    });
+  });
+});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/risk-insights-type-guards.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/risk-insights-type-guards.ts
new file mode 100644
index 00000000000..c1aa028da1f
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/helpers/type-guards/risk-insights-type-guards.ts
@@ -0,0 +1,205 @@
+import { CipherId } from "@bitwarden/common/types/guid";
+
+import {
+  ApplicationHealthReportDetail,
+  MemberDetails,
+  OrganizationReportApplication,
+  OrganizationReportSummary,
+} from "../../models";
+
+import {
+  createBoundedArrayGuard,
+  createValidator,
+  isBoolean,
+  isBoundedString,
+  isBoundedStringOrNull,
+  isBoundedPositiveNumber,
+  BOUNDED_ARRAY_MAX_LENGTH,
+  isDate,
+  isDateString,
+} from "./basic-type-guards";
+
+// Risk Insights specific type guards
+
+/**
+ * Type guard to validate MemberDetails structure
+ * Exported for testability
+ * Strict validation: rejects objects with unexpected properties and prototype pollution
+ */
+export const isMemberDetails = createValidator<MemberDetails>({
+  userGuid: isBoundedString,
+  userName: isBoundedStringOrNull,
+  email: isBoundedString,
+  cipherId: isBoundedString,
+});
+export const isMemberDetailsArray = createBoundedArrayGuard(isMemberDetails);
+
+export function isCipherId(value: unknown): value is CipherId {
+  return value == null || isBoundedString(value);
+}
+export const isCipherIdArray = createBoundedArrayGuard(isCipherId);
+/**
+ * Type guard to validate ApplicationHealthReportDetail structure
+ * Exported for testability
+ * Strict validation: rejects objects with unexpected properties and prototype pollution
+ */
+export const isApplicationHealthReportDetail = createValidator<ApplicationHealthReportDetail>({
+  applicationName: isBoundedString,
+  atRiskCipherIds: isCipherIdArray,
+  atRiskMemberCount: isBoundedPositiveNumber,
+  atRiskMemberDetails: isMemberDetailsArray,
+  atRiskPasswordCount: isBoundedPositiveNumber,
+  cipherIds: isCipherIdArray,
+  memberCount: isBoundedPositiveNumber,
+  memberDetails: isMemberDetailsArray,
+  passwordCount: isBoundedPositiveNumber,
+});
+export const isApplicationHealthReportDetailArray = createBoundedArrayGuard(
+  isApplicationHealthReportDetail,
+);
+
+/**
+ * Type guard to validate OrganizationReportSummary structure
+ * Exported for testability
+ * Strict validation: rejects objects with unexpected properties and prototype pollution
+ */
+export const isOrganizationReportSummary = createValidator<OrganizationReportSummary>({
+  totalMemberCount: isBoundedPositiveNumber,
+  totalApplicationCount: isBoundedPositiveNumber,
+  totalAtRiskMemberCount: isBoundedPositiveNumber,
+  totalAtRiskApplicationCount: isBoundedPositiveNumber,
+  totalCriticalApplicationCount: isBoundedPositiveNumber,
+  totalCriticalMemberCount: isBoundedPositiveNumber,
+  totalCriticalAtRiskMemberCount: isBoundedPositiveNumber,
+  totalCriticalAtRiskApplicationCount: isBoundedPositiveNumber,
+});
+
+// Adding to support reviewedDate casting for mapping until the date is saved as a string
+function isValidDateOrNull(value: unknown): value is Date | null {
+  return value == null || isDate(value) || isDateString(value);
+}
+
+/**
+ * Type guard to validate OrganizationReportApplication structure
+ * Exported for testability
+ * Strict validation: rejects objects with unexpected properties and prototype pollution
+ */
+export const isOrganizationReportApplication = createValidator<OrganizationReportApplication>({
+  applicationName: isBoundedString,
+  isCritical: isBoolean,
+  // ReviewedDate is currently being saved to the database as a Date type
+  // We can improve this when OrganizationReportApplication is updated
+  // to use the Domain, Api, and View model pattern to convert the type to a string
+  // for storage instead of Date
+  // Should eventually be changed to isDateStringOrNull
+  reviewedDate: isValidDateOrNull,
+});
+export const isOrganizationReportApplicationArray = createBoundedArrayGuard(
+  isOrganizationReportApplication,
+);
+
+/**
+ * Validates and returns an array of ApplicationHealthReportDetail
+ * @throws Error if validation fails
+ */
+export function validateApplicationHealthReportDetailArray(
+  data: unknown,
+): ApplicationHealthReportDetail[] {
+  if (!Array.isArray(data)) {
+    throw new Error(
+      "Invalid report data: expected array of ApplicationHealthReportDetail, received non-array",
+    );
+  }
+
+  if (data.length > BOUNDED_ARRAY_MAX_LENGTH) {
+    throw new Error(
+      `Invalid report data: array length ${data.length} exceeds maximum allowed length ${BOUNDED_ARRAY_MAX_LENGTH}`,
+    );
+  }
+
+  const invalidItems = data
+    .map((item, index) => ({ item, index }))
+    .filter(({ item }) => !isApplicationHealthReportDetail(item));
+
+  if (invalidItems.length > 0) {
+    const invalidIndices = invalidItems.map(({ index }) => index).join(", ");
+    throw new Error(
+      `Invalid report data: array contains ${invalidItems.length} invalid ApplicationHealthReportDetail element(s) at indices: ${invalidIndices}`,
+    );
+  }
+
+  if (!isApplicationHealthReportDetailArray(data)) {
+    // Throw for type casting return
+    // Should never get here
+    throw new Error("Invalid report data");
+  }
+
+  return data;
+}
+
+/**
+ * Validates and returns OrganizationReportSummary
+ * @throws Error if validation fails
+ */
+export function validateOrganizationReportSummary(data: unknown): OrganizationReportSummary {
+  if (!isOrganizationReportSummary(data)) {
+    throw new Error("Invalid report summary");
+  }
+
+  return data;
+}
+
+/**
+ * Validates and returns an array of OrganizationReportApplication
+ * @throws Error if validation fails
+ */
+export function validateOrganizationReportApplicationArray(
+  data: unknown,
+): OrganizationReportApplication[] {
+  if (!Array.isArray(data)) {
+    throw new Error(
+      "Invalid application data: expected array of OrganizationReportApplication, received non-array",
+    );
+  }
+
+  if (data.length > BOUNDED_ARRAY_MAX_LENGTH) {
+    throw new Error(
+      `Invalid application data: array length ${data.length} exceeds maximum allowed length ${BOUNDED_ARRAY_MAX_LENGTH}`,
+    );
+  }
+
+  const invalidItems = data
+    .map((item, index) => ({ item, index }))
+    .filter(({ item }) => !isOrganizationReportApplication(item));
+
+  if (invalidItems.length > 0) {
+    const invalidIndices = invalidItems.map(({ index }) => index).join(", ");
+    throw new Error(
+      `Invalid application data: array contains ${invalidItems.length} invalid OrganizationReportApplication element(s) at indices: ${invalidIndices}`,
+    );
+  }
+
+  const mappedData = data.map((item) => ({
+    ...item,
+    reviewedDate: item.reviewedDate
+      ? item.reviewedDate instanceof Date
+        ? item.reviewedDate
+        : (() => {
+            const date = new Date(item.reviewedDate);
+            if (!isDate(date)) {
+              throw new Error(`Invalid date string: ${item.reviewedDate}`);
+            }
+            return date;
+          })()
+      : null,
+  }));
+
+  if (!isOrganizationReportApplicationArray(mappedData)) {
+    // Throw for type casting return
+    // Should never get here
+    throw new Error("Invalid application data");
+  }
+
+  // Convert string dates to Date objects for reviewedDate
+  return mappedData;
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/index.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/index.ts
index b2221a94a89..d6295daa03f 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/index.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/index.ts
@@ -1 +1,2 @@
 export * from "./services";
+export * from "./models";
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/api-models.types.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/api-models.types.ts
index 1386b2d044f..a5b8e86dcce 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/api-models.types.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/api-models.types.ts
@@ -1,7 +1,11 @@
-import { EncryptedString } from "@bitwarden/common/key-management/crypto/models/enc-string";
-import { OrganizationId } from "@bitwarden/common/types/guid";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { OrganizationId, OrganizationReportId } from "@bitwarden/common/types/guid";
 
-import { PasswordHealthReportApplicationId, RiskInsightsReport } from "./report-models";
+import { createNewSummaryData } from "../helpers";
+
+import { RiskInsightsMetricsData } from "./data/risk-insights-metrics.data";
+import { OrganizationReportSummary, PasswordHealthReportApplicationId } from "./report-models";
 
 // -------------------- Password Health Report Models --------------------
 /**
@@ -32,18 +36,116 @@ export interface PasswordHealthReportApplicationsRequest {
 
 // -------------------- Risk Insights Report Models --------------------
 export interface SaveRiskInsightsReportRequest {
-  data: RiskInsightsReport;
+  data: {
+    organizationId: OrganizationId;
+    creationDate: string;
+    reportData: string;
+    summaryData: string;
+    applicationData: string;
+    metrics: RiskInsightsMetricsData;
+    contentEncryptionKey: string;
+  };
 }
 
-export interface SaveRiskInsightsReportResponse {
-  id: string;
+export class SaveRiskInsightsReportResponse extends BaseResponse {
+  id: OrganizationReportId;
+
+  constructor(response: any) {
+    super(response);
+    this.id = this.getResponseProperty("id");
+  }
+}
+export function isSaveRiskInsightsReportResponse(obj: any): obj is SaveRiskInsightsReportResponse {
+  return obj && typeof obj.id === "string" && obj.id !== "";
 }
 
-export interface GetRiskInsightsReportResponse {
+export class GetRiskInsightsReportResponse extends BaseResponse {
   id: string;
   organizationId: OrganizationId;
-  // TODO Update to use creationDate from server
-  date: string;
-  reportData: EncryptedString;
-  contentEncryptionKey: EncryptedString;
+  creationDate: Date;
+  reportData: EncString;
+  summaryData: EncString;
+  applicationData: EncString;
+  contentEncryptionKey: EncString;
+
+  constructor(response: any) {
+    super(response);
+
+    this.id = this.getResponseProperty("id");
+    this.organizationId = this.getResponseProperty("organizationId");
+    this.creationDate = new Date(this.getResponseProperty("creationDate"));
+    this.reportData = new EncString(this.getResponseProperty("reportData"));
+    this.summaryData = new EncString(this.getResponseProperty("summaryData"));
+    this.applicationData = new EncString(this.getResponseProperty("applicationData"));
+    this.contentEncryptionKey = new EncString(this.getResponseProperty("contentEncryptionKey"));
+  }
+}
+
+export class GetRiskInsightsSummaryResponse extends BaseResponse {
+  id: string;
+  organizationId: OrganizationId;
+  encryptedSummary: EncString; // Decrypted as OrganizationReportSummary
+  contentEncryptionKey: EncString;
+
+  constructor(response: any) {
+    super(response);
+    // TODO Handle taking array of summary data and converting to array
+    this.id = this.getResponseProperty("id");
+    this.organizationId = this.getResponseProperty("organizationId");
+    this.encryptedSummary = this.getResponseProperty("encryptedData");
+    this.contentEncryptionKey = this.getResponseProperty("contentEncryptionKey");
+  }
+
+  // TODO
+  getSummary(): OrganizationReportSummary {
+    return createNewSummaryData();
+  }
+}
+export class GetRiskInsightsApplicationDataResponse extends BaseResponse {
+  reportId: string;
+  organizationId: OrganizationId;
+  encryptedData: EncString;
+  contentEncryptionKey: EncString;
+
+  constructor(response: any) {
+    super(response);
+    this.reportId = this.getResponseProperty("reportId");
+    this.organizationId = this.getResponseProperty("organizationId");
+    this.encryptedData = this.getResponseProperty("encryptedData");
+    this.contentEncryptionKey = this.getResponseProperty("contentEncryptionKey");
+  }
+}
+
+export class MemberCipherDetailsResponse extends BaseResponse {
+  userGuid: string;
+  userName: string;
+  email: string;
+  useKeyConnector: boolean;
+  cipherIds: string[] = [];
+
+  constructor(response: any) {
+    super(response);
+    this.userGuid = this.getResponseProperty("UserGuid");
+    this.userName = this.getResponseProperty("UserName");
+    this.email = this.getResponseProperty("Email");
+    this.useKeyConnector = this.getResponseProperty("UseKeyConnector");
+    this.cipherIds = this.getResponseProperty("CipherIds");
+  }
+}
+
+export interface UpdateRiskInsightsApplicationDataRequest {
+  data: {
+    applicationData: string;
+  };
+}
+export interface UpdateRiskInsightsSummaryDataRequest {
+  data: {
+    summaryData: string;
+    metrics: RiskInsightsMetricsData;
+  };
+}
+export class UpdateRiskInsightsApplicationDataResponse extends BaseResponse {
+  constructor(response: any) {
+    super(response);
+  }
 }
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/api/risk-insights-metrics.api.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/api/risk-insights-metrics.api.ts
new file mode 100644
index 00000000000..681df6cdcd5
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/api/risk-insights-metrics.api.ts
@@ -0,0 +1,42 @@
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+
+export class RiskInsightsMetricsApi extends BaseResponse {
+  totalApplicationCount: number = 0;
+  totalAtRiskApplicationCount: number = 0;
+  totalCriticalApplicationCount: number = 0;
+  totalCriticalAtRiskApplicationCount: number = 0;
+  totalMemberCount: number = 0;
+  totalAtRiskMemberCount: number = 0;
+  totalCriticalMemberCount: number = 0;
+  totalCriticalAtRiskMemberCount: number = 0;
+  totalPasswordCount: number = 0;
+  totalAtRiskPasswordCount: number = 0;
+  totalCriticalPasswordCount: number = 0;
+  totalCriticalAtRiskPasswordCount: number = 0;
+
+  constructor(data: any) {
+    super(data);
+    if (data == null) {
+      return;
+    }
+
+    this.totalApplicationCount = this.getResponseProperty("totalApplicationCount");
+    this.totalAtRiskApplicationCount = this.getResponseProperty("totalAtRiskApplicationCount");
+    this.totalCriticalApplicationCount = this.getResponseProperty("totalCriticalApplicationCount");
+    this.totalCriticalAtRiskApplicationCount = this.getResponseProperty(
+      "totalCriticalAtRiskApplicationCount",
+    );
+    this.totalMemberCount = this.getResponseProperty("totalMemberCount");
+    this.totalAtRiskMemberCount = this.getResponseProperty("totalAtRiskMemberCount");
+    this.totalCriticalMemberCount = this.getResponseProperty("totalCriticalMemberCount");
+    this.totalCriticalAtRiskMemberCount = this.getResponseProperty(
+      "totalCriticalAtRiskMemberCount",
+    );
+    this.totalPasswordCount = this.getResponseProperty("totalPasswordCount");
+    this.totalAtRiskPasswordCount = this.getResponseProperty("totalAtRiskPasswordCount");
+    this.totalCriticalPasswordCount = this.getResponseProperty("totalCriticalPasswordCount");
+    this.totalCriticalAtRiskPasswordCount = this.getResponseProperty(
+      "totalCriticalAtRiskPasswordCount",
+    );
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/data/risk-insights-metrics.data.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/data/risk-insights-metrics.data.ts
new file mode 100644
index 00000000000..382004e02a2
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/data/risk-insights-metrics.data.ts
@@ -0,0 +1,34 @@
+import { RiskInsightsMetricsApi } from "../api/risk-insights-metrics.api";
+
+export class RiskInsightsMetricsData {
+  totalApplicationCount: number = 0;
+  totalAtRiskApplicationCount: number = 0;
+  totalCriticalApplicationCount: number = 0;
+  totalCriticalAtRiskApplicationCount: number = 0;
+  totalMemberCount: number = 0;
+  totalAtRiskMemberCount: number = 0;
+  totalCriticalMemberCount: number = 0;
+  totalCriticalAtRiskMemberCount: number = 0;
+  totalPasswordCount: number = 0;
+  totalAtRiskPasswordCount: number = 0;
+  totalCriticalPasswordCount: number = 0;
+  totalCriticalAtRiskPasswordCount: number = 0;
+
+  constructor(data?: RiskInsightsMetricsApi) {
+    if (data == null) {
+      return;
+    }
+    this.totalApplicationCount = data.totalApplicationCount;
+    this.totalAtRiskApplicationCount = data.totalAtRiskApplicationCount;
+    this.totalCriticalApplicationCount = data.totalCriticalApplicationCount;
+    this.totalCriticalAtRiskApplicationCount = data.totalCriticalAtRiskApplicationCount;
+    this.totalMemberCount = data.totalMemberCount;
+    this.totalAtRiskMemberCount = data.totalAtRiskMemberCount;
+    this.totalCriticalMemberCount = data.totalCriticalMemberCount;
+    this.totalCriticalAtRiskMemberCount = data.totalCriticalAtRiskMemberCount;
+    this.totalPasswordCount = data.totalPasswordCount;
+    this.totalAtRiskPasswordCount = data.totalAtRiskPasswordCount;
+    this.totalCriticalPasswordCount = data.totalCriticalPasswordCount;
+    this.totalCriticalAtRiskPasswordCount = data.totalCriticalAtRiskPasswordCount;
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/domain/risk-insights-metrics.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/domain/risk-insights-metrics.ts
new file mode 100644
index 00000000000..309e2aac2ea
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/domain/risk-insights-metrics.ts
@@ -0,0 +1,55 @@
+import Domain from "@bitwarden/common/platform/models/domain/domain-base";
+
+import { RiskInsightsMetricsData } from "../data/risk-insights-metrics.data";
+
+export class RiskInsightsMetrics extends Domain {
+  totalApplicationCount: number = 0;
+  totalAtRiskApplicationCount: number = 0;
+  totalCriticalApplicationCount: number = 0;
+  totalCriticalAtRiskApplicationCount: number = 0;
+  totalMemberCount: number = 0;
+  totalAtRiskMemberCount: number = 0;
+  totalCriticalMemberCount: number = 0;
+  totalCriticalAtRiskMemberCount: number = 0;
+  totalPasswordCount: number = 0;
+  totalAtRiskPasswordCount: number = 0;
+  totalCriticalPasswordCount: number = 0;
+  totalCriticalAtRiskPasswordCount: number = 0;
+
+  constructor(data?: RiskInsightsMetricsData) {
+    super();
+    if (data == null) {
+      return;
+    }
+    this.totalApplicationCount = data.totalApplicationCount;
+    this.totalAtRiskApplicationCount = data.totalAtRiskApplicationCount;
+    this.totalCriticalApplicationCount = data.totalCriticalApplicationCount;
+    this.totalCriticalAtRiskApplicationCount = data.totalCriticalAtRiskApplicationCount;
+    this.totalMemberCount = data.totalMemberCount;
+    this.totalAtRiskMemberCount = data.totalAtRiskMemberCount;
+    this.totalCriticalMemberCount = data.totalCriticalMemberCount;
+    this.totalCriticalAtRiskMemberCount = data.totalCriticalAtRiskMemberCount;
+    this.totalPasswordCount = data.totalPasswordCount;
+    this.totalAtRiskPasswordCount = data.totalAtRiskPasswordCount;
+    this.totalCriticalPasswordCount = data.totalCriticalPasswordCount;
+    this.totalCriticalAtRiskPasswordCount = data.totalCriticalAtRiskPasswordCount;
+  }
+
+  toRiskInsightsMetricsData(): RiskInsightsMetricsData {
+    const m = new RiskInsightsMetricsData();
+    m.totalApplicationCount = this.totalApplicationCount;
+    m.totalAtRiskApplicationCount = this.totalAtRiskApplicationCount;
+    m.totalCriticalApplicationCount = this.totalCriticalApplicationCount;
+    m.totalCriticalAtRiskApplicationCount = this.totalCriticalAtRiskApplicationCount;
+    m.totalMemberCount = this.totalMemberCount;
+    m.totalAtRiskMemberCount = this.totalAtRiskMemberCount;
+    m.totalCriticalMemberCount = this.totalCriticalMemberCount;
+    m.totalCriticalAtRiskMemberCount = this.totalCriticalAtRiskMemberCount;
+    m.totalPasswordCount = this.totalPasswordCount;
+    m.totalAtRiskPasswordCount = this.totalAtRiskPasswordCount;
+    m.totalCriticalPasswordCount = this.totalCriticalPasswordCount;
+    m.totalCriticalAtRiskPasswordCount = this.totalCriticalAtRiskPasswordCount;
+
+    return m;
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/drawer-models.types.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/drawer-models.types.ts
new file mode 100644
index 00000000000..fc500f6fd1f
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/drawer-models.types.ts
@@ -0,0 +1,45 @@
+import { MemberDetails } from "./report-models";
+
+// -------------------- Drawer and UI Models --------------------
+
+export const DrawerType = {
+  None: 0,
+  AppAtRiskMembers: 1,
+  OrgAtRiskMembers: 2,
+  OrgAtRiskApps: 3,
+} as const;
+
+export type DrawerType = (typeof DrawerType)[keyof typeof DrawerType];
+
+export type DrawerDetails = {
+  open: boolean;
+  invokerId: string;
+  activeDrawerType: DrawerType;
+  atRiskMemberDetails?: AtRiskMemberDetail[];
+  appAtRiskMembers?: AppAtRiskMembersDialogParams | null;
+  atRiskAppDetails?: AtRiskApplicationDetail[] | null;
+};
+
+export type AppAtRiskMembersDialogParams = {
+  members: MemberDetails[];
+  applicationName: string;
+};
+
+/**
+ * Member email with the number of at risk passwords
+ * At risk member detail that contains the email
+ * and the count of at risk ciphers
+ */
+export type AtRiskMemberDetail = {
+  email: string;
+  atRiskPasswordCount: number;
+};
+
+/*
+ * A list of applications and the count of
+ * at risk passwords for each application
+ */
+export type AtRiskApplicationDetail = {
+  applicationName: string;
+  atRiskPasswordCount: number;
+};
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/index.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/index.ts
new file mode 100644
index 00000000000..c0364b12f87
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/index.ts
@@ -0,0 +1,6 @@
+export * from "./api-models.types";
+export * from "./password-health";
+export * from "./report-data-service.types";
+export * from "./report-encryption.types";
+export * from "./report-models";
+export * from "./drawer-models.types";
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/ciphers.mock.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/mocks/ciphers.mock.ts
similarity index 100%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/ciphers.mock.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/mocks/ciphers.mock.ts
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/mocks/member-cipher-details-response.mock.ts
similarity index 56%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-api.service.spec.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/mocks/member-cipher-details-response.mock.ts
index d6474c2c9c4..0f14642dc6b 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-api.service.spec.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/mocks/member-cipher-details-response.mock.ts
@@ -1,109 +1,83 @@
 import { mock } from "jest-mock-extended";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { MemberCipherDetailsResponse } from "..";
 
-import { MemberCipherDetailsApiService } from "./member-cipher-details-api.service";
-
-export const mockMemberCipherDetails: any = [
-  {
+export const mockMemberCipherDetailsResponse: MemberCipherDetailsResponse[] = [
+  mock<MemberCipherDetailsResponse>({
+    userGuid: "user-1",
     userName: "David Brent",
     email: "david.brent@wernhamhogg.uk",
-    usesKeyConnector: true,
+    useKeyConnector: true,
     cipherIds: [
       "cbea34a8-bde4-46ad-9d19-b05001228ab1",
       "cbea34a8-bde4-46ad-9d19-b05001228ab2",
       "cbea34a8-bde4-46ad-9d19-b05001228xy4",
       "cbea34a8-bde4-46ad-9d19-b05001227nm5",
     ],
-  },
-  {
+  }),
+  mock<MemberCipherDetailsResponse>({
+    userGuid: "user-2",
     userName: "Tim Canterbury",
     email: "tim.canterbury@wernhamhogg.uk",
-    usesKeyConnector: false,
+    useKeyConnector: false,
     cipherIds: [
       "cbea34a8-bde4-46ad-9d19-b05001228ab2",
       "cbea34a8-bde4-46ad-9d19-b05001228cd3",
       "cbea34a8-bde4-46ad-9d19-b05001228xy4",
       "cbea34a8-bde4-46ad-9d19-b05001227nm5",
     ],
-  },
-  {
+  }),
+  mock<MemberCipherDetailsResponse>({
+    userGuid: "user-3",
     userName: "Gareth Keenan",
     email: "gareth.keenan@wernhamhogg.uk",
-    usesKeyConnector: true,
+    useKeyConnector: true,
     cipherIds: [
       "cbea34a8-bde4-46ad-9d19-b05001228cd3",
       "cbea34a8-bde4-46ad-9d19-b05001228xy4",
       "cbea34a8-bde4-46ad-9d19-b05001227nm5",
       "cbea34a8-bde4-46ad-9d19-b05001227nm7",
     ],
-  },
-  {
+  }),
+  mock<MemberCipherDetailsResponse>({
+    userGuid: "user-4",
     userName: "Dawn Tinsley",
     email: "dawn.tinsley@wernhamhogg.uk",
-    usesKeyConnector: true,
+    useKeyConnector: true,
     cipherIds: [
       "cbea34a8-bde4-46ad-9d19-b05001228ab2",
       "cbea34a8-bde4-46ad-9d19-b05001228cd3",
       "cbea34a8-bde4-46ad-9d19-b05001228xy4",
     ],
-  },
-  {
+  }),
+  mock<MemberCipherDetailsResponse>({
+    userGuid: "user-5",
     userName: "Keith Bishop",
     email: "keith.bishop@wernhamhogg.uk",
-    usesKeyConnector: false,
+    useKeyConnector: false,
     cipherIds: [
       "cbea34a8-bde4-46ad-9d19-b05001228ab1",
       "cbea34a8-bde4-46ad-9d19-b05001228cd3",
       "cbea34a8-bde4-46ad-9d19-b05001228xy4",
       "cbea34a8-bde4-46ad-9d19-b05001227nm5",
     ],
-  },
-  {
+  }),
+  mock<MemberCipherDetailsResponse>({
+    userGuid: "user-1",
     userName: "Chris Finch",
     email: "chris.finch@wernhamhogg.uk",
-    usesKeyConnector: true,
+    useKeyConnector: true,
     cipherIds: [
       "cbea34a8-bde4-46ad-9d19-b05001228ab2",
       "cbea34a8-bde4-46ad-9d19-b05001228cd3",
       "cbea34a8-bde4-46ad-9d19-b05001228xy4",
     ],
-  },
-  {
+  }),
+  mock<MemberCipherDetailsResponse>({
+    userGuid: "user-1",
     userName: "Mister Secure",
     email: "mister.secure@secureco.com",
-    usesKeyConnector: true,
+    useKeyConnector: true,
     cipherIds: ["cbea34a8-bde4-46ad-9d19-b05001227tt1"],
-  },
+  }),
 ];
-
-describe("Member Cipher Details API Service", () => {
-  let memberCipherDetailsApiService: MemberCipherDetailsApiService;
-
-  const apiService = mock<ApiService>();
-
-  beforeEach(() => {
-    memberCipherDetailsApiService = new MemberCipherDetailsApiService(apiService);
-    jest.resetAllMocks();
-  });
-
-  it("instantiates", () => {
-    expect(memberCipherDetailsApiService).not.toBeFalsy();
-  });
-
-  it("getMemberCipherDetails retrieves data", async () => {
-    apiService.send.mockResolvedValue(mockMemberCipherDetails);
-
-    const orgId = "1234";
-    const result = await memberCipherDetailsApiService.getMemberCipherDetails(orgId);
-    expect(result).not.toBeNull();
-    expect(result).toHaveLength(7);
-    expect(apiService.send).toHaveBeenCalledWith(
-      "GET",
-      "/reports/member-cipher-details/" + orgId,
-      null,
-      true,
-      true,
-    );
-  });
-});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/mocks/mock-data.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/mocks/mock-data.ts
new file mode 100644
index 00000000000..027ef8fb25d
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/mocks/mock-data.ts
@@ -0,0 +1,184 @@
+import { mock } from "jest-mock-extended";
+
+import { CipherId } from "@bitwarden/common/types/guid";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+import { MemberCipherDetailsResponse } from "..";
+import { ApplicationHealthReportDetailEnriched } from "../report-data-service.types";
+import {
+  ApplicationHealthReportDetail,
+  CipherHealthReport,
+  OrganizationReportApplication,
+  OrganizationReportSummary,
+  PasswordHealthData,
+} from "../report-models";
+
+const mockCipherId1 = "cipher-1" as CipherId;
+const mockCipherId2 = "cipher-2" as CipherId;
+
+const mockApplication1: ApplicationHealthReportDetail = {
+  applicationName: "application1.com",
+  passwordCount: 2,
+  atRiskPasswordCount: 1,
+  atRiskCipherIds: [mockCipherId1],
+  memberCount: 2,
+  atRiskMemberCount: 1,
+  memberDetails: [
+    {
+      userGuid: "user-id-1",
+      userName: "tom",
+      email: "tom@application1.com",
+      cipherId: "cipher-1",
+    },
+  ],
+  atRiskMemberDetails: [
+    {
+      userGuid: "user-id-2",
+      userName: "tom",
+      email: "tom2@application1.com",
+      cipherId: mockCipherId2,
+    },
+  ],
+  cipherIds: [mockCipherId1, mockCipherId2],
+};
+
+const mockApplication2: ApplicationHealthReportDetail = {
+  applicationName: "site2.application1.com",
+  passwordCount: 0,
+  atRiskPasswordCount: 0,
+  atRiskCipherIds: [],
+  memberCount: 0,
+  atRiskMemberCount: 0,
+  memberDetails: [],
+  atRiskMemberDetails: [],
+  cipherIds: [],
+};
+const mockApplication3: ApplicationHealthReportDetail = {
+  applicationName: "application2.com",
+  passwordCount: 0,
+  atRiskPasswordCount: 0,
+  atRiskCipherIds: [],
+  memberCount: 0,
+  atRiskMemberCount: 0,
+  memberDetails: [],
+  atRiskMemberDetails: [],
+  cipherIds: [],
+};
+
+export const mockReportData: ApplicationHealthReportDetail[] = [
+  mockApplication1,
+  mockApplication2,
+  mockApplication3,
+];
+
+export const mockSummaryData: OrganizationReportSummary = {
+  totalMemberCount: 5,
+  totalAtRiskMemberCount: 2,
+  totalApplicationCount: 3,
+  totalAtRiskApplicationCount: 1,
+  totalCriticalMemberCount: 1,
+  totalCriticalAtRiskMemberCount: 1,
+  totalCriticalApplicationCount: 1,
+  totalCriticalAtRiskApplicationCount: 1,
+};
+export const mockApplicationData: OrganizationReportApplication[] = [
+  {
+    applicationName: "application1.com",
+    isCritical: true,
+    reviewedDate: new Date(),
+  },
+  {
+    applicationName: "application2.com",
+    isCritical: false,
+    reviewedDate: null,
+  },
+];
+
+export const mockEnrichedReportData: ApplicationHealthReportDetailEnriched[] = [
+  { ...mockApplication1, isMarkedAsCritical: true },
+  { ...mockApplication2, isMarkedAsCritical: false },
+];
+
+export const mockCipherViews: CipherView[] = [
+  mock<CipherView>({
+    id: "cipher-1",
+    type: CipherType.Login,
+    login: { password: "pass1", username: "user1", uris: [{ uri: "https://app.com/login" }] },
+    isDeleted: false,
+    viewPassword: true,
+  }),
+  mock<CipherView>({
+    id: "cipher-2",
+    type: CipherType.Login,
+    login: { password: "pass2", username: "user2", uris: [{ uri: "app.com/home" }] },
+    isDeleted: false,
+    viewPassword: true,
+  }),
+  mock<CipherView>({
+    id: "cipher-3",
+    type: CipherType.Login,
+    login: { password: "pass3", username: "user3", uris: [{ uri: "https://other.com" }] },
+    isDeleted: false,
+    viewPassword: true,
+  }),
+];
+
+export const mockMemberDetails = [
+  mock<MemberCipherDetailsResponse>({
+    cipherIds: ["cipher-1"],
+    userGuid: "user1",
+    userName: "User 1",
+    email: "user1@app.com",
+  }),
+  mock<MemberCipherDetailsResponse>({
+    cipherIds: ["cipher-2"],
+    userGuid: "user2",
+    userName: "User 2",
+    email: "user2@app.com",
+  }),
+  mock<MemberCipherDetailsResponse>({
+    cipherIds: ["cipher-3"],
+    userGuid: "user3",
+    userName: "User 3",
+    email: "user3@other.com",
+  }),
+];
+
+export const mockCipherHealthReports: CipherHealthReport[] = [
+  {
+    applications: ["app.com"],
+    cipherMembers: [],
+    healthData: createPasswordHealthData(0),
+    cipher: mockCipherViews[0],
+  },
+  {
+    applications: ["app.com"],
+    cipherMembers: [],
+    healthData: createPasswordHealthData(1),
+    cipher: mockCipherViews[1],
+  },
+  {
+    applications: ["other.com"],
+    cipherMembers: [],
+    healthData: createPasswordHealthData(2),
+    cipher: mockCipherViews[2],
+  },
+];
+
+function createPasswordHealthData(reusedPasswordCount: number | null): PasswordHealthData {
+  return {
+    reusedPasswordCount: reusedPasswordCount ?? 0,
+    weakPasswordDetail: {
+      score: 0,
+      detailValue: {
+        label: "",
+        badgeVariant: "info",
+      },
+    },
+    exposedPasswordDetail: {
+      cipherId: "",
+      exposedXTimes: 0,
+    },
+  };
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/password-health.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/password-health.ts
index 872e883e42e..8406a9107b8 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/password-health.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/password-health.ts
@@ -1,11 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { OrganizationId } from "@bitwarden/common/types/guid";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { BadgeVariant } from "@bitwarden/components";
-import { EncString } from "@bitwarden/sdk-internal";
-
-import { ApplicationHealthReportDetail } from "./report-models";
 
 /**
  * Weak password details containing the score
@@ -32,54 +27,3 @@ export type ExposedPasswordDetail = {
   cipherId: string;
   exposedXTimes: number;
 } | null;
-
-/*
- * After data is encrypted, it is returned with the
- * encryption key used to encrypt the data.
- */
-export interface EncryptedDataWithKey {
-  organizationId: OrganizationId;
-  encryptedData: EncString;
-  encryptionKey: EncString;
-}
-
-export type LEGACY_MemberDetailsFlat = {
-  userGuid: string;
-  userName: string;
-  email: string;
-  cipherId: string;
-};
-
-export type LEGACY_ApplicationHealthReportDetailWithCriticalFlag = ApplicationHealthReportDetail & {
-  isMarkedAsCritical: boolean;
-};
-
-export type LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher =
-  LEGACY_ApplicationHealthReportDetailWithCriticalFlag & {
-    ciphers: CipherView[];
-  };
-
-export type LEGACY_CipherHealthReportDetail = CipherView & {
-  reusedPasswordCount: number;
-  weakPasswordDetail: WeakPasswordDetail;
-  exposedPasswordDetail: ExposedPasswordDetail;
-  cipherMembers: LEGACY_MemberDetailsFlat[];
-  trimmedUris: string[];
-};
-
-export type LEGACY_CipherHealthReportUriDetail = {
-  cipherId: string;
-  reusedPasswordCount: number;
-  weakPasswordDetail: WeakPasswordDetail;
-  exposedPasswordDetail: ExposedPasswordDetail;
-  cipherMembers: LEGACY_MemberDetailsFlat[];
-  trimmedUri: string;
-  cipher: CipherView;
-};
-
-export interface EncryptedDataModel {
-  organizationId: OrganizationId;
-  encryptedData: string;
-  encryptionKey: string;
-  date: Date;
-}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-data-service.types.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-data-service.types.ts
new file mode 100644
index 00000000000..77a3cea419b
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-data-service.types.ts
@@ -0,0 +1,15 @@
+import {
+  ApplicationHealthReportDetail,
+  OrganizationReportApplication,
+  OrganizationReportSummary,
+} from "./report-models";
+
+export type ApplicationHealthReportDetailEnriched = ApplicationHealthReportDetail & {
+  isMarkedAsCritical: boolean;
+};
+export interface RiskInsightsEnrichedData {
+  reportData: ApplicationHealthReportDetailEnriched[];
+  summaryData: OrganizationReportSummary;
+  applicationData: OrganizationReportApplication[];
+  creationDate: Date;
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-encryption.types.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-encryption.types.ts
new file mode 100644
index 00000000000..d5f2726d7ca
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-encryption.types.ts
@@ -0,0 +1,32 @@
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+import {
+  ApplicationHealthReportDetail,
+  OrganizationReportApplication,
+  OrganizationReportSummary,
+} from "./report-models";
+
+/*
+ * After data is encrypted, it is returned with the
+ * encryption key used to encrypt the data.
+ */
+export interface EncryptedDataWithKey {
+  organizationId: OrganizationId;
+  encryptedReportData: EncString;
+  encryptedSummaryData: EncString;
+  encryptedApplicationData: EncString;
+  contentEncryptionKey: EncString;
+}
+
+export interface DecryptedReportData {
+  reportData: ApplicationHealthReportDetail[];
+  summaryData: OrganizationReportSummary;
+  applicationData: OrganizationReportApplication[];
+}
+
+export interface EncryptedReportData {
+  encryptedReportData: EncString;
+  encryptedSummaryData: EncString;
+  encryptedApplicationData: EncString;
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts
index acbec1592a0..a907dcf6d7b 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts
@@ -1,45 +1,13 @@
 import { Opaque } from "type-fest";
 
-import { OrganizationId } from "@bitwarden/common/types/guid";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { CipherId, OrganizationReportId } from "@bitwarden/common/types/guid";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { BadgeVariant } from "@bitwarden/components";
 
 import { ExposedPasswordDetail, WeakPasswordDetail } from "./password-health";
 
-// -------------------- Drawer and UI Models --------------------
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum DrawerType {
-  None = 0,
-  AppAtRiskMembers = 1,
-  OrgAtRiskMembers = 2,
-  OrgAtRiskApps = 3,
-}
-
-export type DrawerDetails = {
-  open: boolean;
-  invokerId: string;
-  activeDrawerType: DrawerType;
-  atRiskMemberDetails?: AtRiskMemberDetail[];
-  appAtRiskMembers?: AppAtRiskMembersDialogParams | null;
-  atRiskAppDetails?: AtRiskApplicationDetail[] | null;
-};
-
-export type AppAtRiskMembersDialogParams = {
-  members: MemberDetails[];
-  applicationName: string;
-};
-
 // -------------------- Member Models --------------------
-/**
- * Member email with the number of at risk passwords
- * At risk member detail that contains the email
- * and the count of at risk ciphers
- */
-export type AtRiskMemberDetail = {
-  email: string;
-  atRiskPasswordCount: number;
-};
 
 /**
  * Flattened member details that associates an
@@ -47,7 +15,7 @@ export type AtRiskMemberDetail = {
  */
 export type MemberDetails = {
   userGuid: string;
-  userName: string;
+  userName: string | null;
   email: string;
   cipherId: string;
 };
@@ -72,18 +40,6 @@ export type CipherHealthReport = {
   cipher: CipherView;
 };
 
-/**
- * Breaks the cipher health info out by uri and passes
- * along the password health and member info
- */
-export type CipherApplicationView = {
-  cipherId: string;
-  cipher: CipherView;
-  cipherMembers: MemberDetails[];
-  application: string;
-  healthData: PasswordHealthData;
-};
-
 // -------------------- Application Health Report Models --------------------
 /**
  * All applications report summary. The total members,
@@ -92,19 +48,13 @@ export type CipherApplicationView = {
  */
 export type OrganizationReportSummary = {
   totalMemberCount: number;
-  totalCriticalMemberCount: number;
-  totalAtRiskMemberCount: number;
-  totalCriticalAtRiskMemberCount: number;
   totalApplicationCount: number;
-  totalCriticalApplicationCount: number;
+  totalAtRiskMemberCount: number;
   totalAtRiskApplicationCount: number;
+  totalCriticalApplicationCount: number;
+  totalCriticalMemberCount: number;
+  totalCriticalAtRiskMemberCount: number;
   totalCriticalAtRiskApplicationCount: number;
-  newApplications: string[];
-};
-
-export type CriticalSummaryDetails = {
-  totalCriticalMembersCount: number;
-  totalCriticalApplicationsCount: number;
 };
 
 /**
@@ -114,6 +64,11 @@ export type CriticalSummaryDetails = {
 export type OrganizationReportApplication = {
   applicationName: string;
   isCritical: boolean;
+  /**
+   * Captures when a report has been reviewed by a user and
+   * can be filtered on to check for new applications
+   * */
+  reviewedDate: Date | null;
 };
 
 /**
@@ -124,43 +79,17 @@ export type ApplicationHealthReportDetail = {
   applicationName: string;
   passwordCount: number;
   atRiskPasswordCount: number;
-  atRiskCipherIds: string[];
+  atRiskCipherIds: CipherId[];
   memberCount: number;
   atRiskMemberCount: number;
   memberDetails: MemberDetails[];
   atRiskMemberDetails: MemberDetails[];
-  cipherIds: string[];
-};
-
-export type ApplicationHealthReportDetailEnriched = ApplicationHealthReportDetail & {
-  isMarkedAsCritical: boolean;
-  ciphers: CipherView[];
-};
-
-/*
- * A list of applications and the count of
- * at risk passwords for each application
- */
-export type AtRiskApplicationDetail = {
-  applicationName: string;
-  atRiskPasswordCount: number;
+  cipherIds: CipherId[];
 };
 
 // -------------------- Password Health Report Models --------------------
 export type PasswordHealthReportApplicationId = Opaque<string, "PasswordHealthReportApplicationId">;
 
-// -------------------- Risk Insights Report Models --------------------
-export interface RiskInsightsReportData {
-  data: ApplicationHealthReportDetailEnriched[];
-  summary: OrganizationReportSummary;
-}
-export interface RiskInsightsReport {
-  organizationId: OrganizationId;
-  date: string;
-  reportData: string;
-  reportKey: string;
-}
-
 export type ReportScore = { label: string; badgeVariant: BadgeVariant; sortOrder: number };
 
 export type ReportResult = CipherView & {
@@ -169,8 +98,47 @@ export type ReportResult = CipherView & {
   scoreKey: number;
 };
 
-export type ReportDetailsAndSummary = {
-  data: ApplicationHealthReportDetailEnriched[];
-  summary: OrganizationReportSummary;
-  dateCreated: Date;
-};
+export const ReportStatus = Object.freeze({
+  Initializing: 1,
+  Loading: 2,
+  Complete: 3,
+  Error: 4,
+} as const);
+
+export type ReportStatus = (typeof ReportStatus)[keyof typeof ReportStatus];
+
+export const ReportProgress = Object.freeze({
+  FetchingMembers: 1,
+  AnalyzingPasswords: 2,
+  CalculatingRisks: 3,
+  GeneratingReport: 4,
+  Saving: 5,
+  Complete: 6,
+} as const);
+
+export type ReportProgress = (typeof ReportProgress)[keyof typeof ReportProgress];
+
+export interface RiskInsightsData {
+  id: OrganizationReportId;
+  creationDate: Date;
+  contentEncryptionKey: EncString;
+  reportData: ApplicationHealthReportDetail[];
+  summaryData: OrganizationReportSummary;
+  applicationData: OrganizationReportApplication[];
+}
+
+export interface ReportState {
+  status: ReportStatus;
+  error: string | null;
+  data: RiskInsightsData | null;
+}
+
+// TODO Make Versioned models for structure changes
+// export type VersionedRiskInsightsData = RiskInsightsDataV1 | RiskInsightsDataV2;
+// export interface RiskInsightsDataV1 {
+//   version: 1;
+//   creationDate: Date;
+//   reportData: ApplicationHealthReportDetail[];
+//   summaryData: OrganizationReportSummary;
+//   applicationData: OrganizationReportApplication[];
+// }
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/view/risk-insights-metrics.view.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/view/risk-insights-metrics.view.ts
new file mode 100644
index 00000000000..87b92c32fe4
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/view/risk-insights-metrics.view.ts
@@ -0,0 +1,52 @@
+import { Jsonify } from "type-fest";
+
+import { View } from "@bitwarden/common/models/view/view";
+
+import { RiskInsightsMetrics } from "../domain/risk-insights-metrics";
+
+export class RiskInsightsMetricsView implements View {
+  totalApplicationCount: number = 0;
+  totalAtRiskApplicationCount: number = 0;
+  totalCriticalApplicationCount: number = 0;
+  totalCriticalAtRiskApplicationCount: number = 0;
+  totalMemberCount: number = 0;
+  totalAtRiskMemberCount: number = 0;
+  totalCriticalMemberCount: number = 0;
+  totalCriticalAtRiskMemberCount: number = 0;
+  totalPasswordCount: number = 0;
+  totalAtRiskPasswordCount: number = 0;
+  totalCriticalPasswordCount: number = 0;
+  totalCriticalAtRiskPasswordCount: number = 0;
+
+  constructor(data?: RiskInsightsMetrics) {
+    if (data == null) {
+      return;
+    }
+    this.totalApplicationCount = data.totalApplicationCount;
+    this.totalAtRiskApplicationCount = data.totalAtRiskApplicationCount;
+    this.totalCriticalApplicationCount = data.totalCriticalApplicationCount;
+    this.totalCriticalAtRiskApplicationCount = data.totalCriticalAtRiskApplicationCount;
+    this.totalMemberCount = data.totalMemberCount;
+    this.totalAtRiskMemberCount = data.totalAtRiskMemberCount;
+    this.totalCriticalMemberCount = data.totalCriticalMemberCount;
+    this.totalCriticalAtRiskMemberCount = data.totalCriticalAtRiskMemberCount;
+    this.totalPasswordCount = data.totalPasswordCount;
+    this.totalAtRiskPasswordCount = data.totalAtRiskPasswordCount;
+    this.totalCriticalPasswordCount = data.totalCriticalPasswordCount;
+    this.totalCriticalAtRiskPasswordCount = data.totalCriticalAtRiskPasswordCount;
+  }
+
+  toJSON() {
+    return this;
+  }
+
+  static fromJSON(
+    obj: Partial<Jsonify<RiskInsightsMetricsView>>,
+  ): RiskInsightsMetricsView | undefined {
+    return Object.assign(new RiskInsightsMetricsView(), obj);
+  }
+
+  // toSdkRiskInsightsMetricsView(): SdkRiskInsightsMetricsView {}
+
+  // static fromRiskInsightsMetricsView(obj?: SdkRiskInsightsMetricsView): RiskInsightsMetricsView | undefined {}
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/response/member-cipher-details.response.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/response/member-cipher-details.response.ts
deleted file mode 100644
index 7aa52330663..00000000000
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/response/member-cipher-details.response.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
-
-export class MemberCipherDetailsResponse extends BaseResponse {
-  userGuid: string;
-  userName: string;
-  email: string;
-  useKeyConnector: boolean;
-  cipherIds: string[] = [];
-
-  constructor(response: any) {
-    super(response);
-    this.userGuid = this.getResponseProperty("UserGuid");
-    this.userName = this.getResponseProperty("UserName");
-    this.email = this.getResponseProperty("Email");
-    this.useKeyConnector = this.getResponseProperty("UseKeyConnector");
-    this.cipherIds = this.getResponseProperty("CipherIds");
-  }
-}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/critical-apps-api.service.spec.ts
similarity index 96%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps-api.service.spec.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/critical-apps-api.service.spec.ts
index f53bf92c47f..5880d81fed2 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps-api.service.spec.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/critical-apps-api.service.spec.ts
@@ -7,8 +7,8 @@ import {
   PasswordHealthReportApplicationDropRequest,
   PasswordHealthReportApplicationsRequest,
   PasswordHealthReportApplicationsResponse,
-} from "../models/api-models.types";
-import { PasswordHealthReportApplicationId } from "../models/report-models";
+} from "../../models/api-models.types";
+import { PasswordHealthReportApplicationId } from "../../models/report-models";
 
 import { CriticalAppsApiService } from "./critical-apps-api.service";
 
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps-api.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/critical-apps-api.service.ts
similarity index 97%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps-api.service.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/critical-apps-api.service.ts
index 29d2364f302..b3e378389d6 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps-api.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/critical-apps-api.service.ts
@@ -7,7 +7,7 @@ import {
   PasswordHealthReportApplicationDropRequest,
   PasswordHealthReportApplicationsRequest,
   PasswordHealthReportApplicationsResponse,
-} from "../models/api-models.types";
+} from "../../models/api-models.types";
 
 export class CriticalAppsApiService {
   constructor(private apiService: ApiService) {}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/member-cipher-details-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/member-cipher-details-api.service.spec.ts
new file mode 100644
index 00000000000..beb19c91c13
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/member-cipher-details-api.service.spec.ts
@@ -0,0 +1,38 @@
+import { mock } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+
+import { mockMemberCipherDetailsResponse } from "../../models/mocks/member-cipher-details-response.mock";
+
+import { MemberCipherDetailsApiService } from "./member-cipher-details-api.service";
+
+describe("Member Cipher Details API Service", () => {
+  let memberCipherDetailsApiService: MemberCipherDetailsApiService;
+
+  const apiService = mock<ApiService>();
+
+  beforeEach(() => {
+    memberCipherDetailsApiService = new MemberCipherDetailsApiService(apiService);
+    jest.resetAllMocks();
+  });
+
+  it("instantiates", () => {
+    expect(memberCipherDetailsApiService).not.toBeFalsy();
+  });
+
+  it("getMemberCipherDetails retrieves data", async () => {
+    apiService.send.mockResolvedValue(mockMemberCipherDetailsResponse);
+
+    const orgId = "1234";
+    const result = await memberCipherDetailsApiService.getMemberCipherDetails(orgId);
+    expect(result).not.toBeNull();
+    expect(result).toHaveLength(7);
+    expect(apiService.send).toHaveBeenCalledWith(
+      "GET",
+      "/reports/member-cipher-details/" + orgId,
+      null,
+      true,
+      true,
+    );
+  });
+});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-api.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/member-cipher-details-api.service.ts
similarity index 88%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-api.service.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/member-cipher-details-api.service.ts
index b38f8712add..66f40ffc5a4 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-api.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/member-cipher-details-api.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from "@angular/core";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 
-import { MemberCipherDetailsResponse } from "../response/member-cipher-details.response";
+import { MemberCipherDetailsResponse } from "../../models";
 
 @Injectable()
 export class MemberCipherDetailsApiService {
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/risk-insights-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/risk-insights-api.service.spec.ts
new file mode 100644
index 00000000000..59764bc38a3
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/risk-insights-api.service.spec.ts
@@ -0,0 +1,277 @@
+import { mock } from "jest-mock-extended";
+import { firstValueFrom } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
+import { makeEncString } from "@bitwarden/common/spec";
+import { OrganizationId, OrganizationReportId } from "@bitwarden/common/types/guid";
+
+import { EncryptedDataWithKey } from "../../models";
+import {
+  GetRiskInsightsApplicationDataResponse,
+  GetRiskInsightsReportResponse,
+  GetRiskInsightsSummaryResponse,
+  SaveRiskInsightsReportRequest,
+  SaveRiskInsightsReportResponse,
+} from "../../models/api-models.types";
+import { RiskInsightsMetrics } from "../../models/domain/risk-insights-metrics";
+import { mockApplicationData, mockReportData, mockSummaryData } from "../../models/mocks/mock-data";
+import { RiskInsightsApiService } from "../api/risk-insights-api.service";
+
+describe("RiskInsightsApiService", () => {
+  let service: RiskInsightsApiService;
+  const mockApiService = mock<ApiService>();
+
+  const mockId = "id";
+  const orgId = "org1" as OrganizationId;
+  const mockReportId = "report-1";
+  const mockKey = "encryption-key-1";
+
+  const mockReportKey = makeEncString("test-key");
+
+  const mockReportEnc = makeEncString(JSON.stringify(mockReportData));
+  const mockSummaryEnc = makeEncString(JSON.stringify(mockSummaryData));
+  const mockApplicationsEnc = makeEncString(JSON.stringify(mockApplicationData));
+
+  const mockMetrics: RiskInsightsMetrics = new RiskInsightsMetrics();
+  mockMetrics.totalApplicationCount = 3;
+  mockMetrics.totalAtRiskApplicationCount = 1;
+  mockMetrics.totalAtRiskMemberCount = 2;
+  mockMetrics.totalAtRiskPasswordCount = 1;
+  mockMetrics.totalCriticalApplicationCount = 1;
+  mockMetrics.totalCriticalAtRiskApplicationCount = 1;
+  mockMetrics.totalCriticalMemberCount = 1;
+  mockMetrics.totalCriticalAtRiskMemberCount = 1;
+  mockMetrics.totalCriticalPasswordCount = 0;
+  mockMetrics.totalCriticalAtRiskPasswordCount = 0;
+  mockMetrics.totalMemberCount = 5;
+  mockMetrics.totalPasswordCount = 2;
+
+  const mockSaveRiskInsightsReportRequest: SaveRiskInsightsReportRequest = {
+    data: {
+      organizationId: orgId,
+      creationDate: new Date().toISOString(),
+      reportData: mockReportEnc.decryptedValue ?? "",
+      summaryData: mockReportEnc.decryptedValue ?? "",
+      applicationData: mockReportEnc.decryptedValue ?? "",
+      contentEncryptionKey: mockReportKey.decryptedValue ?? "",
+      metrics: mockMetrics.toRiskInsightsMetricsData(),
+    },
+  };
+
+  beforeEach(() => {
+    service = new RiskInsightsApiService(mockApiService);
+  });
+
+  it("should be created", () => {
+    expect(service).toBeTruthy();
+  });
+
+  it("getRiskInsightsReport$ should call apiService.send with correct parameters and return the response", () => {
+    const getRiskInsightsReportResponse = {
+      id: mockId,
+      organizationId: orgId,
+      date: new Date().toISOString(),
+      reportData: mockReportEnc,
+      summaryData: mockSummaryEnc,
+      applicationData: mockApplicationsEnc,
+      contentEncryptionKey: mockKey,
+    };
+
+    mockApiService.send.mockReturnValue(Promise.resolve(getRiskInsightsReportResponse));
+
+    service.getRiskInsightsReport$(orgId).subscribe((result) => {
+      expect(result).toEqual(new GetRiskInsightsReportResponse(getRiskInsightsReportResponse));
+      expect(mockApiService.send).toHaveBeenCalledWith(
+        "GET",
+        `/reports/organizations/${orgId.toString()}/latest`,
+        null,
+        true,
+        true,
+      );
+    });
+  });
+
+  it("getRiskInsightsReport$ should return null if apiService.send rejects with 404 error", async () => {
+    const mockError = new ErrorResponse(null, 404);
+    mockApiService.send.mockReturnValue(Promise.reject(mockError));
+
+    const result = await firstValueFrom(service.getRiskInsightsReport$(orgId));
+
+    expect(result).toBeNull();
+  });
+
+  it("getRiskInsightsReport$ should propagate errors if apiService.send rejects 500 server error", async () => {
+    const error = { statusCode: 500, message: "Server error" };
+    mockApiService.send.mockReturnValue(Promise.reject(error));
+
+    await expect(firstValueFrom(service.getRiskInsightsReport$(orgId))).rejects.toEqual(error);
+
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "GET",
+      `/reports/organizations/${orgId.toString()}/latest`,
+      null,
+      true,
+      true,
+    );
+  });
+
+  it("saveRiskInsightsReport$ should call apiService.send with correct parameters", async () => {
+    mockApiService.send.mockReturnValue(Promise.resolve(mockSaveRiskInsightsReportRequest));
+
+    const result = await firstValueFrom(
+      service.saveRiskInsightsReport$(mockSaveRiskInsightsReportRequest, orgId),
+    );
+
+    expect(result).toEqual(new SaveRiskInsightsReportResponse(mockSaveRiskInsightsReportRequest));
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "POST",
+      `/reports/organizations/${orgId.toString()}`,
+      mockSaveRiskInsightsReportRequest.data,
+      true,
+      true,
+    );
+  });
+
+  it("saveRiskInsightsReport$ should propagate errors from apiService.send for saveRiskInsightsReport - 1", async () => {
+    const error = { statusCode: 500, message: "Internal Server Error" };
+    mockApiService.send.mockReturnValue(Promise.reject(error));
+
+    await expect(
+      firstValueFrom(service.saveRiskInsightsReport$(mockSaveRiskInsightsReportRequest, orgId)),
+    ).rejects.toEqual(error);
+
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "POST",
+      `/reports/organizations/${orgId.toString()}`,
+      mockSaveRiskInsightsReportRequest.data,
+      true,
+      true,
+    );
+  });
+
+  it("saveRiskInsightsReport$ should propagate network errors from apiService.send - 2", async () => {
+    const error = new Error("Network error");
+    mockApiService.send.mockReturnValue(Promise.reject(error));
+
+    await expect(
+      firstValueFrom(service.saveRiskInsightsReport$(mockSaveRiskInsightsReportRequest, orgId)),
+    ).rejects.toEqual(error);
+
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "POST",
+      `/reports/organizations/${orgId.toString()}`,
+      mockSaveRiskInsightsReportRequest.data,
+      true,
+      true,
+    );
+  });
+
+  it("getRiskInsightsSummary$ should call apiService.send with correct parameters and return an Observable", async () => {
+    const minDate = new Date("2024-01-01");
+    const maxDate = new Date("2024-01-31");
+    const mockResponse = [
+      {
+        reportId: mockReportId,
+        organizationId: orgId,
+        encryptedData: mockReportData,
+        contentEncryptionKey: mockKey,
+      },
+    ];
+
+    mockApiService.send.mockResolvedValueOnce(mockResponse);
+
+    const result = await firstValueFrom(service.getRiskInsightsSummary$(orgId, minDate, maxDate));
+
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "GET",
+      `/reports/organizations/${orgId.toString()}/data/summary?startDate=${minDate.toISOString().split("T")[0]}&endDate=${maxDate.toISOString().split("T")[0]}`,
+      null,
+      true,
+      true,
+    );
+    expect(result).toEqual(new GetRiskInsightsSummaryResponse(mockResponse));
+  });
+
+  it("updateRiskInsightsSummary$ should call apiService.send with correct parameters and return an Observable", async () => {
+    const data: EncryptedDataWithKey = {
+      organizationId: orgId,
+      contentEncryptionKey: new EncString(mockKey),
+      encryptedReportData: new EncString(JSON.stringify(mockReportData)),
+      encryptedSummaryData: new EncString(JSON.stringify(mockSummaryData)),
+      encryptedApplicationData: new EncString(JSON.stringify(mockApplicationData)),
+    };
+
+    const reportId = "report123" as OrganizationReportId;
+
+    mockApiService.send.mockResolvedValueOnce(undefined);
+
+    const result = await firstValueFrom(
+      service.updateRiskInsightsSummary$(reportId, orgId, {
+        data: {
+          summaryData: data.encryptedSummaryData.encryptedString!,
+          metrics: mockMetrics.toRiskInsightsMetricsData(),
+        },
+      }),
+    );
+
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "PATCH",
+      `/reports/organizations/${orgId.toString()}/data/summary/${reportId.toString()}`,
+      {
+        summaryData: data.encryptedSummaryData.encryptedString!,
+        metrics: mockMetrics.toRiskInsightsMetricsData(),
+        reportId,
+        organizationId: orgId,
+      },
+      true,
+      true,
+    );
+    expect(result).toBeUndefined();
+  });
+
+  it("getRiskInsightsApplicationData$ should call apiService.send with correct parameters and return an Observable", async () => {
+    const reportId = "report123" as OrganizationReportId;
+    const mockResponse: EncryptedDataWithKey | null = {
+      organizationId: orgId,
+      encryptedReportData: new EncString(JSON.stringify(mockReportData)),
+      encryptedSummaryData: new EncString(JSON.stringify(mockSummaryData)),
+      encryptedApplicationData: new EncString(JSON.stringify(mockApplicationData)),
+      contentEncryptionKey: new EncString(mockKey),
+    };
+
+    mockApiService.send.mockResolvedValueOnce(mockResponse);
+
+    const result = await firstValueFrom(service.getRiskInsightsApplicationData$(orgId, reportId));
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "GET",
+      `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
+      null,
+      true,
+      true,
+    );
+    expect(result).toEqual(new GetRiskInsightsApplicationDataResponse(mockResponse));
+  });
+
+  it("updateRiskInsightsApplicationData$ should call apiService.send with correct parameters and return an Observable", async () => {
+    const reportId = "report123" as OrganizationReportId;
+    // TODO Update to be encrypted test
+    const mockApplication = makeEncString("application-data");
+
+    mockApiService.send.mockResolvedValueOnce(undefined);
+    const result = await firstValueFrom(
+      service.updateRiskInsightsApplicationData$(reportId, orgId, {
+        data: { applicationData: mockApplication.encryptedString! },
+      }),
+    );
+    expect(mockApiService.send).toHaveBeenCalledWith(
+      "PATCH",
+      `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
+      { applicationData: mockApplication.encryptedString!, id: reportId, organizationId: orgId },
+      true,
+      true,
+    );
+    expect(result).toBeTruthy();
+  });
+});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-api.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/risk-insights-api.service.ts
similarity index 52%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-api.service.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/risk-insights-api.service.ts
index 9d8c2291749..e221d68ca7e 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-api.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/risk-insights-api.service.ts
@@ -1,29 +1,44 @@
-import { from, Observable } from "rxjs";
+import { catchError, from, map, Observable, of, throwError } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { OrganizationId, OrganizationReportId } from "@bitwarden/common/types/guid";
 
 import {
+  UpdateRiskInsightsApplicationDataRequest,
+  UpdateRiskInsightsApplicationDataResponse,
+  UpdateRiskInsightsSummaryDataRequest,
+} from "../../models";
+import {
+  GetRiskInsightsApplicationDataResponse,
   GetRiskInsightsReportResponse,
+  GetRiskInsightsSummaryResponse,
   SaveRiskInsightsReportRequest,
   SaveRiskInsightsReportResponse,
-} from "../models/api-models.types";
-import { EncryptedDataModel } from "../models/password-health";
+} from "../../models/api-models.types";
 
 export class RiskInsightsApiService {
   constructor(private apiService: ApiService) {}
 
   getRiskInsightsReport$(orgId: OrganizationId): Observable<GetRiskInsightsReportResponse | null> {
-    const dbResponse = this.apiService
-      .send("GET", `/reports/organizations/${orgId.toString()}/latest`, null, true, true)
-      .catch((error: any): any => {
-        if (error.statusCode === 404) {
-          return null; // Handle 404 by returning null or an appropriate default value
+    const dbResponse = this.apiService.send(
+      "GET",
+      `/reports/organizations/${orgId.toString()}/latest`,
+      null,
+      true,
+      true,
+    );
+    return from(dbResponse).pipe(
+      // As of this change, the server doesn't return a 404 if a report is not found
+      // Handle null response if server returns nothing
+      map((response) => (response ? new GetRiskInsightsReportResponse(response) : null)),
+      catchError((error: unknown) => {
+        if (error instanceof ErrorResponse && error.statusCode === 404) {
+          return of(null); // Handle 404 by returning null or an appropriate default value
         }
-        throw error; // Re-throw other errors
-      });
-
-    return from(dbResponse as Promise<GetRiskInsightsReportResponse>);
+        return throwError(() => error); // Re-throw other errors
+      }),
+    );
   }
 
   saveRiskInsightsReport$(
@@ -38,14 +53,14 @@ export class RiskInsightsApiService {
       true,
     );
 
-    return from(dbResponse as Promise<SaveRiskInsightsReportResponse>);
+    return from(dbResponse).pipe(map((response) => new SaveRiskInsightsReportResponse(response)));
   }
 
   getRiskInsightsSummary$(
     orgId: string,
     minDate: Date,
     maxDate: Date,
-  ): Observable<EncryptedDataModel[]> {
+  ): Observable<GetRiskInsightsSummaryResponse> {
     const minDateStr = minDate.toISOString().split("T")[0];
     const maxDateStr = maxDate.toISOString().split("T")[0];
     const dbResponse = this.apiService.send(
@@ -56,18 +71,18 @@ export class RiskInsightsApiService {
       true,
     );
 
-    return from(dbResponse as Promise<EncryptedDataModel[]>);
+    return from(dbResponse).pipe(map((response) => new GetRiskInsightsSummaryResponse(response)));
   }
 
   updateRiskInsightsSummary$(
-    summaryData: EncryptedDataModel,
-    organizationId: OrganizationId,
     reportId: OrganizationReportId,
+    organizationId: OrganizationId,
+    request: UpdateRiskInsightsSummaryDataRequest,
   ): Observable<void> {
     const dbResponse = this.apiService.send(
       "PATCH",
       `/reports/organizations/${organizationId.toString()}/data/summary/${reportId.toString()}`,
-      summaryData,
+      { ...request.data, reportId: reportId, organizationId },
       true,
       true,
     );
@@ -78,7 +93,7 @@ export class RiskInsightsApiService {
   getRiskInsightsApplicationData$(
     orgId: OrganizationId,
     reportId: OrganizationReportId,
-  ): Observable<EncryptedDataModel | null> {
+  ): Observable<GetRiskInsightsApplicationDataResponse> {
     const dbResponse = this.apiService.send(
       "GET",
       `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
@@ -87,22 +102,26 @@ export class RiskInsightsApiService {
       true,
     );
 
-    return from(dbResponse as Promise<EncryptedDataModel | null>);
+    return from(dbResponse).pipe(
+      map((response) => new GetRiskInsightsApplicationDataResponse(response)),
+    );
   }
 
   updateRiskInsightsApplicationData$(
-    applicationData: EncryptedDataModel,
-    orgId: OrganizationId,
     reportId: OrganizationReportId,
-  ): Observable<void> {
+    orgId: OrganizationId,
+    request: UpdateRiskInsightsApplicationDataRequest,
+  ): Observable<UpdateRiskInsightsApplicationDataResponse> {
     const dbResponse = this.apiService.send(
       "PATCH",
       `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
-      applicationData,
+      { ...request.data, id: reportId, organizationId: orgId },
       true,
       true,
     );
 
-    return from(dbResponse as Promise<void>);
+    return from(dbResponse).pipe(
+      map((response) => new UpdateRiskInsightsApplicationDataResponse(response)),
+    );
   }
 }
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/security-tasks-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/security-tasks-api.service.spec.ts
new file mode 100644
index 00000000000..63fec460162
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/security-tasks-api.service.spec.ts
@@ -0,0 +1,53 @@
+import { mock } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+import { SecurityTasksApiService, TaskMetrics } from "./security-tasks-api.service";
+
+describe("SecurityTasksApiService", () => {
+  const apiServiceMock = mock<ApiService>();
+  let service: SecurityTasksApiService;
+
+  beforeEach(() => {
+    service = new SecurityTasksApiService(apiServiceMock);
+  });
+
+  it("should be created", () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe("getTaskMetrics", () => {
+    it("should call apiService.send with correct parameters", (done) => {
+      const orgId = { toString: () => "org-123" } as OrganizationId;
+      const mockMetrics: TaskMetrics = { completedTasks: 2, totalTasks: 5 };
+      apiServiceMock.send.mockReturnValue(Promise.resolve(mockMetrics));
+
+      service.getTaskMetrics(orgId).subscribe((metrics) => {
+        expect(apiServiceMock.send).toHaveBeenCalledWith(
+          "GET",
+          "/tasks/org-123/metrics",
+          null,
+          true,
+          true,
+        );
+        expect(metrics).toEqual(mockMetrics);
+        done();
+      });
+    });
+
+    it("should propagate errors from apiService.send", (done) => {
+      const orgId = { toString: () => "org-456" } as OrganizationId;
+      const error = new Error("API error");
+      apiServiceMock.send.mockReturnValue(Promise.reject(error));
+
+      service.getTaskMetrics(orgId).subscribe({
+        next: () => {},
+        error: (err: unknown) => {
+          expect(err).toBe(error);
+          done();
+        },
+      });
+    });
+  });
+});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/security-tasks-api.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/security-tasks-api.service.ts
new file mode 100644
index 00000000000..e81c91a350c
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/api/security-tasks-api.service.ts
@@ -0,0 +1,57 @@
+import { from, Observable } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import {
+  SecurityTask,
+  SecurityTaskData,
+  SecurityTaskResponse,
+  SecurityTaskStatus,
+} from "@bitwarden/common/vault/tasks";
+
+export type TaskMetrics = {
+  completedTasks: number;
+  totalTasks: number;
+};
+
+export class SecurityTasksApiService {
+  constructor(private apiService: ApiService) {}
+
+  getTaskMetrics(orgId: OrganizationId): Observable<TaskMetrics> {
+    const dbResponse = this.apiService.send(
+      "GET",
+      `/tasks/${orgId.toString()}/metrics`,
+      null,
+      true,
+      true,
+    );
+
+    return from(dbResponse as Promise<TaskMetrics>);
+  }
+
+  // Could not import from @bitwarden/bit-web
+  // Copying from /bitwarden_license/bit-web/src/app/vault/services/default-admin-task.service.ts
+  async getAllTasks(
+    organizationId: OrganizationId,
+    status?: SecurityTaskStatus | undefined,
+  ): Promise<SecurityTask[]> {
+    const queryParams = new URLSearchParams();
+
+    queryParams.append("organizationId", organizationId);
+    if (status !== undefined) {
+      queryParams.append("status", status.toString());
+    }
+
+    const r = await this.apiService.send(
+      "GET",
+      `/tasks/organization?${queryParams.toString()}`,
+      null,
+      true,
+      true,
+    );
+    const response = new ListResponse(r, SecurityTaskResponse);
+
+    return response.data.map((d) => new SecurityTask(new SecurityTaskData(d)));
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/critical-apps.service.spec.ts
similarity index 90%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.spec.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/critical-apps.service.spec.ts
index 72d7e88fcab..d69814572c7 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.spec.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/critical-apps.service.spec.ts
@@ -14,10 +14,10 @@ import { KeyService } from "@bitwarden/key-management";
 import {
   PasswordHealthReportApplicationsRequest,
   PasswordHealthReportApplicationsResponse,
-} from "../models/api-models.types";
-import { PasswordHealthReportApplicationId } from "../models/report-models";
+} from "../../models/api-models.types";
+import { PasswordHealthReportApplicationId } from "../../models/report-models";
+import { CriticalAppsApiService } from "../api/critical-apps-api.service";
 
-import { CriticalAppsApiService } from "./critical-apps-api.service";
 import { CriticalAppsService } from "./critical-apps.service";
 
 const SomeCsprngArray = new Uint8Array(64) as CsprngArray;
@@ -82,9 +82,10 @@ describe("CriticalAppsService", () => {
   });
 
   it("should exclude records that already exist", async () => {
+    const privateCriticalAppsSubject = service["criticalAppsListSubject$"];
     // arrange
     // one record already exists
-    service.setAppsInListForOrg([
+    privateCriticalAppsSubject.next([
       {
         id: randomUUID() as PasswordHealthReportApplicationId,
         organizationId: SomeOrganization,
@@ -145,6 +146,7 @@ describe("CriticalAppsService", () => {
 
   it("should get by org id", () => {
     const orgId = "some organization" as OrganizationId;
+    const privateCriticalAppsSubject = service["criticalAppsListSubject$"];
     const response = [
       { id: "id1", organizationId: "some organization", uri: "https://example.com" },
       { id: "id2", organizationId: "some organization", uri: "https://example.org" },
@@ -155,13 +157,14 @@ describe("CriticalAppsService", () => {
     const orgKey$ = new BehaviorSubject(OrgRecords);
     keyService.orgKeys$.mockReturnValue(orgKey$);
     service.loadOrganizationContext(SomeOrganization, SomeUser);
-    service.setAppsInListForOrg(response);
+    privateCriticalAppsSubject.next(response);
     service.getAppsListForOrg(orgId as OrganizationId).subscribe((res) => {
       expect(res).toHaveLength(2);
     });
   });
 
   it("should drop a critical app", async () => {
+    const privateCriticalAppsSubject = service["criticalAppsListSubject$"];
     // arrange
     const selectedUrl = "https://example.com";
 
@@ -175,10 +178,10 @@ describe("CriticalAppsService", () => {
 
     service.loadOrganizationContext(SomeOrganization, SomeUser);
 
-    service.setAppsInListForOrg(initialList);
+    privateCriticalAppsSubject.next(initialList);
 
     // act
-    await service.dropCriticalApp(SomeOrganization, selectedUrl);
+    await service.dropCriticalAppByUrl(SomeOrganization, selectedUrl);
 
     // expectations
     expect(criticalAppsApiService.dropCriticalApp).toHaveBeenCalledWith({
@@ -193,6 +196,7 @@ describe("CriticalAppsService", () => {
   });
 
   it("should not drop a critical app if it does not exist", async () => {
+    const privateCriticalAppsSubject = service["criticalAppsListSubject$"];
     // arrange
     const selectedUrl = "https://nonexistent.com";
 
@@ -206,10 +210,10 @@ describe("CriticalAppsService", () => {
 
     service.loadOrganizationContext(SomeOrganization, SomeUser);
 
-    service.setAppsInListForOrg(initialList);
+    privateCriticalAppsSubject.next(initialList);
 
     // act
-    await service.dropCriticalApp(SomeOrganization, selectedUrl);
+    await service.dropCriticalAppByUrl(SomeOrganization, selectedUrl);
 
     // expectations
     expect(criticalAppsApiService.dropCriticalApp).not.toHaveBeenCalled();
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/critical-apps.service.ts
similarity index 87%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/critical-apps.service.ts
index 82001387bbd..d310b3aeaac 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/critical-apps.service.ts
@@ -1,13 +1,17 @@
 import {
   BehaviorSubject,
+  catchError,
   filter,
   first,
   firstValueFrom,
   forkJoin,
+  from,
   map,
   Observable,
   of,
   switchMap,
+  tap,
+  throwError,
   zip,
 } from "rxjs";
 
@@ -20,9 +24,8 @@ import { KeyService } from "@bitwarden/key-management";
 import {
   PasswordHealthReportApplicationsRequest,
   PasswordHealthReportApplicationsResponse,
-} from "../models/api-models.types";
-
-import { CriticalAppsApiService } from "./critical-apps-api.service";
+} from "../../models/api-models.types";
+import { CriticalAppsApiService } from "../api/critical-apps-api.service";
 
 /* Retrieves and decrypts critical apps for a given organization
  *  Encrypts and saves data for a given organization
@@ -83,11 +86,6 @@ export class CriticalAppsService {
       .pipe(map((apps) => apps.filter((app) => app.organizationId === orgId)));
   }
 
-  // Reset the critical apps list
-  setAppsInListForOrg(apps: PasswordHealthReportApplicationsResponse[]) {
-    this.criticalAppsListSubject$.next(apps);
-  }
-
   // Save the selected critical apps for a given organization
   async setCriticalApps(orgId: OrganizationId, selectedUrls: string[]) {
     if (orgId != this.organizationId.value) {
@@ -130,9 +128,14 @@ export class CriticalAppsService {
     this.criticalAppsListSubject$.next(updatedList);
   }
 
-  // Drop a critical app for a given organization
-  // Only one app may be dropped at a time
-  async dropCriticalApp(orgId: OrganizationId, selectedUrl: string) {
+  /**
+   * Drop a critical application by url
+   *
+   * @param orgId
+   * @param selectedUrl
+   * @returns
+   */
+  async dropCriticalAppByUrl(orgId: OrganizationId, selectedUrl: string) {
     if (orgId != this.organizationId.value) {
       throw new Error("Organization ID mismatch");
     }
@@ -155,6 +158,31 @@ export class CriticalAppsService {
     );
   }
 
+  /**
+   * Drop multiple critical applications by id
+   *
+   * @param orgId
+   * @param ids
+   * @returns
+   */
+  dropCriticalAppsById(orgId: OrganizationId, ids: string[]) {
+    return from(
+      this.criticalAppsApiService.dropCriticalApp({
+        organizationId: orgId,
+        passwordHealthReportApplicationIds: ids,
+      }),
+    ).pipe(
+      tap((response) => {
+        this.criticalAppsListSubject$.next(
+          this.criticalAppsListSubject$.value.filter((f) => ids.some((id) => id === f.id)),
+        );
+      }),
+      catchError((error: unknown) => {
+        return throwError(() => error);
+      }),
+    );
+  }
+
   private retrieveCriticalApps(
     orgId: OrganizationId | null,
   ): Observable<PasswordHealthReportApplicationsResponse[]> {
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/password-health.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/password-health.service.spec.ts
similarity index 97%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/password-health.service.spec.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/password-health.service.spec.ts
index 65ee2c8bb74..7bc0862887b 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/password-health.service.spec.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/password-health.service.spec.ts
@@ -28,7 +28,7 @@ describe("PasswordHealthService", () => {
     auditService.passwordLeaked.mockImplementation((password: string) =>
       Promise.resolve(password === "leaked" ? 2 : 0),
     );
-    service = new PasswordHealthService(passwordStrengthService, auditService);
+    service = new PasswordHealthService(auditService, passwordStrengthService);
 
     // Setup mock data
     mockValidCipher = mock<CipherView>({
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/password-health.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/password-health.service.ts
similarity index 94%
rename from bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/password-health.service.ts
rename to bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/password-health.service.ts
index 865f5cd712f..2d94bf828b8 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/password-health.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/password-health.service.ts
@@ -10,12 +10,12 @@ import {
   ExposedPasswordDetail,
   WeakPasswordDetail,
   WeakPasswordScore,
-} from "../models/password-health";
+} from "../../models/password-health";
 
 export class PasswordHealthService {
   constructor(
-    private passwordStrengthService: PasswordStrengthServiceAbstraction,
     private auditService: AuditService,
+    private passwordStrengthService: PasswordStrengthServiceAbstraction,
   ) {}
 
   /**
@@ -29,9 +29,10 @@ export class PasswordHealthService {
       filter((cipher) => this.isValidCipher(cipher)),
       mergeMap((cipher) =>
         this.auditService
-          .passwordLeaked(cipher.login.password)
+          .passwordLeaked(cipher.login.password!)
           .then((exposedCount) => ({ cipher, exposedCount })),
       ),
+      // [FIXME] ExposedDetails is can still return a null
       filter(({ exposedCount }) => exposedCount > 0),
       map(({ cipher, exposedCount }) => ({
         exposedXTimes: exposedCount,
@@ -73,11 +74,11 @@ export class PasswordHealthService {
 
     // Check the username
     const userInput = this.isUserNameNotEmpty(cipher)
-      ? this.extractUsernameParts(cipher.login.username)
+      ? this.extractUsernameParts(cipher.login.username!)
       : undefined;
 
     const { score } = this.passwordStrengthService.getPasswordStrength(
-      cipher.login.password,
+      cipher.login.password!,
       undefined, // No email available in this context
       userInput,
     );
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-encryption.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-encryption.service.spec.ts
new file mode 100644
index 00000000000..b9b2cd8de97
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-encryption.service.spec.ts
@@ -0,0 +1,336 @@
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject } from "rxjs";
+
+import { KeyGenerationService } from "@bitwarden/common/key-management/crypto";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { makeSymmetricCryptoKey } from "@bitwarden/common/spec";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { OrgKey } from "@bitwarden/common/types/key";
+import { KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+
+import { EncryptedReportData, DecryptedReportData } from "../../models";
+import { mockApplicationData, mockReportData, mockSummaryData } from "../../models/mocks/mock-data";
+
+import { RiskInsightsEncryptionService } from "./risk-insights-encryption.service";
+
+describe("RiskInsightsEncryptionService", () => {
+  let service: RiskInsightsEncryptionService;
+  const mockKeyService = mock<KeyService>();
+  const mockEncryptService = mock<EncryptService>();
+  const mockKeyGenerationService = mock<KeyGenerationService>();
+  const mockLogService = mock<LogService>();
+
+  const ENCRYPTED_TEXT = "This data has been encrypted";
+  const ENCRYPTED_KEY = "Re-encrypted Cipher Key";
+  const orgId = "org-123" as OrganizationId;
+  const userId = "user-123" as UserId;
+  const orgKey = makeSymmetricCryptoKey<OrgKey>();
+  const contentEncryptionKey = new SymmetricCryptoKey(new Uint8Array(64));
+  const testData = { foo: "bar" };
+  const OrgRecords: Record<OrganizationId, OrgKey> = {
+    [orgId]: orgKey,
+    ["testOrg" as OrganizationId]: makeSymmetricCryptoKey<OrgKey>(),
+  };
+  const orgKey$ = new BehaviorSubject(OrgRecords);
+
+  let mockDecryptedData: DecryptedReportData;
+  let mockEncryptedData: EncryptedReportData;
+  let mockKey: EncString;
+
+  beforeEach(() => {
+    service = new RiskInsightsEncryptionService(
+      mockKeyService,
+      mockEncryptService,
+      mockKeyGenerationService,
+      mockLogService,
+    );
+
+    jest.clearAllMocks();
+
+    // Always use the same contentEncryptionKey for both encrypt and decrypt tests
+    mockKeyGenerationService.createKey.mockResolvedValue(contentEncryptionKey);
+    mockEncryptService.wrapSymmetricKey.mockResolvedValue(new EncString(ENCRYPTED_KEY));
+    mockEncryptService.encryptString.mockResolvedValue(new EncString(ENCRYPTED_TEXT));
+    mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
+    mockEncryptService.decryptString.mockResolvedValue(JSON.stringify(testData));
+    mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+
+    mockKey = new EncString("wrapped-key");
+    mockEncryptedData = {
+      encryptedReportData: new EncString(JSON.stringify(mockReportData)),
+      encryptedSummaryData: new EncString(JSON.stringify(mockSummaryData)),
+      encryptedApplicationData: new EncString(JSON.stringify(mockApplicationData)),
+    };
+    mockDecryptedData = {
+      reportData: mockReportData,
+      summaryData: mockSummaryData,
+      applicationData: mockApplicationData,
+    };
+  });
+
+  describe("encryptRiskInsightsReport", () => {
+    it("should encrypt data and return encrypted packet", async () => {
+      // arrange: setup our mocks
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+
+      // Act: call the method under test
+      const result = await service.encryptRiskInsightsReport(
+        { organizationId: orgId, userId },
+        mockDecryptedData,
+      );
+
+      // Assert: ensure that the methods were called with the expected parameters
+      expect(mockKeyService.orgKeys$).toHaveBeenCalledWith(userId);
+      expect(mockKeyGenerationService.createKey).toHaveBeenCalledWith(512);
+
+      // Assert all variables were encrypted
+      expect(mockEncryptService.encryptString).toHaveBeenCalledWith(
+        JSON.stringify(mockDecryptedData.reportData),
+        contentEncryptionKey,
+      );
+      expect(mockEncryptService.encryptString).toHaveBeenCalledWith(
+        JSON.stringify(mockDecryptedData.summaryData),
+        contentEncryptionKey,
+      );
+      expect(mockEncryptService.encryptString).toHaveBeenCalledWith(
+        JSON.stringify(mockDecryptedData.applicationData),
+        contentEncryptionKey,
+      );
+
+      expect(mockEncryptService.wrapSymmetricKey).toHaveBeenCalledWith(
+        contentEncryptionKey,
+        orgKey,
+      );
+
+      // Mocked encrypt returns ENCRYPTED_TEXT
+      expect(result).toEqual({
+        organizationId: orgId,
+        encryptedReportData: new EncString(ENCRYPTED_TEXT),
+        encryptedSummaryData: new EncString(ENCRYPTED_TEXT),
+        encryptedApplicationData: new EncString(ENCRYPTED_TEXT),
+        contentEncryptionKey: new EncString(ENCRYPTED_KEY),
+      });
+    });
+
+    it("should throw an error when encrypted text is null or empty", async () => {
+      // arrange: setup our mocks
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.encryptString.mockResolvedValue(new EncString(""));
+      mockEncryptService.wrapSymmetricKey.mockResolvedValue(new EncString(ENCRYPTED_KEY));
+
+      // Act & Assert: call the method under test and expect rejection
+      await expect(
+        service.encryptRiskInsightsReport({ organizationId: orgId, userId }, mockDecryptedData),
+      ).rejects.toThrow("Encryption failed, encrypted strings are null");
+    });
+
+    it("should throw an error when encrypted key is null or empty", async () => {
+      // arrange: setup our mocks
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.encryptString.mockResolvedValue(new EncString(ENCRYPTED_TEXT));
+      mockEncryptService.wrapSymmetricKey.mockResolvedValue(new EncString(""));
+
+      // Act & Assert: call the method under test and expect rejection
+      await expect(
+        service.encryptRiskInsightsReport({ organizationId: orgId, userId }, mockDecryptedData),
+      ).rejects.toThrow("Encryption failed, encrypted strings are null");
+    });
+
+    it("should throw if org key is not found", async () => {
+      // when we cannot get an organization key, we should throw an error
+      mockKeyService.orgKeys$.mockReturnValue(new BehaviorSubject({}));
+
+      await expect(
+        service.encryptRiskInsightsReport({ organizationId: orgId, userId }, mockDecryptedData),
+      ).rejects.toThrow("Organization key not found");
+    });
+  });
+
+  describe("decryptRiskInsightsReport", () => {
+    it("should decrypt data and return original object", async () => {
+      // Arrange: setup our mocks with valid data structures
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
+
+      // Mock decryption to return valid data for each call
+      mockEncryptService.decryptString
+        .mockResolvedValueOnce(JSON.stringify(mockReportData))
+        .mockResolvedValueOnce(JSON.stringify(mockSummaryData))
+        .mockResolvedValueOnce(JSON.stringify(mockApplicationData));
+
+      // act: call the decrypt method
+      const result = await service.decryptRiskInsightsReport(
+        { organizationId: orgId, userId },
+        mockEncryptedData,
+        mockKey,
+      );
+
+      expect(mockKeyService.orgKeys$).toHaveBeenCalledWith(userId);
+      expect(mockEncryptService.unwrapSymmetricKey).toHaveBeenCalledWith(mockKey, orgKey);
+      expect(mockEncryptService.decryptString).toHaveBeenCalledTimes(3);
+
+      // Verify decrypted data matches the mocked valid data
+      expect(result).toEqual({
+        reportData: mockReportData,
+        summaryData: mockSummaryData,
+        applicationData: mockApplicationData,
+      });
+    });
+
+    it("should invoke data type validation method during decryption", async () => {
+      // Arrange: setup our mocks with valid data structures
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
+
+      // Mock decryption to return valid data for each call
+      mockEncryptService.decryptString
+        .mockResolvedValueOnce(JSON.stringify(mockReportData))
+        .mockResolvedValueOnce(JSON.stringify(mockSummaryData))
+        .mockResolvedValueOnce(JSON.stringify(mockApplicationData));
+
+      // act: call the decrypt method
+      const result = await service.decryptRiskInsightsReport(
+        { organizationId: orgId, userId },
+        mockEncryptedData,
+        mockKey,
+      );
+
+      // Verify that validation passed and returned the correct data
+      expect(result).toEqual({
+        reportData: mockReportData,
+        summaryData: mockSummaryData,
+        applicationData: mockApplicationData,
+      });
+    });
+
+    it("should return null if org key is not found", async () => {
+      mockKeyService.orgKeys$.mockReturnValue(new BehaviorSubject({}));
+      await expect(
+        service.decryptRiskInsightsReport(
+          { organizationId: orgId, userId },
+
+          mockEncryptedData,
+          mockKey,
+        ),
+      ).rejects.toEqual(Error("Organization key not found"));
+    });
+
+    it("should throw if decrypt throws", async () => {
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.unwrapSymmetricKey.mockRejectedValue(new Error("fail"));
+
+      await expect(
+        service.decryptRiskInsightsReport(
+          { organizationId: orgId, userId },
+
+          mockEncryptedData,
+          mockKey,
+        ),
+      ).rejects.toEqual(Error("fail"));
+    });
+
+    it("should throw error when report data validation fails", async () => {
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
+
+      // Mock decryption to return invalid data
+      mockEncryptService.decryptString
+        .mockResolvedValueOnce(JSON.stringify([{ invalid: "data" }])) // invalid report data
+        .mockResolvedValueOnce(JSON.stringify(mockSummaryData))
+        .mockResolvedValueOnce(JSON.stringify(mockApplicationData));
+
+      await expect(
+        service.decryptRiskInsightsReport(
+          { organizationId: orgId, userId },
+          mockEncryptedData,
+          mockKey,
+        ),
+      ).rejects.toThrow(
+        /Report data validation failed.*This may indicate data corruption or tampering/,
+      );
+    });
+
+    it("should throw error when summary data validation fails", async () => {
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
+
+      // Clear and reset the mock
+      mockEncryptService.decryptString.mockReset();
+
+      // Mock decryption - report data should succeed, summary should fail
+      mockEncryptService.decryptString
+        .mockResolvedValueOnce(JSON.stringify(mockReportData)) // valid
+        .mockResolvedValueOnce(JSON.stringify({ invalid: "summary" })) // invalid summary data - fails here
+        .mockResolvedValueOnce(JSON.stringify(mockApplicationData)); // won't be called but prevents fallback
+
+      await expect(
+        service.decryptRiskInsightsReport(
+          { organizationId: orgId, userId },
+          mockEncryptedData,
+          mockKey,
+        ),
+      ).rejects.toThrow(
+        /Summary data validation failed.*This may indicate data corruption or tampering/,
+      );
+    });
+
+    it("should throw error when application data validation fails", async () => {
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
+
+      // Clear and reset the mock
+      mockEncryptService.decryptString.mockReset();
+
+      // Mock decryption - report and summary should succeed, application should fail
+      mockEncryptService.decryptString
+        .mockResolvedValueOnce(JSON.stringify(mockReportData)) // valid
+        .mockResolvedValueOnce(JSON.stringify(mockSummaryData)) // valid
+        .mockResolvedValueOnce(JSON.stringify([{ invalid: "application" }])); // invalid app data
+
+      await expect(
+        service.decryptRiskInsightsReport(
+          { organizationId: orgId, userId },
+          mockEncryptedData,
+          mockKey,
+        ),
+      ).rejects.toThrow(
+        /Application data validation failed.*This may indicate data corruption or tampering/,
+      );
+    });
+
+    it("should throw error for invalid date in application data", async () => {
+      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
+      mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
+
+      const invalidApplicationData = [
+        {
+          applicationName: "Test App",
+          isCritical: true,
+          reviewedDate: "invalid-date-string",
+        },
+      ];
+
+      // Clear and reset the mock
+      mockEncryptService.decryptString.mockReset();
+
+      // Mock decryption - report and summary succeed, application with invalid date fails
+      mockEncryptService.decryptString
+        .mockResolvedValueOnce(JSON.stringify(mockReportData)) // valid
+        .mockResolvedValueOnce(JSON.stringify(mockSummaryData)) // valid
+        .mockResolvedValueOnce(JSON.stringify(invalidApplicationData)); // invalid date
+
+      await expect(
+        service.decryptRiskInsightsReport(
+          { organizationId: orgId, userId },
+          mockEncryptedData,
+          mockKey,
+        ),
+      ).rejects.toThrow(
+        /Application data validation failed.*This may indicate data corruption or tampering/,
+      );
+    });
+  });
+});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-encryption.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-encryption.service.ts
new file mode 100644
index 00000000000..99ac2276a3e
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-encryption.service.ts
@@ -0,0 +1,258 @@
+import { firstValueFrom, map } from "rxjs";
+
+import { KeyGenerationService } from "@bitwarden/common/key-management/crypto";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+
+import { createNewSummaryData } from "../../helpers";
+import {
+  validateApplicationHealthReportDetailArray,
+  validateOrganizationReportApplicationArray,
+  validateOrganizationReportSummary,
+} from "../../helpers/type-guards/risk-insights-type-guards";
+import {
+  ApplicationHealthReportDetail,
+  DecryptedReportData,
+  EncryptedDataWithKey,
+  EncryptedReportData,
+  OrganizationReportApplication,
+  OrganizationReportSummary,
+} from "../../models";
+
+export class RiskInsightsEncryptionService {
+  constructor(
+    private keyService: KeyService,
+    private encryptService: EncryptService,
+    private keyGeneratorService: KeyGenerationService,
+    private logService: LogService,
+  ) {}
+
+  async encryptRiskInsightsReport(
+    context: {
+      organizationId: OrganizationId;
+      userId: UserId;
+    },
+    data: DecryptedReportData,
+    wrappedKey?: EncString,
+  ): Promise<EncryptedDataWithKey> {
+    this.logService.info("[RiskInsightsEncryptionService] Encrypting risk insights report");
+    const { userId, organizationId } = context;
+    const orgKey = await firstValueFrom(
+      this.keyService
+        .orgKeys$(userId)
+        .pipe(
+          map((organizationKeysById) =>
+            organizationKeysById ? organizationKeysById[organizationId] : null,
+          ),
+        ),
+    );
+
+    if (!orgKey) {
+      this.logService.warning(
+        "[RiskInsightsEncryptionService] Attempted to encrypt report data without org id",
+      );
+      throw new Error("Organization key not found");
+    }
+
+    let contentEncryptionKey: SymmetricCryptoKey;
+    try {
+      if (!wrappedKey) {
+        // Generate a new key
+        contentEncryptionKey = await this.keyGeneratorService.createKey(512);
+      } else {
+        // Unwrap the existing key
+        contentEncryptionKey = await this.encryptService.unwrapSymmetricKey(wrappedKey, orgKey);
+      }
+    } catch (error: unknown) {
+      this.logService.error("[RiskInsightsEncryptionService] Failed to get encryption key", error);
+      throw new Error("Failed to get encryption key");
+    }
+
+    const { reportData, summaryData, applicationData } = data;
+
+    // Encrypt the data
+    const encryptedReportData = await this.encryptService.encryptString(
+      JSON.stringify(reportData),
+      contentEncryptionKey,
+    );
+    const encryptedSummaryData = await this.encryptService.encryptString(
+      JSON.stringify(summaryData),
+      contentEncryptionKey,
+    );
+    const encryptedApplicationData = await this.encryptService.encryptString(
+      JSON.stringify(applicationData),
+      contentEncryptionKey,
+    );
+
+    const wrappedEncryptionKey = await this.encryptService.wrapSymmetricKey(
+      contentEncryptionKey,
+      orgKey,
+    );
+
+    if (
+      !encryptedReportData.encryptedString ||
+      !encryptedSummaryData.encryptedString ||
+      !encryptedApplicationData.encryptedString ||
+      !wrappedEncryptionKey.encryptedString
+    ) {
+      this.logService.error(
+        "[RiskInsightsEncryptionService] Encryption failed, encrypted strings are null",
+      );
+      throw new Error("Encryption failed, encrypted strings are null");
+    }
+
+    const encryptedDataPacket: EncryptedDataWithKey = {
+      organizationId,
+      encryptedReportData: encryptedReportData,
+      encryptedSummaryData: encryptedSummaryData,
+      encryptedApplicationData: encryptedApplicationData,
+      contentEncryptionKey: wrappedEncryptionKey,
+    };
+
+    return encryptedDataPacket;
+  }
+
+  async decryptRiskInsightsReport(
+    context: {
+      organizationId: OrganizationId;
+      userId: UserId;
+    },
+    encryptedData: EncryptedReportData,
+    wrappedKey: EncString,
+  ): Promise<DecryptedReportData> {
+    this.logService.info("[RiskInsightsEncryptionService] Decrypting risk insights report");
+
+    const { userId, organizationId } = context;
+    const orgKey = await firstValueFrom(
+      this.keyService
+        .orgKeys$(userId)
+        .pipe(
+          map((organizationKeysById) =>
+            organizationKeysById ? organizationKeysById[organizationId] : null,
+          ),
+        ),
+    );
+
+    if (!orgKey) {
+      this.logService.warning(
+        "[RiskInsightsEncryptionService] Attempted to decrypt report data without org id",
+      );
+      throw new Error("Organization key not found");
+    }
+
+    const unwrappedEncryptionKey = await this.encryptService.unwrapSymmetricKey(wrappedKey, orgKey);
+    if (!unwrappedEncryptionKey) {
+      this.logService.error("[RiskInsightsEncryptionService] Encryption key not found");
+      throw Error("Encryption key not found");
+    }
+
+    const { encryptedReportData, encryptedSummaryData, encryptedApplicationData } = encryptedData;
+
+    // Decrypt the data
+    const decryptedReportData = await this._handleDecryptReport(
+      encryptedReportData,
+      unwrappedEncryptionKey,
+    );
+    const decryptedSummaryData = await this._handleDecryptSummary(
+      encryptedSummaryData,
+      unwrappedEncryptionKey,
+    );
+    const decryptedApplicationData = await this._handleDecryptApplication(
+      encryptedApplicationData,
+      unwrappedEncryptionKey,
+    );
+
+    const decryptedFullReport = {
+      reportData: decryptedReportData,
+      summaryData: decryptedSummaryData,
+      applicationData: decryptedApplicationData,
+    };
+
+    return decryptedFullReport;
+  }
+
+  private async _handleDecryptReport(
+    encryptedData: EncString | null,
+    key: SymmetricCryptoKey,
+  ): Promise<ApplicationHealthReportDetail[]> {
+    if (encryptedData == null) {
+      return [];
+    }
+
+    try {
+      const decryptedData = await this.encryptService.decryptString(encryptedData, key);
+      const parsedData = JSON.parse(decryptedData);
+
+      // Validate parsed data structure with runtime type guards
+      return validateApplicationHealthReportDetailArray(parsedData);
+    } catch (error: unknown) {
+      // Log detailed error for debugging
+      this.logService.error("[RiskInsightsEncryptionService] Failed to decrypt report", error);
+      // Always throw generic message to prevent information disclosure
+      // Original error with detailed validation info is logged, not exposed to caller
+      throw new Error(
+        "Report data validation failed. This may indicate data corruption or tampering.",
+      );
+    }
+  }
+
+  private async _handleDecryptSummary(
+    encryptedData: EncString | null,
+    key: SymmetricCryptoKey,
+  ): Promise<OrganizationReportSummary> {
+    if (encryptedData == null) {
+      return createNewSummaryData();
+    }
+
+    try {
+      const decryptedData = await this.encryptService.decryptString(encryptedData, key);
+      const parsedData = JSON.parse(decryptedData);
+
+      // Validate parsed data structure with runtime type guards
+      return validateOrganizationReportSummary(parsedData);
+    } catch (error: unknown) {
+      // Log detailed error for debugging
+      this.logService.error(
+        "[RiskInsightsEncryptionService] Failed to decrypt report summary",
+        error,
+      );
+      // Always throw generic message to prevent information disclosure
+      // Original error with detailed validation info is logged, not exposed to caller
+      throw new Error(
+        "Summary data validation failed. This may indicate data corruption or tampering.",
+      );
+    }
+  }
+
+  private async _handleDecryptApplication(
+    encryptedData: EncString | null,
+    key: SymmetricCryptoKey,
+  ): Promise<OrganizationReportApplication[]> {
+    if (encryptedData == null) {
+      return [];
+    }
+
+    try {
+      const decryptedData = await this.encryptService.decryptString(encryptedData, key);
+      const parsedData = JSON.parse(decryptedData);
+
+      // Validate parsed data structure with runtime type guards
+      return validateOrganizationReportApplicationArray(parsedData);
+    } catch (error: unknown) {
+      // Log detailed error for debugging
+      this.logService.error(
+        "[RiskInsightsEncryptionService] Failed to decrypt report applications",
+        error,
+      );
+      // Always throw generic message to prevent information disclosure
+      // Original error with detailed validation info is logged, not exposed to caller
+      throw new Error(
+        "Application data validation failed. This may indicate data corruption or tampering.",
+      );
+    }
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-orchestrator.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-orchestrator.service.spec.ts
new file mode 100644
index 00000000000..bc0d4fc7891
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-orchestrator.service.spec.ts
@@ -0,0 +1,211 @@
+import { mock } from "jest-mock-extended";
+import { of, throwError } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { makeEncString } from "@bitwarden/common/spec";
+import { OrganizationId, OrganizationReportId, UserId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { LogService } from "@bitwarden/logging";
+
+import { createNewSummaryData } from "../../helpers";
+import { ReportStatus, RiskInsightsData, SaveRiskInsightsReportResponse } from "../../models";
+import { RiskInsightsMetrics } from "../../models/domain/risk-insights-metrics";
+import { mockMemberCipherDetailsResponse } from "../../models/mocks/member-cipher-details-response.mock";
+import {
+  mockApplicationData,
+  mockEnrichedReportData,
+  mockSummaryData,
+} from "../../models/mocks/mock-data";
+import { MemberCipherDetailsApiService } from "../api/member-cipher-details-api.service";
+import { RiskInsightsApiService } from "../api/risk-insights-api.service";
+
+import { CriticalAppsService } from "./critical-apps.service";
+import { PasswordHealthService } from "./password-health.service";
+import { RiskInsightsEncryptionService } from "./risk-insights-encryption.service";
+import { RiskInsightsOrchestratorService } from "./risk-insights-orchestrator.service";
+import { RiskInsightsReportService } from "./risk-insights-report.service";
+
+describe("RiskInsightsOrchestratorService", () => {
+  let service: RiskInsightsOrchestratorService;
+
+  // Non changing mock data
+  const mockOrgId = "org-789" as OrganizationId;
+  const mockOrgName = "Test Org";
+  const mockUserId = "user-101" as UserId;
+  const mockReportId = "report-1" as OrganizationReportId;
+  const mockKey: EncString = makeEncString("wrappedKey");
+
+  const reportState: RiskInsightsData = {
+    id: mockReportId,
+    reportData: [],
+    summaryData: createNewSummaryData(),
+    applicationData: [],
+    creationDate: new Date(),
+    contentEncryptionKey: mockKey,
+  };
+  const mockCiphers = [{ id: "cipher-1" }] as any;
+
+  // Mock services
+  const mockAccountService = mock<AccountService>({
+    activeAccount$: of(mock<Account>({ id: mockUserId })),
+  });
+  const mockCriticalAppsService = mock<CriticalAppsService>({
+    criticalAppsList$: of([]),
+  });
+  const mockOrganizationService = mock<OrganizationService>();
+  const mockCipherService = mock<CipherService>();
+  const mockMemberCipherDetailsApiService = mock<MemberCipherDetailsApiService>();
+  let mockPasswordHealthService: PasswordHealthService;
+  const mockReportApiService = mock<RiskInsightsApiService>();
+  let mockReportService: RiskInsightsReportService;
+  const mockRiskInsightsEncryptionService = mock<RiskInsightsEncryptionService>();
+  const mockLogService = mock<LogService>();
+
+  beforeEach(() => {
+    // Mock pipes from constructor
+    mockReportService = mock<RiskInsightsReportService>({
+      generateApplicationsReport: jest.fn().mockReturnValue(mockEnrichedReportData),
+      getApplicationsSummary: jest.fn().mockReturnValue(mockSummaryData),
+      getOrganizationApplications: jest.fn().mockReturnValue(mockApplicationData),
+      getRiskInsightsReport$: jest.fn().mockReturnValue(of(reportState)),
+      saveRiskInsightsReport$: jest.fn().mockReturnValue(
+        of({
+          response: { id: mockReportId } as SaveRiskInsightsReportResponse,
+          contentEncryptionKey: mockKey,
+        }),
+      ),
+    });
+    // Arrange mocks for new flow
+    mockMemberCipherDetailsApiService.getMemberCipherDetails.mockResolvedValue(
+      mockMemberCipherDetailsResponse,
+    );
+
+    mockPasswordHealthService = mock<PasswordHealthService>({
+      auditPasswordLeaks$: jest.fn(() => of([])),
+      isValidCipher: jest.fn().mockReturnValue(true),
+      findWeakPasswordDetails: jest.fn().mockReturnValue(null),
+    });
+
+    mockCipherService.getAllFromApiForOrganization.mockReturnValue(mockCiphers);
+
+    service = new RiskInsightsOrchestratorService(
+      mockAccountService,
+      mockCipherService,
+      mockCriticalAppsService,
+      mockLogService,
+      mockMemberCipherDetailsApiService,
+      mockOrganizationService,
+      mockPasswordHealthService,
+      mockReportApiService,
+      mockReportService,
+      mockRiskInsightsEncryptionService,
+    );
+  });
+
+  describe("fetchReport", () => {
+    it("should emit error ReportState when getRiskInsightsReport$ throws", (done) => {
+      // Setup error passed via constructor for this test case
+      mockReportService.getRiskInsightsReport$ = jest
+        .fn()
+        .mockReturnValue(throwError(() => new Error("API error")));
+      const testService = new RiskInsightsOrchestratorService(
+        mockAccountService,
+        mockCipherService,
+        mockCriticalAppsService,
+        mockLogService,
+        mockMemberCipherDetailsApiService,
+        mockOrganizationService,
+        mockPasswordHealthService,
+        mockReportApiService,
+        mockReportService,
+        mockRiskInsightsEncryptionService,
+      );
+
+      const { _organizationDetailsSubject, _userIdSubject } = testService as any;
+      _organizationDetailsSubject.next({
+        organizationId: mockOrgId,
+        organizationName: mockOrgName,
+      });
+      _userIdSubject.next(mockUserId);
+      testService.rawReportData$.subscribe((state) => {
+        if (state.status != ReportStatus.Loading) {
+          expect(state.error).toBe("Failed to fetch report");
+          expect(state.data).toBeNull();
+          done();
+        }
+      });
+    });
+  });
+
+  describe("generateReport", () => {
+    it("should generate report using member ciphers and password health, then save and emit ReportState", (done) => {
+      const privateOrganizationDetailsSubject = service["_organizationDetailsSubject"];
+      const privateUserIdSubject = service["_userIdSubject"];
+
+      // Set up ciphers in orchestrator
+      privateOrganizationDetailsSubject.next({
+        organizationId: mockOrgId,
+        organizationName: mockOrgName,
+      });
+      privateUserIdSubject.next(mockUserId);
+
+      // Act
+      service.generateReport();
+
+      const metricsData = new RiskInsightsMetrics();
+      metricsData.totalApplicationCount = 3;
+      metricsData.totalAtRiskApplicationCount = 1;
+      metricsData.totalAtRiskMemberCount = 2;
+      metricsData.totalAtRiskPasswordCount = 1;
+      metricsData.totalCriticalApplicationCount = 1;
+      metricsData.totalCriticalAtRiskApplicationCount = 1;
+      metricsData.totalCriticalMemberCount = 1;
+      metricsData.totalCriticalAtRiskMemberCount = 1;
+      metricsData.totalCriticalPasswordCount = 0;
+      metricsData.totalCriticalAtRiskPasswordCount = 0;
+      metricsData.totalMemberCount = 5;
+      metricsData.totalPasswordCount = 2;
+
+      // Assert
+      service.rawReportData$.subscribe((state) => {
+        if (state.status != ReportStatus.Loading && state.data) {
+          expect(mockMemberCipherDetailsApiService.getMemberCipherDetails).toHaveBeenCalledWith(
+            mockOrgId,
+          );
+          expect(mockReportService.generateApplicationsReport).toHaveBeenCalled();
+          expect(mockReportService.saveRiskInsightsReport$).toHaveBeenCalledWith(
+            mockEnrichedReportData,
+            mockSummaryData,
+            mockApplicationData,
+            metricsData,
+            { organizationId: mockOrgId, userId: mockUserId },
+          );
+          expect(state.data.reportData).toEqual(mockEnrichedReportData);
+          expect(state.data.summaryData).toEqual(mockSummaryData);
+          expect(state.data.applicationData).toEqual(mockApplicationData);
+          done();
+        }
+      });
+    });
+
+    describe("destroy", () => {
+      it("should complete destroy$ subject and unsubscribe reportStateSubscription", () => {
+        const privateDestroy = (service as any)._destroy$;
+        const privateReportStateSubscription = (service as any)._reportStateSubscription;
+
+        // Spy on the methods you expect to be called.
+        const destroyCompleteSpy = jest.spyOn(privateDestroy, "complete");
+        const unsubscribeSpy = jest.spyOn(privateReportStateSubscription, "unsubscribe");
+
+        // Execute the destroy method.
+        service.destroy();
+
+        // Assert that the methods were called as expected.
+        expect(destroyCompleteSpy).toHaveBeenCalled();
+        expect(unsubscribeSpy).toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-orchestrator.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-orchestrator.service.ts
new file mode 100644
index 00000000000..050ec8df944
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-orchestrator.service.ts
@@ -0,0 +1,1238 @@
+import {
+  BehaviorSubject,
+  combineLatest,
+  forkJoin,
+  from,
+  merge,
+  Observable,
+  of,
+  Subject,
+  Subscription,
+  throwError,
+} from "rxjs";
+import {
+  catchError,
+  distinctUntilChanged,
+  exhaustMap,
+  filter,
+  map,
+  scan,
+  shareReplay,
+  startWith,
+  switchMap,
+  take,
+  takeUntil,
+  tap,
+  withLatestFrom,
+} from "rxjs/operators";
+
+import {
+  getOrganizationById,
+  OrganizationService,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { CipherId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+import { LogService } from "@bitwarden/logging";
+
+import {
+  buildPasswordUseMap,
+  createNewSummaryData,
+  flattenMemberDetails,
+  getTrimmedCipherUris,
+  getUniqueMembers,
+} from "../../helpers";
+import {
+  ApplicationHealthReportDetailEnriched,
+  PasswordHealthReportApplicationsResponse,
+} from "../../models";
+import { RiskInsightsMetrics } from "../../models/domain/risk-insights-metrics";
+import { RiskInsightsEnrichedData } from "../../models/report-data-service.types";
+import {
+  CipherHealthReport,
+  MemberDetails,
+  OrganizationReportApplication,
+  OrganizationReportSummary,
+  ReportStatus,
+  ReportState,
+  ReportProgress,
+  ApplicationHealthReportDetail,
+} from "../../models/report-models";
+import { MemberCipherDetailsApiService } from "../api/member-cipher-details-api.service";
+import { RiskInsightsApiService } from "../api/risk-insights-api.service";
+
+import { CriticalAppsService } from "./critical-apps.service";
+import { PasswordHealthService } from "./password-health.service";
+import { RiskInsightsEncryptionService } from "./risk-insights-encryption.service";
+import { RiskInsightsReportService } from "./risk-insights-report.service";
+
+export class RiskInsightsOrchestratorService {
+  private _destroy$ = new Subject<void>();
+
+  // -------------------------- Context state --------------------------
+  // Current user viewing risk insights
+  private _userIdSubject = new BehaviorSubject<UserId | null>(null);
+  private _userId$ = this._userIdSubject.asObservable();
+
+  // Organization the user is currently viewing
+  private _organizationDetailsSubject = new BehaviorSubject<{
+    organizationId: OrganizationId;
+    organizationName: string;
+  } | null>(null);
+  organizationDetails$ = this._organizationDetailsSubject.asObservable();
+
+  // ------------------------- Cipher data -------------------------
+  private _ciphersSubject = new BehaviorSubject<CipherView[] | null>(null);
+  private _ciphers$ = this._ciphersSubject.asObservable();
+
+  private _hasCiphersSubject$ = new BehaviorSubject<boolean | null>(null);
+  hasCiphers$ = this._hasCiphersSubject$.asObservable();
+
+  private _criticalApplicationAtRiskCipherIdsSubject$ = new BehaviorSubject<CipherId[]>([]);
+  readonly criticalApplicationAtRiskCipherIds$ =
+    this._criticalApplicationAtRiskCipherIdsSubject$.asObservable();
+
+  // ------------------------- Report Variables ----------------
+  private _rawReportDataSubject = new BehaviorSubject<ReportState>({
+    status: ReportStatus.Initializing,
+    error: null,
+    data: null,
+  });
+  rawReportData$ = this._rawReportDataSubject.asObservable();
+  private _enrichedReportDataSubject = new BehaviorSubject<RiskInsightsEnrichedData | null>(null);
+  enrichedReportData$ = this._enrichedReportDataSubject.asObservable();
+
+  // New applications that haven't been reviewed (reviewedDate === null)
+  newApplications$: Observable<ApplicationHealthReportDetail[]> = this.rawReportData$.pipe(
+    map((reportState) => {
+      const reportApplications = reportState.data?.applicationData || [];
+
+      const newApplications =
+        reportState?.data?.reportData.filter((reportApp) =>
+          reportApplications.some(
+            (app) => app.applicationName == reportApp.applicationName && app.reviewedDate == null,
+          ),
+        ) || [];
+      return newApplications;
+    }),
+    distinctUntilChanged((prev, curr) => {
+      if (prev.length !== curr.length) {
+        return false;
+      }
+      return prev.every(
+        (app, i) =>
+          app.applicationName === curr[i].applicationName &&
+          app.atRiskPasswordCount === curr[i].atRiskPasswordCount,
+      );
+    }),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
+  // Generate report trigger and state
+  private _generateReportTriggerSubject = new BehaviorSubject<boolean>(false);
+  generatingReport$ = this._generateReportTriggerSubject.asObservable();
+
+  // Report generation progress
+  private _reportProgressSubject = new BehaviorSubject<ReportProgress | null>(null);
+  reportProgress$ = this._reportProgressSubject.asObservable();
+
+  // --------------------------- Critical Application data ---------------------
+  criticalReportResults$: Observable<RiskInsightsEnrichedData | null> = of(null);
+
+  // --------------------------- Trigger subjects ---------------------
+  private _initializeOrganizationTriggerSubject = new Subject<OrganizationId>();
+  private _flagForUpdatesSubject = new Subject<ReportState>();
+  private _flagForUpdates$ = this._flagForUpdatesSubject.asObservable();
+
+  private _reportStateSubscription: Subscription | null = null;
+  private _migrationSubscription: Subscription | null = null;
+
+  constructor(
+    private accountService: AccountService,
+    private cipherService: CipherService,
+    private criticalAppsService: CriticalAppsService,
+    private logService: LogService,
+    private memberCipherDetailsApiService: MemberCipherDetailsApiService,
+    private organizationService: OrganizationService,
+    private passwordHealthService: PasswordHealthService,
+    private reportApiService: RiskInsightsApiService,
+    private reportService: RiskInsightsReportService,
+    private riskInsightsEncryptionService: RiskInsightsEncryptionService,
+  ) {
+    this.logService.debug("[RiskInsightsOrchestratorService] Setting up");
+    this._setupCriticalApplicationContext();
+    this._setupCriticalApplicationReport();
+    this._setupEnrichedReportData();
+    this._setupInitializationPipeline();
+    this._setupMigrationAndCleanup();
+    this._setupReportState();
+    this._setupUserId();
+  }
+
+  destroy(): void {
+    this.logService.debug("[RiskInsightsOrchestratorService] Destroying");
+    if (this._reportStateSubscription) {
+      this._reportStateSubscription.unsubscribe();
+    }
+    if (this._migrationSubscription) {
+      this._migrationSubscription.unsubscribe();
+    }
+    this._destroy$.next();
+    this._destroy$.complete();
+  }
+
+  /**
+   * Generates a new report for the current organization and user
+   */
+  generateReport(): void {
+    this.logService.debug("[RiskInsightsOrchestratorService] Create new report triggered");
+    this._generateReportTriggerSubject.next(true);
+  }
+
+  /**
+   * Gets the cipher icon for a given cipher ID
+   *
+   * @param cipherId The ID of the cipher to get the icon for
+   * @returns A CipherViewLike if found, otherwise undefined
+   */
+  getCipherIcon(cipherId: string): CipherViewLike | undefined {
+    const currentCiphers = this._ciphersSubject.value;
+    if (!currentCiphers) {
+      return undefined;
+    }
+
+    const foundCipher = currentCiphers.find((c) => c.id === cipherId);
+
+    return foundCipher;
+  }
+
+  /**
+   * Initializes the service context for a specific organization
+   *
+   * @param organizationId The ID of the organization to initialize context for
+   */
+  initializeForOrganization(organizationId: OrganizationId) {
+    this.logService.debug("[RiskInsightsOrchestratorService] Initializing for org", organizationId);
+    this._initializeOrganizationTriggerSubject.next(organizationId);
+  }
+
+  /**
+   * Removes a critical application from a report.
+   *
+   * @param criticalApplication Application name of the critical application to remove
+   * @returns
+   */
+  removeCriticalApplication$(criticalApplication: string): Observable<ReportState> {
+    this.logService.info(
+      "[RiskInsightsOrchestratorService] Removing critical applications from report",
+    );
+    return this.rawReportData$.pipe(
+      take(1),
+      filter((data) => data.status != ReportStatus.Loading && data.data != null),
+      withLatestFrom(
+        this.organizationDetails$.pipe(filter((org) => !!org && !!org.organizationId)),
+        this._userId$.pipe(filter((userId) => !!userId)),
+      ),
+      map(([reportState, organizationDetails, userId]) => {
+        const report = reportState?.data;
+        if (!report) {
+          throwError(() => Error("Tried to update critical applications without a report"));
+        }
+
+        // Create a set for quick lookup of the new critical apps
+        const existingApplicationData = report!.applicationData || [];
+        const updatedApplicationData = this._removeCriticalApplication(
+          existingApplicationData,
+          criticalApplication,
+        );
+
+        // Updated summary data after changing critical apps
+        const updatedSummaryData = this.reportService.getApplicationsSummary(
+          report!.reportData,
+          updatedApplicationData,
+          report!.summaryData.totalMemberCount,
+        );
+
+        // Used for creating metrics with updated application data
+        const manualEnrichedApplications = report!.reportData.map(
+          (application): ApplicationHealthReportDetailEnriched => ({
+            ...application,
+            isMarkedAsCritical: this.reportService.isCriticalApplication(
+              application,
+              updatedApplicationData,
+            ),
+          }),
+        );
+
+        // For now, merge the report with the critical marking flag to make the enriched type
+        // We don't care about the individual ciphers in this instance
+        // After the report and enriched report types are consolidated, this mapping can be removed
+        // and the class will expose getCriticalApplications
+        const metrics = this._getReportMetrics(manualEnrichedApplications, updatedSummaryData);
+
+        const updatedState = {
+          ...reportState,
+          data: {
+            ...reportState.data,
+            summaryData: updatedSummaryData,
+            applicationData: updatedApplicationData,
+          },
+        } as ReportState;
+
+        return { reportState, organizationDetails, updatedState, userId, metrics };
+      }),
+      switchMap(({ reportState, organizationDetails, updatedState, userId, metrics }) => {
+        return from(
+          this.riskInsightsEncryptionService.encryptRiskInsightsReport(
+            {
+              organizationId: organizationDetails!.organizationId,
+              userId: userId!,
+            },
+            {
+              reportData: reportState?.data?.reportData ?? [],
+              summaryData: reportState?.data?.summaryData ?? createNewSummaryData(),
+              applicationData: updatedState?.data?.applicationData ?? [],
+            },
+            reportState?.data?.contentEncryptionKey,
+          ),
+        ).pipe(
+          map((encryptedData) => ({
+            reportState,
+            organizationDetails,
+            updatedState,
+            encryptedData,
+            metrics,
+          })),
+        );
+      }),
+      switchMap(({ reportState, organizationDetails, updatedState, encryptedData, metrics }) => {
+        this.logService.debug(
+          `[RiskInsightsOrchestratorService] Saving applicationData with toggled critical flag for report with id: ${reportState?.data?.id} and org id: ${organizationDetails?.organizationId}`,
+        );
+        if (!reportState?.data?.id || !organizationDetails?.organizationId) {
+          return of({ ...reportState });
+        }
+
+        // Update applications data with critical marking
+        const updateApplicationsCall = this.reportApiService.updateRiskInsightsApplicationData$(
+          reportState.data.id,
+          organizationDetails.organizationId,
+          {
+            data: {
+              applicationData: encryptedData.encryptedApplicationData.toSdk(),
+            },
+          },
+        );
+        // Update summary after recomputing
+        const updateSummaryCall = this.reportApiService.updateRiskInsightsSummary$(
+          reportState.data.id,
+          organizationDetails.organizationId,
+          {
+            data: {
+              summaryData: encryptedData.encryptedSummaryData.toSdk(),
+              metrics: metrics.toRiskInsightsMetricsData(),
+            },
+          },
+        );
+
+        return forkJoin([updateApplicationsCall, updateSummaryCall]).pipe(
+          map(() => updatedState),
+          tap((finalState) => {
+            this._flagForUpdatesSubject.next({
+              ...finalState,
+            });
+          }),
+          catchError((error: unknown) => {
+            this.logService.error("Failed to save remove critical application", error);
+            return of({ ...reportState, error: "Failed to remove a critical application" });
+          }),
+        );
+      }),
+    );
+  }
+
+  saveCriticalApplications$(criticalApplications: string[]): Observable<ReportState> {
+    this.logService.info(
+      "[RiskInsightsOrchestratorService] Saving critical applications to report",
+    );
+    return this.rawReportData$.pipe(
+      take(1),
+      filter((data) => data.status != ReportStatus.Loading && data.data != null),
+      withLatestFrom(
+        this.organizationDetails$.pipe(filter((org) => !!org && !!org.organizationId)),
+        this._userId$.pipe(filter((userId) => !!userId)),
+      ),
+      map(([reportState, organizationDetails, userId]) => {
+        const report = reportState?.data;
+        if (!report) {
+          throwError(() => Error("Tried to update critical applications without a report"));
+        }
+
+        // Create a set for quick lookup of the new critical apps
+        const newCriticalAppNamesSet = criticalApplications.map((ca) => ({
+          applicationName: ca,
+          isCritical: true,
+        }));
+        const existingApplicationData = report!.applicationData || [];
+        const updatedApplicationData = this._updateApplicationData(
+          existingApplicationData,
+          newCriticalAppNamesSet,
+        );
+
+        // Updated summary data after changing critical apps
+        const updatedSummaryData = this.reportService.getApplicationsSummary(
+          report!.reportData,
+          updatedApplicationData,
+          report!.summaryData.totalMemberCount,
+        );
+
+        // Used for creating metrics with updated application data
+        const manualEnrichedApplications = report!.reportData.map(
+          (application): ApplicationHealthReportDetailEnriched => ({
+            ...application,
+            isMarkedAsCritical: this.reportService.isCriticalApplication(
+              application,
+              updatedApplicationData,
+            ),
+          }),
+        );
+
+        // For now, merge the report with the critical marking flag to make the enriched type
+        // We don't care about the individual ciphers in this instance
+        // After the report and enriched report types are consolidated, this mapping can be removed
+        // and the class will expose getCriticalApplications
+        const metrics = this._getReportMetrics(manualEnrichedApplications, updatedSummaryData);
+
+        const updatedState = {
+          ...reportState,
+          data: {
+            ...reportState.data,
+            summaryData: updatedSummaryData,
+            applicationData: updatedApplicationData,
+          },
+        } as ReportState;
+
+        return { reportState, organizationDetails, updatedState, userId, metrics };
+      }),
+      switchMap(({ reportState, organizationDetails, updatedState, userId, metrics }) => {
+        return from(
+          this.riskInsightsEncryptionService.encryptRiskInsightsReport(
+            {
+              organizationId: organizationDetails!.organizationId,
+              userId: userId!,
+            },
+            {
+              reportData: reportState?.data?.reportData ?? [],
+              summaryData: reportState?.data?.summaryData ?? createNewSummaryData(),
+              applicationData: updatedState?.data?.applicationData ?? [],
+            },
+            reportState?.data?.contentEncryptionKey,
+          ),
+        ).pipe(
+          map((encryptedData) => ({
+            reportState,
+            organizationDetails,
+            updatedState,
+            encryptedData,
+            metrics,
+          })),
+        );
+      }),
+      switchMap(({ reportState, organizationDetails, updatedState, encryptedData, metrics }) => {
+        this.logService.debug(
+          `[RiskInsightsOrchestratorService] Saving critical applications on applicationData with report id: ${reportState?.data?.id} and org id: ${organizationDetails?.organizationId}`,
+        );
+        if (!reportState?.data?.id || !organizationDetails?.organizationId) {
+          return of({ ...reportState });
+        }
+        // Update applications data with critical marking
+        const updateApplicationsCall = this.reportApiService.updateRiskInsightsApplicationData$(
+          reportState.data.id,
+          organizationDetails.organizationId,
+          {
+            data: {
+              applicationData: encryptedData.encryptedApplicationData.toSdk(),
+            },
+          },
+        );
+
+        // Update summary after recomputing
+        const updateSummaryCall = this.reportApiService.updateRiskInsightsSummary$(
+          reportState.data.id,
+          organizationDetails.organizationId,
+          {
+            data: {
+              summaryData: encryptedData.encryptedSummaryData.toSdk(),
+              metrics: metrics.toRiskInsightsMetricsData(),
+            },
+          },
+        );
+        return forkJoin([updateApplicationsCall, updateSummaryCall]).pipe(
+          map(() => updatedState),
+          tap((finalState) => {
+            this._flagForUpdatesSubject.next({
+              ...finalState,
+            });
+          }),
+          catchError((error: unknown) => {
+            this.logService.error("Failed to save critical applications", error);
+            return of({ ...reportState, error: "Failed to save critical applications" });
+          }),
+        );
+      }),
+    );
+  }
+
+  /**
+   * Saves review status for new applications and optionally marks
+   * selected ones as critical
+   *
+   * @param reviewedApplications Array of application names to mark as reviewed
+   * @returns Observable of updated ReportState
+   */
+  saveApplicationReviewStatus$(
+    reviewedApplications: OrganizationReportApplication[],
+  ): Observable<ReportState> {
+    this.logService.info(
+      `[RiskInsightsOrchestratorService] Saving application review status for ${reviewedApplications.length} applications`,
+    );
+
+    return this.rawReportData$.pipe(
+      take(1),
+      filter((data) => data.status != ReportStatus.Loading && data.data != null),
+      withLatestFrom(
+        this.organizationDetails$.pipe(filter((org) => !!org && !!org.organizationId)),
+        this._userId$.pipe(filter((userId) => !!userId)),
+      ),
+      map(([reportState, organizationDetails, userId]) => {
+        const report = reportState?.data;
+        if (!report) {
+          throwError(() => Error("Tried save reviewed applications without a report"));
+        }
+
+        const existingApplicationData = reportState?.data?.applicationData || [];
+        const updatedApplicationData = this._updateApplicationData(
+          existingApplicationData,
+          reviewedApplications,
+        );
+
+        // Updated summary data after changing critical apps
+        const updatedSummaryData = this.reportService.getApplicationsSummary(
+          report!.reportData,
+          updatedApplicationData,
+          report!.summaryData.totalMemberCount,
+        );
+        // Used for creating metrics with updated application data
+        const manualEnrichedApplications = report!.reportData.map(
+          (application): ApplicationHealthReportDetailEnriched => ({
+            ...application,
+            isMarkedAsCritical: this.reportService.isCriticalApplication(
+              application,
+              updatedApplicationData,
+            ),
+          }),
+        );
+        // For now, merge the report with the critical marking flag to make the enriched type
+        // We don't care about the individual ciphers in this instance
+        // After the report and enriched report types are consolidated, this mapping can be removed
+        // and the class will expose getCriticalApplications
+        const metrics = this._getReportMetrics(manualEnrichedApplications, updatedSummaryData);
+
+        const updatedState = {
+          ...reportState,
+          data: {
+            ...reportState.data,
+            summaryData: updatedSummaryData,
+            applicationData: updatedApplicationData,
+          },
+        } as ReportState;
+
+        this.logService.debug("[RiskInsightsOrchestratorService] Updated review status", {
+          totalApps: updatedApplicationData.length,
+          reviewedApps: updatedApplicationData.filter((app) => app.reviewedDate !== null).length,
+          criticalApps: updatedApplicationData.filter((app) => app.isCritical).length,
+        });
+
+        return { reportState, organizationDetails, updatedState, userId, metrics };
+      }),
+      switchMap(({ reportState, organizationDetails, updatedState, userId, metrics }) => {
+        return from(
+          this.riskInsightsEncryptionService.encryptRiskInsightsReport(
+            {
+              organizationId: organizationDetails!.organizationId,
+              userId: userId!,
+            },
+            {
+              reportData: reportState?.data?.reportData ?? [],
+              summaryData: reportState?.data?.summaryData ?? createNewSummaryData(),
+              applicationData: updatedState?.data?.applicationData ?? [],
+            },
+            reportState?.data?.contentEncryptionKey,
+          ),
+        ).pipe(
+          map((encryptedData) => ({
+            reportState,
+            organizationDetails,
+            updatedState,
+            encryptedData,
+            metrics,
+          })),
+        );
+      }),
+      switchMap(({ reportState, organizationDetails, updatedState, encryptedData, metrics }) => {
+        this.logService.debug(
+          `[RiskInsightsOrchestratorService] Persisting review status - report id: ${reportState?.data?.id}`,
+        );
+
+        if (!reportState?.data?.id || !organizationDetails?.organizationId) {
+          this.logService.warning(
+            "[RiskInsightsOrchestratorService] Cannot save review status - missing report id or org id",
+          );
+          return of({ ...reportState });
+        }
+
+        // Update applications data with critical marking
+        const updateApplicationsCall = this.reportApiService.updateRiskInsightsApplicationData$(
+          reportState.data.id,
+          organizationDetails.organizationId,
+          {
+            data: {
+              applicationData: encryptedData.encryptedApplicationData.toSdk(),
+            },
+          },
+        );
+
+        // Update summary after recomputing
+        const updateSummaryCall = this.reportApiService.updateRiskInsightsSummary$(
+          reportState.data.id,
+          organizationDetails.organizationId,
+          {
+            data: {
+              summaryData: encryptedData.encryptedSummaryData.toSdk(),
+              metrics: metrics.toRiskInsightsMetricsData(),
+            },
+          },
+        );
+
+        return forkJoin([updateApplicationsCall, updateSummaryCall]).pipe(
+          map(() => updatedState),
+          tap((finalState) => {
+            this._flagForUpdatesSubject.next({
+              ...finalState,
+            });
+          }),
+          catchError((error: unknown) => {
+            this.logService.error(
+              "[RiskInsightsOrchestratorService] Failed to save review status",
+              error,
+            );
+            return of({ ...reportState, error: "Failed to save application review status" });
+          }),
+        );
+      }),
+    );
+  }
+
+  private _fetchReport$(organizationId: OrganizationId, userId: UserId): Observable<ReportState> {
+    return this.reportService.getRiskInsightsReport$(organizationId, userId).pipe(
+      tap(() => this.logService.debug("[RiskInsightsOrchestratorService] Fetching report")),
+      map((result): ReportState => {
+        return {
+          status: ReportStatus.Complete,
+          error: null,
+          data: result,
+        };
+      }),
+      catchError((error: unknown) => {
+        this.logService.error("[RiskInsightsOrchestratorService] Failed to fetch report", error);
+        return of({
+          status: ReportStatus.Error,
+          error: "Failed to fetch report",
+          data: null,
+          organizationId,
+        });
+      }),
+    );
+  }
+
+  private _generateNewApplicationsReport$(
+    organizationId: OrganizationId,
+    userId: UserId,
+  ): Observable<ReportState> {
+    // Reset progress at the start
+    this._reportProgressSubject.next(null);
+
+    this.logService.debug("[RiskInsightsOrchestratorService] Fetching member cipher details");
+    this._reportProgressSubject.next(ReportProgress.FetchingMembers);
+
+    // Generate the report - fetch member ciphers and org ciphers in parallel
+    const memberCiphers$ = from(
+      this.memberCipherDetailsApiService.getMemberCipherDetails(organizationId),
+    ).pipe(map((memberCiphers) => flattenMemberDetails(memberCiphers)));
+
+    // Start the generation pipeline
+    const reportGeneration$ = forkJoin([this._ciphers$.pipe(take(1)), memberCiphers$]).pipe(
+      switchMap(([ciphers, memberCiphers]) => {
+        this.logService.debug("[RiskInsightsOrchestratorService] Analyzing password health");
+        this._reportProgressSubject.next(ReportProgress.AnalyzingPasswords);
+        return forkJoin({
+          memberDetails: of(memberCiphers),
+          cipherHealthReports: this._getCipherHealth(ciphers ?? [], memberCiphers),
+        }).pipe(
+          map(({ memberDetails, cipherHealthReports }) => {
+            const uniqueMembers = getUniqueMembers(memberDetails);
+            const totalMemberCount = uniqueMembers.length;
+
+            return { cipherHealthReports, totalMemberCount };
+          }),
+        );
+      }),
+      map(({ cipherHealthReports, totalMemberCount }) => {
+        this.logService.debug("[RiskInsightsOrchestratorService] Calculating risk scores");
+        this._reportProgressSubject.next(ReportProgress.CalculatingRisks);
+        const report = this.reportService.generateApplicationsReport(cipherHealthReports);
+        return { report, totalMemberCount };
+      }),
+      tap(() => {
+        this.logService.debug("[RiskInsightsOrchestratorService] Generating report data");
+        this._reportProgressSubject.next(ReportProgress.GeneratingReport);
+      }),
+      withLatestFrom(this.rawReportData$),
+      map(([{ report, totalMemberCount }, previousReport]) => {
+        // Update the application data
+        const updatedApplicationData = this.reportService.getOrganizationApplications(
+          report,
+          previousReport?.data?.applicationData ?? [],
+        );
+
+        const manualEnrichedApplications = report.map(
+          (application): ApplicationHealthReportDetailEnriched => ({
+            ...application,
+            isMarkedAsCritical: this.reportService.isCriticalApplication(
+              application,
+              updatedApplicationData,
+            ),
+          }),
+        );
+
+        const updatedSummary = this.reportService.getApplicationsSummary(
+          report,
+          updatedApplicationData,
+          totalMemberCount,
+        );
+        // For now, merge the report with the critical marking flag to make the enriched type
+        // We don't care about the individual ciphers in this instance
+        // After the report and enriched report types are consolidated, this mapping can be removed
+        // and the class will expose getCriticalApplications
+        const metrics = this._getReportMetrics(manualEnrichedApplications, updatedSummary);
+
+        return {
+          report,
+          summary: updatedSummary,
+          applications: updatedApplicationData,
+          metrics,
+        };
+      }),
+      switchMap(({ report, summary, applications, metrics }) => {
+        this.logService.debug("[RiskInsightsOrchestratorService] Saving report");
+        this._reportProgressSubject.next(ReportProgress.Saving);
+        return this.reportService
+          .saveRiskInsightsReport$(report, summary, applications, metrics, {
+            organizationId,
+            userId,
+          })
+          .pipe(
+            map((result) => ({
+              report,
+              summary,
+              applications,
+              id: result.response.id,
+              contentEncryptionKey: result.contentEncryptionKey,
+            })),
+          );
+      }),
+      // Update the running state
+      tap(() => {
+        this.logService.debug("[RiskInsightsOrchestratorService] Report generation complete");
+        this._reportProgressSubject.next(ReportProgress.Complete);
+      }),
+      map((mappedResult): ReportState => {
+        const { id, report, summary, applications, contentEncryptionKey } = mappedResult;
+        return {
+          status: ReportStatus.Complete,
+          error: null,
+          data: {
+            id,
+            reportData: report,
+            summaryData: summary,
+            applicationData: applications,
+            creationDate: new Date(),
+            contentEncryptionKey,
+          },
+        };
+      }),
+      catchError((): Observable<ReportState> => {
+        return of({
+          status: ReportStatus.Error,
+          error: "Failed to generate or save report",
+          data: null,
+        });
+      }),
+      startWith<ReportState>({
+        status: ReportStatus.Loading,
+        error: null,
+        data: null,
+      }),
+    ) as Observable<ReportState>;
+
+    return reportGeneration$;
+  }
+
+  // Calculates the metrics for a report
+  // This function will be moved to the RiskInsightsReportService after the
+  // ApplicationHealthReportDetail and ApplicationHealthReportDetailEnriched types
+  // are consolidated into one
+  _getReportMetrics(
+    reports: ApplicationHealthReportDetailEnriched[],
+    summary: OrganizationReportSummary,
+  ): RiskInsightsMetrics {
+    const metrics = new RiskInsightsMetrics();
+    const s = summary;
+
+    // Copy summary information
+    metrics.totalApplicationCount = s.totalApplicationCount;
+    metrics.totalAtRiskApplicationCount = s.totalAtRiskApplicationCount;
+    metrics.totalCriticalApplicationCount = s.totalCriticalApplicationCount;
+    metrics.totalCriticalAtRiskApplicationCount = s.totalCriticalAtRiskApplicationCount;
+    metrics.totalMemberCount = s.totalMemberCount;
+    metrics.totalAtRiskMemberCount = s.totalAtRiskMemberCount;
+    metrics.totalCriticalMemberCount = s.totalCriticalMemberCount;
+    metrics.totalCriticalAtRiskMemberCount = s.totalCriticalAtRiskMemberCount;
+
+    // Calculate additional metrics
+    let totalPasswordCount = 0;
+    let totalAtRiskPasswordCount = 0;
+    let totalCriticalPasswordCount = 0;
+    let totalCriticalAtRiskPasswordCount = 0;
+
+    reports.forEach((report) => {
+      totalPasswordCount += report.cipherIds.length;
+      totalAtRiskPasswordCount += report.atRiskCipherIds.length;
+
+      if (report.isMarkedAsCritical) {
+        totalCriticalPasswordCount += report.cipherIds.length;
+        totalCriticalAtRiskPasswordCount += report.atRiskCipherIds.length;
+      }
+    });
+
+    metrics.totalPasswordCount = totalPasswordCount;
+    metrics.totalAtRiskPasswordCount = totalAtRiskPasswordCount;
+    metrics.totalCriticalPasswordCount = totalCriticalPasswordCount;
+    metrics.totalCriticalAtRiskPasswordCount = totalCriticalAtRiskPasswordCount;
+
+    return metrics;
+  }
+  /**
+   * Associates the members with the ciphers they have access to. Calculates the password health.
+   * Finds the trimmed uris.
+   * @param ciphers Org ciphers
+   * @param memberDetails Org members
+   * @returns Cipher password health data with trimmed uris and associated members
+   */
+  private _getCipherHealth(
+    ciphers: CipherView[],
+    memberDetails: MemberDetails[],
+  ): Observable<CipherHealthReport[]> {
+    const validCiphers = ciphers.filter((cipher) =>
+      this.passwordHealthService.isValidCipher(cipher),
+    );
+    const passwordUseMap = buildPasswordUseMap(validCiphers);
+
+    // Check for exposed passwords and map to cipher health report
+    return this.passwordHealthService.auditPasswordLeaks$(validCiphers).pipe(
+      map((exposedDetails) => {
+        return validCiphers.map((cipher) => {
+          const exposedPasswordDetail = exposedDetails.find((x) => x?.cipherId === cipher.id);
+          const cipherMembers = memberDetails.filter((x) => x.cipherId === cipher.id);
+          const applications = getTrimmedCipherUris(cipher);
+          const weakPasswordDetail = this.passwordHealthService.findWeakPasswordDetails(cipher);
+          const reusedPasswordCount = passwordUseMap.get(cipher.login.password!) ?? 0;
+          return {
+            cipher,
+            cipherMembers,
+            applications,
+            healthData: {
+              weakPasswordDetail,
+              reusedPasswordCount,
+              exposedPasswordDetail,
+            },
+          } as CipherHealthReport;
+        });
+      }),
+    );
+  }
+
+  // Updates the existing application data to include critical applications
+  // Does not remove critical applications not in the set
+  private _updateApplicationData(
+    existingApplications: OrganizationReportApplication[],
+    updatedApplications: (Partial<OrganizationReportApplication> & { applicationName: string })[],
+  ): OrganizationReportApplication[] {
+    const arrayToMerge = [...updatedApplications];
+
+    const updatedApps = existingApplications.map((app) => {
+      // Check if there is an updated app
+      const foundUpdatedIndex = arrayToMerge.findIndex(
+        (ua) => ua.applicationName == app.applicationName,
+      );
+
+      let foundApp: Partial<OrganizationReportApplication> | null = null;
+      // Remove the updated app from the list
+      if (foundUpdatedIndex >= 0) {
+        foundApp = arrayToMerge[foundUpdatedIndex];
+        arrayToMerge.splice(foundUpdatedIndex, 1);
+      }
+      return {
+        applicationName: app.applicationName,
+        isCritical: foundApp?.isCritical || app.isCritical,
+        reviewedDate: foundApp?.reviewedDate || app.reviewedDate,
+      };
+    });
+
+    const newElements: OrganizationReportApplication[] = arrayToMerge.map(
+      (newApp): OrganizationReportApplication => ({
+        applicationName: newApp.applicationName,
+        isCritical: newApp.isCritical ?? false,
+        reviewedDate: null,
+      }),
+    );
+
+    return updatedApps.concat(newElements);
+  }
+
+  // Toggles the isCritical flag on applications via criticalApplicationName
+  private _removeCriticalApplication(
+    applicationData: OrganizationReportApplication[],
+    criticalApplication: string,
+  ): OrganizationReportApplication[] {
+    const updatedApplicationData = applicationData.map((application) => {
+      if (application.applicationName == criticalApplication) {
+        return { ...application, isCritical: false } as OrganizationReportApplication;
+      }
+      return application;
+    });
+    return updatedApplicationData;
+  }
+
+  private _runMigrationAndCleanup$(criticalApps: PasswordHealthReportApplicationsResponse[]) {
+    return of(criticalApps).pipe(
+      withLatestFrom(this.organizationDetails$),
+      switchMap(([savedCriticalApps, organizationDetails]) => {
+        // No saved critical apps for migration
+        if (!savedCriticalApps || savedCriticalApps.length === 0) {
+          this.logService.debug("[RiskInsightsOrchestratorService] No critical apps to migrate.");
+          return of([]);
+        }
+
+        const criticalAppsNames = savedCriticalApps.map((app) => app.uri);
+        const criticalAppsIds = savedCriticalApps.map((app) => app.id);
+
+        // Use the setCriticalApplications$ function to update and save the report
+        return this.saveCriticalApplications$(criticalAppsNames).pipe(
+          // After setCriticalApplications$ completes, trigger the deletion.
+          switchMap(() => {
+            return this.criticalAppsService
+              .dropCriticalAppsById(organizationDetails!.organizationId, criticalAppsIds)
+              .pipe(
+                // After all deletes complete, map to the migrated apps.
+                tap(() => {
+                  this.logService.debug(
+                    "[RiskInsightsOrchestratorService] Migrated and deleted critical applications.",
+                  );
+                }),
+              );
+          }),
+          catchError((error: unknown) => {
+            this.logService.error(
+              "[RiskInsightsOrchestratorService] Failed to save migrated critical applications",
+              error,
+            );
+            return throwError(() => error);
+          }),
+        );
+      }),
+    );
+  }
+
+  // Setup the pipeline to load critical applications when organization or user changes
+  private _setupCriticalApplicationContext() {
+    this.organizationDetails$
+      .pipe(
+        filter((orgDetails) => !!orgDetails),
+        withLatestFrom(this._userId$),
+        filter(([_, userId]) => !!userId),
+        tap(([orgDetails, userId]) => {
+          this.logService.debug(
+            "[RiskInsightsOrchestratorService] Loading critical applications for org",
+            orgDetails!.organizationId,
+          );
+          this.criticalAppsService.loadOrganizationContext(orgDetails!.organizationId, userId!);
+        }),
+        takeUntil(this._destroy$),
+      )
+      .subscribe();
+  }
+
+  // Setup the pipeline to create a report view filtered to only critical applications
+  private _setupCriticalApplicationReport() {
+    const criticalReportResultsPipeline$ = this.enrichedReportData$.pipe(
+      filter((state) => !!state),
+      map((enrichedReports) => {
+        const criticalApplications = enrichedReports!.reportData.filter(
+          (app) => app.isMarkedAsCritical,
+        );
+        // Generate a new summary based on just the critical applications
+        const summary = this.reportService.getApplicationsSummary(
+          criticalApplications,
+          enrichedReports.applicationData,
+          enrichedReports.summaryData.totalMemberCount,
+        );
+        return {
+          ...enrichedReports,
+          summaryData: summary,
+          reportData: criticalApplications,
+        };
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+
+    this.criticalReportResults$ = criticalReportResultsPipeline$;
+  }
+
+  /**
+   * Takes the basic application health report details and enriches them to include
+   * critical app status and associated ciphers.
+   */
+  private _setupEnrichedReportData() {
+    // Setup the enriched report data pipeline
+    const enrichmentSubscription = combineLatest([this.rawReportData$]).pipe(
+      switchMap(([rawReportData]) => {
+        this.logService.debug(
+          "[RiskInsightsOrchestratorService] Enriching report data with ciphers and critical app status",
+        );
+        const criticalAppsData =
+          rawReportData?.data?.applicationData.filter((app) => app.isCritical) ?? [];
+        const rawReports = rawReportData.data?.reportData || [];
+
+        const enrichedReports: ApplicationHealthReportDetailEnriched[] = rawReports.map((app) => ({
+          ...app,
+          isMarkedAsCritical: this.reportService.isCriticalApplication(app, criticalAppsData),
+        }));
+
+        const enrichedData = {
+          ...rawReportData.data,
+          reportData: enrichedReports,
+        } as RiskInsightsEnrichedData;
+
+        return of(enrichedData);
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+
+    enrichmentSubscription.pipe(takeUntil(this._destroy$)).subscribe((enrichedData) => {
+      this._enrichedReportDataSubject.next(enrichedData);
+    });
+  }
+
+  // Setup the pipeline to initialize organization context
+  private _setupInitializationPipeline() {
+    this._initializeOrganizationTriggerSubject
+      .pipe(
+        withLatestFrom(this._userId$),
+        filter(([orgId, userId]) => !!orgId && !!userId),
+        switchMap(([orgId, userId]) =>
+          this.organizationService.organizations$(userId!).pipe(
+            getOrganizationById(orgId),
+            map((org) => ({ organizationId: orgId!, organizationName: org?.name ?? "" })),
+          ),
+        ),
+        tap(async (orgDetails) => {
+          this.logService.debug("[RiskInsightsOrchestratorService] Fetching organization ciphers");
+          const ciphers = await this.cipherService.getAllFromApiForOrganization(
+            orgDetails.organizationId,
+            true,
+          );
+          this._ciphersSubject.next(ciphers);
+          this._hasCiphersSubject$.next(ciphers.length > 0);
+        }),
+        takeUntil(this._destroy$),
+      )
+      .subscribe((orgDetails) => this._organizationDetailsSubject.next(orgDetails));
+  }
+
+  private _setupMigrationAndCleanup() {
+    const criticalApps$ = this.criticalAppsService.criticalAppsList$.pipe(
+      filter((criticalApps) => criticalApps.length > 0),
+      take(1),
+    );
+
+    const rawReportData$ = this.rawReportData$.pipe(
+      filter((reportState) => !!reportState.data),
+      take(1),
+    );
+
+    this._migrationSubscription = forkJoin([criticalApps$, rawReportData$])
+      .pipe(
+        tap(([criticalApps]) => {
+          this.logService.debug(
+            `[RiskInsightsOrchestratorService] Detected ${criticalApps.length} legacy critical apps, running migration and cleanup`,
+            criticalApps,
+          );
+        }),
+        switchMap(([criticalApps, _reportState]) =>
+          this._runMigrationAndCleanup$(criticalApps).pipe(
+            catchError((error: unknown) => {
+              this.logService.error(
+                "[RiskInsightsOrchestratorService] Migration and cleanup failed.",
+                error,
+              );
+              return of([]);
+            }),
+          ),
+        ),
+        take(1),
+      )
+      .subscribe();
+  }
+
+  // Setup the report state management pipeline
+  private _setupReportState() {
+    // Dependencies needed for report state
+    const reportDependencies$ = combineLatest([
+      this.organizationDetails$.pipe(filter((org) => !!org)),
+      this._userId$.pipe(filter((user) => !!user)),
+    ]).pipe(shareReplay({ bufferSize: 1, refCount: true }));
+
+    // A stream that continuously watches dependencies and fetches a new report every time they change
+    const continuousReportFetch$: Observable<ReportState> = reportDependencies$.pipe(
+      switchMap(([orgDetails, userId]) =>
+        this._fetchReport$(orgDetails!.organizationId, userId!).pipe(
+          startWith<ReportState>({ status: ReportStatus.Initializing, error: null, data: null }),
+        ),
+      ),
+    );
+
+    // A stream for generating a new report
+    const newReportGeneration$: Observable<ReportState> = this.generatingReport$.pipe(
+      distinctUntilChanged(),
+      filter((isRunning) => isRunning),
+      withLatestFrom(reportDependencies$),
+      exhaustMap(([_, [orgDetails, userId]]) =>
+        this._generateNewApplicationsReport$(orgDetails!.organizationId, userId!),
+      ),
+      startWith<ReportState>({
+        status: ReportStatus.Loading,
+        error: null,
+        data: null,
+      }),
+      tap(() => {
+        this._generateReportTriggerSubject.next(false);
+      }),
+    );
+
+    // Combine all triggers and update the single report state
+    const mergedReportState$ = merge(
+      continuousReportFetch$,
+      newReportGeneration$,
+      this._flagForUpdates$,
+    ).pipe(
+      startWith<ReportState>({
+        status: ReportStatus.Initializing,
+        error: null,
+        data: null,
+      }),
+      withLatestFrom(this.organizationDetails$),
+      map(([reportState, orgDetails]) => {
+        return {
+          reportState,
+          organizationId: orgDetails?.organizationId,
+        };
+      }),
+
+      // 3. NOW, scan receives a simple object for both prevState and currState
+      scan((prevState, currState) => {
+        const hasOrganizationChanged = prevState.organizationId !== currState.organizationId;
+        // Don't override initial status until complete
+        const keepInitializeStatus =
+          prevState.reportState.status == ReportStatus.Initializing &&
+          currState.reportState.status == ReportStatus.Loading;
+        return {
+          reportState: {
+            status: keepInitializeStatus
+              ? prevState.reportState.status
+              : (currState.reportState.status ?? prevState.reportState.status),
+            error: currState.reportState.error ?? prevState.reportState.error,
+            data:
+              currState.reportState.data !== null || hasOrganizationChanged
+                ? currState.reportState.data
+                : prevState.reportState.data,
+          },
+          organizationId: currState.organizationId,
+        };
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+      takeUntil(this._destroy$),
+    );
+
+    this._reportStateSubscription = mergedReportState$
+      .pipe(takeUntil(this._destroy$))
+      .subscribe((state) => {
+        // Update the raw report data subject
+        this._rawReportDataSubject.next(state.reportState);
+
+        // Update the critical application at risk cipher ids for exposure
+        const reportState = state.reportState?.data;
+        if (reportState) {
+          const criticalApplicationAtRiskCipherIds = this._getCriticalApplicationCipherIds(
+            reportState.reportData || [],
+            reportState.applicationData || [],
+          );
+          this._criticalApplicationAtRiskCipherIdsSubject$.next(criticalApplicationAtRiskCipherIds);
+        }
+      });
+  }
+
+  // Gets the unique cipher IDs that are marked at risk in critical applications
+  private _getCriticalApplicationCipherIds(
+    applications: ApplicationHealthReportDetail[],
+    applicationData: OrganizationReportApplication[],
+  ): CipherId[] {
+    const foundCipherIds = applications
+      .map((app) => {
+        const isCriticalApplication = this.reportService.isCriticalApplication(
+          app,
+          applicationData,
+        );
+        return isCriticalApplication ? app.atRiskCipherIds : [];
+      })
+      .flat();
+
+    // Use a set to ensure uniqueness
+    const uniqueCipherIds = new Set<CipherId>([...foundCipherIds]);
+
+    return [...uniqueCipherIds];
+  }
+
+  // Setup the user ID observable to track the current user
+  private _setupUserId() {
+    // Watch userId changes
+    this.accountService.activeAccount$
+      .pipe(getUserId, takeUntil(this._destroy$))
+      .subscribe((userId) => {
+        this._userIdSubject.next(userId);
+      });
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.spec.ts
new file mode 100644
index 00000000000..16f9710fc70
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.spec.ts
@@ -0,0 +1,247 @@
+import { mock } from "jest-mock-extended";
+import { firstValueFrom, of } from "rxjs";
+
+import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
+import { makeEncString } from "@bitwarden/common/spec";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+
+import { DecryptedReportData, EncryptedDataWithKey } from "../../models";
+import {
+  GetRiskInsightsReportResponse,
+  SaveRiskInsightsReportResponse,
+} from "../../models/api-models.types";
+import { RiskInsightsMetrics } from "../../models/domain/risk-insights-metrics";
+import { mockCiphers } from "../../models/mocks/ciphers.mock";
+import { mockMemberCipherDetailsResponse } from "../../models/mocks/member-cipher-details-response.mock";
+import {
+  mockApplicationData,
+  mockCipherHealthReports,
+  mockCipherViews,
+  mockMemberDetails,
+  mockReportData,
+  mockSummaryData,
+} from "../../models/mocks/mock-data";
+import { MemberCipherDetailsApiService } from "../api/member-cipher-details-api.service";
+import { RiskInsightsApiService } from "../api/risk-insights-api.service";
+
+import { PasswordHealthService } from "./password-health.service";
+import { RiskInsightsEncryptionService } from "./risk-insights-encryption.service";
+import { RiskInsightsReportService } from "./risk-insights-report.service";
+
+describe("RiskInsightsReportService", () => {
+  let service: RiskInsightsReportService;
+
+  // Mock services
+  const cipherService = mock<CipherService>();
+  const memberCipherDetailsService = mock<MemberCipherDetailsApiService>();
+  const mockPasswordHealthService = mock<PasswordHealthService>();
+  const mockRiskInsightsApiService = mock<RiskInsightsApiService>();
+  const mockRiskInsightsEncryptionService = mock<RiskInsightsEncryptionService>({
+    encryptRiskInsightsReport: jest.fn().mockResolvedValue("encryptedReportData"),
+    decryptRiskInsightsReport: jest.fn().mockResolvedValue("decryptedReportData"),
+  });
+
+  // Non changing mock data
+  const mockOrganizationId = "orgId" as OrganizationId;
+  const mockUserId = "userId" as UserId;
+  const mockEncryptedKey = makeEncString("test-key");
+
+  // Changing mock data
+  let mockDecryptedData: DecryptedReportData;
+  const mockReportEnc = makeEncString(JSON.stringify(mockReportData));
+  const mockSummaryEnc = makeEncString(JSON.stringify(mockSummaryData));
+  const mockApplicationsEnc = makeEncString(JSON.stringify(mockApplicationData));
+
+  beforeEach(() => {
+    cipherService.getAllFromApiForOrganization.mockResolvedValue(mockCiphers);
+
+    memberCipherDetailsService.getMemberCipherDetails.mockResolvedValue(
+      mockMemberCipherDetailsResponse,
+    );
+
+    // Mock PasswordHealthService methods
+    mockPasswordHealthService.isValidCipher.mockImplementation((cipher: any) => {
+      return (
+        cipher.type === 1 && cipher.login?.password && !cipher.isDeleted && cipher.viewPassword
+      );
+    });
+    mockPasswordHealthService.findWeakPasswordDetails.mockImplementation((cipher: any) => {
+      if (cipher.login?.password === "123") {
+        return { score: 1, detailValue: { label: "veryWeak", badgeVariant: "danger" } };
+      }
+      return null;
+    });
+    mockPasswordHealthService.auditPasswordLeaks$.mockImplementation((ciphers: any[]) => {
+      const exposedDetails = ciphers
+        .filter((cipher) => cipher.login?.password === "123")
+        .map((cipher) => ({
+          exposedXTimes: 100,
+          cipherId: cipher.id,
+        }));
+      return of(exposedDetails);
+    });
+
+    service = new RiskInsightsReportService(
+      mockRiskInsightsApiService,
+      mockRiskInsightsEncryptionService,
+    );
+
+    mockDecryptedData = {
+      reportData: mockReportData,
+      summaryData: mockSummaryData,
+      applicationData: mockApplicationData,
+    };
+  });
+
+  it("should group and aggregate application health reports correctly", () => {
+    // Mock the service methods
+    cipherService.getAllFromApiForOrganization.mockResolvedValue(mockCipherViews);
+    memberCipherDetailsService.getMemberCipherDetails.mockResolvedValue(mockMemberDetails);
+
+    const result = service.generateApplicationsReport(mockCipherHealthReports);
+    expect(Array.isArray(result)).toBe(true);
+
+    // Should group by application name (trimmedUris)
+    const appCom = result.find((r) => r.applicationName === "app.com");
+    const otherCom = result.find((r) => r.applicationName === "other.com");
+    expect(appCom).toBeTruthy();
+    expect(appCom?.passwordCount).toBe(2);
+    expect(otherCom).toBeTruthy();
+    expect(otherCom?.passwordCount).toBe(1);
+  });
+
+  describe("saveRiskInsightsReport$", () => {
+    it("should not update subjects if save response does not have id", (done) => {
+      const mockEncryptedOutput: EncryptedDataWithKey = {
+        organizationId: mockOrganizationId,
+        encryptedReportData: mockReportEnc,
+        encryptedSummaryData: mockSummaryEnc,
+        encryptedApplicationData: mockApplicationsEnc,
+        contentEncryptionKey: mockEncryptedKey,
+      };
+      mockRiskInsightsEncryptionService.encryptRiskInsightsReport.mockResolvedValue(
+        mockEncryptedOutput,
+      );
+
+      const saveResponse = new SaveRiskInsightsReportResponse({ id: "" }); // Simulating no ID in response
+      mockRiskInsightsApiService.saveRiskInsightsReport$.mockReturnValue(of(saveResponse));
+
+      service
+        .saveRiskInsightsReport$(
+          mockReportData,
+          mockSummaryData,
+          mockApplicationData,
+          new RiskInsightsMetrics(),
+          {
+            organizationId: mockOrganizationId,
+            userId: mockUserId,
+          },
+        )
+        .subscribe({
+          next: (response) => {
+            done.fail("Expected error due to invalid response");
+          },
+          error: (error: unknown) => {
+            if (error instanceof ErrorResponse && error.statusCode) {
+              expect(error.message).toBe("Invalid response from API");
+            }
+            done();
+          },
+        });
+    });
+  });
+
+  describe("getRiskInsightsReport$", () => {
+    beforeEach(() => {
+      // Reset the mocks before each test
+      jest.clearAllMocks();
+    });
+
+    it("should call with the correct organizationId", async () => {
+      // we need to ensure that the api is invoked with the specified organizationId
+      // here it doesn't matter what the Api returns
+      const apiResponse = new GetRiskInsightsReportResponse({
+        id: "reportId",
+        date: new Date(),
+        organizationId: mockOrganizationId,
+        reportData: mockReportEnc.encryptedString,
+        summaryData: mockSummaryEnc.encryptedString,
+        applicationData: mockApplicationsEnc.encryptedString,
+        contentEncryptionKey: mockEncryptedKey.encryptedString,
+      });
+
+      const decryptedResponse: DecryptedReportData = {
+        reportData: [],
+        summaryData: {
+          totalMemberCount: 1,
+          totalAtRiskMemberCount: 1,
+          totalApplicationCount: 1,
+          totalAtRiskApplicationCount: 1,
+          totalCriticalMemberCount: 1,
+          totalCriticalAtRiskMemberCount: 1,
+          totalCriticalApplicationCount: 1,
+          totalCriticalAtRiskApplicationCount: 1,
+        },
+        applicationData: [],
+      };
+
+      const userId = "userId" as UserId;
+
+      // Mock api returned encrypted data
+      mockRiskInsightsApiService.getRiskInsightsReport$.mockReturnValue(of(apiResponse));
+
+      // Mock decrypted data
+      mockRiskInsightsEncryptionService.decryptRiskInsightsReport.mockReturnValue(
+        Promise.resolve(decryptedResponse),
+      );
+
+      await firstValueFrom(service.getRiskInsightsReport$(mockOrganizationId, userId));
+
+      expect(mockRiskInsightsApiService.getRiskInsightsReport$).toHaveBeenCalledWith(
+        mockOrganizationId,
+      );
+      expect(mockRiskInsightsEncryptionService.decryptRiskInsightsReport).toHaveBeenCalledWith(
+        { organizationId: mockOrganizationId, userId },
+        expect.anything(),
+        expect.anything(),
+      );
+    });
+
+    it("should decrypt report and update subjects if response is present", async () => {
+      // Arrange: setup a mock response from the API
+      // and ensure the decryption service is called with the correct parameters
+      const organizationId = "orgId" as OrganizationId;
+      const userId = "userId" as UserId;
+
+      const mockResponse = new GetRiskInsightsReportResponse({
+        id: "reportId",
+        creationDate: new Date(),
+        organizationId: organizationId as OrganizationId,
+        reportData: mockReportEnc.encryptedString,
+        summaryData: mockSummaryEnc.encryptedString,
+        applicationData: mockApplicationsEnc.encryptedString,
+        contentEncryptionKey: mockEncryptedKey.encryptedString,
+      });
+
+      mockRiskInsightsApiService.getRiskInsightsReport$.mockReturnValue(of(mockResponse));
+      mockRiskInsightsEncryptionService.decryptRiskInsightsReport.mockResolvedValue(
+        mockDecryptedData,
+      );
+
+      const result = await firstValueFrom(service.getRiskInsightsReport$(organizationId, userId));
+
+      expect(mockRiskInsightsEncryptionService.decryptRiskInsightsReport).toHaveBeenCalledWith(
+        { organizationId: mockOrganizationId, userId },
+        expect.anything(),
+        expect.anything(),
+      );
+      expect(result).toEqual({
+        ...mockDecryptedData,
+        id: mockResponse.id,
+        creationDate: mockResponse.creationDate,
+        contentEncryptionKey: mockEncryptedKey,
+      });
+    });
+  });
+});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.ts
new file mode 100644
index 00000000000..37b788a8e3d
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.ts
@@ -0,0 +1,399 @@
+import { catchError, EMPTY, from, map, Observable, of, switchMap, throwError } from "rxjs";
+
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import {
+  CipherId,
+  OrganizationId,
+  OrganizationReportId,
+  UserId,
+} from "@bitwarden/common/types/guid";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+import { getUniqueMembers } from "../../helpers/risk-insights-data-mappers";
+import {
+  isSaveRiskInsightsReportResponse,
+  SaveRiskInsightsReportResponse,
+} from "../../models/api-models.types";
+import { RiskInsightsMetrics } from "../../models/domain/risk-insights-metrics";
+import {
+  ApplicationHealthReportDetail,
+  OrganizationReportSummary,
+  CipherHealthReport,
+  PasswordHealthData,
+  OrganizationReportApplication,
+  RiskInsightsData,
+} from "../../models/report-models";
+import { RiskInsightsApiService } from "../api/risk-insights-api.service";
+
+import { RiskInsightsEncryptionService } from "./risk-insights-encryption.service";
+
+export class RiskInsightsReportService {
+  constructor(
+    private riskInsightsApiService: RiskInsightsApiService,
+    private riskInsightsEncryptionService: RiskInsightsEncryptionService,
+  ) {}
+
+  filterApplicationsByCritical(
+    report: ApplicationHealthReportDetail[],
+    applicationData: OrganizationReportApplication[],
+  ): ApplicationHealthReportDetail[] {
+    return report.filter((application) => this.isCriticalApplication(application, applicationData));
+  }
+
+  /**
+   * Report data for the aggregation of uris to like uris and getting password/member counts,
+   * members, and at risk statuses.
+   *
+   * @param ciphers The list of ciphers to analyze
+   * @param memberCiphers The list of member cipher details to associate members to ciphers
+   * @returns The all applications health report data
+   */
+  generateApplicationsReport(ciphers: CipherHealthReport[]): ApplicationHealthReportDetail[] {
+    const groupedByApplication = this._groupCiphersByApplication(ciphers);
+
+    return Array.from(groupedByApplication.entries()).map(([application, ciphers]) =>
+      this._getApplicationHealthReport(application, ciphers),
+    );
+  }
+
+  /**
+   *
+   * @param applications The list of application health report details to map ciphers to
+   * @param organizationId
+   * @returns
+   */
+  getApplicationCipherMap(
+    ciphers: CipherView[],
+    applications: ApplicationHealthReportDetail[],
+  ): Map<string, CipherView[]> {
+    const cipherMap = new Map<string, CipherView[]>();
+    applications.forEach((app) => {
+      const filteredCiphers = ciphers.filter((c) => app.cipherIds.includes(c.id as CipherId));
+      cipherMap.set(app.applicationName, filteredCiphers);
+    });
+    return cipherMap;
+  }
+
+  /**
+   * Gets the summary from the application health report. Returns total members and applications as well
+   * as the total at risk members and at risk applications
+   * @param reports The previously calculated application health report data
+   * @returns A summary object containing report totals
+   */
+  getApplicationsSummary(
+    reports: ApplicationHealthReportDetail[],
+    applicationData: OrganizationReportApplication[],
+    totalMemberCount: number,
+  ): OrganizationReportSummary {
+    const atRiskUniqueMembers = getUniqueMembers(reports.flatMap((x) => x.atRiskMemberDetails));
+
+    const criticalReports = this.filterApplicationsByCritical(reports, applicationData);
+    const criticalUniqueMembers = getUniqueMembers(criticalReports.flatMap((x) => x.memberDetails));
+    const criticalAtRiskUniqueMembers = getUniqueMembers(
+      criticalReports.flatMap((x) => x.atRiskMemberDetails),
+    );
+
+    return {
+      totalMemberCount: totalMemberCount,
+      totalAtRiskMemberCount: atRiskUniqueMembers.length,
+      totalApplicationCount: reports.length,
+      totalAtRiskApplicationCount: reports.filter((app) => app.atRiskPasswordCount > 0).length,
+      totalCriticalMemberCount: criticalUniqueMembers.length,
+      totalCriticalAtRiskMemberCount: criticalAtRiskUniqueMembers.length,
+      totalCriticalApplicationCount: criticalReports.length,
+      totalCriticalAtRiskApplicationCount: criticalReports.filter(
+        (app) => app.atRiskPasswordCount > 0,
+      ).length,
+    };
+  }
+
+  /**
+   * Get information associated to the report applications that can be modified
+   *
+   * @param reports
+   * @returns A list of applications with a critical marking flag and review date
+   */
+  getOrganizationApplications(
+    reports: ApplicationHealthReportDetail[],
+    previousApplications: OrganizationReportApplication[] = [],
+  ): OrganizationReportApplication[] {
+    if (previousApplications.length > 0) {
+      // Preserve existing critical application markings and dates
+      return reports.map((report) => {
+        const existingApp = previousApplications.find(
+          (app) => app.applicationName === report.applicationName,
+        );
+        return {
+          applicationName: report.applicationName,
+          isCritical: existingApp ? existingApp.isCritical : false,
+          reviewedDate: existingApp ? existingApp.reviewedDate : null,
+        };
+      });
+    }
+
+    // No previous applications, return all as non-critical with no review date
+    return reports.map(
+      (report): OrganizationReportApplication => ({
+        applicationName: report.applicationName,
+        isCritical: false,
+        reviewedDate: null,
+      }),
+    );
+  }
+
+  /**
+   * Gets the risk insights report for a specific organization and user.
+   *
+   * @param organizationId
+   * @param userId
+   * @returns An observable that emits the decrypted risk insights report data.
+   */
+  getRiskInsightsReport$(
+    organizationId: OrganizationId,
+    userId: UserId,
+  ): Observable<RiskInsightsData | null> {
+    return this.riskInsightsApiService.getRiskInsightsReport$(organizationId).pipe(
+      switchMap((response) => {
+        if (!response) {
+          // Return an empty report and summary if response is falsy
+          return of(null as unknown as RiskInsightsData);
+        }
+        if (!response.contentEncryptionKey || response.contentEncryptionKey.data == "") {
+          return throwError(() => new Error("Report key not found"));
+        }
+        if (!response.reportData) {
+          return throwError(() => new Error("Report data not found"));
+        }
+        if (!response.summaryData) {
+          return throwError(() => new Error("Summary data not found"));
+        }
+        if (!response.applicationData) {
+          return throwError(() => new Error("Application data not found"));
+        }
+
+        return from(
+          this.riskInsightsEncryptionService.decryptRiskInsightsReport(
+            {
+              organizationId,
+              userId,
+            },
+            {
+              encryptedReportData: response.reportData,
+              encryptedSummaryData: response.summaryData,
+              encryptedApplicationData: response.applicationData,
+            },
+            response.contentEncryptionKey,
+          ),
+        ).pipe(
+          map((decryptedData) => {
+            const newReport: RiskInsightsData = {
+              id: response.id as OrganizationReportId,
+              reportData: decryptedData.reportData,
+              summaryData: decryptedData.summaryData,
+              applicationData: decryptedData.applicationData,
+              creationDate: response.creationDate,
+              contentEncryptionKey: response.contentEncryptionKey,
+            };
+            return newReport;
+          }),
+          catchError((error: unknown) => {
+            return throwError(() => error);
+          }),
+        );
+      }),
+      catchError((error: unknown) => {
+        return throwError(() => error);
+      }),
+    );
+  }
+
+  isCriticalApplication(
+    application: ApplicationHealthReportDetail,
+    applicationData: OrganizationReportApplication[],
+  ): boolean {
+    return applicationData.some(
+      (a) => a.applicationName == application.applicationName && a.isCritical,
+    );
+  }
+
+  /**
+   * Encrypts the risk insights report data for a specific organization.
+   * @param organizationId The ID of the organization.
+   * @param userId The ID of the user.
+   * @param report The report data to encrypt.
+   * @returns A promise that resolves to an object containing the encrypted data and encryption key.
+   */
+  saveRiskInsightsReport$(
+    report: ApplicationHealthReportDetail[],
+    summary: OrganizationReportSummary,
+    applications: OrganizationReportApplication[],
+    metrics: RiskInsightsMetrics,
+    encryptionParameters: {
+      organizationId: OrganizationId;
+      userId: UserId;
+    },
+  ): Observable<{ response: SaveRiskInsightsReportResponse; contentEncryptionKey: EncString }> {
+    return from(
+      this.riskInsightsEncryptionService.encryptRiskInsightsReport(
+        {
+          organizationId: encryptionParameters.organizationId,
+          userId: encryptionParameters.userId,
+        },
+        {
+          reportData: report,
+          summaryData: summary,
+          applicationData: applications,
+        },
+      ),
+    ).pipe(
+      map(
+        ({
+          encryptedReportData,
+          encryptedSummaryData,
+          encryptedApplicationData,
+          contentEncryptionKey,
+        }) => ({
+          requestPayload: {
+            data: {
+              organizationId: encryptionParameters.organizationId,
+              creationDate: new Date().toISOString(),
+              reportData: encryptedReportData.toSdk(),
+              summaryData: encryptedSummaryData.toSdk(),
+              applicationData: encryptedApplicationData.toSdk(),
+              contentEncryptionKey: contentEncryptionKey.toSdk(),
+              metrics: metrics.toRiskInsightsMetricsData(),
+            },
+          },
+          // Keep the original EncString alongside the SDK payload so downstream can return the EncString type.
+          contentEncryptionKey,
+        }),
+      ),
+      switchMap(({ requestPayload, contentEncryptionKey }) =>
+        this.riskInsightsApiService
+          .saveRiskInsightsReport$(requestPayload, encryptionParameters.organizationId)
+          .pipe(
+            map((response) => ({
+              response,
+              contentEncryptionKey,
+            })),
+          ),
+      ),
+      catchError((error: unknown) => {
+        return EMPTY;
+      }),
+      map((result) => {
+        if (!isSaveRiskInsightsReportResponse(result.response)) {
+          throw new Error("Invalid response from API");
+        }
+        return result;
+      }),
+    );
+  }
+
+  private _groupCiphersByApplication(
+    cipherHealthData: CipherHealthReport[],
+  ): Map<string, CipherHealthReport[]> {
+    const applicationMap = new Map<string, CipherHealthReport[]>();
+
+    cipherHealthData.forEach((cipher: CipherHealthReport) => {
+      cipher.applications.forEach((application) => {
+        const existingApplication = applicationMap.get(application) || [];
+        existingApplication.push(cipher);
+        applicationMap.set(application, existingApplication);
+      });
+    });
+
+    return applicationMap;
+  }
+
+  // --------------------------- Aggregation methods ---------------------------
+  /**
+   * Loop through the flattened cipher to uri data. If the item exists it's values need to be updated with the new item.
+   * If the item is new, create and add the object with the flattened details
+   * @param cipherHealthReport Cipher and password health info broken out into their uris
+   * @returns Application health reports
+   */
+  private _getApplicationHealthReport(
+    application: string,
+    ciphers: CipherHealthReport[],
+  ): ApplicationHealthReportDetail {
+    let aggregatedReport: ApplicationHealthReportDetail | undefined;
+
+    ciphers.forEach((cipher) => {
+      const isAtRisk = this._isPasswordAtRisk(cipher.healthData);
+      aggregatedReport = this._aggregateReport(application, cipher, isAtRisk, aggregatedReport);
+    });
+
+    return aggregatedReport!;
+  }
+
+  private _aggregateReport(
+    application: string,
+    newCipherReport: CipherHealthReport,
+    isAtRisk: boolean,
+    existingReport?: ApplicationHealthReportDetail,
+  ): ApplicationHealthReportDetail {
+    let baseReport = existingReport
+      ? this._updateExistingReport(existingReport, newCipherReport)
+      : this._createNewReport(application, newCipherReport);
+    if (isAtRisk) {
+      baseReport = { ...baseReport, ...this._getAtRiskData(baseReport, newCipherReport) };
+    }
+
+    baseReport.memberCount = baseReport.memberDetails.length;
+    baseReport.atRiskMemberCount = baseReport.atRiskMemberDetails.length;
+
+    return baseReport;
+  }
+  private _createNewReport(
+    application: string,
+    cipherReport: CipherHealthReport,
+  ): ApplicationHealthReportDetail {
+    return {
+      applicationName: application,
+      cipherIds: [cipherReport.cipher.id as CipherId],
+      passwordCount: 1,
+      memberDetails: [...cipherReport.cipherMembers],
+      memberCount: cipherReport.cipherMembers.length,
+      atRiskCipherIds: [],
+      atRiskMemberCount: 0,
+      atRiskMemberDetails: [],
+      atRiskPasswordCount: 0,
+    };
+  }
+
+  private _updateExistingReport(
+    existingReport: ApplicationHealthReportDetail,
+    newCipherReport: CipherHealthReport,
+  ): ApplicationHealthReportDetail {
+    return {
+      ...existingReport,
+      passwordCount: existingReport.passwordCount + 1,
+      memberDetails: getUniqueMembers(
+        existingReport.memberDetails.concat(newCipherReport.cipherMembers),
+      ),
+      cipherIds: existingReport.cipherIds.concat(newCipherReport.cipher.id as CipherId),
+    };
+  }
+
+  private _getAtRiskData(report: ApplicationHealthReportDetail, cipherReport: CipherHealthReport) {
+    const atRiskMemberDetails = getUniqueMembers(
+      report.atRiskMemberDetails.concat(cipherReport.cipherMembers),
+    );
+    return {
+      atRiskPasswordCount: report.atRiskPasswordCount + 1,
+      atRiskCipherIds: report.atRiskCipherIds.concat(cipherReport.cipher.id as CipherId),
+      atRiskMemberDetails,
+      atRiskMemberCount: atRiskMemberDetails.length,
+    };
+  }
+
+  // TODO Move to health service
+  private _isPasswordAtRisk(healthData: PasswordHealthData): boolean {
+    return !!(
+      healthData.exposedPasswordDetail ||
+      healthData.weakPasswordDetail ||
+      healthData.reusedPasswordCount > 1
+    );
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/index.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/index.ts
index e3f75ea0daf..1e14c09d089 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/index.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/index.ts
@@ -1,7 +1,11 @@
-export * from "./member-cipher-details-api.service";
-export * from "./password-health.service";
-export * from "./critical-apps.service";
-export * from "./critical-apps-api.service";
-export * from "./risk-insights-api.service";
-export * from "./risk-insights-report.service";
-export * from "./risk-insights-data.service";
+export * from "./api/critical-apps-api.service";
+export * from "./api/member-cipher-details-api.service";
+export * from "./api/risk-insights-api.service";
+export * from "./api/security-tasks-api.service";
+export * from "./domain/critical-apps.service";
+export * from "./domain/password-health.service";
+export * from "./domain/risk-insights-encryption.service";
+export * from "./domain/risk-insights-orchestrator.service";
+export * from "./domain/risk-insights-report.service";
+export * from "./view/all-activities.service";
+export * from "./view/risk-insights-data.service";
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-response.mock.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-response.mock.ts
deleted file mode 100644
index 92d87175974..00000000000
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/member-cipher-details-response.mock.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-export const mockMemberCipherDetailsResponse: { data: any[] } = {
-  data: [
-    {
-      UserName: "David Brent",
-      Email: "david.brent@wernhamhogg.uk",
-      UsesKeyConnector: true,
-      cipherIds: [
-        "cbea34a8-bde4-46ad-9d19-b05001228ab1",
-        "cbea34a8-bde4-46ad-9d19-b05001228ab2",
-        "cbea34a8-bde4-46ad-9d19-b05001228xy4",
-        "cbea34a8-bde4-46ad-9d19-b05001227nm5",
-      ],
-    },
-    {
-      UserName: "Tim Canterbury",
-      Email: "tim.canterbury@wernhamhogg.uk",
-      UsesKeyConnector: false,
-      cipherIds: [
-        "cbea34a8-bde4-46ad-9d19-b05001228ab2",
-        "cbea34a8-bde4-46ad-9d19-b05001228cd3",
-        "cbea34a8-bde4-46ad-9d19-b05001228xy4",
-        "cbea34a8-bde4-46ad-9d19-b05001227nm5",
-      ],
-    },
-    {
-      UserName: "Gareth Keenan",
-      Email: "gareth.keenan@wernhamhogg.uk",
-      UsesKeyConnector: true,
-      cipherIds: [
-        "cbea34a8-bde4-46ad-9d19-b05001228cd3",
-        "cbea34a8-bde4-46ad-9d19-b05001228xy4",
-        "cbea34a8-bde4-46ad-9d19-b05001227nm5",
-        "cbea34a8-bde4-46ad-9d19-b05001227nm7",
-      ],
-    },
-    {
-      UserName: "Dawn Tinsley",
-      Email: "dawn.tinsley@wernhamhogg.uk",
-      UsesKeyConnector: true,
-      cipherIds: [
-        "cbea34a8-bde4-46ad-9d19-b05001228ab2",
-        "cbea34a8-bde4-46ad-9d19-b05001228cd3",
-        "cbea34a8-bde4-46ad-9d19-b05001228xy4",
-      ],
-    },
-    {
-      UserName: "Keith Bishop",
-      Email: "keith.bishop@wernhamhogg.uk",
-      UsesKeyConnector: false,
-      cipherIds: [
-        "cbea34a8-bde4-46ad-9d19-b05001228ab1",
-        "cbea34a8-bde4-46ad-9d19-b05001228cd3",
-        "cbea34a8-bde4-46ad-9d19-b05001228xy4",
-        "cbea34a8-bde4-46ad-9d19-b05001227nm5",
-      ],
-    },
-    {
-      UserName: "Chris Finch",
-      Email: "chris.finch@wernhamhogg.uk",
-      UsesKeyConnector: true,
-      cipherIds: [
-        "cbea34a8-bde4-46ad-9d19-b05001228ab2",
-        "cbea34a8-bde4-46ad-9d19-b05001228cd3",
-        "cbea34a8-bde4-46ad-9d19-b05001228xy4",
-      ],
-    },
-    {
-      UserName: "Chris Finch Tester",
-      Email: "chris.finch@wernhamhogg.uk",
-      UsesKeyConnector: true,
-      cipherIds: [
-        "cbea34a8-bde4-46ad-9d19-b05001228ab2",
-        "cbea34a8-bde4-46ad-9d19-b05001228cd3",
-        "cbea34a8-bde4-46ad-9d19-b05001228xy4",
-        "cbea34a8-bde4-46ad-9d19-b05001228ab1",
-      ],
-    },
-  ],
-};
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-api.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-api.service.spec.ts
deleted file mode 100644
index ffcdceadad7..00000000000
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-api.service.spec.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-import { mock } from "jest-mock-extended";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { makeEncString } from "@bitwarden/common/spec";
-import { OrganizationId, OrganizationReportId } from "@bitwarden/common/types/guid";
-
-import { SaveRiskInsightsReportRequest } from "../models/api-models.types";
-import { EncryptedDataModel } from "../models/password-health";
-
-import { RiskInsightsApiService } from "./risk-insights-api.service";
-
-describe("RiskInsightsApiService", () => {
-  let service: RiskInsightsApiService;
-  const mockApiService = mock<ApiService>();
-
-  const orgId = "org1" as OrganizationId;
-
-  const getRiskInsightsReportResponse = {
-    organizationId: orgId,
-    date: new Date().toISOString(),
-    reportData: "test",
-    reportKey: "test-key",
-  };
-
-  const reportData = makeEncString("test").encryptedString?.toString() ?? "";
-  const reportKey = makeEncString("test-key").encryptedString?.toString() ?? "";
-
-  const saveRiskInsightsReportRequest: SaveRiskInsightsReportRequest = {
-    data: {
-      organizationId: orgId,
-      date: new Date().toISOString(),
-      reportData: reportData,
-      reportKey: reportKey,
-    },
-  };
-  const saveRiskInsightsReportResponse = {
-    ...saveRiskInsightsReportRequest.data,
-  };
-
-  beforeEach(() => {
-    service = new RiskInsightsApiService(mockApiService);
-  });
-
-  it("should be created", () => {
-    expect(service).toBeTruthy();
-  });
-
-  it("Get Report: should call apiService.send with correct parameters and return the response for getRiskInsightsReport ", (done) => {
-    mockApiService.send.mockReturnValue(Promise.resolve(getRiskInsightsReportResponse));
-
-    service.getRiskInsightsReport$(orgId).subscribe((result) => {
-      expect(result).toEqual(getRiskInsightsReportResponse);
-      expect(mockApiService.send).toHaveBeenCalledWith(
-        "GET",
-        `/reports/organizations/${orgId.toString()}/latest`,
-        null,
-        true,
-        true,
-      );
-      done();
-    });
-  });
-
-  it("Get Report: should return null if apiService.send rejects with 404 error for getRiskInsightsReport", (done) => {
-    const error = { statusCode: 404 };
-    mockApiService.send.mockReturnValue(Promise.reject(error));
-
-    service.getRiskInsightsReport$(orgId).subscribe((result) => {
-      expect(result).toBeNull();
-      done();
-    });
-  });
-
-  it("Get Report: should throw error if apiService.send rejects with non-404 error for getRiskInsightsReport", (done) => {
-    const error = { statusCode: 500, message: "Server error" };
-    mockApiService.send.mockReturnValue(Promise.reject(error));
-
-    service.getRiskInsightsReport$(orgId).subscribe({
-      next: () => {
-        // Should not reach here
-        fail("Expected error to be thrown");
-      },
-      error: () => {
-        expect(mockApiService.send).toHaveBeenCalledWith(
-          "GET",
-          `/reports/organizations/${orgId.toString()}/latest`,
-          null,
-          true,
-          true,
-        );
-        done();
-      },
-      complete: () => {
-        done();
-      },
-    });
-  });
-
-  it("Save Report: should call apiService.send with correct parameters for saveRiskInsightsReport", (done) => {
-    mockApiService.send.mockReturnValue(Promise.resolve(saveRiskInsightsReportResponse));
-
-    service.saveRiskInsightsReport$(saveRiskInsightsReportRequest, orgId).subscribe((result) => {
-      expect(result).toEqual(saveRiskInsightsReportResponse);
-      expect(mockApiService.send).toHaveBeenCalledWith(
-        "POST",
-        `/reports/organizations/${orgId.toString()}`,
-        saveRiskInsightsReportRequest.data,
-        true,
-        true,
-      );
-      done();
-    });
-  });
-
-  it("Save Report: should propagate errors from apiService.send for saveRiskInsightsReport - 1", (done) => {
-    const error = { statusCode: 500, message: "Internal Server Error" };
-    mockApiService.send.mockReturnValue(Promise.reject(error));
-
-    service.saveRiskInsightsReport$(saveRiskInsightsReportRequest, orgId).subscribe({
-      next: () => {
-        fail("Expected error to be thrown");
-      },
-      error: () => {
-        expect(mockApiService.send).toHaveBeenCalledWith(
-          "POST",
-          `/reports/organizations/${orgId.toString()}`,
-          saveRiskInsightsReportRequest.data,
-          true,
-          true,
-        );
-        done();
-      },
-      complete: () => {
-        done();
-      },
-    });
-  });
-
-  it("Save Report: should propagate network errors from apiService.send for saveRiskInsightsReport - 2", (done) => {
-    const error = new Error("Network error");
-    mockApiService.send.mockReturnValue(Promise.reject(error));
-
-    service.saveRiskInsightsReport$(saveRiskInsightsReportRequest, orgId).subscribe({
-      next: () => {
-        fail("Expected error to be thrown");
-      },
-      error: () => {
-        expect(mockApiService.send).toHaveBeenCalledWith(
-          "POST",
-          `/reports/organizations/${orgId.toString()}`,
-          saveRiskInsightsReportRequest.data,
-          true,
-          true,
-        );
-        done();
-      },
-      complete: () => {
-        done();
-      },
-    });
-  });
-
-  it("Get Summary: should call apiService.send with correct parameters and return an Observable", (done) => {
-    const minDate = new Date("2024-01-01");
-    const maxDate = new Date("2024-01-31");
-    const mockResponse: EncryptedDataModel[] = [{ encryptedData: "abc" } as EncryptedDataModel];
-
-    mockApiService.send.mockResolvedValueOnce(mockResponse);
-
-    service.getRiskInsightsSummary$(orgId, minDate, maxDate).subscribe((result) => {
-      expect(mockApiService.send).toHaveBeenCalledWith(
-        "GET",
-        `/reports/organizations/${orgId.toString()}/data/summary?startDate=${minDate.toISOString().split("T")[0]}&endDate=${maxDate.toISOString().split("T")[0]}`,
-        null,
-        true,
-        true,
-      );
-      expect(result).toEqual(mockResponse);
-      done();
-    });
-  });
-
-  it("Update Summary: should call apiService.send with correct parameters and return an Observable", (done) => {
-    const data: EncryptedDataModel = { encryptedData: "xyz" } as EncryptedDataModel;
-    const reportId = "report123" as OrganizationReportId;
-
-    mockApiService.send.mockResolvedValueOnce(undefined);
-
-    service.updateRiskInsightsSummary$(data, orgId, reportId).subscribe((result) => {
-      expect(mockApiService.send).toHaveBeenCalledWith(
-        "PATCH",
-        `/reports/organizations/${orgId.toString()}/data/summary/${reportId.toString()}`,
-        data,
-        true,
-        true,
-      );
-      expect(result).toBeUndefined();
-      done();
-    });
-  });
-
-  it("Get Applications: should call apiService.send with correct parameters and return an Observable", (done) => {
-    const reportId = "report123" as OrganizationReportId;
-    const mockResponse: EncryptedDataModel | null = {
-      encryptedData: "abc",
-    } as EncryptedDataModel;
-
-    mockApiService.send.mockResolvedValueOnce(mockResponse);
-
-    service.getRiskInsightsApplicationData$(orgId, reportId).subscribe((result) => {
-      expect(mockApiService.send).toHaveBeenCalledWith(
-        "GET",
-        `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
-        null,
-        true,
-        true,
-      );
-      expect(result).toEqual(mockResponse);
-      done();
-    });
-  });
-
-  it("Update Applications: should call apiService.send with correct parameters and return an Observable", (done) => {
-    const applicationData: EncryptedDataModel = { encryptedData: "xyz" } as EncryptedDataModel;
-    const reportId = "report123" as OrganizationReportId;
-
-    mockApiService.send.mockResolvedValueOnce(undefined);
-
-    service
-      .updateRiskInsightsApplicationData$(applicationData, orgId, reportId)
-      .subscribe((result) => {
-        expect(mockApiService.send).toHaveBeenCalledWith(
-          "PATCH",
-          `/reports/organizations/${orgId.toString()}/data/application/${reportId.toString()}`,
-          applicationData,
-          true,
-          true,
-        );
-        expect(result).toBeUndefined();
-        done();
-      });
-  });
-});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-data.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-data.service.ts
deleted file mode 100644
index cc90fb6940a..00000000000
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-data.service.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-import { BehaviorSubject, firstValueFrom, Observable, of } from "rxjs";
-import { finalize, switchMap, withLatestFrom, map } from "rxjs/operators";
-
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
-
-import {
-  AppAtRiskMembersDialogParams,
-  AtRiskApplicationDetail,
-  AtRiskMemberDetail,
-  DrawerType,
-  DrawerDetails,
-  ApplicationHealthReportDetail,
-  ApplicationHealthReportDetailEnriched,
-} from "../models/report-models";
-
-import { CriticalAppsService } from "./critical-apps.service";
-import { RiskInsightsReportService } from "./risk-insights-report.service";
-export class RiskInsightsDataService {
-  // -------------------------- Context state --------------------------
-  // Current user viewing risk insights
-  private userIdSubject = new BehaviorSubject<UserId | null>(null);
-  userId$ = this.userIdSubject.asObservable();
-
-  // Organization the user is currently viewing
-  private organizationDetailsSubject = new BehaviorSubject<{
-    organizationId: OrganizationId;
-    organizationName: string;
-  } | null>(null);
-  organizationDetails$ = this.organizationDetailsSubject.asObservable();
-
-  // -------------------------- Data ------------------------------------
-  private applicationsSubject = new BehaviorSubject<ApplicationHealthReportDetail[] | null>(null);
-  applications$ = this.applicationsSubject.asObservable();
-
-  private dataLastUpdatedSubject = new BehaviorSubject<Date | null>(null);
-  dataLastUpdated$ = this.dataLastUpdatedSubject.asObservable();
-
-  criticalApps$ = this.criticalAppsService.criticalAppsList$;
-
-  // --------------------------- UI State ------------------------------------
-
-  private isLoadingSubject = new BehaviorSubject<boolean>(false);
-  isLoading$ = this.isLoadingSubject.asObservable();
-
-  private isRefreshingSubject = new BehaviorSubject<boolean>(false);
-  isRefreshing$ = this.isRefreshingSubject.asObservable();
-
-  private errorSubject = new BehaviorSubject<string | null>(null);
-  error$ = this.errorSubject.asObservable();
-
-  // ------------------------- Drawer Variables ----------------
-  // Drawer variables unified into a single BehaviorSubject
-  private drawerDetailsSubject = new BehaviorSubject<DrawerDetails>({
-    open: false,
-    invokerId: "",
-    activeDrawerType: DrawerType.None,
-    atRiskMemberDetails: [],
-    appAtRiskMembers: null,
-    atRiskAppDetails: null,
-  });
-  drawerDetails$ = this.drawerDetailsSubject.asObservable();
-
-  constructor(
-    private accountService: AccountService,
-    private criticalAppsService: CriticalAppsService,
-    private organizationService: OrganizationService,
-    private reportService: RiskInsightsReportService,
-  ) {}
-
-  // [FIXME] PM-25612 - Call Initialization in RiskInsightsComponent instead of child components
-  async initializeForOrganization(organizationId: OrganizationId) {
-    // Fetch current user
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    if (userId) {
-      this.userIdSubject.next(userId);
-    }
-
-    // [FIXME] getOrganizationById is now deprecated - update when we can
-    // Fetch organization details
-    const org = await firstValueFrom(
-      this.organizationService.organizations$(userId).pipe(getOrganizationById(organizationId)),
-    );
-    if (org) {
-      this.organizationDetailsSubject.next({
-        organizationId: organizationId,
-        organizationName: org.name,
-      });
-    }
-
-    // Load critical applications for organization
-    await this.criticalAppsService.loadOrganizationContext(organizationId, userId);
-
-    // TODO: PM-25613
-    // // Load existing report
-
-    // this.fetchLastReport(organizationId, userId);
-
-    // // Setup new report generation
-    // this._runApplicationsReport().subscribe({
-    //   next: (result) => {
-    //     this.isRunningReportSubject.next(false);
-    //   },
-    //   error: () => {
-    //     this.errorSubject.next("Failed to save report");
-    //   },
-    // });
-  }
-
-  /**
-   * Fetches the applications report and updates the applicationsSubject.
-   * @param organizationId The ID of the organization.
-   */
-  fetchApplicationsReport(organizationId: OrganizationId, isRefresh?: boolean): void {
-    if (isRefresh) {
-      this.isRefreshingSubject.next(true);
-    } else {
-      this.isLoadingSubject.next(true);
-    }
-    this.reportService
-      .LEGACY_generateApplicationsReport$(organizationId)
-      .pipe(
-        finalize(() => {
-          this.isLoadingSubject.next(false);
-          this.isRefreshingSubject.next(false);
-          this.dataLastUpdatedSubject.next(new Date());
-        }),
-      )
-      .subscribe({
-        next: (reports: ApplicationHealthReportDetail[]) => {
-          this.applicationsSubject.next(reports);
-          this.errorSubject.next(null);
-        },
-        error: () => {
-          this.applicationsSubject.next([]);
-        },
-      });
-  }
-
-  refreshApplicationsReport(organizationId: OrganizationId): void {
-    this.fetchApplicationsReport(organizationId, true);
-  }
-
-  // ------------------------------- Enrichment methods -------------------------------
-  /**
-   * Takes the basic application health report details and enriches them to include
-   * critical app status and associated ciphers.
-   *
-   * @param applications The list of application health report details to enrich
-   * @returns The enriched application health report details with critical app status and ciphers
-   */
-  enrichReportData$(
-    applications: ApplicationHealthReportDetail[],
-  ): Observable<ApplicationHealthReportDetailEnriched[]> {
-    return of(applications).pipe(
-      withLatestFrom(this.organizationDetails$, this.criticalApps$),
-      switchMap(async ([apps, orgDetails, criticalApps]) => {
-        if (!orgDetails) {
-          return [];
-        }
-
-        // Get ciphers for application
-        const cipherMap = await this.reportService.getApplicationCipherMap(
-          apps,
-          orgDetails.organizationId,
-        );
-
-        // Find critical apps
-        const criticalApplicationNames = new Set(criticalApps.map((ca) => ca.uri));
-
-        // Return enriched application data
-        return apps.map((app) => ({
-          ...app,
-          ciphers: cipherMap.get(app.applicationName) || [],
-          isMarkedAsCritical: criticalApplicationNames.has(app.applicationName),
-        })) as ApplicationHealthReportDetailEnriched[];
-      }),
-    );
-  }
-
-  // ------------------------------- Drawer management methods -------------------------------
-  // ------------------------- Drawer functions -----------------------------
-
-  isActiveDrawerType$ = (drawerType: DrawerType): Observable<boolean> => {
-    return this.drawerDetails$.pipe(map((details) => details.activeDrawerType === drawerType));
-  };
-  isActiveDrawerType = (drawerType: DrawerType): boolean => {
-    return this.drawerDetailsSubject.value.activeDrawerType === drawerType;
-  };
-
-  isDrawerOpenForInvoker$ = (applicationName: string) => {
-    return this.drawerDetails$.pipe(map((details) => details.invokerId === applicationName));
-  };
-  isDrawerOpenForInvoker = (applicationName: string): boolean => {
-    return this.drawerDetailsSubject.value.invokerId === applicationName;
-  };
-
-  closeDrawer = (): void => {
-    this.drawerDetailsSubject.next({
-      open: false,
-      invokerId: "",
-      activeDrawerType: DrawerType.None,
-      atRiskMemberDetails: [],
-      appAtRiskMembers: null,
-      atRiskAppDetails: null,
-    });
-  };
-
-  setDrawerForOrgAtRiskMembers = (
-    atRiskMemberDetails: AtRiskMemberDetail[],
-    invokerId: string = "",
-  ): void => {
-    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
-    const shouldClose =
-      open && activeDrawerType === DrawerType.OrgAtRiskMembers && currentInvokerId === invokerId;
-
-    if (shouldClose) {
-      this.closeDrawer();
-    } else {
-      this.drawerDetailsSubject.next({
-        open: true,
-        invokerId,
-        activeDrawerType: DrawerType.OrgAtRiskMembers,
-        atRiskMemberDetails,
-        appAtRiskMembers: null,
-        atRiskAppDetails: null,
-      });
-    }
-  };
-
-  setDrawerForAppAtRiskMembers = (
-    atRiskMembersDialogParams: AppAtRiskMembersDialogParams,
-    invokerId: string = "",
-  ): void => {
-    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
-    const shouldClose =
-      open && activeDrawerType === DrawerType.AppAtRiskMembers && currentInvokerId === invokerId;
-
-    if (shouldClose) {
-      this.closeDrawer();
-    } else {
-      this.drawerDetailsSubject.next({
-        open: true,
-        invokerId,
-        activeDrawerType: DrawerType.AppAtRiskMembers,
-        atRiskMemberDetails: [],
-        appAtRiskMembers: atRiskMembersDialogParams,
-        atRiskAppDetails: null,
-      });
-    }
-  };
-
-  setDrawerForOrgAtRiskApps = (
-    atRiskApps: AtRiskApplicationDetail[],
-    invokerId: string = "",
-  ): void => {
-    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
-    const shouldClose =
-      open && activeDrawerType === DrawerType.OrgAtRiskApps && currentInvokerId === invokerId;
-
-    if (shouldClose) {
-      this.closeDrawer();
-    } else {
-      this.drawerDetailsSubject.next({
-        open: true,
-        invokerId,
-        activeDrawerType: DrawerType.OrgAtRiskApps,
-        atRiskMemberDetails: [],
-        appAtRiskMembers: null,
-        atRiskAppDetails: atRiskApps,
-      });
-    }
-  };
-}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-encryption.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-encryption.service.spec.ts
deleted file mode 100644
index dae56327c29..00000000000
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-encryption.service.spec.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import { mock } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
-
-import { KeyGenerationService } from "@bitwarden/common/key-management/crypto";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { makeSymmetricCryptoKey } from "@bitwarden/common/spec";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
-import { OrgKey } from "@bitwarden/common/types/key";
-import { KeyService } from "@bitwarden/key-management";
-
-import { RiskInsightsEncryptionService } from "./risk-insights-encryption.service";
-
-describe("RiskInsightsEncryptionService", () => {
-  let service: RiskInsightsEncryptionService;
-  const mockKeyService = mock<KeyService>();
-  const mockEncryptService = mock<EncryptService>();
-  const mockKeyGenerationService = mock<KeyGenerationService>();
-
-  const ENCRYPTED_TEXT = "This data has been encrypted";
-  const ENCRYPTED_KEY = "Re-encrypted Cipher Key";
-  const orgId = "org-123" as OrganizationId;
-  const userId = "user-123" as UserId;
-  const orgKey = makeSymmetricCryptoKey<OrgKey>();
-  const contentEncryptionKey = new SymmetricCryptoKey(new Uint8Array(64));
-  const testData = { foo: "bar" };
-  const OrgRecords: Record<OrganizationId, OrgKey> = {
-    [orgId]: orgKey,
-    ["testOrg" as OrganizationId]: makeSymmetricCryptoKey<OrgKey>(),
-  };
-  const orgKey$ = new BehaviorSubject(OrgRecords);
-
-  beforeEach(() => {
-    service = new RiskInsightsEncryptionService(
-      mockKeyService,
-      mockEncryptService,
-      mockKeyGenerationService,
-    );
-
-    jest.clearAllMocks();
-
-    // Always use the same contentEncryptionKey for both encrypt and decrypt tests
-    mockKeyGenerationService.createKey.mockResolvedValue(contentEncryptionKey);
-    mockEncryptService.wrapSymmetricKey.mockResolvedValue(new EncString(ENCRYPTED_KEY));
-    mockEncryptService.encryptString.mockResolvedValue(new EncString(ENCRYPTED_TEXT));
-    mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
-    mockEncryptService.decryptString.mockResolvedValue(JSON.stringify(testData));
-    mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-  });
-
-  describe("encryptRiskInsightsReport", () => {
-    it("should encrypt data and return encrypted packet", async () => {
-      // arrange: setup our mocks
-      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-
-      // Act: call the method under test
-      const result = await service.encryptRiskInsightsReport(orgId, userId, testData);
-
-      // Assert: ensure that the methods were called with the expected parameters
-      expect(mockKeyService.orgKeys$).toHaveBeenCalledWith(userId);
-      expect(mockKeyGenerationService.createKey).toHaveBeenCalledWith(512);
-      expect(mockEncryptService.encryptString).toHaveBeenCalledWith(
-        JSON.stringify(testData),
-        contentEncryptionKey,
-      );
-      expect(mockEncryptService.wrapSymmetricKey).toHaveBeenCalledWith(
-        contentEncryptionKey,
-        orgKey,
-      );
-      expect(result).toEqual({
-        organizationId: orgId,
-        encryptedData: ENCRYPTED_TEXT,
-        encryptionKey: ENCRYPTED_KEY,
-      });
-    });
-
-    it("should throw an error when encrypted text is null or empty", async () => {
-      // arrange: setup our mocks
-      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-      mockEncryptService.encryptString.mockResolvedValue(new EncString(""));
-      mockEncryptService.wrapSymmetricKey.mockResolvedValue(new EncString(ENCRYPTED_KEY));
-
-      // Act & Assert: call the method under test and expect rejection
-      await expect(service.encryptRiskInsightsReport(orgId, userId, testData)).rejects.toThrow(
-        "Encryption failed, encrypted strings are null",
-      );
-    });
-
-    it("should throw an error when encrypted key is null or empty", async () => {
-      // arrange: setup our mocks
-      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-      mockEncryptService.encryptString.mockResolvedValue(new EncString(ENCRYPTED_TEXT));
-      mockEncryptService.wrapSymmetricKey.mockResolvedValue(new EncString(""));
-
-      // Act & Assert: call the method under test and expect rejection
-      await expect(service.encryptRiskInsightsReport(orgId, userId, testData)).rejects.toThrow(
-        "Encryption failed, encrypted strings are null",
-      );
-    });
-
-    it("should throw if org key is not found", async () => {
-      // when we cannot get an organization key, we should throw an error
-      mockKeyService.orgKeys$.mockReturnValue(new BehaviorSubject({}));
-
-      await expect(service.encryptRiskInsightsReport(orgId, userId, testData)).rejects.toThrow(
-        "Organization key not found",
-      );
-    });
-  });
-
-  describe("decryptRiskInsightsReport", () => {
-    it("should decrypt data and return original object", async () => {
-      // Arrange: setup our mocks
-      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-      mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
-      mockEncryptService.decryptString.mockResolvedValue(JSON.stringify(testData));
-
-      // act: call the decrypt method - with any params
-      // actual decryption does not happen here,
-      // we just want to ensure the method calls are correct
-      const result = await service.decryptRiskInsightsReport(
-        orgId,
-        userId,
-        new EncString("encrypted-data"),
-        new EncString("wrapped-key"),
-        (data) => data as typeof testData,
-      );
-
-      expect(mockKeyService.orgKeys$).toHaveBeenCalledWith(userId);
-      expect(mockEncryptService.unwrapSymmetricKey).toHaveBeenCalledWith(
-        new EncString("wrapped-key"),
-        orgKey,
-      );
-      expect(mockEncryptService.decryptString).toHaveBeenCalledWith(
-        new EncString("encrypted-data"),
-        contentEncryptionKey,
-      );
-      expect(result).toEqual(testData);
-    });
-
-    it("should invoke data type validation method during decryption", async () => {
-      // Arrange: setup our mocks
-      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-      mockEncryptService.unwrapSymmetricKey.mockResolvedValue(contentEncryptionKey);
-      mockEncryptService.decryptString.mockResolvedValue(JSON.stringify(testData));
-      const mockParseFn = jest.fn((data) => data as typeof testData);
-
-      // act: call the decrypt method - with any params
-      // actual decryption does not happen here,
-      // we just want to ensure the method calls are correct
-      const result = await service.decryptRiskInsightsReport(
-        orgId,
-        userId,
-        new EncString("encrypted-data"),
-        new EncString("wrapped-key"),
-        mockParseFn,
-      );
-
-      expect(mockParseFn).toHaveBeenCalledWith(JSON.parse(JSON.stringify(testData)));
-      expect(result).toEqual(testData);
-    });
-
-    it("should return null if org key is not found", async () => {
-      mockKeyService.orgKeys$.mockReturnValue(new BehaviorSubject({}));
-
-      const result = await service.decryptRiskInsightsReport(
-        orgId,
-        userId,
-        new EncString("encrypted-data"),
-        new EncString("wrapped-key"),
-        (data) => data as typeof testData,
-      );
-
-      expect(result).toBeNull();
-    });
-
-    it("should return null if decrypt throws", async () => {
-      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-      mockEncryptService.unwrapSymmetricKey.mockRejectedValue(new Error("fail"));
-
-      const result = await service.decryptRiskInsightsReport(
-        orgId,
-        userId,
-        new EncString("encrypted-data"),
-        new EncString("wrapped-key"),
-        (data) => data as typeof testData,
-      );
-      expect(result).toBeNull();
-    });
-
-    it("should return null if decrypt throws", async () => {
-      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-      mockEncryptService.unwrapSymmetricKey.mockRejectedValue(new Error("fail"));
-
-      const result = await service.decryptRiskInsightsReport(
-        orgId,
-        userId,
-        new EncString("encrypted-data"),
-        new EncString("wrapped-key"),
-        (data) => data as typeof testData,
-      );
-      expect(result).toBeNull();
-    });
-
-    it("should return null if decrypt throws", async () => {
-      mockKeyService.orgKeys$.mockReturnValue(orgKey$);
-      mockEncryptService.unwrapSymmetricKey.mockRejectedValue(new Error("fail"));
-
-      const result = await service.decryptRiskInsightsReport(
-        orgId,
-        userId,
-        new EncString("encrypted-data"),
-        new EncString("wrapped-key"),
-        (data) => data as typeof testData,
-      );
-      expect(result).toBeNull();
-    });
-  });
-});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-encryption.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-encryption.service.ts
deleted file mode 100644
index f3c3a68b470..00000000000
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-encryption.service.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { firstValueFrom, map } from "rxjs";
-import { Jsonify } from "type-fest";
-
-import { KeyGenerationService } from "@bitwarden/common/key-management/crypto";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
-import { KeyService } from "@bitwarden/key-management";
-
-import { EncryptedDataWithKey } from "../models/password-health";
-
-export class RiskInsightsEncryptionService {
-  constructor(
-    private keyService: KeyService,
-    private encryptService: EncryptService,
-    private keyGeneratorService: KeyGenerationService,
-  ) {}
-
-  async encryptRiskInsightsReport<T>(
-    organizationId: OrganizationId,
-    userId: UserId,
-    data: T,
-  ): Promise<EncryptedDataWithKey> {
-    const orgKey = await firstValueFrom(
-      this.keyService
-        .orgKeys$(userId)
-        .pipe(
-          map((organizationKeysById) =>
-            organizationKeysById ? organizationKeysById[organizationId] : null,
-          ),
-        ),
-    );
-
-    if (!orgKey) {
-      throw new Error("Organization key not found");
-    }
-
-    const contentEncryptionKey = await this.keyGeneratorService.createKey(512);
-
-    const dataEncrypted = await this.encryptService.encryptString(
-      JSON.stringify(data),
-      contentEncryptionKey,
-    );
-
-    const wrappedEncryptionKey = await this.encryptService.wrapSymmetricKey(
-      contentEncryptionKey,
-      orgKey,
-    );
-
-    if (!dataEncrypted.encryptedString || !wrappedEncryptionKey.encryptedString) {
-      throw new Error("Encryption failed, encrypted strings are null");
-    }
-
-    const encryptedData = dataEncrypted.encryptedString;
-    const encryptionKey = wrappedEncryptionKey.encryptedString;
-
-    const encryptedDataPacket = {
-      organizationId: organizationId,
-      encryptedData: encryptedData,
-      encryptionKey: encryptionKey,
-    };
-
-    return encryptedDataPacket;
-  }
-
-  async decryptRiskInsightsReport<T>(
-    organizationId: OrganizationId,
-    userId: UserId,
-    encryptedData: EncString,
-    wrappedKey: EncString,
-    parser: (data: Jsonify<T>) => T,
-  ): Promise<T | null> {
-    try {
-      const orgKey = await firstValueFrom(
-        this.keyService
-          .orgKeys$(userId)
-          .pipe(
-            map((organizationKeysById) =>
-              organizationKeysById ? organizationKeysById[organizationId] : null,
-            ),
-          ),
-      );
-
-      if (!orgKey) {
-        throw new Error("Organization key not found");
-      }
-
-      const unwrappedEncryptionKey = await this.encryptService.unwrapSymmetricKey(
-        wrappedKey,
-        orgKey,
-      );
-
-      const dataUnencrypted = await this.encryptService.decryptString(
-        encryptedData,
-        unwrappedEncryptionKey,
-      );
-
-      const dataUnencryptedJson = parser(JSON.parse(dataUnencrypted));
-
-      return dataUnencryptedJson as T;
-    } catch {
-      return null;
-    }
-  }
-}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.spec.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.spec.ts
deleted file mode 100644
index 6c6fbb5b92c..00000000000
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.spec.ts
+++ /dev/null
@@ -1,342 +0,0 @@
-import { mock } from "jest-mock-extended";
-import { firstValueFrom, of } from "rxjs";
-
-import { EncryptedString } from "@bitwarden/common/key-management/crypto/models/enc-string";
-import { 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";
-
-import { GetRiskInsightsReportResponse } from "../models/api-models.types";
-import { MemberCipherDetailsResponse } from "../response/member-cipher-details.response";
-
-import { mockCiphers } from "./ciphers.mock";
-import { MemberCipherDetailsApiService } from "./member-cipher-details-api.service";
-import { mockMemberCipherDetails } from "./member-cipher-details-api.service.spec";
-import { PasswordHealthService } from "./password-health.service";
-import { RiskInsightsApiService } from "./risk-insights-api.service";
-import { RiskInsightsEncryptionService } from "./risk-insights-encryption.service";
-import { RiskInsightsReportService } from "./risk-insights-report.service";
-
-describe("RiskInsightsReportService", () => {
-  let service: RiskInsightsReportService;
-
-  // Mock services
-  const cipherService = mock<CipherService>();
-  const memberCipherDetailsService = mock<MemberCipherDetailsApiService>();
-  const mockPasswordHealthService = mock<PasswordHealthService>();
-  const mockRiskInsightsApiService = mock<RiskInsightsApiService>();
-  const mockRiskInsightsEncryptionService = mock<RiskInsightsEncryptionService>({
-    encryptRiskInsightsReport: jest.fn().mockResolvedValue("encryptedReportData"),
-    decryptRiskInsightsReport: jest.fn().mockResolvedValue("decryptedReportData"),
-  });
-
-  // Mock data
-  const mockOrgId = "orgId" as OrganizationId;
-  let mockCipherViews: CipherView[];
-  let mockMemberDetails: MemberCipherDetailsResponse[];
-
-  beforeEach(() => {
-    cipherService.getAllFromApiForOrganization.mockResolvedValue(mockCiphers);
-
-    memberCipherDetailsService.getMemberCipherDetails.mockResolvedValue(mockMemberCipherDetails);
-
-    // Mock PasswordHealthService methods
-    mockPasswordHealthService.isValidCipher.mockImplementation((cipher: any) => {
-      return (
-        cipher.type === 1 && cipher.login?.password && !cipher.isDeleted && cipher.viewPassword
-      );
-    });
-    mockPasswordHealthService.findWeakPasswordDetails.mockImplementation((cipher: any) => {
-      if (cipher.login?.password === "123") {
-        return { score: 1, detailValue: { label: "veryWeak", badgeVariant: "danger" } };
-      }
-      return null;
-    });
-    mockPasswordHealthService.auditPasswordLeaks$.mockImplementation((ciphers: any[]) => {
-      const exposedDetails = ciphers
-        .filter((cipher) => cipher.login?.password === "123")
-        .map((cipher) => ({
-          exposedXTimes: 100,
-          cipherId: cipher.id,
-        }));
-      return of(exposedDetails);
-    });
-
-    service = new RiskInsightsReportService(
-      cipherService,
-      memberCipherDetailsService,
-      mockRiskInsightsApiService,
-      mockRiskInsightsEncryptionService,
-      mockPasswordHealthService,
-    );
-
-    // Reset mock ciphers before each test
-    mockCipherViews = [
-      mock<CipherView>({
-        id: "cipher-1",
-        type: CipherType.Login,
-        login: { password: "pass1", username: "user1", uris: [{ uri: "https://app.com/login" }] },
-        isDeleted: false,
-        viewPassword: true,
-      }),
-      mock<CipherView>({
-        id: "cipher-2",
-        type: CipherType.Login,
-        login: { password: "pass2", username: "user2", uris: [{ uri: "app.com/home" }] },
-        isDeleted: false,
-        viewPassword: true,
-      }),
-      mock<CipherView>({
-        id: "cipher-3",
-        type: CipherType.Login,
-        login: { password: "pass3", username: "user3", uris: [{ uri: "https://other.com" }] },
-        isDeleted: false,
-        viewPassword: true,
-      }),
-    ];
-    mockMemberDetails = [
-      mock<MemberCipherDetailsResponse>({
-        cipherIds: ["cipher-1"],
-        userGuid: "user1",
-        userName: "User 1",
-        email: "user1@app.com",
-      }),
-      mock<MemberCipherDetailsResponse>({
-        cipherIds: ["cipher-2"],
-        userGuid: "user2",
-        userName: "User 2",
-        email: "user2@app.com",
-      }),
-      mock<MemberCipherDetailsResponse>({
-        cipherIds: ["cipher-3"],
-        userGuid: "user3",
-        userName: "User 3",
-        email: "user3@other.com",
-      }),
-    ];
-  });
-
-  it("should group and aggregate application health reports correctly", (done) => {
-    // Mock the service methods
-    cipherService.getAllFromApiForOrganization.mockResolvedValue(mockCipherViews);
-    memberCipherDetailsService.getMemberCipherDetails.mockResolvedValue(mockMemberDetails);
-
-    service.generateApplicationsReport$("orgId" as any).subscribe((result) => {
-      expect(Array.isArray(result)).toBe(true);
-
-      // Should group by application name (trimmedUris)
-      const appCom = result.find((r) => r.applicationName === "app.com");
-      const otherCom = result.find((r) => r.applicationName === "other.com");
-      expect(appCom).toBeTruthy();
-      expect(appCom?.passwordCount).toBe(2);
-      expect(otherCom).toBeTruthy();
-      expect(otherCom?.passwordCount).toBe(1);
-      done();
-    });
-  });
-
-  it("should generate the raw data report correctly", async () => {
-    const result = await firstValueFrom(service.LEGACY_generateRawDataReport$(mockOrgId));
-
-    expect(result).toHaveLength(6);
-
-    let testCaseResults = result.filter((x) => x.id === "cbea34a8-bde4-46ad-9d19-b05001228ab1");
-    expect(testCaseResults).toHaveLength(1);
-    let testCase = testCaseResults[0];
-    expect(testCase).toBeTruthy();
-    expect(testCase.cipherMembers).toHaveLength(2);
-    expect(testCase.trimmedUris).toHaveLength(5);
-    expect(testCase.weakPasswordDetail).toBeTruthy();
-    expect(testCase.exposedPasswordDetail).toBeTruthy();
-    expect(testCase.reusedPasswordCount).toEqual(2);
-
-    testCaseResults = result.filter((x) => x.id === "cbea34a8-bde4-46ad-9d19-b05001227tt1");
-    expect(testCaseResults).toHaveLength(1);
-    testCase = testCaseResults[0];
-    expect(testCase).toBeTruthy();
-    expect(testCase.cipherMembers).toHaveLength(1);
-    expect(testCase.trimmedUris).toHaveLength(1);
-    expect(testCase.weakPasswordDetail).toBeFalsy();
-    expect(testCase.exposedPasswordDetail).toBeFalsy();
-    expect(testCase.reusedPasswordCount).toEqual(1);
-  });
-
-  it("should generate the raw data + uri report correctly", async () => {
-    const result = await firstValueFrom(service.generateRawDataUriReport$(mockOrgId));
-
-    expect(result).toHaveLength(11);
-
-    // Two ciphers that have google.com as their uri. There should be 2 results
-    const googleResults = result.filter((x) => x.trimmedUri === "google.com");
-    expect(googleResults).toHaveLength(2);
-
-    // There is an invalid uri and it should not be trimmed
-    const invalidUriResults = result.filter((x) => x.trimmedUri === "this_is-not|a-valid-uri123@+");
-    expect(invalidUriResults).toHaveLength(1);
-
-    // Verify the details for one of the googles matches the password health info
-    // expected
-    const firstGoogle = googleResults.filter(
-      (x) => x.cipherId === "cbea34a8-bde4-46ad-9d19-b05001228ab1" && x.trimmedUri === "google.com",
-    )[0];
-    expect(firstGoogle.weakPasswordDetail).toBeTruthy();
-    expect(firstGoogle.exposedPasswordDetail).toBeTruthy();
-    expect(firstGoogle.reusedPasswordCount).toEqual(2);
-  });
-
-  it("should generate applications health report data correctly", async () => {
-    const result = await firstValueFrom(service.LEGACY_generateApplicationsReport$(mockOrgId));
-
-    expect(result).toHaveLength(8);
-
-    // Two ciphers have google.com associated with them. The first cipher
-    // has 2 members and the second has 4. However, the 2 members in the first
-    // cipher are also associated with the second. The total amount of members
-    // should be 4 not 6
-    const googleTestResults = result.filter((x) => x.applicationName === "google.com");
-    expect(googleTestResults).toHaveLength(1);
-    const googleTest = googleTestResults[0];
-    expect(googleTest.memberCount).toEqual(4);
-
-    // Both ciphers have at risk passwords
-    expect(googleTest.passwordCount).toEqual(2);
-
-    // All members are at risk since both ciphers are at risk
-    expect(googleTest.atRiskMemberDetails).toHaveLength(4);
-    expect(googleTest.atRiskPasswordCount).toEqual(2);
-
-    // There are 2 ciphers associated with 101domain.com
-    const domain101TestResults = result.filter((x) => x.applicationName === "101domain.com");
-    expect(domain101TestResults).toHaveLength(1);
-    const domain101Test = domain101TestResults[0];
-    expect(domain101Test.passwordCount).toEqual(2);
-
-    // The first cipher is at risk. The second cipher is not at risk
-    expect(domain101Test.atRiskPasswordCount).toEqual(1);
-
-    // The first cipher has 2 members. The second cipher the second
-    // cipher has 4. One of the members in the first cipher is associated
-    // with the second. So there should be 5 members total.
-    expect(domain101Test.memberCount).toEqual(5);
-
-    // The first cipher is at risk. The total at risk members is 2 and
-    // at risk password count is 1.
-    expect(domain101Test.atRiskMemberDetails).toHaveLength(2);
-    expect(domain101Test.atRiskPasswordCount).toEqual(1);
-  });
-
-  it("should generate applications summary data correctly", async () => {
-    const reportResult = await firstValueFrom(
-      service.LEGACY_generateApplicationsReport$(mockOrgId),
-    );
-    const reportSummary = service.generateApplicationsSummary(reportResult);
-
-    expect(reportSummary.totalMemberCount).toEqual(7);
-    expect(reportSummary.totalAtRiskMemberCount).toEqual(6);
-    expect(reportSummary.totalApplicationCount).toEqual(8);
-    expect(reportSummary.totalAtRiskApplicationCount).toEqual(7);
-  });
-
-  describe("saveRiskInsightsReport", () => {
-    it("should not update subjects if save response does not have id", async () => {
-      const organizationId = "orgId" as OrganizationId;
-      const userId = "userId" as UserId;
-      const report = [{ applicationName: "app1" }] as any;
-
-      const encryptedReport = {
-        organizationId: organizationId as OrganizationId,
-        encryptedData: "encryptedData" as EncryptedString,
-        encryptionKey: "encryptionKey" as EncryptedString,
-      };
-
-      mockRiskInsightsEncryptionService.encryptRiskInsightsReport.mockResolvedValue(
-        encryptedReport,
-      );
-
-      const saveResponse = { id: "" }; // Simulating no ID in response
-      mockRiskInsightsApiService.saveRiskInsightsReport$.mockReturnValue(of(saveResponse));
-
-      const reportSubjectSpy = jest.spyOn((service as any).riskInsightsReportSubject, "next");
-      const summarySubjectSpy = jest.spyOn((service as any).riskInsightsSummarySubject, "next");
-
-      await service.saveRiskInsightsReport(organizationId, userId, report);
-
-      expect(reportSubjectSpy).not.toHaveBeenCalled();
-      expect(summarySubjectSpy).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("getRiskInsightsReport", () => {
-    beforeEach(() => {
-      // Reset the mocks before each test
-      jest.clearAllMocks();
-    });
-
-    it("should call riskInsightsApiService.getRiskInsightsReport with the correct organizationId", () => {
-      // we need to ensure that the api is invoked with the specified organizationId
-      // here it doesn't matter what the Api returns
-      const apiResponse = {
-        id: "reportId",
-        date: new Date().toISOString(),
-        organizationId: "orgId",
-        reportData: "encryptedReportData",
-        contentEncryptionKey: "encryptionKey",
-      } as GetRiskInsightsReportResponse;
-
-      const organizationId = "orgId" as OrganizationId;
-      const userId = "userId" as UserId;
-      mockRiskInsightsApiService.getRiskInsightsReport$.mockReturnValue(of(apiResponse));
-      service.getRiskInsightsReport(organizationId, userId);
-      expect(mockRiskInsightsApiService.getRiskInsightsReport$).toHaveBeenCalledWith(
-        organizationId,
-      );
-      expect(mockRiskInsightsEncryptionService.decryptRiskInsightsReport).toHaveBeenCalledWith(
-        organizationId,
-        userId,
-        expect.anything(), // encryptedData
-        expect.anything(), // wrappedKey
-        expect.any(Function), // parser
-      );
-    });
-
-    it("should decrypt report and update subjects if response is present", async () => {
-      // Arrange: setup a mock response from the API
-      // and ensure the decryption service is called with the correct parameters
-      const organizationId = "orgId" as OrganizationId;
-      const userId = "userId" as UserId;
-
-      const mockResponse = {
-        id: "reportId",
-        date: new Date().toISOString(),
-        organizationId: organizationId as OrganizationId,
-        reportData: "encryptedReportData",
-        contentEncryptionKey: "encryptionKey",
-      } as GetRiskInsightsReportResponse;
-
-      const decryptedReport = {
-        data: [{ foo: "bar" }],
-      };
-      mockRiskInsightsApiService.getRiskInsightsReport$.mockReturnValue(of(mockResponse));
-      mockRiskInsightsEncryptionService.decryptRiskInsightsReport.mockResolvedValue(
-        decryptedReport,
-      );
-
-      const reportSubjectSpy = jest.spyOn((service as any).riskInsightsReportSubject, "next");
-
-      service.getRiskInsightsReport(organizationId, userId);
-
-      // Wait for all microtasks to complete
-      await Promise.resolve();
-
-      expect(mockRiskInsightsEncryptionService.decryptRiskInsightsReport).toHaveBeenCalledWith(
-        organizationId,
-        userId,
-        expect.anything(),
-        expect.anything(),
-        expect.any(Function),
-      );
-      expect(reportSubjectSpy).toHaveBeenCalledWith(decryptedReport.data);
-    });
-  });
-});
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.ts
deleted file mode 100644
index 1839e89a1ae..00000000000
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.ts
+++ /dev/null
@@ -1,620 +0,0 @@
-// FIXME: Update this file to be type safe
-// @ts-strict-ignore
-import {
-  BehaviorSubject,
-  concatMap,
-  first,
-  firstValueFrom,
-  forkJoin,
-  from,
-  map,
-  Observable,
-  of,
-  switchMap,
-  zip,
-} from "rxjs";
-
-import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-
-import {
-  flattenMemberDetails,
-  getApplicationReportDetail,
-  getFlattenedCipherDetails,
-  getMemberDetailsFlat,
-  getTrimmedCipherUris,
-  getUniqueMembers,
-} from "../helpers/risk-insights-data-mappers";
-import {
-  LEGACY_CipherHealthReportDetail,
-  LEGACY_CipherHealthReportUriDetail,
-  LEGACY_MemberDetailsFlat,
-  LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher,
-} from "../models/password-health";
-import {
-  ApplicationHealthReportDetail,
-  OrganizationReportSummary,
-  AtRiskApplicationDetail,
-  AtRiskMemberDetail,
-  CipherHealthReport,
-  MemberDetails,
-  PasswordHealthData,
-  RiskInsightsReportData,
-} from "../models/report-models";
-
-import { MemberCipherDetailsApiService } from "./member-cipher-details-api.service";
-import { PasswordHealthService } from "./password-health.service";
-import { RiskInsightsApiService } from "./risk-insights-api.service";
-import { RiskInsightsEncryptionService } from "./risk-insights-encryption.service";
-
-export class RiskInsightsReportService {
-  private riskInsightsReportSubject = new BehaviorSubject<ApplicationHealthReportDetail[]>([]);
-  riskInsightsReport$ = this.riskInsightsReportSubject.asObservable();
-
-  private riskInsightsSummarySubject = new BehaviorSubject<OrganizationReportSummary>({
-    totalMemberCount: 0,
-    totalAtRiskMemberCount: 0,
-    totalApplicationCount: 0,
-    totalAtRiskApplicationCount: 0,
-    totalCriticalMemberCount: 0,
-    totalCriticalAtRiskMemberCount: 0,
-    totalCriticalApplicationCount: 0,
-    totalCriticalAtRiskApplicationCount: 0,
-    newApplications: [],
-  });
-  riskInsightsSummary$ = this.riskInsightsSummarySubject.asObservable();
-
-  // [FIXME] CipherData
-  // Cipher data
-  // private _ciphersSubject = new BehaviorSubject<CipherView[] | null>(null);
-  // _ciphers$ = this._ciphersSubject.asObservable();
-
-  constructor(
-    private cipherService: CipherService,
-    private memberCipherDetailsApiService: MemberCipherDetailsApiService,
-    private riskInsightsApiService: RiskInsightsApiService,
-    private riskInsightsEncryptionService: RiskInsightsEncryptionService,
-    private passwordHealthService: PasswordHealthService,
-  ) {}
-
-  // [FIXME] CipherData
-  // async loadCiphersForOrganization(organizationId: OrganizationId): Promise<void> {
-  //   await this.cipherService.getAllFromApiForOrganization(organizationId).then((ciphers) => {
-  //     this._ciphersSubject.next(ciphers);
-  //   });
-  // }
-
-  /**
-   * Report data from raw cipher health data.
-   * Can be used in the Raw Data diagnostic tab (just exclude the members in the view)
-   * and can be used in the raw data + members tab when including the members in the view
-   * @param organizationId
-   * @returns Cipher health report data with members and trimmed uris
-   */
-  LEGACY_generateRawDataReport$(
-    organizationId: OrganizationId,
-  ): Observable<LEGACY_CipherHealthReportDetail[]> {
-    const allCiphers$ = from(this.cipherService.getAllFromApiForOrganization(organizationId));
-    const memberCiphers$ = from(
-      this.memberCipherDetailsApiService.getMemberCipherDetails(organizationId),
-    );
-
-    const results$ = zip(allCiphers$, memberCiphers$).pipe(
-      map(([allCiphers, memberCiphers]) => {
-        const details: LEGACY_MemberDetailsFlat[] = memberCiphers.flatMap((dtl) =>
-          dtl.cipherIds.map((c) => getMemberDetailsFlat(dtl.userGuid, dtl.userName, dtl.email, c)),
-        );
-        return [allCiphers, details] as const;
-      }),
-      concatMap(([ciphers, flattenedDetails]) =>
-        this.LEGACY_getCipherDetails(ciphers, flattenedDetails),
-      ),
-      first(),
-    );
-
-    return results$;
-  }
-
-  /**
-   * Report data for raw cipher health broken out into the uris
-   * Can be used in the raw data + members + uri diagnostic report
-   * @param organizationId Id of the organization
-   * @returns Cipher health report data flattened to the uris
-   */
-  generateRawDataUriReport$(
-    organizationId: OrganizationId,
-  ): Observable<LEGACY_CipherHealthReportUriDetail[]> {
-    const cipherHealthDetails$ = this.LEGACY_generateRawDataReport$(organizationId);
-    const results$ = cipherHealthDetails$.pipe(
-      map((healthDetails) => this.getCipherUriDetails(healthDetails)),
-      first(),
-    );
-
-    return results$;
-  }
-
-  /**
-   * Report data for the aggregation of uris to like uris and getting password/member counts,
-   * members, and at risk statuses.
-   * @param organizationId Id of the organization
-   * @returns The all applications health report data
-   */
-  LEGACY_generateApplicationsReport$(
-    organizationId: OrganizationId,
-  ): Observable<ApplicationHealthReportDetail[]> {
-    const cipherHealthUriReport$ = this.generateRawDataUriReport$(organizationId);
-    const results$ = cipherHealthUriReport$.pipe(
-      map((uriDetails) => this.LEGACY_getApplicationHealthReport(uriDetails)),
-      first(),
-    );
-
-    return results$;
-  }
-
-  /**
-   * Report data for the aggregation of uris to like uris and getting password/member counts,
-   * members, and at risk statuses.
-   * @param organizationId Id of the organization
-   * @returns The all applications health report data
-   */
-  generateApplicationsReport$(
-    organizationId: OrganizationId,
-  ): Observable<ApplicationHealthReportDetail[]> {
-    const allCiphers$ = from(this.cipherService.getAllFromApiForOrganization(organizationId));
-    const memberCiphers$ = from(
-      this.memberCipherDetailsApiService.getMemberCipherDetails(organizationId),
-    ).pipe(map((memberCiphers) => flattenMemberDetails(memberCiphers)));
-
-    return forkJoin([allCiphers$, memberCiphers$]).pipe(
-      switchMap(([ciphers, memberCiphers]) => this._getCipherDetails(ciphers, memberCiphers)),
-      map((cipherApplications) => {
-        const groupedByApplication = this._groupCiphersByApplication(cipherApplications);
-
-        return Array.from(groupedByApplication.entries()).map(([application, ciphers]) =>
-          this._getApplicationHealthReport(application, ciphers),
-        );
-      }),
-    );
-  }
-
-  /**
-   * Generates a list of members with at-risk passwords along with the number of at-risk passwords.
-   */
-  generateAtRiskMemberList(
-    cipherHealthReportDetails: ApplicationHealthReportDetail[],
-  ): AtRiskMemberDetail[] {
-    const memberRiskMap = new Map<string, number>();
-
-    cipherHealthReportDetails.forEach((app) => {
-      app.atRiskMemberDetails.forEach((member) => {
-        if (memberRiskMap.has(member.email)) {
-          memberRiskMap.set(member.email, memberRiskMap.get(member.email) + 1);
-        } else {
-          memberRiskMap.set(member.email, 1);
-        }
-      });
-    });
-
-    return Array.from(memberRiskMap.entries()).map(([email, atRiskPasswordCount]) => ({
-      email,
-      atRiskPasswordCount,
-    }));
-  }
-
-  generateAtRiskApplicationList(
-    cipherHealthReportDetails: ApplicationHealthReportDetail[],
-  ): AtRiskApplicationDetail[] {
-    const appsRiskMap = new Map<string, number>();
-
-    cipherHealthReportDetails
-      .filter((app) => app.atRiskPasswordCount > 0)
-      .forEach((app) => {
-        if (appsRiskMap.has(app.applicationName)) {
-          appsRiskMap.set(
-            app.applicationName,
-            appsRiskMap.get(app.applicationName) + app.atRiskPasswordCount,
-          );
-        } else {
-          appsRiskMap.set(app.applicationName, app.atRiskPasswordCount);
-        }
-      });
-
-    return Array.from(appsRiskMap.entries()).map(([applicationName, atRiskPasswordCount]) => ({
-      applicationName,
-      atRiskPasswordCount,
-    }));
-  }
-
-  /**
-   * Gets the summary from the application health report. Returns total members and applications as well
-   * as the total at risk members and at risk applications
-   * @param reports The previously calculated application health report data
-   * @returns A summary object containing report totals
-   */
-  generateApplicationsSummary(reports: ApplicationHealthReportDetail[]): OrganizationReportSummary {
-    const totalMembers = reports.flatMap((x) => x.memberDetails);
-    const uniqueMembers = getUniqueMembers(totalMembers);
-
-    const atRiskMembers = reports.flatMap((x) => x.atRiskMemberDetails);
-    const uniqueAtRiskMembers = getUniqueMembers(atRiskMembers);
-
-    // TODO: totalCriticalMemberCount, totalCriticalAtRiskMemberCount, totalCriticalApplicationCount, totalCriticalAtRiskApplicationCount, and newApplications will be handled with future logic implementation
-    return {
-      totalMemberCount: uniqueMembers.length,
-      totalCriticalMemberCount: 0,
-      totalAtRiskMemberCount: uniqueAtRiskMembers.length,
-      totalCriticalAtRiskMemberCount: 0,
-      totalApplicationCount: reports.length,
-      totalCriticalApplicationCount: 0,
-      totalAtRiskApplicationCount: reports.filter((app) => app.atRiskPasswordCount > 0).length,
-      totalCriticalAtRiskApplicationCount: 0,
-      newApplications: [],
-    };
-  }
-
-  async identifyCiphers(
-    data: ApplicationHealthReportDetail[],
-    organizationId: OrganizationId,
-  ): Promise<LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher[]> {
-    const cipherViews = await this.cipherService.getAllFromApiForOrganization(organizationId);
-
-    const dataWithCiphers = data.map(
-      (app, index) =>
-        ({
-          ...app,
-          ciphers: cipherViews.filter((c) => app.cipherIds.some((a) => a === c.id)),
-        }) as LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher,
-    );
-    return dataWithCiphers;
-  }
-
-  getRiskInsightsReport(organizationId: OrganizationId, userId: UserId): void {
-    this.riskInsightsApiService
-      .getRiskInsightsReport$(organizationId)
-      .pipe(
-        switchMap((response) => {
-          if (!response) {
-            // Return an empty report and summary if response is falsy
-            return of<RiskInsightsReportData>({
-              data: [],
-              summary: {
-                totalMemberCount: 0,
-                totalAtRiskMemberCount: 0,
-                totalApplicationCount: 0,
-                totalAtRiskApplicationCount: 0,
-                totalCriticalMemberCount: 0,
-                totalCriticalAtRiskMemberCount: 0,
-                totalCriticalApplicationCount: 0,
-                totalCriticalAtRiskApplicationCount: 0,
-                newApplications: [],
-              },
-            });
-          }
-          return from(
-            this.riskInsightsEncryptionService.decryptRiskInsightsReport<RiskInsightsReportData>(
-              organizationId,
-              userId,
-              new EncString(response.reportData),
-              new EncString(response.contentEncryptionKey),
-              (data) => data as RiskInsightsReportData,
-            ),
-          );
-        }),
-      )
-      .subscribe({
-        next: (decryptRiskInsightsReport) => {
-          this.riskInsightsReportSubject.next(decryptRiskInsightsReport.data);
-          this.riskInsightsSummarySubject.next(decryptRiskInsightsReport.summary);
-        },
-      });
-  }
-
-  async saveRiskInsightsReport(
-    organizationId: OrganizationId,
-    userId: UserId,
-    report: ApplicationHealthReportDetail[],
-  ): Promise<void> {
-    const riskReport = {
-      data: report,
-    };
-
-    const encryptedReport = await this.riskInsightsEncryptionService.encryptRiskInsightsReport(
-      organizationId,
-      userId,
-      riskReport,
-    );
-
-    const saveRequest = {
-      data: {
-        organizationId: organizationId,
-        date: new Date().toISOString(),
-        reportData: encryptedReport.encryptedData,
-        reportKey: encryptedReport.encryptionKey,
-      },
-    };
-
-    const response = await firstValueFrom(
-      this.riskInsightsApiService.saveRiskInsightsReport$(saveRequest, organizationId),
-    );
-
-    if (response && response.id) {
-      this.riskInsightsReportSubject.next(report);
-    }
-  }
-
-  /**
-   * Associates the members with the ciphers they have access to. Calculates the password health.
-   * Finds the trimmed uris.
-   * @param ciphers Org ciphers
-   * @param memberDetails Org members
-   * @returns Cipher password health data with trimmed uris and associated members
-   */
-  private async LEGACY_getCipherDetails(
-    ciphers: CipherView[],
-    memberDetails: LEGACY_MemberDetailsFlat[],
-  ): Promise<LEGACY_CipherHealthReportDetail[]> {
-    const cipherHealthReports: LEGACY_CipherHealthReportDetail[] = [];
-    const passwordUseMap = new Map<string, number>();
-    const exposedDetails = await firstValueFrom(
-      this.passwordHealthService.auditPasswordLeaks$(ciphers),
-    );
-    for (const cipher of ciphers) {
-      if (this.passwordHealthService.isValidCipher(cipher)) {
-        const weakPassword = this.passwordHealthService.findWeakPasswordDetails(cipher);
-        // Looping over all ciphers needs to happen first to determine reused passwords over all ciphers.
-        // Store in the set and evaluate later
-        if (passwordUseMap.has(cipher.login.password)) {
-          passwordUseMap.set(
-            cipher.login.password,
-            (passwordUseMap.get(cipher.login.password) || 0) + 1,
-          );
-        } else {
-          passwordUseMap.set(cipher.login.password, 1);
-        }
-
-        const exposedPassword = exposedDetails.find((x) => x.cipherId === cipher.id);
-
-        // Get the cipher members
-        const cipherMembers = memberDetails.filter((x) => x.cipherId === cipher.id);
-
-        // Trim uris to host name and create the cipher health report
-        const cipherTrimmedUris = getTrimmedCipherUris(cipher);
-        const cipherHealth = {
-          ...cipher,
-          weakPasswordDetail: weakPassword,
-          exposedPasswordDetail: exposedPassword,
-          cipherMembers: cipherMembers,
-          trimmedUris: cipherTrimmedUris,
-        } as LEGACY_CipherHealthReportDetail;
-
-        cipherHealthReports.push(cipherHealth);
-      }
-    }
-
-    // loop for reused passwords
-    cipherHealthReports.forEach((detail) => {
-      detail.reusedPasswordCount = passwordUseMap.get(detail.login.password) ?? 0;
-    });
-    return cipherHealthReports;
-  }
-
-  /**
-   * Flattens the cipher to trimmed uris. Used for the raw data + uri
-   * @param cipherHealthReport Cipher health report with uris and members
-   * @returns Flattened cipher health details to uri
-   */
-  private getCipherUriDetails(
-    cipherHealthReport: LEGACY_CipherHealthReportDetail[],
-  ): LEGACY_CipherHealthReportUriDetail[] {
-    return cipherHealthReport.flatMap((rpt) =>
-      rpt.trimmedUris.map((u) => getFlattenedCipherDetails(rpt, u)),
-    );
-  }
-
-  /**
-   * Loop through the flattened cipher to uri data. If the item exists it's values need to be updated with the new item.
-   * If the item is new, create and add the object with the flattened details
-   * @param cipherHealthUriReport Cipher and password health info broken out into their uris
-   * @returns Application health reports
-   */
-  private LEGACY_getApplicationHealthReport(
-    cipherHealthUriReport: LEGACY_CipherHealthReportUriDetail[],
-  ): ApplicationHealthReportDetail[] {
-    const appReports: ApplicationHealthReportDetail[] = [];
-    cipherHealthUriReport.forEach((uri) => {
-      const index = appReports.findIndex((item) => item.applicationName === uri.trimmedUri);
-
-      let atRisk: boolean = false;
-      if (uri.exposedPasswordDetail || uri.weakPasswordDetail || uri.reusedPasswordCount > 1) {
-        atRisk = true;
-      }
-
-      if (index === -1) {
-        appReports.push(getApplicationReportDetail(uri, atRisk));
-      } else {
-        appReports[index] = getApplicationReportDetail(uri, atRisk, appReports[index]);
-      }
-    });
-    return appReports;
-  }
-
-  private _buildPasswordUseMap(ciphers: CipherView[]): Map<string, number> {
-    const passwordUseMap = new Map<string, number>();
-    ciphers.forEach((cipher) => {
-      const password = cipher.login.password;
-      passwordUseMap.set(password, (passwordUseMap.get(password) || 0) + 1);
-    });
-    return passwordUseMap;
-  }
-
-  private _groupCiphersByApplication(
-    cipherHealthData: CipherHealthReport[],
-  ): Map<string, CipherHealthReport[]> {
-    const applicationMap = new Map<string, CipherHealthReport[]>();
-
-    cipherHealthData.forEach((cipher: CipherHealthReport) => {
-      cipher.applications.forEach((application) => {
-        const existingApplication = applicationMap.get(application) || [];
-        existingApplication.push(cipher);
-        applicationMap.set(application, existingApplication);
-      });
-    });
-
-    return applicationMap;
-  }
-
-  /**
-   *
-   * @param applications The list of application health report details to map ciphers to
-   * @param organizationId
-   * @returns
-   */
-  async getApplicationCipherMap(
-    applications: ApplicationHealthReportDetail[],
-    organizationId: OrganizationId,
-  ): Promise<Map<string, CipherView[]>> {
-    // [FIXME] CipherData
-    // This call is made multiple times. We can optimize this
-    // by loading the ciphers once via a load method to avoid multiple API calls
-    // for the same organization
-    const allCiphers = await this.cipherService.getAllFromApiForOrganization(organizationId);
-    const cipherMap = new Map<string, CipherView[]>();
-
-    applications.forEach((app) => {
-      const filteredCiphers = allCiphers.filter((c) => app.cipherIds.includes(c.id));
-      cipherMap.set(app.applicationName, filteredCiphers);
-    });
-    return cipherMap;
-  }
-
-  // --------------------------- Aggregation methods ---------------------------
-  /**
-   * Loop through the flattened cipher to uri data. If the item exists it's values need to be updated with the new item.
-   * If the item is new, create and add the object with the flattened details
-   * @param cipherHealthReport Cipher and password health info broken out into their uris
-   * @returns Application health reports
-   */
-  private _getApplicationHealthReport(
-    application: string,
-    ciphers: CipherHealthReport[],
-  ): ApplicationHealthReportDetail {
-    let aggregatedReport: ApplicationHealthReportDetail | undefined;
-
-    ciphers.forEach((cipher) => {
-      const isAtRisk = this._isPasswordAtRisk(cipher.healthData);
-      aggregatedReport = this._aggregateReport(application, cipher, isAtRisk, aggregatedReport);
-    });
-
-    return aggregatedReport!;
-  }
-
-  private _aggregateReport(
-    application: string,
-    newCipherReport: CipherHealthReport,
-    isAtRisk: boolean,
-    existingReport?: ApplicationHealthReportDetail,
-  ): ApplicationHealthReportDetail {
-    let baseReport = existingReport
-      ? this._updateExistingReport(existingReport, newCipherReport)
-      : this._createNewReport(application, newCipherReport);
-    if (isAtRisk) {
-      baseReport = { ...baseReport, ...this._getAtRiskData(baseReport, newCipherReport) };
-    }
-
-    baseReport.memberCount = baseReport.memberDetails.length;
-    baseReport.atRiskMemberCount = baseReport.atRiskMemberDetails.length;
-
-    return baseReport;
-  }
-  private _createNewReport(
-    application: string,
-    cipherReport: CipherHealthReport,
-  ): ApplicationHealthReportDetail {
-    return {
-      applicationName: application,
-      cipherIds: [cipherReport.cipher.id],
-      passwordCount: 1,
-      memberDetails: [...cipherReport.cipherMembers],
-      memberCount: cipherReport.cipherMembers.length,
-      atRiskCipherIds: [],
-      atRiskMemberCount: 0,
-      atRiskMemberDetails: [],
-      atRiskPasswordCount: 0,
-    };
-  }
-
-  private _updateExistingReport(
-    existingReport: ApplicationHealthReportDetail,
-    newCipherReport: CipherHealthReport,
-  ): ApplicationHealthReportDetail {
-    return {
-      ...existingReport,
-      passwordCount: existingReport.passwordCount + 1,
-      memberDetails: getUniqueMembers(
-        existingReport.memberDetails.concat(newCipherReport.cipherMembers),
-      ),
-      cipherIds: existingReport.cipherIds.concat(newCipherReport.cipher.id),
-    };
-  }
-
-  private _getAtRiskData(report: ApplicationHealthReportDetail, cipherReport: CipherHealthReport) {
-    const atRiskMemberDetails = getUniqueMembers(
-      report.atRiskMemberDetails.concat(cipherReport.cipherMembers),
-    );
-    return {
-      atRiskPasswordCount: report.atRiskPasswordCount + 1,
-      atRiskCipherIds: report.atRiskCipherIds.concat(cipherReport.cipher.id),
-      atRiskMemberDetails,
-      atRiskMemberCount: atRiskMemberDetails.length,
-    };
-  }
-
-  // TODO Move to health service
-  private _isPasswordAtRisk(healthData: PasswordHealthData): boolean {
-    return !!(
-      healthData.exposedPasswordDetail ||
-      healthData.weakPasswordDetail ||
-      healthData.reusedPasswordCount > 1
-    );
-  }
-  /**
-   * Associates the members with the ciphers they have access to. Calculates the password health.
-   * Finds the trimmed uris.
-   * @param ciphers Org ciphers
-   * @param memberDetails Org members
-   * @returns Cipher password health data with trimmed uris and associated members
-   */
-  private _getCipherDetails(
-    ciphers: CipherView[],
-    memberDetails: MemberDetails[],
-  ): Observable<CipherHealthReport[]> {
-    const validCiphers = ciphers.filter((cipher) =>
-      this.passwordHealthService.isValidCipher(cipher),
-    );
-    // Build password use map
-    const passwordUseMap = this._buildPasswordUseMap(validCiphers);
-
-    return this.passwordHealthService.auditPasswordLeaks$(validCiphers).pipe(
-      map((exposedDetails) => {
-        return validCiphers.map((cipher) => {
-          const exposedPassword = exposedDetails.find((x) => x.cipherId === cipher.id);
-          const cipherMembers = memberDetails.filter((x) => x.cipherId === cipher.id);
-
-          const result = {
-            cipher: cipher,
-            cipherMembers,
-            healthData: {
-              weakPasswordDetail: this.passwordHealthService.findWeakPasswordDetails(cipher),
-              exposedPasswordDetail: exposedPassword,
-              reusedPasswordCount: passwordUseMap.get(cipher.login.password) ?? 0,
-            },
-            applications: getTrimmedCipherUris(cipher),
-          } as CipherHealthReport;
-          return result;
-        });
-      }),
-    );
-  }
-}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts
new file mode 100644
index 00000000000..2111049ce52
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts
@@ -0,0 +1,92 @@
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { BehaviorSubject } from "rxjs";
+
+import { ApplicationHealthReportDetailEnriched } from "../../models";
+import { OrganizationReportSummary } from "../../models/report-models";
+
+import { RiskInsightsDataService } from "./risk-insights-data.service";
+
+export class AllActivitiesService {
+  /// This class is used to manage the summary of all applications
+  /// and critical applications.
+  /// Going forward, this class can be simplified by using the RiskInsightsDataService
+  /// as it contains the application summary data.
+  private reportSummarySubject$ = new BehaviorSubject<OrganizationReportSummary>({
+    totalMemberCount: 0,
+    totalCriticalMemberCount: 0,
+    totalAtRiskMemberCount: 0,
+    totalCriticalAtRiskMemberCount: 0,
+    totalApplicationCount: 0,
+    totalCriticalApplicationCount: 0,
+    totalAtRiskApplicationCount: 0,
+    totalCriticalAtRiskApplicationCount: 0,
+  });
+  reportSummary$ = this.reportSummarySubject$.asObservable();
+
+  private allApplicationsDetailsSubject$: BehaviorSubject<ApplicationHealthReportDetailEnriched[]> =
+    new BehaviorSubject<ApplicationHealthReportDetailEnriched[]>([]);
+  allApplicationsDetails$ = this.allApplicationsDetailsSubject$.asObservable();
+
+  private atRiskPasswordsCountSubject$ = new BehaviorSubject<number>(0);
+  atRiskPasswordsCount$ = this.atRiskPasswordsCountSubject$.asObservable();
+
+  private extendPasswordChangeWidgetSubject$ = new BehaviorSubject<boolean>(false);
+  extendPasswordChangeWidget$ = this.extendPasswordChangeWidgetSubject$.asObservable();
+
+  constructor(private dataService: RiskInsightsDataService) {
+    // All application summary changes
+    this.dataService.enrichedReportData$.pipe(takeUntilDestroyed()).subscribe((report) => {
+      if (report) {
+        this.setAllAppsReportSummary(report.summaryData);
+        this.setAllAppsReportDetails(report.reportData);
+      }
+    });
+
+    // Critical application summary changes
+    this.dataService.criticalReportResults$.pipe(takeUntilDestroyed()).subscribe((report) => {
+      if (report) {
+        this.setCriticalAppsReportSummary(report.summaryData);
+      }
+    });
+  }
+
+  setCriticalAppsReportSummary(summary: OrganizationReportSummary) {
+    if (!summary) {
+      return;
+    }
+    this.reportSummarySubject$.next({
+      ...this.reportSummarySubject$.getValue(),
+      totalCriticalApplicationCount: summary.totalApplicationCount,
+      totalCriticalAtRiskApplicationCount: summary.totalAtRiskApplicationCount,
+      totalCriticalMemberCount: summary.totalMemberCount,
+      totalCriticalAtRiskMemberCount: summary.totalAtRiskMemberCount,
+    });
+  }
+
+  setAllAppsReportSummary(summary: OrganizationReportSummary) {
+    if (!summary) {
+      return;
+    }
+
+    this.reportSummarySubject$.next({
+      ...this.reportSummarySubject$.getValue(),
+      totalMemberCount: summary.totalMemberCount,
+      totalAtRiskMemberCount: summary.totalAtRiskMemberCount,
+      totalApplicationCount: summary.totalApplicationCount,
+      totalAtRiskApplicationCount: summary.totalAtRiskApplicationCount,
+    });
+  }
+
+  setAllAppsReportDetails(applications: ApplicationHealthReportDetailEnriched[]) {
+    const totalAtRiskPasswords = applications
+      .filter((app) => app.isMarkedAsCritical)
+      .reduce((sum, app) => sum + app.atRiskPasswordCount, 0);
+    this.atRiskPasswordsCountSubject$.next(totalAtRiskPasswords);
+
+    this.allApplicationsDetailsSubject$.next(applications);
+  }
+
+  setExtendPasswordWidget(hasProgressBar: boolean) {
+    this.extendPasswordChangeWidgetSubject$.next(hasProgressBar);
+  }
+}
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/risk-insights-data.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/risk-insights-data.service.ts
new file mode 100644
index 00000000000..d426a6b09c1
--- /dev/null
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/risk-insights-data.service.ts
@@ -0,0 +1,273 @@
+import { BehaviorSubject, firstValueFrom, Observable, of, Subject } from "rxjs";
+import { distinctUntilChanged, map } from "rxjs/operators";
+
+import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+
+import { getAtRiskApplicationList, getAtRiskMemberList } from "../../helpers";
+import {
+  ReportState,
+  DrawerDetails,
+  DrawerType,
+  RiskInsightsEnrichedData,
+  ReportStatus,
+  ReportProgress,
+  ApplicationHealthReportDetail,
+  OrganizationReportApplication,
+} from "../../models";
+import { RiskInsightsOrchestratorService } from "../domain/risk-insights-orchestrator.service";
+
+export class RiskInsightsDataService {
+  private _destroy$ = new Subject<void>();
+
+  // -------------------------- Context state --------------------------
+  // Organization the user is currently viewing
+  readonly organizationDetails$: Observable<{
+    organizationId: OrganizationId;
+    organizationName: string;
+  } | null> = of(null);
+
+  // --------------------------- UI State ------------------------------------
+  private errorSubject = new BehaviorSubject<string | null>(null);
+  error$ = this.errorSubject.asObservable();
+
+  // -------------------------- Orchestrator-driven state  -------------
+  // The full report state (for internal facade use or complex components)
+  private readonly reportState$: Observable<ReportState>;
+  readonly reportStatus$: Observable<ReportStatus> = of(ReportStatus.Initializing);
+  readonly hasReportData$: Observable<boolean> = of(false);
+  readonly enrichedReportData$: Observable<RiskInsightsEnrichedData | null> = of(null);
+  readonly isGeneratingReport$: Observable<boolean> = of(false);
+  readonly criticalReportResults$: Observable<RiskInsightsEnrichedData | null> = of(null);
+  readonly hasCiphers$: Observable<boolean | null> = of(null);
+  readonly criticalApplicationAtRiskCipherIds$: Observable<CipherId[]> = of([]);
+  readonly reportProgress$: Observable<ReportProgress | null> = of(null);
+
+  // New applications that need review (reviewedDate === null)
+  readonly newApplications$: Observable<ApplicationHealthReportDetail[]> = of([]);
+
+  // ------------------------- Drawer Variables ---------------------
+  // Drawer variables unified into a single BehaviorSubject
+  private drawerDetailsSubject = new BehaviorSubject<DrawerDetails>({
+    open: false,
+    invokerId: "",
+    activeDrawerType: DrawerType.None,
+    atRiskMemberDetails: [],
+    appAtRiskMembers: null,
+    atRiskAppDetails: null,
+  });
+  drawerDetails$ = this.drawerDetailsSubject.asObservable();
+
+  // --------------------------- Critical Application data ---------------------
+  constructor(private orchestrator: RiskInsightsOrchestratorService) {
+    this.reportState$ = this.orchestrator.rawReportData$;
+    this.isGeneratingReport$ = this.orchestrator.generatingReport$;
+    this.organizationDetails$ = this.orchestrator.organizationDetails$;
+    this.enrichedReportData$ = this.orchestrator.enrichedReportData$;
+    this.criticalReportResults$ = this.orchestrator.criticalReportResults$;
+    this.newApplications$ = this.orchestrator.newApplications$;
+    this.criticalApplicationAtRiskCipherIds$ =
+      this.orchestrator.criticalApplicationAtRiskCipherIds$;
+    this.reportProgress$ = this.orchestrator.reportProgress$;
+
+    this.hasCiphers$ = this.orchestrator.hasCiphers$.pipe(distinctUntilChanged());
+
+    // Expose the loading state
+    this.reportStatus$ = this.reportState$.pipe(
+      map((state) => state.status),
+      distinctUntilChanged(), // Prevent unnecessary component re-renders
+    );
+    this.hasReportData$ = this.reportState$.pipe(
+      map((state) => state.data != null),
+      distinctUntilChanged(),
+    );
+  }
+
+  destroy(): void {
+    this._destroy$.next();
+    this._destroy$.complete();
+  }
+
+  getCipherIcon(cipherId: string) {
+    return this.orchestrator.getCipherIcon(cipherId);
+  }
+  initializeForOrganization(organizationId: OrganizationId) {
+    this.orchestrator.initializeForOrganization(organizationId);
+  }
+
+  triggerReport(): void {
+    this.orchestrator.generateReport();
+  }
+
+  // ------------------------- Drawer functions -----------------------------
+  isActiveDrawerType = (drawerType: DrawerType): boolean => {
+    return this.drawerDetailsSubject.value.activeDrawerType === drawerType;
+  };
+
+  isDrawerOpenForInvoker = (applicationName: string): boolean => {
+    return this.drawerDetailsSubject.value.invokerId === applicationName;
+  };
+
+  closeDrawer = (): void => {
+    this.drawerDetailsSubject.next({
+      open: false,
+      invokerId: "",
+      activeDrawerType: DrawerType.None,
+      atRiskMemberDetails: [],
+      appAtRiskMembers: null,
+      atRiskAppDetails: null,
+    });
+  };
+
+  setDrawerForOrgAtRiskMembers = async (invokerId: string = ""): Promise<void> => {
+    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
+    const shouldClose =
+      open && activeDrawerType === DrawerType.OrgAtRiskMembers && currentInvokerId === invokerId;
+
+    if (shouldClose) {
+      this.closeDrawer();
+    } else {
+      const reportResults = await firstValueFrom(this.enrichedReportData$);
+      if (!reportResults) {
+        return;
+      }
+
+      const atRiskMemberDetails = getAtRiskMemberList(reportResults.reportData);
+
+      this.drawerDetailsSubject.next({
+        open: true,
+        invokerId,
+        activeDrawerType: DrawerType.OrgAtRiskMembers,
+        atRiskMemberDetails,
+        appAtRiskMembers: null,
+        atRiskAppDetails: null,
+      });
+    }
+  };
+
+  setDrawerForAppAtRiskMembers = async (invokerId: string = ""): Promise<void> => {
+    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
+    const shouldClose =
+      open && activeDrawerType === DrawerType.AppAtRiskMembers && currentInvokerId === invokerId;
+
+    if (shouldClose) {
+      this.closeDrawer();
+    } else {
+      const reportResults = await firstValueFrom(this.enrichedReportData$);
+      if (!reportResults) {
+        return;
+      }
+
+      const atRiskMembers = {
+        members:
+          reportResults.reportData.find((app) => app.applicationName === invokerId)
+            ?.atRiskMemberDetails ?? [],
+        applicationName: invokerId,
+      };
+      this.drawerDetailsSubject.next({
+        open: true,
+        invokerId,
+        activeDrawerType: DrawerType.AppAtRiskMembers,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: atRiskMembers,
+        atRiskAppDetails: null,
+      });
+    }
+  };
+
+  setDrawerForOrgAtRiskApps = async (invokerId: string = ""): Promise<void> => {
+    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
+    const shouldClose =
+      open && activeDrawerType === DrawerType.OrgAtRiskApps && currentInvokerId === invokerId;
+
+    if (shouldClose) {
+      this.closeDrawer();
+    } else {
+      const reportResults = await firstValueFrom(this.enrichedReportData$);
+      if (!reportResults) {
+        return;
+      }
+      const atRiskAppDetails = getAtRiskApplicationList(reportResults.reportData);
+
+      this.drawerDetailsSubject.next({
+        open: true,
+        invokerId,
+        activeDrawerType: DrawerType.OrgAtRiskApps,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails,
+      });
+    }
+  };
+
+  setDrawerForCriticalAtRiskMembers = async (invokerId: string = ""): Promise<void> => {
+    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
+    const shouldClose =
+      open && activeDrawerType === DrawerType.OrgAtRiskMembers && currentInvokerId === invokerId;
+
+    if (shouldClose) {
+      this.closeDrawer();
+    } else {
+      const reportResults = await firstValueFrom(this.criticalReportResults$);
+      if (!reportResults?.reportData) {
+        return;
+      }
+
+      // Generate at-risk member list from critical applications
+      const atRiskMemberDetails = getAtRiskMemberList(reportResults.reportData);
+
+      this.drawerDetailsSubject.next({
+        open: true,
+        invokerId,
+        activeDrawerType: DrawerType.OrgAtRiskMembers,
+        atRiskMemberDetails,
+        appAtRiskMembers: null,
+        atRiskAppDetails: null,
+      });
+    }
+  };
+
+  setDrawerForCriticalAtRiskApps = async (invokerId: string = ""): Promise<void> => {
+    const { open, activeDrawerType, invokerId: currentInvokerId } = this.drawerDetailsSubject.value;
+    const shouldClose =
+      open && activeDrawerType === DrawerType.OrgAtRiskApps && currentInvokerId === invokerId;
+
+    if (shouldClose) {
+      this.closeDrawer();
+    } else {
+      const reportResults = await firstValueFrom(this.criticalReportResults$);
+      if (!reportResults?.reportData) {
+        return;
+      }
+
+      // Filter critical applications for those with at-risk passwords
+      const criticalAtRiskApps = reportResults.reportData
+        .filter((app) => app.atRiskPasswordCount > 0)
+        .map((app) => ({
+          applicationName: app.applicationName,
+          atRiskPasswordCount: app.atRiskPasswordCount,
+        }));
+
+      this.drawerDetailsSubject.next({
+        open: true,
+        invokerId,
+        activeDrawerType: DrawerType.OrgAtRiskApps,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: criticalAtRiskApps,
+      });
+    }
+  };
+
+  // ------------------------------ Critical application methods --------------
+  saveCriticalApplications(selectedUrls: string[]) {
+    return this.orchestrator.saveCriticalApplications$(selectedUrls);
+  }
+
+  removeCriticalApplication(hostname: string) {
+    return this.orchestrator.removeCriticalApplication$(hostname);
+  }
+
+  saveApplicationReviewStatus(selectedCriticalApps: OrganizationReportApplication[]) {
+    return this.orchestrator.saveApplicationReviewStatus$(selectedCriticalApps);
+  }
+}
diff --git a/bitwarden_license/bit-common/src/platform/sdk/sdk-alias.d.ts b/bitwarden_license/bit-common/src/platform/sdk/sdk-alias.d.ts
new file mode 100644
index 00000000000..0453c01368c
--- /dev/null
+++ b/bitwarden_license/bit-common/src/platform/sdk/sdk-alias.d.ts
@@ -0,0 +1,7 @@
+declare module "@bitwarden/sdk-internal" {
+  // In `bit-*` clients the commercial sdk replaces the regular internal sdk,
+  // this file creates an alias so that typescript understands that.
+  // The actual replacement is done in the build system via webpack's resolve.alias.
+  // eslint-disable-next-line no-restricted-imports
+  export * from "@bitwarden/commercial-sdk-internal";
+}
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
index 258a112e234..3c2adb46193 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
@@ -24,6 +24,8 @@ import { KeyService } from "@bitwarden/key-management";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-device-approvals",
   templateUrl: "./device-approvals.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts
index 970a476df22..e3e5a927369 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts
@@ -22,6 +22,8 @@ export interface DomainAddEditDialogData {
   existingDomainNames: Array<string>;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "domain-add-edit-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
index 3bc916d3fc5..bfe382f930e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
@@ -33,6 +33,8 @@ import {
   DomainAddEditDialogData,
 } from "./domain-add-edit-dialog/domain-add-edit-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-manage-domain-verification",
   templateUrl: "domain-verification.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts
index de870cdbdcb..9e7f35a8475 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts
@@ -21,6 +21,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-org-manage-scim",
   templateUrl: "scim.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
index 0ee78e59312..08ee8bb3b1f 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
@@ -8,7 +8,7 @@ import { organizationPermissionsGuard } from "@bitwarden/web-vault/app/admin-con
 import { OrganizationLayoutComponent } from "@bitwarden/web-vault/app/admin-console/organizations/layouts/organization-layout.component";
 import { deepLinkGuard } from "@bitwarden/web-vault/app/auth/guards/deep-link/deep-link.guard";
 
-import { SsoComponent } from "../../auth/sso/sso.component";
+import { SsoManageComponent } from "../../auth/sso/sso-manage.component";
 
 import { DomainVerificationComponent } from "./manage/domain-verification/domain-verification.component";
 import { ScimComponent } from "./manage/scim.component";
@@ -33,7 +33,7 @@ const routes: Routes = [
           },
           {
             path: "sso",
-            component: SsoComponent,
+            component: SsoManageComponent,
             canActivate: [organizationPermissionsGuard((org) => org.canManageSso)],
             data: {
               titleId: "singleSignOn",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts
index 9fce712e325..6f36856e08d 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from "@angular/core";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
 
-import { SsoComponent } from "../../auth/sso/sso.component";
+import { SsoManageComponent } from "../../auth/sso/sso-manage.component";
 
 import { DomainAddEditDialogComponent } from "./manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component";
 import { DomainVerificationComponent } from "./manage/domain-verification/domain-verification.component";
@@ -13,7 +13,7 @@ import { OrganizationsRoutingModule } from "./organizations-routing.module";
 @NgModule({
   imports: [SharedModule, OrganizationsRoutingModule, HeaderModule],
   declarations: [
-    SsoComponent,
+    SsoManageComponent,
     ScimComponent,
     DomainVerificationComponent,
     DomainAddEditDialogComponent,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.ts
index 17efc017136..c32eb3d935b 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/activate-autofill.component.ts
@@ -21,6 +21,8 @@ export class ActivateAutofillPolicy extends BasePolicyEditDefinition {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "activate-autofill.component.html",
   imports: [SharedModule],
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.ts
index 7dadc04c6f4..eb82dce4383 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/automatic-app-login.component.ts
@@ -11,12 +11,14 @@ import {
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
 export class AutomaticAppLoginPolicy extends BasePolicyEditDefinition {
-  name = "automaticAppLogin";
-  description = "automaticAppLoginDesc";
+  name = "automaticAppLoginWithSSO";
+  description = "automaticAppLoginWithSSODesc";
   type = PolicyType.AutomaticAppLogIn;
   component = AutomaticAppLoginPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "automatic-app-login.component.html",
   imports: [SharedModule],
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/block-claimed-domain-account-creation.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/block-claimed-domain-account-creation.component.html
new file mode 100644
index 00000000000..17225905995
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/block-claimed-domain-account-creation.component.html
@@ -0,0 +1,15 @@
+<bit-callout type="info" title="{{ 'prerequisite' | i18n }}">
+  {{ "blockClaimedDomainAccountCreationPrerequisite" | i18n }}
+  <a
+    bitLink
+    href="https://bitwarden.com/help/domain-verification/"
+    target="_blank"
+    rel="noreferrer"
+    >{{ "learnMore" | i18n }}</a
+  >
+</bit-callout>
+
+<bit-form-control>
+  <input type="checkbox" id="enabled" bitCheckbox [formControl]="enabled" />
+  <bit-label>{{ "turnOn" | i18n }}</bit-label>
+</bit-form-control>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/block-claimed-domain-account-creation.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/block-claimed-domain-account-creation.component.ts
new file mode 100644
index 00000000000..5e2925aa0bb
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/block-claimed-domain-account-creation.component.ts
@@ -0,0 +1,32 @@
+import { ChangeDetectionStrategy, 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 {
+  BasePolicyEditDefinition,
+  BasePolicyEditComponent,
+} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+export class BlockClaimedDomainAccountCreationPolicy extends BasePolicyEditDefinition {
+  name = "blockClaimedDomainAccountCreation";
+  description = "blockClaimedDomainAccountCreationDesc";
+  type = PolicyType.BlockClaimedDomainAccountCreation;
+  component = BlockClaimedDomainAccountCreationPolicyComponent;
+
+  override display$(organization: Organization, configService: ConfigService): Observable<boolean> {
+    return configService
+      .getFeatureFlag$(FeatureFlag.BlockClaimedDomainAccountCreation)
+      .pipe(map((enabled) => enabled && organization.useOrganizationDomains));
+  }
+}
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  templateUrl: "block-claimed-domain-account-creation.component.html",
+  imports: [SharedModule],
+})
+export class BlockClaimedDomainAccountCreationPolicyComponent extends BasePolicyEditComponent {}
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/disable-personal-vault-export.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/disable-personal-vault-export.component.ts
index d93fb50b0e2..17e8eb055b5 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/disable-personal-vault-export.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/disable-personal-vault-export.component.ts
@@ -14,6 +14,8 @@ export class DisablePersonalVaultExportPolicy extends BasePolicyEditDefinition {
   component = DisablePersonalVaultExportPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "disable-personal-vault-export.component.html",
   imports: [SharedModule],
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/index.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/index.ts
index 8c4be2eeea1..b03f3680422 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/index.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/index.ts
@@ -1,4 +1,4 @@
 export { ActivateAutofillPolicy } from "./activate-autofill.component";
 export { AutomaticAppLoginPolicy } from "./automatic-app-login.component";
+export { BlockClaimedDomainAccountCreationPolicy } from "./block-claimed-domain-account-creation.component";
 export { DisablePersonalVaultExportPolicy } from "./disable-personal-vault-export.component";
-export { MaximumVaultTimeoutPolicy } from "./maximum-vault-timeout.component";
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.html b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.html
deleted file mode 100644
index deb72cfb3b5..00000000000
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<bit-callout title="{{ 'prerequisite' | i18n }}">
-  {{ "requireSsoPolicyReq" | i18n }}
-</bit-callout>
-
-<bit-form-control>
-  <input type="checkbox" id="enabled" bitCheckbox [formControl]="enabled" />
-  <bit-label>{{ "turnOn" | i18n }}</bit-label>
-</bit-form-control>
-
-<div [formGroup]="data">
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-    <bit-form-field class="tw-col-span-6 !tw-mb-0">
-      <bit-label>{{ "maximumVaultTimeoutLabel" | i18n }}</bit-label>
-      <input bitInput type="number" min="0" formControlName="hours" />
-      <bit-hint>{{ "hours" | i18n }}</bit-hint>
-    </bit-form-field>
-    <bit-form-field class="tw-col-span-6 tw-self-end !tw-mb-0">
-      <input bitInput type="number" min="0" max="59" formControlName="minutes" />
-      <bit-hint>{{ "minutes" | i18n }}</bit-hint>
-    </bit-form-field>
-    <bit-form-field class="tw-col-span-6">
-      <bit-label>{{ "vaultTimeoutAction" | i18n }}</bit-label>
-      <bit-select formControlName="action">
-        <bit-option
-          *ngFor="let option of vaultTimeoutActionOptions"
-          [value]="option.value"
-          [label]="option.name"
-        ></bit-option>
-      </bit-select>
-    </bit-form-field>
-  </div>
-</div>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.ts
deleted file mode 100644
index 160ce9aeb20..00000000000
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-definitions/maximum-vault-timeout.component.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component } from "@angular/core";
-import { FormBuilder, FormControl } from "@angular/forms";
-
-import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
-import { VaultTimeoutAction } from "@bitwarden/common/key-management/vault-timeout";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import {
-  BasePolicyEditDefinition,
-  BasePolicyEditComponent,
-} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
-import { SharedModule } from "@bitwarden/web-vault/app/shared";
-
-export class MaximumVaultTimeoutPolicy extends BasePolicyEditDefinition {
-  name = "maximumVaultTimeout";
-  description = "maximumVaultTimeoutDesc";
-  type = PolicyType.MaximumVaultTimeout;
-  component = MaximumVaultTimeoutPolicyComponent;
-}
-
-@Component({
-  templateUrl: "maximum-vault-timeout.component.html",
-  imports: [SharedModule],
-})
-export class MaximumVaultTimeoutPolicyComponent extends BasePolicyEditComponent {
-  vaultTimeoutActionOptions: { name: string; value: string }[];
-  data = this.formBuilder.group({
-    hours: new FormControl<number>(null),
-    minutes: new FormControl<number>(null),
-    action: new FormControl<string>(null),
-  });
-
-  constructor(
-    private formBuilder: FormBuilder,
-    private i18nService: I18nService,
-  ) {
-    super();
-    this.vaultTimeoutActionOptions = [
-      { name: i18nService.t("userPreference"), value: null },
-      { name: i18nService.t(VaultTimeoutAction.Lock), value: VaultTimeoutAction.Lock },
-      { name: i18nService.t(VaultTimeoutAction.LogOut), value: VaultTimeoutAction.LogOut },
-    ];
-  }
-
-  protected loadData() {
-    const minutes = this.policyResponse.data?.minutes;
-    const action = this.policyResponse.data?.action;
-
-    this.data.patchValue({
-      hours: minutes ? Math.floor(minutes / 60) : null,
-      minutes: minutes ? minutes % 60 : null,
-      action: action,
-    });
-  }
-
-  protected buildRequestData() {
-    if (this.data.value.hours == null && this.data.value.minutes == null) {
-      return null;
-    }
-
-    return {
-      minutes: this.data.value.hours * 60 + this.data.value.minutes,
-      action: this.data.value.action,
-    };
-  }
-
-  async buildRequest(): Promise<PolicyRequest> {
-    const request = await super.buildRequest();
-    if (request.data?.minutes == null || request.data?.minutes <= 0) {
-      throw new Error(this.i18nService.t("invalidMaximumVaultTimeout"));
-    }
-
-    return request;
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-register.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-register.ts
index 3438e706f10..c2a31d936b8 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-register.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/policy-edit-register.ts
@@ -4,12 +4,13 @@ import {
 } from "@bitwarden/web-vault/app/admin-console/organizations/policies";
 
 import { FreeFamiliesSponsorshipPolicy } from "../../billing/policies/free-families-sponsorship.component";
+import { SessionTimeoutPolicy } from "../../key-management/policies/session-timeout.component";
 
 import {
   ActivateAutofillPolicy,
   AutomaticAppLoginPolicy,
+  BlockClaimedDomainAccountCreationPolicy,
   DisablePersonalVaultExportPolicy,
-  MaximumVaultTimeoutPolicy,
 } from "./policy-edit-definitions";
 
 /**
@@ -18,11 +19,12 @@ import {
  * It will not appear in the web vault when running in OSS mode.
  */
 const policyEditRegister: BasePolicyEditDefinition[] = [
-  new MaximumVaultTimeoutPolicy(),
+  new SessionTimeoutPolicy(),
   new DisablePersonalVaultExportPolicy(),
   new FreeFamiliesSponsorshipPolicy(),
   new ActivateAutofillPolicy(),
   new AutomaticAppLoginPolicy(),
+  new BlockClaimedDomainAccountCreationPolicy(),
 ];
 
 export const bitPolicyEditRegister = ossPolicyEditRegister.concat(policyEditRegister);
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-existing-organization-dialog.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-existing-organization-dialog.component.html
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-existing-organization-dialog.component.ts
similarity index 81%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-existing-organization-dialog.component.ts
index f0eda893d67..8ce8153b36e 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/add-existing-organization-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-existing-organization-dialog.component.ts
@@ -1,8 +1,11 @@
 import { Component, Inject, OnInit } from "@angular/core";
+import { firstValueFrom } from "rxjs";
 
 import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { AddableOrganizationResponse } from "@bitwarden/common/admin-console/models/response/addable-organization.response";
+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 {
   DIALOG_DATA,
@@ -12,7 +15,7 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
-import { WebProviderService } from "../../../admin-console/providers/services/web-provider.service";
+import { WebProviderService } from "../services/web-provider.service";
 
 export type AddExistingOrganizationDialogParams = {
   provider: Provider;
@@ -25,6 +28,8 @@ export enum AddExistingOrganizationDialogResultType {
   Submitted = "submitted",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./add-existing-organization-dialog.component.html",
   standalone: false,
@@ -44,6 +49,7 @@ export class AddExistingOrganizationDialogComponent implements OnInit {
     private providerApiService: ProviderApiServiceAbstraction,
     private toastService: ToastService,
     private webProviderService: WebProviderService,
+    private accountService: AccountService,
   ) {}
 
   async ngOnInit() {
@@ -55,9 +61,11 @@ export class AddExistingOrganizationDialogComponent implements OnInit {
 
   addExistingOrganization = async (): Promise<void> => {
     if (this.selectedOrganization) {
-      await this.webProviderService.addOrganizationToProviderVNext(
+      const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+      await this.webProviderService.addOrganizationToProvider(
         this.dialogParams.provider.id,
         this.selectedOrganization.id,
+        userId,
       );
 
       this.toastService.showToast({
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html
deleted file mode 100644
index 82e412c2ef6..00000000000
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<bit-dialog [loading]="loading">
-  <span bitDialogTitle>{{ "addExistingOrganization" | i18n }}</span>
-  <ng-container bitDialogContent>
-    <bit-table>
-      <ng-template body>
-        <tr bitRow *ngFor="let o of data.organizations">
-          <td bitCell width="30">
-            <bit-avatar [text]="o.name" [id]="o.id" size="small"></bit-avatar>
-          </td>
-          <td bitCell>
-            {{ o.name }}
-          </td>
-          <td bitCell>
-            <button
-              type="button"
-              bitButton
-              [bitAction]="add(o, provider$ | async)"
-              class="tw-float-right"
-            >
-              Add
-            </button>
-          </td>
-        </tr>
-      </ng-template>
-    </bit-table>
-  </ng-container>
-  <ng-container bitDialogFooter>
-    <button type="button" bitButton bitDialogClose>
-      {{ "close" | i18n }}
-    </button>
-  </ng-container>
-</bit-dialog>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
deleted file mode 100644
index 4f4b85e544b..00000000000
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, Inject, OnInit } from "@angular/core";
-import { Observable, switchMap } from "rxjs";
-
-import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { DIALOG_DATA, DialogRef, DialogService, ToastService } from "@bitwarden/components";
-
-import { WebProviderService } from "../services/web-provider.service";
-
-interface AddOrganizationDialogData {
-  providerId: string;
-  organizations: Organization[];
-}
-
-@Component({
-  templateUrl: "add-organization.component.html",
-  standalone: false,
-})
-export class AddOrganizationComponent implements OnInit {
-  protected provider$: Observable<Provider>;
-  protected loading = true;
-
-  constructor(
-    private dialogRef: DialogRef,
-    @Inject(DIALOG_DATA) protected data: AddOrganizationDialogData,
-    private providerService: ProviderService,
-    private webProviderService: WebProviderService,
-    private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
-    private validationService: ValidationService,
-    private dialogService: DialogService,
-    private toastService: ToastService,
-    private accountService: AccountService,
-  ) {}
-
-  async ngOnInit() {
-    await this.load();
-  }
-
-  async load() {
-    if (this.data.providerId == null) {
-      return;
-    }
-
-    this.provider$ = this.accountService.activeAccount$.pipe(
-      getUserId,
-      switchMap((userId) => this.providerService.get$(this.data.providerId, userId)),
-    );
-
-    this.loading = false;
-  }
-
-  add(organization: Organization, provider: Provider) {
-    return async () => {
-      const confirmed = await this.dialogService.openSimpleDialog({
-        title: organization.name,
-        content: {
-          key: "addOrganizationConfirmation",
-          placeholders: [organization.name, provider.name],
-        },
-        type: "warning",
-      });
-
-      if (!confirmed) {
-        return false;
-      }
-
-      try {
-        await this.webProviderService.addOrganizationToProvider(
-          this.data.providerId,
-          organization.id,
-        );
-      } catch (e) {
-        this.validationService.showError(e);
-        return;
-      }
-
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("organizationJoinedProvider"),
-      });
-
-      this.dialogRef.close(true);
-    };
-  }
-
-  static open(dialogService: DialogService, data: AddOrganizationDialogData) {
-    return dialogService.open<boolean, AddOrganizationDialogData>(AddOrganizationComponent, {
-      data,
-    });
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
deleted file mode 100644
index 8f740384305..00000000000
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
+++ /dev/null
@@ -1,78 +0,0 @@
-@let isAdminOrServiceUser = isAdminOrServiceUser$ | async;
-<app-header>
-  <bit-search
-    class="tw-grow"
-    [formControl]="searchControl"
-    [placeholder]="'search' | i18n"
-  ></bit-search>
-  <a bitButton routerLink="create" *ngIf="isAdminOrServiceUser" buttonType="primary">
-    <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-    {{ "newClient" | i18n }}
-  </a>
-  <button
-    type="button"
-    bitButton
-    (click)="addExistingOrganization()"
-    *ngIf="isAdminOrServiceUser && showAddExisting"
-  >
-    <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-    {{ "addExistingOrganization" | i18n }}
-  </button>
-</app-header>
-
-<ng-container *ngIf="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>
-
-<ng-container *ngIf="!loading">
-  <p *ngIf="dataSource.data.length < 1">{{ "noClientsInList" | i18n }}</p>
-  <ng-container *ngIf="dataSource.data.length >= 1">
-    <bit-table-scroll [dataSource]="dataSource" [rowSize]="53" class="tw-table tw-w-full">
-      <ng-container header>
-        <th bitCell colspan="2" bitSortable="organizationName">{{ "name" | i18n }}</th>
-        <th bitCell bitSortable="seats">{{ "numberOfUsers" | i18n }}</th>
-        <th bitCell bitSortable="plan">{{ "billingPlan" | i18n }}</th>
-      </ng-container>
-      <ng-template bitRowDef let-row>
-        <td bitCell width="30">
-          <bit-avatar [text]="row.organizationName" [id]="row.id" size="small"></bit-avatar>
-        </td>
-        <td bitCell width="320">
-          <a [routerLink]="['/organizations', row.organizationId]">{{ row.organizationName }}</a>
-        </td>
-        <td bitCell width="700">
-          <span>{{ row.userCount }}</span>
-          <span *ngIf="row.seats != null"> / {{ row.seats }}</span>
-        </td>
-        <td bitCell width="250" class="tw-flex tw-flex-row tw-items-center">
-          <span>{{ row.plan }}</span>
-          <div appListDropdown>
-            <button
-              *ngIf="isAdminOrServiceUser"
-              [bitMenuTriggerFor]="removeMenu"
-              bitMenuItem
-              buttonType="secondary"
-              type="button"
-              appA11yTitle="{{ 'options' | i18n }}"
-            >
-              <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
-            </button>
-            <bit-menu #removeMenu>
-              <button bitMenuItem type="button" appStopClick (click)="remove(row)">
-                <span class="tw-text-danger">
-                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
-                  {{ "remove" | i18n }}
-                </span>
-              </button>
-            </bit-menu>
-          </div>
-        </td>
-      </ng-template>
-    </bit-table-scroll>
-  </ng-container>
-</ng-container>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
deleted file mode 100644
index 6d0b52b05d6..00000000000
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { FormControl } from "@angular/forms";
-import { ActivatedRoute, Router, RouterModule } from "@angular/router";
-import { combineLatest, firstValueFrom, from, map, Observable, switchMap } from "rxjs";
-import { debounceTime, first } from "rxjs/operators";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { ProviderStatusType, ProviderUserType } from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { PlanType } from "@bitwarden/common/billing/enums";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import {
-  AvatarModule,
-  DialogService,
-  TableDataSource,
-  TableModule,
-  ToastService,
-} from "@bitwarden/components";
-import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console/organizations/shared";
-import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
-
-import { WebProviderService } from "../services/web-provider.service";
-
-import { AddOrganizationComponent } from "./add-organization.component";
-
-const DisallowedPlanTypes = [
-  PlanType.Free,
-  PlanType.FamiliesAnnually2019,
-  PlanType.FamiliesAnnually,
-  PlanType.TeamsStarter2023,
-  PlanType.TeamsStarter,
-];
-
-@Component({
-  templateUrl: "clients.component.html",
-  imports: [
-    SharedOrganizationModule,
-    HeaderModule,
-    CommonModule,
-    JslibModule,
-    AvatarModule,
-    RouterModule,
-    TableModule,
-  ],
-})
-export class ClientsComponent {
-  addableOrganizations: Organization[] = [];
-  loading = true;
-  showAddExisting = false;
-  dataSource: TableDataSource<ProviderOrganizationOrganizationDetailsResponse> =
-    new TableDataSource();
-  protected searchControl = new FormControl("", { nonNullable: true });
-
-  protected providerId$: Observable<string> =
-    this.activatedRoute.parent?.params.pipe(map((params) => params.providerId as string)) ??
-    new Observable();
-
-  protected provider$ = combineLatest([
-    this.providerId$,
-    this.accountService.activeAccount$.pipe(getUserId),
-  ]).pipe(switchMap(([providerId, userId]) => this.providerService.get$(providerId, userId)));
-
-  protected isAdminOrServiceUser$ = this.provider$.pipe(
-    map(
-      (provider) =>
-        provider?.type === ProviderUserType.ProviderAdmin ||
-        provider?.type === ProviderUserType.ServiceUser,
-    ),
-  );
-
-  constructor(
-    private router: Router,
-    private providerService: ProviderService,
-    private apiService: ApiService,
-    private organizationService: OrganizationService,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    private accountService: AccountService,
-    private activatedRoute: ActivatedRoute,
-    private dialogService: DialogService,
-    private i18nService: I18nService,
-    private toastService: ToastService,
-    private validationService: ValidationService,
-    private webProviderService: WebProviderService,
-  ) {
-    this.activatedRoute.queryParams.pipe(first(), takeUntilDestroyed()).subscribe((queryParams) => {
-      this.searchControl.setValue(queryParams.search);
-    });
-
-    this.provider$
-      .pipe(
-        map((provider) => {
-          if (provider?.providerStatus === ProviderStatusType.Billable) {
-            return from(
-              this.router.navigate(["../manage-client-organizations"], {
-                relativeTo: this.activatedRoute,
-              }),
-            );
-          }
-          return from(this.load());
-        }),
-        takeUntilDestroyed(),
-      )
-      .subscribe();
-
-    this.searchControl.valueChanges
-      .pipe(debounceTime(200), takeUntilDestroyed())
-      .subscribe((searchText) => {
-        this.dataSource.filter = (data) =>
-          data.organizationName.toLowerCase().indexOf(searchText.toLowerCase()) > -1;
-      });
-  }
-
-  async remove(organization: ProviderOrganizationOrganizationDetailsResponse) {
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: organization.organizationName,
-      content: { key: "detachOrganizationConfirmation" },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return;
-    }
-
-    try {
-      const providerId = await firstValueFrom(this.providerId$);
-      await this.webProviderService.detachOrganization(providerId, organization.id);
-      this.toastService.showToast({
-        variant: "success",
-        title: "",
-        message: this.i18nService.t("detachedOrganization", organization.organizationName),
-      });
-      await this.load();
-    } catch (e) {
-      this.validationService.showError(e);
-    }
-  }
-
-  async load() {
-    const providerId = await firstValueFrom(this.providerId$);
-    const response = await this.apiService.getProviderClients(providerId);
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const clients = response.data != null && response.data.length > 0 ? response.data : [];
-    this.dataSource.data = clients;
-    const candidateOrgs = (
-      await firstValueFrom(this.organizationService.organizations$(userId))
-    ).filter((o) => o.isOwner && o.providerId == null);
-    const allowedOrgsIds = await Promise.all(
-      candidateOrgs.map((o) => this.organizationApiService.get(o.id)),
-    ).then((orgs) =>
-      orgs.filter((o) => !DisallowedPlanTypes.includes(o.planType)).map((o) => o.id),
-    );
-    this.addableOrganizations = candidateOrgs.filter((o) => allowedOrgsIds.includes(o.id));
-
-    this.showAddExisting = this.addableOrganizations.length !== 0;
-    this.loading = false;
-  }
-
-  async addExistingOrganization() {
-    const providerId = await firstValueFrom(this.providerId$);
-    const dialogRef = AddOrganizationComponent.open(this.dialogService, {
-      providerId: providerId,
-      organizations: this.addableOrganizations,
-    });
-
-    if (await firstValueFrom(dialogRef.closed)) {
-      await this.load();
-    }
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-client-dialog.component.html
similarity index 91%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-client-dialog.component.html
index c11b23db9fb..fc3d4e9e628 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-client-dialog.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog dialogSize="large" [loading]="loading">
-    <span bitDialogTitle class="tw-font-semibold">
+    <span bitDialogTitle class="tw-font-medium">
       {{ "newClientOrganization" | i18n }}
     </span>
     <div bitDialogContent>
@@ -22,16 +22,16 @@
             <div class="tw-relative">
               <div
                 *ngIf="planCard.selected"
-                class="tw-bg-primary-600 tw-text-center !tw-text-contrast tw-text-sm tw-font-bold tw-py-1 group-hover/plan-card-container:tw-bg-primary-700"
+                class="tw-bg-primary-600 tw-text-center !tw-text-contrast tw-text-sm tw-font-medium tw-py-1 group-hover/plan-card-container:tw-bg-primary-700"
               >
                 {{ "selected" | i18n }}
               </div>
               <div class="tw-pl-5 tw-py-4 tw-pr-4" [ngClass]="{ 'tw-pt-10': !planCard.selected }">
-                <h3 class="tw-text-2xl tw-font-bold tw-uppercase">{{ planCard.name }}</h3>
-                <span class="tw-text-2xl tw-font-semibold">{{
+                <h3 class="tw-text-2xl tw-font-medium tw-uppercase">{{ planCard.name }}</h3>
+                <span class="tw-text-2xl tw-font-medium">{{
                   planCard.getMonthlyCost() | currency: "$"
                 }}</span>
-                <span class="tw-text-sm tw-font-bold"
+                <span class="tw-text-sm tw-font-medium"
                   >/ {{ planCard.getTimePerMemberLabel() | i18n }}</span
                 >
               </div>
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-client-dialog.component.ts
similarity index 97%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-client-dialog.component.ts
index 2d6a0a75509..917ccf58e46 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-client-dialog.component.ts
@@ -17,7 +17,7 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
-import { WebProviderService } from "../../../admin-console/providers/services/web-provider.service";
+import { WebProviderService } from "../services/web-provider.service";
 
 type CreateClientDialogParams = {
   providerId: string;
@@ -100,6 +100,8 @@ export class PlanCard {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./create-client-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.html
deleted file mode 100644
index 1aa720b0485..00000000000
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<app-header [title]="'newClientOrganization' | i18n"></app-header>
-<p>{{ "newClientOrganizationDesc" | i18n }}</p>
-<app-organization-plans [providerId]="providerId"></app-organization-plans>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts
deleted file mode 100644
index 9f3582f84bb..00000000000
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnInit, ViewChild } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-
-import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
-
-@Component({
-  selector: "app-create-organization",
-  templateUrl: "create-organization.component.html",
-  standalone: false,
-})
-export class CreateOrganizationComponent implements OnInit {
-  @ViewChild(OrganizationPlansComponent, { static: true })
-  orgPlansComponent: OrganizationPlansComponent;
-
-  providerId: string;
-
-  constructor(private route: ActivatedRoute) {}
-
-  ngOnInit() {
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.route.parent.params.subscribe(async (params) => {
-      this.providerId = params.providerId;
-    });
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-name-dialog.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-name-dialog.component.html
similarity index 93%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-name-dialog.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-name-dialog.component.html
index 6d7d4b2f18d..bc4b4674201 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-name-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-name-dialog.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog>
-    <span bitDialogTitle class="tw-font-semibold">
+    <span bitDialogTitle class="tw-font-medium">
       {{ "updateName" | i18n }}
       <small class="tw-text-muted">{{ dialogParams.organization.name }}</small>
     </span>
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-name-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-name-dialog.component.ts
similarity index 78%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-name-dialog.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-name-dialog.component.ts
index 06d1f80c101..7e093fdad9b 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-name-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-name-dialog.component.ts
@@ -3,8 +3,8 @@
 import { Component, Inject } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
-import { UpdateClientOrganizationRequest } from "@bitwarden/common/billing/models/request/update-client-organization.request";
+import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
+import { UpdateProviderOrganizationRequest } from "@bitwarden/common/admin-console/models/request/update-provider-organization.request";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
   DIALOG_DATA,
@@ -39,6 +39,8 @@ export const openManageClientNameDialog = (
     dialogConfig,
   );
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "manage-client-name-dialog.component.html",
   standalone: false,
@@ -51,7 +53,7 @@ export class ManageClientNameDialogComponent {
 
   constructor(
     @Inject(DIALOG_DATA) protected dialogParams: ManageClientNameDialogParams,
-    private billingApiService: BillingApiServiceAbstraction,
+    private providerApiService: ProviderApiServiceAbstraction,
     private dialogRef: DialogRef<ManageClientNameDialogResultType>,
     private formBuilder: FormBuilder,
     private i18nService: I18nService,
@@ -65,11 +67,11 @@ export class ManageClientNameDialogComponent {
       return;
     }
 
-    const request = new UpdateClientOrganizationRequest();
+    const request = new UpdateProviderOrganizationRequest();
     request.assignedSeats = this.dialogParams.organization.seats;
     request.name = this.formGroup.value.name;
 
-    await this.billingApiService.updateProviderClientOrganization(
+    await this.providerApiService.updateProviderOrganization(
       this.dialogParams.providerId,
       this.dialogParams.organization.id,
       request,
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-subscription-dialog.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-subscription-dialog.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-subscription-dialog.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-subscription-dialog.component.html
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-subscription-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-subscription-dialog.component.ts
similarity index 91%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-subscription-dialog.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-subscription-dialog.component.ts
index 71e549b563b..9e74a91a4c0 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-client-subscription-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-client-subscription-dialog.component.ts
@@ -3,11 +3,12 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from "@angular/forms";
 
+import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
 import { ProviderUserType } from "@bitwarden/common/admin-console/enums";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
+import { UpdateProviderOrganizationRequest } from "@bitwarden/common/admin-console/models/request/update-provider-organization.request";
 import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-import { UpdateClientOrganizationRequest } from "@bitwarden/common/billing/models/request/update-client-organization.request";
 import { ProviderPlanResponse } from "@bitwarden/common/billing/models/response/provider-subscription-response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
@@ -34,6 +35,8 @@ export const openManageClientSubscriptionDialog = (
     ManageClientSubscriptionDialogParams
   >(ManageClientSubscriptionDialogComponent, dialogConfig);
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./manage-client-subscription-dialog.component.html",
   standalone: false,
@@ -56,6 +59,7 @@ export class ManageClientSubscriptionDialogComponent implements OnInit {
 
   constructor(
     private billingApiService: BillingApiServiceAbstraction,
+    private providerApiService: ProviderApiServiceAbstraction,
     @Inject(DIALOG_DATA) protected dialogParams: ManageClientSubscriptionDialogParams,
     private dialogRef: DialogRef<ManageClientSubscriptionDialogResultType>,
     private i18nService: I18nService,
@@ -99,11 +103,11 @@ export class ManageClientSubscriptionDialogComponent implements OnInit {
     }
 
     try {
-      const request = new UpdateClientOrganizationRequest();
+      const request = new UpdateProviderOrganizationRequest();
       request.assignedSeats = this.formGroup.value.assignedSeats;
       request.name = this.dialogParams.organization.organizationName;
 
-      await this.billingApiService.updateProviderClientOrganization(
+      await this.providerApiService.updateProviderOrganization(
         this.dialogParams.provider.id,
         this.dialogParams.organization.id,
         request,
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-clients.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-clients.component.html
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-clients.component.ts
similarity index 86%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-clients.component.ts
index 9933c316869..eed3db87396 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/manage-clients.component.ts
@@ -1,25 +1,21 @@
-import { Component } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { Component, OnDestroy, OnInit } from "@angular/core";
 import { FormControl } from "@angular/forms";
-import { ActivatedRoute, Router } from "@angular/router";
+import { ActivatedRoute } from "@angular/router";
 import {
   firstValueFrom,
-  from,
   lastValueFrom,
   map,
   combineLatest,
   switchMap,
   Observable,
+  Subject,
+  takeUntil,
 } from "rxjs";
 import { debounceTime, first } from "rxjs/operators";
 
+import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import {
-  ProviderStatusType,
-  ProviderType,
-  ProviderUserType,
-} from "@bitwarden/common/admin-console/enums";
-import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
+import { ProviderType, ProviderUserType } from "@bitwarden/common/admin-console/enums";
 import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
@@ -40,7 +36,7 @@ import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console
 import { BillingNotificationService } from "@bitwarden/web-vault/app/billing/services/billing-notification.service";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 
-import { WebProviderService } from "../../../admin-console/providers/services/web-provider.service";
+import { WebProviderService } from "../services/web-provider.service";
 
 import {
   AddExistingOrganizationDialogComponent,
@@ -61,6 +57,8 @@ import {
 import { NoClientsComponent } from "./no-clients.component";
 import { ReplacePipe } from "./replace.pipe";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "manage-clients.component.html",
   imports: [
@@ -72,7 +70,7 @@ import { ReplacePipe } from "./replace.pipe";
     ReplacePipe,
   ],
 })
-export class ManageClientsComponent {
+export class ManageClientsComponent implements OnInit, OnDestroy {
   loading = true;
   dataSource: TableDataSource<ProviderOrganizationOrganizationDetailsResponse> =
     new TableDataSource();
@@ -117,10 +115,11 @@ export class ManageClientsComponent {
     ),
   );
 
+  private destroy$ = new Subject<void>();
+
   constructor(
     private billingApiService: BillingApiServiceAbstraction,
     private providerService: ProviderService,
-    private router: Router,
     private activatedRoute: ActivatedRoute,
     private dialogService: DialogService,
     private i18nService: I18nService,
@@ -130,35 +129,31 @@ export class ManageClientsComponent {
     private billingNotificationService: BillingNotificationService,
     private configService: ConfigService,
     private accountService: AccountService,
-  ) {
-    this.activatedRoute.queryParams.pipe(first(), takeUntilDestroyed()).subscribe((queryParams) => {
-      this.searchControl.setValue(queryParams.search);
-    });
+    private providerApiService: ProviderApiServiceAbstraction,
+  ) {}
 
-    this.provider$
-      .pipe(
-        map((provider: Provider | undefined) => {
-          if (provider?.providerStatus !== ProviderStatusType.Billable) {
-            return from(
-              this.router.navigate(["../clients"], {
-                relativeTo: this.activatedRoute,
-              }),
-            );
-          }
-          return from(this.load());
-        }),
-        takeUntilDestroyed(),
-      )
-      .subscribe();
+  async ngOnInit() {
+    this.activatedRoute.queryParams
+      .pipe(first(), takeUntil(this.destroy$))
+      .subscribe((queryParams) => {
+        this.searchControl.setValue(queryParams.search);
+      });
+
+    await this.load();
 
     this.searchControl.valueChanges
-      .pipe(debounceTime(200), takeUntilDestroyed())
+      .pipe(debounceTime(200), takeUntil(this.destroy$))
       .subscribe((searchText) => {
         this.dataSource.filter = (data) =>
           data.organizationName.toLowerCase().indexOf(searchText.toLowerCase()) > -1;
       });
   }
 
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
   async load() {
     try {
       const providerId = await firstValueFrom(this.providerId$);
@@ -170,7 +165,7 @@ export class ManageClientsComponent {
         this.newClientButtonLabel = this.i18nService.t("newBusinessUnit");
       }
       this.dataSource.data = (
-        await this.billingApiService.getProviderClientOrganizations(providerId)
+        await this.providerApiService.getProviderOrganizations(providerId)
       ).data;
       this.plans = (await this.billingApiService.getPlans()).data;
       this.loading = false;
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/no-clients.component.ts
similarity index 65%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/no-clients.component.ts
index ed11eb8ef0a..f78e8ae38f2 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/no-clients.component.ts
@@ -4,6 +4,8 @@ import { GearIcon } from "@bitwarden/assets/svg";
 import { NoItemsModule } from "@bitwarden/components";
 import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console/organizations/shared";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-no-clients",
   imports: [SharedOrganizationModule, NoItemsModule],
@@ -27,8 +29,14 @@ import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console
 })
 export class NoClientsComponent {
   icon = GearIcon;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showAddOrganizationButton = true;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disableAddOrganizationButton = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() addNewOrganizationClicked = new EventEmitter();
 
   addNewOrganization = () => this.addNewOrganizationClicked.emit();
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/replace.pipe.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/replace.pipe.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/billing/providers/clients/replace.pipe.ts
rename to bitwarden_license/bit-web/src/app/admin-console/providers/clients/replace.pipe.ts
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html
index 3892892a9c6..bc209ead2bd 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html
@@ -18,7 +18,7 @@
 <div *ngIf="!loading && !authed">
   <p bitTypography="body1" class="tw-text-center">
     {{ providerName }}
-    <span bitTypography="body1" class="tw-font-bold">{{ email }}</span>
+    <span bitTypography="body1" class="tw-font-medium">{{ email }}</span>
   </p>
   <p bitTypography="body1">{{ "joinProviderDesc" | i18n }}</p>
   <hr />
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
index 9f28ba87186..b673dfd1b14 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
@@ -11,6 +11,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-accept-provider",
   templateUrl: "accept-provider.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/add-edit-member-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/add-edit-member-dialog.component.ts
index e21837f7226..635aaf16b3f 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/add-edit-member-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/add-edit-member-dialog.component.ts
@@ -33,6 +33,8 @@ export enum AddEditMemberDialogResultType {
   Saved = "saved",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "add-edit-member-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-confirm-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-confirm-dialog.component.ts
index 8bbc299269d..7ade77ed01b 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-confirm-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-confirm-dialog.component.ts
@@ -1,6 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, Inject } from "@angular/core";
+import { firstValueFrom, map, Observable, switchMap } from "rxjs";
 
 import {
   OrganizationUserBulkPublicKeyResponse,
@@ -12,10 +13,14 @@ import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/admin-console/
 import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request";
 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 { 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 { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { ProviderId } from "@bitwarden/common/types/guid";
+import { ProviderKey } from "@bitwarden/common/types/key";
 import { DIALOG_DATA, DialogConfig, DialogService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 import { BaseBulkConfirmComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/base-bulk-confirm.component";
@@ -26,6 +31,8 @@ type BulkConfirmDialogParams = {
   users: BulkUserDetails[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl:
     "../../../../../../../../apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm-dialog.component.html",
@@ -33,6 +40,7 @@ type BulkConfirmDialogParams = {
 })
 export class BulkConfirmDialogComponent extends BaseBulkConfirmComponent {
   providerId: string;
+  providerKey$: Observable<ProviderKey>;
 
   constructor(
     private apiService: ApiService,
@@ -40,15 +48,21 @@ export class BulkConfirmDialogComponent extends BaseBulkConfirmComponent {
     protected encryptService: EncryptService,
     @Inject(DIALOG_DATA) protected dialogParams: BulkConfirmDialogParams,
     protected i18nService: I18nService,
+    private accountService: AccountService,
   ) {
     super(keyService, encryptService, i18nService);
 
     this.providerId = dialogParams.providerId;
+    this.providerKey$ = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) => this.keyService.providerKeys$(userId)),
+      map((providerKeysById) => providerKeysById?.[this.providerId as ProviderId]),
+    );
     this.users = dialogParams.users;
   }
 
-  protected getCryptoKey = (): Promise<SymmetricCryptoKey> =>
-    this.keyService.getProviderKey(this.providerId);
+  protected getCryptoKey = async (): Promise<SymmetricCryptoKey> =>
+    await firstValueFrom(this.providerKey$);
 
   protected getPublicKeys = async (): Promise<
     ListResponse<OrganizationUserBulkPublicKeyResponse | ProviderUserBulkPublicKeyResponse>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-remove-dialog.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-remove-dialog.component.ts
index e000d918414..29b50f71c1b 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-remove-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/bulk-remove-dialog.component.ts
@@ -16,6 +16,8 @@ type BulkRemoveDialogParams = {
   users: BulkUserDetails[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl:
     "../../../../../../../../apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts
index 43fc958585a..3d00d897175 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts
@@ -20,6 +20,8 @@ import { BaseEventsComponent } from "@bitwarden/web-vault/app/admin-console/comm
 import { EventService } from "@bitwarden/web-vault/app/core";
 import { EventExportService } from "@bitwarden/web-vault/app/tools/event-export";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "provider-events",
   templateUrl: "events.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
index 07ccd997b96..e0b29dffeb8 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
@@ -67,7 +67,7 @@
                 (change)="dataSource.checkAllFilteredUsers($any($event.target).checked)"
                 id="selectAll"
               />
-              <label class="tw-mb-0 !tw-font-bold !tw-text-muted" for="selectAll">
+              <label class="tw-mb-0 !tw-font-medium !tw-text-muted" for="selectAll">
                 {{ "all" | i18n }}
               </label>
             </th>
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 affcfce9c17..268a82ac12f 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
@@ -4,7 +4,7 @@ import { Component } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute, Router } from "@angular/router";
 import { combineLatest, firstValueFrom, lastValueFrom, switchMap } from "rxjs";
-import { first } from "rxjs/operators";
+import { first, map } from "rxjs/operators";
 
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -16,11 +16,13 @@ import { ProviderUserConfirmRequest } from "@bitwarden/common/admin-console/mode
 import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { assertNonNullish } from "@bitwarden/common/auth/utils";
 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 { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+import { ProviderId } from "@bitwarden/common/types/guid";
 import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 import { BaseMembersComponent } from "@bitwarden/web-vault/app/admin-console/common/base-members.component";
@@ -30,6 +32,7 @@ import {
 } from "@bitwarden/web-vault/app/admin-console/common/people-table-data-source";
 import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 import { BulkStatusComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-status.component";
+import { MemberActionResult } from "@bitwarden/web-vault/app/admin-console/organizations/members/services/member-actions/member-actions.service";
 
 import {
   AddEditMemberDialogComponent,
@@ -45,6 +48,8 @@ class MembersTableDataSource extends PeopleTableDataSource<ProviderUser> {
   protected statusType = ProviderUserStatusType;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "members.component.html",
   standalone: false,
@@ -199,16 +204,35 @@ export class MembersComponent extends BaseMembersComponent<ProviderUser> {
     await this.load();
   }
 
-  async confirmUser(user: ProviderUser, publicKey: Uint8Array): Promise<void> {
-    const providerKey = await this.keyService.getProviderKey(this.providerId);
-    const key = await this.encryptService.encapsulateKeyUnsigned(providerKey, publicKey);
-    const request = new ProviderUserConfirmRequest();
-    request.key = key.encryptedString;
-    await this.apiService.postProviderUserConfirm(this.providerId, user.id, request);
+  async confirmUser(user: ProviderUser, publicKey: Uint8Array): Promise<MemberActionResult> {
+    try {
+      const providerKey = await firstValueFrom(
+        this.accountService.activeAccount$.pipe(
+          getUserId,
+          switchMap((userId) => this.keyService.providerKeys$(userId)),
+          map((providerKeys) => providerKeys?.[this.providerId as ProviderId] ?? null),
+        ),
+      );
+      assertNonNullish(providerKey, "Provider key not found");
+
+      const key = await this.encryptService.encapsulateKeyUnsigned(providerKey, publicKey);
+      const request = new ProviderUserConfirmRequest();
+      request.key = key.encryptedString;
+      await this.apiService.postProviderUserConfirm(this.providerId, user.id, request);
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
   }
 
-  removeUser = (id: string): Promise<void> =>
-    this.apiService.deleteProviderUser(this.providerId, id);
+  removeUser = async (id: string): Promise<MemberActionResult> => {
+    try {
+      await this.apiService.deleteProviderUser(this.providerId, id);
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  };
 
   edit = async (user: ProviderUser | null): Promise<void> => {
     const data: AddEditMemberDialogParams = {
@@ -251,6 +275,12 @@ export class MembersComponent extends BaseMembersComponent<ProviderUser> {
   getUsers = (): Promise<ListResponse<ProviderUser>> =>
     this.apiService.getProviderUsers(this.providerId);
 
-  reinviteUser = (id: string): Promise<void> =>
-    this.apiService.postProviderUserReinvite(this.providerId, id);
+  reinviteUser = async (id: string): Promise<MemberActionResult> => {
+    try {
+      await this.apiService.postProviderUserReinvite(this.providerId, id);
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  };
 }
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
index 31e56836375..ab4aaa6bd69 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
@@ -9,7 +9,7 @@
     <bit-nav-item
       icon="bwi-provider"
       [text]="clientsTranslationKey$ | async | i18n"
-      [route]="(isBillable | async) ? 'manage-client-organizations' : 'clients'"
+      route="clients"
     >
       <i
         *ngIf="!provider.enabled && (providerPortalTakeover$ | async)"
@@ -39,12 +39,7 @@
       *ngIf="canAccessBilling$ | async"
     >
       <bit-nav-item [text]="'subscription' | i18n" route="billing/subscription"></bit-nav-item>
-      @if (managePaymentDetailsOutsideCheckout$ | async) {
-        <bit-nav-item
-          [text]="'paymentDetails' | i18n"
-          route="billing/payment-details"
-        ></bit-nav-item>
-      }
+      <bit-nav-item [text]="'paymentDetails' | i18n" route="billing/payment-details"></bit-nav-item>
       <bit-nav-item [text]="'billingHistory' | i18n" route="billing/history"></bit-nav-item>
     </bit-nav-group>
     <bit-nav-item
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 f3e7a9f442e..2e0cf2163a4 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
@@ -9,7 +9,7 @@ import { takeUntil } from "rxjs/operators";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { BusinessUnitPortalLogo, Icon, ProviderPortalLogo } from "@bitwarden/assets/svg";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { ProviderStatusType, ProviderType } from "@bitwarden/common/admin-console/enums";
+import { ProviderType } from "@bitwarden/common/admin-console/enums";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
@@ -23,6 +23,8 @@ import { WebLayoutModule } from "@bitwarden/web-vault/app/layouts/web-layout.mod
 
 import { ProviderWarningsService } from "../../billing/providers/warnings/services";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "providers-layout",
   templateUrl: "providers-layout.component.html",
@@ -43,11 +45,9 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
 
   protected logo$: Observable<Icon>;
 
-  protected isBillable: Observable<boolean>;
   protected canAccessBilling$: Observable<boolean>;
 
   protected clientsTranslationKey$: Observable<string>;
-  protected managePaymentDetailsOutsideCheckout$: Observable<boolean>;
   protected providerPortalTakeover$: Observable<boolean>;
 
   protected subscriber$: Observable<NonIndividualSubscriber>;
@@ -84,15 +84,7 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
       ),
     );
 
-    this.isBillable = this.provider$.pipe(
-      map((provider) => provider?.providerStatus === ProviderStatusType.Billable),
-    );
-
-    this.canAccessBilling$ = combineLatest([this.isBillable, this.provider$]).pipe(
-      map(
-        ([hasConsolidatedBilling, provider]) => hasConsolidatedBilling && provider.isProviderAdmin,
-      ),
-    );
+    this.canAccessBilling$ = this.provider$.pipe(map((provider) => provider.isProviderAdmin));
 
     this.clientsTranslationKey$ = this.provider$.pipe(
       map((provider) =>
@@ -100,10 +92,6 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
       ),
     );
 
-    this.managePaymentDetailsOutsideCheckout$ = this.configService.getFeatureFlag$(
-      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-    );
-
     this.provider$
       .pipe(
         switchMap((provider) =>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
index 7a554275f08..cf0dbe05d07 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
@@ -7,17 +7,12 @@ import { AnonLayoutWrapperComponent } from "@bitwarden/components";
 import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component";
 import { UserLayoutComponent } from "@bitwarden/web-vault/app/layouts/user-layout.component";
 
-import {
-  ManageClientsComponent,
-  ProviderSubscriptionComponent,
-  hasConsolidatedBilling,
-  ProviderBillingHistoryComponent,
-} from "../../billing/providers";
+import { ProviderBillingHistoryComponent } from "../../billing/providers/billing-history/provider-billing-history.component";
 import { ProviderPaymentDetailsComponent } from "../../billing/providers/payment-details/provider-payment-details.component";
 import { SetupBusinessUnitComponent } from "../../billing/providers/setup/setup-business-unit.component";
+import { ProviderSubscriptionComponent } from "../../billing/providers/subscription/provider-subscription.component";
 
-import { ClientsComponent } from "./clients/clients.component";
-import { CreateOrganizationComponent } from "./clients/create-organization.component";
+import { ManageClientsComponent } from "./clients/manage-clients.component";
 import { providerPermissionsGuard } from "./guards/provider-permissions.guard";
 import { AcceptProviderComponent } from "./manage/accept-provider.component";
 import { EventsComponent } from "./manage/events.component";
@@ -88,14 +83,7 @@ const routes: Routes = [
         canActivate: [providerPermissionsGuard()],
         children: [
           { path: "", pathMatch: "full", redirectTo: "clients" },
-          { path: "clients/create", component: CreateOrganizationComponent },
-          { path: "clients", component: ClientsComponent, data: { titleId: "clients" } },
-          {
-            path: "manage-client-organizations",
-            canActivate: [hasConsolidatedBilling],
-            component: ManageClientsComponent,
-            data: { titleId: "clients" },
-          },
+          { path: "clients", component: ManageClientsComponent, data: { titleId: "clients" } },
           {
             path: "manage",
             children: [
@@ -128,7 +116,7 @@ const routes: Routes = [
           },
           {
             path: "billing",
-            canActivate: [hasConsolidatedBilling],
+            canActivate: [providerPermissionsGuard()],
             children: [
               {
                 path: "",
@@ -138,7 +126,6 @@ const routes: Routes = [
               {
                 path: "subscription",
                 component: ProviderSubscriptionComponent,
-                canActivate: [providerPermissionsGuard()],
                 data: {
                   titleId: "subscription",
                 },
@@ -146,7 +133,6 @@ const routes: Routes = [
               {
                 path: "payment-details",
                 component: ProviderPaymentDetailsComponent,
-                canActivate: [providerPermissionsGuard()],
                 data: {
                   titleId: "paymentDetails",
                 },
@@ -154,7 +140,6 @@ const routes: Routes = [
               {
                 path: "history",
                 component: ProviderBillingHistoryComponent,
-                canActivate: [providerPermissionsGuard()],
                 data: {
                   titleId: "billingHistory",
                 },
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.component.ts
index d13ac863437..aa79ec7e29e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.component.ts
@@ -10,6 +10,8 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-providers",
   templateUrl: "providers.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
index 263b90f5b32..92b16699b7e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
@@ -7,24 +7,24 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { CardComponent, ScrollLayoutDirective, SearchModule } from "@bitwarden/components";
 import { DangerZoneComponent } from "@bitwarden/web-vault/app/auth/settings/account/danger-zone.component";
 import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
-import { PaymentComponent } from "@bitwarden/web-vault/app/billing/shared/payment/payment.component";
-import { VerifyBankAccountComponent } from "@bitwarden/web-vault/app/billing/shared/verify-bank-account/verify-bank-account.component";
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+} from "@bitwarden/web-vault/app/billing/payment/components";
 import { OssModule } from "@bitwarden/web-vault/app/oss.module";
 
-import {
-  CreateClientDialogComponent,
-  ManageClientNameDialogComponent,
-  ManageClientSubscriptionDialogComponent,
-  ProviderBillingHistoryComponent,
-  ProviderSubscriptionComponent,
-  ProviderSubscriptionStatusComponent,
-} from "../../billing/providers";
-import { AddExistingOrganizationDialogComponent } from "../../billing/providers/clients/add-existing-organization-dialog.component";
+import { InvoicesComponent } from "../../billing/providers/billing-history/invoices.component";
+import { NoInvoicesComponent } from "../../billing/providers/billing-history/no-invoices.component";
+import { ProviderBillingHistoryComponent } from "../../billing/providers/billing-history/provider-billing-history.component";
 import { SetupBusinessUnitComponent } from "../../billing/providers/setup/setup-business-unit.component";
+import { ProviderSubscriptionStatusComponent } from "../../billing/providers/subscription/provider-subscription-status.component";
+import { ProviderSubscriptionComponent } from "../../billing/providers/subscription/provider-subscription.component";
 import { ProviderWarningsModule } from "../../billing/providers/warnings/provider-warnings.module";
 
-import { AddOrganizationComponent } from "./clients/add-organization.component";
-import { CreateOrganizationComponent } from "./clients/create-organization.component";
+import { AddExistingOrganizationDialogComponent } from "./clients/add-existing-organization-dialog.component";
+import { CreateClientDialogComponent } from "./clients/create-client-dialog.component";
+import { ManageClientNameDialogComponent } from "./clients/manage-client-name-dialog.component";
+import { ManageClientSubscriptionDialogComponent } from "./clients/manage-client-subscription-dialog.component";
 import { AcceptProviderComponent } from "./manage/accept-provider.component";
 import { AddEditMemberDialogComponent } from "./manage/dialogs/add-edit-member-dialog.component";
 import { BulkConfirmDialogComponent } from "./manage/dialogs/bulk-confirm-dialog.component";
@@ -52,19 +52,17 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr
     ProvidersLayoutComponent,
     DangerZoneComponent,
     ScrollingModule,
-    VerifyBankAccountComponent,
     CardComponent,
     ScrollLayoutDirective,
-    PaymentComponent,
     ProviderWarningsModule,
+    EnterPaymentMethodComponent,
+    EnterBillingAddressComponent,
   ],
   declarations: [
     AcceptProviderComponent,
     AccountComponent,
-    AddOrganizationComponent,
     BulkConfirmDialogComponent,
     BulkRemoveDialogComponent,
-    CreateOrganizationComponent,
     EventsComponent,
     MembersComponent,
     SetupComponent,
@@ -72,8 +70,10 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr
     AddEditMemberDialogComponent,
     AddExistingOrganizationDialogComponent,
     CreateClientDialogComponent,
+    InvoicesComponent,
     ManageClientNameDialogComponent,
     ManageClientSubscriptionDialogComponent,
+    NoInvoicesComponent,
     ProviderBillingHistoryComponent,
     ProviderSubscriptionComponent,
     ProviderSubscriptionStatusComponent,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.spec.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.spec.ts
index 2ddfbabf885..2accd760fcb 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.spec.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.spec.ts
@@ -1,16 +1,14 @@
 import { MockProxy, mock } from "jest-mock-extended";
+import { of } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
 import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { PlanType } from "@bitwarden/common/billing/enums";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 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";
 import { OrgKey, ProviderKey } from "@bitwarden/common/types/key";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { newGuid } from "@bitwarden/guid";
@@ -26,10 +24,15 @@ describe("WebProviderService", () => {
   let apiService: MockProxy<ApiService>;
   let i18nService: MockProxy<I18nService>;
   let encryptService: MockProxy<EncryptService>;
-  let billingApiService: MockProxy<BillingApiServiceAbstraction>;
-  let stateProvider: MockProxy<StateProvider>;
   let providerApiService: MockProxy<ProviderApiServiceAbstraction>;
-  let accountService: MockProxy<AccountService>;
+
+  const activeUserId = newGuid() as UserId;
+  const providerId = "provider-123";
+  const mockOrgKey = new SymmetricCryptoKey(new Uint8Array(64)) as OrgKey;
+  const mockProviderKey = new SymmetricCryptoKey(new Uint8Array(64)) as ProviderKey;
+  const mockProviderKeysById: Record<string, ProviderKey> = {
+    [providerId]: mockProviderKey,
+  };
 
   beforeEach(() => {
     keyService = mock();
@@ -37,10 +40,7 @@ describe("WebProviderService", () => {
     apiService = mock();
     i18nService = mock();
     encryptService = mock();
-    billingApiService = mock();
-    stateProvider = mock();
     providerApiService = mock();
-    accountService = mock();
 
     sut = new WebProviderService(
       keyService,
@@ -48,16 +48,69 @@ describe("WebProviderService", () => {
       apiService,
       i18nService,
       encryptService,
-      billingApiService,
-      stateProvider,
       providerApiService,
-      accountService,
     );
   });
 
+  describe("addOrganizationToProvider", () => {
+    const organizationId = "org-789";
+    const encryptedOrgKey = new EncString("encrypted-org-key");
+    const mockOrgKeysById: Record<string, OrgKey> = {
+      [organizationId]: mockOrgKey,
+    };
+
+    beforeEach(() => {
+      keyService.orgKeys$.mockReturnValue(of(mockOrgKeysById));
+      keyService.providerKeys$.mockReturnValue(of(mockProviderKeysById));
+      encryptService.wrapSymmetricKey.mockResolvedValue(encryptedOrgKey);
+    });
+
+    it("adds an organization to a provider with correct encryption", async () => {
+      await sut.addOrganizationToProvider(providerId, organizationId, activeUserId);
+
+      expect(keyService.orgKeys$).toHaveBeenCalledWith(activeUserId);
+      expect(keyService.providerKeys$).toHaveBeenCalledWith(activeUserId);
+      expect(encryptService.wrapSymmetricKey).toHaveBeenCalledWith(mockOrgKey, mockProviderKey);
+      expect(providerApiService.addOrganizationToProvider).toHaveBeenCalledWith(providerId, {
+        key: encryptedOrgKey.encryptedString,
+        organizationId,
+      });
+      expect(syncService.fullSync).toHaveBeenCalledWith(true);
+    });
+
+    it("throws an error if organization key is not found", async () => {
+      const invalidOrgId = "invalid-org";
+
+      await expect(
+        sut.addOrganizationToProvider(providerId, invalidOrgId, activeUserId),
+      ).rejects.toThrow("Organization key not found");
+    });
+
+    it("throws an error if no organization keys are available", async () => {
+      keyService.orgKeys$.mockReturnValue(of(null));
+
+      await expect(
+        sut.addOrganizationToProvider(providerId, organizationId, activeUserId),
+      ).rejects.toThrow("Organization key not found");
+    });
+
+    it("throws an error if provider key is not found", async () => {
+      const invalidProviderId = "invalid-provider";
+      await expect(
+        sut.addOrganizationToProvider(invalidProviderId, organizationId, activeUserId),
+      ).rejects.toThrow("Provider key not found");
+    });
+
+    it("throws an error if no provider keys are available", async () => {
+      keyService.providerKeys$.mockReturnValue(of(null));
+
+      await expect(
+        sut.addOrganizationToProvider(providerId, organizationId, activeUserId),
+      ).rejects.toThrow("Provider key not found");
+    });
+  });
+
   describe("createClientOrganization", () => {
-    const activeUserId = newGuid() as UserId;
-    const providerId = "provider-123";
     const name = "Test Org";
     const ownerEmail = "owner@example.com";
     const planType = PlanType.EnterpriseAnnually;
@@ -67,15 +120,13 @@ describe("WebProviderService", () => {
     const encryptedProviderKey = new EncString("encrypted-provider-key");
     const encryptedCollectionName = new EncString("encrypted-collection-name");
     const defaultCollectionTranslation = "Default Collection";
-    const mockOrgKey = new SymmetricCryptoKey(new Uint8Array(64)) as OrgKey;
-    const mockProviderKey = new SymmetricCryptoKey(new Uint8Array(64)) as ProviderKey;
 
     beforeEach(() => {
       keyService.makeOrgKey.mockResolvedValue([new EncString("mockEncryptedKey"), mockOrgKey]);
       keyService.makeKeyPair.mockResolvedValue([publicKey, encryptedPrivateKey]);
       i18nService.t.mockReturnValue(defaultCollectionTranslation);
       encryptService.encryptString.mockResolvedValue(encryptedCollectionName);
-      keyService.getProviderKey.mockResolvedValue(mockProviderKey);
+      keyService.providerKeys$.mockReturnValue(of(mockProviderKeysById));
       encryptService.wrapSymmetricKey.mockResolvedValue(encryptedProviderKey);
     });
 
@@ -96,10 +147,10 @@ describe("WebProviderService", () => {
         defaultCollectionTranslation,
         mockOrgKey,
       );
-      expect(keyService.getProviderKey).toHaveBeenCalledWith(providerId);
+      expect(keyService.providerKeys$).toHaveBeenCalledWith(activeUserId);
       expect(encryptService.wrapSymmetricKey).toHaveBeenCalledWith(mockOrgKey, mockProviderKey);
 
-      expect(billingApiService.createProviderClientOrganization).toHaveBeenCalledWith(
+      expect(providerApiService.createProviderOrganization).toHaveBeenCalledWith(
         providerId,
         expect.objectContaining({
           name,
@@ -115,5 +166,27 @@ describe("WebProviderService", () => {
       expect(apiService.refreshIdentityToken).toHaveBeenCalled();
       expect(syncService.fullSync).toHaveBeenCalledWith(true);
     });
+
+    it("throws an error if provider key is not found", async () => {
+      const invalidProviderId = "invalid-provider";
+      await expect(
+        sut.createClientOrganization(
+          invalidProviderId,
+          name,
+          ownerEmail,
+          planType,
+          seats,
+          activeUserId,
+        ),
+      ).rejects.toThrow("Provider key not found");
+    });
+
+    it("throws an error if no provider keys are available", async () => {
+      keyService.providerKeys$.mockReturnValue(of(null));
+
+      await expect(
+        sut.createClientOrganization(providerId, name, ownerEmail, planType, seats, activeUserId),
+      ).rejects.toThrow("Provider key not found");
+    });
   });
 });
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts
index 16c2ab5cd3e..e1eea78d26a 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/services/web-provider.service.ts
@@ -1,22 +1,17 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Injectable } from "@angular/core";
-import { firstValueFrom, map } from "rxjs";
-import { switchMap } from "rxjs/operators";
+import { combineLatest, firstValueFrom, map } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
+import { CreateProviderOrganizationRequest } from "@bitwarden/common/admin-console/models/request/create-provider-organization.request";
 import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
-import { ProviderAddOrganizationRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-add-organization.request";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
+import { assertNonNullish } from "@bitwarden/common/auth/utils";
 import { PlanType } from "@bitwarden/common/billing/enums";
-import { CreateClientOrganizationRequest } from "@bitwarden/common/billing/models/request/create-client-organization.request";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { StateProvider } from "@bitwarden/common/platform/state";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { OrganizationId, ProviderId, UserId } from "@bitwarden/common/types/guid";
 import { OrgKey } from "@bitwarden/common/types/key";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { KeyService } from "@bitwarden/key-management";
@@ -29,41 +24,26 @@ export class WebProviderService {
     private apiService: ApiService,
     private i18nService: I18nService,
     private encryptService: EncryptService,
-    private billingApiService: BillingApiServiceAbstraction,
-    private stateProvider: StateProvider,
     private providerApiService: ProviderApiServiceAbstraction,
-    private accountService: AccountService,
   ) {}
 
-  async addOrganizationToProvider(providerId: string, organizationId: string) {
-    const orgKey = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(
-        getUserId,
-        switchMap((userId) => this.keyService.orgKeys$(userId)),
-        map((orgKeys) => orgKeys[organizationId as OrganizationId] ?? null),
-      ),
+  async addOrganizationToProvider(
+    providerId: string,
+    organizationId: string,
+    activeUserId: UserId,
+  ): Promise<void> {
+    const [orgKeysById, providerKeys] = await firstValueFrom(
+      combineLatest([
+        this.keyService.orgKeys$(activeUserId),
+        this.keyService.providerKeys$(activeUserId),
+      ]),
     );
-    const providerKey = await this.keyService.getProviderKey(providerId);
 
-    const encryptedOrgKey = await this.encryptService.wrapSymmetricKey(orgKey, providerKey);
+    const orgKey = orgKeysById?.[organizationId as OrganizationId];
+    const providerKey = providerKeys?.[providerId as ProviderId];
+    assertNonNullish(orgKey, "Organization key not found");
+    assertNonNullish(providerKey, "Provider key not found");
 
-    const request = new ProviderAddOrganizationRequest();
-    request.organizationId = organizationId;
-    request.key = encryptedOrgKey.encryptedString;
-
-    const response = await this.apiService.postProviderAddOrganization(providerId, request);
-    await this.syncService.fullSync(true);
-    return response;
-  }
-
-  async addOrganizationToProviderVNext(providerId: string, organizationId: string): Promise<void> {
-    const orgKey = await firstValueFrom(
-      this.stateProvider.activeUserId$.pipe(
-        switchMap((userId) => this.keyService.orgKeys$(userId)),
-        map((organizationKeysById) => organizationKeysById[organizationId as OrganizationId]),
-      ),
-    );
-    const providerKey = await this.keyService.getProviderKey(providerId);
     const encryptedOrgKey = await this.encryptService.wrapSymmetricKey(orgKey, providerKey);
     await this.providerApiService.addOrganizationToProvider(providerId, {
       key: encryptedOrgKey.encryptedString,
@@ -89,14 +69,19 @@ export class WebProviderService {
       organizationKey,
     );
 
-    const providerKey = await this.keyService.getProviderKey(providerId);
+    const providerKey = await firstValueFrom(
+      this.keyService
+        .providerKeys$(activeUserId)
+        .pipe(map((providerKeys) => providerKeys?.[providerId as ProviderId])),
+    );
+    assertNonNullish(providerKey, "Provider key not found");
 
     const encryptedProviderKey = await this.encryptService.wrapSymmetricKey(
       organizationKey,
       providerKey,
     );
 
-    const request = new CreateClientOrganizationRequest();
+    const request = new CreateProviderOrganizationRequest();
     request.name = name;
     request.ownerEmail = ownerEmail;
     request.planType = planType;
@@ -106,7 +91,7 @@ export class WebProviderService {
     request.keyPair = new OrganizationKeysRequest(publicKey, encryptedPrivateKey.encryptedString);
     request.collectionName = encryptedCollectionName.encryptedString;
 
-    await this.billingApiService.createProviderClientOrganization(providerId, request);
+    await this.providerApiService.createProviderOrganization(providerId, request);
 
     await this.apiService.refreshIdentityToken();
 
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.ts
index 12dada12aa9..705069dc697 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.ts
@@ -17,6 +17,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService, ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "provider-account",
   templateUrl: "account.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
index 02ca72fa9b8..fa75f4b7635 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
@@ -4,6 +4,8 @@ import { Params } from "@angular/router";
 import { BitwardenLogo } from "@bitwarden/assets/svg";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-setup-provider",
   templateUrl: "setup-provider.component.html",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
index daae7e2ed2e..43f49b1fd04 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
@@ -29,13 +29,11 @@
       </div>
     </div>
     <h2 class="tw-mt-5">{{ "paymentMethod" | i18n }}</h2>
-    <app-payment
-      [showAccountCredit]="false"
-      [bankAccountWarningOverride]="
-        'verifyProviderBankAccountWithStatementDescriptorWarning' | i18n
-      "
-    />
-    <app-manage-tax-information />
+    <app-enter-payment-method [group]="formGroup.controls.paymentMethod"></app-enter-payment-method>
+    <app-enter-billing-address
+      [group]="formGroup.controls.billingAddress"
+      [scenario]="{ type: 'checkout', supportsTaxId: true }"
+    ></app-enter-billing-address>
     <button class="tw-mt-8" bitButton bitFormButton buttonType="primary" type="submit">
       {{ "submit" | i18n }}
     </button>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
index 72ca0bc8391..87c48608b10 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
@@ -1,42 +1,46 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom, Subject, switchMap } from "rxjs";
 import { first, takeUntil } from "rxjs/operators";
 
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction";
 import { ProviderSetupRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-setup.request";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { ProviderKey } from "@bitwarden/common/types/key";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
-import { PaymentComponent } from "@bitwarden/web-vault/app/billing/shared/payment/payment.component";
+import {
+  EnterBillingAddressComponent,
+  EnterPaymentMethodComponent,
+  getBillingAddressFromForm,
+} from "@bitwarden/web-vault/app/billing/payment/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "provider-setup",
   templateUrl: "setup.component.html",
   standalone: false,
 })
 export class SetupComponent implements OnInit, OnDestroy {
-  @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(ManageTaxInformationComponent) taxInformationComponent: ManageTaxInformationComponent;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @ViewChild(EnterPaymentMethodComponent) enterPaymentMethodComponent!: EnterPaymentMethodComponent;
 
   loading = true;
-  providerId: string;
-  token: string;
+  providerId!: string;
+  token!: string;
 
   protected formGroup = this.formBuilder.group({
     name: ["", Validators.required],
     billingEmail: ["", [Validators.required, Validators.email]],
+    paymentMethod: EnterPaymentMethodComponent.getFormGroup(),
+    billingAddress: EnterBillingAddressComponent.getFormGroup(),
   });
 
   private destroy$ = new Subject<void>();
@@ -69,7 +73,7 @@ export class SetupComponent implements OnInit, OnDestroy {
           if (error) {
             this.toastService.showToast({
               variant: "error",
-              title: null,
+              title: "",
               message: this.i18nService.t("emergencyInviteAcceptFailed"),
               timeout: 10000,
             });
@@ -95,6 +99,7 @@ export class SetupComponent implements OnInit, OnDestroy {
                 replaceUrl: true,
               });
             }
+
             this.loading = false;
           } catch (error) {
             this.validationService.showError(error);
@@ -115,10 +120,7 @@ export class SetupComponent implements OnInit, OnDestroy {
     try {
       this.formGroup.markAllAsTouched();
 
-      const paymentValid = this.paymentComponent.validate();
-      const taxInformationValid = this.taxInformationComponent.validate();
-
-      if (!paymentValid || !taxInformationValid || !this.formGroup.valid) {
+      if (this.formGroup.invalid) {
         return;
       }
       const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
@@ -126,29 +128,24 @@ export class SetupComponent implements OnInit, OnDestroy {
       const key = providerKey[0].encryptedString;
 
       const request = new ProviderSetupRequest();
-      request.name = this.formGroup.value.name;
-      request.billingEmail = this.formGroup.value.billingEmail;
+      request.name = this.formGroup.value.name!;
+      request.billingEmail = this.formGroup.value.billingEmail!;
       request.token = this.token;
-      request.key = key;
+      request.key = key!;
 
-      request.taxInfo = new ExpandedTaxInfoUpdateRequest();
-      const taxInformation = this.taxInformationComponent.getTaxInformation();
+      const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+      if (!paymentMethod) {
+        return;
+      }
 
-      request.taxInfo.country = taxInformation.country;
-      request.taxInfo.postalCode = taxInformation.postalCode;
-      request.taxInfo.taxId = taxInformation.taxId;
-      request.taxInfo.line1 = taxInformation.line1;
-      request.taxInfo.line2 = taxInformation.line2;
-      request.taxInfo.city = taxInformation.city;
-      request.taxInfo.state = taxInformation.state;
-
-      request.paymentSource = await this.paymentComponent.tokenize();
+      request.paymentMethod = paymentMethod;
+      request.billingAddress = getBillingAddressFromForm(this.formGroup.controls.billingAddress);
 
       const provider = await this.providerApiService.postProviderSetup(this.providerId, request);
 
       this.toastService.showToast({
         variant: "success",
-        title: null,
+        title: "",
         message: this.i18nService.t("providerSetup"),
       });
 
@@ -156,20 +153,10 @@ export class SetupComponent implements OnInit, OnDestroy {
 
       await this.router.navigate(["/providers", provider.id]);
     } catch (e) {
-      if (
-        this.paymentComponent.selected === PaymentMethodType.PayPal &&
-        typeof e === "string" &&
-        e === "No payment method is available."
-      ) {
-        this.toastService.showToast({
-          variant: "error",
-          title: null,
-          message: this.i18nService.t("clickPayWithPayPal"),
-        });
-      } else {
+      if (e !== null && typeof e === "object" && "message" in e && typeof e.message === "string") {
         e.message = this.i18nService.translate(e.message) || e.message;
-        this.validationService.showError(e);
       }
+      this.validationService.showError(e);
     }
   };
 }
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts
index 5c0d0982fb5..f1be766a9a2 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts
@@ -10,6 +10,8 @@ import { ProviderVerifyRecoverDeleteRequest } from "@bitwarden/common/admin-cons
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-verify-recover-delete-provider",
   templateUrl: "verify-recover-delete-provider.component.html",
diff --git a/bitwarden_license/bit-web/src/app/app.component.ts b/bitwarden_license/bit-web/src/app/app.component.ts
index abfb79b8f18..caa1e4b0cf6 100644
--- a/bitwarden_license/bit-web/src/app/app.component.ts
+++ b/bitwarden_license/bit-web/src/app/app.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { AppComponent as BaseAppComponent } from "@bitwarden/web-vault/app/app.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-root",
   templateUrl: "../../../../apps/web/src/app/app.component.html",
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso-manage.component.html
similarity index 96%
rename from bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
rename to bitwarden_license/bit-web/src/app/auth/sso/sso-manage.component.html
index ef8241b534c..149952d2fd9 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso-manage.component.html
@@ -1,7 +1,7 @@
 <app-header></app-header>
 
 <bit-container>
-  <ng-container *ngIf="loading">
+  <ng-container *ngIf="isInitializing">
     <i
       class="bwi bwi-spinner bwi-spin tw-text-muted"
       title="{{ 'loading' | i18n }}"
@@ -10,7 +10,7 @@
     <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </ng-container>
 
-  <form [formGroup]="ssoConfigForm" [bitSubmit]="submit" *ngIf="!loading">
+  <form [formGroup]="ssoConfigForm" [bitSubmit]="submit" *ngIf="!isInitializing">
     <p>
       {{ "ssoPolicyHelpStart" | i18n }}
       <a bitLink routerLink="../policies">{{ "ssoPolicyHelpAnchor" | i18n }}</a>
@@ -30,8 +30,8 @@
         <bit-label>{{ "ssoIdentifier" | i18n }}</bit-label>
         <input bitInput type="text" formControlName="ssoIdentifier" />
         <bit-hint>
-          {{ "ssoIdentifierHintPartOne" | i18n }}
-          <a bitLink routerLink="../domain-verification">{{ "claimedDomains" | i18n }}</a>
+          {{ "ssoIdentifierHint" | i18n }}
+          <a bitLink routerLink="../domain-verification">{{ "claimedDomainsLearnMore" | i18n }}</a>
         </bit-hint>
       </bit-form-field>
 
@@ -133,15 +133,15 @@
               class="bwi bwi-spinner bwi-spin"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
-              *ngIf="keyConnectorUrl.pending"
+              *ngIf="keyConnectorUrlFormCtrl.pending"
             ></i>
-            <span *ngIf="!keyConnectorUrl.pending">
+            <span *ngIf="!keyConnectorUrlFormCtrl.pending">
               {{ "keyConnectorTest" | i18n }}
             </span>
           </button>
           <bit-hint
             aria-live="polite"
-            *ngIf="haveTestedKeyConnector && !keyConnectorUrl.hasError('invalidUrl')"
+            *ngIf="haveTestedKeyConnector && !keyConnectorUrlFormCtrl.hasError('invalidUrl')"
           >
             <small class="tw-text-success-600">
               <i class="bwi bwi-check-circle" aria-hidden="true"></i>
@@ -209,7 +209,14 @@
 
         <bit-form-field>
           <bit-label>{{ "clientSecret" | i18n }}</bit-label>
-          <input bitInput type="text" formControlName="clientSecret" appInputStripSpaces />
+          <input bitInput type="password" formControlName="clientSecret" appInputStripSpaces />
+          <button
+            type="button"
+            bitIconButton
+            bitSuffix
+            bitPasswordInputToggle
+            [(toggled)]="showClientSecret"
+          ></button>
         </bit-form-field>
 
         <bit-form-field>
@@ -488,7 +495,6 @@
             formControlName="idpSingleSignOnServiceUrl"
             appInputStripSpaces
           />
-          <bit-hint>{{ "idpSingleSignOnServiceUrlRequired" | i18n }}</bit-hint>
         </bit-form-field>
 
         <bit-form-field>
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts b/bitwarden_license/bit-web/src/app/auth/sso/sso-manage.component.ts
similarity index 54%
rename from bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
rename to bitwarden_license/bit-web/src/app/auth/sso/sso-manage.component.ts
index 9baeaabb33f..c7479df7784 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso-manage.component.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import {
   AbstractControl,
@@ -9,7 +7,7 @@ import {
   Validators,
 } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
-import { concatMap, firstValueFrom, Subject, takeUntil } from "rxjs";
+import { concatMap, firstValueFrom, Subject, Subscription, switchMap, takeUntil } from "rxjs";
 
 import { ControlsOf } from "@bitwarden/angular/types/controls-of";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -34,10 +32,13 @@ import { OrganizationSsoRequest } from "@bitwarden/common/auth/models/request/or
 import { OrganizationSsoResponse } from "@bitwarden/common/auth/models/response/organization-sso.response";
 import { SsoConfigView } from "@bitwarden/common/auth/models/view/sso-config.view";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ToastService } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
 
 import { ssoTypeValidator } from "./sso-type.validator";
 
@@ -49,12 +50,14 @@ interface SelectOptions {
 
 const defaultSigningAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
-  selector: "app-org-manage-sso",
-  templateUrl: "sso.component.html",
+  selector: "auth-sso-manage",
+  templateUrl: "sso-manage.component.html",
   standalone: false,
 })
-export class SsoComponent implements OnInit, OnDestroy {
+export class SsoManageComponent implements OnInit, OnDestroy {
   readonly ssoType = SsoType;
   readonly memberDecryptionType = MemberDecryptionType;
 
@@ -109,28 +112,34 @@ export class SsoComponent implements OnInit, OnDestroy {
 
   showOpenIdCustomizations = false;
 
-  loading = true;
-  haveTestedKeyConnector = false;
-  organizationId: string;
-  organization: Organization;
+  isInitializing = true; // concerned with UI/UX (i.e. when to show loading spinner vs form)
+  isFormValidatingOrPopulating = true; // tracks when form fields are being validated/populated during load() or submit()
 
-  callbackPath: string;
-  signedOutCallbackPath: string;
-  spEntityId: string;
-  spEntityIdStatic: string;
-  spMetadataUrl: string;
-  spAcsUrl: string;
+  configuredKeyConnectorUrlFromServer: string | null = null;
+  memberDecryptionTypeValueChangesSubscription: Subscription | null = null;
+  haveTestedKeyConnector = false;
+  organizationId: string | undefined = undefined;
+  organization: Organization | undefined = undefined;
+
+  callbackPath: string | undefined = undefined;
+  signedOutCallbackPath: string | undefined = undefined;
+  spEntityId: string | undefined = undefined;
+  spEntityIdStatic: string | undefined = undefined;
+  spMetadataUrl: string | undefined = undefined;
+  spAcsUrl: string | undefined = undefined;
+
+  showClientSecret = false;
 
   protected openIdForm = this.formBuilder.group<ControlsOf<SsoConfigView["openId"]>>(
     {
-      authority: new FormControl("", Validators.required),
-      clientId: new FormControl("", Validators.required),
-      clientSecret: new FormControl("", Validators.required),
+      authority: new FormControl("", { nonNullable: true, validators: Validators.required }),
+      clientId: new FormControl("", { nonNullable: true, validators: Validators.required }),
+      clientSecret: new FormControl("", { nonNullable: true, validators: Validators.required }),
       metadataAddress: new FormControl(),
-      redirectBehavior: new FormControl(
-        OpenIdConnectRedirectBehavior.RedirectGet,
-        Validators.required,
-      ),
+      redirectBehavior: new FormControl(OpenIdConnectRedirectBehavior.RedirectGet, {
+        nonNullable: true,
+        validators: Validators.required,
+      }),
       getClaimsFromUserInfoEndpoint: new FormControl(),
       additionalScopes: new FormControl(),
       additionalUserIdClaimTypes: new FormControl(),
@@ -146,22 +155,32 @@ export class SsoComponent implements OnInit, OnDestroy {
 
   protected samlForm = this.formBuilder.group<ControlsOf<SsoConfigView["saml"]>>(
     {
-      spUniqueEntityId: new FormControl(true, { updateOn: "change" }),
-      spNameIdFormat: new FormControl(Saml2NameIdFormat.NotConfigured),
-      spOutboundSigningAlgorithm: new FormControl(defaultSigningAlgorithm),
-      spSigningBehavior: new FormControl(Saml2SigningBehavior.IfIdpWantAuthnRequestsSigned),
-      spMinIncomingSigningAlgorithm: new FormControl(defaultSigningAlgorithm),
+      spUniqueEntityId: new FormControl(true, { nonNullable: true, updateOn: "change" }),
+      spNameIdFormat: new FormControl(Saml2NameIdFormat.NotConfigured, { nonNullable: true }),
+      spOutboundSigningAlgorithm: new FormControl(defaultSigningAlgorithm, { nonNullable: true }),
+      spSigningBehavior: new FormControl(Saml2SigningBehavior.IfIdpWantAuthnRequestsSigned, {
+        nonNullable: true,
+      }),
+      spMinIncomingSigningAlgorithm: new FormControl(defaultSigningAlgorithm, {
+        nonNullable: true,
+      }),
       spWantAssertionsSigned: new FormControl(),
       spValidateCertificates: new FormControl(),
 
-      idpEntityId: new FormControl("", Validators.required),
-      idpBindingType: new FormControl(Saml2BindingType.HttpRedirect),
-      idpSingleSignOnServiceUrl: new FormControl(),
+      idpEntityId: new FormControl("", { nonNullable: true, validators: Validators.required }),
+      idpBindingType: new FormControl(Saml2BindingType.HttpRedirect, { nonNullable: true }),
+      idpSingleSignOnServiceUrl: new FormControl("", {
+        nonNullable: true,
+        validators: Validators.required,
+      }),
       idpSingleLogoutServiceUrl: new FormControl(),
-      idpX509PublicCert: new FormControl("", Validators.required),
-      idpOutboundSigningAlgorithm: new FormControl(defaultSigningAlgorithm),
+      idpX509PublicCert: new FormControl("", {
+        nonNullable: true,
+        validators: Validators.required,
+      }),
+      idpOutboundSigningAlgorithm: new FormControl(defaultSigningAlgorithm, { nonNullable: true }),
       idpAllowUnsolicitedAuthnResponse: new FormControl(),
-      idpAllowOutboundLogoutRequests: new FormControl(true),
+      idpAllowOutboundLogoutRequests: new FormControl(true, { nonNullable: true }),
       idpWantAuthnRequestsSigned: new FormControl(),
     },
     {
@@ -170,13 +189,16 @@ export class SsoComponent implements OnInit, OnDestroy {
   );
 
   protected ssoConfigForm = this.formBuilder.group<ControlsOf<SsoConfigView>>({
-    configType: new FormControl(SsoType.None),
-    memberDecryptionType: new FormControl(MemberDecryptionType.MasterPassword),
-    keyConnectorUrl: new FormControl(""),
+    configType: new FormControl(SsoType.None, { nonNullable: true }),
+    memberDecryptionType: new FormControl(MemberDecryptionType.MasterPassword, {
+      nonNullable: true,
+    }),
+    keyConnectorUrl: new FormControl("", { nonNullable: true }),
     openId: this.openIdForm,
     saml: this.samlForm,
-    enabled: new FormControl(false),
+    enabled: new FormControl(false, { nonNullable: true }),
     ssoIdentifier: new FormControl("", {
+      nonNullable: true,
       validators: [Validators.maxLength(50), Validators.required],
     }),
   });
@@ -201,6 +223,9 @@ export class SsoComponent implements OnInit, OnDestroy {
     private accountService: AccountService,
     private organizationApiService: OrganizationApiServiceAbstraction,
     private toastService: ToastService,
+    private environmentService: EnvironmentService,
+    private validationService: ValidationService,
+    private logService: LogService,
   ) {}
 
   async ngOnInit() {
@@ -221,7 +246,7 @@ export class SsoComponent implements OnInit, OnDestroy {
 
     this.ssoConfigForm
       .get("configType")
-      .valueChanges.pipe(takeUntil(this.destroy$))
+      ?.valueChanges.pipe(takeUntil(this.destroy$))
       .subscribe((newType: SsoType) => {
         if (newType === SsoType.OpenIdConnect) {
           this.openIdForm.enable();
@@ -237,8 +262,8 @@ export class SsoComponent implements OnInit, OnDestroy {
 
     this.samlForm
       .get("spSigningBehavior")
-      .valueChanges.pipe(takeUntil(this.destroy$))
-      .subscribe(() => this.samlForm.get("idpX509PublicCert").updateValueAndValidity());
+      ?.valueChanges.pipe(takeUntil(this.destroy$))
+      .subscribe(() => this.samlForm.get("idpX509PublicCert")?.updateValueAndValidity());
 
     this.route.params
       .pipe(
@@ -259,69 +284,158 @@ export class SsoComponent implements OnInit, OnDestroy {
   }
 
   async load() {
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-    this.organization = await firstValueFrom(
-      this.organizationService
-        .organizations$(userId)
-        .pipe(getOrganizationById(this.organizationId)),
-    );
-    const ssoSettings = await this.organizationApiService.getSso(this.organizationId);
-    this.populateForm(ssoSettings);
+    // Even though these component properties were initialized to true, we must always reset
+    // them to true at the top of this method in case an admin navigates to another org via
+    // the browser address bar, which re-executes load() on the same component instance
+    // (not a new instance).
+    this.isInitializing = true;
+    this.isFormValidatingOrPopulating = true;
+    // Same with unsubscribing: re-executing load() on the same component instance (not a new
+    // instance) means we will not unsubscribe via takeUntil(this.destroy$). We must manually
+    // unsubscribe for this case. We unsubscribe here in case the try block fails.
+    this.memberDecryptionTypeValueChangesSubscription?.unsubscribe();
+    this.memberDecryptionTypeValueChangesSubscription = null;
 
-    this.callbackPath = ssoSettings.urls.callbackPath;
-    this.signedOutCallbackPath = ssoSettings.urls.signedOutCallbackPath;
-    this.spEntityId = ssoSettings.urls.spEntityId;
-    this.spEntityIdStatic = ssoSettings.urls.spEntityIdStatic;
-    this.spMetadataUrl = ssoSettings.urls.spMetadataUrl;
-    this.spAcsUrl = ssoSettings.urls.spAcsUrl;
+    try {
+      if (!this.organizationId) {
+        throw new Error("Load: Organization ID is not set");
+      }
 
-    this.loading = false;
+      const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+      this.organization = await firstValueFrom(
+        this.organizationService
+          .organizations$(userId)
+          .pipe(getOrganizationById(this.organizationId)),
+      );
+      const ssoSettings = await this.organizationApiService.getSso(this.organizationId);
+      this.configuredKeyConnectorUrlFromServer = ssoSettings.data?.keyConnectorUrl;
+      this.populateForm(ssoSettings);
+
+      this.callbackPath = ssoSettings.urls.callbackPath;
+      this.signedOutCallbackPath = ssoSettings.urls.signedOutCallbackPath;
+      this.spEntityId = ssoSettings.urls.spEntityId;
+      this.spEntityIdStatic = ssoSettings.urls.spEntityIdStatic;
+      this.spMetadataUrl = ssoSettings.urls.spMetadataUrl;
+      this.spAcsUrl = ssoSettings.urls.spAcsUrl;
+
+      if (this.showKeyConnectorOptions) {
+        // We don't setup this subscription until AFTER the form has been populated on load().
+        // This is because populateForm() will trigger valueChanges, but we don't want to
+        // listen for or react to valueChanges until AFTER the form has had a chance to be
+        // populated with already configured values retrieved from the server.
+        this.subscribeToMemberDecryptionTypeValueChanges();
+      }
+    } catch (error) {
+      this.logService.error("Error loading SSO configuration: ", error);
+      this.validationService.showError(error);
+    } finally {
+      this.isInitializing = false;
+      this.isFormValidatingOrPopulating = false;
+    }
   }
 
   submit = async () => {
-    this.updateFormValidationState(this.ssoConfigForm);
+    this.isFormValidatingOrPopulating = true;
 
-    if (this.ssoConfigForm.value.memberDecryptionType === MemberDecryptionType.KeyConnector) {
-      this.haveTestedKeyConnector = false;
-      await this.validateKeyConnectorUrl();
+    try {
+      this.updateFormValidationState(this.ssoConfigForm);
+
+      if (this.ssoConfigForm.value.memberDecryptionType === MemberDecryptionType.KeyConnector) {
+        this.haveTestedKeyConnector = false;
+        await this.validateKeyConnectorUrl();
+      }
+
+      if (!this.ssoConfigForm.valid) {
+        this.readOutErrors();
+        return;
+      }
+
+      if (!this.organizationId) {
+        throw new Error("Submit: Organization ID is not set");
+      }
+
+      const request = new OrganizationSsoRequest();
+      request.enabled = this.enabledCtrl.value;
+      // Return null instead of empty string to avoid duplicate id errors in database
+      request.identifier =
+        this.ssoIdentifierCtrl.value === "" ? null : this.ssoIdentifierCtrl.value;
+      request.data = SsoConfigApi.fromView(this.ssoConfigForm.getRawValue());
+
+      const response = await this.organizationApiService.updateSso(this.organizationId, request);
+      this.configuredKeyConnectorUrlFromServer = response.data?.keyConnectorUrl;
+      this.populateForm(response);
+
+      await this.upsertOrganizationWithSsoChanges(request);
+
+      this.toastService.showToast({
+        variant: "success",
+        message: this.i18nService.t("ssoSettingsSaved"),
+      });
+    } finally {
+      this.isFormValidatingOrPopulating = false;
     }
-
-    if (!this.ssoConfigForm.valid) {
-      this.readOutErrors();
-      return;
-    }
-    const request = new OrganizationSsoRequest();
-    request.enabled = this.enabledCtrl.value;
-    // Return null instead of empty string to avoid duplicate id errors in database
-    request.identifier = this.ssoIdentifierCtrl.value === "" ? null : this.ssoIdentifierCtrl.value;
-    request.data = SsoConfigApi.fromView(this.ssoConfigForm.getRawValue());
-
-    const response = await this.organizationApiService.updateSso(this.organizationId, request);
-    this.populateForm(response);
-
-    await this.upsertOrganizationWithSsoChanges(request);
-
-    this.toastService.showToast({
-      variant: "success",
-      title: null,
-      message: this.i18nService.t("ssoSettingsSaved"),
-    });
   };
 
+  private subscribeToMemberDecryptionTypeValueChanges() {
+    // The load() method will have unsubscribed from any pre-existing subscription before
+    // we setup a new subscription here.
+
+    this.memberDecryptionTypeValueChangesSubscription =
+      this.ssoConfigForm?.controls?.memberDecryptionType.valueChanges
+        .pipe(
+          switchMap(async (memberDecryptionType: MemberDecryptionType) => {
+            this.haveTestedKeyConnector = false;
+
+            if (this.isFormValidatingOrPopulating) {
+              // If the form is being validated/populated due to a load() or submit() call (both of which
+              // trigger valueChanges) we don't want to react to this valueChanges emission.
+              return;
+            }
+
+            if (memberDecryptionType === MemberDecryptionType.KeyConnector) {
+              if (this.configuredKeyConnectorUrlFromServer) {
+                // If the user already has a key connector URL configured, it will have been retrieved
+                // from the server and set to the form field upon load(). But if this user then selects a
+                // different Member Decryption option (but does not save the form), and then once again
+                // selects the Key Connector option, we want to pre-populate the form field with the already
+                // configured URL that was originally retreived from the server, not a default URL.
+                this.ssoConfigForm.controls.keyConnectorUrl.setValue(
+                  this.configuredKeyConnectorUrlFromServer,
+                );
+                return;
+              }
+
+              // Pre-populate a default key connector URL (user can still change it)
+              const env = await firstValueFrom(this.environmentService.environment$);
+              const webVaultUrl = env.getWebVaultUrl();
+              const defaultKeyConnectorUrl = webVaultUrl + "/key-connector";
+
+              this.ssoConfigForm.controls.keyConnectorUrl.setValue(defaultKeyConnectorUrl);
+            } else {
+              // Clear the key connector url
+              this.ssoConfigForm.controls.keyConnectorUrl.setValue("");
+            }
+          }),
+          takeUntil(this.destroy$),
+        )
+        .subscribe();
+  }
+
   async validateKeyConnectorUrl() {
     if (this.haveTestedKeyConnector) {
       return;
     }
 
-    this.keyConnectorUrl.markAsPending();
+    this.keyConnectorUrlFormCtrl.markAsPending();
 
     try {
-      await this.apiService.getKeyConnectorAlive(this.keyConnectorUrl.value);
-      this.keyConnectorUrl.updateValueAndValidity();
+      await this.apiService.getKeyConnectorAlive(this.keyConnectorUrlFormCtrl.value);
+      this.keyConnectorUrlFormCtrl.updateValueAndValidity();
     } catch {
-      this.keyConnectorUrl.setErrors({
+      this.keyConnectorUrlFormCtrl.setErrors({
         invalidUrl: { message: this.i18nService.t("keyConnectorTestFail") },
       });
+      this.keyConnectorUrlFormCtrl.markAllAsTouched();
     }
 
     this.haveTestedKeyConnector = true;
@@ -347,12 +461,12 @@ export class SsoComponent implements OnInit, OnDestroy {
   get enableTestKeyConnector() {
     return (
       this.ssoConfigForm.value?.memberDecryptionType === MemberDecryptionType.KeyConnector &&
-      !Utils.isNullOrWhitespace(this.keyConnectorUrl?.value)
+      !Utils.isNullOrWhitespace(this.keyConnectorUrlFormCtrl?.value)
     );
   }
 
-  get keyConnectorUrl() {
-    return this.ssoConfigForm.get("keyConnectorUrl");
+  get keyConnectorUrlFormCtrl() {
+    return this.ssoConfigForm.controls?.keyConnectorUrl as FormControl<string>;
   }
 
   /**
@@ -407,6 +521,11 @@ export class SsoComponent implements OnInit, OnDestroy {
     organizationSsoRequest: OrganizationSsoRequest,
   ): Promise<void> {
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+
+    if (!this.organizationId) {
+      throw new Error("upsertOrganizationWithSsoChanges: Organization ID is not set");
+    }
+
     const currentOrganization = await firstValueFrom(
       this.organizationService
         .organizations$(userId)
diff --git a/bitwarden_license/bit-web/src/app/billing/policies/free-families-sponsorship.component.ts b/bitwarden_license/bit-web/src/app/billing/policies/free-families-sponsorship.component.ts
index db5ef3ba62f..d1c6c820547 100644
--- a/bitwarden_license/bit-web/src/app/billing/policies/free-families-sponsorship.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/policies/free-families-sponsorship.component.ts
@@ -14,6 +14,8 @@ export class FreeFamiliesSponsorshipPolicy extends BasePolicyEditDefinition {
   component = FreeFamiliesSponsorshipPolicyComponent;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "free-families-sponsorship.component.html",
   imports: [SharedModule],
diff --git a/libs/angular/src/billing/components/invoices/invoices.component.html b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/invoices.component.html
similarity index 100%
rename from libs/angular/src/billing/components/invoices/invoices.component.html
rename to bitwarden_license/bit-web/src/app/billing/providers/billing-history/invoices.component.html
diff --git a/libs/angular/src/billing/components/invoices/invoices.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/invoices.component.ts
similarity index 74%
rename from libs/angular/src/billing/components/invoices/invoices.component.ts
rename to bitwarden_license/bit-web/src/app/billing/providers/billing-history/invoices.component.ts
index fc3352048d6..6c607d205b6 100644
--- a/libs/angular/src/billing/components/invoices/invoices.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/invoices.component.ts
@@ -8,15 +8,25 @@ import {
 } from "@bitwarden/common/billing/models/response/invoices.response";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-invoices",
   templateUrl: "./invoices.component.html",
   standalone: false,
 })
 export class InvoicesComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() startWith?: InvoicesResponse;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() getInvoices?: () => Promise<InvoicesResponse>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() getClientInvoiceReport?: (invoiceId: string) => Promise<string>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() getClientInvoiceReportName?: (invoiceResponse: InvoiceResponse) => string;
 
   protected invoices: InvoiceResponse[] = [];
diff --git a/libs/angular/src/billing/components/invoices/no-invoices.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/no-invoices.component.ts
similarity index 68%
rename from libs/angular/src/billing/components/invoices/no-invoices.component.ts
rename to bitwarden_license/bit-web/src/app/billing/providers/billing-history/no-invoices.component.ts
index ded6bc79593..882a2c764ac 100644
--- a/libs/angular/src/billing/components/invoices/no-invoices.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/no-invoices.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { CreditCardIcon } from "@bitwarden/assets/svg";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-no-invoices",
   template: `<bit-no-items [icon]="icon">
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/billing-history/provider-billing-history.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/provider-billing-history.component.ts
index d1a9d43a6fc..5823080bd3b 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/billing-history/provider-billing-history.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/billing-history/provider-billing-history.component.ts
@@ -10,6 +10,8 @@ import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstract
 import { InvoiceResponse } from "@bitwarden/common/billing/models/response/invoices.response";
 import { BillingNotificationService } from "@bitwarden/web-vault/app/billing/services/billing-notification.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./provider-billing-history.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/index.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/index.ts
deleted file mode 100644
index 898d51e0baf..00000000000
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from "./create-client-dialog.component";
-export * from "./manage-clients.component";
-export * from "./manage-client-name-dialog.component";
-export * from "./manage-client-subscription-dialog.component";
-export * from "./no-clients.component";
-export * from "./replace.pipe";
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/guards/has-consolidated-billing.guard.ts b/bitwarden_license/bit-web/src/app/billing/providers/guards/has-consolidated-billing.guard.ts
deleted file mode 100644
index de13cca3ad4..00000000000
--- a/bitwarden_license/bit-web/src/app/billing/providers/guards/has-consolidated-billing.guard.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { inject } from "@angular/core";
-import { ActivatedRouteSnapshot, CanActivateFn, createUrlTreeFromSnapshot } from "@angular/router";
-import { firstValueFrom } from "rxjs";
-
-import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { ProviderStatusType } from "@bitwarden/common/admin-console/enums";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-
-export const hasConsolidatedBilling: CanActivateFn = async (route: ActivatedRouteSnapshot) => {
-  const providerService = inject(ProviderService);
-  const accountService = inject(AccountService);
-
-  const userId = await firstValueFrom(getUserId(accountService.activeAccount$));
-  const provider = await firstValueFrom(providerService.get$(route.params.providerId, userId));
-
-  if (!provider || provider.providerStatus !== ProviderStatusType.Billable) {
-    return createUrlTreeFromSnapshot(route, ["/providers", route.params.providerId]);
-  }
-
-  return true;
-};
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/index.ts b/bitwarden_license/bit-web/src/app/billing/providers/index.ts
deleted file mode 100644
index b1294bc8047..00000000000
--- a/bitwarden_license/bit-web/src/app/billing/providers/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from "./billing-history/provider-billing-history.component";
-export * from "./clients";
-export * from "./guards/has-consolidated-billing.guard";
-export * from "./subscription/provider-subscription.component";
-export * from "./subscription/provider-subscription-status.component";
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.ts
index d2ac2cede2f..183e6098471 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.ts
@@ -1,13 +1,10 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import { ActivatedRoute } from "@angular/router";
 import {
   BehaviorSubject,
   combineLatest,
-  EMPTY,
   filter,
   firstValueFrom,
-  from,
-  map,
   merge,
   Observable,
   of,
@@ -19,7 +16,6 @@ import {
   tap,
   withLatestFrom,
 } from "rxjs";
-import { catchError } from "rxjs/operators";
 
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
@@ -49,13 +45,6 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
 import { ProviderWarningsService } from "../warnings/services";
 
-class RedirectError {
-  constructor(
-    public path: string[],
-    public relativeTo: ActivatedRoute,
-  ) {}
-}
-
 type View = {
   activeUserId: UserId;
   provider: BitwardenSubscriber;
@@ -70,6 +59,8 @@ const BANK_ACCOUNT_VERIFIED_COMMAND = new CommandDefinition<{
   adminId: string;
 }>("providerBankAccountVerified");
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./provider-payment-details.component.html",
   imports: [
@@ -92,18 +83,6 @@ export class ProviderPaymentDetailsComponent implements OnInit, OnDestroy {
   );
 
   private load$: Observable<View> = this.provider$.pipe(
-    switchMap((provider) =>
-      this.configService
-        .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
-        .pipe(
-          map((managePaymentDetailsOutsideCheckout) => {
-            if (!managePaymentDetailsOutsideCheckout) {
-              throw new RedirectError(["../subscription"], this.activatedRoute);
-            }
-            return provider;
-          }),
-        ),
-    ),
     mapProviderToSubscriber,
     switchMap(async (provider) => {
       const getTaxIdWarning = firstValueFrom(
@@ -131,14 +110,6 @@ export class ProviderPaymentDetailsComponent implements OnInit, OnDestroy {
       };
     }),
     shareReplay({ bufferSize: 1, refCount: false }),
-    catchError((error: unknown) => {
-      if (error instanceof RedirectError) {
-        return from(this.router.navigate(error.path, { relativeTo: error.relativeTo })).pipe(
-          switchMap(() => EMPTY),
-        );
-      }
-      throw error;
-    }),
   );
 
   view$: Observable<View> = merge(
@@ -158,7 +129,6 @@ export class ProviderPaymentDetailsComponent implements OnInit, OnDestroy {
     private messageListener: MessageListener,
     private providerService: ProviderService,
     private providerWarningsService: ProviderWarningsService,
-    private router: Router,
     private subscriberBillingClient: SubscriberBillingClient,
   ) {}
 
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
index a3f8acd6488..4b8dfce05d5 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
@@ -17,6 +17,8 @@ import { KeyService } from "@bitwarden/key-management";
 import { BillingNotificationService } from "@bitwarden/web-vault/app/billing/services/billing-notification.service";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./setup-business-unit.component.html",
   standalone: false,
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 f9ff006de24..dfbfdb29eef 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
@@ -23,12 +23,16 @@ type ComponentData = {
   };
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-provider-subscription-status",
   templateUrl: "provider-subscription-status.component.html",
   standalone: false,
 })
 export class ProviderSubscriptionStatusComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) subscription: ProviderSubscriptionResponse;
 
   constructor(
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
index 0205d2838d1..d71dcf77170 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
@@ -51,7 +51,7 @@
               <tr bitRow>
                 <td bitCell class="tw-pl-0 tw-py-3"></td>
                 <td bitCell class="tw-text-right">
-                  <span class="tw-font-bold">Total:</span> {{ totalCost | currency: "$" }} /
+                  <span class="tw-font-medium">Total:</span> {{ totalCost | currency: "$" }} /
                   {{
                     getBillingCadenceLabel(activePlans.length > 0 ? activePlans[0] : null) | i18n
                   }}
@@ -62,51 +62,5 @@
         </bit-table>
       </div>
     </ng-container>
-    @if (!managePaymentDetailsOutsideCheckout) {
-      <!-- Account Credit -->
-      <bit-section>
-        <h2 bitTypography="h2">
-          {{ "accountCredit" | i18n }}
-        </h2>
-        <p class="tw-text-lg tw-font-bold">{{ subscription.accountCredit | currency: "$" }}</p>
-        <p bitTypography="body1">{{ "creditAppliedDesc" | i18n }}</p>
-      </bit-section>
-      <!-- Payment Method -->
-      <bit-section>
-        <h2 bitTypography="h2">{{ "paymentMethod" | i18n }}</h2>
-        <p *ngIf="!subscription.paymentSource" bitTypography="body1">
-          {{ "noPaymentMethod" | i18n }}
-        </p>
-        <ng-container *ngIf="subscription.paymentSource">
-          <app-verify-bank-account
-            *ngIf="subscription.paymentSource.needsVerification"
-            [onSubmit]="verifyBankAccount"
-            (submitted)="load()"
-          >
-          </app-verify-bank-account>
-          <p>
-            <i class="bwi bwi-fw" [ngClass]="paymentSourceClasses"></i>
-            {{ subscription.paymentSource.description }}
-            <span *ngIf="subscription.paymentSource.needsVerification"
-              >- {{ "unverified" | i18n }}</span
-            >
-          </p>
-        </ng-container>
-        <button type="button" bitButton buttonType="secondary" [bitAction]="updatePaymentMethod">
-          {{ updatePaymentSourceButtonText }}
-        </button>
-      </bit-section>
-      <!-- Tax Information -->
-      <bit-section>
-        <h2 bitTypography="h2" class="tw-mt-16">{{ "taxInformation" | i18n }}</h2>
-        <p>{{ "taxInformationDesc" | i18n }}</p>
-        <app-manage-tax-information
-          *ngIf="subscription.taxInformation"
-          [startWith]="TaxInformation.from(subscription.taxInformation)"
-          [onSubmit]="updateTaxInformation"
-          (taxInformationUpdated)="load()"
-        />
-      </bit-section>
-    }
   </ng-container>
 </bit-container>
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts
index 83a23760d80..2e43ce966d3 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts
@@ -2,27 +2,17 @@
 // @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { concatMap, lastValueFrom, Subject, takeUntil } from "rxjs";
+import { concatMap, Subject, takeUntil } from "rxjs";
 
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
 import {
   ProviderPlanResponse,
   ProviderSubscriptionResponse,
 } from "@bitwarden/common/billing/models/response/provider-subscription-response";
-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 { DialogService, ToastService } from "@bitwarden/components";
 import { BillingNotificationService } from "@bitwarden/web-vault/app/billing/services/billing-notification.service";
-import {
-  AdjustPaymentDialogComponent,
-  AdjustPaymentDialogResultType,
-} from "@bitwarden/web-vault/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-provider-subscription",
   templateUrl: "./provider-subscription.component.html",
@@ -36,18 +26,11 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
   protected loading: boolean;
   private destroy$ = new Subject<void>();
   protected totalCost: number;
-  protected managePaymentDetailsOutsideCheckout: boolean;
-
-  protected readonly TaxInformation = TaxInformation;
 
   constructor(
     private billingApiService: BillingApiServiceAbstraction,
-    private i18nService: I18nService,
     private route: ActivatedRoute,
     private billingNotificationService: BillingNotificationService,
-    private dialogService: DialogService,
-    private toastService: ToastService,
-    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
@@ -55,9 +38,6 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
       .pipe(
         concatMap(async (params) => {
           this.providerId = params.providerId;
-          this.managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-            FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
-          );
           await this.load();
           this.firstLoaded = true;
         }),
@@ -83,40 +63,6 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
     }
   }
 
-  protected updatePaymentMethod = async (): Promise<void> => {
-    const dialogRef = AdjustPaymentDialogComponent.open(this.dialogService, {
-      data: {
-        initialPaymentMethod: this.subscription.paymentSource?.type,
-        providerId: this.providerId,
-      },
-    });
-
-    const result = await lastValueFrom(dialogRef.closed);
-
-    if (result === AdjustPaymentDialogResultType.Submitted) {
-      await this.load();
-    }
-  };
-
-  protected updateTaxInformation = async (taxInformation: TaxInformation) => {
-    try {
-      const request = ExpandedTaxInfoUpdateRequest.From(taxInformation);
-      await this.billingApiService.updateProviderTaxInformation(this.providerId, request);
-      this.billingNotificationService.showSuccess(this.i18nService.t("updatedTaxInformation"));
-    } catch (error) {
-      this.billingNotificationService.handleError(error);
-    }
-  };
-
-  protected verifyBankAccount = async (request: VerifyBankAccountRequest): Promise<void> => {
-    await this.billingApiService.verifyProviderBankAccount(this.providerId, request);
-    this.toastService.showToast({
-      variant: "success",
-      title: null,
-      message: this.i18nService.t("verifiedBankAccount"),
-    });
-  };
-
   protected getFormattedCost(
     cost: number,
     seatMinimum: number,
@@ -161,7 +107,7 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
   }
 
   protected getBillingCadenceLabel(providerPlanResponse: ProviderPlanResponse): string {
-    if (providerPlanResponse == null || providerPlanResponse == undefined) {
+    if (providerPlanResponse == null) {
       return "month";
     }
 
@@ -174,27 +120,4 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
         return "month";
     }
   }
-
-  protected get paymentSourceClasses() {
-    if (this.subscription.paymentSource == null) {
-      return [];
-    }
-    switch (this.subscription.paymentSource.type) {
-      case PaymentMethodType.Card:
-        return ["bwi-credit-card"];
-      case PaymentMethodType.BankAccount:
-      case PaymentMethodType.Check:
-        return ["bwi-billing"];
-      case PaymentMethodType.PayPal:
-        return ["bwi-paypal text-primary"];
-      default:
-        return [];
-    }
-  }
-
-  protected get updatePaymentSourceButtonText(): string {
-    const key =
-      this.subscription.paymentSource == null ? "addPaymentMethod" : "changePaymentMethod";
-    return this.i18nService.t(key);
-  }
 }
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/warnings/types/index.ts b/bitwarden_license/bit-web/src/app/billing/providers/warnings/types/index.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence-routing.module.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence-routing.module.ts
index 2e3c53d8d9f..4bdc8e25047 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence-routing.module.ts
@@ -6,17 +6,20 @@ import { organizationPermissionsGuard } from "@bitwarden/web-vault/app/admin-con
 import { RiskInsightsComponent } from "./risk-insights.component";
 
 const routes: Routes = [
-  { path: "", pathMatch: "full", redirectTo: "risk-insights" },
   {
-    path: "risk-insights",
-    canActivate: [
-      organizationPermissionsGuard((org) => org.useRiskInsights && org.canAccessReports),
-    ],
+    path: "",
+    canActivate: [organizationPermissionsGuard((org) => org.canAccessReports)],
     component: RiskInsightsComponent,
     data: {
-      titleId: "RiskInsights",
+      titleId: "accessIntelligence",
     },
   },
+  {
+    path: "risk-insights",
+    redirectTo: "",
+    pathMatch: "full",
+    // Backwards compatibility: redirect old "risk-insights" route to new base route
+  },
 ];
 
 @NgModule({
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts
index 1d80f2154b1..5592e4cc546 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts
@@ -3,14 +3,17 @@ import { NgModule } from "@angular/core";
 import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
 import { CriticalAppsService } from "@bitwarden/bit-common/dirt/reports/risk-insights";
 import {
+  AllActivitiesService,
   CriticalAppsApiService,
   MemberCipherDetailsApiService,
   PasswordHealthService,
   RiskInsightsApiService,
   RiskInsightsDataService,
   RiskInsightsReportService,
+  SecurityTasksApiService,
 } from "@bitwarden/bit-common/dirt/reports/risk-insights/services";
-import { RiskInsightsEncryptionService } from "@bitwarden/bit-common/dirt/reports/risk-insights/services/risk-insights-encryption.service";
+import { RiskInsightsEncryptionService } from "@bitwarden/bit-common/dirt/reports/risk-insights/services/domain/risk-insights-encryption.service";
+import { RiskInsightsOrchestratorService } from "@bitwarden/bit-common/dirt/reports/risk-insights/services/domain/risk-insights-orchestrator.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -20,58 +23,86 @@ import { EncryptService } from "@bitwarden/common/key-management/crypto/abstract
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength/password-strength.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+
+import { DefaultAdminTaskService } from "../../vault/services/default-admin-task.service";
 
 import { AccessIntelligenceRoutingModule } from "./access-intelligence-routing.module";
+import { NewApplicationsDialogComponent } from "./activity/application-review-dialog/new-applications-dialog.component";
 import { RiskInsightsComponent } from "./risk-insights.component";
+import { AccessIntelligenceSecurityTasksService } from "./shared/security-tasks.service";
 
 @NgModule({
-  imports: [RiskInsightsComponent, AccessIntelligenceRoutingModule],
+  imports: [RiskInsightsComponent, AccessIntelligenceRoutingModule, NewApplicationsDialogComponent],
   providers: [
-    {
-      provide: MemberCipherDetailsApiService,
-      deps: [ApiService],
-    },
-    {
-      provide: PasswordHealthService,
-      deps: [PasswordStrengthServiceAbstraction, AuditService],
-    },
-    {
-      provide: RiskInsightsApiService,
-      deps: [ApiService],
-    },
-    {
-      provide: RiskInsightsReportService,
-      deps: [
-        CipherService,
-        MemberCipherDetailsApiService,
-        RiskInsightsApiService,
-        RiskInsightsEncryptionService,
-        PasswordHealthService,
-      ],
-    },
     safeProvider({
-      provide: RiskInsightsDataService,
+      provide: CriticalAppsApiService,
+      useClass: CriticalAppsApiService,
+      deps: [ApiService],
+    }),
+    safeProvider({
+      provide: MemberCipherDetailsApiService,
+      useClass: MemberCipherDetailsApiService,
+      deps: [ApiService],
+    }),
+    safeProvider({
+      provide: RiskInsightsApiService,
+      useClass: RiskInsightsApiService,
+      deps: [ApiService],
+    }),
+    safeProvider({
+      provide: SecurityTasksApiService,
+      useClass: SecurityTasksApiService,
+      deps: [ApiService],
+    }),
+    safeProvider(DefaultAdminTaskService),
+    safeProvider({
+      provide: AccessIntelligenceSecurityTasksService,
+      useClass: AccessIntelligenceSecurityTasksService,
+      deps: [DefaultAdminTaskService, SecurityTasksApiService],
+    }),
+    safeProvider({
+      provide: PasswordHealthService,
+      useClass: PasswordHealthService,
+      deps: [AuditService, PasswordStrengthServiceAbstraction],
+    }),
+    safeProvider({
+      provide: RiskInsightsReportService,
+      useClass: RiskInsightsReportService,
+      deps: [RiskInsightsApiService, RiskInsightsEncryptionService],
+    }),
+    safeProvider({
+      provide: RiskInsightsOrchestratorService,
       deps: [
         AccountServiceAbstraction,
+        CipherService,
         CriticalAppsService,
+        LogService,
+        MemberCipherDetailsApiService,
         OrganizationService,
+        PasswordHealthService,
+        RiskInsightsApiService,
         RiskInsightsReportService,
+        RiskInsightsEncryptionService,
       ],
     }),
-    {
+    safeProvider({
+      provide: RiskInsightsDataService,
+      deps: [RiskInsightsOrchestratorService],
+    }),
+    safeProvider({
       provide: RiskInsightsEncryptionService,
-      useClass: RiskInsightsEncryptionService,
-      deps: [KeyService, EncryptService, KeyGenerationService],
-    },
+      deps: [KeyService, EncryptService, KeyGenerationService, LogService],
+    }),
     safeProvider({
       provide: CriticalAppsService,
       useClass: CriticalAppsService,
       deps: [KeyService, EncryptService, CriticalAppsApiService],
     }),
     safeProvider({
-      provide: CriticalAppsApiService,
-      useClass: CriticalAppsApiService,
-      deps: [ApiService],
+      provide: AllActivitiesService,
+      useClass: AllActivitiesService,
+      deps: [RiskInsightsDataService],
     }),
   ],
 })
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-card.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-card.component.html
deleted file mode 100644
index 227ca555786..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-card.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="tw-flex-col">
-  <span bitTypography="h6" class="tw-flex tw-text-main">{{ title | i18n }}</span>
-  <div class="tw-flex tw-items-baseline tw-gap-2">
-    <span bitTypography="h3">{{ cardMetrics | i18n: value }}</span>
-  </div>
-  <div class="tw-flex tw-items-baseline tw-gap-2">
-    <span bitTypography="body2">{{ metricDescription | i18n }}</span>
-  </div>
-</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-card.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-card.component.ts
deleted file mode 100644
index 5b9433634e6..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity-card.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component, Input } from "@angular/core";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { TypographyModule } from "@bitwarden/components";
-
-@Component({
-  selector: "dirt-activity-card",
-  templateUrl: "./activity-card.component.html",
-  imports: [CommonModule, TypographyModule, JslibModule],
-  host: {
-    class:
-      "tw-box-border tw-bg-background tw-block tw-text-main tw-border-solid tw-border tw-border-secondary-300 tw-border [&:not(bit-layout_*)]:tw-rounded-lg tw-rounded-lg tw-p-6",
-  },
-})
-export class ActivityCardComponent {
-  /**
-   * The title of the card goes here
-   */
-  @Input() title: string = "";
-  /**
-   * The current value of the card as emphasized text
-   */
-  @Input() value: number | null = null;
-  /**
-   * The card metrics text to display next to the value
-   */
-  @Input() cardMetrics: string = "";
-  /**
-   * The description text to display below the value and metrics
-   */
-  @Input() metricDescription: string = "";
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-card.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-card.component.html
new file mode 100644
index 00000000000..73f98034f0a
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-card.component.html
@@ -0,0 +1,35 @@
+<div class="tw-flex-col">
+  <span bitTypography="h6" class="tw-flex tw-text-main">{{ title }}</span>
+  <div class="tw-flex tw-items-baseline tw-gap-2">
+    @if (iconClass) {
+      <i class="bwi {{ iconClass }} {{ iconColorClass }}" aria-hidden="true"></i>
+    }
+    <span bitTypography="h3">{{ cardMetrics }}</span>
+  </div>
+  <div class="tw-flex tw-items-baseline tw-mt-4 tw-gap-2">
+    <span bitTypography="body2">{{ metricDescription }}</span>
+  </div>
+  @if (buttonClick.observed && buttonText) {
+    <div class="tw-flex tw-items-baseline tw-mt-4 tw-gap-2">
+      <button
+        type="button"
+        bitButton
+        size="small"
+        [buttonType]="buttonType"
+        [attr.aria-label]="buttonText"
+        (click)="onButtonClick()"
+      >
+        {{ buttonText }}
+      </button>
+    </div>
+  }
+  @if (showActionLink && !buttonText) {
+    <div class="tw-flex tw-items-baseline tw-mt-4 tw-gap-2">
+      <p bitTypography="body1">
+        <a bitLink href="#" (click)="onActionClick(); $event.preventDefault()" rel="noreferrer">
+          {{ actionText }}
+        </a>
+      </p>
+    </div>
+  }
+</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-card.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-card.component.ts
new file mode 100644
index 00000000000..24d931165a7
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-card.component.ts
@@ -0,0 +1,106 @@
+import { CommonModule } from "@angular/common";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { Router } from "@angular/router";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { ButtonModule, ButtonType, LinkModule, TypographyModule } from "@bitwarden/components";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "dirt-activity-card",
+  templateUrl: "./activity-card.component.html",
+  imports: [CommonModule, TypographyModule, JslibModule, LinkModule, ButtonModule],
+  host: {
+    class:
+      "tw-box-border tw-bg-background tw-block tw-text-main tw-border-solid tw-border tw-border-secondary-300 tw-border [&:not(bit-layout_*)]:tw-rounded-lg tw-rounded-lg tw-p-6 tw-h-56 tw-max-h-56",
+  },
+})
+export class ActivityCardComponent {
+  /**
+   * The title of the card goes here
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() title: string = "";
+  /**
+   * The card metrics text to display next to the value
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() cardMetrics: string = "";
+  /**
+   * The description text to display below the value and metrics
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() metricDescription: string = "";
+
+  /**
+   * The text to display for the action link
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() actionText: string = "";
+
+  /**
+   * Show action link
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() showActionLink: boolean = false;
+
+  /**
+   * Icon class to display next to metrics (e.g., "bwi-exclamation-triangle").
+   * If null, no icon is displayed.
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() iconClass: string | null = null;
+
+  /**
+   * CSS class for icon color (e.g., "tw-text-success", "tw-text-muted").
+   * Defaults to "tw-text-muted" if not provided.
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() iconColorClass: string = "tw-text-muted";
+
+  /**
+   * Button text. If provided, a button will be displayed instead of a navigation link.
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() buttonText: string = "";
+
+  /**
+   * Button type (e.g., "primary", "secondary")
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() buttonType: ButtonType = "primary";
+
+  /**
+   * Event emitted when button is clicked
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
+  @Output() buttonClick = new EventEmitter<void>();
+
+  /**
+   * Event emitted when action link is clicked
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
+  @Output() actionClick = new EventEmitter<void>();
+
+  constructor(private router: Router) {}
+
+  onButtonClick = () => {
+    this.buttonClick.emit();
+  };
+
+  onActionClick = () => {
+    this.actionClick.emit();
+  };
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.html
new file mode 100644
index 00000000000..fe9880724f3
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.html
@@ -0,0 +1,84 @@
+<div
+  class="tw-flex tw-flex-col tw-p-6 tw-box-border tw-bg-background tw-text-main tw-border-solid tw-border tw-border-secondary-300 tw-rounded-lg tw-h-56 tw-max-h-56"
+>
+  <div bitTypography="h6" class="tw-mb-2">
+    {{ "passwordChangeProgress" | i18n }}
+  </div>
+
+  @switch (currentView()) {
+    @case (PasswordChangeViewEnum.EMPTY) {
+      <div class="tw-items-start tw-mb-2">
+        <span bitTypography="h3">{{ "assignMembersTasksToMonitorProgress" | i18n }}</span>
+      </div>
+
+      <div class="tw-items-baseline tw-gap-2">
+        <span bitTypography="body2">{{ "onceYouReviewApplications" | i18n }}</span>
+      </div>
+    }
+
+    @case (PasswordChangeViewEnum.NO_TASKS_ASSIGNED) {
+      <div class="tw-items-start tw-mb-2">
+        <span bitTypography="h3">{{ "assignMembersTasksToMonitorProgress" | i18n }}</span>
+      </div>
+
+      <div class="tw-items-baseline tw-gap-2">
+        <span bitTypography="body2">{{
+          "countOfAtRiskPasswords" | i18n: atRiskPasswordCount()
+        }}</span>
+      </div>
+
+      @if (atRiskPasswordCount() > 0) {
+        <div class="tw-mt-4">
+          <button bitButton buttonType="secondary" type="button" (click)="assignTasks()">
+            <i class="bwi bwi-envelope tw-mr-2"></i>
+            {{ "assignTasks" | i18n }}
+          </button>
+        </div>
+      }
+    }
+
+    @case (PasswordChangeViewEnum.NEW_TASKS_AVAILABLE) {
+      <div class="tw-items-start tw-mb-2">
+        <span bitTypography="h3">{{ "assignMembersTasksToMonitorProgress" | i18n }}</span>
+      </div>
+
+      <div class="tw-items-baseline tw-gap-2">
+        <span bitTypography="body2">{{ "newPasswordsAtRisk" | i18n: unassignedCipherIds() }}</span>
+      </div>
+
+      <div class="tw-mt-4">
+        <button bitButton buttonType="secondary" type="button" (click)="assignTasks()">
+          <i class="bwi bwi-envelope tw-mr-2"></i>
+          {{ "assignTasks" | i18n }}
+        </button>
+      </div>
+    }
+
+    @case (PasswordChangeViewEnum.PROGRESS) {
+      <div class="tw-items-start tw-mb-2">
+        <span bitTypography="h3">{{ "percentageCompleted" | i18n: completedTasksPercent() }}</span>
+      </div>
+
+      <div class="tw-items-baseline tw-gap-2">
+        <span bitTypography="body2">{{
+          "securityTasksCompleted" | i18n: completedTasksCount() : tasksCount()
+        }}</span>
+      </div>
+
+      <div class="tw-mt-4">
+        <div class="tw-flex tw-justify-between">
+          <div bitTypography="body2">{{ completedTasksCount() }}</div>
+          <div bitTypography="body2">{{ tasksCount() }}</div>
+        </div>
+      </div>
+      <bit-progress
+        [showText]="false"
+        size="small"
+        bgColor="primary"
+        [barWidth]="completedTasksPercent()"
+        [ariaLabel]="'passwordChangeProgressBar' | i18n"
+      >
+      </bit-progress>
+    }
+  }
+</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.ts
new file mode 100644
index 00000000000..30e1db7b438
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.ts
@@ -0,0 +1,174 @@
+import { CommonModule } from "@angular/common";
+import {
+  ChangeDetectionStrategy,
+  Component,
+  DestroyRef,
+  Injector,
+  OnInit,
+  Signal,
+  computed,
+  effect,
+  inject,
+  input,
+  signal,
+} from "@angular/core";
+import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
+import { map } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+  AllActivitiesService,
+  RiskInsightsDataService,
+} from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+import { SecurityTask, SecurityTaskStatus } from "@bitwarden/common/vault/tasks";
+import {
+  ButtonModule,
+  ProgressModule,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+
+import { AccessIntelligenceSecurityTasksService } from "../../shared/security-tasks.service";
+
+export const PasswordChangeView = {
+  EMPTY: "empty",
+  NO_TASKS_ASSIGNED: "noTasksAssigned",
+  NEW_TASKS_AVAILABLE: "newTasks",
+  PROGRESS: "progress",
+} as const;
+
+export type PasswordChangeView = (typeof PasswordChangeView)[keyof typeof PasswordChangeView];
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: "dirt-password-change-metric",
+  imports: [CommonModule, TypographyModule, JslibModule, ProgressModule, ButtonModule],
+  templateUrl: "./password-change-metric.component.html",
+})
+export class PasswordChangeMetricComponent implements OnInit {
+  PasswordChangeViewEnum = PasswordChangeView;
+
+  private destroyRef = inject(DestroyRef);
+
+  // Inputs
+  // Prefer component input since route param controls UI state
+  readonly organizationId = input.required<OrganizationId>();
+
+  // Signal states
+  private readonly _tasks: Signal<SecurityTask[]> = signal<SecurityTask[]>([]);
+  private readonly _atRiskCipherIds: Signal<CipherId[]> = signal<CipherId[]>([]);
+  private readonly _hasCriticalApplications: Signal<boolean> = signal<boolean>(false);
+
+  // Computed properties
+  readonly tasksCount = computed(() => this._tasks().length);
+  readonly completedTasksCount = computed(
+    () => this._tasks().filter((task) => task.status === SecurityTaskStatus.Completed).length,
+  );
+  readonly completedTasksPercent = computed(() => {
+    const total = this.tasksCount();
+    // Account for case where there are no tasks to avoid NaN
+    return total > 0 ? Math.round((this.completedTasksCount() / total) * 100) : 0;
+  });
+
+  readonly unassignedCipherIds = computed<number>(() => {
+    const atRiskIds = this._atRiskCipherIds();
+    const tasks = this._tasks();
+
+    if (tasks.length === 0) {
+      return atRiskIds.length;
+    }
+
+    const inProgressTasks = tasks.filter((task) => task.status === SecurityTaskStatus.Pending);
+    const assignedIdSet = new Set(inProgressTasks.map((task) => task.cipherId));
+    const unassignedIds = atRiskIds.filter((id) => !assignedIdSet.has(id));
+
+    return unassignedIds.length;
+  });
+
+  readonly atRiskPasswordCount = computed<number>(() => {
+    const atRiskIds = this._atRiskCipherIds();
+    const atRiskIdsSet = new Set(atRiskIds);
+
+    return atRiskIdsSet.size;
+  });
+
+  readonly currentView = computed<PasswordChangeView>(() => {
+    if (!this._hasCriticalApplications()) {
+      return PasswordChangeView.EMPTY;
+    }
+    if (this.tasksCount() === 0) {
+      return PasswordChangeView.NO_TASKS_ASSIGNED;
+    }
+    if (this.unassignedCipherIds() > 0) {
+      return PasswordChangeView.NEW_TASKS_AVAILABLE;
+    }
+    return PasswordChangeView.PROGRESS;
+  });
+
+  constructor(
+    private allActivitiesService: AllActivitiesService,
+    private i18nService: I18nService,
+    private injector: Injector,
+    private riskInsightsDataService: RiskInsightsDataService,
+    protected securityTasksService: AccessIntelligenceSecurityTasksService,
+    private toastService: ToastService,
+  ) {
+    // Setup the _tasks signal by manually passing in the injector
+    this._tasks = toSignal(this.securityTasksService.tasks$, {
+      initialValue: [],
+      injector: this.injector,
+    });
+    // Setup the _atRiskCipherIds signal by manually passing in the injector
+    this._atRiskCipherIds = toSignal(
+      this.riskInsightsDataService.criticalApplicationAtRiskCipherIds$,
+      {
+        initialValue: [],
+        injector: this.injector,
+      },
+    );
+
+    this._hasCriticalApplications = toSignal(
+      this.riskInsightsDataService.criticalReportResults$.pipe(
+        takeUntilDestroyed(this.destroyRef),
+        map((report) => {
+          return report != null && (report.reportData?.length ?? 0) > 0;
+        }),
+      ),
+      {
+        initialValue: false,
+        injector: this.injector,
+      },
+    );
+
+    effect(() => {
+      const isShowingProgress = this.currentView() === PasswordChangeView.PROGRESS;
+      this.allActivitiesService.setExtendPasswordWidget(isShowingProgress);
+    });
+  }
+
+  async ngOnInit(): Promise<void> {
+    await this.securityTasksService.loadTasks(this.organizationId());
+  }
+
+  async assignTasks() {
+    try {
+      await this.securityTasksService.requestPasswordChangeForCriticalApplications(
+        this.organizationId(),
+        this._atRiskCipherIds(),
+      );
+      this.toastService.showToast({
+        message: this.i18nService.t("notifiedMembers"),
+        variant: "success",
+        title: this.i18nService.t("success"),
+      });
+    } catch {
+      this.toastService.showToast({
+        message: this.i18nService.t("unexpectedError"),
+        variant: "error",
+        title: this.i18nService.t("error"),
+      });
+    }
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.html
new file mode 100644
index 00000000000..c9b930b3b50
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.html
@@ -0,0 +1,96 @@
+@if ((dataService.reportStatus$ | async) == ReportStatusEnum.Loading) {
+  <dirt-risk-insights-loading></dirt-risk-insights-loading>
+} @else {
+  <ul
+    class="tw-inline-grid tw-grid-cols-3 tw-gap-6 tw-m-0 tw-p-0 tw-w-full tw-auto-cols-auto tw-list-none"
+  >
+    <li class="tw-col-span-1" [ngClass]="{ 'tw-col-span-2': extendPasswordChangeWidget }">
+      <dirt-password-change-metric
+        [organizationId]="this.organizationId()"
+      ></dirt-password-change-metric>
+    </li>
+
+    <li class="tw-col-span-1">
+      <dirt-activity-card
+        [title]="'atRiskMembers' | i18n"
+        [cardMetrics]="'membersAtRiskCount' | i18n: totalCriticalAppsAtRiskMemberCount"
+        [metricDescription]="'membersWithAccessToAtRiskItemsForCriticalApplications' | i18n"
+        actionText="{{ 'viewAtRiskMembers' | i18n }}"
+        [showActionLink]="totalCriticalAppsAtRiskMemberCount > 0"
+        (actionClick)="onViewAtRiskMembers()"
+      >
+      </dirt-activity-card>
+    </li>
+
+    <li class="tw-col-span-1">
+      <dirt-activity-card
+        #allAppsOrgAtRiskApplications
+        [title]="'criticalApplications' | i18n"
+        [cardMetrics]="
+          totalCriticalAppsCount === 0
+            ? ('countOfCriticalApplications' | i18n: totalCriticalAppsCount)
+            : ('countOfApplicationsAtRisk' | i18n: totalCriticalAppsAtRiskCount)
+        "
+        [metricDescription]="
+          totalCriticalAppsCount === 0
+            ? ('onceYouMarkApplicationsCriticalTheyWillDisplayHere' | i18n)
+            : ('criticalApplicationsAreAtRisk'
+              | i18n: totalCriticalAppsAtRiskCount : totalCriticalAppsCount)
+        "
+        actionText="{{ 'viewAtRiskApplications' | i18n }}"
+        [showActionLink]="totalCriticalAppsAtRiskCount > 0"
+        (actionClick)="onViewAtRiskApplications()"
+      >
+      </dirt-activity-card>
+    </li>
+
+    <!-- All Caught Up State -->
+    @if (isAllCaughtUp) {
+      <li class="tw-col-span-1">
+        <dirt-activity-card
+          [title]="'applicationsNeedingReview' | i18n"
+          [cardMetrics]="'allCaughtUp' | i18n"
+          [metricDescription]="'noNewApplicationsToReviewAtThisTime' | i18n"
+          [iconClass]="'bwi-check-circle'"
+          [iconColorClass]="'tw-text-success'"
+          [buttonText]="''"
+          [buttonType]="'primary'"
+          (buttonClick)="onReviewNewApplications()"
+        >
+        </dirt-activity-card>
+      </li>
+    }
+    <!-- Needs Review State (No apps have been reviewed) -->
+    @else if (showNeedsReviewState) {
+      <li class="tw-col-span-2">
+        <dirt-activity-card
+          [title]="'applicationsNeedingReview' | i18n"
+          [cardMetrics]="'organizationHasItemsSavedForApplications' | i18n: totalApplicationCount"
+          [metricDescription]="'reviewApplicationsToSecureItems' | i18n"
+          [iconClass]="'bwi-exclamation-triangle'"
+          [iconColorClass]="'tw-text-warning'"
+          [buttonText]="'reviewApplications' | i18n"
+          [buttonType]="'primary'"
+          (buttonClick)="onReviewNewApplications()"
+        >
+        </dirt-activity-card>
+      </li>
+    }
+    <!-- Default State (New applications to review) -->
+    @else {
+      <li class="tw-col-span-1">
+        <dirt-activity-card
+          [title]="'reviewNewApplications' | i18n"
+          [cardMetrics]="'newApplicationsWithCount' | i18n: newApplicationsCount"
+          [metricDescription]="'newApplicationsDescription' | i18n"
+          [iconClass]="'bwi-exclamation-triangle'"
+          [iconColorClass]="'tw-text-warning'"
+          [buttonText]="'reviewNow' | i18n"
+          [buttonType]="'primary'"
+          (buttonClick)="onReviewNewApplications()"
+        >
+        </dirt-activity-card>
+      </li>
+    }
+  </ul>
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.ts
new file mode 100644
index 00000000000..907e8883a43
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.ts
@@ -0,0 +1,177 @@
+import { Component, DestroyRef, inject, input, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ActivatedRoute } from "@angular/router";
+import { lastValueFrom } from "rxjs";
+
+import {
+  AllActivitiesService,
+  ApplicationHealthReportDetail,
+  ReportStatus,
+  RiskInsightsDataService,
+} from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { DialogService } from "@bitwarden/components";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+import { ApplicationsLoadingComponent } from "../shared/risk-insights-loading.component";
+
+import { ActivityCardComponent } from "./activity-card.component";
+import { PasswordChangeMetricComponent } from "./activity-cards/password-change-metric.component";
+import { NewApplicationsDialogComponent } from "./application-review-dialog/new-applications-dialog.component";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "dirt-all-activity",
+  imports: [
+    ApplicationsLoadingComponent,
+    SharedModule,
+    ActivityCardComponent,
+    PasswordChangeMetricComponent,
+  ],
+  templateUrl: "./all-activity.component.html",
+})
+export class AllActivityComponent implements OnInit {
+  // Prefer component input since route param controls UI state
+  readonly organizationId = input.required<OrganizationId>();
+
+  totalCriticalAppsAtRiskMemberCount = 0;
+  totalCriticalAppsCount = 0;
+  totalCriticalAppsAtRiskCount = 0;
+  totalApplicationCount = 0;
+  newApplicationsCount = 0;
+  newApplications: ApplicationHealthReportDetail[] = [];
+  extendPasswordChangeWidget = false;
+  allAppsHaveReviewDate = false;
+  isAllCaughtUp = false;
+  hasLoadedApplicationData = false;
+  showNeedsReviewState = false;
+
+  destroyRef = inject(DestroyRef);
+
+  protected ReportStatusEnum = ReportStatus;
+
+  constructor(
+    protected activatedRoute: ActivatedRoute,
+    protected allActivitiesService: AllActivitiesService,
+    protected dataService: RiskInsightsDataService,
+    private dialogService: DialogService,
+    protected organizationService: OrganizationService,
+  ) {}
+
+  async ngOnInit(): Promise<void> {
+    this.allActivitiesService.reportSummary$
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((summary) => {
+        this.totalCriticalAppsAtRiskMemberCount = summary.totalCriticalAtRiskMemberCount;
+        this.totalCriticalAppsCount = summary.totalCriticalApplicationCount;
+        this.totalCriticalAppsAtRiskCount = summary.totalCriticalAtRiskApplicationCount;
+        this.totalApplicationCount = summary.totalApplicationCount;
+        // If we have application data, mark as loaded
+        if (summary.totalApplicationCount > 0) {
+          this.hasLoadedApplicationData = true;
+        }
+        this.updateShowNeedsReviewState();
+      });
+
+    this.dataService.newApplications$
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((newApps) => {
+        this.newApplications = newApps;
+        this.newApplicationsCount = newApps.length;
+        this.updateIsAllCaughtUp();
+        this.updateShowNeedsReviewState();
+      });
+
+    this.allActivitiesService.extendPasswordChangeWidget$
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((hasProgressBar) => {
+        this.extendPasswordChangeWidget = hasProgressBar;
+      });
+
+    this.dataService.enrichedReportData$
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((enrichedData) => {
+        if (enrichedData?.applicationData && enrichedData.applicationData.length > 0) {
+          this.hasLoadedApplicationData = true;
+          // Check if all apps have a review date (not null and not undefined)
+          this.allAppsHaveReviewDate = enrichedData.applicationData.every(
+            (app) => app.reviewedDate !== null && app.reviewedDate !== undefined,
+          );
+        } else {
+          this.hasLoadedApplicationData = enrichedData !== null;
+          this.allAppsHaveReviewDate = false;
+        }
+        this.updateIsAllCaughtUp();
+      });
+  }
+
+  /**
+   * Updates the isAllCaughtUp flag based on current state.
+   * Only shows "All caught up!" when:
+   * - Data has been loaded (hasLoadedApplicationData is true)
+   * - No new applications need review
+   * - All apps have a review date
+   */
+  private updateIsAllCaughtUp(): void {
+    this.isAllCaughtUp =
+      this.hasLoadedApplicationData &&
+      this.newApplicationsCount === 0 &&
+      this.allAppsHaveReviewDate;
+  }
+
+  /**
+   * Updates the showNeedsReviewState flag based on current state.
+   * This state is shown when:
+   * - Data has been loaded
+   * - There are applications (totalApplicationCount > 0)
+   * - ALL apps do NOT have a review date (newApplicationsCount === totalApplicationCount)
+   */
+  private updateShowNeedsReviewState(): void {
+    this.showNeedsReviewState =
+      this.hasLoadedApplicationData &&
+      this.totalApplicationCount > 0 &&
+      this.newApplicationsCount === this.totalApplicationCount;
+  }
+
+  /**
+   * Handles the review new applications button click.
+   * Opens a dialog showing the list of new applications that can be marked as critical.
+   */
+  async onReviewNewApplications() {
+    const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId");
+
+    if (!organizationId) {
+      return;
+    }
+
+    // Pass organizationId via dialog data instead of having the dialog retrieve it from route.
+    // This ensures organizationId is immediately available when dialog opens, preventing
+    // timing issues where the dialog's checkForTasksToAssign() method runs before
+    // organizationId is populated via async route subscription.
+    const dialogRef = NewApplicationsDialogComponent.open(this.dialogService, {
+      newApplications: this.newApplications,
+      organizationId: organizationId as OrganizationId,
+      hasExistingCriticalApplications: this.totalCriticalAppsCount > 0,
+    });
+
+    await lastValueFrom(dialogRef.closed);
+  }
+
+  /**
+   * Handles the "View at-risk members" link click.
+   * Opens the at-risk members drawer for critical applications only.
+   */
+  async onViewAtRiskMembers() {
+    await this.dataService.setDrawerForCriticalAtRiskMembers("activityTabAtRiskMembers");
+  }
+
+  /**
+   * Handles the "View at-risk applications" link click.
+   * Opens the at-risk applications drawer for critical applications only.
+   */
+  async onViewAtRiskApplications() {
+    await this.dataService.setDrawerForCriticalAtRiskApps("activityTabAtRiskApplications");
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/assign-tasks-view.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/assign-tasks-view.component.html
new file mode 100644
index 00000000000..572918907f4
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/assign-tasks-view.component.html
@@ -0,0 +1,78 @@
+<div class="tw-flex tw-flex-col tw-gap-6">
+  <!-- Two-column layout: Left panel (stats) and Right panel (browser extension mockup) -->
+  <div class="tw-flex tw-flex-col md:tw-flex-row tw-gap-6">
+    <!-- Left Panel -->
+    <div class="tw-flex tw-flex-col tw-gap-4 tw-flex-1">
+      <!-- Task Summary Info Card -->
+      <bit-callout type="info" [title]="'taskSummary' | i18n" class="tw-mb-6">
+        <strong>{{ atRiskCriticalMembersCount() }}</strong>
+        {{ "membersWithAtRiskPasswords" | i18n }}
+        for
+        <strong>{{ criticalApplicationsCount() }}</strong>
+        {{ "criticalApplications" | i18n }}
+      </bit-callout>
+
+      <!-- Stat Box: Members with At-Risk Passwords -->
+      <div class="tw-flex tw-items-start tw-gap-3">
+        <bit-icon-tile
+          icon="bwi-users"
+          variant="primary"
+          size="large"
+          shape="circle"
+          aria-hidden="true"
+        ></bit-icon-tile>
+        <div class="tw-flex tw-flex-col">
+          <span bitTypography="h2" class="tw-font-medium tw-mb-1">
+            {{ atRiskCriticalMembersCount() }}
+          </span>
+          <span bitTypography="body2" class="tw-text-muted">
+            {{ "membersWithAtRiskPasswords" | i18n }}
+          </span>
+        </div>
+      </div>
+
+      <!-- Stat Box: Critical Applications At-Risk -->
+      <div class="tw-flex tw-items-start tw-gap-3">
+        <bit-icon-tile
+          icon="bwi-desktop"
+          variant="warning"
+          size="large"
+          shape="circle"
+          aria-hidden="true"
+        ></bit-icon-tile>
+        <div class="tw-flex tw-flex-col">
+          <div class="tw-flex tw-items-baseline tw-gap-2 tw-mb-1">
+            <span bitTypography="h2" class="tw-font-medium tw-text-main">
+              {{ criticalApplicationsCount() }}
+            </span>
+            <span bitTypography="body1" class="tw-text-muted">
+              of {{ totalApplicationsCount() }} total
+            </span>
+          </div>
+          <span bitTypography="body2" class="tw-text-muted">
+            {{ "criticalApplications" | i18n }} at-risk
+          </span>
+        </div>
+      </div>
+    </div>
+
+    <!-- Right Panel: Browser Extension Video -->
+    <div class="tw-flex tw-flex-col tw-gap-4 tw-flex-1">
+      <video
+        class="tw-w-full tw-rounded-lg"
+        autoplay
+        loop
+        muted
+        playsinline
+        src="/videos/access-intelligence-assign-tasks.mp4"
+        appDarkImgSrc="/videos/access-intelligence-assign-tasks-dark.mp4"
+        aria-hidden="true"
+      ></video>
+
+      <!-- Description Text -->
+      <div bitTypography="helper" class="tw-text-muted">
+        {{ "membersWillReceiveSecurityTask" | i18n }}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/assign-tasks-view.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/assign-tasks-view.component.ts
new file mode 100644
index 00000000000..15d927a7714
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/assign-tasks-view.component.ts
@@ -0,0 +1,41 @@
+import { CommonModule } from "@angular/common";
+import { ChangeDetectionStrategy, Component, input } from "@angular/core";
+
+import {
+  ButtonModule,
+  CalloutComponent,
+  IconTileComponent,
+  TypographyModule,
+} from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+import { DarkImageSourceDirective } from "@bitwarden/vault";
+
+/**
+ * Embedded component for displaying task assignment UI.
+ * Not a dialog - intended to be embedded within a parent dialog.
+ *
+ * Important: This component provides its own instances of AccessIntelligenceSecurityTasksService
+ * and DefaultAdminTaskService. These services are scoped to this component to ensure proper
+ * dependency injection when the component is dynamically rendered within the structure.
+ * Without these providers, Angular would throw NullInjectorError when trying to inject
+ * DefaultAdminTaskService, which is required by AccessIntelligenceSecurityTasksService.
+ */
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: "dirt-assign-tasks-view",
+  templateUrl: "./assign-tasks-view.component.html",
+  imports: [
+    CommonModule,
+    ButtonModule,
+    TypographyModule,
+    I18nPipe,
+    IconTileComponent,
+    DarkImageSourceDirective,
+    CalloutComponent,
+  ],
+})
+export class AssignTasksViewComponent {
+  readonly criticalApplicationsCount = input.required<number>();
+  readonly totalApplicationsCount = input.required<number>();
+  readonly atRiskCriticalMembersCount = input.required<number>();
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/new-applications-dialog.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/new-applications-dialog.component.html
new file mode 100644
index 00000000000..2742dfdd8cb
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/new-applications-dialog.component.html
@@ -0,0 +1,103 @@
+<bit-dialog [dialogSize]="'large'">
+  <span bitDialogTitle>
+    {{
+      currentView() === DialogView.SelectApplications
+        ? hasNoCriticalApplications()
+          ? ("prioritizeCriticalApplications" | i18n)
+          : ("reviewNewApplications" | i18n)
+        : ("assignSecurityTasksToMembers" | i18n)
+    }}
+  </span>
+
+  <div bitDialogContent>
+    @if (currentView() === DialogView.SelectApplications) {
+      <div>
+        <p bitTypography="body1" class="tw-mb-5">
+          {{
+            hasNoCriticalApplications()
+              ? ("selectCriticalAppsDescription" | i18n)
+              : ("reviewNewAppsDescription" | i18n)
+          }}
+        </p>
+
+        <div class="tw-flex tw-items-center tw-gap-2.5 tw-mb-5">
+          <i class="bwi bwi-star-f tw-text-xl" aria-hidden="true"></i>
+          <p bitTypography="helper" class="tw-text-muted tw-mb-0">
+            {{ "clickIconToMarkAppAsCritical" | i18n }}
+          </p>
+        </div>
+
+        <dirt-review-applications-view
+          [applications]="applicationsWithIcons()"
+          [selectedApplications]="selectedApplications()"
+          (onToggleSelection)="toggleSelection($event)"
+          (onToggleAll)="toggleAll()"
+        ></dirt-review-applications-view>
+      </div>
+    }
+
+    @if (currentView() === DialogView.AssignTasks) {
+      <dirt-assign-tasks-view
+        [criticalApplicationsCount]="newAtRiskCriticalApplications().length"
+        [totalApplicationsCount]="newCriticalApplications().length"
+        [atRiskCriticalMembersCount]="atRiskCriticalMembersCount()"
+      >
+      </dirt-assign-tasks-view>
+    }
+  </div>
+
+  @if (currentView() === DialogView.SelectApplications) {
+    <ng-container bitDialogFooter>
+      <button
+        type="button"
+        bitButton
+        size="small"
+        buttonType="primary"
+        (click)="handleMarkAsCritical()"
+        [disabled]="markingAsCritical()"
+        [loading]="markingAsCritical()"
+        [attr.aria-label]="'markAsCritical' | i18n"
+      >
+        {{ "markAsCritical" | i18n }}
+      </button>
+      <button
+        type="button"
+        bitButton
+        size="small"
+        buttonType="secondary"
+        [bitDialogClose]="false"
+        [attr.aria-label]="'cancel' | i18n"
+      >
+        {{ "cancel" | i18n }}
+      </button>
+    </ng-container>
+  }
+  @if (currentView() == DialogView.AssignTasks) {
+    <!-- Footer: Action Buttons -->
+    <ng-container bitDialogFooter>
+      <button
+        type="button"
+        bitButton
+        size="small"
+        buttonType="primary"
+        (click)="handleAssignTasks()"
+        [disabled]="saving()"
+        [loading]="saving()"
+        [attr.aria-label]="'assignTasks' | i18n"
+      >
+        {{ "assignTasks" | i18n }}
+      </button>
+      <button
+        type="button"
+        bitButton
+        size="small"
+        buttonType="secondary"
+        (click)="onBack()"
+        [disabled]="saving()"
+        [attr.aria-label]="'back' | i18n"
+      >
+        {{ "back" | i18n }}
+      </button>
+    </ng-container>
+  }
+</bit-dialog>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/new-applications-dialog.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/new-applications-dialog.component.ts
new file mode 100644
index 00000000000..4de8ecd9cd0
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/new-applications-dialog.component.ts
@@ -0,0 +1,343 @@
+import { CommonModule } from "@angular/common";
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  DestroyRef,
+  Inject,
+  inject,
+  Injector,
+  Signal,
+  signal,
+} from "@angular/core";
+import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
+import { from, switchMap, take } from "rxjs";
+
+import {
+  ApplicationHealthReportDetail,
+  RiskInsightsDataService,
+} from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { getUniqueMembers } from "@bitwarden/bit-common/dirt/reports/risk-insights/helpers";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+import { SecurityTask, SecurityTaskStatus } from "@bitwarden/common/vault/tasks";
+import {
+  ButtonModule,
+  DIALOG_DATA,
+  DialogModule,
+  DialogRef,
+  DialogService,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import { CipherIcon } from "../../shared/app-table-row-scrollable.component";
+import { AccessIntelligenceSecurityTasksService } from "../../shared/security-tasks.service";
+
+import { AssignTasksViewComponent } from "./assign-tasks-view.component";
+import { ReviewApplicationsViewComponent } from "./review-applications-view.component";
+
+export interface NewApplicationsDialogData {
+  newApplications: ApplicationHealthReportDetail[];
+  /**
+   * Organization ID is passed via dialog data instead of being retrieved from route params.
+   * This ensures organizationId is available immediately when the dialog opens,
+   * preventing async timing issues where user clicks "Mark as critical" before
+   * the route subscription has fired.
+   */
+  organizationId: OrganizationId;
+  /**
+   * Whether the organization has any existing critical applications.
+   * Used to determine which title and description to show in the dialog.
+   */
+  hasExistingCriticalApplications: boolean;
+}
+
+/**
+ * View states for dialog navigation
+ * Using const object pattern per ADR-0025 (Deprecate TypeScript Enums)
+ */
+export const DialogView = Object.freeze({
+  SelectApplications: "select",
+  AssignTasks: "assign",
+} as const);
+
+export type DialogView = (typeof DialogView)[keyof typeof DialogView];
+
+// Possible results for closing the dialog
+export const NewApplicationsDialogResultType = Object.freeze({
+  Close: "close",
+  Complete: "complete",
+} as const);
+export type NewApplicationsDialogResultType =
+  (typeof NewApplicationsDialogResultType)[keyof typeof NewApplicationsDialogResultType];
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: "dirt-new-applications-dialog",
+  templateUrl: "./new-applications-dialog.component.html",
+  imports: [
+    CommonModule,
+    ButtonModule,
+    DialogModule,
+    TypographyModule,
+    I18nPipe,
+    AssignTasksViewComponent,
+    ReviewApplicationsViewComponent,
+  ],
+})
+export class NewApplicationsDialogComponent {
+  destroyRef = inject(DestroyRef);
+
+  // View state management
+  protected readonly currentView = signal<DialogView>(DialogView.SelectApplications);
+  // Expose DialogView constants to template
+  protected readonly DialogView = DialogView;
+
+  // Review new applications view
+  // Applications selected to save as critical applications
+  protected readonly selectedApplications = signal<Set<string>>(new Set());
+
+  protected readonly applicationIcons = signal<Map<string, CipherIcon>>(
+    new Map<string, CipherIcon>(),
+  );
+  protected readonly applicationsWithIcons = computed(() => {
+    return this.dialogParams.newApplications.map((app) => {
+      const iconCipher = this.applicationIcons().get(app.applicationName);
+      return { ...app, iconCipher } as ApplicationHealthReportDetail & { iconCipher: CipherIcon };
+    });
+  });
+
+  // Used to determine if there are unassigned at-risk cipher IDs
+  private readonly _tasks!: Signal<SecurityTask[]>;
+
+  // Computed properties for selected applications
+  protected readonly newCriticalApplications = computed(() => {
+    return this.dialogParams.newApplications.filter((newApp) =>
+      this.selectedApplications().has(newApp.applicationName),
+    );
+  });
+
+  // New at risk critical applications
+  protected readonly newAtRiskCriticalApplications = computed(() => {
+    return this.newCriticalApplications().filter((app) => app.atRiskPasswordCount > 0);
+  });
+
+  // Count of unique members with at-risk passwords in newly marked critical applications
+  protected readonly atRiskCriticalMembersCount = computed(() => {
+    return getUniqueMembers(this.newCriticalApplications().flatMap((x) => x.atRiskMemberDetails))
+      .length;
+  });
+
+  protected readonly newUnassignedAtRiskCipherIds = computed<CipherId[]>(() => {
+    const newAtRiskCipherIds = this.newCriticalApplications().flatMap((app) => app.atRiskCipherIds);
+    const tasks = this._tasks();
+
+    if (tasks.length === 0) {
+      return newAtRiskCipherIds;
+    }
+
+    const inProgressTasks = tasks.filter((task) => task.status === SecurityTaskStatus.Pending);
+    const assignedIdSet = new Set(inProgressTasks.map((task) => task.cipherId));
+    const unassignedIds = newAtRiskCipherIds.filter((id) => !assignedIdSet.has(id));
+    return unassignedIds;
+  });
+
+  readonly saving = signal<boolean>(false);
+
+  // Loading states
+  protected readonly markingAsCritical = signal<boolean>(false);
+
+  constructor(
+    @Inject(DIALOG_DATA) protected dialogParams: NewApplicationsDialogData,
+    private dataService: RiskInsightsDataService,
+    private dialogRef: DialogRef<NewApplicationsDialogResultType>,
+    private dialogService: DialogService,
+    private i18nService: I18nService,
+    private injector: Injector,
+    private logService: LogService,
+    private securityTasksService: AccessIntelligenceSecurityTasksService,
+    private toastService: ToastService,
+  ) {
+    this.setApplicationIconMap(this.dialogParams.newApplications);
+    // Setup the _tasks signal by manually passing in the injector
+    this._tasks = toSignal(this.securityTasksService.tasks$, {
+      initialValue: [],
+      injector: this.injector,
+    });
+  }
+
+  /**
+   * Opens the new applications dialog
+   * @param dialogService The dialog service instance
+   * @param data Dialog data containing the list of new applications and organizationId
+   * @returns Dialog reference
+   */
+  static open(dialogService: DialogService, data: NewApplicationsDialogData) {
+    return dialogService.open<boolean | undefined, NewApplicationsDialogData>(
+      NewApplicationsDialogComponent,
+      {
+        data,
+      },
+    );
+  }
+
+  /**
+   * Returns true if the organization has no existing critical applications.
+   * Used to conditionally show different titles and descriptions.
+   */
+  protected hasNoCriticalApplications(): boolean {
+    return !this.dialogParams.hasExistingCriticalApplications;
+  }
+
+  /**
+   * Maps applications to a corresponding iconCipher
+   *
+   * @param applications
+   */
+  setApplicationIconMap(applications: ApplicationHealthReportDetail[]) {
+    // Map the report data to include the iconCipher for each application
+    const iconCiphers = new Map<string, CipherIcon>();
+    applications.forEach((app) => {
+      const iconCipher =
+        app.cipherIds.length > 0 ? this.dataService.getCipherIcon(app.cipherIds[0]) : undefined;
+      iconCiphers.set(app.applicationName, iconCipher);
+    });
+    this.applicationIcons.set(iconCiphers);
+  }
+
+  /**
+   * Toggles the selection state of an application.
+   * @param applicationName The application to toggle
+   */
+  toggleSelection(applicationName: string) {
+    this.selectedApplications.update((current) => {
+      const temp = new Set(current);
+      if (temp.has(applicationName)) {
+        temp.delete(applicationName);
+      } else {
+        temp.add(applicationName);
+      }
+      return temp;
+    });
+  }
+
+  /**
+   * Toggles the selection state of all applications.
+   * If all are selected, unselect all. Otherwise, select all.
+   */
+  toggleAll() {
+    const allApplicationNames = this.dialogParams.newApplications.map((app) => app.applicationName);
+    const allSelected = this.selectedApplications().size === allApplicationNames.length;
+
+    this.selectedApplications.update(() => {
+      return allSelected ? new Set() : new Set(allApplicationNames);
+    });
+  }
+
+  // Checks if there are selected applications and proceeds to assign tasks
+  async handleMarkAsCritical() {
+    if (this.selectedApplications().size === 0) {
+      const confirmed = await this.dialogService.openSimpleDialog({
+        title: { key: "confirmNoSelectedCriticalApplicationsTitle" },
+        content: { key: "confirmNoSelectedCriticalApplicationsDesc" },
+        type: "warning",
+      });
+
+      if (!confirmed) {
+        return;
+      }
+    }
+
+    // Skip the assign tasks view if there are no new unassigned at-risk cipher IDs
+    if (this.newUnassignedAtRiskCipherIds().length === 0) {
+      this.handleAssignTasks();
+    } else {
+      this.currentView.set(DialogView.AssignTasks);
+    }
+  }
+
+  // Saves the application review and assigns tasks for unassigned at-risk ciphers
+  protected handleAssignTasks() {
+    if (this.saving()) {
+      return; // Prevent double-click
+    }
+    this.saving.set(true);
+
+    const reviewedDate = new Date();
+    const updatedApplications = this.dialogParams.newApplications.map((app) => {
+      const isCritical = this.selectedApplications().has(app.applicationName);
+      return {
+        applicationName: app.applicationName,
+        isCritical,
+        reviewedDate,
+      };
+    });
+
+    // Save the application review dates and critical markings
+    this.dataService
+      .saveApplicationReviewStatus(updatedApplications)
+      .pipe(
+        takeUntilDestroyed(this.destroyRef), // Satisfy eslint rule
+        take(1),
+        switchMap(() => {
+          // Assign password change tasks for unassigned at-risk ciphers for critical applications
+          return from(
+            this.securityTasksService.requestPasswordChangeForCriticalApplications(
+              this.dialogParams.organizationId,
+              this.newUnassignedAtRiskCipherIds(),
+            ),
+          );
+        }),
+      )
+      .subscribe({
+        next: () => {
+          this.toastService.showToast({
+            variant: "success",
+            title: this.i18nService.t("applicationReviewSaved"),
+            message: this.i18nService.t("newApplicationsReviewed"),
+          });
+          this.saving.set(false);
+          this.handleAssigningCompleted();
+        },
+        error: (error: unknown) => {
+          this.logService.error(
+            "[NewApplicationsDialog] Failed to save application review or assign tasks",
+            error,
+          );
+          this.saving.set(false);
+          this.toastService.showToast({
+            variant: "error",
+            title: this.i18nService.t("errorSavingReviewStatus"),
+            message: this.i18nService.t("pleaseTryAgain"),
+          });
+        },
+      });
+  }
+
+  /**
+   * Closes the dialog when the "Cancel" button is selected
+   */
+  handleCancel() {
+    this.dialogRef.close(NewApplicationsDialogResultType.Close);
+  }
+
+  /**
+   * Handles the tasksAssigned event from the embedded component.
+   * Closes the dialog with success indicator.
+   */
+  protected handleAssigningCompleted = () => {
+    // Tasks were successfully assigned - close dialog
+    this.dialogRef.close(NewApplicationsDialogResultType.Complete);
+  };
+
+  /**
+   * Handles the back event from the embedded component.
+   * Returns to the select applications view.
+   */
+  protected onBack = () => {
+    this.currentView.set(DialogView.SelectApplications);
+  };
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/review-applications-view.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/review-applications-view.component.html
new file mode 100644
index 00000000000..99053cbf94d
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/review-applications-view.component.html
@@ -0,0 +1,87 @@
+<div class="tw-space-y-3">
+  <bit-search
+    [placeholder]="'searchApps' | i18n"
+    [(ngModel)]="searchText"
+    (ngModelChange)="onSearchTextChanged($event)"
+  ></bit-search>
+
+  <div class="tw-overflow-x-auto">
+    <table class="tw-w-full tw-border-collapse">
+      <thead>
+        <tr class="tw-border-b tw-border-secondary-300">
+          <th bitTypography="body2" class="tw-text-left tw-py-3 tw-px-2 tw-w-12">
+            <button
+              type="button"
+              class="tw-bg-transparent tw-border-0 tw-p-0 tw-cursor-pointer"
+              (click)="toggleAll()"
+              [attr.aria-label]="isAllSelected() ? ('unselectAll' | i18n) : ('selectAll' | i18n)"
+            >
+              <i
+                class="bwi tw-text-muted"
+                [ngClass]="isAllSelected() ? 'bwi-star-f' : 'bwi-star'"
+                aria-hidden="true"
+              ></i>
+            </button>
+          </th>
+          <th bitTypography="body2" class="tw-text-left tw-py-3 tw-px-2 tw-font-medium">
+            {{ "application" | i18n }}
+          </th>
+          <th bitTypography="body2" class="tw-text-right tw-py-3 tw-px-2 tw-font-medium">
+            {{ "atRiskPasswords" | i18n }}
+          </th>
+          <th bitTypography="body2" class="tw-text-right tw-py-3 tw-px-2 tw-font-medium">
+            {{ "totalPasswords" | i18n }}
+          </th>
+          <th bitTypography="body2" class="tw-text-right tw-py-3 tw-px-2 tw-font-medium">
+            {{ "atRiskMembers" | i18n }}
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        @for (app of filteredApplications(); track app.applicationName) {
+          <tr class="tw-border-b tw-border-secondary-300 hover:tw-bg-background-alt">
+            <td class="tw-py-3 tw-px-2">
+              <button
+                type="button"
+                class="tw-bg-transparent tw-border-0 tw-p-0 tw-cursor-pointer"
+                (click)="toggleSelection(app.applicationName)"
+                [attr.aria-label]="
+                  selectedApplications().has(app.applicationName)
+                    ? ('unselectApplication' | i18n)
+                    : ('selectApplication' | i18n)
+                "
+              >
+                <i
+                  class="bwi tw-text-muted"
+                  [ngClass]="
+                    selectedApplications().has(app.applicationName) ? 'bwi-star-f' : 'bwi-star'
+                  "
+                  aria-hidden="true"
+                ></i>
+              </button>
+            </td>
+            <td bitTypography="body1" class="tw-py-3 tw-px-2">
+              <div class="tw-flex tw-items-center tw-gap-2">
+                @if (app.iconCipher) {
+                  <app-vault-icon [cipher]="app.iconCipher"></app-vault-icon>
+                } @else {
+                  <i class="bwi bwi-globe tw-text-muted" aria-hidden="true"></i>
+                }
+                <span>{{ app.applicationName }}</span>
+              </div>
+            </td>
+            <td bitTypography="body1" class="tw-py-3 tw-px-2 tw-text-right">
+              {{ app.atRiskPasswordCount }}
+            </td>
+            <td bitTypography="body1" class="tw-py-3 tw-px-2 tw-text-right">
+              {{ app.passwordCount }}
+            </td>
+            <td bitTypography="body1" class="tw-py-3 tw-px-2 tw-text-right">
+              {{ app.atRiskMemberCount }}
+            </td>
+          </tr>
+        }
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/review-applications-view.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/review-applications-view.component.ts
new file mode 100644
index 00000000000..172a4e01579
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/application-review-dialog/review-applications-view.component.ts
@@ -0,0 +1,66 @@
+import { CommonModule } from "@angular/common";
+import { Component, input, output, ChangeDetectionStrategy, signal, computed } from "@angular/core";
+import { FormsModule } from "@angular/forms";
+
+import { ApplicationHealthReportDetail } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { ButtonModule, DialogModule, SearchModule, TypographyModule } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+import { CipherIcon } from "../../shared/app-table-row-scrollable.component";
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: "dirt-review-applications-view",
+  templateUrl: "./review-applications-view.component.html",
+  imports: [
+    CommonModule,
+    ButtonModule,
+    DialogModule,
+    FormsModule,
+    SearchModule,
+    TypographyModule,
+    I18nPipe,
+    SharedModule,
+  ],
+})
+export class ReviewApplicationsViewComponent {
+  readonly applications =
+    input.required<Array<ApplicationHealthReportDetail & { iconCipher: CipherIcon }>>();
+  readonly selectedApplications = input.required<Set<string>>();
+
+  protected readonly searchText = signal<string>("");
+
+  // Filter applications based on search text
+  protected readonly filteredApplications = computed(() => {
+    const search = this.searchText().toLowerCase();
+    if (!search) {
+      return this.applications();
+    }
+    return this.applications().filter((app) => app.applicationName.toLowerCase().includes(search));
+  });
+
+  // Return the selected applications from the view
+  onToggleSelection = output<string>();
+  onToggleAll = output<void>();
+
+  toggleSelection(applicationName: string): void {
+    this.onToggleSelection.emit(applicationName);
+  }
+
+  toggleAll(): void {
+    this.onToggleAll.emit();
+  }
+
+  isAllSelected(): boolean {
+    const filtered = this.filteredApplications();
+    return (
+      filtered.length > 0 &&
+      filtered.every((app) => this.selectedApplications().has(app.applicationName))
+    );
+  }
+
+  onSearchTextChanged(searchText: string): void {
+    this.searchText.set(searchText);
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html
deleted file mode 100644
index 8459dc565ae..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.html
+++ /dev/null
@@ -1,46 +0,0 @@
-@if (isLoading$ | async) {
-  <div *ngIf="isLoading$ | async">
-    <tools-risk-insights-loading></tools-risk-insights-loading>
-  </div>
-}
-
-@if (!(isLoading$ | async) && (noData$ | async)) {
-  <div class="tw-mt-4">
-    <bit-no-items class="tw-text-main">
-      <ng-container slot="title">
-        <h2 class="tw-font-semibold tw-mt-4">
-          {{ "noAppsInOrgTitle" | i18n: organization?.name }}
-        </h2>
-      </ng-container>
-      <ng-container slot="description">
-        <div class="tw-flex tw-flex-col tw-mb-2">
-          <a class="tw-text-primary-600" routerLink="/login">{{ "learnMore" | i18n }}</a>
-        </div>
-      </ng-container>
-    </bit-no-items>
-  </div>
-}
-
-@if (!(isLoading$ | async) && !(noData$ | async)) {
-  <div class="tw-mt-4 tw-flex tw-flex-col">
-    <div class="tw-flex tw-gap-4 tw-col-span-6">
-      <dirt-activity-card
-        class="tw-col-span-2 tw-cursor-pointer"
-        [title]="'atRiskMembers'"
-        [value]="atRiskMemberCount"
-        [cardMetrics]="'membersAtRisk'"
-        [metricDescription]="'membersAtRiskActivityDescription'"
-      >
-      </dirt-activity-card>
-      <dirt-activity-card
-        #allAppsOrgAtRiskApplications
-        class="tw-col-span-2 tw-cursor-pointer"
-        [title]="'criticalApplications'"
-        [value]="criticalApplicationsCount"
-        [cardMetrics]="'countOfCriticalApplications'"
-        [metricDescription]="'criticalApplicationsActivityDescription'"
-      >
-      </dirt-activity-card>
-    </div>
-  </div>
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.ts
deleted file mode 100644
index da78f385cbd..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-activity.component.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { Component, DestroyRef, inject, OnInit } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute } from "@angular/router";
-import { BehaviorSubject, combineLatest, firstValueFrom, of, switchMap } from "rxjs";
-
-import {
-  CriticalAppsService,
-  RiskInsightsDataService,
-  RiskInsightsReportService,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-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 { getById } from "@bitwarden/common/platform/misc";
-import { OrganizationId } from "@bitwarden/common/types/guid";
-import { SharedModule } from "@bitwarden/web-vault/app/shared";
-
-import { ActivityCardComponent } from "./activity-card.component";
-import { ApplicationsLoadingComponent } from "./risk-insights-loading.component";
-
-@Component({
-  selector: "tools-all-activity",
-  imports: [ApplicationsLoadingComponent, SharedModule, ActivityCardComponent],
-  templateUrl: "./all-activity.component.html",
-})
-export class AllActivityComponent implements OnInit {
-  protected isLoading$ = this.dataService.isLoading$;
-  protected noData$ = new BehaviorSubject(true);
-  organization: Organization | null = null;
-  atRiskMemberCount = 0;
-  criticalApplicationsCount = 0;
-
-  destroyRef = inject(DestroyRef);
-
-  async ngOnInit(): Promise<void> {
-    const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId");
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-
-    if (organizationId) {
-      this.organization =
-        (await firstValueFrom(
-          this.organizationService.organizations$(userId).pipe(getById(organizationId)),
-        )) ?? null;
-
-      combineLatest([
-        this.dataService.applications$,
-        this.criticalAppsService.getAppsListForOrg(organizationId as OrganizationId),
-      ])
-        .pipe(
-          takeUntilDestroyed(this.destroyRef),
-          switchMap(([apps, criticalApps]) => {
-            const atRiskMembers = this.reportService.generateAtRiskMemberList(apps ?? []);
-            return of({ apps, atRiskMembers, criticalApps });
-          }),
-        )
-        .subscribe(({ apps, atRiskMembers, criticalApps }) => {
-          this.noData$.next((apps?.length ?? 0) === 0);
-          this.atRiskMemberCount = atRiskMembers?.length ?? 0;
-          this.criticalApplicationsCount = criticalApps?.length ?? 0;
-        });
-    }
-  }
-
-  constructor(
-    protected activatedRoute: ActivatedRoute,
-    private accountService: AccountService,
-    protected organizationService: OrganizationService,
-    protected dataService: RiskInsightsDataService,
-    protected reportService: RiskInsightsReportService,
-    protected criticalAppsService: CriticalAppsService,
-  ) {}
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
deleted file mode 100644
index febdb5fa0de..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<div *ngIf="isLoading$ | async">
-  <tools-risk-insights-loading></tools-risk-insights-loading>
-</div>
-<div class="tw-mt-4" *ngIf="!(isLoading$ | async) && !dataSource.data.length">
-  <bit-no-items [icon]="noItemsIcon" class="tw-text-main">
-    <ng-container slot="title">
-      <h2 class="tw-font-semibold tw-mt-4">
-        {{ "noAppsInOrgTitle" | i18n: organization?.name }}
-      </h2>
-    </ng-container>
-    <ng-container slot="description">
-      <div class="tw-flex tw-flex-col tw-mb-2">
-        <span class="tw-text-muted">
-          {{ "noAppsInOrgDescription" | i18n }}
-        </span>
-        <a class="tw-text-primary-600" routerLink="/login">{{ "learnMore" | i18n }}</a>
-      </div>
-    </ng-container>
-    <ng-container slot="button">
-      <button (click)="goToCreateNewLoginItem()" bitButton buttonType="primary" type="button">
-        {{ "createNewLoginItem" | i18n }}
-      </button>
-    </ng-container>
-  </bit-no-items>
-</div>
-<div class="tw-mt-4 tw-flex tw-flex-col" *ngIf="!(isLoading$ | async) && dataSource.data.length">
-  <h2 class="tw-mb-6" bitTypography="h2">{{ "allApplications" | i18n }}</h2>
-  @if (dataService.drawerDetails$ | async; as drawerDetails) {
-    <div class="tw-flex tw-gap-6">
-      <button
-        type="button"
-        class="tw-flex-1"
-        tabindex="0"
-        (click)="showOrgAtRiskMembers('allAppsOrgAtRiskMembers')"
-      >
-        <dirt-card
-          #allAppsOrgAtRiskMembers
-          class="tw-w-full"
-          [ngClass]="{
-            'tw-bg-primary-100': drawerDetails.invokerId === 'allAppsOrgAtRiskMembers',
-          }"
-          [title]="'atRiskMembers' | i18n"
-          [value]="applicationSummary.totalAtRiskMemberCount"
-          [maxValue]="applicationSummary.totalMemberCount"
-        >
-        </dirt-card>
-      </button>
-      <button
-        type="button"
-        class="tw-flex-1"
-        tabindex="0"
-        (click)="showOrgAtRiskApps('allAppsOrgAtRiskApplications')"
-      >
-        <dirt-card
-          #allAppsOrgAtRiskApplications
-          class="tw-w-full"
-          [ngClass]="{
-            'tw-bg-primary-100': drawerDetails.invokerId === 'allAppsOrgAtRiskApplications',
-          }"
-          [title]="'atRiskApplications' | i18n"
-          [value]="applicationSummary.totalAtRiskApplicationCount"
-          [maxValue]="applicationSummary.totalApplicationCount"
-        >
-        </dirt-card>
-      </button>
-    </div>
-    <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
-      <bit-search
-        [placeholder]="'searchApps' | i18n"
-        class="tw-grow"
-        [formControl]="searchControl"
-      ></bit-search>
-      <button
-        type="button"
-        [buttonType]="'primary'"
-        bitButton
-        [disabled]="!selectedUrls.size"
-        [loading]="markingAsCritical"
-        (click)="markAppsAsCritical()"
-      >
-        <i class="bwi tw-mr-2" [ngClass]="selectedUrls.size ? 'bwi-star-f' : 'bwi-star'"></i>
-        {{ "markAppAsCritical" | i18n }}
-      </button>
-    </div>
-
-    <app-table-row-scrollable
-      [dataSource]="dataSource"
-      [showRowCheckBox]="true"
-      [showRowMenuForCriticalApps]="false"
-      [selectedUrls]="selectedUrls"
-      [openApplication]="drawerDetails.invokerId || ''"
-      [checkboxChange]="onCheckboxChange"
-      [showAppAtRiskMembers]="showAppAtRiskMembers"
-    ></app-table-row-scrollable>
-  }
-</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
deleted file mode 100644
index 51efafe501d..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-import { Component, DestroyRef, inject, OnInit } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { FormControl } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
-import { combineLatest, debounceTime, firstValueFrom, map, Observable, of, switchMap } from "rxjs";
-
-import { Security } from "@bitwarden/assets/svg";
-import {
-  CriticalAppsService,
-  RiskInsightsDataService,
-  RiskInsightsReportService,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import {
-  LEGACY_ApplicationHealthReportDetailWithCriticalFlag,
-  LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
-import { OrganizationReportSummary } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/report-models";
-import { RiskInsightsEncryptionService } from "@bitwarden/bit-common/dirt/reports/risk-insights/services/risk-insights-encryption.service";
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { OrganizationId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import {
-  IconButtonModule,
-  NoItemsModule,
-  SearchModule,
-  TableDataSource,
-  ToastService,
-} from "@bitwarden/components";
-import { CardComponent } from "@bitwarden/dirt-card";
-import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
-import { SharedModule } from "@bitwarden/web-vault/app/shared";
-import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-
-import { AppTableRowScrollableComponent } from "./app-table-row-scrollable.component";
-import { ApplicationsLoadingComponent } from "./risk-insights-loading.component";
-
-@Component({
-  selector: "tools-all-applications",
-  templateUrl: "./all-applications.component.html",
-  imports: [
-    ApplicationsLoadingComponent,
-    HeaderModule,
-    CardComponent,
-    SearchModule,
-    PipesModule,
-    NoItemsModule,
-    SharedModule,
-    AppTableRowScrollableComponent,
-    IconButtonModule,
-  ],
-})
-export class AllApplicationsComponent implements OnInit {
-  protected dataSource =
-    new TableDataSource<LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher>();
-  protected selectedUrls: Set<string> = new Set<string>();
-  protected searchControl = new FormControl("", { nonNullable: true });
-  protected loading = true;
-  protected organization = new Organization();
-  noItemsIcon = Security;
-  protected markingAsCritical = false;
-  protected applicationSummary: OrganizationReportSummary = {
-    totalMemberCount: 0,
-    totalAtRiskMemberCount: 0,
-    totalApplicationCount: 0,
-    totalAtRiskApplicationCount: 0,
-    totalCriticalMemberCount: 0,
-    totalCriticalAtRiskMemberCount: 0,
-    totalCriticalApplicationCount: 0,
-    totalCriticalAtRiskApplicationCount: 0,
-    newApplications: [],
-  };
-
-  destroyRef = inject(DestroyRef);
-  isLoading$: Observable<boolean> = of(false);
-
-  async ngOnInit() {
-    const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId");
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-
-    if (organizationId) {
-      const organization$ = this.organizationService
-        .organizations$(userId)
-        .pipe(getOrganizationById(organizationId));
-
-      combineLatest([
-        this.dataService.applications$,
-        this.criticalAppsService.getAppsListForOrg(organizationId as OrganizationId),
-        organization$,
-      ])
-        .pipe(
-          takeUntilDestroyed(this.destroyRef),
-          map(([applications, criticalApps, organization]) => {
-            if (applications && applications.length === 0 && criticalApps && criticalApps) {
-              const criticalUrls = criticalApps.map((ca) => ca.uri);
-              const data = applications?.map((app) => ({
-                ...app,
-                isMarkedAsCritical: criticalUrls.includes(app.applicationName),
-              })) as LEGACY_ApplicationHealthReportDetailWithCriticalFlag[];
-              return { data, organization };
-            }
-
-            return { data: applications, organization };
-          }),
-          switchMap(async ({ data, organization }) => {
-            if (data && organization) {
-              const dataWithCiphers = await this.reportService.identifyCiphers(
-                data,
-                organization.id as OrganizationId,
-              );
-
-              return {
-                data: dataWithCiphers,
-                organization,
-              };
-            }
-
-            return { data: [], organization };
-          }),
-        )
-        .subscribe(({ data, organization }) => {
-          if (data) {
-            this.dataSource.data = data;
-            this.applicationSummary = this.reportService.generateApplicationsSummary(data);
-          }
-          if (organization) {
-            this.organization = organization;
-          }
-        });
-
-      this.isLoading$ = this.dataService.isLoading$;
-    }
-  }
-
-  constructor(
-    protected cipherService: CipherService,
-    protected i18nService: I18nService,
-    protected activatedRoute: ActivatedRoute,
-    protected toastService: ToastService,
-    protected configService: ConfigService,
-    protected dataService: RiskInsightsDataService,
-    protected organizationService: OrganizationService,
-    protected reportService: RiskInsightsReportService,
-    private accountService: AccountService,
-    protected criticalAppsService: CriticalAppsService,
-    protected riskInsightsEncryptionService: RiskInsightsEncryptionService,
-  ) {
-    this.searchControl.valueChanges
-      .pipe(debounceTime(200), takeUntilDestroyed())
-      .subscribe((v) => (this.dataSource.filter = v));
-  }
-
-  goToCreateNewLoginItem = async () => {
-    // TODO: implement
-    this.toastService.showToast({
-      variant: "warning",
-      title: "",
-      message: "Not yet implemented",
-    });
-  };
-
-  isMarkedAsCriticalItem(applicationName: string) {
-    return this.selectedUrls.has(applicationName);
-  }
-
-  markAppsAsCritical = async () => {
-    this.markingAsCritical = true;
-
-    try {
-      await this.criticalAppsService.setCriticalApps(
-        this.organization.id as OrganizationId,
-        Array.from(this.selectedUrls),
-      );
-
-      this.toastService.showToast({
-        variant: "success",
-        title: "",
-        message: this.i18nService.t("applicationsMarkedAsCriticalSuccess"),
-      });
-    } finally {
-      this.selectedUrls.clear();
-      this.markingAsCritical = false;
-    }
-  };
-
-  showAppAtRiskMembers = async (applicationName: string) => {
-    const info = {
-      members:
-        this.dataSource.data.find((app) => app.applicationName === applicationName)
-          ?.atRiskMemberDetails ?? [],
-      applicationName,
-    };
-    this.dataService.setDrawerForAppAtRiskMembers(info, applicationName);
-  };
-
-  showOrgAtRiskMembers = async (invokerId: string) => {
-    const dialogData = this.reportService.generateAtRiskMemberList(this.dataSource.data);
-    this.dataService.setDrawerForOrgAtRiskMembers(dialogData, invokerId);
-  };
-
-  showOrgAtRiskApps = async (invokerId: string) => {
-    const data = this.reportService.generateAtRiskApplicationList(this.dataSource.data);
-    this.dataService.setDrawerForOrgAtRiskApps(data, invokerId);
-  };
-
-  onCheckboxChange = (applicationName: string, event: Event) => {
-    const isChecked = (event.target as HTMLInputElement).checked;
-    if (isChecked) {
-      this.selectedUrls.add(applicationName);
-    } else {
-      this.selectedUrls.delete(applicationName);
-    }
-  };
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications/all-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications/all-applications.component.html
new file mode 100644
index 00000000000..73ded40388d
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications/all-applications.component.html
@@ -0,0 +1,117 @@
+@if ((dataService.reportStatus$ | async) == ReportStatusEnum.Loading) {
+  <dirt-risk-insights-loading></dirt-risk-insights-loading>
+} @else {
+  @let drawerDetails = dataService.drawerDetails$ | async;
+  <div class="tw-mt-4 tw-flex tw-flex-col">
+    <h2 class="tw-mb-6" bitTypography="h2">{{ "allApplications" | i18n }}</h2>
+    <div class="tw-flex tw-gap-6">
+      <div
+        role="region"
+        [attr.aria-label]="'atRiskMembers' | i18n"
+        class="tw-flex-1 tw-box-border tw-bg-background tw-block tw-text-main tw-border-solid tw-border tw-border-secondary-300 tw-rounded-lg tw-p-4"
+        [ngClass]="{
+          'tw-bg-primary-100': drawerDetails.invokerId === 'allAppsOrgAtRiskMembers',
+        }"
+      >
+        <div class="tw-flex tw-flex-col tw-gap-1">
+          <span bitTypography="h6" class="tw-flex tw-text-main" id="allAppsOrgAtRiskMembersLabel">{{
+            "atRiskMembers" | i18n
+          }}</span>
+          <div class="tw-flex tw-items-baseline tw-gap-2" role="status" aria-live="polite">
+            <span
+              bitTypography="h3"
+              class="!tw-mb-0"
+              aria-describedby="allAppsOrgAtRiskMembersLabel"
+              >{{ applicationSummary().totalAtRiskMemberCount }}</span
+            >
+            <span bitTypography="body2">{{
+              "cardMetrics" | i18n: applicationSummary().totalMemberCount
+            }}</span>
+          </div>
+          <div class="tw-flex tw-items-baseline tw-mt-1 tw-gap-2">
+            <p bitTypography="body1" class="tw-mb-0">
+              <button
+                type="button"
+                bitLink
+                [attr.aria-label]="('viewAtRiskMembers' | i18n) + ': ' + ('atRiskMembers' | i18n)"
+                (click)="dataService.setDrawerForOrgAtRiskMembers('allAppsOrgAtRiskMembers')"
+              >
+                {{ "viewAtRiskMembers" | i18n }}
+              </button>
+            </p>
+          </div>
+        </div>
+      </div>
+      <div
+        role="region"
+        [attr.aria-label]="'atRiskApplications' | i18n"
+        class="tw-flex-1 tw-box-border tw-bg-background tw-block tw-text-main tw-border-solid tw-border tw-border-secondary-300 tw-rounded-lg tw-p-4"
+        [ngClass]="{
+          'tw-bg-primary-100': drawerDetails.invokerId === 'allAppsOrgAtRiskApplications',
+        }"
+      >
+        <div class="tw-flex tw-flex-col tw-gap-1">
+          <span
+            bitTypography="h6"
+            class="tw-flex tw-text-main"
+            id="allAppsOrgAtRiskApplicationsLabel"
+            >{{ "atRiskApplications" | i18n }}</span
+          >
+          <div class="tw-flex tw-items-baseline tw-gap-2" role="status" aria-live="polite">
+            <span
+              bitTypography="h3"
+              class="!tw-mb-0"
+              aria-describedby="allAppsOrgAtRiskApplicationsLabel"
+              >{{ applicationSummary().totalAtRiskApplicationCount }}</span
+            >
+            <span bitTypography="body2">{{
+              "cardMetrics" | i18n: applicationSummary().totalApplicationCount
+            }}</span>
+          </div>
+          <div class="tw-flex tw-items-baseline tw-mt-1 tw-gap-2">
+            <p bitTypography="body1" class="tw-mb-0">
+              <button
+                type="button"
+                bitLink
+                [attr.aria-label]="
+                  ('viewAtRiskApplications' | i18n) + ': ' + ('atRiskApplications' | i18n)
+                "
+                (click)="dataService.setDrawerForOrgAtRiskApps('allAppsOrgAtRiskApplications')"
+              >
+                {{ "viewAtRiskApplications" | i18n }}
+              </button>
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
+      <bit-search
+        [placeholder]="'searchApps' | i18n"
+        class="tw-grow"
+        [formControl]="searchControl"
+      ></bit-search>
+      <button
+        type="button"
+        [buttonType]="'primary'"
+        bitButton
+        [disabled]="!selectedUrls().size"
+        [loading]="markingAsCritical()"
+        (click)="markAppsAsCritical()"
+      >
+        <i class="bwi tw-mr-2" [ngClass]="selectedUrls().size ? 'bwi-star-f' : 'bwi-star'"></i>
+        {{ "markAppAsCritical" | i18n }}
+      </button>
+    </div>
+
+    <app-table-row-scrollable
+      [dataSource]="dataSource"
+      [showRowCheckBox]="true"
+      [showRowMenuForCriticalApps]="false"
+      [selectedUrls]="selectedUrls()"
+      [openApplication]="drawerDetails.invokerId || ''"
+      [checkboxChange]="onCheckboxChange"
+      [showAppAtRiskMembers]="showAppAtRiskMembers"
+    ></app-table-row-scrollable>
+  </div>
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications/all-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications/all-applications.component.ts
new file mode 100644
index 00000000000..3a9159ad68c
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications/all-applications.component.ts
@@ -0,0 +1,158 @@
+import {
+  Component,
+  DestroyRef,
+  inject,
+  OnInit,
+  ChangeDetectionStrategy,
+  signal,
+} from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { debounceTime } from "rxjs";
+
+import { Security } from "@bitwarden/assets/svg";
+import { RiskInsightsDataService } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { createNewSummaryData } from "@bitwarden/bit-common/dirt/reports/risk-insights/helpers";
+import {
+  OrganizationReportSummary,
+  ReportStatus,
+} from "@bitwarden/bit-common/dirt/reports/risk-insights/models/report-models";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import {
+  IconButtonModule,
+  LinkModule,
+  NoItemsModule,
+  SearchModule,
+  TableDataSource,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
+
+import {
+  ApplicationTableDataSource,
+  AppTableRowScrollableComponent,
+} from "../shared/app-table-row-scrollable.component";
+import { ApplicationsLoadingComponent } from "../shared/risk-insights-loading.component";
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: "dirt-all-applications",
+  templateUrl: "./all-applications.component.html",
+  imports: [
+    ApplicationsLoadingComponent,
+    HeaderModule,
+    LinkModule,
+    SearchModule,
+    PipesModule,
+    NoItemsModule,
+    SharedModule,
+    AppTableRowScrollableComponent,
+    IconButtonModule,
+    TypographyModule,
+  ],
+})
+export class AllApplicationsComponent implements OnInit {
+  destroyRef = inject(DestroyRef);
+
+  protected ReportStatusEnum = ReportStatus;
+  protected noItemsIcon = Security;
+
+  // Standard properties
+  protected readonly dataSource = new TableDataSource<ApplicationTableDataSource>();
+  protected readonly searchControl = new FormControl("", { nonNullable: true });
+
+  // Template driven properties
+  protected readonly selectedUrls = signal(new Set<string>());
+  protected readonly markingAsCritical = signal(false);
+  protected readonly applicationSummary = signal<OrganizationReportSummary>(createNewSummaryData());
+
+  constructor(
+    protected i18nService: I18nService,
+    protected activatedRoute: ActivatedRoute,
+    protected toastService: ToastService,
+    protected dataService: RiskInsightsDataService,
+  ) {
+    this.searchControl.valueChanges
+      .pipe(debounceTime(200), takeUntilDestroyed())
+      .subscribe((v) => (this.dataSource.filter = v));
+  }
+
+  async ngOnInit() {
+    this.dataService.enrichedReportData$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe({
+      next: (report) => {
+        if (report != null) {
+          this.applicationSummary.set(report.summaryData);
+
+          // Map the report data to include the iconCipher for each application
+          const tableDataWithIcon = report.reportData.map((app) => ({
+            ...app,
+            iconCipher:
+              app.cipherIds.length > 0
+                ? this.dataService.getCipherIcon(app.cipherIds[0])
+                : undefined,
+          }));
+          this.dataSource.data = tableDataWithIcon;
+        } else {
+          this.dataSource.data = [];
+        }
+      },
+      error: () => {
+        this.dataSource.data = [];
+      },
+    });
+  }
+
+  isMarkedAsCriticalItem(applicationName: string) {
+    return this.selectedUrls().has(applicationName);
+  }
+
+  markAppsAsCritical = async () => {
+    this.markingAsCritical.set(true);
+    const count = this.selectedUrls().size;
+
+    this.dataService
+      .saveCriticalApplications(Array.from(this.selectedUrls()))
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe({
+        next: () => {
+          this.toastService.showToast({
+            variant: "success",
+            title: "",
+            message: this.i18nService.t("criticalApplicationsMarkedSuccess", count.toString()),
+          });
+          this.selectedUrls.set(new Set<string>());
+          this.markingAsCritical.set(false);
+        },
+        error: () => {
+          this.toastService.showToast({
+            variant: "error",
+            title: "",
+            message: this.i18nService.t("applicationsMarkedAsCriticalFail"),
+          });
+        },
+      });
+  };
+
+  showAppAtRiskMembers = async (applicationName: string) => {
+    await this.dataService.setDrawerForAppAtRiskMembers(applicationName);
+  };
+
+  onCheckboxChange = (applicationName: string, event: Event) => {
+    const isChecked = (event.target as HTMLInputElement).checked;
+    if (isChecked) {
+      this.selectedUrls.update((selectedUrls) => {
+        selectedUrls.add(applicationName);
+        return selectedUrls;
+      });
+    } else {
+      this.selectedUrls.update((selectedUrls) => {
+        selectedUrls.delete(applicationName);
+        return selectedUrls;
+      });
+    }
+  };
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts
deleted file mode 100644
index 01f3b8fb494..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component, Input } from "@angular/core";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
-import { MenuModule, TableDataSource, TableModule } from "@bitwarden/components";
-import { SharedModule } from "@bitwarden/web-vault/app/shared";
-import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-
-@Component({
-  selector: "app-table-row-scrollable",
-  imports: [CommonModule, JslibModule, TableModule, SharedModule, PipesModule, MenuModule],
-  templateUrl: "./app-table-row-scrollable.component.html",
-})
-export class AppTableRowScrollableComponent {
-  @Input()
-  dataSource!: TableDataSource<LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher>;
-  @Input() showRowMenuForCriticalApps: boolean = false;
-  @Input() showRowCheckBox: boolean = false;
-  @Input() selectedUrls: Set<string> = new Set<string>();
-  @Input() openApplication: string = "";
-  @Input() showAppAtRiskMembers!: (applicationName: string) => void;
-  @Input() unmarkAsCritical!: (applicationName: string) => void;
-  @Input() checkboxChange!: (applicationName: string, $event: Event) => void;
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
deleted file mode 100644
index ed2a6b96524..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<div *ngIf="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>
-</div>
-<div class="tw-mt-4" *ngIf="!dataSource.data.length">
-  <bit-no-items [icon]="noItemsIcon" class="tw-text-main">
-    <ng-container slot="title">
-      <h2 class="tw-font-semibold tw-mt-4">
-        {{ "noCriticalApplicationsTitle" | i18n }}
-      </h2>
-    </ng-container>
-    <ng-container slot="description">
-      <p class="tw-text-muted">
-        {{ "noCriticalApplicationsDescription" | i18n }}
-      </p>
-    </ng-container>
-    <ng-container slot="button">
-      <button (click)="goToAllAppsTab()" bitButton buttonType="primary" type="button">
-        {{ "markCriticalApplications" | i18n }}
-      </button>
-    </ng-container>
-  </bit-no-items>
-</div>
-<div class="tw-mt-4 tw-flex tw-flex-col" *ngIf="!loading && dataSource.data.length">
-  <div class="tw-flex tw-justify-between tw-mb-4">
-    <h2 bitTypography="h2">{{ "criticalApplications" | i18n }}</h2>
-    <button
-      bitButton
-      buttonType="primary"
-      type="button"
-      [disabled]="!enableRequestPasswordChange"
-      (click)="requestPasswordChange()"
-    >
-      <i class="bwi bwi-envelope tw-mr-2"></i>
-      {{
-        enableRequestPasswordChange
-          ? ("requestPasswordChange" | i18n)
-          : ("noCriticalAppsAtRisk" | i18n)
-      }}
-    </button>
-  </div>
-  @if (dataService.drawerDetails$ | async; as drawerDetails) {
-    <div class="tw-flex tw-gap-6">
-      <button
-        type="button"
-        class="tw-flex-1"
-        tabindex="0"
-        (click)="showOrgAtRiskMembers('criticalAppsAtRiskMembers')"
-      >
-        <dirt-card
-          #criticalAppsAtRiskMembers
-          class="tw-w-full"
-          [ngClass]="{
-            'tw-bg-primary-100': drawerDetails.invokerId === 'criticalAppsAtRiskMembers',
-          }"
-          [title]="'atRiskMembers' | i18n"
-          [value]="applicationSummary.totalAtRiskMemberCount"
-          [maxValue]="applicationSummary.totalMemberCount"
-        >
-        </dirt-card>
-      </button>
-      <button
-        type="button"
-        class="tw-flex-1"
-        tabindex="0"
-        (click)="showOrgAtRiskApps('criticalAppsAtRiskApplications')"
-      >
-        <dirt-card
-          #criticalAppsAtRiskApplications
-          class="tw-w-full"
-          [ngClass]="{
-            'tw-bg-primary-100': drawerDetails.invokerId === 'criticalAppsAtRiskApplications',
-          }"
-          [title]="'atRiskApplications' | i18n"
-          [value]="applicationSummary.totalAtRiskApplicationCount"
-          [maxValue]="applicationSummary.totalApplicationCount"
-        >
-        </dirt-card>
-      </button>
-    </div>
-    <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
-      <bit-search
-        [placeholder]="'searchApps' | i18n"
-        class="tw-grow"
-        [formControl]="searchControl"
-      ></bit-search>
-    </div>
-
-    <app-table-row-scrollable
-      [dataSource]="dataSource"
-      [showRowCheckBox]="false"
-      [showRowMenuForCriticalApps]="true"
-      [openApplication]="drawerDetails.invokerId || ''"
-      [showAppAtRiskMembers]="showAppAtRiskMembers"
-      [unmarkAsCritical]="unmarkAsCritical"
-    ></app-table-row-scrollable>
-  }
-</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
deleted file mode 100644
index 9110779c980..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, DestroyRef, inject, OnInit } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { FormControl } from "@angular/forms";
-import { ActivatedRoute, Router } from "@angular/router";
-import { combineLatest, debounceTime, firstValueFrom, map, switchMap } from "rxjs";
-
-import { Security } from "@bitwarden/assets/svg";
-import {
-  CriticalAppsService,
-  RiskInsightsDataService,
-  RiskInsightsReportService,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import {
-  LEGACY_ApplicationHealthReportDetailWithCriticalFlag,
-  LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
-import { OrganizationReportSummary } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/report-models";
-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 { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
-import { SecurityTaskType } from "@bitwarden/common/vault/tasks";
-import { NoItemsModule, SearchModule, TableDataSource, ToastService } from "@bitwarden/components";
-import { CardComponent } from "@bitwarden/dirt-card";
-import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
-import { SharedModule } from "@bitwarden/web-vault/app/shared";
-import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-
-import { CreateTasksRequest } from "../../vault/services/abstractions/admin-task.abstraction";
-import { DefaultAdminTaskService } from "../../vault/services/default-admin-task.service";
-
-import { AppTableRowScrollableComponent } from "./app-table-row-scrollable.component";
-import { RiskInsightsTabType } from "./risk-insights.component";
-
-@Component({
-  selector: "tools-critical-applications",
-  templateUrl: "./critical-applications.component.html",
-  imports: [
-    CardComponent,
-    HeaderModule,
-    SearchModule,
-    NoItemsModule,
-    PipesModule,
-    SharedModule,
-    AppTableRowScrollableComponent,
-  ],
-  providers: [DefaultAdminTaskService],
-})
-export class CriticalApplicationsComponent implements OnInit {
-  protected dataSource =
-    new TableDataSource<LEGACY_ApplicationHealthReportDetailWithCriticalFlagAndCipher>();
-  protected selectedIds: Set<number> = new Set<number>();
-  protected searchControl = new FormControl("", { nonNullable: true });
-  private destroyRef = inject(DestroyRef);
-  protected loading = false;
-  protected organizationId: OrganizationId;
-  protected applicationSummary = {} as OrganizationReportSummary;
-  noItemsIcon = Security;
-  enableRequestPasswordChange = false;
-
-  async ngOnInit() {
-    this.organizationId = this.activatedRoute.snapshot.paramMap.get(
-      "organizationId",
-    ) as OrganizationId;
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-    this.criticalAppsService.loadOrganizationContext(this.organizationId as OrganizationId, userId);
-
-    if (this.organizationId) {
-      combineLatest([
-        this.dataService.applications$,
-        this.criticalAppsService.getAppsListForOrg(this.organizationId as OrganizationId),
-      ])
-        .pipe(
-          takeUntilDestroyed(this.destroyRef),
-          map(([applications, criticalApps]) => {
-            const criticalUrls = criticalApps.map((ca) => ca.uri);
-            const data = applications?.map((app) => ({
-              ...app,
-              isMarkedAsCritical: criticalUrls.includes(app.applicationName),
-            })) as LEGACY_ApplicationHealthReportDetailWithCriticalFlag[];
-            return data?.filter((app) => app.isMarkedAsCritical);
-          }),
-          switchMap(async (data) => {
-            if (data) {
-              const dataWithCiphers = await this.reportService.identifyCiphers(
-                data,
-                this.organizationId,
-              );
-              return dataWithCiphers;
-            }
-            return null;
-          }),
-        )
-        .subscribe((applications) => {
-          if (applications) {
-            this.dataSource.data = applications;
-            this.applicationSummary = this.reportService.generateApplicationsSummary(applications);
-            this.enableRequestPasswordChange = this.applicationSummary.totalAtRiskMemberCount > 0;
-          }
-        });
-    }
-  }
-
-  goToAllAppsTab = async () => {
-    await this.router.navigate(
-      [`organizations/${this.organizationId}/access-intelligence/risk-insights`],
-      {
-        queryParams: { tabIndex: RiskInsightsTabType.AllApps },
-        queryParamsHandling: "merge",
-      },
-    );
-  };
-
-  unmarkAsCritical = async (hostname: string) => {
-    try {
-      await this.criticalAppsService.dropCriticalApp(
-        this.organizationId as OrganizationId,
-        hostname,
-      );
-    } catch {
-      this.toastService.showToast({
-        message: this.i18nService.t("unexpectedError"),
-        variant: "error",
-        title: this.i18nService.t("error"),
-      });
-      return;
-    }
-
-    this.toastService.showToast({
-      message: this.i18nService.t("criticalApplicationUnmarkedSuccessfully"),
-      variant: "success",
-    });
-    this.dataSource.data = this.dataSource.data.filter((app) => app.applicationName !== hostname);
-  };
-
-  async requestPasswordChange() {
-    const apps = this.dataSource.data;
-    const cipherIds = apps
-      .filter((_) => _.atRiskPasswordCount > 0)
-      .flatMap((app) => app.atRiskCipherIds);
-
-    const distinctCipherIds = Array.from(new Set(cipherIds));
-
-    const tasks: CreateTasksRequest[] = distinctCipherIds.map((cipherId) => ({
-      cipherId: cipherId as CipherId,
-      type: SecurityTaskType.UpdateAtRiskCredential,
-    }));
-
-    try {
-      await this.adminTaskService.bulkCreateTasks(this.organizationId as OrganizationId, tasks);
-      this.toastService.showToast({
-        message: this.i18nService.t("notifiedMembers"),
-        variant: "success",
-        title: this.i18nService.t("success"),
-      });
-    } catch {
-      this.toastService.showToast({
-        message: this.i18nService.t("unexpectedError"),
-        variant: "error",
-        title: this.i18nService.t("error"),
-      });
-    }
-  }
-
-  constructor(
-    protected activatedRoute: ActivatedRoute,
-    protected router: Router,
-    protected toastService: ToastService,
-    protected dataService: RiskInsightsDataService,
-    protected criticalAppsService: CriticalAppsService,
-    protected reportService: RiskInsightsReportService,
-    protected i18nService: I18nService,
-    private configService: ConfigService,
-    private adminTaskService: DefaultAdminTaskService,
-    private accountService: AccountService,
-  ) {
-    this.searchControl.valueChanges
-      .pipe(debounceTime(200), takeUntilDestroyed())
-      .subscribe((v) => (this.dataSource.filter = v));
-  }
-
-  showAppAtRiskMembers = async (applicationName: string) => {
-    const data = {
-      members:
-        this.dataSource.data.find((app) => app.applicationName === applicationName)
-          ?.atRiskMemberDetails ?? [],
-      applicationName,
-    };
-    this.dataService.setDrawerForAppAtRiskMembers(data, applicationName);
-  };
-
-  showOrgAtRiskMembers = async (invokerId: string) => {
-    const data = this.reportService.generateAtRiskMemberList(this.dataSource.data);
-    this.dataService.setDrawerForOrgAtRiskMembers(data, invokerId);
-  };
-
-  showOrgAtRiskApps = async (invokerId: string) => {
-    const data = this.reportService.generateAtRiskApplicationList(this.dataSource.data);
-    this.dataService.setDrawerForOrgAtRiskApps(data, invokerId);
-  };
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.html
new file mode 100644
index 00000000000..332a91d28c1
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.html
@@ -0,0 +1,117 @@
+@let drawerDetails = dataService.drawerDetails$ | async;
+<div class="tw-mt-4 tw-flex tw-flex-col">
+  <div class="tw-flex tw-justify-between tw-mb-4">
+    <h2 bitTypography="h2">{{ "criticalApplications" | i18n }}</h2>
+    <button
+      bitButton
+      buttonType="primary"
+      type="button"
+      [disabled]="!enableRequestPasswordChange"
+      (click)="requestPasswordChange()"
+    >
+      <i class="bwi bwi-envelope tw-mr-2"></i>
+      {{
+        enableRequestPasswordChange
+          ? ("requestPasswordChange" | i18n)
+          : ("noCriticalAppsAtRisk" | i18n)
+      }}
+    </button>
+  </div>
+  <div class="tw-flex tw-gap-6">
+    <div
+      role="region"
+      [attr.aria-label]="'atRiskMembers' | i18n"
+      class="tw-flex-1 tw-box-border tw-bg-background tw-block tw-text-main tw-border-solid tw-border tw-border-secondary-300 tw-rounded-lg tw-p-4"
+      [ngClass]="{
+        'tw-bg-primary-100': drawerDetails.invokerId === 'criticalAppsAtRiskMembers',
+      }"
+    >
+      <div class="tw-flex tw-flex-col tw-gap-1">
+        <span bitTypography="h6" class="tw-flex tw-text-main" id="criticalAppsAtRiskMembersLabel">{{
+          "atRiskMembers" | i18n
+        }}</span>
+        <div class="tw-flex tw-items-baseline tw-gap-2" role="status" aria-live="polite">
+          <span
+            bitTypography="h3"
+            class="!tw-mb-0"
+            aria-describedby="criticalAppsAtRiskMembersLabel"
+            >{{ applicationSummary.totalAtRiskMemberCount }}</span
+          >
+          <span bitTypography="body2">{{
+            "cardMetrics" | i18n: applicationSummary.totalMemberCount
+          }}</span>
+        </div>
+        <div class="tw-flex tw-items-baseline tw-mt-1 tw-gap-2">
+          <p bitTypography="body1" class="tw-mb-0">
+            <button
+              type="button"
+              bitLink
+              [attr.aria-label]="('viewAtRiskMembers' | i18n) + ': ' + ('atRiskMembers' | i18n)"
+              (click)="dataService.setDrawerForCriticalAtRiskMembers('criticalAppsAtRiskMembers')"
+            >
+              {{ "viewAtRiskMembers" | i18n }}
+            </button>
+          </p>
+        </div>
+      </div>
+    </div>
+    <div
+      role="region"
+      [attr.aria-label]="'atRiskApplications' | i18n"
+      class="tw-flex-1 tw-box-border tw-bg-background tw-block tw-text-main tw-border-solid tw-border tw-border-secondary-300 tw-rounded-lg tw-p-4"
+      [ngClass]="{
+        'tw-bg-primary-100': drawerDetails.invokerId === 'criticalAppsAtRiskApplications',
+      }"
+    >
+      <div class="tw-flex tw-flex-col tw-gap-1">
+        <span
+          bitTypography="h6"
+          class="tw-flex tw-text-main"
+          id="criticalAppsAtRiskApplicationsLabel"
+          >{{ "atRiskApplications" | i18n }}</span
+        >
+        <div class="tw-flex tw-items-baseline tw-gap-2" role="status" aria-live="polite">
+          <span
+            bitTypography="h3"
+            class="!tw-mb-0"
+            aria-describedby="criticalAppsAtRiskApplicationsLabel"
+            >{{ applicationSummary.totalAtRiskApplicationCount }}</span
+          >
+          <span bitTypography="body2">{{
+            "cardMetrics" | i18n: applicationSummary.totalApplicationCount
+          }}</span>
+        </div>
+        <div class="tw-flex tw-items-baseline tw-mt-1 tw-gap-2">
+          <p bitTypography="body1" class="tw-mb-0">
+            <button
+              type="button"
+              bitLink
+              [attr.aria-label]="
+                ('viewAtRiskApplications' | i18n) + ': ' + ('atRiskApplications' | i18n)
+              "
+              (click)="dataService.setDrawerForCriticalAtRiskApps('criticalAppsAtRiskApplications')"
+            >
+              {{ "viewAtRiskApplications" | i18n }}
+            </button>
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
+    <bit-search
+      [placeholder]="'searchApps' | i18n"
+      class="tw-grow"
+      [formControl]="searchControl"
+    ></bit-search>
+  </div>
+
+  <app-table-row-scrollable
+    [dataSource]="dataSource"
+    [showRowCheckBox]="false"
+    [showRowMenuForCriticalApps]="true"
+    [openApplication]="drawerDetails.invokerId || ''"
+    [showAppAtRiskMembers]="showAppAtRiskMembers"
+    [unmarkAsCritical]="removeCriticalApplication"
+  ></app-table-row-scrollable>
+</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.ts
new file mode 100644
index 00000000000..b61190df660
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.ts
@@ -0,0 +1,189 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { Component, DestroyRef, inject, OnInit, ChangeDetectionStrategy } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl } from "@angular/forms";
+import { ActivatedRoute, Router } from "@angular/router";
+import { debounceTime, EMPTY, from, map, switchMap, take } from "rxjs";
+
+import { Security } from "@bitwarden/assets/svg";
+import {
+  CriticalAppsService,
+  RiskInsightsDataService,
+  RiskInsightsReportService,
+} from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { createNewSummaryData } from "@bitwarden/bit-common/dirt/reports/risk-insights/helpers";
+import { OrganizationReportSummary } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/report-models";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import {
+  LinkModule,
+  NoItemsModule,
+  SearchModule,
+  TableDataSource,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
+
+import { RiskInsightsTabType } from "../models/risk-insights.models";
+import {
+  ApplicationTableDataSource,
+  AppTableRowScrollableComponent,
+} from "../shared/app-table-row-scrollable.component";
+import { AccessIntelligenceSecurityTasksService } from "../shared/security-tasks.service";
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: "dirt-critical-applications",
+  templateUrl: "./critical-applications.component.html",
+  imports: [
+    HeaderModule,
+    LinkModule,
+    SearchModule,
+    NoItemsModule,
+    PipesModule,
+    SharedModule,
+    AppTableRowScrollableComponent,
+    TypographyModule,
+  ],
+})
+export class CriticalApplicationsComponent implements OnInit {
+  private destroyRef = inject(DestroyRef);
+  protected enableRequestPasswordChange = false;
+  protected organizationId: OrganizationId;
+  noItemsIcon = Security;
+
+  protected dataSource = new TableDataSource<ApplicationTableDataSource>();
+  protected applicationSummary = {} as OrganizationReportSummary;
+
+  protected selectedIds: Set<number> = new Set<number>();
+  protected searchControl = new FormControl("", { nonNullable: true });
+
+  constructor(
+    protected activatedRoute: ActivatedRoute,
+    protected dataService: RiskInsightsDataService,
+    protected criticalAppsService: CriticalAppsService,
+    protected i18nService: I18nService,
+    protected reportService: RiskInsightsReportService,
+    protected router: Router,
+    private securityTasksService: AccessIntelligenceSecurityTasksService,
+    protected toastService: ToastService,
+  ) {
+    this.searchControl.valueChanges
+      .pipe(debounceTime(200), takeUntilDestroyed())
+      .subscribe((v) => (this.dataSource.filter = v));
+  }
+
+  async ngOnInit() {
+    this.dataService.criticalReportResults$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe({
+      next: (criticalReport) => {
+        if (criticalReport != null) {
+          // Map the report data to include the iconCipher for each application
+          const tableDataWithIcon = criticalReport.reportData.map((app) => ({
+            ...app,
+            iconCipher:
+              app.cipherIds.length > 0
+                ? this.dataService.getCipherIcon(app.cipherIds[0])
+                : undefined,
+          }));
+          this.dataSource.data = tableDataWithIcon;
+
+          this.applicationSummary = criticalReport.summaryData;
+          this.enableRequestPasswordChange = criticalReport.summaryData.totalAtRiskMemberCount > 0;
+        } else {
+          this.dataSource.data = [];
+          this.applicationSummary = createNewSummaryData();
+          this.enableRequestPasswordChange = false;
+        }
+      },
+      error: () => {
+        this.dataSource.data = [];
+        this.applicationSummary = createNewSummaryData();
+        this.enableRequestPasswordChange = false;
+      },
+    });
+    this.activatedRoute.paramMap
+      .pipe(
+        takeUntilDestroyed(this.destroyRef),
+        map((params) => params.get("organizationId")),
+        switchMap(async (orgId) => {
+          if (orgId) {
+            this.organizationId = orgId as OrganizationId;
+          } else {
+            return EMPTY;
+          }
+        }),
+      )
+      .subscribe();
+  }
+
+  goToAllAppsTab = async () => {
+    await this.router.navigate(
+      [`organizations/${this.organizationId}/access-intelligence/risk-insights`],
+      {
+        queryParams: { tabIndex: RiskInsightsTabType.AllApps },
+        queryParamsHandling: "merge",
+      },
+    );
+  };
+
+  removeCriticalApplication = async (hostname: string) => {
+    this.dataService
+      .removeCriticalApplication(hostname)
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe({
+        next: () => {
+          this.toastService.showToast({
+            message: this.i18nService.t("criticalApplicationUnmarkedSuccessfully"),
+            variant: "success",
+          });
+        },
+        error: () => {
+          this.toastService.showToast({
+            message: this.i18nService.t("unexpectedError"),
+            variant: "error",
+            title: this.i18nService.t("error"),
+          });
+        },
+      });
+  };
+
+  async requestPasswordChange() {
+    this.dataService.criticalApplicationAtRiskCipherIds$
+      .pipe(
+        takeUntilDestroyed(this.destroyRef), // Satisfy eslint rule
+        take(1), // Handle unsubscribe for one off operation
+        switchMap((cipherIds) => {
+          return from(
+            this.securityTasksService.requestPasswordChangeForCriticalApplications(
+              this.organizationId,
+              cipherIds,
+            ),
+          );
+        }),
+      )
+      .subscribe({
+        next: () => {
+          this.toastService.showToast({
+            message: this.i18nService.t("notifiedMembers"),
+            variant: "success",
+            title: this.i18nService.t("success"),
+          });
+        },
+        error: () => {
+          this.toastService.showToast({
+            message: this.i18nService.t("unexpectedError"),
+            variant: "error",
+            title: this.i18nService.t("error"),
+          });
+        },
+      });
+  }
+
+  showAppAtRiskMembers = async (applicationName: string) => {
+    await this.dataService.setDrawerForAppAtRiskMembers(applicationName);
+  };
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/empty-state-card.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/empty-state-card.component.html
new file mode 100644
index 00000000000..42600671e8c
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/empty-state-card.component.html
@@ -0,0 +1,106 @@
+<div
+  class="tw-w-full tw-max-w-4xl tw-p-6 sm:tw-p-8 tw-bg-background tw-rounded-xl tw-border tw-border-solid tw-border-secondary-300 tw-flex tw-flex-col lg:tw-flex-row tw-gap-6 tw-items-center"
+>
+  <div class="tw-flex-1 tw-flex tw-flex-col tw-gap-4 sm:tw-gap-5 tw-w-full lg:tw-w-auto">
+    <div class="tw-text-main tw-text-lg sm:tw-text-xl tw-font-medium tw-leading-6 sm:tw-leading-7">
+      {{ title() }}
+    </div>
+
+    <div
+      class="tw-text-main tw-text-sm sm:tw-text-base tw-font-normal tw-leading-normal"
+      *ngIf="description()"
+    >
+      {{ description() }}
+    </div>
+    @if (benefits().length > 0) {
+      <div class="tw-flex tw-flex-col tw-gap-4 sm:tw-gap-5">
+        @for (benefit of benefits(); track $index) {
+          <div class="tw-flex tw-items-start tw-gap-3">
+            <div
+              class="tw-size-8 sm:tw-size-9 tw-bg-secondary-100 tw-rounded-full tw-flex tw-justify-center tw-items-center tw-flex-shrink-0"
+            >
+              <div
+                class="tw-text-center tw-text-main tw-text-sm sm:tw-text-base tw-font-medium tw-leading-normal"
+              >
+                {{ $index + 1 }}
+              </div>
+            </div>
+            <div class="tw-flex-1 tw-pt-1 sm:tw-pt-1.5 tw-flex tw-flex-col tw-gap-1">
+              <div class="tw-text-main tw-text-sm sm:tw-text-base tw-font-medium tw-leading-normal">
+                {{ benefit[0] }}
+              </div>
+              <div class="tw-text-main tw-text-xs tw-font-normal tw-leading-none">
+                {{ benefit[1] }}
+              </div>
+            </div>
+          </div>
+        }
+      </div>
+    }
+
+    <div class="tw-flex tw-justify-start" *ngIf="buttonText() && buttonAction()">
+      <button
+        (click)="buttonAction()()"
+        bitButton
+        buttonType="primary"
+        type="button"
+        class="tw-px-3 tw-py-1.5 sm:tw-px-4 tw-rounded-full tw-text-sm sm:tw-text-base"
+      >
+        <i [class]="buttonIcon() + ' tw-mr-2'" *ngIf="buttonIcon()"></i>
+        {{ buttonText() }}
+      </button>
+    </div>
+  </div>
+
+  <div class="tw-hidden lg:tw-block tw-flex-shrink-0" *ngIf="videoSrc() || icon()">
+    <div class="tw-size-64 xl:tw-size-80 tw-relative">
+      @if (videoSrc()) {
+        <video
+          class="tw-size-full tw-rounded-lg"
+          [src]="videoSrc()"
+          autoplay
+          loop
+          muted
+          playsinline
+          aria-hidden="true"
+        ></video>
+      } @else if (icon()) {
+        <div
+          class="tw-size-full tw-flex tw-items-center tw-justify-center tw-bg-secondary-100 tw-rounded-lg"
+        >
+          <bit-icon
+            [icon]="icon()"
+            class="tw-size-16 xl:tw-size-24 tw-text-muted"
+            aria-hidden="true"
+          ></bit-icon>
+        </div>
+      }
+    </div>
+  </div>
+
+  <div class="tw-flex lg:tw-hidden tw-w-full tw-justify-center" *ngIf="videoSrc() || icon()">
+    <div class="tw-size-48 sm:tw-size-64 tw-relative">
+      @if (videoSrc()) {
+        <video
+          class="tw-size-full tw-rounded-lg"
+          [src]="videoSrc()"
+          autoplay
+          loop
+          muted
+          playsinline
+          aria-hidden="true"
+        ></video>
+      } @else if (icon()) {
+        <div
+          class="tw-size-full tw-flex tw-items-center tw-justify-center tw-bg-secondary-100 tw-rounded-lg"
+        >
+          <bit-icon
+            [icon]="icon()"
+            class="tw-size-12 sm:tw-size-16 tw-text-muted"
+            aria-hidden="true"
+          ></bit-icon>
+        </div>
+      }
+    </div>
+  </div>
+</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/empty-state-card.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/empty-state-card.component.ts
new file mode 100644
index 00000000000..54d97e984ec
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/empty-state-card.component.ts
@@ -0,0 +1,29 @@
+import { CommonModule } from "@angular/common";
+import { ChangeDetectionStrategy, Component, input, isDevMode, OnInit } from "@angular/core";
+
+import { Icon } from "@bitwarden/assets/svg";
+import { ButtonModule, IconModule } from "@bitwarden/components";
+
+@Component({
+  selector: "empty-state-card",
+  templateUrl: "./empty-state-card.component.html",
+  imports: [CommonModule, IconModule, ButtonModule],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EmptyStateCardComponent implements OnInit {
+  readonly icon = input<Icon | null>(null);
+  readonly videoSrc = input<string | null>(null);
+  readonly title = input<string>("");
+  readonly description = input<string>("");
+  readonly benefits = input<[string, string][]>([]);
+  readonly buttonText = input<string>("");
+  readonly buttonAction = input<(() => void) | null>(null);
+  readonly buttonIcon = input<string | undefined>(undefined);
+
+  ngOnInit(): void {
+    if (!this.title() && isDevMode()) {
+      // eslint-disable-next-line no-console
+      console.warn("EmptyStateCardComponent: title is required for proper display");
+    }
+  }
+}
diff --git a/libs/common/src/billing/enums/bitwarden-product-type.enum.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/models/risk-insights.models.ts
similarity index 53%
rename from libs/common/src/billing/enums/bitwarden-product-type.enum.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/models/risk-insights.models.ts
index 4389d283c00..18493a386dd 100644
--- a/libs/common/src/billing/enums/bitwarden-product-type.enum.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/models/risk-insights.models.ts
@@ -1,6 +1,8 @@
 // FIXME: update to use a const object instead of a typescript enum
 // eslint-disable-next-line @bitwarden/platform/no-enums
-export enum BitwardenProductType {
-  PasswordManager = 0,
-  SecretsManager = 1,
+export enum RiskInsightsTabType {
+  AllActivity = 0,
+  AllApps = 1,
+  CriticalApps = 2,
+  NotifiedMembers = 3,
 }
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.html
deleted file mode 100644
index dc94f28f944..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- <bit-table [dataSource]="dataSource"> -->
-<ng-container header>
-  <tr>
-    <th bitCell>{{ "member" | i18n }}</th>
-    <th bitCell>{{ "atRiskPasswords" | i18n }}</th>
-    <th bitCell>{{ "totalPasswords" | i18n }}</th>
-    <th bitCell>{{ "atRiskApplications" | i18n }}</th>
-    <th bitCell>{{ "totalApplications" | i18n }}</th>
-  </tr>
-</ng-container>
-<!-- </bit-table> -->
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts
deleted file mode 100644
index 15dc80a1b00..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component } from "@angular/core";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { TableDataSource, TableModule } from "@bitwarden/components";
-
-@Component({
-  selector: "tools-notified-members-table",
-  templateUrl: "./notified-members-table.component.html",
-  imports: [CommonModule, JslibModule, TableModule],
-})
-export class NotifiedMembersTableComponent {
-  dataSource = new TableDataSource<any>();
-
-  constructor() {
-    this.dataSource.data = [];
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.html
deleted file mode 100644
index 0c5b74eead2..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="tw-flex-col tw-flex tw-justify-center tw-items-center tw-gap-5 tw-mt-4">
-  <i
-    class="bwi bwi-2x bwi-spinner bwi-spin tw-text-primary-600"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
-  <h2 bitTypography="h1">{{ "generatingYourRiskInsights" | i18n }}</h2>
-</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts
deleted file mode 100644
index af61c9a35c8..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component } from "@angular/core";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-
-@Component({
-  selector: "tools-risk-insights-loading",
-  imports: [CommonModule, JslibModule],
-  templateUrl: "./risk-insights-loading.component.html",
-})
-export class ApplicationsLoadingComponent {
-  constructor() {}
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
index 50af2c9e9a7..19b655a8b23 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
@@ -1,143 +1,112 @@
+<app-header> </app-header>
+
 <ng-container>
-  <h1 bitTypography="h1">{{ "riskInsights" | i18n }}</h1>
-  <div class="tw-text-main tw-max-w-4xl tw-mb-2">
-    {{ "reviewAtRiskPasswords" | i18n }}
-  </div>
-  <div
-    *ngIf="dataLastUpdated$ | async"
-    class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-4 tw-my-4 tw-flex tw-items-center"
-  >
-    <i
-      class="bwi bwi-exclamation-triangle bwi-lg tw-text-[1.2rem] tw-text-muted"
-      aria-hidden="true"
-    ></i>
-    <span class="tw-mx-4">{{
-      "dataLastUpdated" | i18n: (dataLastUpdated$ | async | date: "MMMM d, y 'at' h:mm a")
-    }}</span>
-    <span class="tw-flex tw-justify-center tw-w-16">
-      <button
-        *ngIf="!(isRefreshing$ | async)"
-        type="button"
-        bitButton
-        buttonType="secondary"
-        class="tw-border-none !tw-font-normal tw-cursor-pointer !tw-py-0"
-        tabindex="0"
-        [bitAction]="refreshData.bind(this)"
-      >
-        {{ "refresh" | i18n }}
-      </button>
-      <span>
-        <i
-          *ngIf="isRefreshing$ | async"
-          class="bwi bwi-spinner bwi-spin tw-text-muted tw-text-[1.2rem]"
-          aria-hidden="true"
-        ></i>
-      </span>
-    </span>
-  </div>
-  <bit-tab-group [(selectedIndex)]="tabIndex" (selectedIndexChange)="onTabChange($event)">
-    @if (isRiskInsightsActivityTabFeatureEnabled) {
-      <bit-tab label="{{ 'activity' | i18n }}">
-        <tools-all-activity></tools-all-activity>
-      </bit-tab>
+  @let status = dataService.reportStatus$ | async;
+  @let hasCiphers = dataService.hasCiphers$ | async;
+  @let isGeneratingReport = dataService.isGeneratingReport$ | async;
+  @if (status == ReportStatusEnum.Initializing || hasCiphers === null) {
+    <!-- Show page loading state when initializing risk insights (quick page load) -->
+    <dirt-page-loading></dirt-page-loading>
+  } @else {
+    <!-- Check final states after initial calls have been completed -->
+    @if (isRiskInsightsActivityTabFeatureEnabled && !(dataService.hasReportData$ | async)) {
+      <!-- Show empty state only when feature flag is enabled and there's no report data -->
+      <div @fadeIn class="tw-flex tw-justify-center tw-items-center tw-min-h-[70vh] tw-w-full">
+        @if (!hasCiphers) {
+          <!-- Show Empty state when there are no applications (no ciphers to make reports on) -->
+          <empty-state-card
+            [videoSrc]="emptyStateVideoSrc"
+            [title]="this.i18nService.t('noDataInOrgTitle')"
+            [description]="this.i18nService.t('noDataInOrgDescription')"
+            [benefits]="emptyStateBenefits"
+            [buttonText]="this.i18nService.t('importData')"
+            [buttonIcon]="IMPORT_ICON"
+            [buttonAction]="this.goToImportPage"
+          ></empty-state-card>
+        } @else {
+          <!-- Show empty state for no reports run -->
+          <empty-state-card
+            [videoSrc]="emptyStateVideoSrc"
+            [title]="this.i18nService.t('noReportsRunTitle')"
+            [description]="this.i18nService.t('noReportsRunDescription')"
+            [benefits]="emptyStateBenefits"
+            [buttonText]="this.i18nService.t('riskInsightsRunReport')"
+            [buttonIcon]=""
+            [buttonAction]="this.generateReport.bind(this)"
+          ></empty-state-card>
+        }
+      </div>
+    } @else {
+      <!-- Show screen when there is report data OR when feature flag is disabled (show tabs even without data) -->
+      <div @fadeIn class="tw-min-h-screen tw-flex tw-flex-col">
+        <div>
+          <div class="tw-text-main tw-max-w-4xl tw-mb-2" *ngIf="appsCount > 0">
+            {{ "reviewAtRiskPasswords" | i18n }}
+          </div>
+          @let isRunningReport = dataService.isGeneratingReport$ | async;
+          <div
+            class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-4 tw-my-4 tw-flex tw-items-center"
+          >
+            <i
+              class="bwi bwi-exclamation-triangle bwi-lg tw-text-[1.2rem] tw-text-muted"
+              aria-hidden="true"
+            ></i>
+            @if (dataLastUpdated) {
+              <span class="tw-mx-4">{{
+                "dataLastUpdated" | i18n: (dataLastUpdated | date: "MMMM d, y 'at' h:mm a")
+              }}</span>
+            }
+            <span class="tw-flex tw-justify-center">
+              <button
+                *ngIf="!isRunningReport"
+                type="button"
+                bitButton
+                buttonType="secondary"
+                class="tw-border-none !tw-font-normal tw-cursor-pointer !tw-py-0"
+                tabindex="0"
+                [bitAction]="generateReport.bind(this)"
+              >
+                {{ "riskInsightsRunReport" | i18n }}
+              </button>
+              <span>
+                <i
+                  *ngIf="isRunningReport"
+                  class="bwi bwi-spinner bwi-spin tw-text-muted tw-text-[1.2rem]"
+                  aria-hidden="true"
+                ></i>
+              </span>
+            </span>
+          </div>
+        </div>
+
+        @if (status == ReportStatusEnum.Loading && isGeneratingReport) {
+          <!-- Show detailed progress when generating report (longer operation) -->
+          <dirt-risk-insights-loading></dirt-risk-insights-loading>
+        } @else {
+          <div class="tw-flex-1 tw-flex tw-flex-col">
+            <bit-tab-group [(selectedIndex)]="tabIndex" (selectedIndexChange)="onTabChange($event)">
+              @if (isRiskInsightsActivityTabFeatureEnabled) {
+                <bit-tab label="{{ 'activity' | i18n }}">
+                  <dirt-all-activity [organizationId]="this.organizationId"></dirt-all-activity>
+                </bit-tab>
+              }
+              <bit-tab label="{{ 'allApplicationsWithCount' | i18n: appsCount }}">
+                <dirt-all-applications></dirt-all-applications>
+              </bit-tab>
+              <bit-tab>
+                <ng-template bitTabLabel>
+                  <i class="bwi bwi-star"></i>
+                  {{
+                    "criticalApplicationsWithCount"
+                      | i18n: (dataService.criticalReportResults$ | async)?.reportData?.length ?? 0
+                  }}
+                </ng-template>
+                <dirt-critical-applications></dirt-critical-applications>
+              </bit-tab>
+            </bit-tab-group>
+          </div>
+        }
+      </div>
     }
-    <bit-tab label="{{ 'allApplicationsWithCount' | i18n: appsCount }}">
-      <tools-all-applications></tools-all-applications>
-    </bit-tab>
-    <bit-tab>
-      <ng-template bitTabLabel>
-        <i class="bwi bwi-star"></i>
-        {{ "criticalApplicationsWithCount" | i18n: (criticalApps$ | async)?.length ?? 0 }}
-      </ng-template>
-      <tools-critical-applications></tools-critical-applications>
-    </bit-tab>
-  </bit-tab-group>
-
-  @if (dataService.drawerDetails$ | async; as drawerDetails) {
-    <bit-drawer style="width: 30%" [(open)]="isDrawerOpen" (openChange)="dataService.closeDrawer()">
-      <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.OrgAtRiskMembers)">
-        <bit-drawer-header
-          title="{{ 'atRiskMembersWithCount' | i18n: drawerDetails.atRiskMemberDetails.length }}"
-        >
-        </bit-drawer-header>
-        <bit-drawer-body>
-          <span bitTypography="body1" class="tw-text-muted tw-text-sm">{{
-            (drawerDetails.atRiskMemberDetails.length > 0
-              ? "atRiskMembersDescription"
-              : "atRiskMembersDescriptionNone"
-            ) | i18n
-          }}</span>
-          <ng-container *ngIf="drawerDetails.atRiskMemberDetails.length > 0">
-            <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
-              <div bitTypography="body2" class="tw-text-sm tw-font-bold">{{ "email" | i18n }}</div>
-              <div bitTypography="body2" class="tw-text-sm tw-font-bold">
-                {{ "atRiskPasswords" | i18n }}
-              </div>
-            </div>
-            <ng-container *ngFor="let member of drawerDetails.atRiskMemberDetails">
-              <div class="tw-flex tw-justify-between tw-mt-2">
-                <div>{{ member.email }}</div>
-                <div>{{ member.atRiskPasswordCount }}</div>
-              </div>
-            </ng-container>
-          </ng-container>
-        </bit-drawer-body>
-      </ng-container>
-
-      @if (dataService.isActiveDrawerType(drawerTypes.AppAtRiskMembers)) {
-        <bit-drawer-header title="{{ drawerDetails.appAtRiskMembers.applicationName }}">
-        </bit-drawer-header>
-        <bit-drawer-body>
-          <div bitTypography="body1" class="tw-mb-2">
-            {{ "atRiskMembersWithCount" | i18n: drawerDetails.appAtRiskMembers.members.length }}
-          </div>
-          <div bitTypography="body1" class="tw-text-muted tw-text-sm tw-mb-2">
-            {{
-              (drawerDetails.appAtRiskMembers.members.length > 0
-                ? "atRiskMembersDescriptionWithApp"
-                : "atRiskMembersDescriptionWithAppNone"
-              ) | i18n: drawerDetails.appAtRiskMembers.applicationName
-            }}
-          </div>
-          <div class="tw-mt-1">
-            <ng-container *ngFor="let member of drawerDetails.appAtRiskMembers.members">
-              <div>{{ member.email }}</div>
-            </ng-container>
-          </div>
-        </bit-drawer-body>
-      }
-
-      @if (dataService.isActiveDrawerType(drawerTypes.OrgAtRiskApps)) {
-        <bit-drawer-header
-          title="{{ 'atRiskApplicationsWithCount' | i18n: drawerDetails.atRiskAppDetails.length }}"
-        >
-        </bit-drawer-header>
-
-        <bit-drawer-body>
-          <span bitTypography="body2" class="tw-text-muted tw-text-sm">{{
-            (drawerDetails.atRiskAppDetails.length > 0
-              ? "atRiskApplicationsDescription"
-              : "atRiskApplicationsDescriptionNone"
-            ) | i18n
-          }}</span>
-          <ng-container *ngIf="drawerDetails.atRiskAppDetails.length > 0">
-            <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
-              <div bitTypography="body2" class="tw-text-sm tw-font-bold">
-                {{ "application" | i18n }}
-              </div>
-              <div bitTypography="body2" class="tw-text-sm tw-font-bold">
-                {{ "atRiskPasswords" | i18n }}
-              </div>
-            </div>
-            <ng-container *ngFor="let app of drawerDetails.atRiskAppDetails">
-              <div class="tw-flex tw-justify-between tw-mt-2">
-                <div>{{ app.applicationName }}</div>
-                <div>{{ app.atRiskPasswordCount }}</div>
-              </div>
-            </ng-container>
-          </ng-container>
-        </bit-drawer-body>
-      }
-    </bit-drawer>
   }
 </ng-container>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
index a34cae44f14..9e6901572c3 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
@@ -1,49 +1,52 @@
+import { animate, style, transition, trigger } from "@angular/animations";
 import { CommonModule } from "@angular/common";
-import { Component, DestroyRef, OnInit, inject } from "@angular/core";
+import {
+  Component,
+  DestroyRef,
+  OnDestroy,
+  OnInit,
+  inject,
+  ChangeDetectionStrategy,
+} from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute, Router } from "@angular/router";
-import { EMPTY, firstValueFrom, Observable } from "rxjs";
-import { map, switchMap } from "rxjs/operators";
+import { EMPTY, firstValueFrom } from "rxjs";
+import { distinctUntilChanged, map, tap } from "rxjs/operators";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import {
-  CriticalAppsService,
+  DrawerType,
+  ReportStatus,
   RiskInsightsDataService,
 } from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import { PasswordHealthReportApplicationsResponse } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/api-models.types";
-import {
-  ApplicationHealthReportDetail,
-  DrawerType,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights/models/report-models";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import {
   AsyncActionsModule,
   ButtonModule,
-  DrawerBodyComponent,
-  DrawerComponent,
-  DrawerHeaderComponent,
+  DialogRef,
+  DialogService,
   TabsModule,
 } from "@bitwarden/components";
+import { ExportHelper } from "@bitwarden/vault-export-core";
+import { exportToCSV } from "@bitwarden/web-vault/app/dirt/reports/report-utils";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 
-import { AllActivityComponent } from "./all-activity.component";
-import { AllApplicationsComponent } from "./all-applications.component";
-import { CriticalApplicationsComponent } from "./critical-applications.component";
-
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum RiskInsightsTabType {
-  AllActivity = 0,
-  AllApps = 1,
-  CriticalApps = 2,
-  NotifiedMembers = 3,
-}
+import { AllActivityComponent } from "./activity/all-activity.component";
+import { AllApplicationsComponent } from "./all-applications/all-applications.component";
+import { CriticalApplicationsComponent } from "./critical-applications/critical-applications.component";
+import { EmptyStateCardComponent } from "./empty-state-card.component";
+import { RiskInsightsTabType } from "./models/risk-insights.models";
+import { PageLoadingComponent } from "./shared/page-loading.component";
+import { RiskInsightsDrawerDialogComponent } from "./shared/risk-insights-drawer-dialog.component";
+import { ApplicationsLoadingComponent } from "./shared/risk-insights-loading.component";
 
 @Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: "./risk-insights.component.html",
   imports: [
     AllApplicationsComponent,
@@ -51,46 +54,60 @@ export enum RiskInsightsTabType {
     ButtonModule,
     CommonModule,
     CriticalApplicationsComponent,
+    EmptyStateCardComponent,
     JslibModule,
     HeaderModule,
     TabsModule,
-    DrawerComponent,
-    DrawerBodyComponent,
-    DrawerHeaderComponent,
     AllActivityComponent,
+    ApplicationsLoadingComponent,
+    PageLoadingComponent,
+  ],
+  animations: [
+    trigger("fadeIn", [
+      transition(":enter", [
+        style({ opacity: 0 }),
+        animate("300ms 100ms ease-in", style({ opacity: 1 })),
+      ]),
+    ]),
   ],
 })
-export class RiskInsightsComponent implements OnInit {
+export class RiskInsightsComponent implements OnInit, OnDestroy {
   private destroyRef = inject(DestroyRef);
-  private _isDrawerOpen: boolean = false;
+  protected ReportStatusEnum = ReportStatus;
 
   tabIndex: RiskInsightsTabType = RiskInsightsTabType.AllApps;
   isRiskInsightsActivityTabFeatureEnabled: boolean = false;
 
-  dataLastUpdated: Date = new Date();
-
-  criticalApps$: Observable<PasswordHealthReportApplicationsResponse[]> = new Observable();
-
   appsCount: number = 0;
-  criticalAppsCount: number = 0;
-  notifiedMembersCount: number = 0;
 
-  private organizationId: OrganizationId = "" as OrganizationId;
+  protected organizationId: OrganizationId = "" as OrganizationId;
 
-  isLoading$: Observable<boolean> = new Observable<boolean>();
-  isRefreshing$: Observable<boolean> = new Observable<boolean>();
-  dataLastUpdated$: Observable<Date | null> = new Observable<Date | null>();
-  refetching: boolean = false;
+  dataLastUpdated: Date | null = null;
+
+  // Empty state computed properties
+  protected emptyStateBenefits: [string, string][] = [
+    [this.i18nService.t("feature1Title"), this.i18nService.t("feature1Description")],
+    [this.i18nService.t("feature2Title"), this.i18nService.t("feature2Description")],
+    [this.i18nService.t("feature3Title"), this.i18nService.t("feature3Description")],
+  ];
+  protected emptyStateVideoSrc: string | null = "/videos/risk-insights-mark-as-critical.mp4";
+
+  protected IMPORT_ICON = "bwi bwi-download";
+  protected currentDialogRef: DialogRef<unknown, RiskInsightsDrawerDialogComponent> | null = null;
+
+  // TODO: See https://github.com/bitwarden/clients/pull/16832#discussion_r2474523235
 
   constructor(
     private route: ActivatedRoute,
     private router: Router,
     private configService: ConfigService,
     protected dataService: RiskInsightsDataService,
-    private criticalAppsService: CriticalAppsService,
-    private accountService: AccountService,
+    protected i18nService: I18nService,
+    protected dialogService: DialogService,
+    private fileDownloadService: FileDownloadService,
+    private logService: LogService,
   ) {
-    this.route.queryParams.pipe(takeUntilDestroyed()).subscribe(({ tabIndex }) => {
+    this.route.queryParams.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ tabIndex }) => {
       this.tabIndex = !isNaN(Number(tabIndex)) ? Number(tabIndex) : RiskInsightsTabType.AllApps;
     });
 
@@ -104,56 +121,69 @@ export class RiskInsightsComponent implements OnInit {
   }
 
   async ngOnInit() {
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-
     this.route.paramMap
       .pipe(
         takeUntilDestroyed(this.destroyRef),
         map((params) => params.get("organizationId")),
-        switchMap((orgId) => {
+        tap((orgId) => {
           if (orgId) {
+            // Initialize Data Service
+            void this.dataService.initializeForOrganization(orgId as OrganizationId);
             this.organizationId = orgId as OrganizationId;
-            this.dataService.fetchApplicationsReport(this.organizationId);
-            this.isLoading$ = this.dataService.isLoading$;
-            this.isRefreshing$ = this.dataService.isRefreshing$;
-            this.dataLastUpdated$ = this.dataService.dataLastUpdated$;
-            return this.dataService.applications$;
           } else {
             return EMPTY;
           }
         }),
       )
-      .subscribe({
-        next: (applications: ApplicationHealthReportDetail[] | null) => {
-          if (applications) {
-            this.appsCount = applications.length;
-          }
+      .subscribe();
 
-          this.criticalAppsService.loadOrganizationContext(
-            this.organizationId as OrganizationId,
-            userId,
-          );
-          this.criticalApps$ = this.criticalAppsService.getAppsListForOrg(
-            this.organizationId as OrganizationId,
-          );
-        },
+    // Subscribe to report data updates
+    // This declarative pattern ensures proper cleanup and prevents memory leaks
+    this.dataService.enrichedReportData$
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((report) => {
+        // Update report state
+        this.appsCount = report?.reportData.length ?? 0;
+        this.dataLastUpdated = report?.creationDate ?? null;
       });
 
     // Subscribe to drawer state changes
     this.dataService.drawerDetails$
-      .pipe(takeUntilDestroyed(this.destroyRef))
+      .pipe(
+        distinctUntilChanged(
+          (prev, curr) =>
+            prev.activeDrawerType === curr.activeDrawerType && prev.invokerId === curr.invokerId,
+        ),
+        takeUntilDestroyed(this.destroyRef),
+      )
       .subscribe((details) => {
-        this._isDrawerOpen = details.open;
+        if (details.activeDrawerType !== DrawerType.None) {
+          this.currentDialogRef = this.dialogService.openDrawer(RiskInsightsDrawerDialogComponent, {
+            data: details,
+          });
+        } else {
+          this.currentDialogRef?.close();
+        }
       });
+
+    // if any dialogs are open close it
+    // this happens when navigating between orgs
+    // or just navigating away from the page and back
+    this.currentDialogRef?.close();
+  }
+
+  ngOnDestroy(): void {
+    this.dataService.destroy();
+    this.currentDialogRef?.close();
   }
 
   /**
    * Refreshes the data by re-fetching the applications report.
    * This will automatically notify child components subscribed to the RiskInsightsDataService observables.
    */
-  refreshData(): void {
+  generateReport(): void {
     if (this.organizationId) {
-      this.dataService.refreshApplicationsReport(this.organizationId);
+      this.dataService.triggerReport();
     }
   }
 
@@ -165,34 +195,83 @@ export class RiskInsightsComponent implements OnInit {
     });
 
     // close drawer when tabs are changed
-    this.dataService.closeDrawer();
+    this.currentDialogRef?.close();
   }
 
-  // Get a list of drawer types
-  get drawerTypes(): typeof DrawerType {
-    return DrawerType;
-  }
+  // Empty state methods
+
+  // TODO: import data button (we have this) OR button for adding new login items
+  // we want to add this new button as a second option on the empty state card
+
+  goToImportPage = () => {
+    void this.router.navigate([
+      "/organizations",
+      this.organizationId,
+      "settings",
+      "tools",
+      "import",
+    ]);
+  };
 
   /**
-   * Special case getter for syncing drawer state from service to component.
-   * This allows the template to use two-way binding while staying reactive.
+   * downloads at risk members as CSV
    */
-  get isDrawerOpen() {
-    return this._isDrawerOpen;
-  }
+  downloadAtRiskMembers = async () => {
+    try {
+      const drawerDetails = await firstValueFrom(this.dataService.drawerDetails$);
 
-  /**
-   * Special case setter for syncing drawer state from component to service.
-   * When the drawer component closes the drawer, this syncs the state back to the service.
-   */
-  set isDrawerOpen(value: boolean) {
-    if (this._isDrawerOpen !== value) {
-      this._isDrawerOpen = value;
-
-      // Close the drawer in the service if the drawer component closed the drawer
-      if (!value) {
-        this.dataService.closeDrawer();
+      // Validate drawer is open and showing the correct drawer type
+      if (
+        !drawerDetails.open ||
+        drawerDetails.activeDrawerType !== DrawerType.OrgAtRiskMembers ||
+        !drawerDetails.atRiskMemberDetails ||
+        drawerDetails.atRiskMemberDetails.length === 0
+      ) {
+        return;
       }
+
+      this.fileDownloadService.download({
+        fileName: ExportHelper.getFileName("at-risk-members"),
+        blobData: exportToCSV(drawerDetails.atRiskMemberDetails, {
+          email: this.i18nService.t("email"),
+          atRiskPasswordCount: this.i18nService.t("atRiskPasswords"),
+        }),
+        blobOptions: { type: "text/plain" },
+      });
+    } catch (error) {
+      // Log error for debugging
+      this.logService.error("Failed to download at-risk members", error);
     }
-  }
+  };
+
+  /**
+   * downloads at risk applications as CSV
+   */
+  downloadAtRiskApplications = async () => {
+    try {
+      const drawerDetails = await firstValueFrom(this.dataService.drawerDetails$);
+
+      // Validate drawer is open and showing the correct drawer type
+      if (
+        !drawerDetails.open ||
+        drawerDetails.activeDrawerType !== DrawerType.OrgAtRiskApps ||
+        !drawerDetails.atRiskAppDetails ||
+        drawerDetails.atRiskAppDetails.length === 0
+      ) {
+        return;
+      }
+
+      this.fileDownloadService.download({
+        fileName: ExportHelper.getFileName("at-risk-applications"),
+        blobData: exportToCSV(drawerDetails.atRiskAppDetails, {
+          applicationName: this.i18nService.t("application"),
+          atRiskPasswordCount: this.i18nService.t("atRiskPasswords"),
+        }),
+        blobOptions: { type: "text/plain" },
+      });
+    } catch (error) {
+      // Log error for debugging
+      this.logService.error("Failed to download at-risk applications", error);
+    }
+  };
 }
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/app-table-row-scrollable.component.html
similarity index 98%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/app-table-row-scrollable.component.html
index ea41dd0aff3..76a03e0c525 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/app-table-row-scrollable.component.html
@@ -45,7 +45,7 @@
         tabindex="0"
         [attr.aria-label]="'viewItem' | i18n"
       >
-        <app-vault-icon *ngIf="row.ciphers.length > 0" [cipher]="row.ciphers[0]"></app-vault-icon>
+        <app-vault-icon *ngIf="row.iconCipher" [cipher]="row.iconCipher"></app-vault-icon>
       </td>
       <td
         class="tw-cursor-pointer"
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/app-table-row-scrollable.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/app-table-row-scrollable.component.ts
new file mode 100644
index 00000000000..73e3b347936
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/app-table-row-scrollable.component.ts
@@ -0,0 +1,50 @@
+import { CommonModule } from "@angular/common";
+import { Component, Input } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { ApplicationHealthReportDetailEnriched } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
+import { MenuModule, TableDataSource, TableModule } from "@bitwarden/components";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
+
+export type CipherIcon = CipherViewLike | undefined;
+
+export type ApplicationTableDataSource = ApplicationHealthReportDetailEnriched & {
+  iconCipher: CipherIcon;
+};
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-table-row-scrollable",
+  imports: [CommonModule, JslibModule, TableModule, SharedModule, PipesModule, MenuModule],
+  templateUrl: "./app-table-row-scrollable.component.html",
+})
+export class AppTableRowScrollableComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input()
+  dataSource!: TableDataSource<ApplicationTableDataSource>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() showRowMenuForCriticalApps: boolean = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() showRowCheckBox: boolean = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() selectedUrls: Set<string> = new Set<string>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() openApplication: string = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() showAppAtRiskMembers!: (applicationName: string) => void;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() unmarkAsCritical!: (applicationName: string) => void;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() checkboxChange!: (applicationName: string, $event: Event) => void;
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/page-loading.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/page-loading.component.ts
new file mode 100644
index 00000000000..41dfa7ff440
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/page-loading.component.ts
@@ -0,0 +1,118 @@
+import { animate, style, transition, trigger } from "@angular/animations";
+import { Component } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+  CardComponent as BitCardComponent,
+  SkeletonComponent,
+  SkeletonGroupComponent,
+  SkeletonTextComponent,
+} from "@bitwarden/components";
+
+// Page loading component for quick initial loads
+// Uses skeleton animations to match the full page layout including header, tabs, and widget cards
+// Includes smooth fade-out transition when loading completes
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "dirt-page-loading",
+  imports: [
+    JslibModule,
+    BitCardComponent,
+    SkeletonComponent,
+    SkeletonGroupComponent,
+    SkeletonTextComponent,
+  ],
+  animations: [
+    trigger("fadeOut", [transition(":leave", [animate("300ms ease-out", style({ opacity: 0 }))])]),
+  ],
+  template: `
+    <div class="tw-sr-only" role="status">{{ "loading" | i18n }}</div>
+
+    <div @fadeOut class="tw-min-h-screen tw-flex tw-flex-col">
+      <!-- Header Section -->
+      <header>
+        <!-- Page Title -->
+        <bit-skeleton edgeShape="box" class="tw-h-10 tw-w-48 tw-mb-2"></bit-skeleton>
+
+        <!-- Description -->
+        <bit-skeleton edgeShape="box" class="tw-h-5 tw-w-96 tw-mb-2"></bit-skeleton>
+
+        <!-- Info Banner -->
+        <div
+          class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-4 tw-my-4 tw-flex tw-items-center tw-gap-4"
+        >
+          <bit-skeleton edgeShape="box" class="tw-size-5"></bit-skeleton>
+          <bit-skeleton edgeShape="box" class="tw-h-4 tw-flex-1 tw-max-w-md"></bit-skeleton>
+          <bit-skeleton edgeShape="box" class="tw-h-8 tw-w-32"></bit-skeleton>
+        </div>
+      </header>
+
+      <!-- Tabs Section -->
+      <div class="tw-flex-1 tw-flex tw-flex-col">
+        <!-- Tab Headers -->
+        <div class="tw-flex tw-gap-6 tw-mb-6">
+          <bit-skeleton edgeShape="box" class="tw-h-10 tw-w-24"></bit-skeleton>
+          <bit-skeleton edgeShape="box" class="tw-h-10 tw-w-32"></bit-skeleton>
+          <bit-skeleton edgeShape="box" class="tw-h-10 tw-w-40"></bit-skeleton>
+        </div>
+
+        <!-- Tab Content: Activity Cards Grid -->
+        <ul
+          class="tw-inline-grid tw-grid-cols-3 tw-gap-6 tw-m-0 tw-p-0 tw-w-full tw-auto-cols-auto tw-list-none"
+        >
+          <!-- Password Change Metric skeleton -->
+          <li class="tw-col-span-1">
+            <bit-card class="tw-h-56">
+              <div class="tw-flex tw-flex-col">
+                <bit-skeleton edgeShape="box" class="tw-h-6 tw-w-48 tw-mb-2"></bit-skeleton>
+                <bit-skeleton edgeShape="box" class="tw-h-9 tw-w-full tw-mb-2"></bit-skeleton>
+                <bit-skeleton-text [lines]="2" class="tw-w-3/4"></bit-skeleton-text>
+              </div>
+            </bit-card>
+          </li>
+
+          <!-- Activity Card 1: At Risk Members -->
+          <li class="tw-col-span-1">
+            <bit-card class="tw-h-56">
+              <div class="tw-flex tw-flex-col">
+                <bit-skeleton edgeShape="box" class="tw-h-6 tw-w-32 tw-mb-4"></bit-skeleton>
+                <bit-skeleton edgeShape="box" class="tw-h-9 tw-w-24 tw-mb-4"></bit-skeleton>
+                <bit-skeleton-text [lines]="2" class="tw-w-full tw-mb-4"></bit-skeleton-text>
+                <bit-skeleton edgeShape="box" class="tw-h-6 tw-w-40"></bit-skeleton>
+              </div>
+            </bit-card>
+          </li>
+
+          <!-- Activity Card 2: Critical Applications -->
+          <li class="tw-col-span-1">
+            <bit-card class="tw-h-56">
+              <div class="tw-flex tw-flex-col">
+                <bit-skeleton edgeShape="box" class="tw-h-6 tw-w-36 tw-mb-4"></bit-skeleton>
+                <bit-skeleton edgeShape="box" class="tw-h-9 tw-w-32 tw-mb-4"></bit-skeleton>
+                <bit-skeleton-text [lines]="2" class="tw-w-full tw-mb-4"></bit-skeleton-text>
+                <bit-skeleton edgeShape="box" class="tw-h-6 tw-w-44"></bit-skeleton>
+              </div>
+            </bit-card>
+          </li>
+
+          <!-- Activity Card 3: Applications Needing Review -->
+          <li class="tw-col-span-1">
+            <bit-card class="tw-h-56">
+              <div class="tw-flex tw-flex-col">
+                <bit-skeleton edgeShape="box" class="tw-h-6 tw-w-44 tw-mb-4"></bit-skeleton>
+                <bit-skeleton-group class="tw-mb-4">
+                  <bit-skeleton edgeShape="circle" class="tw-size-5" slot="start"></bit-skeleton>
+                  <bit-skeleton edgeShape="box" class="tw-h-9 tw-w-28"></bit-skeleton>
+                </bit-skeleton-group>
+                <bit-skeleton-text [lines]="2" class="tw-w-full tw-mb-4"></bit-skeleton-text>
+                <bit-skeleton edgeShape="box" class="tw-h-8 tw-w-28"></bit-skeleton>
+              </div>
+            </bit-card>
+          </li>
+        </ul>
+      </div>
+    </div>
+  `,
+})
+export class PageLoadingComponent {}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.html
new file mode 100644
index 00000000000..3fa72358f25
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.html
@@ -0,0 +1,116 @@
+@if (isActiveDrawerType(drawerTypes.OrgAtRiskMembers)) {
+  <bit-dialog dialogSize="large" disablePadding="false">
+    <ng-container bitDialogTitle>
+      <span>{{
+        "atRiskMembersWithCount" | i18n: drawerDetails.atRiskMemberDetails?.length ?? 0
+      }}</span>
+    </ng-container>
+    <ng-container bitDialogContent>
+      <span bitTypography="body1" class="tw-text-muted tw-text-sm">{{
+        (drawerDetails.atRiskMemberDetails?.length > 0
+          ? "atRiskMemberDescription"
+          : "atRiskMembersDescriptionNone"
+        ) | i18n
+      }}</span>
+
+      @if (drawerDetails.atRiskMemberDetails?.length > 0) {
+        <button
+          bitLink
+          type="button"
+          class="tw-my-4 tw-font-bold tw-block"
+          (click)="downloadAtRiskMembers()"
+        >
+          <i class="bwi bwi-download tw-mr-1"></i>
+          {{ "downloadCSV" | i18n }}
+        </button>
+        <ng-container>
+          <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
+            <div bitTypography="body2" class="tw-text-sm tw-font-bold">
+              {{ "email" | i18n }}
+            </div>
+            <div bitTypography="body2" class="tw-text-sm tw-font-bold">
+              {{ "atRiskPasswords" | i18n }}
+            </div>
+          </div>
+          @for (member of drawerDetails.atRiskMemberDetails; track member.email) {
+            <div class="tw-flex tw-justify-between tw-mt-2">
+              <div>{{ member.email }}</div>
+              <div>{{ member.atRiskPasswordCount }}</div>
+            </div>
+          }
+        </ng-container>
+      }
+    </ng-container>
+  </bit-dialog>
+}
+
+@if (isActiveDrawerType(drawerTypes.AppAtRiskMembers)) {
+  <bit-dialog dialogSize="large" disablePadding="false">
+    <ng-container bitDialogTitle>
+      <span>{{ drawerDetails.appAtRiskMembers?.applicationName }}</span>
+    </ng-container>
+    <ng-container bitDialogContent>
+      <div bitTypography="body1" class="tw-mb-2">
+        {{ "atRiskMembersWithCount" | i18n: drawerDetails.appAtRiskMembers?.members.length }}
+      </div>
+      <div bitTypography="body1" class="tw-text-muted tw-text-sm tw-mb-2">
+        {{
+          (drawerDetails.appAtRiskMembers?.members.length > 0
+            ? "atRiskMembersDescriptionWithApp"
+            : "atRiskMembersDescriptionWithAppNone"
+          ) | i18n: drawerDetails.appAtRiskMembers?.applicationName
+        }}
+      </div>
+      <div class="tw-mt-1">
+        @for (member of drawerDetails.appAtRiskMembers?.members; track $index) {
+          <div>{{ member.email }}</div>
+        }
+      </div>
+    </ng-container>
+  </bit-dialog>
+}
+
+@if (isActiveDrawerType(drawerTypes.OrgAtRiskApps)) {
+  <bit-dialog dialogSize="large" disablePadding="false">
+    <ng-container bitDialogTitle>
+      <span>{{
+        "atRiskApplicationsWithCount" | i18n: drawerDetails.atRiskAppDetails?.length ?? 0
+      }}</span>
+    </ng-container>
+    <ng-container bitDialogContent>
+      <span bitTypography="body1" class="tw-text-muted tw-text-sm">{{
+        (drawerDetails.atRiskAppDetails?.length > 0
+          ? "atRiskApplicationsDescription"
+          : "atRiskApplicationsDescriptionNone"
+        ) | i18n
+      }}</span>
+      @if (drawerDetails.atRiskAppDetails?.length > 0) {
+        <ng-container>
+          <button
+            bitLink
+            type="button"
+            class="tw-my-4 tw-font-bold tw-block"
+            (click)="downloadAtRiskApplications()"
+          >
+            <i class="bwi bwi-download tw-mr-1"></i>
+            {{ "downloadCSV" | i18n }}
+          </button>
+          <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
+            <div bitTypography="body2" class="tw-text-sm tw-font-bold">
+              {{ "application" | i18n }}
+            </div>
+            <div bitTypography="body2" class="tw-text-sm tw-font-bold">
+              {{ "atRiskPasswords" | i18n }}
+            </div>
+          </div>
+          @for (app of drawerDetails.atRiskAppDetails; track app.applicationName) {
+            <div class="tw-flex tw-justify-between tw-mt-2">
+              <div>{{ app.applicationName }}</div>
+              <div>{{ app.atRiskPasswordCount }}</div>
+            </div>
+          }
+        </ng-container>
+      }
+    </ng-container>
+  </bit-dialog>
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.spec.ts
new file mode 100644
index 00000000000..9066462b2b1
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.spec.ts
@@ -0,0 +1,280 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { mock } from "jest-mock-extended";
+
+import { DrawerDetails, DrawerType } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DIALOG_DATA } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import { RiskInsightsDrawerDialogComponent } from "./risk-insights-drawer-dialog.component";
+
+beforeAll(() => {
+  // Mock element.animate for jsdom
+  // the animate function is not available in jsdom, so we provide a mock implementation
+  // This is necessary for tests that rely on animations
+  // This mock does not perform any actual animations, it just provides a structure that allows tests
+  // to run without throwing errors related to missing animate function
+  if (!HTMLElement.prototype.animate) {
+    HTMLElement.prototype.animate = function () {
+      return {
+        play: () => {},
+        pause: () => {},
+        finish: () => {},
+        cancel: () => {},
+        reverse: () => {},
+        addEventListener: () => {},
+        removeEventListener: () => {},
+        dispatchEvent: () => false,
+        onfinish: null,
+        oncancel: null,
+        startTime: 0,
+        currentTime: 0,
+        playbackRate: 1,
+        playState: "idle",
+        replaceState: "active",
+        effect: null,
+        finished: Promise.resolve(),
+        id: "",
+        remove: () => {},
+        timeline: null,
+        ready: Promise.resolve(),
+      } as unknown as Animation;
+    };
+  }
+});
+
+describe("RiskInsightsDrawerDialogComponent", () => {
+  let component: RiskInsightsDrawerDialogComponent;
+  let fixture: ComponentFixture<RiskInsightsDrawerDialogComponent>;
+  const mockI18nService = mock<I18nService>();
+  const mockFileDownloadService = mock<FileDownloadService>();
+  const mocklogService = mock<LogService>();
+  const drawerDetails: DrawerDetails = {
+    open: true,
+    invokerId: "test-invoker",
+    activeDrawerType: DrawerType.None,
+    atRiskMemberDetails: [],
+    appAtRiskMembers: null,
+    atRiskAppDetails: null,
+  };
+  mockI18nService.t.mockImplementation((key: string) => key);
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [RiskInsightsDrawerDialogComponent, BrowserAnimationsModule],
+      providers: [
+        { provide: DIALOG_DATA, useValue: drawerDetails },
+        { provide: I18nPipe, useValue: mock<I18nPipe>() },
+        { provide: I18nService, useValue: mockI18nService },
+        { provide: FileDownloadService, useValue: mockFileDownloadService },
+        { provide: LogService, useValue: mocklogService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(RiskInsightsDrawerDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe("drawerTypes getter", () => {
+    it("should return DrawerType enum", () => {
+      expect(component.drawerTypes).toBe(DrawerType);
+    });
+  });
+
+  describe("isActiveDrawerType", () => {
+    it("should return true if type matches activeDrawerType", () => {
+      component.drawerDetails.activeDrawerType = DrawerType.None;
+      expect(component.isActiveDrawerType(DrawerType.None)).toBeTruthy();
+    });
+
+    it("should return false if type does not match activeDrawerType", () => {
+      component.drawerDetails.activeDrawerType = DrawerType.None;
+      expect(component.isActiveDrawerType(DrawerType.AppAtRiskMembers)).toBeFalsy();
+    });
+  });
+  describe("downloadAtRiskMembers", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it("should download CSV when drawer is open with correct type and has data", async () => {
+      component.drawerDetails = {
+        open: true,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskMembers,
+        atRiskMemberDetails: [
+          { email: "user@example.com", atRiskPasswordCount: 5 },
+          { email: "admin@example.com", atRiskPasswordCount: 3 },
+        ],
+        appAtRiskMembers: null,
+        atRiskAppDetails: null,
+      };
+
+      mockI18nService.t.mockImplementation((key: string) => key);
+
+      await component.downloadAtRiskMembers();
+
+      expect(mockFileDownloadService.download).toHaveBeenCalledWith({
+        fileName: expect.stringContaining("at-risk-members"),
+        blobData: expect.any(String),
+        blobOptions: { type: "text/plain" },
+      });
+    });
+
+    it("should not download when drawer is closed", async () => {
+      component.drawerDetails = {
+        open: false,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskMembers,
+        atRiskMemberDetails: [{ email: "user@example.com", atRiskPasswordCount: 5 }],
+        appAtRiskMembers: null,
+        atRiskAppDetails: null,
+      };
+
+      await component.downloadAtRiskMembers();
+
+      expect(mockFileDownloadService.download).not.toHaveBeenCalled();
+    });
+
+    it("should not download when activeDrawerType is incorrect", async () => {
+      component.drawerDetails = {
+        open: true,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskApps,
+        atRiskMemberDetails: [{ email: "user@example.com", atRiskPasswordCount: 5 }],
+        appAtRiskMembers: null,
+        atRiskAppDetails: null,
+      };
+
+      await component.downloadAtRiskMembers();
+
+      expect(mockFileDownloadService.download).not.toHaveBeenCalled();
+    });
+
+    it("should not download when atRiskMemberDetails is null", async () => {
+      component.drawerDetails = {
+        open: true,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskMembers,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: null,
+      };
+
+      await component.downloadAtRiskMembers();
+
+      expect(mockFileDownloadService.download).not.toHaveBeenCalled();
+    });
+
+    it("should not download when atRiskMemberDetails is empty array", async () => {
+      component.drawerDetails = {
+        open: true,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskMembers,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: null,
+      };
+
+      await component.downloadAtRiskMembers();
+
+      expect(mockFileDownloadService.download).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("downloadAtRiskApplications", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it("should download CSV when drawer is open with correct type and has data", async () => {
+      component.drawerDetails = {
+        open: true,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskApps,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: [
+          { applicationName: "App1", atRiskPasswordCount: 10 },
+          { applicationName: "App2", atRiskPasswordCount: 7 },
+        ],
+      };
+
+      await component.downloadAtRiskApplications();
+
+      expect(mockFileDownloadService.download).toHaveBeenCalledWith({
+        fileName: expect.stringContaining("at-risk-applications"),
+        blobData: expect.any(String),
+        blobOptions: { type: "text/plain" },
+      });
+    });
+
+    it("should not download when drawer is closed", async () => {
+      component.drawerDetails = {
+        open: false,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskApps,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: [{ applicationName: "App1", atRiskPasswordCount: 10 }],
+      };
+
+      await component.downloadAtRiskApplications();
+
+      expect(mockFileDownloadService.download).not.toHaveBeenCalled();
+    });
+
+    it("should not download when activeDrawerType is incorrect", async () => {
+      component.drawerDetails = {
+        open: true,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskMembers,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: [{ applicationName: "App1", atRiskPasswordCount: 10 }],
+      };
+
+      await component.downloadAtRiskApplications();
+
+      expect(mockFileDownloadService.download).not.toHaveBeenCalled();
+    });
+
+    it("should not download when atRiskAppDetails is null", async () => {
+      component.drawerDetails = {
+        open: true,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskApps,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: null,
+      };
+
+      await component.downloadAtRiskApplications();
+
+      expect(mockFileDownloadService.download).not.toHaveBeenCalled();
+    });
+
+    it("should not download when atRiskAppDetails is empty array", async () => {
+      component.drawerDetails = {
+        open: true,
+        invokerId: "test-invoker",
+        activeDrawerType: DrawerType.OrgAtRiskApps,
+        atRiskMemberDetails: [],
+        appAtRiskMembers: null,
+        atRiskAppDetails: [],
+      };
+
+      await component.downloadAtRiskApplications();
+
+      expect(mockFileDownloadService.download).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.ts
new file mode 100644
index 00000000000..30863f38e43
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.ts
@@ -0,0 +1,91 @@
+import { Component, ChangeDetectionStrategy, Inject } from "@angular/core";
+
+import { DrawerDetails, DrawerType } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DIALOG_DATA } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+import { ExportHelper } from "@bitwarden/vault-export-core";
+import { exportToCSV } from "@bitwarden/web-vault/app/dirt/reports/report-utils";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+@Component({
+  imports: [SharedModule],
+  templateUrl: "./risk-insights-drawer-dialog.component.html",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class RiskInsightsDrawerDialogComponent {
+  constructor(
+    @Inject(DIALOG_DATA) public drawerDetails: DrawerDetails,
+    private fileDownloadService: FileDownloadService,
+    private i18nService: I18nService,
+    private logService: LogService,
+  ) {}
+
+  // Get a list of drawer types
+  get drawerTypes(): typeof DrawerType {
+    return DrawerType;
+  }
+
+  isActiveDrawerType(type: DrawerType): boolean {
+    return this.drawerDetails.activeDrawerType === type;
+  }
+
+  /**
+   * downloads at risk members as CSV
+   */
+  downloadAtRiskMembers() {
+    try {
+      // Validate drawer is open and showing the correct drawer type
+      if (
+        !this.drawerDetails.open ||
+        this.drawerDetails.activeDrawerType !== DrawerType.OrgAtRiskMembers ||
+        !this.drawerDetails.atRiskMemberDetails ||
+        this.drawerDetails.atRiskMemberDetails.length === 0
+      ) {
+        return;
+      }
+
+      this.fileDownloadService.download({
+        fileName: ExportHelper.getFileName("at-risk-members"),
+        blobData: exportToCSV(this.drawerDetails.atRiskMemberDetails, {
+          email: this.i18nService.t("email"),
+          atRiskPasswordCount: this.i18nService.t("atRiskPasswords"),
+        }),
+        blobOptions: { type: "text/plain" },
+      });
+    } catch (error) {
+      // Log error for debugging
+      this.logService.error("Failed to download at-risk members", error);
+    }
+  }
+
+  /**
+   * downloads at risk applications as CSV
+   */
+  downloadAtRiskApplications() {
+    try {
+      // Validate drawer is open and showing the correct drawer type
+      if (
+        !this.drawerDetails.open ||
+        this.drawerDetails.activeDrawerType !== DrawerType.OrgAtRiskApps ||
+        !this.drawerDetails.atRiskAppDetails ||
+        this.drawerDetails.atRiskAppDetails.length === 0
+      ) {
+        return;
+      }
+
+      this.fileDownloadService.download({
+        fileName: ExportHelper.getFileName("at-risk-applications"),
+        blobData: exportToCSV(this.drawerDetails.atRiskAppDetails, {
+          applicationName: this.i18nService.t("application"),
+          atRiskPasswordCount: this.i18nService.t("atRiskPasswords"),
+        }),
+        blobOptions: { type: "text/plain" },
+      });
+    } catch (error) {
+      // Log error for debugging
+      this.logService.error("Failed to download at-risk applications", error);
+    }
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-loading.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-loading.component.html
new file mode 100644
index 00000000000..6e6bb786336
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-loading.component.html
@@ -0,0 +1,23 @@
+<div class="tw-flex tw-justify-center tw-items-center tw-min-h-[60vh]">
+  <div class="tw-flex tw-flex-col tw-items-center tw-gap-4">
+    <!-- Progress bar -->
+    <div class="tw-w-64" role="progressbar" attr.aria-label="{{ 'loadingProgress' | i18n }}">
+      <bit-progress
+        [barWidth]="progress()"
+        [showText]="false"
+        size="default"
+        bgColor="primary"
+      ></bit-progress>
+    </div>
+
+    <!-- Status message and subtitle -->
+    <div class="tw-text-center tw-flex tw-flex-col tw-gap-1">
+      <span class="tw-text-main tw-text-base tw-font-medium tw-leading-4">
+        {{ currentMessage() | i18n }}
+      </span>
+      <span class="tw-text-muted tw-text-sm tw-font-normal tw-leading-4">
+        {{ "thisMightTakeFewMinutes" | i18n }}
+      </span>
+    </div>
+  </div>
+</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-loading.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-loading.component.ts
new file mode 100644
index 00000000000..d4c97a6fd5c
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-loading.component.ts
@@ -0,0 +1,57 @@
+import { CommonModule } from "@angular/common";
+import { Component, DestroyRef, inject, OnInit, signal } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+  ReportProgress,
+  RiskInsightsDataService,
+} from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { ProgressModule } from "@bitwarden/components";
+
+const PROGRESS_STEPS = [
+  { step: ReportProgress.FetchingMembers, message: "fetchingMemberData", progress: 20 },
+  { step: ReportProgress.AnalyzingPasswords, message: "analyzingPasswordHealth", progress: 40 },
+  { step: ReportProgress.CalculatingRisks, message: "calculatingRiskScores", progress: 60 },
+  { step: ReportProgress.GeneratingReport, message: "generatingReportData", progress: 80 },
+  { step: ReportProgress.Saving, message: "savingReport", progress: 95 },
+  { step: ReportProgress.Complete, message: "compilingInsights", progress: 100 },
+] as const;
+
+type LoadingMessage = (typeof PROGRESS_STEPS)[number]["message"];
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "dirt-risk-insights-loading",
+  imports: [CommonModule, JslibModule, ProgressModule],
+  templateUrl: "./risk-insights-loading.component.html",
+})
+export class ApplicationsLoadingComponent implements OnInit {
+  private dataService = inject(RiskInsightsDataService);
+  private destroyRef = inject(DestroyRef);
+
+  readonly currentMessage = signal<LoadingMessage>(PROGRESS_STEPS[0].message);
+  readonly progress = signal<number>(PROGRESS_STEPS[0].progress);
+
+  ngOnInit(): void {
+    // Subscribe to actual progress events from the orchestrator
+    this.dataService.reportProgress$
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((progressStep) => {
+        if (progressStep === null) {
+          // Reset to initial state
+          this.currentMessage.set(PROGRESS_STEPS[0].message);
+          this.progress.set(PROGRESS_STEPS[0].progress);
+          return;
+        }
+
+        // Find the matching step configuration
+        const stepConfig = PROGRESS_STEPS.find((config) => config.step === progressStep);
+        if (stepConfig) {
+          this.currentMessage.set(stepConfig.message);
+          this.progress.set(stepConfig.progress);
+        }
+      });
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/security-tasks.service.spec.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/security-tasks.service.spec.ts
new file mode 100644
index 00000000000..f6fb41cdbb0
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/security-tasks.service.spec.ts
@@ -0,0 +1,74 @@
+import { TestBed } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
+
+import { SecurityTasksApiService } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+import { SecurityTaskType } from "@bitwarden/common/vault/tasks";
+
+import { DefaultAdminTaskService } from "../../../vault/services/default-admin-task.service";
+
+import { AccessIntelligenceSecurityTasksService } from "./security-tasks.service";
+
+describe("AccessIntelligenceSecurityTasksService", () => {
+  let service: AccessIntelligenceSecurityTasksService;
+  const defaultAdminTaskServiceMock = mock<DefaultAdminTaskService>();
+  const securityTasksApiServiceMock = mock<SecurityTasksApiService>();
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = new AccessIntelligenceSecurityTasksService(
+      defaultAdminTaskServiceMock,
+      securityTasksApiServiceMock,
+    );
+  });
+
+  it("should be created", () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe("assignTasks", () => {
+    it("should call requestPasswordChangeForCriticalApplications and setTaskCreatedCount", async () => {
+      // Set up test data
+      const organizationId = "org-1" as OrganizationId;
+      const mockCipherIds = ["cid1" as CipherId, "cid2" as CipherId];
+      const spy = jest.spyOn(service, "requestPasswordChangeForCriticalApplications");
+
+      // Call the method
+      await service.requestPasswordChangeForCriticalApplications(organizationId, mockCipherIds);
+
+      // Verify that the method was called with correct parameters
+      expect(spy).toHaveBeenCalledWith(organizationId, mockCipherIds);
+    });
+  });
+
+  describe("requestPasswordChangeForCriticalApplications", () => {
+    it("should create tasks for distinct cipher ids and show success toast", async () => {
+      // Set up test data
+      const organizationId = "org-2" as OrganizationId;
+      const mockCipherIds = ["cid1" as CipherId, "cid2" as CipherId];
+      defaultAdminTaskServiceMock.bulkCreateTasks.mockResolvedValue(undefined);
+      const spy = jest.spyOn(service, "requestPasswordChangeForCriticalApplications");
+
+      // Call the method
+      await service.requestPasswordChangeForCriticalApplications(organizationId, mockCipherIds);
+
+      // Verify that bulkCreateTasks was called with distinct cipher ids
+      expect(defaultAdminTaskServiceMock.bulkCreateTasks).toHaveBeenCalledWith(organizationId, [
+        { cipherId: "cid1", type: SecurityTaskType.UpdateAtRiskCredential },
+        { cipherId: "cid2", type: SecurityTaskType.UpdateAtRiskCredential },
+      ]);
+      // Verify that the method was called with correct parameters
+      expect(spy).toHaveBeenCalledWith(organizationId, mockCipherIds);
+    });
+
+    it("should handle error if defaultAdminTaskService errors", async () => {
+      const organizationId = "org-3" as OrganizationId;
+      const mockCipherIds = ["cid3" as CipherId];
+      defaultAdminTaskServiceMock.bulkCreateTasks.mockRejectedValue(new Error("API fail error"));
+
+      await expect(
+        service.requestPasswordChangeForCriticalApplications(organizationId, mockCipherIds),
+      ).rejects.toThrow("API fail error");
+    });
+  });
+});
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/security-tasks.service.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/security-tasks.service.ts
new file mode 100644
index 00000000000..688ab039ca9
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/security-tasks.service.ts
@@ -0,0 +1,63 @@
+import { BehaviorSubject } from "rxjs";
+
+import { SecurityTasksApiService } from "@bitwarden/bit-common/dirt/reports/risk-insights";
+import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+import { SecurityTask, SecurityTaskType } from "@bitwarden/common/vault/tasks";
+
+import { CreateTasksRequest } from "../../../vault/services/abstractions/admin-task.abstraction";
+import { DefaultAdminTaskService } from "../../../vault/services/default-admin-task.service";
+
+/**
+ * Service for managing security tasks related to Access Intelligence features
+ */
+export class AccessIntelligenceSecurityTasksService {
+  private _tasksSubject$ = new BehaviorSubject<SecurityTask[]>([]);
+  tasks$ = this._tasksSubject$.asObservable();
+
+  constructor(
+    private adminTaskService: DefaultAdminTaskService,
+    private securityTasksApiService: SecurityTasksApiService,
+  ) {}
+
+  /**
+   * Gets security task metrics for the given organization
+   *
+   * @param organizationId The organization ID
+   * @returns Metrics about security tasks such as a count of completed and total tasks
+   */
+  getTaskMetrics(organizationId: OrganizationId) {
+    return this.securityTasksApiService.getTaskMetrics(organizationId);
+  }
+
+  /**
+   * Loads security tasks for the given organization and updates the internal tasks subject
+   *
+   * @param organizationId The organization ID
+   */
+  async loadTasks(organizationId: OrganizationId): Promise<void> {
+    // Loads the tasks to update the service
+    const tasks = await this.securityTasksApiService.getAllTasks(organizationId);
+    this._tasksSubject$.next(tasks);
+  }
+
+  /**
+   * Bulk assigns password change tasks for critical applications with at-risk passwords
+   *
+   * @param organizationId The organization ID
+   * @param criticalApplicationIds IDs of critical applications with at-risk passwords
+   */
+  async requestPasswordChangeForCriticalApplications(
+    organizationId: OrganizationId,
+    criticalApplicationIds: CipherId[],
+  ) {
+    const distinctCipherIds = Array.from(new Set(criticalApplicationIds));
+    const tasks: CreateTasksRequest[] = distinctCipherIds.map((cipherId) => ({
+      cipherId,
+      type: SecurityTaskType.UpdateAtRiskCredential,
+    }));
+
+    await this.adminTaskService.bulkCreateTasks(organizationId, tasks);
+    // Reload tasks after creation
+    await this.loadTasks(organizationId);
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.html b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.html
index 4367c6c882e..792606cbfe0 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.html
@@ -1,5 +1,5 @@
-<div
-  class="tw-block tw-h-full tw-overflow-hidden tw-rounded tw-border tw-border-solid tw-border-secondary-600 tw-relative tw-transition-all hover:tw-scale-105 focus-within:tw-outline-none focus-within:tw-ring focus-within:tw-ring-primary-700 focus-within:tw-ring-offset-2"
+<bit-base-card
+  class="tw-block tw-h-full tw-overflow-hidden tw-relative tw-transition-all hover:tw-scale-105 focus-within:tw-outline-none focus-within:tw-ring focus-within:tw-ring-primary-700 focus-within:tw-ring-offset-2"
 >
   <div class="tw-flex tw-bg-secondary-100 tw-items-center tw-justify-end tw-pt-4 tw-pr-4">
     <i class="bwi bwi-external-link"></i>
@@ -15,9 +15,20 @@
         class="tw-block tw-mx-auto tw-h-auto tw-max-w-full tw-max-h-full"
       />
     </div>
+
+    @if (linkURL) {
+      <a
+        class="tw-block tw-mb-0 tw-font-medium hover:tw-no-underline focus:tw-outline-none after:tw-content-[''] after:tw-block after:tw-absolute after:tw-size-full after:tw-left-0 after:tw-top-0 after:tw-w-full after:tw-h-40"
+        [href]="linkURL"
+        rel="noopener noreferrer"
+        target="_blank"
+        title="{{ linkURL }}"
+      >
+      </a>
+    }
   </div>
-  <div class="tw-p-5">
-    <h3 class="tw-text-main tw-text-lg tw-font-semibold">
+  <bit-card-content>
+    <h3 class="tw-text-main tw-m-0 tw-text-lg tw-font-medium">
       {{ name }}
       @if (showConnectedBadge()) {
         <span class="tw-ml-3">
@@ -30,8 +41,9 @@
         </span>
       }
     </h3>
-    <p class="tw-mb-0 tw-font-semibold">{{ description }}</p>
-
+    @if (description) {
+      <p class="tw-mb-0 tw-mt-2 tw-font-medium">{{ description }}</p>
+    }
     @if (canSetupConnection) {
       <button type="button" class="tw-mt-3" bitButton (click)="setupConnection()">
         @if (isUpdateAvailable) {
@@ -42,20 +54,10 @@
       </button>
     }
 
-    @if (linkURL) {
-      <a
-        class="tw-block tw-mb-0 tw-font-bold hover:tw-no-underline focus:tw-outline-none after:tw-content-[''] after:tw-block after:tw-absolute after:tw-size-full after:tw-left-0 after:tw-top-0"
-        [href]="linkURL"
-        rel="noopener noreferrer"
-        target="_blank"
-        title="{{ linkURL }}"
-      >
-      </a>
-    }
     @if (showNewBadge()) {
       <span bitBadge class="tw-mt-3" variant="secondary">
         {{ "new" | i18n }}
       </span>
     }
-  </div>
-</div>
+  </bit-card-content>
+</bit-base-card>
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.spec.ts
index 74c39613502..8beaae7f10a 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.spec.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.spec.ts
@@ -5,6 +5,7 @@ import { BehaviorSubject, of } from "rxjs";
 
 import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
 import { OrganizationIntegrationServiceType } from "@bitwarden/bit-common/dirt/organization-integrations/models/organization-integration-service-type";
+import { DatadogOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/datadog-organization-integration-service";
 import { HecOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/hec-organization-integration-service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -29,6 +30,7 @@ describe("IntegrationCardComponent", () => {
   const mockI18nService = mock<I18nService>();
   const activatedRoute = mock<ActivatedRoute>();
   const mockIntegrationService = mock<HecOrganizationIntegrationService>();
+  const mockDatadogIntegrationService = mock<DatadogOrganizationIntegrationService>();
   const dialogService = mock<DialogService>();
   const toastService = mock<ToastService>();
 
@@ -53,6 +55,7 @@ describe("IntegrationCardComponent", () => {
         { provide: I18nService, useValue: mockI18nService },
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: HecOrganizationIntegrationService, useValue: mockIntegrationService },
+        { provide: DatadogOrganizationIntegrationService, useValue: mockDatadogIntegrationService },
         { provide: ToastService, useValue: toastService },
         { provide: DialogService, useValue: dialogService },
       ],
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.ts
index 091de63d7a1..e6d4aff05fb 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-card/integration-card.component.ts
@@ -13,36 +13,63 @@ import { Observable, Subject, combineLatest, lastValueFrom, takeUntil } from "rx
 import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
 import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
 import { OrganizationIntegrationServiceType } from "@bitwarden/bit-common/dirt/organization-integrations/models/organization-integration-service-type";
+import { OrganizationIntegrationType } from "@bitwarden/bit-common/dirt/organization-integrations/models/organization-integration-type";
+import { DatadogOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/datadog-organization-integration-service";
 import { HecOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/hec-organization-integration-service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ThemeType } from "@bitwarden/common/platform/enums";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { OrganizationId } from "@bitwarden/common/types/guid";
-import { DialogService, ToastService } from "@bitwarden/components";
+import {
+  BaseCardComponent,
+  CardContentComponent,
+  DialogRef,
+  DialogService,
+  ToastService,
+} from "@bitwarden/components";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
 import {
   HecConnectDialogResult,
+  DatadogConnectDialogResult,
   HecConnectDialogResultStatus,
+  DatadogConnectDialogResultStatus,
+  openDatadogConnectDialog,
   openHecConnectDialog,
 } from "../integration-dialog/index";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-integration-card",
   templateUrl: "./integration-card.component.html",
-  imports: [SharedModule],
+  imports: [SharedModule, BaseCardComponent, CardContentComponent],
 })
 export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
   private destroyed$: Subject<void> = new Subject();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("imageEle") imageEle!: ElementRef<HTMLImageElement>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() name: string = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() image: string = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() imageDarkMode: string = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() linkURL: string = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() integrationSettings!: Integration;
 
   /** Adds relevant `rel` attribute to external links */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() externalURL?: boolean;
 
   /**
@@ -51,8 +78,14 @@ export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
    *
    * @example "2024-12-31"
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() newBadgeExpiration?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() description?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() canSetupConnection?: boolean;
 
   organizationId: OrganizationId;
@@ -64,6 +97,7 @@ export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
     private dialogService: DialogService,
     private activatedRoute: ActivatedRoute,
     private hecOrganizationIntegrationService: HecOrganizationIntegrationService,
+    private datadogOrganizationIntegrationService: DatadogOrganizationIntegrationService,
     private toastService: ToastService,
     private i18nService: I18nService,
   ) {
@@ -131,42 +165,87 @@ export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
   }
 
   async setupConnection() {
-    // invoke the dialog to connect the integration
-    const dialog = openHecConnectDialog(this.dialogService, {
-      data: {
-        settings: this.integrationSettings,
-      },
-    });
+    let dialog: DialogRef<DatadogConnectDialogResult | HecConnectDialogResult, unknown>;
 
-    const result = await lastValueFrom(dialog.closed);
-
-    // the dialog was cancelled
-    if (!result || !result.success) {
+    if (this.integrationSettings?.integrationType === null) {
       return;
     }
 
-    try {
-      if (result.success === HecConnectDialogResultStatus.Delete) {
-        await this.deleteHec();
-      }
-    } catch {
-      this.toastService.showToast({
-        variant: "error",
-        title: "",
-        message: this.i18nService.t("failedToDeleteIntegration"),
+    if (this.integrationSettings?.integrationType === OrganizationIntegrationType.Datadog) {
+      dialog = openDatadogConnectDialog(this.dialogService, {
+        data: {
+          settings: this.integrationSettings,
+        },
       });
-    }
 
-    try {
-      if (result.success === HecConnectDialogResultStatus.Edited) {
-        await this.saveHec(result);
+      const result = await lastValueFrom(dialog.closed);
+
+      // the dialog was cancelled
+      if (!result || !result.success) {
+        return;
       }
-    } catch {
-      this.toastService.showToast({
-        variant: "error",
-        title: "",
-        message: this.i18nService.t("failedToSaveIntegration"),
+
+      try {
+        if (result.success === HecConnectDialogResultStatus.Delete) {
+          await this.deleteDatadog();
+        }
+      } catch {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: this.i18nService.t("failedToDeleteIntegration"),
+        });
+      }
+
+      try {
+        if (result.success === DatadogConnectDialogResultStatus.Edited) {
+          await this.saveDatadog(result as DatadogConnectDialogResult);
+        }
+      } catch {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: this.i18nService.t("failedToSaveIntegration"),
+        });
+      }
+    } else {
+      // invoke the dialog to connect the integration
+      dialog = openHecConnectDialog(this.dialogService, {
+        data: {
+          settings: this.integrationSettings,
+        },
       });
+
+      const result = await lastValueFrom(dialog.closed);
+
+      // the dialog was cancelled
+      if (!result || !result.success) {
+        return;
+      }
+
+      try {
+        if (result.success === HecConnectDialogResultStatus.Delete) {
+          await this.deleteHec();
+        }
+      } catch {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: this.i18nService.t("failedToDeleteIntegration"),
+        });
+      }
+
+      try {
+        if (result.success === HecConnectDialogResultStatus.Edited) {
+          await this.saveHec(result as HecConnectDialogResult);
+        }
+      } catch {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: this.i18nService.t("failedToSaveIntegration"),
+        });
+      }
     }
   }
 
@@ -242,6 +321,69 @@ export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
     });
   }
 
+  async saveDatadog(result: DatadogConnectDialogResult) {
+    if (this.isUpdateAvailable) {
+      // retrieve org integration and configuration ids
+      const orgIntegrationId = this.integrationSettings.organizationIntegration?.id;
+      const orgIntegrationConfigurationId =
+        this.integrationSettings.organizationIntegration?.integrationConfiguration[0]?.id;
+
+      if (!orgIntegrationId || !orgIntegrationConfigurationId) {
+        throw Error("Organization Integration ID or Configuration ID is missing");
+      }
+
+      // update existing integration and configuration
+      await this.datadogOrganizationIntegrationService.updateDatadog(
+        this.organizationId,
+        orgIntegrationId,
+        orgIntegrationConfigurationId,
+        this.integrationSettings.name as OrganizationIntegrationServiceType,
+        result.url,
+        result.apiKey,
+      );
+    } else {
+      // create new integration and configuration
+      await this.datadogOrganizationIntegrationService.saveDatadog(
+        this.organizationId,
+        this.integrationSettings.name as OrganizationIntegrationServiceType,
+        result.url,
+        result.apiKey,
+      );
+    }
+    this.toastService.showToast({
+      variant: "success",
+      title: "",
+      message: this.i18nService.t("success"),
+    });
+  }
+
+  async deleteDatadog() {
+    const orgIntegrationId = this.integrationSettings.organizationIntegration?.id;
+    const orgIntegrationConfigurationId =
+      this.integrationSettings.organizationIntegration?.integrationConfiguration[0]?.id;
+
+    if (!orgIntegrationId || !orgIntegrationConfigurationId) {
+      throw Error("Organization Integration ID or Configuration ID is missing");
+    }
+
+    const response = await this.datadogOrganizationIntegrationService.deleteDatadog(
+      this.organizationId,
+      orgIntegrationId,
+      orgIntegrationConfigurationId,
+    );
+
+    if (response.mustBeOwner) {
+      this.showMustBeOwnerToast();
+      return;
+    }
+
+    this.toastService.showToast({
+      variant: "success",
+      title: "",
+      message: this.i18nService.t("success"),
+    });
+  }
+
   private showMustBeOwnerToast() {
     this.toastService.showToast({
       variant: "error",
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.html b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.html
new file mode 100644
index 00000000000..c129216b694
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.html
@@ -0,0 +1,58 @@
+<form [formGroup]="formGroup" [bitSubmit]="submit">
+  <bit-dialog dialogSize="large" [loading]="loading">
+    <span bitDialogTitle>
+      {{ "connectIntegrationButtonDesc" | i18n: connectInfo.settings.name }}
+    </span>
+    <div bitDialogContent class="tw-flex tw-flex-col tw-gap-4">
+      @if (loading) {
+        <ng-container #spinner>
+          <i class="bwi bwi-spinner bwi-lg bwi-spin" aria-hidden="true"></i>
+        </ng-container>
+      }
+      @if (!loading) {
+        <ng-container>
+          <bit-form-field>
+            <bit-label>{{ "url" | i18n }}</bit-label>
+            <input
+              bitInput
+              type="text"
+              formControlName="url"
+              placeholder="https://api.<region>.datadoghq.com"
+            />
+          </bit-form-field>
+
+          <bit-form-field>
+            <bit-label>{{ "apiKey" | i18n }}</bit-label>
+            <input bitInput type="text" formControlName="apiKey" />
+            <bit-hint>{{ "apiKey" | i18n }}</bit-hint>
+          </bit-form-field>
+        </ng-container>
+      }
+    </div>
+    <ng-container bitDialogFooter>
+      <button type="submit" bitButton bitFormButton buttonType="primary" [disabled]="loading">
+        @if (isUpdateAvailable) {
+          {{ "update" | i18n }}
+        } @else {
+          {{ "save" | i18n }}
+        }
+      </button>
+      <button type="button" bitButton bitDialogClose buttonType="secondary" [disabled]="loading">
+        {{ "cancel" | i18n }}
+      </button>
+
+      @if (canDelete) {
+        <div class="tw-ml-auto">
+          <button
+            bitIconButton="bwi-trash"
+            type="button"
+            buttonType="danger"
+            label="'delete' | i18n"
+            [appA11yTitle]="'delete' | i18n"
+            [bitAction]="delete"
+          ></button>
+        </div>
+      }
+    </ng-container>
+  </bit-dialog>
+</form>
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.spec.ts
new file mode 100644
index 00000000000..7298087e7e4
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.spec.ts
@@ -0,0 +1,171 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { FormBuilder, ReactiveFormsModule } from "@angular/forms";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { mock } from "jest-mock-extended";
+
+import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
+import { IntegrationType } from "@bitwarden/common/enums";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+import {
+  ConnectDatadogDialogComponent,
+  DatadogConnectDialogParams,
+  DatadogConnectDialogResult,
+  DatadogConnectDialogResultStatus,
+  openDatadogConnectDialog,
+} from "./connect-dialog-datadog.component";
+
+beforeAll(() => {
+  // Mock element.animate for jsdom
+  // the animate function is not available in jsdom, so we provide a mock implementation
+  // This is necessary for tests that rely on animations
+  // This mock does not perform any actual animations, it just provides a structure that allows tests
+  // to run without throwing errors related to missing animate function
+  if (!HTMLElement.prototype.animate) {
+    HTMLElement.prototype.animate = function () {
+      return {
+        play: () => {},
+        pause: () => {},
+        finish: () => {},
+        cancel: () => {},
+        reverse: () => {},
+        addEventListener: () => {},
+        removeEventListener: () => {},
+        dispatchEvent: () => false,
+        onfinish: null,
+        oncancel: null,
+        startTime: 0,
+        currentTime: 0,
+        playbackRate: 1,
+        playState: "idle",
+        replaceState: "active",
+        effect: null,
+        finished: Promise.resolve(),
+        id: "",
+        remove: () => {},
+        timeline: null,
+        ready: Promise.resolve(),
+      } as unknown as Animation;
+    };
+  }
+});
+
+describe("ConnectDialogDatadogComponent", () => {
+  let component: ConnectDatadogDialogComponent;
+  let fixture: ComponentFixture<ConnectDatadogDialogComponent>;
+  let dialogRefMock = mock<DialogRef<DatadogConnectDialogResult>>();
+  const mockI18nService = mock<I18nService>();
+
+  const integrationMock: Integration = {
+    name: "Test Integration",
+    image: "test-image.png",
+    linkURL: "https://example.com",
+    imageDarkMode: "test-image-dark.png",
+    newBadgeExpiration: "2024-12-31",
+    description: "Test Description",
+    canSetupConnection: true,
+    type: IntegrationType.EVENT,
+  } as Integration;
+  const connectInfo: DatadogConnectDialogParams = {
+    settings: integrationMock, // Provide appropriate mock template if needed
+  };
+
+  beforeEach(async () => {
+    dialogRefMock = mock<DialogRef<DatadogConnectDialogResult>>();
+
+    await TestBed.configureTestingModule({
+      imports: [ReactiveFormsModule, SharedModule, BrowserAnimationsModule],
+      providers: [
+        FormBuilder,
+        { provide: DIALOG_DATA, useValue: connectInfo },
+        { provide: DialogRef, useValue: dialogRefMock },
+        { provide: I18nPipe, useValue: mock<I18nPipe>() },
+        { provide: I18nService, useValue: mockI18nService },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ConnectDatadogDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    mockI18nService.t.mockImplementation((key) => key);
+  });
+
+  it("should create the component", () => {
+    expect(component).toBeTruthy();
+  });
+
+  it("should initialize form with empty values", () => {
+    expect(component.formGroup.value).toEqual({
+      url: "",
+      apiKey: "",
+      service: "Test Integration",
+    });
+  });
+
+  it("should have required validators for all fields", () => {
+    component.formGroup.setValue({ url: "", apiKey: "", service: "" });
+    expect(component.formGroup.valid).toBeFalsy();
+
+    component.formGroup.setValue({
+      url: "https://test.com",
+      apiKey: "token",
+      service: "Test Service",
+    });
+    expect(component.formGroup.valid).toBeTruthy();
+  });
+
+  it("should test url is at least 7 characters long", () => {
+    component.formGroup.setValue({
+      url: "test",
+      apiKey: "token",
+      service: "Test Service",
+    });
+    expect(component.formGroup.valid).toBeFalsy();
+
+    component.formGroup.setValue({
+      url: "https://test.com",
+      apiKey: "token",
+      service: "Test Service",
+    });
+    expect(component.formGroup.valid).toBeTruthy();
+  });
+
+  it("should call dialogRef.close with correct result on submit", async () => {
+    component.formGroup.setValue({
+      url: "https://test.com",
+      apiKey: "token",
+      service: "Test Service",
+    });
+
+    await component.submit();
+
+    expect(dialogRefMock.close).toHaveBeenCalledWith({
+      integrationSettings: integrationMock,
+      url: "https://test.com",
+      apiKey: "token",
+      service: "Test Service",
+      success: DatadogConnectDialogResultStatus.Edited,
+    });
+  });
+});
+
+describe("openDatadogConnectDialog", () => {
+  it("should call dialogService.open with correct params", () => {
+    const dialogServiceMock = mock<DialogService>();
+    const config: DialogConfig<
+      DatadogConnectDialogParams,
+      DialogRef<DatadogConnectDialogResult>
+    > = {
+      data: { settings: { name: "Test" } as Integration },
+    } as any;
+
+    openDatadogConnectDialog(dialogServiceMock, config);
+
+    expect(dialogServiceMock.open).toHaveBeenCalledWith(ConnectDatadogDialogComponent, config);
+  });
+});
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.ts
new file mode 100644
index 00000000000..47760c6311a
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-datadog.component.ts
@@ -0,0 +1,123 @@
+import { Component, Inject, OnInit } from "@angular/core";
+import { FormBuilder, Validators } from "@angular/forms";
+
+import { DatadogConfiguration } from "@bitwarden/bit-common/dirt/organization-integrations/models/configuration/datadog-configuration";
+import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
+import { HecTemplate } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration-configuration-config/configuration-template/hec-template";
+import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+export type DatadogConnectDialogParams = {
+  settings: Integration;
+};
+
+export interface DatadogConnectDialogResult {
+  integrationSettings: Integration;
+  url: string;
+  apiKey: string;
+  service: string;
+  success: DatadogConnectDialogResultStatusType | null;
+}
+
+export const DatadogConnectDialogResultStatus = {
+  Edited: "edit",
+  Delete: "delete",
+} as const;
+
+export type DatadogConnectDialogResultStatusType =
+  (typeof DatadogConnectDialogResultStatus)[keyof typeof DatadogConnectDialogResultStatus];
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  templateUrl: "./connect-dialog-datadog.component.html",
+  imports: [SharedModule],
+})
+export class ConnectDatadogDialogComponent implements OnInit {
+  loading = false;
+  datadogConfig: DatadogConfiguration | null = null;
+  hecTemplate: HecTemplate | null = null;
+  formGroup = this.formBuilder.group({
+    url: ["", [Validators.required, Validators.minLength(7)]],
+    apiKey: ["", Validators.required],
+    service: ["", Validators.required],
+  });
+
+  constructor(
+    @Inject(DIALOG_DATA) protected connectInfo: DatadogConnectDialogParams,
+    protected formBuilder: FormBuilder,
+    private dialogRef: DialogRef<DatadogConnectDialogResult>,
+    private dialogService: DialogService,
+  ) {}
+
+  ngOnInit(): void {
+    this.datadogConfig =
+      this.connectInfo.settings.organizationIntegration?.getConfiguration<DatadogConfiguration>() ??
+      null;
+    this.hecTemplate =
+      this.connectInfo.settings.organizationIntegration?.integrationConfiguration?.[0]?.getTemplate<HecTemplate>() ??
+      null;
+
+    this.formGroup.patchValue({
+      url: this.datadogConfig?.uri || "",
+      apiKey: this.datadogConfig?.apiKey || "",
+      service: this.connectInfo.settings.name,
+    });
+  }
+
+  get isUpdateAvailable(): boolean {
+    return !!this.datadogConfig;
+  }
+
+  get canDelete(): boolean {
+    return !!this.datadogConfig;
+  }
+
+  submit = async (): Promise<void> => {
+    if (this.formGroup.invalid) {
+      this.formGroup.markAllAsTouched();
+      return;
+    }
+    const result = this.getDatadogConnectDialogResult(DatadogConnectDialogResultStatus.Edited);
+
+    this.dialogRef.close(result);
+
+    return;
+  };
+
+  delete = async (): Promise<void> => {
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "deleteItem" },
+      content: {
+        key: "deleteItemConfirmation",
+      },
+      type: "warning",
+    });
+
+    if (confirmed) {
+      const result = this.getDatadogConnectDialogResult(DatadogConnectDialogResultStatus.Delete);
+      this.dialogRef.close(result);
+    }
+  };
+
+  private getDatadogConnectDialogResult(
+    status: DatadogConnectDialogResultStatusType,
+  ): DatadogConnectDialogResult {
+    const formJson = this.formGroup.getRawValue();
+
+    return {
+      integrationSettings: this.connectInfo.settings,
+      url: formJson.url || "",
+      apiKey: formJson.apiKey || "",
+      service: formJson.service || "",
+      success: status,
+    };
+  }
+}
+
+export function openDatadogConnectDialog(
+  dialogService: DialogService,
+  config: DialogConfig<DatadogConnectDialogParams, DialogRef<DatadogConnectDialogResult>>,
+) {
+  return dialogService.open<DatadogConnectDialogResult>(ConnectDatadogDialogComponent, config);
+}
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts
index dc3490843cf..3612f2c76cb 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts
@@ -28,6 +28,8 @@ export const HecConnectDialogResultStatus = {
 export type HecConnectDialogResultStatusType =
   (typeof HecConnectDialogResultStatus)[keyof typeof HecConnectDialogResultStatus];
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./connect-dialog-hec.component.html",
   imports: [SharedModule],
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/index.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/index.ts
index 8c4891b9aa8..9852f3fe5c8 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/index.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-dialog/index.ts
@@ -1 +1,2 @@
 export * from "./connect-dialog/connect-dialog-hec.component";
+export * from "./connect-dialog/connect-dialog-datadog.component";
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.spec.ts
index f0b371703f6..2908fe0c089 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.spec.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.spec.ts
@@ -6,6 +6,7 @@ import { of } from "rxjs";
 
 import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
 import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
+import { DatadogOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/datadog-organization-integration-service";
 import { HecOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/hec-organization-integration-service";
 import { IntegrationType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -24,6 +25,7 @@ describe("IntegrationGridComponent", () => {
   let fixture: ComponentFixture<IntegrationGridComponent>;
   const mockActivatedRoute = mock<ActivatedRoute>();
   const mockIntegrationService = mock<HecOrganizationIntegrationService>();
+  const mockDatadogIntegrationService = mock<DatadogOrganizationIntegrationService>();
   const integrations: Integration[] = [
     {
       name: "Integration 1",
@@ -70,6 +72,7 @@ describe("IntegrationGridComponent", () => {
           useValue: mockActivatedRoute,
         },
         { provide: HecOrganizationIntegrationService, useValue: mockIntegrationService },
+        { provide: DatadogOrganizationIntegrationService, useValue: mockDatadogIntegrationService },
         {
           provide: ToastService,
           useValue: mock<ToastService>(),
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.ts
index 66ccc2530c2..19f15d1caea 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integration-grid/integration-grid.component.ts
@@ -6,15 +6,23 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
 import { IntegrationCardComponent } from "../integration-card/integration-card.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-integration-grid",
   templateUrl: "./integration-grid.component.html",
   imports: [IntegrationCardComponent, SharedModule],
 })
 export class IntegrationGridComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() integrations: Integration[] = [];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() ariaI18nKey: string = "integrationCardAriaLabel";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() tooltipI18nKey: string = "integrationCardTooltip";
 
   protected IntegrationType = IntegrationType;
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.ts
index c249bf42282..894a8e9a25c 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/integrations.component.ts
@@ -4,6 +4,8 @@ import { firstValueFrom, Observable, Subject, switchMap, takeUntil, takeWhile }
 
 import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
 import { OrganizationIntegrationServiceType } from "@bitwarden/bit-common/dirt/organization-integrations/models/organization-integration-service-type";
+import { OrganizationIntegrationType } from "@bitwarden/bit-common/dirt/organization-integrations/models/organization-integration-type";
+import { DatadogOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/datadog-organization-integration-service";
 import { HecOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/hec-organization-integration-service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -19,6 +21,8 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
 import { IntegrationGridComponent } from "./integration-grid/integration-grid.component";
 import { FilterIntegrationsPipe } from "./integrations.pipe";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "ac-integrations",
   templateUrl: "./integrations.component.html",
@@ -27,7 +31,7 @@ import { FilterIntegrationsPipe } from "./integrations.pipe";
 export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
   tabIndex: number = 0;
   organization$: Observable<Organization> = new Observable<Organization>();
-  isEventBasedIntegrationsEnabled: boolean = false;
+  isEventManagementForDataDogAndCrowdStrikeEnabled: boolean = false;
   private destroy$ = new Subject<void>();
 
   // initialize the integrations list with default integrations
@@ -199,6 +203,14 @@ export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
       image: "../../../../../../../images/integrations/logo-panther-round-color.svg",
       type: IntegrationType.EVENT,
     },
+    {
+      name: "Sumo Logic",
+      linkURL: "https://bitwarden.com/help/sumo-logic-siem/",
+      image: "../../../../../../../images/integrations/logo-sumo-logic-siem.svg",
+      imageDarkMode: "../../../../../../../images/integrations/logo-sumo-logic-siem-darkmode.svg",
+      type: IntegrationType.EVENT,
+      newBadgeExpiration: "2025-12-31",
+    },
     {
       name: "Microsoft Intune",
       linkURL: "https://bitwarden.com/help/deploy-browser-extensions-with-intune/",
@@ -226,7 +238,51 @@ export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
     // Sets the organization ID which also loads the integrations$
     this.organization$.pipe(takeUntil(this.destroy$)).subscribe((org) => {
       this.hecOrganizationIntegrationService.setOrganizationIntegrations(org.id);
+      this.datadogOrganizationIntegrationService.setOrganizationIntegrations(org.id);
     });
+  }
+
+  constructor(
+    private route: ActivatedRoute,
+    private organizationService: OrganizationService,
+    private accountService: AccountService,
+    private configService: ConfigService,
+    private hecOrganizationIntegrationService: HecOrganizationIntegrationService,
+    private datadogOrganizationIntegrationService: DatadogOrganizationIntegrationService,
+  ) {
+    this.configService
+      .getFeatureFlag$(FeatureFlag.EventManagementForDataDogAndCrowdStrike)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((isEnabled) => {
+        this.isEventManagementForDataDogAndCrowdStrikeEnabled = isEnabled;
+      });
+
+    // Add the new event based items to the list
+    if (this.isEventManagementForDataDogAndCrowdStrikeEnabled) {
+      const crowdstrikeIntegration: Integration = {
+        name: OrganizationIntegrationServiceType.CrowdStrike,
+        linkURL: "https://bitwarden.com/help/crowdstrike-siem/",
+        image: "../../../../../../../images/integrations/logo-crowdstrike-black.svg",
+        type: IntegrationType.EVENT,
+        description: "crowdstrikeEventIntegrationDesc",
+        canSetupConnection: true,
+        integrationType: OrganizationIntegrationType.Hec,
+      };
+
+      this.integrationsList.push(crowdstrikeIntegration);
+
+      const datadogIntegration: Integration = {
+        name: OrganizationIntegrationServiceType.Datadog,
+        linkURL: "https://bitwarden.com/help/datadog-siem/",
+        image: "../../../../../../../images/integrations/logo-datadog-color.svg",
+        type: IntegrationType.EVENT,
+        description: "datadogEventIntegrationDesc",
+        canSetupConnection: true,
+        integrationType: OrganizationIntegrationType.Datadog,
+      };
+
+      this.integrationsList.push(datadogIntegration);
+    }
 
     // For all existing event based configurations loop through and assign the
     // organizationIntegration for the correct services.
@@ -235,7 +291,9 @@ export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
       .subscribe((integrations) => {
         // reset all integrations to null first - in case one was deleted
         this.integrationsList.forEach((i) => {
-          i.organizationIntegration = null;
+          if (i.integrationType === OrganizationIntegrationType.Hec) {
+            i.organizationIntegration = null;
+          }
         });
 
         integrations.map((integration) => {
@@ -245,35 +303,24 @@ export class AdminConsoleIntegrationsComponent implements OnInit, OnDestroy {
           }
         });
       });
-  }
 
-  constructor(
-    private route: ActivatedRoute,
-    private organizationService: OrganizationService,
-    private accountService: AccountService,
-    private configService: ConfigService,
-    private hecOrganizationIntegrationService: HecOrganizationIntegrationService,
-  ) {
-    this.configService
-      .getFeatureFlag$(FeatureFlag.EventBasedOrganizationIntegrations)
+    this.datadogOrganizationIntegrationService.integrations$
       .pipe(takeUntil(this.destroy$))
-      .subscribe((isEnabled) => {
-        this.isEventBasedIntegrationsEnabled = isEnabled;
+      .subscribe((integrations) => {
+        // reset all integrations to null first - in case one was deleted
+        this.integrationsList.forEach((i) => {
+          if (i.integrationType === OrganizationIntegrationType.Datadog) {
+            i.organizationIntegration = null;
+          }
+        });
+
+        integrations.map((integration) => {
+          const item = this.integrationsList.find((i) => i.name === integration.serviceType);
+          if (item) {
+            item.organizationIntegration = integration;
+          }
+        });
       });
-
-    // Add the new event based items to the list
-    if (this.isEventBasedIntegrationsEnabled) {
-      const crowdstrikeIntegration: Integration = {
-        name: OrganizationIntegrationServiceType.CrowdStrike,
-        linkURL: "",
-        image: "../../../../../../../images/integrations/logo-crowdstrike-black.svg",
-        type: IntegrationType.EVENT,
-        description: "crowdstrikeEventIntegrationDesc",
-        canSetupConnection: true,
-      };
-
-      this.integrationsList.push(crowdstrikeIntegration);
-    }
   }
   ngOnDestroy(): void {
     this.destroy$.next();
diff --git a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/organization-integrations.module.ts b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/organization-integrations.module.ts
index a8e0899f26d..e3c37b4a42b 100644
--- a/bitwarden_license/bit-web/src/app/dirt/organization-integrations/organization-integrations.module.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/organization-integrations/organization-integrations.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from "@angular/core";
 
+import { DatadogOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/datadog-organization-integration-service";
 import { HecOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/hec-organization-integration-service";
 import { OrganizationIntegrationApiService } from "@bitwarden/bit-common/dirt/organization-integrations/services/organization-integration-api.service";
 import { OrganizationIntegrationConfigurationApiService } from "@bitwarden/bit-common/dirt/organization-integrations/services/organization-integration-configuration-api.service";
@@ -12,6 +13,11 @@ import { OrganizationIntegrationsRoutingModule } from "./organization-integratio
 @NgModule({
   imports: [AdminConsoleIntegrationsComponent, OrganizationIntegrationsRoutingModule],
   providers: [
+    safeProvider({
+      provide: DatadogOrganizationIntegrationService,
+      useClass: DatadogOrganizationIntegrationService,
+      deps: [OrganizationIntegrationApiService, OrganizationIntegrationConfigurationApiService],
+    }),
     safeProvider({
       provide: HecOrganizationIntegrationService,
       useClass: HecOrganizationIntegrationService,
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.ts
index b9cab679560..445cee6683c 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.ts
@@ -8,11 +8,15 @@ import { BehaviorSubject, debounceTime, firstValueFrom, lastValueFrom } from "rx
 
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { DialogService, SearchModule, TableDataSource } from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
 import { ExportHelper } from "@bitwarden/vault-export-core";
 import { CoreOrganizationModule } from "@bitwarden/web-vault/app/admin-console/organizations/core";
 import {
@@ -30,6 +34,8 @@ import { MemberAccessReportService } from "./services/member-access-report.servi
 import { userReportItemHeaders } from "./view/member-access-export.view";
 import { MemberAccessReportView } from "./view/member-access-report.view";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "member-access-report",
   templateUrl: "member-access-report.component.html",
@@ -38,7 +44,7 @@ import { MemberAccessReportView } from "./view/member-access-report.view";
     safeProvider({
       provide: MemberAccessReportServiceAbstraction,
       useClass: MemberAccessReportService,
-      deps: [MemberAccessReportApiService, I18nService],
+      deps: [MemberAccessReportApiService, I18nService, EncryptService, KeyService, AccountService],
     }),
   ],
 })
@@ -56,6 +62,7 @@ export class MemberAccessReportComponent implements OnInit {
     protected dialogService: DialogService,
     protected userNamePipe: UserNamePipe,
     protected billingApiService: BillingApiServiceAbstraction,
+    protected organizationMetadataService: OrganizationMetadataServiceAbstraction,
   ) {
     // Connect the search input to the table dataSource filter input
     this.searchControl.valueChanges
@@ -69,8 +76,8 @@ export class MemberAccessReportComponent implements OnInit {
     const params = await firstValueFrom(this.route.params);
     this.organizationId = params.organizationId;
 
-    const billingMetadata = await this.billingApiService.getOrganizationBillingMetadata(
-      this.organizationId,
+    const billingMetadata = await firstValueFrom(
+      this.organizationMetadataService.getOrganizationMetadata$(this.organizationId),
     );
 
     this.orgIsOnSecretsManagerStandalone = billingMetadata.isOnSecretsManagerStandalone;
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.spec.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.spec.ts
index ad388cfed04..615e6d079b2 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.spec.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.spec.ts
@@ -1,7 +1,13 @@
 import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
 
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { OrganizationId } from "@bitwarden/common/types/guid";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { mockAccountServiceWith } from "@bitwarden/common/spec";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { newGuid } from "@bitwarden/guid";
+import { KeyService } from "@bitwarden/key-management";
 
 import { MemberAccessReportApiService } from "./member-access-report-api.service";
 import {
@@ -9,9 +15,14 @@ import {
   memberAccessWithoutAccessDetailsReportsMock,
 } from "./member-access-report.mock";
 import { MemberAccessReportService } from "./member-access-report.service";
+
 describe("ImportService", () => {
   const mockOrganizationId = "mockOrgId" as OrganizationId;
   const reportApiService = mock<MemberAccessReportApiService>();
+  const mockEncryptService = mock<EncryptService>();
+  const userId = newGuid() as UserId;
+  const mockAccountService = mockAccountServiceWith(userId);
+  const mockKeyService = mock<KeyService>();
   let memberAccessReportService: MemberAccessReportService;
   const i18nMock = mock<I18nService>({
     t(key) {
@@ -20,10 +31,19 @@ describe("ImportService", () => {
   });
 
   beforeEach(() => {
+    mockKeyService.orgKeys$.mockReturnValue(
+      of({ mockOrgId: new SymmetricCryptoKey(new Uint8Array(64)) }),
+    );
     reportApiService.getMemberAccessData.mockImplementation(() =>
       Promise.resolve(memberAccessReportsMock),
     );
-    memberAccessReportService = new MemberAccessReportService(reportApiService, i18nMock);
+    memberAccessReportService = new MemberAccessReportService(
+      reportApiService,
+      i18nMock,
+      mockEncryptService,
+      mockKeyService,
+      mockAccountService,
+    );
   });
 
   describe("generateMemberAccessReportView", () => {
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
index caa27a75b82..3bd74391419 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
@@ -1,11 +1,16 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Injectable } from "@angular/core";
+import { firstValueFrom, map } from "rxjs";
 
 import { CollectionAccessSelectionView } from "@bitwarden/admin-console/common";
+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 { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Guid, OrganizationId } from "@bitwarden/common/types/guid";
+import { KeyService } from "@bitwarden/key-management";
 import {
   getPermissionList,
   convertToPermission,
@@ -22,6 +27,9 @@ export class MemberAccessReportService {
   constructor(
     private reportApiService: MemberAccessReportApiService,
     private i18nService: I18nService,
+    private encryptService: EncryptService,
+    private keyService: KeyService,
+    private accountService: AccountService,
   ) {}
   /**
    * Transforms user data into a MemberAccessReportView.
@@ -78,14 +86,24 @@ export class MemberAccessReportService {
   async generateUserReportExportItems(
     organizationId: OrganizationId,
   ): Promise<MemberAccessExportItem[]> {
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const organizationSymmetricKey = await firstValueFrom(
+      this.keyService.orgKeys$(activeUserId).pipe(map((keys) => keys[organizationId])),
+    );
+
     const memberAccessReports = await this.reportApiService.getMemberAccessData(organizationId);
     const collectionNames = memberAccessReports.map((item) => item.collectionName.encryptedString);
 
-    const collectionNameMap = new Map(collectionNames.map((col) => [col, ""]));
+    const collectionNameMap = new Map(
+      collectionNames.filter((col) => col !== null).map((col) => [col, ""]),
+    );
     for await (const key of collectionNameMap.keys()) {
-      const decrypted = new EncString(key);
-      await decrypted.decrypt(organizationId);
-      collectionNameMap.set(key, decrypted.decryptedValue);
+      const encryptedCollectionName = new EncString(key);
+      const collectionName = await this.encryptService.decryptString(
+        encryptedCollectionName,
+        organizationSymmetricKey,
+      );
+      collectionNameMap.set(key, collectionName);
     }
 
     const exportItems = memberAccessReports.map((report) => {
diff --git a/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.html b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.html
new file mode 100644
index 00000000000..2b718990c30
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.html
@@ -0,0 +1,38 @@
+<bit-dialog dialogSize="small">
+  <div bitDialogTitle class="tw-mt-4 tw-flex tw-flex-col tw-gap-2 tw-text-center">
+    <i class="bwi bwi-exclamation-triangle tw-text-3xl tw-text-warning" aria-hidden="true"></i>
+    <h1
+      bitTypography="h3"
+      class="tw-break-words tw-hyphens-auto tw-whitespace-normal tw-max-w-fit tw-inline-block"
+    >
+      {{ "sessionTimeoutConfirmationNeverTitle" | i18n }}
+    </h1>
+  </div>
+
+  <span
+    bitDialogContent
+    class="tw-flex tw-flex-col tw-gap-2 tw-items-center tw-text-center tw-text-base tw-break-words tw-hyphens-auto"
+  >
+    <p>{{ "sessionTimeoutConfirmationNeverDescription" | i18n }}</p>
+    <a
+      target="_blank"
+      rel="noreferrer"
+      appA11yTitle="{{ 'learnMoreAboutDeviceProtection' | i18n }}"
+      href="https://bitwarden.com/help/vault-timeout/"
+      bitLink
+      class="tw-flex tw-flex-row tw-gap-1"
+    >
+      {{ "learnMoreAboutDeviceProtection" | i18n }}
+      <i class="bwi bwi-external-link" aria-hidden="true"></i>
+    </a>
+  </span>
+
+  <div bitDialogFooter class="tw-flex tw-flex-col tw-flex-grow tw-gap-2">
+    <button bitButton buttonType="primary" type="button" (click)="dialogRef.close(true)">
+      {{ "yes" | i18n }}
+    </button>
+    <button bitButton buttonType="secondary" type="button" (click)="dialogRef.close(false)">
+      {{ "no" | i18n }}
+    </button>
+  </div>
+</bit-dialog>
diff --git a/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.spec.ts b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.spec.ts
new file mode 100644
index 00000000000..332a0e323a7
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.spec.ts
@@ -0,0 +1,79 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { mock } from "jest-mock-extended";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogRef, DialogService } from "@bitwarden/components";
+
+import { SessionTimeoutConfirmationNeverComponent } from "./session-timeout-confirmation-never.component";
+
+describe("SessionTimeoutConfirmationNeverComponent", () => {
+  let component: SessionTimeoutConfirmationNeverComponent;
+  let fixture: ComponentFixture<SessionTimeoutConfirmationNeverComponent>;
+  let mockDialogRef: jest.Mocked<DialogRef>;
+
+  const mockI18nService = mock<I18nService>();
+  const mockDialogService = mock<DialogService>();
+
+  beforeEach(async () => {
+    mockDialogRef = mock<DialogRef>();
+    mockI18nService.t.mockImplementation((key) => `${key}-used-i18n`);
+
+    await TestBed.configureTestingModule({
+      imports: [SessionTimeoutConfirmationNeverComponent, NoopAnimationsModule],
+      providers: [
+        { provide: DialogRef, useValue: mockDialogRef },
+        { provide: I18nService, useValue: mockI18nService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SessionTimeoutConfirmationNeverComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe("open", () => {
+    it("should call dialogService.open with correct parameters", () => {
+      const mockResult = mock<DialogRef>();
+      mockDialogService.open.mockReturnValue(mockResult);
+
+      const result = SessionTimeoutConfirmationNeverComponent.open(mockDialogService);
+
+      expect(mockDialogService.open).toHaveBeenCalledWith(
+        SessionTimeoutConfirmationNeverComponent,
+        {
+          disableClose: true,
+        },
+      );
+      expect(result).toBe(mockResult);
+    });
+  });
+
+  describe("button clicks", () => {
+    it("should close dialog with true when Yes button is clicked", () => {
+      const yesButton = fixture.nativeElement.querySelector(
+        'button[buttonType="primary"]',
+      ) as HTMLButtonElement;
+
+      yesButton.click();
+
+      expect(mockDialogRef.close).toHaveBeenCalledWith(true);
+      expect(yesButton.textContent?.trim()).toBe("yes-used-i18n");
+    });
+
+    it("should close dialog with false when No button is clicked", () => {
+      const noButton = fixture.nativeElement.querySelector(
+        'button[buttonType="secondary"]',
+      ) as HTMLButtonElement;
+
+      noButton.click();
+
+      expect(mockDialogRef.close).toHaveBeenCalledWith(false);
+      expect(noButton.textContent?.trim()).toBe("no-used-i18n");
+    });
+  });
+});
diff --git a/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.ts b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.ts
new file mode 100644
index 00000000000..884cbd10cac
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout-confirmation-never.component.ts
@@ -0,0 +1,20 @@
+import { Component } from "@angular/core";
+
+import { DialogRef, DialogService } from "@bitwarden/components";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  imports: [SharedModule],
+  templateUrl: "./session-timeout-confirmation-never.component.html",
+})
+export class SessionTimeoutConfirmationNeverComponent {
+  constructor(public dialogRef: DialogRef) {}
+
+  static open(dialogService: DialogService) {
+    return dialogService.open<boolean>(SessionTimeoutConfirmationNeverComponent, {
+      disableClose: true,
+    });
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.html b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.html
new file mode 100644
index 00000000000..22e9e07bea7
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.html
@@ -0,0 +1,39 @@
+<bit-callout title="{{ 'prerequisite' | i18n }}">
+  {{ "requireSsoPolicyReq" | i18n }}
+</bit-callout>
+
+<bit-form-control>
+  <input type="checkbox" id="enabled" bitCheckbox [formControl]="enabled" />
+  <bit-label>{{ "turnOn" | i18n }}</bit-label>
+</bit-form-control>
+
+<div [formGroup]="data">
+  <div class="tw-grid tw-grid-cols-12 tw-gap-4">
+    <bit-form-field class="tw-col-span-12 !tw-mb-0">
+      <bit-label>{{ "maximumAllowedTimeout" | i18n }}</bit-label>
+      <bit-select formControlName="type">
+        @for (option of typeOptions; track option.value) {
+          <bit-option [value]="option.value" [label]="option.name"></bit-option>
+        }
+      </bit-select>
+    </bit-form-field>
+    @if (data.value.type === "custom") {
+      <bit-form-field class="tw-col-span-6 tw-self-start !tw-mb-0">
+        <bit-label>{{ "hours" | i18n }}</bit-label>
+        <input bitInput type="number" min="0" formControlName="hours" />
+      </bit-form-field>
+      <bit-form-field class="tw-col-span-6 tw-self-start !tw-mb-0">
+        <bit-label>{{ "minutes" | i18n }}</bit-label>
+        <input bitInput type="number" min="0" max="59" formControlName="minutes" />
+      </bit-form-field>
+    }
+    <bit-form-field class="tw-col-span-12">
+      <bit-label>{{ "sessionTimeoutAction" | i18n }}</bit-label>
+      <bit-select formControlName="action">
+        @for (option of actionOptions; track option.value) {
+          <bit-option [value]="option.value" [label]="option.name"></bit-option>
+        }
+      </bit-select>
+    </bit-form-field>
+  </div>
+</div>
diff --git a/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.spec.ts b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.spec.ts
new file mode 100644
index 00000000000..694b0f1d1a2
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.spec.ts
@@ -0,0 +1,441 @@
+import { DialogCloseOptions } from "@angular/cdk/dialog";
+import { DebugElement } from "@angular/core";
+import { ComponentFixture, TestBed, fakeAsync, tick } from "@angular/core/testing";
+import { FormBuilder, ReactiveFormsModule } from "@angular/forms";
+import { By } from "@angular/platform-browser";
+import { mock } from "jest-mock-extended";
+import { Observable, of } from "rxjs";
+
+import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
+import { VaultTimeoutAction } from "@bitwarden/common/key-management/vault-timeout";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogRef, DialogService } from "@bitwarden/components";
+
+import { SessionTimeoutConfirmationNeverComponent } from "./session-timeout-confirmation-never.component";
+import {
+  SessionTimeoutAction,
+  SessionTimeoutPolicyComponent,
+  SessionTimeoutType,
+} from "./session-timeout.component";
+
+// Mock DialogRef, so we can mock "readonly closed" property.
+class MockDialogRef extends DialogRef {
+  close(result: unknown | undefined, options: DialogCloseOptions | undefined): void {}
+
+  closed: Observable<unknown | undefined> = of();
+  componentInstance: unknown | null;
+  disableClose: boolean | undefined;
+  isDrawer: boolean = false;
+}
+
+describe("SessionTimeoutPolicyComponent", () => {
+  let component: SessionTimeoutPolicyComponent;
+  let fixture: ComponentFixture<SessionTimeoutPolicyComponent>;
+
+  const mockI18nService = mock<I18nService>();
+  const mockDialogService = mock<DialogService>();
+  const mockDialogRef = mock<MockDialogRef>();
+
+  beforeEach(async () => {
+    jest.resetAllMocks();
+
+    mockDialogRef.closed = of(true);
+    mockDialogService.open.mockReturnValue(mockDialogRef);
+    mockDialogService.openSimpleDialog.mockResolvedValue(true);
+
+    mockI18nService.t.mockImplementation((key) => `${key}-used-i18n`);
+
+    const testBed = TestBed.configureTestingModule({
+      imports: [SessionTimeoutPolicyComponent, ReactiveFormsModule],
+      providers: [FormBuilder, { provide: I18nService, useValue: mockI18nService }],
+    });
+
+    // Override DialogService provided from SharedModule (which includes DialogModule)
+    testBed.overrideProvider(DialogService, { useValue: mockDialogService });
+
+    await testBed.compileComponents();
+
+    fixture = TestBed.createComponent(SessionTimeoutPolicyComponent);
+    component = fixture.componentInstance;
+  });
+
+  function assertHoursAndMinutesInputsNotVisible() {
+    const hoursInput = fixture.nativeElement.querySelector('input[formControlName="hours"]');
+    const minutesInput = fixture.nativeElement.querySelector('input[formControlName="minutes"]');
+
+    expect(hoursInput).toBeFalsy();
+    expect(minutesInput).toBeFalsy();
+  }
+
+  function assertHoursAndMinutesInputs(expectedHours: string, expectedMinutes: string) {
+    const hoursInput = fixture.nativeElement.querySelector('input[formControlName="hours"]');
+    const minutesInput = fixture.nativeElement.querySelector('input[formControlName="minutes"]');
+
+    expect(hoursInput).toBeTruthy();
+    expect(minutesInput).toBeTruthy();
+    expect(hoursInput.disabled).toBe(false);
+    expect(minutesInput.disabled).toBe(false);
+    expect(hoursInput.value).toBe(expectedHours);
+    expect(minutesInput.value).toBe(expectedMinutes);
+  }
+
+  function setPolicyResponseType(type: SessionTimeoutType) {
+    component.policyResponse = new PolicyResponse({
+      Data: {
+        type,
+        minutes: 480,
+        action: null,
+      },
+    });
+  }
+
+  describe("initialization and data loading", () => {
+    function assertTypeAndActionSelectElementsVisible() {
+      // Type and action selects should always be present
+      const typeSelectDebug: DebugElement = fixture.debugElement.query(
+        By.css('bit-select[formControlName="type"]'),
+      );
+      const actionSelectDebug: DebugElement = fixture.debugElement.query(
+        By.css('bit-select[formControlName="action"]'),
+      );
+
+      expect(typeSelectDebug).toBeTruthy();
+      expect(actionSelectDebug).toBeTruthy();
+    }
+
+    it("should initialize with default state when policy have no value", () => {
+      component.policyResponse = undefined;
+
+      fixture.detectChanges();
+
+      expect(component.data.controls.type.value).toBeNull();
+      expect(component.data.controls.type.hasError("required")).toBe(true);
+      expect(component.data.controls.hours.value).toBe(8);
+      expect(component.data.controls.hours.disabled).toBe(true);
+      expect(component.data.controls.minutes.value).toBe(0);
+      expect(component.data.controls.minutes.disabled).toBe(true);
+      expect(component.data.controls.action.value).toBeNull();
+
+      assertTypeAndActionSelectElementsVisible();
+      assertHoursAndMinutesInputsNotVisible();
+    });
+
+    // This is for backward compatibility when type field did not exist
+    it("should load as custom type when type field does not exist but minutes does", () => {
+      component.policyResponse = new PolicyResponse({
+        Data: {
+          minutes: 500,
+          action: VaultTimeoutAction.Lock,
+        },
+      });
+
+      fixture.detectChanges();
+
+      expect(component.data.controls.type.value).toBe("custom");
+      expect(component.data.controls.hours.value).toBe(8);
+      expect(component.data.controls.hours.disabled).toBe(false);
+      expect(component.data.controls.minutes.value).toBe(20);
+      expect(component.data.controls.minutes.disabled).toBe(false);
+      expect(component.data.controls.action.value).toBe(VaultTimeoutAction.Lock);
+
+      assertTypeAndActionSelectElementsVisible();
+      assertHoursAndMinutesInputs("8", "20");
+    });
+
+    it.each([
+      ["never", null],
+      ["never", VaultTimeoutAction.Lock],
+      ["never", VaultTimeoutAction.LogOut],
+      ["onAppRestart", null],
+      ["onAppRestart", VaultTimeoutAction.Lock],
+      ["onAppRestart", VaultTimeoutAction.LogOut],
+      ["onSystemLock", null],
+      ["onSystemLock", VaultTimeoutAction.Lock],
+      ["onSystemLock", VaultTimeoutAction.LogOut],
+      ["immediately", null],
+      ["immediately", VaultTimeoutAction.Lock],
+      ["immediately", VaultTimeoutAction.LogOut],
+      ["custom", null],
+      ["custom", VaultTimeoutAction.Lock],
+      ["custom", VaultTimeoutAction.LogOut],
+    ])("should load correctly when policy type is %s and action is %s", (type, action) => {
+      component.policyResponse = new PolicyResponse({
+        Data: {
+          type,
+          minutes: 510,
+          action,
+        },
+      });
+
+      fixture.detectChanges();
+
+      expect(component.data.controls.type.value).toBe(type);
+      expect(component.data.controls.action.value).toBe(action);
+
+      assertTypeAndActionSelectElementsVisible();
+
+      if (type === "custom") {
+        expect(component.data.controls.hours.value).toBe(8);
+        expect(component.data.controls.minutes.value).toBe(30);
+        expect(component.data.controls.hours.disabled).toBe(false);
+        expect(component.data.controls.minutes.disabled).toBe(false);
+
+        assertHoursAndMinutesInputs("8", "30");
+      } else {
+        expect(component.data.controls.hours.disabled).toBe(true);
+        expect(component.data.controls.minutes.disabled).toBe(true);
+
+        assertHoursAndMinutesInputsNotVisible();
+      }
+    });
+
+    it("should have all type options and update form control when value changes", fakeAsync(() => {
+      expect(component.typeOptions.length).toBe(5);
+      expect(component.typeOptions[0].value).toBe("immediately");
+      expect(component.typeOptions[1].value).toBe("custom");
+      expect(component.typeOptions[2].value).toBe("onSystemLock");
+      expect(component.typeOptions[3].value).toBe("onAppRestart");
+      expect(component.typeOptions[4].value).toBe("never");
+    }));
+
+    it("should have all action options and update form control when value changes", () => {
+      expect(component.actionOptions.length).toBe(3);
+      expect(component.actionOptions[0].value).toBeNull();
+      expect(component.actionOptions[1].value).toBe(VaultTimeoutAction.Lock);
+      expect(component.actionOptions[2].value).toBe(VaultTimeoutAction.LogOut);
+    });
+  });
+
+  describe("form controls change detection", () => {
+    it.each(["never", "onAppRestart", "onSystemLock", "immediately"])(
+      "should disable hours and minutes inputs when type changes from custom to %s",
+      fakeAsync((newType: SessionTimeoutType) => {
+        setPolicyResponseType("custom");
+        fixture.detectChanges();
+
+        expect(component.data.controls.hours.value).toBe(8);
+        expect(component.data.controls.minutes.value).toBe(0);
+        expect(component.data.controls.hours.disabled).toBe(false);
+        expect(component.data.controls.minutes.disabled).toBe(false);
+
+        component.data.patchValue({ type: newType });
+        tick();
+        fixture.detectChanges();
+
+        expect(component.data.controls.hours.disabled).toBe(true);
+        expect(component.data.controls.minutes.disabled).toBe(true);
+
+        assertHoursAndMinutesInputsNotVisible();
+      }),
+    );
+
+    it.each(["never", "onAppRestart", "onSystemLock", "immediately"])(
+      "should enable hours and minutes inputs when type changes from %s to custom",
+      fakeAsync((oldType: SessionTimeoutType) => {
+        setPolicyResponseType(oldType);
+        fixture.detectChanges();
+
+        expect(component.data.controls.hours.disabled).toBe(true);
+        expect(component.data.controls.minutes.disabled).toBe(true);
+
+        component.data.patchValue({ type: "custom", hours: 8, minutes: 1 });
+        tick();
+        fixture.detectChanges();
+
+        expect(component.data.controls.hours.value).toBe(8);
+        expect(component.data.controls.minutes.value).toBe(1);
+        expect(component.data.controls.hours.disabled).toBe(false);
+        expect(component.data.controls.minutes.disabled).toBe(false);
+
+        assertHoursAndMinutesInputs("8", "1");
+      }),
+    );
+
+    it.each(["custom", "onAppRestart", "immediately"])(
+      "should not show confirmation dialog when changing to %s type",
+      fakeAsync((newType: SessionTimeoutType) => {
+        setPolicyResponseType(null);
+        fixture.detectChanges();
+
+        component.data.patchValue({ type: newType });
+        tick();
+        fixture.detectChanges();
+
+        expect(mockDialogService.open).not.toHaveBeenCalled();
+        expect(mockDialogService.openSimpleDialog).not.toHaveBeenCalled();
+      }),
+    );
+
+    it("should show never confirmation dialog when changing to never type", fakeAsync(() => {
+      setPolicyResponseType(null);
+      fixture.detectChanges();
+
+      component.data.patchValue({ type: "never" });
+      tick();
+      fixture.detectChanges();
+
+      expect(mockDialogService.open).toHaveBeenCalledWith(
+        SessionTimeoutConfirmationNeverComponent,
+        {
+          disableClose: true,
+        },
+      );
+      expect(mockDialogService.openSimpleDialog).not.toHaveBeenCalled();
+    }));
+
+    it("should show simple confirmation dialog when changing to onSystemLock type", fakeAsync(() => {
+      setPolicyResponseType(null);
+      fixture.detectChanges();
+
+      component.data.patchValue({ type: "onSystemLock" });
+      tick();
+      fixture.detectChanges();
+
+      expect(mockDialogService.openSimpleDialog).toHaveBeenCalledWith({
+        type: "info",
+        title: { key: "sessionTimeoutConfirmationOnSystemLockTitle" },
+        content: { key: "sessionTimeoutConfirmationOnSystemLockDescription" },
+        acceptButtonText: { key: "continue" },
+        cancelButtonText: { key: "cancel" },
+      });
+      expect(mockDialogService.open).not.toHaveBeenCalled();
+      expect(component.data.controls.type.value).toBe("onSystemLock");
+    }));
+
+    it("should revert to previous type when type changed to never and dialog not confirmed", fakeAsync(() => {
+      mockDialogRef.closed = of(false);
+      setPolicyResponseType("immediately");
+      fixture.detectChanges();
+
+      component.data.patchValue({ type: "never" });
+      tick();
+      fixture.detectChanges();
+
+      expect(mockDialogService.open).toHaveBeenCalled();
+      expect(mockDialogService.openSimpleDialog).not.toHaveBeenCalled();
+      expect(component.data.controls.type.value).toBe("immediately");
+    }));
+
+    it("should revert to previous type when type changed to onSystemLock and dialog not confirmed", fakeAsync(() => {
+      mockDialogService.openSimpleDialog.mockResolvedValue(false);
+      setPolicyResponseType("immediately");
+      fixture.detectChanges();
+
+      component.data.patchValue({ type: "onSystemLock" });
+      tick();
+      fixture.detectChanges();
+
+      expect(mockDialogService.openSimpleDialog).toHaveBeenCalled();
+      expect(mockDialogService.open).not.toHaveBeenCalled();
+      expect(component.data.controls.type.value).toBe("immediately");
+    }));
+
+    it("should revert to last confirmed type when canceling multiple times", fakeAsync(() => {
+      mockDialogRef.closed = of(false);
+      mockDialogService.openSimpleDialog.mockResolvedValue(false);
+
+      setPolicyResponseType("custom");
+      fixture.detectChanges();
+
+      // First attempt: custom -> never (cancel)
+      component.data.patchValue({ type: "never" });
+      tick();
+      fixture.detectChanges();
+
+      expect(component.data.controls.type.value).toBe("custom");
+
+      // Second attempt: custom -> onSystemLock (cancel)
+      component.data.patchValue({ type: "onSystemLock" });
+      tick();
+      fixture.detectChanges();
+
+      // Should revert to "custom", not "never"
+      expect(component.data.controls.type.value).toBe("custom");
+    }));
+  });
+
+  describe("buildRequestData", () => {
+    beforeEach(() => {
+      setPolicyResponseType("custom");
+      fixture.detectChanges();
+    });
+
+    it("should throw max allowed timeout required error when type is invalid", () => {
+      component.data.patchValue({ type: null });
+
+      expect(() => component["buildRequestData"]()).toThrow(
+        "maximumAllowedTimeoutRequired-used-i18n",
+      );
+    });
+
+    it.each([
+      [null, null],
+      [null, 0],
+      [0, null],
+      [0, 0],
+    ])(
+      "should throw invalid time error when type is custom, hours is %o and minutes is %o ",
+      (hours, minutes) => {
+        component.data.patchValue({
+          type: "custom",
+          hours: hours,
+          minutes: minutes,
+        });
+
+        expect(() => component["buildRequestData"]()).toThrow(
+          "sessionTimeoutPolicyInvalidTime-used-i18n",
+        );
+      },
+    );
+
+    it("should return correct data when type is custom with valid time", () => {
+      component.data.patchValue({
+        type: "custom",
+        hours: 8,
+        minutes: 30,
+        action: VaultTimeoutAction.Lock,
+      });
+
+      const result = component["buildRequestData"]();
+
+      expect(result).toEqual({
+        type: "custom",
+        minutes: 510,
+        action: VaultTimeoutAction.Lock,
+      });
+    });
+
+    it.each([
+      ["never", null],
+      ["never", VaultTimeoutAction.Lock],
+      ["never", VaultTimeoutAction.LogOut],
+      ["immediately", null],
+      ["immediately", VaultTimeoutAction.Lock],
+      ["immediately", VaultTimeoutAction.LogOut],
+      ["onSystemLock", null],
+      ["onSystemLock", VaultTimeoutAction.Lock],
+      ["onSystemLock", VaultTimeoutAction.LogOut],
+      ["onAppRestart", null],
+      ["onAppRestart", VaultTimeoutAction.Lock],
+      ["onAppRestart", VaultTimeoutAction.LogOut],
+    ])(
+      "should return default 8 hours for backward compatibility when type is %s and action is %s",
+      (type, action) => {
+        component.data.patchValue({
+          type: type as SessionTimeoutType,
+          hours: 5,
+          minutes: 25,
+          action: action as SessionTimeoutAction,
+        });
+
+        const result = component["buildRequestData"]();
+
+        expect(result).toEqual({
+          type,
+          minutes: 480,
+          action,
+        });
+      },
+    );
+  });
+});
diff --git a/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.ts b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.ts
new file mode 100644
index 00000000000..9c6129f64df
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/key-management/policies/session-timeout.component.ts
@@ -0,0 +1,199 @@
+import { Component, OnDestroy, OnInit } from "@angular/core";
+import { FormBuilder, FormControl, Validators } from "@angular/forms";
+import {
+  BehaviorSubject,
+  concatMap,
+  firstValueFrom,
+  Subject,
+  takeUntil,
+  withLatestFrom,
+} from "rxjs";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { VaultTimeoutAction } from "@bitwarden/common/key-management/vault-timeout";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogService } from "@bitwarden/components";
+import {
+  BasePolicyEditDefinition,
+  BasePolicyEditComponent,
+} from "@bitwarden/web-vault/app/admin-console/organizations/policies";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+import { SessionTimeoutConfirmationNeverComponent } from "./session-timeout-confirmation-never.component";
+
+export type SessionTimeoutAction = null | "lock" | "logOut";
+export type SessionTimeoutType =
+  | null
+  | "never"
+  | "onAppRestart"
+  | "onSystemLock"
+  | "immediately"
+  | "custom";
+
+export class SessionTimeoutPolicy extends BasePolicyEditDefinition {
+  name = "sessionTimeoutPolicyTitle";
+  description = "sessionTimeoutPolicyDescription";
+  type = PolicyType.MaximumVaultTimeout;
+  component = SessionTimeoutPolicyComponent;
+}
+
+const DEFAULT_HOURS = 8;
+const DEFAULT_MINUTES = 0;
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  templateUrl: "session-timeout.component.html",
+  imports: [SharedModule],
+})
+export class SessionTimeoutPolicyComponent
+  extends BasePolicyEditComponent
+  implements OnInit, OnDestroy
+{
+  private destroy$ = new Subject<void>();
+  private lastConfirmedType$ = new BehaviorSubject<SessionTimeoutType>(null);
+
+  actionOptions: { name: string; value: SessionTimeoutAction }[];
+  typeOptions: { name: string; value: SessionTimeoutType }[];
+  data = this.formBuilder.group({
+    type: new FormControl<SessionTimeoutType>(null, [Validators.required]),
+    hours: new FormControl<number>(
+      {
+        value: DEFAULT_HOURS,
+        disabled: true,
+      },
+      [Validators.required],
+    ),
+    minutes: new FormControl<number>(
+      {
+        value: DEFAULT_MINUTES,
+        disabled: true,
+      },
+      [Validators.required],
+    ),
+    action: new FormControl<SessionTimeoutAction>(null),
+  });
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private i18nService: I18nService,
+    private dialogService: DialogService,
+  ) {
+    super();
+    this.actionOptions = [
+      { name: i18nService.t("userPreference"), value: null },
+      { name: i18nService.t("lock"), value: VaultTimeoutAction.Lock },
+      { name: i18nService.t("logOut"), value: VaultTimeoutAction.LogOut },
+    ];
+    this.typeOptions = [
+      { name: i18nService.t("immediately"), value: "immediately" },
+      { name: i18nService.t("custom"), value: "custom" },
+      { name: i18nService.t("onSystemLock"), value: "onSystemLock" },
+      { name: i18nService.t("onAppRestart"), value: "onAppRestart" },
+      { name: i18nService.t("never"), value: "never" },
+    ];
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+
+    const typeControl = this.data.controls.type;
+    this.lastConfirmedType$.next(typeControl.value ?? null);
+
+    typeControl.valueChanges
+      .pipe(
+        withLatestFrom(this.lastConfirmedType$),
+        concatMap(async ([newType, lastConfirmedType]) => {
+          const confirmed = await this.confirmTypeChange(newType);
+          if (confirmed) {
+            this.updateFormControls(newType);
+            this.lastConfirmedType$.next(newType);
+          } else {
+            typeControl.setValue(lastConfirmedType, { emitEvent: false });
+          }
+        }),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  protected override loadData() {
+    const minutes: number | null = this.policyResponse?.data?.minutes ?? null;
+    const action: SessionTimeoutAction =
+      this.policyResponse?.data?.action ?? (null satisfies SessionTimeoutAction);
+    // For backward compatibility, the "type" field might not exist, hence we initialize it based on the presence of "minutes"
+    const type: SessionTimeoutType =
+      this.policyResponse?.data?.type ?? ((minutes ? "custom" : null) satisfies SessionTimeoutType);
+
+    this.updateFormControls(type);
+    this.data.patchValue({
+      type: type,
+      hours: minutes ? Math.floor(minutes / 60) : DEFAULT_HOURS,
+      minutes: minutes ? minutes % 60 : DEFAULT_MINUTES,
+      action: action,
+    });
+  }
+
+  protected override buildRequestData() {
+    this.data.markAllAsTouched();
+    this.data.updateValueAndValidity();
+    if (this.data.invalid) {
+      if (this.data.controls.type.hasError("required")) {
+        throw new Error(this.i18nService.t("maximumAllowedTimeoutRequired"));
+      }
+      throw new Error(this.i18nService.t("sessionTimeoutPolicyInvalidTime"));
+    }
+
+    let minutes = this.data.value.hours! * 60 + this.data.value.minutes!;
+
+    const type = this.data.value.type;
+    if (type === "custom") {
+      if (minutes <= 0) {
+        throw new Error(this.i18nService.t("sessionTimeoutPolicyInvalidTime"));
+      }
+    } else {
+      // For backwards compatibility, we set minutes to 8 hours, so older client's vault timeout will not be broken
+      minutes = DEFAULT_HOURS * 60 + DEFAULT_MINUTES;
+    }
+
+    return {
+      type,
+      minutes,
+      action: this.data.value.action,
+    };
+  }
+
+  private async confirmTypeChange(newType: SessionTimeoutType): Promise<boolean> {
+    if (newType === "never") {
+      const dialogRef = SessionTimeoutConfirmationNeverComponent.open(this.dialogService);
+      return !!(await firstValueFrom(dialogRef.closed));
+    } else if (newType === "onSystemLock") {
+      return await this.dialogService.openSimpleDialog({
+        type: "info",
+        title: { key: "sessionTimeoutConfirmationOnSystemLockTitle" },
+        content: { key: "sessionTimeoutConfirmationOnSystemLockDescription" },
+        acceptButtonText: { key: "continue" },
+        cancelButtonText: { key: "cancel" },
+      });
+    }
+
+    return true;
+  }
+
+  private updateFormControls(type: SessionTimeoutType) {
+    const hoursControl = this.data.controls.hours;
+    const minutesControl = this.data.controls.minutes;
+    if (type === "custom") {
+      hoursControl.enable();
+      minutesControl.enable();
+    } else {
+      hoursControl.disable();
+      minutesControl.disable();
+    }
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/guards/project-access.guard.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/guards/project-access.guard.spec.ts
index f442c85f46d..79c022e8fd2 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/guards/project-access.guard.spec.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/guards/project-access.guard.spec.ts
@@ -20,12 +20,16 @@ import { ProjectService } from "../projects/project.service";
 
 import { projectAccessGuard } from "./project-access.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
 })
 export class GuardedRouteTestComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts
index bd105fc21e2..0e8c46c8864 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts
@@ -9,6 +9,7 @@ import {} from "@bitwarden/web-vault/app/shared";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
+import { DatadogOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/datadog-organization-integration-service";
 import { HecOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/hec-organization-integration-service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ThemeType } from "@bitwarden/common/platform/enums";
@@ -20,6 +21,8 @@ import { IntegrationGridComponent } from "../../dirt/organization-integrations/i
 
 import { IntegrationsComponent } from "./integrations.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-header",
   template: "<div></div>",
@@ -27,6 +30,8 @@ import { IntegrationsComponent } from "./integrations.component";
 })
 class MockHeaderComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-new-menu",
   template: "<div></div>",
@@ -37,6 +42,7 @@ class MockNewMenuComponent {}
 describe("IntegrationsComponent", () => {
   let fixture: ComponentFixture<IntegrationsComponent>;
   const hecOrgIntegrationSvc = mock<HecOrganizationIntegrationService>();
+  const datadogOrgIntegrationSvc = mock<DatadogOrganizationIntegrationService>();
 
   const activatedRouteMock = {
     snapshot: { paramMap: { get: jest.fn() } },
@@ -55,6 +61,7 @@ describe("IntegrationsComponent", () => {
         { provide: I18nPipe, useValue: mock<I18nPipe>() },
         { provide: I18nService, useValue: mockI18nService },
         { provide: HecOrganizationIntegrationService, useValue: hecOrgIntegrationSvc },
+        { provide: DatadogOrganizationIntegrationService, useValue: datadogOrgIntegrationSvc },
       ],
     }).compileComponents();
     fixture = TestBed.createComponent(IntegrationsComponent);
@@ -71,7 +78,13 @@ describe("IntegrationsComponent", () => {
       (integrationList.componentInstance as IntegrationGridComponent).integrations.map(
         (i) => i.name,
       ),
-    ).toEqual(["GitHub Actions", "GitLab CI/CD", "Ansible", "Kubernetes Operator"]);
+    ).toEqual([
+      "GitHub Actions",
+      "GitLab CI/CD",
+      "Ansible",
+      "Kubernetes Operator",
+      "Terraform Provider",
+    ]);
 
     expect(
       (sdkList.componentInstance as IntegrationGridComponent).integrations.map((i) => i.name),
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.ts
index 31aff308c51..37c7a93d27f 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.ts
@@ -3,6 +3,8 @@ import { Component } from "@angular/core";
 import { Integration } from "@bitwarden/bit-common/dirt/organization-integrations/models/integration";
 import { IntegrationType } from "@bitwarden/common/enums";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-integrations",
   templateUrl: "./integrations.component.html",
@@ -36,7 +38,7 @@ export class IntegrationsComponent {
       },
       {
         name: "Ansible",
-        linkURL: "https://bitwarden.com/help/ansible-integration/",
+        linkURL: "https://galaxy.ansible.com/ui/repo/published/bitwarden/secrets",
         image: "../../../../../../../images/secrets-manager/integrations/ansible.svg",
         type: IntegrationType.Integration,
       },
@@ -96,6 +98,13 @@ export class IntegrationsComponent {
         type: IntegrationType.Integration,
         newBadgeExpiration: "2024-8-12",
       },
+      {
+        name: "Terraform Provider",
+        linkURL: "https://registry.terraform.io/providers/bitwarden/bitwarden-secrets/latest",
+        image: "../../../../../../../images/secrets-manager/integrations/terraform.svg",
+        type: IntegrationType.Integration,
+        newBadgeExpiration: "2025-12-12", // December 12, 2025
+      },
     ];
   }
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.module.ts
index 2b0682b6602..04240da3176 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from "@angular/core";
 
+import { DatadogOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/datadog-organization-integration-service";
 import { HecOrganizationIntegrationService } from "@bitwarden/bit-common/dirt/organization-integrations/services/hec-organization-integration-service";
 import { OrganizationIntegrationApiService } from "@bitwarden/bit-common/dirt/organization-integrations/services/organization-integration-api.service";
 import { OrganizationIntegrationConfigurationApiService } from "@bitwarden/bit-common/dirt/organization-integrations/services/organization-integration-configuration-api.service";
@@ -21,6 +22,11 @@ import { IntegrationsComponent } from "./integrations.component";
     IntegrationGridComponent,
   ],
   providers: [
+    safeProvider({
+      provide: DatadogOrganizationIntegrationService,
+      useClass: DatadogOrganizationIntegrationService,
+      deps: [OrganizationIntegrationApiService, OrganizationIntegrationConfigurationApiService],
+    }),
     safeProvider({
       provide: HecOrganizationIntegrationService,
       useClass: HecOrganizationIntegrationService,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.component.ts
index b50e586c337..00a4c6cc4d4 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-layout",
   templateUrl: "./layout.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
index a714bc0d543..be9124ee3e1 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
@@ -31,6 +31,8 @@ import { ServiceAccountService } from "../service-accounts/service-account.servi
 import { SecretsManagerPortingApiService } from "../settings/services/sm-porting-api.service";
 import { CountService } from "../shared/counts/count.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-navigation",
   templateUrl: "./navigation.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
index d9ff3ec5619..6995549e845 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
@@ -23,12 +23,10 @@ import {
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { 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 { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService } from "@bitwarden/components";
+import { CenterPositionStrategy, DialogService } from "@bitwarden/components";
 
 import { OrganizationCounts } from "../models/view/counts.view";
 import { ProjectListView } from "../models/view/project-list.view";
@@ -77,6 +75,8 @@ type OrganizationTasks = {
   createServiceAccount: boolean;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-overview",
   templateUrl: "./overview.component.html",
@@ -117,7 +117,6 @@ export class OverviewComponent implements OnInit, OnDestroy {
     private smOnboardingTasksService: SMOnboardingTasksService,
     private logService: LogService,
     private router: Router,
-    private configService: ConfigService,
   ) {}
 
   ngOnInit() {
@@ -218,13 +217,12 @@ export class OverviewComponent implements OnInit, OnDestroy {
   }
 
   async navigateToPaymentMethod() {
-    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
-      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
+    await this.router.navigate(
+      ["organizations", `${this.organizationId}`, "billing", "payment-details"],
+      {
+        state: { launchPaymentModalAutomatically: true },
+      },
     );
-    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
-    await this.router.navigate(["organizations", `${this.organizationId}`, "billing", route], {
-      state: { launchPaymentModalAutomatically: true },
-    });
   }
 
   ngOnDestroy(): void {
@@ -343,6 +341,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
       data: {
         secrets: event,
       },
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/section.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/section.component.ts
index 6b71c81f09e..0691ed9dd73 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/section.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/section.component.ts
@@ -1,11 +1,15 @@
 import { Component, Input } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-section",
   templateUrl: "./section.component.html",
   standalone: false,
 })
 export class SectionComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() open = true;
 
   /**
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.ts
index 8cdb1bb4d69..3ddf3233b38 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.ts
@@ -25,6 +25,8 @@ export interface ProjectDeleteOperation {
   projects: ProjectListView[];
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./project-delete-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.ts
index 819f2107fcf..2f6b2229d75 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.ts
@@ -25,6 +25,8 @@ export interface ProjectOperation {
   projectId?: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./project-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-people.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-people.component.ts
index 13f80920558..49b016e921c 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-people.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-people.component.ts
@@ -24,6 +24,8 @@ import {
 import { ApItemEnum } from "../../shared/access-policies/access-policy-selector/models/enums/ap-item.enum";
 import { AccessPolicyService } from "../../shared/access-policies/access-policy.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-project-people",
   templateUrl: "./project-people.component.html",
@@ -41,7 +43,7 @@ export class ProjectPeopleComponent implements OnInit, OnDestroy {
         return convertToAccessPolicyItemViews(policies);
       }),
     ),
-    catchError(async () => {
+    catchError(async (): Promise<any> => {
       this.logService.info("Error fetching project people access policies.");
       await this.router.navigate(["/sm", this.organizationId, "projects"]);
       return undefined;
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts
index 5c83f784431..9cd570a734a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts
@@ -21,7 +21,7 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService } from "@bitwarden/components";
+import { CenterPositionStrategy, DialogService } from "@bitwarden/components";
 
 import { ProjectView } from "../../models/view/project.view";
 import { SecretListView } from "../../models/view/secret-list.view";
@@ -41,6 +41,8 @@ import {
 import { SecretService } from "../../secrets/secret.service";
 import { SecretsListComponent } from "../../shared/secrets-list.component";
 import { ProjectService } from "../project.service";
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-project-secrets",
   templateUrl: "./project-secrets.component.html",
@@ -124,6 +126,7 @@ export class ProjectSecretsComponent implements OnInit {
       data: {
         secrets: event,
       },
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.ts
index fc3a489bce9..e2fd8556621 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.ts
@@ -22,6 +22,8 @@ import {
 } from "../../shared/access-policies/access-policy-selector/models/ap-item-view.type";
 import { AccessPolicyService } from "../../shared/access-policies/access-policy.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-project-service-accounts",
   templateUrl: "./project-service-accounts.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts
index c79ebd733c0..7c1812e3f26 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts
@@ -34,6 +34,8 @@ import {
 } from "../dialog/project-dialog.component";
 import { ProjectService } from "../project.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-project",
   templateUrl: "./project.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
index 81a568f0c65..10e75cfb75a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
@@ -40,6 +40,8 @@ import {
 } from "../dialog/project-dialog.component";
 import { ProjectService } from "../project.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-projects",
   templateUrl: "./projects.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-delete.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-delete.component.ts
index 6340cc42f3b..344a20f02c2 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-delete.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-delete.component.ts
@@ -18,6 +18,8 @@ export interface SecretDeleteOperation {
   secrets: SecretListView[];
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./secret-delete.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
index 9172d44965d..53325fe2f54 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts
@@ -19,6 +19,7 @@ import {
   DialogService,
   BitValidators,
   ToastService,
+  CenterPositionStrategy,
 } from "@bitwarden/components";
 
 import { SecretAccessPoliciesView } from "../../models/view/access-policies/secret-access-policies.view";
@@ -67,6 +68,8 @@ export interface SecretOperation {
   organizationEnabled: boolean;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./secret-dialog.component.html",
   standalone: false,
@@ -223,6 +226,7 @@ export class SecretDialogComponent implements OnInit, OnDestroy {
         data: {
           secrets: secretListView,
         },
+        positionStrategy: new CenterPositionStrategy(),
       },
     );
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-view-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-view-dialog.component.ts
index b719014a382..ace8db4e6ba 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-view-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-view-dialog.component.ts
@@ -10,6 +10,8 @@ export interface SecretViewDialogParams {
   secretId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./secret-view-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
index ca093f449c9..92b33a06d4f 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
@@ -13,7 +13,12 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
+import {
+  CenterPositionStrategy,
+  DialogRef,
+  DialogService,
+  ToastService,
+} from "@bitwarden/components";
 import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 
 import { SecretListView } from "../models/view/secret-list.view";
@@ -34,6 +39,8 @@ import {
 } from "./dialog/secret-view-dialog.component";
 import { SecretService } from "./secret.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-secrets",
   templateUrl: "./secrets.component.html",
@@ -178,6 +185,7 @@ export class SecretsComponent implements OnInit {
       data: {
         secrets: event,
       },
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
index 3399b550ba5..6172ec22b65 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
@@ -21,7 +21,7 @@
   <ng-container header>
     <tr>
       <th bitCell class="tw-w-0">
-        <label class="tw-m-0 tw-flex tw-w-fit tw-gap-2 !tw-font-bold !tw-text-muted">
+        <label class="tw-m-0 tw-flex tw-w-fit tw-gap-2 !tw-font-medium !tw-text-muted">
           <input
             type="checkbox"
             (change)="$event ? toggleAll() : null"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.ts
index a714729d96f..7a8c0b37408 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.ts
@@ -5,12 +5,16 @@ import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 import { AccessTokenView } from "../models/view/access-token.view";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-access-list",
   templateUrl: "./access-list.component.html",
   standalone: false,
 })
 export class AccessListComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get tokens(): AccessTokenView[] {
     return this._tokens;
@@ -21,7 +25,11 @@ export class AccessListComponent {
   }
   private _tokens: AccessTokenView[];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() newAccessTokenEvent = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() revokeAccessTokensEvent = new EventEmitter<AccessTokenView[]>();
 
   protected selection = new SelectionModel<string>(true, []);
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts
index b9643ce8fd8..4e9069cd6cb 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts
@@ -24,6 +24,8 @@ import { ServiceAccountService } from "../service-account.service";
 import { AccessService } from "./access.service";
 import { AccessTokenCreateDialogComponent } from "./dialogs/access-token-create-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-access-tokens",
   templateUrl: "./access-tokens.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.ts
index dfbe0a1511d..3aca93572ef 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.ts
@@ -15,6 +15,8 @@ export interface AccessTokenOperation {
   serviceAccountView: ServiceAccountView;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./access-token-create-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.ts
index 0259b8d6e90..cf5118c5062 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.ts
@@ -12,6 +12,8 @@ export interface AccessTokenDetails {
   accessToken: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./access-token-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.ts
index 891501874ff..a0db42d03b0 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.ts
@@ -18,6 +18,8 @@ import { Subject, takeUntil } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-expiration-options",
   templateUrl: "./expiration-options.component.html",
@@ -40,8 +42,12 @@ export class ExpirationOptionsComponent
 {
   private destroy$ = new Subject<void>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() expirationDayOptions: number[];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() set touched(val: boolean) {
     if (val) {
       this.form.markAllAsTouched();
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.ts
index f85cde90306..18ef397c6ae 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.ts
@@ -24,6 +24,8 @@ class ServiceAccountConfig {
   projects: ProjectListView[];
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-service-account-config",
   templateUrl: "./config.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts
index 5edc57d8c74..638ee6862a3 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts
@@ -25,6 +25,8 @@ export interface ServiceAccountDeleteOperation {
   serviceAccounts: ServiceAccountView[];
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./service-account-delete-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
index 250e0870ecf..5c6072807a6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
@@ -24,6 +24,8 @@ export interface ServiceAccountOperation {
   organizationEnabled: boolean;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./service-account-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
index 2e364df1423..5968933064d 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
@@ -17,6 +17,8 @@ import { EventExportService } from "@bitwarden/web-vault/app/tools/event-export"
 
 import { ServiceAccountEventLogApiService } from "./service-account-event-log-api.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-service-accounts-events",
   templateUrl: "./service-accounts-events.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
index e0bcad8d6e9..e7b258ed1c2 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
@@ -20,12 +20,16 @@ import { ServiceAccountService } from "../service-account.service";
 
 import { serviceAccountAccessGuard } from "./service-account-access.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
 })
 export class GuardedRouteTestComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts
index 4449757167d..42ab2ec613b 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts
@@ -25,6 +25,8 @@ import { ApItemEnum } from "../../shared/access-policies/access-policy-selector/
 import { ApPermissionEnum } from "../../shared/access-policies/access-policy-selector/models/enums/ap-permission.enum";
 import { AccessPolicyService } from "../../shared/access-policies/access-policy.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-service-account-people",
   templateUrl: "./service-account-people.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.ts
index af334b22c63..6d4490bad3c 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.ts
@@ -22,6 +22,8 @@ import {
 } from "../../shared/access-policies/access-policy-selector/models/ap-item-view.type";
 import { AccessPolicyService } from "../../shared/access-policies/access-policy.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-service-account-projects",
   templateUrl: "./service-account-projects.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts
index 5eb074e3e99..285f03acb01 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts
@@ -15,6 +15,8 @@ import { AccessService } from "./access/access.service";
 import { AccessTokenCreateDialogComponent } from "./access/dialogs/access-token-create-dialog.component";
 import { ServiceAccountService } from "./service-account.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-service-account",
   templateUrl: "./service-account.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
index 3d7fc9715c3..bdfd149541c 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
@@ -21,7 +21,7 @@
   <ng-container header>
     <tr>
       <th bitCell class="tw-w-0">
-        <label class="!tw-mb-0 tw-flex tw-w-fit tw-gap-2 !tw-font-bold !tw-text-muted">
+        <label class="!tw-mb-0 tw-flex tw-w-fit tw-gap-2 !tw-font-medium !tw-text-muted">
           <input
             type="checkbox"
             (change)="$event ? toggleAll() : null"
@@ -84,6 +84,15 @@
           <i class="bwi bwi-fw bwi-pencil" aria-hidden="true"></i>
           {{ "editMachineAccount" | i18n }}
         </button>
+        <button
+          type="button"
+          bitMenuItem
+          *ngIf="viewEventsAllowed$ | async as allowed"
+          (click)="openEventsDialog(serviceAccount)"
+        >
+          <i class="bwi bwi-fw bwi-billing" aria-hidden="true"></i>
+          <span> {{ "viewEvents" | i18n }} </span>
+        </button>
         <button type="button" bitMenuItem (click)="delete(serviceAccount)">
           <i class="bwi bwi-fw bwi-trash tw-text-danger" aria-hidden="true"></i>
           <span class="tw-text-danger">
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
index ac3defaf5dd..4febda9ea28 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
@@ -1,25 +1,38 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { SelectionModel } from "@angular/cdk/collections";
-import { Component, EventEmitter, Input, OnDestroy, Output } from "@angular/core";
-import { Subject, takeUntil } from "rxjs";
+import { Component, EventEmitter, Input, OnDestroy, Output, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { catchError, concatMap, map, Observable, of, Subject, switchMap, takeUntil } from "rxjs";
 
+import {
+  getOrganizationById,
+  OrganizationService,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { TableDataSource, ToastService } from "@bitwarden/components";
+import { DialogRef, DialogService, TableDataSource, ToastService } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 
 import {
   ServiceAccountSecretsDetailsView,
   ServiceAccountView,
 } from "../models/view/service-account.view";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-service-accounts-list",
   templateUrl: "./service-accounts-list.component.html",
   standalone: false,
 })
-export class ServiceAccountsListComponent implements OnDestroy {
+export class ServiceAccountsListComponent implements OnDestroy, OnInit {
   protected dataSource = new TableDataSource<ServiceAccountSecretsDetailsView>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get serviceAccounts(): ServiceAccountSecretsDetailsView[] {
     return this._serviceAccounts;
@@ -31,30 +44,74 @@ export class ServiceAccountsListComponent implements OnDestroy {
   }
   private _serviceAccounts: ServiceAccountSecretsDetailsView[];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   set search(search: string) {
     this.selection.clear();
     this.dataSource.filter = search;
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() newServiceAccountEvent = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() deleteServiceAccountsEvent = new EventEmitter<ServiceAccountView[]>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onServiceAccountCheckedEvent = new EventEmitter<string[]>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() editServiceAccountEvent = new EventEmitter<string>();
 
   private destroy$: Subject<void> = new Subject<void>();
-
+  protected viewEventsAllowed$: Observable<boolean>;
+  protected isAdmin$: Observable<boolean>;
   selection = new SelectionModel<string>(true, []);
 
   constructor(
     private i18nService: I18nService,
     private toastService: ToastService,
+    private dialogService: DialogService,
+    private organizationService: OrganizationService,
+    private activatedRoute: ActivatedRoute,
+    private accountService: AccountService,
+    private logService: LogService,
   ) {
     this.selection.changed
       .pipe(takeUntil(this.destroy$))
       .subscribe((_) => this.onServiceAccountCheckedEvent.emit(this.selection.selected));
   }
 
+  ngOnInit(): void {
+    this.viewEventsAllowed$ = this.activatedRoute.params.pipe(
+      concatMap((params) =>
+        getUserId(this.accountService.activeAccount$).pipe(
+          switchMap((userId) =>
+            this.organizationService
+              .organizations$(userId)
+              .pipe(getOrganizationById(params.organizationId)),
+          ),
+        ),
+      ),
+      map((org) => org.canAccessEventLogs),
+      catchError((error: unknown) => {
+        if (typeof error === "string") {
+          this.toastService.showToast({
+            message: error,
+            variant: "error",
+            title: "",
+          });
+        } else {
+          this.logService.error(error);
+        }
+        return of(false);
+      }),
+      takeUntil(this.destroy$),
+    );
+  }
+
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
@@ -94,4 +151,13 @@ export class ServiceAccountsListComponent implements OnDestroy {
       });
     }
   }
+  openEventsDialog = (serviceAccount: ServiceAccountView): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: serviceAccount.name,
+        organizationId: serviceAccount.organizationId,
+        entityId: serviceAccount.id,
+        entity: "service-account",
+      },
+    });
 }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
index 2813ece001f..5d6b4fd49de 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts
@@ -1,8 +1,8 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { combineLatest, firstValueFrom, Observable, startWith, switchMap } from "rxjs";
+import { ActivatedRoute, Router } from "@angular/router";
+import { combineLatestWith, firstValueFrom, Observable, startWith, switchMap } from "rxjs";
 
 import {
   getOrganizationById,
@@ -10,7 +10,9 @@ import {
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { DialogService } from "@bitwarden/components";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
+import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 
 import {
   ServiceAccountSecretsDetailsView,
@@ -28,6 +30,8 @@ import {
 } from "./dialog/service-account-dialog.component";
 import { ServiceAccountService } from "./service-account.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-service-accounts",
   templateUrl: "./service-accounts.component.html",
@@ -46,14 +50,16 @@ export class ServiceAccountsComponent implements OnInit {
     private serviceAccountService: ServiceAccountService,
     private organizationService: OrganizationService,
     private accountService: AccountService,
+    private toastService: ToastService,
+    private router: Router,
+    private i18nService: I18nService,
   ) {}
 
   ngOnInit() {
-    this.serviceAccounts$ = combineLatest([
-      this.route.params,
-      this.serviceAccountService.serviceAccount$.pipe(startWith(null)),
-    ]).pipe(
-      switchMap(async ([params]) => {
+    this.serviceAccounts$ = this.serviceAccountService.serviceAccount$.pipe(
+      startWith(null),
+      combineLatestWith(this.route.params),
+      switchMap(async ([_, params]) => {
         this.organizationId = params.organizationId;
         const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
         this.organizationEnabled = (
@@ -64,11 +70,74 @@ export class ServiceAccountsComponent implements OnInit {
           )
         )?.enabled;
 
-        return await this.getServiceAccounts();
+        const serviceAccounts = await this.getServiceAccounts();
+
+        const viewEvents = this.route.snapshot.queryParams.viewEvents;
+        if (viewEvents) {
+          const targetAccount = serviceAccounts.find((sa) => sa.id === viewEvents);
+
+          const userIsAdmin = (
+            await firstValueFrom(
+              this.organizationService
+                .organizations$(userId)
+                .pipe(getOrganizationById(params.organizationId)),
+            )
+          )?.isAdmin;
+
+          if (!targetAccount) {
+            if (userIsAdmin) {
+              this.openEventsDialogByEntityId(
+                this.i18nService.t("nameUnavailableServiceAccountDeleted", viewEvents),
+                viewEvents,
+              );
+            } else {
+              this.toastService.showToast({
+                variant: "error",
+                title: null,
+                message: this.i18nService.t("unknownServiceAccount"),
+              });
+            }
+          } else {
+            this.openEventsDialog(targetAccount);
+          }
+
+          await this.router.navigate([], {
+            queryParams: { search: this.search },
+          });
+        }
+
+        return serviceAccounts;
       }),
     );
+
+    if (this.route.snapshot.queryParams.search) {
+      this.search = this.route.snapshot.queryParams.search;
+    }
   }
 
+  openEventsDialogByEntityId = (
+    serviceAccountName: string,
+    serviceAccountId: string,
+  ): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: serviceAccountName,
+        organizationId: this.organizationId,
+        entityId: serviceAccountId,
+        entity: "service-account",
+      },
+    });
+
+  openEventsDialog = (serviceAccount: ServiceAccountView): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: serviceAccount.name,
+        organizationId: this.organizationId,
+        entityId: serviceAccount.id,
+        entity: "service-account",
+      },
+    });
+
   openNewServiceAccountDialog() {
     this.dialogService.open<unknown, ServiceAccountOperation>(ServiceAccountDialogComponent, {
       data: {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/dialog/sm-import-error-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/dialog/sm-import-error-dialog.component.ts
index 0bed0355a8c..85e054d998b 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/dialog/sm-import-error-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/dialog/sm-import-error-dialog.component.ts
@@ -10,6 +10,8 @@ export interface SecretsManagerImportErrorDialogOperation {
   error: SecretsManagerImportError;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./sm-import-error-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts
index c2b726803c5..e2b66d9ffa6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts
@@ -26,6 +26,8 @@ type ExportFormat = {
   fileExtension: string;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-export",
   templateUrl: "./sm-export.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.ts
index 65075d12bf6..c2ffe5536b8 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.ts
@@ -18,6 +18,8 @@ import {
 import { SecretsManagerImportError } from "../models/error/sm-import-error";
 import { SecretsManagerPortingApiService } from "../services/sm-porting-api.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-import",
   templateUrl: "./sm-import.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.component.ts
index fba3ff03ee0..2bb4d6cb37f 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.component.ts
@@ -20,6 +20,8 @@ import { ApItemViewType } from "./models/ap-item-view.type";
 import { ApItemEnumUtil, ApItemEnum } from "./models/enums/ap-item.enum";
 import { ApPermissionEnum } from "./models/enums/ap-permission.enum";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-access-policy-selector",
   templateUrl: "access-policy-selector.component.html",
@@ -108,23 +110,43 @@ export class AccessPolicySelectorComponent implements ControlValueAccessor, OnIn
 
   disabled: boolean;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() loading: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() addButtonMode: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() label: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hint: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() columnTitle: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() emptyMessage: string;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() permissionList = [
     { perm: ApPermissionEnum.CanRead, labelId: "canRead" },
     { perm: ApPermissionEnum.CanReadWrite, labelId: "canReadWrite" },
   ];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() initialPermission = ApPermissionEnum.CanRead;
 
   // Pass in a static permission that wil be the only option for a given selector instance.
   // Will ignore permissionList and initialPermission.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() staticPermission: ApPermissionEnum;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get items(): ApItemViewType[] {
     return this.selectionList.allItems;
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-confirmation-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-confirmation-dialog.component.ts
index 9d2a3715e16..0f0991d52a9 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-confirmation-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-confirmation-dialog.component.ts
@@ -22,6 +22,8 @@ export enum BulkConfirmationResult {
   Cancel,
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-bulk-confirmation-dialog",
   templateUrl: "./bulk-confirmation-dialog.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts
index fc7890f1654..8e27b551e55 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts
@@ -18,6 +18,8 @@ export class BulkOperationStatus {
   errorMessage?: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./bulk-status-dialog.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
index 18823130d22..6c3d4228c06 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
@@ -26,6 +26,8 @@ import {
   ServiceAccountOperation,
 } from "../service-accounts/dialog/service-account-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-new-menu",
   templateUrl: "./new-menu.component.html",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
index 6777df7ef7a..f2e0d48fe1d 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
@@ -10,6 +10,8 @@ import {
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./org-suspended.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
index ef5df7aaf4c..c205d60b977 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
@@ -21,7 +21,7 @@
   <ng-container header>
     <tr>
       <th bitCell class="tw-w-0" *ngIf="showMenus">
-        <label class="!tw-mb-0 tw-flex tw-w-fit tw-gap-2 !tw-font-bold !tw-text-muted">
+        <label class="!tw-mb-0 tw-flex tw-w-fit tw-gap-2 !tw-font-medium !tw-text-muted">
           <input
             type="checkbox"
             (change)="$event ? toggleAll() : null"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts
index 31114bcd1c4..5d3c806f386 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts
@@ -20,12 +20,16 @@ import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/o
 import { ProjectListView } from "../models/view/project-list.view";
 import { ProjectView } from "../models/view/project.view";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-projects-list",
   templateUrl: "./projects-list.component.html",
   standalone: false,
 })
 export class ProjectsListComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get projects(): ProjectListView[] {
     return this._projects;
@@ -40,17 +44,29 @@ export class ProjectsListComponent implements OnInit {
   protected isAdmin$: Observable<boolean>;
   private destroy$: Subject<void> = new Subject<void>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showMenus?: boolean = true;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   set search(search: string) {
     this.selection.clear();
     this.dataSource.filter = search;
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() editProjectEvent = new EventEmitter<string>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() deleteProjectEvent = new EventEmitter<ProjectListView[]>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() newProjectEvent = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() copiedProjectUUIdEvent = new EventEmitter<string>();
 
   selection = new SelectionModel<string>(true, []);
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
index 35a9b3c5bba..a7314d969d6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
@@ -26,7 +26,7 @@
 <bit-table-scroll *ngIf="secrets?.length >= 1" [dataSource]="dataSource" [rowSize]="66">
   <ng-container header>
     <th bitCell class="tw-w-0">
-      <label class="!tw-mb-0 tw-flex tw-w-fit tw-gap-2 !tw-font-bold !tw-text-muted">
+      <label class="!tw-mb-0 tw-flex tw-w-fit tw-gap-2 !tw-font-medium !tw-text-muted">
         <input
           type="checkbox"
           (change)="$event ? toggleAll() : null"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
index 4ef7dbf22e7..05e38baff69 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
@@ -21,6 +21,8 @@ import { SecretListView } from "../models/view/secret-list.view";
 import { SecretView } from "../models/view/secret.view";
 import { SecretService } from "../secrets/secret.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-secrets-list",
   templateUrl: "./secrets-list.component.html",
@@ -29,6 +31,8 @@ import { SecretService } from "../secrets/secret.service";
 export class SecretsListComponent implements OnDestroy, OnInit {
   protected dataSource = new TableDataSource<SecretListView>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get secrets(): SecretListView[] {
     return this._secrets;
@@ -40,22 +44,44 @@ export class SecretsListComponent implements OnDestroy, OnInit {
   }
   private _secrets: SecretListView[];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   set search(search: string) {
     this.selection.clear();
     this.dataSource.filter = search;
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() trash: boolean;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() editSecretEvent = new EventEmitter<string>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() viewSecretEvent = new EventEmitter<string>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() copySecretNameEvent = new EventEmitter<string>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() copySecretValueEvent = new EventEmitter<string>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() copySecretUuidEvent = new EventEmitter<string>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSecretCheckedEvent = new EventEmitter<string[]>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() deleteSecretsEvent = new EventEmitter<SecretListView[]>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() newSecretEvent = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() restoreSecretsEvent = new EventEmitter();
 
   private destroy$: Subject<void> = new Subject<void>();
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-hard-delete.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-hard-delete.component.ts
index 29f9a85250c..521550185f1 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-hard-delete.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-hard-delete.component.ts
@@ -13,6 +13,8 @@ export interface SecretHardDeleteOperation {
   organizationId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./secret-hard-delete.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-restore.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-restore.component.ts
index 712757445be..034b6f8de00 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-restore.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-restore.component.ts
@@ -13,6 +13,8 @@ export interface SecretRestoreOperation {
   organizationId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./secret-restore.component.html",
   standalone: false,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/trash/trash.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/trash/trash.component.ts
index 4392ae8b1bb..1e6483dcf92 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/trash/trash.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/trash/trash.component.ts
@@ -6,7 +6,7 @@ import { combineLatestWith, Observable, startWith, switchMap } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService } from "@bitwarden/components";
+import { CenterPositionStrategy, DialogService } from "@bitwarden/components";
 
 import { SecretListView } from "../models/view/secret-list.view";
 import { SecretService } from "../secrets/secret.service";
@@ -21,6 +21,8 @@ import {
   SecretRestoreOperation,
 } from "./dialog/secret-restore.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "sm-trash",
   templateUrl: "./trash.component.html",
@@ -62,6 +64,7 @@ export class TrashComponent implements OnInit {
         secretIds: secretIds,
         organizationId: this.organizationId,
       },
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 
@@ -71,6 +74,7 @@ export class TrashComponent implements OnInit {
         secretIds: secretIds,
         organizationId: this.organizationId,
       },
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 
diff --git a/bitwarden_license/bit-web/tsconfig.build.json b/bitwarden_license/bit-web/tsconfig.build.json
index 66c475051ed..58acbf09392 100644
--- a/bitwarden_license/bit-web/tsconfig.build.json
+++ b/bitwarden_license/bit-web/tsconfig.build.json
@@ -1,6 +1,8 @@
 {
   "extends": "./tsconfig",
   "files": [
+    "../../bitwarden_license/bit-common/src/platform/sdk/sdk-alias.d.ts",
+
     "../../apps/web/src/polyfills.ts",
     "../../apps/web/src/main.ts",
     "../../apps/web/src/theme.ts",
diff --git a/bitwarden_license/bit-web/tsconfig.json b/bitwarden_license/bit-web/tsconfig.json
index 0836d3d54ad..8c19f771a26 100644
--- a/bitwarden_license/bit-web/tsconfig.json
+++ b/bitwarden_license/bit-web/tsconfig.json
@@ -1,6 +1,8 @@
 {
   "extends": "../../apps/web/tsconfig",
   "files": [
+    "../../bitwarden_license/bit-common/src/platform/sdk/sdk-alias.d.ts",
+
     "../../apps/web/src/polyfills.ts",
     "../../apps/web/src/main.ts",
     "../../apps/web/src/theme.ts",
diff --git a/bitwarden_license/bit-web/webpack.config.js b/bitwarden_license/bit-web/webpack.config.js
index ce5f0075afc..8ab719072f6 100644
--- a/bitwarden_license/bit-web/webpack.config.js
+++ b/bitwarden_license/bit-web/webpack.config.js
@@ -1,12 +1,45 @@
-const { AngularWebpackPlugin } = require("@ngtools/webpack");
+const path = require("path");
+const { buildConfig } = require(path.resolve(__dirname, "../../apps/web/webpack.base"));
 
-const webpackConfig = require("../../apps/web/webpack.config");
+module.exports = (webpackConfig, context) => {
+  const isNxBuild = context && context.options;
 
-webpackConfig.entry["app/main"] = "../../bitwarden_license/bit-web/src/main.ts";
-webpackConfig.plugins[webpackConfig.plugins.length - 1] = new AngularWebpackPlugin({
-  tsconfig: "../../bitwarden_license/bit-web/tsconfig.build.json",
-  entryModule: "bitwarden_license/src/app/app.module#AppModule",
-  sourceMap: true,
-});
-
-module.exports = webpackConfig;
+  if (isNxBuild) {
+    return buildConfig({
+      configName: "Commercial",
+      app: {
+        entry: context.options.main
+          ? path.resolve(context.context.root, context.options.main)
+          : path.resolve(__dirname, "src/main.ts"),
+        entryModule: "bitwarden_license/bit-web/src/app/app.module#AppModule",
+      },
+      tsConfig: "bitwarden_license/bit-web/tsconfig.build.json",
+      outputPath:
+        context.context && context.context.root
+          ? path.resolve(context.context.root, context.options.outputPath)
+          : context.options.outputPath,
+      importAliases: [
+        {
+          name: "@bitwarden/sdk-internal",
+          alias: "@bitwarden/commercial-sdk-internal",
+        },
+      ],
+      env: context.options.env,
+    });
+  } else {
+    return buildConfig({
+      configName: "Commercial",
+      app: {
+        entry: path.resolve(__dirname, "src/main.ts"),
+        entryModule: "bitwarden_license/bit-web/src/app/app.module#AppModule",
+      },
+      tsConfig: path.resolve(__dirname, "tsconfig.build.json"),
+      importAliases: [
+        {
+          name: "@bitwarden/sdk-internal",
+          alias: "@bitwarden/commercial-sdk-internal",
+        },
+      ],
+    });
+  }
+};
diff --git a/clients.code-workspace b/clients.code-workspace
index f7d86d2a242..1dbef721fe6 100644
--- a/clients.code-workspace
+++ b/clients.code-workspace
@@ -82,6 +82,7 @@
       "rust-lang.rust-analyzer",
       "tamasfe.even-better-toml",
       "vadimcn.vscode-lldb",
+      "nrwl.angular-console",
     ],
   },
 }
diff --git a/docs/using-nx-to-build-projects.md b/docs/using-nx-to-build-projects.md
new file mode 100644
index 00000000000..408a6e92fb1
--- /dev/null
+++ b/docs/using-nx-to-build-projects.md
@@ -0,0 +1,209 @@
+# Using Nx to Build Projects
+
+Bitwarden uses [Nx](https://nx.dev/) to make building projects from the monorepo easier. To build, lint, or test a project you'll want to reference the project's `project.json` file for availible commands and their names. Then you'll run `npx nx [your_command] [your_project] [your_options]`. Run `npx nx --help` to see availible options, there are many.
+
+Please note: the Nx implementation is a work in progress. CI still uses the old npm builds, and we have many "legacy" libraries that use hacks to get them into the Nx project graph.
+
+## Quick Start
+
+### Basic Commands
+
+```bash
+# Build a project
+npx nx build cli
+npx nx build-native desktop # Some apps have special build commands
+npx nx build state # Modern libs and apps have simple, all lowercase target names
+npx nx build @bitwarden/common # Legacy libs have a special naming convention and include the @bitwarden prefix
+
+# Test a project
+npx nx test cli
+
+# Lint a project
+npx nx lint cli
+
+# Serve/watch a project (for projects with serve targets)
+npx nx serve cli
+
+# Build all projects that differ from origin/main
+nx affected --target=build --base=origin/main
+
+# Build, lint, and test every project at once
+npx nx run-many --target=build,test,lint --all
+
+# Most projects default to the "oss-dev" build, so if you need the bitwarden license build add a --configuration
+npx nx build cli --configuration=commercial-dev
+
+# If you need a production build drop the "dev" suffix
+npx nx build cli --configuration=oss # or "commercial"
+
+# Configurations can also be passed to run-many
+# For example: to run all Bitwarden licensed builds
+npx nx run-many --target=build,test,lint --all --configuration=commercial
+
+# Outputs are distrubuted in a root level /dist/ folder
+
+# Run a locally built CLI
+node dist/apps/cli/oss-dev/bw.js
+```
+
+### Global Commands
+
+```bash
+# See all projects
+npx nx show projects
+
+# Run affected projects only (great for local dev and CI)
+npx nx affected:build
+npx nx affected:test
+npx nx affected:lint
+
+# Show dependency graph
+npx nx dep-graph
+```
+
+## Library Projects
+
+Our libraries use two different Nx integration patterns depending on their migration status.
+
+### Legacy Libraries
+
+Most existing libraries use a facade pattern where `project.json` delegates to existing npm scripts. This approach maintains backward compatibility with the build methods we used before introducing Nx. These libraries are considered tech debt and Platform has a focus on updating them. For an example reference `libs/common/project.json`.
+
+These libraries use `nx:run-script` executor to call existing npm scripts:
+
+```json
+{
+  "targets": {
+    "build": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "build"
+      }
+    }
+  }
+}
+```
+
+#### Available Commands for Legacy Libraries
+
+All legacy libraries support these standardized commands:
+
+- **`nx build <library>`** - Build the library
+- **`nx build:watch <library>`** - Build and watch for changes
+- **`nx clean <library>`** - Clean build artifacts
+- **`nx test <library>`** - Run tests
+- **`nx lint <library>`** - Run linting
+
+### Modern Libraries
+
+Newer libraries like `libs/state` use native Nx executors for better performance and caching.
+
+```json
+{
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/state"
+      }
+    }
+  }
+}
+```
+
+## What Happens When You Run An Nx Command
+
+```mermaid
+flowchart TD
+    Start([You just ran an nx command]) --> ParseCmd[Nx parses command args]
+    ParseCmd --> ReadWorkspace[Nx reads nx.json, workspace configuration, cache settings, and plugins]
+    ReadWorkspace --> ReadProject[Nx reads project.json, finds the target configuration, and checks executor to use]
+    ReadProject --> CheckCache{Nx checks the cache: has this exact build been done before?}
+
+    CheckCache -->|Cache hit| UseCached[Nx uses cached outputs, copies from .nx/cache, and skips execution]
+    UseCached --> Done([Your command is done])
+
+    CheckCache -->|Cache miss| DetermineExecutor{Which executor is configured?}
+
+    DetermineExecutor -->|nx:run-script| FacadePattern[Legacy Facade Pattern]
+    DetermineExecutor -->|nx/webpack:webpack| WebpackExecutor[Webpack Executor]
+    DetermineExecutor -->|nx/js:tsc| TypeScriptExecutor[TypeScript Executor]
+    DetermineExecutor -->|nx/jest:jest| JestExecutor[Jest Executor]
+    DetermineExecutor -->|nx/eslint:lint| ESLintExecutor[ESLint Executor]
+
+    %% Facade Pattern Flow
+    FacadePattern --> ReadPackageJson[The run-script executor finds npm script to run in package.json]
+    ReadPackageJson --> RunNpmScript[Npm script is executed]
+    RunNpmScript --> NpmDelegates{What does the npm script do?}
+
+    NpmDelegates -->|TypeScript| TSCompile[TypeScript compiles to JavaScript using tsconfig.json]
+    NpmDelegates -->|Webpack| WebpackBuild[Webpack bundles and optimizes code]
+    NpmDelegates -->|Jest| JestTest[Jest executes unit tests]
+
+    TSCompile --> FacadeOutput[Outputs written to libs/LIB/dist/]
+    WebpackBuild --> FacadeOutput
+    JestTest --> FacadeOutput
+    FacadeOutput --> CacheResults1[Nx caches results in .nx/cache/]
+
+    %% Webpack Executor Flow
+    WebpackExecutor --> ReadWebpackConfig[Webpack config read from apps/cli/webpack.config.js or bit-cli/webpack.config.js]
+    ReadWebpackConfig --> ConfigureWebpack[Webpack configured with entry points, TypeScript paths, and plugins]
+    ConfigureWebpack --> WebpackProcess[Webpack resolves paths, compiles TypeScript, bundles dependencies, and applies optimizations]
+    WebpackProcess --> WebpackOutput[Single executable bundle written to dist/apps/cli/]
+    WebpackOutput --> CacheResults2[Nx caches results in .nx/cache/]
+
+    %% TypeScript Executor Flow
+    TypeScriptExecutor --> ReadTSConfig[TypeScript reads tsconfig.lib.json compilation options]
+    ReadTSConfig --> TSProcess[TypeScript performs type checking, emits declarations, and compiles to JavaScript]
+    TSProcess --> TSOutput[Outputs written to dist/libs/LIB/]
+    TSOutput --> CacheResults3[Nx caches results in .nx/cache/]
+
+    %% Jest Executor Flow
+    JestExecutor --> ReadJestConfig[Jest reads jest.config.js test configuration]
+    ReadJestConfig --> JestProcess[Jest finds test files, runs suites, and generates coverage]
+    JestProcess --> JestOutput[Test results and coverage reports output]
+    JestOutput --> CacheResults4[Nx caches results in .nx/cache/]
+
+    %% ESLint Executor Flow
+    ESLintExecutor --> ReadESLintConfig[ESLint reads .eslintrc.json rules and configuration]
+    ReadESLintConfig --> ESLintProcess[ESLint checks code style, finds issues, and applies auto-fixes]
+    ESLintProcess --> ESLintOutput[Lint results with errors and warnings output]
+    ESLintOutput --> CacheResults5[Nx caches results in .nx/cache/]
+
+    %% All paths converge
+    CacheResults1 --> UpdateGraph[Dependency graph updated to track project relationships]
+    CacheResults2 --> UpdateGraph
+    CacheResults3 --> UpdateGraph
+    CacheResults4 --> UpdateGraph
+    CacheResults5 --> UpdateGraph
+
+    UpdateGraph --> Done
+```
+
+## Caching and Performance
+
+### Nx Caching
+
+Nx automatically caches build outputs and only rebuilds what changed:
+
+```bash
+# First run builds everything
+npx nx build cli
+
+# Second run uses cache (much faster)
+npx nx build cli
+```
+
+### Clearing Cache
+
+```bash
+# Clear all caches
+npx nx reset
+```
+
+## Additional Resources
+
+- [Nx Intro Documentation](https://nx.dev/getting-started/intro)
+- [Nx CLI Commands Reference](https://nx.dev/docs/reference/nx-commands)
+- [Nx Workspace Configuration](https://nx.dev/reference/project-configuration)
diff --git a/eslint.config.mjs b/eslint.config.mjs
index d8b4c4cef94..b97d5c685a8 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -61,24 +61,27 @@ export default tseslint.config(
       "rxjs/no-exposed-subjects": ["error", { allowProtected: true }],
 
       // TODO: Enable these.
-      "@angular-eslint/component-class-suffix": 0,
-      "@angular-eslint/contextual-lifecycle": 0,
-      "@angular-eslint/directive-class-suffix": 0,
+      "@angular-eslint/component-class-suffix": "error",
+      "@angular-eslint/contextual-lifecycle": "error",
+      "@angular-eslint/directive-class-suffix": "error",
       "@angular-eslint/no-empty-lifecycle-method": 0,
-      "@angular-eslint/no-host-metadata-property": 0,
       "@angular-eslint/no-input-rename": 0,
-      "@angular-eslint/no-inputs-metadata-property": 0,
+      "@angular-eslint/no-inputs-metadata-property": "error",
       "@angular-eslint/no-output-native": 0,
       "@angular-eslint/no-output-on-prefix": 0,
-      "@angular-eslint/no-output-rename": 0,
-      "@angular-eslint/no-outputs-metadata-property": 0,
+      "@angular-eslint/no-output-rename": "error",
+      "@angular-eslint/no-outputs-metadata-property": "error",
+      "@angular-eslint/prefer-on-push-component-change-detection": "error",
+      "@angular-eslint/prefer-output-emitter-ref": "error",
+      "@angular-eslint/prefer-signals": "error",
       "@angular-eslint/prefer-standalone": 0,
       "@angular-eslint/use-lifecycle-interface": "error",
       "@angular-eslint/use-pipe-transform-interface": 0,
 
       "@bitwarden/platform/required-using": "error",
       "@bitwarden/platform/no-enums": "error",
-      "@bitwarden/components/require-theme-colors-in-svg": "warn",
+      "@bitwarden/platform/no-page-script-url-leakage": "error",
+      "@bitwarden/components/require-theme-colors-in-svg": "error",
 
       "@typescript-eslint/explicit-member-accessibility": ["error", { accessibility: "no-public" }],
       "@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled
@@ -157,6 +160,11 @@ export default tseslint.config(
               // allow module index import
               except: ["**/state/index.ts"],
             },
+            {
+              target: ["libs/**/*"],
+              from: ["apps/**/*"],
+              message: "Libs should not import app-specific code.",
+            },
           ],
         },
       ],
@@ -322,7 +330,12 @@ export default tseslint.config(
   },
   // Tailwind migrated clients & libs
   {
-    files: ["apps/web/**/*.html", "bitwarden_license/bit-web/**/*.html", "libs/**/*.html"],
+    files: [
+      "apps/web/**/*.html",
+      "apps/browser/**/*.html",
+      "bitwarden_license/bit-web/**/*.html",
+      "libs/**/*.html",
+    ],
     rules: {
       "tailwindcss/no-custom-classname": [
         "error",
@@ -335,6 +348,7 @@ export default tseslint.config(
             "file-selector",
             "mfaType.*",
             "filter.*", // Temporary until filters are migrated
+            "tw-@container",
           ],
         },
       ],
@@ -679,6 +693,12 @@ function buildNoRestrictedImports(additionalForbiddenPatterns = [], skipPlatform
   return [
     "error",
     {
+      paths: [
+        {
+          name: "@bitwarden/commercial-sdk-internal",
+          message: "Use @bitwarden/sdk-internal instead.",
+        },
+      ],
       patterns: [
         ...(skipPlatform ? [] : ["**/platform/**/internal", "**/platform/messaging/**"]),
         "**/src/**/*", // Prevent relative imports across libs.
diff --git a/libs/admin-console/src/common/auto-confirm/abstractions/auto-confirm.service.abstraction.ts b/libs/admin-console/src/common/auto-confirm/abstractions/auto-confirm.service.abstraction.ts
new file mode 100644
index 00000000000..e753184273e
--- /dev/null
+++ b/libs/admin-console/src/common/auto-confirm/abstractions/auto-confirm.service.abstraction.ts
@@ -0,0 +1,42 @@
+import { Observable } from "rxjs";
+
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { UserId } from "@bitwarden/user-core";
+
+import { AutoConfirmState } from "../models/auto-confirm-state.model";
+
+export abstract class AutomaticUserConfirmationService {
+  /**
+   * @param userId
+   * @returns Observable<AutoConfirmState> an observable with the Auto Confirm user state for the provided userId.
+   **/
+  abstract configuration$(userId: UserId): Observable<AutoConfirmState>;
+  /**
+   * Upserts the existing user state with a new configuration.
+   * @param userId
+   * @param config The new AutoConfirmState to upsert into the user state for the provided userId.
+   **/
+  abstract upsert(userId: UserId, config: AutoConfirmState): Promise<void>;
+  /**
+   * This will check if the feature is enabled, the organization plan feature UseAutomaticUserConfirmation is enabled
+   * and the the provided user has admin/owner/manage custom permission role.
+   * @param userId
+   * @returns Observable<boolean> an observable with a boolean telling us if the provided user may confgure the auto confirm feature.
+   **/
+  abstract canManageAutoConfirm$(
+    userId: UserId,
+    organizationId: OrganizationId,
+  ): Observable<boolean>;
+  /**
+   * Calls the API endpoint to initiate automatic user confirmation.
+   * @param userId The userId of the logged in admin performing auto confirmation. This is neccesary to perform the key exchange and for permissions checks.
+   * @param confirmingUserId The userId of the user being confirmed.
+   * @param organization the organization the user is being auto confirmed to.
+   **/
+  abstract autoConfirmUser(
+    userId: UserId,
+    confirmingUserId: UserId,
+    organization: Organization,
+  ): Promise<void>;
+}
diff --git a/libs/admin-console/src/common/auto-confirm/abstractions/index.ts b/libs/admin-console/src/common/auto-confirm/abstractions/index.ts
new file mode 100644
index 00000000000..87e284656ab
--- /dev/null
+++ b/libs/admin-console/src/common/auto-confirm/abstractions/index.ts
@@ -0,0 +1 @@
+export * from "./auto-confirm.service.abstraction";
diff --git a/libs/admin-console/src/common/auto-confirm/index.ts b/libs/admin-console/src/common/auto-confirm/index.ts
new file mode 100644
index 00000000000..9187ccd39cf
--- /dev/null
+++ b/libs/admin-console/src/common/auto-confirm/index.ts
@@ -0,0 +1,3 @@
+export * from "./abstractions";
+export * from "./models";
+export * from "./services";
diff --git a/libs/admin-console/src/common/auto-confirm/models/auto-confirm-state.model.ts b/libs/admin-console/src/common/auto-confirm/models/auto-confirm-state.model.ts
new file mode 100644
index 00000000000..fd3cfa2f590
--- /dev/null
+++ b/libs/admin-console/src/common/auto-confirm/models/auto-confirm-state.model.ts
@@ -0,0 +1,21 @@
+import { AUTO_CONFIRM, UserKeyDefinition } from "@bitwarden/state";
+
+export class AutoConfirmState {
+  enabled: boolean;
+  showSetupDialog: boolean;
+  showBrowserNotification: boolean | undefined;
+
+  constructor() {
+    this.enabled = false;
+    this.showSetupDialog = true;
+  }
+}
+
+export const AUTO_CONFIRM_STATE = UserKeyDefinition.record<AutoConfirmState>(
+  AUTO_CONFIRM,
+  "autoConfirm",
+  {
+    deserializer: (autoConfirmState) => autoConfirmState,
+    clearOn: [],
+  },
+);
diff --git a/libs/admin-console/src/common/auto-confirm/models/index.ts b/libs/admin-console/src/common/auto-confirm/models/index.ts
new file mode 100644
index 00000000000..a34c54c16aa
--- /dev/null
+++ b/libs/admin-console/src/common/auto-confirm/models/index.ts
@@ -0,0 +1 @@
+export * from "./auto-confirm-state.model";
diff --git a/libs/admin-console/src/common/auto-confirm/services/default-auto-confirm.service.spec.ts b/libs/admin-console/src/common/auto-confirm/services/default-auto-confirm.service.spec.ts
new file mode 100644
index 00000000000..133dac758b4
--- /dev/null
+++ b/libs/admin-console/src/common/auto-confirm/services/default-auto-confirm.service.spec.ts
@@ -0,0 +1,382 @@
+import { TestBed } from "@angular/core/testing";
+import { BehaviorSubject, firstValueFrom, of, throwError } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api";
+import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data";
+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 { Utils } from "@bitwarden/common/platform/misc/utils";
+import { FakeStateProvider, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+
+import {
+  DefaultOrganizationUserService,
+  OrganizationUserApiService,
+  OrganizationUserConfirmRequest,
+} from "../../organization-user";
+import { AUTO_CONFIRM_STATE, AutoConfirmState } from "../models/auto-confirm-state.model";
+
+import { DefaultAutomaticUserConfirmationService } from "./default-auto-confirm.service";
+
+describe("DefaultAutomaticUserConfirmationService", () => {
+  let service: DefaultAutomaticUserConfirmationService;
+  let configService: jest.Mocked<ConfigService>;
+  let apiService: jest.Mocked<ApiService>;
+  let organizationUserService: jest.Mocked<DefaultOrganizationUserService>;
+  let stateProvider: FakeStateProvider;
+  let organizationService: jest.Mocked<InternalOrganizationServiceAbstraction>;
+  let organizationUserApiService: jest.Mocked<OrganizationUserApiService>;
+
+  const mockUserId = Utils.newGuid() as UserId;
+  const mockConfirmingUserId = Utils.newGuid() as UserId;
+  const mockOrganizationId = Utils.newGuid() as OrganizationId;
+  let mockOrganization: Organization;
+
+  beforeEach(() => {
+    configService = {
+      getFeatureFlag$: jest.fn(),
+    } as any;
+
+    apiService = {
+      getUserPublicKey: jest.fn(),
+    } as any;
+
+    organizationUserService = {
+      buildConfirmRequest: jest.fn(),
+    } as any;
+
+    stateProvider = new FakeStateProvider(mockAccountServiceWith(mockUserId));
+
+    organizationService = {
+      organizations$: jest.fn(),
+    } as any;
+
+    organizationUserApiService = {
+      postOrganizationUserConfirm: jest.fn(),
+    } as any;
+
+    TestBed.configureTestingModule({
+      providers: [
+        DefaultAutomaticUserConfirmationService,
+        { provide: ConfigService, useValue: configService },
+        { provide: ApiService, useValue: apiService },
+        { provide: DefaultOrganizationUserService, useValue: organizationUserService },
+        { provide: "StateProvider", useValue: stateProvider },
+        {
+          provide: InternalOrganizationServiceAbstraction,
+          useValue: organizationService,
+        },
+        { provide: OrganizationUserApiService, useValue: organizationUserApiService },
+      ],
+    });
+
+    service = new DefaultAutomaticUserConfirmationService(
+      configService,
+      apiService,
+      organizationUserService,
+      stateProvider,
+      organizationService,
+      organizationUserApiService,
+    );
+
+    const mockOrgData = new OrganizationData({} as any, {} as any);
+    mockOrgData.id = mockOrganizationId;
+    mockOrgData.useAutomaticUserConfirmation = true;
+
+    const permissions = new PermissionsApi();
+    permissions.manageUsers = true;
+    mockOrgData.permissions = permissions;
+
+    mockOrganization = new Organization(mockOrgData);
+  });
+
+  describe("configuration$", () => {
+    it("should return default AutoConfirmState when no state exists", async () => {
+      const config$ = service.configuration$(mockUserId);
+      const config = await firstValueFrom(config$);
+
+      expect(config).toBeInstanceOf(AutoConfirmState);
+      expect(config.enabled).toBe(false);
+      expect(config.showSetupDialog).toBe(true);
+    });
+
+    it("should return stored AutoConfirmState when state exists", async () => {
+      const expectedConfig = new AutoConfirmState();
+      expectedConfig.enabled = true;
+      expectedConfig.showSetupDialog = false;
+      expectedConfig.showBrowserNotification = true;
+
+      await stateProvider.setUserState(
+        AUTO_CONFIRM_STATE,
+        { [mockUserId]: expectedConfig },
+        mockUserId,
+      );
+
+      const config$ = service.configuration$(mockUserId);
+      const config = await firstValueFrom(config$);
+
+      expect(config.enabled).toBe(true);
+      expect(config.showSetupDialog).toBe(false);
+      expect(config.showBrowserNotification).toBe(true);
+    });
+
+    it("should emit updates when state changes", async () => {
+      const config$ = service.configuration$(mockUserId);
+      const configs: AutoConfirmState[] = [];
+
+      const subscription = config$.subscribe((config) => configs.push(config));
+
+      expect(configs[0].enabled).toBe(false);
+
+      const newConfig = new AutoConfirmState();
+      newConfig.enabled = true;
+      await stateProvider.setUserState(AUTO_CONFIRM_STATE, { [mockUserId]: newConfig }, mockUserId);
+
+      expect(configs.length).toBeGreaterThan(1);
+      expect(configs[configs.length - 1].enabled).toBe(true);
+
+      subscription.unsubscribe();
+    });
+  });
+
+  describe("upsert", () => {
+    it("should store new configuration for user", async () => {
+      const newConfig = new AutoConfirmState();
+      newConfig.enabled = true;
+      newConfig.showSetupDialog = false;
+
+      await service.upsert(mockUserId, newConfig);
+
+      const storedState = await firstValueFrom(
+        stateProvider.getUser(mockUserId, AUTO_CONFIRM_STATE).state$,
+      );
+
+      expect(storedState != null);
+      expect(storedState![mockUserId]).toEqual(newConfig);
+    });
+
+    it("should update existing configuration for user", async () => {
+      const initialConfig = new AutoConfirmState();
+      initialConfig.enabled = false;
+
+      await service.upsert(mockUserId, initialConfig);
+
+      const updatedConfig = new AutoConfirmState();
+      updatedConfig.enabled = true;
+      updatedConfig.showSetupDialog = false;
+
+      await service.upsert(mockUserId, updatedConfig);
+
+      const storedState = await firstValueFrom(
+        stateProvider.getUser(mockUserId, AUTO_CONFIRM_STATE).state$,
+      );
+
+      expect(storedState != null);
+      expect(storedState![mockUserId].enabled).toBe(true);
+      expect(storedState![mockUserId].showSetupDialog).toBe(false);
+    });
+
+    it("should preserve other user configurations when updating", async () => {
+      const otherUserId = Utils.newGuid() as UserId;
+      const otherConfig = new AutoConfirmState();
+      otherConfig.enabled = true;
+
+      await stateProvider.setUserState(
+        AUTO_CONFIRM_STATE,
+        { [otherUserId]: otherConfig },
+        mockUserId,
+      );
+
+      const newConfig = new AutoConfirmState();
+      newConfig.enabled = false;
+
+      await service.upsert(mockUserId, newConfig);
+
+      const storedState = await firstValueFrom(
+        stateProvider.getUser(mockUserId, AUTO_CONFIRM_STATE).state$,
+      );
+
+      expect(storedState != null);
+      expect(storedState![mockUserId]).toEqual(newConfig);
+      expect(storedState![otherUserId]).toEqual(otherConfig);
+    });
+  });
+
+  describe("canManageAutoConfirm$", () => {
+    beforeEach(() => {
+      const organizations$ = new BehaviorSubject<Organization[]>([mockOrganization]);
+      organizationService.organizations$.mockReturnValue(organizations$);
+    });
+
+    it("should return true when feature flag is enabled and organization allows management", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+
+      const canManage$ = service.canManageAutoConfirm$(mockUserId, mockOrganizationId);
+      const canManage = await firstValueFrom(canManage$);
+
+      expect(canManage).toBe(true);
+    });
+
+    it("should return false when feature flag is disabled", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(false));
+
+      const canManage$ = service.canManageAutoConfirm$(mockUserId, mockOrganizationId);
+      const canManage = await firstValueFrom(canManage$);
+
+      expect(canManage).toBe(false);
+    });
+
+    it("should return false when organization canManageUsers is false", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+
+      // Create organization without manageUsers permission
+      const mockOrgData = new OrganizationData({} as any, {} as any);
+      mockOrgData.id = mockOrganizationId;
+      mockOrgData.useAutomaticUserConfirmation = true;
+      const permissions = new PermissionsApi();
+      permissions.manageUsers = false;
+      mockOrgData.permissions = permissions;
+      const orgWithoutManageUsers = new Organization(mockOrgData);
+
+      const organizations$ = new BehaviorSubject<Organization[]>([orgWithoutManageUsers]);
+      organizationService.organizations$.mockReturnValue(organizations$);
+
+      const canManage$ = service.canManageAutoConfirm$(mockUserId, mockOrganizationId);
+      const canManage = await firstValueFrom(canManage$);
+
+      expect(canManage).toBe(false);
+    });
+
+    it("should return false when organization useAutomaticUserConfirmation is false", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+
+      // Create organization without useAutomaticUserConfirmation
+      const mockOrgData = new OrganizationData({} as any, {} as any);
+      mockOrgData.id = mockOrganizationId;
+      mockOrgData.useAutomaticUserConfirmation = false;
+      const permissions = new PermissionsApi();
+      permissions.manageUsers = true;
+      mockOrgData.permissions = permissions;
+      const orgWithoutAutoConfirm = new Organization(mockOrgData);
+
+      const organizations$ = new BehaviorSubject<Organization[]>([orgWithoutAutoConfirm]);
+      organizationService.organizations$.mockReturnValue(organizations$);
+
+      const canManage$ = service.canManageAutoConfirm$(mockUserId, mockOrganizationId);
+      const canManage = await firstValueFrom(canManage$);
+
+      expect(canManage).toBe(false);
+    });
+
+    it("should return false when organization is not found", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+
+      const organizations$ = new BehaviorSubject<Organization[]>([]);
+      organizationService.organizations$.mockReturnValue(organizations$);
+
+      const canManage$ = service.canManageAutoConfirm$(mockUserId, mockOrganizationId);
+      const canManage = await firstValueFrom(canManage$);
+
+      expect(canManage).toBe(false);
+    });
+
+    it("should use the correct feature flag", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+
+      const canManage$ = service.canManageAutoConfirm$(mockUserId, mockOrganizationId);
+      await firstValueFrom(canManage$);
+
+      expect(configService.getFeatureFlag$).toHaveBeenCalledWith(FeatureFlag.AutoConfirm);
+    });
+  });
+
+  describe("autoConfirmUser", () => {
+    const mockPublicKey = "mock-public-key-base64";
+    const mockPublicKeyArray = new Uint8Array([1, 2, 3, 4]);
+    const mockConfirmRequest = {
+      key: "encrypted-key",
+      defaultUserCollectionName: "encrypted-collection",
+    } as OrganizationUserConfirmRequest;
+
+    beforeEach(() => {
+      const organizations$ = new BehaviorSubject<Organization[]>([mockOrganization]);
+      organizationService.organizations$.mockReturnValue(organizations$);
+      configService.getFeatureFlag$.mockReturnValue(of(true));
+
+      apiService.getUserPublicKey.mockResolvedValue({ publicKey: mockPublicKey } as any);
+      jest.spyOn(Utils, "fromB64ToArray").mockReturnValue(mockPublicKeyArray);
+      organizationUserService.buildConfirmRequest.mockReturnValue(of(mockConfirmRequest));
+      organizationUserApiService.postOrganizationUserConfirm.mockResolvedValue(undefined);
+    });
+
+    it("should successfully auto-confirm a user", async () => {
+      await service.autoConfirmUser(mockUserId, mockConfirmingUserId, mockOrganization);
+
+      expect(apiService.getUserPublicKey).toHaveBeenCalledWith(mockUserId);
+      expect(organizationUserService.buildConfirmRequest).toHaveBeenCalledWith(
+        mockOrganization,
+        mockPublicKeyArray,
+      );
+      expect(organizationUserApiService.postOrganizationUserConfirm).toHaveBeenCalledWith(
+        mockOrganizationId,
+        mockConfirmingUserId,
+        mockConfirmRequest,
+      );
+    });
+
+    it("should not confirm user when canManageAutoConfirm returns false", async () => {
+      configService.getFeatureFlag$.mockReturnValue(of(false));
+
+      await expect(
+        service.autoConfirmUser(mockUserId, mockConfirmingUserId, mockOrganization),
+      ).rejects.toThrow("Cannot automatically confirm user (insufficient permissions)");
+
+      expect(apiService.getUserPublicKey).not.toHaveBeenCalled();
+      expect(organizationUserApiService.postOrganizationUserConfirm).not.toHaveBeenCalled();
+    });
+
+    it("should build confirm request with organization and public key", async () => {
+      await service.autoConfirmUser(mockUserId, mockConfirmingUserId, mockOrganization);
+
+      expect(organizationUserService.buildConfirmRequest).toHaveBeenCalledWith(
+        mockOrganization,
+        mockPublicKeyArray,
+      );
+    });
+
+    it("should call API with correct parameters", async () => {
+      await service.autoConfirmUser(mockUserId, mockConfirmingUserId, mockOrganization);
+
+      expect(organizationUserApiService.postOrganizationUserConfirm).toHaveBeenCalledWith(
+        mockOrganization.id,
+        mockConfirmingUserId,
+        mockConfirmRequest,
+      );
+    });
+
+    it("should handle API errors gracefully", async () => {
+      const apiError = new Error("API Error");
+      apiService.getUserPublicKey.mockRejectedValue(apiError);
+
+      await expect(
+        service.autoConfirmUser(mockUserId, mockConfirmingUserId, mockOrganization),
+      ).rejects.toThrow("API Error");
+
+      expect(organizationUserApiService.postOrganizationUserConfirm).not.toHaveBeenCalled();
+    });
+
+    it("should handle buildConfirmRequest errors gracefully", async () => {
+      const buildError = new Error("Build Error");
+      organizationUserService.buildConfirmRequest.mockReturnValue(throwError(() => buildError));
+
+      await expect(
+        service.autoConfirmUser(mockUserId, mockConfirmingUserId, mockOrganization),
+      ).rejects.toThrow("Build Error");
+
+      expect(organizationUserApiService.postOrganizationUserConfirm).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/libs/admin-console/src/common/auto-confirm/services/default-auto-confirm.service.ts b/libs/admin-console/src/common/auto-confirm/services/default-auto-confirm.service.ts
new file mode 100644
index 00000000000..d6c435b84a3
--- /dev/null
+++ b/libs/admin-console/src/common/auto-confirm/services/default-auto-confirm.service.ts
@@ -0,0 +1,87 @@
+import { combineLatest, firstValueFrom, map, Observable, switchMap } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+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 { getById } from "@bitwarden/common/platform/misc";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { StateProvider } from "@bitwarden/state";
+import { UserId } from "@bitwarden/user-core";
+
+import { OrganizationUserApiService, OrganizationUserService } from "../../organization-user";
+import { AutomaticUserConfirmationService } from "../abstractions/auto-confirm.service.abstraction";
+import { AUTO_CONFIRM_STATE, AutoConfirmState } from "../models/auto-confirm-state.model";
+
+export class DefaultAutomaticUserConfirmationService implements AutomaticUserConfirmationService {
+  constructor(
+    private configService: ConfigService,
+    private apiService: ApiService,
+    private organizationUserService: OrganizationUserService,
+    private stateProvider: StateProvider,
+    private organizationService: InternalOrganizationServiceAbstraction,
+    private organizationUserApiService: OrganizationUserApiService,
+  ) {}
+  private autoConfirmState(userId: UserId) {
+    return this.stateProvider.getUser(userId, AUTO_CONFIRM_STATE);
+  }
+
+  configuration$(userId: UserId): Observable<AutoConfirmState> {
+    return this.autoConfirmState(userId).state$.pipe(
+      map((records) => records?.[userId] ?? new AutoConfirmState()),
+    );
+  }
+
+  async upsert(userId: UserId, config: AutoConfirmState): Promise<void> {
+    await this.autoConfirmState(userId).update((records) => {
+      return {
+        ...records,
+        [userId]: config,
+      };
+    });
+  }
+
+  canManageAutoConfirm$(userId: UserId, organizationId: OrganizationId): Observable<boolean> {
+    return combineLatest([
+      this.configService.getFeatureFlag$(FeatureFlag.AutoConfirm),
+      this.organizationService.organizations$(userId).pipe(getById(organizationId)),
+    ]).pipe(
+      map(
+        ([enabled, organization]) =>
+          (enabled && organization?.canManageUsers && organization?.useAutomaticUserConfirmation) ??
+          false,
+      ),
+    );
+  }
+
+  async autoConfirmUser(
+    userId: UserId,
+    confirmingUserId: UserId,
+    organization: Organization,
+  ): Promise<void> {
+    await firstValueFrom(
+      this.canManageAutoConfirm$(userId, organization.id).pipe(
+        map((canManage) => {
+          if (!canManage) {
+            throw new Error("Cannot automatically confirm user (insufficient permissions)");
+          }
+          return canManage;
+        }),
+        switchMap(() => this.apiService.getUserPublicKey(userId)),
+        map((publicKeyResponse) => Utils.fromB64ToArray(publicKeyResponse.publicKey)),
+        switchMap((publicKey) =>
+          this.organizationUserService.buildConfirmRequest(organization, publicKey),
+        ),
+        switchMap((request) =>
+          this.organizationUserApiService.postOrganizationUserConfirm(
+            organization.id,
+            confirmingUserId,
+            request,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/libs/admin-console/src/common/auto-confirm/services/index.ts b/libs/admin-console/src/common/auto-confirm/services/index.ts
new file mode 100644
index 00000000000..305ae380848
--- /dev/null
+++ b/libs/admin-console/src/common/auto-confirm/services/index.ts
@@ -0,0 +1 @@
+export * from "./default-auto-confirm.service";
diff --git a/libs/admin-console/src/common/collections/services/default-collection.service.spec.ts b/libs/admin-console/src/common/collections/services/default-collection.service.spec.ts
index 4fe2ac67863..ced3b720e3c 100644
--- a/libs/admin-console/src/common/collections/services/default-collection.service.spec.ts
+++ b/libs/admin-console/src/common/collections/services/default-collection.service.spec.ts
@@ -177,8 +177,7 @@ describe("DefaultCollectionService", () => {
       // Arrange dependencies
       void setEncryptedState([collection1, collection2]).then(() => {
         // Act: emit undefined
-        cryptoKeys.next(undefined);
-        keyService.activeUserOrgKeys$ = of(undefined);
+        cryptoKeys.next(null);
       });
     });
 
diff --git a/libs/admin-console/src/common/index.ts b/libs/admin-console/src/common/index.ts
index edeff5aa314..37f79d56256 100644
--- a/libs/admin-console/src/common/index.ts
+++ b/libs/admin-console/src/common/index.ts
@@ -1,2 +1,3 @@
-export * from "./organization-user";
+export * from "./auto-confirm";
 export * from "./collections";
+export * from "./organization-user";
diff --git a/libs/admin-console/src/common/organization-user/abstractions/index.ts b/libs/admin-console/src/common/organization-user/abstractions/index.ts
index 01cd189b3dd..dc2788deead 100644
--- a/libs/admin-console/src/common/organization-user/abstractions/index.ts
+++ b/libs/admin-console/src/common/organization-user/abstractions/index.ts
@@ -1 +1,2 @@
 export * from "./organization-user-api.service";
+export * from "./organization-user.service";
diff --git a/libs/admin-console/src/common/organization-user/abstractions/organization-user-api.service.ts b/libs/admin-console/src/common/organization-user/abstractions/organization-user-api.service.ts
index ff422231a12..71d228ff822 100644
--- a/libs/admin-console/src/common/organization-user/abstractions/organization-user-api.service.ts
+++ b/libs/admin-console/src/common/organization-user/abstractions/organization-user-api.service.ts
@@ -148,6 +148,19 @@ export abstract class OrganizationUserApiService {
     request: OrganizationUserConfirmRequest,
   ): Promise<void>;
 
+  /**
+   * Admin api for automatically confirming an organization user that
+   * has accepted their invitation
+   * @param organizationId - Identifier for the organization to confirm
+   * @param id - Organization user identifier
+   * @param request - Request details for confirming the user
+   */
+  abstract postOrganizationUserAutoConfirm(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserConfirmRequest,
+  ): Promise<void>;
+
   /**
    * Retrieve a list of the specified users' public keys
    * @param organizationId - Identifier for the organization to accept
diff --git a/libs/admin-console/src/common/organization-user/abstractions/organization-user.service.ts b/libs/admin-console/src/common/organization-user/abstractions/organization-user.service.ts
new file mode 100644
index 00000000000..844a0f412be
--- /dev/null
+++ b/libs/admin-console/src/common/organization-user/abstractions/organization-user.service.ts
@@ -0,0 +1,45 @@
+import { Observable } from "rxjs";
+
+import {
+  OrganizationUserConfirmRequest,
+  OrganizationUserBulkResponse,
+} from "@bitwarden/admin-console/common";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+
+export abstract class OrganizationUserService {
+  /**
+   * Builds a confirmation request for an organization user.
+   * @param organization - The organization the user belongs to
+   * @param publicKey - The user's public key
+   * @returns An observable that emits the confirmation request
+   */
+  abstract buildConfirmRequest(
+    organization: Organization,
+    publicKey: Uint8Array,
+  ): Observable<OrganizationUserConfirmRequest>;
+
+  /**
+   * Confirms a user in an organization.
+   * @param organization - The organization the user belongs to
+   * @param userId - The ID of the user to confirm
+   * @param publicKey - The user's public key
+   * @returns An observable that completes when the user is confirmed
+   */
+  abstract confirmUser(
+    organization: Organization,
+    userId: string,
+    publicKey: Uint8Array,
+  ): Observable<void>;
+
+  /**
+   * Confirms multiple users in an organization.
+   * @param organization - The organization the users belong to
+   * @param userIdsWithKeys - Array of user IDs with their encrypted keys
+   * @returns An observable that emits the bulk confirmation response
+   */
+  abstract bulkConfirmUsers(
+    organization: Organization,
+    userIdsWithKeys: { id: string; key: string }[],
+  ): Observable<ListResponse<OrganizationUserBulkResponse>>;
+}
diff --git a/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts b/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
index c16fba258ec..869d84a8c8e 100644
--- a/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
+++ b/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
@@ -194,6 +194,20 @@ export class DefaultOrganizationUserApiService implements OrganizationUserApiSer
     );
   }
 
+  postOrganizationUserAutoConfirm(
+    organizationId: string,
+    id: string,
+    request: OrganizationUserConfirmRequest,
+  ): Promise<void> {
+    return this.apiService.send(
+      "POST",
+      "/organizations/" + organizationId + "/users/" + id + "/auto-confirm",
+      request,
+      true,
+      false,
+    );
+  }
+
   async postOrganizationUsersPublicKey(
     organizationId: string,
     ids: string[],
diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.spec.ts b/libs/admin-console/src/common/organization-user/services/default-organization-user.service.spec.ts
similarity index 91%
rename from apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.spec.ts
rename to libs/admin-console/src/common/organization-user/services/default-organization-user.service.spec.ts
index 2ae5aa4eb98..982fb3ca5e0 100644
--- a/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.spec.ts
+++ b/libs/admin-console/src/common/organization-user/services/default-organization-user.service.spec.ts
@@ -19,12 +19,10 @@ 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 { DefaultOrganizationUserService } from "./default-organization-user.service";
 
-import { OrganizationUserService } from "./organization-user.service";
-
-describe("OrganizationUserService", () => {
-  let service: OrganizationUserService;
+describe("DefaultOrganizationUserService", () => {
+  let service: DefaultOrganizationUserService;
   let keyService: jest.Mocked<KeyService>;
   let encryptService: jest.Mocked<EncryptService>;
   let organizationUserApiService: jest.Mocked<OrganizationUserApiService>;
@@ -34,9 +32,7 @@ describe("OrganizationUserService", () => {
   const mockOrganization = new Organization();
   mockOrganization.id = "org-123" as OrganizationId;
 
-  const mockOrganizationUser = new OrganizationUserView();
-  mockOrganizationUser.id = "user-123";
-
+  const mockUserId = "user-123";
   const mockPublicKey = new Uint8Array(64) as CsprngArray;
   const mockRandomBytes = new Uint8Array(64) as CsprngArray;
   const mockOrgKey = new SymmetricCryptoKey(mockRandomBytes) as OrgKey;
@@ -77,7 +73,7 @@ describe("OrganizationUserService", () => {
 
     TestBed.configureTestingModule({
       providers: [
-        OrganizationUserService,
+        DefaultOrganizationUserService,
         { provide: KeyService, useValue: keyService },
         { provide: EncryptService, useValue: encryptService },
         { provide: OrganizationUserApiService, useValue: organizationUserApiService },
@@ -86,7 +82,13 @@ describe("OrganizationUserService", () => {
       ],
     });
 
-    service = TestBed.inject(OrganizationUserService);
+    service = new DefaultOrganizationUserService(
+      keyService,
+      encryptService,
+      organizationUserApiService,
+      accountService,
+      i18nService,
+    );
   });
 
   describe("confirmUser", () => {
@@ -97,7 +99,7 @@ describe("OrganizationUserService", () => {
     });
 
     it("should confirm a user successfully", (done) => {
-      service.confirmUser(mockOrganization, mockOrganizationUser, mockPublicKey).subscribe({
+      service.confirmUser(mockOrganization, mockUserId, mockPublicKey).subscribe({
         next: () => {
           expect(i18nService.t).toHaveBeenCalledWith("myItems");
 
@@ -112,7 +114,7 @@ describe("OrganizationUserService", () => {
 
           expect(organizationUserApiService.postOrganizationUserConfirm).toHaveBeenCalledWith(
             mockOrganization.id,
-            mockOrganizationUser.id,
+            mockUserId,
             {
               key: mockEncryptedKey.encryptedString,
               defaultUserCollectionName: mockEncryptedCollectionName.encryptedString,
diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts b/libs/admin-console/src/common/organization-user/services/default-organization-user.service.ts
similarity index 80%
rename from apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts
rename to libs/admin-console/src/common/organization-user/services/default-organization-user.service.ts
index f59b377e26e..4f503a92675 100644
--- a/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts
+++ b/libs/admin-console/src/common/organization-user/services/default-organization-user.service.ts
@@ -1,4 +1,3 @@
-import { Injectable } from "@angular/core";
 import { combineLatest, filter, map, Observable, switchMap } from "rxjs";
 
 import {
@@ -6,6 +5,7 @@ import {
   OrganizationUserBulkConfirmRequest,
   OrganizationUserApiService,
   OrganizationUserBulkResponse,
+  OrganizationUserService,
 } from "@bitwarden/admin-console/common";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -16,12 +16,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { KeyService } from "@bitwarden/key-management";
 
-import { OrganizationUserView } from "../../../core/views/organization-user.view";
-
-@Injectable({
-  providedIn: "root",
-})
-export class OrganizationUserService {
+export class DefaultOrganizationUserService implements OrganizationUserService {
   constructor(
     protected keyService: KeyService,
     private encryptService: EncryptService,
@@ -39,11 +34,10 @@ export class OrganizationUserService {
     );
   }
 
-  confirmUser(
+  buildConfirmRequest(
     organization: Organization,
-    user: OrganizationUserView,
     publicKey: Uint8Array,
-  ): Observable<void> {
+  ): Observable<OrganizationUserConfirmRequest> {
     const encryptedCollectionName$ = this.getEncryptedDefaultCollectionName$(organization);
 
     const encryptedKey$ = this.orgKey$(organization).pipe(
@@ -51,18 +45,22 @@ export class OrganizationUserService {
     );
 
     return combineLatest([encryptedKey$, encryptedCollectionName$]).pipe(
-      switchMap(([key, collectionName]) => {
-        const request: OrganizationUserConfirmRequest = {
-          key: key.encryptedString,
-          defaultUserCollectionName: collectionName.encryptedString,
-        };
+      map(([key, collectionName]) => ({
+        key: key.encryptedString,
+        defaultUserCollectionName: collectionName.encryptedString,
+      })),
+    );
+  }
 
-        return this.organizationUserApiService.postOrganizationUserConfirm(
+  confirmUser(organization: Organization, userId: string, publicKey: Uint8Array): Observable<void> {
+    return this.buildConfirmRequest(organization, publicKey).pipe(
+      switchMap((request) =>
+        this.organizationUserApiService.postOrganizationUserConfirm(
           organization.id,
-          user.id,
+          userId,
           request,
-        );
-      }),
+        ),
+      ),
     );
   }
 
diff --git a/libs/admin-console/src/common/organization-user/services/index.ts b/libs/admin-console/src/common/organization-user/services/index.ts
index 6135236d6a6..929a9fcd39a 100644
--- a/libs/admin-console/src/common/organization-user/services/index.ts
+++ b/libs/admin-console/src/common/organization-user/services/index.ts
@@ -1 +1,2 @@
 export * from "./default-organization-user-api.service";
+export * from "./default-organization-user.service";
diff --git a/libs/angular/src/auth/components/authentication-timeout.component.ts b/libs/angular/src/auth/components/authentication-timeout.component.ts
index 940798de9e7..ed1ff9d29fa 100644
--- a/libs/angular/src/auth/components/authentication-timeout.component.ts
+++ b/libs/angular/src/auth/components/authentication-timeout.component.ts
@@ -9,6 +9,8 @@ import { ButtonModule } from "@bitwarden/components";
  * This component is used to display a message to the user that their authentication session has expired.
  * It provides a button to navigate to the login page.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-authentication-timeout",
   imports: [CommonModule, JslibModule, ButtonModule, RouterModule],
diff --git a/libs/angular/src/auth/components/set-pin.component.ts b/libs/angular/src/auth/components/set-pin.component.ts
index 9e351990fff..28f0fbaee97 100644
--- a/libs/angular/src/auth/components/set-pin.component.ts
+++ b/libs/angular/src/auth/components/set-pin.component.ts
@@ -9,7 +9,6 @@ import { UserVerificationService } from "@bitwarden/common/auth/abstractions/use
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DialogRef } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
 
 @Directive()
 export class SetPinComponent implements OnInit {
@@ -22,7 +21,6 @@ export class SetPinComponent implements OnInit {
 
   constructor(
     private accountService: AccountService,
-    private keyService: KeyService,
     private dialogRef: DialogRef,
     private formBuilder: FormBuilder,
     private pinService: PinServiceAbstraction,
@@ -47,25 +45,11 @@ export class SetPinComponent implements OnInit {
     }
 
     const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
-    const userKey = await this.keyService.getUserKey();
-
-    const userKeyEncryptedPin = await this.pinService.createUserKeyEncryptedPin(
+    await this.pinService.setPin(
       pinFormControl.value,
-      userKey,
-    );
-    await this.pinService.setUserKeyEncryptedPin(userKeyEncryptedPin, userId);
-
-    const pinKeyEncryptedUserKey = await this.pinService.createPinKeyEncryptedUserKey(
-      pinFormControl.value,
-      userKey,
+      requireMasterPasswordOnClientRestart ? "EPHEMERAL" : "PERSISTENT",
       userId,
     );
-    await this.pinService.storePinKeyEncryptedUserKey(
-      pinKeyEncryptedUserKey,
-      requireMasterPasswordOnClientRestart,
-      userId,
-    );
-
     this.dialogRef.close(true);
   };
 }
diff --git a/libs/angular/src/auth/components/two-factor-icon.component.ts b/libs/angular/src/auth/components/two-factor-icon.component.ts
index c9c7e43b61f..85db7975f87 100644
--- a/libs/angular/src/auth/components/two-factor-icon.component.ts
+++ b/libs/angular/src/auth/components/two-factor-icon.component.ts
@@ -9,13 +9,19 @@ import {
   TwoFactorAuthWebAuthnIcon,
 } from "@bitwarden/assets/svg";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-two-factor-icon",
   templateUrl: "./two-factor-icon.component.html",
   standalone: false,
 })
 export class TwoFactorIconComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() provider: any;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() name: string;
 
   protected readonly IconProviderMap: { [key: number | string]: Icon } = {
diff --git a/libs/angular/src/auth/components/user-verification.component.ts b/libs/angular/src/auth/components/user-verification.component.ts
index 6f5021340c7..a2cee2f1099 100644
--- a/libs/angular/src/auth/components/user-verification.component.ts
+++ b/libs/angular/src/auth/components/user-verification.component.ts
@@ -24,8 +24,12 @@ import { KeyService } from "@bitwarden/key-management";
   selector: "app-user-verification",
   standalone: false,
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28232): Use Directive suffix
+// eslint-disable-next-line @angular-eslint/directive-class-suffix
 export class UserVerificationComponent implements ControlValueAccessor, OnInit, OnDestroy {
   private _invalidSecret = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get invalidSecret() {
     return this._invalidSecret;
@@ -43,6 +47,8 @@ export class UserVerificationComponent implements ControlValueAccessor, OnInit,
     }
     this.secret.updateValueAndValidity({ emitEvent: false });
   }
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() invalidSecretChange = new EventEmitter<boolean>();
 
   hasMasterPassword = true;
diff --git a/libs/angular/src/auth/constants/auth-route.constant.ts b/libs/angular/src/auth/constants/auth-route.constant.ts
new file mode 100644
index 00000000000..caacfbbc4a8
--- /dev/null
+++ b/libs/angular/src/auth/constants/auth-route.constant.ts
@@ -0,0 +1,21 @@
+/**
+ * Constants for auth team owned full routes which are shared across clients.
+ */
+export const AuthRoute = Object.freeze({
+  SignUp: "signup",
+  FinishSignUp: "finish-signup",
+  Login: "login",
+  LoginWithDevice: "login-with-device",
+  AdminApprovalRequested: "admin-approval-requested",
+  PasswordHint: "hint",
+  LoginInitiated: "login-initiated",
+  SetInitialPassword: "set-initial-password",
+  ChangePassword: "change-password",
+  Sso: "sso",
+  TwoFactor: "2fa",
+  AuthenticationTimeout: "authentication-timeout",
+  NewDeviceVerification: "device-verification",
+  LoginWithPasskey: "login-with-passkey",
+} as const);
+
+export type AuthRoute = (typeof AuthRoute)[keyof typeof AuthRoute];
diff --git a/libs/angular/src/auth/constants/index.ts b/libs/angular/src/auth/constants/index.ts
new file mode 100644
index 00000000000..d8e362734c1
--- /dev/null
+++ b/libs/angular/src/auth/constants/index.ts
@@ -0,0 +1 @@
+export * from "./auth-route.constant";
diff --git a/libs/angular/src/auth/device-management/device-management-item-group.component.html b/libs/angular/src/auth/device-management/device-management-item-group.component.html
index b6a3ea2d8f8..68081f20199 100644
--- a/libs/angular/src/auth/device-management/device-management-item-group.component.html
+++ b/libs/angular/src/auth/device-management/device-management-item-group.component.html
@@ -22,7 +22,7 @@
         <span slot="secondary" class="tw-text-sm">
           <br />
           <div>
-            <span class="tw-font-semibold"> {{ "firstLogin" | i18n }}: </span>
+            <span class="tw-font-medium"> {{ "firstLogin" | i18n }}: </span>
             <span>{{ device.firstLogin | date: "medium" }}</span>
           </div>
         </span>
@@ -52,7 +52,7 @@
           }
 
           <div>
-            <span class="tw-font-semibold">{{ "firstLogin" | i18n }}: </span>
+            <span class="tw-font-medium">{{ "firstLogin" | i18n }}: </span>
             <span>{{ device.firstLogin | date: "medium" }}</span>
           </div>
         </div>
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 71e343e734f..71fe80928f9 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
@@ -8,6 +8,8 @@ import { I18nPipe } from "@bitwarden/ui-common";
 import { DeviceDisplayData } from "./device-management.component";
 
 /** Displays user devices in an item list view */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   selector: "auth-device-management-item-group",
@@ -15,7 +17,11 @@ import { DeviceDisplayData } from "./device-management.component";
   imports: [BadgeModule, CommonModule, ItemModule, I18nPipe],
 })
 export class DeviceManagementItemGroupComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() devices: DeviceDisplayData[] = [];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAuthRequestAnswered = new EventEmitter<DevicePendingAuthRequest>();
 
   protected answerAuthRequest(pendingAuthRequest: DevicePendingAuthRequest | null) {
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 d663e28b9e4..36edf6dd336 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
@@ -15,6 +15,8 @@ import {
 import { DeviceDisplayData } from "./device-management.component";
 
 /** Displays user devices in a sortable table view */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   selector: "auth-device-management-table",
@@ -22,7 +24,11 @@ import { DeviceDisplayData } from "./device-management.component";
   imports: [BadgeModule, ButtonModule, CommonModule, JslibModule, LinkModule, TableModule],
 })
 export class DeviceManagementTableComponent implements OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() devices: DeviceDisplayData[] = [];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAuthRequestAnswered = new EventEmitter<DevicePendingAuthRequest>();
 
   protected tableDataSource = new TableDataSource<DeviceDisplayData>();
diff --git a/libs/angular/src/auth/device-management/device-management.component.ts b/libs/angular/src/auth/device-management/device-management.component.ts
index 2c67812b586..d8f8cc10df4 100644
--- a/libs/angular/src/auth/device-management/device-management.component.ts
+++ b/libs/angular/src/auth/device-management/device-management.component.ts
@@ -50,6 +50,8 @@ export interface DeviceDisplayData {
  * - Medium to Large screens = `bit-table` view
  * - Small screens = `bit-item-group` view
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   selector: "auth-device-management",
diff --git a/libs/angular/src/auth/environment-selector/environment-selector.component.html b/libs/angular/src/auth/environment-selector/environment-selector.component.html
index f6484ea1e5f..72d7355c399 100644
--- a/libs/angular/src/auth/environment-selector/environment-selector.component.html
+++ b/libs/angular/src/auth/environment-selector/environment-selector.component.html
@@ -38,7 +38,7 @@
     <div bitTypography="body2">
       {{ "accessing" | i18n }}:
       <button [bitMenuTriggerFor]="environmentOptions" bitLink type="button">
-        <b class="tw-text-primary-600 tw-font-semibold">{{
+        <b class="tw-text-primary-600 tw-font-medium">{{
           data.selectedRegion?.domain || ("selfHostedServer" | i18n)
         }}</b>
         <i class="bwi bwi-fw bwi-sm bwi-angle-down" aria-hidden="true"></i>
diff --git a/libs/angular/src/auth/environment-selector/environment-selector.component.ts b/libs/angular/src/auth/environment-selector/environment-selector.component.ts
index 6fe3eaa92a0..89366f47b70 100644
--- a/libs/angular/src/auth/environment-selector/environment-selector.component.ts
+++ b/libs/angular/src/auth/environment-selector/environment-selector.component.ts
@@ -20,6 +20,8 @@ import {
 } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "environment-selector",
   templateUrl: "environment-selector.component.html",
diff --git a/libs/angular/src/auth/guards/active-auth.guard.spec.ts b/libs/angular/src/auth/guards/active-auth.guard.spec.ts
index de1bf40be11..d4d27626c11 100644
--- a/libs/angular/src/auth/guards/active-auth.guard.spec.ts
+++ b/libs/angular/src/auth/guards/active-auth.guard.spec.ts
@@ -13,6 +13,8 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 
 import { activeAuthGuard } from "./active-auth.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({ template: "", standalone: false })
 class EmptyComponent {}
 
diff --git a/libs/angular/src/auth/login-approval/login-approval-dialog.component.ts b/libs/angular/src/auth/login-approval/login-approval-dialog.component.ts
index 19dc3f519c6..35333c43536 100644
--- a/libs/angular/src/auth/login-approval/login-approval-dialog.component.ts
+++ b/libs/angular/src/auth/login-approval/login-approval-dialog.component.ts
@@ -33,6 +33,8 @@ export interface LoginApprovalDialogParams {
   notificationId: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "login-approval-dialog.component.html",
   imports: [AsyncActionsModule, ButtonModule, CommonModule, DialogModule, JslibModule],
diff --git a/libs/angular/src/auth/login-via-webauthn/login-via-webauthn.component.html b/libs/angular/src/auth/login-via-webauthn/login-via-webauthn.component.html
new file mode 100644
index 00000000000..1fe0f18ceb7
--- /dev/null
+++ b/libs/angular/src/auth/login-via-webauthn/login-via-webauthn.component.html
@@ -0,0 +1,20 @@
+<div class="tw-flex tw-flex-col tw-items-center">
+  <ng-container *ngIf="currentState === 'assert'">
+    <p bitTypography="body1" class="tw-text-center">{{ "readingPasskeyLoading" | i18n }}</p>
+    <button type="button" bitButton block [loading]="true" buttonType="primary" class="tw-mb-4">
+      {{ "loading" | i18n }}
+    </button>
+  </ng-container>
+
+  <ng-container *ngIf="currentState === 'assertFailed'">
+    <p bitTypography="body1" class="tw-text-center">{{ "passkeyAuthenticationFailed" | i18n }}</p>
+    <button type="button" bitButton block buttonType="primary" class="tw-mb-4" (click)="retry()">
+      {{ "tryAgain" | i18n }}
+    </button>
+  </ng-container>
+
+  <p bitTypography="body1" class="tw-mb-0 tw-text-center">
+    {{ "troubleLoggingIn" | i18n }}<br />
+    <a bitLink routerLink="/login">{{ "useADifferentLogInMethod" | i18n }}</a>
+  </p>
+</div>
diff --git a/libs/angular/src/auth/components/base-login-via-webauthn.component.ts b/libs/angular/src/auth/login-via-webauthn/login-via-webauthn.component.ts
similarity index 60%
rename from libs/angular/src/auth/components/base-login-via-webauthn.component.ts
rename to libs/angular/src/auth/login-via-webauthn/login-via-webauthn.component.ts
index 53e29d4d940..fa2a01fe8e1 100644
--- a/libs/angular/src/auth/components/base-login-via-webauthn.component.ts
+++ b/libs/angular/src/auth/login-via-webauthn/login-via-webauthn.component.ts
@@ -1,27 +1,71 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Directive, OnInit } from "@angular/core";
-import { Router } from "@angular/router";
+import { CommonModule } from "@angular/common";
+import { Component, OnInit } from "@angular/core";
+import { Router, RouterModule } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+  TwoFactorAuthSecurityKeyIcon,
+  TwoFactorAuthSecurityKeyFailedIcon,
+} from "@bitwarden/assets/svg";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import { LoginSuccessHandlerService } from "@bitwarden/auth/common";
 import { WebAuthnLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login.service.abstraction";
 import { WebAuthnLoginCredentialAssertionView } from "@bitwarden/common/auth/models/view/webauthn-login/webauthn-login-credential-assertion.view";
+import { ClientType } from "@bitwarden/common/enums";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+import {
+  AnonLayoutWrapperDataService,
+  ButtonModule,
+  IconModule,
+  LinkModule,
+  TypographyModule,
+} from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
 export type State = "assert" | "assertFailed";
-
-@Directive()
-export class BaseLoginViaWebAuthnComponent implements OnInit {
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "app-login-via-webauthn",
+  templateUrl: "login-via-webauthn.component.html",
+  standalone: true,
+  imports: [
+    CommonModule,
+    RouterModule,
+    JslibModule,
+    ButtonModule,
+    IconModule,
+    LinkModule,
+    TypographyModule,
+  ],
+})
+export class LoginViaWebAuthnComponent implements OnInit {
   protected currentState: State = "assert";
 
-  protected successRoute = "/vault";
+  protected readonly Icons = {
+    TwoFactorAuthSecurityKeyIcon,
+    TwoFactorAuthSecurityKeyFailedIcon,
+  };
+
+  private readonly successRoutes: Record<ClientType, string> = {
+    [ClientType.Web]: "/vault",
+    [ClientType.Browser]: "/tabs/vault",
+    [ClientType.Desktop]: "/vault",
+    [ClientType.Cli]: "/vault",
+  };
+
+  protected get successRoute(): string {
+    const clientType = this.platformUtilsService.getClientType();
+    return this.successRoutes[clientType] || "/vault";
+  }
 
   constructor(
     private webAuthnLoginService: WebAuthnLoginServiceAbstraction,
@@ -31,6 +75,8 @@ export class BaseLoginViaWebAuthnComponent implements OnInit {
     private i18nService: I18nService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
     private keyService: KeyService,
+    private platformUtilsService: PlatformUtilsService,
+    private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
   ) {}
 
   ngOnInit(): void {
@@ -41,6 +87,8 @@ export class BaseLoginViaWebAuthnComponent implements OnInit {
 
   protected retry() {
     this.currentState = "assert";
+    // Reset to default icon on retry
+    this.setDefaultIcon();
     // 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.authenticate();
@@ -54,6 +102,7 @@ export class BaseLoginViaWebAuthnComponent implements OnInit {
     } catch (error) {
       this.validationService.showError(error);
       this.currentState = "assertFailed";
+      this.setFailureIcon();
       return;
     }
     try {
@@ -64,6 +113,7 @@ export class BaseLoginViaWebAuthnComponent implements OnInit {
           this.i18nService.t("twoFactorForPasskeysNotSupportedOnClientUpdateToLogIn"),
         );
         this.currentState = "assertFailed";
+        this.setFailureIcon();
         return;
       }
 
@@ -80,6 +130,19 @@ export class BaseLoginViaWebAuthnComponent implements OnInit {
       }
       this.logService.error(error);
       this.currentState = "assertFailed";
+      this.setFailureIcon();
     }
   }
+
+  private setDefaultIcon(): void {
+    this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+      pageIcon: this.Icons.TwoFactorAuthSecurityKeyIcon,
+    });
+  }
+
+  private setFailureIcon(): void {
+    this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+      pageIcon: this.Icons.TwoFactorAuthSecurityKeyFailedIcon,
+    });
+  }
 }
diff --git a/libs/angular/src/auth/password-management/change-password/change-password.component.ts b/libs/angular/src/auth/password-management/change-password/change-password.component.ts
index 1512f348133..7f46ebfc9d4 100644
--- a/libs/angular/src/auth/password-management/change-password/change-password.component.ts
+++ b/libs/angular/src/auth/password-management/change-password/change-password.component.ts
@@ -39,12 +39,16 @@ import { ChangePasswordService } from "./change-password.service.abstraction";
  * and by design to maintain a strong security posture as some flows could have the user
  * end up at a change password without having one before.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-change-password",
   templateUrl: "change-password.component.html",
   imports: [InputPasswordComponent, I18nPipe, CalloutComponent, CommonModule],
 })
 export class ChangePasswordComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() inputPasswordFlow: InputPasswordFlow = InputPasswordFlow.ChangePassword;
 
   activeAccount: Account | null = null;
diff --git a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
index 01e87cae0ed..df5220b5255 100644
--- a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
+++ b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
@@ -182,7 +182,10 @@ export class DefaultSetInitialPasswordService implements SetInitialPasswordServi
     if (userKey == null) {
       masterKeyEncryptedUserKey = await this.keyService.makeUserKey(masterKey);
     } else {
-      masterKeyEncryptedUserKey = await this.keyService.encryptUserKeyWithMasterKey(masterKey);
+      masterKeyEncryptedUserKey = await this.keyService.encryptUserKeyWithMasterKey(
+        masterKey,
+        userKey,
+      );
     }
 
     return masterKeyEncryptedUserKey;
@@ -195,10 +198,13 @@ export class DefaultSetInitialPasswordService implements SetInitialPasswordServi
     userId: UserId,
   ) {
     const userDecryptionOpts = await firstValueFrom(
-      this.userDecryptionOptionsService.userDecryptionOptions$,
+      this.userDecryptionOptionsService.userDecryptionOptionsById$(userId),
     );
     userDecryptionOpts.hasMasterPassword = true;
-    await this.userDecryptionOptionsService.setUserDecryptionOptions(userDecryptionOpts);
+    await this.userDecryptionOptionsService.setUserDecryptionOptionsById(
+      userId,
+      userDecryptionOpts,
+    );
     await this.kdfConfigService.setKdfConfig(userId, kdfConfig);
     await this.masterPasswordService.setMasterKey(masterKey, userId);
     await this.keyService.setUserKey(masterKeyEncryptedUserKey[0], userId);
diff --git a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.spec.ts b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.spec.ts
index 7a1dfc91e67..8b95090e776 100644
--- a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.spec.ts
+++ b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.spec.ts
@@ -149,7 +149,9 @@ describe("DefaultSetInitialPasswordService", () => {
 
       userDecryptionOptions = new UserDecryptionOptions({ hasMasterPassword: true });
       userDecryptionOptionsSubject = new BehaviorSubject(userDecryptionOptions);
-      userDecryptionOptionsService.userDecryptionOptions$ = userDecryptionOptionsSubject;
+      userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
+        userDecryptionOptionsSubject,
+      );
 
       setPasswordRequest = new SetPasswordRequest(
         credentials.newServerMasterKeyHash,
@@ -362,7 +364,8 @@ describe("DefaultSetInitialPasswordService", () => {
 
           // Assert
           expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
-          expect(userDecryptionOptionsService.setUserDecryptionOptions).toHaveBeenCalledWith(
+          expect(userDecryptionOptionsService.setUserDecryptionOptionsById).toHaveBeenCalledWith(
+            userId,
             userDecryptionOptions,
           );
           expect(kdfConfigService.setKdfConfig).toHaveBeenCalledWith(userId, credentials.kdfConfig);
@@ -560,7 +563,8 @@ describe("DefaultSetInitialPasswordService", () => {
 
           // Assert
           expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
-          expect(userDecryptionOptionsService.setUserDecryptionOptions).toHaveBeenCalledWith(
+          expect(userDecryptionOptionsService.setUserDecryptionOptionsById).toHaveBeenCalledWith(
+            userId,
             userDecryptionOptions,
           );
           expect(kdfConfigService.setKdfConfig).toHaveBeenCalledWith(userId, credentials.kdfConfig);
diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
index ff78952c562..805fe3c0173 100644
--- a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
+++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
@@ -45,6 +45,8 @@ import {
   SetInitialPasswordUserType,
 } from "./set-initial-password.service.abstraction";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   templateUrl: "set-initial-password.component.html",
diff --git a/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.html b/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.html
deleted file mode 100644
index c9c0c296ada..00000000000
--- a/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog [title]="'addCredit' | i18n">
-    <ng-container bitDialogContent>
-      <p bitTypography="body1">{{ "creditDelayed" | i18n }}</p>
-      <div class="tw-grid tw-grid-cols-2">
-        <bit-radio-group formControlName="paymentMethod">
-          <bit-radio-button [value]="paymentMethodType.PayPal">
-            <bit-label> <i class="bwi bwi-paypal"></i>{{ "payPal" | i18n }}</bit-label>
-          </bit-radio-button>
-          <bit-radio-button [value]="paymentMethodType.BitPay">
-            <bit-label> <i class="bwi bwi-bitcoin"></i>{{ "bitcoin" | i18n }}</bit-label>
-          </bit-radio-button>
-        </bit-radio-group>
-      </div>
-      <div class="tw-grid tw-grid-cols-2">
-        <bit-form-field>
-          <bit-label>{{ "amount" | i18n }}</bit-label>
-          <input bitInput type="number" formControlName="creditAmount" step="0.01" required />
-          <span bitPrefix>$USD</span>
-        </bit-form-field>
-      </div>
-    </ng-container>
-    <ng-container bitDialogFooter>
-      <button type="submit" bitButton bitFormButton buttonType="primary">
-        {{ "submit" | i18n }}
-      </button>
-      <button
-        type="button"
-        bitButton
-        bitFormButton
-        buttonType="secondary"
-        [bitDialogClose]="ResultType.Closed"
-      >
-        {{ "cancel" | i18n }}
-      </button>
-    </ng-container>
-  </bit-dialog>
-</form>
-<form #payPalForm action="{{ payPalConfig.buttonAction }}" method="post" target="_top">
-  <input type="hidden" name="cmd" value="_xclick" />
-  <input type="hidden" name="business" value="{{ payPalConfig.businessId }}" />
-  <input type="hidden" name="button_subtype" value="services" />
-  <input type="hidden" name="no_note" value="1" />
-  <input type="hidden" name="no_shipping" value="1" />
-  <input type="hidden" name="rm" value="1" />
-  <input type="hidden" name="return" value="{{ payPalConfig.returnUrl }}" />
-  <input type="hidden" name="cancel_return" value="{{ payPalConfig.returnUrl }}" />
-  <input type="hidden" name="currency_code" value="USD" />
-  <input type="hidden" name="image_url" value="https://bitwarden.com/images/paypal-banner.png" />
-  <input type="hidden" name="bn" value="PP-BuyNowBF:btn_buynow_LG.gif:NonHosted" />
-  <input type="hidden" name="amount" value="{{ formGroup.get('creditAmount').value }}" />
-  <input type="hidden" name="custom" value="{{ payPalConfig.customField }}" />
-  <input type="hidden" name="item_name" value="Bitwarden Account Credit" />
-  <input type="hidden" name="item_number" value="{{ payPalConfig.subject }}" />
-</form>
diff --git a/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts b/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts
deleted file mode 100644
index 3dc56c55b0c..00000000000
--- a/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, ElementRef, Inject, OnInit, ViewChild } from "@angular/core";
-import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { firstValueFrom, map } from "rxjs";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
-import { AccountService, AccountInfo } from "@bitwarden/common/auth/abstractions/account.service";
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { BitPayInvoiceRequest } from "@bitwarden/common/billing/models/request/bit-pay-invoice.request";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { UserId } from "@bitwarden/common/types/guid";
-import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
-
-export type AddAccountCreditDialogParams = {
-  organizationId?: string;
-  providerId?: string;
-};
-
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum AddAccountCreditDialogResultType {
-  Closed = "closed",
-  Submitted = "submitted",
-}
-
-export const openAddAccountCreditDialog = (
-  dialogService: DialogService,
-  dialogConfig: DialogConfig<AddAccountCreditDialogParams>,
-) =>
-  dialogService.open<AddAccountCreditDialogResultType, AddAccountCreditDialogParams>(
-    AddAccountCreditDialogComponent,
-    dialogConfig,
-  );
-
-type PayPalConfig = {
-  businessId?: string;
-  buttonAction?: string;
-  returnUrl?: string;
-  customField?: string;
-  subject?: string;
-};
-
-@Component({
-  templateUrl: "./add-account-credit-dialog.component.html",
-  standalone: false,
-})
-export class AddAccountCreditDialogComponent implements OnInit {
-  @ViewChild("payPalForm", { read: ElementRef, static: true }) payPalForm: ElementRef;
-  protected formGroup = new FormGroup({
-    paymentMethod: new FormControl<PaymentMethodType>(PaymentMethodType.PayPal),
-    creditAmount: new FormControl<number>(null, [Validators.required, Validators.min(0.01)]),
-  });
-  protected payPalConfig: PayPalConfig;
-  protected ResultType = AddAccountCreditDialogResultType;
-
-  private organization?: Organization;
-  private provider?: Provider;
-  private user?: { id: UserId } & AccountInfo;
-
-  constructor(
-    private accountService: AccountService,
-    private apiService: ApiService,
-    private configService: ConfigService,
-    @Inject(DIALOG_DATA) private dialogParams: AddAccountCreditDialogParams,
-    private dialogRef: DialogRef<AddAccountCreditDialogResultType>,
-    private organizationService: OrganizationService,
-    private platformUtilsService: PlatformUtilsService,
-    private providerService: ProviderService,
-  ) {
-    this.payPalConfig = process.env.PAYPAL_CONFIG as PayPalConfig;
-  }
-
-  protected readonly paymentMethodType = PaymentMethodType;
-
-  submit = async () => {
-    this.formGroup.markAllAsTouched();
-
-    if (this.formGroup.invalid) {
-      return;
-    }
-
-    if (this.formGroup.value.paymentMethod === PaymentMethodType.PayPal) {
-      this.payPalForm.nativeElement.submit();
-      return;
-    }
-
-    if (this.formGroup.value.paymentMethod === PaymentMethodType.BitPay) {
-      const request = this.getBitPayInvoiceRequest();
-      const bitPayUrl = await this.apiService.postBitPayInvoice(request);
-      this.platformUtilsService.launchUri(bitPayUrl);
-      return;
-    }
-
-    this.dialogRef.close(AddAccountCreditDialogResultType.Submitted);
-  };
-
-  async ngOnInit(): Promise<void> {
-    let payPalCustomField: string;
-
-    if (this.dialogParams.organizationId) {
-      this.formGroup.patchValue({
-        creditAmount: 20.0,
-      });
-      this.user = await firstValueFrom(this.accountService.activeAccount$);
-      this.organization = await firstValueFrom(
-        this.organizationService
-          .organizations$(this.user.id)
-          .pipe(
-            map((organizations) =>
-              organizations.find((org) => org.id === this.dialogParams.organizationId),
-            ),
-          ),
-      );
-      payPalCustomField = "organization_id:" + this.organization.id;
-      this.payPalConfig.subject = this.organization.name;
-    } else if (this.dialogParams.providerId) {
-      this.formGroup.patchValue({
-        creditAmount: 20.0,
-      });
-      this.provider = await firstValueFrom(
-        this.providerService.get$(this.dialogParams.providerId, this.user.id),
-      );
-      payPalCustomField = "provider_id:" + this.provider.id;
-      this.payPalConfig.subject = this.provider.name;
-    } else {
-      this.formGroup.patchValue({
-        creditAmount: 10.0,
-      });
-      payPalCustomField = "user_id:" + this.user.id;
-      this.payPalConfig.subject = this.user.email;
-    }
-
-    const region = await firstValueFrom(this.configService.cloudRegion$);
-
-    payPalCustomField += ",account_credit:1";
-    payPalCustomField += `,region:${region}`;
-
-    this.payPalConfig.customField = payPalCustomField;
-    this.payPalConfig.returnUrl = window.location.href;
-  }
-
-  getBitPayInvoiceRequest(): BitPayInvoiceRequest {
-    const request = new BitPayInvoiceRequest();
-    if (this.organization) {
-      request.name = this.organization.name;
-      request.organizationId = this.organization.id;
-    } else if (this.provider) {
-      request.name = this.provider.name;
-      request.providerId = this.provider.id;
-    } else {
-      request.email = this.user.email;
-      request.userId = this.user.id;
-    }
-
-    request.credit = true;
-    request.amount = this.formGroup.value.creditAmount;
-    request.returnUrl = window.location.href;
-
-    return request;
-  }
-}
diff --git a/libs/angular/src/billing/components/index.ts b/libs/angular/src/billing/components/index.ts
index dacb5b265bd..574ed01e073 100644
--- a/libs/angular/src/billing/components/index.ts
+++ b/libs/angular/src/billing/components/index.ts
@@ -1,5 +1,2 @@
-export * from "./add-account-credit-dialog/add-account-credit-dialog.component";
-export * from "./invoices/invoices.component";
-export * from "./invoices/no-invoices.component";
-export * from "./manage-tax-information/manage-tax-information.component";
 export * from "./premium.component";
+export * from "./premium-upgrade-dialog/premium-upgrade-dialog.component";
diff --git a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html
deleted file mode 100644
index 391765251b0..00000000000
--- a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<form [formGroup]="formGroup" [bitSubmit]="submit">
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-    <div class="tw-col-span-6">
-      <bit-form-field disableMargin>
-        <bit-label>{{ "country" | i18n }}</bit-label>
-        <bit-select formControlName="country" data-testid="country">
-          <bit-option
-            *ngFor="let country of countries"
-            [value]="country.value"
-            [disabled]="country.disabled"
-            [label]="country.name"
-          ></bit-option>
-        </bit-select>
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field disableMargin>
-        <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="text"
-          formControlName="postalCode"
-          autocomplete="postal-code"
-          data-testid="postal-code"
-        />
-      </bit-form-field>
-    </div>
-    <ng-container *ngIf="isTaxSupported">
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "address1" | i18n }}</bit-label>
-          <input
-            bitInput
-            type="text"
-            formControlName="line1"
-            autocomplete="address-line1"
-            data-testid="address-line1"
-          />
-        </bit-form-field>
-      </div>
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "address2" | i18n }}</bit-label>
-          <input
-            bitInput
-            type="text"
-            formControlName="line2"
-            autocomplete="address-line2"
-            data-testid="address-line2"
-          />
-        </bit-form-field>
-      </div>
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "cityTown" | i18n }}</bit-label>
-          <input
-            bitInput
-            type="text"
-            formControlName="city"
-            autocomplete="address-level2"
-            data-testid="city"
-          />
-        </bit-form-field>
-      </div>
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "stateProvince" | i18n }}</bit-label>
-          <input
-            bitInput
-            type="text"
-            formControlName="state"
-            autocomplete="address-level1"
-            data-testid="state"
-          />
-        </bit-form-field>
-      </div>
-      <div class="tw-col-span-6" *ngIf="showTaxIdField">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
-          <input bitInput type="text" formControlName="taxId" data-testid="tax-id" />
-        </bit-form-field>
-      </div>
-    </ng-container>
-    <div class="tw-col-span-12" *ngIf="!!onSubmit">
-      <button bitButton bitFormButton buttonType="primary" type="submit">
-        {{ "submit" | i18n }}
-      </button>
-    </div>
-  </div>
-</form>
diff --git a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.spec.ts b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.spec.ts
deleted file mode 100644
index c662e20b275..00000000000
--- a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.spec.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { SimpleChange } from "@angular/core";
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { ReactiveFormsModule } from "@angular/forms";
-import { mock, MockProxy } from "jest-mock-extended";
-
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { SelectModule, FormFieldModule, BitSubmitDirective } from "@bitwarden/components";
-import { I18nPipe } from "@bitwarden/ui-common";
-
-import { ManageTaxInformationComponent } from "./manage-tax-information.component";
-
-describe("ManageTaxInformationComponent", () => {
-  let sut: ManageTaxInformationComponent;
-  let fixture: ComponentFixture<ManageTaxInformationComponent>;
-  let mockTaxService: MockProxy<TaxServiceAbstraction>;
-
-  beforeEach(async () => {
-    mockTaxService = mock();
-    await TestBed.configureTestingModule({
-      declarations: [ManageTaxInformationComponent],
-      providers: [
-        { provide: TaxServiceAbstraction, useValue: mockTaxService },
-        { provide: I18nService, useValue: { t: (key: string) => key } },
-      ],
-      imports: [
-        CommonModule,
-        ReactiveFormsModule,
-        SelectModule,
-        FormFieldModule,
-        BitSubmitDirective,
-        I18nPipe,
-      ],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ManageTaxInformationComponent);
-    sut = fixture.componentInstance;
-    fixture.autoDetectChanges();
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("creates successfully", () => {
-    expect(sut).toBeTruthy();
-  });
-
-  it("should initialize with all values empty in startWith", async () => {
-    // Arrange
-    sut.startWith = {
-      country: "",
-      postalCode: "",
-      taxId: "",
-      line1: "",
-      line2: "",
-      city: "",
-      state: "",
-    };
-
-    // Act
-    fixture.detectChanges();
-
-    // Assert
-    const startWithValue = sut.startWith;
-    expect(startWithValue.line1).toHaveLength(0);
-    expect(startWithValue.line2).toHaveLength(0);
-    expect(startWithValue.city).toHaveLength(0);
-    expect(startWithValue.state).toHaveLength(0);
-    expect(startWithValue.postalCode).toHaveLength(0);
-    expect(startWithValue.country).toHaveLength(0);
-    expect(startWithValue.taxId).toHaveLength(0);
-  });
-
-  it("should update the tax information protected state when form is updated", async () => {
-    // Arrange
-    const line1Value = "123 Street";
-    const line2Value = "Apt. 5";
-    const cityValue = "New York";
-    const stateValue = "NY";
-    const countryValue = "USA";
-    const postalCodeValue = "123 Street";
-
-    sut.startWith = {
-      country: countryValue,
-      postalCode: "",
-      taxId: "",
-      line1: "",
-      line2: "",
-      city: "",
-      state: "",
-    };
-    sut.showTaxIdField = false;
-    mockTaxService.isCountrySupported.mockResolvedValue(true);
-
-    // Act
-    await sut.ngOnInit();
-    fixture.detectChanges();
-
-    const line1: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='line1']",
-    );
-    const line2: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='line2']",
-    );
-    const city: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='city']",
-    );
-    const state: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='state']",
-    );
-    const postalCode: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='postalCode']",
-    );
-
-    line1.value = line1Value;
-    line2.value = line2Value;
-    city.value = cityValue;
-    state.value = stateValue;
-    postalCode.value = postalCodeValue;
-
-    line1.dispatchEvent(new Event("input"));
-    line2.dispatchEvent(new Event("input"));
-    city.dispatchEvent(new Event("input"));
-    state.dispatchEvent(new Event("input"));
-    postalCode.dispatchEvent(new Event("input"));
-    await fixture.whenStable();
-
-    // Assert
-
-    // Assert that the internal tax information reflects the form
-    const taxInformation = sut.getTaxInformation();
-    expect(taxInformation.line1).toBe(line1Value);
-    expect(taxInformation.line2).toBe(line2Value);
-    expect(taxInformation.city).toBe(cityValue);
-    expect(taxInformation.state).toBe(stateValue);
-    expect(taxInformation.postalCode).toBe(postalCodeValue);
-    expect(taxInformation.country).toBe(countryValue);
-    expect(taxInformation.taxId).toHaveLength(0);
-
-    expect(mockTaxService.isCountrySupported).toHaveBeenCalledWith(countryValue);
-    expect(mockTaxService.isCountrySupported).toHaveBeenCalledTimes(2);
-  });
-
-  it("should not show address fields except postal code if country is not supported for taxes", async () => {
-    // Arrange
-    const countryValue = "UNKNOWN";
-    sut.startWith = {
-      country: countryValue,
-      postalCode: "",
-      taxId: "",
-      line1: "",
-      line2: "",
-      city: "",
-      state: "",
-    };
-    sut.showTaxIdField = false;
-    mockTaxService.isCountrySupported.mockResolvedValue(false);
-
-    // Act
-    await sut.ngOnInit();
-    fixture.detectChanges();
-
-    const line1: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='line1']",
-    );
-    const line2: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='line2']",
-    );
-    const city: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='city']",
-    );
-    const state: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='state']",
-    );
-    const postalCode: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='postalCode']",
-    );
-
-    // Assert
-    expect(line1).toBeNull();
-    expect(line2).toBeNull();
-    expect(city).toBeNull();
-    expect(state).toBeNull();
-    //Should be visible
-    expect(postalCode).toBeTruthy();
-
-    expect(mockTaxService.isCountrySupported).toHaveBeenCalledWith(countryValue);
-    expect(mockTaxService.isCountrySupported).toHaveBeenCalledTimes(1);
-  });
-
-  it("should not show the tax id field if showTaxIdField is set to false", async () => {
-    // Arrange
-    const countryValue = "USA";
-    sut.startWith = {
-      country: countryValue,
-      postalCode: "",
-      taxId: "",
-      line1: "",
-      line2: "",
-      city: "",
-      state: "",
-    };
-
-    sut.showTaxIdField = false;
-    mockTaxService.isCountrySupported.mockResolvedValue(true);
-
-    // Act
-    await sut.ngOnInit();
-    fixture.detectChanges();
-
-    // Assert
-    const taxId: HTMLInputElement = fixture.nativeElement.querySelector(
-      "input[formControlName='taxId']",
-    );
-    expect(taxId).toBeNull();
-
-    expect(mockTaxService.isCountrySupported).toHaveBeenCalledWith(countryValue);
-    expect(mockTaxService.isCountrySupported).toHaveBeenCalledTimes(1);
-  });
-
-  it("should clear the tax id field if showTaxIdField is set to false after being true", async () => {
-    // Arrange
-    const countryValue = "USA";
-    const taxIdValue = "A12345678";
-
-    sut.startWith = {
-      country: countryValue,
-      postalCode: "",
-      taxId: taxIdValue,
-      line1: "",
-      line2: "",
-      city: "",
-      state: "",
-    };
-    sut.showTaxIdField = true;
-
-    mockTaxService.isCountrySupported.mockResolvedValue(true);
-    await sut.ngOnInit();
-    fixture.detectChanges();
-    const initialTaxIdValue = fixture.nativeElement.querySelector(
-      "input[formControlName='taxId']",
-    ).value;
-
-    // Act
-    sut.showTaxIdField = false;
-    sut.ngOnChanges({ showTaxIdField: new SimpleChange(true, false, false) });
-    fixture.detectChanges();
-
-    // Assert
-    const taxId = fixture.nativeElement.querySelector("input[formControlName='taxId']");
-    expect(taxId).toBeNull();
-
-    const taxInformation = sut.getTaxInformation();
-    expect(taxInformation.taxId).toBeNull();
-    expect(initialTaxIdValue).toEqual(taxIdValue);
-
-    expect(mockTaxService.isCountrySupported).toHaveBeenCalledWith(countryValue);
-    expect(mockTaxService.isCountrySupported).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
deleted file mode 100644
index 0b87f3f931d..00000000000
--- a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import {
-  Component,
-  EventEmitter,
-  Input,
-  OnChanges,
-  OnDestroy,
-  OnInit,
-  Output,
-  SimpleChanges,
-} from "@angular/core";
-import { FormBuilder, Validators } from "@angular/forms";
-import { Subject, takeUntil } from "rxjs";
-import { debounceTime } from "rxjs/operators";
-
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { CountryListItem, TaxInformation } from "@bitwarden/common/billing/models/domain";
-
-@Component({
-  selector: "app-manage-tax-information",
-  templateUrl: "./manage-tax-information.component.html",
-  standalone: false,
-})
-export class ManageTaxInformationComponent implements OnInit, OnDestroy, OnChanges {
-  @Input() startWith: TaxInformation;
-  @Input() onSubmit?: (taxInformation: TaxInformation) => Promise<void>;
-  @Input() showTaxIdField: boolean = true;
-
-  /**
-   * Emits when the tax information has changed.
-   */
-  @Output() taxInformationChanged = new EventEmitter<TaxInformation>();
-
-  /**
-   * Emits when the tax information has been updated.
-   */
-  @Output() taxInformationUpdated = new EventEmitter();
-
-  private taxInformation: TaxInformation;
-
-  protected formGroup = this.formBuilder.group({
-    country: ["", Validators.required],
-    postalCode: ["", Validators.required],
-    taxId: "",
-    line1: "",
-    line2: "",
-    city: "",
-    state: "",
-  });
-
-  protected isTaxSupported: boolean;
-
-  private destroy$ = new Subject<void>();
-
-  protected readonly countries: CountryListItem[] = this.taxService.getCountries();
-
-  constructor(
-    private formBuilder: FormBuilder,
-    private taxService: TaxServiceAbstraction,
-  ) {}
-
-  getTaxInformation(): TaxInformation {
-    return this.taxInformation;
-  }
-
-  submit = async () => {
-    this.markAllAsTouched();
-    if (this.formGroup.invalid) {
-      return;
-    }
-    await this.onSubmit?.(this.taxInformation);
-    this.taxInformationUpdated.emit();
-  };
-
-  validate(): boolean {
-    this.markAllAsTouched();
-    return this.formGroup.valid;
-  }
-
-  markAllAsTouched() {
-    this.formGroup.markAllAsTouched();
-  }
-
-  async ngOnInit() {
-    this.formGroup.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((values) => {
-      this.taxInformation = {
-        country: values.country,
-        postalCode: values.postalCode,
-        taxId: values.taxId,
-        line1: values.line1,
-        line2: values.line2,
-        city: values.city,
-        state: values.state,
-      };
-    });
-
-    if (this.startWith) {
-      this.formGroup.controls.country.setValue(this.startWith.country);
-      this.formGroup.controls.postalCode.setValue(this.startWith.postalCode);
-
-      this.isTaxSupported =
-        this.startWith && this.startWith.country
-          ? await this.taxService.isCountrySupported(this.startWith.country)
-          : false;
-
-      if (this.isTaxSupported) {
-        this.formGroup.controls.taxId.setValue(this.startWith.taxId);
-        this.formGroup.controls.line1.setValue(this.startWith.line1);
-        this.formGroup.controls.line2.setValue(this.startWith.line2);
-        this.formGroup.controls.city.setValue(this.startWith.city);
-        this.formGroup.controls.state.setValue(this.startWith.state);
-      }
-    }
-
-    this.formGroup.controls.country.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe((country: string) => {
-        this.taxService
-          .isCountrySupported(country)
-          .then((isSupported) => (this.isTaxSupported = isSupported))
-          .catch(() => (this.isTaxSupported = false))
-          .finally(() => {
-            if (!this.isTaxSupported) {
-              this.formGroup.controls.taxId.setValue(null);
-              this.formGroup.controls.line1.setValue(null);
-              this.formGroup.controls.line2.setValue(null);
-              this.formGroup.controls.city.setValue(null);
-              this.formGroup.controls.state.setValue(null);
-            }
-            if (this.taxInformationChanged) {
-              this.taxInformationChanged.emit(this.taxInformation);
-            }
-          });
-      });
-
-    this.formGroup.controls.postalCode.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        if (this.taxInformationChanged) {
-          this.taxInformationChanged.emit(this.taxInformation);
-        }
-      });
-
-    this.formGroup.controls.taxId.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        if (this.taxInformationChanged) {
-          this.taxInformationChanged.emit(this.taxInformation);
-        }
-      });
-  }
-
-  ngOnChanges(changes: SimpleChanges): void {
-    // Clear the value of the tax-id if states have been changed in the parent component
-    const showTaxIdField = changes["showTaxIdField"];
-    if (showTaxIdField && !showTaxIdField.currentValue) {
-      this.formGroup.controls.taxId.setValue(null);
-    }
-  }
-
-  ngOnDestroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-}
diff --git a/libs/angular/src/billing/components/premium-badge/premium-badge.component.ts b/libs/angular/src/billing/components/premium-badge/premium-badge.component.ts
index a4a1d76d1d6..8890584186d 100644
--- a/libs/angular/src/billing/components/premium-badge/premium-badge.component.ts
+++ b/libs/angular/src/billing/components/premium-badge/premium-badge.component.ts
@@ -4,22 +4,32 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { BadgeModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-premium-badge",
   standalone: true,
   template: `
-    <button type="button" *appNotPremium bitBadge variant="success" (click)="promptForPremium()">
+    <button
+      type="button"
+      *appNotPremium
+      bitBadge
+      variant="success"
+      (click)="promptForPremium($event)"
+    >
       {{ "premium" | i18n }}
     </button>
   `,
   imports: [BadgeModule, JslibModule],
 })
 export class PremiumBadgeComponent {
-  organizationId = input<string>();
+  readonly organizationId = input<string>();
 
   constructor(private premiumUpgradePromptService: PremiumUpgradePromptService) {}
 
-  async promptForPremium() {
+  async promptForPremium(event: Event) {
+    event.stopPropagation();
+    event.preventDefault();
     await this.premiumUpgradePromptService.promptForPremium(this.organizationId());
   }
 }
diff --git a/libs/angular/src/billing/components/premium-badge/premium-badge.stories.ts b/libs/angular/src/billing/components/premium-badge/premium-badge.stories.ts
index 08259358f30..bf50d16d3c4 100644
--- a/libs/angular/src/billing/components/premium-badge/premium-badge.stories.ts
+++ b/libs/angular/src/billing/components/premium-badge/premium-badge.stories.ts
@@ -5,18 +5,11 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { MessageSender } from "@bitwarden/common/platform/messaging";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { BadgeModule, I18nMockService } from "@bitwarden/components";
 
 import { PremiumBadgeComponent } from "./premium-badge.component";
 
-class MockMessagingService implements MessageSender {
-  send = () => {
-    alert("Clicked on badge");
-  };
-}
-
 export default {
   title: "Billing/Premium Badge",
   component: PremiumBadgeComponent,
@@ -40,12 +33,6 @@ export default {
             });
           },
         },
-        {
-          provide: MessageSender,
-          useFactory: () => {
-            return new MockMessagingService();
-          },
-        },
         {
           provide: BillingAccountProfileStateService,
           useValue: {
diff --git a/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.html b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.html
new file mode 100644
index 00000000000..3b89d7cf56a
--- /dev/null
+++ b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.html
@@ -0,0 +1,98 @@
+@if (cardDetails$ | async; as cardDetails) {
+  <section
+    class="tw-min-w-[332px] md:tw-max-w-sm tw-overflow-y-auto tw-self-center tw-bg-background tw-rounded-xl tw-shadow-lg tw-border-secondary-100 tw-border-solid tw-border"
+    cdkTrapFocus
+    cdkTrapFocusAutoCapture
+  >
+    <header
+      class="tw-flex tw-items-center tw-justify-end tw-pl-6 tw-pt-3 tw-pr-2 !tw-bg-background !tw-border-none"
+    >
+      <button
+        type="button"
+        bitIconButton="bwi-close"
+        buttonType="main"
+        size="default"
+        [label]="'close' | i18n"
+        (click)="close()"
+      ></button>
+    </header>
+    <div class="tw-flex tw-justify-center tw-mb-6">
+      <div
+        class="tw-box-border tw-bg-background tw-text-main tw-size-full tw-flex tw-flex-col tw-px-8 tw-pb-2 tw-w-full tw-max-w-md"
+      >
+        <div class="tw-flex tw-items-center tw-justify-between tw-mb-2">
+          <h3 slot="title" class="tw-m-0" bitTypography="h3">
+            {{ "upgradeToPremium" | i18n }}
+          </h3>
+        </div>
+
+        <!-- Tagline with consistent height (exactly 2 lines) -->
+        <div class="tw-mb-6 tw-h-6">
+          <p bitTypography="helper" class="tw-text-muted tw-m-0 tw-leading-relaxed tw-line-clamp-2">
+            {{ cardDetails.tagline }}
+          </p>
+        </div>
+
+        <!-- Price Section -->
+        <div class="tw-mb-6">
+          <div class="tw-flex tw-items-baseline tw-gap-1 tw-flex-wrap">
+            <span class="tw-text-3xl tw-font-medium tw-leading-none tw-m-0">{{
+              cardDetails.price.amount | currency: "$"
+            }}</span>
+            <span bitTypography="helper" class="tw-text-muted">
+              / {{ cardDetails.price.cadence | i18n }}
+            </span>
+          </div>
+        </div>
+
+        <!-- Button space (always reserved) -->
+        <div class="tw-mb-6 tw-h-12">
+          <button
+            bitButton
+            [buttonType]="cardDetails.button.type"
+            [block]="true"
+            (click)="upgrade()"
+            type="button"
+          >
+            @if (cardDetails.button.icon?.position === "before") {
+              <i class="bwi {{ cardDetails.button.icon.type }} tw-me-2" aria-hidden="true"></i>
+            }
+            {{ cardDetails.button.text }}
+            @if (
+              cardDetails.button.icon &&
+              (cardDetails.button.icon.position === "after" || !cardDetails.button.icon.position)
+            ) {
+              <i class="bwi {{ cardDetails.button.icon.type }} tw-ms-2" aria-hidden="true"></i>
+            }
+          </button>
+        </div>
+
+        <!-- Features List -->
+        <div class="tw-flex-grow">
+          @if (cardDetails.features.length > 0) {
+            <ul class="tw-list-none tw-p-0 tw-m-0">
+              @for (feature of cardDetails.features; track feature) {
+                <li class="tw-flex tw-items-start tw-gap-2 tw-mb-2 last:tw-mb-0">
+                  <i
+                    class="bwi bwi-check tw-text-primary-600 tw-mt-0.5 tw-flex-shrink-0"
+                    aria-hidden="true"
+                  ></i>
+                  <span bitTypography="helper" class="tw-text-muted tw-leading-relaxed">{{
+                    feature
+                  }}</span>
+                </li>
+              }
+            </ul>
+          }
+        </div>
+      </div>
+    </div>
+  </section>
+} @else {
+  <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>
+}
diff --git a/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.spec.ts b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.spec.ts
new file mode 100644
index 00000000000..107eb068e76
--- /dev/null
+++ b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.spec.ts
@@ -0,0 +1,207 @@
+import { CdkTrapFocus } from "@angular/cdk/a11y";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { firstValueFrom, of, throwError } from "rxjs";
+
+import { SubscriptionPricingServiceAbstraction } from "@bitwarden/common/billing/abstractions/subscription-pricing.service.abstraction";
+import {
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierIds,
+  SubscriptionCadenceIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import {
+  EnvironmentService,
+  Region,
+} from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { DialogRef, ToastService } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+
+import { PremiumUpgradeDialogComponent } from "./premium-upgrade-dialog.component";
+
+describe("PremiumUpgradeDialogComponent", () => {
+  let component: PremiumUpgradeDialogComponent;
+  let fixture: ComponentFixture<PremiumUpgradeDialogComponent>;
+  let mockDialogRef: jest.Mocked<DialogRef>;
+  let mockSubscriptionPricingService: jest.Mocked<SubscriptionPricingServiceAbstraction>;
+  let mockI18nService: jest.Mocked<I18nService>;
+  let mockToastService: jest.Mocked<ToastService>;
+  let mockEnvironmentService: jest.Mocked<EnvironmentService>;
+  let mockPlatformUtilsService: jest.Mocked<PlatformUtilsService>;
+  let mockLogService: jest.Mocked<LogService>;
+
+  const mockPremiumTier: PersonalSubscriptionPricingTier = {
+    id: PersonalSubscriptionPricingTierIds.Premium,
+    name: "Premium",
+    description: "Advanced features for power users",
+    availableCadences: [SubscriptionCadenceIds.Annually],
+    passwordManager: {
+      type: "standalone",
+      annualPrice: 10,
+      annualPricePerAdditionalStorageGB: 4,
+      features: [
+        { key: "feature1", value: "Feature 1" },
+        { key: "feature2", value: "Feature 2" },
+        { key: "feature3", value: "Feature 3" },
+      ],
+    },
+  };
+
+  const mockFamiliesTier: PersonalSubscriptionPricingTier = {
+    id: PersonalSubscriptionPricingTierIds.Families,
+    name: "Families",
+    description: "Family plan",
+    availableCadences: [SubscriptionCadenceIds.Annually],
+    passwordManager: {
+      type: "packaged",
+      users: 6,
+      annualPrice: 40,
+      annualPricePerAdditionalStorageGB: 4,
+      features: [{ key: "featureA", value: "Feature A" }],
+    },
+  };
+
+  beforeEach(async () => {
+    mockDialogRef = {
+      close: jest.fn(),
+    } as any;
+
+    mockSubscriptionPricingService = {
+      getPersonalSubscriptionPricingTiers$: jest.fn(),
+    } as any;
+
+    mockI18nService = {
+      t: jest.fn((key: string) => key),
+    } as any;
+
+    mockToastService = {
+      showToast: jest.fn(),
+    } as any;
+
+    mockEnvironmentService = {
+      environment$: of({
+        getWebVaultUrl: () => "https://vault.bitwarden.com",
+        getRegion: () => Region.US,
+      }),
+    } as any;
+
+    mockPlatformUtilsService = {
+      launchUri: jest.fn(),
+    } as any;
+
+    mockSubscriptionPricingService.getPersonalSubscriptionPricingTiers$.mockReturnValue(
+      of([mockPremiumTier, mockFamiliesTier]),
+    );
+
+    mockLogService = {
+      error: jest.fn(),
+    } as any;
+
+    await TestBed.configureTestingModule({
+      imports: [NoopAnimationsModule, PremiumUpgradeDialogComponent, CdkTrapFocus],
+      providers: [
+        { provide: DialogRef, useValue: mockDialogRef },
+        {
+          provide: SubscriptionPricingServiceAbstraction,
+          useValue: mockSubscriptionPricingService,
+        },
+        { provide: I18nService, useValue: mockI18nService },
+        { provide: ToastService, useValue: mockToastService },
+        { provide: EnvironmentService, useValue: mockEnvironmentService },
+        { provide: PlatformUtilsService, useValue: mockPlatformUtilsService },
+        { provide: LogService, useValue: mockLogService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(PremiumUpgradeDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  it("should emit cardDetails$ observable with Premium tier data", async () => {
+    const cardDetails = await firstValueFrom(component["cardDetails$"]);
+
+    expect(mockSubscriptionPricingService.getPersonalSubscriptionPricingTiers$).toHaveBeenCalled();
+    expect(cardDetails).toBeDefined();
+    expect(cardDetails?.title).toBe("Premium");
+  });
+
+  it("should filter to Premium tier only", async () => {
+    const cardDetails = await firstValueFrom(component["cardDetails$"]);
+
+    expect(cardDetails?.title).toBe("Premium");
+    expect(cardDetails?.title).not.toBe("Families");
+  });
+
+  it("should map Premium tier to card details correctly", async () => {
+    const cardDetails = await firstValueFrom(component["cardDetails$"]);
+
+    expect(cardDetails?.title).toBe("Premium");
+    expect(cardDetails?.tagline).toBe("Advanced features for power users");
+    expect(cardDetails?.price.amount).toBe(10 / 12);
+    expect(cardDetails?.price.cadence).toBe("monthly");
+    expect(cardDetails?.button.text).toBe("upgradeNow");
+    expect(cardDetails?.button.type).toBe("primary");
+    expect(cardDetails?.features).toEqual(["Feature 1", "Feature 2", "Feature 3"]);
+  });
+
+  it("should use i18nService for button text", async () => {
+    const cardDetails = await firstValueFrom(component["cardDetails$"]);
+
+    expect(mockI18nService.t).toHaveBeenCalledWith("upgradeNow");
+    expect(cardDetails?.button.text).toBe("upgradeNow");
+  });
+
+  describe("upgrade()", () => {
+    it("should launch URI with query parameter", async () => {
+      await component["upgrade"]();
+
+      expect(mockPlatformUtilsService.launchUri).toHaveBeenCalledWith(
+        "https://vault.bitwarden.com/#/settings/subscription/premium?callToAction=upgradeToPremium",
+      );
+      expect(mockDialogRef.close).toHaveBeenCalled();
+    });
+  });
+
+  it("should close dialog when close button clicked", () => {
+    component["close"]();
+
+    expect(mockDialogRef.close).toHaveBeenCalled();
+  });
+
+  describe("error handling", () => {
+    it("should show error toast and return EMPTY and close dialog when getPersonalSubscriptionPricingTiers$ throws an error", (done) => {
+      const error = new Error("Service error");
+      mockSubscriptionPricingService.getPersonalSubscriptionPricingTiers$.mockReturnValue(
+        throwError(() => error),
+      );
+
+      const errorFixture = TestBed.createComponent(PremiumUpgradeDialogComponent);
+      const errorComponent = errorFixture.componentInstance;
+      errorFixture.detectChanges();
+
+      const cardDetails$ = errorComponent["cardDetails$"];
+
+      cardDetails$.subscribe({
+        next: () => {
+          done.fail("Observable should not emit any values");
+        },
+        complete: () => {
+          expect(mockToastService.showToast).toHaveBeenCalledWith({
+            variant: "error",
+            title: "error",
+            message: "unexpectedError",
+          });
+          expect(mockDialogRef.close).toHaveBeenCalled();
+          done();
+        },
+        error: (err: unknown) => done.fail(`Observable should not error: ${err}`),
+      });
+    });
+  });
+});
diff --git a/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.stories.ts b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.stories.ts
new file mode 100644
index 00000000000..7ba09192d3c
--- /dev/null
+++ b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.stories.ts
@@ -0,0 +1,117 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+import { of } from "rxjs";
+
+import { SubscriptionPricingServiceAbstraction } from "@bitwarden/common/billing/abstractions/subscription-pricing.service.abstraction";
+import {
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierIds,
+  SubscriptionCadenceIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  ButtonModule,
+  DialogModule,
+  DialogRef,
+  ToastOptions,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+
+import { PremiumUpgradeDialogComponent } from "./premium-upgrade-dialog.component";
+
+const mockPremiumTier: PersonalSubscriptionPricingTier = {
+  id: PersonalSubscriptionPricingTierIds.Premium,
+  name: "Premium",
+  description: "Complete online security",
+  availableCadences: [SubscriptionCadenceIds.Annually],
+  passwordManager: {
+    type: "standalone",
+    annualPrice: 10,
+    annualPricePerAdditionalStorageGB: 4,
+    features: [
+      { key: "builtInAuthenticator", value: "Built-in authenticator" },
+      { key: "secureFileStorage", value: "Secure file storage" },
+      { key: "emergencyAccess", value: "Emergency access" },
+      { key: "breachMonitoring", value: "Breach monitoring" },
+      { key: "andMoreFeatures", value: "And more!" },
+    ],
+  },
+};
+
+export default {
+  title: "Billing/Premium Upgrade Dialog",
+  component: PremiumUpgradeDialogComponent,
+  description: "A dialog for upgrading to Premium subscription",
+  decorators: [
+    moduleMetadata({
+      imports: [DialogModule, ButtonModule, TypographyModule],
+      providers: [
+        {
+          provide: DialogRef,
+          useValue: {
+            close: () => {},
+          },
+        },
+        {
+          provide: SubscriptionPricingServiceAbstraction,
+          useValue: {
+            getPersonalSubscriptionPricingTiers$: () => of([mockPremiumTier]),
+          },
+        },
+        {
+          provide: ToastService,
+          useValue: {
+            showToast: (options: ToastOptions) => {},
+          },
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {
+            cloudWebVaultUrl$: of("https://vault.bitwarden.com"),
+          },
+        },
+        {
+          provide: PlatformUtilsService,
+          useValue: {
+            launchUri: (uri: string) => {},
+          },
+        },
+        {
+          provide: I18nService,
+          useValue: {
+            t: (key: string) => {
+              switch (key) {
+                case "upgradeNow":
+                  return "Upgrade Now";
+                case "month":
+                  return "month";
+                case "upgradeToPremium":
+                  return "Upgrade To Premium";
+                default:
+                  return key;
+              }
+            },
+          },
+        },
+        {
+          provide: LogService,
+          useValue: {
+            error: {},
+          },
+        },
+      ],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/nuFrzHsgEoEk2Sm8fWOGuS/Premium---business-upgrade-flows?node-id=931-17785&t=xOhvwjYLpjoMPgND-1",
+    },
+  },
+} as Meta<PremiumUpgradeDialogComponent>;
+
+type Story = StoryObj<PremiumUpgradeDialogComponent>;
+export const Default: Story = {};
diff --git a/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.ts b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.ts
new file mode 100644
index 00000000000..ea9def03bd2
--- /dev/null
+++ b/libs/angular/src/billing/components/premium-upgrade-dialog/premium-upgrade-dialog.component.ts
@@ -0,0 +1,122 @@
+import { CdkTrapFocus } from "@angular/cdk/a11y";
+import { CommonModule } from "@angular/common";
+import { ChangeDetectionStrategy, Component } from "@angular/core";
+import { catchError, EMPTY, firstValueFrom, map, Observable } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { SubscriptionPricingServiceAbstraction } from "@bitwarden/common/billing/abstractions/subscription-pricing.service.abstraction";
+import {
+  PersonalSubscriptionPricingTier,
+  PersonalSubscriptionPricingTierIds,
+  SubscriptionCadence,
+  SubscriptionCadenceIds,
+} from "@bitwarden/common/billing/types/subscription-pricing-tier";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  ButtonModule,
+  ButtonType,
+  CenterPositionStrategy,
+  DialogModule,
+  DialogRef,
+  DialogService,
+  IconButtonModule,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+
+type CardDetails = {
+  title: string;
+  tagline: string;
+  price: { amount: number; cadence: SubscriptionCadence };
+  button: { text: string; type: ButtonType; icon?: { type: string; position: "before" | "after" } };
+  features: string[];
+};
+
+@Component({
+  selector: "billing-premium-upgrade-dialog",
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    CommonModule,
+    DialogModule,
+    ButtonModule,
+    IconButtonModule,
+    TypographyModule,
+    CdkTrapFocus,
+    JslibModule,
+  ],
+  templateUrl: "./premium-upgrade-dialog.component.html",
+})
+export class PremiumUpgradeDialogComponent {
+  protected cardDetails$: Observable<CardDetails | null> = this.subscriptionPricingService
+    .getPersonalSubscriptionPricingTiers$()
+    .pipe(
+      map((tiers) => tiers.find((tier) => tier.id === PersonalSubscriptionPricingTierIds.Premium)),
+      map((tier) => this.mapPremiumTierToCardDetails(tier!)),
+      catchError((error: unknown) => {
+        this.toastService.showToast({
+          variant: "error",
+          title: this.i18nService.t("error"),
+          message: this.i18nService.t("unexpectedError"),
+        });
+        this.logService.error("Error fetching and mapping pricing tiers", error);
+        this.dialogRef.close();
+        return EMPTY;
+      }),
+    );
+
+  constructor(
+    private dialogRef: DialogRef,
+    private subscriptionPricingService: SubscriptionPricingServiceAbstraction,
+    private i18nService: I18nService,
+    private toastService: ToastService,
+    private environmentService: EnvironmentService,
+    private platformUtilsService: PlatformUtilsService,
+    private logService: LogService,
+  ) {}
+
+  protected async upgrade(): Promise<void> {
+    const environment = await firstValueFrom(this.environmentService.environment$);
+    const vaultUrl =
+      environment.getWebVaultUrl() +
+      "/#/settings/subscription/premium?callToAction=upgradeToPremium";
+    this.platformUtilsService.launchUri(vaultUrl);
+    this.dialogRef.close();
+  }
+
+  protected close(): void {
+    this.dialogRef.close();
+  }
+
+  private mapPremiumTierToCardDetails(tier: PersonalSubscriptionPricingTier): CardDetails {
+    return {
+      title: tier.name,
+      tagline: tier.description,
+      price: {
+        amount: tier.passwordManager.annualPrice / 12,
+        cadence: SubscriptionCadenceIds.Monthly,
+      },
+      button: {
+        text: this.i18nService.t("upgradeNow"),
+        type: "primary",
+        icon: { type: "bwi-external-link", position: "after" },
+      },
+      features: tier.passwordManager.features.map((f) => f.value),
+    };
+  }
+
+  /**
+   * Opens the premium upgrade dialog.
+   *
+   * @param dialogService - The dialog service used to open the component
+   * @returns A dialog reference object
+   */
+  static open(dialogService: DialogService): DialogRef<PremiumUpgradeDialogComponent> {
+    return dialogService.open(PremiumUpgradeDialogComponent, {
+      positionStrategy: new CenterPositionStrategy(),
+    });
+  }
+}
diff --git a/libs/angular/src/billing/directives/not-premium.directive.ts b/libs/angular/src/billing/directives/not-premium.directive.ts
index 41d62bb773e..8582a9f4396 100644
--- a/libs/angular/src/billing/directives/not-premium.directive.ts
+++ b/libs/angular/src/billing/directives/not-premium.directive.ts
@@ -1,4 +1,5 @@
-import { Directive, OnInit, TemplateRef, ViewContainerRef } from "@angular/core";
+import { DestroyRef, Directive, OnInit, TemplateRef, ViewContainerRef } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -16,6 +17,7 @@ export class NotPremiumDirective implements OnInit {
     private templateRef: TemplateRef<any>,
     private viewContainer: ViewContainerRef,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
+    private destroyRef: DestroyRef,
     private accountService: AccountService,
   ) {}
 
@@ -27,14 +29,15 @@ export class NotPremiumDirective implements OnInit {
       return;
     }
 
-    const premium = await firstValueFrom(
-      this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
-    );
-
-    if (premium) {
-      this.viewContainer.clear();
-    } else {
-      this.viewContainer.createEmbeddedView(this.templateRef);
-    }
+    this.billingAccountProfileStateService
+      .hasPremiumFromAnySource$(account.id)
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((premium) => {
+        if (premium) {
+          this.viewContainer.clear();
+        } else {
+          this.viewContainer.createEmbeddedView(this.templateRef);
+        }
+      });
   }
 }
diff --git a/libs/angular/src/billing/services/premium-interest/noop-premium-interest-state.service.ts b/libs/angular/src/billing/services/premium-interest/noop-premium-interest-state.service.ts
new file mode 100644
index 00000000000..f941e86e0d0
--- /dev/null
+++ b/libs/angular/src/billing/services/premium-interest/noop-premium-interest-state.service.ts
@@ -0,0 +1,14 @@
+import { Injectable } from "@angular/core";
+
+import { UserId } from "@bitwarden/user-core";
+
+import { PremiumInterestStateService } from "./premium-interest-state.service.abstraction";
+
+@Injectable()
+export class NoopPremiumInterestStateService implements PremiumInterestStateService {
+  async getPremiumInterest(userId: UserId): Promise<boolean | null> {
+    return null;
+  } // no-op
+  async setPremiumInterest(userId: UserId, premiumInterest: boolean): Promise<void> {} // no-op
+  async clearPremiumInterest(userId: UserId): Promise<void> {} // no-op
+}
diff --git a/libs/angular/src/billing/services/premium-interest/premium-interest-state.service.abstraction.ts b/libs/angular/src/billing/services/premium-interest/premium-interest-state.service.abstraction.ts
new file mode 100644
index 00000000000..850560df38c
--- /dev/null
+++ b/libs/angular/src/billing/services/premium-interest/premium-interest-state.service.abstraction.ts
@@ -0,0 +1,14 @@
+import { UserId } from "@bitwarden/user-core";
+
+/**
+ * A service that manages state which conveys whether or not a user has expressed interest
+ * in setting up a premium subscription. This applies for users who began the registration
+ * process on https://bitwarden.com/go/start-premium/, which is a marketing page designed
+ * to streamline users who intend to setup a premium subscription after registration.
+ * - Implemented in Web only. No-op for other clients.
+ */
+export abstract class PremiumInterestStateService {
+  abstract getPremiumInterest(userId: UserId): Promise<boolean | null>;
+  abstract setPremiumInterest(userId: UserId, premiumInterest: boolean): Promise<void>;
+  abstract clearPremiumInterest(userId: UserId): Promise<void>;
+}
diff --git a/libs/angular/src/components/callout.component.ts b/libs/angular/src/components/callout.component.ts
index 215de49f676..9630b761076 100644
--- a/libs/angular/src/components/callout.component.ts
+++ b/libs/angular/src/components/callout.component.ts
@@ -9,17 +9,31 @@ import { CalloutTypes } from "@bitwarden/components";
 /**
  * @deprecated use the CL's `CalloutComponent` instead
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-callout",
   templateUrl: "callout.component.html",
   standalone: false,
 })
 export class DeprecatedCalloutComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() type: CalloutTypes = "info";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() icon: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() enforcedPolicyOptions: MasterPasswordPolicyOptions;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() enforcedPolicyMessage: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() useAlertRole = false;
 
   calloutStyle: string;
diff --git a/libs/angular/src/components/modal/dynamic-modal.component.ts b/libs/angular/src/components/modal/dynamic-modal.component.ts
index 77491193916..ea40dd1a877 100644
--- a/libs/angular/src/components/modal/dynamic-modal.component.ts
+++ b/libs/angular/src/components/modal/dynamic-modal.component.ts
@@ -15,6 +15,8 @@ import {
 
 import { ModalRef } from "./modal.ref";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-modal",
   template: "<ng-template #modalContent></ng-template>",
@@ -23,6 +25,8 @@ import { ModalRef } from "./modal.ref";
 export class DynamicModalComponent implements AfterViewInit, OnDestroy {
   componentRef: ComponentRef<any>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("modalContent", { read: ViewContainerRef, static: true })
   modalContentRef: ViewContainerRef;
 
diff --git a/libs/angular/src/directives/api-action.directive.ts b/libs/angular/src/directives/api-action.directive.ts
index 85ba8a7489c..6873e448589 100644
--- a/libs/angular/src/directives/api-action.directive.ts
+++ b/libs/angular/src/directives/api-action.directive.ts
@@ -18,6 +18,8 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid
   standalone: false,
 })
 export class ApiActionDirective implements OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() appApiAction: Promise<any>;
 
   constructor(
diff --git a/libs/angular/src/directives/cipherListVirtualScroll.directive.ts b/libs/angular/src/directives/cipherListVirtualScroll.directive.ts
index 442e01c1c79..8e7b5cc204d 100644
--- a/libs/angular/src/directives/cipherListVirtualScroll.directive.ts
+++ b/libs/angular/src/directives/cipherListVirtualScroll.directive.ts
@@ -45,6 +45,8 @@ export function _cipherListVirtualScrollStrategyFactory(cipherListDir: CipherLis
     },
   ],
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28232): Use Directive suffix
+// eslint-disable-next-line @angular-eslint/directive-class-suffix
 export class CipherListVirtualScroll extends CdkFixedSizeVirtualScroll {
   _scrollStrategy: CipherListVirtualScrollStrategy;
 
diff --git a/libs/angular/src/directives/copy-text.directive.ts b/libs/angular/src/directives/copy-text.directive.ts
index 0f9018e19ad..aefb26ef07e 100644
--- a/libs/angular/src/directives/copy-text.directive.ts
+++ b/libs/angular/src/directives/copy-text.directive.ts
@@ -15,6 +15,8 @@ export class CopyTextDirective {
     private platformUtilsService: PlatformUtilsService,
   ) {}
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input("appCopyText") copyText: string;
 
   @HostListener("copy") onCopy() {
diff --git a/libs/angular/src/directives/fallback-src.directive.ts b/libs/angular/src/directives/fallback-src.directive.ts
index f1225245912..b63dc8671cf 100644
--- a/libs/angular/src/directives/fallback-src.directive.ts
+++ b/libs/angular/src/directives/fallback-src.directive.ts
@@ -7,6 +7,8 @@ import { Directive, ElementRef, HostListener, Input } from "@angular/core";
   standalone: false,
 })
 export class FallbackSrcDirective {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input("appFallbackSrc") appFallbackSrc: string;
 
   /** Only try setting the fallback once. This prevents an infinite loop if the fallback itself is missing. */
diff --git a/libs/angular/src/directives/if-feature.directive.spec.ts b/libs/angular/src/directives/if-feature.directive.spec.ts
index d7c49994045..357209b0e64 100644
--- a/libs/angular/src/directives/if-feature.directive.spec.ts
+++ b/libs/angular/src/directives/if-feature.directive.spec.ts
@@ -13,6 +13,8 @@ const testBooleanFeature: FeatureFlag = "boolean-feature" as FeatureFlag;
 const testStringFeature: FeatureFlag = "string-feature" as FeatureFlag;
 const testStringFeatureValue = "test-value";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <div *appIfFeature="testBooleanFeature">
diff --git a/libs/angular/src/directives/if-feature.directive.ts b/libs/angular/src/directives/if-feature.directive.ts
index aa10c9e8081..28cf1d5c35f 100644
--- a/libs/angular/src/directives/if-feature.directive.ts
+++ b/libs/angular/src/directives/if-feature.directive.ts
@@ -20,12 +20,16 @@ export class IfFeatureDirective implements OnInit {
   /**
    * The feature flag to check.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() appIfFeature: FeatureFlag;
 
   /**
    * Optional value to compare against the value of the feature flag in the config service.
    * @default true
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() appIfFeatureValue: AllowedFeatureFlagTypes = true;
 
   private hasView = false;
diff --git a/libs/angular/src/directives/input-verbatim.directive.ts b/libs/angular/src/directives/input-verbatim.directive.ts
index 7bd18b12659..1240523d2bf 100644
--- a/libs/angular/src/directives/input-verbatim.directive.ts
+++ b/libs/angular/src/directives/input-verbatim.directive.ts
@@ -7,6 +7,8 @@ import { Directive, ElementRef, Input, OnInit, Renderer2 } from "@angular/core";
   standalone: false,
 })
 export class InputVerbatimDirective implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() set appInputVerbatim(condition: boolean | string) {
     this.disableComplete = condition === "" || condition === true;
   }
diff --git a/libs/angular/src/directives/launch-click.directive.ts b/libs/angular/src/directives/launch-click.directive.ts
index b270dbba5e3..ce44648dc37 100644
--- a/libs/angular/src/directives/launch-click.directive.ts
+++ b/libs/angular/src/directives/launch-click.directive.ts
@@ -10,6 +10,8 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 export class LaunchClickDirective {
   constructor(private platformUtilsService: PlatformUtilsService) {}
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input("appLaunchClick") uriToLaunch = "";
 
   @HostListener("click") onClick() {
diff --git a/libs/angular/src/directives/text-drag.directive.ts b/libs/angular/src/directives/text-drag.directive.ts
index 6202c552a87..aade2798dc7 100644
--- a/libs/angular/src/directives/text-drag.directive.ts
+++ b/libs/angular/src/directives/text-drag.directive.ts
@@ -8,6 +8,8 @@ import { Directive, HostListener, Input } from "@angular/core";
   },
 })
 export class TextDragDirective {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({
     alias: "appTextDrag",
     required: true,
diff --git a/libs/angular/src/directives/true-false-value.directive.ts b/libs/angular/src/directives/true-false-value.directive.ts
index 5d25ac2a385..78c1b4647c6 100644
--- a/libs/angular/src/directives/true-false-value.directive.ts
+++ b/libs/angular/src/directives/true-false-value.directive.ts
@@ -14,7 +14,11 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
   standalone: false,
 })
 export class TrueFalseValueDirective implements ControlValueAccessor {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() trueValue: boolean | string = true;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() falseValue: boolean | string = false;
 
   constructor(
diff --git a/libs/angular/src/jslib.module.ts b/libs/angular/src/jslib.module.ts
index c0bf1425d47..446530a1111 100644
--- a/libs/angular/src/jslib.module.ts
+++ b/libs/angular/src/jslib.module.ts
@@ -2,12 +2,6 @@ import { CommonModule, DatePipe } from "@angular/common";
 import { NgModule } from "@angular/core";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
-import {
-  AddAccountCreditDialogComponent,
-  InvoicesComponent,
-  NoInvoicesComponent,
-  ManageTaxInformationComponent,
-} from "@bitwarden/angular/billing/components";
 import {
   AsyncActionsModule,
   AutofocusDirective,
@@ -112,10 +106,6 @@ import { IconComponent } from "./vault/components/icon.component";
     UserTypePipe,
     IfFeatureDirective,
     FingerprintPipe,
-    AddAccountCreditDialogComponent,
-    InvoicesComponent,
-    NoInvoicesComponent,
-    ManageTaxInformationComponent,
     TwoFactorIconComponent,
   ],
   exports: [
@@ -146,10 +136,6 @@ import { IconComponent } from "./vault/components/icon.component";
     UserTypePipe,
     IfFeatureDirective,
     FingerprintPipe,
-    AddAccountCreditDialogComponent,
-    InvoicesComponent,
-    NoInvoicesComponent,
-    ManageTaxInformationComponent,
     TwoFactorIconComponent,
     TextDragDirective,
   ],
diff --git a/libs/angular/src/platform/guard/feature-flag.guard.spec.ts b/libs/angular/src/platform/guard/feature-flag.guard.spec.ts
index 3bc8b085a7d..fa6d82b49e0 100644
--- a/libs/angular/src/platform/guard/feature-flag.guard.spec.ts
+++ b/libs/angular/src/platform/guard/feature-flag.guard.spec.ts
@@ -12,6 +12,8 @@ import { I18nMockService, ToastService } from "@bitwarden/components/src";
 
 import { canAccessFeature } from "./feature-flag.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({ template: "", standalone: false })
 export class EmptyComponent {}
 
diff --git a/libs/angular/src/scss/bwicons/fonts/bwi-font.svg b/libs/angular/src/scss/bwicons/fonts/bwi-font.svg
index f6ea5d09372..cbbc8e04a37 100644
--- a/libs/angular/src/scss/bwicons/fonts/bwi-font.svg
+++ b/libs/angular/src/scss/bwicons/fonts/bwi-font.svg
@@ -23,9 +23,9 @@
 </metadata>
 <defs>
 <font id="bwi-font" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="880.64" descent="-143.36" />
+<font-face units-per-em="1024" ascent="880.8602150537635" descent="-143.13978494623655" />
 <missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#x20;" horiz-adv-x="512.5004887585533" d="" />
 <glyph unicode="&#xe900;" glyph-name="bwi-angle-down" data-tags="bwi-angle-down" d="M929.939 545.941c-18.746 18.745-49.133 18.745-67.878 0l-350.061-350.056-350.059 350.056c-18.745 18.745-49.137 18.745-67.882 0s-18.745-49.137 0-67.882l384.001-383.998c9.002-9.005 21.21-14.061 33.941-14.061s24.939 5.056 33.94 14.061l383.998 383.998c18.746 18.745 18.746 49.137 0 67.882z" />
 <glyph unicode="&#xe901;" glyph-name="bwi-angle-left" data-tags="bwi-angle-left" d="M673.939-33.939c18.746 18.746 18.746 49.133 0 67.878l-350.057 350.061 350.057 350.059c18.746 18.745 18.746 49.137 0 67.882s-49.135 18.745-67.88 0l-384-384c-18.745-18.746-18.745-49.137 0-67.882l384-383.998c18.745-18.746 49.135-18.746 67.88 0z" />
 <glyph unicode="&#xe902;" glyph-name="bwi-angle-right" data-tags="bwi-angle-right" d="M350.059 801.941c-18.745-18.745-18.745-49.137 0-67.882l350.056-350.059-350.056-350.061c-18.745-18.746-18.745-49.133 0-67.878s49.137-18.746 67.882 0l383.998 383.998c18.746 18.746 18.746 49.137 0 67.882l-383.998 384c-18.745 18.745-49.137 18.745-67.882 0z" />
@@ -39,6 +39,7 @@
 <glyph unicode="&#xe90a;" glyph-name="bwi-bug" data-tags="bwi-bug" d="M350.059 865.941c-18.745-18.745-18.745-49.137 0-67.882l24.25-24.25c-33.611-34.579-54.308-81.777-54.308-133.809v-13.715c0-2.588 0.12-5.148 0.353-7.674-24.548-11.608-46.648-27.547-65.313-46.829l-65.45 37.788c-22.958 13.255-52.314 5.389-65.569-17.569s-5.389-52.314 17.569-65.569l62.952-36.345c-8.124-23.19-12.541-48.122-12.541-74.086v-48h-80c-26.509 0-48-21.491-48-48s21.491-48 48-48h80v-16c0-41.21 7.791-80.602 21.979-116.781-1.047-0.512-2.083-1.056-3.107-1.651l-69.282-40c-22.958-13.254-30.824-42.611-17.569-65.568s42.611-30.822 65.569-17.568l69.282 40c1.046 0.602 2.060 1.242 3.042 1.907 58.638-73.35 148.875-120.339 250.086-120.339s191.45 46.989 250.086 120.339c0.979-0.666 1.997-1.306 3.040-1.907l69.286-40c22.957-13.254 52.314-5.389 65.568 17.568s5.389 52.314-17.568 65.568l-69.286 40c-1.024 0.595-2.061 1.139-3.104 1.651 14.189 36.179 21.978 75.571 21.978 116.781v16h80c26.509 0 48 21.491 48 48s-21.491 48-48 48h-80v48c0 25.964-4.416 50.896-12.544 74.086l62.957 36.345c22.957 13.255 30.822 42.611 17.568 65.569s-42.611 30.824-65.568 17.569l-65.453-37.788c-18.669 19.283-40.768 35.221-65.312 46.829 0.23 2.527 0.352 5.087 0.352 7.674v13.715c0 52.032-20.698 99.23-54.31 133.81l24.25 24.249c18.746 18.745 18.746 49.137 0 67.882s-49.135 18.745-67.88 0l-41.285-41.285c-16.767 4.783-34.472 7.344-52.774 7.344s-36.006-2.561-52.774-7.344l-41.285 41.285c-18.745 18.745-49.137 18.745-67.882 0zM547.943 729.044c4.242-3.062 8.871-5.347 13.691-6.854 27.791-16.819 46.366-47.335 46.366-82.19h-192c0 34.855 18.575 65.371 46.366 82.19 4.82 1.507 9.449 3.792 13.691 6.854 11.101 4.486 23.234 6.956 35.943 6.956s24.842-2.47 35.943-6.956zM288 416c0 70.692 57.308 128 128 128h192c70.694 0 128-57.308 128-128v-160c0-107.238-75.354-196.87-176-218.848v298.848c0 26.509-21.491 48-48 48s-48-21.491-48-48v-298.848c-100.646 21.978-176 111.61-176 218.848v160z" />
 <glyph unicode="&#xe90b;" glyph-name="bwi-business" data-tags="bwi-business" d="M336 704c-26.509 0-48-21.491-48-48s21.491-48 48-48h96c26.509 0 48 21.491 48 48s-21.491 48-48 48h-96zM592 704c-26.509 0-48-21.491-48-48s21.491-48 48-48h96c26.509 0 48 21.491 48 48s-21.491 48-48 48h-96zM592 512c-26.509 0-48-21.491-48-48s21.491-48 48-48h96c26.509 0 48 21.491 48 48s-21.491 48-48 48h-96zM544 272c0 26.509 21.491 48 48 48h96c26.509 0 48-21.491 48-48s-21.491-48-48-48h-96c-26.509 0-48 21.491-48 48zM288 464c0 26.509 21.491 48 48 48h96c26.509 0 48-21.491 48-48s-21.491-48-48-48h-96c-26.509 0-48 21.491-48 48zM336 320c-26.509 0-48-21.491-48-48s21.491-48 48-48h96c26.509 0 48 21.491 48 48s-21.491 48-48 48h-96zM192 896h640c35.347 0 64-28.654 64-64v-896c0-35.347-28.653-64-64-64h-640c-35.346 0-64 28.653-64 64v896c0 35.346 28.654 64 64 64zM224 800v-832h160v96c0 35.347 28.654 64 64 64h128c35.346 0 64-28.653 64-64v-96h160v832h-576z" />
 <glyph unicode="&#xe90c;" glyph-name="bwi-camera" data-tags="bwi-camera" d="M704 368c0 106.038-85.962 192-192 192s-192-85.962-192-192c0-106.038 85.962-192 192-192s192 85.962 192 192zM608 368c0-53.020-42.98-96-96-96s-96 42.98-96 96c0 53.020 42.98 96 96 96s96-42.98 96-96zM404.403 864c-51.203 0-97.48-30.515-117.651-77.578l-35.324-82.422h-123.428c-70.692 0-128-57.308-128-128v-448c0-70.694 57.308-128 128-128h768c70.694 0 128 57.306 128 128v448c0 70.692-57.306 128-128 128h-123.43l-35.322 82.422c-20.173 47.063-66.445 77.578-117.651 77.578h-215.195zM314.731 608l60.259 140.605c5.043 11.766 16.612 19.395 29.412 19.395h215.195c12.801 0 24.371-7.629 29.414-19.395l60.256-140.605h186.733c17.67 0 32-14.327 32-32v-448c0-17.67-14.33-32-32-32h-768c-17.673 0-32 14.33-32 32v448c0 17.673 14.327 32 32 32h186.731z" />
+<glyph unicode="&#xe90d;" glyph-name="bwi-premium" data-tags="bwi-premium" d="M805.869 800.188c41.254-0.010 79.181-22.7 98.682-59.062l98.63-183.875c21.843-40.75 16.41-90.778-13.69-125.875l-391.75-456.687c-44.71-52.096-125.319-52.058-170 0.064l-391.875 457.248c-29.641 34.592-35.368 83.695-14.5 124.188l94.5 183.313c19.211 37.263 57.638 60.687 99.562 60.687h590.441zM464.928 78.874l0.625 367.876-175.688 1.187h-141.25l316.312-369.064zM561.553 446.75l-0.625-367.563 316.314 368.75h-141.376l-174.312-1.187zM364.178 543.437l149.437-1 142.813 1-84.188 160.75h-135.75l-72.313-160.75zM764.55 543.937h136.813l-81.434 151.812c-2.784 5.185-8.179 8.428-14.061 8.438h-125.254l83.936-160.25zM215.428 704.188c-5.99 0-11.506-3.363-14.25-8.687l-78.125-151.563h136.125l72.125 160.25h-115.875z" />
 <glyph unicode="&#xe90e;" glyph-name="bwi-check-circle" data-tags="bwi-check-circle" d="M769.939 494.059c18.746 18.745 18.746 49.137 0 67.882s-49.133 18.745-67.878 0l-270.061-270.059-110.059 110.059c-18.745 18.745-49.137 18.745-67.882 0s-18.745-49.137 0-67.882l144-143.998c18.745-18.746 49.137-18.746 67.882 0l303.998 303.998zM1024 384c0 282.77-229.229 512-512 512s-512-229.23-512-512c0-282.771 229.23-512 512-512s512 229.229 512 512zM928 384c0-229.754-186.246-416-416-416-229.75 0-416 186.246-416 416 0 229.75 186.25 416 416 416 229.754 0 416-186.25 416-416z" />
 <glyph unicode="&#xe90f;" glyph-name="bwi-check" data-tags="bwi-check" d="M1009.939 753.941c18.746-18.745 18.746-49.137 0-67.882l-623.998-623.998c-18.745-18.746-49.137-18.746-67.882 0l-304 303.998c-18.745 18.745-18.745 49.137 0 67.882s49.137 18.745 67.882 0l270.059-270.056 590.061 590.056c18.746 18.745 49.133 18.745 67.878 0z" />
 <glyph unicode="&#xe910;" glyph-name="bwi-cli" data-tags="bwi-cli" d="M270.059 545.941c-18.745-18.745-18.745-49.137 0-67.882l94.059-94.059-94.059-94.059c-18.745-18.745-18.745-49.135 0-67.88s49.137-18.746 67.882 0l128 127.998c18.745 18.745 18.745 49.137 0 67.882l-128 128c-18.745 18.745-49.137 18.745-67.882 0zM560 304h160c26.509 0 48-21.491 48-48s-21.491-48-48-48h-160c-26.509 0-48 21.491-48 48s21.491 48 48 48zM832 832h-640c-70.692 0-128-57.308-128-128v-640c0-70.694 57.308-128 128-128h640c70.694 0 128 57.306 128 128v640c0 70.692-57.306 128-128 128zM192 736h640c17.67 0 32-14.327 32-32v-640c0-17.67-14.33-32-32-32h-640c-17.673 0-32 14.33-32 32v640c0 17.673 14.327 32 32 32z" />
@@ -49,6 +50,7 @@
 <glyph unicode="&#xe915;" glyph-name="collection" data-tags="collection" d="M288 848c0 26.51 21.491 48 48 48h352c26.509 0 48-21.49 48-48s-21.491-48-48-48h-352c-26.509 0-48 21.491-48 48zM208 768c-26.509 0-48-21.491-48-48s21.491-48 48-48h608c26.509 0 48 21.491 48 48s-21.491 48-48 48h-608zM832 640h-640c-70.692 0-128-57.308-128-128v-384c0-70.694 57.308-128 128-128h640c70.694 0 128 57.306 128 128v384c0 70.692-57.306 128-128 128zM832 544c17.67 0 32-14.327 32-32v-384c0-17.67-14.33-32-32-32h-640c-17.673 0-32 14.33-32 32v384c0 17.673 14.327 32 32 32h640z" />
 <glyph unicode="&#xe916;" glyph-name="bwi-collection-shared" data-tags="bwi-collection-shared" d="M288 848c0 26.51 21.491 48 48 48h352c26.509 0 48-21.49 48-48s-21.491-48-48-48h-352c-26.509 0-48 21.491-48 48zM208 768c-26.509 0-48-21.491-48-48s21.491-48 48-48h608c26.509 0 48 21.491 48 48s-21.491 48-48 48h-608zM448 384c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 35.346 28.654 64 64 64s64-28.654 64-64zM704 384c0-35.346-28.653-64-64-64s-64 28.654-64 64 28.654 64 64 64c35.347 0 64-28.654 64-64zM512 162.509c0 16.48-3.311 32.8-9.743 48.026s-15.861 29.056-27.747 40.71c-11.885 11.652-25.996 20.897-41.526 27.203s-32.175 9.553-48.984 9.553c-16.809 0-33.454-3.246-48.984-9.553s-29.64-15.55-41.526-27.203c-11.886-11.654-21.315-25.485-27.747-40.71s-9.743-31.546-9.743-48.026c0-19.059 15.451-34.509 34.51-34.509h186.98c19.059 0 34.51 15.45 34.51 34.509zM576.004 162.509c0 25.062-5.037 49.85-14.79 72.934-2.665 6.304-5.667 12.448-8.987 18.406 11.293 10.431 24.435 18.769 38.788 24.598 15.53 6.307 32.175 9.553 48.984 9.553 16.806 0 33.453-3.246 48.986-9.553 15.526-6.306 29.638-15.55 41.523-27.203s21.312-25.485 27.75-40.71c6.432-15.226 9.741-31.546 9.741-48.026 0-19.059-15.45-34.509-34.509-34.509h-163.701c4.018 10.739 6.214 22.368 6.214 34.509zM832 640h-640c-70.692 0-128-57.308-128-128v-384c0-70.694 57.308-128 128-128h640c70.694 0 128 57.306 128 128v384c0 70.692-57.306 128-128 128zM832 544c17.67 0 32-14.327 32-32v-384c0-17.67-14.33-32-32-32h-640c-17.673 0-32 14.33-32 32v384c0 17.673 14.327 32 32 32h640z" />
 <glyph unicode="&#xe917;" glyph-name="bwi-copy" data-tags="bwi-clone" d="M320 704v-128h-128c-70.692 0-128-57.308-128-128v-384c0-70.694 57.308-128 128-128h384c70.694 0 128 57.306 128 128v128h128c70.694 0 128 57.306 128 128v384c0 70.692-57.306 128-128 128h-384c-70.692 0-128-57.308-128-128zM448 736h384c17.67 0 32-14.327 32-32v-384c0-17.673-14.33-32-32-32h-384c-17.673 0-32 14.327-32 32v384c0 17.673 14.327 32 32 32zM320 480v-160c0-70.694 57.308-128 128-128h160v-128c0-17.67-14.327-32-32-32h-384c-17.673 0-32 14.33-32 32v384c0 17.673 14.327 32 32 32h128z" />
+<glyph unicode="&#xe918;" glyph-name="bwi-unarchive" data-tags="unarchive (1)" d="M483.556 110.393c12.108 0 22.243 4.081 30.407 12.245 8.173 8.172 12.26 18.313 12.26 30.421v210.488l75.264-75.278c7.879-7.87 17.783-11.9 29.71-12.089 11.919-0.18 22.002 3.849 30.251 12.089 8.24 8.248 12.36 18.242 12.36 29.98s-4.12 21.732-12.36 29.98l-141.895 141.013c-10.288 10.288-22.287 15.432-35.996 15.432s-25.709-5.144-35.997-15.432l-141.895-141.013c-7.869-7.879-11.899-17.783-12.089-29.71-0.18-11.919 3.849-22.002 12.089-30.251 8.249-8.24 18.243-12.36 29.98-12.36s21.732 4.12 29.981 12.36l75.264 75.278v-210.488c0-12.108 4.087-22.249 12.259-30.421 8.164-8.164 18.3-12.245 30.408-12.245zM85.333 645.476v-613.749c0-5.111 1.64-9.301 4.921-12.587 3.28-3.277 7.476-4.915 12.587-4.915h761.432c5.111 0 9.301 1.638 12.587 4.915 3.277 3.285 4.915 7.475 4.915 12.587v613.749h-796.442zM107.221-71.108c-28.378 0-53.343 10.769-74.894 32.324s-32.327 46.515-32.327 74.897v660.448c0 12.175 1.953 23.789 5.86 34.845 3.897 11.046 9.747 21.239 17.55 30.577l79.872 96.597c9.33 12.184 20.997 21.466 35.001 27.847s28.809 9.571 44.416 9.571h600.619c15.607 0 30.502-3.19 44.687-9.571s25.944-15.663 35.288-27.847l80.41-97.692c7.799-9.34 13.653-19.622 17.553-30.848 3.9-11.236 5.854-22.945 5.854-35.129v-658.799c0-28.382-10.769-53.342-32.324-74.897s-46.515-32.324-74.897-32.324h-752.666zM107.548 730.795h751.477l-62.040 73.856c-1.821 1.82-3.916 3.28-6.287 4.38-2.371 1.091-4.831 1.636-7.381 1.636h-600.064c-2.551 0-5.016-0.545-7.396-1.636-2.37-1.1-4.465-2.56-6.286-4.38l-62.024-73.856z" />
 <glyph unicode="&#xe919;" glyph-name="bwi-dollar" data-tags="bwi-dollar" d="M512 896c26.509 0 48-21.49 48-48v-76.787c28.948-4.156 55.337-12.075 79.167-23.757 37.716-18.133 67.092-43.52 88.129-76.16 10.598-16.078 18.618-33.537 24.058-52.377 9.222-31.927-19.008-59.687-52.243-59.687-32.461 0-59.908 27.451-76.263 55.488-10.155 18.134-25.024 33.003-44.608 44.608s-43.52 17.408-71.808 17.408c-36.267 0.726-66.368-8.341-90.304-27.2-23.211-18.858-34.816-44.97-34.816-78.336 0-29.738 8.704-52.586 26.112-68.544s41.344-29.376 71.808-40.256c30.464-10.154 65.28-22.122 104.448-35.904 37.717-12.33 71.444-27.2 101.185-44.608s53.312-40.256 70.72-68.544c18.131-28.288 27.2-64.192 27.2-107.712 0-38.445-9.792-74.349-29.376-107.712-19.584-32.64-48.96-59.475-88.128-80.512-29.834-15.469-64.927-25.050-105.28-28.736v-68.672c0-26.509-21.491-48-48-48s-48 21.491-48 48v70.605c-32.986 4.474-63.087 13.043-90.305 25.715-42.070 19.584-75.072 47.507-99.008 83.776-13.869 21.67-23.725 45.805-29.565 72.397-6.787 30.893 19.551 57.075 51.185 57.075 30.918 0 55.636-25.862 69.656-53.414 9.344-18.368 22.56-35.014 37.108-49.946 27.562-28.288 66.368-42.432 116.416-42.432 44.245 0 78.698 10.515 103.36 31.552 25.389 21.76 38.081 49.325 38.081 82.688 0 26.835-6.163 48.595-18.496 65.28-11.606 16.683-27.926 30.464-48.961 41.344-20.31 10.88-43.883 20.672-70.72 29.376s-55.126 18.134-84.864 28.288c-58.752 19.584-102.998 44.971-132.736 76.16-29.014 31.19-43.52 72.171-43.52 122.944-0.726 42.795 9.066 80.15 29.376 112.064 21.034 31.915 50.048 56.576 87.040 73.984 25.772 12.391 54.423 20.548 85.953 24.472v76.072c0 26.51 21.491 48 48 48z" />
 <glyph unicode="&#xe91a;" glyph-name="bwi-down-solid" data-tags="bwi-down-solid" d="M841.376 457.373l-284.12-284.118c-24.993-24.992-65.516-24.992-90.509 0l-284.118 284.118c-20.159 20.159-5.881 54.627 22.628 54.627h613.49c28.512 0 42.784-34.468 22.63-54.627z" />
 <glyph unicode="&#xe91b;" glyph-name="bwi-download" data-tags="bwi-download" d="M560.001 784c0 26.509-21.49 48-48 48s-48-21.491-48-48v-389.112l-64.111 56.988c-19.813 17.612-50.153 15.827-67.765-3.987s-15.827-50.153 3.987-67.765l144.001-128.003c18.187-16.16 45.592-16.16 63.779 0l144.001 128.003c19.814 17.612 21.594 47.952 3.987 67.765-17.613 19.814-47.955 21.598-67.768 3.987l-64.11-56.987v389.111zM160 400c0 26.509-21.491 48-48 48s-48-21.491-48-48v-288c0-61.856 50.144-112 112-112h672c61.856 0 112 50.144 112 112v288c0 26.509-21.491 48-48 48s-48-21.491-48-48v-288c0-8.838-7.162-16-16-16h-672c-8.836 0-16 7.162-16 16v288z" />
diff --git a/libs/angular/src/scss/bwicons/fonts/bwi-font.ttf b/libs/angular/src/scss/bwicons/fonts/bwi-font.ttf
index dd6a52c1a02..0d0c408c53a 100644
Binary files a/libs/angular/src/scss/bwicons/fonts/bwi-font.ttf and b/libs/angular/src/scss/bwicons/fonts/bwi-font.ttf differ
diff --git a/libs/angular/src/scss/bwicons/fonts/bwi-font.woff b/libs/angular/src/scss/bwicons/fonts/bwi-font.woff
index a20ec5903b3..0d9f0a549dc 100644
Binary files a/libs/angular/src/scss/bwicons/fonts/bwi-font.woff and b/libs/angular/src/scss/bwicons/fonts/bwi-font.woff differ
diff --git a/libs/angular/src/scss/bwicons/fonts/bwi-font.woff2 b/libs/angular/src/scss/bwicons/fonts/bwi-font.woff2
index dc92f85cd76..75c7ba9b430 100644
Binary files a/libs/angular/src/scss/bwicons/fonts/bwi-font.woff2 and b/libs/angular/src/scss/bwicons/fonts/bwi-font.woff2 differ
diff --git a/libs/angular/src/scss/bwicons/styles/style.scss b/libs/angular/src/scss/bwicons/styles/style.scss
index 92c6434d28d..93f5856e3df 100644
--- a/libs/angular/src/scss/bwicons/styles/style.scss
+++ b/libs/angular/src/scss/bwicons/styles/style.scss
@@ -100,6 +100,7 @@ $icomoon-font-path: "~@bitwarden/angular/src/scss/bwicons/fonts/" !default;
 }
 
 // For new icons - add their glyph name and value to the map below
+// Also add to `libs/components/src/shared/icon.ts`
 $icons: (
   "angle-down": "\e900",
   "angle-left": "\e901",
@@ -168,6 +169,7 @@ $icons: (
   "plus-circle": "\e942",
   "plus": "\e943",
   "popout": "\e944",
+  "premium": "\e90d",
   "provider": "\e945",
   "puzzle": "\e946",
   "question-circle": "\e947",
@@ -198,6 +200,7 @@ $icons: (
   "credit-card": "\e9a2",
   "desktop": "\e9a3",
   "archive": "\e9c1",
+  "unarchive": "\e918",
 );
 
 @each $name, $glyph in $icons {
diff --git a/libs/angular/src/services/injection-tokens.ts b/libs/angular/src/services/injection-tokens.ts
index 6bf3ab77252..543dcaa7324 100644
--- a/libs/angular/src/services/injection-tokens.ts
+++ b/libs/angular/src/services/injection-tokens.ts
@@ -35,9 +35,6 @@ export const SECURE_STORAGE = new SafeInjectionToken<AbstractStorageService>("SE
 export const LOGOUT_CALLBACK = new SafeInjectionToken<
   (logoutReason: LogoutReason, userId?: string) => Promise<void>
 >("LOGOUT_CALLBACK");
-export const LOCKED_CALLBACK = new SafeInjectionToken<(userId?: string) => Promise<void>>(
-  "LOCKED_CALLBACK",
-);
 export const SUPPORTS_SECURE_STORAGE = new SafeInjectionToken<boolean>("SUPPORTS_SECURE_STORAGE");
 export const LOCALES_DIRECTORY = new SafeInjectionToken<string>("LOCALES_DIRECTORY");
 export const SYSTEM_LANGUAGE = new SafeInjectionToken<string>("SYSTEM_LANGUAGE");
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index ff704394bc3..c8a70cf5af6 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -9,7 +9,9 @@ import {
   CollectionService,
   DefaultCollectionService,
   DefaultOrganizationUserApiService,
+  DefaultOrganizationUserService,
   OrganizationUserApiService,
+  OrganizationUserService,
 } from "@bitwarden/admin-console/common";
 import {
   ChangePasswordService,
@@ -20,11 +22,13 @@ import {
 import {
   DefaultLoginComponentService,
   DefaultLoginDecryptionOptionsService,
+  DefaultNewDeviceVerificationComponentService,
   DefaultRegistrationFinishService,
   DefaultTwoFactorAuthComponentService,
   DefaultTwoFactorAuthWebAuthnComponentService,
   LoginComponentService,
   LoginDecryptionOptionsService,
+  NewDeviceVerificationComponentService,
   RegistrationFinishService as RegistrationFinishServiceAbstraction,
   TwoFactorAuthComponentService,
   TwoFactorAuthWebAuthnComponentService,
@@ -36,9 +40,11 @@ import {
   AuthRequestService,
   AuthRequestServiceAbstraction,
   DefaultAuthRequestApiService,
+  DefaultLockService,
   DefaultLoginSuccessHandlerService,
   DefaultLogoutService,
   InternalUserDecryptionOptionsServiceAbstraction,
+  LockService,
   LoginEmailService,
   LoginEmailServiceAbstraction,
   LoginStrategyService,
@@ -96,12 +102,12 @@ import { MasterPasswordApiService as MasterPasswordApiServiceAbstraction } from
 import { PasswordResetEnrollmentServiceAbstraction } from "@bitwarden/common/auth/abstractions/password-reset-enrollment.service.abstraction";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
 import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { UserVerificationApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/user-verification/user-verification-api.service.abstraction";
 import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { WebAuthnLoginApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login-api.service.abstraction";
 import { WebAuthnLoginPrfKeyServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login-prf-key.service.abstraction";
 import { WebAuthnLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login.service.abstraction";
+import { SendTokenService, DefaultSendTokenService } from "@bitwarden/common/auth/send-access";
 import { AccountApiServiceImplementation } from "@bitwarden/common/auth/services/account-api.service";
 import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service";
 import { AnonymousHubService } from "@bitwarden/common/auth/services/anonymous-hub.service";
@@ -118,12 +124,17 @@ import { OrganizationInviteService } from "@bitwarden/common/auth/services/organ
 import { PasswordResetEnrollmentServiceImplementation } from "@bitwarden/common/auth/services/password-reset-enrollment.service.implementation";
 import { SsoLoginService } from "@bitwarden/common/auth/services/sso-login.service";
 import { TokenService } from "@bitwarden/common/auth/services/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service";
 import { UserVerificationApiService } from "@bitwarden/common/auth/services/user-verification/user-verification-api.service";
 import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
 import { WebAuthnLoginApiService } from "@bitwarden/common/auth/services/webauthn-login/webauthn-login-api.service";
 import { WebAuthnLoginPrfKeyService } from "@bitwarden/common/auth/services/webauthn-login/webauthn-login-prf-key.service";
 import { WebAuthnLoginService } from "@bitwarden/common/auth/services/webauthn-login/webauthn-login.service";
+import {
+  TwoFactorApiService,
+  DefaultTwoFactorApiService,
+  TwoFactorService,
+  DefaultTwoFactorService,
+} from "@bitwarden/common/auth/two-factor";
 import {
   AutofillSettingsService,
   AutofillSettingsServiceAbstraction,
@@ -142,17 +153,20 @@ import {
 } from "@bitwarden/common/billing/abstractions";
 import { AccountBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/account/account-billing-api.service.abstraction";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { OrganizationMetadataServiceAbstraction } from "@bitwarden/common/billing/abstractions/organization-metadata.service.abstraction";
 import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction";
 import { OrganizationSponsorshipApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-sponsorship-api.service.abstraction";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
+import { SubscriptionPricingServiceAbstraction } from "@bitwarden/common/billing/abstractions/subscription-pricing.service.abstraction";
 import { AccountBillingApiService } from "@bitwarden/common/billing/services/account/account-billing-api.service";
 import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service";
 import { BillingApiService } from "@bitwarden/common/billing/services/billing-api.service";
 import { OrganizationBillingApiService } from "@bitwarden/common/billing/services/organization/organization-billing-api.service";
+import { DefaultOrganizationMetadataService } from "@bitwarden/common/billing/services/organization/organization-metadata.service";
 import { OrganizationSponsorshipApiService } from "@bitwarden/common/billing/services/organization/organization-sponsorship-api.service";
 import { OrganizationBillingService } from "@bitwarden/common/billing/services/organization-billing.service";
-import { TaxService } from "@bitwarden/common/billing/services/tax.service";
+import { DefaultSubscriptionPricingService } from "@bitwarden/common/billing/services/subscription-pricing.service";
 import { HibpApiService } from "@bitwarden/common/dirt/services/hibp-api.service";
+import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
 import {
   DefaultKeyGenerationService,
   KeyGenerationService,
@@ -169,13 +183,23 @@ import { DefaultChangeKdfService } from "@bitwarden/common/key-management/kdf/ch
 import { ChangeKdfService } from "@bitwarden/common/key-management/kdf/change-kdf-service.abstraction";
 import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/services/key-connector.service";
+import { KeyApiService } from "@bitwarden/common/key-management/keys/services/abstractions/key-api-service.abstraction";
+import { RotateableKeySetService } from "@bitwarden/common/key-management/keys/services/abstractions/rotateable-key-set.service";
+import { DefaultKeyApiService } from "@bitwarden/common/key-management/keys/services/default-key-api-service.service";
+import { DefaultRotateableKeySetService } from "@bitwarden/common/key-management/keys/services/default-rotateable-key-set.service";
+import { MasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/abstractions/master-password-unlock.service";
 import {
   InternalMasterPasswordServiceAbstraction,
   MasterPasswordServiceAbstraction,
 } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { DefaultMasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/services/default-master-password-unlock.service";
 import { MasterPasswordService } from "@bitwarden/common/key-management/master-password/services/master-password.service";
+import { PinStateServiceAbstraction } from "@bitwarden/common/key-management/pin/pin-state.service.abstraction";
+import { PinStateService } from "@bitwarden/common/key-management/pin/pin-state.service.implementation";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { PinService } from "@bitwarden/common/key-management/pin/pin.service.implementation";
+import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
+import { DefaultSecurityStateService } from "@bitwarden/common/key-management/security-state/services/security-state.service";
 import {
   SendPasswordService,
   DefaultSendPasswordService,
@@ -199,13 +223,16 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platfor
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { RegisterSdkService } from "@bitwarden/common/platform/abstractions/sdk/register-sdk.service";
 import { SdkClientFactory } from "@bitwarden/common/platform/abstractions/sdk/sdk-client-factory";
 import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
+import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
 import { ValidationService as ValidationServiceAbstraction } from "@bitwarden/common/platform/abstractions/validation.service";
 import { ActionsService } from "@bitwarden/common/platform/actions";
 import { UnsupportedActionsService } from "@bitwarden/common/platform/actions/unsupported-actions.service";
+import { IpcSessionRepository } from "@bitwarden/common/platform/ipc";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency injection
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
@@ -235,6 +262,7 @@ import { FileUploadService } from "@bitwarden/common/platform/services/file-uplo
 import { MigrationBuilderService } from "@bitwarden/common/platform/services/migration-builder.service";
 import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
 import { DefaultSdkService } from "@bitwarden/common/platform/services/sdk/default-sdk.service";
+import { DefaultRegisterSdkService } from "@bitwarden/common/platform/services/sdk/register-sdk.service";
 import { StorageServiceProvider } from "@bitwarden/common/platform/services/storage-service.provider";
 import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service";
 import { ValidationService } from "@bitwarden/common/platform/services/validation.service";
@@ -264,7 +292,9 @@ import {
   InternalSendService,
   SendService as SendServiceAbstraction,
 } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherEncryptionService } from "@bitwarden/common/vault/abstractions/cipher-encryption.service";
+import { CipherRiskService } from "@bitwarden/common/vault/abstractions/cipher-risk.service";
 import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
@@ -284,7 +314,9 @@ import {
   DefaultCipherAuthorizationService,
 } from "@bitwarden/common/vault/services/cipher-authorization.service";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
+import { DefaultCipherArchiveService } from "@bitwarden/common/vault/services/default-cipher-archive.service";
 import { DefaultCipherEncryptionService } from "@bitwarden/common/vault/services/default-cipher-encryption.service";
+import { DefaultCipherRiskService } from "@bitwarden/common/vault/services/default-cipher-risk.service";
 import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
@@ -296,7 +328,6 @@ import { DefaultTaskService, TaskService } from "@bitwarden/common/vault/tasks";
 import {
   AnonLayoutWrapperDataService,
   DefaultAnonLayoutWrapperDataService,
-  DialogService,
   ToastService,
 } from "@bitwarden/components";
 import {
@@ -345,11 +376,7 @@ import {
 import { SafeInjectionToken } from "@bitwarden/ui-common";
 // 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 {
-  CipherArchiveService,
-  DefaultCipherArchiveService,
-  PasswordRepromptService,
-} from "@bitwarden/vault";
+import { PasswordRepromptService } from "@bitwarden/vault";
 import {
   IndividualVaultExportService,
   IndividualVaultExportServiceAbstraction,
@@ -367,6 +394,8 @@ import { DefaultSetInitialPasswordService } from "../auth/password-management/se
 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";
 import { DeviceTrustToastService } from "../auth/services/device-trust-toast.service.implementation";
+import { NoopPremiumInterestStateService } from "../billing/services/premium-interest/noop-premium-interest-state.service";
+import { PremiumInterestStateService } from "../billing/services/premium-interest/premium-interest-state.service.abstraction";
 import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "../platform/abstractions/form-validation-errors.service";
 import { DocumentLangSetter } from "../platform/i18n";
 import { FormValidationErrorsService } from "../platform/services/form-validation-errors.service";
@@ -386,7 +415,6 @@ import {
   HTTP_OPERATIONS,
   INTRAPROCESS_MESSAGING_SUBJECT,
   LOCALES_DIRECTORY,
-  LOCKED_CALLBACK,
   LOG_MAC_FAILURES,
   LOGOUT_CALLBACK,
   OBSERVABLE_DISK_STORAGE,
@@ -442,10 +470,6 @@ const safeProviders: SafeProvider[] = [
       },
     deps: [MessagingServiceAbstraction],
   }),
-  safeProvider({
-    provide: LOCKED_CALLBACK,
-    useValue: null,
-  }),
   safeProvider({
     provide: LOG_MAC_FAILURES,
     useValue: true,
@@ -508,7 +532,7 @@ const safeProviders: SafeProvider[] = [
       KeyConnectorServiceAbstraction,
       EnvironmentService,
       StateServiceAbstraction,
-      TwoFactorServiceAbstraction,
+      TwoFactorService,
       I18nServiceAbstraction,
       EncryptService,
       PasswordStrengthServiceAbstraction,
@@ -537,7 +561,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: DomainSettingsService,
     useClass: DefaultDomainSettingsService,
-    deps: [StateProvider],
+    deps: [StateProvider, PolicyServiceAbstraction, AccountService],
   }),
   safeProvider({
     provide: CipherServiceAbstraction,
@@ -590,6 +614,11 @@ const safeProviders: SafeProvider[] = [
       MessagingServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: CipherRiskService,
+    useClass: DefaultCipherRiskService,
+    deps: [SdkService, CipherServiceAbstraction],
+  }),
   safeProvider({
     provide: InternalFolderService,
     useClass: FolderService,
@@ -657,7 +686,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: InternalUserDecryptionOptionsServiceAbstraction,
     useClass: UserDecryptionOptionsService,
-    deps: [StateProvider],
+    deps: [SingleUserStateProvider],
   }),
   safeProvider({
     provide: UserDecryptionOptionsServiceAbstraction,
@@ -691,7 +720,6 @@ const safeProviders: SafeProvider[] = [
     provide: KeyService,
     useClass: DefaultKeyService,
     deps: [
-      PinServiceAbstraction,
       InternalMasterPasswordServiceAbstraction,
       KeyGenerationService,
       CryptoFunctionServiceAbstraction,
@@ -704,6 +732,11 @@ const safeProviders: SafeProvider[] = [
       KdfConfigService,
     ],
   }),
+  safeProvider({
+    provide: SecurityStateService,
+    useClass: DefaultSecurityStateService,
+    deps: [StateProvider],
+  }),
   safeProvider({
     provide: RestrictedItemTypesService,
     useClass: RestrictedItemTypesService,
@@ -782,6 +815,7 @@ const safeProviders: SafeProvider[] = [
     provide: InternalSendService,
     useClass: SendService,
     deps: [
+      AccountServiceAbstraction,
       KeyService,
       I18nServiceAbstraction,
       KeyGenerationService,
@@ -799,6 +833,11 @@ const safeProviders: SafeProvider[] = [
     useClass: SendApiService,
     deps: [ApiServiceAbstraction, FileUploadServiceAbstraction, InternalSendService],
   }),
+  safeProvider({
+    provide: KeyApiService,
+    useClass: DefaultKeyApiService,
+    deps: [ApiServiceAbstraction],
+  }),
   safeProvider({
     provide: SyncService,
     useClass: DefaultSyncService,
@@ -827,6 +866,8 @@ const safeProviders: SafeProvider[] = [
       TokenServiceAbstraction,
       AuthServiceAbstraction,
       StateProvider,
+      SecurityStateService,
+      KdfConfigService,
     ],
   }),
   safeProvider({
@@ -839,7 +880,7 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultVaultTimeoutSettingsService,
     deps: [
       AccountServiceAbstraction,
-      PinServiceAbstraction,
+      PinStateServiceAbstraction,
       UserDecryptionOptionsServiceAbstraction,
       KeyService,
       TokenServiceAbstraction,
@@ -855,23 +896,13 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultVaultTimeoutService,
     deps: [
       AccountServiceAbstraction,
-      InternalMasterPasswordServiceAbstraction,
-      CipherServiceAbstraction,
-      FolderServiceAbstraction,
-      CollectionService,
       PlatformUtilsServiceAbstraction,
-      MessagingServiceAbstraction,
-      SearchServiceAbstraction,
-      StateServiceAbstraction,
-      TokenServiceAbstraction,
       AuthServiceAbstraction,
       VaultTimeoutSettingsService,
-      StateEventRunnerService,
       TaskSchedulerService,
       LogService,
-      BiometricsService,
-      LOCKED_CALLBACK,
-      LOGOUT_CALLBACK,
+      LockService,
+      LogoutService,
     ],
   }),
   safeProvider({
@@ -945,7 +976,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: SignalRConnectionService,
     useClass: SignalRConnectionService,
-    deps: [ApiServiceAbstraction, LogService],
+    deps: [ApiServiceAbstraction, LogService, PlatformUtilsServiceAbstraction],
   }),
   safeProvider({
     provide: WebPushConnectionService,
@@ -1049,9 +1080,7 @@ const safeProviders: SafeProvider[] = [
     useClass: MasterPasswordService,
     deps: [
       StateProvider,
-      StateServiceAbstraction,
       KeyGenerationService,
-      EncryptService,
       LogService,
       CryptoFunctionServiceAbstraction,
       AccountServiceAbstraction,
@@ -1061,6 +1090,11 @@ const safeProviders: SafeProvider[] = [
     provide: MasterPasswordServiceAbstraction,
     useExisting: InternalMasterPasswordServiceAbstraction,
   }),
+  safeProvider({
+    provide: MasterPasswordUnlockService,
+    useClass: DefaultMasterPasswordUnlockService,
+    deps: [InternalMasterPasswordServiceAbstraction, KeyService, LogService],
+  }),
   safeProvider({
     provide: KeyConnectorServiceAbstraction,
     useClass: KeyConnectorService,
@@ -1097,6 +1131,17 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultOrganizationService,
     deps: [StateProvider],
   }),
+  safeProvider({
+    provide: OrganizationUserService,
+    useClass: DefaultOrganizationUserService,
+    deps: [
+      KeyService,
+      EncryptService,
+      OrganizationUserApiService,
+      AccountService,
+      I18nServiceAbstraction,
+    ],
+  }),
   safeProvider({
     provide: OrganizationServiceAbstraction,
     useExisting: InternalOrganizationServiceAbstraction,
@@ -1125,9 +1170,14 @@ const safeProviders: SafeProvider[] = [
     deps: [StateProvider],
   }),
   safeProvider({
-    provide: TwoFactorServiceAbstraction,
-    useClass: TwoFactorService,
-    deps: [I18nServiceAbstraction, PlatformUtilsServiceAbstraction, GlobalStateProvider],
+    provide: TwoFactorService,
+    useClass: DefaultTwoFactorService,
+    deps: [
+      I18nServiceAbstraction,
+      PlatformUtilsServiceAbstraction,
+      GlobalStateProvider,
+      TwoFactorApiService,
+    ],
   }),
   safeProvider({
     provide: FormValidationErrorsServiceAbstraction,
@@ -1186,7 +1236,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: AnonymousHubServiceAbstraction,
     useClass: AnonymousHubService,
-    deps: [EnvironmentService, AuthRequestServiceAbstraction],
+    deps: [EnvironmentService, AuthRequestServiceAbstraction, PlatformUtilsServiceAbstraction],
   }),
   safeProvider({
     provide: ValidationServiceAbstraction,
@@ -1244,6 +1294,7 @@ const safeProviders: SafeProvider[] = [
       UserDecryptionOptionsServiceAbstraction,
       LogService,
       ConfigService,
+      AccountServiceAbstraction,
     ],
   }),
   safeProvider({
@@ -1254,7 +1305,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: ChangeKdfService,
     useClass: DefaultChangeKdfService,
-    deps: [MasterPasswordServiceAbstraction, KeyService, KdfConfigService, ChangeKdfApiService],
+    deps: [ChangeKdfApiService, SdkService],
   }),
   safeProvider({
     provide: AuthRequestServiceAbstraction,
@@ -1267,19 +1318,26 @@ const safeProviders: SafeProvider[] = [
       ApiServiceAbstraction,
       StateProvider,
       AuthRequestApiServiceAbstraction,
+      AccountServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: PinStateServiceAbstraction,
+    useClass: PinStateService,
+    deps: [StateProvider],
+  }),
   safeProvider({
     provide: PinServiceAbstraction,
     useClass: PinService,
     deps: [
       AccountServiceAbstraction,
-      CryptoFunctionServiceAbstraction,
       EncryptService,
       KdfConfigService,
       KeyGenerationService,
       LogService,
-      StateProvider,
+      KeyService,
+      SdkService,
+      PinStateServiceAbstraction,
     ],
   }),
   safeProvider({
@@ -1402,15 +1460,20 @@ const safeProviders: SafeProvider[] = [
     deps: [ApiServiceAbstraction],
   }),
   safeProvider({
-    provide: TaxServiceAbstraction,
-    useClass: TaxService,
-    deps: [ApiServiceAbstraction],
+    provide: OrganizationMetadataServiceAbstraction,
+    useClass: DefaultOrganizationMetadataService,
+    deps: [BillingApiServiceAbstraction, ConfigService, PlatformUtilsServiceAbstraction],
   }),
   safeProvider({
     provide: BillingAccountProfileStateService,
     useClass: DefaultBillingAccountProfileStateService,
     deps: [StateProvider, PlatformUtilsServiceAbstraction, ApiServiceAbstraction],
   }),
+  safeProvider({
+    provide: SubscriptionPricingServiceAbstraction,
+    useClass: DefaultSubscriptionPricingService,
+    deps: [BillingApiServiceAbstraction, ConfigService, I18nServiceAbstraction, LogService],
+  }),
   safeProvider({
     provide: OrganizationManagementPreferencesService,
     useClass: DefaultOrganizationManagementPreferencesService,
@@ -1504,6 +1567,11 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultTwoFactorAuthWebAuthnComponentService,
     deps: [],
   }),
+  safeProvider({
+    provide: TwoFactorApiService,
+    useClass: DefaultTwoFactorApiService,
+    deps: [ApiServiceAbstraction],
+  }),
   safeProvider({
     provide: ViewCacheService,
     useExisting: NoopViewCacheService,
@@ -1520,6 +1588,19 @@ const safeProviders: SafeProvider[] = [
       SsoLoginServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: RegisterSdkService,
+    useClass: DefaultRegisterSdkService,
+    deps: [
+      SdkClientFactory,
+      EnvironmentService,
+      PlatformUtilsServiceAbstraction,
+      AccountServiceAbstraction,
+      ApiServiceAbstraction,
+      StateProvider,
+      ConfigService,
+    ],
+  }),
   safeProvider({
     provide: SdkService,
     useClass: DefaultSdkService,
@@ -1530,6 +1611,8 @@ const safeProviders: SafeProvider[] = [
       AccountServiceAbstraction,
       KdfConfigService,
       KeyService,
+      SecurityStateService,
+      ApiServiceAbstraction,
       StateProvider,
       ConfigService,
     ],
@@ -1596,6 +1679,11 @@ const safeProviders: SafeProvider[] = [
       MessageListener,
     ],
   }),
+  safeProvider({
+    provide: SendTokenService,
+    useClass: DefaultSendTokenService,
+    deps: [GlobalStateProvider, SdkService, SendPasswordService],
+  }),
   safeProvider({
     provide: EndUserNotificationService,
     useClass: DefaultEndUserNotificationService,
@@ -1646,18 +1734,57 @@ const safeProviders: SafeProvider[] = [
       InternalMasterPasswordServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: LockService,
+    useClass: DefaultLockService,
+    deps: [
+      AccountService,
+      BiometricsService,
+      VaultTimeoutSettingsService,
+      LogoutService,
+      MessagingServiceAbstraction,
+      SearchServiceAbstraction,
+      FolderServiceAbstraction,
+      InternalMasterPasswordServiceAbstraction,
+      StateEventRunnerService,
+      CipherServiceAbstraction,
+      AuthServiceAbstraction,
+      SystemService,
+      ProcessReloadServiceAbstraction,
+      LogService,
+      KeyService,
+    ],
+  }),
   safeProvider({
     provide: CipherArchiveService,
     useClass: DefaultCipherArchiveService,
     deps: [
       CipherServiceAbstraction,
       ApiServiceAbstraction,
-      DialogService,
-      PasswordRepromptService,
       BillingAccountProfileStateService,
       ConfigService,
     ],
   }),
+  safeProvider({
+    provide: RotateableKeySetService,
+    useClass: DefaultRotateableKeySetService,
+    deps: [KeyService, EncryptService],
+  }),
+  safeProvider({
+    provide: NewDeviceVerificationComponentService,
+    useClass: DefaultNewDeviceVerificationComponentService,
+    deps: [],
+  }),
+  safeProvider({
+    provide: IpcSessionRepository,
+    useClass: IpcSessionRepository,
+    deps: [StateProvider],
+  }),
+  safeProvider({
+    provide: PremiumInterestStateService,
+    useClass: NoopPremiumInterestStateService,
+    deps: [],
+  }),
 ];
 
 @NgModule({
diff --git a/libs/angular/src/tools/password-strength/password-strength-v2.component.ts b/libs/angular/src/tools/password-strength/password-strength-v2.component.ts
index c8a3b071746..a2571950936 100644
--- a/libs/angular/src/tools/password-strength/password-strength-v2.component.ts
+++ b/libs/angular/src/tools/password-strength/password-strength-v2.component.ts
@@ -17,6 +17,8 @@ export type PasswordStrengthScore = 0 | 1 | 2 | 3 | 4;
 type SizeTypes = "small" | "default" | "large";
 type BackgroundTypes = "danger" | "primary" | "success" | "warning";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-password-strength",
   templateUrl: "password-strength-v2.component.html",
@@ -27,24 +29,34 @@ export class PasswordStrengthV2Component implements OnChanges {
    * The size (height) of the password strength component.
    * Possible values are "default", "small" and "large".
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() size: SizeTypes = "default";
   /**
    * Determines whether to show the password strength score text on the progress bar or not.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() showText = false;
   /**
    * Optional email address which can be used as input for the password strength calculation
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() email: string;
   /**
    * Optional name which can be used as input for the password strength calculation
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() name: string;
   /**
    * Sets the password value and updates the password strength.
    *
    * @param value - password provided by the hosting component
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() set password(value: string) {
     this.updatePasswordStrength(value);
   }
@@ -55,11 +67,15 @@ export class PasswordStrengthV2Component implements OnChanges {
    * The password strength score represents the strength of a password.
    * It is emitted as an event when the password strength changes.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() passwordStrengthScore = new EventEmitter<PasswordStrengthScore>();
 
   /**
    * Emits an event with the password score text and color.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() passwordScoreTextWithColor = new EventEmitter<PasswordColorText>();
 
   passwordScore: PasswordStrengthScore;
diff --git a/libs/angular/src/tools/send/add-edit.component.ts b/libs/angular/src/tools/send/add-edit.component.ts
index 221b751528a..e03162c2d91 100644
--- a/libs/angular/src/tools/send/add-edit.component.ts
+++ b/libs/angular/src/tools/send/add-edit.component.ts
@@ -11,6 +11,7 @@ import {
   BehaviorSubject,
   concatMap,
   switchMap,
+  tap,
 } from "rxjs";
 
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -33,6 +34,7 @@ import { SendTextView } from "@bitwarden/common/tools/send/models/view/send-text
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 // Value = hours
@@ -56,11 +58,21 @@ interface DatePresetSelectOption {
 
 @Directive()
 export class AddEditComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() sendId: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() type: SendType;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSavedSend = new EventEmitter<SendView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onDeletedSend = new EventEmitter<SendView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCancelled = new EventEmitter<SendView>();
 
   deletionDatePresets: DatePresetSelectOption[] = [
@@ -134,6 +146,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
     protected billingAccountProfileStateService: BillingAccountProfileStateService,
     protected accountService: AccountService,
     protected toastService: ToastService,
+    protected premiumUpgradePromptService: PremiumUpgradePromptService,
   ) {
     this.typeOptions = [
       { name: i18nService.t("sendTypeFile"), value: SendType.File, premium: true },
@@ -182,10 +195,15 @@ export class AddEditComponent implements OnInit, OnDestroy {
         }
       });
 
-    this.formGroup.controls.type.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((val) => {
-      this.type = val;
-      this.typeChanged();
-    });
+    this.formGroup.controls.type.valueChanges
+      .pipe(
+        tap((val) => {
+          this.type = val;
+        }),
+        switchMap(() => this.typeChanged()),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
 
     this.formGroup.controls.selectedDeletionDatePreset.valueChanges
       .pipe(takeUntil(this.destroy$))
@@ -260,12 +278,19 @@ export class AddEditComponent implements OnInit, OnDestroy {
       });
 
       if (this.editMode) {
-        this.sendService
-          .get$(this.sendId)
+        this.accountService.activeAccount$
           .pipe(
-            //Promise.reject will complete the BehaviourSubject, if desktop starts relying only on BehaviourSubject, this should be changed.
-            concatMap((s) =>
-              s instanceof Send ? s.decrypt() : Promise.reject(new Error("Failed to load send.")),
+            getUserId,
+            switchMap((userId) =>
+              this.sendService
+                .get$(this.sendId)
+                .pipe(
+                  concatMap((s) =>
+                    s instanceof Send
+                      ? s.decrypt(userId)
+                      : Promise.reject(new Error("Failed to load send.")),
+                  ),
+                ),
             ),
             takeUntil(this.destroy$),
           )
@@ -409,11 +434,11 @@ export class AddEditComponent implements OnInit, OnDestroy {
     return false;
   }
 
-  typeChanged() {
+  async typeChanged() {
     if (this.type === SendType.File && !this.alertShown) {
       if (!this.canAccessPremium) {
         this.alertShown = true;
-        this.messagingService.send("premiumRequired");
+        await this.premiumUpgradePromptService.promptForPremium();
       } else if (!this.emailVerified) {
         this.alertShown = true;
         this.messagingService.send("emailVerificationRequired");
diff --git a/libs/angular/src/vault/components/folder-add-edit.component.ts b/libs/angular/src/vault/components/folder-add-edit.component.ts
index acf7511284d..486585b810c 100644
--- a/libs/angular/src/vault/components/folder-add-edit.component.ts
+++ b/libs/angular/src/vault/components/folder-add-edit.component.ts
@@ -16,8 +16,14 @@ import { KeyService } from "@bitwarden/key-management";
 
 @Directive()
 export class FolderAddEditComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() folderId: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSavedFolder = new EventEmitter<FolderView>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onDeletedFolder = new EventEmitter<FolderView>();
 
   editMode = false;
diff --git a/libs/angular/src/vault/components/icon.component.ts b/libs/angular/src/vault/components/icon.component.ts
index ee2b535d716..851cec5656b 100644
--- a/libs/angular/src/vault/components/icon.component.ts
+++ b/libs/angular/src/vault/components/icon.component.ts
@@ -25,14 +25,14 @@ export class IconComponent {
   /**
    * The cipher to display the icon for.
    */
-  cipher = input.required<CipherViewLike>();
+  readonly cipher = input.required<CipherViewLike>();
 
   /**
    * coloredIcon will adjust the size of favicons and the colors of the text icon when user is in the item details view.
    */
-  coloredIcon = input<boolean>(false);
+  readonly coloredIcon = input<boolean>(false);
 
-  imageLoaded = signal(false);
+  readonly imageLoaded = signal(false);
 
   protected data$: Observable<CipherIconDetails>;
 
diff --git a/libs/angular/src/vault/components/spotlight/spotlight.component.html b/libs/angular/src/vault/components/spotlight/spotlight.component.html
index 0d0e95e191b..92b88eb967d 100644
--- a/libs/angular/src/vault/components/spotlight/spotlight.component.html
+++ b/libs/angular/src/vault/components/spotlight/spotlight.component.html
@@ -3,20 +3,20 @@
 >
   <div class="tw-flex tw-justify-between tw-items-start tw-flex-grow">
     <div>
-      <h2 bitTypography="h4" class="tw-font-semibold !tw-mb-1">{{ title }}</h2>
+      <h2 *ngIf="title()" bitTypography="h4" class="tw-font-medium !tw-mb-1">{{ title() }}</h2>
       <p
-        *ngIf="subtitle"
+        *ngIf="subtitle()"
         class="tw-text-main tw-mb-0"
         bitTypography="body2"
-        [innerHTML]="subtitle"
+        [innerHTML]="subtitle()"
       ></p>
-      <ng-content *ngIf="!subtitle"></ng-content>
+      <ng-content *ngIf="!subtitle()"></ng-content>
     </div>
     <button
       type="button"
       bitIconButton="bwi-close"
       size="small"
-      *ngIf="!persistent"
+      *ngIf="!persistent()"
       (click)="handleDismiss()"
       class="-tw-me-2"
       [label]="'close' | i18n"
@@ -28,10 +28,10 @@
     bitButton
     type="button"
     buttonType="primary"
-    *ngIf="buttonText"
+    *ngIf="buttonText()"
     (click)="handleButtonClick($event)"
   >
-    {{ buttonText }}
-    <i *ngIf="buttonIcon" [ngClass]="buttonIcon" class="bwi tw-ml-1" aria-hidden="true"></i>
+    {{ buttonText() }}
+    <i *ngIf="buttonIcon()" [ngClass]="buttonIcon()" class="bwi tw-ml-1" aria-hidden="true"></i>
   </button>
 </div>
diff --git a/libs/angular/src/vault/components/spotlight/spotlight.component.spec.ts b/libs/angular/src/vault/components/spotlight/spotlight.component.spec.ts
new file mode 100644
index 00000000000..3d4d35fdf63
--- /dev/null
+++ b/libs/angular/src/vault/components/spotlight/spotlight.component.spec.ts
@@ -0,0 +1,208 @@
+import { CommonModule } from "@angular/common";
+import { ChangeDetectionStrategy, Component } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { SpotlightComponent } from "./spotlight.component";
+
+describe("SpotlightComponent", () => {
+  let fixture: ComponentFixture<SpotlightComponent>;
+  let component: SpotlightComponent;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SpotlightComponent],
+      providers: [{ provide: I18nService, useValue: { t: (key: string) => key } }],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SpotlightComponent);
+    component = fixture.componentInstance;
+  });
+
+  function detect(): void {
+    fixture.detectChanges();
+  }
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe("rendering when inputs are null", () => {
+    it("should render without crashing when inputs are null/undefined", () => {
+      // Explicitly drive the inputs to null to exercise template null branches
+      fixture.componentRef.setInput("title", null);
+      fixture.componentRef.setInput("subtitle", null);
+      fixture.componentRef.setInput("buttonText", null);
+      fixture.componentRef.setInput("buttonIcon", null);
+      // persistent has a default, but drive it as well for coverage sanity
+      fixture.componentRef.setInput("persistent", false);
+
+      expect(() => detect()).not.toThrow();
+
+      const root = fixture.debugElement.nativeElement as HTMLElement;
+      expect(root).toBeTruthy();
+    });
+  });
+
+  describe("close button visibility based on persistent", () => {
+    it("should show the close button when persistent is false", () => {
+      fixture.componentRef.setInput("persistent", false);
+      detect();
+
+      // Assumes dismiss uses bitIconButton
+      const dismissButton = fixture.debugElement.query(By.css("button[bitIconButton]"));
+
+      expect(dismissButton).toBeTruthy();
+    });
+
+    it("should hide the close button when persistent is true", () => {
+      fixture.componentRef.setInput("persistent", true);
+      detect();
+
+      const dismissButton = fixture.debugElement.query(By.css("button[bitIconButton]"));
+      expect(dismissButton).toBeNull();
+    });
+  });
+
+  describe("event emission", () => {
+    it("should emit onButtonClick when CTA button is clicked", () => {
+      const clickSpy = jest.fn();
+      component.onButtonClick.subscribe(clickSpy);
+
+      fixture.componentRef.setInput("buttonText", "Click me");
+      detect();
+
+      const buttonDe = fixture.debugElement.query(By.css("button[bitButton]"));
+      expect(buttonDe).toBeTruthy();
+
+      const event = new MouseEvent("click");
+      buttonDe.triggerEventHandler("click", event);
+
+      expect(clickSpy).toHaveBeenCalledTimes(1);
+      expect(clickSpy.mock.calls[0][0]).toBeInstanceOf(MouseEvent);
+    });
+
+    it("should emit onDismiss when close button is clicked", () => {
+      const dismissSpy = jest.fn();
+      component.onDismiss.subscribe(dismissSpy);
+
+      fixture.componentRef.setInput("persistent", false);
+      detect();
+
+      const dismissButton = fixture.debugElement.query(By.css("button[bitIconButton]"));
+      expect(dismissButton).toBeTruthy();
+
+      dismissButton.triggerEventHandler("click", new MouseEvent("click"));
+
+      expect(dismissSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it("handleButtonClick should emit via onButtonClick()", () => {
+      const clickSpy = jest.fn();
+      component.onButtonClick.subscribe(clickSpy);
+
+      const event = new MouseEvent("click");
+      component.handleButtonClick(event);
+
+      expect(clickSpy).toHaveBeenCalledTimes(1);
+      expect(clickSpy.mock.calls[0][0]).toBe(event);
+    });
+
+    it("handleDismiss should emit via onDismiss()", () => {
+      const dismissSpy = jest.fn();
+      component.onDismiss.subscribe(dismissSpy);
+
+      component.handleDismiss();
+
+      expect(dismissSpy).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe("content projection behavior", () => {
+    @Component({
+      standalone: true,
+      imports: [SpotlightComponent],
+      changeDetection: ChangeDetectionStrategy.OnPush,
+      template: `
+        <bit-spotlight>
+          <span class="tw-text-sm">Projected content</span>
+        </bit-spotlight>
+      `,
+    })
+    class HostWithProjectionComponent {}
+
+    let hostFixture: ComponentFixture<HostWithProjectionComponent>;
+
+    beforeEach(async () => {
+      hostFixture = TestBed.createComponent(HostWithProjectionComponent);
+    });
+
+    it("should render projected content inside the spotlight", () => {
+      hostFixture.detectChanges();
+
+      const projected = hostFixture.debugElement.query(By.css(".tw-text-sm"));
+      expect(projected).toBeTruthy();
+      expect(projected.nativeElement.textContent.trim()).toBe("Projected content");
+    });
+  });
+
+  describe("boolean attribute transform for persistent", () => {
+    @Component({
+      standalone: true,
+      imports: [CommonModule, SpotlightComponent],
+      changeDetection: ChangeDetectionStrategy.OnPush,
+      template: `
+        <!-- bare persistent attribute -->
+        <bit-spotlight *ngIf="mode === 'bare'" persistent></bit-spotlight>
+
+        <!-- no persistent attribute -->
+        <bit-spotlight *ngIf="mode === 'none'"></bit-spotlight>
+
+        <!-- explicit persistent="false" -->
+        <bit-spotlight *ngIf="mode === 'falseStr'" persistent="false"></bit-spotlight>
+      `,
+    })
+    class BooleanHostComponent {
+      mode: "bare" | "none" | "falseStr" = "bare";
+    }
+
+    let boolFixture: ComponentFixture<BooleanHostComponent>;
+    let boolHost: BooleanHostComponent;
+
+    beforeEach(async () => {
+      boolFixture = TestBed.createComponent(BooleanHostComponent);
+      boolHost = boolFixture.componentInstance;
+    });
+
+    function getSpotlight(): SpotlightComponent {
+      const de = boolFixture.debugElement.query(By.directive(SpotlightComponent));
+      return de.componentInstance as SpotlightComponent;
+    }
+
+    it("treats bare 'persistent' attribute as true via booleanAttribute", () => {
+      boolHost.mode = "bare";
+      boolFixture.detectChanges();
+
+      const spotlight = getSpotlight();
+      expect(spotlight.persistent()).toBe(true);
+    });
+
+    it("uses default false when 'persistent' is omitted", () => {
+      boolHost.mode = "none";
+      boolFixture.detectChanges();
+
+      const spotlight = getSpotlight();
+      expect(spotlight.persistent()).toBe(false);
+    });
+
+    it('treats persistent="false" as false', () => {
+      boolHost.mode = "falseStr";
+      boolFixture.detectChanges();
+
+      const spotlight = getSpotlight();
+      expect(spotlight.persistent()).toBe(false);
+    });
+  });
+});
diff --git a/libs/angular/src/vault/components/spotlight/spotlight.component.ts b/libs/angular/src/vault/components/spotlight/spotlight.component.ts
index 3c64318a900..1b75e1ee737 100644
--- a/libs/angular/src/vault/components/spotlight/spotlight.component.ts
+++ b/libs/angular/src/vault/components/spotlight/spotlight.component.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from "@angular/common";
-import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { booleanAttribute, ChangeDetectionStrategy, Component, input, output } from "@angular/core";
 
 import { ButtonModule, IconButtonModule, TypographyModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
@@ -8,20 +8,21 @@ import { I18nPipe } from "@bitwarden/ui-common";
   selector: "bit-spotlight",
   templateUrl: "spotlight.component.html",
   imports: [ButtonModule, CommonModule, IconButtonModule, I18nPipe, TypographyModule],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class SpotlightComponent {
   // The title of the component
-  @Input({ required: true }) title: string | null = null;
+  readonly title = input<string>();
   // The subtitle of the component
-  @Input() subtitle?: string | null = null;
+  readonly subtitle = input<string>();
   // The text to display on the button
-  @Input() buttonText?: string;
-  // Wheter the component can be dismissed, if true, the component will not show a close button
-  @Input() persistent = false;
+  readonly buttonText = input<string>();
+  // Whether the component can be dismissed, if true, the component will not show a close button
+  readonly persistent = input(false, { transform: booleanAttribute });
   // Optional icon to display on the button
-  @Input() buttonIcon: string | null = null;
-  @Output() onDismiss = new EventEmitter<void>();
-  @Output() onButtonClick = new EventEmitter();
+  readonly buttonIcon = input<string>();
+  readonly onDismiss = output<void>();
+  readonly onButtonClick = output<MouseEvent>();
 
   handleButtonClick(event: MouseEvent): void {
     this.onButtonClick.emit(event);
diff --git a/libs/angular/src/vault/components/vault-items.component.ts b/libs/angular/src/vault/components/vault-items.component.ts
index 8ae4acfb687..0254ddabf2b 100644
--- a/libs/angular/src/vault/components/vault-items.component.ts
+++ b/libs/angular/src/vault/components/vault-items.component.ts
@@ -11,11 +11,14 @@ import {
   of,
   shareReplay,
   switchMap,
+  take,
 } from "rxjs";
 
 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 { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -28,15 +31,26 @@ import {
 
 @Directive()
 export class VaultItemsComponent<C extends CipherViewLike> implements OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeCipherId: string = null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCipherClicked = new EventEmitter<C>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCipherRightClicked = new EventEmitter<C>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddCipher = new EventEmitter<CipherType | undefined>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddCipherOptions = new EventEmitter();
 
   loaded = false;
   ciphers: C[] = [];
   deleted = false;
+  archived = false;
   organization: Organization;
   CipherType = CipherType;
 
@@ -73,13 +87,24 @@ export class VaultItemsComponent<C extends CipherViewLike> implements OnDestroy
     this._filter$.next(value);
   }
 
+  private archiveFeatureEnabled = false;
+
   constructor(
     protected searchService: SearchService,
     protected cipherService: CipherService,
     protected accountService: AccountService,
     protected restrictedItemTypesService: RestrictedItemTypesService,
+    private configService: ConfigService,
   ) {
     this.subscribeToCiphers();
+
+    // Check if archive feature flag is enabled
+    this.configService
+      .getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive)
+      .pipe(takeUntilDestroyed(), take(1))
+      .subscribe((isEnabled) => {
+        this.archiveFeatureEnabled = isEnabled;
+      });
   }
 
   ngOnDestroy(): void {
@@ -87,19 +112,20 @@ export class VaultItemsComponent<C extends CipherViewLike> implements OnDestroy
     this.destroy$.complete();
   }
 
-  async load(filter: (cipher: C) => boolean = null, deleted = false) {
+  async load(filter: (cipher: C) => boolean = null, deleted = false, archived = false) {
     this.deleted = deleted ?? false;
+    this.archived = archived;
     await this.applyFilter(filter);
     this.loaded = true;
   }
 
-  async reload(filter: (cipher: C) => boolean = null, deleted = false) {
+  async reload(filter: (cipher: C) => boolean = null, deleted = false, archived = false) {
     this.loaded = false;
-    await this.load(filter, deleted);
+    await this.load(filter, deleted, archived);
   }
 
   async refresh() {
-    await this.reload(this.filter, this.deleted);
+    await this.reload(this.filter, this.deleted, this.archived);
   }
 
   async applyFilter(filter: (cipher: C) => boolean = null) {
@@ -125,6 +151,16 @@ export class VaultItemsComponent<C extends CipherViewLike> implements OnDestroy
   protected deletedFilter: (cipher: C) => boolean = (c) =>
     CipherViewLikeUtils.isDeleted(c) === this.deleted;
 
+  protected archivedFilter: (cipher: C) => boolean = (c) => {
+    // When the archive feature is not enabled,
+    // always return true to avoid filtering out any items.
+    if (!this.archiveFeatureEnabled) {
+      return true;
+    }
+
+    return CipherViewLikeUtils.isArchived(c) === this.archived;
+  };
+
   /**
    * Creates stream of dependencies that results in the list of ciphers to display
    * within the vault list.
@@ -158,7 +194,7 @@ export class VaultItemsComponent<C extends CipherViewLike> implements OnDestroy
           return this.searchService.searchCiphers(
             userId,
             searchText,
-            [filter, this.deletedFilter, restrictedTypeFilter],
+            [filter, this.deletedFilter, this.archivedFilter, restrictedTypeFilter],
             allCiphers,
           );
         }),
diff --git a/libs/angular/src/vault/services/custom-nudges-services/new-item-nudge.service.ts b/libs/angular/src/vault/services/custom-nudges-services/new-item-nudge.service.ts
index e89b877562a..4afc356a095 100644
--- a/libs/angular/src/vault/services/custom-nudges-services/new-item-nudge.service.ts
+++ b/libs/angular/src/vault/services/custom-nudges-services/new-item-nudge.service.ts
@@ -1,5 +1,5 @@
 import { inject, Injectable } from "@angular/core";
-import { combineLatest, Observable, switchMap } from "rxjs";
+import { combineLatest, filter, Observable, switchMap } from "rxjs";
 
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -20,7 +20,7 @@ export class NewItemNudgeService extends DefaultSingleNudgeService {
   nudgeStatus$(nudgeType: NudgeType, userId: UserId): Observable<NudgeStatus> {
     return combineLatest([
       this.getNudgeStatus$(nudgeType, userId),
-      this.cipherService.cipherViews$(userId),
+      this.cipherService.cipherViews$(userId).pipe(filter((ciphers) => ciphers != null)),
     ]).pipe(
       switchMap(async ([nudgeStatus, ciphers]) => {
         if (nudgeStatus.hasSpotlightDismissed) {
diff --git a/libs/angular/src/vault/services/nudges.service.ts b/libs/angular/src/vault/services/nudges.service.ts
index 4c77ff38bf6..05d565eb499 100644
--- a/libs/angular/src/vault/services/nudges.service.ts
+++ b/libs/angular/src/vault/services/nudges.service.ts
@@ -37,6 +37,7 @@ export const NudgeType = {
   NewNoteItemStatus: "new-note-item-status",
   NewSshItemStatus: "new-ssh-item-status",
   GeneratorNudgeStatus: "generator-nudge-status",
+  PremiumUpgrade: "premium-upgrade",
 } as const;
 
 export type NudgeType = UnionOfValues<typeof NudgeType>;
diff --git a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts
index feaaf74c96d..4d4037a3517 100644
--- a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts
@@ -4,7 +4,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
 // 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 { CollectionTypes, CollectionView } from "@bitwarden/admin-console/common";
 import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { DynamicTreeNode } from "../models/dynamic-tree-node.model";
@@ -13,14 +13,27 @@ import { VaultFilter } from "../models/vault-filter.model";
 
 @Directive()
 export class CollectionFilterComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hide = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collapsedFilterNodes: Set<string>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collectionNodes: DynamicTreeNode<CollectionView>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeFilter: VaultFilter;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onNodeCollapseStateChange: EventEmitter<ITreeNodeObject> =
     new EventEmitter<ITreeNodeObject>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onFilterChange: EventEmitter<VaultFilter> = new EventEmitter<VaultFilter>();
+  DefaultCollectionType = CollectionTypes.DefaultUserCollection;
 
   readonly collectionsGrouping: TopLevelTreeNode = {
     id: "collections",
diff --git a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts
index 45605d583aa..8c47a37b31b 100644
--- a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts
@@ -11,15 +11,31 @@ import { VaultFilter } from "../models/vault-filter.model";
 
 @Directive()
 export class FolderFilterComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hide = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collapsedFilterNodes: Set<string>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() folderNodes: DynamicTreeNode<FolderView>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeFilter: VaultFilter;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onNodeCollapseStateChange: EventEmitter<ITreeNodeObject> =
     new EventEmitter<ITreeNodeObject>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onFilterChange: EventEmitter<VaultFilter> = new EventEmitter<VaultFilter>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddFolder = new EventEmitter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEditFolder = new EventEmitter<FolderView>();
 
   get folders() {
diff --git a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
index 45198d2bcc5..46be2df3884 100644
--- a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
@@ -11,15 +11,31 @@ import { VaultFilter } from "../models/vault-filter.model";
 
 @Directive()
 export class OrganizationFilterComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hide = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collapsedFilterNodes: Set<string>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizations: Organization[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeFilter: VaultFilter;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeOrganizationDataOwnership: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeSingleOrganizationPolicy: boolean;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onNodeCollapseStateChange: EventEmitter<ITreeNodeObject> =
     new EventEmitter<ITreeNodeObject>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onFilterChange: EventEmitter<VaultFilter> = new EventEmitter<VaultFilter>();
 
   get displayMode(): DisplayMode {
diff --git a/libs/angular/src/vault/vault-filter/components/status-filter.component.ts b/libs/angular/src/vault/vault-filter/components/status-filter.component.ts
index ba3842a6e11..6862019ab4e 100644
--- a/libs/angular/src/vault/vault-filter/components/status-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/status-filter.component.ts
@@ -7,13 +7,24 @@ import { VaultFilter } from "../models/vault-filter.model";
 
 @Directive()
 export class StatusFilterComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideFavorites = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideTrash = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() hideArchive = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onFilterChange: EventEmitter<VaultFilter> = new EventEmitter<VaultFilter>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeFilter: VaultFilter;
 
   get show() {
-    return !(this.hideFavorites && this.hideTrash);
+    return !(this.hideFavorites && this.hideTrash && this.hideArchive);
   }
 
   applyFilter(cipherStatus: CipherStatus) {
diff --git a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts
index 84cdf976309..a06be5e4b08 100644
--- a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts
@@ -10,13 +10,25 @@ import { VaultFilter } from "../models/vault-filter.model";
 
 @Directive()
 export class TypeFilterComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hide = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() collapsedFilterNodes: Set<string>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() selectedCipherType: CipherType = null;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeFilter: VaultFilter;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onNodeCollapseStateChange: EventEmitter<ITreeNodeObject> =
     new EventEmitter<ITreeNodeObject>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onFilterChange: EventEmitter<VaultFilter> = new EventEmitter<VaultFilter>();
 
   readonly typesNode: TopLevelTreeNode = {
diff --git a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
index 0b0cb14bbb8..659db1bb925 100644
--- a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
@@ -10,6 +10,7 @@ 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 { UserId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
@@ -21,15 +22,33 @@ import { VaultFilter } from "../models/vault-filter.model";
 // and refactor desktop/browser vault filters
 @Directive()
 export class VaultFilterComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeFilter: VaultFilter = new VaultFilter();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideFolders = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideCollections = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideFavorites = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideTrash = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideOrganizations = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onFilterChange = new EventEmitter<VaultFilter>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onAddFolder = new EventEmitter<never>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onEditFolder = new EventEmitter<FolderView>();
 
   private activeUserId: UserId;
@@ -42,9 +61,12 @@ export class VaultFilterComponent implements OnInit {
   collections: DynamicTreeNode<CollectionView>;
   folders$: Observable<DynamicTreeNode<FolderView>>;
 
+  protected showArchiveVaultFilter = false;
+
   constructor(
     protected vaultFilterService: DeprecatedVaultFilterService,
     protected accountService: AccountService,
+    protected cipherArchiveService: CipherArchiveService,
   ) {}
 
   get displayCollections() {
@@ -65,6 +87,11 @@ export class VaultFilterComponent implements OnInit {
     }
     this.folders$ = await this.vaultFilterService.buildNestedFolders();
     this.collections = await this.initCollections();
+
+    this.showArchiveVaultFilter = await firstValueFrom(
+      this.cipherArchiveService.hasArchiveFlagEnabled$(),
+    );
+
     this.isLoaded = true;
   }
 
diff --git a/libs/angular/src/vault/vault-filter/models/cipher-status.model.ts b/libs/angular/src/vault/vault-filter/models/cipher-status.model.ts
index f93cd8b2107..c05484a55fc 100644
--- a/libs/angular/src/vault/vault-filter/models/cipher-status.model.ts
+++ b/libs/angular/src/vault/vault-filter/models/cipher-status.model.ts
@@ -1 +1 @@
-export type CipherStatus = "all" | "favorites" | "trash";
+export type CipherStatus = "all" | "favorites" | "trash" | "archive";
diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts
index ea5e9eb9b24..a2f8aa7a352 100644
--- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts
+++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts
@@ -56,6 +56,34 @@ describe("VaultFilter", () => {
       });
     });
 
+    describe("given a archived cipher", () => {
+      const cipher = createCipher({ archivedDate: new Date() });
+
+      it("should return true when filtering for archive", () => {
+        const filterFunction = createFilterFunction({ status: "archive" });
+
+        const result = filterFunction(cipher);
+
+        expect(result).toBe(true);
+      });
+
+      it("should return false when filtering for favorites", () => {
+        const filterFunction = createFilterFunction({ status: "favorites" });
+
+        const result = filterFunction(cipher);
+
+        expect(result).toBe(false);
+      });
+
+      it("should return false when filtering for trash", () => {
+        const filterFunction = createFilterFunction({ status: "trash" });
+
+        const result = filterFunction(cipher);
+
+        expect(result).toBe(false);
+      });
+    });
+
     describe("given a cipher with type", () => {
       it("should return true when filter matches cipher type", () => {
         const cipher = createCipher({ type: CipherType.Identity });
@@ -103,12 +131,12 @@ describe("VaultFilter", () => {
     });
 
     describe("given a cipher without folder", () => {
-      const cipher = createCipher({ folderId: null });
+      const cipher = createCipher({ folderId: undefined });
 
       it("should return true when filtering on unassigned folder", () => {
         const filterFunction = createFilterFunction({
           selectedFolder: true,
-          selectedFolderId: null,
+          selectedFolderId: undefined,
         });
 
         const result = filterFunction(cipher);
@@ -175,7 +203,7 @@ describe("VaultFilter", () => {
       it("should return true when filtering for unassigned collection", () => {
         const filterFunction = createFilterFunction({
           selectedCollection: true,
-          selectedCollectionId: null,
+          selectedCollectionId: undefined,
         });
 
         const result = filterFunction(cipher);
@@ -195,12 +223,12 @@ describe("VaultFilter", () => {
     });
 
     describe("given an individual cipher (without organization or collection)", () => {
-      const cipher = createCipher({ organizationId: null, collectionIds: [] });
+      const cipher = createCipher({ organizationId: undefined, collectionIds: [] });
 
       it("should return false when filtering for unassigned collection", () => {
         const filterFunction = createFilterFunction({
           selectedCollection: true,
-          selectedCollectionId: null,
+          selectedCollectionId: undefined,
         });
 
         const result = filterFunction(cipher);
@@ -209,7 +237,7 @@ describe("VaultFilter", () => {
       });
 
       it("should return true when filtering for my vault only", () => {
-        const cipher = createCipher({ organizationId: null });
+        const cipher = createCipher({ organizationId: undefined });
         const filterFunction = createFilterFunction({
           myVaultOnly: true,
         });
@@ -230,11 +258,12 @@ function createCipher(options: Partial<CipherView> = {}) {
   const cipher = new CipherView();
 
   cipher.favorite = options.favorite ?? false;
-  cipher.deletedDate = options.deletedDate;
-  cipher.type = options.type;
-  cipher.folderId = options.folderId;
-  cipher.collectionIds = options.collectionIds;
-  cipher.organizationId = options.organizationId;
+  cipher.deletedDate = options.deletedDate ?? null;
+  cipher.archivedDate = options.archivedDate ?? null;
+  cipher.type = options.type ?? CipherType.Login;
+  cipher.folderId = options.folderId ?? undefined;
+  cipher.collectionIds = options.collectionIds ?? [];
+  cipher.organizationId = options.organizationId ?? undefined;
 
   return cipher;
 }
diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts
index bade2244ff0..87536036644 100644
--- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts
+++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts
@@ -50,6 +50,9 @@ export class VaultFilter {
       if (this.status === "trash" && cipherPassesFilter) {
         cipherPassesFilter = CipherViewLikeUtils.isDeleted(cipher);
       }
+      if (this.status === "archive" && cipherPassesFilter) {
+        cipherPassesFilter = CipherViewLikeUtils.isArchived(cipher);
+      }
       if (this.cipherType != null && cipherPassesFilter) {
         cipherPassesFilter = CipherViewLikeUtils.getType(cipher) === this.cipherType;
       }
diff --git a/libs/assets/src/svg/svgs/account-warning.icon.ts b/libs/assets/src/svg/svgs/account-warning.icon.ts
new file mode 100644
index 00000000000..80e29dad870
--- /dev/null
+++ b/libs/assets/src/svg/svgs/account-warning.icon.ts
@@ -0,0 +1,18 @@
+import { svgIcon } from "../icon-service";
+
+export const AccountWarning = svgIcon`
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 12.75 96 72">
+  <path class="tw-fill-illustration-bg-primary" d="M0 18.512a5.76 5.76 0 0 1 5.76-5.76h54.48a5.76 5.76 0 0 1 5.76 5.76v38.48a5.76 5.76 0 0 1-5.76 5.76H5.76A5.76 5.76 0 0 1 0 56.992v-38.48Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M60.24 14.672H5.76a3.84 3.84 0 0 0-3.84 3.84v38.48a3.84 3.84 0 0 0 3.84 3.84h54.48a3.84 3.84 0 0 0 3.84-3.84v-38.48a3.84 3.84 0 0 0-3.84-3.84Zm-54.48-1.92A5.76 5.76 0 0 0 0 18.512v38.48a5.76 5.76 0 0 0 5.76 5.76h54.48a5.76 5.76 0 0 0 5.76-5.76v-38.48a5.76 5.76 0 0 0-5.76-5.76H5.76Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M65 24.712H1v-1.92h64v1.92Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-outline" d="M62 18.752a2 2 0 1 1-4 0 2 2 0 0 1 4 0ZM56 18.752a2 2 0 1 1-4 0 2 2 0 0 1 4 0ZM50 18.752a2 2 0 1 1-4 0 2 2 0 0 1 4 0Z"/>
+  <path class="tw-fill-illustration-tertiary" d="M21.099 48.635c1.515-2.606 5.28-2.606 6.795 0l10.053 17.29c1.523 2.62-.367 5.906-3.398 5.906H14.444c-3.03 0-4.92-3.285-3.398-5.905L21.1 48.636Z"/>
+  <path class="tw-fill-illustration-outline" d="M20.373 48.213c1.839-3.163 6.408-3.163 8.247 0l10.053 17.29c1.849 3.18-.446 7.168-4.124 7.168H14.444c-3.678 0-5.973-3.987-4.124-7.167l10.053-17.29Zm6.795.844c-1.192-2.049-4.152-2.049-5.343 0L11.773 66.349c-1.198 2.06.288 4.643 2.671 4.643h20.105c2.383 0 3.869-2.583 2.671-4.643l-10.052-17.29Z"/>
+  <circle class="tw-fill-illustration-outline" cx="24.496" cy="66.428" r="1.351" />
+  <path class="tw-fill-illustration-outline" d="M22.517 54.707a.393.393 0 0 1 .39-.434h3.178c.234 0 .416.202.391.434l-.929 8.67a.393.393 0 0 1-.39.35h-1.32c-.201 0-.37-.151-.391-.35L22.977 59l-.46-4.293Z"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M82 42.752c0 7.732-6.268 14-14 14s-14-6.268-14-14 6.268-14 14-14 14 6.268 14 14Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M68 54.832c6.671 0 12.08-5.408 12.08-12.08S74.67 30.672 68 30.672c-6.672 0-12.08 5.408-12.08 12.08s5.408 12.08 12.08 12.08Zm0 1.92c7.732 0 14-6.268 14-14s-6.268-14-14-14-14 6.268-14 14 6.268 14 14 14Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M93.907 72.728A27.5 27.5 0 0 1 96 83.252a1.5 1.5 0 0 1-1.5 1.5h-52a1.5 1.5 0 0 1-1.5-1.5 27.5 27.5 0 0 1 52.907-10.524Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M94.076 82.832a25.58 25.58 0 0 0-51.153 0h51.153Zm1.924.42a27.5 27.5 0 1 0-55 0 1.5 1.5 0 0 0 1.5 1.5h52a1.5 1.5 0 0 0 1.5-1.5Z" clip-rule="evenodd"/>
+</svg>
+`;
diff --git a/libs/assets/src/svg/svgs/auto-confirmation.ts b/libs/assets/src/svg/svgs/auto-confirmation.ts
new file mode 100644
index 00000000000..2a1416a5d25
--- /dev/null
+++ b/libs/assets/src/svg/svgs/auto-confirmation.ts
@@ -0,0 +1,5 @@
+import { svgIcon } from "../icon-service";
+
+export const AutoConfirmSvg = svgIcon`
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 197 232"><g filter="url(#a)"><path class="tw-fill-background-alt" d="M8 11a8 8 0 0 1 8-8h166a8 8 0 0 1 8 8v16.673H8z"/><path class="tw-fill-background" d="M8 26.686h182V229H8z"/><path class="tw-fill-illustration-logo" d="M153.366 8.3a2.31 2.31 0 0 1 2.31-2.31h11.687a2.31 2.31 0 0 1 2.309 2.31v11.472a2.31 2.31 0 0 1-2.31 2.31h-11.686a2.31 2.31 0 0 1-2.31-2.31z"/><g clip-path="url(#b)"><path class="tw-fill-background" d="M166.143 8.46a.46.46 0 0 0-.334-.143h-8.579a.46.46 0 0 0-.334.143.45.45 0 0 0-.143.335v5.718c.002.436.086.867.249 1.27q.232.602.618 1.118.395.516.879.95.448.411.941.767.429.304.901.577.471.272.666.368.197.097.315.149.094.045.198.043a.4.4 0 0 0 .193-.045q.12-.053.317-.149c.132-.064.357-.187.666-.368s.613-.374.901-.577q.494-.356.943-.767.484-.434.878-.95c.256-.343.464-.719.619-1.117.163-.404.247-.835.248-1.27v-5.72a.45.45 0 0 0-.142-.332m-1.106 6.106c0 2.073-3.517 3.853-3.517 3.853V9.542h3.517z"/></g><path class="tw-fill-secondary-500" d="M178.484 10.454c0 .577.474 1.044 1.059 1.044s1.059-.467 1.059-1.044-.474-1.045-1.059-1.045-1.059.468-1.059 1.045M179.543 14.633a1.05 1.05 0 0 1-1.059-1.045c0-.577.474-1.045 1.059-1.045s1.059.468 1.059 1.045-.474 1.045-1.059 1.045M179.543 17.767a1.05 1.05 0 0 1-1.059-1.045c0-.577.474-1.045 1.059-1.045s1.059.468 1.059 1.045-.474 1.045-1.059 1.045"/></g><g clip-path="url(#c)"><rect width="154" height="205" x="16" y="24" class="tw-fill-background-alt" rx="4.918"/><path class="tw-fill-background" d="M16 24h155v27.419H16z"/><path class="tw-fill-text-main" d="m24.595 40.71-2.107-5.739h1.057l1.648 4.73 1.664-4.73h1.041l-2.107 5.738zm4.891.098q-.492 0-.828-.18a1.2 1.2 0 0 1-.492-.484 1.4 1.4 0 0 1-.155-.656q0-.394.196-.689a1.33 1.33 0 0 1 .59-.459q.395-.164.951-.164h1.025q0-.36-.074-.598a.62.62 0 0 0-.254-.353q-.18-.123-.516-.123-.32 0-.533.148a.64.64 0 0 0-.262.418h-.968q.05-.426.279-.73a1.5 1.5 0 0 1 .623-.475q.386-.165.86-.164.6 0 1 .205.41.197.616.566.213.368.213.901v2.738h-.845l-.098-.664a1.3 1.3 0 0 1-.213.303 1.4 1.4 0 0 1-.287.246q-.165.099-.377.156a1.7 1.7 0 0 1-.45.058m.213-.78q.222 0 .402-.09a.9.9 0 0 0 .32-.253q.14-.164.22-.378.083-.213.1-.45v-.05h-.886q-.279 0-.46.082-.18.074-.27.213a.6.6 0 0 0-.082.312q0 .197.082.336a.56.56 0 0 0 .23.205.76.76 0 0 0 .344.074m4.787.78q-.491 0-.844-.18a1.3 1.3 0 0 1-.549-.558q-.189-.378-.189-.926v-2.747h.984v2.615q0 .493.238.73.246.237.672.238.27 0 .492-.115a.9.9 0 0 0 .352-.36 1.15 1.15 0 0 0 .14-.591v-2.517h.983v4.312h-.868l-.074-.656q-.165.352-.508.558-.345.197-.828.197m3.43-.099v-5.902h.983v5.902zm3.966 0a1.9 1.9 0 0 1-.73-.13 1 1 0 0 1-.476-.435q-.163-.304-.163-.82v-2.107h-.746v-.82h.746l.114-1.164h.87v1.164h1.139v.82h-1.14v2.107q0 .311.131.434.131.115.46.115h.565v.836z"/><path class="tw-fill-secondary-300" d="M102.538 37.71a7.38 7.38 0 0 1 7.378-7.378h27.871a7.378 7.378 0 0 1 0 14.755h-27.871a7.38 7.38 0 0 1-7.378-7.378"/><path class="tw-fill-secondary-100" d="M149.913 37.71a7.378 7.378 0 1 1 14.755 0 7.378 7.378 0 0 1-14.755 0"/><g clip-path="url(#d)"><path class="tw-fill-background" d="M21.874 64.308a6.56 6.56 0 0 1 6.558-6.558h130.137a6.56 6.56 0 0 1 6.558 6.558v1.23a6.56 6.56 0 0 1-6.558 6.558H28.432a6.56 6.56 0 0 1-6.558-6.558z"/></g><path class="tw-fill-secondary-100" d="M22.332 84.759a3.166 3.166 0 0 1 3.166-3.166H68.78a3.166 3.166 0 0 1 0 6.332H25.498a3.166 3.166 0 0 1-3.166-3.166M22.332 97.422a6.33 6.33 0 0 1 6.332-6.331h129.673a6.33 6.33 0 0 1 6.332 6.331v9.497a6.33 6.33 0 0 1-6.332 6.332H28.664a6.33 6.33 0 0 1-6.332-6.332zM22.332 122.749a6.33 6.33 0 0 1 6.332-6.332h129.673a6.33 6.33 0 0 1 6.332 6.332v9.497a6.33 6.33 0 0 1-6.332 6.332H28.664a6.33 6.33 0 0 1-6.332-6.332zM22.332 148.075a6.33 6.33 0 0 1 6.332-6.332h129.673a6.33 6.33 0 0 1 6.332 6.332v9.497a6.33 6.33 0 0 1-6.332 6.332H28.664a6.33 6.33 0 0 1-6.332-6.332z"/><path class="tw-fill-secondary-100" d="M41.477 101.706a7.727 7.727 0 0 0-7.727-7.727h-.337a7.727 7.727 0 0 0 0 15.454h.337a7.727 7.727 0 0 0 7.727-7.727M95.974 106.13a1.994 1.994 0 0 0-1.994-1.994H46.637a1.994 1.994 0 0 0 0 3.988H93.98a1.993 1.993 0 0 0 1.994-1.994M86.31 98.591a3.303 3.303 0 0 0-3.303-3.303h-35.06a3.303 3.303 0 1 0 0 6.607h35.06a3.303 3.303 0 0 0 3.303-3.304M161.816 101.706a5.84 5.84 0 0 0-5.84-5.84h-29.987a5.84 5.84 0 0 0 0 11.681h29.987a5.84 5.84 0 0 0 5.84-5.841M41.477 127.032a7.726 7.726 0 0 0-7.727-7.726h-.337a7.726 7.726 0 1 0 0 15.453h.337a7.727 7.727 0 0 0 7.727-7.727M95.974 131.457a1.993 1.993 0 0 0-1.994-1.994H46.637a1.993 1.993 0 1 0 0 3.987H93.98a1.993 1.993 0 0 0 1.994-1.993M86.31 123.918a3.303 3.303 0 0 0-3.303-3.304h-35.06a3.303 3.303 0 0 0 0 6.607h35.06a3.303 3.303 0 0 0 3.303-3.303M161.816 127.032a5.84 5.84 0 0 0-5.84-5.84h-29.987a5.84 5.84 0 0 0 0 11.681h29.987a5.84 5.84 0 0 0 5.84-5.841M41.477 152.359a7.727 7.727 0 0 0-7.727-7.727h-.337a7.727 7.727 0 0 0 0 15.454h.337a7.727 7.727 0 0 0 7.727-7.727M95.974 156.783a1.994 1.994 0 0 0-1.994-1.994H46.637a1.994 1.994 0 0 0 0 3.988H93.98a1.994 1.994 0 0 0 1.994-1.994M86.31 149.244a3.303 3.303 0 0 0-3.303-3.303h-35.06a3.303 3.303 0 1 0 0 6.606h35.06a3.303 3.303 0 0 0 3.303-3.303M161.816 152.359a5.84 5.84 0 0 0-5.84-5.841h-29.987a5.84 5.84 0 0 0 0 11.682h29.987a5.84 5.84 0 0 0 5.84-5.841M22.332 176.567a3.166 3.166 0 0 1 3.166-3.166H68.78a3.166 3.166 0 0 1 0 6.332H25.498a3.166 3.166 0 0 1-3.166-3.166M22.332 189.23a6.33 6.33 0 0 1 6.332-6.331h129.673a6.33 6.33 0 0 1 6.332 6.331v9.498a6.33 6.33 0 0 1-6.332 6.331H28.664a6.33 6.33 0 0 1-6.332-6.331z"/><path class="tw-fill-secondary-100" d="M41.477 193.514a7.726 7.726 0 0 0-7.727-7.726h-.337a7.726 7.726 0 1 0 0 15.453h.337a7.727 7.727 0 0 0 7.727-7.727M95.974 197.938a1.993 1.993 0 0 0-1.994-1.993H46.637a1.993 1.993 0 1 0 0 3.987H93.98a1.993 1.993 0 0 0 1.994-1.994M86.31 190.4a3.303 3.303 0 0 0-3.303-3.304h-35.06a3.303 3.303 0 0 0 0 6.607h35.06a3.303 3.303 0 0 0 3.303-3.303M161.816 193.514a5.84 5.84 0 0 0-5.84-5.841h-9.038a5.842 5.842 0 0 0 0 11.682h9.038a5.84 5.84 0 0 0 5.84-5.841M22.332 214.557a6.33 6.33 0 0 1 6.332-6.332h129.673a6.33 6.33 0 0 1 6.332 6.332v9.497a6.33 6.33 0 0 1-6.332 6.332H28.664a6.33 6.33 0 0 1-6.332-6.332z"/><path class="tw-fill-secondary-100" d="M41.477 220.424a7.727 7.727 0 0 0-7.727-7.727h-.337a7.727 7.727 0 1 0 0 15.453h.337a7.726 7.726 0 0 0 7.727-7.726M95.974 224.848a1.994 1.994 0 0 0-1.994-1.994H46.637a1.994 1.994 0 0 0 0 3.988H93.98a1.994 1.994 0 0 0 1.994-1.994M86.31 217.309a3.303 3.303 0 0 0-3.303-3.304h-35.06a3.303 3.303 0 0 0 0 6.607h35.06a3.303 3.303 0 0 0 3.303-3.303M161.816 220.423a5.84 5.84 0 0 0-5.84-5.84h-9.038a5.84 5.84 0 1 0 0 11.681h9.038a5.84 5.84 0 0 0 5.84-5.841"/></g><g clip-path="url(#e)"><rect width="154" height="205" x="16" y="24" class="tw-fill-primary-700" fill-opacity=".1" rx="4.918"/><g filter="url(#f)"><g clip-path="url(#g)"><path class="tw-fill-background" d="M20.84 73.484c0-5.577 4.521-10.098 10.098-10.098h124.125c5.577 0 10.098 4.521 10.098 10.098v106.032c0 5.577-4.521 10.098-10.098 10.098H30.938c-5.577 0-10.098-4.521-10.098-10.098z"/><path class="tw-fill-primary-100" d="M36.121 75.434h30.366a5.078 5.078 0 1 1 0 10.155H36.121a5.078 5.078 0 0 1 0-10.156"/><path class="tw-stroke-primary-700" stroke-width=".21" d="M36.121 75.434h30.366a5.078 5.078 0 1 1 0 10.155H36.121a5.078 5.078 0 0 1 0-10.156Z"/><path class="tw-fill-primary-700" d="m36.214 78.64-1.161 3.371h-.703l1.464-3.889h.448zm.973 3.371-1.165-3.37-.05-.519h.45l1.47 3.889zm-.057-1.442v.531h-2.115v-.531zm1.94.932.707-2.38h.668l-1.004 2.89h-.417zm-.543-2.38.721 2.39.035.5h-.416l-1.01-2.89zm3.902 2.31v-1.378a.6.6 0 0 0-.056-.267.4.4 0 0 0-.17-.173.6.6 0 0 0-.284-.062.64.64 0 0 0-.272.054.44.44 0 0 0-.18.144.35.35 0 0 0-.063.205h-.641q0-.17.083-.33a.9.9 0 0 1 .24-.286 1.2 1.2 0 0 1 .377-.198q.22-.072.491-.072.326 0 .577.11.254.109.398.33.147.22.147.55v1.285q0 .198.026.355.03.156.083.27v.043h-.66a1.2 1.2 0 0 1-.072-.264 2 2 0 0 1-.024-.316m.094-1.177.005.397h-.462q-.18 0-.315.035a.7.7 0 0 0-.227.096.42.42 0 0 0-.182.361q0 .114.054.211a.38.38 0 0 0 .155.147q.105.053.25.053a.7.7 0 0 0 .58-.28.44.44 0 0 0 .091-.227l.209.286a1 1 0 0 1-.11.235 1.1 1.1 0 0 1-.203.24 1 1 0 0 1-.692.256q-.283 0-.505-.112a.9.9 0 0 1-.347-.307.8.8 0 0 1-.125-.44.9.9 0 0 1 .085-.407.8.8 0 0 1 .257-.299q.17-.12.416-.181.246-.064.561-.064zm1.915-1.133v2.89h-.647v-2.89zm-.69-.758a.33.33 0 0 1 .097-.243.37.37 0 0 1 .272-.1q.171 0 .27.1a.33.33 0 0 1 .099.243.32.32 0 0 1-.099.24.37.37 0 0 1-.27.096.37.37 0 0 1-.272-.096.33.33 0 0 1-.096-.24m2.084-.454v4.102h-.646v-4.102zm2.334 3.522v-1.378a.6.6 0 0 0-.056-.267.4.4 0 0 0-.17-.173.6.6 0 0 0-.284-.062.64.64 0 0 0-.272.054.44.44 0 0 0-.18.144.35.35 0 0 0-.063.205H46.5q0-.17.083-.33a.9.9 0 0 1 .24-.286q.157-.126.377-.198.219-.072.491-.072.326 0 .577.11.254.109.398.33.147.22.147.55v1.285q0 .198.026.355.03.156.083.27v.043h-.66a1.2 1.2 0 0 1-.072-.264 2 2 0 0 1-.024-.316m.094-1.177.005.397h-.462q-.18 0-.315.035a.7.7 0 0 0-.227.096.42.42 0 0 0-.182.361q0 .114.054.211a.38.38 0 0 0 .155.147q.105.053.25.053a.7.7 0 0 0 .58-.28.44.44 0 0 0 .091-.227l.208.286a1 1 0 0 1-.11.235q-.075.125-.202.24a1 1 0 0 1-.692.256q-.282 0-.505-.112a.9.9 0 0 1-.347-.307.8.8 0 0 1-.125-.44.9.9 0 0 1 .085-.407.8.8 0 0 1 .257-.299q.17-.12.416-.181.246-.064.561-.064zm1.228-2.345h.644v3.485l-.061.617h-.583zm2.53 2.63v.056q0 .32-.072.59a1.4 1.4 0 0 1-.214.465 1 1 0 0 1-.353.308q-.209.105-.483.106-.27 0-.47-.101a.94.94 0 0 1-.337-.288 1.6 1.6 0 0 1-.216-.447 3 3 0 0 1-.117-.571v-.18q.034-.315.117-.57a1.6 1.6 0 0 1 .216-.447.93.93 0 0 1 .334-.29q.201-.103.468-.102.278 0 .488.106a.96.96 0 0 1 .356.305q.141.195.21.465.073.27.073.595m-.644.056v-.056q0-.195-.032-.366a1 1 0 0 0-.107-.304.54.54 0 0 0-.197-.206.57.57 0 0 0-.308-.077.7.7 0 0 0-.293.059.6.6 0 0 0-.206.16.8.8 0 0 0-.13.235q-.047.134-.062.288v.484q.024.2.101.368.08.166.224.267.145.1.372.1.179 0 .302-.073a.53.53 0 0 0 .195-.2 1 1 0 0 0 .106-.305q.035-.173.035-.374m1.878-2.686v4.102h-.647v-4.102zm1.979 4.155a1.5 1.5 0 0 1-.58-.104 1.3 1.3 0 0 1-.438-.296 1.3 1.3 0 0 1-.275-.446 1.6 1.6 0 0 1-.096-.553v-.107q0-.338.099-.614t.275-.47q.176-.198.416-.302.24-.105.521-.104.31 0 .543.104.232.104.384.294.155.186.23.446.077.258.077.571v.275h-2.233v-.462h1.598v-.05a.9.9 0 0 0-.07-.326.55.55 0 0 0-.19-.246.57.57 0 0 0-.341-.094.566.566 0 0 0-.491.264 1 1 0 0 0-.129.31 1.7 1.7 0 0 0-.043.404v.107q0 .19.051.352.054.16.155.28t.246.19a.8.8 0 0 0 .328.067.89.89 0 0 0 .73-.358l.339.329a1.215 1.215 0 0 1-.609.462 1.5 1.5 0 0 1-.497.077m3.659-2.326v2.273h-.644v-2.89h.606zm-.115.721-.208-.002a1.9 1.9 0 0 1 .085-.564 1.4 1.4 0 0 1 .235-.44q.153-.186.363-.284a1.1 1.1 0 0 1 .47-.101q.21 0 .377.058a.7.7 0 0 1 .291.185.8.8 0 0 1 .187.334q.064.202.064.5v1.866h-.646v-1.87a.7.7 0 0 0-.062-.328.34.34 0 0 0-.173-.174.65.65 0 0 0-.28-.053.62.62 0 0 0-.519.259.9.9 0 0 0-.136.278 1.2 1.2 0 0 0-.048.336m2.398.14v-.062q0-.313.091-.58.09-.27.262-.467.173-.2.422-.31.25-.112.566-.112.318 0 .566.112.252.11.425.31.174.198.264.467.091.267.091.58v.061q0 .313-.09.58-.092.267-.265.467a1.2 1.2 0 0 1-.422.31q-.248.11-.563.11a1.4 1.4 0 0 1-.57-.11 1.2 1.2 0 0 1-.421-.31 1.4 1.4 0 0 1-.265-.467 1.8 1.8 0 0 1-.09-.58m.644-.062v.061q0 .195.04.369a1 1 0 0 0 .126.304.6.6 0 0 0 .219.206.64.64 0 0 0 .318.075.61.61 0 0 0 .528-.28 1 1 0 0 0 .126-.305q.042-.174.043-.369v-.061q0-.193-.043-.364a1 1 0 0 0-.128-.307.61.61 0 0 0-.532-.285.6.6 0 0 0-.315.077.6.6 0 0 0-.216.208 1 1 0 0 0-.126.307 1.6 1.6 0 0 0-.04.364m3.368.833.668-2.249h.411l-.112.673-.673 2.217h-.369zm-.393-2.249.521 2.26.043.63h-.411l-.783-2.89zm2.097 2.233.505-2.233h.627l-.78 2.89h-.41zm-.555-2.233.66 2.222.082.668h-.369l-.68-2.22-.113-.67z"/><path class="tw-fill-text-main" d="m33.889 92.986-1.706 5.074h-1.195l2.235-5.983h.764zm1.426 5.074L33.6 92.986l-.103-.909h.769l2.247 5.983zm-.078-2.223v.892h-3.21v-.892zm4.408 1.167v-3.39h1.093v4.446h-1.027zm.14-.92.337-.008q0 .447-.099.825a1.9 1.9 0 0 1-.308.658 1.4 1.4 0 0 1-.522.431 1.7 1.7 0 0 1-.747.152q-.33 0-.6-.09a1.2 1.2 0 0 1-.469-.292 1.4 1.4 0 0 1-.3-.513 2.4 2.4 0 0 1-.106-.76v-2.873h1.084v2.88q0 .223.05.37.053.15.143.243.095.09.218.131a1 1 0 0 0 .271.037q.395 0 .62-.156a.88.88 0 0 0 .33-.427q.098-.271.098-.608m4.019-2.47v.781h-2.548v-.78zm-1.866-1.093h1.09v4.257q0 .198.053.304.053.108.16.144a.8.8 0 0 0 .255.037q.105 0 .197-.012.09-.012.152-.025l.004.814q-.135.045-.308.074-.17.028-.382.028-.366 0-.641-.123a.9.9 0 0 1-.428-.407q-.152-.284-.152-.747zm2.289 3.361v-.086q0-.489.14-.9a2.1 2.1 0 0 1 .407-.719q.266-.304.653-.472.385-.173.88-.173.5 0 .887.173.39.168.657.472t.407.72q.14.41.14.9v.085q0 .486-.14.9a2.1 2.1 0 0 1-.407.72q-.267.303-.653.472a2.2 2.2 0 0 1-.884.168 2.2 2.2 0 0 1-.883-.168q-.39-.168-.657-.473a2.1 2.1 0 0 1-.407-.719 2.8 2.8 0 0 1-.14-.9m1.085-.086v.086q0 .292.057.547.059.255.177.448.12.193.308.304a.94.94 0 0 0 .46.107.9.9 0 0 0 .452-.107.9.9 0 0 0 .309-.304q.123-.193.18-.448a2.5 2.5 0 0 0 .058-.547v-.086q0-.288-.058-.538a1.4 1.4 0 0 0-.18-.448.86.86 0 0 0-.769-.423.85.85 0 0 0-.76.423q-.12.193-.177.448a2.4 2.4 0 0 0-.057.538m4.955-1.27v3.534h-1.085v-4.446h1.023zm-.16 1.151h-.333q0-.465.111-.855.116-.39.337-.678a1.5 1.5 0 0 1 .547-.452q.328-.16.76-.16.3 0 .55.09.25.087.432.276.184.185.283.485.099.296.099.71v2.967h-1.085v-2.856q0-.312-.09-.488a.5.5 0 0 0-.251-.247 1 1 0 0 0-.395-.074.9.9 0 0 0-.44.103.85.85 0 0 0-.3.275 1.3 1.3 0 0 0-.172.407q-.053.23-.053.497m2.704-.201-.448.082q.003-.42.115-.785.111-.37.324-.645.219-.28.539-.436.324-.16.748-.16.328 0 .591.095.267.09.456.291.189.198.288.514.102.316.103.772v2.856h-1.093V95.2q0-.324-.09-.497a.47.47 0 0 0-.251-.238 1 1 0 0 0-.387-.07.808.808 0 0 0-.674.316q-.11.148-.168.346a1.6 1.6 0 0 0-.053.419m6.139 1.64v-2.051q0-.226-.079-.39a.56.56 0 0 0-.238-.255.8.8 0 0 0-.407-.09.9.9 0 0 0-.382.073.56.56 0 0 0-.246.21.54.54 0 0 0-.087.304h-1.089q0-.276.132-.522.132-.25.374-.444.246-.197.587-.308.345-.11.773-.11.506 0 .9.172.398.168.624.51.23.34.23.858v1.94q0 .332.042.57.045.235.131.407v.07H59.11a1.6 1.6 0 0 1-.12-.427 3.4 3.4 0 0 1-.04-.518m.151-1.764.009.645h-.687q-.255 0-.447.054a.8.8 0 0 0-.317.148.6.6 0 0 0-.185.23.7.7 0 0 0 .013.596.56.56 0 0 0 .222.21q.147.073.345.073.287 0 .501-.115a1 1 0 0 0 .333-.287.6.6 0 0 0 .127-.32l.313.468a2 2 0 0 1-.173.357 1.6 1.6 0 0 1-.296.353q-.18.165-.436.272a1.5 1.5 0 0 1-.591.106q-.431 0-.773-.172a1.37 1.37 0 0 1-.538-.473 1.2 1.2 0 0 1-.197-.682q0-.353.131-.624.132-.271.39-.457.26-.188.642-.283.386-.099.883-.099zm4.023-1.738v.781h-2.547v-.78zm-1.865-1.093h1.089v4.257q0 .198.053.304.054.108.16.144a.8.8 0 0 0 .255.037q.107 0 .197-.012t.152-.025l.004.814q-.135.045-.308.074-.169.028-.382.028-.366 0-.64-.123a.9.9 0 0 1-.428-.407q-.153-.284-.152-.747zm3.739 1.093v4.446h-1.089v-4.446zm-1.163-1.163A.54.54 0 0 1 64 92.05a.63.63 0 0 1 .452-.16q.285 0 .448.16a.53.53 0 0 1 .169.402.53.53 0 0 1-.169.399.61.61 0 0 1-.448.16.63.63 0 0 1-.452-.16.53.53 0 0 1-.164-.399m4.023 4.837q.23 0 .41-.09a.7.7 0 0 0 .288-.255.7.7 0 0 0 .12-.383h1.023a1.44 1.44 0 0 1-.255.81 1.75 1.75 0 0 1-.658.567 2 2 0 0 1-.912.205 2.2 2.2 0 0 1-.895-.172 1.74 1.74 0 0 1-.637-.481 2.1 2.1 0 0 1-.379-.715 3 3 0 0 1-.123-.871v-.132q0-.465.123-.87a2.1 2.1 0 0 1 .379-.716q.255-.308.636-.48.382-.173.892-.173.538 0 .945.21.411.21.641.591.234.382.243.9h-1.023a1 1 0 0 0-.107-.427.8.8 0 0 0-.28-.304.8.8 0 0 0-.44-.115.86.86 0 0 0-.46.115.8.8 0 0 0-.283.316q-.099.198-.14.444a3.4 3.4 0 0 0-.037.51v.131q0 .27.037.518.041.246.14.444a.8.8 0 0 0 .283.308q.186.114.469.115m5.013-.173v-2.05q0-.226-.078-.39a.56.56 0 0 0-.239-.255.8.8 0 0 0-.406-.09.9.9 0 0 0-.383.073.56.56 0 0 0-.246.21.54.54 0 0 0-.086.304h-1.09q0-.276.132-.522.132-.25.374-.444.246-.197.588-.308.345-.11.772-.11.505 0 .9.172.399.168.625.51.23.34.23.858v1.94q0 .332.04.57.047.235.132.407v.07h-1.105a1.6 1.6 0 0 1-.12-.427 3.4 3.4 0 0 1-.04-.518m.152-1.763.008.645h-.686q-.255 0-.448.054a.8.8 0 0 0-.317.148.6.6 0 0 0-.184.23.7.7 0 0 0 .012.596.57.57 0 0 0 .222.21q.148.073.345.073.288 0 .501-.115a1 1 0 0 0 .333-.287.6.6 0 0 0 .127-.32l.313.468a2 2 0 0 1-.173.357 1.6 1.6 0 0 1-.296.353q-.18.165-.435.272-.255.105-.592.106-.431 0-.772-.172a1.37 1.37 0 0 1-.539-.473 1.2 1.2 0 0 1-.197-.682q0-.353.132-.624.13-.271.39-.457.258-.188.64-.283.387-.099.884-.099zm3.07-3.603v6.311h-1.09V91.75zm2.185 0v6.311H77.19V91.75zm2.338 5.818 1.192-3.953h1.163l-1.784 5.12q-.06.165-.16.358-.094.192-.255.365a1.2 1.2 0 0 1-.402.288q-.239.11-.58.11-.147 0-.263-.02a3 3 0 0 1-.242-.053v-.814a1 1 0 0 0 .094.004q.059.005.099.005.238 0 .395-.058a.5.5 0 0 0 .25-.177 1 1 0 0 0 .164-.312zm-.587-3.953 1.006 3.275.177 1.147-.748.135-1.606-4.557zm7.388 3.674q.23 0 .41-.09a.7.7 0 0 0 .288-.255.7.7 0 0 0 .12-.383h1.022a1.44 1.44 0 0 1-.254.81 1.75 1.75 0 0 1-.658.567 2 2 0 0 1-.912.205 2.2 2.2 0 0 1-.896-.172 1.74 1.74 0 0 1-.637-.481 2.1 2.1 0 0 1-.378-.715 3 3 0 0 1-.123-.871v-.132q0-.465.123-.87a2.1 2.1 0 0 1 .378-.716q.255-.308.637-.48.382-.173.892-.173.539 0 .945.21.411.21.641.591.234.382.242.9h-1.023a1 1 0 0 0-.107-.427.8.8 0 0 0-.279-.304.8.8 0 0 0-.44-.115.86.86 0 0 0-.46.115.8.8 0 0 0-.283.316q-.1.198-.14.444a3.4 3.4 0 0 0-.037.51v.131q0 .27.037.518.04.246.14.444a.8.8 0 0 0 .283.308q.185.114.469.115m2.37-1.406v-.086q0-.489.14-.9a2.1 2.1 0 0 1 .407-.719q.267-.304.653-.472.386-.173.88-.173.501 0 .887.173.39.168.658.472.267.304.406.72.14.41.14.9v.085q0 .486-.14.9a2.1 2.1 0 0 1-.406.72q-.267.303-.654.472a2.2 2.2 0 0 1-.883.168 2.2 2.2 0 0 1-.884-.168q-.39-.168-.657-.473a2.1 2.1 0 0 1-.407-.719 2.8 2.8 0 0 1-.14-.9m1.085-.086v.086q0 .292.058.547.057.255.176.448.12.193.309.304a.94.94 0 0 0 .46.107.9.9 0 0 0 .452-.107.9.9 0 0 0 .308-.304q.123-.193.18-.448.059-.255.058-.547v-.086a2.4 2.4 0 0 0-.057-.538 1.4 1.4 0 0 0-.181-.448.86.86 0 0 0-.768-.423.85.85 0 0 0-.76.423q-.12.193-.177.448a2.4 2.4 0 0 0-.058.538m4.94-1.233v3.497h-1.085v-4.446h1.019zm-.173 1.114h-.32a3 3 0 0 1 .13-.88q.129-.393.358-.677.234-.285.555-.436.32-.152.715-.152.32 0 .58.09.258.09.443.288.189.197.288.518.102.316.102.78v2.852h-1.093V95.2q0-.304-.09-.48a.5.5 0 0 0-.255-.251 1 1 0 0 0-.407-.074.9.9 0 0 0-.44.103.9.9 0 0 0-.312.275 1.4 1.4 0 0 0-.189.407q-.065.23-.065.497m5.181 2.383h-1.093v-4.692q0-.55.222-.929.226-.382.645-.58.423-.196 1.007-.197.34 0 .657.07.32.066.658.173l-.161.88a7 7 0 0 0-.476-.132 2.6 2.6 0 0 0-.604-.062q-.432 0-.645.197-.21.198-.21.58zm.888-4.446v.781h-2.65v-.78zm1.717 0v4.446h-1.089v-4.446zm2.137.908v3.538h-1.085v-4.446h1.027zm1.352-.937-.017 1.011a2.894 2.894 0 0 0-.415-.033q-.25 0-.439.07a.8.8 0 0 0-.317.193.9.9 0 0 0-.189.313 1.4 1.4 0 0 0-.074.41l-.234-.028q0-.423.086-.785.087-.361.251-.633.165-.27.411-.419.25-.152.575-.152.09 0 .193.017.108.012.169.036m1.676.941v3.534h-1.085v-4.446h1.024zm-.16 1.151h-.333q0-.465.111-.855.115-.39.337-.678.222-.291.547-.452.328-.16.76-.16.3 0 .55.09.25.087.432.276.185.185.283.485.099.296.099.71v2.967h-1.085v-2.856q0-.312-.09-.488a.5.5 0 0 0-.251-.247 1 1 0 0 0-.394-.074.84.84 0 0 0-.74.378 1.3 1.3 0 0 0-.173.407q-.053.23-.053.497m2.704-.201-.448.082q.004-.42.115-.785.111-.37.324-.645a1.5 1.5 0 0 1 .539-.436q.324-.16.748-.16.329 0 .591.095.267.09.456.291.189.198.288.514.102.316.103.772v2.856h-1.093V95.2q0-.324-.091-.497a.47.47 0 0 0-.25-.238 1 1 0 0 0-.387-.07.85.85 0 0 0-.394.086.8.8 0 0 0-.279.23 1.1 1.1 0 0 0-.169.346 1.6 1.6 0 0 0-.053.419m6.849-.913v3.497h-1.084v-4.446h1.019zm-.172 1.114h-.321a3 3 0 0 1 .132-.88q.127-.393.357-.677.234-.285.555-.436.32-.152.715-.152.321 0 .579.09.26.09.444.288.189.197.288.518.102.316.102.78v2.852h-1.093V95.2q0-.304-.09-.48a.5.5 0 0 0-.255-.251 1 1 0 0 0-.406-.074.9.9 0 0 0-.44.103.9.9 0 0 0-.312.275 1.3 1.3 0 0 0-.189.407q-.066.23-.066.497m5.806 2.465q-.506 0-.908-.164a2 2 0 0 1-.686-.456 2.1 2.1 0 0 1-.432-.686 2.4 2.4 0 0 1-.148-.847v-.164q0-.514.148-.933a2.1 2.1 0 0 1 .419-.727q.271-.304.649-.469t.835-.164q.473 0 .834.16.361.156.604.444.242.288.365.69.124.399.124.884v.456h-3.485v-.748h2.416v-.082a1.3 1.3 0 0 0-.098-.473.76.76 0 0 0-.28-.345.84.84 0 0 0-.489-.131.8.8 0 0 0-.423.107.85.85 0 0 0-.296.295 1.5 1.5 0 0 0-.172.452q-.058.264-.058.584v.164q0 .28.074.518.078.238.226.415.152.172.362.271.213.095.485.095.34 0 .616-.132.28-.135.485-.398l.546.567a1.926 1.926 0 0 1-.945.703 2.4 2.4 0 0 1-.768.114m3.768-1.15.974-3.378h.69l-.206 1.167-.982 3.28h-.595zm-.539-3.378.732 3.386.066 1.06h-.687l-1.167-4.446zm3.107 3.337.715-3.337h1.052l-1.159 4.446h-.686zm-.797-3.337.965 3.345.128 1.101h-.596l-.99-3.279-.202-1.167zm7.947 3.39v-3.39h1.093v4.446h-1.028zm.139-.92.337-.008q0 .447-.098.825a1.9 1.9 0 0 1-.309.658 1.44 1.44 0 0 1-.521.431 1.7 1.7 0 0 1-.748.152q-.328 0-.6-.09a1.2 1.2 0 0 1-.469-.292 1.4 1.4 0 0 1-.3-.513 2.4 2.4 0 0 1-.106-.76v-2.873h1.084v2.88q0 .223.05.37.053.15.143.243.095.09.218.131a1 1 0 0 0 .271.037q.395 0 .621-.156a.9.9 0 0 0 .329-.427q.098-.271.098-.608m4.36.76a.44.44 0 0 0-.074-.25q-.074-.112-.279-.202a3 3 0 0 0-.592-.177q-.346-.074-.637-.185a2 2 0 0 1-.501-.267 1.2 1.2 0 0 1-.329-.374 1.05 1.05 0 0 1-.115-.501q0-.275.119-.518.119-.246.345-.431.226-.19.551-.296.324-.11.731-.11.567-.001.974.184.41.184.629.51.217.32.217.723h-1.084a.63.63 0 0 0-.083-.32.56.56 0 0 0-.242-.23.86.86 0 0 0-.415-.091.9.9 0 0 0-.382.074.56.56 0 0 0-.23.193.47.47 0 0 0-.078.263q0 .106.041.193.045.082.144.152.097.07.267.127.173.058.423.111.497.1.867.263.374.161.583.427.21.268.21.683 0 .296-.127.542a1.3 1.3 0 0 1-.37.423q-.243.18-.58.284a2.7 2.7 0 0 1-.76.098q-.612 0-1.035-.217a1.66 1.66 0 0 1-.641-.56 1.3 1.3 0 0 1-.218-.706h1.04q.012.259.139.415t.321.226q.197.066.415.066.246 0 .415-.066a.6.6 0 0 0 .255-.185.45.45 0 0 0 .086-.271m3.883 1.298q-.506 0-.908-.164a2 2 0 0 1-.686-.456 2.1 2.1 0 0 1-.432-.686 2.4 2.4 0 0 1-.148-.847v-.164q0-.514.148-.933a2.1 2.1 0 0 1 .419-.727q.271-.304.649-.469.379-.165.835-.164.472 0 .834.16.361.156.604.444.242.288.365.69.124.399.124.884v.456h-3.485v-.748h2.416v-.082a1.3 1.3 0 0 0-.098-.473.76.76 0 0 0-.28-.345.84.84 0 0 0-.489-.131.8.8 0 0 0-.423.107.85.85 0 0 0-.296.295 1.5 1.5 0 0 0-.172.452q-.058.264-.058.584v.164q0 .28.074.518.078.238.226.415.152.172.362.271.213.095.485.095.34 0 .616-.132.28-.135.485-.398l.546.567a1.926 1.926 0 0 1-.945.703 2.4 2.4 0 0 1-.768.114m3.616-3.62v3.538h-1.085v-4.446h1.027zm1.352-.937-.017 1.011a2.894 2.894 0 0 0-.415-.033q-.25 0-.439.07a.8.8 0 0 0-.317.193.9.9 0 0 0-.189.313 1.4 1.4 0 0 0-.074.41l-.234-.028q0-.423.086-.785.086-.361.251-.633.164-.27.411-.419.25-.152.575-.152.09 0 .193.017.107.012.169.036m3.04 3.259a.44.44 0 0 0-.074-.25q-.073-.112-.279-.202a3 3 0 0 0-.592-.177q-.345-.074-.637-.185a2 2 0 0 1-.501-.267 1.2 1.2 0 0 1-.329-.374 1.07 1.07 0 0 1-.115-.501q0-.275.119-.518a1.3 1.3 0 0 1 .346-.431q.226-.19.55-.296.325-.11.732-.11.567-.001.973.184.411.184.629.51.218.32.218.723h-1.085a.63.63 0 0 0-.082-.32.56.56 0 0 0-.243-.23.85.85 0 0 0-.415-.091.9.9 0 0 0-.382.074.56.56 0 0 0-.23.193.47.47 0 0 0-.037.456q.045.082.144.152t.267.127q.172.058.423.111.498.1.867.263.375.161.584.427.21.268.209.683 0 .296-.127.542a1.25 1.25 0 0 1-.37.423q-.242.18-.579.284a2.7 2.7 0 0 1-.76.098q-.612 0-1.036-.217a1.66 1.66 0 0 1-.641-.56 1.3 1.3 0 0 1-.218-.706h1.04q.012.259.14.415a.7.7 0 0 0 .32.226q.198.066.415.066.247 0 .415-.066a.6.6 0 0 0 .255-.185.45.45 0 0 0 .086-.271M34.646 104.555v4.188h-.558l-2.108-3.23v3.23h-.555v-4.188h.555l2.117 3.239v-3.239zm2.195 4.246q-.326 0-.59-.11a1.3 1.3 0 0 1-.452-.313 1.4 1.4 0 0 1-.287-.478 1.8 1.8 0 0 1-.1-.604v-.12q0-.38.111-.676.113-.3.305-.507.193-.207.437-.313.245-.107.507-.107.333 0 .575.116.244.114.4.322.155.204.23.483.075.276.075.604v.239h-2.325v-.435h1.792v-.04a1.3 1.3 0 0 0-.086-.403.73.73 0 0 0-.23-.322q-.159-.126-.431-.126a.71.71 0 0 0-.595.302 1.1 1.1 0 0 0-.17.365q-.06.216-.06.498v.12q0 .222.06.417.063.193.18.34.121.147.291.23a.9.9 0 0 0 .391.083.9.9 0 0 0 .478-.115q.195-.114.342-.307l.322.256a1.5 1.5 0 0 1-.256.29 1.2 1.2 0 0 1-.382.224 1.5 1.5 0 0 1-.532.087m2.62-.61.8-2.56h.35l-.069.509-.814 2.603h-.342zm-.538-2.56.682 2.589.049.523h-.36l-.903-3.112zm2.454 2.569.65-2.569h.529l-.903 3.112h-.357zm-.688-2.569.782 2.517.09.595h-.34l-.837-2.609-.069-.503zm5.779 2.393v-2.393h.535v3.112h-.51zm.1-.656.222-.005q0 .31-.066.575a1.2 1.2 0 0 1-.207.454 1 1 0 0 1-.377.302 1.4 1.4 0 0 1-.567.107q-.227 0-.417-.066a.85.85 0 0 1-.532-.564 1.7 1.7 0 0 1-.072-.532v-2.008h.532v2.013q0 .21.046.348a.6.6 0 0 0 .13.216.5.5 0 0 0 .184.109q.104.032.212.032.34 0 .538-.129a.74.74 0 0 0 .285-.354q.09-.225.09-.498m3.058.55a.45.45 0 0 0-.052-.213.44.44 0 0 0-.204-.181 1.7 1.7 0 0 0-.46-.144 4 4 0 0 1-.47-.13 1.4 1.4 0 0 1-.353-.181.8.8 0 0 1-.222-.25.785.785 0 0 1 .003-.685.9.9 0 0 1 .233-.29q.153-.127.366-.199t.474-.072q.374 0 .639.133a1 1 0 0 1 .405.354q.141.218.141.486h-.532a.46.46 0 0 0-.078-.251.6.6 0 0 0-.221-.204.7.7 0 0 0-.354-.08.8.8 0 0 0-.36.069.46.46 0 0 0-.198.169.43.43 0 0 0-.031.374.34.34 0 0 0 .109.124 1 1 0 0 0 .218.104q.141.049.36.097.382.087.63.207.248.121.368.297t.12.425a.837.837 0 0 1-.33.668q-.158.12-.38.19a1.7 1.7 0 0 1-.491.066q-.412 0-.697-.147a1.1 1.1 0 0 1-.43-.38.9.9 0 0 1-.148-.492h.535q.012.219.127.349.115.126.282.181.166.051.33.051.219 0 .366-.057a.5.5 0 0 0 .227-.158.37.37 0 0 0 .078-.23m2.522.883q-.324 0-.59-.11a1.3 1.3 0 0 1-.45-.313 1.4 1.4 0 0 1-.289-.478 1.8 1.8 0 0 1-.1-.604v-.12q0-.38.112-.676.112-.3.305-.507.192-.207.437-.313t.506-.107q.334 0 .575.116.245.114.4.322.156.204.23.483.075.276.075.604v.239h-2.324v-.435h1.792v-.04a1.3 1.3 0 0 0-.086-.403.73.73 0 0 0-.23-.322q-.159-.126-.432-.126a.712.712 0 0 0-.595.302q-.11.149-.17.365t-.06.498v.12q0 .222.06.417.064.193.181.34a.9.9 0 0 0 .29.23.9.9 0 0 0 .392.083.9.9 0 0 0 .477-.115q.195-.114.343-.307l.322.256a1.5 1.5 0 0 1-.256.29 1.2 1.2 0 0 1-.383.224 1.5 1.5 0 0 1-.532.087m2.365-2.681v2.623h-.532v-3.112h.517zm.972-.506-.003.494a1.289 1.289 0 0 0-.259-.023.9.9 0 0 0-.325.058.7.7 0 0 0-.239.161.8.8 0 0 0-.155.247 1.2 1.2 0 0 0-.072.311l-.15.086q0-.282.055-.529.057-.248.176-.437a.85.85 0 0 1 .299-.299.84.84 0 0 1 .673-.069m2.304 2.304a.45.45 0 0 0-.052-.213.44.44 0 0 0-.204-.181 1.7 1.7 0 0 0-.46-.144 4 4 0 0 1-.47-.13 1.4 1.4 0 0 1-.353-.181.8.8 0 0 1-.222-.25.783.783 0 0 1 .003-.685.9.9 0 0 1 .233-.29q.153-.127.365-.199.213-.072.475-.072.374 0 .639.133a1 1 0 0 1 .405.354.87.87 0 0 1 .141.486h-.532a.46.46 0 0 0-.078-.251.6.6 0 0 0-.221-.204.7.7 0 0 0-.354-.08.8.8 0 0 0-.36.069.46.46 0 0 0-.198.169.43.43 0 0 0-.032.374.34.34 0 0 0 .11.124 1 1 0 0 0 .218.104q.141.049.36.097.383.087.63.207.248.121.368.297t.12.425a.837.837 0 0 1-.33.668q-.158.12-.38.19a1.7 1.7 0 0 1-.492.066q-.411 0-.696-.147a1.1 1.1 0 0 1-.431-.38.9.9 0 0 1-.147-.492h.535q.012.219.127.349.115.126.282.181.166.051.33.051.219 0 .366-.057a.5.5 0 0 0 .227-.158.37.37 0 0 0 .078-.23m3.48.273.8-2.56h.35l-.069.509-.814 2.603h-.342zm-.538-2.56.682 2.589.049.523h-.36l-.903-3.112zm2.454 2.569.65-2.569h.529l-.903 3.112h-.357zm-.688-2.569.782 2.517.09.595h-.34l-.837-2.609-.069-.503zm2.992 0v3.112h-.535v-3.112zm-.576-.825a.32.32 0 0 1 .078-.219q.08-.09.236-.089.153 0 .233.089a.3.3 0 0 1 .083.219.3.3 0 0 1-.083.212q-.081.087-.233.087-.155 0-.236-.087a.3.3 0 0 1-.078-.212m2.008-.481v4.418h-.535v-4.418zm1.432 0v4.418h-.535v-4.418zm2.313 0h.535v3.814l-.046.604h-.49zm2.637 2.836v.061q0 .339-.08.63a1.6 1.6 0 0 1-.236.5q-.155.213-.38.331-.224.118-.514.118-.296 0-.521-.101a1 1 0 0 1-.374-.296 1.5 1.5 0 0 1-.244-.466q-.09-.273-.124-.616v-.264a3 3 0 0 1 .124-.619 1.5 1.5 0 0 1 .244-.466 1 1 0 0 1 .374-.296q.221-.104.515-.104.293 0 .52.116.228.112.38.322.155.21.236.503.08.29.08.647m-.535.061v-.061a2 2 0 0 0-.043-.437 1.1 1.1 0 0 0-.138-.362.69.69 0 0 0-.633-.34.8.8 0 0 0-.35.069.8.8 0 0 0-.25.187 1 1 0 0 0-.17.265 1.5 1.5 0 0 0-.095.305v.693q.045.201.15.388a.9.9 0 0 0 .281.302.8.8 0 0 0 .44.118.74.74 0 0 0 .368-.086.7.7 0 0 0 .25-.245q.099-.155.144-.359.046-.204.046-.437m2.5 1.579q-.325 0-.59-.11a1.3 1.3 0 0 1-.451-.313 1.4 1.4 0 0 1-.288-.478 1.8 1.8 0 0 1-.1-.604v-.12q0-.38.112-.676.111-.3.305-.507.192-.207.437-.313.244-.107.506-.107.333 0 .575.116.244.114.4.322.155.204.23.483.075.276.075.604v.239h-2.324v-.435h1.792v-.04a1.3 1.3 0 0 0-.087-.403.73.73 0 0 0-.23-.322q-.158-.126-.431-.126a.71.71 0 0 0-.595.302 1.1 1.1 0 0 0-.17.365q-.06.216-.06.498v.12q0 .222.06.417.063.193.181.34.12.147.29.23a.9.9 0 0 0 .392.083.9.9 0 0 0 .477-.115q.196-.114.342-.307l.323.256a1.5 1.5 0 0 1-.256.29 1.2 1.2 0 0 1-.383.224 1.5 1.5 0 0 1-.532.087m5.128-.59v-1.602a.65.65 0 0 0-.074-.319.5.5 0 0 0-.219-.213.8.8 0 0 0-.362-.075.85.85 0 0 0-.354.069.6.6 0 0 0-.236.181.4.4 0 0 0-.084.242h-.532q0-.167.087-.331a1 1 0 0 1 .247-.296q.165-.135.391-.213.23-.081.512-.081.34 0 .599.116.261.114.408.348.15.23.15.578v1.449q0 .156.025.331.03.176.084.302v.046h-.555a1 1 0 0 1-.064-.244 2 2 0 0 1-.023-.288m.092-1.355.006.374h-.538a2 2 0 0 0-.405.038.9.9 0 0 0-.3.106.482.482 0 0 0-.247.431.55.55 0 0 0 .066.268.5.5 0 0 0 .199.193q.135.069.33.069a.894.894 0 0 0 .728-.357.54.54 0 0 0 .121-.29l.227.256a.8.8 0 0 1-.109.267 1.27 1.27 0 0 1-.59.503 1.1 1.1 0 0 1-.454.087q-.317 0-.555-.124a.95.95 0 0 1-.368-.331.9.9 0 0 1-.13-.469q0-.25.098-.44a.85.85 0 0 1 .282-.319q.184-.129.443-.196.258-.066.578-.066zm3.182 1.168v-2.393h.535v3.112h-.51zm.1-.656.222-.005q0 .31-.066.575a1.2 1.2 0 0 1-.207.454 1 1 0 0 1-.377.302 1.4 1.4 0 0 1-.567.107q-.227 0-.417-.066a.85.85 0 0 1-.532-.564 1.7 1.7 0 0 1-.072-.532v-2.008h.532v2.013q0 .21.046.348a.6.6 0 0 0 .13.216.5.5 0 0 0 .184.109q.103.032.213.032.339 0 .537-.129a.74.74 0 0 0 .285-.354q.09-.225.09-.498m2.549-1.737v.408h-1.683v-.408zm-1.114-.756h.533v3.097q0 .159.049.239a.23.23 0 0 0 .126.106.5.5 0 0 0 .167.026q.066 0 .138-.011l.112-.023.003.434a1 1 0 0 1-.167.038q-.1.02-.244.02a.8.8 0 0 1-.36-.078.58.58 0 0 1-.262-.259 1.1 1.1 0 0 1-.094-.495zm1.54 2.347v-.067q0-.336.097-.624a1.5 1.5 0 0 1 .282-.503 1.3 1.3 0 0 1 .446-.334q.261-.12.587-.121.327 0 .59.121.264.118.448.334.188.213.285.503.097.288.097.624v.067q0 .336-.097.624-.098.287-.285.503a1.3 1.3 0 0 1-.446.334 1.4 1.4 0 0 1-.587.118 1.4 1.4 0 0 1-.59-.118 1.3 1.3 0 0 1-.448-.334 1.5 1.5 0 0 1-.282-.503 2 2 0 0 1-.098-.624m.531-.067v.067q0 .233.055.44.055.204.164.362a.8.8 0 0 0 .28.25q.166.09.387.089a.8.8 0 0 0 .383-.089.8.8 0 0 0 .276-.25q.109-.158.164-.362a1.6 1.6 0 0 0 .058-.44v-.067q0-.23-.058-.434a1.1 1.1 0 0 0-.167-.365.768.768 0 0 0-.662-.345.8.8 0 0 0-.385.092.8.8 0 0 0-.276.253 1.2 1.2 0 0 0-.164.365 1.7 1.7 0 0 0-.055.434m3.498-.906v2.494h-.535v-3.112h.506zm-.11.82-.247-.008q.003-.32.084-.59.08-.273.239-.475.157-.2.394-.31.236-.113.546-.113.219 0 .403.064a.81.81 0 0 1 .529.532q.075.207.075.5v2.074h-.532v-2.048a.8.8 0 0 0-.084-.391.48.48 0 0 0-.23-.213.8.8 0 0 0-.35-.069.83.83 0 0 0-.395.084.66.66 0 0 0-.253.23q-.095.146-.138.336-.04.187-.04.397m2.017-.293-.357.109q.003-.257.084-.492.083-.236.239-.42.157-.183.388-.29.23-.11.526-.11.25 0 .443.067a.8.8 0 0 1 .328.204q.135.135.204.348.07.213.07.506v2.045h-.536v-2.051a.8.8 0 0 0-.083-.405.43.43 0 0 0-.23-.204.9.9 0 0 0-.351-.061q-.175 0-.31.061a.6.6 0 0 0-.228.166.7.7 0 0 0-.141.239.9.9 0 0 0-.046.288m4.565 1.435v-1.602a.65.65 0 0 0-.075-.319.5.5 0 0 0-.219-.213.8.8 0 0 0-.362-.075.85.85 0 0 0-.354.069.6.6 0 0 0-.236.181.4.4 0 0 0-.083.242h-.532q0-.167.086-.331a1 1 0 0 1 .247-.296q.165-.135.392-.213.23-.081.511-.081.34 0 .599.116.261.114.408.348.15.23.15.578v1.449q0 .156.026.331.029.176.083.302v.046h-.555a1 1 0 0 1-.063-.244 2 2 0 0 1-.023-.288m.092-1.355.006.374h-.538q-.228 0-.406.038a.9.9 0 0 0-.3.106.482.482 0 0 0-.247.431.55.55 0 0 0 .067.268.5.5 0 0 0 .198.193q.135.069.331.069a.895.895 0 0 0 .728-.357.54.54 0 0 0 .12-.29l.228.256a.8.8 0 0 1-.11.267 1.27 1.27 0 0 1-.59.503 1.1 1.1 0 0 1-.454.087q-.316 0-.555-.124a.95.95 0 0 1-.368-.331.9.9 0 0 1-.13-.469q0-.25.098-.44a.85.85 0 0 1 .282-.319q.184-.129.443-.196.259-.066.578-.066zm2.58-1.225v.408h-1.683v-.408zm-1.113-.756h.532v3.097q0 .159.049.239a.23.23 0 0 0 .126.106.5.5 0 0 0 .167.026q.066 0 .138-.011l.112-.023.003.434a1 1 0 0 1-.167.038q-.1.02-.244.02a.8.8 0 0 1-.36-.078.58.58 0 0 1-.261-.259 1.1 1.1 0 0 1-.095-.495zm2.315.756v3.112h-.535v-3.112zm-.575-.825q0-.13.077-.219.081-.09.236-.089.153 0 .233.089a.3.3 0 0 1 .084.219.3.3 0 0 1-.084.212q-.08.087-.233.087-.155 0-.236-.087a.31.31 0 0 1-.077-.212m2.675 3.557a.8.8 0 0 0 .351-.077.7.7 0 0 0 .264-.213.6.6 0 0 0 .118-.314h.506a.94.94 0 0 1-.187.515 1.3 1.3 0 0 1-.445.383 1.3 1.3 0 0 1-.607.144 1.4 1.4 0 0 1-.613-.124 1.2 1.2 0 0 1-.431-.339 1.5 1.5 0 0 1-.256-.495 2 2 0 0 1-.084-.596v-.12q0-.314.084-.593.086-.282.256-.497.173-.216.431-.34a1.4 1.4 0 0 1 .613-.124q.365 0 .638.15.273.147.429.403.158.252.172.575h-.506a.8.8 0 0 0-.109-.348.7.7 0 0 0-.253-.247.7.7 0 0 0-.371-.095q-.244 0-.412.097a.7.7 0 0 0-.261.259q-.096.162-.138.36-.04.196-.041.4v.12q0 .205.041.403.04.198.135.36a.76.76 0 0 0 .262.259.83.83 0 0 0 .414.094m3.673-.152v-1.602a.65.65 0 0 0-.075-.319.5.5 0 0 0-.219-.213.8.8 0 0 0-.362-.075.85.85 0 0 0-.354.069.63.63 0 0 0-.236.181.4.4 0 0 0-.083.242h-.532a.7.7 0 0 1 .086-.331 1 1 0 0 1 .247-.296q.164-.135.392-.213.23-.081.512-.081.339 0 .598.116a.9.9 0 0 1 .408.348q.15.23.15.578v1.449q0 .156.026.331a1.3 1.3 0 0 0 .083.302v.046h-.555a1 1 0 0 1-.063-.244 2 2 0 0 1-.023-.288m.092-1.355.006.374h-.538a2 2 0 0 0-.406.038 1 1 0 0 0-.299.106.484.484 0 0 0-.247.431q0 .147.066.268t.198.193q.135.069.331.069a.9.9 0 0 0 .728-.357.55.55 0 0 0 .121-.29l.227.256a.8.8 0 0 1-.11.267 1.27 1.27 0 0 1-.589.503 1.1 1.1 0 0 1-.455.087q-.317 0-.555-.124a.95.95 0 0 1-.368-.331.9.9 0 0 1-.129-.469q0-.25.097-.44a.86.86 0 0 1 .282-.319q.185-.129.443-.196.26-.066.578-.066zm1.855-2.531v4.418h-.535v-4.418zm1.432 0v4.418h-.535v-4.418zm1.729 4.096.866-2.79h.569l-1.248 3.593a2 2 0 0 1-.115.247q-.069.135-.178.256a.84.84 0 0 1-.791.256 2 2 0 0 1-.138-.029l-.003-.431.072.005.072.006q.18 0 .307-.049a.45.45 0 0 0 .213-.158 1 1 0 0 0 .153-.302zm-.636-2.79.809 2.416.138.561-.383.196-1.145-3.173zm5.258 2.732a.8.8 0 0 0 .351-.077.7.7 0 0 0 .265-.213.6.6 0 0 0 .118-.314h.506a.95.95 0 0 1-.187.515 1.291 1.291 0 0 1-1.053.527q-.351 0-.612-.124a1.2 1.2 0 0 1-.432-.339 1.5 1.5 0 0 1-.256-.495 2.1 2.1 0 0 1-.083-.596v-.12q0-.314.083-.593.087-.282.256-.497.172-.216.432-.34.261-.123.612-.124.366 0 .639.15.273.147.428.403.158.252.173.575h-.506a.8.8 0 0 0-.11-.348.67.67 0 0 0-.253-.247.7.7 0 0 0-.371-.095q-.244 0-.411.097a.73.73 0 0 0-.262.259 1.2 1.2 0 0 0-.138.36q-.04.196-.04.4v.12q0 .205.04.403t.135.36a.8.8 0 0 0 .262.259.83.83 0 0 0 .414.094m1.697-1.141v-.067q0-.336.098-.624.098-.29.282-.503a1.3 1.3 0 0 1 .446-.334q.261-.12.587-.121.328 0 .589.121.265.118.449.334.187.213.285.503.097.288.097.624v.067q0 .336-.097.624a1.5 1.5 0 0 1-.285.503 1.3 1.3 0 0 1-1.033.452q-.328 0-.589-.118a1.3 1.3 0 0 1-.449-.334 1.5 1.5 0 0 1-.282-.503 2 2 0 0 1-.098-.624m.532-.067v.067q0 .233.055.44.055.204.164.362a.8.8 0 0 0 .279.25q.167.09.388.089a.8.8 0 0 0 .383-.089.8.8 0 0 0 .276-.25 1.1 1.1 0 0 0 .164-.362q.057-.207.057-.44v-.067q0-.23-.057-.434a1.1 1.1 0 0 0-.167-.365.767.767 0 0 0-.661-.345.8.8 0 0 0-.386.092.8.8 0 0 0-.276.253 1.2 1.2 0 0 0-.164.365 1.7 1.7 0 0 0-.055.434m3.501-.86v2.448h-.532v-3.112h.503zm-.127.774-.221-.008q.002-.32.095-.59.091-.273.259-.475.166-.2.397-.31.232-.113.514-.113.23 0 .415.064.183.06.313.195.132.135.201.351.069.213.069.521v2.039h-.534v-2.045a.9.9 0 0 0-.072-.391.44.44 0 0 0-.21-.216.76.76 0 0 0-.34-.069.8.8 0 0 0-.362.084.84.84 0 0 0-.279.23q-.115.146-.181.336a1.2 1.2 0 0 0-.064.397m3.561 1.674h-.532v-3.382q0-.354.138-.599a.9.9 0 0 1 .394-.371q.256-.126.607-.126.207 0 .406.052.198.048.408.123l-.089.449a3 3 0 0 0-.308-.098 1.4 1.4 0 0 0-.38-.049q-.342 0-.494.156-.15.152-.15.463zm.636-3.112v.408h-1.66v-.408zm1.047 0v3.112h-.532v-3.112zm1.406.489v2.623h-.532v-3.112h.518zm.973-.506-.003.494a1.277 1.277 0 0 0-.259-.023.9.9 0 0 0-.325.058.7.7 0 0 0-.239.161.8.8 0 0 0-.155.247 1.2 1.2 0 0 0-.072.311l-.15.086q0-.282.055-.529.058-.248.175-.437a.86.86 0 0 1 .299-.299.84.84 0 0 1 .674-.069m1.021.635v2.494h-.535v-3.112h.506zm-.11.82-.247-.008q.003-.32.083-.59.081-.273.239-.475.159-.2.394-.31.236-.113.547-.113.218 0 .402.064a.82.82 0 0 1 .53.532q.074.207.074.5v2.074h-.532v-2.048a.8.8 0 0 0-.083-.391.48.48 0 0 0-.23-.213.8.8 0 0 0-.351-.069.83.83 0 0 0-.394.084.65.65 0 0 0-.253.23 1 1 0 0 0-.138.336 2 2 0 0 0-.041.397m2.017-.293-.357.109q.003-.257.083-.492a1.4 1.4 0 0 1 .239-.42q.159-.183.388-.29.23-.11.527-.11.25 0 .443.067.195.066.328.204.135.135.204.348t.069.506v2.045h-.535v-2.051a.8.8 0 0 0-.084-.405.43.43 0 0 0-.23-.204.9.9 0 0 0-.351-.061.7.7 0 0 0-.31.061.6.6 0 0 0-.227.166.7.7 0 0 0-.141.239.9.9 0 0 0-.046.288m4.021 2.025q-.326 0-.59-.11a1.3 1.3 0 0 1-.452-.313 1.4 1.4 0 0 1-.287-.478 1.8 1.8 0 0 1-.101-.604v-.12q0-.38.112-.676.113-.3.305-.507a1.3 1.3 0 0 1 .437-.313q.245-.107.507-.107.333 0 .575.116.244.114.4.322.155.204.23.483.075.276.075.604v.239h-2.324v-.435h1.791v-.04a1.3 1.3 0 0 0-.086-.403.73.73 0 0 0-.23-.322q-.158-.126-.431-.126a.71.71 0 0 0-.596.302 1.1 1.1 0 0 0-.169.365q-.061.216-.061.498v.12q0 .222.061.417.063.193.181.34.12.147.29.23a.9.9 0 0 0 .391.083.93.93 0 0 0 .478-.115q.195-.114.342-.307l.322.256a1.5 1.5 0 0 1-.256.29 1.2 1.2 0 0 1-.382.224q-.225.087-.532.087m3.793-.662v-3.814h.535v4.418h-.489zm-2.093-.917v-.061q0-.356.086-.647a1.6 1.6 0 0 1 .25-.503q.164-.21.388-.322.228-.116.507-.116.293 0 .512.104a1 1 0 0 1 .373.296q.156.193.245.466.089.274.124.619v.264a2.7 2.7 0 0 1-.124.616 1.4 1.4 0 0 1-.245.466 1 1 0 0 1-.373.296 1.25 1.25 0 0 1-.518.101 1.08 1.08 0 0 1-.889-.449 1.6 1.6 0 0 1-.25-.5 2.2 2.2 0 0 1-.086-.63m.535-.061v.061q0 .233.046.437.048.204.149.359a.75.75 0 0 0 .256.245.76.76 0 0 0 .371.086.77.77 0 0 0 .434-.112.84.84 0 0 0 .277-.296q.103-.184.161-.4v-.693a1.5 1.5 0 0 0-.101-.305 1 1 0 0 0-.167-.265.7.7 0 0 0-.25-.187.8.8 0 0 0-.348-.069.74.74 0 0 0-.377.092.74.74 0 0 0-.256.248 1.1 1.1 0 0 0-.149.362 2 2 0 0 0-.046.437m-106.9 10.03.799-2.56h.35l-.068.509-.814 2.603h-.343zm-.539-2.56.682 2.589.049.523h-.36l-.903-3.112zm2.454 2.569.65-2.569h.529l-.903 3.112h-.357zm-.688-2.569.783 2.517.089.595h-.34l-.837-2.609-.069-.503zm2.946-1.306v4.418h-.532v-4.418zm-.127 2.744-.221-.008q.003-.32.095-.59.09-.273.258-.475a1.16 1.16 0 0 1 .912-.423q.231 0 .414.064.185.06.314.195a.9.9 0 0 1 .201.351q.07.213.07.521v2.039h-.536v-2.045a.9.9 0 0 0-.072-.391.44.44 0 0 0-.21-.216.75.75 0 0 0-.339-.069.8.8 0 0 0-.362.084.9.9 0 0 0-.28.23 1.15 1.15 0 0 0-.244.733m3.417-1.438v3.112h-.535v-3.112zm-.575-.825a.32.32 0 0 1 .078-.219q.08-.09.235-.089.153 0 .233.089a.3.3 0 0 1 .084.219.3.3 0 0 1-.084.212q-.08.087-.233.087-.155 0-.236-.087a.3.3 0 0 1-.077-.212m2.008-.481v4.418h-.536v-4.418zm2.145 4.476q-.324 0-.59-.11a1.3 1.3 0 0 1-.451-.313 1.4 1.4 0 0 1-.288-.478 1.8 1.8 0 0 1-.1-.604v-.12q0-.38.112-.676.112-.3.305-.507.192-.207.437-.313t.506-.107q.334 0 .576.116.244.114.4.322.155.204.23.483.075.276.074.604v.239h-2.324v-.435h1.792v-.04a1.3 1.3 0 0 0-.086-.403.73.73 0 0 0-.23-.322q-.159-.126-.432-.126a.71.71 0 0 0-.595.302 1.1 1.1 0 0 0-.17.365q-.06.216-.06.498v.12q0 .222.06.417.063.193.181.34.121.147.29.23a.9.9 0 0 0 .392.083.9.9 0 0 0 .477-.115q.196-.114.343-.307l.322.256a1.5 1.5 0 0 1-.256.29 1.2 1.2 0 0 1-.383.224 1.5 1.5 0 0 1-.532.087m4.597-3.17v.408h-1.683v-.408zm-1.114-.756h.533v3.097q0 .159.048.239a.23.23 0 0 0 .127.106.5.5 0 0 0 .167.026q.066 0 .138-.011l.112-.023.003.434a1 1 0 0 1-.167.038q-.101.02-.244.02a.8.8 0 0 1-.36-.078.58.58 0 0 1-.262-.259 1.1 1.1 0 0 1-.095-.495zm2.27-.55v4.418h-.532v-4.418zm-.127 2.744-.221-.008a1.9 1.9 0 0 1 .095-.59q.091-.273.259-.475a1.16 1.16 0 0 1 .911-.423q.231 0 .414.064.185.06.314.195a.9.9 0 0 1 .201.351q.07.213.07.521v2.039h-.536v-2.045a.9.9 0 0 0-.072-.391.44.44 0 0 0-.21-.216.75.75 0 0 0-.339-.069.8.8 0 0 0-.362.084.9.9 0 0 0-.28.23 1.15 1.15 0 0 0-.244.733m3.417-1.438v3.112h-.535v-3.112zm-.575-.825a.32.32 0 0 1 .078-.219q.08-.09.236-.089.152 0 .232.089a.3.3 0 0 1 .084.219.3.3 0 0 1-.084.212q-.08.087-.232.087-.156 0-.236-.087a.3.3 0 0 1-.078-.212m3.242 3.112a.45.45 0 0 0-.052-.213.44.44 0 0 0-.204-.181 1.7 1.7 0 0 0-.46-.144 4 4 0 0 1-.47-.13 1.4 1.4 0 0 1-.353-.181.8.8 0 0 1-.222-.25.783.783 0 0 1 .003-.685.9.9 0 0 1 .233-.29q.153-.127.365-.199.213-.072.475-.072.374 0 .639.133a1 1 0 0 1 .405.354q.141.218.141.486h-.532a.46.46 0 0 0-.078-.251.6.6 0 0 0-.221-.204.7.7 0 0 0-.354-.08.8.8 0 0 0-.36.069.46.46 0 0 0-.198.169.43.43 0 0 0-.032.374.34.34 0 0 0 .11.124 1 1 0 0 0 .218.104q.141.049.36.097.383.087.63.207.247.121.368.297.12.176.12.425a.838.838 0 0 1-.33.668q-.158.12-.38.19a1.7 1.7 0 0 1-.491.066q-.412 0-.697-.147a1.1 1.1 0 0 1-.431-.38.9.9 0 0 1-.147-.492h.535q.012.219.127.349.115.126.282.181.166.051.33.051.219 0 .366-.057a.5.5 0 0 0 .227-.158.37.37 0 0 0 .078-.23m4.654.221v-3.814h.535v4.418h-.49zm-2.094-.917v-.061q0-.356.086-.647.09-.294.25-.503.165-.21.388-.322a1.1 1.1 0 0 1 .507-.116q.293 0 .512.104a1 1 0 0 1 .373.296q.156.193.245.466.089.274.124.619v.264a2.7 2.7 0 0 1-.124.616q-.09.273-.245.466a1 1 0 0 1-.373.296q-.222.1-.518.101-.274 0-.5-.118a1.2 1.2 0 0 1-.389-.331 1.6 1.6 0 0 1-.25-.5 2.2 2.2 0 0 1-.087-.63m.534-.061v.061q0 .233.047.437.048.204.15.359a.75.75 0 0 0 .255.245.76.76 0 0 0 .371.086.77.77 0 0 0 .434-.112.84.84 0 0 0 .277-.296q.103-.184.16-.4v-.693a1.5 1.5 0 0 0-.1-.305 1 1 0 0 0-.167-.265.7.7 0 0 0-.25-.187.8.8 0 0 0-.348-.069.74.74 0 0 0-.377.092.74.74 0 0 0-.256.248 1.1 1.1 0 0 0-.15.362 2 2 0 0 0-.046.437m4.214 1.64q-.324 0-.59-.11a1.3 1.3 0 0 1-.45-.313 1.4 1.4 0 0 1-.289-.478 1.8 1.8 0 0 1-.1-.604v-.12q0-.38.112-.676.112-.3.305-.507.192-.207.437-.313t.506-.107q.335 0 .576.116.244.114.4.322.155.204.23.483.075.276.074.604v.239H61.08v-.435h1.792v-.04a1.3 1.3 0 0 0-.086-.403.73.73 0 0 0-.23-.322q-.159-.126-.432-.126a.71.71 0 0 0-.595.302q-.11.149-.17.365t-.06.498v.12q0 .222.06.417.064.193.181.34a.9.9 0 0 0 .29.23.9.9 0 0 0 .392.083.9.9 0 0 0 .478-.115q.195-.114.342-.307l.322.256a1.5 1.5 0 0 1-.256.29 1.2 1.2 0 0 1-.383.224 1.5 1.5 0 0 1-.532.087m2.738-.538.852-2.632h.544l-1.12 3.112h-.356zm-.71-2.632.877 2.646.06.466h-.356l-1.127-3.112zm3.196 0v3.112h-.535v-3.112zm-.576-.825a.32.32 0 0 1 .078-.219q.08-.09.236-.089.153 0 .233.089a.3.3 0 0 1 .083.219.3.3 0 0 1-.083.212q-.081.087-.233.087-.155 0-.236-.087a.3.3 0 0 1-.078-.212m2.675 3.557a.8.8 0 0 0 .351-.077.7.7 0 0 0 .265-.213.6.6 0 0 0 .118-.314h.506a.95.95 0 0 1-.187.515 1.27 1.27 0 0 1-1.053.527q-.351 0-.612-.124a1.2 1.2 0 0 1-.432-.339 1.5 1.5 0 0 1-.256-.495 2 2 0 0 1-.083-.596v-.12q0-.314.083-.593a1.5 1.5 0 0 1 .256-.497 1.2 1.2 0 0 1 .432-.34q.261-.123.612-.124.366 0 .639.15.273.147.428.403.158.252.173.575h-.506a.8.8 0 0 0-.11-.348.7.7 0 0 0-.253-.247.7.7 0 0 0-.37-.095q-.245 0-.412.097a.73.73 0 0 0-.262.259q-.094.162-.138.36a2 2 0 0 0-.04.4v.12q0 .205.04.403t.135.36a.76.76 0 0 0 .262.259.83.83 0 0 0 .414.094m3.13.438q-.325 0-.59-.11a1.3 1.3 0 0 1-.452-.313 1.4 1.4 0 0 1-.287-.478 1.8 1.8 0 0 1-.1-.604v-.12q0-.38.111-.676.113-.3.305-.507.193-.207.438-.313.244-.107.506-.107.333 0 .575.116.244.114.4.322.155.204.23.483.075.276.075.604v.239h-2.324v-.435h1.792v-.04a1.3 1.3 0 0 0-.087-.403.73.73 0 0 0-.23-.322q-.159-.126-.431-.126a.71.71 0 0 0-.595.302q-.11.149-.17.365t-.06.498v.12q0 .222.06.417.063.193.18.34.121.147.291.23a.9.9 0 0 0 .392.083.9.9 0 0 0 .477-.115q.196-.114.342-.307l.322.256a1.5 1.5 0 0 1-.256.29 1.2 1.2 0 0 1-.382.224 1.5 1.5 0 0 1-.532.087m3.871-3.17v3.112h-.535v-3.112zm-.575-.825a.32.32 0 0 1 .078-.219q.08-.09.235-.089.153 0 .233.089a.3.3 0 0 1 .084.219.3.3 0 0 1-.084.212q-.079.087-.233.087t-.235-.087a.3.3 0 0 1-.078-.212m3.242 3.112a.45.45 0 0 0-.052-.213.44.44 0 0 0-.204-.181 1.7 1.7 0 0 0-.46-.144 4 4 0 0 1-.47-.13 1.4 1.4 0 0 1-.353-.181.8.8 0 0 1-.222-.25.783.783 0 0 1 .003-.685.9.9 0 0 1 .233-.29q.153-.127.365-.199.213-.072.475-.072.375 0 .638.133a1 1 0 0 1 .406.354q.141.218.141.486h-.532a.46.46 0 0 0-.078-.251.6.6 0 0 0-.221-.204.7.7 0 0 0-.354-.08.8.8 0 0 0-.36.069.46.46 0 0 0-.198.169.43.43 0 0 0-.032.374.34.34 0 0 0 .11.124 1 1 0 0 0 .218.104q.141.049.36.097.382.087.63.207.247.121.368.297.12.176.12.425a.837.837 0 0 1-.33.668q-.158.12-.38.19a1.7 1.7 0 0 1-.492.066q-.411 0-.696-.147a1.1 1.1 0 0 1-.431-.38.9.9 0 0 1-.147-.492h.535q.012.219.127.349.114.126.282.181.166.051.33.051.219 0 .366-.057a.5.5 0 0 0 .227-.158.37.37 0 0 0 .078-.23m4.596.106v-2.393h.535v3.112h-.51zm.1-.656.222-.005q0 .31-.066.575a1.2 1.2 0 0 1-.207.454 1 1 0 0 1-.377.302 1.4 1.4 0 0 1-.567.107q-.227 0-.417-.066a.85.85 0 0 1-.532-.564 1.7 1.7 0 0 1-.072-.532v-2.008h.532v2.013q0 .21.046.348a.6.6 0 0 0 .13.216.5.5 0 0 0 .184.109q.104.032.213.032.339 0 .538-.129a.74.74 0 0 0 .284-.354q.09-.225.09-.498m1.778-1.073v2.448h-.532v-3.112h.503zm-.126.774-.222-.008a1.9 1.9 0 0 1 .095-.59q.092-.273.259-.475a1.16 1.16 0 0 1 .912-.423q.23 0 .414.064.184.06.313.195.133.135.202.351.069.213.069.521v2.039h-.535v-2.045a.9.9 0 0 0-.072-.391.44.44 0 0 0-.21-.216.75.75 0 0 0-.34-.069.8.8 0 0 0-.362.084.9.9 0 0 0-.279.23 1.15 1.15 0 0 0-.244.733m3.428-2.744v4.418h-.535v-4.418zm.713 2.897v-.067q0-.336.098-.624a1.5 1.5 0 0 1 .282-.503 1.3 1.3 0 0 1 .446-.334q.261-.12.587-.121a1.4 1.4 0 0 1 .59.121q.264.118.448.334.188.213.285.503.098.288.098.624v.067q0 .336-.098.624a1.5 1.5 0 0 1-.285.503 1.3 1.3 0 0 1-.446.334 1.4 1.4 0 0 1-.587.118 1.4 1.4 0 0 1-.59-.118 1.3 1.3 0 0 1-.448-.334 1.5 1.5 0 0 1-.282-.503 2 2 0 0 1-.098-.624m.532-.067v.067q0 .233.055.44.055.204.164.362a.8.8 0 0 0 .28.25q.166.09.387.089a.8.8 0 0 0 .383-.089.8.8 0 0 0 .276-.25q.11-.158.164-.362.057-.207.058-.44v-.067q0-.23-.058-.434a1.1 1.1 0 0 0-.167-.365.768.768 0 0 0-.662-.345.8.8 0 0 0-.385.092.8.8 0 0 0-.276.253 1.2 1.2 0 0 0-.164.365 1.7 1.7 0 0 0-.055.434m4.214 1.208a.8.8 0 0 0 .351-.077.7.7 0 0 0 .265-.213.6.6 0 0 0 .118-.314h.506a.95.95 0 0 1-.187.515 1.293 1.293 0 0 1-1.053.527q-.351 0-.612-.124a1.2 1.2 0 0 1-.432-.339 1.5 1.5 0 0 1-.256-.495 2 2 0 0 1-.083-.596v-.12q0-.314.083-.593a1.5 1.5 0 0 1 .256-.497 1.2 1.2 0 0 1 .432-.34q.261-.123.612-.124.366 0 .639.15.273.147.428.403.158.252.173.575h-.506a.8.8 0 0 0-.11-.348.7.7 0 0 0-.253-.247.7.7 0 0 0-.37-.095q-.245 0-.412.097a.73.73 0 0 0-.262.259q-.095.162-.138.36-.04.196-.04.4v.12q0 .205.04.403t.135.36a.76.76 0 0 0 .262.259.83.83 0 0 0 .414.094m2.373-4.038v4.418h-.535v-4.418zm1.901 1.306-1.357 1.453-.76.788-.043-.567.544-.65.966-1.024zm-.486 3.112-1.11-1.484.276-.475 1.461 1.959zm2.27.058a1.5 1.5 0 0 1-.59-.11 1.3 1.3 0 0 1-.451-.313 1.4 1.4 0 0 1-.288-.478 1.8 1.8 0 0 1-.1-.604v-.12q0-.38.111-.676.113-.3.305-.507.194-.207.438-.313t.506-.107q.333 0 .575.116.244.114.4.322.155.204.23.483.075.276.075.604v.239h-2.324v-.435h1.792v-.04a1.3 1.3 0 0 0-.087-.403.73.73 0 0 0-.23-.322q-.158-.126-.431-.126a.711.711 0 0 0-.596.302q-.109.149-.17.365-.06.216-.06.498v.12q0 .222.06.417.064.193.182.34a.9.9 0 0 0 .29.23.9.9 0 0 0 .392.083.9.9 0 0 0 .477-.115q.195-.114.342-.307l.322.256a1.5 1.5 0 0 1-.256.29 1.2 1.2 0 0 1-.382.224q-.225.087-.532.087m3.794-.662v-3.814h.535v4.418h-.489zm-2.094-.917v-.061q0-.356.086-.647a1.6 1.6 0 0 1 .25-.503q.164-.21.388-.322.228-.116.507-.116.293 0 .512.104a1 1 0 0 1 .374.296q.155.193.244.466.09.274.124.619v.264a2.7 2.7 0 0 1-.124.616 1.5 1.5 0 0 1-.244.466 1.04 1.04 0 0 1-.374.296 1.25 1.25 0 0 1-.518.101 1.08 1.08 0 0 1-.889-.449 1.6 1.6 0 0 1-.25-.5 2.2 2.2 0 0 1-.086-.63m.535-.061v.061q0 .233.046.437.048.204.149.359a.75.75 0 0 0 .256.245.76.76 0 0 0 .371.086.77.77 0 0 0 .435-.112.84.84 0 0 0 .276-.296q.103-.184.161-.4v-.693a1.5 1.5 0 0 0-.101-.305 1 1 0 0 0-.167-.265.7.7 0 0 0-.25-.187.8.8 0 0 0-.348-.069.74.74 0 0 0-.377.092.74.74 0 0 0-.256.248 1.1 1.1 0 0 0-.149.362 2 2 0 0 0-.046.437m2.931 1.3q0-.135.083-.227a.32.32 0 0 1 .247-.095q.162 0 .245.095a.32.32 0 0 1 .086.227.32.32 0 0 1-.086.225q-.083.092-.245.092a.32.32 0 0 1-.247-.092.32.32 0 0 1-.083-.225"/><path class="tw-fill-background" d="M20.84 126.475h144.32v64.661H20.84z"/><rect width="124.124" height="16.049" x="30.939" y="129.842" class="tw-fill-secondary-500" rx="4.039"/><path class="tw-fill-background" d="M83.974 134.58v4.786h-.983v-4.786zm1.473 0v.772h-3.905v-.772zm2.357 3.935v-2.706h.947v3.557h-.891zm.105-.73.28-.007q0 .355-.083.661a1.6 1.6 0 0 1-.246.526q-.165.22-.414.345a1.3 1.3 0 0 1-.589.122q-.26 0-.48-.072a1 1 0 0 1-.374-.234 1.1 1.1 0 0 1-.244-.411 1.9 1.9 0 0 1-.085-.608v-2.298h.947v2.305q0 .158.036.266a.5.5 0 0 0 .108.177.4.4 0 0 0 .161.099q.096.03.21.03.294 0 .46-.119a.62.62 0 0 0 .24-.322q.073-.207.073-.46m2.511-1.2v2.781h-.946v-3.557h.89zm1.072-.799-.016.878a2 2 0 0 0-.168-.016 2 2 0 0 0-.174-.01q-.2 0-.349.052a.6.6 0 0 0-.243.148.65.65 0 0 0-.145.24 1.2 1.2 0 0 0-.052.322l-.19-.059q0-.345.068-.634.07-.293.2-.51.135-.216.33-.335a.83.83 0 0 1 .443-.118q.08 0 .161.013.082.01.135.029m1.374.783v2.797h-.947v-3.557h.888zm-.138.894h-.256q0-.395.102-.71.102-.32.286-.543.183-.227.437-.345a1.3 1.3 0 0 1 .572-.121q.25 0 .457.072a.9.9 0 0 1 .355.23q.15.158.23.417.082.26.082.635v2.268h-.953v-2.271a.84.84 0 0 0-.066-.369.37.37 0 0 0-.194-.184.8.8 0 0 0-.309-.055.7.7 0 0 0-.332.075.7.7 0 0 0-.23.21 1 1 0 0 0-.135.309q-.046.178-.046.382m4.51.161v-.069q0-.392.112-.72.111-.332.325-.575t.526-.378q.313-.138.717-.138.405 0 .72.138.315.135.529.378.217.243.329.575.111.328.112.72v.069q0 .387-.112.72a1.7 1.7 0 0 1-.329.575 1.46 1.46 0 0 1-.526.378q-.312.135-.717.135t-.72-.135a1.5 1.5 0 0 1-.529-.378 1.7 1.7 0 0 1-.325-.575 2.3 2.3 0 0 1-.112-.72m.947-.069v.069q0 .223.04.417.039.195.124.342a.65.65 0 0 0 .23.227q.142.082.346.082a.66.66 0 0 0 .338-.082.6.6 0 0 0 .227-.227q.086-.147.125-.342.043-.194.043-.417v-.069a2 2 0 0 0-.043-.408 1.1 1.1 0 0 0-.128-.342.64.64 0 0 0-.227-.236.65.65 0 0 0-.342-.086.65.65 0 0 0-.342.086.7.7 0 0 0-.227.236 1.1 1.1 0 0 0-.125.342 2 2 0 0 0-.04.408m3.931-.986v2.797h-.946v-3.557h.887zm-.138.894h-.256q0-.395.102-.71.102-.32.286-.543.184-.227.437-.345a1.3 1.3 0 0 1 .572-.121q.25 0 .457.072a.9.9 0 0 1 .355.23q.151.158.23.417.082.26.082.635v2.268h-.953v-2.271a.84.84 0 0 0-.066-.369.37.37 0 0 0-.194-.184.8.8 0 0 0-.309-.055.7.7 0 0 0-.332.075.7.7 0 0 0-.23.21 1 1 0 0 0-.135.309q-.046.178-.046.382"/><rect width="123.283" height="15.208" x="31.359" y="149.677" class="tw-stroke-secondary-500" stroke-width=".842" rx="3.619"/><path class="tw-fill-secondary-500" d="M87.663 157.194h.982q-.03.483-.266.857-.233.375-.654.586-.418.21-1.006.21-.46 0-.825-.158a1.76 1.76 0 0 1-.625-.46 2 2 0 0 1-.39-.723q-.136-.425-.136-.95v-.332q0-.526.139-.95.14-.427.4-.727a1.8 1.8 0 0 1 .629-.46q.364-.16.815-.161.598 0 1.009.217.414.217.64.598.23.382.277.868h-.986a1.3 1.3 0 0 0-.115-.49.65.65 0 0 0-.3-.305q-.196-.106-.525-.106a.96.96 0 0 0-.43.092.8.8 0 0 0-.31.28 1.4 1.4 0 0 0-.187.473q-.06.283-.06.664v.339q.001.371.056.654a1.5 1.5 0 0 0 .171.473.8.8 0 0 0 .303.29 1 1 0 0 0 .45.095q.309 0 .51-.099a.68.68 0 0 0 .305-.292q.109-.195.129-.483m2.57-3.462v5.049h-.95v-5.049zm.631 3.307v-.069q0-.391.112-.72.112-.332.326-.575.213-.243.525-.378.313-.138.717-.138.405 0 .72.138.315.135.53.378t.328.575q.111.329.112.72v.069q0 .388-.112.72a1.7 1.7 0 0 1-.329.575 1.5 1.5 0 0 1-.526.378 1.8 1.8 0 0 1-.716.135q-.405 0-.72-.135a1.5 1.5 0 0 1-.53-.378 1.7 1.7 0 0 1-.325-.575 2.2 2.2 0 0 1-.112-.72m.947-.069v.069q0 .223.04.418.039.194.124.341.09.145.23.227.142.082.346.082a.66.66 0 0 0 .338-.082.6.6 0 0 0 .227-.227q.086-.147.125-.341.042-.195.043-.418v-.069a2 2 0 0 0-.043-.408 1.1 1.1 0 0 0-.128-.341.64.64 0 0 0-.227-.237.65.65 0 0 0-.342-.086.65.65 0 0 0-.342.086.7.7 0 0 0-.227.237 1.1 1.1 0 0 0-.124.341 2 2 0 0 0-.04.408m4.927.828a.3.3 0 0 0-.059-.184.5.5 0 0 0-.22-.151 2 2 0 0 0-.457-.131 4 4 0 0 1-.503-.148 1.8 1.8 0 0 1-.4-.221.84.84 0 0 1-.358-.706q-.002-.224.094-.421.1-.198.28-.349.183-.155.447-.239.266-.09.598-.089.463 0 .796.148.335.147.512.407a1 1 0 0 1 .181.585h-.947a.5.5 0 0 0-.059-.246.4.4 0 0 0-.177-.174.63.63 0 0 0-.31-.066.6.6 0 0 0-.272.056.4.4 0 0 0-.178.144.35.35 0 0 0-.026.346q.037.062.115.115t.204.098q.127.043.316.079.384.08.686.207.303.125.48.342.178.214.178.562a.9.9 0 0 1-.105.434q-.105.198-.303.345-.197.145-.473.227a2.2 2.2 0 0 1-.615.079q-.496 0-.841-.178a1.33 1.33 0 0 1-.52-.45 1.05 1.05 0 0 1-.174-.565h.897a.53.53 0 0 0 .1.312.54.54 0 0 0 .24.171 1 1 0 0 0 .318.053.8.8 0 0 0 .306-.05.43.43 0 0 0 .184-.138.33.33 0 0 0 .066-.204m3.173 1.049q-.414 0-.743-.131a1.6 1.6 0 0 1-.56-.372 1.7 1.7 0 0 1-.348-.549 1.9 1.9 0 0 1-.121-.67v-.132q0-.404.115-.74t.329-.581a1.4 1.4 0 0 1 .526-.378q.309-.135.697-.135.377 0 .67.125.292.124.49.355.2.23.302.552.102.319.102.71v.394h-2.827v-.631h1.897v-.072a.8.8 0 0 0-.072-.352.57.57 0 0 0-.211-.25.65.65 0 0 0-.361-.092.6.6 0 0 0-.323.083.6.6 0 0 0-.22.23 1.2 1.2 0 0 0-.125.348 2.2 2.2 0 0 0-.04.434v.132q0 .213.06.394.063.18.174.312a.8.8 0 0 0 .276.204q.165.072.372.072.257 0 .476-.098a1 1 0 0 0 .385-.306l.46.5q-.111.16-.305.309a1.7 1.7 0 0 1-.461.243 1.9 1.9 0 0 1-.614.092"/><path class="tw-fill-secondary-700" d="m41.003 177.374.834-3.524h.466l.107.587-.889 3.601h-.5zm-.428-3.524.69 3.524-.057.664h-.558l-.93-4.188zm2.568 3.509.682-3.509h.854l-.926 4.188h-.558zm-.578-3.509.84 3.538-.023.65h-.5l-.895-3.604.115-.584zm3.34-.23v4.418h-.829v-4.418zm-.118 2.753h-.228q.003-.325.087-.599.083-.276.238-.477.156-.205.371-.316a1.04 1.04 0 0 1 .484-.113q.23 0 .417.067a.8.8 0 0 1 .325.207.9.9 0 0 1 .213.371q.074.23.074.558v1.967h-.834v-1.973a.7.7 0 0 0-.06-.325.33.33 0 0 0-.17-.17.6.6 0 0 0-.27-.052.65.65 0 0 0-.305.067.5.5 0 0 0-.199.184.8.8 0 0 0-.109.27 1.5 1.5 0 0 0-.034.334m4.291.963v-1.386q0-.15-.049-.256a.36.36 0 0 0-.152-.17.5.5 0 0 0-.262-.06.54.54 0 0 0-.239.049.34.34 0 0 0-.155.135.37.37 0 0 0-.055.204h-.828q0-.198.092-.377a.9.9 0 0 1 .267-.313q.175-.138.417-.216.246-.078.547-.078.362 0 .644.121a1 1 0 0 1 .443.363q.165.241.164.604v1.331q0 .257.032.42.031.162.092.282v.049h-.837q-.06-.126-.092-.316a3 3 0 0 1-.029-.386m.11-1.193.005.468h-.463a1 1 0 0 0-.285.038.5.5 0 0 0-.198.106.4.4 0 0 0-.115.156.5.5 0 0 0-.035.195q0 .106.05.193.048.083.14.132a.5.5 0 0 0 .216.046.7.7 0 0 0 .325-.075.6.6 0 0 0 .213-.184.4.4 0 0 0 .08-.207l.219.351q-.045.118-.127.245a1.024 1.024 0 0 1-.489.42 1.1 1.1 0 0 1-.402.069q-.297 0-.538-.118a1 1 0 0 1-.38-.331.87.87 0 0 1-.138-.483q0-.245.092-.435a.85.85 0 0 1 .27-.319 1.3 1.3 0 0 1 .452-.198q.27-.069.627-.069zm2.887-1.217v.587h-1.812v-.587zm-1.363-.768h.828v2.942q0 .136.035.208a.2.2 0 0 0 .109.1.6.6 0 0 0 .181.026q.078 0 .138-.006.063-.008.107-.017l.002.61q-.105.035-.23.054a1.6 1.6 0 0 1-.273.021q-.273 0-.477-.09a.66.66 0 0 1-.31-.293 1.1 1.1 0 0 1-.11-.529zm4.981 3.178v-1.386q0-.15-.048-.256a.36.36 0 0 0-.153-.17.5.5 0 0 0-.262-.06.54.54 0 0 0-.238.049.34.34 0 0 0-.156.135.37.37 0 0 0-.054.204h-.829q0-.198.092-.377a.9.9 0 0 1 .268-.313q.175-.138.417-.216.244-.078.546-.078.363 0 .645.121a1 1 0 0 1 .443.363q.164.241.164.604v1.331q0 .257.031.42.032.162.092.282v.049h-.837q-.06-.126-.092-.316a3 3 0 0 1-.029-.386m.11-1.193.006.468h-.463a1 1 0 0 0-.285.038.5.5 0 0 0-.199.106.4.4 0 0 0-.115.156.5.5 0 0 0-.034.195q0 .106.049.193.049.083.14.132a.5.5 0 0 0 .216.046.7.7 0 0 0 .325-.075.6.6 0 0 0 .213-.184.4.4 0 0 0 .08-.207l.22.351q-.047.118-.127.245a1.022 1.022 0 0 1-.489.42 1.1 1.1 0 0 1-.403.069q-.296 0-.538-.118a1 1 0 0 1-.38-.331.87.87 0 0 1-.138-.483q0-.245.093-.435a.85.85 0 0 1 .27-.319q.18-.132.451-.198.27-.069.627-.069zm2.192-.538v2.433h-.829v-3.112h.78zm.937-.699-.014.768a2 2 0 0 0-.147-.015 2 2 0 0 0-.152-.008.9.9 0 0 0-.305.046.55.55 0 0 0-.213.129.6.6 0 0 0-.127.21 1 1 0 0 0-.046.282l-.166-.052q0-.302.06-.555.06-.255.175-.446a.9.9 0 0 1 .288-.293.73.73 0 0 1 .388-.104q.069 0 .141.012a.5.5 0 0 1 .118.026m1.766 3.19q-.362 0-.65-.115a1.4 1.4 0 0 1-.489-.325 1.5 1.5 0 0 1-.305-.481 1.6 1.6 0 0 1-.106-.587v-.115q0-.353.1-.647a1.5 1.5 0 0 1 .288-.509q.19-.216.46-.331.27-.118.61-.118.33 0 .587.11t.429.31q.175.202.264.484.09.279.09.621v.345h-2.474v-.552h1.66v-.064a.7.7 0 0 0-.064-.307.5.5 0 0 0-.184-.219.57.57 0 0 0-.316-.08.54.54 0 0 0-.282.071.56.56 0 0 0-.193.202 1.1 1.1 0 0 0-.11.305 2 2 0 0 0-.034.379v.115q0 .187.052.346a.9.9 0 0 0 .152.273.7.7 0 0 0 .242.178.8.8 0 0 0 .325.063q.225 0 .417-.086a.9.9 0 0 0 .337-.267l.402.437a1.2 1.2 0 0 1-.267.27 1.4 1.4 0 0 1-.403.213 1.7 1.7 0 0 1-.538.081m4.74-3.17v.587h-1.812v-.587zm-1.363-.768h.828v2.942q0 .136.035.208a.2.2 0 0 0 .11.1.6.6 0 0 0 .18.026q.078 0 .139-.006.063-.008.106-.017l.003.61a1.638 1.638 0 0 1-.503.075q-.274 0-.478-.09a.66.66 0 0 1-.31-.293 1.1 1.1 0 0 1-.11-.529zm2.643-.538v4.418h-.828v-4.418zm-.118 2.753h-.227q.002-.325.087-.599.083-.276.238-.477.156-.205.371-.316a1.04 1.04 0 0 1 .483-.113q.231 0 .417.067a.8.8 0 0 1 .326.207.9.9 0 0 1 .212.371q.075.23.075.558v1.967h-.834v-1.973a.7.7 0 0 0-.06-.325.33.33 0 0 0-.17-.17.6.6 0 0 0-.27-.052.65.65 0 0 0-.305.067.5.5 0 0 0-.199.184.8.8 0 0 0-.11.27 1.5 1.5 0 0 0-.034.334m4.044 1.723q-.362 0-.65-.115a1.4 1.4 0 0 1-.489-.325 1.5 1.5 0 0 1-.304-.481 1.6 1.6 0 0 1-.107-.587v-.115q0-.353.1-.647a1.5 1.5 0 0 1 .288-.509q.19-.216.46-.331a1.5 1.5 0 0 1 .61-.118q.332 0 .587.11.256.11.429.31.175.202.264.484.09.279.09.621v.345h-2.474v-.552h1.66v-.064a.7.7 0 0 0-.064-.307.5.5 0 0 0-.184-.219.57.57 0 0 0-.316-.08.54.54 0 0 0-.282.071.56.56 0 0 0-.193.202 1.1 1.1 0 0 0-.11.305 2 2 0 0 0-.034.379v.115q0 .187.052.346a.9.9 0 0 0 .153.273.7.7 0 0 0 .241.178.8.8 0 0 0 .325.063 1 1 0 0 0 .417-.086.9.9 0 0 0 .337-.267l.403.437a1.2 1.2 0 0 1-.268.27 1.4 1.4 0 0 1-.403.213 1.7 1.7 0 0 1-.538.081m4.045-2.572v3.711h-.829v-4.309h.768zm1.97.923v.061q0 .339-.08.63a1.6 1.6 0 0 1-.23.506 1.1 1.1 0 0 1-.38.334q-.225.118-.518.118-.285 0-.495-.115a1.04 1.04 0 0 1-.354-.323 1.9 1.9 0 0 1-.227-.486 4 4 0 0 1-.132-.592v-.158q.046-.34.132-.622.087-.284.227-.492.144-.209.351-.325.21-.114.492-.115.297 0 .52.113.228.111.38.322.155.21.233.5.08.291.08.644m-.831.061v-.061q0-.198-.035-.365a1 1 0 0 0-.104-.296.51.51 0 0 0-.457-.268.7.7 0 0 0-.29.055.5.5 0 0 0-.193.158.7.7 0 0 0-.112.248q-.037.144-.046.325v.399q.015.213.08.383a.6.6 0 0 0 .204.265.6.6 0 0 0 .363.097.5.5 0 0 0 .276-.071.55.55 0 0 0 .181-.205 1 1 0 0 0 .1-.299q.033-.17.033-.365m1.213.006v-.061q0-.342.098-.63.097-.29.285-.503a1.3 1.3 0 0 1 .46-.331q.273-.12.627-.121.354 0 .63.121.276.118.463.331.19.213.288.503.098.288.098.63v.061q0 .339-.098.63a1.5 1.5 0 0 1-.288.503 1.3 1.3 0 0 1-.46.331 1.6 1.6 0 0 1-.627.118q-.354 0-.63-.118a1.3 1.3 0 0 1-.463-.331 1.5 1.5 0 0 1-.285-.503 2 2 0 0 1-.098-.63m.829-.061v.061q0 .195.034.365.035.17.11.299a.6.6 0 0 0 .2.199.6.6 0 0 0 .303.071.6.6 0 0 0 .296-.071.55.55 0 0 0 .199-.199 1 1 0 0 0 .109-.299 1.7 1.7 0 0 0 .037-.365v-.061a1.6 1.6 0 0 0-.037-.356 1 1 0 0 0-.112-.3.56.56 0 0 0-.199-.207.6.6 0 0 0-.299-.074.6.6 0 0 0-.299.074.6.6 0 0 0-.198.207 1 1 0 0 0-.11.3q-.034.167-.034.356m4.153-1.527v.587h-1.812v-.587zm-1.363-.768h.828v2.942q0 .136.035.208a.2.2 0 0 0 .109.1.6.6 0 0 0 .181.026q.078 0 .138-.006.063-.008.107-.017l.002.61q-.105.035-.23.054a1.6 1.6 0 0 1-.273.021q-.273 0-.477-.09a.66.66 0 0 1-.31-.293 1.1 1.1 0 0 1-.11-.529zm3.267 3.938q-.362 0-.65-.115a1.4 1.4 0 0 1-.489-.325 1.5 1.5 0 0 1-.305-.481 1.6 1.6 0 0 1-.106-.587v-.115q0-.353.1-.647a1.5 1.5 0 0 1 .288-.509q.19-.216.46-.331.27-.118.61-.118.33 0 .587.11t.428.31q.177.202.265.484.09.279.09.621v.345H83.73v-.552h1.66v-.064a.7.7 0 0 0-.064-.307.5.5 0 0 0-.184-.219.57.57 0 0 0-.316-.08.54.54 0 0 0-.282.071.56.56 0 0 0-.193.202 1.1 1.1 0 0 0-.11.305 2 2 0 0 0-.034.379v.115q0 .187.052.346a.9.9 0 0 0 .152.273.7.7 0 0 0 .242.178.8.8 0 0 0 .325.063q.225 0 .417-.086a.9.9 0 0 0 .337-.267l.402.437a1.2 1.2 0 0 1-.267.27 1.4 1.4 0 0 1-.403.213 1.7 1.7 0 0 1-.538.081m2.56-2.506v2.448h-.828v-3.112h.776zm-.12.783h-.225q0-.345.09-.622.088-.279.25-.474.16-.198.382-.302.225-.107.5-.107.22 0 .4.064.182.063.31.201a.9.9 0 0 1 .202.365q.072.228.072.555v1.985h-.834v-1.987a.74.74 0 0 0-.058-.323.33.33 0 0 0-.17-.161.7.7 0 0 0-.27-.049.6.6 0 0 0-.29.067.6.6 0 0 0-.201.184.9.9 0 0 0-.118.27q-.04.156-.04.334m4.135-1.447v.587H89.69v-.587zm-1.363-.768h.828v2.942q0 .136.035.208a.2.2 0 0 0 .11.1.6.6 0 0 0 .18.026q.078 0 .138-.006.064-.008.107-.017l.003.61q-.107.035-.23.054a1.6 1.6 0 0 1-.273.021q-.274 0-.478-.09a.66.66 0 0 1-.31-.293 1.1 1.1 0 0 1-.11-.529zm2.71.768v3.112h-.832v-3.112zm-.883-.811a.4.4 0 0 1 .126-.299.48.48 0 0 1 .34-.118q.21 0 .336.118.13.117.13.299 0 .181-.13.299a.47.47 0 0 1-.337.118.48.48 0 0 1-.339-.118.4.4 0 0 1-.126-.299m3.247 3.221v-1.386q0-.15-.049-.256a.36.36 0 0 0-.153-.17.5.5 0 0 0-.261-.06.54.54 0 0 0-.239.049.34.34 0 0 0-.155.135.37.37 0 0 0-.055.204h-.828q0-.198.092-.377a.9.9 0 0 1 .267-.313q.175-.138.417-.216.245-.078.547-.078.362 0 .644.121a1 1 0 0 1 .443.363q.164.241.164.604v1.331q0 .257.032.42.03.162.092.282v.049h-.837a1.2 1.2 0 0 1-.092-.316 3 3 0 0 1-.03-.386m.11-1.193.005.468h-.463a1 1 0 0 0-.285.038.5.5 0 0 0-.198.106.4.4 0 0 0-.115.156.5.5 0 0 0-.035.195q0 .106.049.193.049.083.14.132a.5.5 0 0 0 .217.046.7.7 0 0 0 .325-.075.6.6 0 0 0 .213-.184.4.4 0 0 0 .08-.207l.219.351q-.046.118-.127.245a1.025 1.025 0 0 1-.489.42 1.1 1.1 0 0 1-.403.069q-.295 0-.538-.118a1 1 0 0 1-.38-.331.87.87 0 0 1-.137-.483q0-.245.092-.435a.85.85 0 0 1 .27-.319 1.3 1.3 0 0 1 .452-.198q.27-.069.627-.069zm2.237-2.523v4.418h-.831v-4.418zm3.834 3.558a.27.27 0 0 0-.052-.161.45.45 0 0 0-.192-.132 2 2 0 0 0-.4-.115 3 3 0 0 1-.44-.13 1.5 1.5 0 0 1-.351-.193.739.739 0 0 1-.313-.618q0-.195.083-.368a.95.95 0 0 1 .244-.305q.162-.135.391-.21.234-.078.524-.078.405 0 .696.13.293.129.449.357.158.224.158.511h-.829a.45.45 0 0 0-.051-.215.35.35 0 0 0-.156-.153.56.56 0 0 0-.27-.057.54.54 0 0 0-.239.049.36.36 0 0 0-.155.126.3.3 0 0 0-.023.302q.032.055.101.101a1 1 0 0 0 .178.086q.112.037.276.069.337.07.601.181.266.11.42.3.155.186.155.491 0 .207-.092.38a.9.9 0 0 1-.264.302 1.4 1.4 0 0 1-.414.199q-.24.069-.538.069-.434 0-.737-.156-.299-.155-.454-.394a.9.9 0 0 1-.153-.494h.786a.46.46 0 0 0 .086.273.47.47 0 0 0 .21.149.8.8 0 0 0 .279.046.7.7 0 0 0 .267-.043.37.37 0 0 0 .161-.121.3.3 0 0 0 .058-.178m2.776.918q-.363 0-.65-.115a1.4 1.4 0 0 1-.489-.325 1.5 1.5 0 0 1-.305-.481 1.6 1.6 0 0 1-.107-.587v-.115q0-.353.101-.647.1-.293.288-.509.19-.216.46-.331.27-.118.61-.118.33 0 .586.11t.429.31q.175.202.265.484.089.279.089.621v.345h-2.474v-.552h1.66v-.064a.7.7 0 0 0-.064-.307.5.5 0 0 0-.184-.219.57.57 0 0 0-.316-.08.54.54 0 0 0-.282.071.56.56 0 0 0-.193.202 1.1 1.1 0 0 0-.109.305 2 2 0 0 0-.034.379v.115q0 .187.051.346a.9.9 0 0 0 .153.273.7.7 0 0 0 .241.178.8.8 0 0 0 .325.063q.225 0 .417-.086a.9.9 0 0 0 .337-.267l.403.437a1.417 1.417 0 0 1-.67.483 1.7 1.7 0 0 1-.538.081m3.034-.648a.6.6 0 0 0 .271-.057.46.46 0 0 0 .255-.423h.78q-.003.328-.175.584-.173.253-.464.4a1.44 1.44 0 0 1-.65.144q-.362 0-.632-.121a1.2 1.2 0 0 1-.446-.334 1.5 1.5 0 0 1-.268-.5 2.1 2.1 0 0 1-.089-.616v-.083q0-.331.089-.616.09-.288.268-.5.178-.216.446-.337.267-.12.627-.121.382 0 .67.147.29.147.454.42.167.27.17.641h-.78a.6.6 0 0 0-.066-.281.497.497 0 0 0-.463-.279.5.5 0 0 0-.296.077.5.5 0 0 0-.178.207 1 1 0 0 0-.089.297 2.4 2.4 0 0 0-.024.345v.083q0 .182.024.348.023.167.086.296a.5.5 0 0 0 .181.205q.115.075.299.074m3.627-.155v-2.367h.829v3.112h-.78zm.092-.638.245-.006q0 .31-.072.578-.072.264-.216.46a1 1 0 0 1-.362.302 1.2 1.2 0 0 1-.515.107q-.228 0-.42-.064a.85.85 0 0 1-.328-.204 1 1 0 0 1-.213-.359 1.7 1.7 0 0 1-.075-.533v-2.01h.829v2.016q0 .138.031.233a.4.4 0 0 0 .095.156q.06.06.141.086a.6.6 0 0 0 .184.026.7.7 0 0 0 .403-.104q.15-.103.21-.282a1.2 1.2 0 0 0 .063-.402m2.198-1.05v2.433h-.829v-3.112h.78zm.937-.699-.014.768a2 2 0 0 0-.147-.015 2 2 0 0 0-.152-.008.9.9 0 0 0-.305.046.6.6 0 0 0-.213.129.56.56 0 0 0-.126.21 1 1 0 0 0-.046.282l-.167-.052q0-.302.06-.555.06-.255.176-.446a.9.9 0 0 1 .287-.293.73.73 0 0 1 .388-.104q.069 0 .141.012a.5.5 0 0 1 .118.026m1.266.02v3.112h-.831v-3.112zm-.883-.811a.4.4 0 0 1 .126-.299.48.48 0 0 1 .34-.118.47.47 0 0 1 .336.118q.13.117.13.299 0 .181-.13.299a.47.47 0 0 1-.336.118.48.48 0 0 1-.34-.118.4.4 0 0 1-.126-.299m3.092.811v.587h-1.812v-.587zm-1.363-.768h.828v2.942q0 .136.034.208a.2.2 0 0 0 .11.1.6.6 0 0 0 .181.026q.078 0 .138-.006.064-.008.106-.017l.003.61a1.629 1.629 0 0 1-.503.075q-.273 0-.478-.09a.66.66 0 0 1-.31-.293q-.11-.201-.109-.529zm2.758 3.529.825-2.761h.889l-1.251 3.581a2 2 0 0 1-.109.253 1 1 0 0 1-.182.256.8.8 0 0 1-.284.201 1 1 0 0 1-.417.078q-.118 0-.193-.014a3 3 0 0 1-.178-.041v-.607h.066l.066.003a.8.8 0 0 0 .267-.037.37.37 0 0 0 .167-.115.6.6 0 0 0 .101-.196zm-.345-2.761.676 2.255.118.877-.564.061-1.119-3.193zm4.685.679v2.433h-.828v-3.112h.779zm.938-.699-.014.768a2 2 0 0 0-.147-.015 2 2 0 0 0-.153-.008.9.9 0 0 0-.304.046.54.54 0 0 0-.213.129.6.6 0 0 0-.127.21 1 1 0 0 0-.046.282l-.167-.052q0-.302.061-.555.06-.255.175-.446a.9.9 0 0 1 .288-.293.73.73 0 0 1 .388-.104q.069 0 .141.012a.5.5 0 0 1 .118.026m1.265.02v3.112h-.831v-3.112zm-.883-.811q0-.182.127-.299a.48.48 0 0 1 .339-.118q.21 0 .337.118a.39.39 0 0 1 .129.299q0 .181-.129.299a.47.47 0 0 1-.337.118.48.48 0 0 1-.339-.118.4.4 0 0 1-.127-.299m3.251 3.063a.27.27 0 0 0-.052-.161.46.46 0 0 0-.193-.132 2 2 0 0 0-.4-.115 3 3 0 0 1-.44-.13 1.5 1.5 0 0 1-.351-.193.8.8 0 0 1-.23-.264.75.75 0 0 1-.083-.354.84.84 0 0 1 .328-.673q.161-.135.391-.21.233-.078.523-.078.406 0 .697.13.293.129.448.357a.86.86 0 0 1 .158.511h-.828a.44.44 0 0 0-.052-.215.34.34 0 0 0-.155-.153.56.56 0 0 0-.27-.057.54.54 0 0 0-.239.049.36.36 0 0 0-.155.126.3.3 0 0 0-.052.173q0 .072.029.129.031.055.1.101a1 1 0 0 0 .179.086q.111.037.276.069.336.07.601.181t.42.3a.74.74 0 0 1 .155.491.8.8 0 0 1-.092.38.9.9 0 0 1-.265.302 1.4 1.4 0 0 1-.414.199 2 2 0 0 1-.538.069q-.434 0-.736-.156a1.16 1.16 0 0 1-.454-.394.9.9 0 0 1-.153-.494h.785a.46.46 0 0 0 .087.273.46.46 0 0 0 .21.149.8.8 0 0 0 .279.046.7.7 0 0 0 .267-.043.37.37 0 0 0 .161-.121.3.3 0 0 0 .058-.178m2.171-3.561v4.421h-.828v-4.421zm1.962 1.309-1.352 1.542-.725.733-.302-.598.575-.731.809-.946zm-.86 3.112-.921-1.438.573-.501 1.303 1.939zm2.899-.86a.27.27 0 0 0-.052-.161.44.44 0 0 0-.192-.132 2 2 0 0 0-.4-.115 3 3 0 0 1-.44-.13 1.5 1.5 0 0 1-.351-.193.735.735 0 0 1-.314-.618.8.8 0 0 1 .084-.368.95.95 0 0 1 .244-.305q.162-.135.391-.21.233-.078.524-.078.405 0 .696.13.293.129.449.357.158.224.158.511h-.828a.45.45 0 0 0-.052-.215.35.35 0 0 0-.156-.153.56.56 0 0 0-.27-.057.54.54 0 0 0-.239.049.36.36 0 0 0-.155.126.31.31 0 0 0-.023.302q.032.055.101.101a1 1 0 0 0 .178.086q.112.037.276.069.337.07.601.181.266.11.42.3a.74.74 0 0 1 .156.491.8.8 0 0 1-.092.38.9.9 0 0 1-.265.302 1.4 1.4 0 0 1-.414.199 2 2 0 0 1-.538.069q-.435 0-.736-.156a1.17 1.17 0 0 1-.455-.394.9.9 0 0 1-.152-.494h.785a.46.46 0 0 0 .086.273.47.47 0 0 0 .21.149.8.8 0 0 0 .279.046.7.7 0 0 0 .268-.043.4.4 0 0 0 .161-.121.3.3 0 0 0 .057-.178m2.756-.42h-.734a2.5 2.5 0 0 1 .041-.446q.039-.189.135-.342.097-.153.259-.302.135-.121.235-.23a1 1 0 0 0 .159-.224.6.6 0 0 0 .057-.262.64.64 0 0 0-.052-.276.35.35 0 0 0-.149-.17.5.5 0 0 0-.248-.058.5.5 0 0 0-.23.055.43.43 0 0 0-.175.161.6.6 0 0 0-.069.288h-.834q.008-.395.181-.65.175-.259.469-.383a1.65 1.65 0 0 1 .658-.126q.403 0 .691.132a.96.96 0 0 1 .44.383q.152.25.152.609a1 1 0 0 1-.098.446q-.097.193-.256.36a8 8 0 0 1-.348.345.8.8 0 0 0-.224.308 1.2 1.2 0 0 0-.06.382m-.82.889q0-.184.127-.305a.47.47 0 0 1 .339-.124.46.46 0 0 1 .336.124q.13.121.13.305a.4.4 0 0 1-.13.302.46.46 0 0 1-.336.124.47.47 0 0 1-.339-.124.4.4 0 0 1-.127-.302"/><g class="tw-fill-secondary-700" clip-path="url(#h)"><path d="M141.027 174.75c0-.291.235-.526.526-.526h1.472a.315.315 0 1 0 0-.631h-1.472c-.639 0-1.157.518-1.157 1.157v3.576c0 .639.518 1.157 1.157 1.157h3.576c.639 0 1.157-.518 1.157-1.157v-1.472a.315.315 0 1 0-.631 0v1.472a.525.525 0 0 1-.526.526h-3.576a.525.525 0 0 1-.526-.526z"/><path d="M144.498 173.593a.316.316 0 1 0 0 .631h.711l-1.776 1.775a.317.317 0 0 0 .447.447l1.775-1.776v.711a.316.316 0 0 0 .631 0v-1.473a.315.315 0 0 0-.315-.315z"/></g></g><path class="tw-stroke-secondary-100" stroke-width=".421" d="M30.939 63.596h124.123c5.461 0 9.888 4.428 9.888 9.889v106.031c0 5.461-4.427 9.887-9.888 9.887H30.939c-5.461 0-9.89-4.426-9.89-9.887V73.485c0-5.461 4.429-9.89 9.89-9.89Z"/></g></g><defs><clipPath id="b"><path class="tw-fill-background" d="M155.801 8.317h11.438v11.438h-11.438z"/></clipPath><clipPath id="c"><rect width="154" height="205" x="16" y="24" class="tw-fill-background" rx="4.918"/></clipPath><clipPath id="d"><path class="tw-fill-background" d="M21.874 57.75h143.253v14.345H21.874z"/></clipPath><clipPath id="e"><rect width="154" height="205" x="16" y="24" class="tw-fill-background" rx="4.918"/></clipPath><clipPath id="g"><path class="tw-fill-background" d="M20.84 73.484c0-5.577 4.521-10.098 10.098-10.098h124.125c5.577 0 10.098 4.521 10.098 10.098v106.032c0 5.577-4.521 10.098-10.098 10.098H30.938c-5.577 0-10.098-4.521-10.098-10.098z"/></clipPath><clipPath id="h"><path class="tw-fill-background" d="M139.976 173.172h6.732v6.732h-6.732z"/></clipPath><filter id="a" width="184.857" height="228.234" x="6.26" y="1.883" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset/><feGaussianBlur stdDeviation=".558"/><feColorMatrix values="0 0 0 0 0.4 0 0 0 0 0.4 0 0 0 0 0.5 0 0 0 0.35 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_6463_20789"/><feBlend in="SourceGraphic" in2="effect1_dropShadow_6463_20789" result="shape"/></filter><filter id="f" width="161.152" height="143.059" x="12.425" y="63.386" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feMorphology in="SourceAlpha" radius="2.104" result="effect1_dropShadow_6463_20789"/><feOffset dy="8.415"/><feGaussianBlur stdDeviation="5.26"/><feComposite in2="hardAlpha" operator="out"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/><feBlend in2="BackgroundImageFix" result="effect1_dropShadow_6463_20789"/><feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feMorphology in="SourceAlpha" radius="2.525" result="effect2_dropShadow_6463_20789"/><feOffset dy="3.366"/><feGaussianBlur stdDeviation="2.104"/><feComposite in2="hardAlpha" operator="out"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/><feBlend in2="effect1_dropShadow_6463_20789" result="effect2_dropShadow_6463_20789"/><feBlend in="SourceGraphic" in2="effect2_dropShadow_6463_20789" result="shape"/></filter></defs></svg>
+`;
diff --git a/libs/assets/src/svg/svgs/background-right-illustration.ts b/libs/assets/src/svg/svgs/background-right-illustration.ts
index b8f02935d83..1c488f7242d 100644
--- a/libs/assets/src/svg/svgs/background-right-illustration.ts
+++ b/libs/assets/src/svg/svgs/background-right-illustration.ts
@@ -1,5 +1,28 @@
 import { svgIcon } from "../icon-service";
 
 export const BackgroundRightIllustration = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 506 297"><g clip-path="url(#right-bg-illustration-clip)"><path class="tw-fill-illustration-bg-primary" d="M45.673 294.742v-29.124l22.323 16.198-15.395 15.75a4.04 4.04 0 0 1-6.928-2.824Z"/><path class="tw-fill-illustration-bg-tertiary" d="m4.978 240.865 95.568-44.738c3.52-1.648 7.492 1.175 7.093 5.041l-9.608 93.173c-.395 3.823-4.774 5.79-7.893 3.547l-43.43-31.233-41.47-16.621c-4.06-1.627-4.221-7.315-.26-9.169Z"/><path class="tw-fill-illustration-outline" d="M99.698 194.315c4.929-2.306 10.489 1.645 9.931 7.058l-9.608 93.174c-.552 5.351-6.683 8.105-11.05 4.965l-20.832-14.983-14.107 14.435a6.04 6.04 0 0 1-10.359-4.222v-27.151l-39.178-15.7c-5.684-2.278-5.91-10.242-.364-12.838l95.567-44.738Zm5.953 6.648c.239-2.32-2.144-4.013-4.256-3.025L5.827 242.676c-2.376 1.112-2.28 4.525.156 5.502l40.159 16.093 26.703-30.327a2.001 2.001 0 0 1 3.002 2.644l-26.178 29.731 41.637 29.945c1.872 1.346 4.5.165 4.736-2.128l9.609-93.173Zm-57.978 93.779a2.04 2.04 0 0 0 3.498 1.426l13.684-14.001-17.182-12.357v24.932Z"/><circle cx="86.719" cy="86.719" r="84.719" class="tw-fill-illustration-bg-tertiary" stroke="#020F66" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" transform="scale(-1 1) rotate(45.035 -184.565 -565.488)"/><circle cx="69.752" cy="69.752" r="69.752" class="tw-fill-illustration-bg-secondary" transform="scale(-1 1) rotate(45.035 -213.255 -553.709)"/><path class="tw-fill-illustration-outline" d="m445.838 353.214 2.95-180.467 12.372-.007 3.078 180.465a4.64 4.64 0 0 1-4.637 4.72l-9.12.005a4.64 4.64 0 0 1-4.643-4.716ZM453.82 52.947a2 2 0 0 1 1.998-2.001l35.638-.023a2 2 0 0 1 2.001 2.015l-.268 35.637a2 2 0 1 1-4-.03l.252-33.62-33.62.02a1.999 1.999 0 0 1-2.001-1.998ZM415.689 86.49a2 2 0 0 1 4.001.03l-.254 33.62 33.622-.021a2 2 0 0 1 .003 4l-35.637.022a2 2 0 0 1-2.001-2.015l.266-35.636Zm25.457-19.997a2 2 0 0 1 3.461-2.006l23.124 39.885a2 2 0 0 1-3.461 2.006l-23.124-39.885Z"/><path class="tw-fill-illustration-bg-primary" d="M259.264 277.271c21.107-4.293 34.791-24.62 30.565-45.402-4.227-20.782-24.764-34.15-45.871-29.857-21.107 4.293-34.791 24.62-30.565 45.402 4.227 20.783 24.764 34.15 45.871 29.857ZM299.993 173.472c7.793-1.585 12.826-9.188 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.187-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-secondary" d="M329.869 242.094c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.188-12.826-16.981-11.241-7.794 1.585-12.827 9.188-11.241 16.981 1.585 7.794 9.187 12.827 16.981 11.241Z"/><path class="tw-fill-illustration-bg-tertiary" d="M330.088 309.401c7.794-1.585 12.826-9.188 11.241-16.981-1.585-7.794-9.187-12.827-16.981-11.242-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.827 16.981 11.242Z"/><path class="tw-fill-illustration-bg-primary" d="M234.598 327.597c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-secondary" d="M176.919 248.71c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.794-9.188-12.827-16.982-11.242-7.793 1.586-12.826 9.188-11.241 16.982 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-tertiary" d="M206.836 185.071c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.793-9.188-12.826-16.982-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M200.699 154.89c8.875-1.805 17.533 3.927 19.339 12.803 1.165 5.732-.814 11.372-4.752 15.135.131.223.29.502.489.845l14.805 21.386a41.483 41.483 0 0 1 12.979-5.007c9.276-1.886 18.455-.523 26.321 3.303.038-.221.111-.441.227-.648l17.035-30.333a16.337 16.337 0 0 1-6.09-9.744c-1.805-8.876 3.928-17.535 12.803-19.34 8.876-1.805 17.534 3.928 19.339 12.803 1.805 8.876-3.926 17.534-12.802 19.339-3.427.697-6.822.27-9.803-1.028l-16.994 30.262a1.98 1.98 0 0 1-.397.497c8.774 5.316 15.487 13.883 18.16 24.43l19.238-1.61c-.007-7.642 5.356-14.488 13.135-16.07 8.875-1.805 17.534 3.927 19.339 12.803 1.805 8.875-3.927 17.533-12.802 19.339-8.639 1.757-17.072-3.627-19.18-12.099l-18.935 1.585c1.474 9.839-.81 19.465-5.834 27.387l29.108 22.962a16.324 16.324 0 0 1 8.523-4.671c8.876-1.804 17.534 3.928 19.339 12.803 1.805 8.876-3.927 17.534-12.802 19.339-8.875 1.805-17.534-3.926-19.34-12.802a16.338 16.338 0 0 1 1.872-11.474l-29.007-22.882c-5.828 7.464-14.29 12.983-24.349 15.028a41.442 41.442 0 0 1-14.045.441l-6.224 19.317a16.365 16.365 0 0 1 8.405 11.229c1.805 8.876-3.927 17.534-12.802 19.339-8.876 1.805-17.535-3.926-19.34-12.802-1.805-8.875 3.927-17.534 12.803-19.34 2.461-.5 4.906-.42 7.192.145l6.007-18.641c-14.851-3.594-27.011-15.301-30.225-31.105a40.043 40.043 0 0 1-.808-8.184l-20.473-1.442c-.032-.002-.064-.008-.096-.011-1.37 6.114-6.201 11.162-12.739 12.492-8.875 1.805-17.534-3.926-19.339-12.802-1.805-8.875 3.927-17.534 12.802-19.34 8.876-1.804 17.534 3.928 19.339 12.803.196.962.302 1.921.327 2.869l20.401 1.436c1.206-11.333 7.247-21.627 16.399-28.363l-14.76-21.321a20.41 20.41 0 0 0-.435-.719 16.428 16.428 0 0 1-4.816 1.8c-8.876 1.805-17.535-3.927-19.34-12.802-1.805-8.876 3.927-17.535 12.803-19.34Zm124.048 128.249c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.364-6.71-7.911-11.044-14.622-9.68Zm-95.49 18.196c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.621-1.365-6.711-7.911-11.045-14.622-9.681Zm15.1-97.363c-20.054 4.079-33.004 23.373-29.004 43.044 4.001 19.672 23.459 32.374 43.513 28.296 9.593-1.951 17.558-7.386 22.822-14.676a1.986 1.986 0 0 1 .612-.873c5.306-7.813 7.58-17.606 5.569-27.495-4.001-19.671-23.459-32.374-43.512-28.296Zm80.171 11.861c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.365-6.711-7.911-11.045-14.622-9.68Zm-152.949 6.614c-6.711 1.365-11.045 7.912-9.681 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.621-1.365-6.711-7.912-11.045-14.622-9.681Zm123.073-75.237c-6.71 1.365-11.044 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.622-1.365-6.71-7.912-11.045-14.623-9.68Zm-93.156 11.6c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.622 9.679 6.711-1.365 11.044-7.912 9.68-14.622-1.365-6.711-7.911-11.045-14.622-9.68Z" clip-rule="evenodd"/><path class="tw-fill-illustration-logo" d="M272.266 232.544a1.998 1.998 0 0 0-.353 1.589l.554 2.725a2.002 2.002 0 0 0 1.002 1.357l4.786 2.611a2 2 0 0 1 1.003 2.15l-.667 3.313a1.998 1.998 0 0 1-1.647 1.58l-5.641.896a1.998 1.998 0 0 0-1.352.867l-1.524 2.291a2 2 0 0 0-.252 1.678l1.555 5.227a2 2 0 0 1-.794 2.224l-2.799 1.902a2 2 0 0 1-2.309-.043l-4.524-3.327a2 2 0 0 0-1.583-.348l-2.754.56a1.997 1.997 0 0 0-1.352.994l-2.638 4.785a2 2 0 0 1-2.14.996l-3.339-.661a2 2 0 0 1-1.587-1.649l-.886-5.597a2.003 2.003 0 0 0-.875-1.358l-2.298-1.514a2 2 0 0 0-1.669-.247l-5.272 1.563a2 2 0 0 1-2.22-.788l-1.897-2.774a2.001 2.001 0 0 1 .045-2.321l3.339-4.498a2.004 2.004 0 0 0 .354-1.591l-.557-2.736a2.001 2.001 0 0 0-.983-1.347l-4.848-2.715a2 2 0 0 1-.983-2.14l.669-3.329a2.001 2.001 0 0 1 1.648-1.581l5.641-.895a1.999 1.999 0 0 0 1.352-.868l1.526-2.293c.327-.493.42-1.105.253-1.673l-1.608-5.457a2 2 0 0 1 .794-2.22l2.793-1.897a2 2 0 0 1 2.322.053l4.676 3.5a1.999 1.999 0 0 0 1.597.359l2.744-.558a2.002 2.002 0 0 0 1.353-.995l2.637-4.784a1.997 1.997 0 0 1 2.14-.996l3.339.661a2 2 0 0 1 1.587 1.649l.886 5.597c.088.555.406 1.048.875 1.357l2.298 1.514a2.002 2.002 0 0 0 1.669.248l5.272-1.564a2 2 0 0 1 2.22.789l1.898 2.775a2 2 0 0 1-.044 2.319l-3.432 4.635Zm-24.977-.064c-4.049 2.702-5.078 8.076-2.395 11.991 2.705 4.028 8.1 5.044 12.035 2.365 3.936-2.678 5.078-8.076 2.395-11.991-2.592-4.051-7.986-5.067-12.035-2.365Z"/><path class="tw-fill-illustration-outline" d="m270.507 237.256-.554-2.724a4.004 4.004 0 0 1 .705-3.178l3.433-4.636-1.897-2.775-5.273 1.564a4 4 0 0 1-3.337-.494l-2.298-1.515a4 4 0 0 1-1.751-2.714l-.886-5.597-3.339-.661-2.637 4.784a4.001 4.001 0 0 1-2.706 1.989l-2.744.558a4 4 0 0 1-3.194-.718l-4.676-3.5-2.792 1.898 1.608 5.457a3.998 3.998 0 0 1-.507 3.345l-1.525 2.294c-.62.931-1.6 1.56-2.704 1.736l-5.642.895-.669 3.329 4.848 2.715a4 4 0 0 1 1.965 2.693l.557 2.737a3.999 3.999 0 0 1-.708 3.18l-3.338 4.499 1.897 2.774 5.272-1.563a3.998 3.998 0 0 1 3.338.494l2.298 1.514a4.001 4.001 0 0 1 1.75 2.715l.886 5.597 3.339.661 2.638-4.785a4 4 0 0 1 2.706-1.988l2.753-.56a4 4 0 0 1 3.166.697l4.524 3.327 2.8-1.902-1.555-5.227a4.002 4.002 0 0 1 .504-3.355l1.524-2.291a3.998 3.998 0 0 1 2.703-1.736l5.642-.895.667-3.313-4.787-2.611a4.004 4.004 0 0 1-2.004-2.714Zm-24.328-6.439c4.915-3.28 11.556-2.099 14.795 2.898h.001v.001l.034.051h-.001c3.294 4.868 1.835 11.464-2.953 14.723-4.855 3.304-11.499 2.043-14.821-2.903l.001-.001c-3.308-4.845-2.013-11.461 2.944-14.769Zm11.461 5.106c-1.959-3.06-6.075-3.891-9.24-1.779-3.036 2.026-3.85 5.957-2.039 8.913l.183.284.01.015c2.089 3.109 6.234 3.879 9.25 1.827 3.066-2.087 3.897-6.25 1.871-9.207a.97.97 0 0 1-.035-.053Zm16.787.536 4.787 2.611a4 4 0 0 1 2.005 4.3l-.666 3.313a4.001 4.001 0 0 1-3.295 3.161l-5.641.896-1.525 2.291 1.555 5.227a4.002 4.002 0 0 1-1.586 4.449l-2.8 1.901a4 4 0 0 1-4.618-.086l-4.523-3.326-2.753.56-2.638 4.784a4 4 0 0 1-4.279 1.993l-3.34-.661a4.002 4.002 0 0 1-3.174-3.298l-.886-5.598-2.298-1.514-5.273 1.564a3.999 3.999 0 0 1-4.438-1.577l-1.897-2.774a3.998 3.998 0 0 1 .09-4.641l3.338-4.499-.557-2.737-4.848-2.715a3.998 3.998 0 0 1-1.966-4.279l.669-3.329a4.002 4.002 0 0 1 3.294-3.162l5.642-.895 1.526-2.294-1.609-5.457a4.001 4.001 0 0 1 1.59-4.439l2.792-1.897a4 4 0 0 1 4.645.106l4.676 3.5 2.744-.558 2.636-4.785a4 4 0 0 1 4.281-1.992l3.339.661a4 4 0 0 1 3.174 3.298l.886 5.597 2.298 1.514 5.272-1.563a4 4 0 0 1 4.439 1.576l1.898 2.775a4.001 4.001 0 0 1-.087 4.639l-3.433 4.636.554 2.724Z"/></g><defs><clipPath id="right-bg-illustration-clip"><path class="tw-fill-illustration-bg-tertiary" d="M0 0h506v297H0z"/></clipPath></defs></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 506 297">
+    <g clip-path="url(#right-bg-illustration-clip)">
+      <path class="tw-fill-illustration-bg-primary" d="M45.673 294.742v-29.124l22.323 16.198-15.395 15.75a4.04 4.04 0 0 1-6.928-2.824Z"/>
+      <path class="tw-fill-illustration-bg-tertiary" d="m4.978 240.865 95.568-44.738c3.52-1.648 7.492 1.175 7.093 5.041l-9.608 93.173c-.395 3.823-4.774 5.79-7.893 3.547l-43.43-31.233-41.47-16.621c-4.06-1.627-4.221-7.315-.26-9.169Z"/>
+      <path class="tw-fill-illustration-outline" d="M99.698 194.315c4.929-2.306 10.489 1.645 9.931 7.058l-9.608 93.174c-.552 5.351-6.683 8.105-11.05 4.965l-20.832-14.983-14.107 14.435a6.04 6.04 0 0 1-10.359-4.222v-27.151l-39.178-15.7c-5.684-2.278-5.91-10.242-.364-12.838l95.567-44.738Zm5.953 6.648c.239-2.32-2.144-4.013-4.256-3.025L5.827 242.676c-2.376 1.112-2.28 4.525.156 5.502l40.159 16.093 26.703-30.327a2.001 2.001 0 0 1 3.002 2.644l-26.178 29.731 41.637 29.945c1.872 1.346 4.5.165 4.736-2.128l9.609-93.173Zm-57.978 93.779a2.04 2.04 0 0 0 3.498 1.426l13.684-14.001-17.182-12.357v24.932Z"/>
+      <circle cx="86.719" cy="86.719" r="84.719" class="tw-fill-illustration-bg-tertiary tw-stroke-illustration-outline" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" transform="scale(-1 1) rotate(45.035 -184.565 -565.488)"/>
+      <circle cx="69.752" cy="69.752" r="69.752" class="tw-fill-illustration-bg-secondary" transform="scale(-1 1) rotate(45.035 -213.255 -553.709)"/>
+      <path class="tw-fill-illustration-outline" d="m445.838 353.214 2.95-180.467 12.372-.007 3.078 180.465a4.64 4.64 0 0 1-4.637 4.72l-9.12.005a4.64 4.64 0 0 1-4.643-4.716ZM453.82 52.947a2 2 0 0 1 1.998-2.001l35.638-.023a2 2 0 0 1 2.001 2.015l-.268 35.637a2 2 0 1 1-4-.03l.252-33.62-33.62.02a1.999 1.999 0 0 1-2.001-1.998ZM415.689 86.49a2 2 0 0 1 4.001.03l-.254 33.62 33.622-.021a2 2 0 0 1 .003 4l-35.637.022a2 2 0 0 1-2.001-2.015l.266-35.636Zm25.457-19.997a2 2 0 0 1 3.461-2.006l23.124 39.885a2 2 0 0 1-3.461 2.006l-23.124-39.885Z"/>
+      <path class="tw-fill-illustration-bg-primary" d="M259.264 277.271c21.107-4.293 34.791-24.62 30.565-45.402-4.227-20.782-24.764-34.15-45.871-29.857-21.107 4.293-34.791 24.62-30.565 45.402 4.227 20.783 24.764 34.15 45.871 29.857ZM299.993 173.472c7.793-1.585 12.826-9.188 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.187-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"/>
+      <path class="tw-fill-illustration-bg-secondary" d="M329.869 242.094c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.188-12.826-16.981-11.241-7.794 1.585-12.827 9.188-11.241 16.981 1.585 7.794 9.187 12.827 16.981 11.241Z"/>
+      <path class="tw-fill-illustration-bg-tertiary" d="M330.088 309.401c7.794-1.585 12.826-9.188 11.241-16.981-1.585-7.794-9.187-12.827-16.981-11.242-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.827 16.981 11.242Z"/>
+      <path class="tw-fill-illustration-bg-primary" d="M234.598 327.597c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.826 16.981 11.241Z"/>
+      <path class="tw-fill-illustration-bg-secondary" d="M176.919 248.71c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.794-9.188-12.827-16.982-11.242-7.793 1.586-12.826 9.188-11.241 16.982 1.585 7.793 9.188 12.826 16.981 11.241Z"/>
+      <path class="tw-fill-illustration-bg-tertiary" d="M206.836 185.071c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.793-9.188-12.826-16.982-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"/>
+      <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M200.699 154.89c8.875-1.805 17.533 3.927 19.339 12.803 1.165 5.732-.814 11.372-4.752 15.135.131.223.29.502.489.845l14.805 21.386a41.483 41.483 0 0 1 12.979-5.007c9.276-1.886 18.455-.523 26.321 3.303.038-.221.111-.441.227-.648l17.035-30.333a16.337 16.337 0 0 1-6.09-9.744c-1.805-8.876 3.928-17.535 12.803-19.34 8.876-1.805 17.534 3.928 19.339 12.803 1.805 8.876-3.926 17.534-12.802 19.339-3.427.697-6.822.27-9.803-1.028l-16.994 30.262a1.98 1.98 0 0 1-.397.497c8.774 5.316 15.487 13.883 18.16 24.43l19.238-1.61c-.007-7.642 5.356-14.488 13.135-16.07 8.875-1.805 17.534 3.927 19.339 12.803 1.805 8.875-3.927 17.533-12.802 19.339-8.639 1.757-17.072-3.627-19.18-12.099l-18.935 1.585c1.474 9.839-.81 19.465-5.834 27.387l29.108 22.962a16.324 16.324 0 0 1 8.523-4.671c8.876-1.804 17.534 3.928 19.339 12.803 1.805 8.876-3.927 17.534-12.802 19.339-8.875 1.805-17.534-3.926-19.34-12.802a16.338 16.338 0 0 1 1.872-11.474l-29.007-22.882c-5.828 7.464-14.29 12.983-24.349 15.028a41.442 41.442 0 0 1-14.045.441l-6.224 19.317a16.365 16.365 0 0 1 8.405 11.229c1.805 8.876-3.927 17.534-12.802 19.339-8.876 1.805-17.535-3.926-19.34-12.802-1.805-8.875 3.927-17.534 12.803-19.34 2.461-.5 4.906-.42 7.192.145l6.007-18.641c-14.851-3.594-27.011-15.301-30.225-31.105a40.043 40.043 0 0 1-.808-8.184l-20.473-1.442c-.032-.002-.064-.008-.096-.011-1.37 6.114-6.201 11.162-12.739 12.492-8.875 1.805-17.534-3.926-19.339-12.802-1.805-8.875 3.927-17.534 12.802-19.34 8.876-1.804 17.534 3.928 19.339 12.803.196.962.302 1.921.327 2.869l20.401 1.436c1.206-11.333 7.247-21.627 16.399-28.363l-14.76-21.321a20.41 20.41 0 0 0-.435-.719 16.428 16.428 0 0 1-4.816 1.8c-8.876 1.805-17.535-3.927-19.34-12.802-1.805-8.876 3.927-17.535 12.803-19.34Zm124.048 128.249c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.364-6.71-7.911-11.044-14.622-9.68Zm-95.49 18.196c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.621-1.365-6.711-7.911-11.045-14.622-9.681Zm15.1-97.363c-20.054 4.079-33.004 23.373-29.004 43.044 4.001 19.672 23.459 32.374 43.513 28.296 9.593-1.951 17.558-7.386 22.822-14.676a1.986 1.986 0 0 1 .612-.873c5.306-7.813 7.58-17.606 5.569-27.495-4.001-19.671-23.459-32.374-43.512-28.296Zm80.171 11.861c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.365-6.711-7.911-11.045-14.622-9.68Zm-152.949 6.614c-6.711 1.365-11.045 7.912-9.681 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.621-1.365-6.711-7.912-11.045-14.622-9.681Zm123.073-75.237c-6.71 1.365-11.044 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.622-1.365-6.71-7.912-11.045-14.623-9.68Zm-93.156 11.6c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.622 9.679 6.711-1.365 11.044-7.912 9.68-14.622-1.365-6.711-7.911-11.045-14.622-9.68Z" clip-rule="evenodd"/>
+      <path class="tw-fill-illustration-logo" d="M272.266 232.544a1.998 1.998 0 0 0-.353 1.589l.554 2.725a2.002 2.002 0 0 0 1.002 1.357l4.786 2.611a2 2 0 0 1 1.003 2.15l-.667 3.313a1.998 1.998 0 0 1-1.647 1.58l-5.641.896a1.998 1.998 0 0 0-1.352.867l-1.524 2.291a2 2 0 0 0-.252 1.678l1.555 5.227a2 2 0 0 1-.794 2.224l-2.799 1.902a2 2 0 0 1-2.309-.043l-4.524-3.327a2 2 0 0 0-1.583-.348l-2.754.56a1.997 1.997 0 0 0-1.352.994l-2.638 4.785a2 2 0 0 1-2.14.996l-3.339-.661a2 2 0 0 1-1.587-1.649l-.886-5.597a2.003 2.003 0 0 0-.875-1.358l-2.298-1.514a2 2 0 0 0-1.669-.247l-5.272 1.563a2 2 0 0 1-2.22-.788l-1.897-2.774a2.001 2.001 0 0 1 .045-2.321l3.339-4.498a2.004 2.004 0 0 0 .354-1.591l-.557-2.736a2.001 2.001 0 0 0-.983-1.347l-4.848-2.715a2 2 0 0 1-.983-2.14l.669-3.329a2.001 2.001 0 0 1 1.648-1.581l5.641-.895a1.999 1.999 0 0 0 1.352-.868l1.526-2.293c.327-.493.42-1.105.253-1.673l-1.608-5.457a2 2 0 0 1 .794-2.22l2.793-1.897a2 2 0 0 1 2.322.053l4.676 3.5a1.999 1.999 0 0 0 1.597.359l2.744-.558a2.002 2.002 0 0 0 1.353-.995l2.637-4.784a1.997 1.997 0 0 1 2.14-.996l3.339.661a2 2 0 0 1 1.587 1.649l.886 5.597c.088.555.406 1.048.875 1.357l2.298 1.514a2.002 2.002 0 0 0 1.669.248l5.272-1.564a2 2 0 0 1 2.22.789l1.898 2.775a2 2 0 0 1-.044 2.319l-3.432 4.635Zm-24.977-.064c-4.049 2.702-5.078 8.076-2.395 11.991 2.705 4.028 8.1 5.044 12.035 2.365 3.936-2.678 5.078-8.076 2.395-11.991-2.592-4.051-7.986-5.067-12.035-2.365Z"/>
+      <path class="tw-fill-illustration-outline" d="m270.507 237.256-.554-2.724a4.004 4.004 0 0 1 .705-3.178l3.433-4.636-1.897-2.775-5.273 1.564a4 4 0 0 1-3.337-.494l-2.298-1.515a4 4 0 0 1-1.751-2.714l-.886-5.597-3.339-.661-2.637 4.784a4.001 4.001 0 0 1-2.706 1.989l-2.744.558a4 4 0 0 1-3.194-.718l-4.676-3.5-2.792 1.898 1.608 5.457a3.998 3.998 0 0 1-.507 3.345l-1.525 2.294c-.62.931-1.6 1.56-2.704 1.736l-5.642.895-.669 3.329 4.848 2.715a4 4 0 0 1 1.965 2.693l.557 2.737a3.999 3.999 0 0 1-.708 3.18l-3.338 4.499 1.897 2.774 5.272-1.563a3.998 3.998 0 0 1 3.338.494l2.298 1.514a4.001 4.001 0 0 1 1.75 2.715l.886 5.597 3.339.661 2.638-4.785a4 4 0 0 1 2.706-1.988l2.753-.56a4 4 0 0 1 3.166.697l4.524 3.327 2.8-1.902-1.555-5.227a4.002 4.002 0 0 1 .504-3.355l1.524-2.291a3.998 3.998 0 0 1 2.703-1.736l5.642-.895.667-3.313-4.787-2.611a4.004 4.004 0 0 1-2.004-2.714Zm-24.328-6.439c4.915-3.28 11.556-2.099 14.795 2.898h.001v.001l.034.051h-.001c3.294 4.868 1.835 11.464-2.953 14.723-4.855 3.304-11.499 2.043-14.821-2.903l.001-.001c-3.308-4.845-2.013-11.461 2.944-14.769Zm11.461 5.106c-1.959-3.06-6.075-3.891-9.24-1.779-3.036 2.026-3.85 5.957-2.039 8.913l.183.284.01.015c2.089 3.109 6.234 3.879 9.25 1.827 3.066-2.087 3.897-6.25 1.871-9.207a.97.97 0 0 1-.035-.053Zm16.787.536 4.787 2.611a4 4 0 0 1 2.005 4.3l-.666 3.313a4.001 4.001 0 0 1-3.295 3.161l-5.641.896-1.525 2.291 1.555 5.227a4.002 4.002 0 0 1-1.586 4.449l-2.8 1.901a4 4 0 0 1-4.618-.086l-4.523-3.326-2.753.56-2.638 4.784a4 4 0 0 1-4.279 1.993l-3.34-.661a4.002 4.002 0 0 1-3.174-3.298l-.886-5.598-2.298-1.514-5.273 1.564a3.999 3.999 0 0 1-4.438-1.577l-1.897-2.774a3.998 3.998 0 0 1 .09-4.641l3.338-4.499-.557-2.737-4.848-2.715a3.998 3.998 0 0 1-1.966-4.279l.669-3.329a4.002 4.002 0 0 1 3.294-3.162l5.642-.895 1.526-2.294-1.609-5.457a4.001 4.001 0 0 1 1.59-4.439l2.792-1.897a4 4 0 0 1 4.645.106l4.676 3.5 2.744-.558 2.636-4.785a4 4 0 0 1 4.281-1.992l3.339.661a4 4 0 0 1 3.174 3.298l.886 5.597 2.298 1.514 5.272-1.563a4 4 0 0 1 4.439 1.576l1.898 2.775a4.001 4.001 0 0 1-.087 4.639l-3.433 4.636.554 2.724Z"/>
+    </g>
+    <defs>
+      <clipPath id="right-bg-illustration-clip">
+        <path class="tw-fill-illustration-bg-tertiary" d="M0 0h506v297H0z"/>
+      </clipPath>
+    </defs>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/bitwarden-icon.ts b/libs/assets/src/svg/svgs/bitwarden-icon.ts
index 2f88b38043c..203460952b5 100644
--- a/libs/assets/src/svg/svgs/bitwarden-icon.ts
+++ b/libs/assets/src/svg/svgs/bitwarden-icon.ts
@@ -3,12 +3,12 @@ import { svgIcon } from "../icon-service";
 export const BitwardenIcon = svgIcon`
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
   <g clip-path="url(#clip0_11934_25684)">
-    <path d="M17.3333 0H2.66667C1.19391 0 0 1.19391 0 2.66667V17.3333C0 18.8061 1.19391 20 2.66667 20H17.3333C18.8061 20 20 18.8061 20 17.3333V2.66667C20 1.19391 18.8061 0 17.3333 0Z" fill="#175DDC"/>
+    <path d="M17.3333 0H2.66667C1.19391 0 0 1.19391 0 2.66667V17.3333C0 18.8061 1.19391 20 2.66667 20H17.3333C18.8061 20 20 18.8061 20 17.3333V2.66667C20 1.19391 18.8061 0 17.3333 0Z" class="tw-fill-bw-blue" />
       <mask id="mask0_11934_25684" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="3" y="3" width="14" height="14">
       <path d="M17 3H3V17H17V3Z" class="tw-fill-text-alt2"/>
     </mask>
     <g mask="url(#mask0_11934_25684)">
-      <path d="M15.6599 3.17501C15.607 3.11944 15.5435 3.07526 15.4731 3.04507C15.4027 3.01489 15.327 2.99958 15.2504 3.00001H4.75052C4.67396 2.99958 4.59784 3.01489 4.5274 3.04507C4.45696 3.07526 4.39352 3.11944 4.34102 3.17501C4.28546 3.22751 4.24127 3.29138 4.21109 3.36182C4.1809 3.43226 4.16559 3.50794 4.16602 3.58451V10.5844C4.16821 11.1173 4.27146 11.6449 4.47052 12.1393C4.65996 12.6271 4.91458 13.0874 5.22739 13.5069C5.54895 13.9274 5.90901 14.3163 6.30276 14.6698C6.66807 15.0049 7.05306 15.3186 7.4551 15.6086C7.8051 15.8571 8.1726 16.0925 8.5576 16.3148C8.9426 16.537 9.21431 16.6871 9.3731 16.7654C9.53322 16.8441 9.66272 16.9063 9.75897 16.9474C9.83422 16.9837 9.91694 17.0016 10.0005 16.9999C10.0827 17.0012 10.1641 16.982 10.2376 16.9448C10.3356 16.9019 10.4633 16.8415 10.6252 16.7628C10.7871 16.684 11.0627 16.5335 11.4407 16.3121C11.8187 16.0908 12.1906 15.8545 12.5432 15.606C12.9457 15.3155 13.3311 15.0023 13.6973 14.6671C14.0915 14.3141 14.4515 13.9247 14.7727 13.5043C15.085 13.0843 15.3397 12.6245 15.5295 12.1367C15.729 11.6423 15.8323 11.1147 15.834 10.5818V3.58188C15.8345 3.50576 15.8192 3.43051 15.789 3.36051C15.7588 3.29051 15.715 3.22751 15.6599 3.17501ZM14.3063 10.6483C14.3063 13.1858 10.0005 15.3654 10.0005 15.3654V4.49975H14.3063V10.6483Z" fill="white"/>
+      <path d="M15.6599 3.17501C15.607 3.11944 15.5435 3.07526 15.4731 3.04507C15.4027 3.01489 15.327 2.99958 15.2504 3.00001H4.75052C4.67396 2.99958 4.59784 3.01489 4.5274 3.04507C4.45696 3.07526 4.39352 3.11944 4.34102 3.17501C4.28546 3.22751 4.24127 3.29138 4.21109 3.36182C4.1809 3.43226 4.16559 3.50794 4.16602 3.58451V10.5844C4.16821 11.1173 4.27146 11.6449 4.47052 12.1393C4.65996 12.6271 4.91458 13.0874 5.22739 13.5069C5.54895 13.9274 5.90901 14.3163 6.30276 14.6698C6.66807 15.0049 7.05306 15.3186 7.4551 15.6086C7.8051 15.8571 8.1726 16.0925 8.5576 16.3148C8.9426 16.537 9.21431 16.6871 9.3731 16.7654C9.53322 16.8441 9.66272 16.9063 9.75897 16.9474C9.83422 16.9837 9.91694 17.0016 10.0005 16.9999C10.0827 17.0012 10.1641 16.982 10.2376 16.9448C10.3356 16.9019 10.4633 16.8415 10.6252 16.7628C10.7871 16.684 11.0627 16.5335 11.4407 16.3121C11.8187 16.0908 12.1906 15.8545 12.5432 15.606C12.9457 15.3155 13.3311 15.0023 13.6973 14.6671C14.0915 14.3141 14.4515 13.9247 14.7727 13.5043C15.085 13.0843 15.3397 12.6245 15.5295 12.1367C15.729 11.6423 15.8323 11.1147 15.834 10.5818V3.58188C15.8345 3.50576 15.8192 3.43051 15.789 3.36051C15.7588 3.29051 15.715 3.22751 15.6599 3.17501ZM14.3063 10.6483C14.3063 13.1858 10.0005 15.3654 10.0005 15.3654V4.49975H14.3063V10.6483Z" class="tw-fill-text-alt2"/>
     </g>
   </g>
   <defs>
diff --git a/libs/assets/src/svg/svgs/business-welcome.icon.ts b/libs/assets/src/svg/svgs/business-welcome.icon.ts
new file mode 100644
index 00000000000..06c4950ec18
--- /dev/null
+++ b/libs/assets/src/svg/svgs/business-welcome.icon.ts
@@ -0,0 +1,32 @@
+import { svgIcon } from "../icon-service";
+
+export const BusinessWelcome = svgIcon`
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="4.17 0.75 91.67 95.83">
+  <path class="tw-fill-illustration-bg-secondary" d="M56.25 9.085A8.333 8.333 0 0 1 64.583.752h8.334a8.333 8.333 0 0 1 8.333 8.333v4.167h-25V9.085Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M72.917 2.835h-8.334a6.25 6.25 0 0 0-6.25 6.25v2.084h20.834V9.085a6.25 6.25 0 0 0-6.25-6.25ZM64.583.752a8.333 8.333 0 0 0-8.333 8.333v4.167h25V9.085A8.333 8.333 0 0 0 72.917.752h-8.334Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-secondary" d="M48.959 17.418a8.333 8.333 0 0 1 8.333-8.333h22.916a8.333 8.333 0 0 1 8.334 8.333v6.25H48.958v-6.25Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M80.209 11.168H57.291a6.25 6.25 0 0 0-6.25 6.25v4.167h35.416v-4.167a6.25 6.25 0 0 0-6.25-6.25ZM57.291 9.085a8.333 8.333 0 0 0-8.334 8.333v6.25h39.584v-6.25a8.333 8.333 0 0 0-8.334-8.333H57.293Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-secondary" d="M41.666 27.835A8.333 8.333 0 0 1 50 19.502h37.5a8.333 8.333 0 0 1 8.333 8.333v66.667c0 1.15-.933 2.083-2.083 2.083H41.666v-68.75Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M87.5 21.585H50a6.25 6.25 0 0 0-6.25 6.25v66.667h50V27.835a6.25 6.25 0 0 0-6.25-6.25ZM50 19.502a8.333 8.333 0 0 0-8.334 8.333v68.75H93.75c1.15 0 2.083-.932 2.083-2.083V27.835a8.333 8.333 0 0 0-8.333-8.333H50Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-primary"" d="M4.167 46.585a8.333 8.333 0 0 1 8.333-8.333h39.583a8.333 8.333 0 0 1 8.334 8.333v47.917c0 1.15-.933 2.083-2.084 2.083H6.25a2.083 2.083 0 0 1-2.083-2.083V46.585Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M52.083 40.335H12.5a6.25 6.25 0 0 0-6.25 6.25v47.917h52.083V46.585a6.25 6.25 0 0 0-6.25-6.25ZM12.5 38.252a8.333 8.333 0 0 0-8.334 8.333v47.917c0 1.15.933 2.083 2.084 2.083h52.083c1.15 0 2.084-.932 2.084-2.083V46.585a8.333 8.333 0 0 0-8.334-8.333H12.5Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-tertiary" d="M21.875 84.085a8.333 8.333 0 0 1 8.333-8.333h4.167a8.333 8.333 0 0 1 8.333 8.333v12.5H21.875v-12.5Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M34.375 77.835h-4.167a6.25 6.25 0 0 0-6.25 6.25v10.417h16.667V84.085a6.25 6.25 0 0 0-6.25-6.25Zm-4.167-2.083a8.333 8.333 0 0 0-8.333 8.333v12.5h20.833v-12.5a8.333 8.333 0 0 0-8.333-8.333h-4.167Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M23.959 85.127a8.333 8.333 0 0 0-8.334-8.333h-1.041c-.576 0-1.042.466-1.042 1.042v18.75h10.417V85.127Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M15.625 94.502V78.877a6.25 6.25 0 0 1 6.25 6.25v9.375h-6.25Zm0-17.708a8.333 8.333 0 0 1 8.334 8.333v11.459H13.542v-18.75c0-.576.466-1.042 1.042-1.042h1.041Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M40.625 85.127a8.333 8.333 0 0 1 8.333-8.333H50c.575 0 1.042.466 1.042 1.042v18.75H40.625V85.127Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M48.958 94.502V78.877a6.25 6.25 0 0 0-6.25 6.25v9.375h6.25Zm0-17.708a8.333 8.333 0 0 0-8.333 8.333v11.459h10.417v-18.75c0-.576-.467-1.042-1.042-1.042h-1.042Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M13.541 48.669c0-.576.467-1.042 1.042-1.042h8.333c.576 0 1.042.466 1.042 1.042v8.333c0 .575-.466 1.042-1.041 1.042h-8.334a1.042 1.042 0 0 1-1.042-1.042v-8.333Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M15.625 49.71v6.25h6.25v-6.25h-6.25Zm-1.042-2.083c-.575 0-1.042.466-1.042 1.042v8.333c0 .575.467 1.042 1.042 1.042h8.333c.576 0 1.042-.467 1.042-1.042v-8.333c0-.576-.466-1.042-1.041-1.042h-8.334Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M13.541 62.21c0-.575.467-1.041 1.042-1.041h8.333c.576 0 1.042.466 1.042 1.042v8.333c0 .575-.466 1.042-1.041 1.042h-8.334a1.042 1.042 0 0 1-1.042-1.042V62.21Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M15.625 63.252v6.25h6.25v-6.25h-6.25Zm-1.042-2.083c-.575 0-1.042.466-1.042 1.042v8.333c0 .575.467 1.042 1.042 1.042h8.333c.576 0 1.042-.467 1.042-1.042V62.21c0-.576-.466-1.042-1.041-1.042h-8.334Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M27.084 48.669c0-.576.466-1.042 1.041-1.042h8.334c.575 0 1.041.466 1.041 1.042v8.333c0 .575-.466 1.042-1.041 1.042h-8.334a1.042 1.042 0 0 1-1.041-1.042v-8.333Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M29.167 49.71v6.25h6.25v-6.25h-6.25Zm-1.042-2.083c-.575 0-1.041.466-1.041 1.042v8.333c0 .575.466 1.042 1.041 1.042h8.334c.575 0 1.041-.467 1.041-1.042v-8.333c0-.576-.466-1.042-1.041-1.042h-8.334Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M27.084 62.21c0-.575.466-1.041 1.041-1.041h8.334c.575 0 1.041.466 1.041 1.042v8.333c0 .575-.466 1.042-1.041 1.042h-8.334a1.042 1.042 0 0 1-1.041-1.042V62.21Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M29.167 63.252v6.25h6.25v-6.25h-6.25Zm-1.042-2.083c-.575 0-1.041.466-1.041 1.042v8.333c0 .575.466 1.042 1.041 1.042h8.334c.575 0 1.041-.467 1.041-1.042V62.21c0-.576-.466-1.042-1.041-1.042h-8.334Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M40.625 48.669c0-.576.466-1.042 1.042-1.042H50c.575 0 1.042.466 1.042 1.042v8.333c0 .575-.467 1.042-1.042 1.042h-8.333a1.042 1.042 0 0 1-1.042-1.042v-8.333Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M42.708 49.71v6.25h6.25v-6.25h-6.25Zm-1.041-2.083c-.576 0-1.042.466-1.042 1.042v8.333c0 .575.466 1.042 1.042 1.042H50c.575 0 1.042-.467 1.042-1.042v-8.333c0-.576-.467-1.042-1.042-1.042h-8.333ZM48.959 28.877c0-.576.466-1.042 1.041-1.042h6.25a1.042 1.042 0 1 1 0 2.083H50a1.042 1.042 0 0 1-1.041-1.041Zm11.458-1.042a1.042 1.042 0 1 0 0 2.083h6.25a1.042 1.042 0 0 0 0-2.083h-6.25Zm9.375 1.042c0-.576.466-1.042 1.041-1.042h6.25a1.042 1.042 0 1 1 0 2.083h-6.25a1.042 1.042 0 0 1-1.041-1.041Zm10.416 0c0-.576.467-1.042 1.042-1.042h6.25a1.042 1.042 0 1 1 0 2.083h-6.25a1.042 1.042 0 0 1-1.041-1.041Zm0 6.25c0-.576.467-1.042 1.042-1.042h6.25a1.042 1.042 0 1 1 0 2.083h-6.25a1.042 1.042 0 0 1-1.041-1.041Zm1.042 5.208a1.042 1.042 0 1 0 0 2.083h6.25a1.042 1.042 0 0 0 0-2.083h-6.25Zm-1.041 7.292c0-.576.466-1.042 1.041-1.042h6.25a1.042 1.042 0 1 1 0 2.083h-6.25a1.042 1.042 0 0 1-1.041-1.041Zm1.041 5.208a1.042 1.042 0 1 0 0 2.083h6.25a1.042 1.042 0 0 0 0-2.083h-6.25Zm-10.416-18.75a1.042 1.042 0 1 0 0 2.083h6.25a1.042 1.042 0 0 0 0-2.083h-6.25Zm-1.042 7.292c0-.576.466-1.042 1.041-1.042h6.25a1.042 1.042 0 1 1 0 2.083h-6.25a1.042 1.042 0 0 1-1.041-1.041Zm1.041 5.208a1.042 1.042 0 1 0 0 2.083h6.25a1.042 1.042 0 0 0 0-2.083h-6.25Zm-1.041 7.292c0-.576.466-1.042 1.041-1.042h6.25a1.042 1.042 0 1 1 0 2.083h-6.25a1.042 1.042 0 0 1-1.041-1.041Zm-9.375-19.792a1.042 1.042 0 1 0 0 2.083h6.25a1.042 1.042 0 0 0 0-2.083h-6.25Zm-11.459 1.042c0-.576.467-1.042 1.042-1.042h6.25a1.042 1.042 0 1 1 0 2.083H50a1.042 1.042 0 0 1-1.041-1.041Zm11.459 5.208a1.042 1.042 0 1 0 0 2.083h6.25a1.042 1.042 0 0 0 0-2.083h-6.25Zm-1.042 7.292c0-.576.467-1.042 1.042-1.042h6.25a1.042 1.042 0 1 1 0 2.083h-6.25a1.042 1.042 0 0 1-1.042-1.041Zm1.042 5.208a1.042 1.042 0 1 0 0 2.083h6.25a1.042 1.042 0 0 0 0-2.083h-6.25Z" clip-rule="evenodd"/>
+  <path class="tw-fill-illustration-bg-tertiary" d="M40.625 62.21c0-.575.466-1.041 1.042-1.041H50c.575 0 1.042.466 1.042 1.042v8.333c0 .575-.467 1.042-1.042 1.042h-8.333a1.042 1.042 0 0 1-1.042-1.042V62.21Z"/>
+  <path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M42.708 63.252v6.25h6.25v-6.25h-6.25Zm-1.041-2.083c-.576 0-1.042.466-1.042 1.042v8.333c0 .575.466 1.042 1.042 1.042H50c.575 0 1.042-.467 1.042-1.042V62.21c0-.576-.467-1.042-1.042-1.042h-8.333Z" clip-rule="evenodd"/>
+</svg>
+`;
diff --git a/libs/assets/src/svg/svgs/carousel-icon.ts b/libs/assets/src/svg/svgs/carousel-icon.ts
index 802f6ff1435..e29fd952098 100644
--- a/libs/assets/src/svg/svgs/carousel-icon.ts
+++ b/libs/assets/src/svg/svgs/carousel-icon.ts
@@ -2,6 +2,6 @@ import { svgIcon } from "../icon-service";
 
 export const CarouselIcon = svgIcon`
   <svg class="tw-block" width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg" data-testid="inactive-carousel-icon">
-    <rect stroke="currentColor" x="0.5" y="0.5" width="11" height="11" rx="5.5" />
+    <rect class="tw-stroke-current" x="0.5" y="0.5" width="11" height="11" rx="5.5" />
   </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/favorites.icon.ts b/libs/assets/src/svg/svgs/favorites.icon.ts
new file mode 100644
index 00000000000..4725d0b0a7c
--- /dev/null
+++ b/libs/assets/src/svg/svgs/favorites.icon.ts
@@ -0,0 +1,26 @@
+import { svgIcon } from "../icon-service";
+
+export const FavoritesIcon = svgIcon`
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="5.29 4.98 86.89 90.19">
+<g clip-path="url(#clip0_2211_2391)">
+<path class="tw-stroke-illustration-outline tw-fill-illustration-bg-primary" d="M45.7322 7.73645C46.8425 5.06767 50.6228 5.06767 51.7332 7.73645L60.8269 29.5929C61.511 31.2373 63.0575 32.3607 64.8328 32.5031L88.4343 34.3947C91.316 34.6257 92.4843 38.2221 90.2888 40.1027L72.3083 55.5001C70.9554 56.6589 70.3647 58.4773 70.7781 60.2101L76.2712 83.2335C76.9419 86.0452 73.8838 88.2672 71.4167 86.7609L51.2078 74.422C49.688 73.4941 47.7773 73.4941 46.2576 74.422L26.0486 86.7609C23.5815 88.2672 20.5234 86.0452 21.1941 83.2335L26.6873 60.2101C27.1007 58.4773 26.51 56.6589 25.157 55.5001L7.17651 40.1027C4.98107 38.2221 6.14942 34.6258 9.03101 34.3947L32.6326 32.5031C34.4079 32.3607 35.9543 31.2373 36.6384 29.5929L45.7322 7.73645Z" stroke-width="1.5"/>
+<path class="tw-stroke-illustration-outline tw-fill-illustration-bg-tertiary" d="M86.5363 75.5456L67.0229 86.8083L64.3035 82.0996C63.2768 82.3932 60.0282 82.2577 55.7085 78.0915C51.1997 73.7429 53.1 69.4322 54.8897 67.3528L51.1991 60.9624C51.1991 60.9624 49.0085 57.1701 47.5085 54.572C46.5871 52.9761 46.8445 50.4707 48.594 49.461C50.3435 48.4512 52.9064 49.1601 53.9008 50.8825C56.3862 55.1873 60.6993 62.6543 60.6993 62.6543L60.3136 61.9865C59.0344 59.7715 57.8733 56.6618 60.0887 55.3831C60.1803 55.3302 60.2715 55.2816 60.3624 55.2371C62.6556 54.1121 64.7529 56.4687 66.0303 58.6805C65.81 57.9107 65.7395 56.1576 67.2199 55.3032C69.5661 53.949 71.7744 56.9755 73.1292 59.3214L72.6308 58.4584C72.1365 57.4731 71.6772 55.4212 73.4319 54.4084C75.2982 53.3313 76.7992 54.9314 77.3409 55.7398C78.3682 57.3892 80.6222 61.1108 81.42 62.8029C82.2178 64.495 82.7029 67.7429 82.8457 69.1553L86.5363 75.5456Z"/>
+<path class="tw-stroke-illustration-outline" d="M66.0303 58.6805C65.81 57.9107 65.7395 56.1576 67.2199 55.3032V55.3032C69.5661 53.949 71.7744 56.9755 73.1292 59.3214L73.9905 60.8128L72.6308 58.4584C72.1365 57.4731 71.6772 55.4212 73.4319 54.4084C75.2982 53.3313 76.7992 54.9314 77.3409 55.7398C78.3682 57.3892 80.6222 61.1108 81.42 62.8029C82.2178 64.495 82.7029 67.7429 82.8457 69.1553L86.5363 75.5456L67.0229 86.8083L64.3035 82.0996C63.2768 82.3932 60.0282 82.2577 55.7085 78.0915C51.1997 73.7429 53.1 69.4322 54.8897 67.3528M66.0303 58.6805L67.9727 62.0439M66.0303 58.6805V58.6805C64.7529 56.4687 62.6556 54.1121 60.3624 55.2371C60.2715 55.2816 60.1803 55.3302 60.0887 55.3831V55.3831C57.8733 56.6618 59.0344 59.7715 60.3136 61.9865L60.6993 62.6543C60.6993 62.6543 56.3862 55.1873 53.9008 50.8825C52.9064 49.1601 50.3435 48.4512 48.594 49.461C46.8445 50.4707 46.5871 52.9761 47.5085 54.572C49.0085 57.1701 51.1991 60.9624 51.1991 60.9624L54.8897 67.3528M57.6091 72.0616L54.8897 67.3528" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path class="tw-stroke-illustration-outline tw-fill-illustration-bg-secondary" d="M70.9905 93.6786L67.5232 87.6748C67.247 87.1965 67.4108 86.585 67.8892 86.309L85.6704 76.046C86.1487 75.7699 86.7604 75.9338 87.0366 76.4121L90.5039 82.4159C90.7802 82.8942 90.6163 83.5057 90.138 83.7818L72.3567 94.0447C71.8784 94.3208 71.2667 94.1569 70.9905 93.6786Z" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<g clip-path="url(#clip1_2211_2391)">
+<path class="tw-stroke-illustration-tertiary" d="M41.5571 37.1704L45.0496 43.2177" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path class="tw-stroke-illustration-tertiary" d="M54.9774 35.4178L53.187 42.1557" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path class="tw-stroke-illustration-tertiary" d="M65.7288 43.6858L59.6986 47.1663" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path class="tw-stroke-illustration-tertiary" d="M35.1155 61.3549L41.1457 57.8744" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path class="tw-stroke-illustration-tertiary" d="M33.329 47.9126L40.0662 49.7286" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_2211_2391">
+<rect width="96" height="96" class="tw-fill-bg-tertiary" transform="translate(0.5 0.400024)"/>
+</clipPath>
+<clipPath id="clip1_2211_2391">
+<rect width="37.6674" height="20.0537" class="tw-fill-bg-tertiary" transform="matrix(0.86609 -0.499888 0.500112 0.86596 25.2179 45.5771)"/>
+</clipPath>
+</defs>
+</svg>`;
diff --git a/libs/assets/src/svg/svgs/index.ts b/libs/assets/src/svg/svgs/index.ts
index ab4f2c23f13..1e3000c9b4c 100644
--- a/libs/assets/src/svg/svgs/index.ts
+++ b/libs/assets/src/svg/svgs/index.ts
@@ -1,17 +1,21 @@
+export * from "./account-warning.icon";
 export * from "./active-send.icon";
 export { default as AdminConsoleLogo } from "./admin-console";
+export * from "./auto-confirmation";
 export * from "./background-left-illustration";
 export * from "./background-right-illustration";
 export * from "./bitwarden-icon";
 export * from "./bitwarden-logo.icon";
 export * from "./browser-extension";
 export { default as BusinessUnitPortalLogo } from "./business-unit-portal";
+export * from "./business-welcome.icon";
 export * from "./carousel-icon";
 export * from "./credit-card.icon";
 export * from "./deactivated-org";
 export * from "./devices.icon";
 export * from "./domain.icon";
 export * from "./empty-trash";
+export * from "./favorites.icon";
 export * from "./gear";
 export * from "./generator";
 export * from "./item-types";
diff --git a/libs/assets/src/svg/svgs/secrets-manager-alt.ts b/libs/assets/src/svg/svgs/secrets-manager-alt.ts
index 293bd99cbf3..98640803ca9 100644
--- a/libs/assets/src/svg/svgs/secrets-manager-alt.ts
+++ b/libs/assets/src/svg/svgs/secrets-manager-alt.ts
@@ -1,5 +1,9 @@
 import { svgIcon } from "../icon-service";
 
 export const SecretsManagerAlt = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 580 104" fill="none"><path fill="#fff" d="M102.539 52.27c0 28.315-22.954 51.269-51.27 51.269C22.955 103.539 0 80.585 0 52.269 0 23.955 22.954 1 51.27 1c28.315 0 51.269 22.954 51.269 51.27Z"/><path fill="#175DDC" fill-rule="evenodd" d="M75.971 26.765c-.516-.49-1.111-.777-1.786-.777H28.39c-.675 0-1.31.287-1.786.777-.516.49-.754 1.145-.754 1.84v31.47c0 2.371.437 4.66 1.31 6.95.873 2.288 1.984 4.332 3.294 6.13s2.897 3.515 4.682 5.232a62.036 62.036 0 0 0 5 4.25 82.731 82.731 0 0 0 4.802 3.188c1.667.981 2.857 1.676 3.572 2.003.714.368 1.27.613 1.706.817a2.26 2.26 0 0 0 1.032.246 2.26 2.26 0 0 0 1.032-.246c.436-.204.992-.45 1.706-.817.715-.368 1.905-1.022 3.572-2.003a54.848 54.848 0 0 0 4.801-3.188c1.548-1.103 3.215-2.534 5.04-4.25 1.826-1.717 3.373-3.434 4.683-5.232 1.31-1.798 2.42-3.842 3.294-6.13.912-2.29 1.31-4.62 1.31-6.95v-31.47c.04-.695-.239-1.309-.715-1.84Zm-5.913 33.597c0 11.403-18.77 21.172-18.77 21.172V32.732h18.77v27.63Z" clip-rule="evenodd"/><path fill="#fff" d="M142.208 70.81c-2.804 0-5.243-.511-7.319-1.533-2.075-1.023-3.678-2.447-4.806-4.272-1.129-1.826-1.694-3.943-1.694-6.353h4.807c0 1.497.346 2.884 1.038 4.162.692 1.241 1.693 2.246 3.004 3.012 1.347.73 3.004 1.096 4.97 1.096 2.585 0 4.588-.621 6.008-1.862 1.42-1.242 2.13-2.794 2.13-4.656 0-1.533-.327-2.756-.983-3.669-.655-.95-1.547-1.716-2.676-2.3-1.092-.585-2.367-1.096-3.823-1.534a126.43 126.43 0 0 1-4.479-1.479c-2.95-1.022-5.134-2.281-6.555-3.778-1.42-1.534-2.13-3.524-2.13-5.97-.036-2.045.437-3.852 1.42-5.422.984-1.607 2.367-2.848 4.151-3.724 1.821-.913 3.969-1.37 6.446-1.37 2.439 0 4.551.457 6.335 1.37 1.821.913 3.223 2.172 4.206 3.779 1.02 1.606 1.548 3.432 1.584 5.476h-4.806c0-1.058-.274-2.099-.82-3.121-.546-1.06-1.383-1.917-2.512-2.574-1.093-.658-2.476-.986-4.151-.986-2.076-.037-3.787.493-5.135 1.588-1.31 1.095-1.966 2.61-1.966 4.546 0 1.643.455 2.903 1.366 3.779.946.876 2.257 1.606 3.932 2.19 1.675.548 3.605 1.187 5.79 1.917 1.821.657 3.459 1.424 4.916 2.3 1.456.877 2.585 2.009 3.386 3.396.838 1.388 1.256 3.158 1.256 5.313 0 1.825-.473 3.56-1.42 5.203-.946 1.606-2.385 2.92-4.315 3.943-1.893 1.022-4.278 1.533-7.155 1.533ZM172.42 70.81c-2.586 0-4.88-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.694-4.619-1.694-7.503 0-2.848.565-5.331 1.694-7.449 1.128-2.154 2.694-3.815 4.697-4.983 2.039-1.205 4.388-1.808 7.046-1.808 2.622 0 4.879.603 6.773 1.807 1.93 1.169 3.404 2.72 4.424 4.656a13.201 13.201 0 0 1 1.529 6.243c0 .402-.018.803-.054 1.205v1.37h-21.575c.109 2.08.582 3.815 1.42 5.202.874 1.351 1.948 2.373 3.222 3.067a8.754 8.754 0 0 0 4.152 1.04c1.893 0 3.477-.437 4.751-1.314 1.275-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.205 6.299-2.039 1.643-4.661 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.845 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.042c-.11-2.446-.947-4.363-2.513-5.75-1.566-1.388-3.495-2.081-5.789-2.081ZM202.697 70.81c-2.585 0-4.916-.584-6.991-1.752-2.039-1.205-3.66-2.867-4.861-4.984-1.166-2.154-1.748-4.655-1.748-7.503s.582-5.331 1.748-7.449c1.201-2.154 2.822-3.815 4.861-4.983 2.075-1.205 4.406-1.808 6.991-1.808 3.204 0 5.899.84 8.084 2.52 2.221 1.679 3.623 3.924 4.206 6.736h-4.698c-.364-1.68-1.256-2.976-2.676-3.889-1.42-.949-3.077-1.424-4.97-1.424-1.53 0-2.968.384-4.315 1.15-1.348.767-2.44 1.917-3.278 3.45-.837 1.534-1.256 3.433-1.256 5.697 0 2.263.419 4.162 1.256 5.696.838 1.533 1.93 2.701 3.278 3.505a8.584 8.584 0 0 0 4.315 1.15c1.893 0 3.55-.457 4.97-1.37 1.42-.949 2.312-2.282 2.676-3.998h4.698c-.547 2.739-1.93 4.966-4.152 6.682-2.221 1.716-4.934 2.574-8.138 2.574ZM220.302 70.153V42.988h4.151l.382 5.203c.838-1.789 2.112-3.213 3.823-4.272 1.712-1.058 3.824-1.588 6.336-1.588v4.82h-1.256c-1.602 0-3.077.292-4.424.876-1.347.548-2.422 1.497-3.223 2.848-.801 1.35-1.201 3.213-1.201 5.586v13.692h-4.588ZM250.218 70.81c-2.585 0-4.879-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.693-4.619-1.693-7.503 0-2.848.564-5.331 1.693-7.449 1.129-2.154 2.695-3.815 4.698-4.983 2.039-1.205 4.387-1.808 7.045-1.808 2.622 0 4.88.603 6.773 1.807 1.93 1.169 3.405 2.72 4.424 4.656 1.02 1.935 1.53 4.016 1.53 6.243 0 .402-.018.803-.055 1.205v1.37h-21.575c.11 2.08.583 3.815 1.421 5.202.874 1.351 1.948 2.373 3.222 3.067a8.753 8.753 0 0 0 4.151 1.04c1.894 0 3.478-.437 4.752-1.314 1.275-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.206 6.299-2.039 1.643-4.66 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.844 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.041c-.109-2.446-.946-4.363-2.512-5.75-1.566-1.388-3.496-2.081-5.79-2.081ZM277.841 70.153c-2.476 0-4.424-.603-5.844-1.807-1.42-1.205-2.13-3.378-2.13-6.518V46.877h-4.698v-3.889h4.698l.601-6.517h3.987v6.517h7.974v3.889h-7.974v14.951c0 1.716.346 2.885 1.038 3.505.691.585 1.911.877 3.659.877h2.84v3.943h-4.151ZM297.544 70.81c-3.241 0-5.936-.821-8.084-2.464-2.149-1.643-3.405-3.87-3.769-6.682h4.697c.292 1.424 1.038 2.665 2.24 3.724 1.238 1.022 2.895 1.534 4.97 1.534 1.93 0 3.35-.402 4.26-1.205.911-.84 1.366-1.826 1.366-2.958 0-1.643-.601-2.738-1.803-3.286-1.165-.547-2.822-1.04-4.97-1.478a28.114 28.114 0 0 1-4.369-1.26c-1.457-.548-2.677-1.315-3.66-2.3-.983-1.023-1.475-2.355-1.475-3.998 0-2.373.874-4.309 2.622-5.806 1.784-1.533 4.188-2.3 7.21-2.3 2.876 0 5.225.73 7.046 2.19 1.857 1.425 2.931 3.47 3.222 6.135h-4.533c-.182-1.388-.783-2.465-1.803-3.231-.983-.804-2.312-1.205-3.987-1.205-1.638 0-2.913.346-3.823 1.04-.874.694-1.311 1.607-1.311 2.739 0 1.095.564 1.953 1.693 2.574 1.165.62 2.731 1.15 4.697 1.588 1.675.365 3.259.821 4.752 1.37 1.53.51 2.768 1.295 3.714 2.354.984 1.022 1.475 2.52 1.475 4.491.037 2.446-.892 4.473-2.785 6.08-1.857 1.57-4.388 2.354-7.592 2.354ZM327.019 70.153V31.816h5.353l13.764 26.726 13.655-26.726h5.407v38.337h-4.588V40.031l-12.781 24.645h-3.441l-12.781-24.59v30.067h-4.588ZM380.911 70.81c-2.258 0-4.133-.383-5.626-1.15-1.493-.767-2.604-1.789-3.332-3.067a8.266 8.266 0 0 1-1.092-4.162c0-2.775 1.056-4.911 3.168-6.408 2.112-1.497 4.988-2.245 8.63-2.245h7.319v-.33c0-2.372-.619-4.161-1.857-5.366-1.238-1.242-2.895-1.862-4.971-1.862-1.784 0-3.332.456-4.642 1.369-1.275.876-2.076 2.172-2.404 3.888h-4.697c.182-1.971.838-3.633 1.966-4.983 1.166-1.352 2.604-2.374 4.315-3.068 1.712-.73 3.532-1.095 5.462-1.095 3.787 0 6.627 1.022 8.521 3.067 1.93 2.008 2.895 4.692 2.895 8.05v16.705h-4.097l-.273-4.874c-.765 1.533-1.893 2.848-3.386 3.943-1.457 1.059-3.423 1.588-5.899 1.588Zm.71-3.888c1.748 0 3.241-.457 4.479-1.37a8.66 8.66 0 0 0 2.895-3.56c.655-1.46.983-2.993.983-4.6v-.055h-6.937c-2.695 0-4.606.475-5.735 1.424-1.092.913-1.639 2.063-1.639 3.45 0 1.425.51 2.575 1.53 3.451 1.056.84 2.53 1.26 4.424 1.26ZM400.356 70.153V42.988h4.151l.273 4.875a9.86 9.86 0 0 1 3.769-4.053c1.639-.986 3.496-1.479 5.571-1.479 3.205 0 5.754.986 7.647 2.958 1.93 1.935 2.895 4.929 2.895 8.981v15.883h-4.588v-15.39c0-5.659-2.331-8.489-6.991-8.489-2.331 0-4.279.858-5.845 2.575-1.529 1.679-2.294 4.089-2.294 7.229v14.075h-4.588ZM439.533 70.81c-2.258 0-4.133-.383-5.626-1.15-1.493-.767-2.603-1.789-3.332-3.067a8.266 8.266 0 0 1-1.092-4.162c0-2.775 1.056-4.911 3.168-6.408 2.112-1.497 4.988-2.245 8.63-2.245h7.319v-.33c0-2.372-.619-4.161-1.857-5.366-1.238-1.242-2.895-1.862-4.971-1.862-1.784 0-3.331.456-4.642 1.369-1.275.876-2.076 2.172-2.404 3.888h-4.697c.182-1.971.838-3.633 1.966-4.983 1.166-1.352 2.604-2.374 4.315-3.068 1.712-.73 3.532-1.095 5.462-1.095 3.787 0 6.627 1.022 8.521 3.067 1.93 2.008 2.895 4.692 2.895 8.05v16.705h-4.097l-.273-4.874c-.764 1.533-1.893 2.848-3.386 3.943-1.457 1.059-3.423 1.588-5.899 1.588Zm.71-3.888c1.748 0 3.241-.457 4.479-1.37a8.66 8.66 0 0 0 2.895-3.56c.655-1.46.983-2.993.983-4.6v-.055h-6.937c-2.694 0-4.606.475-5.735 1.424-1.092.913-1.639 2.063-1.639 3.45 0 1.425.51 2.575 1.53 3.451 1.056.84 2.531 1.26 4.424 1.26ZM469.684 61.61c-1.53 0-2.931-.202-4.206-.603l-2.731 2.574c.401.292.892.548 1.475.767.619.182 1.493.365 2.622.547 1.128.146 2.712.31 4.751.493 3.642.256 6.245 1.096 7.811 2.52 1.566 1.424 2.349 3.286 2.349 5.586 0 1.57-.437 3.067-1.311 4.49-.838 1.425-2.149 2.593-3.933 3.506-1.748.913-4.005 1.369-6.773 1.369-2.439 0-4.606-.329-6.499-.986-1.894-.62-3.369-1.588-4.425-2.903-1.055-1.277-1.583-2.902-1.583-4.874 0-1.022.273-2.136.819-3.34.546-1.169 1.566-2.282 3.059-3.341a13.725 13.725 0 0 1-2.076-1.041 13.173 13.173 0 0 1-1.529-1.314V63.8l4.642-4.6c-2.148-1.826-3.222-4.236-3.222-7.23 0-1.789.418-3.414 1.256-4.874.837-1.46 2.057-2.61 3.66-3.45 1.602-.877 3.55-1.315 5.844-1.315 1.566 0 2.986.22 4.26.657h9.995v3.45l-5.079.22c1.056 1.533 1.584 3.304 1.584 5.312 0 1.79-.437 3.414-1.311 4.874-.838 1.461-2.057 2.63-3.66 3.506-1.565.84-3.495 1.26-5.789 1.26Zm0-3.78c1.93 0 3.459-.493 4.588-1.478 1.165-1.023 1.748-2.483 1.748-4.382 0-1.862-.583-3.286-1.748-4.272-1.129-1.022-2.658-1.533-4.588-1.533-1.967 0-3.532.511-4.698 1.533-1.128.986-1.693 2.41-1.693 4.272 0 1.899.565 3.36 1.693 4.382 1.166.985 2.731 1.478 4.698 1.478Zm-7.975 15.828c0 1.826.765 3.177 2.294 4.053 1.53.913 3.441 1.37 5.735 1.37 2.258 0 4.06-.494 5.408-1.48 1.383-.986 2.075-2.3 2.075-3.943 0-1.168-.473-2.19-1.42-3.067-.947-.84-2.694-1.332-5.243-1.479-2.003-.146-3.733-.328-5.189-.547-1.493.803-2.476 1.661-2.95 2.574-.473.95-.71 1.789-.71 2.52ZM499.136 70.81c-2.585 0-4.879-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.693-4.619-1.693-7.503 0-2.848.564-5.331 1.693-7.449 1.129-2.154 2.695-3.815 4.697-4.983 2.04-1.205 4.388-1.808 7.046-1.808 2.622 0 4.88.603 6.773 1.807 1.93 1.169 3.405 2.72 4.424 4.656 1.02 1.935 1.53 4.016 1.53 6.243 0 .402-.019.803-.055 1.205v1.37h-21.575c.11 2.08.583 3.815 1.42 5.202.874 1.351 1.949 2.373 3.223 3.067a8.753 8.753 0 0 0 4.151 1.04c1.894 0 3.478-.437 4.752-1.314 1.274-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.206 6.299-2.039 1.643-4.661 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.844 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.041c-.109-2.446-.947-4.363-2.512-5.75-1.566-1.388-3.496-2.081-5.79-2.081ZM516.96 70.153V42.988h4.151l.383 5.203c.837-1.789 2.112-3.213 3.823-4.272 1.712-1.058 3.824-1.588 6.336-1.588v4.82h-1.256c-1.602 0-3.077.292-4.424.876-1.348.548-2.422 1.497-3.223 2.848-.801 1.35-1.202 3.213-1.202 5.586v13.692h-4.588Z"/></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 580 104" fill="none">
+    <path class="tw-fill-text-alt2" d="M102.539 52.27c0 28.315-22.954 51.269-51.27 51.269C22.955 103.539 0 80.585 0 52.269 0 23.955 22.954 1 51.27 1c28.315 0 51.269 22.954 51.269 51.27Z"/>
+    <path class="tw-fill-bw-blue" fill-rule="evenodd" d="M75.971 26.765c-.516-.49-1.111-.777-1.786-.777H28.39c-.675 0-1.31.287-1.786.777-.516.49-.754 1.145-.754 1.84v31.47c0 2.371.437 4.66 1.31 6.95.873 2.288 1.984 4.332 3.294 6.13s2.897 3.515 4.682 5.232a62.036 62.036 0 0 0 5 4.25 82.731 82.731 0 0 0 4.802 3.188c1.667.981 2.857 1.676 3.572 2.003.714.368 1.27.613 1.706.817a2.26 2.26 0 0 0 1.032.246 2.26 2.26 0 0 0 1.032-.246c.436-.204.992-.45 1.706-.817.715-.368 1.905-1.022 3.572-2.003a54.848 54.848 0 0 0 4.801-3.188c1.548-1.103 3.215-2.534 5.04-4.25 1.826-1.717 3.373-3.434 4.683-5.232 1.31-1.798 2.42-3.842 3.294-6.13.912-2.29 1.31-4.62 1.31-6.95v-31.47c.04-.695-.239-1.309-.715-1.84Zm-5.913 33.597c0 11.403-18.77 21.172-18.77 21.172V32.732h18.77v27.63Z" clip-rule="evenodd"/>
+    <path class="tw-fill-text-alt2" d="M142.208 70.81c-2.804 0-5.243-.511-7.319-1.533-2.075-1.023-3.678-2.447-4.806-4.272-1.129-1.826-1.694-3.943-1.694-6.353h4.807c0 1.497.346 2.884 1.038 4.162.692 1.241 1.693 2.246 3.004 3.012 1.347.73 3.004 1.096 4.97 1.096 2.585 0 4.588-.621 6.008-1.862 1.42-1.242 2.13-2.794 2.13-4.656 0-1.533-.327-2.756-.983-3.669-.655-.95-1.547-1.716-2.676-2.3-1.092-.585-2.367-1.096-3.823-1.534a126.43 126.43 0 0 1-4.479-1.479c-2.95-1.022-5.134-2.281-6.555-3.778-1.42-1.534-2.13-3.524-2.13-5.97-.036-2.045.437-3.852 1.42-5.422.984-1.607 2.367-2.848 4.151-3.724 1.821-.913 3.969-1.37 6.446-1.37 2.439 0 4.551.457 6.335 1.37 1.821.913 3.223 2.172 4.206 3.779 1.02 1.606 1.548 3.432 1.584 5.476h-4.806c0-1.058-.274-2.099-.82-3.121-.546-1.06-1.383-1.917-2.512-2.574-1.093-.658-2.476-.986-4.151-.986-2.076-.037-3.787.493-5.135 1.588-1.31 1.095-1.966 2.61-1.966 4.546 0 1.643.455 2.903 1.366 3.779.946.876 2.257 1.606 3.932 2.19 1.675.548 3.605 1.187 5.79 1.917 1.821.657 3.459 1.424 4.916 2.3 1.456.877 2.585 2.009 3.386 3.396.838 1.388 1.256 3.158 1.256 5.313 0 1.825-.473 3.56-1.42 5.203-.946 1.606-2.385 2.92-4.315 3.943-1.893 1.022-4.278 1.533-7.155 1.533ZM172.42 70.81c-2.586 0-4.88-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.694-4.619-1.694-7.503 0-2.848.565-5.331 1.694-7.449 1.128-2.154 2.694-3.815 4.697-4.983 2.039-1.205 4.388-1.808 7.046-1.808 2.622 0 4.879.603 6.773 1.807 1.93 1.169 3.404 2.72 4.424 4.656a13.201 13.201 0 0 1 1.529 6.243c0 .402-.018.803-.054 1.205v1.37h-21.575c.109 2.08.582 3.815 1.42 5.202.874 1.351 1.948 2.373 3.222 3.067a8.754 8.754 0 0 0 4.152 1.04c1.893 0 3.477-.437 4.751-1.314 1.275-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.205 6.299-2.039 1.643-4.661 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.845 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.042c-.11-2.446-.947-4.363-2.513-5.75-1.566-1.388-3.495-2.081-5.789-2.081ZM202.697 70.81c-2.585 0-4.916-.584-6.991-1.752-2.039-1.205-3.66-2.867-4.861-4.984-1.166-2.154-1.748-4.655-1.748-7.503s.582-5.331 1.748-7.449c1.201-2.154 2.822-3.815 4.861-4.983 2.075-1.205 4.406-1.808 6.991-1.808 3.204 0 5.899.84 8.084 2.52 2.221 1.679 3.623 3.924 4.206 6.736h-4.698c-.364-1.68-1.256-2.976-2.676-3.889-1.42-.949-3.077-1.424-4.97-1.424-1.53 0-2.968.384-4.315 1.15-1.348.767-2.44 1.917-3.278 3.45-.837 1.534-1.256 3.433-1.256 5.697 0 2.263.419 4.162 1.256 5.696.838 1.533 1.93 2.701 3.278 3.505a8.584 8.584 0 0 0 4.315 1.15c1.893 0 3.55-.457 4.97-1.37 1.42-.949 2.312-2.282 2.676-3.998h4.698c-.547 2.739-1.93 4.966-4.152 6.682-2.221 1.716-4.934 2.574-8.138 2.574ZM220.302 70.153V42.988h4.151l.382 5.203c.838-1.789 2.112-3.213 3.823-4.272 1.712-1.058 3.824-1.588 6.336-1.588v4.82h-1.256c-1.602 0-3.077.292-4.424.876-1.347.548-2.422 1.497-3.223 2.848-.801 1.35-1.201 3.213-1.201 5.586v13.692h-4.588ZM250.218 70.81c-2.585 0-4.879-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.693-4.619-1.693-7.503 0-2.848.564-5.331 1.693-7.449 1.129-2.154 2.695-3.815 4.698-4.983 2.039-1.205 4.387-1.808 7.045-1.808 2.622 0 4.88.603 6.773 1.807 1.93 1.169 3.405 2.72 4.424 4.656 1.02 1.935 1.53 4.016 1.53 6.243 0 .402-.018.803-.055 1.205v1.37h-21.575c.11 2.08.583 3.815 1.421 5.202.874 1.351 1.948 2.373 3.222 3.067a8.753 8.753 0 0 0 4.151 1.04c1.894 0 3.478-.437 4.752-1.314 1.275-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.206 6.299-2.039 1.643-4.66 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.844 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.041c-.109-2.446-.946-4.363-2.512-5.75-1.566-1.388-3.496-2.081-5.79-2.081ZM277.841 70.153c-2.476 0-4.424-.603-5.844-1.807-1.42-1.205-2.13-3.378-2.13-6.518V46.877h-4.698v-3.889h4.698l.601-6.517h3.987v6.517h7.974v3.889h-7.974v14.951c0 1.716.346 2.885 1.038 3.505.691.585 1.911.877 3.659.877h2.84v3.943h-4.151ZM297.544 70.81c-3.241 0-5.936-.821-8.084-2.464-2.149-1.643-3.405-3.87-3.769-6.682h4.697c.292 1.424 1.038 2.665 2.24 3.724 1.238 1.022 2.895 1.534 4.97 1.534 1.93 0 3.35-.402 4.26-1.205.911-.84 1.366-1.826 1.366-2.958 0-1.643-.601-2.738-1.803-3.286-1.165-.547-2.822-1.04-4.97-1.478a28.114 28.114 0 0 1-4.369-1.26c-1.457-.548-2.677-1.315-3.66-2.3-.983-1.023-1.475-2.355-1.475-3.998 0-2.373.874-4.309 2.622-5.806 1.784-1.533 4.188-2.3 7.21-2.3 2.876 0 5.225.73 7.046 2.19 1.857 1.425 2.931 3.47 3.222 6.135h-4.533c-.182-1.388-.783-2.465-1.803-3.231-.983-.804-2.312-1.205-3.987-1.205-1.638 0-2.913.346-3.823 1.04-.874.694-1.311 1.607-1.311 2.739 0 1.095.564 1.953 1.693 2.574 1.165.62 2.731 1.15 4.697 1.588 1.675.365 3.259.821 4.752 1.37 1.53.51 2.768 1.295 3.714 2.354.984 1.022 1.475 2.52 1.475 4.491.037 2.446-.892 4.473-2.785 6.08-1.857 1.57-4.388 2.354-7.592 2.354ZM327.019 70.153V31.816h5.353l13.764 26.726 13.655-26.726h5.407v38.337h-4.588V40.031l-12.781 24.645h-3.441l-12.781-24.59v30.067h-4.588ZM380.911 70.81c-2.258 0-4.133-.383-5.626-1.15-1.493-.767-2.604-1.789-3.332-3.067a8.266 8.266 0 0 1-1.092-4.162c0-2.775 1.056-4.911 3.168-6.408 2.112-1.497 4.988-2.245 8.63-2.245h7.319v-.33c0-2.372-.619-4.161-1.857-5.366-1.238-1.242-2.895-1.862-4.971-1.862-1.784 0-3.332.456-4.642 1.369-1.275.876-2.076 2.172-2.404 3.888h-4.697c.182-1.971.838-3.633 1.966-4.983 1.166-1.352 2.604-2.374 4.315-3.068 1.712-.73 3.532-1.095 5.462-1.095 3.787 0 6.627 1.022 8.521 3.067 1.93 2.008 2.895 4.692 2.895 8.05v16.705h-4.097l-.273-4.874c-.765 1.533-1.893 2.848-3.386 3.943-1.457 1.059-3.423 1.588-5.899 1.588Zm.71-3.888c1.748 0 3.241-.457 4.479-1.37a8.66 8.66 0 0 0 2.895-3.56c.655-1.46.983-2.993.983-4.6v-.055h-6.937c-2.695 0-4.606.475-5.735 1.424-1.092.913-1.639 2.063-1.639 3.45 0 1.425.51 2.575 1.53 3.451 1.056.84 2.53 1.26 4.424 1.26ZM400.356 70.153V42.988h4.151l.273 4.875a9.86 9.86 0 0 1 3.769-4.053c1.639-.986 3.496-1.479 5.571-1.479 3.205 0 5.754.986 7.647 2.958 1.93 1.935 2.895 4.929 2.895 8.981v15.883h-4.588v-15.39c0-5.659-2.331-8.489-6.991-8.489-2.331 0-4.279.858-5.845 2.575-1.529 1.679-2.294 4.089-2.294 7.229v14.075h-4.588ZM439.533 70.81c-2.258 0-4.133-.383-5.626-1.15-1.493-.767-2.603-1.789-3.332-3.067a8.266 8.266 0 0 1-1.092-4.162c0-2.775 1.056-4.911 3.168-6.408 2.112-1.497 4.988-2.245 8.63-2.245h7.319v-.33c0-2.372-.619-4.161-1.857-5.366-1.238-1.242-2.895-1.862-4.971-1.862-1.784 0-3.331.456-4.642 1.369-1.275.876-2.076 2.172-2.404 3.888h-4.697c.182-1.971.838-3.633 1.966-4.983 1.166-1.352 2.604-2.374 4.315-3.068 1.712-.73 3.532-1.095 5.462-1.095 3.787 0 6.627 1.022 8.521 3.067 1.93 2.008 2.895 4.692 2.895 8.05v16.705h-4.097l-.273-4.874c-.764 1.533-1.893 2.848-3.386 3.943-1.457 1.059-3.423 1.588-5.899 1.588Zm.71-3.888c1.748 0 3.241-.457 4.479-1.37a8.66 8.66 0 0 0 2.895-3.56c.655-1.46.983-2.993.983-4.6v-.055h-6.937c-2.694 0-4.606.475-5.735 1.424-1.092.913-1.639 2.063-1.639 3.45 0 1.425.51 2.575 1.53 3.451 1.056.84 2.531 1.26 4.424 1.26ZM469.684 61.61c-1.53 0-2.931-.202-4.206-.603l-2.731 2.574c.401.292.892.548 1.475.767.619.182 1.493.365 2.622.547 1.128.146 2.712.31 4.751.493 3.642.256 6.245 1.096 7.811 2.52 1.566 1.424 2.349 3.286 2.349 5.586 0 1.57-.437 3.067-1.311 4.49-.838 1.425-2.149 2.593-3.933 3.506-1.748.913-4.005 1.369-6.773 1.369-2.439 0-4.606-.329-6.499-.986-1.894-.62-3.369-1.588-4.425-2.903-1.055-1.277-1.583-2.902-1.583-4.874 0-1.022.273-2.136.819-3.34.546-1.169 1.566-2.282 3.059-3.341a13.725 13.725 0 0 1-2.076-1.041 13.173 13.173 0 0 1-1.529-1.314V63.8l4.642-4.6c-2.148-1.826-3.222-4.236-3.222-7.23 0-1.789.418-3.414 1.256-4.874.837-1.46 2.057-2.61 3.66-3.45 1.602-.877 3.55-1.315 5.844-1.315 1.566 0 2.986.22 4.26.657h9.995v3.45l-5.079.22c1.056 1.533 1.584 3.304 1.584 5.312 0 1.79-.437 3.414-1.311 4.874-.838 1.461-2.057 2.63-3.66 3.506-1.565.84-3.495 1.26-5.789 1.26Zm0-3.78c1.93 0 3.459-.493 4.588-1.478 1.165-1.023 1.748-2.483 1.748-4.382 0-1.862-.583-3.286-1.748-4.272-1.129-1.022-2.658-1.533-4.588-1.533-1.967 0-3.532.511-4.698 1.533-1.128.986-1.693 2.41-1.693 4.272 0 1.899.565 3.36 1.693 4.382 1.166.985 2.731 1.478 4.698 1.478Zm-7.975 15.828c0 1.826.765 3.177 2.294 4.053 1.53.913 3.441 1.37 5.735 1.37 2.258 0 4.06-.494 5.408-1.48 1.383-.986 2.075-2.3 2.075-3.943 0-1.168-.473-2.19-1.42-3.067-.947-.84-2.694-1.332-5.243-1.479-2.003-.146-3.733-.328-5.189-.547-1.493.803-2.476 1.661-2.95 2.574-.473.95-.71 1.789-.71 2.52ZM499.136 70.81c-2.585 0-4.879-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.693-4.619-1.693-7.503 0-2.848.564-5.331 1.693-7.449 1.129-2.154 2.695-3.815 4.697-4.983 2.04-1.205 4.388-1.808 7.046-1.808 2.622 0 4.88.603 6.773 1.807 1.93 1.169 3.405 2.72 4.424 4.656 1.02 1.935 1.53 4.016 1.53 6.243 0 .402-.019.803-.055 1.205v1.37h-21.575c.11 2.08.583 3.815 1.42 5.202.874 1.351 1.949 2.373 3.223 3.067a8.753 8.753 0 0 0 4.151 1.04c1.894 0 3.478-.437 4.752-1.314 1.274-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.206 6.299-2.039 1.643-4.661 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.844 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.041c-.109-2.446-.947-4.363-2.512-5.75-1.566-1.388-3.496-2.081-5.79-2.081ZM516.96 70.153V42.988h4.151l.383 5.203c.837-1.789 2.112-3.213 3.823-4.272 1.712-1.058 3.824-1.588 6.336-1.588v4.82h-1.256c-1.602 0-3.077.292-4.424.876-1.348.548-2.422 1.497-3.223 2.848-.801 1.35-1.202 3.213-1.202 5.586v13.692h-4.588Z"/>
+  </svg>
 `;
diff --git a/libs/assets/src/svg/svgs/shield.ts b/libs/assets/src/svg/svgs/shield.ts
index eaf9780773e..38d429604aa 100644
--- a/libs/assets/src/svg/svgs/shield.ts
+++ b/libs/assets/src/svg/svgs/shield.ts
@@ -1,14 +1,5 @@
 import { svgIcon } from "../icon-service";
 
-/**
- * Shield logo with extra space in the viewbox.
- */
-const AnonLayoutBitwardenShield = svgIcon`
-  <svg viewBox="10 15 100 100" xmlns="http://www.w3.org/2000/svg">
-    <path class="tw-fill-marketing-logo" d="M82.2944 69.1899V37.2898H60V93.9624C63.948 91.869 67.4812 89.5927 70.5998 87.1338C78.3962 81.0196 82.2944 75.0383 82.2944 69.1899ZM91.8491 30.9097V69.1899C91.8491 72.0477 91.2934 74.8805 90.182 77.6883C89.0706 80.4962 87.6938 82.9884 86.0516 85.1649C84.4094 87.3415 82.452 89.4598 80.1794 91.5201C77.9068 93.5803 75.8084 95.2916 73.8842 96.654C71.96 98.0164 69.9528 99.304 67.8627 100.517C65.7726 101.73 64.288 102.552 63.4088 102.984C62.5297 103.416 61.8247 103.748 61.2939 103.981C60.8958 104.18 60.4645 104.28 60 104.28C59.5355 104.28 59.1042 104.18 58.7061 103.981C58.1753 103.748 57.4703 103.416 56.5911 102.984C55.712 102.552 54.2273 101.73 52.1372 100.517C50.0471 99.304 48.04 98.0164 46.1158 96.654C44.1916 95.2916 42.0932 93.5803 39.8206 91.5201C37.548 89.4598 35.5906 87.3415 33.9484 85.1649C32.3062 82.9884 30.9294 80.4962 29.818 77.6883C28.7066 74.8805 28.1509 72.0477 28.1509 69.1899V30.9097C28.1509 30.0458 28.4661 29.2981 29.0964 28.6668C29.7267 28.0354 30.4732 27.7197 31.3358 27.7197H88.6642C89.5268 27.7197 90.2732 28.0354 90.9036 28.6668C91.5339 29.2981 91.8491 30.0458 91.8491 30.9097Z" />
-  </svg>
-`;
-
 const BitwardenShield = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 32" fill="none">
     <g clip-path="url(#bitwarden-shield-clip)">
@@ -22,4 +13,4 @@ const BitwardenShield = svgIcon`
   </svg>
 `;
 
-export { AnonLayoutBitwardenShield, BitwardenShield };
+export { BitwardenShield };
diff --git a/libs/assets/src/svg/svgs/two-factor-auth-duo.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-duo.icon.ts
index 53a81386e04..5bf43334d18 100644
--- a/libs/assets/src/svg/svgs/two-factor-auth-duo.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-duo.icon.ts
@@ -1,3 +1,5 @@
+// this svg includes the Duo logo, which contains colors not part of our bitwarden theme colors
+/* eslint-disable @bitwarden/components/require-theme-colors-in-svg */
 import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthDuoIcon = svgIcon`
@@ -13,7 +15,7 @@ export const TwoFactorAuthDuoIcon = svgIcon`
     </g>
     <defs>
         <clipPath id="two-factor-auth-duo-clip">
-            <path fill="#fff" d="M0 .588h120v38.824H0z" />
+            <path class="tw-fill-text-alt2" d="M0 .588h120v38.824H0z" />
         </clipPath>
     </defs>
 </svg>
diff --git a/libs/assets/src/svg/svgs/two-factor-auth-yubico.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-yubico.icon.ts
index e00bc905880..d4d38c363ae 100644
--- a/libs/assets/src/svg/svgs/two-factor-auth-yubico.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-yubico.icon.ts
@@ -1,3 +1,5 @@
+// this svg includes the Yubico logo, which contains colors not part of our bitwarden theme colors
+/* eslint-disable @bitwarden/components/require-theme-colors-in-svg */
 import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthYubicoIcon = svgIcon`
@@ -8,7 +10,7 @@ export const TwoFactorAuthYubicoIcon = svgIcon`
     </g>
     <defs>
         <clipPath id="two-factor-auth-yubico-clip">
-            <path fill="#fff" d="M.5.377h120v32.247H.5z" />
+            <path class="tw-fill-text-alt2" d="M.5.377h120v32.247H.5z" />
         </clipPath>
     </defs>
 </svg>
diff --git a/libs/auth/src/angular/fingerprint-dialog/fingerprint-dialog.component.ts b/libs/auth/src/angular/fingerprint-dialog/fingerprint-dialog.component.ts
index 1769a57319c..5e4d1cbdb49 100644
--- a/libs/auth/src/angular/fingerprint-dialog/fingerprint-dialog.component.ts
+++ b/libs/auth/src/angular/fingerprint-dialog/fingerprint-dialog.component.ts
@@ -3,12 +3,20 @@ import { Component, Inject } from "@angular/core";
 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 { DIALOG_DATA, ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
+import {
+  DIALOG_DATA,
+  ButtonModule,
+  DialogModule,
+  DialogService,
+  CenterPositionStrategy,
+} from "@bitwarden/components";
 
 export type FingerprintDialogData = {
   fingerprint: string[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "fingerprint-dialog.component.html",
   imports: [JslibModule, ButtonModule, DialogModule],
@@ -17,6 +25,9 @@ export class FingerprintDialogComponent {
   constructor(@Inject(DIALOG_DATA) protected data: FingerprintDialogData) {}
 
   static open(dialogService: DialogService, data: FingerprintDialogData) {
-    return dialogService.open(FingerprintDialogComponent, { data });
+    return dialogService.open(FingerprintDialogComponent, {
+      data,
+      positionStrategy: new CenterPositionStrategy(),
+    });
   }
 }
diff --git a/libs/auth/src/angular/index.ts b/libs/auth/src/angular/index.ts
index fdd06509511..2bce4f52f5d 100644
--- a/libs/auth/src/angular/index.ts
+++ b/libs/auth/src/angular/index.ts
@@ -43,9 +43,6 @@ export * from "./user-verification/user-verification-dialog.component";
 export * from "./user-verification/user-verification-dialog.types";
 export * from "./user-verification/user-verification-form-input.component";
 
-// vault timeout
-export * from "./vault-timeout-input/vault-timeout-input.component";
-
 // sso
 export * from "./sso/sso.component";
 export * from "./sso/sso-component.service";
@@ -59,6 +56,8 @@ export * from "./two-factor-auth";
 
 // device verification
 export * from "./new-device-verification/new-device-verification.component";
+export * from "./new-device-verification/new-device-verification-component.service";
+export * from "./new-device-verification/default-new-device-verification-component.service";
 
 // validators
 export * from "./validators/compare-inputs.validator";
diff --git a/libs/auth/src/angular/input-password/input-password.component.html b/libs/auth/src/angular/input-password/input-password.component.html
index b6dc4141c27..d114e92bce7 100644
--- a/libs/auth/src/angular/input-password/input-password.component.html
+++ b/libs/auth/src/angular/input-password/input-password.component.html
@@ -69,7 +69,7 @@
         [(toggled)]="showPassword"
       ></button>
       <bit-hint *ngIf="flow !== InputPasswordFlow.ChangePasswordDelegation">
-        <span class="tw-font-bold">{{ "important" | i18n }} </span>
+        <span class="tw-font-medium">{{ "important" | i18n }} </span>
         {{ "masterPassImportant" | i18n }}
         {{ minPasswordLengthMsg }}.
       </bit-hint>
diff --git a/libs/auth/src/angular/input-password/input-password.component.ts b/libs/auth/src/angular/input-password/input-password.component.ts
index dda471c7129..62294f037a0 100644
--- a/libs/auth/src/angular/input-password/input-password.component.ts
+++ b/libs/auth/src/angular/input-password/input-password.component.ts
@@ -99,6 +99,8 @@ interface InputPasswordForm {
   rotateUserKey?: FormControl<boolean>;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-input-password",
   templateUrl: "./input-password.component.html",
@@ -118,24 +120,48 @@ interface InputPasswordForm {
   ],
 })
 export class InputPasswordComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(PasswordStrengthV2Component) passwordStrengthComponent:
     | PasswordStrengthV2Component
     | undefined = undefined;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onPasswordFormSubmit = new EventEmitter<PasswordInputResult>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSecondaryButtonClick = new EventEmitter<void>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() isSubmitting = new EventEmitter<boolean>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) flow!: InputPasswordFlow;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: (val: string) => val?.trim().toLowerCase() }) email?: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() userId?: UserId;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() loading = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() inlineButtons = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() primaryButtonText?: Translation;
   protected primaryButtonTextStr: string = "";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() secondaryButtonText?: Translation;
   protected secondaryButtonTextStr: string = "";
 
@@ -538,7 +564,7 @@ export class InputPasswordComponent implements OnInit {
       }
     } else if (passwordIsWeak) {
       const userAcceptedDialog = await this.dialogService.openSimpleDialog({
-        title: { key: "weakMasterPasswordDesc" },
+        title: { key: "weakMasterPassword" },
         content: { key: "weakMasterPasswordDesc" },
         type: "warning",
       });
diff --git a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
index a2018817fed..fb07069998b 100644
--- a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
+++ b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
@@ -50,6 +50,8 @@ enum State {
   ExistingUserUntrustedDevice,
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./login-decryption-options.component.html",
   imports: [
@@ -133,7 +135,7 @@ export class LoginDecryptionOptionsComponent implements OnInit {
 
     try {
       const userDecryptionOptions = await firstValueFrom(
-        this.userDecryptionOptionsService.userDecryptionOptions$,
+        this.userDecryptionOptionsService.userDecryptionOptionsById$(this.activeAccountId),
       );
 
       if (
diff --git a/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.html b/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.html
index 38dc874cd0f..18a0db30904 100644
--- a/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.html
+++ b/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.html
@@ -23,7 +23,7 @@
         {{ "notificationSentDeviceComplete" | i18n }}
       </p>
 
-      <div class="tw-font-semibold">{{ "fingerprintPhraseHeader" | i18n }}</div>
+      <div class="tw-font-medium">{{ "fingerprintPhraseHeader" | i18n }}</div>
       <code class="tw-text-code">{{ fingerprintPhrase }}</code>
 
       <button
@@ -50,7 +50,7 @@
     <ng-container *ngIf="flow === Flow.AdminAuthRequest">
       <p>{{ "youWillBeNotifiedOnceTheRequestIsApproved" | i18n }}</p>
 
-      <div class="tw-font-semibold">{{ "fingerprintPhraseHeader" | i18n }}</div>
+      <div class="tw-font-medium">{{ "fingerprintPhraseHeader" | i18n }}</div>
       <code class="tw-text-code">{{ fingerprintPhrase }}</code>
 
       <div class="tw-mt-4">
diff --git a/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts b/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
index 10b19567946..2436593dfda 100644
--- a/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
+++ b/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
@@ -56,6 +56,8 @@ const matchOptions: IsActiveMatchOptions = {
   matrixParams: "ignored",
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./login-via-auth-request.component.html",
   imports: [ButtonModule, CommonModule, JslibModule, LinkModule, RouterModule],
diff --git a/libs/auth/src/angular/login/login-secondary-content.component.ts b/libs/auth/src/angular/login/login-secondary-content.component.ts
index 9cd4cfd2502..29474d5c8c6 100644
--- a/libs/auth/src/angular/login/login-secondary-content.component.ts
+++ b/libs/auth/src/angular/login/login-secondary-content.component.ts
@@ -8,6 +8,8 @@ import { DefaultServerSettingsService } from "@bitwarden/common/platform/service
 // eslint-disable-next-line no-restricted-imports
 import { LinkModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [CommonModule, JslibModule, LinkModule, RouterModule],
   template: `
diff --git a/libs/auth/src/angular/login/login.component.html b/libs/auth/src/angular/login/login.component.html
index 26e19f11147..e33872829ad 100644
--- a/libs/auth/src/angular/login/login.component.html
+++ b/libs/auth/src/angular/login/login.component.html
@@ -1,4 +1,4 @@
-<!-- 
+<!--
   # Table of Contents
 
     This file contains a single consolidated template for all visual clients.
@@ -21,7 +21,7 @@
         bitInput
         appAutofocus
         (input)="onEmailInput($event)"
-        (keyup.enter)="continuePressed()"
+        (keyup.enter)="ssoRequired ? handleSsoClick() : continuePressed()"
       />
     </bit-form-field>
 
@@ -44,6 +44,8 @@
         block
         buttonType="primary"
         (click)="continuePressed()"
+        [bitTooltip]="ssoRequired ? ('yourOrganizationRequiresSingleSignOn' | i18n) : ''"
+        [addTooltipToDescribedby]="ssoRequired"
         [disabled]="ssoRequired"
       >
         {{ "continue" | i18n }}
@@ -59,6 +61,8 @@
           block
           buttonType="secondary"
           (click)="handleLoginWithPasskeyClick()"
+          [bitTooltip]="ssoRequired ? ('yourOrganizationRequiresSingleSignOn' | i18n) : ''"
+          [addTooltipToDescribedby]="ssoRequired"
           [disabled]="ssoRequired"
         >
           <i class="bwi bwi-passkey tw-mr-1" aria-hidden="true"></i>
@@ -67,7 +71,13 @@
       </ng-container>
 
       <!-- Button to Login with SSO -->
-      <button type="button" bitButton block buttonType="secondary" (click)="handleSsoClick()">
+      <button
+        type="button"
+        bitButton
+        block
+        [buttonType]="ssoRequired ? 'primary' : 'secondary'"
+        (click)="handleSsoClick()"
+      >
         <i class="bwi bwi-provider tw-mr-1" aria-hidden="true"></i>
         {{ "useSingleSignOn" | i18n }}
       </button>
diff --git a/libs/auth/src/angular/login/login.component.spec.ts b/libs/auth/src/angular/login/login.component.spec.ts
new file mode 100644
index 00000000000..530b1225431
--- /dev/null
+++ b/libs/auth/src/angular/login/login.component.spec.ts
@@ -0,0 +1,102 @@
+import { FormBuilder } from "@angular/forms";
+import { mock } from "jest-mock-extended";
+
+import { LoginStrategyServiceAbstraction } from "@bitwarden/auth/common";
+import { ClientType } from "@bitwarden/common/enums";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+
+import { LoginComponent } from "./login.component";
+
+describe("LoginComponent continue() integration", () => {
+  function createComponent({ flagEnabled }: { flagEnabled: boolean }) {
+    const activatedRoute: any = { queryParams: { subscribe: () => {} } };
+    const anonLayoutWrapperDataService: any = { setAnonLayoutWrapperData: () => {} };
+    const appIdService: any = {};
+    const broadcasterService: any = { subscribe: () => {}, unsubscribe: () => {} };
+    const destroyRef: any = {};
+    const devicesApiService: any = {};
+    const formBuilder = new FormBuilder();
+    const i18nService: any = { t: () => "" };
+    const loginEmailService: any = {
+      rememberedEmail$: { pipe: () => ({}) },
+      setLoginEmail: async () => {},
+      setRememberedEmailChoice: async () => {},
+      clearLoginEmail: async () => {},
+    };
+    const loginComponentService: any = {
+      showBackButton: () => {},
+      isLoginWithPasskeySupported: () => false,
+      redirectToSsoLogin: async () => {},
+    };
+    const loginStrategyService = mock<LoginStrategyServiceAbstraction>();
+    const messagingService: any = { send: () => {} };
+    const ngZone: any = { isStable: true, onStable: { pipe: () => ({ subscribe: () => {} }) } };
+    const passwordStrengthService: any = {};
+    const platformUtilsService = mock<PlatformUtilsService>();
+    platformUtilsService.getClientType.mockReturnValue(ClientType.Browser);
+    const policyService: any = { replace: async () => {}, evaluateMasterPassword: () => true };
+    const router: any = { navigate: async () => {}, navigateByUrl: async () => {} };
+    const toastService: any = { showToast: () => {} };
+    const logService: any = { error: () => {} };
+    const validationService: any = { showError: () => {} };
+    const loginSuccessHandlerService: any = { run: async () => {} };
+    const configService = mock<ConfigService>();
+    configService.getFeatureFlag.mockResolvedValue(flagEnabled);
+    const ssoLoginService: any = { ssoRequiredCache$: { pipe: () => ({}) } };
+    const environmentService: any = { environment$: { pipe: () => ({}) } };
+
+    const component = new LoginComponent(
+      activatedRoute,
+      anonLayoutWrapperDataService,
+      appIdService,
+      broadcasterService,
+      destroyRef,
+      devicesApiService,
+      formBuilder,
+      i18nService,
+      loginEmailService,
+      loginComponentService,
+      loginStrategyService,
+      messagingService,
+      ngZone,
+      passwordStrengthService,
+      platformUtilsService,
+      policyService,
+      router,
+      toastService,
+      logService,
+      validationService,
+      loginSuccessHandlerService,
+      configService,
+      ssoLoginService,
+      environmentService,
+    );
+
+    jest.spyOn(component as any, "toggleLoginUiState").mockResolvedValue(undefined);
+
+    return { component, loginStrategyService };
+  }
+
+  it("calls getPasswordPrelogin on continue when flag enabled and email valid", async () => {
+    const { component, loginStrategyService } = createComponent({ flagEnabled: true });
+    (component as any).formGroup.controls.email.setValue("user@example.com");
+    (component as any).formGroup.controls.rememberEmail.setValue(false);
+    (component as any).formGroup.controls.masterPassword.setValue("irrelevant");
+
+    await (component as any).continue();
+
+    expect(loginStrategyService.getPasswordPrelogin).toHaveBeenCalledWith("user@example.com");
+  });
+
+  it("does not call getPasswordPrelogin when flag disabled", async () => {
+    const { component, loginStrategyService } = createComponent({ flagEnabled: false });
+    (component as any).formGroup.controls.email.setValue("user@example.com");
+    (component as any).formGroup.controls.rememberEmail.setValue(false);
+    (component as any).formGroup.controls.masterPassword.setValue("irrelevant");
+
+    await (component as any).continue();
+
+    expect(loginStrategyService.getPasswordPrelogin).not.toHaveBeenCalled();
+  });
+});
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index 91a421216f2..0b011b5641f 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -34,6 +34,7 @@ import { ErrorResponse } from "@bitwarden/common/models/response/error.response"
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -53,6 +54,7 @@ import {
   IconButtonModule,
   LinkModule,
   ToastService,
+  TooltipDirective,
 } from "@bitwarden/components";
 
 import { LoginComponentService, PasswordPolicies } from "./login-component.service";
@@ -66,6 +68,8 @@ export enum LoginUiState {
   MASTER_PASSWORD_ENTRY = "MasterPasswordEntry",
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./login.component.html",
   imports: [
@@ -79,9 +83,12 @@ export enum LoginUiState {
     JslibModule,
     ReactiveFormsModule,
     RouterModule,
+    TooltipDirective,
   ],
 })
 export class LoginComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("masterPasswordInputRef") masterPasswordInputRef: ElementRef | undefined;
 
   private destroy$ = new Subject<void>();
@@ -138,6 +145,7 @@ export class LoginComponent implements OnInit, OnDestroy {
     private loginSuccessHandlerService: LoginSuccessHandlerService,
     private configService: ConfigService,
     private ssoLoginService: SsoLoginServiceAbstraction,
+    private environmentService: EnvironmentService,
   ) {
     this.clientType = this.platformUtilsService.getClientType();
   }
@@ -197,14 +205,9 @@ export class LoginComponent implements OnInit, OnDestroy {
       await this.loadRememberedEmail();
     }
 
-    const disableAlternateLoginMethodsFlagEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.PM22110_DisableAlternateLoginMethods,
-    );
-    if (disableAlternateLoginMethodsFlagEnabled) {
-      // This SSO required check should come after email has had a chance to be pre-filled (if it
-      // was found in query params or was the remembered email)
-      await this.determineIfSsoRequired();
-    }
+    // This SSO required check should come after email has had a chance to be pre-filled (if it
+    // was found in query params or was the remembered email)
+    await this.determineIfSsoRequired();
   }
 
   private async desktopOnInit(): Promise<void> {
@@ -307,7 +310,7 @@ export class LoginComponent implements OnInit, OnDestroy {
       await this.handleAuthResult(authResult);
     } catch (error) {
       this.logService.error(error);
-      this.handleSubmitError(error);
+      await this.handleSubmitError(error);
     }
   };
 
@@ -316,15 +319,18 @@ export class LoginComponent implements OnInit, OnDestroy {
    *
    * @param error The error object.
    */
-  private handleSubmitError(error: unknown) {
+  private async handleSubmitError(error: unknown) {
     // Handle error responses
     if (error instanceof ErrorResponse) {
       switch (error.statusCode) {
         case HttpStatusCode.BadRequest: {
           if (error.message?.toLowerCase().includes("username or password is incorrect")) {
+            const env = await firstValueFrom(this.environmentService.environment$);
+            const host = Utils.getHost(env.getWebVaultUrl());
+
             this.formGroup.controls.masterPassword.setErrors({
               error: {
-                message: this.i18nService.t("invalidMasterPassword"),
+                message: this.i18nService.t("invalidMasterPasswordConfirmEmailAndHost", host),
               },
             });
           } else {
@@ -539,6 +545,8 @@ export class LoginComponent implements OnInit, OnDestroy {
     const isEmailValid = this.validateEmail();
 
     if (isEmailValid) {
+      await this.makePasswordPreloginCall();
+
       await this.toggleLoginUiState(LoginUiState.MASTER_PASSWORD_ENTRY);
     }
   }
@@ -641,6 +649,23 @@ export class LoginComponent implements OnInit, OnDestroy {
     history.back();
   }
 
+  private async makePasswordPreloginCall() {
+    // Prefetch prelogin KDF config when enabled
+    try {
+      const flagEnabled = await this.configService.getFeatureFlag(
+        FeatureFlag.PM23801_PrefetchPasswordPrelogin,
+      );
+      if (flagEnabled) {
+        const email = this.formGroup.value.email;
+        if (email) {
+          void this.loginStrategyService.getPasswordPrelogin(email);
+        }
+      }
+    } catch (error) {
+      this.logService.error("Failed to prefetch prelogin data.", error);
+    }
+  }
+
   /**
    * Handle the popstate event to transition back to the email entry state when the back button is clicked.
    * Also handles the case where the user clicks the forward button.
diff --git a/libs/auth/src/angular/new-device-verification/default-new-device-verification-component.service.spec.ts b/libs/auth/src/angular/new-device-verification/default-new-device-verification-component.service.spec.ts
new file mode 100644
index 00000000000..a2ea26268ea
--- /dev/null
+++ b/libs/auth/src/angular/new-device-verification/default-new-device-verification-component.service.spec.ts
@@ -0,0 +1,21 @@
+import { DefaultNewDeviceVerificationComponentService } from "./default-new-device-verification-component.service";
+
+describe("DefaultNewDeviceVerificationComponentService", () => {
+  let sut: DefaultNewDeviceVerificationComponentService;
+
+  beforeEach(() => {
+    sut = new DefaultNewDeviceVerificationComponentService();
+  });
+
+  it("should instantiate the service", () => {
+    expect(sut).not.toBeFalsy();
+  });
+
+  describe("showBackButton()", () => {
+    it("should return true", () => {
+      const result = sut.showBackButton();
+
+      expect(result).toBe(true);
+    });
+  });
+});
diff --git a/libs/auth/src/angular/new-device-verification/default-new-device-verification-component.service.ts b/libs/auth/src/angular/new-device-verification/default-new-device-verification-component.service.ts
new file mode 100644
index 00000000000..88ea652bc4b
--- /dev/null
+++ b/libs/auth/src/angular/new-device-verification/default-new-device-verification-component.service.ts
@@ -0,0 +1,9 @@
+import { NewDeviceVerificationComponentService } from "./new-device-verification-component.service";
+
+export class DefaultNewDeviceVerificationComponentService
+  implements NewDeviceVerificationComponentService
+{
+  showBackButton() {
+    return true;
+  }
+}
diff --git a/libs/auth/src/angular/new-device-verification/new-device-verification-component.service.ts b/libs/auth/src/angular/new-device-verification/new-device-verification-component.service.ts
new file mode 100644
index 00000000000..c34fc40ef00
--- /dev/null
+++ b/libs/auth/src/angular/new-device-verification/new-device-verification-component.service.ts
@@ -0,0 +1,8 @@
+export abstract class NewDeviceVerificationComponentService {
+  /**
+   * States whether component should show a back button. Can be overridden by client-specific component services.
+   * - Default = `true`
+   * - Extension = `false` (because Extension shows a back button in the header instead)
+   */
+  abstract showBackButton: () => boolean;
+}
diff --git a/libs/auth/src/angular/new-device-verification/new-device-verification.component.html b/libs/auth/src/angular/new-device-verification/new-device-verification.component.html
index e731f3afcb6..814c48db0fc 100644
--- a/libs/auth/src/angular/new-device-verification/new-device-verification.component.html
+++ b/libs/auth/src/angular/new-device-verification/new-device-verification.component.html
@@ -22,7 +22,7 @@
     {{ "resendCode" | i18n }}
   </button>
 
-  <div class="tw-flex tw-mt-4">
+  <div class="tw-grid tw-gap-3 tw-mt-4">
     <button
       bitButton
       bitFormButton
@@ -33,5 +33,13 @@
     >
       {{ "continueLoggingIn" | i18n }}
     </button>
+
+    @if (showBackButton) {
+      <div class="tw-text-center">{{ "or" | i18n }}</div>
+
+      <button type="button" bitButton block buttonType="secondary" (click)="goBack()">
+        {{ "back" | i18n }}
+      </button>
+    }
   </div>
 </form>
diff --git a/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts b/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
index 6362b901fc8..c3d6ff5d1fe 100644
--- a/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
+++ b/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
@@ -1,4 +1,4 @@
-import { CommonModule } from "@angular/common";
+import { CommonModule, Location } from "@angular/common";
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
@@ -11,7 +11,6 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
@@ -26,9 +25,13 @@ import {
 
 import { LoginStrategyServiceAbstraction } from "../../common/abstractions/login-strategy.service";
 
+import { NewDeviceVerificationComponentService } from "./new-device-verification-component.service";
+
 /**
  * Component for verifying a new device via a one-time password (OTP).
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-new-device-verification",
   templateUrl: "./new-device-verification.component.html",
@@ -57,6 +60,7 @@ export class NewDeviceVerificationComponent implements OnInit, OnDestroy {
   protected disableRequestOTP = false;
   private destroy$ = new Subject<void>();
   protected authenticationSessionTimeoutRoute = "/authentication-timeout";
+  protected showBackButton = true;
 
   constructor(
     private router: Router,
@@ -66,12 +70,15 @@ export class NewDeviceVerificationComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private i18nService: I18nService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
-    private configService: ConfigService,
     private accountService: AccountService,
     private masterPasswordService: MasterPasswordServiceAbstraction,
+    private newDeviceVerificationComponentService: NewDeviceVerificationComponentService,
+    private location: Location,
   ) {}
 
   async ngOnInit() {
+    this.showBackButton = this.newDeviceVerificationComponentService.showBackButton();
+
     // Redirect to timeout route if session expires
     this.loginStrategyService.authenticationSessionTimeout$
       .pipe(takeUntil(this.destroy$))
@@ -179,4 +186,8 @@ export class NewDeviceVerificationComponent implements OnInit, OnDestroy {
       codeControl.markAsTouched();
     }
   };
+
+  protected goBack() {
+    this.location.back();
+  }
 }
diff --git a/libs/auth/src/angular/password-callout/password-callout.component.ts b/libs/auth/src/angular/password-callout/password-callout.component.ts
index 7a28700f109..2d97c33c50b 100644
--- a/libs/auth/src/angular/password-callout/password-callout.component.ts
+++ b/libs/auth/src/angular/password-callout/password-callout.component.ts
@@ -10,13 +10,19 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 // eslint-disable-next-line no-restricted-imports
 import { CalloutModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-password-callout",
   templateUrl: "password-callout.component.html",
   imports: [CommonModule, JslibModule, CalloutModule],
 })
 export class PasswordCalloutComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() message = "masterPasswordPolicyInEffect";
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() policy: MasterPasswordPolicyOptions;
 
   constructor(private i18nService: I18nService) {}
diff --git a/libs/auth/src/angular/password-hint/password-hint.component.ts b/libs/auth/src/angular/password-hint/password-hint.component.ts
index 3189bf8f187..50d53e00ad3 100644
--- a/libs/auth/src/angular/password-hint/password-hint.component.ts
+++ b/libs/auth/src/angular/password-hint/password-hint.component.ts
@@ -22,6 +22,8 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./password-hint.component.html",
   imports: [
diff --git a/libs/auth/src/angular/registration/registration-env-selector/registration-env-selector.component.ts b/libs/auth/src/angular/registration/registration-env-selector/registration-env-selector.component.ts
index 93ddd00fdd6..d2dbd72989d 100644
--- a/libs/auth/src/angular/registration/registration-env-selector/registration-env-selector.component.ts
+++ b/libs/auth/src/angular/registration/registration-env-selector/registration-env-selector.component.ts
@@ -25,12 +25,16 @@ import { SelfHostedEnvConfigDialogComponent } from "../../self-hosted-env-config
  * Component for selecting the environment to register with in the email verification registration flow.
  * Outputs the selected region to the parent component so it can respond as necessary.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-registration-env-selector",
   templateUrl: "registration-env-selector.component.html",
   imports: [CommonModule, JslibModule, ReactiveFormsModule, FormFieldModule, SelectModule],
 })
 export class RegistrationEnvSelectorComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() selectedRegionChange = new EventEmitter<RegionConfig | Region.SelfHosted | null>();
 
   ServerEnvironmentType = Region;
diff --git a/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts b/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
index 952b9e9ce75..19e7c1feabd 100644
--- a/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
+++ b/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
@@ -5,6 +5,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, Params, Router, RouterModule } from "@angular/router";
 import { Subject, firstValueFrom } from "rxjs";
 
+import { PremiumInterestStateService } from "@bitwarden/angular/billing/services/premium-interest/premium-interest-state.service.abstraction";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
@@ -31,6 +32,14 @@ import { PasswordInputResult } from "../../input-password/password-input-result"
 
 import { RegistrationFinishService } from "./registration-finish.service";
 
+const MarketingInitiative = Object.freeze({
+  Premium: "premium",
+} as const);
+
+type MarketingInitiative = (typeof MarketingInitiative)[keyof typeof MarketingInitiative];
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-registration-finish",
   templateUrl: "./registration-finish.component.html",
@@ -44,6 +53,12 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
   submitting = false;
   email: string;
 
+  /**
+   * Indicates that the user is coming from a marketing page designed to streamline
+   * users who intend to setup a premium subscription after registration.
+   */
+  premiumInterest = false;
+
   // Note: this token is the email verification token. When it is supplied as a query param,
   // it either comes from the email verification email or, if email verification is disabled server side
   // via global settings, it comes directly from the registration-start component directly.
@@ -77,6 +92,7 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
+    private premiumInterestStateService: PremiumInterestStateService,
   ) {}
 
   async ngOnInit() {
@@ -124,6 +140,10 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
       this.providerInviteToken = qParams.providerInviteToken;
       this.providerUserId = qParams.providerUserId;
     }
+
+    if (qParams.fromMarketing != null && qParams.fromMarketing === MarketingInitiative.Premium) {
+      this.premiumInterest = true;
+    }
   }
 
   private async initOrgInviteFlowIfPresent(): Promise<boolean> {
@@ -188,6 +208,13 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
 
       await this.loginSuccessHandlerService.run(authenticationResult.userId);
 
+      if (this.premiumInterest) {
+        await this.premiumInterestStateService.setPremiumInterest(
+          authenticationResult.userId,
+          true,
+        );
+      }
+
       await this.router.navigate(["/vault"]);
     } catch (e) {
       // If login errors, redirect to login page per product. Don't show error
diff --git a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
index 9e75a8b888c..e7a3e99759c 100644
--- a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
+++ b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
@@ -19,6 +19,8 @@ export interface RegistrationLinkExpiredComponentData {
   loginRoute: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-registration-link-expired",
   templateUrl: "./registration-link-expired.component.html",
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start-secondary.component.ts b/libs/auth/src/angular/registration/registration-start/registration-start-secondary.component.ts
index f30dc8a3822..31e9cbc6316 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start-secondary.component.ts
+++ b/libs/auth/src/angular/registration/registration-start/registration-start-secondary.component.ts
@@ -18,6 +18,8 @@ export interface RegistrationStartSecondaryComponentData {
   loginRoute: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-registration-start-secondary",
   templateUrl: "./registration-start-secondary.component.html",
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.component.html b/libs/auth/src/angular/registration/registration-start/registration-start.component.html
index de3611a5975..665264e511d 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.component.html
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.component.html
@@ -81,7 +81,7 @@
   <div class="tw-flex tw-flex-col tw-items-center tw-justify-center">
     <p bitTypography="body1" class="tw-text-center tw-mb-3 tw-text-main" id="follow_the_link_body">
       {{ "followTheLinkInTheEmailSentTo" | i18n }}
-      <span class="tw-font-bold">{{ email.value }}</span>
+      <span class="tw-font-medium">{{ email.value }}</span>
       {{ "andContinueCreatingYourAccount" | i18n }}
     </p>
 
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.component.ts b/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
index 16018cecfa7..714f6d49342 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
@@ -40,6 +40,8 @@ const DEFAULT_MARKETING_EMAILS_PREF_BY_REGION: Record<Region, boolean> = {
   [Region.SelfHosted]: false,
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-registration-start",
   templateUrl: "./registration-start.component.html",
@@ -57,6 +59,8 @@ const DEFAULT_MARKETING_EMAILS_PREF_BY_REGION: Record<Region, boolean> = {
   ],
 })
 export class RegistrationStartComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() registrationStartStateChange = new EventEmitter<RegistrationStartState>();
 
   state: RegistrationStartState = RegistrationStartState.USER_DATA_ENTRY;
diff --git a/libs/auth/src/angular/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts b/libs/auth/src/angular/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts
index 16c25f2404f..6fb40179afa 100644
--- a/libs/auth/src/angular/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts
+++ b/libs/auth/src/angular/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from "@angular/common";
-import { Component, OnDestroy, OnInit } from "@angular/core";
+import { Component, inject, OnDestroy, OnInit } from "@angular/core";
 import {
   AbstractControl,
   FormBuilder,
@@ -16,6 +16,8 @@ import {
   EnvironmentService,
   Region,
 } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 // 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 {
@@ -51,9 +53,30 @@ function selfHostedEnvSettingsFormValidator(): ValidatorFn {
   };
 }
 
+function onlyHttpsValidator(): ValidatorFn {
+  const i18nService = inject(I18nService);
+  const platformUtilsService = inject(PlatformUtilsService);
+
+  return (control: AbstractControl): ValidationErrors | null => {
+    const url = control.value as string;
+
+    if (url && !url.startsWith("https://") && !platformUtilsService.isDev()) {
+      return {
+        onlyHttpsAllowed: {
+          message: i18nService.t("selfHostedEnvMustUseHttps"),
+        },
+      }; // invalid
+    }
+
+    return null; // valid
+  };
+}
+
 /**
  * Dialog for configuring self-hosted environment settings.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "self-hosted-env-config-dialog",
   templateUrl: "self-hosted-env-config-dialog.component.html",
@@ -87,12 +110,12 @@ export class SelfHostedEnvConfigDialogComponent implements OnInit, OnDestroy {
 
   formGroup = this.formBuilder.group(
     {
-      baseUrl: [""],
-      webVaultUrl: [""],
-      apiUrl: [""],
-      identityUrl: [""],
-      iconsUrl: [""],
-      notificationsUrl: [""],
+      baseUrl: ["", [onlyHttpsValidator()]],
+      webVaultUrl: ["", [onlyHttpsValidator()]],
+      apiUrl: ["", [onlyHttpsValidator()]],
+      identityUrl: ["", [onlyHttpsValidator()]],
+      iconsUrl: ["", [onlyHttpsValidator()]],
+      notificationsUrl: ["", [onlyHttpsValidator()]],
     },
     { validators: selfHostedEnvSettingsFormValidator() },
   );
@@ -160,10 +183,11 @@ export class SelfHostedEnvConfigDialogComponent implements OnInit, OnDestroy {
       });
   }
   submit = async () => {
+    this.formGroup.markAllAsTouched();
     this.showErrorSummary = false;
 
     if (this.formGroup.invalid) {
-      this.showErrorSummary = true;
+      this.showErrorSummary = Boolean(this.formGroup.errors?.["atLeastOneUrlIsRequired"]);
       return;
     }
 
diff --git a/libs/auth/src/angular/sso/sso.component.ts b/libs/auth/src/angular/sso/sso.component.ts
index 8636595759e..bf618ba39f4 100644
--- a/libs/auth/src/angular/sso/sso.component.ts
+++ b/libs/auth/src/angular/sso/sso.component.ts
@@ -62,6 +62,8 @@ interface QueryParams {
 /**
  * This component handles the SSO flow.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "sso.component.html",
   imports: [
@@ -458,7 +460,7 @@ export class SsoComponent implements OnInit {
 
       // must come after 2fa check since user decryption options aren't available if 2fa is required
       const userDecryptionOpts = await firstValueFrom(
-        this.userDecryptionOptionsService.userDecryptionOptions$,
+        this.userDecryptionOptionsService.userDecryptionOptionsById$(authResult.userId),
       );
 
       const tdeEnabled = userDecryptionOpts.trustedDeviceOption
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.ts
index c53bffe2496..2bc5d1a0381 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.ts
@@ -14,6 +14,8 @@ import {
   AsyncActionsModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-auth-authenticator",
   templateUrl: "two-factor-auth-authenticator.component.html",
@@ -32,7 +34,11 @@ import {
   providers: [],
 })
 export class TwoFactorAuthAuthenticatorComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) tokenFormControl: FormControl | undefined = undefined;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() tokenChange = new EventEmitter<{ token: string }>();
 
   onTokenChange(event: Event) {
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-duo/two-factor-auth-duo.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-duo/two-factor-auth-duo.component.ts
index 5ad70d3792d..0e089c674be 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-duo/two-factor-auth-duo.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-duo/two-factor-auth-duo.component.ts
@@ -25,6 +25,8 @@ import {
   TwoFactorAuthDuoComponentService,
 } from "./two-factor-auth-duo-component.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-auth-duo",
   template: "",
@@ -43,7 +45,11 @@ import {
   providers: [],
 })
 export class TwoFactorAuthDuoComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() tokenEmitter = new EventEmitter<string>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() providerData: any;
 
   duoFramelessUrl: string | undefined = undefined;
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.ts
index d98387e1cf5..79a7e1f9ddc 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.ts
@@ -36,7 +36,7 @@ export class TwoFactorAuthEmailComponentCacheService {
   /**
    * Signal for the cached email state.
    */
-  private emailCache: WritableSignal<TwoFactorAuthEmailComponentCache | null> =
+  private readonly emailCache: WritableSignal<TwoFactorAuthEmailComponentCache | null> =
     this.viewCacheService.signal<TwoFactorAuthEmailComponentCache | null>({
       key: TWO_FACTOR_AUTH_EMAIL_COMPONENT_CACHE_KEY,
       initialValue: null,
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email.component.ts
index 9b402f3a956..8976236f48c 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email.component.ts
@@ -4,10 +4,9 @@ import { ReactiveFormsModule, FormsModule, FormControl } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { LoginStrategyServiceAbstraction } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -26,6 +25,8 @@ import {
 
 import { TwoFactorAuthEmailComponentCacheService } from "./two-factor-auth-email-component-cache.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-auth-email",
   templateUrl: "two-factor-auth-email.component.html",
@@ -49,7 +50,11 @@ import { TwoFactorAuthEmailComponentCacheService } from "./two-factor-auth-email
   ],
 })
 export class TwoFactorAuthEmailComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) tokenFormControl: FormControl | undefined = undefined;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() tokenChange = new EventEmitter<{ token: string }>();
 
   twoFactorEmail: string | undefined = undefined;
@@ -62,7 +67,6 @@ export class TwoFactorAuthEmailComponent implements OnInit {
     protected loginStrategyService: LoginStrategyServiceAbstraction,
     protected platformUtilsService: PlatformUtilsService,
     protected logService: LogService,
-    protected apiService: ApiService,
     protected appIdService: AppIdService,
     private toastService: ToastService,
     private cacheService: TwoFactorAuthEmailComponentCacheService,
@@ -131,7 +135,7 @@ export class TwoFactorAuthEmailComponent implements OnInit {
       request.deviceIdentifier = await this.appIdService.getAppId();
       request.authRequestAccessCode = (await this.loginStrategyService.getAccessCode()) ?? "";
       request.authRequestId = (await this.loginStrategyService.getAuthRequestId()) ?? "";
-      this.emailPromise = this.apiService.postTwoFactorEmail(request);
+      this.emailPromise = this.twoFactorService.postTwoFactorEmail(request);
       await this.emailPromise;
 
       this.emailSent = true;
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component.ts
index 710d5dc4de0..54d6f7c5f77 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component.ts
@@ -6,8 +6,8 @@ import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { WebAuthnIFrame } from "@bitwarden/common/auth/webauthn-iframe";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -32,6 +32,8 @@ export interface WebAuthnResult {
   remember?: boolean;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-auth-webauthn",
   templateUrl: "two-factor-auth-webauthn.component.html",
@@ -50,7 +52,11 @@ export interface WebAuthnResult {
   providers: [],
 })
 export class TwoFactorAuthWebAuthnComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() webAuthnResultEmitter = new EventEmitter<WebAuthnResult>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() webAuthnInNewTabEmitter = new EventEmitter<boolean>();
 
   webAuthnReady = false;
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.ts
index 7218bee056c..40bd3fb551d 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.ts
@@ -14,6 +14,8 @@ import {
   AsyncActionsModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-auth-yubikey",
   templateUrl: "two-factor-auth-yubikey.component.html",
@@ -32,5 +34,7 @@ import {
   providers: [],
 })
 export class TwoFactorAuthYubikeyComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) tokenFormControl: FormControl | undefined = undefined;
 }
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.ts
index 33aa76680e4..89fb3d34e96 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.ts
@@ -42,7 +42,7 @@ export class TwoFactorAuthComponentCacheService {
   /**
    * Signal for the cached TwoFactorAuthData.
    */
-  private twoFactorAuthComponentCache: WritableSignal<TwoFactorAuthComponentCache | null> =
+  private readonly twoFactorAuthComponentCache: WritableSignal<TwoFactorAuthComponentCache | null> =
     this.viewCacheService.signal<TwoFactorAuthComponentCache | null>({
       key: TWO_FACTOR_AUTH_COMPONENT_CACHE_KEY,
       initialValue: null,
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts
index 9418030d7a1..8c12060168b 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts
@@ -18,12 +18,12 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { AuthenticationType } from "@bitwarden/common/auth/enums/authentication-type";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import {
   InternalMasterPasswordServiceAbstraction,
@@ -46,6 +46,8 @@ import { TwoFactorAuthComponentCacheService } from "./two-factor-auth-component-
 import { TwoFactorAuthComponentService } from "./two-factor-auth-component.service";
 import { TwoFactorAuthComponent } from "./two-factor-auth.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({ standalone: false })
 class TestTwoFactorComponent extends TwoFactorAuthComponent {}
 
@@ -174,7 +176,9 @@ describe("TwoFactorAuthComponent", () => {
     selectedUserDecryptionOptions = new BehaviorSubject<UserDecryptionOptions>(
       mockUserDecryptionOpts.withMasterPassword,
     );
-    mockUserDecryptionOptionsService.userDecryptionOptions$ = selectedUserDecryptionOptions;
+    mockUserDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
+      selectedUserDecryptionOptions,
+    );
 
     TestBed.configureTestingModule({
       declarations: [TestTwoFactorComponent],
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
index 4c0784928d4..ca19d3652bb 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
@@ -32,12 +32,12 @@ import {
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -75,6 +75,8 @@ import {
   TwoFactorOptionsDialogResult,
 } from "./two-factor-options.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-auth",
   templateUrl: "two-factor-auth.component.html",
@@ -99,6 +101,8 @@ import {
   ],
 })
 export class TwoFactorAuthComponent implements OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("continueButton", { read: ElementRef, static: false }) continueButton:
     | ElementRef
     | undefined = undefined;
@@ -114,6 +118,8 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
   twoFactorProviders: Map<TwoFactorProviderType, { [key: string]: string }> | null = null;
   selectedProviderData: { [key: string]: string } | undefined;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("duoComponent") duoComponent!: TwoFactorAuthDuoComponent;
 
   form = this.formBuilder.group({
@@ -467,7 +473,7 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
     }
 
     const userDecryptionOpts = await firstValueFrom(
-      this.userDecryptionOptionsService.userDecryptionOptions$,
+      this.userDecryptionOptionsService.userDecryptionOptionsById$(authResult.userId),
     );
 
     const tdeEnabled = await this.isTrustedDeviceEncEnabled(userDecryptionOpts.trustedDeviceOption);
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.spec.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.spec.ts
index 06b998c5725..37fbf6bf794 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.spec.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.spec.ts
@@ -4,13 +4,15 @@ import { provideRouter, Router } from "@angular/router";
 import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject } from "rxjs";
 
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { AuthenticationType } from "@bitwarden/common/auth/enums/authentication-type";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 
 import { LoginStrategyServiceAbstraction } from "../../common";
 
 import { TwoFactorAuthGuard } from "./two-factor-auth.guard";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({ template: "", standalone: true })
 export class EmptyComponent {}
 
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.ts
index 2aec0bae441..a7ed4010ef5 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.ts
@@ -8,7 +8,7 @@ import {
 } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 
 import { LoginStrategyServiceAbstraction } from "../../common";
 
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts b/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
index 7e7e02e5e5a..d8b2ab2508b 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
@@ -9,11 +9,8 @@ import {
   TwoFactorAuthWebAuthnIcon,
   TwoFactorAuthYubicoIcon,
 } from "@bitwarden/assets/svg";
-import {
-  TwoFactorProviderDetails,
-  TwoFactorService,
-} from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
+import { TwoFactorProviderDetails, TwoFactorService } from "@bitwarden/common/auth/two-factor";
 // 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 {
@@ -30,6 +27,8 @@ export type TwoFactorOptionsDialogResult = {
   type: TwoFactorProviderType;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-two-factor-options",
   templateUrl: "two-factor-options.component.html",
diff --git a/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts b/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts
index 4dfb7a6a995..1304df2a763 100644
--- a/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts
+++ b/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts
@@ -30,6 +30,8 @@ import {
 } from "./user-verification-dialog.types";
 import { UserVerificationFormInputComponent } from "./user-verification-form-input.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "user-verification-dialog.component.html",
   imports: [
@@ -275,13 +277,13 @@ export class UserVerificationDialogComponent {
           });
         }
       }
-    } catch (e) {
+    } catch {
       // Catch handles OTP and MP verification scenarios as those throw errors on verification failure instead of returning false like PIN and biometrics.
       this.invalidSecret = true;
       this.toastService.showToast({
         variant: "error",
         title: this.i18nService.t("error"),
-        message: e.message,
+        message: this.i18nService.t("userVerificationFailed"),
       });
       return;
     }
diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.html b/libs/auth/src/angular/user-verification/user-verification-form-input.component.html
index 70d8836edd5..5699f3dd9a4 100644
--- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.html
+++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.html
@@ -44,7 +44,7 @@
         <div class="tw-size-16 tw-content-center tw-mb-4">
           <bit-icon [icon]="Icons.UserVerificationBiometricsIcon"></bit-icon>
         </div>
-        <p class="tw-font-bold tw-mb-1">{{ "verifyWithBiometrics" | i18n }}</p>
+        <p class="tw-font-medium tw-mb-1">{{ "verifyWithBiometrics" | i18n }}</p>
         <div *ngIf="!biometricsVerificationFailed">
           <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
           {{ "awaitingConfirmation" | i18n }}
diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
index e1b8207d970..296359c92ff 100644
--- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
+++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
@@ -40,6 +40,8 @@ import { ActiveClientVerificationOption } from "./active-client-verification-opt
  * This is exposed to the parent component via the ControlValueAccessor interface (e.g. bind it to a FormControl).
  * Use UserVerificationService to verify the user's input.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-user-verification-form-input",
   templateUrl: "user-verification-form-input.component.html",
@@ -69,8 +71,12 @@ import { ActiveClientVerificationOption } from "./active-client-verification-opt
   ],
 })
 export class UserVerificationFormInputComponent implements ControlValueAccessor, OnInit, OnDestroy {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() verificationType: "server" | "client" = "server"; // server represents original behavior
   private _invalidSecret = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get invalidSecret() {
     return this._invalidSecret;
@@ -88,11 +94,17 @@ export class UserVerificationFormInputComponent implements ControlValueAccessor,
     }
     this.secret.updateValueAndValidity({ emitEvent: false });
   }
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() invalidSecretChange = new EventEmitter<boolean>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() activeClientVerificationOptionChange =
     new EventEmitter<ActiveClientVerificationOption>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() biometricsVerificationResultChange = new EventEmitter<boolean>();
 
   readonly Icons = { UserVerificationBiometricsIcon };
diff --git a/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts b/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
index 10cc643fd45..1bfbfd8d004 100644
--- a/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
+++ b/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
@@ -55,6 +55,7 @@ export abstract class AuthRequestServiceAbstraction {
    * Approve or deny an auth request.
    * @param approve True to approve, false to deny.
    * @param authRequest The auth request to approve or deny, must have an id and key.
+   * @param activeUserId the active user id
    * @returns The updated auth request, the `requestApproved` field will be true if
    * approval was successful.
    * @throws If the auth request is missing an id or key.
diff --git a/libs/auth/src/common/abstractions/login-strategy.service.ts b/libs/auth/src/common/abstractions/login-strategy.service.ts
index 64854393240..74f7f826f02 100644
--- a/libs/auth/src/common/abstractions/login-strategy.service.ts
+++ b/libs/auth/src/common/abstractions/login-strategy.service.ts
@@ -65,7 +65,11 @@ export abstract class LoginStrategyServiceAbstraction {
   /**
    * Creates a master key from the provided master password and email.
    */
-  abstract makePreloginKey(masterPassword: string, email: string): Promise<MasterKey>;
+  abstract makePasswordPreLoginMasterKey(masterPassword: string, email: string): Promise<MasterKey>;
+  /**
+   * Prefetch and cache the KDF configuration for the given email. No-op if already in-flight or cached.
+   */
+  abstract getPasswordPrelogin(email: string): Promise<void>;
   /**
    * Emits true if the authentication session has expired.
    */
diff --git a/libs/auth/src/common/abstractions/user-decryption-options.service.abstraction.ts b/libs/auth/src/common/abstractions/user-decryption-options.service.abstraction.ts
index e46fb09cff6..443e43b3151 100644
--- a/libs/auth/src/common/abstractions/user-decryption-options.service.abstraction.ts
+++ b/libs/auth/src/common/abstractions/user-decryption-options.service.abstraction.ts
@@ -1,34 +1,45 @@
 import { Observable } from "rxjs";
 
+import { UserId } from "@bitwarden/common/types/guid";
+
 import { UserDecryptionOptions } from "../models";
 
+/**
+ * Public service for reading user decryption options.
+ * For use in components and services that need to evaluate user decryption settings.
+ */
 export abstract class UserDecryptionOptionsServiceAbstraction {
   /**
-   * Returns what decryption options are available for the current user.
-   * @remark This is sent from the server on authentication.
+   * Returns the user decryption options for the given user id.
+   * Will only emit when options are set (does not emit null/undefined
+   * for an unpopulated state), and should not be called in an unauthenticated context.
+   * @param userId The user id to check.
    */
-  abstract userDecryptionOptions$: Observable<UserDecryptionOptions>;
+  abstract userDecryptionOptionsById$(userId: UserId): Observable<UserDecryptionOptions>;
   /**
    * Uses user decryption options to determine if current user has a master password.
    * @remark This is sent from the server, and does not indicate if the master password
    * was used to login and/or if a master key is saved locally.
    */
-  abstract hasMasterPassword$: Observable<boolean>;
-
-  /**
-   * Returns the user decryption options for the given user id.
-   * @param userId The user id to check.
-   */
-  abstract userDecryptionOptionsById$(userId: string): Observable<UserDecryptionOptions>;
+  abstract hasMasterPasswordById$(userId: UserId): Observable<boolean>;
 }
 
+/**
+ * Internal service for managing user decryption options.
+ * For use only in authentication flows that need to update decryption options
+ * (e.g., login strategies). Extends consumer methods from {@link UserDecryptionOptionsServiceAbstraction}.
+ * @remarks Most consumers should use UserDecryptionOptionsServiceAbstraction instead.
+ */
 export abstract class InternalUserDecryptionOptionsServiceAbstraction extends UserDecryptionOptionsServiceAbstraction {
   /**
-   * Sets the current decryption options for the user, contains the current configuration
+   * Sets the current decryption options for the user. Contains the current configuration
    * of the users account related to how they can decrypt their vault.
    * @remark Intended to be used when user decryption options are received from server, does
    * not update the server. Consider syncing instead of updating locally.
    * @param userDecryptionOptions Current user decryption options received from server.
    */
-  abstract setUserDecryptionOptions(userDecryptionOptions: UserDecryptionOptions): Promise<void>;
+  abstract setUserDecryptionOptionsById(
+    userId: UserId,
+    userDecryptionOptions: UserDecryptionOptions,
+  ): Promise<void>;
 }
diff --git a/libs/auth/src/common/login-strategies/README.md b/libs/auth/src/common/login-strategies/README.md
new file mode 100644
index 00000000000..69d57f97467
--- /dev/null
+++ b/libs/auth/src/common/login-strategies/README.md
@@ -0,0 +1,377 @@
+# Overview of Authentication at Bitwarden
+
+> **Table of Contents**
+>
+> - [Authentication Methods](#authentication-methods)
+> - [The Login Credentials Object](#the-login-credentials-object)
+> - [The `LoginStrategyService` and our Login Strategies](#the-loginstrategyservice-and-our-login-strategies)
+> - [The `logIn()` and `startLogIn()` Methods](#the-login-and-startlogin-methods)
+> - [Handling the `AuthResult`](#handling-the-authresult)
+> - [Diagram of Authentication Flows](#diagram-of-authentication-flows)
+
+<br>
+
+## Authentication Methods
+
+Bitwarden provides 5 methods for logging in to Bitwarden, as defined in our [`AuthenticationType`](https://github.com/bitwarden/clients/blob/main/libs/common/src/auth/enums/authentication-type.ts) enum. They are:
+
+1. [Login with Master Password](https://bitwarden.com/help/bitwarden-security-white-paper/#authentication-and-decryption)
+2. [Login with Auth Request](https://bitwarden.com/help/log-in-with-device/) (aka Login with Device) &mdash; authenticate with a one-time access code
+3. [Login with Single Sign-On](https://bitwarden.com/help/about-sso/) &mdash; authenticate with an SSO Identity Provider (IdP) through SAML or OpenID Connect (OIDC)
+4. [Login with Passkey](https://bitwarden.com/help/login-with-passkeys/) (WebAuthn)
+5. [Login with User API Key](https://bitwarden.com/help/personal-api-key/) &mdash; authenticate with an API key and secret
+
+<br>
+
+**Login Initiation**
+
+_Angular Clients - Initiating Components_
+
+A user begins the login process by entering their email on the `/login` screen (`LoginComponent`). From there, the user must click one of the following buttons to initiate a login method by navigating to that method's associated "initiating component":
+
+- `"Continue"` &rarr; user stays on the `LoginComponent` and enters a Master Password
+- `"Log in with device"` &rarr; navigates user to `LoginViaAuthRequestComponent`
+- `"Use single sign-on"` &rarr; navigates user to `SsoComponent`
+- `"Log in with passkey"` &rarr; navigates user to `LoginViaWebAuthnComponent`
+  - Note: Login with Passkey is currently not available on the Desktop client.
+
+> [!NOTE]
+>
+> - Our Angular clients do not support the Login with User API Key method.
+>   &nbsp;
+> - The Login with Master Password method is also used by the
+>   `RegistrationFinishComponent` and `CompleteTrialInitiationComponent` (the user automatically
+>   gets logged in with their Master Password after registration), as well as the `RecoverTwoFactorComponent`
+>   (the user logs in with their Master Password along with their 2FA recovery code).
+
+<br>
+
+_CLI Client - `LoginCommand`_
+
+The CLI client supports the following login methods via the `LoginCommand`:
+
+- Login with Master Password
+- Login with Single Sign-On
+- Login with User API Key (which can _only_ be initiated from the CLI client)
+
+<br>
+
+> [!IMPORTANT]
+> While each authentication method has its own unique logic, this document discusses the
+> logic that is _generally_ common to all authentication methods. It provides a high-level
+> overview of authentication and as such will involve some abstraction and generalization.
+
+<br>
+
+## The Login Credentials Object
+
+When the user presses the "submit" action on an initiating component (or via `LoginCommand` for CLI), we build a **login credentials object**, which contains the core credentials needed to initiate the specific login method.
+
+For example, when the user clicks "Log in with master password" on the `LoginComponent`, we build a `PasswordLoginCredentials` object, which is defined as:
+
+```typescript
+export class PasswordLoginCredentials {
+  readonly type = AuthenticationType.Password;
+
+  constructor(
+    public email: string,
+    public masterPassword: string,
+    public twoFactor?: TokenTwoFactorRequest,
+    public masterPasswordPoliciesFromOrgInvite?: MasterPasswordPolicyOptions,
+  ) {}
+}
+```
+
+Notice that the `type` is automatically set to `AuthenticationType.Password`, and the `PasswordLoginCredentials` object simply requires an `email` and `masterPassword` to initiate the login method.
+
+Each authentication method builds its own type of credentials object. These are defined in [`login-credentials.ts`](https://github.com/bitwarden/clients/blob/main/libs/auth/src/common/models/domain/login-credentials.ts).
+
+- `PasswordLoginCredentials`
+- `AuthRequestLoginCredentials`
+- `SsoLoginCredentials`
+- `WebAuthnLoginCredentials`
+- `UserApiLoginCredentials`
+
+After building the credentials object, we then call the `logIn()` method on the `LoginStrategyService`, passing in the credentials object as an argument: `LoginStrategyService.logIn(credentials)`
+
+<br>
+
+## The `LoginStrategyService` and our Login Strategies
+
+The [`LoginStrategyService`](https://github.com/bitwarden/clients/blob/main/libs/auth/src/common/services/login-strategies/login-strategy.service.ts) acts as an orchestrator that determines which of our specific **login strategies** should be initialized and used for the login process.
+
+> [!IMPORTANT]
+> Our authentication methods are handled by different [login strategies](https://github.com/bitwarden/clients/tree/main/libs/auth/src/common/login-strategies), making use of the [Strategy Design Pattern](https://refactoring.guru/design-patterns/strategy). Those strategies are:
+>
+> - `PasswordLoginStrategy`
+> - `AuthRequestLoginStrategy`
+> - `SsoLoginStrategy`
+> - `WebAuthnLoginStrategy`
+> - `UserApiLoginStrategy`
+>
+> Each of those strategies extend the base [`LoginStrategy`](https://github.com/bitwarden/clients/blob/main/libs/auth/src/common/login-strategies/login.strategy.ts), which houses common login logic.
+
+More specifically, within its `logIn()` method, the `LoginStrategyService` uses the `type` property on the credentials object to determine which specific login strategy to initialize.
+
+For example, the `PasswordLoginCredentials` object has `type` of `AuthenticationType.Password`. This tells the `LoginStrategyService` to initialize and use the `PasswordLoginStrategy` for the login process.
+
+Once the `LoginStrategyService` initializes the appropriate strategy, it then calls the `logIn()` method defined on _that_ particular strategy, passing on the credentials object as an argument. For example: `PasswordLoginStrategy.logIn(credentials)`
+
+<br>
+
+To summarize everything so far:
+
+```bash
+Initiating Component (Submit Action)   # ex: LoginComponent.submit()
+    |
+    Build credentials object           # ex: PasswordLoginCredentials
+    |
+    Call LoginStrategyService.logIn(credentials)
+        |
+        Initialize specific strategy      # ex: PasswordLoginStrategy
+        |
+        Call strategy.logIn(credentials)  # ex: PasswordLoginStrategy.logIn(credentials)
+
+    ...
+```
+
+<br>
+
+## The `logIn()` and `startLogIn()` Methods
+
+Each login strategy has its own unique implementation of the `logIn()` method, but each `logIn()` method performs the following general logic with the help of the credentials object:
+
+1. Build a `LoginStrategyData` object with a `TokenRequest` property
+2. Cache the `LoginStrategyData` object
+3. Call the `startLogIn()` method on the base `LoginStrategy`
+
+Here are those steps in more detail:
+
+1. **Build a `LoginStrategyData` object with a `TokenRequest` property**
+
+   Each strategy uses the credentials object to help build a type of `LoginStrategyData` object, which contains the data needed throughout the lifetime of the particular strategy, and must, at minimum, contain a `tokenRequest` property (more on this below).
+
+   ```typescript
+   export abstract class LoginStrategyData {
+     tokenRequest:
+       | PasswordTokenRequest
+       | SsoTokenRequest
+       | WebAuthnLoginTokenRequest
+       | UserApiTokenRequest
+       | undefined;
+
+     abstract userEnteredEmail?: string;
+   }
+   ```
+
+   Each strategy has its own class that implements the `LoginStrategyData` interface:
+   - `PasswordLoginStrategyData`
+   - `AuthRequestLoginStrategyData`
+   - `SsoLoginStrategyData`
+   - `WebAuthnLoginStrategyData`
+   - `UserApiLoginStrategyData`
+
+   So in our ongoing example that uses the "Login with Master Password" method, the call to `PasswordLoginStrategy.logIn(PasswordLoginCredentials)` would build a `PasswordLoginStrategyData` object that contains the data needed throughout the lifetime of the `PasswordLoginStrategy`.
+
+   That `PasswordLoginStrategyData` object is defined as:
+
+   ```typescript
+   export class PasswordLoginStrategyData implements LoginStrategyData {
+     tokenRequest: PasswordTokenRequest;
+
+     userEnteredEmail: string;
+     localMasterKeyHash: string;
+     masterKey: MasterKey;
+     forcePasswordResetReason: ForceSetPasswordReason = ForceSetPasswordReason.None;
+   }
+   ```
+
+   Each of the `LoginStrategyData` types have varying properties, but one property common to all is the `tokenRequest` property.
+
+   The `tokenRequest` property holds some type of [`TokenRequest`](https://github.com/bitwarden/clients/tree/main/libs/common/src/auth/models/request/identity-token) object based on the strategy:
+   - `PasswordTokenRequest` &mdash; used by both `PasswordLoginStrategy` and `AuthRequestLoginStrategy`
+   - `SsoTokenRequest`
+   - `WebAuthnLoginTokenRequest`
+   - `UserApiTokenRequest`
+
+   This `TokenRequest` object is _also_ built within the `logIn()` method and gets added to the `LoginStrategyData` object as the `tokenRequest` property.
+
+   <br />
+
+2. **Cache the `LoginStrategyData` object**
+
+   Because a login attempt could "fail" due to a need for Two Factor Authentication (2FA) or New Device Verification (NDV), we need to preserve the `LoginStrategyData` so that we can re-use it later when the user provides their 2FA or NDV token. This way, the user does not need to completely re-enter all of their credentials.
+
+   The way we cache this `LoginStrategyData` is simply by saving it to a property called `cache` on the strategy. There will be more details on how this cache is used later on.
+
+   <br />
+
+3. **Call the `startLogIn()` method on the base `LoginStrategy`**
+
+   Next, we call the `startLogIn()` method, which exists on the base `LoginStrategy` and is therefore common to all login strategies. The `startLogIn()` method does the following:
+   1. **Makes a `POST` request to the `/connect/token` endpoint on our Identity Server**
+      - `REQUEST`
+
+        The exact payload for this request is determined by the `TokenRequest` object. More specifically, the base `TokenRequest` class contains a `toIdentityToken()` method which gets overridden/extended by the sub-classes (`PasswordTokenRequest.toIdentityToken()`, etc.). This `toIdentityToken()` method produces the exact payload that gets sent to our `/connect/token` endpoint.
+
+        The payload includes OAuth2 parameters, such as `scope`, `client_id`, and `grant_type`, as well as any other credentials that the server needs to complete validation for the specific authentication method.
+
+      - `RESPONSE`
+
+        The Identity Server validates the request and then generates some type of `IdentityResponse`, which can be one of three types:
+        - [`IdentityTokenResponse`](https://github.com/bitwarden/clients/blob/main/libs/common/src/auth/models/response/identity-token.response.ts)
+          - Meaning: the user has been authenticated
+          - Response Contains:
+            - Authentication information, such as:
+              - An access token (which is a JWT with claims about the user)
+              - A refresh token
+            - Decryption information, such as:
+              - The user's master-key-encrypted user key (if the user has a master password), along with their KDF settings
+              - The user's user-key-encrypted private key
+              - A `userDecryptionOptions` object that contains information about which decryption options the user has available to them
+              - A flag that indicates if the user is required to set or change their master password
+              - Any master password policies the user is required to adhere to
+
+        - [`IdentityTwoFactorResponse`](https://github.com/bitwarden/clients/blob/main/libs/common/src/auth/models/response/identity-two-factor.response.ts)
+          - Meaning: the user needs to complete Two Factor Authentication
+          - Response Contains:
+            - A list of which 2FA providers the user has configured
+            - Any master password policies the user is required to adhere to
+
+        - [`IdentityDeviceVerificationResponse`](https://github.com/bitwarden/clients/blob/main/libs/common/src/auth/models/response/identity-device-verification.response.ts)
+          - Meaning: the user needs to verify their new device via [new device verification](https://bitwarden.com/help/new-device-verification/)
+          - Response Contains: a simple boolean property that states whether or not the device has been verified
+
+   2. **Calls one of the `process[IdentityType]Response()` methods**
+
+      Each of these methods builds and returns an [`AuthResult`](https://github.com/bitwarden/clients/blob/main/libs/common/src/auth/models/domain/auth-result.ts) object, which gets used later to determine how to direct the user after an authentication attempt.
+
+      The specific method that gets called depends on the type of the `IdentityResponse`:
+      - If `IdentityTokenResponse` &rarr; call `processTokenResponse()`
+        - Instantiates a new `AuthResult` object
+        - Calls `saveAccountInformation()` to initialize the account with information from the `IdentityTokenResponse`
+          - Decodes the access token (a JWT) to get information about the user (userId, email, etc.)
+          - Sets several things to state:
+            - The account (via `AccountService`)
+            - The user's environment
+            - `userDecryptionOptions`
+            - `masterPasswordUnlockData` (_if_ `userDecryptionOptions` allows for master password unlock):
+              - Salt
+              - KDF config
+              - Master-key-encrypted user key
+            - Access token and refresh token
+            - KDF config
+            - Premium status
+        - If the `IdentityTokenResponse` contains a `twoFactorToken` (because the user previously selected "remember me" for their 2FA method), set that token to state
+        - Sets cryptographic properties to state: master key, user key, private key
+        - Sets a `forceSetPasswordReason` to state (if necessary)
+        - Returns the `AuthResult`
+
+      - If `IdentityTwoFactorResponse` &rarr; call `processTwoFactorResponse()`
+        - Instantiates a new `AuthResult` object
+        - Sets `AuthResult.twoFactorProviders` to the list of 2FA providers from the `IdentityTwoFactorResponse`
+        - Sets that same list of of 2FA providers to global state (memory)
+        - Returns the `AuthResult`
+
+      - If `IdentityDeviceVerificationResponse` &rarr; call `processDeviceVerificationResponse()`
+        - Instantiates a new `AuthResult` object
+        - Sets `AuthResult.requiresDeviceVerification` to `true`
+        - Returns the `AuthResult`
+
+<br>
+
+## Handling the `AuthResult`
+
+The `AuthResult` object that gets returned from the `process[IdentityType]Response()` method ultimately gets returned up through the chain of callers until it makes its way back to the initiating component (ex: the `LoginComponent` for Login with Master Password).
+
+The initiating component will then use the information on that `AuthResult` to determine how to direct the user after an authentication attempt.
+
+Below is a high-level overview of how the `AuthResult` is handled, but note again that there are abstractions in this diagram &mdash; it doesn't depict every edge case, and is just meant to give a general picture.
+
+```bash
+Initiating Component (Submit Action) < - - -
+    |                                        \
+    LoginStrategyService.logIn()            - \
+        |                                      \    # AuthResult bubbles back up
+        strategy.logIn()                      - \   # through chain of callers
+            |                                    \  # to the initiating component
+            startLogIn()                        - \
+                |                                  \
+                process[IdentityType]Response()   - \
+                    |                                \
+                    returns AuthResult - - - - - - - -
+
+    |
+     - - - - - - - - - -                            # Initiating component then
+                        |                           # uses the AuthResult in
+    handleAuthResult(authResult)                    # handleAuthResult()
+        |
+        IF AuthResult.requiresTwoFactor
+        |  # route user to /2fa to complete 2FA
+        |
+        IF AuthResult.requiresDeviceVerification
+        |  # route user to /device-verification to complete NDV
+        |
+        # Otherwise, route user to /vault
+```
+
+<br />
+
+Now for a more detailed breakdown of how the `AuthResult` is handled...
+
+There are two broad types of scenarios that the user will fall into:
+
+1. Re-submit scenarios
+2. Successful Authentication scenarios
+
+### Re-submit Scenarios
+
+There are two cases where a user is required to provide additional information before they can be authenticated: Two Factor Authentication (2FA) and New Device Verification (NDV). In these scenarios, we actually need the user to "re-submit" their original request, along with their added 2FA or NDV token. But remember earlier that we cached the `LoginStrategyData`. This makes it so the user does not need to re-enter their original credentials. Instead, the user simply provides their 2FA or NDV token, we add it to their original (cached) `LoginStrategyData`, and then we re-submit the request.
+
+Here is how these scenarios work:
+
+**User must complete Two Factor Authentication**
+
+1. Remember that when the server response is `IdentityTwoFactorResponse`, we set 2FA provider data into state, and also set `requiresTwoFactor` to `true` on the `AuthResult`.
+2. When `AuthResult.requiresTwoFactor` is `true`, the specific login strategy exports its `LoginStrategyData` to the `LoginStrategyService`, where it gets stored in memory. This means the `LoginStrategyService` has a cache of the original request the user sent.
+3. We route the user to `/2fa` (`TwoFactorAuthComponent`).
+4. The user enters their 2FA token.
+5. On submission, the `LoginStrategyService` calls `logInTwoFactor()` on the particular login strategy. This method then:
+   - Takes the cached `LoginStrategyData` (the user's original request), and appends the 2FA token onto the `TokenRequest`
+   - Calls `startLogIn()` again, this time using the updated `LoginStrategyData` that includes the 2FA token.
+
+**User must complete New Device Verification**
+
+Note that we currently only require new device verification on Master Password logins (`PasswordLoginStrategy`) for users who do not have a 2FA method setup.
+
+1. Remember that when the server response is `IdentityDeviceVerificationResponse`, we set `requiresDeviceVerification` to `true` on the `AuthResult`.
+2. When `AuthResult.requiresDeviceVerification` is `true`, the specific login strategy exports its `LoginStrategyData` to the `LoginStrategyService`, where it gets stored in memory. This means the `LoginStrategyService` has a cache of the original request the user sent.
+3. We route the user to `/device-verification`.
+4. The user enters their NDV token.
+5. On submission, the `LoginStrategyService` calls `logInNewDeviceVerification()` on the particular login strategy. This method then:
+   - Takes the cached `LoginStrategyData` (the user's original request), and appends the NDV token onto the `TokenRequest`.
+   - Calls `startLogIn()` again, this time using the updated `LoginStrategyData` that includes the NDV token.
+
+### Successful Authentication Scenarios
+
+**User must change their password**
+
+A user can be successfully authenticated but still required to set/change their master password. In this case, the user gets routed to the relevant set/change password component (`SetInitialPassword` or `ChangePassword`).
+
+**User does not need to complete 2FA, NDV, or set/change their master password**
+
+In this case, the user proceeds to their `/vault`.
+
+**Trusted Device Encryption scenario**
+
+If the user is on an untrusted device, they get routed to `/login-initiated` to select a decryption option. If the user is on a trusted device, they get routed to `/vault` because decryption can be done automatically.
+
+<br>
+
+## Diagram of Authentication Flows
+
+Here is a high-level overview of what all of this looks like in the end.
+
+<br>
+
+![A Diagram of our Authentication Flows](./overview-of-authentication.svg)
diff --git a/libs/auth/src/common/login-strategies/auth-request-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/auth-request-login.strategy.spec.ts
index 0b19fecdc4e..b536ae0dc4b 100644
--- a/libs/auth/src/common/login-strategies/auth-request-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/auth-request-login.strategy.spec.ts
@@ -3,8 +3,8 @@ import { BehaviorSubject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
diff --git a/libs/auth/src/common/login-strategies/login.strategy.spec.ts b/libs/auth/src/common/login-strategies/login.strategy.spec.ts
index e2f326d836d..38d62cfdd83 100644
--- a/libs/auth/src/common/login-strategies/login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/login.strategy.spec.ts
@@ -5,7 +5,6 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
@@ -16,6 +15,7 @@ import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/id
 import { IdentityTwoFactorResponse } from "@bitwarden/common/auth/models/response/identity-two-factor.response";
 import { MasterPasswordPolicyResponse } from "@bitwarden/common/auth/models/response/master-password-policy.response";
 import { IUserDecryptionOptionsServerResponse } from "@bitwarden/common/auth/models/response/user-decryption-options/user-decryption-options.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
@@ -257,7 +257,8 @@ describe("LoginStrategy", () => {
 
       expect(environmentService.seedUserEnvironment).toHaveBeenCalled();
 
-      expect(userDecryptionOptionsService.setUserDecryptionOptions).toHaveBeenCalledWith(
+      expect(userDecryptionOptionsService.setUserDecryptionOptionsById).toHaveBeenCalledWith(
+        userId,
         UserDecryptionOptions.fromResponse(idTokenResponse),
       );
       expect(masterPasswordService.mock.setMasterPasswordUnlockData).toHaveBeenCalledWith(
@@ -337,7 +338,7 @@ describe("LoginStrategy", () => {
       const tokenResponse = identityTokenResponseFactory();
       tokenResponse.privateKey = null;
       keyService.makeKeyPair.mockResolvedValue(["PUBLIC_KEY", new EncString("PRIVATE_KEY")]);
-      keyService.getUserKey.mockResolvedValue(userKey);
+      keyService.userKey$.mockReturnValue(new BehaviorSubject<UserKey>(userKey).asObservable());
 
       apiService.postIdentityToken.mockResolvedValue(tokenResponse);
       masterPasswordService.masterKeySubject.next(masterKey);
@@ -356,9 +357,11 @@ describe("LoginStrategy", () => {
     });
 
     it("throws if userKey is CoseEncrypt0 (V2 encryption) in createKeyPairForOldAccount", async () => {
-      keyService.getUserKey.mockResolvedValue({
-        inner: () => ({ type: 7 }),
-      } as UserKey);
+      keyService.userKey$.mockReturnValue(
+        new BehaviorSubject<UserKey>({
+          inner: () => ({ type: 7 }),
+        } as unknown as UserKey).asObservable(),
+      );
       await expect(passwordLoginStrategy["createKeyPairForOldAccount"](userId)).resolves.toBe(
         undefined,
       );
diff --git a/libs/auth/src/common/login-strategies/login.strategy.ts b/libs/auth/src/common/login-strategies/login.strategy.ts
index 93198f992cb..b8e4ee9e822 100644
--- a/libs/auth/src/common/login-strategies/login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/login.strategy.ts
@@ -3,7 +3,6 @@ import { BehaviorSubject, filter, firstValueFrom, timeout, Observable } from "rx
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
@@ -16,6 +15,7 @@ import { WebAuthnLoginTokenRequest } from "@bitwarden/common/auth/models/request
 import { IdentityDeviceVerificationResponse } from "@bitwarden/common/auth/models/response/identity-device-verification.response";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { IdentityTwoFactorResponse } from "@bitwarden/common/auth/models/response/identity-two-factor.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
@@ -195,7 +195,8 @@ export abstract class LoginStrategy {
 
     // We must set user decryption options before retrieving vault timeout settings
     // as the user decryption options help determine the available timeout actions.
-    await this.userDecryptionOptionsService.setUserDecryptionOptions(
+    await this.userDecryptionOptionsService.setUserDecryptionOptionsById(
+      userId,
       UserDecryptionOptions.fromResponse(tokenResponse),
     );
 
@@ -306,7 +307,11 @@ export abstract class LoginStrategy {
 
   protected async createKeyPairForOldAccount(userId: UserId) {
     try {
-      const userKey = await this.keyService.getUserKey(userId);
+      const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+      if (userKey === null) {
+        throw new Error("User key is null when creating key pair for old account");
+      }
+
       if (userKey.inner().type == EncryptionType.CoseEncrypt0) {
         throw new Error("Cannot create key pair for account on V2 encryption");
       }
diff --git a/libs/auth/src/common/login-strategies/overview-of-authentication.svg b/libs/auth/src/common/login-strategies/overview-of-authentication.svg
new file mode 100644
index 00000000000..1c846325c67
--- /dev/null
+++ b/libs/auth/src/common/login-strategies/overview-of-authentication.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4483.016419290889 5206.037360874458" width="4483.016419290889" height="5206.037360874458"><!-- svg-source:excalidraw --><metadata></metadata><defs><style class="style-fonts">
+      @font-face { font-family: Comic Shanns; src: url(data:font/woff2;base64,d09GMgABAAAAACIgAAsAAAAAPJQAACHRAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmAAgTQRCArdBM0vC4EAAAE2AiQDgQIEIAWVGAcgG34zRQdq2DgAKGbbRfZ/mWAbM3+sEy5RTMeMJvVXtErpdtQts62ZGuzgP8dwEaKUVcQxnHH/t92Xcbw7QpJZnv/n6Pf73uaBmwHTEVuBFlAajtjKWmFYYIEEHP5p9P/1neH5bfbi/8+H39ACiqCIiojVKEiIAVbN6VxE6taXxrKuYlfp1S5qd7sKt92c115vu0KV7amyHhYA9z9X7tk7W2Sp+uqrauyMnbEfMD8LyeIBQ9tkc5gnnM/rBvBXYtAzrQclnX7Srf5NO9MmRAj4mQrkxPkuLWmX9gRZE0x2HVmXkV903///qSWVZjpbLVqY0mgATQDZswzkSFff+np6/lNkTZH+FI+3erytTKmetM5qcYI2AFrb7bRWUelwTlB4A7wCABrKCQ9ANHnt1Qcc1J52bS4xBP16ay776dcxby/PRymmmMYYwhC9/Xv3wFDv1BAS6LtuBRy/v/k6BWrWi+UV/PfFd4uHxYb+KdRrw7d2NuDhIuutb+A1a6PbDdHykeHRIhyPt1iYCHr4NsnSZclRqEw5v5CIFm3mWGdD/ofZ1crBKcPC9Fph9Uunm/fjwP8XNr4v9tk+3Sf7YOf27t7ZW3tzb+z1vbgXNnbQi1IloHXjnnlpnLSBiAvbVTMMvg+ObwltTww2ILxfsK18Q76F54Xtym9+g01IWKdISbGqxWRfZTSqi80Uyxhfkrq7J9LgntlgMeVoq9WhgsLMRb4kTZbWnxObyzVmWhuqg6uCRk2m0WmojUYrUyPBzIrKysJpYOCDD/T779Tu1e6Fg/sOGQcH4dHYwYODewfhYJINqQkTTgXM1U0dUZJwUTcmTKlbZUb9uUFo9w9+hnIhSwDJtBuPx3NKhqR/NtCbEWuP4m+gavwCk63UFUJFd7lo+mn/R+9yxTRSGbMp6Pt5cly/iXMedJYQLj+1tUS4B6Ab03C2qBpKw1qbsRobQIGuJwMzhBtC+LzFue7K+VFMvQj7CC9sTGiRsbBabSiEEZVu6rx0IPHFJqvgb5CDL1lg7qJpslfFOFKJ93MPtntkre1gwruG4eqPE0qje02xmO3G8W06ttu9fyU1HzC1dSaT9WPjx9EdQgXzvsGy3+V/lAj1LZstwjWAXIRWC1p2JW2dER5C2+G+A0xoC0W/9Y2lYrCXqbhOb95R9znhHc0JHZELDQBUg4nSpu1lHqGY2jpzKxptCFcxUXUgEabt9zgpBBTT4mKd58grvZs+XCEsEHI8dPXO7CK0EO4eYaqqRuKnQZ+8KAjfuwcAX1tXh/01Mx2uWUqfMJG7bCcDyzvFiNbilkAqnsgQZowRHggGnvo3rpfauKvQ3B7WxiImEwxwJfxbuOs0yQzbytFWy+53dKt55HlI2Rz4wzBUo33pQ9pAoScow2dl2lprkG5LJjNHU7eNUaExeFc3vrz+bByz713XOR7sTW96/UuKNBUCI3dEKb9rVbhgDxEMGkIpx7Redb0x5hrUuBQ7OvxHHpB1RjEaRQFakL19YBvpUUWlMZ1SoFQbISz26L7DVjvF8PzRtfgazzc5QiHE+3vu+kW8VUPkkbd05MEMe5J9GF21pL2oPW3PNiPcqAy5vUmO5+HrDulfo1d7mLaXdd1ZwvJ6S0muPekeeVNE2LYiJiurgDeOl5Y7+gMFFkLtLr4tsQ13tMiy4iokczGbjJTpVcGb6aik3jYEXnGiH9m2fqaL/detngbDAMDmCSZ8bP32IyU/Tuuxa0cjYx1m/4Ta5wXe4Y0mf9Hxm6Z1pA4UKW+qpq1OcAOAxwIYFTDrudAANa3dAtIfUnxz490txhy9PtyFFupohHZOshxtm9Onh0JsKXIJElk1vFOsn/25d3bIGIuRJJIgDK0xIzpJkjBLzBnQ9VwNo2RsMBoShTO0uRJGuTrRCIDhMILkvW/VilD4utYZJXOPpvKeJMxdr+hqGR7QrNIyge5CGcFOF0bbPeTrMHV7A+YfJwqkEToR4VbJT0f2JZRGsjzIbcrHNBnoGAcVDWxw7gwOh+ZqfL4aG8wTHTasBqrmdJkGWRzRXcKFCJ0djom6c7cB0CIr1UI0u7121DC+gvGcxU++wtGLF6VnZX9ubqhTdoTyt0/UH57mACAHCIupLoT50cGQ2+T8du2pAfwdcVutYm+2rY9QzziaUQlF9xH+JNfRYYzvdPWasQlNtruK1TdADSkzYaURCDc5P/7ZPileLd5YSF1am0LYWufBjcV6JkVM+AObklzEJKPEOuUgpunhLMDGtZptxCGKVu5tkd9Ol9J0ABKWSRZ7PzLlwU5av8G3l2m2o1+rq9Haz73IQo9xClouXbMdpQXCwky+hBQbItxO0doBAPhRBoPjxhmm20aD+sp6bmbnQjHdjmYjJufgLTtufcN3Q0/7HJpd+fDChZ1CihYA6s6roxtS/b16tgiybilUmlUeVJ+zPB360gBAOInMoeeP+6/JqoburehTUWc/xqo4sMD3r/DD7qrxjmW2z5a0t1rZ8Ygv2NMOPXHu4dvcCAAQmaceRn7KyVPitgnFG3yyWNaMsHfQkRshPNao2FH45Jk8X6X/hwGMJWZX7zbdkgSTgmihRriwQCNh058CjAVZZxuOCL+yZ1pvJ1D3cIHwldMpW+dHv/XrRd1WeUzDVVp4PpZmcyPHmPCOvpJmDloV1WIObG78OAWPdMgkry84fbA82oXDCwhf1nGlLXGC2a5G2FOGbAIY0erQZi2xIA9lMgqi8NDtmECj0zuY8NnZPYBz+4RDk5NbmPA0OEV4ZNVD/YVaTZPRaFIaUEr9ceJa30bGMsr4ny7D55gXNFwtGnrOOnbPwqgpI7L+vJmCsLOTOwWe6awmcwopP0jlj91QaIF8OT3kr7ZZIMTy+ozGsN/QxLeXtgJS91sZk8RHScYAWJgaubr9RWW018rIsu5NN3WbfUDxlPMyduApflFelNvLtDXuzVeLhsgji1vaVhAmm0uNgj1Z5gxEIQ8byaSRFtmnAmXcEkUc+gtgoVIYKTGoD0ZbJP9gGmEKHRKfrY+3h9Qk5/qgKj2bneP4CMwxk9uVFWtuele6d8VWozIE9DQ4AfZyb4YXZKeoN907pzE31xdixA2X8ROYWZ42IYkx6XR2VBP4NOXZTIhKi1uESw5aS1ggYkKNHPAUuux2umXY9ZXjIGskOweGhRFate60001wdRF2YqIc7wGsBuyl+CiNu3S2sjMkfeKdliPJz+ZQhdiWPCa66vSlfY2vrIgezpkyhN6d7Mzurx4+MZnT8YFVczx1/wEm+hQA9s2/nAFtl5JEVN2dYIJAuhohPErzl2h7PXK41bKMc1S7LRADdaAgrPCJfqPi8mOZUs4PYqI7/9iWkGPIhiqZcbUwe9nK61VTw89Swt9xZzNTeKmcUqq9FJJvLJ3YrAa6pQWKa9Qt5S7D4eU6G9HlbIVUc4UMTIPhaHXZsdMZzULsp0qtuaU9Y4Tby0V+/KaOMJmSlha4XpbHsXGdpuf9AiCP6xmQ19mKZqeyYYpI3veOEsHPQxhD3xcLcQUT4THGI7ShU2UwHJEvTsA4XxDFIKIt/vVWbscaxY1sZcdcjxZQo6GZwc0tmePRej7ZDsOZ0TyCC3InjpiarbJfJNjjpnKYZVoN2WRB3e696O7ttfVIlvMdahZohJkVGzRoX4Wi1/laoXJgYgi6v3Ia3cKxWmHyfWbNadLy+5zfExzZ4GAXMLJsho+U0IifH4xXq9LgDkR9mWjXjcbUnhO+e/exdGSXzNVq2qHYM8axN2lCLz6Tjtm+YayiXNyf1X9T1Nk6QiWzG32CiQvjHwcGq6bjlRzLU3vfzjdYvttuacIVZ5vIsSLOu65TQGjvV3ffQjZbBEgNDOTQ3fPVSatSKfws1j83lAk6nu/UiTPDGMaPD925nPW2hof95+wlFgoVhOnBwfN+2MpEuJjNArAu9zTdnwSI5ToA6J7HfkyLy+W8deuxsR0X3Jyrcusse9enMklfLrF4HiD9EwvSmbEYVABQB9QEJbph98O9m8LVM24rrEJ+yfbC2NS1T5RILsNSgopAcsjSBNBpf+cREsb36i95IUDV30P6B/vF+lWMm0ZIe/ApgZ89MCYY1/Hh/Nn0aYb02O5bI8h0OV/1z53DVebNkQ0N6kV8djZHJ3ufrmf0T7JC/oB1JhuZZddfZoVvDdlzuVBHX/JZjoriwRCrSC59c5ZpIGYVH2jvLf6E5Tf00ipOkXLPvOUmQ6/AB185PVOMrHrQnNPPR2aBwbXpkaySTsdmqtrZQfdJfZef3eD5Op6516C9VTDc9N+6Ra10AIdDhlDsHEfNf1oxEiOOgjvXsqNiTETU/od2cSZs1Ta881oXrfvvJoNwq9ZwLxP/tWfDs5elPrqvw0lVOzaXdEayQGdbhro6JhLjv/H3WecVsuj5Y7m0Yt3R2ICpThtMz7aNyOnpL927miPBnVm+5chA7e881vre+1rDpMB/CzSshzSrA4X0GIIWW3bhavDLKqlqU8MN1YPWR/dsaW//ds4j6uVnCylSc+JKVnPpXP8aRUqVd4vqMd8SGbv7r3INxYGu2ji7J2ISIGHiBReeR6yKid7QGiXviRPEj1lv1ms6zWZGhVtxD2oSnAkS0pt5eioAOdMNhwV+3ZE4rhssBYtBrFav5NffDOoLBnyxl6x9czu7049Za9OKLuT2Jp53218sJ070SANuOyY4zwyVaxbuQ60vlgupsaryabOUG/2p23+wZN6V6fCk/0WfQ5CjJuoIkge/P9m9Yuk866VY38AmniQyJl5hCc+lS7L/i3nBsszCWl+/6jmVMllT/dWzhQih5Pd/y3P0//nHe26C/XAigyD5TTBSVDmvs7oJIozi9j7h+W15UKgNAF9kkCeJugmKg+gc/Ver01+/sCs3I5hXOLv/QOISmnkkny2PUhH9OtccJR/bCKbBfuBS9ddxBLa7B6SeMx+cTHSdF81iOlzTklSS4ol9VBtMvmnrgdnN3WUguo2iGEVcmReODeAiPaJnZof7mMVIaWQoAtRq5+lYBKcaNLyCJBhENyc8dJcioPj3xLd3CbLBvUvyOSbtuY4FRxjZIJ3bUb1u3+bB6wcHJk+sHOCb/OBQY256EPzF/xP20vJR3XO9+rm8X1RuPftwl6UnelQ2Kqd7JyIOBVvmMtU2LL9Fxt6RWJ4+O607NWJ4IcohxL9yJWej9aGkRxJGhzdy8qSRsbQzT8ZWxtZdSWwmx9+N2QJmHpTwSyXRBxFmPqKzlpuc6tfGEeYmkzUyzNx+XplYX+jrS9tWFVfM/2gs60jdfP3TT/9WiTnv3HrXzlwXSWXUJHUb6xyzi+/vXL/EBwpNFNW14TmF9OZdaoyJFMLN5KJN0AONakHFKR6XtLcY9nWseuSAw9ic469xTU6HHoUxZnEjl2V8+A+xIq6lZHl7eK7zeWYNOEuSlPTCcD9Z7lGZou7HShLqwIxVZtKkETBQPC4dz5t9Wx/RXYfrl15khQXz1BiPnOtxRo7XkecJ1FWc1ku0EH4sJpkvVJ6ZadQ0Mk4IxqY7Rpv7cDt18YxcO/c4K9x/RIvBDVq14roEEerDcAp2K9LWmyhGTks8oVLd7K0fmP3iNPxgT4pl8YtLLrHCkfU6iKQsS3wjqiLJWCFJpfE+KJfbpGG/zLrsAits6FBjbA2RJwwxkvK4ioK10G8GjSVjbrdHhoOgZSaOiVXzarg4uBgh7YGnS+XTVA0Den0niMiWaFlhaIOS8FhDxBmZTKlJJXlzViwO5GTVA0J7XNghkZ5Ts5egudic+xYFnMSHAhWt0bbmB1SwhljJqplrTw6nNW4juYXBogVGtHiVEZQ+/cyYgJcDf2NDNBRYscMqATh14KBFM6slq6Zmp/hzb2dXazAYzhPyFu7dyxLuX8EG3byaXkl0wRE+YIp4I7lMaAC1oFyE+xC6qDvQDFiumFuQ2ke00wH5pQgprD/BC5eBT+j8VERY3PNYaot6pXZEf4z2LKSHyBbs78pVA5IEpmMihO6PTSpmdk2GfLViHlu/YHeenUeI+7tps2qrtEcc6UlSbKACYbaJCz1R2uRPECZqPl5ayJxkH2WPVJaxiqToRMTcddnRBsVa+ih1L/Sv1mwlAnnsXLb5aXBF3oMHgsTb7yi4w7s8Olp3VFeOy/eh7WqswRRFYGjY/wftnMmAb0V31iuYCjvG1kKDivBw3/ef8GytHam9cSfnh37sx2uKCUI69JzS+FoBDVqcPdlgNvUE+F37YDApy/flZ+kELqZOm6rnragNJ/pMzQnRbAuNkzFNhWZPuPxnq3lnrbstK007m6jjKDI5N+xryMyuqP7pTEKcRUNCxrtiMYAfOVbYUHkp1SBTX72mhAh89oQKY9wI56ENLGPmFRZeGd8qpwPDL9oeG31Plh41nIivErItHcXeBrtzheQjfuVgQFWo13+w01rqS6QWGqxv77oO0tTYTTXe7goNrmyk65Rq+SRw+6dPvjaETc7Fq2Q8wxhNZJyBY2WtSlLW09SsU9CXGvqIm9NbvI6IPcVfYemSlhmai73FH+3WyXNB/pb0hZYKxi8+R5LseD+xzOyy7mtI6TIm6hhQMsiT2JOrfyqOOUznsxMs2jf31Jt9lCqca9YkWUPevBnWCkVGX+Jm+xex9niK5EayX0uPe+f7swbb+ycrUIs9SVVhyXO2hIt7LbmVvbmg5aC1i1gEl0KHXs8Kx27WQWSpRufcaBgfwKMwuf8LgFhdLPQRx2HEkCoJ74Wxdct0iT9ySCIB8SsKZ84OljTHJFqq9J58Zw/0y9BCqE/XMFD+hiTOMFbnwbVwPjb/+Eu6vay5iexKoUibUsKgWeU8IUpr6RTQq2DbwJ+7J5bkyblFW3J2lzyUf+89Tc9NcezyzOL7C+933hqij2uL7mi/faNrn3v/fxpP9lHXkG1x/dGkUbkcfDeYKI/HrQgyXcyCmRG+axYd4u6l5uSqtDykSALHy8cWiKg7yOxk1/DdG1f3cBMVzqHqyBBZ4SgTDkqHpe3zmpoS9/+sS0ITs0ixUbFE1gJklKZm+kQvrdjtMEEkEfWyeYpNXfl0TWa/+hHtGfUtAISXNu97JzlYExdof6hg2SZ7L8U+8fo0jYyZf5u7p/3mtBrby/kdYi/P2AcntjLyzU2nZRltN/z92F0j+QXL3V3unvjeF+yjymVnT+axHLiyb31ZYoKcZtjWx2NoccebIkLCR39tjO2Kmxkqyh2oSPxE77N0OtcGgz3mmf5E6zXtSIjV6g/kHl9hw62t6a44VdY7cTXgKknj0v/R0Ftltbv8+s36W84hyH/8bXwpaHW2p4E2eJyJWzaFoDg5GasFFSXh4UpdxnjIanz9sbRPhhBO+PL/qQC2w6Ylib5MS53l2Lq/vwMfLStl+Nb7/xxl6OkJR25wOVS/3mepTZHRAtCH341SlOven7vHbNNlzOifGxNk/OhCZTgoSyXJ8YD1r0cetGEMIqmrgzVd9sysmirwb6x18cUeSnPs5fTUHwrs1fFFFZJQSmCMnS9/Eg7Hj7uC2gFQhdYYbJfFqSfvMhEkTSxCA2hjslzmW+mdNJk3PVm2QauX0SIQedGllyVBdIY1l9RxfDECX+WNnn2sgyA6QVZFhmeRJzu+tKLFmqnJnNp4g/PGq9kzegKWsDmgWz33hwyM9f6Zynplp5LA/B2fRjApvFWnOtFyNHXkuUqd12zp+B/W+6dixxnWGCcKyjIcVI8xy9RHZkhTMJqClGggc5ouSzVszxca+2rLeLm8pw1op9r/Jcou7NZTQ7AcqajFF5SGSl5sjxHKQW0dOHP8yI286vANegReePVsehCowEMneSucsQgvLmlPb63MbzG54k9+dNVk33HxhYPG4OI2ud8kkUV+W1EniK5bCgLO/kBptykz607jHColIaLeWqEiiB7p9GfJnKBRWb2lLjNCFocqxkZ2ggfOQxopgD8j9m9fjv2oUa+XWDoG9veDDjBtfZRSrKAZdNjiW4prLfcOKTw2ji3NrsuL+/FHCcKp67osHU5Wa3iTz2R5j9sHTuK1H+f4MkPP1Pf+ACCjSPBrKIq/9q0SovHvPtFiXALvGwMPZxkuq6RHDGbQBmfCBcBVWXzm5Z2VdjEO1vgnubLGkrp/ZeCxvY9zGP8yj/+BjNbBG9BNKGJJ1B65iZfsmnQ4/iBJMlPUdm20hbTgfrQEzDj/S32b0fKCOD4Yx5UgY6FKBcIM5P4RkfjWLq1MxvgZ/ES66pUdorc436xtQB7ksCDenGbA2Lb/SQEiflKho21KFSOTy9NEhwJCY03Xq2KcI8Fh0yCCMD3+Gg+RsDSel+Ky/N5wsaR3l//BK+VyjnXiCHjgbkqQpdVlllR4psMoDDPlXIPDdPdbIkTi90xcIbc4HVe3WeO0018blNGsgXMqagyx1yYliMa3KoS1iNLneqkqhjddFxGUPrtLS4L/9OOh5EzfW685CZxv6sn3NzrykqvNBRW/P1XAC9SC2uJlSKrFOPfoGRRiFC0fpRbk58/CTRRZ3rEIRC8t/Om98dZi0o215VpraqXOZJwDIhjbHn3C7Q2kjnOsOXrBD3w0Z9S9/qY49T5rxqfgI803uKqjwwoQhmEQyTMhEOc5N7zVUxhDkZJwyqSKD1q2gQv3nbPMzNoerQC3wRPErTWpVy1v3q3DhJFcDP3BD5bGyWTjgWS35+wpG8Ig6lwU8HabM7OilrFRijQte6QK1uLbQcCgNqnAnXE+JUkaCmoGh8Bzt5i5oZf/u3OWkyRPXlygh1hdnDntJTfB3vF5XDxPYATFexxem+v/YogoimWd8iiDoOHKWQGhqQE9PIZIbb5PFmZ4SiW98aRJAQIlZazCHpk4zco3N919106HqlYuWpWivvBcjRiOtjqCJ1vulH+1r5EkMGcqS1wqY7ZdLwxvn2OYrOf/UTKP7/mUevGJWu3QxIt6igymeSpTO3SZWV1p4EHZG6oRPUX5YH8jjMj1qcr8TJfhW16YNGi5c4SOUdjyWFYSV5kkk0yWJAzNwSrDtwJ7Wa+dCcYQrjTJaBlP6zRjJKHpe+mtDxdlYIK/+x2wwxTzbfDhdPnQ4FNkGmmHoURXEqtT0PrTovIbvc7BxHNcIgxU+n6LcTYnv8L7ZImwxajZNiX9obUCH4Oi3q3m26YQlK5dAxeogpaB2cHyNY3PxEam80xgeGKZQn6y5bSx3XvUVO5srjymCw/njcrlvWeX5DN89KjJm9JetBY8T8+gPhQxEt9aNiY2si10Q51UabzH3F53lGGf67fMTTtHdRGktOupXzDec7WggO3mOrimaf3KfmmGsnV20/1TYzf3k2ytNE+78p4etoXpYrpzU/+8TUG63z+8WkVRQXGhaoGuHxwmvg431SW9tJGcQ4kQgDcPlCGCf/lYy9u/pkyvqlzwh6j+/nVH892/G1LeKytuaLIhN8HuuzNCkNyzZyqijwFpX23VKQe/694MBNUA3GTvOOHbeH1T0vTJ+xP8f3blo/nz2l8xhg4fWx8J32nxpjSHjpmrq/YrOEX/kA383ppwKGQPopsea1ArhfXr1Qh3yiNAFEuVEApH3lVzJx5e/2Z5pa/EX2KbRq7b88iug0XpmQ7BLuhWKJLjIVSOnAI9lFlIJ6zi/k1XtMrzEuc0OKPihV4/6eGNdK218lcC3ymmhl27RfmVhEuJLatnz1Pt5kQnX+7PdxlQMZarFiWN+er8GeD1MTObCmFWjKqZFX6fNLEc6aZ+B8zxDFslki9hY4wXROa4RcuwKg0n6FVnlhyPE0XBeTKeIKsreB7W4PYV+o947qpO7IDzwRxoNnzHC1eAuC7tKAXmxwAN9+pe/v9v++vvqb011F8y5r+EfjGcre7u67c52xzqa3ckOaa52YBLdbryvJZf9djKnrP+bkx2rvq3exXmJ1OdUpVv/dFpRfnZtQ76TEI11RldPXSxdmhLrqfuO9hzMbpfJZ4ttp/oRyvtxsO/d7Wjpd/824Gv6U8tn5JfdOX3MEVsy/cDZ361jdPzba3aMWn50ZU+KOsc/9dhqnY52M8c+S0gyULjVX2AMX+kwLHWfJa8n3hwM3+6IqjVcb13eXPRRP2o0MV2D64yl02ZVJMpn/dbQoOfXKwvhfKdy0TlteIvHVRD5lXBRXJWMqYRP/A5/2fznZCfCVfqO8HBdyYbqzgXfzehyUJfamMLctnnvZlfOpT/WHaO1f/2CWO+iq93LrSth/6Uc/BR8vrEk6u+qY/AP3V+Rw2ZBHLS5SGj8vzsF2+BANzey/ezueL/NDP0B+DDRPAc4PvuiPz/9y13engIMA4BKOCf97q6VWnbZg9Cvng+u/5dZtsBj4yGbXbEgNfYZStUpchnuljYJe6rpTBxSpcm606OUs3CyMojyNtRrFQj5Kj8XD1bMp98QRWauFjAL9sYuzi55BdQjmfynt1IRxGoG8rRNNCHWxvTDoPDE8DEhdc+Hw05HD8a4Y0cjZ/QaZ7+y3z0N8rTT3753hydDrE7i/DxSGpTP0z2+Nqqd+pN8XSkB7qqJR/arZUwBqgzwvGEQFgWW4Pa0Wya7Ytpd21OHShwTfPCuh375pKPkPPxz89rHBItVCRdAn8XbQ1hQS0Ggy7rHbta7U6s+pkTVCy5n3ReeO+/aGpQ3oFOschiKogcCRf2mGaDdca+TjGo2SVR0ccYI2MouvacO3dX0lTQAJ7Y9zWKJD+5JRv5Kg+RrYq543jDUXvsO0QQgRnKsQeWV+XAAEg63RnWCmsKJqYcwB6ufAZSBFyfHE4EKX0MreAuyCgEZ1KBhEmDqaTwKUDZe8/kCbkmhbGBazR0ctAS01aPGgUMNgDJRXhAXVx6th5Ol0gI8aAIRmg7waXsoQT32BCfEsdwcCWDtiUGgAIkdvcW5XFQ3tFROBanDH7Ps5QdahIooWLBv+QSn80DPHQGX5/eF4rOHez40SRqODaJmB0cwqqVzEnTzqoU3FA3QwvvmRL+Vcy1lHRh3iSEYFxqRlAvo6BOYuY7U2f/IAe2hIaUSD4eYCV9QCtCYXPpWVu/k249YCMALSSgFAwEgdmMVYyNx+ml5g4xdhzftmflJi0Kl6KMSgbmqv8szmla3gGEGOPS4DTmqgtUxQbQJ0eYzitxUbT4CAxLeIdJUjtlQqo6dS1DCobYEkVpxUwbpHAMNlnWkvjCfBISw8LEaSn0SoHQ1qJKCHeaHsmUegOwDGscSCNt8m5aWMNrYQZI1p2QRkaF9LMSbGCtOb3G4zNLxVL40qb1HraiUgmUNK8pIFcWESvePFRkiA1TTjaUGFaBAnarivC508TI4hF0wA9AAVfiFvpXaDEXZFsGZwJxxSNlEz+JTtBgwTu8qjpNYQNu1LIV8gDbsK4TIhTVgneeYhIHi7N4A60l2RFm1gUUVoOswBeIko6SkBSJOSJaMZ4yv+BiBmtmg7cCBySTQJI3oQ2YPAtJTTFvmWPNeTukEEAOsmpqUFUZjelCHnmlwgYBrOMrqQ6wyxZyhZTpwXdaKDxfkFXimKvoswnpITbSxAsMC6BjYByiCUxq5lUKWB702tc/XwAA); }</style></defs><rect x="0" y="0" width="4483.016419290889" height="5206.037360874458" fill="#ffffff"></rect><g stroke-linecap="round" transform="translate(513.199356019195 408.71803874883267) rotate(0 183.1328125 60.9227287227809)"><path d="M30.46 0 C144.81 0, 259.16 0, 335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 C366.27 53.62, 366.27 76.77, 366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 C243.07 121.85, 150.34 121.85, 30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 C0 69, 0 46.62, 0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M30.46 0 C144.64 0, 258.82 0, 335.8 0 M30.46 0 C145.74 0, 261.01 0, 335.8 0 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M366.27 30.46 C366.27 52.28, 366.27 74.1, 366.27 91.38 M366.27 30.46 C366.27 46.69, 366.27 62.92, 366.27 91.38 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M335.8 121.85 C259.89 121.85, 183.98 121.85, 30.46 121.85 M335.8 121.85 C236.27 121.85, 136.73 121.85, 30.46 121.85 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M0 91.38 C0 72.53, 0 53.68, 0 30.46 M0 91.38 C0 77.98, 0 64.57, 0 30.46 M0 30.46 C0 10.15, 10.15 0, 30.46 0 M0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(960.4014150950716 412.5954636023009) rotate(0 183.1328125 60.9227287227809)"><path d="M30.46 0 C131.52 0, 232.57 0, 335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 C366.27 49.33, 366.27 68.2, 366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 C246.49 121.85, 157.18 121.85, 30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 C0 74.04, 0 56.69, 0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M30.46 0 C132.09 0, 233.72 0, 335.8 0 M30.46 0 C124.28 0, 218.09 0, 335.8 0 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M366.27 30.46 C366.27 54.63, 366.27 78.79, 366.27 91.38 M366.27 30.46 C366.27 45.49, 366.27 60.52, 366.27 91.38 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M335.8 121.85 C222.44 121.85, 109.08 121.85, 30.46 121.85 M335.8 121.85 C217.86 121.85, 99.91 121.85, 30.46 121.85 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M0 91.38 C0 76.04, 0 60.7, 0 30.46 M0 91.38 C0 78.22, 0 65.05, 0 30.46 M0 30.46 C0 10.15, 10.15 0, 30.46 0 M0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(1412.1836414026802 410.3189423008007) rotate(0 183.1328125 60.9227287227809)"><path d="M30.46 0 C97.43 0, 164.4 0, 335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 C366.27 46.92, 366.27 63.37, 366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 C271.11 121.85, 206.42 121.85, 30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 C0 72.37, 0 53.35, 0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M30.46 0 C134.14 0, 237.83 0, 335.8 0 M30.46 0 C119.83 0, 209.2 0, 335.8 0 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M366.27 30.46 C366.27 50.38, 366.27 70.3, 366.27 91.38 M366.27 30.46 C366.27 48.77, 366.27 67.07, 366.27 91.38 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M335.8 121.85 C262.07 121.85, 188.33 121.85, 30.46 121.85 M335.8 121.85 C218.11 121.85, 100.42 121.85, 30.46 121.85 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M0 91.38 C0 69.39, 0 47.39, 0 30.46 M0 91.38 C0 67.69, 0 43.99, 0 30.46 M0 30.46 C0 10.15, 10.15 0, 30.46 0 M0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(1862.6273713503324 404.3040424939459) rotate(0 183.1328125 60.9227287227809)"><path d="M30.46 0 C142.25 0, 254.04 0, 335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 C366.27 50.45, 366.27 70.45, 366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 C270.59 121.85, 205.37 121.85, 30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 C0 67.59, 0 43.79, 0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M30.46 0 C105.04 0, 179.62 0, 335.8 0 M30.46 0 C149.07 0, 267.67 0, 335.8 0 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M366.27 30.46 C366.27 48.64, 366.27 66.81, 366.27 91.38 M366.27 30.46 C366.27 51.37, 366.27 72.28, 366.27 91.38 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M335.8 121.85 C223.85 121.85, 111.9 121.85, 30.46 121.85 M335.8 121.85 C272.96 121.85, 210.11 121.85, 30.46 121.85 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M0 91.38 C0 77.19, 0 63, 0 30.46 M0 91.38 C0 69.51, 0 47.64, 0 30.46 M0 30.46 C0 10.15, 10.15 0, 30.46 0 M0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(2305.2910912057196 406.91094150573406) rotate(0 183.1328125 60.92272872278096)"><path d="M30.46 0 C140.67 0, 250.88 0, 335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 C366.27 51.42, 366.27 72.39, 366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 C219.68 121.85, 103.55 121.85, 30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 C0 79.2, 0 67.01, 0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M30.46 0 C104.52 0, 178.58 0, 335.8 0 M30.46 0 C140.75 0, 251.05 0, 335.8 0 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M335.8 0 C356.11 0, 366.27 10.15, 366.27 30.46 M366.27 30.46 C366.27 44.75, 366.27 59.03, 366.27 91.38 M366.27 30.46 C366.27 46.84, 366.27 63.21, 366.27 91.38 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M366.27 91.38 C366.27 111.69, 356.11 121.85, 335.8 121.85 M335.8 121.85 C243.76 121.85, 151.71 121.85, 30.46 121.85 M335.8 121.85 C237.33 121.85, 138.85 121.85, 30.46 121.85 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M30.46 121.85 C10.15 121.85, 0 111.69, 0 91.38 M0 91.38 C0 76.06, 0 60.74, 0 30.46 M0 91.38 C0 76, 0 60.61, 0 30.46 M0 30.46 C0 10.15, 10.15 0, 30.46 0 M0 30.46 C0 10.15, 10.15 0, 30.46 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(556.7516084387789 430.0072630003666) rotate(0 143 12.5)"><text x="143" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Login with Master Password</text></g><g transform="translate(1020.1337111206994 431.82828806652003) rotate(0 126.5 12.5)"><text x="126.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Login with Auth Request</text></g><g transform="translate(1461.2358938222642 430.60816655233464) rotate(0 137.5 12.5)"><text x="137.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Login with Single Sign-On</text></g><g transform="translate(1950.1796237699164 424.5932667454798) rotate(0 99 12.5)"><text x="99" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Login with Passkey</text></g><g transform="translate(2365.3433436253035 428.200165757268) rotate(0 126.5 12.5)"><text x="126.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Login with User API Key</text></g><g stroke-linecap="round" transform="translate(519.1482809200788 10) rotate(0 847.9168856280612 162.66748005967156)"><path d="M32 0 C461.97 0, 891.93 0, 1663.83 0 C1685.17 0, 1695.83 10.67, 1695.83 32 C1695.83 121.15, 1695.83 210.29, 1695.83 293.33 C1695.83 314.67, 1685.17 325.33, 1663.83 325.33 C1118.09 325.33, 572.34 325.33, 32 325.33 C10.67 325.33, 0 314.67, 0 293.33 C0 205.11, 0 116.88, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C531.86 0, 1031.71 0, 1663.83 0 M32 0 C568.91 0, 1105.82 0, 1663.83 0 M1663.83 0 C1685.17 0, 1695.83 10.67, 1695.83 32 M1663.83 0 C1685.17 0, 1695.83 10.67, 1695.83 32 M1695.83 32 C1695.83 117.93, 1695.83 203.85, 1695.83 293.33 M1695.83 32 C1695.83 121.03, 1695.83 210.06, 1695.83 293.33 M1695.83 293.33 C1695.83 314.67, 1685.17 325.33, 1663.83 325.33 M1695.83 293.33 C1695.83 314.67, 1685.17 325.33, 1663.83 325.33 M1663.83 325.33 C1080.97 325.33, 498.1 325.33, 32 325.33 M1663.83 325.33 C1155.2 325.33, 646.57 325.33, 32 325.33 M32 325.33 C10.67 325.33, 0 314.67, 0 293.33 M32 325.33 C10.67 325.33, 0 314.67, 0 293.33 M0 293.33 C0 231.8, 0 170.26, 0 32 M0 293.33 C0 209.05, 0 124.76, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1004.0651665481419 115.71168406105619) rotate(0 363 50)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">1. User enters email</text><text x="0" y="42.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="0" y="67.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">2. User clicks a button on the LoginComponent to take them to</text><text x="0" y="92.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">   an "initiating component" to initiate a particular login method</text></g><g stroke-linecap="round" transform="translate(512.2895967745353 615.9607570281094) rotate(0 183.1328125 41.966796875)"><path d="M20.98 0 C121.34 0, 221.7 0, 345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 C366.27 30.88, 366.27 40.78, 366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 C267.95 83.93, 190.61 83.93, 20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 C0 48.01, 0 33.08, 0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M20.98 0 C92.72 0, 164.46 0, 345.28 0 M20.98 0 C150.38 0, 279.77 0, 345.28 0 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M366.27 20.98 C366.27 37.47, 366.27 53.96, 366.27 62.95 M366.27 20.98 C366.27 36.63, 366.27 52.27, 366.27 62.95 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M345.28 83.93 C274.87 83.93, 204.45 83.93, 20.98 83.93 M345.28 83.93 C277.65 83.93, 210.01 83.93, 20.98 83.93 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M0 62.95 C0 47.03, 0 31.11, 0 20.98 M0 62.95 C0 54.06, 0 45.18, 0 20.98 M0 20.98 C0 6.99, 6.99 0, 20.98 0 M0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(563.4224092745353 645.4275539031094) rotate(0 132 12.5)"><text x="132" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">PasswordLoginCredentials</text></g><g stroke-linecap="round" transform="translate(962.0463148132403 615.9607570281094) rotate(0 183.1328125 41.966796875)"><path d="M20.98 0 C102.33 0, 183.67 0, 345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 C366.27 35.03, 366.27 49.09, 366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 C236.9 83.93, 128.51 83.93, 20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 C0 46.62, 0 30.29, 0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M20.98 0 C88.85 0, 156.72 0, 345.28 0 M20.98 0 C123.7 0, 226.42 0, 345.28 0 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M366.27 20.98 C366.27 35.94, 366.27 50.9, 366.27 62.95 M366.27 20.98 C366.27 36.42, 366.27 51.86, 366.27 62.95 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M345.28 83.93 C269.43 83.93, 193.58 83.93, 20.98 83.93 M345.28 83.93 C249.68 83.93, 154.09 83.93, 20.98 83.93 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M0 62.95 C0 51.49, 0 40.04, 0 20.98 M0 62.95 C0 50.92, 0 38.9, 0 20.98 M0 20.98 C0 6.99, 6.99 0, 20.98 0 M0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(996.6791273132403 645.4275539031094) rotate(0 148.5 12.5)"><text x="148.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">AuthRequestLoginCredentials</text></g><g stroke-linecap="round" transform="translate(1411.8030328519453 615.9607570281094) rotate(0 183.1328125 41.966796875)"><path d="M20.98 0 C126.01 0, 231.03 0, 345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 C366.27 36.22, 366.27 51.47, 366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 C252.11 83.93, 158.93 83.93, 20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 C0 46.18, 0 29.41, 0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M20.98 0 C135.77 0, 250.56 0, 345.28 0 M20.98 0 C119.75 0, 218.51 0, 345.28 0 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M366.27 20.98 C366.27 31.83, 366.27 42.67, 366.27 62.95 M366.27 20.98 C366.27 30.23, 366.27 39.48, 366.27 62.95 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M345.28 83.93 C259.45 83.93, 173.61 83.93, 20.98 83.93 M345.28 83.93 C239.24 83.93, 133.19 83.93, 20.98 83.93 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M0 62.95 C0 53.31, 0 43.67, 0 20.98 M0 62.95 C0 51.99, 0 41.03, 0 20.98 M0 20.98 C0 6.99, 6.99 0, 20.98 0 M0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1490.4358453519453 645.4275539031094) rotate(0 104.5 12.5)"><text x="104.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SsoLoginCredentials</text></g><g stroke-linecap="round" transform="translate(2311.3164689293553 615.9607570281094) rotate(0 183.1328125 41.966796875)"><path d="M20.98 0 C101.41 0, 181.84 0, 345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 C366.27 35.89, 366.27 50.8, 366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 C267.26 83.93, 189.23 83.93, 20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 C0 52.74, 0 42.54, 0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M20.98 0 C104.38 0, 187.78 0, 345.28 0 M20.98 0 C124.59 0, 228.2 0, 345.28 0 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M366.27 20.98 C366.27 34.1, 366.27 47.21, 366.27 62.95 M366.27 20.98 C366.27 33.79, 366.27 46.6, 366.27 62.95 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M345.28 83.93 C253.74 83.93, 162.2 83.93, 20.98 83.93 M345.28 83.93 C252.02 83.93, 158.75 83.93, 20.98 83.93 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M0 62.95 C0 50.52, 0 38.1, 0 20.98 M0 62.95 C0 53.05, 0 43.16, 0 20.98 M0 20.98 C0 6.99, 6.99 0, 20.98 0 M0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2367.9492814293553 645.4275539031094) rotate(0 126.5 12.5)"><text x="126.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">UserApiLoginCredentials</text></g><g stroke-linecap="round" transform="translate(1861.5597508906503 615.9607570281094) rotate(0 183.1328125 41.966796875)"><path d="M20.98 0 C86.69 0, 152.39 0, 345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 C366.27 35.9, 366.27 50.82, 366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 C250.74 83.93, 156.19 83.93, 20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 C0 52.58, 0 42.22, 0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M20.98 0 C117.31 0, 213.63 0, 345.28 0 M20.98 0 C91.26 0, 161.54 0, 345.28 0 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M345.28 0 C359.27 0, 366.27 6.99, 366.27 20.98 M366.27 20.98 C366.27 29.61, 366.27 38.23, 366.27 62.95 M366.27 20.98 C366.27 31.9, 366.27 42.83, 366.27 62.95 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M366.27 62.95 C366.27 76.94, 359.27 83.93, 345.28 83.93 M345.28 83.93 C227.38 83.93, 109.48 83.93, 20.98 83.93 M345.28 83.93 C265.58 83.93, 185.87 83.93, 20.98 83.93 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M20.98 83.93 C6.99 83.93, 0 76.94, 0 62.95 M0 62.95 C0 48.39, 0 33.82, 0 20.98 M0 62.95 C0 50.13, 0 37.31, 0 20.98 M0 20.98 C0 6.99, 6.99 0, 20.98 0 M0 20.98 C0 6.99, 6.99 0, 20.98 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1912.6925633906503 645.4275539031094) rotate(0 132 12.5)"><text x="132" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">WebAuthnLoginCredentials</text></g><g stroke-linecap="round" transform="translate(862.5529345876093 868.529654655523) rotate(0 726.0397135416679 288.1620392304301)"><path d="M32 0 C464.6 0, 897.21 0, 1420.08 0 C1441.41 0, 1452.08 10.67, 1452.08 32 C1452.08 222.1, 1452.08 412.21, 1452.08 544.32 C1452.08 565.66, 1441.41 576.32, 1420.08 576.32 C870.26 576.32, 320.44 576.32, 32 576.32 C10.67 576.32, 0 565.66, 0 544.32 C0 362.63, 0 180.94, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#b2f2bb"></path><path d="M32 0 C420.05 0, 808.1 0, 1420.08 0 M32 0 C489.16 0, 946.31 0, 1420.08 0 M1420.08 0 C1441.41 0, 1452.08 10.67, 1452.08 32 M1420.08 0 C1441.41 0, 1452.08 10.67, 1452.08 32 M1452.08 32 C1452.08 179.73, 1452.08 327.45, 1452.08 544.32 M1452.08 32 C1452.08 230.54, 1452.08 429.08, 1452.08 544.32 M1452.08 544.32 C1452.08 565.66, 1441.41 576.32, 1420.08 576.32 M1452.08 544.32 C1452.08 565.66, 1441.41 576.32, 1420.08 576.32 M1420.08 576.32 C989.33 576.32, 558.57 576.32, 32 576.32 M1420.08 576.32 C1087.29 576.32, 754.5 576.32, 32 576.32 M32 576.32 C10.67 576.32, 0 565.66, 0 544.32 M32 576.32 C10.67 576.32, 0 565.66, 0 544.32 M0 544.32 C0 361.96, 0 179.6, 0 32 M0 544.32 C0 435.22, 0 326.11, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1434.5219809900773 895.803594509777) rotate(0 153.99993896484375 17.5)"><text x="153.99993896484375" y="24.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginStrategyService</text></g><g stroke-linecap="round" transform="translate(908.66406405214 958.6738202042213) rotate(0 219.9609375 142.63163783915002)"><path d="M32 0 C142.47 0, 252.95 0, 407.92 0 C429.26 0, 439.92 10.67, 439.92 32 C439.92 84.53, 439.92 137.06, 439.92 253.26 C439.92 274.6, 429.26 285.26, 407.92 285.26 C272.41 285.26, 136.91 285.26, 32 285.26 C10.67 285.26, 0 274.6, 0 253.26 C0 171.04, 0 88.82, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M32 0 C122.03 0, 212.05 0, 407.92 0 M32 0 C110.19 0, 188.38 0, 407.92 0 M407.92 0 C429.26 0, 439.92 10.67, 439.92 32 M407.92 0 C429.26 0, 439.92 10.67, 439.92 32 M439.92 32 C439.92 81.66, 439.92 131.33, 439.92 253.26 M439.92 32 C439.92 86.2, 439.92 140.4, 439.92 253.26 M439.92 253.26 C439.92 274.6, 429.26 285.26, 407.92 285.26 M439.92 253.26 C439.92 274.6, 429.26 285.26, 407.92 285.26 M407.92 285.26 C302.97 285.26, 198.01 285.26, 32 285.26 M407.92 285.26 C310.91 285.26, 213.91 285.26, 32 285.26 M32 285.26 C10.67 285.26, 0 274.6, 0 253.26 M32 285.26 C10.67 285.26, 0 274.6, 0 253.26 M0 253.26 C0 202.94, 0 152.62, 0 32 M0 253.26 C0 176.16, 0 99.05, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(1382.0008696076911 1260.5127958986657) rotate(0 210.896484375 80.91471354166674)"><path d="M32 0 C108.99 0, 185.99 0, 389.79 0 C411.13 0, 421.79 10.67, 421.79 32 C421.79 61.68, 421.79 91.35, 421.79 129.83 C421.79 151.16, 411.13 161.83, 389.79 161.83 C269.84 161.83, 149.88 161.83, 32 161.83 C10.67 161.83, 0 151.16, 0 129.83 C0 96.64, 0 63.44, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M32 0 C158.22 0, 284.45 0, 389.79 0 M32 0 C137.29 0, 242.58 0, 389.79 0 M389.79 0 C411.13 0, 421.79 10.67, 421.79 32 M389.79 0 C411.13 0, 421.79 10.67, 421.79 32 M421.79 32 C421.79 61.36, 421.79 90.71, 421.79 129.83 M421.79 32 C421.79 71.05, 421.79 110.09, 421.79 129.83 M421.79 129.83 C421.79 151.16, 411.13 161.83, 389.79 161.83 M421.79 129.83 C421.79 151.16, 411.13 161.83, 389.79 161.83 M389.79 161.83 C261.13 161.83, 132.47 161.83, 32 161.83 M389.79 161.83 C298.65 161.83, 207.5 161.83, 32 161.83 M32 161.83 C10.67 161.83, 0 151.16, 0 129.83 M32 161.83 C10.67 161.83, 0 151.16, 0 129.83 M0 129.83 C0 106.03, 0 82.23, 0 32 M0 129.83 C0 107.42, 0 85.02, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(1837.972223774359 1259.3509035375544) rotate(0 219.052734375 78.85850694444457)"><path d="M32 0 C147.13 0, 262.26 0, 406.11 0 C427.44 0, 438.11 10.67, 438.11 32 C438.11 57.65, 438.11 83.3, 438.11 125.72 C438.11 147.05, 427.44 157.72, 406.11 157.72 C289.77 157.72, 173.43 157.72, 32 157.72 C10.67 157.72, 0 147.05, 0 125.72 C0 94.28, 0 62.85, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M32 0 C110.04 0, 188.09 0, 406.11 0 M32 0 C171 0, 309.99 0, 406.11 0 M406.11 0 C427.44 0, 438.11 10.67, 438.11 32 M406.11 0 C427.44 0, 438.11 10.67, 438.11 32 M438.11 32 C438.11 51.2, 438.11 70.41, 438.11 125.72 M438.11 32 C438.11 55.97, 438.11 79.95, 438.11 125.72 M438.11 125.72 C438.11 147.05, 427.44 157.72, 406.11 157.72 M438.11 125.72 C438.11 147.05, 427.44 157.72, 406.11 157.72 M406.11 157.72 C289.62 157.72, 173.14 157.72, 32 157.72 M406.11 157.72 C316.26 157.72, 226.42 157.72, 32 157.72 M32 157.72 C10.67 157.72, 0 147.05, 0 125.72 M32 157.72 C10.67 157.72, 0 147.05, 0 125.72 M0 125.72 C0 92.15, 0 58.58, 0 32 M0 125.72 C0 100.77, 0 75.82, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1029.62500155214 987.0318931208881) rotate(0 99 12.5)"><text x="99" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logIn(credentials)</text></g><g transform="translate(1488.3973539826911 1289.1687974974166) rotate(0 104.5 12.5)"><text x="104.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logInTwoFactor(...)</text></g><g transform="translate(1886.524958149359 1289.342205366321) rotate(0 170.5 12.5)"><text x="170.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logInNewDeviceVerification(...)</text></g><g stroke-linecap="round" transform="translate(1384.0087620186132 957.6196111947761) rotate(0 443.13606770833394 55.78407118055566)"><path d="M27.89 0 C222.25 0, 416.61 0, 858.38 0 C876.97 0, 886.27 9.3, 886.27 27.89 C886.27 47.91, 886.27 67.93, 886.27 83.68 C886.27 102.27, 876.97 111.57, 858.38 111.57 C665.5 111.57, 472.63 111.57, 27.89 111.57 C9.3 111.57, 0 102.27, 0 83.68 C0 64.55, 0 45.43, 0 27.89 C0 9.3, 9.3 0, 27.89 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M27.89 0 C298.71 0, 569.53 0, 858.38 0 M27.89 0 C337.39 0, 646.88 0, 858.38 0 M858.38 0 C876.97 0, 886.27 9.3, 886.27 27.89 M858.38 0 C876.97 0, 886.27 9.3, 886.27 27.89 M886.27 27.89 C886.27 47.81, 886.27 67.73, 886.27 83.68 M886.27 27.89 C886.27 41.51, 886.27 55.13, 886.27 83.68 M886.27 83.68 C886.27 102.27, 876.97 111.57, 858.38 111.57 M886.27 83.68 C886.27 102.27, 876.97 111.57, 858.38 111.57 M858.38 111.57 C532.72 111.57, 207.06 111.57, 27.89 111.57 M858.38 111.57 C687.89 111.57, 517.4 111.57, 27.89 111.57 M27.89 111.57 C9.3 111.57, 0 102.27, 0 83.68 M27.89 111.57 C9.3 111.57, 0 102.27, 0 83.68 M0 83.68 C0 71.09, 0 58.5, 0 27.89 M0 83.68 C0 72.04, 0 60.39, 0 27.89 M0 27.89 C0 9.3, 9.3 0, 27.89 0 M0 27.89 C0 9.3, 9.3 0, 27.89 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1700.6448297269453 975.9496893197761) rotate(0 126.5 12.5)"><text x="126.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginStrategyData Cache</text></g><g transform="translate(1524.9547255602774 1012.6167455514419) rotate(0 302.1901041666679 20)"><text x="302.19010416666794" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">If 2FA or NDV are required, this cache retains the LoginStrategyData</text><text x="302.19010416666794" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">for use in the re-submission. Clears on successful login.</text></g><g transform="translate(969.0292068744056 1050.5288239244578) rotate(0 159.59579467773438 30)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">1. Initializes the specific strategy</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="0" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">2. Calls logIn(...) on the strategy</text></g><g transform="translate(1149.1074419669094 812.0477813776013) rotate(0 325.59954833984375 10)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">All login methods start by calling LoginStrategyService.logIn(credentials)</text></g><g stroke-linecap="round"><g transform="translate(695.3224092745368 704.8943507781094) rotate(0 216.60129613880235 124.54243553304241)"><path d="M0 0 C0 15.28, 0 30.56, 0 40.7 M0 0 C0 14.52, 0 29.05, 0 40.7 M0 40.7 C0 51.37, 5.33 56.7, 16 56.7 M0 40.7 C0 51.37, 5.33 56.7, 16 56.7 M16 56.7 C138.15 56.7, 260.3 56.7, 417.2 56.7 M16 56.7 C130.25 56.7, 244.51 56.7, 417.2 56.7 M417.2 56.7 C427.87 56.7, 433.2 62.03, 433.2 72.7 M417.2 56.7 C427.87 56.7, 433.2 62.03, 433.2 72.7 M433.2 72.7 C433.2 138.07, 433.2 203.44, 433.2 249.08 M433.2 72.7 C433.2 113.37, 433.2 154.03, 433.2 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(695.3224092745368 704.8943507781094) rotate(0 216.60129613880235 124.54243553304241)"><path d="M433.2 249.08 L426.86 235.49 L439.54 235.49 L433.2 249.08" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M433.2 249.08 C430.82 243.98, 428.44 238.88, 426.86 235.49 M433.2 249.08 C430.94 244.23, 428.68 239.38, 426.86 235.49 M426.86 235.49 C431.12 235.49, 435.37 235.49, 439.54 235.49 M426.86 235.49 C429.76 235.49, 432.65 235.49, 439.54 235.49 M439.54 235.49 C437.29 240.32, 435.04 245.14, 433.2 249.08 M439.54 235.49 C438.26 238.24, 436.98 240.99, 433.2 249.08 M433.2 249.08 C433.2 249.08, 433.2 249.08, 433.2 249.08 M433.2 249.08 C433.2 249.08, 433.2 249.08, 433.2 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1594.8358453519468 704.8943507781094) rotate(0 -233.15542189990265 124.54243553304241)"><path d="M0 0 C0 8.75, 0 17.51, 0 41.32 M0 0 C0 8.5, 0 17.01, 0 41.32 M0 41.32 C0 51.98, -5.33 57.32, -16 57.32 M0 41.32 C0 51.98, -5.33 57.32, -16 57.32 M-16 57.32 C-186.97 57.32, -357.94 57.32, -450.31 57.32 M-16 57.32 C-108.55 57.32, -201.11 57.32, -450.31 57.32 M-450.31 57.32 C-460.98 57.32, -466.31 62.65, -466.31 73.32 M-450.31 57.32 C-460.98 57.32, -466.31 62.65, -466.31 73.32 M-466.31 73.32 C-466.31 134.74, -466.31 196.16, -466.31 249.08 M-466.31 73.32 C-466.31 115.56, -466.31 157.79, -466.31 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1594.8358453519468 704.8943507781094) rotate(0 -233.15542189990265 124.54243553304241)"><path d="M-466.31 249.08 L-472.65 235.49 L-459.97 235.49 L-466.31 249.08" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-466.31 249.08 C-467.65 246.2, -469 243.32, -472.65 235.49 M-466.31 249.08 C-467.62 246.29, -468.92 243.49, -472.65 235.49 M-472.65 235.49 C-467.83 235.49, -463.01 235.49, -459.97 235.49 M-472.65 235.49 C-468.88 235.49, -465.12 235.49, -459.97 235.49 M-459.97 235.49 C-461.36 238.46, -462.74 241.43, -466.31 249.08 M-459.97 235.49 C-461.93 239.68, -463.88 243.88, -466.31 249.08 M-466.31 249.08 C-466.31 249.08, -466.31 249.08, -466.31 249.08 M-466.31 249.08 C-466.31 249.08, -466.31 249.08, -466.31 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2044.5925633906518 704.8943507781094) rotate(0 -458.03378091925515 124.54243553304241)"><path d="M0 0 C0 10.23, 0 20.45, 0 41.36 M0 0 C0 9.7, 0 19.41, 0 41.36 M0 41.36 C0 52.02, -5.33 57.36, -16 57.36 M0 41.36 C0 52.02, -5.33 57.36, -16 57.36 M-16 57.36 C-363.45 57.36, -710.9 57.36, -900.07 57.36 M-16 57.36 C-321.92 57.36, -627.85 57.36, -900.07 57.36 M-900.07 57.36 C-910.73 57.36, -916.07 62.69, -916.07 73.36 M-900.07 57.36 C-910.73 57.36, -916.07 62.69, -916.07 73.36 M-916.07 73.36 C-916.07 109.56, -916.07 145.75, -916.07 249.08 M-916.07 73.36 C-916.07 130.78, -916.07 188.21, -916.07 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2044.5925633906518 704.8943507781094) rotate(0 -458.03378091925515 124.54243553304241)"><path d="M-916.07 249.08 L-922.41 235.49 L-909.73 235.49 L-916.07 249.08" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-916.07 249.08 C-917.63 245.72, -919.2 242.36, -922.41 235.49 M-916.07 249.08 C-917.55 245.9, -919.04 242.71, -922.41 235.49 M-922.41 235.49 C-919.36 235.49, -916.32 235.49, -909.73 235.49 M-922.41 235.49 C-919.34 235.49, -916.27 235.49, -909.73 235.49 M-909.73 235.49 C-911.69 239.69, -913.65 243.89, -916.07 249.08 M-909.73 235.49 C-911.76 239.85, -913.79 244.2, -916.07 249.08 M-916.07 249.08 C-916.07 249.08, -916.07 249.08, -916.07 249.08 M-916.07 249.08 C-916.07 249.08, -916.07 249.08, -916.07 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2494.349281429357 704.8943507781094) rotate(0 -682.9121399386077 124.54243553304241)"><path d="M0 0 C0 13.95, 0 27.91, 0 41.38 M0 0 C0 12.44, 0 24.89, 0 41.38 M0 41.38 C0 52.05, -5.33 57.38, -16 57.38 M0 41.38 C0 52.05, -5.33 57.38, -16 57.38 M-16 57.38 C-298.95 57.38, -581.91 57.38, -1349.82 57.38 M-16 57.38 C-399.51 57.38, -783.02 57.38, -1349.82 57.38 M-1349.82 57.38 C-1360.49 57.38, -1365.82 62.72, -1365.82 73.38 M-1349.82 57.38 C-1360.49 57.38, -1365.82 62.72, -1365.82 73.38 M-1365.82 73.38 C-1365.82 117.98, -1365.82 162.58, -1365.82 249.08 M-1365.82 73.38 C-1365.82 142.48, -1365.82 211.57, -1365.82 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2494.349281429357 704.8943507781094) rotate(0 -682.9121399386077 124.54243553304241)"><path d="M-1365.82 249.08 L-1372.16 235.49 L-1359.49 235.49 L-1365.82 249.08" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-1365.82 249.08 C-1367.96 244.5, -1370.1 239.92, -1372.16 235.49 M-1365.82 249.08 C-1367.73 245, -1369.64 240.91, -1372.16 235.49 M-1372.16 235.49 C-1368.26 235.49, -1364.35 235.49, -1359.49 235.49 M-1372.16 235.49 C-1367.53 235.49, -1362.89 235.49, -1359.49 235.49 M-1359.49 235.49 C-1361.87 240.61, -1364.26 245.73, -1365.82 249.08 M-1359.49 235.49 C-1361.62 240.07, -1363.75 244.64, -1365.82 249.08 M-1365.82 249.08 C-1365.82 249.08, -1365.82 249.08, -1365.82 249.08 M-1365.82 249.08 C-1365.82 249.08, -1365.82 249.08, -1365.82 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1145.0791273132418 704.8943507781094) rotate(0 -8.277062880550147 124.54243553304241)"><path d="M0 0 C0 11.81, 0 23.63, 0 50.25 M0 0 C0 14.82, 0 29.65, 0 50.25 M0 50.25 C0 55.77, -2.76 58.53, -8.28 58.53 M0 50.25 C0 55.77, -2.76 58.53, -8.28 58.53 M-8.28 58.53 C-8.28 58.53, -8.28 58.53, -8.28 58.53 M-8.28 58.53 C-8.28 58.53, -8.28 58.53, -8.28 58.53 M-8.28 58.53 C-13.8 58.53, -16.55 61.29, -16.55 66.81 M-8.28 58.53 C-13.8 58.53, -16.55 61.29, -16.55 66.81 M-16.55 66.81 C-16.55 130.43, -16.55 194.06, -16.55 249.08 M-16.55 66.81 C-16.55 118.42, -16.55 170.02, -16.55 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1145.0791273132418 704.8943507781094) rotate(0 -8.277062880550147 124.54243553304241)"><path d="M-16.55 249.08 L-22.89 235.49 L-10.21 235.49 L-16.55 249.08" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-16.55 249.08 C-18.04 245.89, -19.53 242.69, -22.89 235.49 M-16.55 249.08 C-18.42 245.07, -20.29 241.06, -22.89 235.49 M-22.89 235.49 C-19.16 235.49, -15.43 235.49, -10.21 235.49 M-22.89 235.49 C-18.52 235.49, -14.16 235.49, -10.21 235.49 M-10.21 235.49 C-12.07 239.46, -13.92 243.43, -16.55 249.08 M-10.21 235.49 C-11.98 239.27, -13.74 243.06, -16.55 249.08 M-16.55 249.08 C-16.55 249.08, -16.55 249.08, -16.55 249.08 M-16.55 249.08 C-16.55 249.08, -16.55 249.08, -16.55 249.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g transform="translate(1412.4976042268318 1348.2751014393557) rotate(0 180.39974975585938 10)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Calls logInTwoFactor(...) on the strategy</text></g><g transform="translate(1894.2251839794371 1337.4118201893557) rotate(0 162.79977416992188 20)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Calls logInNewDeviceVerification(...)</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">on the strategy</text></g><g stroke-linecap="round" transform="translate(470.03310171738303 1611.7649476538193) rotate(0 1149.229166666667 925.4263165599095)"><path d="M32 0 C593.74 0, 1155.47 0, 2266.46 0 C2287.79 0, 2298.46 10.67, 2298.46 32 C2298.46 656.62, 2298.46 1281.24, 2298.46 1818.85 C2298.46 1840.19, 2287.79 1850.85, 2266.46 1850.85 C1596.92 1850.85, 927.39 1850.85, 32 1850.85 C10.67 1850.85, 0 1840.19, 0 1818.85 C0 1454.16, 0 1089.47, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C835.13 0, 1638.25 0, 2266.46 0 M32 0 C520.32 0, 1008.64 0, 2266.46 0 M2266.46 0 C2287.79 0, 2298.46 10.67, 2298.46 32 M2266.46 0 C2287.79 0, 2298.46 10.67, 2298.46 32 M2298.46 32 C2298.46 644.93, 2298.46 1257.87, 2298.46 1818.85 M2298.46 32 C2298.46 520.64, 2298.46 1009.28, 2298.46 1818.85 M2298.46 1818.85 C2298.46 1840.19, 2287.79 1850.85, 2266.46 1850.85 M2298.46 1818.85 C2298.46 1840.19, 2287.79 1850.85, 2266.46 1850.85 M2266.46 1850.85 C1761.85 1850.85, 1257.24 1850.85, 32 1850.85 M2266.46 1850.85 C1604.87 1850.85, 943.28 1850.85, 32 1850.85 M32 1850.85 C10.67 1850.85, 0 1840.19, 0 1818.85 M32 1850.85 C10.67 1850.85, 0 1840.19, 0 1818.85 M0 1818.85 C0 1333.51, 0 848.16, 0 32 M0 1818.85 C0 1359.81, 0 900.77, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1502.2021321269494 1664.577835814356) rotate(0 100.09996032714844 17.5)"><text x="0" y="24.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginStrategy</text></g><g stroke-linecap="round" transform="translate(837.2843054758996 2441.615501290674) rotate(0 781.8984375 489.6443375143251)"><path d="M32 0 C628.91 0, 1225.82 0, 1531.8 0 C1553.13 0, 1563.8 10.67, 1563.8 32 C1563.8 226.1, 1563.8 420.21, 1563.8 947.29 C1563.8 968.62, 1553.13 979.29, 1531.8 979.29 C1152.84 979.29, 773.89 979.29, 32 979.29 C10.67 979.29, 0 968.62, 0 947.29 C0 661.66, 0 376.02, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M32 0 C585.06 0, 1138.12 0, 1531.8 0 M32 0 C349.67 0, 667.35 0, 1531.8 0 M1531.8 0 C1553.13 0, 1563.8 10.67, 1563.8 32 M1531.8 0 C1553.13 0, 1563.8 10.67, 1563.8 32 M1563.8 32 C1563.8 228.46, 1563.8 424.93, 1563.8 947.29 M1563.8 32 C1563.8 250, 1563.8 468.01, 1563.8 947.29 M1563.8 947.29 C1563.8 968.62, 1553.13 979.29, 1531.8 979.29 M1563.8 947.29 C1563.8 968.62, 1553.13 979.29, 1531.8 979.29 M1531.8 979.29 C1010.85 979.29, 489.9 979.29, 32 979.29 M1531.8 979.29 C1054.73 979.29, 577.67 979.29, 32 979.29 M32 979.29 C10.67 979.29, 0 968.62, 0 947.29 M32 979.29 C10.67 979.29, 0 968.62, 0 947.29 M0 947.29 C0 676.13, 0 404.98, 0 32 M0 947.29 C0 666.84, 0 386.4, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1545.86003516243 2510.870153522689) rotate(0 66 12.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">startLogin()</text></g><g stroke-linecap="round" transform="translate(882.0441340591824 2590.4990260033483) rotate(0 736.6051807790791 38.60546875)"><path d="M19.3 0 C513.98 0, 1008.67 0, 1453.91 0 C1466.78 0, 1473.21 6.43, 1473.21 19.3 C1473.21 27.91, 1473.21 36.51, 1473.21 57.91 C1473.21 70.78, 1466.78 77.21, 1453.91 77.21 C1039.89 77.21, 625.88 77.21, 19.3 77.21 C6.43 77.21, 0 70.78, 0 57.91 C0 44.51, 0 31.12, 0 19.3 C0 6.43, 6.43 0, 19.3 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M19.3 0 C386.98 0, 754.66 0, 1453.91 0 M19.3 0 C572.46 0, 1125.62 0, 1453.91 0 M1453.91 0 C1466.78 0, 1473.21 6.43, 1473.21 19.3 M1453.91 0 C1466.78 0, 1473.21 6.43, 1473.21 19.3 M1473.21 19.3 C1473.21 33.43, 1473.21 47.55, 1473.21 57.91 M1473.21 19.3 C1473.21 28.33, 1473.21 37.37, 1473.21 57.91 M1473.21 57.91 C1473.21 70.78, 1466.78 77.21, 1453.91 77.21 M1473.21 57.91 C1473.21 70.78, 1466.78 77.21, 1453.91 77.21 M1453.91 77.21 C996.16 77.21, 538.42 77.21, 19.3 77.21 M1453.91 77.21 C956.92 77.21, 459.93 77.21, 19.3 77.21 M19.3 77.21 C6.43 77.21, 0 70.78, 0 57.91 M19.3 77.21 C6.43 77.21, 0 70.78, 0 57.91 M0 57.91 C0 49.04, 0 40.17, 0 19.3 M0 57.91 C0 49.76, 0 41.61, 0 19.3 M0 19.3 C0 6.43, 6.43 0, 19.3 0 M0 19.3 C0 6.43, 6.43 0, 19.3 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1489.1189839603649 2618.0651473048965) rotate(0 162.79977416992188 10)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">POST identity token to /connect/token</text></g><g stroke-linecap="round" transform="translate(1422.580097376318 2606.0089082559343) rotate(0 17.41652509434971 21.959966423310334)"><path d="M0 0 C8.84 0, 17.68 0, 34.83 0 M0 0 C8.18 0, 16.36 0, 34.83 0 M34.83 0 C34.83 11.66, 34.83 23.33, 34.83 43.92 M34.83 0 C34.83 11.6, 34.83 23.2, 34.83 43.92 M34.83 43.92 C27.77 43.92, 20.7 43.92, 0 43.92 M34.83 43.92 C23.44 43.92, 12.04 43.92, 0 43.92 M0 43.92 C0 28.58, 0 13.23, 0 0 M0 43.92 C0 30.1, 0 16.27, 0 0" stroke="#0000" stroke-width="2" fill="none"></path></g><g stroke-linecap="round"><g transform="translate(1424.2385286119788 2633.5481760697166) rotate(0 16.102380446523966 3.3899748308472226)" fill-rule="evenodd"><path d="M0 0 L0.09 6.69 L16.38 16.57 L31.64 7.53 L32.2 0 L15.82 -9.79 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.04 2.64, 0.07 5.28, 0.09 6.69 M0 0 C0.03 2, 0.06 3.99, 0.09 6.69 M0.09 6.69 C6.22 10.4, 12.34 14.12, 16.38 16.57 M0.09 6.69 C6.58 10.62, 13.06 14.56, 16.38 16.57 M16.38 16.57 C21.9 13.3, 27.42 10.03, 31.64 7.53 M16.38 16.57 C20.98 13.85, 25.57 11.13, 31.64 7.53 M31.64 7.53 C31.85 4.74, 32.06 1.96, 32.2 0 M31.64 7.53 C31.85 4.72, 32.06 1.9, 32.2 0 M32.2 0 C27.61 -2.75, 23.02 -5.49, 15.82 -9.79 M32.2 0 C25.85 -3.8, 19.5 -7.6, 15.82 -9.79 M15.82 -9.79 C11.84 -7.33, 7.86 -4.86, 0 0 M15.82 -9.79 C9.52 -5.89, 3.21 -1.99, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1440.52924099355 2649.4622245811943) rotate(0 0 -3.2016428958002052)"><path d="M0 0 C0 -2.49, 0 -4.97, 0 -6.4 M0 0 C0 -2.27, 0 -4.53, 0 -6.4" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1424.4268605470243 2633.736508004764) rotate(0 15.772799560192652 4.614132408653177)"><path d="M0 0 C6.02 3.45, 12.04 6.9, 16.1 9.23 M0 0 C5.06 2.9, 10.13 5.8, 16.1 9.23 M16.1 9.23 C20.85 6.54, 25.59 3.85, 31.55 0.47 M16.1 9.23 C20.29 6.85, 24.48 4.48, 31.55 0.47" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1441.9417305064053 2646.166415717871) rotate(0 3.7843249522720726 -2.1187342692794573)"><path d="M0 0 C2.2 -1.23, 4.4 -2.46, 7.57 -4.24 M0 0 C2.73 -1.53, 5.46 -3.06, 7.57 -4.24" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1450.9494089919644 2640.319506616337) rotate(0 1.9683133081707638 -0.27149149078218215)" fill-rule="evenodd"><path d="M0 0 L0.05 1.72 L3.64 -0.62 L3.94 -2.26 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.01 0.53, 0.03 1.06, 0.05 1.72 M0 0 C0.01 0.36, 0.02 0.72, 0.05 1.72 M0.05 1.72 C1.14 1.01, 2.23 0.3, 3.64 -0.62 M0.05 1.72 C1.19 0.97, 2.34 0.23, 3.64 -0.62 M3.64 -0.62 C3.74 -1.16, 3.84 -1.71, 3.94 -2.26 M3.64 -0.62 C3.75 -1.21, 3.85 -1.8, 3.94 -2.26 M3.94 -2.26 C2.62 -1.51, 1.31 -0.75, 0 0 M3.94 -2.26 C3.11 -1.79, 2.28 -1.31, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1424.167423697727 2624.670587484692) rotate(0 16.102380446523966 3.3899748308472226)" fill-rule="evenodd"><path d="M0 0 L0.09 6.69 L16.38 16.57 L31.64 7.53 L32.2 0 L15.82 -9.79 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.02 1.73, 0.05 3.47, 0.09 6.69 M0 0 C0.04 2.54, 0.07 5.07, 0.09 6.69 M0.09 6.69 C6.3 10.45, 12.5 14.22, 16.38 16.57 M0.09 6.69 C4.71 9.49, 9.33 12.29, 16.38 16.57 M16.38 16.57 C19.82 14.54, 23.26 12.5, 31.64 7.53 M16.38 16.57 C21.8 13.36, 27.22 10.16, 31.64 7.53 M31.64 7.53 C31.79 5.57, 31.93 3.61, 32.2 0 M31.64 7.53 C31.79 5.59, 31.93 3.65, 32.2 0 M32.2 0 C26.11 -3.64, 20.02 -7.28, 15.82 -9.79 M32.2 0 C28.89 -1.98, 25.58 -3.96, 15.82 -9.79 M15.82 -9.79 C11.37 -7.04, 6.92 -4.28, 0 0 M15.82 -9.79 C12.2 -7.55, 8.58 -5.31, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1440.4581360792945 2640.584635996169) rotate(0 0 -3.2016428958002052)"><path d="M0 0 C0 -1.7, 0 -3.4, 0 -6.4 M0 0 C0 -1.69, 0 -3.38, 0 -6.4" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1424.3557556327723 2624.8589194197384) rotate(0 15.772799560192652 4.614132408653177)"><path d="M0 0 C6.05 3.47, 12.1 6.94, 16.1 9.23 M0 0 C6.41 3.67, 12.82 7.35, 16.1 9.23 M16.1 9.23 C21.69 6.06, 27.27 2.89, 31.55 0.47 M16.1 9.23 C20.75 6.59, 25.4 3.96, 31.55 0.47" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1441.8706255921497 2637.2888271328447) rotate(0 3.954970635988502 -2.1187342692794573)"><path d="M0 0 C3.11 -1.67, 6.22 -3.33, 7.91 -4.24 M0 0 C2.58 -1.38, 5.15 -2.76, 7.91 -4.24" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1451.1342726032854 2631.185949505736) rotate(0 1.6654172195740102 -0.18062266420292872)" fill-rule="evenodd"><path d="M0 0 L0.05 1.72 L3.25 -0.18 L3.33 -2.08 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.01 0.53, 0.03 1.06, 0.05 1.72 M0 0 C0.01 0.47, 0.02 0.93, 0.05 1.72 M0.05 1.72 C1.19 1.04, 2.32 0.37, 3.25 -0.18 M0.05 1.72 C1.23 1.02, 2.41 0.32, 3.25 -0.18 M3.25 -0.18 C3.28 -0.86, 3.31 -1.54, 3.33 -2.08 M3.25 -0.18 C3.28 -0.69, 3.3 -1.19, 3.33 -2.08 M3.33 -2.08 C2.38 -1.49, 1.44 -0.9, 0 0 M3.33 -2.08 C2.1 -1.31, 0.87 -0.55, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1424.0963187834714 2615.9141573351053) rotate(0 16.102380446523966 3.3899748308472226)" fill-rule="evenodd"><path d="M0 0 L0.09 6.69 L16.38 16.57 L31.64 7.53 L32.2 0 L15.82 -9.79 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.03 2.18, 0.06 4.35, 0.09 6.69 M0 0 C0.02 1.38, 0.04 2.76, 0.09 6.69 M0.09 6.69 C6.07 10.31, 12.05 13.94, 16.38 16.57 M0.09 6.69 C4.91 9.61, 9.72 12.53, 16.38 16.57 M16.38 16.57 C21.67 13.44, 26.96 10.3, 31.64 7.53 M16.38 16.57 C21.11 13.77, 25.83 10.98, 31.64 7.53 M31.64 7.53 C31.84 4.89, 32.04 2.24, 32.2 0 M31.64 7.53 C31.83 4.97, 32.02 2.41, 32.2 0 M32.2 0 C28.24 -2.37, 24.28 -4.74, 15.82 -9.79 M32.2 0 C26.16 -3.61, 20.11 -7.23, 15.82 -9.79 M15.82 -9.79 C11.53 -7.14, 7.24 -4.48, 0 0 M15.82 -9.79 C10.24 -6.34, 4.66 -2.89, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1440.3870311650462 2631.828205846582) rotate(0 0 -3.2016428958002052)"><path d="M0 0 C0 -1.95, 0 -3.9, 0 -6.4 M0 0 C0 -2.04, 0 -4.09, 0 -6.4" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1424.284650718524 2616.1024892701516) rotate(0 15.772799560192652 4.614132408653177)"><path d="M0 0 C6.13 3.51, 12.26 7.03, 16.1 9.23 M0 0 C4.56 2.62, 9.13 5.23, 16.1 9.23 M16.1 9.23 C19.58 7.26, 23.06 5.28, 31.55 0.47 M16.1 9.23 C21.58 6.12, 27.07 3.01, 31.55 0.47" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1441.7995206778978 2628.532396983258) rotate(0 3.954970635988502 -2.1187342692794573)"><path d="M0 0 C1.6 -0.86, 3.21 -1.72, 7.91 -4.24 M0 0 C2.59 -1.39, 5.18 -2.77, 7.91 -4.24" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1451.0631676890334 2622.429519356151) rotate(0 1.816865263872387 -0.15033305534325336)" fill-rule="evenodd"><path d="M0 0 L0.05 1.72 L3.44 -0.12 L3.63 -2.02 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.02 0.62, 0.03 1.24, 0.05 1.72 M0 0 C0.01 0.52, 0.03 1.03, 0.05 1.72 M0.05 1.72 C1.3 1.04, 2.56 0.36, 3.44 -0.12 M0.05 1.72 C1.31 1.03, 2.58 0.34, 3.44 -0.12 M3.44 -0.12 C3.49 -0.65, 3.55 -1.19, 3.63 -2.02 M3.44 -0.12 C3.51 -0.86, 3.59 -1.59, 3.63 -2.02 M3.63 -2.02 C2.72 -1.51, 1.8 -1, 0 0 M3.63 -2.02 C2.19 -1.22, 0.74 -0.41, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(881.3472833966407 2711.558928399936) rotate(0 736.642546980418 38.60546875)"><path d="M19.3 0 C441.99 0, 864.68 0, 1453.98 0 C1466.85 0, 1473.29 6.43, 1473.29 19.3 C1473.29 28.95, 1473.29 38.59, 1473.29 57.91 C1473.29 70.78, 1466.85 77.21, 1453.98 77.21 C1065.3 77.21, 676.62 77.21, 19.3 77.21 C6.43 77.21, 0 70.78, 0 57.91 C0 49.39, 0 40.88, 0 19.3 C0 6.43, 6.43 0, 19.3 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M19.3 0 C573.45 0, 1127.59 0, 1453.98 0 M19.3 0 C480.9 0, 942.49 0, 1453.98 0 M1453.98 0 C1466.85 0, 1473.29 6.43, 1473.29 19.3 M1453.98 0 C1466.85 0, 1473.29 6.43, 1473.29 19.3 M1473.29 19.3 C1473.29 31.4, 1473.29 43.51, 1473.29 57.91 M1473.29 19.3 C1473.29 33.53, 1473.29 47.75, 1473.29 57.91 M1473.29 57.91 C1473.29 70.78, 1466.85 77.21, 1453.98 77.21 M1473.29 57.91 C1473.29 70.78, 1466.85 77.21, 1453.98 77.21 M1453.98 77.21 C1092.67 77.21, 731.35 77.21, 19.3 77.21 M1453.98 77.21 C895.34 77.21, 336.69 77.21, 19.3 77.21 M19.3 77.21 C6.43 77.21, 0 70.78, 0 57.91 M19.3 77.21 C6.43 77.21, 0 70.78, 0 57.91 M0 57.91 C0 43.25, 0 28.6, 0 19.3 M0 57.91 C0 45.96, 0 34.01, 0 19.3 M0 19.3 C0 6.43, 6.43 0, 19.3 0 M0 19.3 C0 6.43, 6.43 0, 19.3 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1435.8861352413514 2745.164397149936) rotate(0 215.59970092773438 10)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Server validates the request and sends a response</text></g><g stroke-linecap="round" transform="translate(1368.8941236573046 2728.108158100974) rotate(0 17.41652509434971 21.959966423310334)"><path d="M0 0 C12.69 0, 25.38 0, 34.83 0 M0 0 C11.51 0, 23.02 0, 34.83 0 M34.83 0 C34.83 15.03, 34.83 30.07, 34.83 43.92 M34.83 0 C34.83 11.33, 34.83 22.66, 34.83 43.92 M34.83 43.92 C23.63 43.92, 12.43 43.92, 0 43.92 M34.83 43.92 C23.64 43.92, 12.44 43.92, 0 43.92 M0 43.92 C0 31.98, 0 20.04, 0 0 M0 43.92 C0 28.7, 0 13.48, 0 0" stroke="#0000" stroke-width="2" fill="none"></path></g><g stroke-linecap="round"><g transform="translate(1370.5525548929654 2755.6474259147562) rotate(0 16.102380446523966 3.3899748308472226)" fill-rule="evenodd"><path d="M0 0 L0.09 6.69 L16.38 16.57 L31.64 7.53 L32.2 0 L15.82 -9.79 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.02 1.59, 0.04 3.18, 0.09 6.69 M0 0 C0.03 2.46, 0.07 4.91, 0.09 6.69 M0.09 6.69 C5.68 10.08, 11.26 13.46, 16.38 16.57 M0.09 6.69 C5.56 10, 11.02 13.32, 16.38 16.57 M16.38 16.57 C21.98 13.26, 27.58 9.94, 31.64 7.53 M16.38 16.57 C20.79 13.96, 25.2 11.35, 31.64 7.53 M31.64 7.53 C31.77 5.75, 31.91 3.97, 32.2 0 M31.64 7.53 C31.77 5.74, 31.91 3.95, 32.2 0 M32.2 0 C28.09 -2.46, 23.98 -4.92, 15.82 -9.79 M32.2 0 C28.86 -2, 25.52 -4, 15.82 -9.79 M15.82 -9.79 C10.06 -6.23, 4.3 -2.66, 0 0 M15.82 -9.79 C12.06 -7.46, 8.29 -5.13, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1386.8432672745366 2771.561474426235) rotate(0 0 -3.2016428958002052)"><path d="M0 0 C0 -2.02, 0 -4.05, 0 -6.4 M0 0 C0 -1.84, 0 -3.69, 0 -6.4" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1370.7408868280108 2755.8357578498035) rotate(0 15.772799560192652 4.614132408653177)"><path d="M0 0 C3.24 1.86, 6.48 3.71, 16.1 9.23 M0 0 C5.27 3.02, 10.54 6.04, 16.1 9.23 M16.1 9.23 C21.48 6.18, 26.85 3.13, 31.55 0.47 M16.1 9.23 C20.61 6.67, 25.12 4.11, 31.55 0.47" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1388.2557567873919 2768.2656655629116) rotate(0 3.7843249522720726 -2.1187342692794573)"><path d="M0 0 C2.51 -1.4, 5.01 -2.81, 7.57 -4.24 M0 0 C2.05 -1.15, 4.09 -2.29, 7.57 -4.24" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1397.263435272951 2762.4187564613767) rotate(0 1.9683133081707638 -0.27149149078218215)" fill-rule="evenodd"><path d="M0 0 L0.05 1.72 L3.64 -0.62 L3.94 -2.26 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.01 0.43, 0.02 0.85, 0.05 1.72 M0 0 C0.01 0.48, 0.03 0.97, 0.05 1.72 M0.05 1.72 C0.89 1.17, 1.73 0.62, 3.64 -0.62 M0.05 1.72 C0.84 1.2, 1.64 0.68, 3.64 -0.62 M3.64 -0.62 C3.74 -1.19, 3.85 -1.76, 3.94 -2.26 M3.64 -0.62 C3.75 -1.2, 3.85 -1.79, 3.94 -2.26 M3.94 -2.26 C2.56 -1.47, 1.19 -0.68, 0 0 M3.94 -2.26 C3.08 -1.77, 2.23 -1.28, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1370.4814499787135 2746.7698373297317) rotate(0 16.102380446523966 3.3899748308472226)" fill-rule="evenodd"><path d="M0 0 L0.09 6.69 L16.38 16.57 L31.64 7.53 L32.2 0 L15.82 -9.79 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.03 1.78, 0.05 3.56, 0.09 6.69 M0 0 C0.03 2.26, 0.06 4.52, 0.09 6.69 M0.09 6.69 C5.51 9.97, 10.92 13.26, 16.38 16.57 M0.09 6.69 C4.35 9.27, 8.6 11.85, 16.38 16.57 M16.38 16.57 C20.23 14.3, 24.07 12.02, 31.64 7.53 M16.38 16.57 C22.32 13.05, 28.26 9.53, 31.64 7.53 M31.64 7.53 C31.78 5.62, 31.93 3.7, 32.2 0 M31.64 7.53 C31.77 5.78, 31.9 4.03, 32.2 0 M32.2 0 C27.51 -2.81, 22.82 -5.61, 15.82 -9.79 M32.2 0 C27.8 -2.63, 23.39 -5.27, 15.82 -9.79 M15.82 -9.79 C11.21 -6.94, 6.6 -4.08, 0 0 M15.82 -9.79 C10.09 -6.25, 4.37 -2.7, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1386.772162360281 2762.6838858412084) rotate(0 0 -3.2016428958002052)"><path d="M0 0 C0 -2.19, 0 -4.38, 0 -6.4 M0 0 C0 -1.65, 0 -3.3, 0 -6.4" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1370.669781913759 2746.958169264778) rotate(0 15.772799560192652 4.614132408653177)"><path d="M0 0 C5.52 3.16, 11.04 6.33, 16.1 9.23 M0 0 C5.4 3.09, 10.8 6.19, 16.1 9.23 M16.1 9.23 C21.77 6.02, 27.43 2.8, 31.55 0.47 M16.1 9.23 C20.57 6.7, 25.03 4.17, 31.55 0.47" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1388.1846518731363 2759.3880769778852) rotate(0 3.954970635988502 -2.1187342692794573)"><path d="M0 0 C2.48 -1.33, 4.96 -2.66, 7.91 -4.24 M0 0 C2.91 -1.56, 5.83 -3.12, 7.91 -4.24" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1397.448298884272 2753.2851993507766) rotate(0 1.6654172195740102 -0.18062266420292872)" fill-rule="evenodd"><path d="M0 0 L0.05 1.72 L3.25 -0.18 L3.33 -2.08 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.02 0.6, 0.03 1.2, 0.05 1.72 M0 0 C0.01 0.5, 0.03 1, 0.05 1.72 M0.05 1.72 C0.86 1.24, 1.67 0.76, 3.25 -0.18 M0.05 1.72 C1.15 1.07, 2.25 0.42, 3.25 -0.18 M3.25 -0.18 C3.28 -0.75, 3.3 -1.31, 3.33 -2.08 M3.25 -0.18 C3.27 -0.58, 3.29 -0.99, 3.33 -2.08 M3.33 -2.08 C2.07 -1.29, 0.8 -0.5, 0 0 M3.33 -2.08 C2.3 -1.44, 1.27 -0.79, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1370.410345064458 2738.013407180146) rotate(0 16.102380446523966 3.3899748308472226)" fill-rule="evenodd"><path d="M0 0 L0.09 6.69 L16.38 16.57 L31.64 7.53 L32.2 0 L15.82 -9.79 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.02 1.72, 0.05 3.43, 0.09 6.69 M0 0 C0.02 1.4, 0.04 2.8, 0.09 6.69 M0.09 6.69 C6.57 10.62, 13.05 14.55, 16.38 16.57 M0.09 6.69 C5.74 10.11, 11.39 13.54, 16.38 16.57 M16.38 16.57 C20.03 14.42, 23.67 12.26, 31.64 7.53 M16.38 16.57 C21.81 13.36, 27.24 10.14, 31.64 7.53 M31.64 7.53 C31.78 5.7, 31.92 3.86, 32.2 0 M31.64 7.53 C31.76 5.9, 31.88 4.28, 32.2 0 M32.2 0 C26.69 -3.3, 21.18 -6.59, 15.82 -9.79 M32.2 0 C28.43 -2.25, 24.66 -4.51, 15.82 -9.79 M15.82 -9.79 C9.76 -6.04, 3.71 -2.3, 0 0 M15.82 -9.79 C11.97 -7.41, 8.12 -5.02, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1386.7010574460328 2753.9274556916216) rotate(0 0 -3.2016428958002052)"><path d="M0 0 C0 -1.5, 0 -3.01, 0 -6.4 M0 0 C0 -1.42, 0 -2.84, 0 -6.4" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1370.5986769995106 2738.201739115192) rotate(0 15.772799560192652 4.614132408653177)"><path d="M0 0 C5.35 3.07, 10.7 6.13, 16.1 9.23 M0 0 C4.2 2.41, 8.41 4.82, 16.1 9.23 M16.1 9.23 C19.99 7.02, 23.88 4.82, 31.55 0.47 M16.1 9.23 C22.12 5.82, 28.13 2.41, 31.55 0.47" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1388.1135469588844 2750.6316468282985) rotate(0 3.954970635988502 -2.1187342692794573)"><path d="M0 0 C2.54 -1.36, 5.09 -2.73, 7.91 -4.24 M0 0 C2.54 -1.36, 5.08 -2.72, 7.91 -4.24" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1397.37719397002 2744.5287692011907) rotate(0 1.816865263872387 -0.15033305534325336)" fill-rule="evenodd"><path d="M0 0 L0.05 1.72 L3.44 -0.12 L3.63 -2.02 L0 0" stroke="none" stroke-width="0" fill="#ced4da" fill-rule="evenodd"></path><path d="M0 0 C0.02 0.63, 0.03 1.26, 0.05 1.72 M0 0 C0.01 0.5, 0.03 0.99, 0.05 1.72 M0.05 1.72 C0.85 1.28, 1.65 0.85, 3.44 -0.12 M0.05 1.72 C0.85 1.28, 1.66 0.84, 3.44 -0.12 M3.44 -0.12 C3.49 -0.6, 3.54 -1.07, 3.63 -2.02 M3.44 -0.12 C3.48 -0.51, 3.52 -0.89, 3.63 -2.02 M3.63 -2.02 C2.31 -1.28, 0.99 -0.55, 0 0 M3.63 -2.02 C2.77 -1.54, 1.9 -1.06, 0 0 M0 0 C0 0, 0 0, 0 0 M0 0 C0 0, 0 0, 0 0" stroke="#495057" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(1887.664087121757 2983.3089504187437) rotate(0 235.94921875 115.31422828339896)"><path d="M32 0 C163.49 0, 294.97 0, 439.9 0 C461.23 0, 471.9 10.67, 471.9 32 C471.9 74.9, 471.9 117.8, 471.9 198.63 C471.9 219.96, 461.23 230.63, 439.9 230.63 C323.03 230.63, 206.17 230.63, 32 230.63 C10.67 230.63, 0 219.96, 0 198.63 C0 153.56, 0 108.5, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ff8787"></path><path d="M32 0 C187.19 0, 342.38 0, 439.9 0 M32 0 C151.84 0, 271.67 0, 439.9 0 M439.9 0 C461.23 0, 471.9 10.67, 471.9 32 M439.9 0 C461.23 0, 471.9 10.67, 471.9 32 M471.9 32 C471.9 77.79, 471.9 123.58, 471.9 198.63 M471.9 32 C471.9 67.26, 471.9 102.52, 471.9 198.63 M471.9 198.63 C471.9 219.96, 461.23 230.63, 439.9 230.63 M471.9 198.63 C471.9 219.96, 461.23 230.63, 439.9 230.63 M439.9 230.63 C326.46 230.63, 213.01 230.63, 32 230.63 M439.9 230.63 C332.16 230.63, 224.43 230.63, 32 230.63 M32 230.63 C10.67 230.63, 0 219.96, 0 198.63 M32 230.63 C10.67 230.63, 0 219.96, 0 198.63 M0 198.63 C0 132.7, 0 66.77, 0 32 M0 198.63 C0 143.28, 0 87.94, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(877.1562746217569 2982.6273097937437) rotate(0 235.94921875 118.02518327708799)"><path d="M32 0 C145.83 0, 259.67 0, 439.9 0 C461.23 0, 471.9 10.67, 471.9 32 C471.9 72.02, 471.9 112.04, 471.9 204.05 C471.9 225.38, 461.23 236.05, 439.9 236.05 C314.67 236.05, 189.45 236.05, 32 236.05 C10.67 236.05, 0 225.38, 0 204.05 C0 141.72, 0 79.38, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ff8787"></path><path d="M32 0 C191.84 0, 351.68 0, 439.9 0 M32 0 C151.98 0, 271.96 0, 439.9 0 M439.9 0 C461.23 0, 471.9 10.67, 471.9 32 M439.9 0 C461.23 0, 471.9 10.67, 471.9 32 M471.9 32 C471.9 80.76, 471.9 129.53, 471.9 204.05 M471.9 32 C471.9 96.41, 471.9 160.82, 471.9 204.05 M471.9 204.05 C471.9 225.38, 461.23 236.05, 439.9 236.05 M471.9 204.05 C471.9 225.38, 461.23 236.05, 439.9 236.05 M439.9 236.05 C305.52 236.05, 171.15 236.05, 32 236.05 M439.9 236.05 C291.49 236.05, 143.07 236.05, 32 236.05 M32 236.05 C10.67 236.05, 0 225.38, 0 204.05 M32 236.05 C10.67 236.05, 0 225.38, 0 204.05 M0 204.05 C0 137.04, 0 70.03, 0 32 M0 204.05 C0 156.32, 0 108.59, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(1382.410180871757 2983.6381686330615) rotate(0 235.94921875 116.06674656852306)"><path d="M32 0 C168.89 0, 305.79 0, 439.9 0 C461.23 0, 471.9 10.67, 471.9 32 C471.9 84.78, 471.9 137.57, 471.9 200.13 C471.9 221.47, 461.23 232.13, 439.9 232.13 C303.25 232.13, 166.61 232.13, 32 232.13 C10.67 232.13, 0 221.47, 0 200.13 C0 154.42, 0 108.72, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ff8787"></path><path d="M32 0 C155.79 0, 279.58 0, 439.9 0 M32 0 C185.01 0, 338.02 0, 439.9 0 M439.9 0 C461.23 0, 471.9 10.67, 471.9 32 M439.9 0 C461.23 0, 471.9 10.67, 471.9 32 M471.9 32 C471.9 91.23, 471.9 150.45, 471.9 200.13 M471.9 32 C471.9 71.64, 471.9 111.27, 471.9 200.13 M471.9 200.13 C471.9 221.47, 461.23 232.13, 439.9 232.13 M471.9 200.13 C471.9 221.47, 461.23 232.13, 439.9 232.13 M439.9 232.13 C298.78 232.13, 157.67 232.13, 32 232.13 M439.9 232.13 C338.28 232.13, 236.67 232.13, 32 232.13 M32 232.13 C10.67 232.13, 0 221.47, 0 200.13 M32 232.13 C10.67 232.13, 0 221.47, 0 200.13 M0 200.13 C0 139.48, 0 78.83, 0 32 M0 200.13 C0 142.49, 0 84.85, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1931.113305871757 3029.9162558804874) rotate(0 192.5 12.5)"><text x="192.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">processDeviceVerificationResponse()</text></g><g transform="translate(1475.359399621757 3028.0791559618983) rotate(0 143 12.5)"><text x="143" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">processTwoFactorResponse()</text></g><g stroke-linecap="round" transform="translate(878.9507762599023 2836.07898906469) rotate(0 235.72462696028015 51.3359375)"><path d="M25.67 0 C159.27 0, 292.88 0, 445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 C471.45 35.98, 471.45 46.29, 471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 C357.73 102.67, 269.67 102.67, 25.67 102.67 C8.56 102.67, 0 94.12, 0 77 C0 64.09, 0 51.17, 0 25.67 C0 8.56, 8.56 0, 25.67 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M25.67 0 C114.58 0, 203.49 0, 445.78 0 M25.67 0 C126.41 0, 227.15 0, 445.78 0 M445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 M445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 M471.45 25.67 C471.45 37.22, 471.45 48.78, 471.45 77 M471.45 25.67 C471.45 45.36, 471.45 65.04, 471.45 77 M471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 M471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 M445.78 102.67 C321.15 102.67, 196.52 102.67, 25.67 102.67 M445.78 102.67 C304.99 102.67, 164.21 102.67, 25.67 102.67 M25.67 102.67 C8.56 102.67, 0 94.12, 0 77 M25.67 102.67 C8.56 102.67, 0 94.12, 0 77 M0 77 C0 59.09, 0 41.18, 0 25.67 M0 77 C0 65.93, 0 54.86, 0 25.67 M0 25.67 C0 8.56, 8.56 0, 25.67 0 M0 25.67 C0 8.56, 8.56 0, 25.67 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(1384.737428955188 2836.07898906469) rotate(0 235.72462696028015 51.3359375)"><path d="M25.67 0 C168.32 0, 310.98 0, 445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 C471.45 43.59, 471.45 61.51, 471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 C292.05 102.67, 138.32 102.67, 25.67 102.67 C8.56 102.67, 0 94.12, 0 77 C0 60.09, 0 43.18, 0 25.67 C0 8.56, 8.56 0, 25.67 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M25.67 0 C136.62 0, 247.57 0, 445.78 0 M25.67 0 C123.46 0, 221.25 0, 445.78 0 M445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 M445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 M471.45 25.67 C471.45 41.63, 471.45 57.6, 471.45 77 M471.45 25.67 C471.45 40.88, 471.45 56.09, 471.45 77 M471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 M471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 M445.78 102.67 C325.44 102.67, 205.1 102.67, 25.67 102.67 M445.78 102.67 C317.35 102.67, 188.92 102.67, 25.67 102.67 M25.67 102.67 C8.56 102.67, 0 94.12, 0 77 M25.67 102.67 C8.56 102.67, 0 94.12, 0 77 M0 77 C0 56.47, 0 35.94, 0 25.67 M0 77 C0 63.72, 0 50.43, 0 25.67 M0 25.67 C0 8.56, 8.56 0, 25.67 0 M0 25.67 C0 8.56, 8.56 0, 25.67 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1022.2755313940106 2855.454936137199) rotate(0 92.39987182617188 30)"><text x="92.39987182617188" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Response #1:</text><text x="92.39987182617188" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="92.39987182617188" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">IdentityTokenResponse</text></g><g transform="translate(992.1054933717569 3027.7720864964003) rotate(0 121 12.5)"><text x="121" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">processTokenResponse()</text></g><g stroke-linecap="round" transform="translate(879.708492767837 3274.4099757781105) rotate(0 735.9745281581327 55.78407118055566)"><path d="M27.89 0 C583.52 0, 1139.14 0, 1444.06 0 C1462.65 0, 1471.95 9.3, 1471.95 27.89 C1471.95 49.55, 1471.95 71.21, 1471.95 83.68 C1471.95 102.27, 1462.65 111.57, 1444.06 111.57 C1073.89 111.57, 703.73 111.57, 27.89 111.57 C9.3 111.57, 0 102.27, 0 83.68 C0 66.56, 0 49.45, 0 27.89 C0 9.3, 9.3 0, 27.89 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M27.89 0 C395.28 0, 762.67 0, 1444.06 0 M27.89 0 C482.49 0, 937.08 0, 1444.06 0 M1444.06 0 C1462.65 0, 1471.95 9.3, 1471.95 27.89 M1444.06 0 C1462.65 0, 1471.95 9.3, 1471.95 27.89 M1471.95 27.89 C1471.95 41.31, 1471.95 54.74, 1471.95 83.68 M1471.95 27.89 C1471.95 45.6, 1471.95 63.31, 1471.95 83.68 M1471.95 83.68 C1471.95 102.27, 1462.65 111.57, 1444.06 111.57 M1471.95 83.68 C1471.95 102.27, 1462.65 111.57, 1444.06 111.57 M1444.06 111.57 C984.33 111.57, 524.61 111.57, 27.89 111.57 M1444.06 111.57 C1066.07 111.57, 688.09 111.57, 27.89 111.57 M27.89 111.57 C9.3 111.57, 0 102.27, 0 83.68 M27.89 111.57 C9.3 111.57, 0 102.27, 0 83.68 M0 83.68 C0 64.45, 0 45.22, 0 27.89 M0 83.68 C0 71.1, 0 58.53, 0 27.89 M0 27.89 C0 9.3, 9.3 0, 27.89 0 M0 27.89 C0 9.3, 9.3 0, 27.89 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1560.6830209259715 3317.694046958666) rotate(0 55 12.5)"><text x="55" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">AuthResult</text></g><g transform="translate(954.7057130983194 3102.0602260706446) rotate(0 158.3997802734375 20)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">- Sets authentication and decryption</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  data to state</text></g><g transform="translate(1453.133259483664 3097.237576735485) rotate(0 165.2261401380929 30)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">- Sets 2FA providers to state</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">- Sets AuthResult.twoFactorProviders</text><text x="0" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  to true</text></g><g transform="translate(1928.5649068779785 3112.6214237643653) rotate(0 195.4136379940901 20)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">- Sets AuthResult.requiresDeviceVerification</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  to true</text></g><g transform="translate(1631.655453840267 1509.7736257723489) rotate(0 255.19964599609375 20)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Call the relevant method on the specific strategy:</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logIn(), logInTwoFactor(), or logInNewDeviceVerification()</text></g><g stroke-linecap="round" transform="translate(509.1067799540997 1742.9408380464981) rotate(0 214.3160342261899 244.28896949404725)"><path d="M32 0 C166 0, 300 0, 396.63 0 C417.97 0, 428.63 10.67, 428.63 32 C428.63 136.17, 428.63 240.34, 428.63 456.58 C428.63 477.91, 417.97 488.58, 396.63 488.58 C319.4 488.58, 242.17 488.58, 32 488.58 C10.67 488.58, 0 477.91, 0 456.58 C0 366.77, 0 276.96, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C159.69 0, 287.38 0, 396.63 0 M32 0 C120.02 0, 208.05 0, 396.63 0 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M428.63 32 C428.63 135.74, 428.63 239.48, 428.63 456.58 M428.63 32 C428.63 194.77, 428.63 357.55, 428.63 456.58 M428.63 456.58 C428.63 477.91, 417.97 488.58, 396.63 488.58 M428.63 456.58 C428.63 477.91, 417.97 488.58, 396.63 488.58 M396.63 488.58 C253.11 488.58, 109.58 488.58, 32 488.58 M396.63 488.58 C304.78 488.58, 212.93 488.58, 32 488.58 M32 488.58 C10.67 488.58, 0 477.91, 0 456.58 M32 488.58 C10.67 488.58, 0 477.91, 0 456.58 M0 456.58 C0 298.04, 0 139.49, 0 32 M0 456.58 C0 335.25, 0 213.93, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(607.9228141802887 1771.9468369304261) rotate(0 115.5 12.5)"><text x="115.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">PasswordLoginStrategy</text></g><g stroke-linecap="round" transform="translate(532.4838493365387 1817.957986018968) rotate(0 190.93896484375 53.00065104166674)"><path d="M26.5 0 C140.41 0, 254.32 0, 355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 C381.88 39, 381.88 51.5, 381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 C226.18 106, 96.97 106, 26.5 106 C8.83 106, 0 97.17, 0 79.5 C0 67.05, 0 54.59, 0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M26.5 0 C120.52 0, 214.55 0, 355.38 0 M26.5 0 C136.13 0, 245.75 0, 355.38 0 M355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 M355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 M381.88 26.5 C381.88 42.28, 381.88 58.06, 381.88 79.5 M381.88 26.5 C381.88 37.79, 381.88 49.08, 381.88 79.5 M381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 M381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 M355.38 106 C286.89 106, 218.4 106, 26.5 106 M355.38 106 C287.55 106, 219.73 106, 26.5 106 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M0 79.5 C0 59.03, 0 38.56, 0 26.5 M0 79.5 C0 60.17, 0 40.83, 0 26.5 M0 26.5 C0 8.83, 8.83 0, 26.5 0 M0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(560.6230400103668 1831.287878132064) rotate(0 162.79977416992188 40)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">PasswordLoginStrategyData {</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  tokenRequest: PasswordTokenRequest,</text><text x="0" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  // ... other properties</text><text x="0" y="74" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">}</text></g><g stroke-linecap="round" transform="translate(536.1893382378221 2022.4704371908435) rotate(0 189.37158203125 26.024088541666742)"><path d="M13.01 0 C96.89 0, 180.77 0, 365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 C378.74 23.21, 378.74 33.41, 378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 C258.34 52.05, 150.96 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 28.94, 0 18.85, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C138.7 0, 264.38 0, 365.73 0 M13.01 0 C148.16 0, 283.32 0, 365.73 0 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M378.74 13.01 C378.74 18.47, 378.74 23.93, 378.74 39.04 M378.74 13.01 C378.74 19.18, 378.74 25.35, 378.74 39.04 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M365.73 52.05 C285.21 52.05, 204.69 52.05, 13.01 52.05 M365.73 52.05 C263.31 52.05, 160.88 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 30.92, 0 22.81, 0 13.01 M0 39.04 C0 30.97, 0 22.9, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(681.5609813042283 2038.4945257325105) rotate(0 43.99993896484375 10)"><text x="43.99993896484375" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logIn(...)</text></g><g stroke-linecap="round" transform="translate(539.5046284163946 2093.7021673340732) rotate(0 186.06103515625 26.024088541666742)"><path d="M13.01 0 C146.13 0, 279.25 0, 359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 C372.12 19.81, 372.12 26.6, 372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 C258.79 52.05, 158.46 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 29.06, 0 19.09, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C98.7 0, 184.39 0, 359.11 0 M13.01 0 C111.35 0, 209.69 0, 359.11 0 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M372.12 13.01 C372.12 19.92, 372.12 26.82, 372.12 39.04 M372.12 13.01 C372.12 22.03, 372.12 31.06, 372.12 39.04 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M359.11 52.05 C232.52 52.05, 105.92 52.05, 13.01 52.05 M359.11 52.05 C273.98 52.05, 188.85 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 30.04, 0 21.05, 0 13.01 M0 39.04 C0 32.21, 0 25.39, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(641.9657795394414 2109.72625587574) rotate(0 83.59988403320312 10)"><text x="83.59988403320312" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logInTwoFactor(...)</text></g><g stroke-linecap="round" transform="translate(540.5046284163946 2162.7787054200107) rotate(0 186.06103515625 26.024088541666742)"><path d="M13.01 0 C86.17 0, 159.33 0, 359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 C372.12 19.27, 372.12 25.54, 372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 C289.72 52.05, 220.33 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 29.71, 0 20.39, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C94.88 0, 176.75 0, 359.11 0 M13.01 0 C106.67 0, 200.33 0, 359.11 0 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M372.12 13.01 C372.12 20.6, 372.12 28.2, 372.12 39.04 M372.12 13.01 C372.12 22.01, 372.12 31.01, 372.12 39.04 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M359.11 52.05 C272.6 52.05, 186.08 52.05, 13.01 52.05 M359.11 52.05 C246.16 52.05, 133.21 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 32.3, 0 25.55, 0 13.01 M0 39.04 C0 32.4, 0 25.76, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(590.1658527816289 2178.8027939616777) rotate(0 136.39981079101562 10)"><text x="136.39981079101562" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logInNewDeviceVerification(...)</text></g><g stroke-linecap="round" transform="translate(957.1683033915979 1742.9408380464981) rotate(0 214.316034226189 244.52866381601052)"><path d="M32 0 C113.15 0, 194.3 0, 396.63 0 C417.97 0, 428.63 10.67, 428.63 32 C428.63 150.19, 428.63 268.38, 428.63 457.06 C428.63 478.39, 417.97 489.06, 396.63 489.06 C323.24 489.06, 249.86 489.06, 32 489.06 C10.67 489.06, 0 478.39, 0 457.06 C0 363.59, 0 270.11, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C159.87 0, 287.75 0, 396.63 0 M32 0 C119.57 0, 207.14 0, 396.63 0 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M428.63 32 C428.63 189.27, 428.63 346.53, 428.63 457.06 M428.63 32 C428.63 201.11, 428.63 370.22, 428.63 457.06 M428.63 457.06 C428.63 478.39, 417.97 489.06, 396.63 489.06 M428.63 457.06 C428.63 478.39, 417.97 489.06, 396.63 489.06 M396.63 489.06 C293.84 489.06, 191.04 489.06, 32 489.06 M396.63 489.06 C275.58 489.06, 154.54 489.06, 32 489.06 M32 489.06 C10.67 489.06, 0 478.39, 0 457.06 M32 489.06 C10.67 489.06, 0 478.39, 0 457.06 M0 457.06 C0 359.82, 0 262.58, 0 32 M0 457.06 C0 296.28, 0 135.5, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1039.4843376177887 1771.9468369304261) rotate(0 132 12.5)"><text x="132" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">AuthRequestLoginStrategy</text></g><g stroke-linecap="round" transform="translate(980.5453727740387 1817.957986018968) rotate(0 190.93896484375 53.00065104166674)"><path d="M26.5 0 C110.42 0, 194.34 0, 355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 C381.88 40.43, 381.88 54.36, 381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 C225.99 106, 96.6 106, 26.5 106 C8.83 106, 0 97.17, 0 79.5 C0 64.56, 0 49.63, 0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M26.5 0 C95.43 0, 164.35 0, 355.38 0 M26.5 0 C131.84 0, 237.17 0, 355.38 0 M355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 M355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 M381.88 26.5 C381.88 44.88, 381.88 63.27, 381.88 79.5 M381.88 26.5 C381.88 38.88, 381.88 51.26, 381.88 79.5 M381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 M381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 M355.38 106 C260.74 106, 166.11 106, 26.5 106 M355.38 106 C251.82 106, 148.27 106, 26.5 106 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M0 79.5 C0 66.3, 0 53.09, 0 26.5 M0 79.5 C0 61.93, 0 44.36, 0 26.5 M0 26.5 C0 8.83, 8.83 0, 26.5 0 M0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1008.6845634478668 1831.287878132064) rotate(0 162.79977416992188 40)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">AuthRequestLoginStrategyData {</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  tokenRequest: PasswordTokenRequest,</text><text x="0" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  // ... other properties</text><text x="0" y="74" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">}</text></g><g stroke-linecap="round" transform="translate(984.2508616753184 2022.4704371908435) rotate(0 189.37158203125 26.024088541666742)"><path d="M13.01 0 C114.06 0, 215.12 0, 365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 C378.74 20.46, 378.74 27.91, 378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 C245.67 52.05, 125.62 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 28.97, 0 18.9, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C152.13 0, 291.24 0, 365.73 0 M13.01 0 C120.96 0, 228.91 0, 365.73 0 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M378.74 13.01 C378.74 21.21, 378.74 29.41, 378.74 39.04 M378.74 13.01 C378.74 19.02, 378.74 25.03, 378.74 39.04 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M365.73 52.05 C247.36 52.05, 128.99 52.05, 13.01 52.05 M365.73 52.05 C236 52.05, 106.27 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 29.35, 0 19.66, 0 13.01 M0 39.04 C0 31.48, 0 23.91, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1129.6225047417247 2038.4945257325105) rotate(0 43.99993896484375 10)"><text x="43.99993896484375" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logIn(...)</text></g><g stroke-linecap="round" transform="translate(987.5661518538909 2094.7021673340732) rotate(0 186.06103515625 26.024088541666742)"><path d="M13.01 0 C112.74 0, 212.47 0, 359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 C372.12 18.93, 372.12 24.85, 372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 C238.09 52.05, 117.07 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 33.75, 0 28.47, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C93.67 0, 174.33 0, 359.11 0 M13.01 0 C94.68 0, 176.35 0, 359.11 0 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M372.12 13.01 C372.12 21.82, 372.12 30.64, 372.12 39.04 M372.12 13.01 C372.12 21.28, 372.12 29.54, 372.12 39.04 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M359.11 52.05 C229.25 52.05, 99.39 52.05, 13.01 52.05 M359.11 52.05 C235.41 52.05, 111.7 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 29.04, 0 19.05, 0 13.01 M0 39.04 C0 30.94, 0 22.85, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1090.0273029769378 2110.72625587574) rotate(0 83.59988403320312 10)"><text x="83.59988403320312" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logInTwoFactor(...)</text></g><g stroke-linecap="round" transform="translate(1405.2298268290942 1742.9408380464981) rotate(0 214.316034226189 244.25050120625156)"><path d="M32 0 C105.78 0, 179.56 0, 396.63 0 C417.97 0, 428.63 10.67, 428.63 32 C428.63 182.77, 428.63 333.54, 428.63 456.5 C428.63 477.83, 417.97 488.5, 396.63 488.5 C319.84 488.5, 243.05 488.5, 32 488.5 C10.67 488.5, 0 477.83, 0 456.5 C0 312.06, 0 167.61, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C153.4 0, 274.8 0, 396.63 0 M32 0 C175.33 0, 318.66 0, 396.63 0 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M428.63 32 C428.63 154.39, 428.63 276.78, 428.63 456.5 M428.63 32 C428.63 125.46, 428.63 218.92, 428.63 456.5 M428.63 456.5 C428.63 477.83, 417.97 488.5, 396.63 488.5 M428.63 456.5 C428.63 477.83, 417.97 488.5, 396.63 488.5 M396.63 488.5 C283.44 488.5, 170.25 488.5, 32 488.5 M396.63 488.5 C286.78 488.5, 176.94 488.5, 32 488.5 M32 488.5 C10.67 488.5, 0 477.83, 0 456.5 M32 488.5 C10.67 488.5, 0 477.83, 0 456.5 M0 456.5 C0 293.47, 0 130.44, 0 32 M0 456.5 C0 322.47, 0 188.44, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1531.545861055285 1771.9468369304261) rotate(0 88 12.5)"><text x="88" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SsoLoginStrategy</text></g><g stroke-linecap="round" transform="translate(1428.606896211535 1817.957986018968) rotate(0 190.93896484375 53.00065104166674)"><path d="M26.5 0 C109.88 0, 193.25 0, 355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 C381.88 42.11, 381.88 57.72, 381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 C239.11 106, 122.84 106, 26.5 106 C8.83 106, 0 97.17, 0 79.5 C0 68.79, 0 58.08, 0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M26.5 0 C135.69 0, 244.88 0, 355.38 0 M26.5 0 C106.13 0, 185.77 0, 355.38 0 M355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 M355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 M381.88 26.5 C381.88 39.56, 381.88 52.62, 381.88 79.5 M381.88 26.5 C381.88 38.03, 381.88 49.56, 381.88 79.5 M381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 M381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 M355.38 106 C270.82 106, 186.27 106, 26.5 106 M355.38 106 C250.79 106, 146.2 106, 26.5 106 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M0 79.5 C0 66.63, 0 53.76, 0 26.5 M0 79.5 C0 62.4, 0 45.3, 0 26.5 M0 26.5 C0 8.83, 8.83 0, 26.5 0 M0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1456.7460868853632 1831.287878132064) rotate(0 140.7998046875 40)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SsoLoginStrategyData {</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  tokenRequest: SsoTokenRequest,</text><text x="0" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  // ... other properties</text><text x="0" y="74" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">}</text></g><g stroke-linecap="round" transform="translate(1432.3123851128148 2022.4704371908435) rotate(0 189.37158203125 26.024088541666742)"><path d="M13.01 0 C151.16 0, 289.3 0, 365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 C378.74 18.36, 378.74 23.71, 378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 C263.92 52.05, 162.1 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 33.48, 0 27.92, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C143.68 0, 274.36 0, 365.73 0 M13.01 0 C122.03 0, 231.05 0, 365.73 0 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M378.74 13.01 C378.74 23.16, 378.74 33.3, 378.74 39.04 M378.74 13.01 C378.74 20.41, 378.74 27.8, 378.74 39.04 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M365.73 52.05 C237.95 52.05, 110.17 52.05, 13.01 52.05 M365.73 52.05 C227.95 52.05, 90.18 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 32.9, 0 26.77, 0 13.01 M0 39.04 C0 30.39, 0 21.75, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1577.684028179221 2038.4945257325105) rotate(0 43.99993896484375 10)"><text x="43.99993896484375" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logIn(...)</text></g><g stroke-linecap="round" transform="translate(1435.6276752913873 2094.7021673340732) rotate(0 186.06103515625 26.024088541666742)"><path d="M13.01 0 C91.09 0, 169.16 0, 359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 C372.12 20.58, 372.12 28.16, 372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 C233.17 52.05, 107.22 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 30.88, 0 22.73, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C82.55 0, 152.09 0, 359.11 0 M13.01 0 C147.1 0, 281.19 0, 359.11 0 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M372.12 13.01 C372.12 18.48, 372.12 23.95, 372.12 39.04 M372.12 13.01 C372.12 19.5, 372.12 26, 372.12 39.04 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M359.11 52.05 C252.98 52.05, 146.85 52.05, 13.01 52.05 M359.11 52.05 C243.37 52.05, 127.63 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 31.69, 0 24.34, 0 13.01 M0 39.04 C0 31.35, 0 23.66, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1538.0888264144342 2110.72625587574) rotate(0 83.59988403320312 10)"><text x="83.59988403320312" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logInTwoFactor(...)</text></g><g stroke-linecap="round" transform="translate(1853.2913502665942 1742.9408380464981) rotate(0 214.316034226189 244.50117387802743)"><path d="M32 0 C126.57 0, 221.15 0, 396.63 0 C417.97 0, 428.63 10.67, 428.63 32 C428.63 137.74, 428.63 243.48, 428.63 457 C428.63 478.34, 417.97 489, 396.63 489 C304.24 489, 211.84 489, 32 489 C10.67 489, 0 478.34, 0 457 C0 303.15, 0 149.29, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C115.68 0, 199.35 0, 396.63 0 M32 0 C156.8 0, 281.59 0, 396.63 0 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M428.63 32 C428.63 133.73, 428.63 235.47, 428.63 457 M428.63 32 C428.63 157.95, 428.63 283.9, 428.63 457 M428.63 457 C428.63 478.34, 417.97 489, 396.63 489 M428.63 457 C428.63 478.34, 417.97 489, 396.63 489 M396.63 489 C295.21 489, 193.79 489, 32 489 M396.63 489 C303.91 489, 211.19 489, 32 489 M32 489 C10.67 489, 0 478.34, 0 457 M32 489 C10.67 489, 0 478.34, 0 457 M0 457 C0 350.16, 0 243.33, 0 32 M0 457 C0 297.19, 0 137.38, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1952.107384492785 1771.9468369304261) rotate(0 115.5 12.5)"><text x="115.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">WebAuthnLoginStrategy</text></g><g stroke-linecap="round" transform="translate(1870.668419649035 1817.957986018968) rotate(0 195.71194001131335 53.00065104166674)"><path d="M26.5 0 C122.66 0, 218.81 0, 364.92 0 C382.59 0, 391.42 8.83, 391.42 26.5 C391.42 38.18, 391.42 49.86, 391.42 79.5 C391.42 97.17, 382.59 106, 364.92 106 C267.71 106, 170.5 106, 26.5 106 C8.83 106, 0 97.17, 0 79.5 C0 68.76, 0 58.03, 0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M26.5 0 C137.89 0, 249.27 0, 364.92 0 M26.5 0 C125.42 0, 224.33 0, 364.92 0 M364.92 0 C382.59 0, 391.42 8.83, 391.42 26.5 M364.92 0 C382.59 0, 391.42 8.83, 391.42 26.5 M391.42 26.5 C391.42 47.06, 391.42 67.61, 391.42 79.5 M391.42 26.5 C391.42 39.26, 391.42 52.02, 391.42 79.5 M391.42 79.5 C391.42 97.17, 382.59 106, 364.92 106 M391.42 79.5 C391.42 97.17, 382.59 106, 364.92 106 M364.92 106 C266.42 106, 167.92 106, 26.5 106 M364.92 106 C295.6 106, 226.27 106, 26.5 106 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M0 79.5 C0 59.94, 0 40.38, 0 26.5 M0 79.5 C0 67.51, 0 55.51, 0 26.5 M0 26.5 C0 8.83, 8.83 0, 26.5 0 M0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1904.8076103228632 1831.287878132064) rotate(0 162.79977416992188 40)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">WebAuthnLoginStrategyData {</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  tokenRequest: WebAuthnTokenRequest,</text><text x="0" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  // ... other properties</text><text x="0" y="74" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">}</text></g><g stroke-linecap="round" transform="translate(1880.3739085503148 2022.4704371908435) rotate(0 189.37158203125 26.024088541666742)"><path d="M13.01 0 C86.95 0, 160.89 0, 365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 C378.74 18.27, 378.74 23.53, 378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 C240.14 52.05, 114.55 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 33.07, 0 27.09, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C134.44 0, 255.87 0, 365.73 0 M13.01 0 C119.04 0, 225.06 0, 365.73 0 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M378.74 13.01 C378.74 20.7, 378.74 28.38, 378.74 39.04 M378.74 13.01 C378.74 20.07, 378.74 27.13, 378.74 39.04 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M365.73 52.05 C227.54 52.05, 89.36 52.05, 13.01 52.05 M365.73 52.05 C287.49 52.05, 209.25 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 33.48, 0 27.93, 0 13.01 M0 39.04 C0 32.51, 0 25.99, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2025.745551616721 2038.4945257325105) rotate(0 43.99993896484375 10)"><text x="43.99993896484375" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logIn(...)</text></g><g stroke-linecap="round" transform="translate(1883.6891987288873 2094.7021673340732) rotate(0 186.06103515625 26.024088541666742)"><path d="M13.01 0 C143.24 0, 273.46 0, 359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 C372.12 18.32, 372.12 23.63, 372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 C242.77 52.05, 126.43 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 32.74, 0 26.43, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C141.6 0, 270.19 0, 359.11 0 M13.01 0 C129.63 0, 246.24 0, 359.11 0 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M359.11 0 C367.78 0, 372.12 4.34, 372.12 13.01 M372.12 13.01 C372.12 23.28, 372.12 33.55, 372.12 39.04 M372.12 13.01 C372.12 19.43, 372.12 25.86, 372.12 39.04 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M372.12 39.04 C372.12 47.71, 367.78 52.05, 359.11 52.05 M359.11 52.05 C255.69 52.05, 152.27 52.05, 13.01 52.05 M359.11 52.05 C254.2 52.05, 149.28 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 30.22, 0 21.4, 0 13.01 M0 39.04 C0 32.9, 0 26.76, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1986.1503498519342 2110.72625587574) rotate(0 83.59988403320312 10)"><text x="83.59988403320312" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logInTwoFactor(...)</text></g><g stroke-linecap="round" transform="translate(2301.3528737040942 1742.9408380464981) rotate(0 214.316034226189 243.34422743776327)"><path d="M32 0 C147.19 0, 262.38 0, 396.63 0 C417.97 0, 428.63 10.67, 428.63 32 C428.63 185.96, 428.63 339.92, 428.63 454.69 C428.63 476.02, 417.97 486.69, 396.63 486.69 C256.93 486.69, 117.23 486.69, 32 486.69 C10.67 486.69, 0 476.02, 0 454.69 C0 316.4, 0 178.11, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C172.61 0, 313.21 0, 396.63 0 M32 0 C153.96 0, 275.92 0, 396.63 0 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M396.63 0 C417.97 0, 428.63 10.67, 428.63 32 M428.63 32 C428.63 139.47, 428.63 246.94, 428.63 454.69 M428.63 32 C428.63 185.01, 428.63 338.02, 428.63 454.69 M428.63 454.69 C428.63 476.02, 417.97 486.69, 396.63 486.69 M428.63 454.69 C428.63 476.02, 417.97 486.69, 396.63 486.69 M396.63 486.69 C307.4 486.69, 218.16 486.69, 32 486.69 M396.63 486.69 C277.18 486.69, 157.73 486.69, 32 486.69 M32 486.69 C10.67 486.69, 0 476.02, 0 454.69 M32 486.69 C10.67 486.69, 0 476.02, 0 454.69 M0 454.69 C0 327.81, 0 200.93, 0 32 M0 454.69 C0 341.45, 0 228.2, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2405.668907930285 1771.9468369304261) rotate(0 110 12.5)"><text x="110" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">UserApiLoginStrategy</text></g><g stroke-linecap="round" transform="translate(2324.729943086535 1817.957986018968) rotate(0 190.93896484375 53.00065104166674)"><path d="M26.5 0 C156.68 0, 286.87 0, 355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 C381.88 41.9, 381.88 57.3, 381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 C287.07 106, 218.76 106, 26.5 106 C8.83 106, 0 97.17, 0 79.5 C0 64.46, 0 49.41, 0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M26.5 0 C155.84 0, 285.17 0, 355.38 0 M26.5 0 C130.14 0, 233.77 0, 355.38 0 M355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 M355.38 0 C373.04 0, 381.88 8.83, 381.88 26.5 M381.88 26.5 C381.88 43.58, 381.88 60.67, 381.88 79.5 M381.88 26.5 C381.88 44.53, 381.88 62.56, 381.88 79.5 M381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 M381.88 79.5 C381.88 97.17, 373.04 106, 355.38 106 M355.38 106 C224.88 106, 94.38 106, 26.5 106 M355.38 106 C232.35 106, 109.33 106, 26.5 106 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M26.5 106 C8.83 106, 0 97.17, 0 79.5 M0 79.5 C0 62.73, 0 45.95, 0 26.5 M0 79.5 C0 64.1, 0 48.71, 0 26.5 M0 26.5 C0 8.83, 8.83 0, 26.5 0 M0 26.5 C0 8.83, 8.83 0, 26.5 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2352.869133760363 1831.287878132064) rotate(0 158.3997802734375 40)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">UserApiLoginStrategyData {</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  tokenRequest: UserApiTokenRequest,</text><text x="0" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  // ... other properties</text><text x="0" y="74" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">}</text></g><g stroke-linecap="round" transform="translate(2328.435431987815 2022.4704371908435) rotate(0 189.37158203125 26.024088541666742)"><path d="M13.01 0 C153.83 0, 294.65 0, 365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 C378.74 21.74, 378.74 30.46, 378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 C228.76 52.05, 91.79 52.05, 13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 C0 30.66, 0 22.28, 0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.01 0 C124.98 0, 236.95 0, 365.73 0 M13.01 0 C130.75 0, 248.48 0, 365.73 0 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M365.73 0 C374.41 0, 378.74 4.34, 378.74 13.01 M378.74 13.01 C378.74 20.3, 378.74 27.59, 378.74 39.04 M378.74 13.01 C378.74 21.94, 378.74 30.86, 378.74 39.04 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M378.74 39.04 C378.74 47.71, 374.41 52.05, 365.73 52.05 M365.73 52.05 C290.19 52.05, 214.64 52.05, 13.01 52.05 M365.73 52.05 C227.53 52.05, 89.32 52.05, 13.01 52.05 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M13.01 52.05 C4.34 52.05, 0 47.71, 0 39.04 M0 39.04 C0 29.9, 0 20.77, 0 13.01 M0 39.04 C0 33.41, 0 27.78, 0 13.01 M0 13.01 C0 4.34, 4.34 0, 13.01 0 M0 13.01 C0 4.34, 4.34 0, 13.01 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2473.807075054221 2038.4945257325105) rotate(0 43.99993896484375 10)"><text x="43.99993896484375" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logIn(...)</text></g><g stroke-linecap="round" transform="translate(2329.640878709619 2094.380557522476) rotate(0 188.36040692354072 26.34569835326397)"><path d="M13.17 0 C109.17 0, 205.17 0, 363.55 0 C372.33 0, 376.72 4.39, 376.72 13.17 C376.72 19.42, 376.72 25.67, 376.72 39.52 C376.72 48.3, 372.33 52.69, 363.55 52.69 C271.76 52.69, 179.97 52.69, 13.17 52.69 C4.39 52.69, 0 48.3, 0 39.52 C0 32.5, 0 25.48, 0 13.17 C0 4.39, 4.39 0, 13.17 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M13.17 0 C100.7 0, 188.22 0, 363.55 0 M13.17 0 C90.24 0, 167.3 0, 363.55 0 M363.55 0 C372.33 0, 376.72 4.39, 376.72 13.17 M363.55 0 C372.33 0, 376.72 4.39, 376.72 13.17 M376.72 13.17 C376.72 18.66, 376.72 24.15, 376.72 39.52 M376.72 13.17 C376.72 23.33, 376.72 33.49, 376.72 39.52 M376.72 39.52 C376.72 48.3, 372.33 52.69, 363.55 52.69 M376.72 39.52 C376.72 48.3, 372.33 52.69, 363.55 52.69 M363.55 52.69 C287.65 52.69, 211.75 52.69, 13.17 52.69 M363.55 52.69 C247.16 52.69, 130.77 52.69, 13.17 52.69 M13.17 52.69 C4.39 52.69, 0 48.3, 0 39.52 M13.17 52.69 C4.39 52.69, 0 48.3, 0 39.52 M0 39.52 C0 33.92, 0 28.32, 0 13.17 M0 39.52 C0 32.08, 0 24.64, 0 13.17 M0 13.17 C0 4.39, 4.39 0, 13.17 0 M0 13.17 C0 4.39, 4.39 0, 13.17 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2433.3682609806274 2110.602674290517) rotate(0 84.633024652534 10.123581585223292)"><text x="84.6330246525343" y="14.173014219312694" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16.197730536357366px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">logInTwoFactor(...)</text></g><g stroke-linecap="round" transform="translate(3801.1330108939655 3704.3928505176127) rotate(0 335.9417041984616 153.04904771379506)"><path d="M32 0 C268.08 0, 504.17 0, 639.88 0 C661.22 0, 671.88 10.67, 671.88 32 C671.88 81.06, 671.88 130.13, 671.88 274.1 C671.88 295.43, 661.22 306.1, 639.88 306.1 C417.29 306.1, 194.7 306.1, 32 306.1 C10.67 306.1, 0 295.43, 0 274.1 C0 179.25, 0 84.41, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C237.97 0, 443.93 0, 639.88 0 M32 0 C221.5 0, 411.01 0, 639.88 0 M639.88 0 C661.22 0, 671.88 10.67, 671.88 32 M639.88 0 C661.22 0, 671.88 10.67, 671.88 32 M671.88 32 C671.88 119.85, 671.88 207.71, 671.88 274.1 M671.88 32 C671.88 113.2, 671.88 194.4, 671.88 274.1 M671.88 274.1 C671.88 295.43, 661.22 306.1, 639.88 306.1 M671.88 274.1 C671.88 295.43, 661.22 306.1, 639.88 306.1 M639.88 306.1 C427.42 306.1, 214.96 306.1, 32 306.1 M639.88 306.1 C397.82 306.1, 155.76 306.1, 32 306.1 M32 306.1 C10.67 306.1, 0 295.43, 0 274.1 M32 306.1 C10.67 306.1, 0 295.43, 0 274.1 M0 274.1 C0 219.89, 0 165.69, 0 32 M0 274.1 C0 215.45, 0 156.81, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(3910.68342801544 3736.528988961367) rotate(0 230.99990844726562 122.5)"><text x="230.99990844726562" y="24.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">TwoFactorAuthComponent</text><text x="230.99990844726562" y="59.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">(/2fa)</text><text x="230.99990844726562" y="94.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="230.99990844726562" y="129.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">OR</text><text x="230.99990844726562" y="164.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="230.99990844726562" y="199.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">NewDeviceVerificationComponent</text><text x="230.99990844726562" y="234.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">(/device-verification)</text></g><g transform="translate(3571.123848118139 3825.3266450508245) rotate(0 60.5 12.5)"><text x="60.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Route to...</text></g><g transform="translate(1631.5590627311976 4969.855141585212) rotate(0 60.5 12.5)"><text x="60.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Route to...</text></g><g transform="translate(2109.1222662820255 4607.583375542631) rotate(0 60.5 12.5)"><text x="60.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Route to...</text></g><g stroke-linecap="round" transform="translate(1318.8858843040289 5047.138443671578) rotate(0 278.5054927602632 74.4494586014398)"><path d="M32 0 C197.35 0, 362.7 0, 525.01 0 C546.34 0, 557.01 10.67, 557.01 32 C557.01 58.44, 557.01 84.87, 557.01 116.9 C557.01 138.23, 546.34 148.9, 525.01 148.9 C399.09 148.9, 273.17 148.9, 32 148.9 C10.67 148.9, 0 138.23, 0 116.9 C0 93.11, 0 69.32, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C142.96 0, 253.91 0, 525.01 0 M32 0 C226.46 0, 420.91 0, 525.01 0 M525.01 0 C546.34 0, 557.01 10.67, 557.01 32 M525.01 0 C546.34 0, 557.01 10.67, 557.01 32 M557.01 32 C557.01 54.08, 557.01 76.16, 557.01 116.9 M557.01 32 C557.01 52.86, 557.01 73.72, 557.01 116.9 M557.01 116.9 C557.01 138.23, 546.34 148.9, 525.01 148.9 M557.01 116.9 C557.01 138.23, 546.34 148.9, 525.01 148.9 M525.01 148.9 C374.84 148.9, 224.67 148.9, 32 148.9 M525.01 148.9 C380.94 148.9, 236.87 148.9, 32 148.9 M32 148.9 C10.67 148.9, 0 138.23, 0 116.9 M32 148.9 C10.67 148.9, 0 138.23, 0 116.9 M0 116.9 C0 91.12, 0 65.35, 0 32 M0 116.9 C0 92.22, 0 67.55, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g stroke-linecap="round" transform="translate(2297.7664635185356 4507.978098642837) rotate(0 322.7395211919338 161.5109030655167)"><path d="M32 0 C179.02 0, 326.03 0, 613.48 0 C634.81 0, 645.48 10.67, 645.48 32 C645.48 108.86, 645.48 185.71, 645.48 291.02 C645.48 312.36, 634.81 323.02, 613.48 323.02 C413.39 323.02, 213.29 323.02, 32 323.02 C10.67 323.02, 0 312.36, 0 291.02 C0 201.17, 0 111.32, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C208.42 0, 384.83 0, 613.48 0 M32 0 C259.37 0, 486.73 0, 613.48 0 M613.48 0 C634.81 0, 645.48 10.67, 645.48 32 M613.48 0 C634.81 0, 645.48 10.67, 645.48 32 M645.48 32 C645.48 117.55, 645.48 203.1, 645.48 291.02 M645.48 32 C645.48 127.14, 645.48 222.28, 645.48 291.02 M645.48 291.02 C645.48 312.36, 634.81 323.02, 613.48 323.02 M645.48 291.02 C645.48 312.36, 634.81 323.02, 613.48 323.02 M613.48 323.02 C464.62 323.02, 315.76 323.02, 32 323.02 M613.48 323.02 C428.06 323.02, 242.64 323.02, 32 323.02 M32 323.02 C10.67 323.02, 0 312.36, 0 291.02 M32 323.02 C10.67 323.02, 0 312.36, 0 291.02 M0 291.02 C0 201.48, 0 111.93, 0 32 M0 291.02 C0 218.04, 0 145.06, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1489.5914197888997 5086.587902273018) rotate(0 107.79995727539062 35)"><text x="107.79995727539062" y="24.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">VaultComponent</text><text x="107.79995727539062" y="59.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">/vault</text></g><g transform="translate(2413.02106144933 4549.550924805062) rotate(0 207.89991760253906 122.5)"><text x="207.89991760253906" y="24.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SetInitialPasswordComponent</text><text x="207.89991760253906" y="59.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">(/set-initial-password)</text><text x="207.89991760253906" y="94.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="207.89991760253906" y="129.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">OR</text><text x="207.89991760253906" y="164.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="207.89991760253906" y="199.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">ChangePasswordComponent</text><text x="207.89991760253906" y="234.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">(/change-password)</text></g><g stroke-linecap="round"><g transform="translate(1603.3161262000613 3487.688895678738) rotate(0 1.0495161398412165 95.60939588377823)"><path d="M0 0 C0.82 75.1, 1.65 150.21, 2.1 191.22 M0 0 C0.65 58.85, 1.29 117.7, 2.1 191.22" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1603.3161262000613 3487.688895678738) rotate(0 1.0495161398412165 95.60939588377823)"><path d="M2.1 191.22 L-4.39 177.69 L8.29 177.56 L2.1 191.22" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M2.1 191.22 C-0.45 185.91, -3 180.6, -4.39 177.69 M2.1 191.22 C0.1 187.06, -1.89 182.89, -4.39 177.69 M-4.39 177.69 C0.31 177.64, 5.01 177.59, 8.29 177.56 M-4.39 177.69 C-1.78 177.67, 0.83 177.64, 8.29 177.56 M8.29 177.56 C6.02 182.56, 3.75 187.57, 2.1 191.22 M8.29 177.56 C5.82 183.01, 3.34 188.47, 2.1 191.22 M2.1 191.22 C2.1 191.22, 2.1 191.22, 2.1 191.22 M2.1 191.22 C2.1 191.22, 2.1 191.22, 2.1 191.22" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(1424.1725041604368 3691.5987621536415) rotate(0 181.28059895833212 181.28059895833258)"><path d="M227.5 45.5 C261.75 80.3, 295.99 115.09, 317.06 136.5 C362.56 182, 362.56 182, 317.06 227.5 C293.19 251.37, 269.32 275.24, 227.5 317.06 C182 362.56, 182 362.56, 136.5 317.06 C104.54 285.6, 72.57 254.15, 45.5 227.5 C0 182, 0 182, 45.5 136.5 C64.31 117.69, 83.12 98.88, 136.5 45.5 C182 0, 182 0, 227.5 45.5" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M227.5 45.5 C262.76 81.33, 298.03 117.16, 317.06 136.5 M227.5 45.5 C257.48 75.97, 287.47 106.43, 317.06 136.5 M317.06 136.5 C362.56 182, 362.56 182, 317.06 227.5 M317.06 136.5 C362.56 182, 362.56 182, 317.06 227.5 M317.06 227.5 C281.8 262.76, 246.55 298.01, 227.5 317.06 M317.06 227.5 C288.64 255.93, 260.21 284.35, 227.5 317.06 M227.5 317.06 C182 362.56, 182 362.56, 136.5 317.06 M227.5 317.06 C182 362.56, 182 362.56, 136.5 317.06 M136.5 317.06 C116.7 297.58, 96.91 278.09, 45.5 227.5 M136.5 317.06 C108.23 289.23, 79.95 261.41, 45.5 227.5 M45.5 227.5 C0 182, 0 182, 45.5 136.5 M45.5 227.5 C0 182, 0 182, 45.5 136.5 M45.5 136.5 C78.31 103.69, 111.12 70.88, 136.5 45.5 M45.5 136.5 C69.91 112.09, 94.31 87.69, 136.5 45.5 M136.5 45.5 C182 0, 182 0, 227.5 45.5 M136.5 45.5 C182 0, 182 0, 227.5 45.5" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1511.2844833271047 3848.2602204869754) rotate(0 104.5 25)"><text x="104.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Does AuthResult</text><text x="104.5" y="42.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">require 2FA or NDV?</text></g><g stroke-linecap="round"><g transform="translate(1606.2739552433595 4063.045581871771) rotate(0 0.02976623190988903 66.76205252187219)"><path d="M0 0 C0.02 40.77, 0.04 81.55, 0.06 133.52 M0 0 C0.02 37, 0.03 74.01, 0.06 133.52" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1606.2739552433595 4063.045581871771) rotate(0 0.02976623190988903 66.76205252187219)"><path d="M0.06 133.52 L-6.29 119.93 L6.39 119.93 L0.06 133.52" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.06 133.52 C-1.88 129.37, -3.82 125.22, -6.29 119.93 M0.06 133.52 C-1.7 129.76, -3.46 125.99, -6.29 119.93 M-6.29 119.93 C-2.27 119.93, 1.75 119.93, 6.39 119.93 M-6.29 119.93 C-1.35 119.93, 3.58 119.93, 6.39 119.93 M6.39 119.93 C4.02 125.01, 1.66 130.1, 0.06 133.52 M6.39 119.93 C4.46 124.07, 2.53 128.21, 0.06 133.52 M0.06 133.52 C0.06 133.52, 0.06 133.52, 0.06 133.52 M0.06 133.52 C0.06 133.52, 0.06 133.52, 0.06 133.52" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1603.8003944884222 4423.561687851088) rotate(0 -0.04266361355803383 39.28338517619977)"><path d="M0 0 C-0.03 23.5, -0.05 46.99, -0.09 78.57 M0 0 C-0.02 18.42, -0.04 36.84, -0.09 78.57" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1603.8003944884222 4423.561687851088) rotate(0 -0.04266361355803383 39.28338517619977)"><path d="M-0.09 78.57 L-6.41 64.97 L6.27 64.98 L-0.09 78.57" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-0.09 78.57 C-1.98 74.5, -3.87 70.43, -6.41 64.97 M-0.09 78.57 C-1.57 75.38, -3.05 72.19, -6.41 64.97 M-6.41 64.97 C-1.49 64.97, 3.42 64.98, 6.27 64.98 M-6.41 64.97 C-2.77 64.97, 0.86 64.97, 6.27 64.98 M6.27 64.98 C4.95 67.81, 3.62 70.63, -0.09 78.57 M6.27 64.98 C4.23 69.33, 2.2 73.69, -0.09 78.57 M-0.09 78.57 C-0.09 78.57, -0.09 78.57, -0.09 78.57 M-0.09 78.57 C-0.09 78.57, -0.09 78.57, -0.09 78.57" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1797.8678249686927 4673.676424354933) rotate(0 234.51117860956765 0.44442555155501395)"><path d="M0 0 C154.45 0.29, 308.89 0.59, 469.02 0.89 M0 0 C118.47 0.22, 236.95 0.45, 469.02 0.89" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1797.8678249686927 4673.676424354933) rotate(0 234.51117860956765 0.44442555155501395)"><path d="M469.02 0.89 L455.42 7.2 L455.44 -5.48 L469.02 0.89" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M469.02 0.89 C464.54 2.97, 460.06 5.05, 455.42 7.2 M469.02 0.89 C465.59 2.48, 462.15 4.08, 455.42 7.2 M455.42 7.2 C455.42 4.04, 455.43 0.88, 455.44 -5.48 M455.42 7.2 C455.42 3.04, 455.43 -1.11, 455.44 -5.48 M455.44 -5.48 C459.33 -3.65, 463.22 -1.83, 469.02 0.89 M455.44 -5.48 C458.56 -4.01, 461.68 -2.55, 469.02 0.89 M469.02 0.89 C469.02 0.89, 469.02 0.89, 469.02 0.89 M469.02 0.89 C469.02 0.89, 469.02 0.89, 469.02 0.89" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g transform="translate(1654.5592229104368 4142.862434028642) rotate(0 11 12.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">NO</text></g><g transform="translate(1908.3092229104332 3825.4275381953094) rotate(0 16.5 12.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">YES</text></g><g transform="translate(1908.6607854104332 4610.007616320309) rotate(0 16.5 12.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">YES</text></g><g stroke-linecap="round"><g transform="translate(1787.195559958498 3882.710697244168) rotate(0 996.5046323594943 -1.1930116143671512)"><path d="M0 0 C713.89 -0.85, 1427.77 -1.71, 1993.01 -2.39 M0 0 C581.15 -0.7, 1162.3 -1.39, 1993.01 -2.39" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1787.195559958498 3882.710697244168) rotate(0 996.5046323594943 -1.1930116143671512)"><path d="M1993.01 -2.39 L1979.42 3.97 L1979.41 -8.71 L1993.01 -2.39" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M1993.01 -2.39 C1988.14 -0.11, 1983.28 2.17, 1979.42 3.97 M1993.01 -2.39 C1989.05 -0.53, 1985.09 1.32, 1979.42 3.97 M1979.42 3.97 C1979.42 -0.51, 1979.41 -4.98, 1979.41 -8.71 M1979.42 3.97 C1979.42 -1.03, 1979.41 -6.03, 1979.41 -8.71 M1979.41 -8.71 C1982.59 -7.23, 1985.77 -5.75, 1993.01 -2.39 M1979.41 -8.71 C1982.41 -7.31, 1985.41 -5.92, 1993.01 -2.39 M1993.01 -2.39 C1993.01 -2.39, 1993.01 -2.39, 1993.01 -2.39 M1993.01 -2.39 C1993.01 -2.39, 1993.01 -2.39, 1993.01 -2.39" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(2738.1352753696374 3710.8149356433523) rotate(0 382.048274236422 149.7890228808351)"><path d="M32 0 C292.39 0, 552.77 0, 732.1 0 C753.43 0, 764.1 10.67, 764.1 32 C764.1 100.98, 764.1 169.95, 764.1 267.58 C764.1 288.91, 753.43 299.58, 732.1 299.58 C467.28 299.58, 202.46 299.58, 32 299.58 C10.67 299.58, 0 288.91, 0 267.58 C0 199.5, 0 131.42, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M32 0 C186.24 0, 340.48 0, 732.1 0 M32 0 C206.4 0, 380.79 0, 732.1 0 M732.1 0 C753.43 0, 764.1 10.67, 764.1 32 M732.1 0 C753.43 0, 764.1 10.67, 764.1 32 M764.1 32 C764.1 91.95, 764.1 151.9, 764.1 267.58 M764.1 32 C764.1 100.38, 764.1 168.76, 764.1 267.58 M764.1 267.58 C764.1 288.91, 753.43 299.58, 732.1 299.58 M764.1 267.58 C764.1 288.91, 753.43 299.58, 732.1 299.58 M732.1 299.58 C503.82 299.58, 275.55 299.58, 32 299.58 M732.1 299.58 C456.73 299.58, 181.36 299.58, 32 299.58 M32 299.58 C10.67 299.58, 0 288.91, 0 267.58 M32 299.58 C10.67 299.58, 0 288.91, 0 267.58 M0 267.58 C0 179.33, 0 91.08, 0 32 M0 267.58 C0 210.91, 0 154.25, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2792.47893870798 3760.919419192406) rotate(0 327.7046108980794 100)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">The LoginStrategyService collects the LoginStrategyData by</text><text x="0" y="42.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">calling exportCache() on the specific strategy.</text><text x="0" y="67.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="0" y="92.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">The LoginStrategyService saves that exported</text><text x="0" y="117.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginStrategyData to its own state cache.</text><text x="0" y="142.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="0" y="167.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">This way, the LoginStrategyData can be re-submitted when</text><text x="0" y="192.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">the user attempts 2FA or NDV.</text></g><g stroke-linecap="round"><g transform="translate(4136.996553612586 3698.4097160265483) rotate(0 -927.9594305441133 -1180.1501527722744)"><path d="M0 0 C0 -757.24, 0 -1514.49, 0 -2344.3 M0 0 C0 -775, 0 -1550, 0 -2344.3 M0 -2344.3 C0 -2354.97, -5.33 -2360.3, -16 -2360.3 M0 -2344.3 C0 -2354.97, -5.33 -2360.3, -16 -2360.3 M-16 -2360.3 C-623.5 -2360.3, -1230.99 -2360.3, -1855.92 -2360.3 M-16 -2360.3 C-545.58 -2360.3, -1075.16 -2360.3, -1855.92 -2360.3" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(4136.996553612586 3698.4097160265483) rotate(0 -927.9594305441133 -1180.1501527722744)"><path d="M-1855.92 -2360.3 L-1842.32 -2366.64 L-1842.32 -2353.96 L-1855.92 -2360.3" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-1855.92 -2360.3 C-1851.53 -2362.35, -1847.14 -2364.4, -1842.32 -2366.64 M-1855.92 -2360.3 C-1851.42 -2362.4, -1846.93 -2364.49, -1842.32 -2366.64 M-1842.32 -2366.64 C-1842.32 -2362.86, -1842.32 -2359.08, -1842.32 -2353.96 M-1842.32 -2366.64 C-1842.32 -2363.67, -1842.32 -2360.7, -1842.32 -2353.96 M-1842.32 -2353.96 C-1846.85 -2356.07, -1851.37 -2358.18, -1855.92 -2360.3 M-1842.32 -2353.96 C-1846.21 -2355.77, -1850.1 -2357.58, -1855.92 -2360.3 M-1855.92 -2360.3 C-1855.92 -2360.3, -1855.92 -2360.3, -1855.92 -2360.3 M-1855.92 -2360.3 C-1855.92 -2360.3, -1855.92 -2360.3, -1855.92 -2360.3" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(3120.2020403623937 3510.4916361580026) rotate(0 -422.46057146355815 -1248.5939768913354)"><path d="M0 0 C0 -617.68, 0 -1235.36, 0 -2481.19 M0 -2481.19 C0 -2491.85, -5.33 -2497.19, -16 -2497.19 M-16 -2497.19 C-331.21 -2497.19, -646.42 -2497.19, -844.92 -2497.19" stroke="#1e1e1e" stroke-width="2.5" fill="none" stroke-dasharray="8 10"></path></g><g transform="translate(3120.2020403623937 3510.4916361580026) rotate(0 -422.46057146355815 -1248.5939768913354)"><path d="M-844.92 -2497.19 L-831.33 -2503.53 L-831.33 -2490.85 L-844.92 -2497.19" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-844.92 -2497.19 C-841.54 -2498.77, -838.15 -2500.34, -831.33 -2503.53 M-831.33 -2503.53 C-831.33 -2498.96, -831.33 -2494.39, -831.33 -2490.85 M-831.33 -2490.85 C-836.2 -2493.12, -841.08 -2495.4, -844.92 -2497.19 M-844.92 -2497.19 C-844.92 -2497.19, -844.92 -2497.19, -844.92 -2497.19" stroke="#1e1e1e" stroke-width="2.5" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1599.652671539552 1457.3347576550896) rotate(0 0.9368823664281081 70.628010425953)"><path d="M0 0 C0.65 48.65, 1.29 97.31, 1.87 141.26 M0 0 C0.52 39.43, 1.05 78.86, 1.87 141.26" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1599.652671539552 1457.3347576550896) rotate(0 0.9368823664281081 70.628010425953)"><path d="M1.87 141.26 L-4.65 127.75 L8.03 127.58 L1.87 141.26" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M1.87 141.26 C-0.37 136.6, -2.62 131.95, -4.65 127.75 M1.87 141.26 C0.05 137.48, -1.77 133.71, -4.65 127.75 M-4.65 127.75 C-1.24 127.7, 2.16 127.66, 8.03 127.58 M-4.65 127.75 C0.17 127.68, 4.99 127.62, 8.03 127.58 M8.03 127.58 C6 132.08, 3.98 136.59, 1.87 141.26 M8.03 127.58 C6.74 130.44, 5.45 133.3, 1.87 141.26 M1.87 141.26 C1.87 141.26, 1.87 141.26, 1.87 141.26 M1.87 141.26 C1.87 141.26, 1.87 141.26, 1.87 141.26" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(723.3228141802902 2237.2887107590914) rotate(0 448.00815424155553 99.93676661755921)"><path d="M0 0 C0 13.31, 0 26.63, 0 57.02 M0 0 C0 22.43, 0 44.87, 0 57.02 M0 57.02 C0 67.69, 5.33 73.02, 16 73.02 M0 57.02 C0 67.69, 5.33 73.02, 16 73.02 M16 73.02 C235.82 73.02, 455.65 73.02, 880.02 73.02 M16 73.02 C190.53 73.02, 365.06 73.02, 880.02 73.02 M880.02 73.02 C890.68 73.02, 896.02 78.35, 896.02 89.02 M880.02 73.02 C890.68 73.02, 896.02 78.35, 896.02 89.02 M896.02 89.02 C896.02 126.9, 896.02 164.78, 896.02 199.87 M896.02 89.02 C896.02 121.98, 896.02 154.93, 896.02 199.87" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(723.3228141802902 2237.2887107590914) rotate(0 448.00815424155553 99.93676661755921)"><path d="M896.02 199.87 L889.68 186.28 L902.36 186.28 L896.02 199.87" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M896.02 199.87 C894.54 196.7, 893.06 193.52, 889.68 186.28 M896.02 199.87 C893.52 194.52, 891.03 189.18, 889.68 186.28 M889.68 186.28 C892.46 186.28, 895.25 186.28, 902.36 186.28 M889.68 186.28 C893.3 186.28, 896.92 186.28, 902.36 186.28 M902.36 186.28 C901.09 189, 899.82 191.73, 896.02 199.87 M902.36 186.28 C901 189.19, 899.64 192.1, 896.02 199.87 M896.02 199.87 C896.02 199.87, 896.02 199.87, 896.02 199.87 M896.02 199.87 C896.02 199.87, 896.02 199.87, 896.02 199.87" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1171.3843376177902 2237.773760814398) rotate(0 223.97739252280553 99.69424158990614)"><path d="M0 0 C0 11.47, 0 22.93, 0 56.76 M0 0 C0 21.15, 0 42.29, 0 56.76 M0 56.76 C0 67.43, 5.33 72.76, 16 72.76 M0 56.76 C0 67.43, 5.33 72.76, 16 72.76 M16 72.76 C139.66 72.76, 263.32 72.76, 431.95 72.76 M16 72.76 C122.01 72.76, 228.02 72.76, 431.95 72.76 M431.95 72.76 C442.62 72.76, 447.95 78.1, 447.95 88.76 M431.95 72.76 C442.62 72.76, 447.95 78.1, 447.95 88.76 M447.95 88.76 C447.95 111.89, 447.95 135.01, 447.95 199.39 M447.95 88.76 C447.95 131.07, 447.95 173.38, 447.95 199.39" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1171.3843376177902 2237.773760814398) rotate(0 223.97739252280553 99.69424158990614)"><path d="M447.95 199.39 L441.62 185.79 L454.29 185.79 L447.95 199.39" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M447.95 199.39 C446.67 196.64, 445.39 193.9, 441.62 185.79 M447.95 199.39 C445.59 194.32, 443.23 189.26, 441.62 185.79 M441.62 185.79 C444.46 185.79, 447.31 185.79, 454.29 185.79 M441.62 185.79 C445.34 185.79, 449.06 185.79, 454.29 185.79 M454.29 185.79 C452.35 189.97, 450.4 194.15, 447.95 199.39 M454.29 185.79 C452.58 189.46, 450.87 193.13, 447.95 199.39 M447.95 199.39 C447.95 199.39, 447.95 199.39, 447.95 199.39 M447.95 199.39 C447.95 199.39, 447.95 199.39, 447.95 199.39" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2067.507384492783 2237.7181316454216) rotate(0 -224.08413091469083 99.72205617439408)"><path d="M0 0 C0 10.89, 0 21.77, 0 53.07 M0 0 C0 18.68, 0 37.37, 0 53.07 M0 53.07 C0 63.74, -5.33 69.07, -16 69.07 M0 53.07 C0 63.74, -5.33 69.07, -16 69.07 M-16 69.07 C-168.01 69.07, -320.01 69.07, -432.17 69.07 M-16 69.07 C-112.86 69.07, -209.72 69.07, -432.17 69.07 M-432.17 69.07 C-442.83 69.07, -448.17 74.41, -448.17 85.07 M-432.17 69.07 C-442.83 69.07, -448.17 74.41, -448.17 85.07 M-448.17 85.07 C-448.17 115.98, -448.17 146.89, -448.17 199.44 M-448.17 85.07 C-448.17 117.77, -448.17 150.46, -448.17 199.44" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2067.507384492783 2237.7181316454216) rotate(0 -224.08413091469083 99.72205617439408)"><path d="M-448.17 199.44 L-454.51 185.85 L-441.83 185.85 L-448.17 199.44" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-448.17 199.44 C-449.47 196.66, -450.77 193.87, -454.51 185.85 M-448.17 199.44 C-450.4 194.66, -452.63 189.87, -454.51 185.85 M-454.51 185.85 C-449.95 185.85, -445.38 185.85, -441.83 185.85 M-454.51 185.85 C-449.91 185.85, -445.31 185.85, -441.83 185.85 M-441.83 185.85 C-443.67 189.8, -445.51 193.75, -448.17 199.44 M-441.83 185.85 C-444.23 191.01, -446.64 196.16, -448.17 199.44 M-448.17 199.44 C-448.17 199.44, -448.17 199.44, -448.17 199.44 M-448.17 199.44 C-448.17 199.44, -448.17 199.44, -448.17 199.44" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2515.568907930283 2235.376912503307) rotate(0 -448.11489263344083 100.89266574545172)"><path d="M0 0 C0 14.23, 0 28.45, 0 55.96 M0 0 C0 22.28, 0 44.56, 0 55.96 M0 55.96 C0 66.62, -5.33 71.96, -16 71.96 M0 55.96 C0 66.62, -5.33 71.96, -16 71.96 M-16 71.96 C-322.5 71.96, -629.01 71.96, -880.23 71.96 M-16 71.96 C-338.68 71.96, -661.36 71.96, -880.23 71.96 M-880.23 71.96 C-890.9 71.96, -896.23 77.29, -896.23 87.96 M-880.23 71.96 C-890.9 71.96, -896.23 77.29, -896.23 87.96 M-896.23 87.96 C-896.23 113.68, -896.23 139.39, -896.23 201.79 M-896.23 87.96 C-896.23 118.47, -896.23 148.99, -896.23 201.79" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2515.568907930283 2235.376912503307) rotate(0 -448.11489263344083 100.89266574545172)"><path d="M-896.23 201.79 L-902.57 188.19 L-889.89 188.19 L-896.23 201.79" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-896.23 201.79 C-897.84 198.33, -899.45 194.87, -902.57 188.19 M-896.23 201.79 C-898.75 196.37, -901.28 190.96, -902.57 188.19 M-902.57 188.19 C-898.29 188.19, -894.02 188.19, -889.89 188.19 M-902.57 188.19 C-899.65 188.19, -896.73 188.19, -889.89 188.19 M-889.89 188.19 C-891.29 191.19, -892.69 194.19, -896.23 201.79 M-889.89 188.19 C-892 192.71, -894.1 197.22, -896.23 201.79 M-896.23 201.79 C-896.23 201.79, -896.23 201.79, -896.23 201.79 M-896.23 201.79 C-896.23 201.79, -896.23 201.79, -896.23 201.79" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(3987.970808608359 3266.806872047935) rotate(0 148.857421875 148.857421875)"><path d="M297.71 148.86 C297.71 152.75, 297.56 156.66, 297.26 160.54 C296.95 164.42, 296.49 168.3, 295.88 172.14 C295.27 175.99, 294.51 179.82, 293.6 183.61 C292.69 187.39, 291.63 191.15, 290.43 194.86 C289.23 198.56, 287.87 202.23, 286.38 205.82 C284.89 209.42, 283.26 212.97, 281.49 216.44 C279.72 219.91, 277.81 223.32, 275.78 226.64 C273.75 229.95, 271.57 233.2, 269.29 236.35 C267 239.5, 264.58 242.57, 262.05 245.53 C259.52 248.49, 256.87 251.36, 254.12 254.12 C251.36 256.87, 248.49 259.52, 245.53 262.05 C242.57 264.58, 239.5 267, 236.35 269.29 C233.2 271.57, 229.95 273.75, 226.64 275.78 C223.32 277.81, 219.91 279.72, 216.44 281.49 C212.97 283.26, 209.42 284.89, 205.82 286.38 C202.23 287.87, 198.56 289.23, 194.86 290.43 C191.15 291.63, 187.39 292.69, 183.61 293.6 C179.82 294.51, 175.99 295.27, 172.14 295.88 C168.3 296.49, 164.42 296.95, 160.54 297.26 C156.66 297.56, 152.75 297.71, 148.86 297.71 C144.96 297.71, 141.06 297.56, 137.18 297.26 C133.3 296.95, 129.42 296.49, 125.57 295.88 C121.73 295.27, 117.89 294.51, 114.11 293.6 C110.32 292.69, 106.56 291.63, 102.86 290.43 C99.16 289.23, 95.49 287.87, 91.89 286.38 C88.3 284.89, 84.75 283.26, 81.28 281.49 C77.81 279.72, 74.4 277.81, 71.08 275.78 C67.76 273.75, 64.51 271.57, 61.36 269.29 C58.21 267, 55.14 264.58, 52.18 262.05 C49.22 259.52, 46.35 256.87, 43.6 254.12 C40.85 251.36, 38.19 248.49, 35.67 245.53 C33.14 242.57, 30.72 239.5, 28.43 236.35 C26.14 233.2, 23.97 229.95, 21.94 226.64 C19.9 223.32, 17.99 219.91, 16.22 216.44 C14.46 212.97, 12.82 209.42, 11.33 205.82 C9.84 202.23, 8.49 198.56, 7.29 194.86 C6.08 191.15, 5.02 187.39, 4.11 183.61 C3.2 179.82, 2.44 175.99, 1.83 172.14 C1.22 168.3, 0.76 164.42, 0.46 160.54 C0.15 156.66, 0 152.75, 0 148.86 C0 144.96, 0.15 141.06, 0.46 137.18 C0.76 133.3, 1.22 129.42, 1.83 125.57 C2.44 121.73, 3.2 117.89, 4.11 114.11 C5.02 110.32, 6.08 106.56, 7.29 102.86 C8.49 99.16, 9.84 95.49, 11.33 91.89 C12.82 88.3, 14.46 84.75, 16.22 81.28 C17.99 77.81, 19.9 74.4, 21.94 71.08 C23.97 67.76, 26.14 64.51, 28.43 61.36 C30.72 58.21, 33.14 55.14, 35.67 52.18 C38.19 49.22, 40.85 46.35, 43.6 43.6 C46.35 40.85, 49.22 38.19, 52.18 35.67 C55.14 33.14, 58.21 30.72, 61.36 28.43 C64.51 26.14, 67.76 23.97, 71.08 21.94 C74.4 19.9, 77.81 17.99, 81.28 16.22 C84.75 14.46, 88.3 12.82, 91.89 11.33 C95.49 9.84, 99.16 8.49, 102.86 7.29 C106.56 6.08, 110.32 5.02, 114.11 4.11 C117.89 3.2, 121.73 2.44, 125.57 1.83 C129.42 1.22, 133.3 0.76, 137.18 0.46 C141.06 0.15, 144.96 0, 148.86 0 C152.75 0, 156.66 0.15, 160.54 0.46 C164.42 0.76, 168.3 1.22, 172.14 1.83 C175.99 2.44, 179.82 3.2, 183.61 4.11 C187.39 5.02, 191.15 6.08, 194.86 7.29 C198.56 8.49, 202.23 9.84, 205.82 11.33 C209.42 12.82, 212.97 14.46, 216.44 16.22 C219.91 17.99, 223.32 19.9, 226.64 21.94 C229.95 23.97, 233.2 26.14, 236.35 28.43 C239.5 30.72, 242.57 33.14, 245.53 35.67 C248.49 38.19, 251.36 40.85, 254.12 43.6 C256.87 46.35, 259.52 49.22, 262.05 52.18 C264.58 55.14, 267 58.21, 269.29 61.36 C271.57 64.51, 273.75 67.76, 275.78 71.08 C277.81 74.4, 279.72 77.81, 281.49 81.28 C283.26 84.75, 284.89 88.3, 286.38 91.89 C287.87 95.49, 289.23 99.16, 290.43 102.86 C291.63 106.56, 292.69 110.32, 293.6 114.11 C294.51 117.89, 295.27 121.73, 295.88 125.57 C296.49 129.42, 296.95 133.3, 297.26 137.18 C297.56 141.06, 297.71 144.96, 297.71 148.86" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M297.71 148.86 C297.71 152.75, 297.56 156.66, 297.26 160.54 C296.95 164.42, 296.49 168.3, 295.88 172.14 C295.27 175.99, 294.51 179.82, 293.6 183.61 C292.69 187.39, 291.63 191.15, 290.43 194.86 C289.23 198.56, 287.87 202.23, 286.38 205.82 C284.89 209.42, 283.26 212.97, 281.49 216.44 C279.72 219.91, 277.81 223.32, 275.78 226.64 C273.75 229.95, 271.57 233.2, 269.29 236.35 C267 239.5, 264.58 242.57, 262.05 245.53 C259.52 248.49, 256.87 251.36, 254.12 254.12 C251.36 256.87, 248.49 259.52, 245.53 262.05 C242.57 264.58, 239.5 267, 236.35 269.29 C233.2 271.57, 229.95 273.75, 226.64 275.78 C223.32 277.81, 219.91 279.72, 216.44 281.49 C212.97 283.26, 209.42 284.89, 205.82 286.38 C202.23 287.87, 198.56 289.23, 194.86 290.43 C191.15 291.63, 187.39 292.69, 183.61 293.6 C179.82 294.51, 175.99 295.27, 172.14 295.88 C168.3 296.49, 164.42 296.95, 160.54 297.26 C156.66 297.56, 152.75 297.71, 148.86 297.71 C144.96 297.71, 141.06 297.56, 137.18 297.26 C133.3 296.95, 129.42 296.49, 125.57 295.88 C121.73 295.27, 117.89 294.51, 114.11 293.6 C110.32 292.69, 106.56 291.63, 102.86 290.43 C99.16 289.23, 95.49 287.87, 91.89 286.38 C88.3 284.89, 84.75 283.26, 81.28 281.49 C77.81 279.72, 74.4 277.81, 71.08 275.78 C67.76 273.75, 64.51 271.57, 61.36 269.29 C58.21 267, 55.14 264.58, 52.18 262.05 C49.22 259.52, 46.35 256.87, 43.6 254.12 C40.85 251.36, 38.19 248.49, 35.67 245.53 C33.14 242.57, 30.72 239.5, 28.43 236.35 C26.14 233.2, 23.97 229.95, 21.94 226.64 C19.9 223.32, 17.99 219.91, 16.22 216.44 C14.46 212.97, 12.82 209.42, 11.33 205.82 C9.84 202.23, 8.49 198.56, 7.29 194.86 C6.08 191.15, 5.02 187.39, 4.11 183.61 C3.2 179.82, 2.44 175.99, 1.83 172.14 C1.22 168.3, 0.76 164.42, 0.46 160.54 C0.15 156.66, 0 152.75, 0 148.86 C0 144.96, 0.15 141.06, 0.46 137.18 C0.76 133.3, 1.22 129.42, 1.83 125.57 C2.44 121.73, 3.2 117.89, 4.11 114.11 C5.02 110.32, 6.08 106.56, 7.29 102.86 C8.49 99.16, 9.84 95.49, 11.33 91.89 C12.82 88.3, 14.46 84.75, 16.22 81.28 C17.99 77.81, 19.9 74.4, 21.94 71.08 C23.97 67.76, 26.14 64.51, 28.43 61.36 C30.72 58.21, 33.14 55.14, 35.67 52.18 C38.19 49.22, 40.85 46.35, 43.6 43.6 C46.35 40.85, 49.22 38.19, 52.18 35.67 C55.14 33.14, 58.21 30.72, 61.36 28.43 C64.51 26.14, 67.76 23.97, 71.08 21.94 C74.4 19.9, 77.81 17.99, 81.28 16.22 C84.75 14.46, 88.3 12.82, 91.89 11.33 C95.49 9.84, 99.16 8.49, 102.86 7.29 C106.56 6.08, 110.32 5.02, 114.11 4.11 C117.89 3.2, 121.73 2.44, 125.57 1.83 C129.42 1.22, 133.3 0.76, 137.18 0.46 C141.06 0.15, 144.96 0, 148.86 0 C152.75 0, 156.66 0.15, 160.54 0.46 C164.42 0.76, 168.3 1.22, 172.14 1.83 C175.99 2.44, 179.82 3.2, 183.61 4.11 C187.39 5.02, 191.15 6.08, 194.86 7.29 C198.56 8.49, 202.23 9.84, 205.82 11.33 C209.42 12.82, 212.97 14.46, 216.44 16.22 C219.91 17.99, 223.32 19.9, 226.64 21.94 C229.95 23.97, 233.2 26.14, 236.35 28.43 C239.5 30.72, 242.57 33.14, 245.53 35.67 C248.49 38.19, 251.36 40.85, 254.12 43.6 C256.87 46.35, 259.52 49.22, 262.05 52.18 C264.58 55.14, 267 58.21, 269.29 61.36 C271.57 64.51, 273.75 67.76, 275.78 71.08 C277.81 74.4, 279.72 77.81, 281.49 81.28 C283.26 84.75, 284.89 88.3, 286.38 91.89 C287.87 95.49, 289.23 99.16, 290.43 102.86 C291.63 106.56, 292.69 110.32, 293.6 114.11 C294.51 117.89, 295.27 121.73, 295.88 125.57 C296.49 129.42, 296.95 133.3, 297.26 137.18 C297.56 141.06, 297.71 144.96, 297.71 148.86" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(4024.7444631222497 3399.320233903093) rotate(0 113.046875 25)"><text x="113.046875" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">User submits their</text><text x="113.046875" y="42.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">2FA or NDV token</text></g><g stroke-linecap="round"><g transform="translate(1809.3035405745577 1334.255327924495) rotate(0 11.204560050624423 -0.03882426368988945)"><path d="M0 0 C3.73 -0.01, 18.67 -0.06, 22.41 -0.08 M0 0 C3.73 -0.01, 18.67 -0.06, 22.41 -0.08" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(691.9271397966731 541.7429880892573) rotate(0 -0.02022871857843711 33.57793240292233)"><path d="M0 0 C-0.02 25.34, -0.03 50.68, -0.04 67.16 M0 0 C-0.01 16.01, -0.02 32.01, -0.04 67.16" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(691.9271397966731 541.7429880892573) rotate(0 -0.02022871857843711 33.57793240292233)"><path d="M-0.04 67.16 L-6.37 53.56 L6.31 53.57 L-0.04 67.16" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-0.04 67.16 C-2.43 62.03, -4.82 56.89, -6.37 53.56 M-0.04 67.16 C-1.55 63.91, -3.06 60.67, -6.37 53.56 M-6.37 53.56 C-2.29 53.56, 1.79 53.56, 6.31 53.57 M-6.37 53.56 C-2.44 53.56, 1.48 53.56, 6.31 53.57 M6.31 53.57 C3.91 58.69, 1.52 63.82, -0.04 67.16 M6.31 53.57 C4.09 58.31, 1.88 63.05, -0.04 67.16 M-0.04 67.16 C-0.04 67.16, -0.04 67.16, -0.04 67.16 M-0.04 67.16 C-0.04 67.16, -0.04 67.16, -0.04 67.16" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1597.1324597060375 544.8900516750284) rotate(0 0.04371621133032022 30.995052708313665)"><path d="M0 0 C0.03 18.39, 0.05 36.78, 0.09 61.99 M0 0 C0.03 20.99, 0.06 41.97, 0.09 61.99" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1597.1324597060375 544.8900516750284) rotate(0 0.04371621133032022 30.995052708313665)"><path d="M0.09 61.99 L-6.27 48.4 L6.41 48.39 L0.09 61.99" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.09 61.99 C-1.8 57.96, -3.68 53.93, -6.27 48.4 M0.09 61.99 C-2.07 57.39, -4.22 52.79, -6.27 48.4 M-6.27 48.4 C-1.3 48.4, 3.68 48.39, 6.41 48.39 M-6.27 48.4 C-1.7 48.4, 2.87 48.39, 6.41 48.39 M6.41 48.39 C4.94 51.54, 3.48 54.69, 0.09 61.99 M6.41 48.39 C5.03 51.34, 3.66 54.3, 0.09 61.99 M0.09 61.99 C0.09 61.99, 0.09 61.99, 0.09 61.99 M0.09 61.99 C0.09 61.99, 0.09 61.99, 0.09 61.99" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1138.6744192245533 544.746758947213) rotate(0 0.04371621133032022 30.995052708313665)"><path d="M0 0 C0.02 13.87, 0.04 27.73, 0.09 61.99 M0 0 C0.02 13.77, 0.04 27.53, 0.09 61.99" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1138.6744192245533 544.746758947213) rotate(0 0.04371621133032022 30.995052708313665)"><path d="M0.09 61.99 L-6.27 48.4 L6.41 48.39 L0.09 61.99" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.09 61.99 C-1.33 58.95, -2.76 55.91, -6.27 48.4 M0.09 61.99 C-1.32 58.97, -2.74 55.96, -6.27 48.4 M-6.27 48.4 C-1.91 48.4, 2.45 48.39, 6.41 48.39 M-6.27 48.4 C-1.38 48.4, 3.52 48.39, 6.41 48.39 M6.41 48.39 C4.26 53, 2.12 57.61, 0.09 61.99 M6.41 48.39 C4.57 52.34, 2.73 56.29, 0.09 61.99 M0.09 61.99 C0.09 61.99, 0.09 61.99, 0.09 61.99 M0.09 61.99 C0.09 61.99, 0.09 61.99, 0.09 61.99" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2043.0162049079408 542.2704942835674) rotate(0 0.5979373603786371 32.652487654044194)"><path d="M0 0 C0.28 15.49, 0.57 30.97, 1.2 65.3 M0 0 C0.42 23.19, 0.85 46.38, 1.2 65.3" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2043.0162049079408 542.2704942835674) rotate(0 0.5979373603786371 32.652487654044194)"><path d="M1.2 65.3 L-5.39 51.83 L7.29 51.6 L1.2 65.3" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M1.2 65.3 C-0.37 62.11, -1.93 58.91, -5.39 51.83 M1.2 65.3 C-1.14 60.52, -3.48 55.73, -5.39 51.83 M-5.39 51.83 C-2.13 51.77, 1.13 51.71, 7.29 51.6 M-5.39 51.83 C-0.36 51.74, 4.67 51.64, 7.29 51.6 M7.29 51.6 C5.14 56.42, 3 61.24, 1.2 65.3 M7.29 51.6 C5.08 56.56, 2.87 61.53, 1.2 65.3 M1.2 65.3 C1.2 65.3, 1.2 65.3, 1.2 65.3 M1.2 65.3 C1.2 65.3, 1.2 65.3, 1.2 65.3" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2489.8014305035576 547.2618463370134) rotate(0 0.42016831257024023 30.22907725232119)"><path d="M0 0 C0.26 18.83, 0.52 37.66, 0.84 60.46 M0 0 C0.2 14.64, 0.41 29.29, 0.84 60.46" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2489.8014305035576 547.2618463370134) rotate(0 0.42016831257024023 30.22907725232119)"><path d="M0.84 60.46 L-5.69 46.95 L6.99 46.78 L0.84 60.46" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.84 60.46 C-1.19 56.25, -3.23 52.05, -5.69 46.95 M0.84 60.46 C-0.74 57.19, -2.32 53.92, -5.69 46.95 M-5.69 46.95 C-2.06 46.9, 1.56 46.85, 6.99 46.78 M-5.69 46.95 C-1.14 46.89, 3.41 46.83, 6.99 46.78 M6.99 46.78 C5.65 49.75, 4.32 52.73, 0.84 60.46 M6.99 46.78 C5.66 49.75, 4.32 52.71, 0.84 60.46 M0.84 60.46 C0.84 60.46, 0.84 60.46, 0.84 60.46 M0.84 60.46 C0.84 60.46, 0.84 60.46, 0.84 60.46" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g transform="translate(1649.6827982546856 2346.177481620426) rotate(0 404.35546875 25)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">The logIn(), logInTwoFactor(), and logInNewDeviceVerification() methods</text><text x="0" y="42.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">all ultimately call startLogin() on the base LoginStrategy</text></g><g transform="translate(3372.1025147510736 1293.2368333375512) rotate(0 324.5 12.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Call loginTwoFactor(...) or logInNewDeviceVerification(...)</text></g><g transform="translate(2364.4874949048426 971.7046919723157) rotate(0 225.5 12.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Save exported LoginStrategyData to cache </text></g><g stroke-linecap="round" transform="translate(1420.7263684040663 4500.100956108189) rotate(0 181.28059895833212 181.28059895833258)"><path d="M227.5 45.5 C247.86 66.18, 268.21 86.87, 317.06 136.5 C362.56 182, 362.56 182, 317.06 227.5 C289.69 254.87, 262.33 282.24, 227.5 317.06 C182 362.56, 182 362.56, 136.5 317.06 C114 294.91, 91.49 272.77, 45.5 227.5 C0 182, 0 182, 45.5 136.5 C72.88 109.12, 100.25 81.75, 136.5 45.5 C182 0, 182 0, 227.5 45.5" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M227.5 45.5 C255.49 73.94, 283.47 102.37, 317.06 136.5 M227.5 45.5 C254.86 73.3, 282.21 101.09, 317.06 136.5 M317.06 136.5 C362.56 182, 362.56 182, 317.06 227.5 M317.06 136.5 C362.56 182, 362.56 182, 317.06 227.5 M317.06 227.5 C289.27 255.29, 261.48 283.08, 227.5 317.06 M317.06 227.5 C295.44 249.12, 273.82 270.74, 227.5 317.06 M227.5 317.06 C182 362.56, 182 362.56, 136.5 317.06 M227.5 317.06 C182 362.56, 182 362.56, 136.5 317.06 M136.5 317.06 C100.75 281.88, 65 246.69, 45.5 227.5 M136.5 317.06 C117.98 298.84, 99.47 280.61, 45.5 227.5 M45.5 227.5 C0 182, 0 182, 45.5 136.5 M45.5 227.5 C0 182, 0 182, 45.5 136.5 M45.5 136.5 C76.93 105.07, 108.36 73.64, 136.5 45.5 M45.5 136.5 C81.81 100.19, 118.12 63.88, 136.5 45.5 M136.5 45.5 C182 0, 182 0, 227.5 45.5 M136.5 45.5 C182 0, 182 0, 227.5 45.5" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1495.7805770771047 4646.658657986975) rotate(0 102.9384765625 37.5)"><text x="102.9384765625" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Is user required</text><text x="102.9384765625" y="42.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">to set/change</text><text x="102.9384765625" y="67.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">master password?</text></g><g stroke-linecap="round"><g transform="translate(1599.7485121289901 4868.163875750501) rotate(0 -0.33919686246190395 78.97939806602108)"><path d="M0 0 C-0.2 46.08, -0.4 92.15, -0.68 157.96 M0 0 C-0.19 45.17, -0.39 90.35, -0.68 157.96" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1599.7485121289901 4868.163875750501) rotate(0 -0.33919686246190395 78.97939806602108)"><path d="M-0.68 157.96 L-6.96 144.34 L5.72 144.39 L-0.68 157.96" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-0.68 157.96 C-2.51 153.99, -4.34 150.01, -6.96 144.34 M-0.68 157.96 C-2.47 154.06, -4.27 150.17, -6.96 144.34 M-6.96 144.34 C-2.64 144.36, 1.68 144.37, 5.72 144.39 M-6.96 144.34 C-3.38 144.35, 0.2 144.37, 5.72 144.39 M5.72 144.39 C4.15 147.72, 2.58 151.04, -0.68 157.96 M5.72 144.39 C3.27 149.59, 0.81 154.79, -0.68 157.96 M-0.68 157.96 C-0.68 157.96, -0.68 157.96, -0.68 157.96 M-0.68 157.96 C-0.68 157.96, -0.68 157.96, -0.68 157.96" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g transform="translate(1633.326844827472 4907.437519713756) rotate(0 11 12.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">NO</text></g><g transform="translate(10 1945.9798880557894) rotate(0 198 137.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Note:</text><text x="0" y="42.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="0" y="67.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">The logInTwoFactor() method actually</text><text x="0" y="92.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">exists on the base LoginStrategy.</text><text x="0" y="117.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="0" y="142.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Some login strategies have a slight</text><text x="0" y="167.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">override/extension of the method.</text><text x="0" y="192.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="0" y="217.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">For the sake of simplicity, this</text><text x="0" y="242.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">diagram shows the logInTwoFactor()</text><text x="0" y="267.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">method as existing on each strategy.</text></g><g stroke-linecap="round" transform="translate(535.1772552595539 1946.7210275425512) rotate(0 189.17931226523615 26.4602374619044)"><path d="M13.23 0 C109.82 0, 206.42 0, 365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 C378.36 23.23, 378.36 33.23, 378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 C273.67 52.92, 182.21 52.92, 13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 C0 29.36, 0 19.03, 0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="none" stroke-width="0" fill="#fff0f6"></path><path d="M13.23 0 C130.94 0, 248.65 0, 365.13 0 M13.23 0 C138.16 0, 263.09 0, 365.13 0 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M378.36 13.23 C378.36 19.74, 378.36 26.24, 378.36 39.69 M378.36 13.23 C378.36 20.55, 378.36 27.88, 378.36 39.69 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M365.13 52.92 C260.08 52.92, 155.04 52.92, 13.23 52.92 M365.13 52.92 C292.89 52.92, 220.64 52.92, 13.23 52.92 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M0 39.69 C0 29.99, 0 20.29, 0 13.23 M0 39.69 C0 34.37, 0 29.04, 0 13.23 M0 13.23 C0 4.41, 4.41 0, 13.23 0 M0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(666.1980087383199 1963.0136706929245) rotate(0 58.15855878646835 10.167594311531502)"><text x="58.15855878646856" y="14.234632036144188" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16.2681508984505px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">exportCache()</text></g><g stroke-linecap="round" transform="translate(985.7340250677662 1946.7210275425512) rotate(0 189.17931226523615 26.4602374619044)"><path d="M13.23 0 C121.95 0, 230.68 0, 365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 C378.36 23.8, 378.36 34.37, 378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 C233.26 52.92, 101.39 52.92, 13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 C0 29.86, 0 20.04, 0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="none" stroke-width="0" fill="#fff0f6"></path><path d="M13.23 0 C89.51 0, 165.78 0, 365.13 0 M13.23 0 C104.81 0, 196.39 0, 365.13 0 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M378.36 13.23 C378.36 22.98, 378.36 32.74, 378.36 39.69 M378.36 13.23 C378.36 21.06, 378.36 28.89, 378.36 39.69 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M365.13 52.92 C256.26 52.92, 147.39 52.92, 13.23 52.92 M365.13 52.92 C291.95 52.92, 218.78 52.92, 13.23 52.92 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M0 39.69 C0 29.29, 0 18.89, 0 13.23 M0 39.69 C0 32.19, 0 24.69, 0 13.23 M0 13.23 C0 4.41, 4.41 0, 13.23 0 M0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1116.7547785465322 1963.0136706929245) rotate(0 58.15855878646835 10.167594311531502)"><text x="58.15855878646856" y="14.234632036144188" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16.2681508984505px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">exportCache()</text></g><g stroke-linecap="round" transform="translate(1432.035347903853 1946.7210275425512) rotate(0 189.17931226523615 26.4602374619044)"><path d="M13.23 0 C128.97 0, 244.7 0, 365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 C378.36 23.15, 378.36 33.06, 378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 C258.26 52.92, 151.39 52.92, 13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 C0 34.24, 0 28.79, 0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="none" stroke-width="0" fill="#fff0f6"></path><path d="M13.23 0 C149.3 0, 285.37 0, 365.13 0 M13.23 0 C89.22 0, 165.2 0, 365.13 0 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M378.36 13.23 C378.36 18.59, 378.36 23.96, 378.36 39.69 M378.36 13.23 C378.36 20.01, 378.36 26.78, 378.36 39.69 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M365.13 52.92 C274.26 52.92, 183.38 52.92, 13.23 52.92 M365.13 52.92 C271.86 52.92, 178.58 52.92, 13.23 52.92 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M0 39.69 C0 32.01, 0 24.33, 0 13.23 M0 39.69 C0 29.59, 0 19.5, 0 13.23 M0 13.23 C0 4.41, 4.41 0, 13.23 0 M0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1563.056101382619 1963.0136706929245) rotate(0 58.15855878646835 10.167594311531502)"><text x="58.15855878646856" y="14.234632036144188" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16.2681508984505px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">exportCache()</text></g><g stroke-linecap="round" transform="translate(1882.0628688449433 1946.7210275425512) rotate(0 189.17931226523615 26.4602374619044)"><path d="M13.23 0 C148.67 0, 284.11 0, 365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 C378.36 19.84, 378.36 26.44, 378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 C254.56 52.92, 144 52.92, 13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 C0 30.82, 0 21.96, 0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="none" stroke-width="0" fill="#fff0f6"></path><path d="M13.23 0 C98.1 0, 182.97 0, 365.13 0 M13.23 0 C109.83 0, 206.43 0, 365.13 0 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M378.36 13.23 C378.36 19.25, 378.36 25.26, 378.36 39.69 M378.36 13.23 C378.36 21.15, 378.36 29.06, 378.36 39.69 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M365.13 52.92 C255.1 52.92, 145.06 52.92, 13.23 52.92 M365.13 52.92 C226.31 52.92, 87.5 52.92, 13.23 52.92 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M0 39.69 C0 30.34, 0 20.98, 0 13.23 M0 39.69 C0 30.13, 0 20.57, 0 13.23 M0 13.23 C0 4.41, 4.41 0, 13.23 0 M0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2013.0836223237093 1963.0136706929245) rotate(0 58.15855878646835 10.167594311531502)"><text x="58.15855878646856" y="14.234632036144188" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16.2681508984505px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">exportCache()</text></g><g stroke-linecap="round" transform="translate(2327.141197677276 1946.7210275425512) rotate(0 189.17931226523615 26.4602374619044)"><path d="M13.23 0 C139.5 0, 265.77 0, 365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 C378.36 20.12, 378.36 27.01, 378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 C293.15 52.92, 221.16 52.92, 13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 C0 32.38, 0 25.06, 0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="none" stroke-width="0" fill="#fff0f6"></path><path d="M13.23 0 C135.15 0, 257.07 0, 365.13 0 M13.23 0 C118.93 0, 224.64 0, 365.13 0 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M365.13 0 C373.95 0, 378.36 4.41, 378.36 13.23 M378.36 13.23 C378.36 23.59, 378.36 33.95, 378.36 39.69 M378.36 13.23 C378.36 19.86, 378.36 26.49, 378.36 39.69 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M378.36 39.69 C378.36 48.51, 373.95 52.92, 365.13 52.92 M365.13 52.92 C286.12 52.92, 207.12 52.92, 13.23 52.92 M365.13 52.92 C279.24 52.92, 193.35 52.92, 13.23 52.92 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M13.23 52.92 C4.41 52.92, 0 48.51, 0 39.69 M0 39.69 C0 34.32, 0 28.95, 0 13.23 M0 39.69 C0 33.84, 0 28, 0 13.23 M0 13.23 C0 4.41, 4.41 0, 13.23 0 M0 13.23 C0 4.41, 4.41 0, 13.23 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2458.161951156042 1963.0136706929245) rotate(0 58.15855878646835 10.167594311531502)"><text x="58.15855878646856" y="14.234632036144188" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16.2681508984505px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">exportCache()</text></g><g stroke-linecap="round"><g transform="translate(1618.617662452507 2246.2407232812957) rotate(0 -0.00051092024477839 95.51722997917932)"><path d="M0 0 C0 52.8, 0 105.59, 0 191.03 M0 0 C0 61.9, 0 123.8, 0 191.03" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1618.617662452507 2246.2407232812957) rotate(0 -0.00051092024477839 95.51722997917932)"><path d="M0 191.03 L-6.34 177.44 L6.34 177.44 L0 191.03" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0 191.03 C-1.75 187.28, -3.5 183.52, -6.34 177.44 M0 191.03 C-2.06 186.63, -4.11 182.22, -6.34 177.44 M-6.34 177.44 C-2.07 177.44, 2.19 177.44, 6.34 177.44 M-6.34 177.44 C-2.66 177.44, 1.02 177.44, 6.34 177.44 M6.34 177.44 C4.72 180.92, 3.09 184.4, 0 191.03 M6.34 177.44 C4.79 180.76, 3.24 184.08, 0 191.03 M0 191.03 C0 191.03, 0 191.03, 0 191.03 M0 191.03 C0 191.03, 0 191.03, 0 191.03" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g></g><mask></mask><g transform="translate(1259.2652092727512 29.40786696955888) rotate(0 107.79995727539062 17.5)"><text x="0" y="24.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginComponent</text></g><g transform="translate(1334.0651665481419 64.13889079122441) rotate(0 33 12.5)"><text x="0" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">/login</text></g><g stroke-linecap="round" transform="translate(561.901496916591 258.4186003919941) rotate(0 142.2230809977682 23.67204011607447)"><path d="M11.84 0 C71.22 0, 130.6 0, 272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 C284.45 19.09, 284.45 26.35, 284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 C216.1 47.34, 159.6 47.34, 11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 C0 29.3, 0 23.09, 0 11.84 C0 3.95, 3.95 0, 11.84 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M11.84 0 C92.7 0, 173.57 0, 272.61 0 M11.84 0 C69.94 0, 128.04 0, 272.61 0 M272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 M272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 M284.45 11.84 C284.45 17.84, 284.45 23.84, 284.45 35.51 M284.45 11.84 C284.45 19.6, 284.45 27.36, 284.45 35.51 M284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 M284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 M272.61 47.34 C219.68 47.34, 166.76 47.34, 11.84 47.34 M272.61 47.34 C212.23 47.34, 151.85 47.34, 11.84 47.34 M11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 M11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 M0 35.51 C0 26.78, 0 18.05, 0 11.84 M0 35.51 C0 30.5, 0 25.49, 0 11.84 M0 11.84 C0 3.95, 3.95 0, 11.84 0 M0 11.84 C0 3.95, 3.95 0, 11.84 0" stroke="#495057" stroke-width="2" fill="none"></path></g><g transform="translate(649.1245779143574 269.59064050806865) rotate(0 55 12.5)"><text x="55" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#495057" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">"Continue"</text></g><g stroke-linecap="round" transform="translate(1005.9071987995412 260.11334257751776) rotate(0 142.2230809977682 23.67204011607447)"><path d="M11.84 0 C71.41 0, 130.98 0, 272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 C284.45 17.59, 284.45 23.35, 284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 C181.75 47.34, 90.88 47.34, 11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 C0 29.49, 0 23.46, 0 11.84 C0 3.95, 3.95 0, 11.84 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M11.84 0 C92.46 0, 173.08 0, 272.61 0 M11.84 0 C104.6 0, 197.37 0, 272.61 0 M272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 M272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 M284.45 11.84 C284.45 18.69, 284.45 25.54, 284.45 35.51 M284.45 11.84 C284.45 20.86, 284.45 29.88, 284.45 35.51 M284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 M284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 M272.61 47.34 C197.58 47.34, 122.54 47.34, 11.84 47.34 M272.61 47.34 C170.59 47.34, 68.57 47.34, 11.84 47.34 M11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 M11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 M0 35.51 C0 26.18, 0 16.86, 0 11.84 M0 35.51 C0 30.1, 0 24.69, 0 11.84 M0 11.84 C0 3.95, 3.95 0, 11.84 0 M0 11.84 C0 3.95, 3.95 0, 11.84 0" stroke="#495057" stroke-width="2" fill="none"></path></g><g transform="translate(1038.1302797973112 271.2853826935923) rotate(0 110 12.5)"><text x="110" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#495057" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">"Log in with device"</text></g><g stroke-linecap="round" transform="translate(1449.9129006824915 261.8080847630414) rotate(0 142.2230809977682 23.67204011607447)"><path d="M11.84 0 C112.24 0, 212.64 0, 272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 C284.45 18.61, 284.45 25.39, 284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 C175.51 47.34, 78.42 47.34, 11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 C0 27.34, 0 19.18, 0 11.84 C0 3.95, 3.95 0, 11.84 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M11.84 0 C80.1 0, 148.37 0, 272.61 0 M11.84 0 C102.58 0, 193.33 0, 272.61 0 M272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 M272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 M284.45 11.84 C284.45 21.06, 284.45 30.28, 284.45 35.51 M284.45 11.84 C284.45 16.9, 284.45 21.97, 284.45 35.51 M284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 M284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 M272.61 47.34 C193.14 47.34, 113.67 47.34, 11.84 47.34 M272.61 47.34 C172.24 47.34, 71.86 47.34, 11.84 47.34 M11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 M11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 M0 35.51 C0 29.81, 0 24.11, 0 11.84 M0 35.51 C0 29.67, 0 23.83, 0 11.84 M0 11.84 C0 3.95, 3.95 0, 11.84 0 M0 11.84 C0 3.95, 3.95 0, 11.84 0" stroke="#495057" stroke-width="2" fill="none"></path></g><g transform="translate(1482.1359816802578 272.9801248791159) rotate(0 110 12.5)"><text x="110" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#495057" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">"Use single sign-on"</text></g><g stroke-linecap="round" transform="translate(1893.9186025654417 256.7238582064706) rotate(0 142.2230809977682 23.67204011607447)"><path d="M11.84 0 C72.58 0, 133.32 0, 272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 C284.45 18.78, 284.45 25.72, 284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 C214.72 47.34, 156.83 47.34, 11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 C0 30.2, 0 24.9, 0 11.84 C0 3.95, 3.95 0, 11.84 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M11.84 0 C115.67 0, 219.51 0, 272.61 0 M11.84 0 C94.51 0, 177.19 0, 272.61 0 M272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 M272.61 0 C280.5 0, 284.45 3.95, 284.45 11.84 M284.45 11.84 C284.45 18.01, 284.45 24.19, 284.45 35.51 M284.45 11.84 C284.45 17.72, 284.45 23.61, 284.45 35.51 M284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 M284.45 35.51 C284.45 43.4, 280.5 47.34, 272.61 47.34 M272.61 47.34 C210.17 47.34, 147.73 47.34, 11.84 47.34 M272.61 47.34 C173.4 47.34, 74.18 47.34, 11.84 47.34 M11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 M11.84 47.34 C3.95 47.34, 0 43.4, 0 35.51 M0 35.51 C0 29.74, 0 23.97, 0 11.84 M0 35.51 C0 29.29, 0 23.07, 0 11.84 M0 11.84 C0 3.95, 3.95 0, 11.84 0 M0 11.84 C0 3.95, 3.95 0, 11.84 0" stroke="#495057" stroke-width="2" fill="none"></path></g><g transform="translate(1920.641683563208 267.895898322545) rotate(0 115.5 12.5)"><text x="115.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#495057" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">"Log in with passkey"</text></g><g stroke-linecap="round"><g transform="translate(693.6158455524928 341.5663389354695) rotate(0 -0.04560795078941737 28.15025157039082)"><path d="M0 0 C-0.02 14.74, -0.05 29.48, -0.09 56.3 M0 0 C-0.03 16.89, -0.05 33.77, -0.09 56.3" stroke="#495057" stroke-width="2" fill="none"></path></g><g transform="translate(693.6158455524928 341.5663389354695) rotate(0 -0.04560795078941737 28.15025157039082)"><path d="M-0.09 56.3 L-6.41 42.7 L6.27 42.72 L-0.09 56.3" stroke="none" stroke-width="0" fill="#495057" fill-rule="evenodd"></path><path d="M-0.09 56.3 C-1.75 52.74, -3.4 49.18, -6.41 42.7 M-0.09 56.3 C-1.99 52.22, -3.88 48.14, -6.41 42.7 M-6.41 42.7 C-2.9 42.7, 0.61 42.71, 6.27 42.72 M-6.41 42.7 C-1.48 42.7, 3.45 42.71, 6.27 42.72 M6.27 42.72 C3.78 48.03, 1.29 53.34, -0.09 56.3 M6.27 42.72 C4.97 45.49, 3.68 48.26, -0.09 56.3 M-0.09 56.3 C-0.09 56.3, -0.09 56.3, -0.09 56.3 M-0.09 56.3 C-0.09 56.3, -0.09 56.3, -0.09 56.3" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2040.8249476405217 343.46603402599885) rotate(0 -0.13689253031770932 28.30449236187036)"><path d="M0 0 C-0.06 11.76, -0.11 23.52, -0.27 56.61 M0 0 C-0.1 20.43, -0.2 40.87, -0.27 56.61" stroke="#495057" stroke-width="2" fill="none"></path></g><g transform="translate(2040.8249476405217 343.46603402599885) rotate(0 -0.13689253031770932 28.30449236187036)"><path d="M-0.27 56.61 L-6.55 42.98 L6.13 43.05 L-0.27 56.61" stroke="none" stroke-width="0" fill="#495057" fill-rule="evenodd"></path><path d="M-0.27 56.61 C-1.58 53.78, -2.88 50.95, -6.55 42.98 M-0.27 56.61 C-2.54 51.69, -4.8 46.77, -6.55 42.98 M-6.55 42.98 C-2.73 43, 1.09 43.02, 6.13 43.05 M-6.55 42.98 C-3.58 43, -0.62 43.01, 6.13 43.05 M6.13 43.05 C3.96 47.65, 1.78 52.25, -0.27 56.61 M6.13 43.05 C3.83 47.91, 1.53 52.78, -0.27 56.61 M-0.27 56.61 C-0.27 56.61, -0.27 56.61, -0.27 56.61 M-0.27 56.61 C-0.27 56.61, -0.27 56.61, -0.27 56.61" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1596.5413744709513 345.10178800769086) rotate(0 -0.13689253031770932 28.30449236187036)"><path d="M0 0 C-0.07 14.92, -0.14 29.85, -0.27 56.61 M0 0 C-0.08 16.61, -0.16 33.23, -0.27 56.61" stroke="#495057" stroke-width="2" fill="none"></path></g><g transform="translate(1596.5413744709513 345.10178800769086) rotate(0 -0.13689253031770932 28.30449236187036)"><path d="M-0.27 56.61 L-6.55 42.98 L6.13 43.05 L-0.27 56.61" stroke="none" stroke-width="0" fill="#495057" fill-rule="evenodd"></path><path d="M-0.27 56.61 C-1.93 53.02, -3.58 49.43, -6.55 42.98 M-0.27 56.61 C-2.11 52.61, -3.96 48.61, -6.55 42.98 M-6.55 42.98 C-3.28 43, -0.01 43.02, 6.13 43.05 M-6.55 42.98 C-2.25 43, 2.05 43.03, 6.13 43.05 M6.13 43.05 C4.2 47.13, 2.27 51.22, -0.27 56.61 M6.13 43.05 C4.84 45.77, 3.56 48.5, -0.27 56.61 M-0.27 56.61 C-0.27 56.61, -0.27 56.61, -0.27 56.61 M-0.27 56.61 C-0.27 56.61, -0.27 56.61, -0.27 56.61" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1138.9042087102207 344.81732574191096) rotate(0 -0.13689253031770932 28.30449236187036)"><path d="M0 0 C-0.06 12.17, -0.12 24.34, -0.27 56.61 M0 0 C-0.09 19.6, -0.19 39.2, -0.27 56.61" stroke="#495057" stroke-width="2" fill="none"></path></g><g transform="translate(1138.9042087102207 344.81732574191096) rotate(0 -0.13689253031770932 28.30449236187036)"><path d="M-0.27 56.61 L-6.55 42.98 L6.13 43.05 L-0.27 56.61" stroke="none" stroke-width="0" fill="#495057" fill-rule="evenodd"></path><path d="M-0.27 56.61 C-1.62 53.68, -2.97 50.75, -6.55 42.98 M-0.27 56.61 C-2.45 51.89, -4.62 47.17, -6.55 42.98 M-6.55 42.98 C-2.86 43, 0.83 43.02, 6.13 43.05 M-6.55 42.98 C-1.49 43.01, 3.57 43.03, 6.13 43.05 M6.13 43.05 C4.05 47.46, 1.96 51.87, -0.27 56.61 M6.13 43.05 C3.93 47.71, 1.73 52.37, -0.27 56.61 M-0.27 56.61 C-0.27 56.61, -0.27 56.61, -0.27 56.61 M-0.27 56.61 C-0.27 56.61, -0.27 56.61, -0.27 56.61" stroke="#495057" stroke-width="2" fill="none"></path></g></g><mask></mask><g transform="translate(632.9066948195796 467.2229132280406) rotate(0 61.59991455078125 20)"><text x="61.59991455078125" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginComponent</text><text x="61.59991455078125" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">/login</text></g><g transform="translate(1018.5088393446749 470.1003380815089) rotate(0 123.1998291015625 20)"><text x="123.1998291015625" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginViaAuthRequestComponent</text><text x="123.1998291015625" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">/login-with-device</text></g><g transform="translate(1540.994221077588 468.51533519704935) rotate(0 52.7999267578125 20)"><text x="52.7999267578125" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SsoComponent</text><text x="52.7999267578125" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">/sso</text></g><g transform="translate(1933.9347772893889 462.8089169731538) rotate(0 109.99984741210938 20)"><text x="109.99984741210938" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginViaWebAuthnComponent</text><text x="109.99984741210938" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">/login-with-passkey</text></g><g transform="translate(2385.398484937745 465.415815984942) rotate(0 101.19985961914062 19.999999999999943)"><text x="101.19985961914062" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">LoginCommand</text><text x="101.19985961914062" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">(only available on CLI)</text></g><g stroke-linecap="round" transform="translate(1386.6922382633966 1086.455424118357) rotate(0 442.5296744468942 76.46125600830158)"><path d="M32 0 C219.39 0, 406.78 0, 853.06 0 C874.39 0, 885.06 10.67, 885.06 32 C885.06 52.38, 885.06 72.76, 885.06 120.92 C885.06 142.26, 874.39 152.92, 853.06 152.92 C661.55 152.92, 470.05 152.92, 32 152.92 C10.67 152.92, 0 142.26, 0 120.92 C0 88.95, 0 56.98, 0 32 C0 10.67, 10.67 0, 32 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M32 0 C353.45 0, 674.91 0, 853.06 0 M32 0 C325.97 0, 619.95 0, 853.06 0 M853.06 0 C874.39 0, 885.06 10.67, 885.06 32 M853.06 0 C874.39 0, 885.06 10.67, 885.06 32 M885.06 32 C885.06 53.36, 885.06 74.72, 885.06 120.92 M885.06 32 C885.06 56.3, 885.06 80.61, 885.06 120.92 M885.06 120.92 C885.06 142.26, 874.39 152.92, 853.06 152.92 M885.06 120.92 C885.06 142.26, 874.39 152.92, 853.06 152.92 M853.06 152.92 C598.86 152.92, 344.66 152.92, 32 152.92 M853.06 152.92 C675.32 152.92, 497.58 152.92, 32 152.92 M32 152.92 C10.67 152.92, 0 142.26, 0 120.92 M32 152.92 C10.67 152.92, 0 142.26, 0 120.92 M0 120.92 C0 88.13, 0 55.33, 0 32 M0 120.92 C0 88.09, 0 55.26, 0 32 M0 32 C0 10.67, 10.67 0, 32 0 M0 32 C0 10.67, 10.67 0, 32 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1746.7219127102908 1107.62603021804) rotate(0 82.5 12.5)"><text x="82.5" y="17.5" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Session Timeout</text></g><g transform="translate(1529.8099821775832 1150.683873841357) rotate(0 299.41193053270763 30)"><text x="299.4119305327071" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">If 2FA or NDV are required, start a timer. If user does not complete</text><text x="299.4119305327071" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">authentication within 5 minutes, the LoginStrategyData Cache will</text><text x="299.4119305327071" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">clear and they will have to restart the authentication process.</text></g><g stroke-linecap="round" transform="translate(2906.1184466123923 3515.4916361580026) rotate(0 214.18359375 56.45768229166697)"><path d="M28.23 0 C104.09 0, 179.95 0, 400.14 0 C418.96 0, 428.37 9.41, 428.37 28.23 C428.37 49.2, 428.37 70.17, 428.37 84.69 C428.37 103.51, 418.96 112.92, 400.14 112.92 C261.43 112.92, 122.72 112.92, 28.23 112.92 C9.41 112.92, 0 103.51, 0 84.69 C0 73.33, 0 61.97, 0 28.23 C0 9.41, 9.41 0, 28.23 0" stroke="none" stroke-width="0" fill="#ffd8a8"></path><path d="M28.23 0 C129.06 0, 229.9 0, 400.14 0 M28.23 0 C172.98 0, 317.73 0, 400.14 0 M400.14 0 C418.96 0, 428.37 9.41, 428.37 28.23 M400.14 0 C418.96 0, 428.37 9.41, 428.37 28.23 M428.37 28.23 C428.37 48.6, 428.37 68.98, 428.37 84.69 M428.37 28.23 C428.37 50.36, 428.37 72.49, 428.37 84.69 M428.37 84.69 C428.37 103.51, 418.96 112.92, 400.14 112.92 M428.37 84.69 C428.37 103.51, 418.96 112.92, 400.14 112.92 M400.14 112.92 C255.59 112.92, 111.04 112.92, 28.23 112.92 M400.14 112.92 C254.74 112.92, 109.34 112.92, 28.23 112.92 M28.23 112.92 C9.41 112.92, 0 103.51, 0 84.69 M28.23 112.92 C9.41 112.92, 0 103.51, 0 84.69 M0 84.69 C0 67.5, 0 50.32, 0 28.23 M0 84.69 C0 64.55, 0 44.42, 0 28.23 M0 28.23 C0 9.41, 9.41 0, 28.23 0 M0 28.23 C0 9.41, 9.41 0, 28.23 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(2966.2859564790233 3534.0134874031037) rotate(0 162.79977416992188 40)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">PasswordLoginStrategyData {</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  tokenRequest: PasswordTokenRequest,</text><text x="0" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">  // ... other properties</text><text x="0" y="74" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">}</text></g><g transform="translate(3152.7546323381393 3648.9781356740623) rotate(0 153.99978637695312 20)"><text x="0" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Example:</text><text x="0" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">PasswordLoginStrategy.exportCache()</text></g><g stroke-linecap="round"><g transform="translate(3123.6881838983463 3701.531635472622) rotate(0 -0.15506838829242042 -30.64766642488712)"><path d="M0 0 C-0.11 -20.78, -0.21 -41.57, -0.31 -61.3" stroke="#1e1e1e" stroke-width="2.5" fill="none" stroke-dasharray="8 10"></path></g><g transform="translate(3123.6881838983463 3701.531635472622) rotate(0 -0.15506838829242042 -30.64766642488712)"><path d="M-0.31 -61.3 L6.1 -47.73 L-6.58 -47.67 L-0.31 -61.3" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-0.31 -61.3 C1.86 -56.7, 4.04 -52.1, 6.1 -47.73 M6.1 -47.73 C2.67 -47.72, -0.76 -47.7, -6.58 -47.67 M-6.58 -47.67 C-5.26 -50.55, -3.93 -53.42, -0.31 -61.3 M-0.31 -61.3 C-0.31 -61.3, -0.31 -61.3, -0.31 -61.3" stroke="#1e1e1e" stroke-width="2.5" fill="none"></path></g></g><mask></mask><g transform="translate(1510.4622085033589 2857.41492656469) rotate(0 109.99984741210938 30)"><text x="109.99984741210938" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Response #2:</text><text x="109.99984741210938" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="109.99984741210938" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">IdentityTwoFactorResponse</text></g><g stroke-linecap="round" transform="translate(1886.6235420881894 2836.07898906469) rotate(0 235.72462696028015 51.3359375)"><path d="M25.67 0 C148.18 0, 270.7 0, 445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 C471.45 40.63, 471.45 55.6, 471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 C290.87 102.67, 135.97 102.67, 25.67 102.67 C8.56 102.67, 0 94.12, 0 77 C0 65.66, 0 54.31, 0 25.67 C0 8.56, 8.56 0, 25.67 0" stroke="none" stroke-width="0" fill="#e9ecef"></path><path d="M25.67 0 C124.02 0, 222.37 0, 445.78 0 M25.67 0 C125.08 0, 224.49 0, 445.78 0 M445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 M445.78 0 C462.89 0, 471.45 8.56, 471.45 25.67 M471.45 25.67 C471.45 43.4, 471.45 61.13, 471.45 77 M471.45 25.67 C471.45 36.15, 471.45 46.63, 471.45 77 M471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 M471.45 77 C471.45 94.12, 462.89 102.67, 445.78 102.67 M445.78 102.67 C325.23 102.67, 204.67 102.67, 25.67 102.67 M445.78 102.67 C322.44 102.67, 199.1 102.67, 25.67 102.67 M25.67 102.67 C8.56 102.67, 0 94.12, 0 77 M25.67 102.67 C8.56 102.67, 0 94.12, 0 77 M0 77 C0 61.23, 0 45.46, 0 25.67 M0 77 C0 56.58, 0 36.16, 0 25.67 M0 25.67 C0 8.56, 8.56 0, 25.67 0 M0 25.67 C0 8.56, 8.56 0, 25.67 0" stroke="#1e1e1e" stroke-width="2" fill="none"></path></g><g transform="translate(1972.7483765680008 2857.41492656469) rotate(0 149.59979248046875 30)"><text x="149.59979248046875" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Response #3:</text><text x="149.59979248046875" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic"></text><text x="149.59979248046875" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">IdentityDeviceVerificationResponse</text></g><g stroke-linecap="round"><g transform="translate(1620.553611715648 2674.7944762018396) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.03 10.61, 0.05 21.21, 0.08 32.38 M0 0 C0.02 9.12, 0.04 18.24, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1620.553611715648 2674.7944762018396) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-2.01 27.94, -4.1 23.49, -6.29 18.8 M0.08 32.38 C-1.72 28.56, -3.51 24.73, -6.29 18.8 M-6.29 18.8 C-3.65 18.8, -1.01 18.79, 6.38 18.77 M-6.29 18.8 C-3.04 18.8, 0.22 18.79, 6.38 18.77 M6.38 18.77 C5.11 21.52, 3.84 24.26, 0.08 32.38 M6.38 18.77 C4.31 23.26, 2.23 27.74, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2114.303352901199 2797.026501645225) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.03 11.86, 0.06 23.72, 0.08 32.38 M0 0 C0.02 8.57, 0.04 17.15, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(2114.303352901199 2797.026501645225) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-2.26 27.41, -4.59 22.44, -6.29 18.8 M0.08 32.38 C-1.61 28.79, -3.3 25.19, -6.29 18.8 M-6.29 18.8 C-3.14 18.8, 0.01 18.79, 6.38 18.77 M-6.29 18.8 C-2.59 18.8, 1.12 18.79, 6.38 18.77 M6.38 18.77 C4.88 22.01, 3.38 25.25, 0.08 32.38 M6.38 18.77 C4.68 22.46, 2.97 26.15, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2117.2013293144337 2945.7114761188477) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.02 10.43, 0.05 20.86, 0.08 32.38 M0 0 C0.03 12.05, 0.06 24.09, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(2117.2013293144337 2945.7114761188477) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-1.98 28.01, -4.03 23.64, -6.29 18.8 M0.08 32.38 C-2.29 27.33, -4.66 22.28, -6.29 18.8 M-6.29 18.8 C-2.86 18.8, 0.57 18.79, 6.38 18.77 M-6.29 18.8 C-3.25 18.8, -0.21 18.79, 6.38 18.77 M6.38 18.77 C4.29 23.3, 2.19 27.83, 0.08 32.38 M6.38 18.77 C3.9 24.12, 1.42 29.47, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1613.024848018802 3233.2079055489176) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.03 11.61, 0.05 23.23, 0.08 32.38 M0 0 C0.02 6.54, 0.03 13.08, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1613.024848018802 3233.2079055489176) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-2.21 27.51, -4.49 22.64, -6.29 18.8 M0.08 32.38 C-1.21 29.64, -2.5 26.9, -6.29 18.8 M-6.29 18.8 C-2.9 18.8, 0.49 18.79, 6.38 18.77 M-6.29 18.8 C-3.5 18.8, -0.71 18.79, 6.38 18.77 M6.38 18.77 C3.98 23.96, 1.58 29.14, 0.08 32.38 M6.38 18.77 C4.16 23.57, 1.94 28.36, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(2122.3983395155738 3233.1635770504945) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.03 11.73, 0.06 23.46, 0.08 32.38 M0 0 C0.02 6.91, 0.03 13.82, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(2122.3983395155738 3233.1635770504945) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-2.23 27.47, -4.54 22.55, -6.29 18.8 M0.08 32.38 C-1.28 29.49, -2.64 26.59, -6.29 18.8 M-6.29 18.8 C-3.46 18.8, -0.63 18.79, 6.38 18.77 M-6.29 18.8 C-1.57 18.79, 3.15 18.78, 6.38 18.77 M6.38 18.77 C4.16 23.58, 1.93 28.38, 0.08 32.38 M6.38 18.77 C4.85 22.09, 3.31 25.4, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1108.645549239125 3233.9218875610986) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.02 7.07, 0.03 14.13, 0.08 32.38 M0 0 C0.02 9.32, 0.04 18.65, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1108.645549239125 3233.9218875610986) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-1.31 29.42, -2.7 26.46, -6.29 18.8 M0.08 32.38 C-1.76 28.47, -3.59 24.56, -6.29 18.8 M-6.29 18.8 C-2.43 18.79, 1.44 18.79, 6.38 18.77 M-6.29 18.8 C-1.74 18.79, 2.82 18.78, 6.38 18.77 M6.38 18.77 C5.02 21.71, 3.66 24.65, 0.08 32.38 M6.38 18.77 C4.29 23.3, 2.19 27.82, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1621.7938922705107 2945.1496476995662) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.03 11.6, 0.05 23.2, 0.08 32.38 M0 0 C0.02 7.86, 0.04 15.72, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1621.7938922705107 2945.1496476995662) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-2.21 27.52, -4.49 22.66, -6.29 18.8 M0.08 32.38 C-1.47 29.09, -3.02 25.79, -6.29 18.8 M-6.29 18.8 C-3.18 18.8, -0.06 18.79, 6.38 18.77 M-6.29 18.8 C-1.86 18.79, 2.57 18.78, 6.38 18.77 M6.38 18.77 C4.65 22.5, 2.93 26.23, 0.08 32.38 M6.38 18.77 C4.19 23.51, 2 28.24, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1620.5175498790995 2796.2548206945667) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.03 11.88, 0.06 23.76, 0.08 32.38 M0 0 C0.03 11.16, 0.05 22.32, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1620.5175498790995 2796.2548206945667) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-2.26 27.4, -4.6 22.42, -6.29 18.8 M0.08 32.38 C-2.12 27.7, -4.31 23.03, -6.29 18.8 M-6.29 18.8 C-1.72 18.79, 2.86 18.78, 6.38 18.77 M-6.29 18.8 C-2.73 18.8, 0.83 18.79, 6.38 18.77 M6.38 18.77 C4.14 23.62, 1.9 28.46, 0.08 32.38 M6.38 18.77 C4.42 23.02, 2.45 27.26, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1110.3662193589298 2947.1957320722213) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.03 12.37, 0.06 24.74, 0.08 32.38 M0 0 C0.03 11.62, 0.05 23.24, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1110.3662193589298 2947.1957320722213) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-2.36 27.2, -4.79 22.01, -6.29 18.8 M0.08 32.38 C-2.21 27.51, -4.5 22.64, -6.29 18.8 M-6.29 18.8 C-3.73 18.8, -1.17 18.79, 6.38 18.77 M-6.29 18.8 C-2.11 18.79, 2.08 18.78, 6.38 18.77 M6.38 18.77 C4.23 23.41, 2.08 28.05, 0.08 32.38 M6.38 18.77 C4.55 22.73, 2.72 26.68, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(1108.798936371637 2798.1438250161264) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0 0 C0.02 6.6, 0.03 13.19, 0.08 32.38 M0 0 C0.03 10.97, 0.05 21.93, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1108.798936371637 2798.1438250161264) rotate(0 0.038183178014151054 16.1918060551468)"><path d="M0.08 32.38 L-6.29 18.8 L6.38 18.77 L0.08 32.38" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.08 32.38 C-1.22 29.62, -2.52 26.85, -6.29 18.8 M0.08 32.38 C-2.08 27.78, -4.24 23.19, -6.29 18.8 M-6.29 18.8 C-1.35 18.79, 3.59 18.78, 6.38 18.77 M-6.29 18.8 C-1.58 18.79, 3.13 18.78, 6.38 18.77 M6.38 18.77 C3.92 24.09, 1.45 29.41, 0.08 32.38 M6.38 18.77 C4.43 22.99, 2.48 27.2, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38 M0.08 32.38 C0.08 32.38, 0.08 32.38, 0.08 32.38" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(1502.9199268090415 4214.683600211826) rotate(0 101.2591732232886 101.2591732232886)"><path d="M202.52 101.26 C202.52 104.37, 202.37 107.5, 202.09 110.6 C201.8 113.7, 201.37 116.8, 200.79 119.87 C200.22 122.93, 199.51 125.97, 198.65 128.97 C197.8 131.97, 196.81 134.93, 195.68 137.84 C194.56 140.74, 193.29 143.61, 191.9 146.39 C190.51 149.18, 188.99 151.92, 187.35 154.57 C185.71 157.21, 183.94 159.8, 182.07 162.28 C180.19 164.77, 178.19 167.18, 176.09 169.48 C173.99 171.78, 171.78 173.99, 169.48 176.09 C167.18 178.19, 164.77 180.19, 162.28 182.07 C159.8 183.94, 157.21 185.71, 154.57 187.35 C151.92 188.99, 149.18 190.51, 146.39 191.9 C143.61 193.29, 140.74 194.56, 137.84 195.68 C134.93 196.81, 131.97 197.8, 128.97 198.65 C125.97 199.51, 122.93 200.22, 119.87 200.79 C116.8 201.37, 113.7 201.8, 110.6 202.09 C107.5 202.37, 104.37 202.52, 101.26 202.52 C98.14 202.52, 95.02 202.37, 91.92 202.09 C88.82 201.8, 85.71 201.37, 82.65 200.79 C79.59 200.22, 76.54 199.51, 73.55 198.65 C70.55 197.8, 67.58 196.81, 64.68 195.68 C61.78 194.56, 58.91 193.29, 56.12 191.9 C53.34 190.51, 50.6 188.99, 47.95 187.35 C45.31 185.71, 42.72 183.94, 40.24 182.07 C37.75 180.19, 35.34 178.19, 33.04 176.09 C30.74 173.99, 28.53 171.78, 26.43 169.48 C24.33 167.18, 22.33 164.77, 20.45 162.28 C18.58 159.8, 16.81 157.21, 15.17 154.57 C13.53 151.92, 12 149.18, 10.62 146.39 C9.23 143.61, 7.96 140.74, 6.84 137.84 C5.71 134.93, 4.72 131.97, 3.87 128.97 C3.01 125.97, 2.3 122.93, 1.72 119.87 C1.15 116.8, 0.72 113.7, 0.43 110.6 C0.14 107.5, 0 104.37, 0 101.26 C0 98.14, 0.14 95.02, 0.43 91.92 C0.72 88.82, 1.15 85.71, 1.72 82.65 C2.3 79.59, 3.01 76.54, 3.87 73.55 C4.72 70.55, 5.71 67.58, 6.84 64.68 C7.96 61.78, 9.23 58.91, 10.62 56.12 C12 53.34, 13.53 50.6, 15.17 47.95 C16.81 45.31, 18.58 42.72, 20.45 40.24 C22.33 37.75, 24.33 35.34, 26.43 33.04 C28.53 30.74, 30.74 28.53, 33.04 26.43 C35.34 24.33, 37.75 22.33, 40.24 20.45 C42.72 18.58, 45.31 16.81, 47.95 15.17 C50.6 13.53, 53.34 12, 56.12 10.62 C58.91 9.23, 61.78 7.96, 64.68 6.84 C67.58 5.71, 70.55 4.72, 73.55 3.87 C76.54 3.01, 79.59 2.3, 82.65 1.72 C85.71 1.15, 88.82 0.72, 91.92 0.43 C95.02 0.14, 98.14 0, 101.26 0 C104.37 0, 107.5 0.14, 110.6 0.43 C113.7 0.72, 116.8 1.15, 119.87 1.72 C122.93 2.3, 125.97 3.01, 128.97 3.87 C131.97 4.72, 134.93 5.71, 137.84 6.84 C140.74 7.96, 143.61 9.23, 146.39 10.62 C149.18 12, 151.92 13.53, 154.57 15.17 C157.21 16.81, 159.8 18.58, 162.28 20.45 C164.77 22.33, 167.18 24.33, 169.48 26.43 C171.78 28.53, 173.99 30.74, 176.09 33.04 C178.19 35.34, 180.19 37.75, 182.07 40.24 C183.94 42.72, 185.71 45.31, 187.35 47.95 C188.99 50.6, 190.51 53.34, 191.9 56.12 C193.29 58.91, 194.56 61.78, 195.68 64.68 C196.81 67.58, 197.8 70.55, 198.65 73.55 C199.51 76.54, 200.22 79.59, 200.79 82.65 C201.37 85.71, 201.8 88.82, 202.09 91.92 C202.37 95.02, 202.45 99.7, 202.52 101.26 C202.59 102.82, 202.59 99.7, 202.52 101.26" stroke="none" stroke-width="0" fill="#b2f2bb"></path><path d="M202.52 101.26 C202.52 104.37, 202.37 107.5, 202.09 110.6 C201.8 113.7, 201.37 116.8, 200.79 119.87 C200.22 122.93, 199.51 125.97, 198.65 128.97 C197.8 131.97, 196.81 134.93, 195.68 137.84 C194.56 140.74, 193.29 143.61, 191.9 146.39 C190.51 149.18, 188.99 151.92, 187.35 154.57 C185.71 157.21, 183.94 159.8, 182.07 162.28 C180.19 164.77, 178.19 167.18, 176.09 169.48 C173.99 171.78, 171.78 173.99, 169.48 176.09 C167.18 178.19, 164.77 180.19, 162.28 182.07 C159.8 183.94, 157.21 185.71, 154.57 187.35 C151.92 188.99, 149.18 190.51, 146.39 191.9 C143.61 193.29, 140.74 194.56, 137.84 195.68 C134.93 196.81, 131.97 197.8, 128.97 198.65 C125.97 199.51, 122.93 200.22, 119.87 200.79 C116.8 201.37, 113.7 201.8, 110.6 202.09 C107.5 202.37, 104.37 202.52, 101.26 202.52 C98.14 202.52, 95.02 202.37, 91.92 202.09 C88.82 201.8, 85.71 201.37, 82.65 200.79 C79.59 200.22, 76.54 199.51, 73.55 198.65 C70.55 197.8, 67.58 196.81, 64.68 195.68 C61.78 194.56, 58.91 193.29, 56.12 191.9 C53.34 190.51, 50.6 188.99, 47.95 187.35 C45.31 185.71, 42.72 183.94, 40.24 182.07 C37.75 180.19, 35.34 178.19, 33.04 176.09 C30.74 173.99, 28.53 171.78, 26.43 169.48 C24.33 167.18, 22.33 164.77, 20.45 162.28 C18.58 159.8, 16.81 157.21, 15.17 154.57 C13.53 151.92, 12 149.18, 10.62 146.39 C9.23 143.61, 7.96 140.74, 6.84 137.84 C5.71 134.93, 4.72 131.97, 3.87 128.97 C3.01 125.97, 2.3 122.93, 1.72 119.87 C1.15 116.8, 0.72 113.7, 0.43 110.6 C0.14 107.5, 0 104.37, 0 101.26 C0 98.14, 0.14 95.02, 0.43 91.92 C0.72 88.82, 1.15 85.71, 1.72 82.65 C2.3 79.59, 3.01 76.54, 3.87 73.55 C4.72 70.55, 5.71 67.58, 6.84 64.68 C7.96 61.78, 9.23 58.91, 10.62 56.12 C12 53.34, 13.53 50.6, 15.17 47.95 C16.81 45.31, 18.58 42.72, 20.45 40.24 C22.33 37.75, 24.33 35.34, 26.43 33.04 C28.53 30.74, 30.74 28.53, 33.04 26.43 C35.34 24.33, 37.75 22.33, 40.24 20.45 C42.72 18.58, 45.31 16.81, 47.95 15.17 C50.6 13.53, 53.34 12, 56.12 10.62 C58.91 9.23, 61.78 7.96, 64.68 6.84 C67.58 5.71, 70.55 4.72, 73.55 3.87 C76.54 3.01, 79.59 2.3, 82.65 1.72 C85.71 1.15, 88.82 0.72, 91.92 0.43 C95.02 0.14, 98.14 0, 101.26 0 C104.37 0, 107.5 0.14, 110.6 0.43 C113.7 0.72, 116.8 1.15, 119.87 1.72 C122.93 2.3, 125.97 3.01, 128.97 3.87 C131.97 4.72, 134.93 5.71, 137.84 6.84 C140.74 7.96, 143.61 9.23, 146.39 10.62 C149.18 12, 151.92 13.53, 154.57 15.17 C157.21 16.81, 159.8 18.58, 162.28 20.45 C164.77 22.33, 167.18 24.33, 169.48 26.43 C171.78 28.53, 173.99 30.74, 176.09 33.04 C178.19 35.34, 180.19 37.75, 182.07 40.24 C183.94 42.72, 185.71 45.31, 187.35 47.95 C188.99 50.6, 190.51 53.34, 191.9 56.12 C193.29 58.91, 194.56 61.78, 195.68 64.68 C196.81 67.58, 197.8 70.55, 198.65 73.55 C199.51 76.54, 200.22 79.59, 200.79 82.65 C201.37 85.71, 201.8 88.82, 202.09 91.92 C202.37 95.02, 202.45 99.7, 202.52 101.26 C202.59 102.82, 202.59 99.7, 202.52 101.26" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1546.8781313345025 4275.841725391584) rotate(0 57.199920654296875 40)"><text x="57.199920654296875" y="14" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">User is</text><text x="57.199920654296875" y="34" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">considered</text><text x="57.199920654296875" y="54" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">authenticated</text><text x="57.199920654296875" y="74" font-family="Comic Shanns, monospace, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">at this point</text></g></svg>
\ No newline at end of file
diff --git a/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts
index 8e3867d1b36..26ae1270f39 100644
--- a/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts
@@ -5,12 +5,12 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { IdentityTwoFactorResponse } from "@bitwarden/common/auth/models/response/identity-two-factor.response";
 import { MasterPasswordPolicyResponse } from "@bitwarden/common/auth/models/response/master-password-policy.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
@@ -119,7 +119,7 @@ describe("PasswordLoginStrategy", () => {
       sub: userId,
     });
 
-    loginStrategyService.makePreloginKey.mockResolvedValue(masterKey);
+    loginStrategyService.makePasswordPreLoginMasterKey.mockResolvedValue(masterKey);
 
     keyService.hashMasterKey
       .calledWith(masterPassword, expect.anything(), undefined)
diff --git a/libs/auth/src/common/login-strategies/password-login.strategy.ts b/libs/auth/src/common/login-strategies/password-login.strategy.ts
index 3482e73d5d7..829351cc88f 100644
--- a/libs/auth/src/common/login-strategies/password-login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/password-login.strategy.ts
@@ -79,7 +79,10 @@ export class PasswordLoginStrategy extends LoginStrategy {
     const { email, masterPassword, twoFactor } = credentials;
 
     const data = new PasswordLoginStrategyData();
-    data.masterKey = await this.loginStrategyService.makePreloginKey(masterPassword, email);
+    data.masterKey = await this.loginStrategyService.makePasswordPreLoginMasterKey(
+      masterPassword,
+      email,
+    );
     data.userEnteredEmail = email;
 
     // Hash the password early (before authentication) so we don't persist it in memory in plaintext
diff --git a/libs/auth/src/common/login-strategies/sso-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/sso-login.strategy.spec.ts
index bce05b35e62..acbb680ae6d 100644
--- a/libs/auth/src/common/login-strategies/sso-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/sso-login.strategy.spec.ts
@@ -3,12 +3,12 @@ import { BehaviorSubject, of } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { AdminAuthRequestStorable } from "@bitwarden/common/auth/models/domain/admin-auth-req-storable";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { IUserDecryptionOptionsServerResponse } from "@bitwarden/common/auth/models/response/user-decryption-options/user-decryption-options.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncryptedString } from "@bitwarden/common/key-management/crypto/models/enc-string";
@@ -134,7 +134,9 @@ describe("SsoLoginStrategy", () => {
     );
 
     const userDecryptionOptions = new UserDecryptionOptions();
-    userDecryptionOptionsService.userDecryptionOptions$ = of(userDecryptionOptions);
+    userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
+      of(userDecryptionOptions),
+    );
 
     ssoLoginStrategy = new SsoLoginStrategy(
       {} as SsoLoginStrategyData,
diff --git a/libs/auth/src/common/login-strategies/sso-login.strategy.ts b/libs/auth/src/common/login-strategies/sso-login.strategy.ts
index ec7914b087e..d806f6d733e 100644
--- a/libs/auth/src/common/login-strategies/sso-login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/sso-login.strategy.ts
@@ -393,7 +393,7 @@ export class SsoLoginStrategy extends LoginStrategy {
 
     // Check for TDE-related conditions
     const userDecryptionOptions = await firstValueFrom(
-      this.userDecryptionOptionsService.userDecryptionOptions$,
+      this.userDecryptionOptionsService.userDecryptionOptionsById$(userId),
     );
 
     if (!userDecryptionOptions) {
diff --git a/libs/auth/src/common/login-strategies/user-api-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/user-api-login.strategy.spec.ts
index a6446401f70..9bf282dee11 100644
--- a/libs/auth/src/common/login-strategies/user-api-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/user-api-login.strategy.spec.ts
@@ -3,7 +3,7 @@ import { BehaviorSubject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
diff --git a/libs/auth/src/common/login-strategies/webauthn-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/webauthn-login.strategy.spec.ts
index f5ba2d0be23..53bc1c57905 100644
--- a/libs/auth/src/common/login-strategies/webauthn-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/webauthn-login.strategy.spec.ts
@@ -3,11 +3,11 @@ import { BehaviorSubject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { IUserDecryptionOptionsServerResponse } from "@bitwarden/common/auth/models/response/user-decryption-options/user-decryption-options.response";
 import { WebAuthnLoginAssertionResponseRequest } from "@bitwarden/common/auth/services/webauthn-login/request/webauthn-login-assertion-response.request";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
@@ -75,7 +75,7 @@ describe("WebAuthnLoginStrategy", () => {
 
     // We must do this to make the mocked classes available for all the
     // assertCredential(...) tests.
-    global.PublicKeyCredential = MockPublicKeyCredential;
+    global.PublicKeyCredential = MockPublicKeyCredential as any;
     global.AuthenticatorAssertionResponse = MockAuthenticatorAssertionResponse;
   });
 
@@ -397,4 +397,8 @@ export class MockPublicKeyCredential implements PublicKeyCredential {
   static isUserVerifyingPlatformAuthenticatorAvailable(): Promise<boolean> {
     return Promise.resolve(false);
   }
+
+  toJSON() {
+    throw new Error("Method not implemented.");
+  }
 }
diff --git a/libs/auth/src/common/models/domain/index.ts b/libs/auth/src/common/models/domain/index.ts
index b8b83711a4a..cebfa847569 100644
--- a/libs/auth/src/common/models/domain/index.ts
+++ b/libs/auth/src/common/models/domain/index.ts
@@ -1,3 +1,2 @@
-export * from "./rotateable-key-set";
 export * from "./login-credentials";
 export * from "./user-decryption-options";
diff --git a/libs/auth/src/common/models/domain/rotateable-key-set.ts b/libs/auth/src/common/models/domain/rotateable-key-set.ts
deleted file mode 100644
index 7578a4e9754..00000000000
--- a/libs/auth/src/common/models/domain/rotateable-key-set.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { PrfKey } from "@bitwarden/common/types/key";
-
-declare const tag: unique symbol;
-
-/**
- * A set of keys where a `UserKey` is protected by an encrypted public/private key-pair.
- * The `UserKey` is used to encrypt/decrypt data, while the public/private key-pair is
- * used to rotate the `UserKey`.
- *
- * The `PrivateKey` is protected by an `ExternalKey`, such as a `DeviceKey`, or `PrfKey`,
- * and the `PublicKey` is protected by the `UserKey`. This setup allows:
- *
- *   - Access to `UserKey` by knowing the `ExternalKey`
- *   - Rotation to a `NewUserKey` by knowing the current `UserKey`,
- *     without needing access to the `ExternalKey`
- */
-export class RotateableKeySet<ExternalKey extends SymmetricCryptoKey = SymmetricCryptoKey> {
-  private readonly [tag]: ExternalKey;
-
-  constructor(
-    /** PublicKey encrypted UserKey */
-    readonly encryptedUserKey: EncString,
-
-    /** UserKey encrypted PublicKey */
-    readonly encryptedPublicKey: EncString,
-
-    /** ExternalKey encrypted PrivateKey */
-    readonly encryptedPrivateKey?: EncString,
-  ) {}
-}
-
-export type PrfKeySet = RotateableKeySet<PrfKey>;
diff --git a/libs/auth/src/common/services/accounts/lock.service.ts b/libs/auth/src/common/services/accounts/lock.service.ts
index 1f42873408d..7db9331ffc2 100644
--- a/libs/auth/src/common/services/accounts/lock.service.ts
+++ b/libs/auth/src/common/services/accounts/lock.service.ts
@@ -1,20 +1,55 @@
-import { combineLatest, firstValueFrom, map } from "rxjs";
+import { combineLatest, filter, firstValueFrom, map, timeout } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { assertNonNullish } from "@bitwarden/common/auth/utils";
+import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
 import { 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 { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
+import { BiometricsService, KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+import { StateEventRunnerService } from "@bitwarden/state";
+
+import { LogoutService } from "../../abstractions";
 
 export abstract class LockService {
   /**
    * Locks all accounts.
    */
   abstract lockAll(): Promise<void>;
+  /**
+   * Performs lock for a user.
+   * @param userId The user id to lock
+   */
+  abstract lock(userId: UserId): Promise<void>;
+
+  abstract runPlatformOnLockActions(): Promise<void>;
 }
 
 export class DefaultLockService implements LockService {
   constructor(
     private readonly accountService: AccountService,
-    private readonly vaultTimeoutService: VaultTimeoutService,
+    private readonly biometricService: BiometricsService,
+    private readonly vaultTimeoutSettingsService: VaultTimeoutSettingsService,
+    private readonly logoutService: LogoutService,
+    private readonly messagingService: MessagingService,
+    private readonly searchService: SearchService,
+    private readonly folderService: FolderService,
+    private readonly masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    private readonly stateEventRunnerService: StateEventRunnerService,
+    private readonly cipherService: CipherService,
+    private readonly authService: AuthService,
+    private readonly systemService: SystemService,
+    private readonly processReloadService: ProcessReloadServiceAbstraction,
+    private readonly logService: LogService,
+    private readonly keyService: KeyService,
   ) {}
 
   async lockAll() {
@@ -36,14 +71,88 @@ export class DefaultLockService implements LockService {
     );
 
     for (const otherAccount of accounts.otherAccounts) {
-      await this.vaultTimeoutService.lock(otherAccount);
+      await this.lock(otherAccount);
     }
 
     // Do the active account last in case we ever try to route the user on lock
     // that way this whole operation will be complete before that routing
     // could take place.
     if (accounts.activeAccount != null) {
-      await this.vaultTimeoutService.lock(accounts.activeAccount);
+      await this.lock(accounts.activeAccount);
     }
   }
+
+  async lock(userId: UserId): Promise<void> {
+    assertNonNullish(userId, "userId", "LockService");
+
+    this.logService.info(`[LockService] Locking user ${userId}`);
+
+    // If user already logged out, then skip locking
+    if (
+      (await firstValueFrom(this.authService.authStatusFor$(userId))) ===
+      AuthenticationStatus.LoggedOut
+    ) {
+      return;
+    }
+
+    // If user cannot lock, then logout instead
+    if (!(await this.vaultTimeoutSettingsService.canLock(userId))) {
+      // Logout should perform the same steps
+      await this.logoutService.logout(userId, "vaultTimeout");
+      this.logService.info(`[LockService] User ${userId} cannot lock, logging out instead.`);
+      return;
+    }
+
+    await this.wipeDecryptedState(userId);
+    await this.waitForLockedStatus(userId);
+    await this.systemService.clearPendingClipboard();
+    await this.runPlatformOnLockActions();
+
+    this.logService.info(`[LockService] Locked user ${userId}`);
+
+    // Subscribers navigate the client to the lock screen based on this lock message.
+    // We need to disable auto-prompting as we are just entering a locked state now.
+    await this.biometricService.setShouldAutopromptNow(false);
+    this.messagingService.send("locked", { userId });
+
+    // Wipe the current process to clear active secrets in memory.
+    await this.processReloadService.startProcessReload();
+  }
+
+  private async wipeDecryptedState(userId: UserId) {
+    // Manually clear state
+    await this.searchService.clearIndex(userId);
+    //! DO NOT REMOVE folderService.clearDecryptedFolderState ! For more information see PM-25660
+    await this.folderService.clearDecryptedFolderState(userId);
+    await this.masterPasswordService.clearMasterKey(userId);
+    await this.cipherService.clearCache(userId);
+    // Clear CLI unlock state
+    await this.keyService.clearStoredUserKey(userId);
+
+    // This will clear ephemeral state such as the user's user key based on the key definition's clear-on
+    await this.stateEventRunnerService.handleEvent("lock", userId);
+  }
+
+  private async waitForLockedStatus(userId: UserId): Promise<void> {
+    // HACK: Start listening for the transition of the locking user from something to the locked state.
+    // This is very much a hack to ensure that the authentication status to retrievable right after
+    // it does its work. Particularly and `"locked"` message. Instead the message should be deprecated
+    // and people should subscribe and react to `authStatusFor$` themselves.
+    await firstValueFrom(
+      this.authService.authStatusFor$(userId).pipe(
+        filter((authStatus) => authStatus === AuthenticationStatus.Locked),
+        timeout({
+          first: 5_000,
+          with: () => {
+            throw new Error("The lock process did not complete in a reasonable amount of time.");
+          },
+        }),
+      ),
+    );
+  }
+
+  async runPlatformOnLockActions(): Promise<void> {
+    // No platform specific actions to run for this platform.
+    return;
+  }
 }
diff --git a/libs/auth/src/common/services/accounts/lock.services.spec.ts b/libs/auth/src/common/services/accounts/lock.services.spec.ts
index 27310298028..e22a6f71581 100644
--- a/libs/auth/src/common/services/accounts/lock.services.spec.ts
+++ b/libs/auth/src/common/services/accounts/lock.services.spec.ts
@@ -1,8 +1,23 @@
 import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
 
-import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
 import { mockAccountServiceWith } from "@bitwarden/common/spec";
 import { 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 { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
+import { BiometricsService, KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+import { StateEventRunnerService } from "@bitwarden/state";
+
+import { LogoutService } from "../../abstractions";
 
 import { DefaultLockService } from "./lock.service";
 
@@ -12,10 +27,57 @@ describe("DefaultLockService", () => {
   const mockUser3 = "user3" as UserId;
 
   const accountService = mockAccountServiceWith(mockUser1);
-  const vaultTimeoutService = mock<VaultTimeoutService>();
+  const biometricsService = mock<BiometricsService>();
+  const vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
+  const logoutService = mock<LogoutService>();
+  const messagingService = mock<MessagingService>();
+  const searchService = mock<SearchService>();
+  const folderService = mock<FolderService>();
+  const masterPasswordService = mock<InternalMasterPasswordServiceAbstraction>();
+  const stateEventRunnerService = mock<StateEventRunnerService>();
+  const cipherService = mock<CipherService>();
+  const authService = mock<AuthService>();
+  const systemService = mock<SystemService>();
+  const processReloadService = mock<ProcessReloadServiceAbstraction>();
+  const logService = mock<LogService>();
+  const keyService = mock<KeyService>();
+  const sut = new DefaultLockService(
+    accountService,
+    biometricsService,
+    vaultTimeoutSettingsService,
+    logoutService,
+    messagingService,
+    searchService,
+    folderService,
+    masterPasswordService,
+    stateEventRunnerService,
+    cipherService,
+    authService,
+    systemService,
+    processReloadService,
+    logService,
+    keyService,
+  );
 
-  const sut = new DefaultLockService(accountService, vaultTimeoutService);
   describe("lockAll", () => {
+    const sut = new DefaultLockService(
+      accountService,
+      biometricsService,
+      vaultTimeoutSettingsService,
+      logoutService,
+      messagingService,
+      searchService,
+      folderService,
+      masterPasswordService,
+      stateEventRunnerService,
+      cipherService,
+      authService,
+      systemService,
+      processReloadService,
+      logService,
+      keyService,
+    );
+
     it("locks the active account last", async () => {
       await accountService.addAccount(mockUser2, {
         name: "name2",
@@ -25,19 +87,49 @@ describe("DefaultLockService", () => {
 
       await accountService.addAccount(mockUser3, {
         name: "name3",
-        email: "email3@example.com",
+        email: "name3@example.com",
         emailVerified: false,
       });
 
+      const lockSpy = jest.spyOn(sut, "lock").mockResolvedValue(undefined);
+
       await sut.lockAll();
 
-      expect(vaultTimeoutService.lock).toHaveBeenCalledTimes(3);
       // Non-Active users should be called first
-      expect(vaultTimeoutService.lock).toHaveBeenNthCalledWith(1, mockUser2);
-      expect(vaultTimeoutService.lock).toHaveBeenNthCalledWith(2, mockUser3);
+      expect(lockSpy).toHaveBeenNthCalledWith(1, mockUser2);
+      expect(lockSpy).toHaveBeenNthCalledWith(2, mockUser3);
 
       // Active user should be called last
-      expect(vaultTimeoutService.lock).toHaveBeenNthCalledWith(3, mockUser1);
+      expect(lockSpy).toHaveBeenNthCalledWith(3, mockUser1);
+    });
+  });
+
+  describe("lock", () => {
+    const userId = mockUser1;
+
+    it("returns early if user is already logged out", async () => {
+      authService.authStatusFor$.mockReturnValue(of(AuthenticationStatus.LoggedOut));
+      await sut.lock(userId);
+      // Should return early, not call logoutService.logout
+      expect(logoutService.logout).not.toHaveBeenCalled();
+      expect(stateEventRunnerService.handleEvent).not.toHaveBeenCalled();
+    });
+
+    it("logs out if user cannot lock", async () => {
+      authService.authStatusFor$.mockReturnValue(of(AuthenticationStatus.Unlocked));
+      vaultTimeoutSettingsService.canLock.mockResolvedValue(false);
+      await sut.lock(userId);
+      expect(logoutService.logout).toHaveBeenCalledWith(userId, "vaultTimeout");
+      expect(stateEventRunnerService.handleEvent).not.toHaveBeenCalled();
+    });
+
+    it("locks user", async () => {
+      authService.authStatusFor$.mockReturnValue(of(AuthenticationStatus.Locked));
+      logoutService.logout.mockClear();
+      vaultTimeoutSettingsService.canLock.mockResolvedValue(true);
+      await sut.lock(userId);
+      expect(logoutService.logout).not.toHaveBeenCalled();
+      expect(stateEventRunnerService.handleEvent).toHaveBeenCalledWith("lock", userId);
     });
   });
 });
diff --git a/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts b/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts
index 69f38f40989..8cb0cc279ae 100644
--- a/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts
+++ b/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts
@@ -1,7 +1,8 @@
 import { mock } from "jest-mock-extended";
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, of } from "rxjs";
 
 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 { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
@@ -9,11 +10,11 @@ import { FakeMasterPasswordService } from "@bitwarden/common/key-management/mast
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { AuthRequestPushNotification } from "@bitwarden/common/models/response/notification.response";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { UserId } from "@bitwarden/common/types/guid";
 import { MasterKey, UserKey } from "@bitwarden/common/types/key";
+import { newGuid } from "@bitwarden/guid";
 import { KeyService } from "@bitwarden/key-management";
 
 import { DefaultAuthRequestApiService } from "./auth-request-api.service";
@@ -29,10 +30,11 @@ describe("AuthRequestService", () => {
   const encryptService = mock<EncryptService>();
   const apiService = mock<ApiService>();
   const authRequestApiService = mock<DefaultAuthRequestApiService>();
+  const accountService = mock<AccountService>();
 
   let mockPrivateKey: Uint8Array;
   let mockPublicKey: Uint8Array;
-  const mockUserId = Utils.newGuid() as UserId;
+  const mockUserId = newGuid() as UserId;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -46,6 +48,7 @@ describe("AuthRequestService", () => {
       apiService,
       stateProvider,
       authRequestApiService,
+      accountService,
     );
 
     mockPrivateKey = new Uint8Array(64);
@@ -95,6 +98,8 @@ describe("AuthRequestService", () => {
       const authRequestNoId = new AuthRequestResponse({ id: "", key: "KEY" });
       const authRequestNoPublicKey = new AuthRequestResponse({ id: "123", publicKey: "" });
 
+      accountService.activeAccount$ = of({ id: mockUserId } as any);
+
       await expect(sut.approveOrDenyAuthRequest(true, authRequestNoId)).rejects.toThrow(
         "Auth request has no id",
       );
@@ -104,8 +109,9 @@ describe("AuthRequestService", () => {
     });
 
     it("should use the user key if the master key and hash do not exist", async () => {
-      keyService.getUserKey.mockResolvedValueOnce(
-        new SymmetricCryptoKey(new Uint8Array(64)) as UserKey,
+      accountService.activeAccount$ = of({ id: mockUserId } as any);
+      keyService.userKey$.mockReturnValue(
+        of(new SymmetricCryptoKey(new Uint8Array(64)) as UserKey),
       );
 
       await sut.approveOrDenyAuthRequest(
diff --git a/libs/auth/src/common/services/auth-request/auth-request.service.ts b/libs/auth/src/common/services/auth-request/auth-request.service.ts
index 5fc28e960a8..ba4b9eaf174 100644
--- a/libs/auth/src/common/services/auth-request/auth-request.service.ts
+++ b/libs/auth/src/common/services/auth-request/auth-request.service.ts
@@ -4,9 +4,11 @@ import { Observable, Subject, defer, firstValueFrom, map } from "rxjs";
 import { Jsonify } from "type-fest";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AdminAuthRequestStorable } from "@bitwarden/common/auth/models/domain/admin-auth-req-storable";
 import { PasswordlessAuthRequest } from "@bitwarden/common/auth/models/request/passwordless-auth.request";
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
+import { getUserId } from "@bitwarden/common/auth/services/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 { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
@@ -56,6 +58,7 @@ export class AuthRequestService implements AuthRequestServiceAbstraction {
     private apiService: ApiService,
     private stateProvider: StateProvider,
     private authRequestApiService: AuthRequestApiServiceAbstraction,
+    private accountService: AccountService,
   ) {
     this.authRequestPushNotification$ = this.authRequestPushNotificationSubject.asObservable();
     this.adminLoginApproved$ = this.adminLoginApprovedSubject.asObservable();
@@ -124,15 +127,19 @@ export class AuthRequestService implements AuthRequestServiceAbstraction {
     approve: boolean,
     authRequest: AuthRequestResponse,
   ): Promise<AuthRequestResponse> {
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
     if (!authRequest.id) {
       throw new Error("Auth request has no id");
     }
     if (!authRequest.publicKey) {
       throw new Error("Auth request has no public key");
     }
+    if (activeUserId == null) {
+      throw new Error("User ID is required");
+    }
     const pubKey = Utils.fromB64ToArray(authRequest.publicKey);
-
-    const keyToEncrypt = await this.keyService.getUserKey();
+    const keyToEncrypt = await firstValueFrom(this.keyService.userKey$(activeUserId));
     const encryptedKey = await this.encryptService.encapsulateKeyUnsigned(keyToEncrypt, pubKey);
 
     const response = new PasswordlessAuthRequest(
diff --git a/libs/auth/src/common/services/auth-request/default-login-via-auth-request-cache.service.ts b/libs/auth/src/common/services/auth-request/default-login-via-auth-request-cache.service.ts
index 80dbafd3159..8b947c41c46 100644
--- a/libs/auth/src/common/services/auth-request/default-login-via-auth-request-cache.service.ts
+++ b/libs/auth/src/common/services/auth-request/default-login-via-auth-request-cache.service.ts
@@ -16,7 +16,7 @@ const LOGIN_VIA_AUTH_CACHE_KEY = "login-via-auth-request-form-cache";
 export class LoginViaAuthRequestCacheService {
   private viewCacheService: ViewCacheService = inject(ViewCacheService);
 
-  private defaultLoginViaAuthRequestCache: WritableSignal<LoginViaAuthRequestView | null> =
+  private readonly defaultLoginViaAuthRequestCache: WritableSignal<LoginViaAuthRequestView | null> =
     this.viewCacheService.signal<LoginViaAuthRequestView | null>({
       key: LOGIN_VIA_AUTH_CACHE_KEY,
       initialValue: null,
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.spec.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.spec.ts
index 8ddee96dd57..831692c160f 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.spec.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.spec.ts
@@ -4,13 +4,13 @@ import { BehaviorSubject } from "rxjs";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { IdentityTwoFactorResponse } from "@bitwarden/common/auth/models/response/identity-two-factor.response";
 import { PreloginResponse } from "@bitwarden/common/auth/models/response/prelogin.response";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
@@ -37,7 +37,13 @@ import {
 } from "@bitwarden/common/spec";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { UserId } from "@bitwarden/common/types/guid";
-import { KdfConfigService, KdfType, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
+import {
+  Argon2KdfConfig,
+  KdfConfigService,
+  KdfType,
+  KeyService,
+  PBKDF2KdfConfig,
+} from "@bitwarden/key-management";
 
 import {
   AuthRequestServiceAbstraction,
@@ -158,6 +164,321 @@ describe("LoginStrategyService", () => {
     );
   });
 
+  describe("PM23801_PrefetchPasswordPrelogin", () => {
+    describe("Flag On", () => {
+      it("prefetches and caches KDF, then makePrePasswordLoginMasterKey uses cached", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const email = "a@a.com";
+        apiService.postPrelogin.mockResolvedValue(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        await sut.getPasswordPrelogin(email);
+
+        await sut.makePasswordPreLoginMasterKey("pw", email);
+
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(1);
+        const calls = keyService.makeMasterKey.mock.calls as any[];
+        expect(calls[0][2]).toBeInstanceOf(PBKDF2KdfConfig);
+        expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+          "pw",
+          email.trim().toLowerCase(),
+          expect.any(PBKDF2KdfConfig),
+        );
+      });
+
+      it("awaits in-flight prelogin promise in makePrePasswordLoginMasterKey", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const email = "a@a.com";
+        let resolveFn: (v: any) => void;
+        const deferred = new Promise<PreloginResponse>((resolve) => (resolveFn = resolve));
+        apiService.postPrelogin.mockReturnValue(deferred as any);
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        void sut.getPasswordPrelogin(email);
+
+        const makeKeyPromise = sut.makePasswordPreLoginMasterKey("pw", email);
+
+        // Resolve after makePrePasswordLoginMasterKey has started awaiting
+        resolveFn!(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+
+        await makeKeyPromise;
+
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(1);
+        expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+          "pw",
+          email,
+          expect.any(PBKDF2KdfConfig),
+        );
+      });
+
+      it("no cache and no in-flight request", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const email = "a@a.com";
+        apiService.postPrelogin.mockResolvedValue(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        await sut.makePasswordPreLoginMasterKey("pw", email);
+
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(1);
+        expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+          "pw",
+          email,
+          expect.any(PBKDF2KdfConfig),
+        );
+      });
+
+      it("falls back to API call when prefetched email differs", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const emailPrefetched = "a@a.com";
+        const emailUsed = "b@b.com";
+
+        // Prefetch for A
+        apiService.postPrelogin.mockResolvedValueOnce(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+        await sut.getPasswordPrelogin(emailPrefetched);
+
+        // makePrePasswordLoginMasterKey for B (forces new API call) -> Argon2
+        apiService.postPrelogin.mockResolvedValueOnce(
+          new PreloginResponse({
+            Kdf: KdfType.Argon2id,
+            KdfIterations: 2,
+            KdfMemory: 16,
+            KdfParallelism: 1,
+          }),
+        );
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        await sut.makePasswordPreLoginMasterKey("pw", emailUsed);
+
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(2);
+        const calls = keyService.makeMasterKey.mock.calls as any[];
+        expect(calls[calls.length - 1][2]).toBeInstanceOf(Argon2KdfConfig);
+      });
+
+      it("ignores stale prelogin resolution for older email (versioning)", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const emailA = "a@a.com";
+        const emailB = "b@b.com";
+
+        let resolveA!: (v: any) => void;
+        let resolveB!: (v: any) => void;
+        const deferredA = new Promise<PreloginResponse>((res) => (resolveA = res));
+        const deferredB = new Promise<PreloginResponse>((res) => (resolveB = res));
+
+        // First call returns A, second returns B
+        apiService.postPrelogin.mockImplementationOnce(() => deferredA as any);
+        apiService.postPrelogin.mockImplementationOnce(() => deferredB as any);
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        // Start A prefetch, then B prefetch (B supersedes A)
+        void sut.getPasswordPrelogin(emailA);
+        void sut.getPasswordPrelogin(emailB);
+
+        // Resolve A (stale) to PBKDF2, then B to Argon2
+        resolveA(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+        resolveB(
+          new PreloginResponse({
+            Kdf: KdfType.Argon2id,
+            KdfIterations: 2,
+            KdfMemory: 16,
+            KdfParallelism: 1,
+          }),
+        );
+
+        await sut.makePasswordPreLoginMasterKey("pwB", emailB);
+
+        // Ensure B's Argon2 config is used and stale A doesn't overwrite
+        const calls = keyService.makeMasterKey.mock.calls as any[];
+        const argB = calls.find((c) => c[0] === "pwB")[2];
+        expect(argB).toBeInstanceOf(Argon2KdfConfig);
+      });
+
+      it("handles concurrent getPasswordPrelogin calls for same email; uses latest result", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const email = "a@a.com";
+        let resolve1!: (v: any) => void;
+        let resolve2!: (v: any) => void;
+        const deferred1 = new Promise<PreloginResponse>((res) => (resolve1 = res));
+        const deferred2 = new Promise<PreloginResponse>((res) => (resolve2 = res));
+
+        apiService.postPrelogin.mockImplementationOnce(() => deferred1 as any);
+        apiService.postPrelogin.mockImplementationOnce(() => deferred2 as any);
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        void sut.getPasswordPrelogin(email);
+        void sut.getPasswordPrelogin(email);
+
+        // First resolves to PBKDF2, second resolves to Argon2 (latest wins)
+        resolve1(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+        resolve2(
+          new PreloginResponse({
+            Kdf: KdfType.Argon2id,
+            KdfIterations: 2,
+            KdfMemory: 16,
+            KdfParallelism: 1,
+          }),
+        );
+
+        await sut.makePasswordPreLoginMasterKey("pw", email);
+
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(2);
+        const calls = keyService.makeMasterKey.mock.calls as any[];
+        expect(calls[0][2]).toBeInstanceOf(Argon2KdfConfig);
+      });
+
+      it("does not throw when prefetch network error occurs; fallback works in makePrePasswordLoginMasterKey", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const email = "a@a.com";
+
+        // Prefetch throws non-404 error
+        const err: any = new Error("network");
+        err.statusCode = 500;
+        apiService.postPrelogin.mockRejectedValueOnce(err);
+
+        await expect(sut.getPasswordPrelogin(email)).resolves.toBeUndefined();
+
+        // makePrePasswordLoginMasterKey falls back to a new API call which succeeds
+        apiService.postPrelogin.mockResolvedValueOnce(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        await sut.makePasswordPreLoginMasterKey("pw", email);
+
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(2);
+        const calls = keyService.makeMasterKey.mock.calls as any[];
+        expect(calls[0][2]).toBeInstanceOf(PBKDF2KdfConfig);
+      });
+
+      it("treats 404 as null prefetch and falls back in makePrePasswordLoginMasterKey", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const email = "a@a.com";
+
+        const notFound: any = new Error("not found");
+        notFound.statusCode = 404;
+        apiService.postPrelogin.mockRejectedValueOnce(notFound);
+
+        await sut.getPasswordPrelogin(email);
+
+        // Fallback call on makePrePasswordLoginMasterKey
+        apiService.postPrelogin.mockResolvedValueOnce(
+          new PreloginResponse({
+            Kdf: KdfType.Argon2id,
+            KdfIterations: 2,
+            KdfMemory: 16,
+            KdfParallelism: 1,
+          }),
+        );
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        await sut.makePasswordPreLoginMasterKey("pw", email);
+
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(2);
+        const calls = keyService.makeMasterKey.mock.calls as any[];
+        expect(calls[0][2]).toBeInstanceOf(Argon2KdfConfig);
+      });
+
+      it("awaits rejected current prelogin promise and then falls back in makePrePasswordLoginMasterKey", async () => {
+        configService.getFeatureFlag.mockResolvedValue(true);
+
+        const email = "a@a.com";
+        const err: any = new Error("network");
+        err.statusCode = 500;
+        let rejectFn!: (e: any) => void;
+        const deferred = new Promise<PreloginResponse>((_res, rej) => (rejectFn = rej));
+        apiService.postPrelogin.mockReturnValueOnce(deferred as any);
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        void sut.getPasswordPrelogin(email);
+        const makeKey = sut.makePasswordPreLoginMasterKey("pw", email);
+
+        rejectFn(err);
+
+        // Fallback call succeeds
+        apiService.postPrelogin.mockResolvedValueOnce(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+
+        await makeKey;
+
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(2);
+        const calls = keyService.makeMasterKey.mock.calls as any[];
+        expect(calls[0][2]).toBeInstanceOf(PBKDF2KdfConfig);
+      });
+    });
+
+    describe("Flag Off", () => {
+      // remove when pm-23801 feature flag comes out
+      it("uses legacy API path", async () => {
+        configService.getFeatureFlag.mockResolvedValue(false);
+
+        const email = "a@a.com";
+        // prefetch shouldn't affect behavior when flag off
+        apiService.postPrelogin.mockResolvedValue(
+          new PreloginResponse({
+            Kdf: KdfType.PBKDF2_SHA256,
+            KdfIterations: PBKDF2KdfConfig.PRELOGIN_ITERATIONS_MIN,
+          }),
+        );
+        keyService.makeMasterKey.mockResolvedValue({} as any);
+
+        await sut.getPasswordPrelogin(email);
+        await sut.makePasswordPreLoginMasterKey("pw", email);
+
+        // Called twice: once for prefetch, once for legacy path in makePrePasswordLoginMasterKey
+        expect(apiService.postPrelogin).toHaveBeenCalledTimes(2);
+        expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+          "pw",
+          email,
+          expect.any(PBKDF2KdfConfig),
+        );
+      });
+    });
+  });
+
   it("should return an AuthResult on successful login", async () => {
     const credentials = new PasswordLoginCredentials("EMAIL", "MASTER_PASSWORD");
     apiService.postIdentityToken.mockResolvedValue(
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index 6900e5e5872..5720fce254e 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -13,11 +13,12 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { AuthenticationType } from "@bitwarden/common/auth/enums/authentication-type";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
+import { TwoFactorService } from "@bitwarden/common/auth/two-factor";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
@@ -92,6 +93,32 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
   private authRequestPushNotificationState: GlobalState<string | null>;
   private authenticationTimeoutSubject = new BehaviorSubject<boolean>(false);
 
+  // Prefetched password prelogin
+  //
+  // About versioning:
+  // Users can quickly change emails (e.g., continue with user1, go back, continue with user2)
+  // which triggers overlapping async prelogin requests. We use a monotonically increasing
+  // "version" to associate each prelogin attempt with the state at the time it was started.
+  // Only if BOTH the email and the version still match when the promise resolves do we commit
+  // the resulting KDF config or clear the in-flight promise. This prevents stale results from
+  // user1 overwriting user2's state in race conditions.
+  private passwordPrelogin: {
+    email: string | null;
+    kdfConfig: KdfConfig | null;
+    promise: Promise<KdfConfig | null> | null;
+    /**
+     * Version guard for prelogin attempts.
+     * Incremented at the start of getPasswordPrelogin for each new submission.
+     * Used to ignore stale async resolutions when email changes mid-flight.
+     */
+    version: number;
+  } = {
+    email: null,
+    kdfConfig: null,
+    promise: null,
+    version: 0,
+  };
+
   authenticationSessionTimeout$: Observable<boolean> =
     this.authenticationTimeoutSubject.asObservable();
 
@@ -308,33 +335,106 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     }
   }
 
-  async makePreloginKey(masterPassword: string, email: string): Promise<MasterKey> {
+  async makePasswordPreLoginMasterKey(masterPassword: string, email: string): Promise<MasterKey> {
     email = email.trim().toLowerCase();
-    let kdfConfig: KdfConfig | undefined;
+
+    if (await this.configService.getFeatureFlag(FeatureFlag.PM23801_PrefetchPasswordPrelogin)) {
+      let kdfConfig: KdfConfig | null = null;
+      if (this.passwordPrelogin.email === email) {
+        if (this.passwordPrelogin.kdfConfig) {
+          kdfConfig = this.passwordPrelogin.kdfConfig;
+        } else if (this.passwordPrelogin.promise != null) {
+          try {
+            await this.passwordPrelogin.promise;
+          } catch (error) {
+            this.logService.error(
+              "Failed to prefetch prelogin data, falling back to fetching now.",
+              error,
+            );
+          }
+          kdfConfig = this.passwordPrelogin.kdfConfig;
+        }
+      }
+
+      if (!kdfConfig) {
+        try {
+          const preloginResponse = await this.apiService.postPrelogin(new PreloginRequest(email));
+          kdfConfig = this.buildKdfConfigFromPrelogin(preloginResponse);
+        } catch (e: any) {
+          if (e == null || e.statusCode !== 404) {
+            throw e;
+          }
+        }
+      }
+
+      if (!kdfConfig) {
+        throw new Error("KDF config is required");
+      }
+      kdfConfig.validateKdfConfigForPrelogin();
+      return await this.keyService.makeMasterKey(masterPassword, email, kdfConfig);
+    }
+
+    // Legacy behavior when flag is disabled
+    let legacyKdfConfig: KdfConfig | undefined;
     try {
       const preloginResponse = await this.apiService.postPrelogin(new PreloginRequest(email));
-      if (preloginResponse != null) {
-        kdfConfig =
-          preloginResponse.kdf === KdfType.PBKDF2_SHA256
-            ? new PBKDF2KdfConfig(preloginResponse.kdfIterations)
-            : new Argon2KdfConfig(
-                preloginResponse.kdfIterations,
-                preloginResponse.kdfMemory,
-                preloginResponse.kdfParallelism,
-              );
-      }
+      legacyKdfConfig = this.buildKdfConfigFromPrelogin(preloginResponse) ?? undefined;
     } catch (e: any) {
       if (e == null || e.statusCode !== 404) {
         throw e;
       }
     }
 
-    if (!kdfConfig) {
+    if (!legacyKdfConfig) {
       throw new Error("KDF config is required");
     }
-    kdfConfig.validateKdfConfigForPrelogin();
+    legacyKdfConfig.validateKdfConfigForPrelogin();
+    return await this.keyService.makeMasterKey(masterPassword, email, legacyKdfConfig);
+  }
 
-    return await this.keyService.makeMasterKey(masterPassword, email, kdfConfig);
+  async getPasswordPrelogin(email: string): Promise<void> {
+    const normalizedEmail = email.trim().toLowerCase();
+    const version = ++this.passwordPrelogin.version;
+
+    this.passwordPrelogin.email = normalizedEmail;
+    this.passwordPrelogin.kdfConfig = null;
+    const promise: Promise<KdfConfig | null> = (async () => {
+      try {
+        const preloginResponse = await this.apiService.postPrelogin(
+          new PreloginRequest(normalizedEmail),
+        );
+        return this.buildKdfConfigFromPrelogin(preloginResponse);
+      } catch (e: any) {
+        if (e == null || e.statusCode !== 404) {
+          throw e;
+        }
+        return null;
+      }
+    })();
+
+    this.passwordPrelogin.promise = promise;
+    promise
+      .then((cfg) => {
+        // Only apply if still for the same email and same version
+        if (
+          this.passwordPrelogin.email === normalizedEmail &&
+          this.passwordPrelogin.version === version &&
+          cfg
+        ) {
+          this.passwordPrelogin.kdfConfig = cfg;
+        }
+      })
+      .catch(() => {
+        // swallow; best-effort prefetch
+      })
+      .finally(() => {
+        if (
+          this.passwordPrelogin.email === normalizedEmail &&
+          this.passwordPrelogin.version === version
+        ) {
+          this.passwordPrelogin.promise = null;
+        }
+      });
   }
 
   private async clearCache(): Promise<void> {
@@ -342,6 +442,12 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     await this.loginStrategyCacheState.update((_) => null);
     this.authenticationTimeoutSubject.next(false);
     await this.clearSessionTimeout();
+
+    // Increment to invalidate any in-flight requests
+    this.passwordPrelogin.version++;
+    this.passwordPrelogin.email = null;
+    this.passwordPrelogin.kdfConfig = null;
+    this.passwordPrelogin.promise = null;
   }
 
   private async startSessionTimeout(): Promise<void> {
@@ -449,4 +555,24 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
       }),
     );
   }
+
+  private buildKdfConfigFromPrelogin(
+    preloginResponse: {
+      kdf: KdfType;
+      kdfIterations: number;
+      kdfMemory?: number;
+      kdfParallelism?: number;
+    } | null,
+  ): KdfConfig | null {
+    if (preloginResponse == null) {
+      return null;
+    }
+    return preloginResponse.kdf === KdfType.PBKDF2_SHA256
+      ? new PBKDF2KdfConfig(preloginResponse.kdfIterations)
+      : new Argon2KdfConfig(
+          preloginResponse.kdfIterations,
+          preloginResponse.kdfMemory,
+          preloginResponse.kdfParallelism,
+        );
+  }
 }
diff --git a/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.spec.ts b/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.spec.ts
index 86f7be8dfc7..975e065e21e 100644
--- a/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.spec.ts
+++ b/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.spec.ts
@@ -1,7 +1,6 @@
 import { MockProxy, mock } from "jest-mock-extended";
 
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -58,62 +57,35 @@ describe("DefaultLoginSuccessHandlerService", () => {
       expect(loginEmailService.clearLoginEmail).toHaveBeenCalled();
     });
 
-    describe("when PM22110_DisableAlternateLoginMethods flag is disabled", () => {
+    it("should get SSO email", async () => {
+      await service.run(userId);
+
+      expect(ssoLoginService.getSsoEmail).toHaveBeenCalled();
+    });
+
+    describe("given SSO email is not found", () => {
       beforeEach(() => {
-        configService.getFeatureFlag.mockResolvedValue(false);
+        ssoLoginService.getSsoEmail.mockResolvedValue(null);
       });
 
-      it("should not check SSO requirements", async () => {
+      it("should log error and return early", async () => {
         await service.run(userId);
 
-        expect(ssoLoginService.getSsoEmail).not.toHaveBeenCalled();
+        expect(logService.error).toHaveBeenCalledWith("SSO login email not found.");
         expect(ssoLoginService.updateSsoRequiredCache).not.toHaveBeenCalled();
       });
     });
 
-    describe("given PM22110_DisableAlternateLoginMethods flag is enabled", () => {
+    describe("given SSO email is found", () => {
       beforeEach(() => {
-        configService.getFeatureFlag.mockResolvedValue(true);
+        ssoLoginService.getSsoEmail.mockResolvedValue(testEmail);
       });
 
-      it("should check feature flag", async () => {
+      it("should call updateSsoRequiredCache() and clearSsoEmail()", async () => {
         await service.run(userId);
 
-        expect(configService.getFeatureFlag).toHaveBeenCalledWith(
-          FeatureFlag.PM22110_DisableAlternateLoginMethods,
-        );
-      });
-
-      it("should get SSO email", async () => {
-        await service.run(userId);
-
-        expect(ssoLoginService.getSsoEmail).toHaveBeenCalled();
-      });
-
-      describe("given SSO email is not found", () => {
-        beforeEach(() => {
-          ssoLoginService.getSsoEmail.mockResolvedValue(null);
-        });
-
-        it("should log error and return early", async () => {
-          await service.run(userId);
-
-          expect(logService.error).toHaveBeenCalledWith("SSO login email not found.");
-          expect(ssoLoginService.updateSsoRequiredCache).not.toHaveBeenCalled();
-        });
-      });
-
-      describe("given SSO email is found", () => {
-        beforeEach(() => {
-          ssoLoginService.getSsoEmail.mockResolvedValue(testEmail);
-        });
-
-        it("should call updateSsoRequiredCache() and clearSsoEmail()", async () => {
-          await service.run(userId);
-
-          expect(ssoLoginService.updateSsoRequiredCache).toHaveBeenCalledWith(testEmail, userId);
-          expect(ssoLoginService.clearSsoEmail).toHaveBeenCalled();
-        });
+        expect(ssoLoginService.updateSsoRequiredCache).toHaveBeenCalledWith(testEmail, userId);
+        expect(ssoLoginService.clearSsoEmail).toHaveBeenCalled();
       });
     });
   });
diff --git a/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.ts b/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.ts
index 78003a4fca0..27d058c311a 100644
--- a/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.ts
+++ b/libs/auth/src/common/services/login-success-handler/default-login-success-handler.service.ts
@@ -1,5 +1,4 @@
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -23,20 +22,14 @@ export class DefaultLoginSuccessHandlerService implements LoginSuccessHandlerSer
     await this.userAsymmetricKeysRegenerationService.regenerateIfNeeded(userId);
     await this.loginEmailService.clearLoginEmail();
 
-    const disableAlternateLoginMethodsFlagEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.PM22110_DisableAlternateLoginMethods,
-    );
+    const ssoLoginEmail = await this.ssoLoginService.getSsoEmail();
 
-    if (disableAlternateLoginMethodsFlagEnabled) {
-      const ssoLoginEmail = await this.ssoLoginService.getSsoEmail();
-
-      if (!ssoLoginEmail) {
-        this.logService.error("SSO login email not found.");
-        return;
-      }
-
-      await this.ssoLoginService.updateSsoRequiredCache(ssoLoginEmail, userId);
-      await this.ssoLoginService.clearSsoEmail();
+    if (!ssoLoginEmail) {
+      this.logService.error("SSO login email not found.");
+      return;
     }
+
+    await this.ssoLoginService.updateSsoRequiredCache(ssoLoginEmail, userId);
+    await this.ssoLoginService.clearSsoEmail();
   }
 }
diff --git a/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.spec.ts b/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.spec.ts
index c2fafc1a2f6..efb00b9aa63 100644
--- a/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.spec.ts
+++ b/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.spec.ts
@@ -1,12 +1,8 @@
 import { firstValueFrom } from "rxjs";
 
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import {
-  FakeAccountService,
-  FakeStateProvider,
-  mockAccountServiceWith,
-} from "@bitwarden/common/spec";
+import { FakeSingleUserStateProvider } from "@bitwarden/common/spec";
 import { UserId } from "@bitwarden/common/types/guid";
+import { newGuid } from "@bitwarden/guid";
 
 import { UserDecryptionOptions } from "../../models/domain/user-decryption-options";
 
@@ -17,15 +13,10 @@ import {
 
 describe("UserDecryptionOptionsService", () => {
   let sut: UserDecryptionOptionsService;
-
-  const fakeUserId = Utils.newGuid() as UserId;
-  let fakeAccountService: FakeAccountService;
-  let fakeStateProvider: FakeStateProvider;
+  let fakeStateProvider: FakeSingleUserStateProvider;
 
   beforeEach(() => {
-    fakeAccountService = mockAccountServiceWith(fakeUserId);
-    fakeStateProvider = new FakeStateProvider(fakeAccountService);
-
+    fakeStateProvider = new FakeSingleUserStateProvider();
     sut = new UserDecryptionOptionsService(fakeStateProvider);
   });
 
@@ -42,55 +33,71 @@ describe("UserDecryptionOptionsService", () => {
     },
   };
 
-  describe("userDecryptionOptions$", () => {
-    it("should return the active user's decryption options", async () => {
-      await fakeStateProvider.setUserState(USER_DECRYPTION_OPTIONS, userDecryptionOptions);
+  describe("userDecryptionOptionsById$", () => {
+    it("should return user decryption options for a specific user", async () => {
+      const userId = newGuid() as UserId;
 
-      const result = await firstValueFrom(sut.userDecryptionOptions$);
+      fakeStateProvider.getFake(userId, USER_DECRYPTION_OPTIONS).nextState(userDecryptionOptions);
+
+      const result = await firstValueFrom(sut.userDecryptionOptionsById$(userId));
 
       expect(result).toEqual(userDecryptionOptions);
     });
   });
 
-  describe("hasMasterPassword$", () => {
-    it("should return the hasMasterPassword property of the active user's decryption options", async () => {
-      await fakeStateProvider.setUserState(USER_DECRYPTION_OPTIONS, userDecryptionOptions);
+  describe("hasMasterPasswordById$", () => {
+    it("should return true when user has a master password", async () => {
+      const userId = newGuid() as UserId;
 
-      const result = await firstValueFrom(sut.hasMasterPassword$);
+      fakeStateProvider.getFake(userId, USER_DECRYPTION_OPTIONS).nextState(userDecryptionOptions);
+
+      const result = await firstValueFrom(sut.hasMasterPasswordById$(userId));
 
       expect(result).toBe(true);
     });
-  });
 
-  describe("userDecryptionOptionsById$", () => {
-    it("should return the user decryption options for the given user", async () => {
-      const givenUser = Utils.newGuid() as UserId;
-      await fakeAccountService.addAccount(givenUser, {
-        name: "Test User 1",
-        email: "test1@email.com",
-        emailVerified: false,
-      });
-      await fakeStateProvider.setUserState(
-        USER_DECRYPTION_OPTIONS,
-        userDecryptionOptions,
-        givenUser,
-      );
+    it("should return false when user does not have a master password", async () => {
+      const userId = newGuid() as UserId;
+      const optionsWithoutMasterPassword = {
+        ...userDecryptionOptions,
+        hasMasterPassword: false,
+      };
 
-      const result = await firstValueFrom(sut.userDecryptionOptionsById$(givenUser));
+      fakeStateProvider
+        .getFake(userId, USER_DECRYPTION_OPTIONS)
+        .nextState(optionsWithoutMasterPassword);
 
-      expect(result).toEqual(userDecryptionOptions);
+      const result = await firstValueFrom(sut.hasMasterPasswordById$(userId));
+
+      expect(result).toBe(false);
     });
   });
 
-  describe("setUserDecryptionOptions", () => {
-    it("should set the active user's decryption options", async () => {
-      await sut.setUserDecryptionOptions(userDecryptionOptions);
+  describe("setUserDecryptionOptionsById", () => {
+    it("should set user decryption options for a specific user", async () => {
+      const userId = newGuid() as UserId;
 
-      const result = await firstValueFrom(
-        fakeStateProvider.getActive(USER_DECRYPTION_OPTIONS).state$,
-      );
+      await sut.setUserDecryptionOptionsById(userId, userDecryptionOptions);
+
+      const fakeState = fakeStateProvider.getFake(userId, USER_DECRYPTION_OPTIONS);
+      const result = await firstValueFrom(fakeState.state$);
 
       expect(result).toEqual(userDecryptionOptions);
     });
+
+    it("should overwrite existing user decryption options", async () => {
+      const userId = newGuid() as UserId;
+      const initialOptions = { ...userDecryptionOptions, hasMasterPassword: false };
+      const updatedOptions = { ...userDecryptionOptions, hasMasterPassword: true };
+
+      const fakeState = fakeStateProvider.getFake(userId, USER_DECRYPTION_OPTIONS);
+      fakeState.nextState(initialOptions);
+
+      await sut.setUserDecryptionOptionsById(userId, updatedOptions);
+
+      const result = await firstValueFrom(fakeState.state$);
+
+      expect(result).toEqual(updatedOptions);
+    });
   });
 });
diff --git a/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.ts b/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.ts
index 7c44a6f1682..a0075d1987b 100644
--- a/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.ts
+++ b/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.ts
@@ -1,16 +1,11 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Observable, map } from "rxjs";
+import { Observable, filter, map } from "rxjs";
 
 import {
-  ActiveUserState,
-  StateProvider,
+  SingleUserStateProvider,
   USER_DECRYPTION_OPTIONS_DISK,
   UserKeyDefinition,
 } from "@bitwarden/common/platform/state";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { UserId } from "@bitwarden/common/src/types/guid";
+import { UserId } from "@bitwarden/common/types/guid";
 
 import { InternalUserDecryptionOptionsServiceAbstraction } from "../../abstractions/user-decryption-options.service.abstraction";
 import { UserDecryptionOptions } from "../../models";
@@ -27,25 +22,26 @@ export const USER_DECRYPTION_OPTIONS = new UserKeyDefinition<UserDecryptionOptio
 export class UserDecryptionOptionsService
   implements InternalUserDecryptionOptionsServiceAbstraction
 {
-  private userDecryptionOptionsState: ActiveUserState<UserDecryptionOptions>;
+  constructor(private singleUserStateProvider: SingleUserStateProvider) {}
 
-  userDecryptionOptions$: Observable<UserDecryptionOptions>;
-  hasMasterPassword$: Observable<boolean>;
+  userDecryptionOptionsById$(userId: UserId): Observable<UserDecryptionOptions> {
+    return this.singleUserStateProvider
+      .get(userId, USER_DECRYPTION_OPTIONS)
+      .state$.pipe(filter((options): options is UserDecryptionOptions => options != null));
+  }
 
-  constructor(private stateProvider: StateProvider) {
-    this.userDecryptionOptionsState = this.stateProvider.getActive(USER_DECRYPTION_OPTIONS);
-
-    this.userDecryptionOptions$ = this.userDecryptionOptionsState.state$;
-    this.hasMasterPassword$ = this.userDecryptionOptions$.pipe(
-      map((options) => options?.hasMasterPassword ?? false),
+  hasMasterPasswordById$(userId: UserId): Observable<boolean> {
+    return this.userDecryptionOptionsById$(userId).pipe(
+      map((options) => options.hasMasterPassword ?? false),
     );
   }
 
-  userDecryptionOptionsById$(userId: UserId): Observable<UserDecryptionOptions> {
-    return this.stateProvider.getUser(userId, USER_DECRYPTION_OPTIONS).state$;
-  }
-
-  async setUserDecryptionOptions(userDecryptionOptions: UserDecryptionOptions): Promise<void> {
-    await this.userDecryptionOptionsState.update((_) => userDecryptionOptions);
+  async setUserDecryptionOptionsById(
+    userId: UserId,
+    userDecryptionOptions: UserDecryptionOptions,
+  ): Promise<void> {
+    await this.singleUserStateProvider
+      .get(userId, USER_DECRYPTION_OPTIONS)
+      .update((_) => userDecryptionOptions);
   }
 }
diff --git a/libs/common/spec/jest-sdk-client-factory.ts b/libs/common/spec/jest-sdk-client-factory.ts
index 8e5e1c9d3fc..8b93ba791b3 100644
--- a/libs/common/spec/jest-sdk-client-factory.ts
+++ b/libs/common/spec/jest-sdk-client-factory.ts
@@ -1,11 +1,11 @@
-import { BitwardenClient } from "@bitwarden/sdk-internal";
+import { PasswordManagerClient } from "@bitwarden/sdk-internal";
 
 import { SdkClientFactory } from "../src/platform/abstractions/sdk/sdk-client-factory";
 
 export class DefaultSdkClientFactory implements SdkClientFactory {
   createSdkClient(
-    ...args: ConstructorParameters<typeof BitwardenClient>
-  ): Promise<BitwardenClient> {
+    ...args: ConstructorParameters<typeof PasswordManagerClient>
+  ): Promise<PasswordManagerClient> {
     throw new Error("Method not implemented.");
   }
 }
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index d746342d728..f7ca1964b76 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -37,8 +37,6 @@ import {
   ProviderUserUserDetailsResponse,
 } from "../admin-console/models/response/provider/provider-user.response";
 import { SelectionReadOnlyResponse } from "../admin-console/models/response/selection-read-only.response";
-import { DeviceVerificationRequest } from "../auth/models/request/device-verification.request";
-import { DisableTwoFactorAuthenticatorRequest } from "../auth/models/request/disable-two-factor-authenticator.request";
 import { EmailTokenRequest } from "../auth/models/request/email-token.request";
 import { EmailRequest } from "../auth/models/request/email.request";
 import { PasswordTokenRequest } from "../auth/models/request/identity-token/password-token.request";
@@ -48,43 +46,20 @@ import { WebAuthnLoginTokenRequest } from "../auth/models/request/identity-token
 import { PasswordHintRequest } from "../auth/models/request/password-hint.request";
 import { PasswordlessAuthRequest } from "../auth/models/request/passwordless-auth.request";
 import { SecretVerificationRequest } from "../auth/models/request/secret-verification.request";
-import { TwoFactorEmailRequest } from "../auth/models/request/two-factor-email.request";
-import { TwoFactorProviderRequest } from "../auth/models/request/two-factor-provider.request";
 import { UpdateProfileRequest } from "../auth/models/request/update-profile.request";
-import { UpdateTwoFactorAuthenticatorRequest } from "../auth/models/request/update-two-factor-authenticator.request";
-import { UpdateTwoFactorDuoRequest } from "../auth/models/request/update-two-factor-duo.request";
-import { UpdateTwoFactorEmailRequest } from "../auth/models/request/update-two-factor-email.request";
-import { UpdateTwoFactorWebAuthnDeleteRequest } from "../auth/models/request/update-two-factor-web-authn-delete.request";
-import { UpdateTwoFactorWebAuthnRequest } from "../auth/models/request/update-two-factor-web-authn.request";
-import { UpdateTwoFactorYubikeyOtpRequest } from "../auth/models/request/update-two-factor-yubikey-otp.request";
 import { ApiKeyResponse } from "../auth/models/response/api-key.response";
 import { AuthRequestResponse } from "../auth/models/response/auth-request.response";
-import { DeviceVerificationResponse } from "../auth/models/response/device-verification.response";
 import { IdentityDeviceVerificationResponse } from "../auth/models/response/identity-device-verification.response";
 import { IdentityTokenResponse } from "../auth/models/response/identity-token.response";
 import { IdentityTwoFactorResponse } from "../auth/models/response/identity-two-factor.response";
 import { KeyConnectorUserKeyResponse } from "../auth/models/response/key-connector-user-key.response";
 import { PreloginResponse } from "../auth/models/response/prelogin.response";
 import { SsoPreValidateResponse } from "../auth/models/response/sso-pre-validate.response";
-import { TwoFactorAuthenticatorResponse } from "../auth/models/response/two-factor-authenticator.response";
-import { TwoFactorDuoResponse } from "../auth/models/response/two-factor-duo.response";
-import { TwoFactorEmailResponse } from "../auth/models/response/two-factor-email.response";
-import { TwoFactorProviderResponse } from "../auth/models/response/two-factor-provider.response";
-import { TwoFactorRecoverResponse } from "../auth/models/response/two-factor-recover.response";
-import {
-  ChallengeResponse,
-  TwoFactorWebAuthnResponse,
-} from "../auth/models/response/two-factor-web-authn.response";
-import { TwoFactorYubiKeyResponse } from "../auth/models/response/two-factor-yubi-key.response";
 import { BitPayInvoiceRequest } from "../billing/models/request/bit-pay-invoice.request";
-import { PaymentRequest } from "../billing/models/request/payment.request";
-import { TaxInfoUpdateRequest } from "../billing/models/request/tax-info-update.request";
 import { BillingHistoryResponse } from "../billing/models/response/billing-history.response";
-import { BillingPaymentResponse } from "../billing/models/response/billing-payment.response";
 import { PaymentResponse } from "../billing/models/response/payment.response";
 import { PlanResponse } from "../billing/models/response/plan.response";
 import { SubscriptionResponse } from "../billing/models/response/subscription.response";
-import { TaxInfoResponse } from "../billing/models/response/tax-info.response";
 import { KeyConnectorUserKeyRequest } from "../key-management/key-connector/models/key-connector-user-key.request";
 import { SetKeyConnectorKeyRequest } from "../key-management/key-connector/models/set-key-connector-key.request";
 import { DeleteRecoverRequest } from "../models/request/delete-recover.request";
@@ -116,7 +91,7 @@ import { CipherShareRequest } from "../vault/models/request/cipher-share.request
 import { CipherRequest } from "../vault/models/request/cipher.request";
 import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response";
 import { AttachmentResponse } from "../vault/models/response/attachment.response";
-import { CipherResponse } from "../vault/models/response/cipher.response";
+import { CipherMiniResponse, CipherResponse } from "../vault/models/response/cipher.response";
 import { OptionalCipherResponse } from "../vault/models/response/optional-cipher.response";
 
 /**
@@ -167,14 +142,12 @@ export abstract class ApiService {
   ): Promise<
     IdentityTokenResponse | IdentityTwoFactorResponse | IdentityDeviceVerificationResponse
   >;
-  abstract refreshIdentityToken(): Promise<any>;
+  abstract refreshIdentityToken(userId?: UserId): Promise<any>;
 
   abstract getProfile(): Promise<ProfileResponse>;
   abstract getUserSubscription(): Promise<SubscriptionResponse>;
-  abstract getTaxInfo(): Promise<TaxInfoResponse>;
   abstract putProfile(request: UpdateProfileRequest): Promise<ProfileResponse>;
   abstract putAvatar(request: UpdateAvatarRequest): Promise<ProfileResponse>;
-  abstract putTaxInfo(request: TaxInfoUpdateRequest): Promise<any>;
   abstract postPrelogin(request: PreloginRequest): Promise<PreloginResponse>;
   abstract postEmailToken(request: EmailTokenRequest): Promise<any>;
   abstract postEmail(request: EmailRequest): Promise<any>;
@@ -185,7 +158,6 @@ export abstract class ApiService {
   abstract postPremium(data: FormData): Promise<PaymentResponse>;
   abstract postReinstatePremium(): Promise<any>;
   abstract postAccountStorage(request: StorageRequest): Promise<PaymentResponse>;
-  abstract postAccountPayment(request: PaymentRequest): Promise<void>;
   abstract postAccountLicense(data: FormData): Promise<any>;
   abstract postAccountKeys(request: KeysRequest): Promise<any>;
   abstract postAccountVerifyEmail(): Promise<any>;
@@ -209,7 +181,6 @@ export abstract class ApiService {
   abstract getLastAuthRequest(): Promise<AuthRequestResponse>;
 
   abstract getUserBillingHistory(): Promise<BillingHistoryResponse>;
-  abstract getUserBillingPayment(): Promise<BillingPaymentResponse>;
 
   abstract getCipher(id: string): Promise<CipherResponse>;
   abstract getFullCipherDetails(id: string): Promise<CipherResponse>;
@@ -223,7 +194,10 @@ export abstract class ApiService {
     cipherId: string,
     attachmentId: string,
   ): Promise<AttachmentResponse>;
-  abstract getCiphersOrganization(organizationId: string): Promise<ListResponse<CipherResponse>>;
+  abstract getCiphersOrganization(
+    organizationId: string,
+    includeMemberItems?: boolean,
+  ): Promise<ListResponse<CipherResponse>>;
   abstract postCipher(request: CipherRequest): Promise<CipherResponse>;
   abstract postCipherCreate(request: CipherCreateRequest): Promise<CipherResponse>;
   abstract postCipherAdmin(request: CipherCreateRequest): Promise<CipherResponse>;
@@ -241,7 +215,10 @@ export abstract class ApiService {
     id: string,
     request: CipherCollectionsRequest,
   ): Promise<OptionalCipherResponse>;
-  abstract putCipherCollectionsAdmin(id: string, request: CipherCollectionsRequest): Promise<any>;
+  abstract putCipherCollectionsAdmin(
+    id: string,
+    request: CipherCollectionsRequest,
+  ): Promise<CipherMiniResponse>;
   abstract postPurgeCiphers(
     request: SecretVerificationRequest,
     organizationId?: string,
@@ -314,66 +291,6 @@ export abstract class ApiService {
   abstract getSettingsDomains(): Promise<DomainsResponse>;
   abstract putSettingsDomains(request: UpdateDomainsRequest): Promise<DomainsResponse>;
 
-  abstract getTwoFactorProviders(): Promise<ListResponse<TwoFactorProviderResponse>>;
-  abstract getTwoFactorOrganizationProviders(
-    organizationId: string,
-  ): Promise<ListResponse<TwoFactorProviderResponse>>;
-  abstract getTwoFactorAuthenticator(
-    request: SecretVerificationRequest,
-  ): Promise<TwoFactorAuthenticatorResponse>;
-  abstract getTwoFactorEmail(request: SecretVerificationRequest): Promise<TwoFactorEmailResponse>;
-  abstract getTwoFactorDuo(request: SecretVerificationRequest): Promise<TwoFactorDuoResponse>;
-  abstract getTwoFactorOrganizationDuo(
-    organizationId: string,
-    request: SecretVerificationRequest,
-  ): Promise<TwoFactorDuoResponse>;
-  abstract getTwoFactorYubiKey(
-    request: SecretVerificationRequest,
-  ): Promise<TwoFactorYubiKeyResponse>;
-  abstract getTwoFactorWebAuthn(
-    request: SecretVerificationRequest,
-  ): Promise<TwoFactorWebAuthnResponse>;
-  abstract getTwoFactorWebAuthnChallenge(
-    request: SecretVerificationRequest,
-  ): Promise<ChallengeResponse>;
-  abstract getTwoFactorRecover(
-    request: SecretVerificationRequest,
-  ): Promise<TwoFactorRecoverResponse>;
-  abstract putTwoFactorAuthenticator(
-    request: UpdateTwoFactorAuthenticatorRequest,
-  ): Promise<TwoFactorAuthenticatorResponse>;
-  abstract deleteTwoFactorAuthenticator(
-    request: DisableTwoFactorAuthenticatorRequest,
-  ): Promise<TwoFactorProviderResponse>;
-  abstract putTwoFactorEmail(request: UpdateTwoFactorEmailRequest): Promise<TwoFactorEmailResponse>;
-  abstract putTwoFactorDuo(request: UpdateTwoFactorDuoRequest): Promise<TwoFactorDuoResponse>;
-  abstract putTwoFactorOrganizationDuo(
-    organizationId: string,
-    request: UpdateTwoFactorDuoRequest,
-  ): Promise<TwoFactorDuoResponse>;
-  abstract putTwoFactorYubiKey(
-    request: UpdateTwoFactorYubikeyOtpRequest,
-  ): Promise<TwoFactorYubiKeyResponse>;
-  abstract putTwoFactorWebAuthn(
-    request: UpdateTwoFactorWebAuthnRequest,
-  ): Promise<TwoFactorWebAuthnResponse>;
-  abstract deleteTwoFactorWebAuthn(
-    request: UpdateTwoFactorWebAuthnDeleteRequest,
-  ): Promise<TwoFactorWebAuthnResponse>;
-  abstract putTwoFactorDisable(
-    request: TwoFactorProviderRequest,
-  ): Promise<TwoFactorProviderResponse>;
-  abstract putTwoFactorOrganizationDisable(
-    organizationId: string,
-    request: TwoFactorProviderRequest,
-  ): Promise<TwoFactorProviderResponse>;
-  abstract postTwoFactorEmailSetup(request: TwoFactorEmailRequest): Promise<any>;
-  abstract postTwoFactorEmail(request: TwoFactorEmailRequest): Promise<any>;
-  abstract getDeviceVerificationSettings(): Promise<DeviceVerificationResponse>;
-  abstract putDeviceVerificationSettings(
-    request: DeviceVerificationRequest,
-  ): Promise<DeviceVerificationResponse>;
-
   abstract getCloudCommunicationsEnabled(): Promise<boolean>;
   abstract getOrganizationConnection<TConfig extends OrganizationConnectionConfigApis>(
     id: string,
@@ -469,6 +386,13 @@ export abstract class ApiService {
     end: string,
     token: string,
   ): Promise<ListResponse<EventResponse>>;
+  abstract getEventsServiceAccount(
+    orgId: string,
+    id: string,
+    start: string,
+    end: string,
+    token: string,
+  ): Promise<ListResponse<EventResponse>>;
   abstract getEventsProject(
     orgId: string,
     id: string,
diff --git a/libs/common/src/abstractions/audit.service.ts b/libs/common/src/abstractions/audit.service.ts
index a00b2bf038a..71edc3f1740 100644
--- a/libs/common/src/abstractions/audit.service.ts
+++ b/libs/common/src/abstractions/audit.service.ts
@@ -14,10 +14,4 @@ export abstract class AuditService {
    * @returns A promise that resolves to an array of BreachAccountResponse objects.
    */
   abstract breachedAccounts: (username: string) => Promise<BreachAccountResponse[]>;
-  /**
-   * Checks if a domain is known for phishing.
-   * @param domain The domain to check.
-   * @returns A promise that resolves to a boolean indicating if the domain is known for phishing.
-   */
-  abstract getKnownPhishingDomains: () => Promise<string[]>;
 }
diff --git a/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts
index 10626d6758f..6c91c2ea0cf 100644
--- a/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts
@@ -3,21 +3,17 @@ import { OrganizationSsoRequest } from "../../../auth/models/request/organizatio
 import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request";
 import { ApiKeyResponse } from "../../../auth/models/response/api-key.response";
 import { OrganizationSsoResponse } from "../../../auth/models/response/organization-sso.response";
-import { ExpandedTaxInfoUpdateRequest } from "../../../billing/models/request/expanded-tax-info-update.request";
 import { OrganizationNoPaymentMethodCreateRequest } from "../../../billing/models/request/organization-no-payment-method-create-request";
 import { OrganizationSmSubscriptionUpdateRequest } from "../../../billing/models/request/organization-sm-subscription-update.request";
 import { OrganizationSubscriptionUpdateRequest } from "../../../billing/models/request/organization-subscription-update.request";
-import { PaymentRequest } from "../../../billing/models/request/payment.request";
 import { SecretsManagerSubscribeRequest } from "../../../billing/models/request/sm-subscribe.request";
 import { BillingHistoryResponse } from "../../../billing/models/response/billing-history.response";
 import { BillingResponse } from "../../../billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "../../../billing/models/response/organization-subscription.response";
 import { PaymentResponse } from "../../../billing/models/response/payment.response";
-import { TaxInfoResponse } from "../../../billing/models/response/tax-info.response";
 import { ImportDirectoryRequest } from "../../../models/request/import-directory.request";
 import { SeatRequest } from "../../../models/request/seat.request";
 import { StorageRequest } from "../../../models/request/storage.request";
-import { VerifyBankRequest } from "../../../models/request/verify-bank.request";
 import { ListResponse } from "../../../models/response/list.response";
 import { OrganizationApiKeyType } from "../../enums";
 import { OrganizationCollectionManagementUpdateRequest } from "../../models/request/organization-collection-management-update.request";
@@ -45,7 +41,6 @@ export abstract class OrganizationApiServiceAbstraction {
   ): Promise<OrganizationResponse>;
   abstract createLicense(data: FormData): Promise<OrganizationResponse>;
   abstract save(id: string, request: OrganizationUpdateRequest): Promise<OrganizationResponse>;
-  abstract updatePayment(id: string, request: PaymentRequest): Promise<void>;
   abstract upgrade(id: string, request: OrganizationUpgradeRequest): Promise<PaymentResponse>;
   abstract updatePasswordManagerSeats(
     id: string,
@@ -57,7 +52,6 @@ export abstract class OrganizationApiServiceAbstraction {
   ): Promise<ProfileOrganizationResponse>;
   abstract updateSeats(id: string, request: SeatRequest): Promise<PaymentResponse>;
   abstract updateStorage(id: string, request: StorageRequest): Promise<PaymentResponse>;
-  abstract verifyBank(id: string, request: VerifyBankRequest): Promise<void>;
   abstract reinstate(id: string): Promise<void>;
   abstract leave(id: string): Promise<void>;
   abstract delete(id: string, request: SecretVerificationRequest): Promise<void>;
@@ -76,8 +70,6 @@ export abstract class OrganizationApiServiceAbstraction {
     organizationApiKeyType?: OrganizationApiKeyType,
   ): Promise<ListResponse<OrganizationApiKeyInformationResponse>>;
   abstract rotateApiKey(id: string, request: OrganizationApiKeyRequest): Promise<ApiKeyResponse>;
-  abstract getTaxInfo(id: string): Promise<TaxInfoResponse>;
-  abstract updateTaxInfo(id: string, request: ExpandedTaxInfoUpdateRequest): Promise<void>;
   abstract getKeys(id: string): Promise<OrganizationKeysResponse>;
   abstract updateKeys(
     id: string,
diff --git a/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
index 58d6d9efef9..363b82c507d 100644
--- a/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
@@ -1,8 +1,13 @@
-import { map, Observable } from "rxjs";
+import { combineLatest, map, Observable } from "rxjs";
+
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { UserId } from "../../../types/guid";
+import { PolicyType } from "../../enums";
 import { OrganizationData } from "../../models/data/organization.data";
 import { Organization } from "../../models/domain/organization";
+import { PolicyService } from "../policy/policy.service.abstraction";
 
 export function canAccessVaultTab(org: Organization): boolean {
   return org.canViewAllCollections;
@@ -51,6 +56,17 @@ export function canAccessOrgAdmin(org: Organization): boolean {
   );
 }
 
+export function canAccessEmergencyAccess(
+  userId: UserId,
+  configService: ConfigService,
+  policyService: PolicyService,
+) {
+  return combineLatest([
+    configService.getFeatureFlag$(FeatureFlag.AutoConfirm),
+    policyService.policiesByType$(PolicyType.AutoConfirm, userId),
+  ]).pipe(map(([enabled, policies]) => !enabled || !policies.some((p) => p.enabled)));
+}
+
 /**
  * @deprecated Please use the general `getById` custom rxjs operator instead.
  */
diff --git a/libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts
index f998fdc8ab7..0fba60a5944 100644
--- a/libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts
@@ -1,8 +1,12 @@
 import { AddableOrganizationResponse } from "@bitwarden/common/admin-console/models/response/addable-organization.response";
+import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
 
+import { CreateProviderOrganizationRequest } from "../../models/request/create-provider-organization.request";
 import { ProviderSetupRequest } from "../../models/request/provider/provider-setup.request";
 import { ProviderUpdateRequest } from "../../models/request/provider/provider-update.request";
 import { ProviderVerifyRecoverDeleteRequest } from "../../models/request/provider/provider-verify-recover-delete.request";
+import { UpdateProviderOrganizationRequest } from "../../models/request/update-provider-organization.request";
 import { ProviderResponse } from "../../models/response/provider/provider.response";
 
 export abstract class ProviderApiServiceAbstraction {
@@ -14,6 +18,9 @@ export abstract class ProviderApiServiceAbstraction {
     request: ProviderVerifyRecoverDeleteRequest,
   ): Promise<any>;
   abstract deleteProvider(id: string): Promise<void>;
+  abstract getProviderOrganizations(
+    providerId: string,
+  ): Promise<ListResponse<ProviderOrganizationOrganizationDetailsResponse>>;
   abstract getProviderAddableOrganizations(
     providerId: string,
   ): Promise<AddableOrganizationResponse[]>;
@@ -24,4 +31,15 @@ export abstract class ProviderApiServiceAbstraction {
       organizationId: string;
     },
   ): Promise<void>;
+
+  abstract updateProviderOrganization(
+    providerId: string,
+    organizationId: string,
+    request: UpdateProviderOrganizationRequest,
+  ): Promise<any>;
+
+  abstract createProviderOrganization(
+    providerId: string,
+    request: CreateProviderOrganizationRequest,
+  ): Promise<void>;
 }
diff --git a/libs/common/src/admin-console/enums/policy-type.enum.ts b/libs/common/src/admin-console/enums/policy-type.enum.ts
index a4a860a2f3f..af8147c41e4 100644
--- a/libs/common/src/admin-console/enums/policy-type.enum.ts
+++ b/libs/common/src/admin-console/enums/policy-type.enum.ts
@@ -17,5 +17,8 @@ export enum PolicyType {
   FreeFamiliesSponsorshipPolicy = 13, // Disables free families plan for organization
   RemoveUnlockWithPin = 14, // Do not allow members to unlock their account with a PIN.
   RestrictedItemTypes = 15, // Restricts item types that can be created within an organization
+  UriMatchDefaults = 16, // Sets the default URI matching strategy for all users within an organization
   AutotypeDefaultSetting = 17, // Sets the default autotype setting for desktop app
+  AutoConfirm = 18, // Enables the auto confirmation feature for admins to enable in their client
+  BlockClaimedDomainAccountCreation = 19, // Prevents users from creating personal accounts using email addresses from verified domains
 }
diff --git a/libs/common/src/admin-console/models/data/organization.data.spec.ts b/libs/common/src/admin-console/models/data/organization.data.spec.ts
index 346fc3db4bb..53fc0d5ec3e 100644
--- a/libs/common/src/admin-console/models/data/organization.data.spec.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.spec.ts
@@ -30,6 +30,7 @@ describe("ORGANIZATIONS state", () => {
         useSecretsManager: false,
         usePasswordManager: false,
         useActivateAutofillPolicy: false,
+        useAutomaticUserConfirmation: false,
         selfHost: false,
         usersGetPremium: false,
         seats: 0,
@@ -57,7 +58,7 @@ describe("ORGANIZATIONS state", () => {
         allowAdminAccessToAllCollectionItems: false,
         familySponsorshipLastSyncDate: new Date(),
         userIsManagedByOrganization: false,
-        useRiskInsights: false,
+        useAccessIntelligence: false,
         useOrganizationDomains: false,
         useAdminSponsoredFamilies: false,
         isAdminInitiated: false,
diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts
index 95b4b294445..6424947d004 100644
--- a/libs/common/src/admin-console/models/data/organization.data.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.ts
@@ -30,6 +30,7 @@ export class OrganizationData {
   useSecretsManager: boolean;
   usePasswordManager: boolean;
   useActivateAutofillPolicy: boolean;
+  useAutomaticUserConfirmation: boolean;
   selfHost: boolean;
   usersGetPremium: boolean;
   seats: number;
@@ -61,7 +62,7 @@ export class OrganizationData {
   limitItemDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
   userIsManagedByOrganization: boolean;
-  useRiskInsights: boolean;
+  useAccessIntelligence: boolean;
   useAdminSponsoredFamilies: boolean;
   isAdminInitiated: boolean;
   ssoEnabled: boolean;
@@ -99,6 +100,7 @@ export class OrganizationData {
     this.useSecretsManager = response.useSecretsManager;
     this.usePasswordManager = response.usePasswordManager;
     this.useActivateAutofillPolicy = response.useActivateAutofillPolicy;
+    this.useAutomaticUserConfirmation = response.useAutomaticUserConfirmation;
     this.selfHost = response.selfHost;
     this.usersGetPremium = response.usersGetPremium;
     this.seats = response.seats;
@@ -128,7 +130,7 @@ export class OrganizationData {
     this.limitItemDeletion = response.limitItemDeletion;
     this.allowAdminAccessToAllCollectionItems = response.allowAdminAccessToAllCollectionItems;
     this.userIsManagedByOrganization = response.userIsManagedByOrganization;
-    this.useRiskInsights = response.useRiskInsights;
+    this.useAccessIntelligence = response.useAccessIntelligence;
     this.useAdminSponsoredFamilies = response.useAdminSponsoredFamilies;
     this.isAdminInitiated = response.isAdminInitiated;
     this.ssoEnabled = response.ssoEnabled;
diff --git a/libs/common/src/admin-console/models/domain/organization.spec.ts b/libs/common/src/admin-console/models/domain/organization.spec.ts
index ddf1010eea9..5765e84dfb2 100644
--- a/libs/common/src/admin-console/models/domain/organization.spec.ts
+++ b/libs/common/src/admin-console/models/domain/organization.spec.ts
@@ -32,6 +32,7 @@ describe("Organization", () => {
       useSecretsManager: true,
       usePasswordManager: true,
       useActivateAutofillPolicy: false,
+      useAutomaticUserConfirmation: false,
       selfHost: false,
       usersGetPremium: false,
       seats: 10,
@@ -79,7 +80,7 @@ describe("Organization", () => {
       limitItemDeletion: false,
       allowAdminAccessToAllCollectionItems: true,
       userIsManagedByOrganization: false,
-      useRiskInsights: false,
+      useAccessIntelligence: false,
       useAdminSponsoredFamilies: false,
       isAdminInitiated: false,
       ssoEnabled: false,
@@ -111,6 +112,28 @@ describe("Organization", () => {
       expect(organization.canManageDeviceApprovals).toBe(false);
     });
 
+    it("should return false when ssoEnabled is false", () => {
+      data.type = OrganizationUserType.Admin;
+      data.useSso = true;
+      data.ssoEnabled = false;
+      data.ssoMemberDecryptionType = MemberDecryptionType.TrustedDeviceEncryption;
+
+      const organization = new Organization(data);
+
+      expect(organization.canManageDeviceApprovals).toBe(false);
+    });
+
+    it("should return false when ssoMemberDecryptionType is not TrustedDeviceEncryption", () => {
+      data.type = OrganizationUserType.Admin;
+      data.useSso = true;
+      data.ssoEnabled = true;
+      data.ssoMemberDecryptionType = MemberDecryptionType.MasterPassword;
+
+      const organization = new Organization(data);
+
+      expect(organization.canManageDeviceApprovals).toBe(false);
+    });
+
     it("should return true when admin has all required SSO settings enabled", () => {
       data.type = OrganizationUserType.Admin;
       data.useSso = true;
@@ -157,4 +180,118 @@ describe("Organization", () => {
       expect(organization.canManageDeviceApprovals).toBe(true);
     });
   });
+
+  describe("canEnableAutoConfirmPolicy", () => {
+    it("should return false when user cannot manage users or policies", () => {
+      data.type = OrganizationUserType.User;
+      data.permissions.manageUsers = false;
+      data.permissions.managePolicies = false;
+      data.useAutomaticUserConfirmation = true;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(false);
+    });
+
+    it("should return false when user can manage users but useAutomaticUserConfirmation is false", () => {
+      data.type = OrganizationUserType.Admin;
+      data.useAutomaticUserConfirmation = false;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(false);
+    });
+
+    it("should return false when user has manageUsers permission but useAutomaticUserConfirmation is false", () => {
+      data.type = OrganizationUserType.User;
+      data.permissions.manageUsers = true;
+      data.useAutomaticUserConfirmation = false;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(false);
+    });
+
+    it("should return false when user can manage policies but useAutomaticUserConfirmation is false", () => {
+      data.type = OrganizationUserType.Admin;
+      data.usePolicies = true;
+      data.useAutomaticUserConfirmation = false;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(false);
+    });
+
+    it("should return false when user has managePolicies permission but usePolicies is false", () => {
+      data.type = OrganizationUserType.User;
+      data.permissions.managePolicies = true;
+      data.usePolicies = false;
+      data.useAutomaticUserConfirmation = true;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(false);
+    });
+
+    it("should return true when admin has useAutomaticUserConfirmation enabled", () => {
+      data.type = OrganizationUserType.Admin;
+      data.useAutomaticUserConfirmation = true;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(true);
+    });
+
+    it("should return true when owner has useAutomaticUserConfirmation enabled", () => {
+      data.type = OrganizationUserType.Owner;
+      data.useAutomaticUserConfirmation = true;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(true);
+    });
+
+    it("should return true when user has manageUsers permission and useAutomaticUserConfirmation is enabled", () => {
+      data.type = OrganizationUserType.User;
+      data.permissions.manageUsers = true;
+      data.useAutomaticUserConfirmation = true;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(true);
+    });
+
+    it("should return true when user has managePolicies permission, usePolicies is true, and useAutomaticUserConfirmation is enabled", () => {
+      data.type = OrganizationUserType.User;
+      data.permissions.managePolicies = true;
+      data.usePolicies = true;
+      data.useAutomaticUserConfirmation = true;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(true);
+    });
+
+    it("should return true when user has both manageUsers and managePolicies permissions with useAutomaticUserConfirmation enabled", () => {
+      data.type = OrganizationUserType.User;
+      data.permissions.manageUsers = true;
+      data.permissions.managePolicies = true;
+      data.usePolicies = true;
+      data.useAutomaticUserConfirmation = true;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(true);
+    });
+
+    it("should return false when provider user has useAutomaticUserConfirmation enabled", () => {
+      data.type = OrganizationUserType.Owner;
+      data.isProviderUser = true;
+      data.useAutomaticUserConfirmation = true;
+
+      const organization = new Organization(data);
+
+      expect(organization.canEnableAutoConfirmPolicy).toBe(false);
+    });
+  });
 });
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index 1372150bd81..458ae1e8f0c 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -38,6 +38,7 @@ export class Organization {
   useSecretsManager: boolean;
   usePasswordManager: boolean;
   useActivateAutofillPolicy: boolean;
+  useAutomaticUserConfirmation: boolean;
   selfHost: boolean;
   usersGetPremium: boolean;
   seats: number;
@@ -92,7 +93,7 @@ export class Organization {
    * matches one of the verified domains of that organization, and the user is a member of it.
    */
   userIsManagedByOrganization: boolean;
-  useRiskInsights: boolean;
+  useAccessIntelligence: boolean;
   useAdminSponsoredFamilies: boolean;
   isAdminInitiated: boolean;
   ssoEnabled: boolean;
@@ -124,6 +125,7 @@ export class Organization {
     this.useSecretsManager = obj.useSecretsManager;
     this.usePasswordManager = obj.usePasswordManager;
     this.useActivateAutofillPolicy = obj.useActivateAutofillPolicy;
+    this.useAutomaticUserConfirmation = obj.useAutomaticUserConfirmation;
     this.selfHost = obj.selfHost;
     this.usersGetPremium = obj.usersGetPremium;
     this.seats = obj.seats;
@@ -155,7 +157,7 @@ export class Organization {
     this.limitItemDeletion = obj.limitItemDeletion;
     this.allowAdminAccessToAllCollectionItems = obj.allowAdminAccessToAllCollectionItems;
     this.userIsManagedByOrganization = obj.userIsManagedByOrganization;
-    this.useRiskInsights = obj.useRiskInsights;
+    this.useAccessIntelligence = obj.useAccessIntelligence;
     this.useAdminSponsoredFamilies = obj.useAdminSponsoredFamilies;
     this.isAdminInitiated = obj.isAdminInitiated;
     this.ssoEnabled = obj.ssoEnabled;
@@ -308,8 +310,21 @@ export class Organization {
     return this.isAdmin || this.permissions.manageResetPassword;
   }
 
+  get canEnableAutoConfirmPolicy() {
+    return (
+      (this.canManageUsers || this.canManagePolicies) &&
+      this.useAutomaticUserConfirmation &&
+      !this.isProviderUser
+    );
+  }
+
   get canManageDeviceApprovals() {
-    return (this.isAdmin || this.permissions.manageResetPassword) && this.useSso;
+    return (
+      (this.isAdmin || this.permissions.manageResetPassword) &&
+      this.useSso &&
+      this.ssoEnabled &&
+      this.ssoMemberDecryptionType === MemberDecryptionType.TrustedDeviceEncryption
+    );
   }
 
   get isExemptFromPolicies() {
diff --git a/libs/common/src/billing/models/request/create-client-organization.request.ts b/libs/common/src/admin-console/models/request/create-provider-organization.request.ts
similarity index 66%
rename from libs/common/src/billing/models/request/create-client-organization.request.ts
rename to libs/common/src/admin-console/models/request/create-provider-organization.request.ts
index c7078164993..ccb437b922d 100644
--- a/libs/common/src/billing/models/request/create-client-organization.request.ts
+++ b/libs/common/src/admin-console/models/request/create-provider-organization.request.ts
@@ -1,9 +1,10 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { OrganizationKeysRequest } from "../../../admin-console/models/request/organization-keys.request";
 import { PlanType } from "../../../billing/enums";
 
-export class CreateClientOrganizationRequest {
+import { OrganizationKeysRequest } from "./organization-keys.request";
+
+export class CreateProviderOrganizationRequest {
   name: string;
   ownerEmail: string;
   planType: PlanType;
diff --git a/libs/common/src/admin-console/models/request/organization-update.request.ts b/libs/common/src/admin-console/models/request/organization-update.request.ts
index 1cde23dc675..0fa5dced880 100644
--- a/libs/common/src/admin-console/models/request/organization-update.request.ts
+++ b/libs/common/src/admin-console/models/request/organization-update.request.ts
@@ -1,10 +1,7 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { OrganizationKeysRequest } from "./organization-keys.request";
 
-export class OrganizationUpdateRequest {
-  name: string;
-  businessName: string;
-  billingEmail: string;
-  keys: OrganizationKeysRequest;
+export interface OrganizationUpdateRequest {
+  name?: string;
+  billingEmail?: string;
+  keys?: OrganizationKeysRequest;
 }
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 7b2e4f76063..36ffadff128 100644
--- a/libs/common/src/admin-console/models/request/policy.request.ts
+++ b/libs/common/src/admin-console/models/request/policy.request.ts
@@ -1,7 +1,4 @@
-import { PolicyType } from "../../enums";
-
 export type PolicyRequest = {
-  type: PolicyType;
   enabled: boolean;
   data: any;
 };
diff --git a/libs/common/src/admin-console/models/request/provider/provider-setup.request.ts b/libs/common/src/admin-console/models/request/provider/provider-setup.request.ts
index 5c9ea5526a0..001bba11cf4 100644
--- a/libs/common/src/admin-console/models/request/provider/provider-setup.request.ts
+++ b/libs/common/src/admin-console/models/request/provider/provider-setup.request.ts
@@ -1,7 +1,19 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ExpandedTaxInfoUpdateRequest } from "../../../../billing/models/request/expanded-tax-info-update.request";
-import { TokenizedPaymentSourceRequest } from "../../../../billing/models/request/tokenized-payment-source.request";
+interface TokenizedPaymentMethod {
+  type: "bankAccount" | "card" | "payPal";
+  token: string;
+}
+
+interface BillingAddress {
+  country: string;
+  postalCode: string;
+  line1: string | null;
+  line2: string | null;
+  city: string | null;
+  state: string | null;
+  taxId: { code: string; value: string } | null;
+}
 
 export class ProviderSetupRequest {
   name: string;
@@ -9,6 +21,6 @@ export class ProviderSetupRequest {
   billingEmail: string;
   token: string;
   key: string;
-  taxInfo: ExpandedTaxInfoUpdateRequest;
-  paymentSource?: TokenizedPaymentSourceRequest;
+  paymentMethod: TokenizedPaymentMethod;
+  billingAddress: BillingAddress;
 }
diff --git a/libs/common/src/billing/models/request/update-client-organization.request.ts b/libs/common/src/admin-console/models/request/update-provider-organization.request.ts
similarity index 73%
rename from libs/common/src/billing/models/request/update-client-organization.request.ts
rename to libs/common/src/admin-console/models/request/update-provider-organization.request.ts
index e21344b3d6b..f65ac42464f 100644
--- a/libs/common/src/billing/models/request/update-client-organization.request.ts
+++ b/libs/common/src/admin-console/models/request/update-provider-organization.request.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-export class UpdateClientOrganizationRequest {
+export class UpdateProviderOrganizationRequest {
   assignedSeats: number;
   name: string;
 }
diff --git a/libs/common/src/admin-console/models/response/organization.response.ts b/libs/common/src/admin-console/models/response/organization.response.ts
index 235ea2f8d96..3f6443678bf 100644
--- a/libs/common/src/admin-console/models/response/organization.response.ts
+++ b/libs/common/src/admin-console/models/response/organization.response.ts
@@ -38,7 +38,7 @@ export class OrganizationResponse extends BaseResponse {
   limitCollectionDeletion: boolean;
   limitItemDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
-  useRiskInsights: boolean;
+  useAccessIntelligence: boolean;
 
   constructor(response: any) {
     super(response);
@@ -80,6 +80,7 @@ export class OrganizationResponse extends BaseResponse {
     this.allowAdminAccessToAllCollectionItems = this.getResponseProperty(
       "AllowAdminAccessToAllCollectionItems",
     );
-    this.useRiskInsights = this.getResponseProperty("UseRiskInsights");
+    // Map from backend API property (UseRiskInsights) to domain model property (useAccessIntelligence)
+    this.useAccessIntelligence = this.getResponseProperty("UseRiskInsights");
   }
 }
diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts
index 53c3858ed1d..268ec1e4b6e 100644
--- a/libs/common/src/admin-console/models/response/profile-organization.response.ts
+++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts
@@ -23,6 +23,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
   useSecretsManager: boolean;
   usePasswordManager: boolean;
   useActivateAutofillPolicy: boolean;
+  useAutomaticUserConfirmation: boolean;
   selfHost: boolean;
   usersGetPremium: boolean;
   seats: number;
@@ -56,7 +57,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
   limitItemDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
   userIsManagedByOrganization: boolean;
-  useRiskInsights: boolean;
+  useAccessIntelligence: boolean;
   useAdminSponsoredFamilies: boolean;
   isAdminInitiated: boolean;
   ssoEnabled: boolean;
@@ -82,6 +83,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
     this.useSecretsManager = this.getResponseProperty("UseSecretsManager");
     this.usePasswordManager = this.getResponseProperty("UsePasswordManager");
     this.useActivateAutofillPolicy = this.getResponseProperty("UseActivateAutofillPolicy");
+    this.useAutomaticUserConfirmation = this.getResponseProperty("UseAutomaticUserConfirmation");
     this.selfHost = this.getResponseProperty("SelfHost");
     this.usersGetPremium = this.getResponseProperty("UsersGetPremium");
     this.seats = this.getResponseProperty("Seats");
@@ -127,7 +129,8 @@ export class ProfileOrganizationResponse extends BaseResponse {
       "AllowAdminAccessToAllCollectionItems",
     );
     this.userIsManagedByOrganization = this.getResponseProperty("UserIsManagedByOrganization");
-    this.useRiskInsights = this.getResponseProperty("UseRiskInsights");
+    // Map from backend API property (UseRiskInsights) to domain model property (useAccessIntelligence)
+    this.useAccessIntelligence = this.getResponseProperty("UseRiskInsights");
     this.useAdminSponsoredFamilies = this.getResponseProperty("UseAdminSponsoredFamilies");
     this.isAdminInitiated = this.getResponseProperty("IsAdminInitiated");
     this.ssoEnabled = this.getResponseProperty("SsoEnabled") ?? false;
diff --git a/libs/common/src/admin-console/services/organization/organization-api.service.ts b/libs/common/src/admin-console/services/organization/organization-api.service.ts
index 598bb2a29db..6a7b71389bb 100644
--- a/libs/common/src/admin-console/services/organization/organization-api.service.ts
+++ b/libs/common/src/admin-console/services/organization/organization-api.service.ts
@@ -7,21 +7,17 @@ import { OrganizationSsoRequest } from "../../../auth/models/request/organizatio
 import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request";
 import { ApiKeyResponse } from "../../../auth/models/response/api-key.response";
 import { OrganizationSsoResponse } from "../../../auth/models/response/organization-sso.response";
-import { ExpandedTaxInfoUpdateRequest } from "../../../billing/models/request/expanded-tax-info-update.request";
 import { OrganizationNoPaymentMethodCreateRequest } from "../../../billing/models/request/organization-no-payment-method-create-request";
 import { OrganizationSmSubscriptionUpdateRequest } from "../../../billing/models/request/organization-sm-subscription-update.request";
 import { OrganizationSubscriptionUpdateRequest } from "../../../billing/models/request/organization-subscription-update.request";
-import { PaymentRequest } from "../../../billing/models/request/payment.request";
 import { SecretsManagerSubscribeRequest } from "../../../billing/models/request/sm-subscribe.request";
 import { BillingHistoryResponse } from "../../../billing/models/response/billing-history.response";
 import { BillingResponse } from "../../../billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "../../../billing/models/response/organization-subscription.response";
 import { PaymentResponse } from "../../../billing/models/response/payment.response";
-import { TaxInfoResponse } from "../../../billing/models/response/tax-info.response";
 import { ImportDirectoryRequest } from "../../../models/request/import-directory.request";
 import { SeatRequest } from "../../../models/request/seat.request";
 import { StorageRequest } from "../../../models/request/storage.request";
-import { VerifyBankRequest } from "../../../models/request/verify-bank.request";
 import { ListResponse } from "../../../models/response/list.response";
 import { SyncService } from "../../../vault/abstractions/sync/sync.service.abstraction";
 import { OrganizationApiServiceAbstraction } from "../../abstractions/organization/organization-api.service.abstraction";
@@ -143,10 +139,6 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction
     return data;
   }
 
-  async updatePayment(id: string, request: PaymentRequest): Promise<void> {
-    return this.apiService.send("POST", "/organizations/" + id + "/payment", request, true, false);
-  }
-
   async upgrade(id: string, request: OrganizationUpgradeRequest): Promise<PaymentResponse> {
     const r = await this.apiService.send(
       "POST",
@@ -208,16 +200,6 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction
     return new PaymentResponse(r);
   }
 
-  async verifyBank(id: string, request: VerifyBankRequest): Promise<void> {
-    await this.apiService.send(
-      "POST",
-      "/organizations/" + id + "/verify-bank",
-      request,
-      true,
-      false,
-    );
-  }
-
   async reinstate(id: string): Promise<void> {
     return this.apiService.send("POST", "/organizations/" + id + "/reinstate", null, true, false);
   }
@@ -299,16 +281,6 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction
     return new ApiKeyResponse(r);
   }
 
-  async getTaxInfo(id: string): Promise<TaxInfoResponse> {
-    const r = await this.apiService.send("GET", "/organizations/" + id + "/tax", null, true, true);
-    return new TaxInfoResponse(r);
-  }
-
-  async updateTaxInfo(id: string, request: ExpandedTaxInfoUpdateRequest): Promise<void> {
-    // Can't broadcast anything because the response doesn't have content
-    return this.apiService.send("PUT", "/organizations/" + id + "/tax", request, true, false);
-  }
-
   async getKeys(id: string): Promise<OrganizationKeysResponse> {
     const r = await this.apiService.send("GET", "/organizations/" + id + "/keys", null, true, true);
     return new OrganizationKeysResponse(r);
diff --git a/libs/common/src/admin-console/services/policy/default-policy.service.spec.ts b/libs/common/src/admin-console/services/policy/default-policy.service.spec.ts
index 6b50f9befec..8ce1a785516 100644
--- a/libs/common/src/admin-console/services/policy/default-policy.service.spec.ts
+++ b/libs/common/src/admin-console/services/policy/default-policy.service.spec.ts
@@ -554,6 +554,77 @@ describe("PolicyService", () => {
 
       expect(result).toBe(false);
     });
+
+    describe("SingleOrg policy exemptions", () => {
+      it("returns true for SingleOrg policy when AutoConfirm is enabled, even for users who can manage policies", async () => {
+        singleUserState.nextState(
+          arrayToRecord([
+            policyData("policy1", "org6", PolicyType.SingleOrg, true),
+            policyData("policy2", "org6", PolicyType.AutoConfirm, true),
+          ]),
+        );
+
+        const result = await firstValueFrom(
+          policyService.policyAppliesToUser$(PolicyType.SingleOrg, userId),
+        );
+
+        expect(result).toBe(true);
+      });
+
+      it("returns false for SingleOrg policy when user can manage policies and AutoConfirm is not enabled", async () => {
+        singleUserState.nextState(
+          arrayToRecord([policyData("policy1", "org6", PolicyType.SingleOrg, true)]),
+        );
+
+        const result = await firstValueFrom(
+          policyService.policyAppliesToUser$(PolicyType.SingleOrg, userId),
+        );
+
+        expect(result).toBe(false);
+      });
+
+      it("returns false for SingleOrg policy when user can manage policies and AutoConfirm is disabled", async () => {
+        singleUserState.nextState(
+          arrayToRecord([
+            policyData("policy1", "org6", PolicyType.SingleOrg, true),
+            policyData("policy2", "org6", PolicyType.AutoConfirm, false),
+          ]),
+        );
+
+        const result = await firstValueFrom(
+          policyService.policyAppliesToUser$(PolicyType.SingleOrg, userId),
+        );
+
+        expect(result).toBe(false);
+      });
+
+      it("returns true for SingleOrg policy for regular users when AutoConfirm is not enabled", async () => {
+        singleUserState.nextState(
+          arrayToRecord([policyData("policy1", "org1", PolicyType.SingleOrg, true)]),
+        );
+
+        const result = await firstValueFrom(
+          policyService.policyAppliesToUser$(PolicyType.SingleOrg, userId),
+        );
+
+        expect(result).toBe(true);
+      });
+
+      it("returns true for SingleOrg policy when AutoConfirm is enabled in a different organization", async () => {
+        singleUserState.nextState(
+          arrayToRecord([
+            policyData("policy1", "org6", PolicyType.SingleOrg, true),
+            policyData("policy2", "org1", PolicyType.AutoConfirm, true),
+          ]),
+        );
+
+        const result = await firstValueFrom(
+          policyService.policyAppliesToUser$(PolicyType.SingleOrg, userId),
+        );
+
+        expect(result).toBe(false);
+      });
+    });
   });
 
   describe("combinePoliciesIntoMasterPasswordPolicyOptions", () => {
diff --git a/libs/common/src/admin-console/services/policy/default-policy.service.ts b/libs/common/src/admin-console/services/policy/default-policy.service.ts
index 5781dd938f3..b9d7655195b 100644
--- a/libs/common/src/admin-console/services/policy/default-policy.service.ts
+++ b/libs/common/src/admin-console/services/policy/default-policy.service.ts
@@ -40,18 +40,16 @@ export class DefaultPolicyService implements PolicyService {
   }
 
   policiesByType$(policyType: PolicyType, userId: UserId) {
-    const filteredPolicies$ = this.policies$(userId).pipe(
-      map((policies) => policies.filter((p) => p.type === policyType)),
-    );
-
     if (!userId) {
       throw new Error("No userId provided");
     }
 
+    const allPolicies$ = this.policies$(userId);
     const organizations$ = this.organizationService.organizations$(userId);
 
-    return combineLatest([filteredPolicies$, organizations$]).pipe(
+    return combineLatest([allPolicies$, organizations$]).pipe(
       map(([policies, organizations]) => this.enforcedPolicyFilter(policies, organizations)),
+      map((policies) => policies.filter((p) => p.type === policyType)),
     );
   }
 
@@ -77,7 +75,7 @@ export class DefaultPolicyService implements PolicyService {
         policy.enabled &&
         organization.status >= OrganizationUserStatusType.Accepted &&
         organization.usePolicies &&
-        !this.isExemptFromPolicy(policy.type, organization)
+        !this.isExemptFromPolicy(policy.type, organization, policies)
       );
     });
   }
@@ -265,7 +263,11 @@ export class DefaultPolicyService implements PolicyService {
    * Determines whether an orgUser is exempt from a specific policy because of their role
    * Generally orgUsers who can manage policies are exempt from them, but some policies are stricter
    */
-  private isExemptFromPolicy(policyType: PolicyType, organization: Organization) {
+  private isExemptFromPolicy(
+    policyType: PolicyType,
+    organization: Organization,
+    allPolicies: Policy[],
+  ) {
     switch (policyType) {
       case PolicyType.MaximumVaultTimeout:
         // Max Vault Timeout applies to everyone except owners
@@ -283,9 +285,19 @@ export class DefaultPolicyService implements PolicyService {
       case PolicyType.RemoveUnlockWithPin:
         // Remove Unlock with PIN policy
         return false;
+      case PolicyType.AutoConfirm:
+        return false;
       case PolicyType.OrganizationDataOwnership:
         // organization data ownership policy applies to everyone except admins and owners
         return organization.isAdmin;
+      case PolicyType.SingleOrg:
+        // Check if AutoConfirm policy is enabled for this organization
+        return allPolicies.find(
+          (p) =>
+            p.organizationId === organization.id && p.type === PolicyType.AutoConfirm && p.enabled,
+        )
+          ? false
+          : organization.canManagePolicies;
       default:
         return organization.canManagePolicies;
     }
diff --git a/libs/common/src/admin-console/services/provider/provider-api.service.ts b/libs/common/src/admin-console/services/provider/provider-api.service.ts
index dc82ec011f4..f0dbb424558 100644
--- a/libs/common/src/admin-console/services/provider/provider-api.service.ts
+++ b/libs/common/src/admin-console/services/provider/provider-api.service.ts
@@ -1,10 +1,14 @@
 import { AddableOrganizationResponse } from "@bitwarden/common/admin-console/models/response/addable-organization.response";
+import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
 
 import { ApiService } from "../../../abstractions/api.service";
 import { ProviderApiServiceAbstraction } from "../../abstractions/provider/provider-api.service.abstraction";
+import { CreateProviderOrganizationRequest } from "../../models/request/create-provider-organization.request";
 import { ProviderSetupRequest } from "../../models/request/provider/provider-setup.request";
 import { ProviderUpdateRequest } from "../../models/request/provider/provider-update.request";
 import { ProviderVerifyRecoverDeleteRequest } from "../../models/request/provider/provider-verify-recover-delete.request";
+import { UpdateProviderOrganizationRequest } from "../../models/request/update-provider-organization.request";
 import { ProviderResponse } from "../../models/response/provider/provider.response";
 
 export class ProviderApiService implements ProviderApiServiceAbstraction {
@@ -47,6 +51,19 @@ export class ProviderApiService implements ProviderApiServiceAbstraction {
     await this.apiService.send("DELETE", "/providers/" + id, null, true, false);
   }
 
+  async getProviderOrganizations(
+    providerId: string,
+  ): Promise<ListResponse<ProviderOrganizationOrganizationDetailsResponse>> {
+    const response = await this.apiService.send(
+      "GET",
+      "/providers/" + providerId + "/organizations",
+      null,
+      true,
+      true,
+    );
+    return new ListResponse(response, ProviderOrganizationOrganizationDetailsResponse);
+  }
+
   async getProviderAddableOrganizations(
     providerId: string,
   ): Promise<AddableOrganizationResponse[]> {
@@ -76,4 +93,31 @@ export class ProviderApiService implements ProviderApiServiceAbstraction {
       false,
     );
   }
+
+  async updateProviderOrganization(
+    providerId: string,
+    organizationId: string,
+    request: UpdateProviderOrganizationRequest,
+  ): Promise<any> {
+    return await this.apiService.send(
+      "PUT",
+      "/providers/" + providerId + "/clients/" + organizationId,
+      request,
+      true,
+      false,
+    );
+  }
+
+  createProviderOrganization(
+    providerId: string,
+    request: CreateProviderOrganizationRequest,
+  ): Promise<void> {
+    return this.apiService.send(
+      "POST",
+      "/providers/" + providerId + "/clients",
+      request,
+      true,
+      false,
+    );
+  }
 }
diff --git a/libs/common/src/auth/abstractions/two-factor.service.ts b/libs/common/src/auth/abstractions/two-factor.service.ts
deleted file mode 100644
index 528e52bf5da..00000000000
--- a/libs/common/src/auth/abstractions/two-factor.service.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { TwoFactorProviderType } from "../enums/two-factor-provider-type";
-import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response";
-
-export interface TwoFactorProviderDetails {
-  type: TwoFactorProviderType;
-  name: string;
-  description: string;
-  priority: number;
-  sort: number;
-  premium: boolean;
-}
-export abstract class TwoFactorService {
-  /**
-   * Initializes the client-side's TwoFactorProviders const with translations.
-   */
-  abstract init(): void;
-
-  /**
-   * Gets a list of two-factor providers from state that are supported on the current client.
-   * E.g., WebAuthn and Duo are not available on all clients.
-   * @returns A list of supported two-factor providers or an empty list if none are stored in state.
-   */
-  abstract getSupportedProviders(win: Window): Promise<TwoFactorProviderDetails[]>;
-
-  /**
-   * Gets the previously selected two-factor provider or the default two factor provider based on priority.
-   * @param webAuthnSupported - Whether or not WebAuthn is supported by the client. Prevents WebAuthn from being the default provider if false.
-   */
-  abstract getDefaultProvider(webAuthnSupported: boolean): Promise<TwoFactorProviderType>;
-
-  /**
-   * Sets the selected two-factor provider in state.
-   * @param type - The type of two-factor provider to set as the selected provider.
-   */
-  abstract setSelectedProvider(type: TwoFactorProviderType): Promise<void>;
-
-  /**
-   * Clears the selected two-factor provider from state.
-   */
-  abstract clearSelectedProvider(): Promise<void>;
-
-  /**
-   * Sets the list of available two-factor providers in state.
-   * @param response - the response from Identity for when 2FA is required. Includes the list of available 2FA providers.
-   */
-  abstract setProviders(response: IdentityTwoFactorResponse): Promise<void>;
-
-  /**
-   * Clears the list of available two-factor providers from state.
-   */
-  abstract clearProviders(): Promise<void>;
-
-  /**
-   * Gets the list of two-factor providers from state.
-   * Note: no filtering is done here, so this will return all providers, including potentially
-   * unsupported ones for the current client.
-   * @returns A list of two-factor providers or null if none are stored in state.
-   */
-  abstract getProviders(): Promise<Map<TwoFactorProviderType, { [key: string]: string }> | null>;
-}
diff --git a/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts b/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts
index d9749d9467c..b9bc9108e52 100644
--- a/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts
+++ b/libs/common/src/auth/abstractions/user-verification/user-verification.service.abstraction.ts
@@ -48,6 +48,9 @@ export abstract class UserVerificationService {
    * @param userId The user id to check. If not provided, the current user is used
    * @returns True if the user has a master password
    * @deprecated Use UserDecryptionOptionsService.hasMasterPassword$ instead
+   * @remark To facilitate deprecation, many call sites were removed as part of PM-26413.
+   * Those remaining are blocked by currently-disallowed imports of auth/common.
+   * PM-27009 has been filed to track completion of this deprecation.
    */
   abstract hasMasterPassword(userId?: string): Promise<boolean>;
   /**
diff --git a/libs/common/src/auth/abstractions/webauthn/webauthn-login-prf-key.service.abstraction.ts b/libs/common/src/auth/abstractions/webauthn/webauthn-login-prf-key.service.abstraction.ts
index d47b7ccbcef..191bcaf44a8 100644
--- a/libs/common/src/auth/abstractions/webauthn/webauthn-login-prf-key.service.abstraction.ts
+++ b/libs/common/src/auth/abstractions/webauthn/webauthn-login-prf-key.service.abstraction.ts
@@ -11,7 +11,7 @@ export abstract class WebAuthnLoginPrfKeyServiceAbstraction {
 
   /**
    * Create a symmetric key from the PRF-output by stretching it.
-   * This should be used as `ExternalKey` with `RotateableKeySet`.
+   * This should be used as `UpstreamKey` with `RotateableKeySet`.
    */
   abstract createSymmetricKeyFromPrf(prf: ArrayBuffer): Promise<PrfKey>;
 }
diff --git a/libs/common/src/auth/models/request/device-verification.request.ts b/libs/common/src/auth/models/request/device-verification.request.ts
deleted file mode 100644
index 5e119efa190..00000000000
--- a/libs/common/src/auth/models/request/device-verification.request.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export class DeviceVerificationRequest {
-  unknownDeviceVerificationEnabled: boolean;
-
-  constructor(unknownDeviceVerificationEnabled: boolean) {
-    this.unknownDeviceVerificationEnabled = unknownDeviceVerificationEnabled;
-  }
-}
diff --git a/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts b/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
index 2d32d3c21ee..7b831917815 100644
--- a/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
+++ b/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
@@ -1,10 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { RotateableKeySet } from "../../../../../auth/src/common/models";
 import { EncString } from "../../../key-management/crypto/models/enc-string";
+import { RotateableKeySet } from "../../../key-management/keys/models/rotateable-key-set";
 
 export class WebauthnRotateCredentialRequest {
   id: string;
diff --git a/libs/common/src/auth/models/response/device-verification.response.ts b/libs/common/src/auth/models/response/device-verification.response.ts
deleted file mode 100644
index d703605703f..00000000000
--- a/libs/common/src/auth/models/response/device-verification.response.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { BaseResponse } from "../../../models/response/base.response";
-
-export class DeviceVerificationResponse extends BaseResponse {
-  isDeviceVerificationSectionEnabled: boolean;
-  unknownDeviceVerificationEnabled: boolean;
-
-  constructor(response: any) {
-    super(response);
-    this.isDeviceVerificationSectionEnabled = this.getResponseProperty(
-      "IsDeviceVerificationSectionEnabled",
-    );
-    this.unknownDeviceVerificationEnabled = this.getResponseProperty(
-      "UnknownDeviceVerificationEnabled",
-    );
-  }
-}
diff --git a/libs/common/src/auth/models/response/identity-token.response.ts b/libs/common/src/auth/models/response/identity-token.response.ts
index 7f490203131..dab96f6cf8c 100644
--- a/libs/common/src/auth/models/response/identity-token.response.ts
+++ b/libs/common/src/auth/models/response/identity-token.response.ts
@@ -11,11 +11,13 @@ import { MasterPasswordPolicyResponse } from "./master-password-policy.response"
 import { UserDecryptionOptionsResponse } from "./user-decryption-options/user-decryption-options.response";
 
 export class IdentityTokenResponse extends BaseResponse {
+  // Authentication Information
   accessToken: string;
   expiresIn?: number;
   refreshToken?: string;
   tokenType: string;
 
+  // Decryption Information
   resetMasterPassword: boolean;
   privateKey: string; // userKeyEncryptedPrivateKey
   key?: EncString; // masterKeyEncryptedUserKey
diff --git a/libs/common/src/auth/models/response/protected-device.response.ts b/libs/common/src/auth/models/response/protected-device.response.ts
index 1c69db8f358..77a077ac1af 100644
--- a/libs/common/src/auth/models/response/protected-device.response.ts
+++ b/libs/common/src/auth/models/response/protected-device.response.ts
@@ -2,12 +2,9 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
-// 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 { RotateableKeySet } from "@bitwarden/auth/common";
-
 import { DeviceType } from "../../../enums";
 import { EncString } from "../../../key-management/crypto/models/enc-string";
+import { RotateableKeySet } from "../../../key-management/keys/models/rotateable-key-set";
 import { BaseResponse } from "../../../models/response/base.response";
 
 export class ProtectedDeviceResponse extends BaseResponse {
diff --git a/libs/common/src/auth/send-access/abstractions/index.ts b/libs/common/src/auth/send-access/abstractions/index.ts
new file mode 100644
index 00000000000..be8d6282020
--- /dev/null
+++ b/libs/common/src/auth/send-access/abstractions/index.ts
@@ -0,0 +1 @@
+export * from "./send-token.service";
diff --git a/libs/common/src/auth/send-access/abstractions/send-token.service.ts b/libs/common/src/auth/send-access/abstractions/send-token.service.ts
new file mode 100644
index 00000000000..e423713a283
--- /dev/null
+++ b/libs/common/src/auth/send-access/abstractions/send-token.service.ts
@@ -0,0 +1,57 @@
+import { Observable } from "rxjs";
+
+import { SendAccessToken } from "../models/send-access-token";
+import { GetSendAccessTokenError } from "../types/get-send-access-token-error.type";
+import { SendAccessDomainCredentials } from "../types/send-access-domain-credentials.type";
+import { SendHashedPasswordB64 } from "../types/send-hashed-password-b64.type";
+import { TryGetSendAccessTokenError } from "../types/try-get-send-access-token-error.type";
+
+/**
+ * Service to manage send access tokens.
+ */
+export abstract class SendTokenService {
+  /**
+   * Attempts to retrieve a {@link SendAccessToken} for the given sendId.
+   * If the access token is found in session storage and is not expired, then it returns the token.
+   * If the access token found in session storage is expired, then it returns a {@link TryGetSendAccessTokenError} expired error and clears the token from storage so that a subsequent call can attempt to retrieve a new token.
+   * If an access token is not found in storage, then it attempts to retrieve it from the server (will succeed for sends that don't require any credentials to view).
+   * If the access token is successfully retrieved from the server, then it stores the token in session storage and returns it.
+   * If an access token cannot be granted b/c the send requires credentials, then it returns a {@link TryGetSendAccessTokenError} indicating which credentials are required.
+   * Any submissions of credentials will be handled by the getSendAccessToken$ method.
+   * @param sendId The ID of the send to retrieve the access token for.
+   * @returns An observable that emits a SendAccessToken if successful, or a TryGetSendAccessTokenError if not.
+   */
+  abstract tryGetSendAccessToken$: (
+    sendId: string,
+  ) => Observable<SendAccessToken | TryGetSendAccessTokenError>;
+
+  /**
+   * Retrieves a SendAccessToken for the given sendId using the provided credentials.
+   * If the access token is successfully retrieved from the server, it stores the token in session storage and returns it.
+   * If the access token cannot be granted due to invalid credentials, it returns a {@link GetSendAccessTokenError}.
+   * @param sendId The ID of the send to retrieve the access token for.
+   * @param sendAccessCredentials The credentials to use for accessing the send.
+   * @returns An observable that emits a SendAccessToken if successful, or a GetSendAccessTokenError if not.
+   */
+  abstract getSendAccessToken$: (
+    sendId: string,
+    sendAccessCredentials: SendAccessDomainCredentials,
+  ) => Observable<SendAccessToken | GetSendAccessTokenError>;
+
+  /**
+   * Hashes a password for send access which is required to create a {@link SendAccessTokenRequest}
+   * (more specifically, to create a {@link SendAccessDomainCredentials} for sends that require a password)
+   * @param password The raw password string to hash.
+   * @param keyMaterialUrlB64 The base64 URL encoded key material string.
+   * @returns A promise that resolves to the hashed password as a SendHashedPasswordB64.
+   */
+  abstract hashSendPassword: (
+    password: string,
+    keyMaterialUrlB64: string,
+  ) => Promise<SendHashedPasswordB64>;
+
+  /**
+   * Clears a send access token from storage.
+   */
+  abstract invalidateSendAccessToken: (sendId: string) => Promise<void>;
+}
diff --git a/libs/common/src/auth/send-access/index.ts b/libs/common/src/auth/send-access/index.ts
new file mode 100644
index 00000000000..38352451e49
--- /dev/null
+++ b/libs/common/src/auth/send-access/index.ts
@@ -0,0 +1,4 @@
+export * from "./abstractions";
+export * from "./models";
+export * from "./services";
+export * from "./types";
diff --git a/libs/common/src/auth/send-access/models/index.ts b/libs/common/src/auth/send-access/models/index.ts
new file mode 100644
index 00000000000..9748d794715
--- /dev/null
+++ b/libs/common/src/auth/send-access/models/index.ts
@@ -0,0 +1 @@
+export * from "./send-access-token";
diff --git a/libs/common/src/auth/send-access/models/send-access-token.spec.ts b/libs/common/src/auth/send-access/models/send-access-token.spec.ts
new file mode 100644
index 00000000000..6bacac7eb6d
--- /dev/null
+++ b/libs/common/src/auth/send-access/models/send-access-token.spec.ts
@@ -0,0 +1,75 @@
+import { SendAccessTokenResponse } from "@bitwarden/sdk-internal";
+
+import { SendAccessToken } from "./send-access-token";
+
+describe("SendAccessToken", () => {
+  const sendId = "sendId";
+
+  const NOW = 1_000_000; // fixed timestamp for predictable results
+
+  const expiresAt: number = NOW + 1000 * 60 * 5; // 5 minutes from now
+
+  const expiredExpiresAt: number = NOW - 1000 * 60 * 5; // 5 minutes ago
+
+  let nowSpy: jest.SpyInstance<number, []>;
+
+  beforeAll(() => {
+    nowSpy = jest.spyOn(Date, "now");
+  });
+
+  beforeEach(() => {
+    // Ensure every test starts from the same fixed time
+    nowSpy.mockReturnValue(NOW);
+  });
+
+  afterAll(() => {
+    jest.restoreAllMocks();
+  });
+
+  it("should create a valid, unexpired token", () => {
+    const token = new SendAccessToken(sendId, expiresAt);
+    expect(token).toBeTruthy();
+    expect(token.isExpired()).toBe(false);
+  });
+
+  it("should be expired after the expiration time", () => {
+    const token = new SendAccessToken(sendId, expiredExpiresAt);
+    expect(token.isExpired()).toBe(true);
+  });
+
+  it("should be considered expired if within 5 seconds of expiration", () => {
+    const token = new SendAccessToken(sendId, expiresAt);
+    nowSpy.mockReturnValue(expiresAt - 4_000); // 4 seconds before expiry
+    expect(token.isExpired()).toBe(true);
+  });
+
+  it("should return the correct time until expiry in seconds", () => {
+    const token = new SendAccessToken(sendId, expiresAt);
+    expect(token.timeUntilExpirySeconds()).toBe(300); // 5 minutes
+  });
+
+  it("should return 0 if the token is expired", () => {
+    const token = new SendAccessToken(sendId, expiredExpiresAt);
+    expect(token.timeUntilExpirySeconds()).toBe(0);
+  });
+
+  it("should create a token from JSON", () => {
+    const json = {
+      token: sendId,
+      expiresAt: expiresAt,
+    };
+    const token = SendAccessToken.fromJson(json);
+    expect(token).toBeTruthy();
+    expect(token.isExpired()).toBe(false);
+  });
+
+  it("should create a token from SendAccessTokenResponse", () => {
+    const response = {
+      token: sendId,
+      expiresAt: expiresAt,
+    } as SendAccessTokenResponse;
+    const token = SendAccessToken.fromSendAccessTokenResponse(response);
+    expect(token).toBeTruthy();
+    expect(token.isExpired()).toBe(false);
+  });
+});
diff --git a/libs/common/src/auth/send-access/models/send-access-token.ts b/libs/common/src/auth/send-access/models/send-access-token.ts
new file mode 100644
index 00000000000..e237243159d
--- /dev/null
+++ b/libs/common/src/auth/send-access/models/send-access-token.ts
@@ -0,0 +1,46 @@
+import { Jsonify } from "type-fest";
+
+import { SendAccessTokenResponse } from "@bitwarden/sdk-internal";
+
+export class SendAccessToken {
+  constructor(
+    /**
+     * The access token string
+     */
+    readonly token: string,
+    /**
+     * The time (in milliseconds since the epoch) when the token expires
+     */
+    readonly expiresAt: number,
+  ) {}
+
+  /** Returns whether the send access token is expired or not
+   * Has a 5 second threshold to avoid race conditions with the token
+   * expiring in flight
+   */
+  isExpired(threshold: number = 5_000): boolean {
+    return Date.now() >= this.expiresAt - threshold;
+  }
+
+  /** Returns how many full seconds remain until expiry. Returns 0 if expired. */
+  timeUntilExpirySeconds(): number {
+    return Math.max(0, Math.floor((this.expiresAt - Date.now()) / 1_000));
+  }
+
+  static fromJson(parsedJson: Jsonify<SendAccessToken>): SendAccessToken {
+    return new SendAccessToken(parsedJson.token, parsedJson.expiresAt);
+  }
+
+  /**
+   * Creates a SendAccessToken from a SendAccessTokenResponse.
+   * @param sendAccessTokenResponse The SDK response object containing the token and expiry information.
+   * @returns A new instance of SendAccessToken.
+   * note: we need to convert from the SDK response type to our internal type so that we can
+   * be sure it will serialize/deserialize correctly in state provider.
+   */
+  static fromSendAccessTokenResponse(
+    sendAccessTokenResponse: SendAccessTokenResponse,
+  ): SendAccessToken {
+    return new SendAccessToken(sendAccessTokenResponse.token, sendAccessTokenResponse.expiresAt);
+  }
+}
diff --git a/libs/common/src/auth/send-access/services/default-send-token.service.spec.ts b/libs/common/src/auth/send-access/services/default-send-token.service.spec.ts
new file mode 100644
index 00000000000..8db0532911f
--- /dev/null
+++ b/libs/common/src/auth/send-access/services/default-send-token.service.spec.ts
@@ -0,0 +1,678 @@
+import { MockProxy, mock } from "jest-mock-extended";
+import { firstValueFrom } from "rxjs";
+
+import {
+  SendAccessTokenApiErrorResponse,
+  SendAccessTokenError,
+  SendAccessTokenInvalidGrantError,
+  SendAccessTokenInvalidRequestError,
+  SendAccessTokenResponse,
+  UnexpectedIdentityError,
+} from "@bitwarden/sdk-internal";
+import { FakeGlobalState, FakeGlobalStateProvider } from "@bitwarden/state-test-utils";
+
+import {
+  SendHashedPassword,
+  SendPasswordKeyMaterial,
+  SendPasswordService,
+} from "../../../key-management/sends";
+import { Utils } from "../../../platform/misc/utils";
+import { MockSdkService } from "../../../platform/spec/mock-sdk.service";
+import { SendAccessToken } from "../models/send-access-token";
+import { GetSendAccessTokenError } from "../types/get-send-access-token-error.type";
+import { SendAccessDomainCredentials } from "../types/send-access-domain-credentials.type";
+import { SendHashedPasswordB64 } from "../types/send-hashed-password-b64.type";
+import { SendOtp } from "../types/send-otp.type";
+
+import { DefaultSendTokenService } from "./default-send-token.service";
+import { SEND_ACCESS_TOKEN_DICT } from "./send-access-token-dict.state";
+
+describe("SendTokenService", () => {
+  let service: DefaultSendTokenService;
+
+  // Deps
+  let sdkService: MockSdkService;
+  let globalStateProvider: FakeGlobalStateProvider;
+  let sendPasswordService: MockProxy<SendPasswordService>;
+
+  beforeEach(() => {
+    globalStateProvider = new FakeGlobalStateProvider();
+    sdkService = new MockSdkService();
+    sendPasswordService = mock<SendPasswordService>();
+
+    service = new DefaultSendTokenService(globalStateProvider, sdkService, sendPasswordService);
+  });
+
+  it("instantiates", () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe("Send access token retrieval tests", () => {
+    let sendAccessTokenDictGlobalState: FakeGlobalState<Record<string, SendAccessToken>>;
+
+    let sendAccessTokenResponse: SendAccessTokenResponse;
+
+    let sendId: string;
+    let sendAccessToken: SendAccessToken;
+    let token: string;
+    let tokenExpiresAt: number;
+
+    const EXPECTED_SERVER_KIND: GetSendAccessTokenError["kind"] = "expected_server";
+    const UNEXPECTED_SERVER_KIND: GetSendAccessTokenError["kind"] = "unexpected_server";
+
+    const INVALID_REQUEST_CODES: SendAccessTokenInvalidRequestError[] = [
+      "send_id_required",
+      "password_hash_b64_required",
+      "email_required",
+      "email_and_otp_required_otp_sent",
+      "unknown",
+    ];
+
+    const INVALID_GRANT_CODES: SendAccessTokenInvalidGrantError[] = [
+      "send_id_invalid",
+      "password_hash_b64_invalid",
+      "email_invalid",
+      "otp_invalid",
+      "otp_generation_failed",
+      "unknown",
+    ];
+
+    const CREDS = [
+      { kind: "password", passwordHashB64: "h4sh" as SendHashedPasswordB64 },
+      { kind: "email", email: "u@example.com" },
+      { kind: "email_otp", email: "u@example.com", otp: "123456" as SendOtp },
+    ] as const satisfies readonly SendAccessDomainCredentials[];
+
+    type SendAccessTokenApiErrorResponseErrorCode = SendAccessTokenApiErrorResponse["error"];
+
+    type SimpleErrorType = Exclude<
+      SendAccessTokenApiErrorResponseErrorCode,
+      "invalid_request" | "invalid_grant"
+    >;
+
+    // Extract out simple error types which don't have complex send_access_error_types to handle.
+    const SIMPLE_ERROR_TYPES = [
+      "invalid_client",
+      "unauthorized_client",
+      "unsupported_grant_type",
+      "invalid_scope",
+      "invalid_target",
+    ] as const satisfies readonly SimpleErrorType[];
+
+    beforeEach(() => {
+      sendId = "sendId";
+      token = "sendAccessToken";
+      tokenExpiresAt = Date.now() + 1000 * 60 * 5; // 5 minutes from now
+
+      sendAccessTokenResponse = {
+        token: token,
+        expiresAt: tokenExpiresAt,
+      };
+
+      sendAccessToken = SendAccessToken.fromSendAccessTokenResponse(sendAccessTokenResponse);
+
+      sendAccessTokenDictGlobalState = globalStateProvider.getFake(SEND_ACCESS_TOKEN_DICT);
+      // Ensure the state is empty before each test
+      sendAccessTokenDictGlobalState.stateSubject.next({});
+    });
+
+    describe("tryGetSendAccessToken$", () => {
+      it("returns the send access token from session storage when token exists and isn't expired", async () => {
+        // Arrange
+        // Store the send access token in the global state
+        sendAccessTokenDictGlobalState.stateSubject.next({ [sendId]: sendAccessToken });
+
+        // Act
+        const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+        // Assert
+        expect(result).toEqual(sendAccessToken);
+      });
+
+      it("returns expired error and clears token from storage when token is expired", async () => {
+        // Arrange
+        const oldDate = new Date("2025-01-01");
+        const expiredSendAccessToken = new SendAccessToken(token, oldDate.getTime());
+        sendAccessTokenDictGlobalState.stateSubject.next({ [sendId]: expiredSendAccessToken });
+
+        // Act
+        const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+        // Assert
+        expect(result).not.toBeInstanceOf(SendAccessToken);
+        expect(result).toStrictEqual({ kind: "expired" });
+
+        // assert that we removed the expired token from storage.
+        const sendAccessTokenDict = await firstValueFrom(sendAccessTokenDictGlobalState.state$);
+        expect(sendAccessTokenDict).not.toHaveProperty(sendId);
+      });
+
+      it("calls to get a new token if none is found in storage and stores the retrieved token in session storage", async () => {
+        // Arrange
+        sdkService.client.auth
+          .mockDeep()
+          .send_access.mockDeep()
+          .request_send_access_token.mockResolvedValue(sendAccessTokenResponse);
+
+        // Act
+        const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+        // Assert
+        expect(result).toBeInstanceOf(SendAccessToken);
+        expect(result).toEqual(sendAccessToken);
+        const sendAccessTokenDict = await firstValueFrom(sendAccessTokenDictGlobalState.state$);
+        expect(sendAccessTokenDict).toHaveProperty(sendId, sendAccessToken);
+      });
+
+      describe("handles expected invalid_request scenarios appropriately", () => {
+        it.each(INVALID_REQUEST_CODES)(
+          "surfaces %s as an expected invalid_request error",
+          async (code) => {
+            // Arrange
+            const sendAccessTokenApiErrorResponse: SendAccessTokenApiErrorResponse = {
+              error: "invalid_request",
+              error_description: code,
+              send_access_error_type: code,
+            };
+            mockSdkRejectWith({
+              kind: "expected",
+              data: sendAccessTokenApiErrorResponse,
+            });
+
+            // Act
+            const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+            // Assert
+            expect(result).toEqual({
+              kind: EXPECTED_SERVER_KIND,
+              error: sendAccessTokenApiErrorResponse,
+            });
+          },
+        );
+
+        it("handles bare expected invalid_request scenario appropriately", async () => {
+          const sendAccessTokenApiErrorResponse: SendAccessTokenApiErrorResponse = {
+            error: "invalid_request",
+          };
+          mockSdkRejectWith({
+            kind: "expected",
+            data: sendAccessTokenApiErrorResponse,
+          });
+
+          // Act
+          const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+          // Assert
+          expect(result).toEqual({
+            kind: EXPECTED_SERVER_KIND,
+            error: sendAccessTokenApiErrorResponse,
+          });
+        });
+      });
+
+      it.each(SIMPLE_ERROR_TYPES)("handles expected %s error appropriately", async (errorType) => {
+        const api: SendAccessTokenApiErrorResponse = {
+          error: errorType,
+          error_description: `The ${errorType} error occurred`,
+        };
+        mockSdkRejectWith({ kind: "expected", data: api });
+
+        const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+        expect(result).toEqual({ kind: EXPECTED_SERVER_KIND, error: api });
+      });
+
+      it.each(SIMPLE_ERROR_TYPES)(
+        "handles expected %s bare error appropriately",
+        async (errorType) => {
+          const api: SendAccessTokenApiErrorResponse = { error: errorType };
+          mockSdkRejectWith({ kind: "expected", data: api });
+
+          const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+          expect(result).toEqual({ kind: EXPECTED_SERVER_KIND, error: api });
+        },
+      );
+
+      describe("handles expected invalid_grant scenarios appropriately", () => {
+        it.each(INVALID_GRANT_CODES)(
+          "surfaces %s as an expected invalid_grant error",
+          async (code) => {
+            // Arrange
+            const sendAccessTokenApiErrorResponse: SendAccessTokenApiErrorResponse = {
+              error: "invalid_grant",
+              error_description: code,
+              send_access_error_type: code,
+            };
+            mockSdkRejectWith({
+              kind: "expected",
+              data: sendAccessTokenApiErrorResponse,
+            });
+
+            // Act
+            const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+            // Assert
+            expect(result).toEqual({
+              kind: EXPECTED_SERVER_KIND,
+              error: sendAccessTokenApiErrorResponse,
+            });
+          },
+        );
+
+        it("handles bare expected invalid_grant scenario appropriately", async () => {
+          const sendAccessTokenApiErrorResponse: SendAccessTokenApiErrorResponse = {
+            error: "invalid_grant",
+          };
+          mockSdkRejectWith({
+            kind: "expected",
+            data: sendAccessTokenApiErrorResponse,
+          });
+
+          // Act
+          const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+          // Assert
+          expect(result).toEqual({
+            kind: EXPECTED_SERVER_KIND,
+            error: sendAccessTokenApiErrorResponse,
+          });
+        });
+      });
+
+      it("surfaces unexpected errors as unexpected_server error", async () => {
+        // Arrange
+        const unexpectedIdentityError: UnexpectedIdentityError = "unexpected error occurred";
+
+        mockSdkRejectWith({
+          kind: "unexpected",
+          data: unexpectedIdentityError,
+        });
+
+        // Act
+        const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+        // Assert
+        expect(result).toEqual({
+          kind: UNEXPECTED_SERVER_KIND,
+          error: unexpectedIdentityError,
+        });
+      });
+
+      it("surfaces an unknown error as an unknown error", async () => {
+        // Arrange
+        const unknownError = "unknown error occurred";
+
+        sdkService.client.auth
+          .mockDeep()
+          .send_access.mockDeep()
+          .request_send_access_token.mockRejectedValue(new Error(unknownError));
+
+        // Act
+        const result = await firstValueFrom(service.tryGetSendAccessToken$(sendId));
+
+        // Assert
+        expect(result).toEqual({
+          kind: "unknown",
+          error: unknownError,
+        });
+      });
+
+      describe("getSendAccessTokenFromStorage", () => {
+        it("returns undefined if no token is found in storage", async () => {
+          const result = await (service as any).getSendAccessTokenFromStorage("nonexistentSendId");
+          expect(result).toBeUndefined();
+        });
+
+        it("returns the token if found in storage", async () => {
+          sendAccessTokenDictGlobalState.stateSubject.next({ [sendId]: sendAccessToken });
+          const result = await (service as any).getSendAccessTokenFromStorage(sendId);
+          expect(result).toEqual(sendAccessToken);
+        });
+
+        it("returns undefined if the global state isn't initialized yet", async () => {
+          sendAccessTokenDictGlobalState.stateSubject.next(null);
+
+          const result = await (service as any).getSendAccessTokenFromStorage(sendId);
+          expect(result).toBeUndefined();
+        });
+      });
+
+      describe("setSendAccessTokenInStorage", () => {
+        it("stores the token in storage", async () => {
+          await (service as any).setSendAccessTokenInStorage(sendId, sendAccessToken);
+          const sendAccessTokenDict = await firstValueFrom(sendAccessTokenDictGlobalState.state$);
+          expect(sendAccessTokenDict).toHaveProperty(sendId, sendAccessToken);
+        });
+
+        it("initializes the dictionary if it isn't already", async () => {
+          sendAccessTokenDictGlobalState.stateSubject.next(null);
+
+          await (service as any).setSendAccessTokenInStorage(sendId, sendAccessToken);
+          const sendAccessTokenDict = await firstValueFrom(sendAccessTokenDictGlobalState.state$);
+          expect(sendAccessTokenDict).toHaveProperty(sendId, sendAccessToken);
+        });
+
+        it("merges with existing tokens in storage", async () => {
+          const anotherSendId = "anotherSendId";
+          const anotherSendAccessToken = new SendAccessToken(
+            "anotherToken",
+            Date.now() + 1000 * 60,
+          );
+
+          sendAccessTokenDictGlobalState.stateSubject.next({
+            [anotherSendId]: anotherSendAccessToken,
+          });
+          await (service as any).setSendAccessTokenInStorage(sendId, sendAccessToken);
+          const sendAccessTokenDict = await firstValueFrom(sendAccessTokenDictGlobalState.state$);
+          expect(sendAccessTokenDict).toHaveProperty(sendId, sendAccessToken);
+          expect(sendAccessTokenDict).toHaveProperty(anotherSendId, anotherSendAccessToken);
+        });
+      });
+    });
+
+    describe("getSendAccessToken$", () => {
+      it("returns a send access token for a password protected send when given valid password credentials", async () => {
+        // Arrange
+        const sendPasswordCredentials: SendAccessDomainCredentials = {
+          kind: "password",
+          passwordHashB64: "testPassword" as SendHashedPasswordB64,
+        };
+
+        sdkService.client.auth
+          .mockDeep()
+          .send_access.mockDeep()
+          .request_send_access_token.mockResolvedValue(sendAccessTokenResponse);
+
+        // Act
+        const result = await firstValueFrom(
+          service.getSendAccessToken$(sendId, sendPasswordCredentials),
+        );
+
+        // Assert
+        expect(result).toEqual(sendAccessToken);
+
+        const sendAccessTokenDict = await firstValueFrom(sendAccessTokenDictGlobalState.state$);
+        expect(sendAccessTokenDict).toHaveProperty(sendId, sendAccessToken);
+      });
+
+      // Note: we deliberately aren't testing the "success" scenario of passing
+      // just SendEmailCredentials as that will never return a send access token on it's own.
+
+      it("returns a send access token for a email + otp protected send when given valid email and otp", async () => {
+        // Arrange
+        const sendEmailOtpCredentials: SendAccessDomainCredentials = {
+          kind: "email_otp",
+          email: "test@example.com",
+          otp: "123456" as SendOtp,
+        };
+
+        sdkService.client.auth
+          .mockDeep()
+          .send_access.mockDeep()
+          .request_send_access_token.mockResolvedValue(sendAccessTokenResponse);
+
+        // Act
+        const result = await firstValueFrom(
+          service.getSendAccessToken$(sendId, sendEmailOtpCredentials),
+        );
+
+        // Assert
+        expect(result).toEqual(sendAccessToken);
+        const sendAccessTokenDict = await firstValueFrom(sendAccessTokenDictGlobalState.state$);
+        expect(sendAccessTokenDict).toHaveProperty(sendId, sendAccessToken);
+      });
+
+      describe.each(CREDS.map((c) => [c.kind, c] as const))(
+        "scenarios with %s credentials",
+        (_label, creds) => {
+          it.each(INVALID_REQUEST_CODES)(
+            "handles expected invalid_request.%s scenario appropriately",
+            async (code) => {
+              const sendAccessTokenApiErrorResponse: SendAccessTokenApiErrorResponse = {
+                error: "invalid_request",
+                error_description: code,
+                send_access_error_type: code,
+              };
+
+              mockSdkRejectWith({
+                kind: "expected",
+                data: sendAccessTokenApiErrorResponse,
+              });
+
+              const result = await firstValueFrom(service.getSendAccessToken$("abc123", creds));
+
+              expect(result).toEqual({
+                kind: "expected_server",
+                error: sendAccessTokenApiErrorResponse,
+              });
+            },
+          );
+
+          it("handles expected invalid_request scenario appropriately", async () => {
+            const sendAccessTokenApiErrorResponse: SendAccessTokenApiErrorResponse = {
+              error: "invalid_request",
+            };
+            mockSdkRejectWith({
+              kind: "expected",
+              data: sendAccessTokenApiErrorResponse,
+            });
+
+            // Act
+            const result = await firstValueFrom(service.getSendAccessToken$(sendId, creds));
+
+            // Assert
+            expect(result).toEqual({
+              kind: "expected_server",
+              error: sendAccessTokenApiErrorResponse,
+            });
+          });
+
+          it.each(INVALID_GRANT_CODES)(
+            "handles expected invalid_grant.%s scenario appropriately",
+            async (code) => {
+              const sendAccessTokenApiErrorResponse: SendAccessTokenApiErrorResponse = {
+                error: "invalid_grant",
+                error_description: code,
+                send_access_error_type: code,
+              };
+
+              mockSdkRejectWith({
+                kind: "expected",
+                data: sendAccessTokenApiErrorResponse,
+              });
+
+              const result = await firstValueFrom(service.getSendAccessToken$("abc123", creds));
+
+              expect(result).toEqual({
+                kind: "expected_server",
+                error: sendAccessTokenApiErrorResponse,
+              });
+            },
+          );
+
+          it("handles expected invalid_grant scenario appropriately", async () => {
+            const sendAccessTokenApiErrorResponse: SendAccessTokenApiErrorResponse = {
+              error: "invalid_grant",
+            };
+            mockSdkRejectWith({
+              kind: "expected",
+              data: sendAccessTokenApiErrorResponse,
+            });
+
+            // Act
+            const result = await firstValueFrom(service.getSendAccessToken$(sendId, creds));
+
+            // Assert
+            expect(result).toEqual({
+              kind: "expected_server",
+              error: sendAccessTokenApiErrorResponse,
+            });
+          });
+
+          it.each(SIMPLE_ERROR_TYPES)(
+            "handles expected %s error appropriately",
+            async (errorType) => {
+              const api: SendAccessTokenApiErrorResponse = {
+                error: errorType,
+                error_description: `The ${errorType} error occurred`,
+              };
+              mockSdkRejectWith({ kind: "expected", data: api });
+
+              const result = await firstValueFrom(service.getSendAccessToken$(sendId, creds));
+
+              expect(result).toEqual({ kind: EXPECTED_SERVER_KIND, error: api });
+            },
+          );
+
+          it.each(SIMPLE_ERROR_TYPES)(
+            "handles expected %s bare error appropriately",
+            async (errorType) => {
+              const api: SendAccessTokenApiErrorResponse = { error: errorType };
+              mockSdkRejectWith({ kind: "expected", data: api });
+
+              const result = await firstValueFrom(service.getSendAccessToken$(sendId, creds));
+
+              expect(result).toEqual({ kind: EXPECTED_SERVER_KIND, error: api });
+            },
+          );
+
+          it("surfaces unexpected errors as unexpected_server error", async () => {
+            // Arrange
+            const unexpectedIdentityError: UnexpectedIdentityError = "unexpected error occurred";
+
+            mockSdkRejectWith({
+              kind: "unexpected",
+              data: unexpectedIdentityError,
+            });
+
+            // Act
+            const result = await firstValueFrom(service.getSendAccessToken$(sendId, creds));
+
+            // Assert
+            expect(result).toEqual({
+              kind: UNEXPECTED_SERVER_KIND,
+              error: unexpectedIdentityError,
+            });
+          });
+
+          it("surfaces an unknown error as an unknown error", async () => {
+            // Arrange
+            const unknownError = "unknown error occurred";
+
+            sdkService.client.auth
+              .mockDeep()
+              .send_access.mockDeep()
+              .request_send_access_token.mockRejectedValue(new Error(unknownError));
+
+            // Act
+            const result = await firstValueFrom(service.getSendAccessToken$(sendId, creds));
+
+            // Assert
+            expect(result).toEqual({
+              kind: "unknown",
+              error: unknownError,
+            });
+          });
+        },
+      );
+
+      it("errors if passwordHashB64 is missing for password credentials", async () => {
+        const creds: SendAccessDomainCredentials = {
+          kind: "password",
+          passwordHashB64: "" as SendHashedPasswordB64,
+        };
+        await expect(firstValueFrom(service.getSendAccessToken$(sendId, creds))).rejects.toThrow(
+          "passwordHashB64 must be provided for password credentials.",
+        );
+      });
+
+      it("errors if email is missing for email credentials", async () => {
+        const creds: SendAccessDomainCredentials = {
+          kind: "email",
+          email: "",
+        };
+        await expect(firstValueFrom(service.getSendAccessToken$(sendId, creds))).rejects.toThrow(
+          "email must be provided for email credentials.",
+        );
+      });
+
+      it("errors if email or otp is missing for email_otp credentials", async () => {
+        const creds: SendAccessDomainCredentials = {
+          kind: "email_otp",
+          email: "",
+          otp: "" as SendOtp,
+        };
+        await expect(firstValueFrom(service.getSendAccessToken$(sendId, creds))).rejects.toThrow(
+          "email and otp must be provided for email_otp credentials.",
+        );
+      });
+    });
+
+    describe("invalidateSendAccessToken", () => {
+      it("removes a send access token from storage", async () => {
+        // Arrange
+        sendAccessTokenDictGlobalState.stateSubject.next({ [sendId]: sendAccessToken });
+
+        // Act
+        await service.invalidateSendAccessToken(sendId);
+        const sendAccessTokenDict = await firstValueFrom(sendAccessTokenDictGlobalState.state$);
+
+        // Assert
+        expect(sendAccessTokenDict).not.toHaveProperty(sendId);
+      });
+    });
+  });
+
+  describe("hashSendPassword", () => {
+    test.each(["", null, undefined])("rejects if password is %p", async (pwd) => {
+      await expect(service.hashSendPassword(pwd as any, "keyMaterialUrlB64")).rejects.toThrow(
+        "Password must be provided.",
+      );
+    });
+
+    test.each(["", null, undefined])(
+      "rejects if keyMaterialUrlB64 is %p",
+      async (keyMaterialUrlB64) => {
+        await expect(
+          service.hashSendPassword("password", keyMaterialUrlB64 as any),
+        ).rejects.toThrow("KeyMaterialUrlB64 must be provided.");
+      },
+    );
+
+    it("correctly hashes the password", async () => {
+      // Arrange
+      const password = "testPassword";
+      const keyMaterialUrlB64 = "testKeyMaterialUrlB64";
+      const keyMaterialArray = new Uint8Array([1, 2, 3]) as SendPasswordKeyMaterial;
+      const hashedPasswordArray = new Uint8Array([4, 5, 6]) as SendHashedPassword;
+      const sendHashedPasswordB64 = "hashedPasswordB64" as SendHashedPasswordB64;
+
+      const utilsFromUrlB64ToArraySpy = jest
+        .spyOn(Utils, "fromUrlB64ToArray")
+        .mockReturnValue(keyMaterialArray);
+
+      sendPasswordService.hashPassword.mockResolvedValue(hashedPasswordArray);
+
+      const utilsFromBufferToB64Spy = jest
+        .spyOn(Utils, "fromBufferToB64")
+        .mockReturnValue(sendHashedPasswordB64);
+
+      // Act
+      const result = await service.hashSendPassword(password, keyMaterialUrlB64);
+
+      // Assert
+      expect(sendPasswordService.hashPassword).toHaveBeenCalledWith(password, keyMaterialArray);
+      expect(utilsFromUrlB64ToArraySpy).toHaveBeenCalledWith(keyMaterialUrlB64);
+      expect(utilsFromBufferToB64Spy).toHaveBeenCalledWith(hashedPasswordArray);
+      expect(result).toBe(sendHashedPasswordB64);
+    });
+  });
+
+  function mockSdkRejectWith(sendAccessTokenError: SendAccessTokenError) {
+    sdkService.client.auth
+      .mockDeep()
+      .send_access.mockDeep()
+      .request_send_access_token.mockRejectedValue(sendAccessTokenError);
+  }
+});
diff --git a/libs/common/src/auth/send-access/services/default-send-token.service.ts b/libs/common/src/auth/send-access/services/default-send-token.service.ts
new file mode 100644
index 00000000000..90c2c6c3293
--- /dev/null
+++ b/libs/common/src/auth/send-access/services/default-send-token.service.ts
@@ -0,0 +1,316 @@
+import { Observable, defer, firstValueFrom, from } from "rxjs";
+
+import {
+  BitwardenClient,
+  SendAccessCredentials,
+  SendAccessTokenError,
+  SendAccessTokenRequest,
+  SendAccessTokenResponse,
+} from "@bitwarden/sdk-internal";
+import { GlobalState, GlobalStateProvider } from "@bitwarden/state";
+
+import { SendPasswordService } from "../../../key-management/sends/abstractions/send-password.service";
+import {
+  SendHashedPassword,
+  SendPasswordKeyMaterial,
+} from "../../../key-management/sends/types/send-hashed-password.type";
+import { SdkService } from "../../../platform/abstractions/sdk/sdk.service";
+import { Utils } from "../../../platform/misc/utils";
+import { SendTokenService as SendTokenServiceAbstraction } from "../abstractions/send-token.service";
+import { SendAccessToken } from "../models/send-access-token";
+import { GetSendAccessTokenError } from "../types/get-send-access-token-error.type";
+import { SendAccessDomainCredentials } from "../types/send-access-domain-credentials.type";
+import { SendHashedPasswordB64 } from "../types/send-hashed-password-b64.type";
+import { TryGetSendAccessTokenError } from "../types/try-get-send-access-token-error.type";
+
+import { SEND_ACCESS_TOKEN_DICT } from "./send-access-token-dict.state";
+
+export class DefaultSendTokenService implements SendTokenServiceAbstraction {
+  private sendAccessTokenDictGlobalState: GlobalState<Record<string, SendAccessToken>> | undefined;
+
+  constructor(
+    private globalStateProvider: GlobalStateProvider,
+    private sdkService: SdkService,
+    private sendPasswordService: SendPasswordService,
+  ) {
+    this.initializeState();
+  }
+
+  private initializeState(): void {
+    this.sendAccessTokenDictGlobalState = this.globalStateProvider.get(SEND_ACCESS_TOKEN_DICT);
+  }
+
+  tryGetSendAccessToken$(sendId: string): Observable<SendAccessToken | TryGetSendAccessTokenError> {
+    // Defer the execution to ensure that a cold observable is returned.
+    return defer(() => from(this._tryGetSendAccessToken(sendId)));
+  }
+
+  private async _tryGetSendAccessToken(
+    sendId: string,
+  ): Promise<SendAccessToken | TryGetSendAccessTokenError> {
+    // Validate the sendId is a non-empty string.
+    this.validateSendId(sendId);
+
+    // Check in storage for the access token for the given sendId.
+    const sendAccessTokenFromStorage = await this.getSendAccessTokenFromStorage(sendId);
+
+    if (sendAccessTokenFromStorage != null) {
+      // If it is expired, we clear the token from storage and return the expired error
+      if (sendAccessTokenFromStorage.isExpired()) {
+        await this.clearSendAccessTokenFromStorage(sendId);
+        return { kind: "expired" };
+      } else {
+        // If it is not expired, we return it
+        return sendAccessTokenFromStorage;
+      }
+    }
+
+    // If we don't have a token in storage, we can try to request a new token from the server.
+    const request: SendAccessTokenRequest = {
+      sendId: sendId,
+    };
+
+    const anonSdkClient: BitwardenClient = await firstValueFrom(this.sdkService.client$);
+
+    try {
+      const result: SendAccessTokenResponse = await anonSdkClient
+        .auth()
+        .send_access()
+        .request_send_access_token(request);
+
+      // Convert from SDK shape to SendAccessToken so it can be serialized into & out of state provider
+      const sendAccessToken = SendAccessToken.fromSendAccessTokenResponse(result);
+
+      // If we get a token back, we need to store it in the global state.
+      await this.setSendAccessTokenInStorage(sendId, sendAccessToken);
+
+      return sendAccessToken;
+    } catch (error: unknown) {
+      return this.normalizeSendAccessTokenError(error);
+    }
+  }
+
+  getSendAccessToken$(
+    sendId: string,
+    sendCredentials: SendAccessDomainCredentials,
+  ): Observable<SendAccessToken | GetSendAccessTokenError> {
+    // Defer the execution to ensure that a cold observable is returned.
+    return defer(() => from(this._getSendAccessToken(sendId, sendCredentials)));
+  }
+
+  private async _getSendAccessToken(
+    sendId: string,
+    sendAccessCredentials: SendAccessDomainCredentials,
+  ): Promise<SendAccessToken | GetSendAccessTokenError> {
+    // Validate inputs to account for non-strict TS call sites.
+    this.validateCredentialsRequest(sendId, sendAccessCredentials);
+
+    // Convert inputs to SDK request shape
+    const request: SendAccessTokenRequest = {
+      sendId: sendId,
+      sendAccessCredentials: this.convertDomainCredentialsToSdkCredentials(sendAccessCredentials),
+    };
+
+    const anonSdkClient: BitwardenClient = await firstValueFrom(this.sdkService.client$);
+
+    try {
+      const result: SendAccessTokenResponse = await anonSdkClient
+        .auth()
+        .send_access()
+        .request_send_access_token(request);
+
+      // Convert from SDK interface to SendAccessToken class so it can be serialized into & out of state provider
+      const sendAccessToken = SendAccessToken.fromSendAccessTokenResponse(result);
+
+      // Any time we get a token from the server, we need to store it in the global state.
+      await this.setSendAccessTokenInStorage(sendId, sendAccessToken);
+
+      return sendAccessToken;
+    } catch (error: unknown) {
+      return this.normalizeSendAccessTokenError(error);
+    }
+  }
+
+  async invalidateSendAccessToken(sendId: string): Promise<void> {
+    await this.clearSendAccessTokenFromStorage(sendId);
+  }
+
+  async hashSendPassword(
+    password: string,
+    keyMaterialUrlB64: string,
+  ): Promise<SendHashedPasswordB64> {
+    // Validate the password and key material
+    if (password == null || password.trim() === "") {
+      throw new Error("Password must be provided.");
+    }
+    if (keyMaterialUrlB64 == null || keyMaterialUrlB64.trim() === "") {
+      throw new Error("KeyMaterialUrlB64 must be provided.");
+    }
+
+    // Convert the base64 URL encoded key material to a Uint8Array
+    const keyMaterialUrlB64Array = Utils.fromUrlB64ToArray(
+      keyMaterialUrlB64,
+    ) as SendPasswordKeyMaterial;
+
+    const sendHashedPasswordArray: SendHashedPassword = await this.sendPasswordService.hashPassword(
+      password,
+      keyMaterialUrlB64Array,
+    );
+
+    // Convert the Uint8Array to a base64 encoded string which is required
+    // for the server to be able to compare the password hash.
+    const sendHashedPasswordB64 = Utils.fromBufferToB64(
+      sendHashedPasswordArray,
+    ) as SendHashedPasswordB64;
+
+    return sendHashedPasswordB64;
+  }
+
+  private async getSendAccessTokenFromStorage(
+    sendId: string,
+  ): Promise<SendAccessToken | undefined> {
+    if (this.sendAccessTokenDictGlobalState != null) {
+      const sendAccessTokenDict = await firstValueFrom(this.sendAccessTokenDictGlobalState.state$);
+      return sendAccessTokenDict?.[sendId];
+    }
+    return undefined;
+  }
+
+  private async setSendAccessTokenInStorage(
+    sendId: string,
+    sendAccessToken: SendAccessToken,
+  ): Promise<void> {
+    if (this.sendAccessTokenDictGlobalState != null) {
+      await this.sendAccessTokenDictGlobalState.update(
+        (sendAccessTokenDict) => {
+          sendAccessTokenDict ??= {}; // Initialize if undefined
+
+          sendAccessTokenDict[sendId] = sendAccessToken;
+          return sendAccessTokenDict;
+        },
+        {
+          // only update if the value is different (to avoid unnecessary writes)
+          shouldUpdate: (prevDict) => {
+            const prevSendAccessToken = prevDict?.[sendId];
+            return (
+              prevSendAccessToken?.token !== sendAccessToken.token ||
+              prevSendAccessToken?.expiresAt !== sendAccessToken.expiresAt
+            );
+          },
+        },
+      );
+    }
+  }
+
+  private async clearSendAccessTokenFromStorage(sendId: string): Promise<void> {
+    if (this.sendAccessTokenDictGlobalState != null) {
+      await this.sendAccessTokenDictGlobalState.update(
+        (sendAccessTokenDict) => {
+          if (!sendAccessTokenDict) {
+            // If the dict is empty or undefined, there's nothing to clear
+            return sendAccessTokenDict;
+          }
+
+          if (sendAccessTokenDict[sendId] == null) {
+            // If the specific sendId does not exist, nothing to clear
+            return sendAccessTokenDict;
+          }
+
+          // Destructure to omit the specific sendId and get new reference for the rest of the dict for an immutable update
+           
+          const { [sendId]: _, ...rest } = sendAccessTokenDict;
+
+          return rest;
+        },
+        {
+          // only update if the value is defined (to avoid unnecessary writes)
+          shouldUpdate: (prevDict) => prevDict?.[sendId] != null,
+        },
+      );
+    }
+  }
+
+  /**
+   * Normalizes an error from the SDK send access token request process.
+   * @param e The error to normalize.
+   * @returns A normalized GetSendAccessTokenError.
+   */
+  private normalizeSendAccessTokenError(e: unknown): GetSendAccessTokenError {
+    if (this.isSendAccessTokenError(e)) {
+      if (e.kind === "unexpected") {
+        return { kind: "unexpected_server", error: e.data };
+      }
+      return { kind: "expected_server", error: e.data };
+    }
+
+    if (e instanceof Error) {
+      return { kind: "unknown", error: e.message };
+    }
+
+    try {
+      return { kind: "unknown", error: JSON.stringify(e) };
+    } catch {
+      return { kind: "unknown", error: "error cannot be stringified" };
+    }
+  }
+
+  private isSendAccessTokenError(e: unknown): e is SendAccessTokenError {
+    return (
+      typeof e === "object" &&
+      e !== null &&
+      "kind" in e &&
+      (e.kind === "expected" || e.kind === "unexpected")
+    );
+  }
+
+  private validateSendId(sendId: string): void {
+    if (sendId == null || sendId.trim() === "") {
+      throw new Error("sendId must be provided.");
+    }
+  }
+
+  private validateCredentialsRequest(
+    sendId: string,
+    sendAccessCredentials: SendAccessDomainCredentials,
+  ): void {
+    this.validateSendId(sendId);
+    if (sendAccessCredentials == null) {
+      throw new Error("sendAccessCredentials must be provided.");
+    }
+
+    if (sendAccessCredentials.kind === "password" && !sendAccessCredentials.passwordHashB64) {
+      throw new Error("passwordHashB64 must be provided for password credentials.");
+    }
+
+    if (sendAccessCredentials.kind === "email" && !sendAccessCredentials.email) {
+      throw new Error("email must be provided for email credentials.");
+    }
+
+    if (
+      sendAccessCredentials.kind === "email_otp" &&
+      (!sendAccessCredentials.email || !sendAccessCredentials.otp)
+    ) {
+      throw new Error("email and otp must be provided for email_otp credentials.");
+    }
+  }
+
+  private convertDomainCredentialsToSdkCredentials(
+    sendAccessCredentials: SendAccessDomainCredentials,
+  ): SendAccessCredentials {
+    switch (sendAccessCredentials.kind) {
+      case "password":
+        return {
+          passwordHashB64: sendAccessCredentials.passwordHashB64,
+        };
+      case "email":
+        return {
+          email: sendAccessCredentials.email,
+        };
+      case "email_otp":
+        return {
+          email: sendAccessCredentials.email,
+          otp: sendAccessCredentials.otp,
+        };
+    }
+  }
+}
diff --git a/libs/common/src/auth/send-access/services/index.ts b/libs/common/src/auth/send-access/services/index.ts
new file mode 100644
index 00000000000..f45ffb94bab
--- /dev/null
+++ b/libs/common/src/auth/send-access/services/index.ts
@@ -0,0 +1 @@
+export * from "./default-send-token.service";
diff --git a/libs/common/src/auth/send-access/services/send-access-token-dict.state.ts b/libs/common/src/auth/send-access/services/send-access-token-dict.state.ts
new file mode 100644
index 00000000000..77e390768fc
--- /dev/null
+++ b/libs/common/src/auth/send-access/services/send-access-token-dict.state.ts
@@ -0,0 +1,15 @@
+import { Jsonify } from "type-fest";
+
+import { KeyDefinition, SEND_ACCESS_DISK } from "@bitwarden/state";
+
+import { SendAccessToken } from "../models/send-access-token";
+
+export const SEND_ACCESS_TOKEN_DICT = KeyDefinition.record<SendAccessToken, string>(
+  SEND_ACCESS_DISK,
+  "accessTokenDict",
+  {
+    deserializer: (sendAccessTokenJson: Jsonify<SendAccessToken>) => {
+      return SendAccessToken.fromJson(sendAccessTokenJson);
+    },
+  },
+);
diff --git a/libs/common/src/auth/send-access/types/get-send-access-token-error.type.ts b/libs/common/src/auth/send-access/types/get-send-access-token-error.type.ts
new file mode 100644
index 00000000000..224e982c84c
--- /dev/null
+++ b/libs/common/src/auth/send-access/types/get-send-access-token-error.type.ts
@@ -0,0 +1,12 @@
+import { UnexpectedIdentityError, SendAccessTokenApiErrorResponse } from "@bitwarden/sdk-internal";
+
+/**
+ * Represents the possible errors that can occur when retrieving a SendAccessToken.
+ * Note: for expected_server errors, see invalid-request-errors.type.ts and
+ * invalid-grant-errors.type.ts for type guards that identify specific
+ * SendAccessTokenApiErrorResponse errors
+ */
+export type GetSendAccessTokenError =
+  | { kind: "unexpected_server"; error: UnexpectedIdentityError }
+  | { kind: "expected_server"; error: SendAccessTokenApiErrorResponse }
+  | { kind: "unknown"; error: string };
diff --git a/libs/common/src/auth/send-access/types/index.ts b/libs/common/src/auth/send-access/types/index.ts
new file mode 100644
index 00000000000..344ac00abbe
--- /dev/null
+++ b/libs/common/src/auth/send-access/types/index.ts
@@ -0,0 +1,7 @@
+export * from "./try-get-send-access-token-error.type";
+export * from "./send-otp.type";
+export * from "./send-hashed-password-b64.type";
+export * from "./send-access-domain-credentials.type";
+export * from "./invalid-request-errors.type";
+export * from "./invalid-grant-errors.type";
+export * from "./get-send-access-token-error.type";
diff --git a/libs/common/src/auth/send-access/types/invalid-grant-errors.type.ts b/libs/common/src/auth/send-access/types/invalid-grant-errors.type.ts
new file mode 100644
index 00000000000..befb869a89e
--- /dev/null
+++ b/libs/common/src/auth/send-access/types/invalid-grant-errors.type.ts
@@ -0,0 +1,62 @@
+import { SendAccessTokenApiErrorResponse } from "@bitwarden/sdk-internal";
+
+export type InvalidGrant = Extract<SendAccessTokenApiErrorResponse, { error: "invalid_grant" }>;
+
+export function isInvalidGrant(e: SendAccessTokenApiErrorResponse): e is InvalidGrant {
+  return e.error === "invalid_grant";
+}
+
+export type BareInvalidGrant = Extract<
+  SendAccessTokenApiErrorResponse,
+  { error: "invalid_grant" }
+> & { send_access_error_type?: undefined };
+
+export function isBareInvalidGrant(e: SendAccessTokenApiErrorResponse): e is BareInvalidGrant {
+  return e.error === "invalid_grant" && e.send_access_error_type === undefined;
+}
+
+export type SendIdInvalid = InvalidGrant & {
+  send_access_error_type: "send_id_invalid";
+};
+export function sendIdInvalid(e: SendAccessTokenApiErrorResponse): e is SendIdInvalid {
+  return e.error === "invalid_grant" && e.send_access_error_type === "send_id_invalid";
+}
+
+export type PasswordHashB64Invalid = InvalidGrant & {
+  send_access_error_type: "password_hash_b64_invalid";
+};
+export function passwordHashB64Invalid(
+  e: SendAccessTokenApiErrorResponse,
+): e is PasswordHashB64Invalid {
+  return e.error === "invalid_grant" && e.send_access_error_type === "password_hash_b64_invalid";
+}
+
+export type EmailInvalid = InvalidGrant & {
+  send_access_error_type: "email_invalid";
+};
+export function emailInvalid(e: SendAccessTokenApiErrorResponse): e is EmailInvalid {
+  return e.error === "invalid_grant" && e.send_access_error_type === "email_invalid";
+}
+
+export type OtpInvalid = InvalidGrant & {
+  send_access_error_type: "otp_invalid";
+};
+export function otpInvalid(e: SendAccessTokenApiErrorResponse): e is OtpInvalid {
+  return e.error === "invalid_grant" && e.send_access_error_type === "otp_invalid";
+}
+
+export type OtpGenerationFailed = InvalidGrant & {
+  send_access_error_type: "otp_generation_failed";
+};
+export function otpGenerationFailed(e: SendAccessTokenApiErrorResponse): e is OtpGenerationFailed {
+  return e.error === "invalid_grant" && e.send_access_error_type === "otp_generation_failed";
+}
+
+export type UnknownInvalidGrant = InvalidGrant & {
+  send_access_error_type: "unknown";
+};
+export function isUnknownInvalidGrant(
+  e: SendAccessTokenApiErrorResponse,
+): e is UnknownInvalidGrant {
+  return e.error === "invalid_grant" && e.send_access_error_type === "unknown";
+}
diff --git a/libs/common/src/auth/send-access/types/invalid-request-errors.type.ts b/libs/common/src/auth/send-access/types/invalid-request-errors.type.ts
new file mode 100644
index 00000000000..57a70e62586
--- /dev/null
+++ b/libs/common/src/auth/send-access/types/invalid-request-errors.type.ts
@@ -0,0 +1,62 @@
+import { SendAccessTokenApiErrorResponse } from "@bitwarden/sdk-internal";
+
+export type InvalidRequest = Extract<SendAccessTokenApiErrorResponse, { error: "invalid_request" }>;
+
+export function isInvalidRequest(e: SendAccessTokenApiErrorResponse): e is InvalidRequest {
+  return e.error === "invalid_request";
+}
+
+export type BareInvalidRequest = Extract<
+  SendAccessTokenApiErrorResponse,
+  { error: "invalid_request" }
+> & { send_access_error_type?: undefined };
+
+export function isBareInvalidRequest(e: SendAccessTokenApiErrorResponse): e is BareInvalidRequest {
+  return e.error === "invalid_request" && e.send_access_error_type === undefined;
+}
+
+export type SendIdRequired = InvalidRequest & {
+  send_access_error_type: "send_id_required";
+};
+
+export function sendIdRequired(e: SendAccessTokenApiErrorResponse): e is SendIdRequired {
+  return e.error === "invalid_request" && e.send_access_error_type === "send_id_required";
+}
+
+export type PasswordHashB64Required = InvalidRequest & {
+  send_access_error_type: "password_hash_b64_required";
+};
+
+export function passwordHashB64Required(
+  e: SendAccessTokenApiErrorResponse,
+): e is PasswordHashB64Required {
+  return e.error === "invalid_request" && e.send_access_error_type === "password_hash_b64_required";
+}
+
+export type EmailRequired = InvalidRequest & { send_access_error_type: "email_required" };
+
+export function emailRequired(e: SendAccessTokenApiErrorResponse): e is EmailRequired {
+  return e.error === "invalid_request" && e.send_access_error_type === "email_required";
+}
+
+export type EmailAndOtpRequiredEmailSent = InvalidRequest & {
+  send_access_error_type: "email_and_otp_required_otp_sent";
+};
+
+export function emailAndOtpRequiredEmailSent(
+  e: SendAccessTokenApiErrorResponse,
+): e is EmailAndOtpRequiredEmailSent {
+  return (
+    e.error === "invalid_request" && e.send_access_error_type === "email_and_otp_required_otp_sent"
+  );
+}
+
+export type UnknownInvalidRequest = InvalidRequest & {
+  send_access_error_type: "unknown";
+};
+
+export function isUnknownInvalidRequest(
+  e: SendAccessTokenApiErrorResponse,
+): e is UnknownInvalidRequest {
+  return e.error === "invalid_request" && e.send_access_error_type === "unknown";
+}
diff --git a/libs/common/src/auth/send-access/types/send-access-domain-credentials.type.ts b/libs/common/src/auth/send-access/types/send-access-domain-credentials.type.ts
new file mode 100644
index 00000000000..966117dc64e
--- /dev/null
+++ b/libs/common/src/auth/send-access/types/send-access-domain-credentials.type.ts
@@ -0,0 +1,11 @@
+import { SendHashedPasswordB64 } from "./send-hashed-password-b64.type";
+import { SendOtp } from "./send-otp.type";
+
+/**
+ * The domain facing send access credentials
+ * Will be internally mapped to the SDK types
+ */
+export type SendAccessDomainCredentials =
+  | { kind: "password"; passwordHashB64: SendHashedPasswordB64 }
+  | { kind: "email"; email: string }
+  | { kind: "email_otp"; email: string; otp: SendOtp };
diff --git a/libs/common/src/auth/send-access/types/send-hashed-password-b64.type.ts b/libs/common/src/auth/send-access/types/send-hashed-password-b64.type.ts
new file mode 100644
index 00000000000..9d55bdfb671
--- /dev/null
+++ b/libs/common/src/auth/send-access/types/send-hashed-password-b64.type.ts
@@ -0,0 +1,3 @@
+import { Opaque } from "type-fest";
+
+export type SendHashedPasswordB64 = Opaque<string, "SendHashedPasswordB64">;
diff --git a/libs/common/src/auth/send-access/types/send-otp.type.ts b/libs/common/src/auth/send-access/types/send-otp.type.ts
new file mode 100644
index 00000000000..b5dfaa95ac5
--- /dev/null
+++ b/libs/common/src/auth/send-access/types/send-otp.type.ts
@@ -0,0 +1,3 @@
+import { Opaque } from "type-fest";
+
+export type SendOtp = Opaque<string, "SendOtp">;
diff --git a/libs/common/src/auth/send-access/types/try-get-send-access-token-error.type.ts b/libs/common/src/auth/send-access/types/try-get-send-access-token-error.type.ts
new file mode 100644
index 00000000000..e82b426654c
--- /dev/null
+++ b/libs/common/src/auth/send-access/types/try-get-send-access-token-error.type.ts
@@ -0,0 +1,7 @@
+import { GetSendAccessTokenError } from "./get-send-access-token-error.type";
+
+/**
+ * Represents the possible errors that can occur when trying to retrieve a SendAccessToken by
+ * just a sendId. Extends {@link GetSendAccessTokenError}.
+ */
+export type TryGetSendAccessTokenError = { kind: "expired" } | GetSendAccessTokenError;
diff --git a/libs/common/src/auth/services/anonymous-hub.service.ts b/libs/common/src/auth/services/anonymous-hub.service.ts
index 3900dd53ee0..561cddb5372 100644
--- a/libs/common/src/auth/services/anonymous-hub.service.ts
+++ b/libs/common/src/auth/services/anonymous-hub.service.ts
@@ -18,6 +18,8 @@ import {
   NotificationResponse,
 } from "../../models/response/notification.response";
 import { EnvironmentService } from "../../platform/abstractions/environment.service";
+import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
+import { InsecureUrlNotAllowedError } from "../../services/api-errors";
 import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymous-hub.service";
 
 export class AnonymousHubService implements AnonymousHubServiceAbstraction {
@@ -27,10 +29,14 @@ export class AnonymousHubService implements AnonymousHubServiceAbstraction {
   constructor(
     private environmentService: EnvironmentService,
     private authRequestService: AuthRequestServiceAbstraction,
+    private platformUtilsService: PlatformUtilsService,
   ) {}
 
   async createHubConnection(token: string) {
     this.url = (await firstValueFrom(this.environmentService.environment$)).getNotificationsUrl();
+    if (!this.url.startsWith("https://") && !this.platformUtilsService.isDev()) {
+      throw new InsecureUrlNotAllowedError();
+    }
 
     this.anonHubConnection = new HubConnectionBuilder()
       .withUrl(this.url + "/anonymous-hub?Token=" + token, {
diff --git a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
index d5b787d69f0..7e6e0d53f57 100644
--- a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
+++ b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
@@ -1,5 +1,5 @@
 import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, of } 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
@@ -103,7 +103,7 @@ describe("PasswordResetEnrollmentServiceImplementation", () => {
       };
       activeAccountSubject.next(Object.assign(user1AccountInfo, { id: "userId" as UserId }));
 
-      keyService.getUserKey.mockResolvedValue({ key: "key" } as any);
+      keyService.userKey$.mockReturnValue(of({ key: "key" } as any));
       encryptService.encapsulateKeyUnsigned.mockResolvedValue(encryptedKey as any);
 
       await service.enroll("orgId");
diff --git a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
index f491d7d5eb0..55644009f16 100644
--- a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
+++ b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { firstValueFrom, map } from "rxjs";
+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
@@ -8,9 +8,11 @@ import {
   OrganizationUserApiService,
   OrganizationUserResetPasswordEnrollmentRequest,
 } from "@bitwarden/admin-console/common";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 // 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";
+import { UserId } from "@bitwarden/user-core";
 
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
@@ -43,7 +45,7 @@ export class PasswordResetEnrollmentServiceImplementation
 
   async enroll(organizationId: string): Promise<void>;
   async enroll(organizationId: string, userId: string, userKey: UserKey): Promise<void>;
-  async enroll(organizationId: string, userId?: string, userKey?: UserKey): Promise<void> {
+  async enroll(organizationId: string, activeUserId?: string, userKey?: UserKey): Promise<void> {
     const orgKeyResponse = await this.organizationApiService.getKeys(organizationId);
     if (orgKeyResponse == null) {
       throw new Error(this.i18nService.t("resetPasswordOrgKeysError"));
@@ -51,9 +53,12 @@ export class PasswordResetEnrollmentServiceImplementation
 
     const orgPublicKey = Utils.fromB64ToArray(orgKeyResponse.publicKey);
 
-    userId =
-      userId ?? (await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.id))));
-    userKey = userKey ?? (await this.keyService.getUserKey(userId));
+    activeUserId =
+      activeUserId ?? (await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId)));
+    if (activeUserId == null) {
+      throw new Error("User ID is required");
+    }
+    userKey = userKey ?? (await firstValueFrom(this.keyService.userKey$(activeUserId as UserId)));
     // RSA Encrypt user's userKey.key with organization public key
     const encryptedKey = await this.encryptService.encapsulateKeyUnsigned(userKey, orgPublicKey);
 
@@ -62,7 +67,7 @@ export class PasswordResetEnrollmentServiceImplementation
 
     await this.organizationUserApiService.putOrganizationUserResetPasswordEnrollment(
       organizationId,
-      userId,
+      activeUserId,
       resetRequest,
     );
   }
diff --git a/libs/common/src/auth/services/two-factor.service.ts b/libs/common/src/auth/services/two-factor.service.ts
deleted file mode 100644
index 83e113268a2..00000000000
--- a/libs/common/src/auth/services/two-factor.service.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { firstValueFrom, map } from "rxjs";
-
-import { I18nService } from "../../platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
-import { Utils } from "../../platform/misc/utils";
-import { GlobalStateProvider, KeyDefinition, TWO_FACTOR_MEMORY } from "../../platform/state";
-import {
-  TwoFactorProviderDetails,
-  TwoFactorService as TwoFactorServiceAbstraction,
-} from "../abstractions/two-factor.service";
-import { TwoFactorProviderType } from "../enums/two-factor-provider-type";
-import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response";
-
-export const TwoFactorProviders: Partial<Record<TwoFactorProviderType, TwoFactorProviderDetails>> =
-  {
-    [TwoFactorProviderType.Authenticator]: {
-      type: TwoFactorProviderType.Authenticator,
-      name: null as string,
-      description: null as string,
-      priority: 1,
-      sort: 2,
-      premium: false,
-    },
-    [TwoFactorProviderType.Yubikey]: {
-      type: TwoFactorProviderType.Yubikey,
-      name: null as string,
-      description: null as string,
-      priority: 3,
-      sort: 4,
-      premium: true,
-    },
-    [TwoFactorProviderType.Duo]: {
-      type: TwoFactorProviderType.Duo,
-      name: "Duo",
-      description: null as string,
-      priority: 2,
-      sort: 5,
-      premium: true,
-    },
-    [TwoFactorProviderType.OrganizationDuo]: {
-      type: TwoFactorProviderType.OrganizationDuo,
-      name: "Duo (Organization)",
-      description: null as string,
-      priority: 10,
-      sort: 6,
-      premium: false,
-    },
-    [TwoFactorProviderType.Email]: {
-      type: TwoFactorProviderType.Email,
-      name: null as string,
-      description: null as string,
-      priority: 0,
-      sort: 1,
-      premium: false,
-    },
-    [TwoFactorProviderType.WebAuthn]: {
-      type: TwoFactorProviderType.WebAuthn,
-      name: null as string,
-      description: null as string,
-      priority: 4,
-      sort: 3,
-      premium: false,
-    },
-  };
-
-// Memory storage as only required during authentication process
-export const PROVIDERS = KeyDefinition.record<Record<string, string>, TwoFactorProviderType>(
-  TWO_FACTOR_MEMORY,
-  "providers",
-  {
-    deserializer: (obj) => obj,
-  },
-);
-
-// Memory storage as only required during authentication process
-export const SELECTED_PROVIDER = new KeyDefinition<TwoFactorProviderType>(
-  TWO_FACTOR_MEMORY,
-  "selected",
-  {
-    deserializer: (obj) => obj,
-  },
-);
-
-export class TwoFactorService implements TwoFactorServiceAbstraction {
-  private providersState = this.globalStateProvider.get(PROVIDERS);
-  private selectedState = this.globalStateProvider.get(SELECTED_PROVIDER);
-  readonly providers$ = this.providersState.state$.pipe(
-    map((providers) => Utils.recordToMap(providers)),
-  );
-  readonly selected$ = this.selectedState.state$;
-
-  constructor(
-    private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
-    private globalStateProvider: GlobalStateProvider,
-  ) {}
-
-  init() {
-    TwoFactorProviders[TwoFactorProviderType.Email].name = this.i18nService.t("emailTitle");
-    TwoFactorProviders[TwoFactorProviderType.Email].description = this.i18nService.t("emailDescV2");
-
-    TwoFactorProviders[TwoFactorProviderType.Authenticator].name =
-      this.i18nService.t("authenticatorAppTitle");
-    TwoFactorProviders[TwoFactorProviderType.Authenticator].description =
-      this.i18nService.t("authenticatorAppDescV2");
-
-    TwoFactorProviders[TwoFactorProviderType.Duo].description = this.i18nService.t("duoDescV2");
-
-    TwoFactorProviders[TwoFactorProviderType.OrganizationDuo].name =
-      "Duo (" + this.i18nService.t("organization") + ")";
-    TwoFactorProviders[TwoFactorProviderType.OrganizationDuo].description =
-      this.i18nService.t("duoOrganizationDesc");
-
-    TwoFactorProviders[TwoFactorProviderType.WebAuthn].name = this.i18nService.t("webAuthnTitle");
-    TwoFactorProviders[TwoFactorProviderType.WebAuthn].description =
-      this.i18nService.t("webAuthnDesc");
-
-    TwoFactorProviders[TwoFactorProviderType.Yubikey].name = this.i18nService.t("yubiKeyTitleV2");
-    TwoFactorProviders[TwoFactorProviderType.Yubikey].description =
-      this.i18nService.t("yubiKeyDesc");
-  }
-
-  async getSupportedProviders(win: Window): Promise<TwoFactorProviderDetails[]> {
-    const data = await firstValueFrom(this.providers$);
-    const providers: any[] = [];
-    if (data == null) {
-      return providers;
-    }
-
-    if (
-      data.has(TwoFactorProviderType.OrganizationDuo) &&
-      this.platformUtilsService.supportsDuo()
-    ) {
-      providers.push(TwoFactorProviders[TwoFactorProviderType.OrganizationDuo]);
-    }
-
-    if (data.has(TwoFactorProviderType.Authenticator)) {
-      providers.push(TwoFactorProviders[TwoFactorProviderType.Authenticator]);
-    }
-
-    if (data.has(TwoFactorProviderType.Yubikey)) {
-      providers.push(TwoFactorProviders[TwoFactorProviderType.Yubikey]);
-    }
-
-    if (data.has(TwoFactorProviderType.Duo) && this.platformUtilsService.supportsDuo()) {
-      providers.push(TwoFactorProviders[TwoFactorProviderType.Duo]);
-    }
-
-    if (
-      data.has(TwoFactorProviderType.WebAuthn) &&
-      this.platformUtilsService.supportsWebAuthn(win)
-    ) {
-      providers.push(TwoFactorProviders[TwoFactorProviderType.WebAuthn]);
-    }
-
-    if (data.has(TwoFactorProviderType.Email)) {
-      providers.push(TwoFactorProviders[TwoFactorProviderType.Email]);
-    }
-
-    return providers;
-  }
-
-  async getDefaultProvider(webAuthnSupported: boolean): Promise<TwoFactorProviderType> {
-    const data = await firstValueFrom(this.providers$);
-    const selected = await firstValueFrom(this.selected$);
-    if (data == null) {
-      return null;
-    }
-
-    if (selected != null && data.has(selected)) {
-      return selected;
-    }
-
-    let providerType: TwoFactorProviderType = null;
-    let providerPriority = -1;
-    data.forEach((_value, type) => {
-      const provider = (TwoFactorProviders as any)[type];
-      if (provider != null && provider.priority > providerPriority) {
-        if (type === TwoFactorProviderType.WebAuthn && !webAuthnSupported) {
-          return;
-        }
-
-        providerType = type;
-        providerPriority = provider.priority;
-      }
-    });
-
-    return providerType;
-  }
-
-  async setSelectedProvider(type: TwoFactorProviderType): Promise<void> {
-    await this.selectedState.update(() => type);
-  }
-
-  async clearSelectedProvider(): Promise<void> {
-    await this.selectedState.update(() => null);
-  }
-
-  async setProviders(response: IdentityTwoFactorResponse): Promise<void> {
-    await this.providersState.update(() => response.twoFactorProviders2);
-  }
-
-  async clearProviders(): Promise<void> {
-    await this.providersState.update(() => null);
-  }
-
-  getProviders(): Promise<Map<TwoFactorProviderType, { [key: string]: string }> | null> {
-    return firstValueFrom(this.providers$);
-  }
-}
diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts b/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts
index b8a9a85ed0a..e570c0f4a43 100644
--- a/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts
+++ b/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts
@@ -3,10 +3,7 @@ import { of } 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 {
-  UserDecryptionOptions,
-  UserDecryptionOptionsServiceAbstraction,
-} from "@bitwarden/auth/common";
+import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 // 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 {
@@ -19,8 +16,8 @@ import {
 
 import { FakeAccountService, mockAccountServiceWith } from "../../../../spec";
 import { InternalMasterPasswordServiceAbstraction } from "../../../key-management/master-password/abstractions/master-password.service.abstraction";
+import { PinLockType } from "../../../key-management/pin/pin-lock-type";
 import { PinServiceAbstraction } from "../../../key-management/pin/pin.service.abstraction";
-import { PinLockType } from "../../../key-management/pin/pin.service.implementation";
 import { VaultTimeoutSettingsService } from "../../../key-management/vault-timeout";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
 import { HashPurpose } from "../../../platform/enums";
@@ -146,11 +143,7 @@ describe("UserVerificationService", () => {
 
     describe("server verification type", () => {
       it("correctly returns master password availability", async () => {
-        userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
-          of({
-            hasMasterPassword: true,
-          } as UserDecryptionOptions),
-        );
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(true));
 
         const result = await sut.getAvailableVerificationOptions("server");
 
@@ -168,11 +161,7 @@ describe("UserVerificationService", () => {
       });
 
       it("correctly returns OTP availability", async () => {
-        userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
-          of({
-            hasMasterPassword: false,
-          } as UserDecryptionOptions),
-        );
+        userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(false));
 
         const result = await sut.getAvailableVerificationOptions("server");
 
@@ -191,6 +180,140 @@ describe("UserVerificationService", () => {
     });
   });
 
+  describe("buildRequest", () => {
+    beforeEach(() => {
+      accountService = mockAccountServiceWith(mockUserId);
+      i18nService.t
+        .calledWith("verificationCodeRequired")
+        .mockReturnValue("Verification code is required");
+      i18nService.t
+        .calledWith("masterPasswordRequired")
+        .mockReturnValue("Master Password is required");
+    });
+
+    describe("OTP verification", () => {
+      it("should build request with OTP secret", async () => {
+        const verification = {
+          type: VerificationType.OTP,
+          secret: "123456",
+        } as any;
+
+        const result = await sut.buildRequest(verification);
+
+        expect(result.otp).toBe("123456");
+      });
+
+      it("should throw if OTP secret is empty", async () => {
+        const verification = {
+          type: VerificationType.OTP,
+          secret: "",
+        } as any;
+
+        await expect(sut.buildRequest(verification)).rejects.toThrow(
+          "Verification code is required",
+        );
+      });
+
+      it("should throw if OTP secret is null", async () => {
+        const verification = {
+          type: VerificationType.OTP,
+          secret: null,
+        } as any;
+
+        await expect(sut.buildRequest(verification)).rejects.toThrow(
+          "Verification code is required",
+        );
+      });
+    });
+
+    describe("Master password verification", () => {
+      beforeEach(() => {
+        kdfConfigService.getKdfConfig.mockResolvedValue("kdfConfig" as unknown as KdfConfig);
+        masterPasswordService.saltForUser$.mockReturnValue(of("salt" as any));
+        masterPasswordService.makeMasterPasswordAuthenticationData.mockResolvedValue({
+          masterPasswordAuthenticationHash: "hash",
+        } as any);
+      });
+
+      it("should build request with master password secret", async () => {
+        const verification = {
+          type: VerificationType.MasterPassword,
+          secret: "password123",
+        } as any;
+
+        const result = await sut.buildRequest(verification);
+
+        expect(result.masterPasswordHash).toBe("hash");
+      });
+
+      it("should use default SecretVerificationRequest if no custom class provided", async () => {
+        const verification = {
+          type: VerificationType.MasterPassword,
+          secret: "password123",
+        } as any;
+
+        const result = await sut.buildRequest(verification);
+
+        expect(result).toHaveProperty("masterPasswordHash");
+      });
+
+      it("should get KDF config for the active user", async () => {
+        const verification = {
+          type: VerificationType.MasterPassword,
+          secret: "password123",
+        } as any;
+
+        await sut.buildRequest(verification);
+
+        expect(kdfConfigService.getKdfConfig).toHaveBeenCalledWith(mockUserId);
+      });
+
+      it("should get salt for the active user", async () => {
+        const verification = {
+          type: VerificationType.MasterPassword,
+          secret: "password123",
+        } as any;
+
+        await sut.buildRequest(verification);
+
+        expect(masterPasswordService.saltForUser$).toHaveBeenCalledWith(mockUserId);
+      });
+
+      it("should call makeMasterPasswordAuthenticationData with correct parameters", async () => {
+        const verification = {
+          type: VerificationType.MasterPassword,
+          secret: "password123",
+        } as any;
+
+        await sut.buildRequest(verification);
+
+        expect(masterPasswordService.makeMasterPasswordAuthenticationData).toHaveBeenCalledWith(
+          "password123",
+          "kdfConfig",
+          "salt",
+        );
+      });
+
+      it("should throw if master password secret is empty", async () => {
+        const verification = {
+          type: VerificationType.MasterPassword,
+          secret: "",
+        } as any;
+
+        await expect(sut.buildRequest(verification)).rejects.toThrow("Master Password is required");
+      });
+
+      it("should throw if master password secret is null", async () => {
+        const verification = {
+          type: VerificationType.MasterPassword,
+          secret: null,
+        } as any;
+
+        await expect(sut.buildRequest(verification)).rejects.toThrow("Master Password is required");
+      });
+    });
+  });
+
   describe("verifyUserByMasterPassword", () => {
     beforeAll(() => {
       i18nService.t.calledWith("invalidMasterPassword").mockReturnValue("Invalid master password");
@@ -228,7 +351,6 @@ describe("UserVerificationService", () => {
         expect(result).toEqual({
           policyOptions: null,
           masterKey: "masterKey",
-          kdfConfig: "kdfConfig",
           email: "email",
         });
       });
@@ -288,7 +410,6 @@ describe("UserVerificationService", () => {
         expect(result).toEqual({
           policyOptions: "MasterPasswordPolicyOptions",
           masterKey: "masterKey",
-          kdfConfig: "kdfConfig",
           email: "email",
         });
       });
@@ -394,11 +515,7 @@ describe("UserVerificationService", () => {
 
   // Helpers
   function setMasterPasswordAvailability(hasMasterPassword: boolean) {
-    userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
-      of({
-        hasMasterPassword: hasMasterPassword,
-      } as UserDecryptionOptions),
-    );
+    userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(of(hasMasterPassword));
     masterPasswordService.masterKeyHash$.mockReturnValue(
       of(hasMasterPassword ? "masterKeyHash" : null),
     );
diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts
index 2fed6713b40..7d93120148b 100644
--- a/libs/common/src/auth/services/user-verification/user-verification.service.ts
+++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts
@@ -37,6 +37,7 @@ import {
   VerificationWithSecret,
   verificationHasSecret,
 } from "../../types/verification";
+import { getUserId } from "../account.service";
 
 /**
  * Used for general-purpose user verification throughout the app.
@@ -101,7 +102,6 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
   async buildRequest<T extends SecretVerificationRequest>(
     verification: ServerSideVerification,
     requestClass?: new () => T,
-    alreadyHashed?: boolean,
   ) {
     this.validateSecretInput(verification);
 
@@ -111,20 +111,17 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
     if (verification.type === VerificationType.OTP) {
       request.otp = verification.secret;
     } else {
-      const [userId, email] = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => [a?.id, a?.email])),
-      );
-      let masterKey = await firstValueFrom(this.masterPasswordService.masterKey$(userId));
-      if (!masterKey && !alreadyHashed) {
-        masterKey = await this.keyService.makeMasterKey(
+      const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+      const kdf = await this.kdfConfigService.getKdfConfig(userId as UserId);
+      const salt = await firstValueFrom(this.masterPasswordService.saltForUser$(userId as UserId));
+
+      const authenticationData =
+        await this.masterPasswordService.makeMasterPasswordAuthenticationData(
           verification.secret,
-          email,
-          await this.kdfConfigService.getKdfConfig(userId),
+          kdf,
+          salt,
         );
-      }
-      request.masterPasswordHash = alreadyHashed
-        ? verification.secret
-        : await this.keyService.hashMasterKey(verification.secret, masterKey);
+      request.authenticateWith(authenticationData);
     }
 
     return request;
@@ -239,7 +236,7 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
     );
     await this.masterPasswordService.setMasterKeyHash(localKeyHash, userId);
     await this.masterPasswordService.setMasterKey(masterKey, userId);
-    return { policyOptions, masterKey, kdfConfig, email };
+    return { policyOptions, masterKey, email };
   }
 
   private async verifyUserByPIN(verification: PinVerification, userId: UserId): Promise<boolean> {
@@ -261,16 +258,19 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
   }
 
   async hasMasterPassword(userId?: string): Promise<boolean> {
-    if (userId) {
-      const decryptionOptions = await firstValueFrom(
-        this.userDecryptionOptionsService.userDecryptionOptionsById$(userId),
-      );
+    const resolvedUserId = userId ?? (await firstValueFrom(this.accountService.activeAccount$))?.id;
 
-      if (decryptionOptions?.hasMasterPassword != undefined) {
-        return decryptionOptions.hasMasterPassword;
-      }
+    if (!resolvedUserId) {
+      return false;
     }
-    return await firstValueFrom(this.userDecryptionOptionsService.hasMasterPassword$);
+
+    // Ideally, this method would accept a UserId over string. To avoid scope creep in PM-26413, we are
+    // doing the cast here. Future work should be done to make this type-safe, and should be considered
+    // as part of PM-27009.
+
+    return await firstValueFrom(
+      this.userDecryptionOptionsService.hasMasterPasswordById$(resolvedUserId as UserId),
+    );
   }
 
   async hasMasterPasswordAndMasterKeyHash(userId?: string): Promise<boolean> {
diff --git a/libs/common/src/auth/services/webauthn-login/webauthn-login.service.spec.ts b/libs/common/src/auth/services/webauthn-login/webauthn-login.service.spec.ts
index 56aa1139cda..b848cb2f902 100644
--- a/libs/common/src/auth/services/webauthn-login/webauthn-login.service.spec.ts
+++ b/libs/common/src/auth/services/webauthn-login/webauthn-login.service.spec.ts
@@ -38,7 +38,7 @@ describe("WebAuthnLoginService", () => {
 
     // We must do this to make the mocked classes available for all the
     // assertCredential(...) tests.
-    global.PublicKeyCredential = MockPublicKeyCredential;
+    global.PublicKeyCredential = MockPublicKeyCredential as any;
     global.AuthenticatorAssertionResponse = MockAuthenticatorAssertionResponse;
 
     // Save the original navigator
@@ -316,6 +316,10 @@ class MockPublicKeyCredential implements PublicKeyCredential {
   static isUserVerifyingPlatformAuthenticatorAvailable(): Promise<boolean> {
     return Promise.resolve(false);
   }
+
+  toJSON() {
+    throw new Error("Method not implemented.");
+  }
 }
 
 function buildCredentialAssertionOptions(): WebAuthnLoginCredentialAssertionOptionsView {
diff --git a/libs/common/src/auth/two-factor/abstractions/index.ts b/libs/common/src/auth/two-factor/abstractions/index.ts
new file mode 100644
index 00000000000..00789048ebe
--- /dev/null
+++ b/libs/common/src/auth/two-factor/abstractions/index.ts
@@ -0,0 +1,2 @@
+export * from "./two-factor-api.service";
+export * from "./two-factor.service";
diff --git a/libs/common/src/auth/two-factor/abstractions/two-factor-api.service.ts b/libs/common/src/auth/two-factor/abstractions/two-factor-api.service.ts
new file mode 100644
index 00000000000..278813c4c30
--- /dev/null
+++ b/libs/common/src/auth/two-factor/abstractions/two-factor-api.service.ts
@@ -0,0 +1,292 @@
+import { DisableTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/disable-two-factor-authenticator.request";
+import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
+import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
+import { TwoFactorProviderRequest } from "@bitwarden/common/auth/models/request/two-factor-provider.request";
+import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/update-two-factor-authenticator.request";
+import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/auth/models/request/update-two-factor-duo.request";
+import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/update-two-factor-email.request";
+import { UpdateTwoFactorWebAuthnDeleteRequest } from "@bitwarden/common/auth/models/request/update-two-factor-web-authn-delete.request";
+import { UpdateTwoFactorWebAuthnRequest } from "@bitwarden/common/auth/models/request/update-two-factor-web-authn.request";
+import { UpdateTwoFactorYubikeyOtpRequest } from "@bitwarden/common/auth/models/request/update-two-factor-yubikey-otp.request";
+import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/auth/models/response/two-factor-authenticator.response";
+import { TwoFactorDuoResponse } from "@bitwarden/common/auth/models/response/two-factor-duo.response";
+import { TwoFactorEmailResponse } from "@bitwarden/common/auth/models/response/two-factor-email.response";
+import { TwoFactorProviderResponse } from "@bitwarden/common/auth/models/response/two-factor-provider.response";
+import { TwoFactorRecoverResponse } from "@bitwarden/common/auth/models/response/two-factor-recover.response";
+import {
+  ChallengeResponse,
+  TwoFactorWebAuthnResponse,
+} from "@bitwarden/common/auth/models/response/two-factor-web-authn.response";
+import { TwoFactorYubiKeyResponse } from "@bitwarden/common/auth/models/response/two-factor-yubi-key.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+
+/**
+ * Service abstraction for two-factor authentication API operations.
+ * Provides methods for managing various two-factor authentication providers including
+ * authenticator apps (TOTP), email, Duo, YubiKey, WebAuthn (FIDO2), and recovery codes.
+ *
+ * All methods that retrieve sensitive configuration data require user verification via
+ * SecretVerificationRequest. Premium-tier providers (Duo, YubiKey) require an active
+ * premium subscription. Organization-level methods require appropriate administrative permissions.
+ */
+export abstract class TwoFactorApiService {
+  /**
+   * Gets a list of all enabled two-factor providers for the current user.
+   *
+   * @returns A promise that resolves to a list response containing enabled two-factor provider configurations.
+   */
+  abstract getTwoFactorProviders(): Promise<ListResponse<TwoFactorProviderResponse>>;
+
+  /**
+   * Gets a list of all enabled two-factor providers for an organization.
+   * Requires organization administrator permissions.
+   *
+   * @param organizationId The ID of the organization.
+   * @returns A promise that resolves to a list response containing enabled two-factor provider configurations.
+   */
+  abstract getTwoFactorOrganizationProviders(
+    organizationId: string,
+  ): Promise<ListResponse<TwoFactorProviderResponse>>;
+
+  /**
+   * Gets the authenticator (TOTP) two-factor configuration for the current user.
+   * Returns the shared secret key and user verification token needed for setup.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The secret verification request to authorize the operation.
+   * @returns A promise that resolves to the authenticator configuration including the secret key.
+   */
+  abstract getTwoFactorAuthenticator(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorAuthenticatorResponse>;
+
+  /**
+   * Gets the email two-factor configuration for the current user.
+   * Returns the configured email address and enabled status.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The secret verification request to authorize the operation.
+   * @returns A promise that resolves to the email two-factor configuration.
+   */
+  abstract getTwoFactorEmail(request: SecretVerificationRequest): Promise<TwoFactorEmailResponse>;
+
+  /**
+   * Gets the Duo two-factor configuration for the current user.
+   * Returns Duo integration configuration details.
+   * Requires user verification and an active premium subscription.
+   *
+   * @param request The secret verification request to authorize the operation.
+   * @returns A promise that resolves to the Duo configuration.
+   */
+  abstract getTwoFactorDuo(request: SecretVerificationRequest): Promise<TwoFactorDuoResponse>;
+
+  /**
+   * Gets the Duo two-factor configuration for an organization.
+   * Returns organization-level Duo integration configuration.
+   * Requires user verification and organization policy management permissions.
+   *
+   * @param organizationId The ID of the organization.
+   * @param request The secret verification request to authorize the operation.
+   * @returns A promise that resolves to the organization Duo configuration.
+   */
+  abstract getTwoFactorOrganizationDuo(
+    organizationId: string,
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorDuoResponse>;
+
+  /**
+   * Gets the YubiKey OTP two-factor configuration for the current user.
+   * Returns configured YubiKey device identifiers (multiple keys supported).
+   * Requires user verification and an active premium subscription.
+   *
+   * @param request The secret verification request to authorize the operation.
+   * @returns A promise that resolves to the YubiKey configuration.
+   */
+  abstract getTwoFactorYubiKey(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorYubiKeyResponse>;
+
+  /**
+   * Gets the WebAuthn (FIDO2) two-factor configuration for the current user.
+   * Returns a list of registered WebAuthn credentials with their names and IDs.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The secret verification request to authorize the operation.
+   * @returns A promise that resolves to the WebAuthn configuration including registered credentials.
+   */
+  abstract getTwoFactorWebAuthn(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorWebAuthnResponse>;
+
+  /**
+   * Gets a WebAuthn challenge for registering a new WebAuthn credential.
+   * This must be called before putTwoFactorWebAuthn to obtain the cryptographic challenge
+   * required for credential creation. The challenge is used by the browser's WebAuthn API.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The secret verification request to authorize the operation.
+   * @returns A promise that resolves to the credential creation options containing the challenge.
+   */
+  abstract getTwoFactorWebAuthnChallenge(
+    request: SecretVerificationRequest,
+  ): Promise<ChallengeResponse>;
+
+  /**
+   * Gets the recovery code configuration for the current user.
+   * Returns the recovery code that can be used to regain access if other two-factor methods are unavailable.
+   * The recovery code should be stored securely by the user.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The secret verification request to authorize the operation.
+   * @returns A promise that resolves to the recovery code configuration.
+   */
+  abstract getTwoFactorRecover(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorRecoverResponse>;
+
+  /**
+   * Enables or updates the authenticator (TOTP) two-factor provider.
+   * Validates the provided token against the shared secret before enabling.
+   * The token must be generated by an authenticator app using the secret key.
+   *
+   * @param request The request containing the authenticator configuration and verification token.
+   * @returns A promise that resolves to the updated authenticator configuration.
+   */
+  abstract putTwoFactorAuthenticator(
+    request: UpdateTwoFactorAuthenticatorRequest,
+  ): Promise<TwoFactorAuthenticatorResponse>;
+
+  /**
+   * Disables the authenticator (TOTP) two-factor provider for the current user.
+   * Requires user verification token to confirm the operation.
+   *
+   * @param request The request containing verification credentials to disable the provider.
+   * @returns A promise that resolves to the updated provider status.
+   */
+  abstract deleteTwoFactorAuthenticator(
+    request: DisableTwoFactorAuthenticatorRequest,
+  ): Promise<TwoFactorProviderResponse>;
+
+  /**
+   * Enables or updates the email two-factor provider.
+   * Validates the email verification token sent via postTwoFactorEmailSetup before enabling.
+   * The token must match the code sent to the specified email address.
+   *
+   * @param request The request containing the email configuration and verification token.
+   * @returns A promise that resolves to the updated email two-factor configuration.
+   */
+  abstract putTwoFactorEmail(request: UpdateTwoFactorEmailRequest): Promise<TwoFactorEmailResponse>;
+
+  /**
+   * Enables or updates the Duo two-factor provider for the current user.
+   * Validates the Duo configuration (client ID, client secret, and host) before enabling.
+   * Requires user verification and an active premium subscription.
+   *
+   * @param request The request containing the Duo integration configuration.
+   * @returns A promise that resolves to the updated Duo configuration.
+   */
+  abstract putTwoFactorDuo(request: UpdateTwoFactorDuoRequest): Promise<TwoFactorDuoResponse>;
+
+  /**
+   * Enables or updates the Duo two-factor provider for an organization.
+   * Validates the Duo configuration (client ID, client secret, and host) before enabling.
+   * Requires user verification and organization policy management permissions.
+   *
+   * @param organizationId The ID of the organization.
+   * @param request The request containing the Duo integration configuration.
+   * @returns A promise that resolves to the updated organization Duo configuration.
+   */
+  abstract putTwoFactorOrganizationDuo(
+    organizationId: string,
+    request: UpdateTwoFactorDuoRequest,
+  ): Promise<TwoFactorDuoResponse>;
+
+  /**
+   * Enables or updates the YubiKey OTP two-factor provider.
+   * Validates each provided YubiKey by testing an OTP from the device.
+   * Supports up to 5 YubiKey devices. Empty key slots are allowed.
+   * Requires user verification and an active premium subscription.
+   * Includes a 2-second delay on validation failure to prevent timing attacks.
+   *
+   * @param request The request containing YubiKey device identifiers and test OTPs.
+   * @returns A promise that resolves to the updated YubiKey configuration.
+   */
+  abstract putTwoFactorYubiKey(
+    request: UpdateTwoFactorYubikeyOtpRequest,
+  ): Promise<TwoFactorYubiKeyResponse>;
+
+  /**
+   * Registers a new WebAuthn (FIDO2) credential for two-factor authentication.
+   * Must be called after getTwoFactorWebAuthnChallenge to complete the registration flow.
+   * The device response contains the signed challenge from the authenticator device.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The request containing the WebAuthn credential creation response from the browser.
+   * @returns A promise that resolves to the updated WebAuthn configuration with the new credential.
+   */
+  abstract putTwoFactorWebAuthn(
+    request: UpdateTwoFactorWebAuthnRequest,
+  ): Promise<TwoFactorWebAuthnResponse>;
+
+  /**
+   * Removes a specific WebAuthn (FIDO2) credential from the user's account.
+   * The credential will no longer be usable for two-factor authentication.
+   * Other registered WebAuthn credentials remain active.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The request containing the credential ID to remove.
+   * @returns A promise that resolves to the updated WebAuthn configuration.
+   */
+  abstract deleteTwoFactorWebAuthn(
+    request: UpdateTwoFactorWebAuthnDeleteRequest,
+  ): Promise<TwoFactorWebAuthnResponse>;
+
+  /**
+   * Disables a specific two-factor provider for the current user.
+   * The provider will no longer be required or usable for authentication.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The request specifying which provider type to disable.
+   * @returns A promise that resolves to the updated provider status.
+   */
+  abstract putTwoFactorDisable(
+    request: TwoFactorProviderRequest,
+  ): Promise<TwoFactorProviderResponse>;
+
+  /**
+   * Disables a specific two-factor provider for an organization.
+   * The provider will no longer be available for organization members.
+   * Requires user verification and organization policy management permissions.
+   *
+   * @param organizationId The ID of the organization.
+   * @param request The request specifying which provider type to disable.
+   * @returns A promise that resolves to the updated provider status.
+   */
+  abstract putTwoFactorOrganizationDisable(
+    organizationId: string,
+    request: TwoFactorProviderRequest,
+  ): Promise<TwoFactorProviderResponse>;
+
+  /**
+   * Initiates email two-factor setup by sending a verification code to the specified email address.
+   * This is the first step in enabling email two-factor authentication.
+   * The verification code must be provided to putTwoFactorEmail to complete setup.
+   * Only used during initial configuration, not during login flows.
+   * Requires user verification via master password or OTP.
+   *
+   * @param request The request containing the email address for two-factor setup.
+   * @returns A promise that resolves when the verification email has been sent.
+   */
+  abstract postTwoFactorEmailSetup(request: TwoFactorEmailRequest): Promise<any>;
+
+  /**
+   * Sends a two-factor authentication code via email during the login flow.
+   * Supports multiple authentication contexts including standard login, SSO, and passwordless flows.
+   * This is used to deliver codes during authentication, not during initial setup.
+   * May be called without authentication for login scenarios.
+   *
+   * @param request The request to send the two-factor code, optionally including SSO or auth request tokens.
+   * @returns A promise that resolves when the authentication email has been sent.
+   */
+  abstract postTwoFactorEmail(request: TwoFactorEmailRequest): Promise<any>;
+}
diff --git a/libs/common/src/auth/two-factor/abstractions/two-factor.service.ts b/libs/common/src/auth/two-factor/abstractions/two-factor.service.ts
new file mode 100644
index 00000000000..4cba40716e1
--- /dev/null
+++ b/libs/common/src/auth/two-factor/abstractions/two-factor.service.ts
@@ -0,0 +1,497 @@
+import { ListResponse } from "../../../models/response/list.response";
+import { KeyDefinition, TWO_FACTOR_MEMORY } from "../../../platform/state";
+import { TwoFactorProviderType } from "../../enums/two-factor-provider-type";
+import { DisableTwoFactorAuthenticatorRequest } from "../../models/request/disable-two-factor-authenticator.request";
+import { SecretVerificationRequest } from "../../models/request/secret-verification.request";
+import { TwoFactorEmailRequest } from "../../models/request/two-factor-email.request";
+import { TwoFactorProviderRequest } from "../../models/request/two-factor-provider.request";
+import { UpdateTwoFactorAuthenticatorRequest } from "../../models/request/update-two-factor-authenticator.request";
+import { UpdateTwoFactorDuoRequest } from "../../models/request/update-two-factor-duo.request";
+import { UpdateTwoFactorEmailRequest } from "../../models/request/update-two-factor-email.request";
+import { UpdateTwoFactorWebAuthnDeleteRequest } from "../../models/request/update-two-factor-web-authn-delete.request";
+import { UpdateTwoFactorWebAuthnRequest } from "../../models/request/update-two-factor-web-authn.request";
+import { UpdateTwoFactorYubikeyOtpRequest } from "../../models/request/update-two-factor-yubikey-otp.request";
+import { IdentityTwoFactorResponse } from "../../models/response/identity-two-factor.response";
+import { TwoFactorAuthenticatorResponse } from "../../models/response/two-factor-authenticator.response";
+import { TwoFactorDuoResponse } from "../../models/response/two-factor-duo.response";
+import { TwoFactorEmailResponse } from "../../models/response/two-factor-email.response";
+import { TwoFactorProviderResponse } from "../../models/response/two-factor-provider.response";
+import { TwoFactorRecoverResponse } from "../../models/response/two-factor-recover.response";
+import {
+  ChallengeResponse,
+  TwoFactorWebAuthnResponse,
+} from "../../models/response/two-factor-web-authn.response";
+import { TwoFactorYubiKeyResponse } from "../../models/response/two-factor-yubi-key.response";
+
+/**
+ * Metadata and display information for a two-factor authentication provider.
+ * Used by UI components to render provider selection and configuration screens.
+ */
+export interface TwoFactorProviderDetails {
+  /** The unique identifier for this provider type. */
+  type: TwoFactorProviderType;
+
+  /**
+   * Display name for the provider, localized via {@link TwoFactorService.init}.
+   * Examples: "Authenticator App", "Email", "YubiKey".
+   */
+  name: string | null;
+
+  /**
+   * User-facing description explaining what this provider is and how it works.
+   * Localized via {@link TwoFactorService.init}.
+   */
+  description: string | null;
+
+  /**
+   * Selection priority during login when multiple providers are available.
+   * Higher values are preferred. Used to determine the default provider.
+   * Range: 0 (lowest) to 10 (highest).
+   */
+  priority: number;
+
+  /**
+   * Display order in provider lists within settings UI.
+   * Lower values appear first (1 = first position).
+   */
+  sort: number;
+
+  /**
+   * Whether this provider requires an active premium subscription.
+   * Premium providers: Duo (personal), YubiKey.
+   * Organization providers (e.g., OrganizationDuo) do not require personal premium.
+   */
+  premium: boolean;
+}
+
+/**
+ * Registry of all supported two-factor authentication providers with their metadata.
+ * Strings (name, description) are initialized as null and populated with localized
+ * translations when {@link TwoFactorService.init} is called during application startup.
+ *
+ * @remarks
+ * This constant is mutated during initialization. Components should not access it before
+ * the service's init() method has been called.
+ *
+ * @example
+ * ```typescript
+ * // During app init
+ * twoFactorService.init();
+ *
+ * // In components
+ * const authenticator = TwoFactorProviders[TwoFactorProviderType.Authenticator];
+ * console.log(authenticator.name); // "Authenticator App" (localized)
+ * ```
+ */
+export const TwoFactorProviders: Partial<Record<TwoFactorProviderType, TwoFactorProviderDetails>> =
+  {
+    [TwoFactorProviderType.Authenticator]: {
+      type: TwoFactorProviderType.Authenticator,
+      name: null,
+      description: null,
+      priority: 1,
+      sort: 2,
+      premium: false,
+    },
+    [TwoFactorProviderType.Yubikey]: {
+      type: TwoFactorProviderType.Yubikey,
+      name: null,
+      description: null,
+      priority: 3,
+      sort: 4,
+      premium: true,
+    },
+    [TwoFactorProviderType.Duo]: {
+      type: TwoFactorProviderType.Duo,
+      name: "Duo",
+      description: null,
+      priority: 2,
+      sort: 5,
+      premium: true,
+    },
+    [TwoFactorProviderType.OrganizationDuo]: {
+      type: TwoFactorProviderType.OrganizationDuo,
+      name: "Duo (Organization)",
+      description: null,
+      priority: 10,
+      sort: 6,
+      premium: false,
+    },
+    [TwoFactorProviderType.Email]: {
+      type: TwoFactorProviderType.Email,
+      name: null,
+      description: null,
+      priority: 0,
+      sort: 1,
+      premium: false,
+    },
+    [TwoFactorProviderType.WebAuthn]: {
+      type: TwoFactorProviderType.WebAuthn,
+      name: null,
+      description: null,
+      priority: 4,
+      sort: 3,
+      premium: false,
+    },
+  };
+
+// Memory storage as only required during authentication process
+export const PROVIDERS = KeyDefinition.record<Record<string, string>, TwoFactorProviderType>(
+  TWO_FACTOR_MEMORY,
+  "providers",
+  {
+    deserializer: (obj) => obj,
+  },
+);
+
+// Memory storage as only required during authentication process
+export const SELECTED_PROVIDER = new KeyDefinition<TwoFactorProviderType>(
+  TWO_FACTOR_MEMORY,
+  "selected",
+  {
+    deserializer: (obj) => obj,
+  },
+);
+
+export abstract class TwoFactorService {
+  /**
+   * Initializes the client-side's TwoFactorProviders const with translations.
+   */
+  abstract init(): void;
+
+  /**
+   * Gets a list of two-factor providers from state that are supported on the current client.
+   * E.g., WebAuthn and Duo are not available on all clients.
+   * @returns A list of supported two-factor providers or an empty list if none are stored in state.
+   */
+  abstract getSupportedProviders(win: Window): Promise<TwoFactorProviderDetails[]>;
+
+  /**
+   * Gets the previously selected two-factor provider or the default two factor provider based on priority.
+   * @param webAuthnSupported - Whether or not WebAuthn is supported by the client. Prevents WebAuthn from being the default provider if false.
+   */
+  abstract getDefaultProvider(webAuthnSupported: boolean): Promise<TwoFactorProviderType>;
+
+  /**
+   * Sets the selected two-factor provider in state.
+   * @param type - The type of two-factor provider to set as the selected provider.
+   */
+  abstract setSelectedProvider(type: TwoFactorProviderType): Promise<void>;
+
+  /**
+   * Clears the selected two-factor provider from state.
+   */
+  abstract clearSelectedProvider(): Promise<void>;
+
+  /**
+   * Sets the list of available two-factor providers in state.
+   * @param response - the response from Identity for when 2FA is required. Includes the list of available 2FA providers.
+   */
+  abstract setProviders(response: IdentityTwoFactorResponse): Promise<void>;
+
+  /**
+   * Clears the list of available two-factor providers from state.
+   */
+  abstract clearProviders(): Promise<void>;
+
+  /**
+   * Gets the list of two-factor providers from state.
+   * Note: no filtering is done here, so this will return all providers, including potentially
+   * unsupported ones for the current client.
+   * @returns A list of two-factor providers or null if none are stored in state.
+   */
+  abstract getProviders(): Promise<Map<TwoFactorProviderType, { [key: string]: string }> | null>;
+
+  /**
+   * Gets the enabled two-factor providers for the current user from the API.
+   * Used for settings management.
+   * @returns A promise that resolves to a list response containing enabled two-factor provider configurations.
+   */
+  abstract getEnabledTwoFactorProviders(): Promise<ListResponse<TwoFactorProviderResponse>>;
+
+  /**
+   * Gets the enabled two-factor providers for an organization from the API.
+   * Requires organization administrator permissions.
+   * Used for settings management.
+   *
+   * @param organizationId The ID of the organization.
+   * @returns A promise that resolves to a list response containing enabled two-factor provider configurations.
+   */
+  abstract getTwoFactorOrganizationProviders(
+    organizationId: string,
+  ): Promise<ListResponse<TwoFactorProviderResponse>>;
+
+  /**
+   * Gets the authenticator (TOTP) two-factor configuration for the current user from the API.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   * @param request The {@link SecretVerificationRequest} to prove authentication.
+   * @returns A promise that resolves to the authenticator configuration including the secret key.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract getTwoFactorAuthenticator(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorAuthenticatorResponse>;
+
+  /**
+   * Gets the email two-factor configuration for the current user from the API.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   * @param request The {@link SecretVerificationRequest} to prove authentication.
+   * @returns A promise that resolves to the email two-factor configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract getTwoFactorEmail(request: SecretVerificationRequest): Promise<TwoFactorEmailResponse>;
+
+  /**
+   * Gets the Duo two-factor configuration for the current user from the API.
+   * Requires user verification and an active premium subscription.
+   * Used for settings management.
+   *
+   * @param request The {@link SecretVerificationRequest} to prove authentication.
+   * @returns A promise that resolves to the Duo configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract getTwoFactorDuo(request: SecretVerificationRequest): Promise<TwoFactorDuoResponse>;
+
+  /**
+   * Gets the Duo two-factor configuration for an organization from the API.
+   * Requires user verification and organization policy management permissions.
+   * Used for settings management.
+   *
+   * @param organizationId The ID of the organization.
+   * @param request The {@link SecretVerificationRequest} to prove authentication.
+   * @returns A promise that resolves to the organization Duo configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract getTwoFactorOrganizationDuo(
+    organizationId: string,
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorDuoResponse>;
+
+  /**
+   * Gets the YubiKey OTP two-factor configuration for the current user from the API.
+   * Requires user verification and an active premium subscription.
+   * Used for settings management.
+   *
+   * @param request The {@link SecretVerificationRequest} to prove authentication.
+   * @returns A promise that resolves to the YubiKey configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract getTwoFactorYubiKey(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorYubiKeyResponse>;
+
+  /**
+   * Gets the WebAuthn (FIDO2) two-factor configuration for the current user from the API.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   * @param request The {@link SecretVerificationRequest} to authentication.
+   * @returns A promise that resolves to the WebAuthn configuration including registered credentials.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract getTwoFactorWebAuthn(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorWebAuthnResponse>;
+
+  /**
+   * Gets a WebAuthn challenge for registering a new WebAuthn credential from the API.
+   * This must be called before putTwoFactorWebAuthn to obtain the cryptographic challenge
+   * required for credential creation. The challenge is used by the browser's WebAuthn API.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   * @param request The {@link SecretVerificationRequest} to prove authentication.
+   * @returns A promise that resolves to the credential creation options containing the challenge.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract getTwoFactorWebAuthnChallenge(
+    request: SecretVerificationRequest,
+  ): Promise<ChallengeResponse>;
+
+  /**
+   * Gets the recovery code configuration for the current user from the API.
+   * The recovery code should be stored securely by the user.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   *  @param verification The verification information to prove authentication.
+   * @returns A promise that resolves to the recovery code configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract getTwoFactorRecover(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorRecoverResponse>;
+
+  /**
+   * Enables or updates the authenticator (TOTP) two-factor provider.
+   * Validates the provided token against the shared secret before enabling.
+   * The token must be generated by an authenticator app using the secret key.
+   * Used for settings management.
+   *
+   * @param request The {@link UpdateTwoFactorAuthenticatorRequest} to prove authentication.
+   * @returns A promise that resolves to the updated authenticator configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract putTwoFactorAuthenticator(
+    request: UpdateTwoFactorAuthenticatorRequest,
+  ): Promise<TwoFactorAuthenticatorResponse>;
+
+  /**
+   * Disables the authenticator (TOTP) two-factor provider for the current user.
+   * Requires user verification token to confirm the operation.
+   * Used for settings management.
+   *
+   * @param request The {@link DisableTwoFactorAuthenticatorRequest} to prove authentication.
+   * @returns A promise that resolves to the updated provider status.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract deleteTwoFactorAuthenticator(
+    request: DisableTwoFactorAuthenticatorRequest,
+  ): Promise<TwoFactorProviderResponse>;
+
+  /**
+   * Enables or updates the email two-factor provider for the current user.
+   * Validates the email verification token sent via postTwoFactorEmailSetup before enabling.
+   * The token must match the code sent to the specified email address.
+   * Used for settings management.
+   *
+   * @param request The {@link UpdateTwoFactorEmailRequest} to prove authentication.
+   * @returns A promise that resolves to the updated email two-factor configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract putTwoFactorEmail(request: UpdateTwoFactorEmailRequest): Promise<TwoFactorEmailResponse>;
+
+  /**
+   * Enables or updates the Duo two-factor provider for the current user.
+   * Validates the Duo configuration (client ID, client secret, and host) before enabling.
+   * Requires user verification and an active premium subscription.
+   * Used for settings management.
+   *
+   * @param request The {@link UpdateTwoFactorDuoRequest} to prove authentication.
+   * @returns A promise that resolves to the updated Duo configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract putTwoFactorDuo(request: UpdateTwoFactorDuoRequest): Promise<TwoFactorDuoResponse>;
+
+  /**
+   * Enables or updates the Duo two-factor provider for an organization.
+   * Validates the Duo configuration (client ID, client secret, and host) before enabling.
+   * Requires user verification and organization policy management permissions.
+   * Used for settings management.
+   *
+   * @param organizationId The ID of the organization.
+   * @param request The {@link UpdateTwoFactorDuoRequest} to prove authentication.
+   * @returns A promise that resolves to the updated organization Duo configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract putTwoFactorOrganizationDuo(
+    organizationId: string,
+    request: UpdateTwoFactorDuoRequest,
+  ): Promise<TwoFactorDuoResponse>;
+
+  /**
+   * Enables or updates the YubiKey OTP two-factor provider for the current user.
+   * Validates each provided YubiKey by testing an OTP from the device.
+   * Supports up to 5 YubiKey devices. Empty key slots are allowed.
+   * Requires user verification and an active premium subscription.
+   * Used for settings management.
+   *
+   * @param request The {@link UpdateTwoFactorYubikeyOtpRequest} to prove authentication.
+   * @returns A promise that resolves to the updated YubiKey configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract putTwoFactorYubiKey(
+    request: UpdateTwoFactorYubikeyOtpRequest,
+  ): Promise<TwoFactorYubiKeyResponse>;
+
+  /**
+   * Registers a new WebAuthn (FIDO2) credential for two-factor authentication for the current user.
+   * Must be called after getTwoFactorWebAuthnChallenge to complete the registration flow.
+   * The device response contains the signed challenge from the authenticator device.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   * @param request The {@link UpdateTwoFactorWebAuthnRequest} to prove authentication.
+   * @returns A promise that resolves to the updated WebAuthn configuration with the new credential.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract putTwoFactorWebAuthn(
+    request: UpdateTwoFactorWebAuthnRequest,
+  ): Promise<TwoFactorWebAuthnResponse>;
+
+  /**
+   * Removes a specific WebAuthn (FIDO2) credential from the user's account.
+   * The credential will no longer be usable for two-factor authentication.
+   * Other registered WebAuthn credentials remain active.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   * @param request The {@link UpdateTwoFactorWebAuthnDeleteRequest} to prove authentication.
+   * @returns A promise that resolves to the updated WebAuthn configuration.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract deleteTwoFactorWebAuthn(
+    request: UpdateTwoFactorWebAuthnDeleteRequest,
+  ): Promise<TwoFactorWebAuthnResponse>;
+
+  /**
+   * Disables a specific two-factor provider for the current user.
+   * The provider will no longer be required or usable for authentication.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   * @param request The {@link TwoFactorProviderRequest} to prove authentication.
+   * @returns A promise that resolves to the updated provider status.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract putTwoFactorDisable(
+    request: TwoFactorProviderRequest,
+  ): Promise<TwoFactorProviderResponse>;
+
+  /**
+   * Disables a specific two-factor provider for an organization.
+   * The provider will no longer be available for organization members.
+   * Requires user verification and organization policy management permissions.
+   * Used for settings management.
+   *
+   * @param organizationId The ID of the organization.
+   * @param request The {@link TwoFactorProviderRequest} to prove authentication.
+   * @returns A promise that resolves to the updated provider status.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract putTwoFactorOrganizationDisable(
+    organizationId: string,
+    request: TwoFactorProviderRequest,
+  ): Promise<TwoFactorProviderResponse>;
+
+  /**
+   * Initiates email two-factor setup by sending a verification code to the specified email address.
+   * This is the first step in enabling email two-factor authentication.
+   * The verification code must be provided to putTwoFactorEmail to complete setup.
+   * Only used during initial configuration, not during login flows.
+   * Requires user verification via master password or OTP.
+   * Used for settings management.
+   *
+   * @param request The {@link TwoFactorEmailRequest} to prove authentication.
+   * @returns A promise that resolves when the verification email has been sent.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract postTwoFactorEmailSetup(request: TwoFactorEmailRequest): Promise<any>;
+
+  /**
+   * Sends a two-factor authentication code via email during the login flow.
+   * Supports multiple authentication contexts including standard login, SSO, and passwordless flows.
+   * This is used to deliver codes during authentication, not during initial setup.
+   * May be called without authentication for login scenarios.
+   * Used during authentication flows.
+   *
+   * @param request The {@link TwoFactorEmailRequest} to prove authentication.
+   * @returns A promise that resolves when the authentication email has been sent.
+   * @remarks Use {@link UserVerificationService.buildRequest} to create the request object.
+   */
+  abstract postTwoFactorEmail(request: TwoFactorEmailRequest): Promise<any>;
+}
diff --git a/libs/common/src/auth/two-factor/index.ts b/libs/common/src/auth/two-factor/index.ts
new file mode 100644
index 00000000000..fd6edf0ac3c
--- /dev/null
+++ b/libs/common/src/auth/two-factor/index.ts
@@ -0,0 +1,2 @@
+export * from "./abstractions";
+export * from "./services";
diff --git a/libs/common/src/auth/two-factor/services/default-two-factor-api.service.spec.ts b/libs/common/src/auth/two-factor/services/default-two-factor-api.service.spec.ts
new file mode 100644
index 00000000000..c54790d9f76
--- /dev/null
+++ b/libs/common/src/auth/two-factor/services/default-two-factor-api.service.spec.ts
@@ -0,0 +1,697 @@
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { DisableTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/disable-two-factor-authenticator.request";
+import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
+import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
+import { TwoFactorProviderRequest } from "@bitwarden/common/auth/models/request/two-factor-provider.request";
+import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/update-two-factor-authenticator.request";
+import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/auth/models/request/update-two-factor-duo.request";
+import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/update-two-factor-email.request";
+import { UpdateTwoFactorWebAuthnDeleteRequest } from "@bitwarden/common/auth/models/request/update-two-factor-web-authn-delete.request";
+import { UpdateTwoFactorWebAuthnRequest } from "@bitwarden/common/auth/models/request/update-two-factor-web-authn.request";
+import { UpdateTwoFactorYubikeyOtpRequest } from "@bitwarden/common/auth/models/request/update-two-factor-yubikey-otp.request";
+import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/auth/models/response/two-factor-authenticator.response";
+import { TwoFactorDuoResponse } from "@bitwarden/common/auth/models/response/two-factor-duo.response";
+import { TwoFactorEmailResponse } from "@bitwarden/common/auth/models/response/two-factor-email.response";
+import { TwoFactorProviderResponse } from "@bitwarden/common/auth/models/response/two-factor-provider.response";
+import { TwoFactorRecoverResponse } from "@bitwarden/common/auth/models/response/two-factor-recover.response";
+import {
+  TwoFactorWebAuthnResponse,
+  ChallengeResponse,
+} from "@bitwarden/common/auth/models/response/two-factor-web-authn.response";
+import { TwoFactorYubiKeyResponse } from "@bitwarden/common/auth/models/response/two-factor-yubi-key.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+
+import { DefaultTwoFactorApiService } from "./default-two-factor-api.service";
+
+describe("TwoFactorApiService", () => {
+  let apiService: MockProxy<ApiService>;
+  let twoFactorApiService: DefaultTwoFactorApiService;
+
+  beforeEach(() => {
+    apiService = mock<ApiService>();
+    twoFactorApiService = new DefaultTwoFactorApiService(apiService);
+  });
+
+  describe("Two-Factor Providers", () => {
+    describe("getTwoFactorProviders", () => {
+      it("retrieves all enabled two-factor providers for the current user", async () => {
+        const mockResponse = {
+          data: [
+            { Type: 0, Enabled: true },
+            { Type: 1, Enabled: true },
+          ],
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorProviders();
+
+        expect(apiService.send).toHaveBeenCalledWith("GET", "/two-factor", null, true, true);
+        expect(result).toBeInstanceOf(ListResponse);
+        expect(result.data).toHaveLength(2);
+        for (let i = 0; i < result.data.length; i++) {
+          expect(result.data[i]).toBeInstanceOf(TwoFactorProviderResponse);
+          expect(result.data[i].type).toBe(i);
+          expect(result.data[i].enabled).toBe(true);
+        }
+      });
+    });
+
+    describe("getTwoFactorOrganizationProviders", () => {
+      it("retrieves all enabled two-factor providers for a specific organization", async () => {
+        const organizationId = "org-123";
+        const mockResponse = {
+          data: [{ Type: 6, Enabled: true }],
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorOrganizationProviders(organizationId);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "GET",
+          `/organizations/${organizationId}/two-factor`,
+          null,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(ListResponse);
+        expect(result.data[0]).toBeInstanceOf(TwoFactorProviderResponse);
+        expect(result.data[0].enabled).toBe(true);
+        expect(result.data[0].type).toBe(6); // Duo
+      });
+    });
+  });
+
+  describe("Authenticator (TOTP) APIs", () => {
+    describe("getTwoFactorAuthenticator", () => {
+      it("retrieves authenticator configuration with secret key after user verification", async () => {
+        const request = new SecretVerificationRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: false,
+          Key: "MFRGGZDFMZTWQ2LK",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorAuthenticator(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/get-authenticator",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorAuthenticatorResponse);
+        expect(result.enabled).toBe(false);
+      });
+    });
+
+    describe("putTwoFactorAuthenticator", () => {
+      it("enables authenticator after validating the provided token", async () => {
+        const request = new UpdateTwoFactorAuthenticatorRequest();
+        request.token = "123456";
+        request.key = "MFRGGZDFMZTWQ2LK";
+        const mockResponse = {
+          Enabled: true,
+          Key: "MFRGGZDFMZTWQ2LK",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.putTwoFactorAuthenticator(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "PUT",
+          "/two-factor/authenticator",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorAuthenticatorResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.key).toBeDefined();
+      });
+    });
+
+    describe("deleteTwoFactorAuthenticator", () => {
+      it("disables authenticator two-factor authentication", async () => {
+        const request = new DisableTwoFactorAuthenticatorRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: false,
+          Type: 0,
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.deleteTwoFactorAuthenticator(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "DELETE",
+          "/two-factor/authenticator",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorProviderResponse);
+        expect(result.enabled).toBe(false);
+        expect(result.type).toBe(0); // Authenticator
+      });
+    });
+  });
+
+  describe("Email APIs", () => {
+    describe("getTwoFactorEmail", () => {
+      it("retrieves email two-factor configuration after user verification", async () => {
+        const request = new SecretVerificationRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: true,
+          Email: "user@example.com",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorEmail(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/get-email",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorEmailResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.email).toBeDefined();
+      });
+    });
+
+    describe("postTwoFactorEmailSetup", () => {
+      it("sends verification code to email address during two-factor setup", async () => {
+        const request = new TwoFactorEmailRequest();
+        request.email = "user@example.com";
+        request.masterPasswordHash = "master-password-hash";
+
+        await twoFactorApiService.postTwoFactorEmailSetup(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/send-email",
+          request,
+          true,
+          false,
+        );
+      });
+    });
+
+    describe("postTwoFactorEmail", () => {
+      it("sends two-factor authentication code during login flow", async () => {
+        const request = new TwoFactorEmailRequest();
+        request.email = "user@example.com";
+        // Note: masterPasswordHash not required for login flow
+
+        await twoFactorApiService.postTwoFactorEmail(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/send-email-login",
+          request,
+          false,
+          false,
+        );
+      });
+    });
+
+    describe("putTwoFactorEmail", () => {
+      it("enables email two-factor after validating the verification code", async () => {
+        const request = new UpdateTwoFactorEmailRequest();
+        request.email = "user@example.com";
+        request.token = "verification-code";
+        const mockResponse = {
+          Enabled: true,
+          Email: "user@example.com",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.putTwoFactorEmail(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "PUT",
+          "/two-factor/email",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorEmailResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.email).toBeDefined();
+      });
+    });
+  });
+
+  describe("Duo APIs", () => {
+    describe("getTwoFactorDuo", () => {
+      it("retrieves Duo configuration for premium user after verification", async () => {
+        const request = new SecretVerificationRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: true,
+          Host: "api-abc123.duosecurity.com",
+          ClientId: "DI9ABC1DEFGH2JKL",
+          ClientSecret: "client******",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorDuo(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/get-duo",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorDuoResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.host).toBeDefined();
+        expect(result.clientId).toBeDefined();
+        expect(result.clientSecret).toContain("******");
+      });
+    });
+
+    describe("getTwoFactorOrganizationDuo", () => {
+      it("retrieves Duo configuration for organization with admin permissions", async () => {
+        const organizationId = "org-123";
+        const request = new SecretVerificationRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: true,
+          Host: "api-xyz789.duosecurity.com",
+          ClientId: "DI4XYZ9MNOP3QRS",
+          ClientSecret: "orgcli******",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorOrganizationDuo(
+          organizationId,
+          request,
+        );
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          `/organizations/${organizationId}/two-factor/get-duo`,
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorDuoResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.host).toBeDefined();
+        expect(result.clientId).toBeDefined();
+        expect(result.clientSecret).toContain("******");
+      });
+    });
+
+    describe("putTwoFactorDuo", () => {
+      it("enables Duo two-factor for premium user with valid integration details", async () => {
+        const request = new UpdateTwoFactorDuoRequest();
+        request.host = "api-abc123.duosecurity.com";
+        request.clientId = "DI9ABC1DEFGH2JKL";
+        request.clientSecret = "client-secret-value-here";
+        const mockResponse = {
+          Enabled: true,
+          Host: "api-abc123.duosecurity.com",
+          ClientId: "DI9ABC1DEFGH2JKL",
+          ClientSecret: "client******",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.putTwoFactorDuo(request);
+
+        expect(apiService.send).toHaveBeenCalledWith("PUT", "/two-factor/duo", request, true, true);
+        expect(result).toBeInstanceOf(TwoFactorDuoResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.host).toBeDefined();
+        expect(result.clientId).toBeDefined();
+        expect(result.clientSecret).toContain("******");
+      });
+    });
+
+    describe("putTwoFactorOrganizationDuo", () => {
+      it("enables organization-level Duo with policy management permissions", async () => {
+        const organizationId = "org-123";
+        const request = new UpdateTwoFactorDuoRequest();
+        request.host = "api-xyz789.duosecurity.com";
+        request.clientId = "DI4XYZ9MNOP3QRS";
+        request.clientSecret = "orgcli-secret-value-here";
+        const mockResponse = {
+          Enabled: true,
+          Host: "api-xyz789.duosecurity.com",
+          ClientId: "DI4XYZ9MNOP3QRS",
+          ClientSecret: "orgcli******",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.putTwoFactorOrganizationDuo(
+          organizationId,
+          request,
+        );
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "PUT",
+          `/organizations/${organizationId}/two-factor/duo`,
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorDuoResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.host).toBeDefined();
+        expect(result.clientId).toBeDefined();
+        expect(result.clientSecret).toContain("******");
+      });
+    });
+  });
+
+  describe("YubiKey APIs", () => {
+    describe("getTwoFactorYubiKey", () => {
+      it("retrieves YubiKey configuration for premium user after verification", async () => {
+        const request = new SecretVerificationRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: true,
+          Key1: "cccccccccccc",
+          Key2: "dddddddddddd",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorYubiKey(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/get-yubikey",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorYubiKeyResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.key1).toBeDefined();
+        expect(result.key2).toBeDefined();
+      });
+    });
+
+    describe("putTwoFactorYubiKey", () => {
+      it("enables YubiKey two-factor for premium user after validating device OTPs", async () => {
+        const request = new UpdateTwoFactorYubikeyOtpRequest();
+        request.key1 = "ccccccccccccjkhbhbhrkcitringjkrjirfjuunlnlvcghnkrtgfj";
+        request.key2 = "ddddddddddddvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv";
+        const mockResponse = {
+          Enabled: true,
+          Key1: "cccccccccccc",
+          Key2: "dddddddddddd",
+          Nfc: false,
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.putTwoFactorYubiKey(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "PUT",
+          "/two-factor/yubikey",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorYubiKeyResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.key1).toBeDefined();
+        expect(result.key2).toBeDefined();
+      });
+    });
+  });
+
+  describe("WebAuthn APIs", () => {
+    describe("getTwoFactorWebAuthn", () => {
+      it("retrieves list of registered WebAuthn credentials after verification", async () => {
+        const request = new SecretVerificationRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: true,
+          Keys: [
+            { Name: "YubiKey 5", Id: 1, Migrated: false },
+            { Name: "Security Key", Id: 2, Migrated: true },
+          ],
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorWebAuthn(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/get-webauthn",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorWebAuthnResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.keys).toHaveLength(2);
+        result.keys.forEach((key) => {
+          expect(key).toHaveProperty("name");
+          expect(key).toHaveProperty("id");
+          expect(key).toHaveProperty("migrated");
+        });
+      });
+    });
+
+    describe("getTwoFactorWebAuthnChallenge", () => {
+      it("obtains cryptographic challenge for WebAuthn credential registration", async () => {
+        const request = new SecretVerificationRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          challenge: "Y2hhbGxlbmdlLXN0cmluZw",
+          rp: { name: "Bitwarden" },
+          user: {
+            id: "dXNlci1pZA",
+            name: "user@example.com",
+            displayName: "User",
+          },
+          pubKeyCredParams: [{ type: "public-key", alg: -7 }], // ES256
+          excludeCredentials: [] as PublicKeyCredentialDescriptor[],
+          timeout: 60000,
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorWebAuthnChallenge(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/get-webauthn-challenge",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(ChallengeResponse);
+        expect(result.challenge).toBeDefined();
+        expect(result.rp).toHaveProperty("name", "Bitwarden");
+        expect(result.user).toHaveProperty("id");
+        expect(result.user).toHaveProperty("name");
+        expect(result.user).toHaveProperty("displayName", "User");
+        expect(result.pubKeyCredParams).toHaveLength(1);
+        expect(Number(result.timeout)).toBeTruthy();
+      });
+    });
+
+    describe("putTwoFactorWebAuthn", () => {
+      it("registers new WebAuthn credential by serializing browser credential to JSON", async () => {
+        const mockAttestationResponse: Partial<AuthenticatorAttestationResponse> = {
+          clientDataJSON: new Uint8Array([1, 2, 3]).buffer,
+          attestationObject: new Uint8Array([4, 5, 6]).buffer,
+        };
+
+        const mockCredential: Partial<PublicKeyCredential> = {
+          id: "credential-id",
+          type: "public-key",
+          response: mockAttestationResponse as AuthenticatorAttestationResponse,
+          getClientExtensionResults: jest.fn().mockReturnValue({}),
+        };
+
+        const request = new UpdateTwoFactorWebAuthnRequest();
+        request.deviceResponse = mockCredential as PublicKeyCredential;
+        request.name = "My Security Key";
+
+        const mockResponse = {
+          Enabled: true,
+          Keys: [{ Name: "My Security Key", Id: 1, Migrated: false }],
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.putTwoFactorWebAuthn(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "PUT",
+          "/two-factor/webauthn",
+          expect.objectContaining({
+            name: "My Security Key",
+            deviceResponse: expect.objectContaining({
+              id: "credential-id",
+              rawId: expect.any(String), // base64 encoded
+              type: "public-key",
+              extensions: {},
+              response: expect.objectContaining({
+                AttestationObject: expect.any(String), // base64 encoded
+                clientDataJson: expect.any(String), // base64 encoded
+              }),
+            }),
+          }),
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorWebAuthnResponse);
+        expect(result.enabled).toBe(true);
+        expect(result.keys).toHaveLength(1);
+        expect(result.keys[0].name).toBeDefined();
+        expect(result.keys[0].id).toBeDefined();
+        expect(result.keys[0].migrated).toBeDefined();
+      });
+
+      it("preserves original request object without mutation during serialization", async () => {
+        const mockAttestationResponse: Partial<AuthenticatorAttestationResponse> = {
+          clientDataJSON: new Uint8Array([1, 2, 3]).buffer,
+          attestationObject: new Uint8Array([4, 5, 6]).buffer,
+        };
+
+        const mockCredential: Partial<PublicKeyCredential> = {
+          id: "credential-id",
+          type: "public-key",
+          response: mockAttestationResponse as AuthenticatorAttestationResponse,
+          getClientExtensionResults: jest.fn().mockReturnValue({}),
+        };
+
+        const request = new UpdateTwoFactorWebAuthnRequest();
+        request.deviceResponse = mockCredential as PublicKeyCredential;
+        request.name = "My Security Key";
+
+        const originalDeviceResponse = request.deviceResponse;
+        apiService.send.mockResolvedValue({ enabled: true, keys: [] });
+
+        await twoFactorApiService.putTwoFactorWebAuthn(request);
+
+        // Do not mutate the original request object
+        expect(request.deviceResponse).toBe(originalDeviceResponse);
+        expect(request.deviceResponse.response).toBe(mockAttestationResponse);
+      });
+    });
+
+    describe("deleteTwoFactorWebAuthn", () => {
+      it("removes specific WebAuthn credential while preserving other registered keys", async () => {
+        const request = new UpdateTwoFactorWebAuthnDeleteRequest();
+        request.id = 1;
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: true,
+          Keys: [{ Name: "Security Key", Id: 2, Migrated: true }], // Key with id:1 removed
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.deleteTwoFactorWebAuthn(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "DELETE",
+          "/two-factor/webauthn",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorWebAuthnResponse);
+        expect(result.keys).toHaveLength(1);
+        expect(result.keys[0].id).toBe(2);
+      });
+    });
+  });
+
+  describe("Recovery Code APIs", () => {
+    describe("getTwoFactorRecover", () => {
+      it("retrieves recovery code for regaining access when two-factor is unavailable", async () => {
+        const request = new SecretVerificationRequest();
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Code: "ABCD-EFGH-IJKL-MNOP-QRST-UVWX-YZ12",
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.getTwoFactorRecover(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "POST",
+          "/two-factor/get-recover",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorRecoverResponse);
+        expect(result.code).toBeDefined();
+        expect(result.code).toMatch(/^[A-Z0-9-]+$/);
+      });
+    });
+  });
+
+  describe("Disable APIs", () => {
+    describe("putTwoFactorDisable", () => {
+      it("disables specified two-factor provider for current user", async () => {
+        const request = new TwoFactorProviderRequest();
+        request.type = 0; // Authenticator
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: false,
+          Type: 0,
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.putTwoFactorDisable(request);
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "PUT",
+          "/two-factor/disable",
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorProviderResponse);
+        expect(result.enabled).toBe(false);
+        expect(result.type).toBe(0); // Authenticator
+      });
+    });
+
+    describe("putTwoFactorOrganizationDisable", () => {
+      it("disables two-factor provider for organization with policy management permissions", async () => {
+        const organizationId = "org-123";
+        const request = new TwoFactorProviderRequest();
+        request.type = 6; // Duo
+        request.masterPasswordHash = "master-password-hash";
+        const mockResponse = {
+          Enabled: false,
+          Type: 6,
+        };
+        apiService.send.mockResolvedValue(mockResponse);
+
+        const result = await twoFactorApiService.putTwoFactorOrganizationDisable(
+          organizationId,
+          request,
+        );
+
+        expect(apiService.send).toHaveBeenCalledWith(
+          "PUT",
+          `/organizations/${organizationId}/two-factor/disable`,
+          request,
+          true,
+          true,
+        );
+        expect(result).toBeInstanceOf(TwoFactorProviderResponse);
+        expect(result.enabled).toBe(false);
+        expect(result.type).toBe(6); // Duo
+      });
+    });
+  });
+});
diff --git a/libs/common/src/auth/two-factor/services/default-two-factor-api.service.ts b/libs/common/src/auth/two-factor/services/default-two-factor-api.service.ts
new file mode 100644
index 00000000000..b9778e460ea
--- /dev/null
+++ b/libs/common/src/auth/two-factor/services/default-two-factor-api.service.ts
@@ -0,0 +1,272 @@
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { DisableTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/disable-two-factor-authenticator.request";
+import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
+import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
+import { TwoFactorProviderRequest } from "@bitwarden/common/auth/models/request/two-factor-provider.request";
+import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/update-two-factor-authenticator.request";
+import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/auth/models/request/update-two-factor-duo.request";
+import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/update-two-factor-email.request";
+import { UpdateTwoFactorWebAuthnDeleteRequest } from "@bitwarden/common/auth/models/request/update-two-factor-web-authn-delete.request";
+import { UpdateTwoFactorWebAuthnRequest } from "@bitwarden/common/auth/models/request/update-two-factor-web-authn.request";
+import { UpdateTwoFactorYubikeyOtpRequest } from "@bitwarden/common/auth/models/request/update-two-factor-yubikey-otp.request";
+import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/auth/models/response/two-factor-authenticator.response";
+import { TwoFactorDuoResponse } from "@bitwarden/common/auth/models/response/two-factor-duo.response";
+import { TwoFactorEmailResponse } from "@bitwarden/common/auth/models/response/two-factor-email.response";
+import { TwoFactorProviderResponse } from "@bitwarden/common/auth/models/response/two-factor-provider.response";
+import { TwoFactorRecoverResponse } from "@bitwarden/common/auth/models/response/two-factor-recover.response";
+import {
+  TwoFactorWebAuthnResponse,
+  ChallengeResponse,
+} from "@bitwarden/common/auth/models/response/two-factor-web-authn.response";
+import { TwoFactorYubiKeyResponse } from "@bitwarden/common/auth/models/response/two-factor-yubi-key.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+
+import { TwoFactorApiService } from "../abstractions/two-factor-api.service";
+
+export class DefaultTwoFactorApiService implements TwoFactorApiService {
+  constructor(private apiService: ApiService) {}
+
+  // Providers
+
+  async getTwoFactorProviders(): Promise<ListResponse<TwoFactorProviderResponse>> {
+    const response = await this.apiService.send("GET", "/two-factor", null, true, true);
+    return new ListResponse(response, TwoFactorProviderResponse);
+  }
+
+  async getTwoFactorOrganizationProviders(
+    organizationId: string,
+  ): Promise<ListResponse<TwoFactorProviderResponse>> {
+    const response = await this.apiService.send(
+      "GET",
+      `/organizations/${organizationId}/two-factor`,
+      null,
+      true,
+      true,
+    );
+    return new ListResponse(response, TwoFactorProviderResponse);
+  }
+
+  // Authenticator (TOTP)
+
+  async getTwoFactorAuthenticator(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorAuthenticatorResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      "/two-factor/get-authenticator",
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorAuthenticatorResponse(response);
+  }
+
+  async putTwoFactorAuthenticator(
+    request: UpdateTwoFactorAuthenticatorRequest,
+  ): Promise<TwoFactorAuthenticatorResponse> {
+    const response = await this.apiService.send(
+      "PUT",
+      "/two-factor/authenticator",
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorAuthenticatorResponse(response);
+  }
+
+  async deleteTwoFactorAuthenticator(
+    request: DisableTwoFactorAuthenticatorRequest,
+  ): Promise<TwoFactorProviderResponse> {
+    const response = await this.apiService.send(
+      "DELETE",
+      "/two-factor/authenticator",
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorProviderResponse(response);
+  }
+
+  // Email
+
+  async getTwoFactorEmail(request: SecretVerificationRequest): Promise<TwoFactorEmailResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      "/two-factor/get-email",
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorEmailResponse(response);
+  }
+
+  async postTwoFactorEmailSetup(request: TwoFactorEmailRequest): Promise<any> {
+    return this.apiService.send("POST", "/two-factor/send-email", request, true, false);
+  }
+
+  async postTwoFactorEmail(request: TwoFactorEmailRequest): Promise<any> {
+    return this.apiService.send("POST", "/two-factor/send-email-login", request, false, false);
+  }
+
+  async putTwoFactorEmail(request: UpdateTwoFactorEmailRequest): Promise<TwoFactorEmailResponse> {
+    const response = await this.apiService.send("PUT", "/two-factor/email", request, true, true);
+    return new TwoFactorEmailResponse(response);
+  }
+
+  // Duo
+
+  async getTwoFactorDuo(request: SecretVerificationRequest): Promise<TwoFactorDuoResponse> {
+    const response = await this.apiService.send("POST", "/two-factor/get-duo", request, true, true);
+    return new TwoFactorDuoResponse(response);
+  }
+
+  async getTwoFactorOrganizationDuo(
+    organizationId: string,
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorDuoResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      `/organizations/${organizationId}/two-factor/get-duo`,
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorDuoResponse(response);
+  }
+
+  async putTwoFactorDuo(request: UpdateTwoFactorDuoRequest): Promise<TwoFactorDuoResponse> {
+    const response = await this.apiService.send("PUT", "/two-factor/duo", request, true, true);
+    return new TwoFactorDuoResponse(response);
+  }
+
+  async putTwoFactorOrganizationDuo(
+    organizationId: string,
+    request: UpdateTwoFactorDuoRequest,
+  ): Promise<TwoFactorDuoResponse> {
+    const response = await this.apiService.send(
+      "PUT",
+      `/organizations/${organizationId}/two-factor/duo`,
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorDuoResponse(response);
+  }
+
+  // YubiKey
+
+  async getTwoFactorYubiKey(request: SecretVerificationRequest): Promise<TwoFactorYubiKeyResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      "/two-factor/get-yubikey",
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorYubiKeyResponse(response);
+  }
+
+  async putTwoFactorYubiKey(
+    request: UpdateTwoFactorYubikeyOtpRequest,
+  ): Promise<TwoFactorYubiKeyResponse> {
+    const response = await this.apiService.send("PUT", "/two-factor/yubikey", request, true, true);
+    return new TwoFactorYubiKeyResponse(response);
+  }
+
+  // WebAuthn
+
+  async getTwoFactorWebAuthn(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorWebAuthnResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      "/two-factor/get-webauthn",
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorWebAuthnResponse(response);
+  }
+
+  async getTwoFactorWebAuthnChallenge(
+    request: SecretVerificationRequest,
+  ): Promise<ChallengeResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      "/two-factor/get-webauthn-challenge",
+      request,
+      true,
+      true,
+    );
+    return new ChallengeResponse(response);
+  }
+
+  async putTwoFactorWebAuthn(
+    request: UpdateTwoFactorWebAuthnRequest,
+  ): Promise<TwoFactorWebAuthnResponse> {
+    const deviceResponse = request.deviceResponse.response as AuthenticatorAttestationResponse;
+    const body: any = Object.assign({}, request);
+
+    body.deviceResponse = {
+      id: request.deviceResponse.id,
+      rawId: btoa(request.deviceResponse.id),
+      type: request.deviceResponse.type,
+      extensions: request.deviceResponse.getClientExtensionResults(),
+      response: {
+        AttestationObject: Utils.fromBufferToB64(deviceResponse.attestationObject),
+        clientDataJson: Utils.fromBufferToB64(deviceResponse.clientDataJSON),
+      },
+    };
+
+    const response = await this.apiService.send("PUT", "/two-factor/webauthn", body, true, true);
+    return new TwoFactorWebAuthnResponse(response);
+  }
+
+  async deleteTwoFactorWebAuthn(
+    request: UpdateTwoFactorWebAuthnDeleteRequest,
+  ): Promise<TwoFactorWebAuthnResponse> {
+    const response = await this.apiService.send(
+      "DELETE",
+      "/two-factor/webauthn",
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorWebAuthnResponse(response);
+  }
+
+  // Recovery Code
+
+  async getTwoFactorRecover(request: SecretVerificationRequest): Promise<TwoFactorRecoverResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      "/two-factor/get-recover",
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorRecoverResponse(response);
+  }
+
+  // Disable
+
+  async putTwoFactorDisable(request: TwoFactorProviderRequest): Promise<TwoFactorProviderResponse> {
+    const response = await this.apiService.send("PUT", "/two-factor/disable", request, true, true);
+    return new TwoFactorProviderResponse(response);
+  }
+
+  async putTwoFactorOrganizationDisable(
+    organizationId: string,
+    request: TwoFactorProviderRequest,
+  ): Promise<TwoFactorProviderResponse> {
+    const response = await this.apiService.send(
+      "PUT",
+      `/organizations/${organizationId}/two-factor/disable`,
+      request,
+      true,
+      true,
+    );
+    return new TwoFactorProviderResponse(response);
+  }
+}
diff --git a/libs/common/src/auth/two-factor/services/default-two-factor.service.ts b/libs/common/src/auth/two-factor/services/default-two-factor.service.ts
new file mode 100644
index 00000000000..2acc4a7e939
--- /dev/null
+++ b/libs/common/src/auth/two-factor/services/default-two-factor.service.ts
@@ -0,0 +1,279 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { firstValueFrom, map } from "rxjs";
+
+import { TwoFactorApiService } from "..";
+import { ListResponse } from "../../../models/response/list.response";
+import { I18nService } from "../../../platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
+import { Utils } from "../../../platform/misc/utils";
+import { GlobalStateProvider } from "../../../platform/state";
+import { TwoFactorProviderType } from "../../enums/two-factor-provider-type";
+import { DisableTwoFactorAuthenticatorRequest } from "../../models/request/disable-two-factor-authenticator.request";
+import { SecretVerificationRequest } from "../../models/request/secret-verification.request";
+import { TwoFactorEmailRequest } from "../../models/request/two-factor-email.request";
+import { TwoFactorProviderRequest } from "../../models/request/two-factor-provider.request";
+import { UpdateTwoFactorAuthenticatorRequest } from "../../models/request/update-two-factor-authenticator.request";
+import { UpdateTwoFactorDuoRequest } from "../../models/request/update-two-factor-duo.request";
+import { UpdateTwoFactorEmailRequest } from "../../models/request/update-two-factor-email.request";
+import { UpdateTwoFactorWebAuthnDeleteRequest } from "../../models/request/update-two-factor-web-authn-delete.request";
+import { UpdateTwoFactorWebAuthnRequest } from "../../models/request/update-two-factor-web-authn.request";
+import { UpdateTwoFactorYubikeyOtpRequest } from "../../models/request/update-two-factor-yubikey-otp.request";
+import { IdentityTwoFactorResponse } from "../../models/response/identity-two-factor.response";
+import { TwoFactorAuthenticatorResponse } from "../../models/response/two-factor-authenticator.response";
+import { TwoFactorDuoResponse } from "../../models/response/two-factor-duo.response";
+import { TwoFactorEmailResponse } from "../../models/response/two-factor-email.response";
+import { TwoFactorProviderResponse } from "../../models/response/two-factor-provider.response";
+import { TwoFactorRecoverResponse } from "../../models/response/two-factor-recover.response";
+import {
+  TwoFactorWebAuthnResponse,
+  ChallengeResponse,
+} from "../../models/response/two-factor-web-authn.response";
+import { TwoFactorYubiKeyResponse } from "../../models/response/two-factor-yubi-key.response";
+import {
+  PROVIDERS,
+  SELECTED_PROVIDER,
+  TwoFactorProviderDetails,
+  TwoFactorProviders,
+  TwoFactorService as TwoFactorServiceAbstraction,
+} from "../abstractions/two-factor.service";
+
+export class DefaultTwoFactorService implements TwoFactorServiceAbstraction {
+  private providersState = this.globalStateProvider.get(PROVIDERS);
+  private selectedState = this.globalStateProvider.get(SELECTED_PROVIDER);
+  readonly providers$ = this.providersState.state$.pipe(
+    map((providers) => Utils.recordToMap(providers)),
+  );
+  readonly selected$ = this.selectedState.state$;
+
+  constructor(
+    private i18nService: I18nService,
+    private platformUtilsService: PlatformUtilsService,
+    private globalStateProvider: GlobalStateProvider,
+    private twoFactorApiService: TwoFactorApiService,
+  ) {}
+
+  init() {
+    TwoFactorProviders[TwoFactorProviderType.Email].name = this.i18nService.t("emailTitle");
+    TwoFactorProviders[TwoFactorProviderType.Email].description = this.i18nService.t("emailDescV2");
+
+    TwoFactorProviders[TwoFactorProviderType.Authenticator].name =
+      this.i18nService.t("authenticatorAppTitle");
+    TwoFactorProviders[TwoFactorProviderType.Authenticator].description =
+      this.i18nService.t("authenticatorAppDescV2");
+
+    TwoFactorProviders[TwoFactorProviderType.Duo].description = this.i18nService.t("duoDescV2");
+
+    TwoFactorProviders[TwoFactorProviderType.OrganizationDuo].name =
+      "Duo (" + this.i18nService.t("organization") + ")";
+    TwoFactorProviders[TwoFactorProviderType.OrganizationDuo].description =
+      this.i18nService.t("duoOrganizationDesc");
+
+    TwoFactorProviders[TwoFactorProviderType.WebAuthn].name = this.i18nService.t("webAuthnTitle");
+    TwoFactorProviders[TwoFactorProviderType.WebAuthn].description =
+      this.i18nService.t("webAuthnDesc");
+
+    TwoFactorProviders[TwoFactorProviderType.Yubikey].name = this.i18nService.t("yubiKeyTitleV2");
+    TwoFactorProviders[TwoFactorProviderType.Yubikey].description =
+      this.i18nService.t("yubiKeyDesc");
+  }
+
+  async getSupportedProviders(win: Window): Promise<TwoFactorProviderDetails[]> {
+    const data = await firstValueFrom(this.providers$);
+    const providers: any[] = [];
+    if (data == null) {
+      return providers;
+    }
+
+    if (
+      data.has(TwoFactorProviderType.OrganizationDuo) &&
+      this.platformUtilsService.supportsDuo()
+    ) {
+      providers.push(TwoFactorProviders[TwoFactorProviderType.OrganizationDuo]);
+    }
+
+    if (data.has(TwoFactorProviderType.Authenticator)) {
+      providers.push(TwoFactorProviders[TwoFactorProviderType.Authenticator]);
+    }
+
+    if (data.has(TwoFactorProviderType.Yubikey)) {
+      providers.push(TwoFactorProviders[TwoFactorProviderType.Yubikey]);
+    }
+
+    if (data.has(TwoFactorProviderType.Duo) && this.platformUtilsService.supportsDuo()) {
+      providers.push(TwoFactorProviders[TwoFactorProviderType.Duo]);
+    }
+
+    if (
+      data.has(TwoFactorProviderType.WebAuthn) &&
+      this.platformUtilsService.supportsWebAuthn(win)
+    ) {
+      providers.push(TwoFactorProviders[TwoFactorProviderType.WebAuthn]);
+    }
+
+    if (data.has(TwoFactorProviderType.Email)) {
+      providers.push(TwoFactorProviders[TwoFactorProviderType.Email]);
+    }
+
+    return providers;
+  }
+
+  async getDefaultProvider(webAuthnSupported: boolean): Promise<TwoFactorProviderType> {
+    const data = await firstValueFrom(this.providers$);
+    const selected = await firstValueFrom(this.selected$);
+    if (data == null) {
+      return null;
+    }
+
+    if (selected != null && data.has(selected)) {
+      return selected;
+    }
+
+    let providerType: TwoFactorProviderType = null;
+    let providerPriority = -1;
+    data.forEach((_value, type) => {
+      const provider = (TwoFactorProviders as any)[type];
+      if (provider != null && provider.priority > providerPriority) {
+        if (type === TwoFactorProviderType.WebAuthn && !webAuthnSupported) {
+          return;
+        }
+
+        providerType = type;
+        providerPriority = provider.priority;
+      }
+    });
+
+    return providerType;
+  }
+
+  async setSelectedProvider(type: TwoFactorProviderType): Promise<void> {
+    await this.selectedState.update(() => type);
+  }
+
+  async clearSelectedProvider(): Promise<void> {
+    await this.selectedState.update(() => null);
+  }
+
+  async setProviders(response: IdentityTwoFactorResponse): Promise<void> {
+    await this.providersState.update(() => response.twoFactorProviders2);
+  }
+
+  async clearProviders(): Promise<void> {
+    await this.providersState.update(() => null);
+  }
+
+  getProviders(): Promise<Map<TwoFactorProviderType, { [key: string]: string }> | null> {
+    return firstValueFrom(this.providers$);
+  }
+
+  getEnabledTwoFactorProviders(): Promise<ListResponse<TwoFactorProviderResponse>> {
+    return this.twoFactorApiService.getTwoFactorProviders();
+  }
+
+  getTwoFactorOrganizationProviders(
+    organizationId: string,
+  ): Promise<ListResponse<TwoFactorProviderResponse>> {
+    return this.twoFactorApiService.getTwoFactorOrganizationProviders(organizationId);
+  }
+
+  getTwoFactorAuthenticator(
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorAuthenticatorResponse> {
+    return this.twoFactorApiService.getTwoFactorAuthenticator(request);
+  }
+
+  getTwoFactorEmail(request: SecretVerificationRequest): Promise<TwoFactorEmailResponse> {
+    return this.twoFactorApiService.getTwoFactorEmail(request);
+  }
+
+  getTwoFactorDuo(request: SecretVerificationRequest): Promise<TwoFactorDuoResponse> {
+    return this.twoFactorApiService.getTwoFactorDuo(request);
+  }
+
+  getTwoFactorOrganizationDuo(
+    organizationId: string,
+    request: SecretVerificationRequest,
+  ): Promise<TwoFactorDuoResponse> {
+    return this.twoFactorApiService.getTwoFactorOrganizationDuo(organizationId, request);
+  }
+
+  getTwoFactorYubiKey(request: SecretVerificationRequest): Promise<TwoFactorYubiKeyResponse> {
+    return this.twoFactorApiService.getTwoFactorYubiKey(request);
+  }
+
+  getTwoFactorWebAuthn(request: SecretVerificationRequest): Promise<TwoFactorWebAuthnResponse> {
+    return this.twoFactorApiService.getTwoFactorWebAuthn(request);
+  }
+
+  getTwoFactorWebAuthnChallenge(request: SecretVerificationRequest): Promise<ChallengeResponse> {
+    return this.twoFactorApiService.getTwoFactorWebAuthnChallenge(request);
+  }
+
+  getTwoFactorRecover(request: SecretVerificationRequest): Promise<TwoFactorRecoverResponse> {
+    return this.twoFactorApiService.getTwoFactorRecover(request);
+  }
+
+  putTwoFactorAuthenticator(
+    request: UpdateTwoFactorAuthenticatorRequest,
+  ): Promise<TwoFactorAuthenticatorResponse> {
+    return this.twoFactorApiService.putTwoFactorAuthenticator(request);
+  }
+
+  deleteTwoFactorAuthenticator(
+    request: DisableTwoFactorAuthenticatorRequest,
+  ): Promise<TwoFactorProviderResponse> {
+    return this.twoFactorApiService.deleteTwoFactorAuthenticator(request);
+  }
+
+  putTwoFactorEmail(request: UpdateTwoFactorEmailRequest): Promise<TwoFactorEmailResponse> {
+    return this.twoFactorApiService.putTwoFactorEmail(request);
+  }
+
+  putTwoFactorDuo(request: UpdateTwoFactorDuoRequest): Promise<TwoFactorDuoResponse> {
+    return this.twoFactorApiService.putTwoFactorDuo(request);
+  }
+
+  putTwoFactorOrganizationDuo(
+    organizationId: string,
+    request: UpdateTwoFactorDuoRequest,
+  ): Promise<TwoFactorDuoResponse> {
+    return this.twoFactorApiService.putTwoFactorOrganizationDuo(organizationId, request);
+  }
+
+  putTwoFactorYubiKey(
+    request: UpdateTwoFactorYubikeyOtpRequest,
+  ): Promise<TwoFactorYubiKeyResponse> {
+    return this.twoFactorApiService.putTwoFactorYubiKey(request);
+  }
+
+  putTwoFactorWebAuthn(
+    request: UpdateTwoFactorWebAuthnRequest,
+  ): Promise<TwoFactorWebAuthnResponse> {
+    return this.twoFactorApiService.putTwoFactorWebAuthn(request);
+  }
+
+  deleteTwoFactorWebAuthn(
+    request: UpdateTwoFactorWebAuthnDeleteRequest,
+  ): Promise<TwoFactorWebAuthnResponse> {
+    return this.twoFactorApiService.deleteTwoFactorWebAuthn(request);
+  }
+
+  putTwoFactorDisable(request: TwoFactorProviderRequest): Promise<TwoFactorProviderResponse> {
+    return this.twoFactorApiService.putTwoFactorDisable(request);
+  }
+
+  putTwoFactorOrganizationDisable(
+    organizationId: string,
+    request: TwoFactorProviderRequest,
+  ): Promise<TwoFactorProviderResponse> {
+    return this.twoFactorApiService.putTwoFactorOrganizationDisable(organizationId, request);
+  }
+
+  postTwoFactorEmailSetup(request: TwoFactorEmailRequest): Promise<any> {
+    return this.twoFactorApiService.postTwoFactorEmailSetup(request);
+  }
+
+  postTwoFactorEmail(request: TwoFactorEmailRequest): Promise<any> {
+    return this.twoFactorApiService.postTwoFactorEmail(request);
+  }
+}
diff --git a/libs/common/src/auth/two-factor/services/index.ts b/libs/common/src/auth/two-factor/services/index.ts
new file mode 100644
index 00000000000..283f7b34631
--- /dev/null
+++ b/libs/common/src/auth/two-factor/services/index.ts
@@ -0,0 +1,2 @@
+export * from "./default-two-factor-api.service";
+export * from "./default-two-factor.service";
diff --git a/libs/common/src/auth/types/verification.ts b/libs/common/src/auth/types/verification.ts
index 4f45a6fdeed..5c5e9acb0f8 100644
--- a/libs/common/src/auth/types/verification.ts
+++ b/libs/common/src/auth/types/verification.ts
@@ -1,13 +1,13 @@
-// 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 { KdfConfig } from "@bitwarden/key-management";
-
 import { MasterKey } from "../../types/key";
 import { VerificationType } from "../enums/verification-type";
 import { MasterPasswordPolicyResponse } from "../models/response/master-password-policy.response";
 
 export type OtpVerification = { type: VerificationType.OTP; secret: string };
-export type MasterPasswordVerification = { type: VerificationType.MasterPassword; secret: string };
+export type MasterPasswordVerification = {
+  type: VerificationType.MasterPassword;
+  /** Secret here means the master password, *NOT* a hash of it */
+  secret: string;
+};
 export type PinVerification = { type: VerificationType.PIN; secret: string };
 export type BiometricsVerification = { type: VerificationType.Biometrics };
 
@@ -25,8 +25,8 @@ export function verificationHasSecret(
 export type ServerSideVerification = OtpVerification | MasterPasswordVerification;
 
 export type MasterPasswordVerificationResponse = {
+  /** @deprecated */
   masterKey: MasterKey;
-  kdfConfig: KdfConfig;
   email: string;
   policyOptions: MasterPasswordPolicyResponse | null;
 };
diff --git a/libs/common/src/autofill/services/autofill-settings.service.ts b/libs/common/src/autofill/services/autofill-settings.service.ts
index c56f852d3de..f39c6e8de30 100644
--- a/libs/common/src/autofill/services/autofill-settings.service.ts
+++ b/libs/common/src/autofill/services/autofill-settings.service.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { combineLatest, map, Observable, startWith, switchMap } from "rxjs";
+import { combineLatest, map, Observable, switchMap } from "rxjs";
 
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
@@ -205,7 +205,7 @@ export class AutofillSettingsService implements AutofillSettingsServiceAbstracti
     this.showInlineMenuCardsState = this.stateProvider.getActive(SHOW_INLINE_MENU_CARDS);
     this.showInlineMenuCards$ = combineLatest([
       this.showInlineMenuCardsState.state$.pipe(map((x) => x ?? true)),
-      this.restrictedItemTypesService.restricted$.pipe(startWith([])),
+      this.restrictedItemTypesService.restricted$,
     ]).pipe(
       map(
         ([enabled, restrictions]) =>
diff --git a/libs/common/src/autofill/services/domain-settings.service.spec.ts b/libs/common/src/autofill/services/domain-settings.service.spec.ts
index 12a34b70913..53cf72d8e73 100644
--- a/libs/common/src/autofill/services/domain-settings.service.spec.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.spec.ts
@@ -1,5 +1,8 @@
+import { mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+
 import { FakeStateProvider, FakeAccountService, mockAccountServiceWith } from "../../../spec";
 import { Utils } from "../../platform/misc/utils";
 import { UserId } from "../../types/guid";
@@ -10,6 +13,7 @@ describe("DefaultDomainSettingsService", () => {
   let domainSettingsService: DomainSettingsService;
   const mockUserId = Utils.newGuid() as UserId;
   const accountService: FakeAccountService = mockAccountServiceWith(mockUserId);
+  const policyService = mock<PolicyService>();
   const fakeStateProvider: FakeStateProvider = new FakeStateProvider(accountService);
 
   const mockEquivalentDomains = [
@@ -19,7 +23,11 @@ describe("DefaultDomainSettingsService", () => {
   ];
 
   beforeEach(() => {
-    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);
+    domainSettingsService = new DefaultDomainSettingsService(
+      fakeStateProvider,
+      policyService,
+      accountService,
+    );
 
     jest.spyOn(domainSettingsService, "getUrlEquivalentDomains");
     domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
diff --git a/libs/common/src/autofill/services/domain-settings.service.ts b/libs/common/src/autofill/services/domain-settings.service.ts
index bc86f9b4d64..fa7a37ba732 100644
--- a/libs/common/src/autofill/services/domain-settings.service.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.ts
@@ -1,6 +1,12 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { map, Observable } from "rxjs";
+import { combineLatest, map, Observable, switchMap, shareReplay } from "rxjs";
+
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type.enum";
+import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/default-policy.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 
 import {
   NeverDomains,
@@ -87,6 +93,18 @@ export abstract class DomainSettingsService {
   defaultUriMatchStrategy$: Observable<UriMatchStrategySetting>;
   setDefaultUriMatchStrategy: (newValue: UriMatchStrategySetting) => Promise<void>;
 
+  /**
+   * Org policy value for default for URI-matching
+   * strategies. Can be overridden by cipher-specific settings.
+   */
+  defaultUriMatchStrategyPolicy$: Observable<UriMatchStrategySetting>;
+
+  /**
+   * Resolved (concerning user setting, org policy, etc) default for URI-matching
+   * strategies. Can be overridden by cipher-specific settings.
+   */
+  resolvedDefaultUriMatchStrategy$: Observable<UriMatchStrategySetting>;
+
   /**
    * Helper function for the common resolution of a given URL against equivalent domains
    */
@@ -109,7 +127,15 @@ export class DefaultDomainSettingsService implements DomainSettingsService {
   private defaultUriMatchStrategyState: ActiveUserState<UriMatchStrategySetting>;
   readonly defaultUriMatchStrategy$: Observable<UriMatchStrategySetting>;
 
-  constructor(private stateProvider: StateProvider) {
+  readonly defaultUriMatchStrategyPolicy$: Observable<UriMatchStrategySetting>;
+
+  readonly resolvedDefaultUriMatchStrategy$: Observable<UriMatchStrategySetting>;
+
+  constructor(
+    private stateProvider: StateProvider,
+    private policyService: PolicyService,
+    private accountService: AccountService,
+  ) {
     this.showFaviconsState = this.stateProvider.getGlobal(SHOW_FAVICONS);
     this.showFavicons$ = this.showFaviconsState.state$.pipe(map((x) => x ?? true));
 
@@ -129,6 +155,31 @@ export class DefaultDomainSettingsService implements DomainSettingsService {
     this.defaultUriMatchStrategy$ = this.defaultUriMatchStrategyState.state$.pipe(
       map((x) => x ?? UriMatchStrategy.Domain),
     );
+
+    this.defaultUriMatchStrategyPolicy$ = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) =>
+        this.policyService.policiesByType$(PolicyType.UriMatchDefaults, userId),
+      ),
+      getFirstPolicy,
+      map((policy) => {
+        if (!policy?.enabled || policy?.data == null) {
+          return null;
+        }
+        const data = policy.data?.uriMatchDetection;
+        // Validate that data is a valid UriMatchStrategy value
+        return Object.values(UriMatchStrategy).includes(data) ? data : null;
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+
+    this.resolvedDefaultUriMatchStrategy$ = combineLatest([
+      this.defaultUriMatchStrategy$,
+      this.defaultUriMatchStrategyPolicy$,
+    ]).pipe(
+      map(([userSettingValue, policySettingValue]) => policySettingValue || userSettingValue),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
   }
 
   async setShowFavicons(newValue: boolean): Promise<void> {
diff --git a/libs/common/src/billing/abstractions/billing-api.service.abstraction.ts b/libs/common/src/billing/abstractions/billing-api.service.abstraction.ts
index 2f3fe9125db..dcb395ef85c 100644
--- a/libs/common/src/billing/abstractions/billing-api.service.abstraction.ts
+++ b/libs/common/src/billing/abstractions/billing-api.service.abstraction.ts
@@ -1,19 +1,12 @@
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
+import { PremiumPlanResponse } from "@bitwarden/common/billing/models/response/premium-plan.response";
 
 import { OrganizationCreateRequest } from "../../admin-console/models/request/organization-create.request";
-import { ProviderOrganizationOrganizationDetailsResponse } from "../../admin-console/models/response/provider/provider-organization.response";
 import { SubscriptionCancellationRequest } from "../../billing/models/request/subscription-cancellation.request";
 import { OrganizationBillingMetadataResponse } from "../../billing/models/response/organization-billing-metadata.response";
 import { PlanResponse } from "../../billing/models/response/plan.response";
 import { ListResponse } from "../../models/response/list.response";
-import { PaymentMethodType } from "../enums";
-import { CreateClientOrganizationRequest } from "../models/request/create-client-organization.request";
-import { ExpandedTaxInfoUpdateRequest } from "../models/request/expanded-tax-info-update.request";
-import { UpdateClientOrganizationRequest } from "../models/request/update-client-organization.request";
-import { UpdatePaymentMethodRequest } from "../models/request/update-payment-method.request";
-import { VerifyBankAccountRequest } from "../models/request/verify-bank-account.request";
+import { OrganizationId } from "../../types/guid";
 import { InvoicesResponse } from "../models/response/invoices.response";
-import { PaymentMethodResponse } from "../models/response/payment-method.response";
 import { ProviderSubscriptionResponse } from "../models/response/provider-subscription-response";
 
 export abstract class BillingApiServiceAbstraction {
@@ -24,69 +17,28 @@ export abstract class BillingApiServiceAbstraction {
 
   abstract cancelPremiumUserSubscription(request: SubscriptionCancellationRequest): Promise<void>;
 
-  abstract createProviderClientOrganization(
-    providerId: string,
-    request: CreateClientOrganizationRequest,
-  ): Promise<void>;
-
-  abstract createSetupIntent(paymentMethodType: PaymentMethodType): Promise<string>;
-
   abstract getOrganizationBillingMetadata(
-    organizationId: string,
+    organizationId: OrganizationId,
   ): Promise<OrganizationBillingMetadataResponse>;
 
-  abstract getOrganizationPaymentMethod(organizationId: string): Promise<PaymentMethodResponse>;
+  abstract getOrganizationBillingMetadataVNext(
+    organizationId: OrganizationId,
+  ): Promise<OrganizationBillingMetadataResponse>;
+
+  abstract getOrganizationBillingMetadataVNextSelfHost(
+    organizationId: OrganizationId,
+  ): Promise<OrganizationBillingMetadataResponse>;
 
   abstract getPlans(): Promise<ListResponse<PlanResponse>>;
 
-  abstract getProviderClientInvoiceReport(providerId: string, invoiceId: string): Promise<string>;
+  abstract getPremiumPlan(): Promise<PremiumPlanResponse>;
 
-  abstract getProviderClientOrganizations(
-    providerId: string,
-  ): Promise<ListResponse<ProviderOrganizationOrganizationDetailsResponse>>;
+  abstract getProviderClientInvoiceReport(providerId: string, invoiceId: string): Promise<string>;
 
   abstract getProviderInvoices(providerId: string): Promise<InvoicesResponse>;
 
   abstract getProviderSubscription(providerId: string): Promise<ProviderSubscriptionResponse>;
 
-  abstract getProviderTaxInformation(providerId: string): Promise<TaxInfoResponse>;
-
-  abstract updateOrganizationPaymentMethod(
-    organizationId: string,
-    request: UpdatePaymentMethodRequest,
-  ): Promise<void>;
-
-  abstract updateOrganizationTaxInformation(
-    organizationId: string,
-    request: ExpandedTaxInfoUpdateRequest,
-  ): Promise<void>;
-
-  abstract updateProviderClientOrganization(
-    providerId: string,
-    organizationId: string,
-    request: UpdateClientOrganizationRequest,
-  ): Promise<any>;
-
-  abstract updateProviderPaymentMethod(
-    providerId: string,
-    request: UpdatePaymentMethodRequest,
-  ): Promise<void>;
-
-  abstract updateProviderTaxInformation(
-    providerId: string,
-    request: ExpandedTaxInfoUpdateRequest,
-  ): Promise<void>;
-
-  abstract verifyOrganizationBankAccount(
-    organizationId: string,
-    request: VerifyBankAccountRequest,
-  ): Promise<void>;
-
-  abstract verifyProviderBankAccount(
-    providerId: string,
-    request: VerifyBankAccountRequest,
-  ): Promise<void>;
-
   abstract restartSubscription(
     organizationId: string,
     request: OrganizationCreateRequest,
diff --git a/libs/common/src/billing/abstractions/organization-billing.service.ts b/libs/common/src/billing/abstractions/organization-billing.service.ts
index 3254787457a..215fabfd955 100644
--- a/libs/common/src/billing/abstractions/organization-billing.service.ts
+++ b/libs/common/src/billing/abstractions/organization-billing.service.ts
@@ -3,7 +3,6 @@ import { UserId } from "@bitwarden/user-core";
 import { OrganizationResponse } from "../../admin-console/models/response/organization.response";
 import { InitiationPath } from "../../models/request/reference-event.request";
 import { PaymentMethodType, PlanType } from "../enums";
-import { PaymentSourceResponse } from "../models/response/payment-source.response";
 
 export type OrganizationInformation = {
   name: string;
@@ -45,8 +44,6 @@ export type SubscriptionInformation = {
 };
 
 export abstract class OrganizationBillingServiceAbstraction {
-  abstract getPaymentSource(organizationId: string): Promise<PaymentSourceResponse>;
-
   abstract purchaseSubscription(
     subscription: SubscriptionInformation,
     activeUserId: UserId,
diff --git a/libs/common/src/billing/abstractions/organization-metadata.service.abstraction.ts b/libs/common/src/billing/abstractions/organization-metadata.service.abstraction.ts
new file mode 100644
index 00000000000..c16d4112273
--- /dev/null
+++ b/libs/common/src/billing/abstractions/organization-metadata.service.abstraction.ts
@@ -0,0 +1,12 @@
+import { Observable } from "rxjs";
+
+import { OrganizationId } from "../../types/guid";
+import { OrganizationBillingMetadataResponse } from "../models/response/organization-billing-metadata.response";
+
+export abstract class OrganizationMetadataServiceAbstraction {
+  abstract getOrganizationMetadata$(
+    organizationId: OrganizationId,
+  ): Observable<OrganizationBillingMetadataResponse>;
+
+  abstract refreshMetadataCache(): void;
+}
diff --git a/libs/common/src/billing/abstractions/subscription-pricing.service.abstraction.ts b/libs/common/src/billing/abstractions/subscription-pricing.service.abstraction.ts
new file mode 100644
index 00000000000..f3928c0e2e7
--- /dev/null
+++ b/libs/common/src/billing/abstractions/subscription-pricing.service.abstraction.ts
@@ -0,0 +1,32 @@
+import { Observable } from "rxjs";
+
+import {
+  BusinessSubscriptionPricingTier,
+  PersonalSubscriptionPricingTier,
+} from "../types/subscription-pricing-tier";
+
+export abstract class SubscriptionPricingServiceAbstraction {
+  /**
+   * Gets personal subscription pricing tiers (Premium and Families).
+   * Throws any errors that occur during api request so callers must handle errors.
+   * @returns An observable of an array of personal subscription pricing tiers.
+   * @throws Error if any errors occur during api request.
+   */
+  abstract getPersonalSubscriptionPricingTiers$(): Observable<PersonalSubscriptionPricingTier[]>;
+
+  /**
+   * Gets business subscription pricing tiers (Teams, Enterprise, and Custom).
+   * Throws any errors that occur during api request so callers must handle errors.
+   * @returns An observable of an array of business subscription pricing tiers.
+   * @throws Error if any errors occur during api request.
+   */
+  abstract getBusinessSubscriptionPricingTiers$(): Observable<BusinessSubscriptionPricingTier[]>;
+
+  /**
+   * Gets developer subscription pricing tiers (Free, Teams, and Enterprise).
+   * Throws any errors that occur during api request so callers must handle errors.
+   * @returns An observable of an array of business subscription pricing tiers for developers.
+   * @throws Error if any errors occur during api request.
+   */
+  abstract getDeveloperSubscriptionPricingTiers$(): Observable<BusinessSubscriptionPricingTier[]>;
+}
diff --git a/libs/common/src/billing/abstractions/tax.service.abstraction.ts b/libs/common/src/billing/abstractions/tax.service.abstraction.ts
deleted file mode 100644
index c94fbcba652..00000000000
--- a/libs/common/src/billing/abstractions/tax.service.abstraction.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { CountryListItem } from "../models/domain";
-import { PreviewIndividualInvoiceRequest } from "../models/request/preview-individual-invoice.request";
-import { PreviewOrganizationInvoiceRequest } from "../models/request/preview-organization-invoice.request";
-import { PreviewTaxAmountForOrganizationTrialRequest } from "../models/request/tax";
-import { PreviewInvoiceResponse } from "../models/response/preview-invoice.response";
-
-export abstract class TaxServiceAbstraction {
-  abstract getCountries(): CountryListItem[];
-
-  abstract isCountrySupported(country: string): Promise<boolean>;
-
-  abstract previewIndividualInvoice(
-    request: PreviewIndividualInvoiceRequest,
-  ): Promise<PreviewInvoiceResponse>;
-
-  abstract previewOrganizationInvoice(
-    request: PreviewOrganizationInvoiceRequest,
-  ): Promise<PreviewInvoiceResponse>;
-
-  abstract previewTaxAmountForOrganizationTrial: (
-    request: PreviewTaxAmountForOrganizationTrialRequest,
-  ) => Promise<number>;
-}
diff --git a/libs/common/src/billing/enums/index.ts b/libs/common/src/billing/enums/index.ts
index 1a9f3f8219c..ee8cd1f5948 100644
--- a/libs/common/src/billing/enums/index.ts
+++ b/libs/common/src/billing/enums/index.ts
@@ -2,7 +2,6 @@ export * from "./payment-method-type.enum";
 export * from "./plan-sponsorship-type.enum";
 export * from "./plan-type.enum";
 export * from "./transaction-type.enum";
-export * from "./bitwarden-product-type.enum";
 export * from "./product-tier-type.enum";
 export * from "./product-type.enum";
 export * from "./plan-interval.enum";
diff --git a/libs/common/src/billing/enums/plan-type.enum.ts b/libs/common/src/billing/enums/plan-type.enum.ts
index 5c356ce42fe..60d62f88700 100644
--- a/libs/common/src/billing/enums/plan-type.enum.ts
+++ b/libs/common/src/billing/enums/plan-type.enum.ts
@@ -8,7 +8,7 @@ export enum PlanType {
   EnterpriseMonthly2019 = 4,
   EnterpriseAnnually2019 = 5,
   Custom = 6,
-  FamiliesAnnually = 7,
+  FamiliesAnnually2025 = 7,
   TeamsMonthly2020 = 8,
   TeamsAnnually2020 = 9,
   EnterpriseMonthly2020 = 10,
@@ -23,4 +23,5 @@ export enum PlanType {
   EnterpriseMonthly = 19,
   EnterpriseAnnually = 20,
   TeamsStarter = 21,
+  FamiliesAnnually = 22,
 }
diff --git a/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts b/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
deleted file mode 100644
index 83b254ac512..00000000000
--- a/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { TaxInformation } from "../domain/tax-information";
-
-import { TaxInfoUpdateRequest } from "./tax-info-update.request";
-
-export class ExpandedTaxInfoUpdateRequest extends TaxInfoUpdateRequest {
-  taxId: string;
-  line1: string;
-  line2: string;
-  city: string;
-  state: string;
-
-  static From(taxInformation: TaxInformation): ExpandedTaxInfoUpdateRequest {
-    if (!taxInformation) {
-      return null;
-    }
-
-    const request = new ExpandedTaxInfoUpdateRequest();
-    request.country = taxInformation.country;
-    request.postalCode = taxInformation.postalCode;
-    request.taxId = taxInformation.taxId;
-    request.line1 = taxInformation.line1;
-    request.line2 = taxInformation.line2;
-    request.city = taxInformation.city;
-    request.state = taxInformation.state;
-    return request;
-  }
-}
diff --git a/libs/common/src/billing/models/request/payment.request.ts b/libs/common/src/billing/models/request/payment.request.ts
deleted file mode 100644
index e2edd9aabb3..00000000000
--- a/libs/common/src/billing/models/request/payment.request.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { PaymentMethodType } from "../../enums";
-
-import { ExpandedTaxInfoUpdateRequest } from "./expanded-tax-info-update.request";
-
-export class PaymentRequest extends ExpandedTaxInfoUpdateRequest {
-  paymentMethodType: PaymentMethodType;
-  paymentToken: string;
-}
diff --git a/libs/common/src/billing/models/request/preview-individual-invoice.request.ts b/libs/common/src/billing/models/request/preview-individual-invoice.request.ts
deleted file mode 100644
index f817398c629..00000000000
--- a/libs/common/src/billing/models/request/preview-individual-invoice.request.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// @ts-strict-ignore
-export class PreviewIndividualInvoiceRequest {
-  passwordManager: PasswordManager;
-  taxInformation: TaxInformation;
-
-  constructor(passwordManager: PasswordManager, taxInformation: TaxInformation) {
-    this.passwordManager = passwordManager;
-    this.taxInformation = taxInformation;
-  }
-}
-
-class PasswordManager {
-  additionalStorage: number;
-
-  constructor(additionalStorage: number) {
-    this.additionalStorage = additionalStorage;
-  }
-}
-
-class TaxInformation {
-  postalCode: string;
-  country: string;
-
-  constructor(postalCode: string, country: string) {
-    this.postalCode = postalCode;
-    this.country = country;
-  }
-}
diff --git a/libs/common/src/billing/models/request/preview-organization-invoice.request.ts b/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
deleted file mode 100644
index bfeecb4eb23..00000000000
--- a/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { PlanSponsorshipType, PlanType } from "../../enums";
-
-export class PreviewOrganizationInvoiceRequest {
-  organizationId?: string;
-  passwordManager: PasswordManager;
-  secretsManager?: SecretsManager;
-  taxInformation: TaxInformation;
-
-  constructor(
-    passwordManager: PasswordManager,
-    taxInformation: TaxInformation,
-    organizationId?: string,
-    secretsManager?: SecretsManager,
-  ) {
-    this.organizationId = organizationId;
-    this.passwordManager = passwordManager;
-    this.secretsManager = secretsManager;
-    this.taxInformation = taxInformation;
-  }
-}
-
-class PasswordManager {
-  plan: PlanType;
-  sponsoredPlan?: PlanSponsorshipType;
-  seats: number;
-  additionalStorage: number;
-
-  constructor(plan: PlanType, seats: number, additionalStorage: number) {
-    this.plan = plan;
-    this.seats = seats;
-    this.additionalStorage = additionalStorage;
-  }
-}
-
-class SecretsManager {
-  seats: number;
-  additionalMachineAccounts: number;
-
-  constructor(seats: number, additionalMachineAccounts: number) {
-    this.seats = seats;
-    this.additionalMachineAccounts = additionalMachineAccounts;
-  }
-}
-
-class TaxInformation {
-  postalCode: string;
-  country: string;
-  taxId: string;
-
-  constructor(postalCode: string, country: string, taxId: string) {
-    this.postalCode = postalCode;
-    this.country = country;
-    this.taxId = taxId;
-  }
-}
diff --git a/libs/common/src/billing/models/request/tax-info-update.request.ts b/libs/common/src/billing/models/request/tax-info-update.request.ts
deleted file mode 100644
index 6f767535472..00000000000
--- a/libs/common/src/billing/models/request/tax-info-update.request.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-export class TaxInfoUpdateRequest {
-  country: string;
-  postalCode: string;
-}
diff --git a/libs/common/src/billing/models/request/tax/index.ts b/libs/common/src/billing/models/request/tax/index.ts
deleted file mode 100644
index cda1930c614..00000000000
--- a/libs/common/src/billing/models/request/tax/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./preview-tax-amount-for-organization-trial.request";
diff --git a/libs/common/src/billing/models/request/tax/preview-tax-amount-for-organization-trial.request.ts b/libs/common/src/billing/models/request/tax/preview-tax-amount-for-organization-trial.request.ts
deleted file mode 100644
index 3f366335a47..00000000000
--- a/libs/common/src/billing/models/request/tax/preview-tax-amount-for-organization-trial.request.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { PlanType, ProductType } from "../../../enums";
-
-export type PreviewTaxAmountForOrganizationTrialRequest = {
-  planType: PlanType;
-  productType: ProductType;
-  taxInformation: {
-    country: string;
-    postalCode: string;
-    taxId?: string;
-  };
-};
diff --git a/libs/common/src/billing/models/request/tokenized-payment-source.request.ts b/libs/common/src/billing/models/request/tokenized-payment-source.request.ts
deleted file mode 100644
index e4bf575cc6a..00000000000
--- a/libs/common/src/billing/models/request/tokenized-payment-source.request.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { PaymentMethodType } from "../../enums";
-
-export class TokenizedPaymentSourceRequest {
-  type: PaymentMethodType;
-  token: string;
-}
diff --git a/libs/common/src/billing/models/request/update-payment-method.request.ts b/libs/common/src/billing/models/request/update-payment-method.request.ts
deleted file mode 100644
index 10b03103716..00000000000
--- a/libs/common/src/billing/models/request/update-payment-method.request.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { ExpandedTaxInfoUpdateRequest } from "./expanded-tax-info-update.request";
-import { TokenizedPaymentSourceRequest } from "./tokenized-payment-source.request";
-
-export class UpdatePaymentMethodRequest {
-  paymentSource: TokenizedPaymentSourceRequest;
-  taxInformation: ExpandedTaxInfoUpdateRequest;
-}
diff --git a/libs/common/src/billing/models/request/verify-bank-account.request.ts b/libs/common/src/billing/models/request/verify-bank-account.request.ts
deleted file mode 100644
index ee85d1a2aad..00000000000
--- a/libs/common/src/billing/models/request/verify-bank-account.request.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export class VerifyBankAccountRequest {
-  descriptorCode: string;
-
-  constructor(descriptorCode: string) {
-    this.descriptorCode = descriptorCode;
-  }
-}
diff --git a/libs/common/src/billing/models/response/billing-payment.response.ts b/libs/common/src/billing/models/response/billing-payment.response.ts
deleted file mode 100644
index e60a11c0772..00000000000
--- a/libs/common/src/billing/models/response/billing-payment.response.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { BaseResponse } from "../../../models/response/base.response";
-
-import { BillingSourceResponse } from "./billing.response";
-
-export class BillingPaymentResponse extends BaseResponse {
-  balance: number;
-  paymentSource: BillingSourceResponse;
-
-  constructor(response: any) {
-    super(response);
-    this.balance = this.getResponseProperty("Balance");
-    const paymentSource = this.getResponseProperty("PaymentSource");
-    this.paymentSource = paymentSource == null ? null : new BillingSourceResponse(paymentSource);
-  }
-}
diff --git a/libs/common/src/billing/models/response/organization-billing-metadata.response.ts b/libs/common/src/billing/models/response/organization-billing-metadata.response.ts
index aa34c37bd1d..366d10a1dca 100644
--- a/libs/common/src/billing/models/response/organization-billing-metadata.response.ts
+++ b/libs/common/src/billing/models/response/organization-billing-metadata.response.ts
@@ -1,35 +1,12 @@
 import { BaseResponse } from "../../../models/response/base.response";
 
 export class OrganizationBillingMetadataResponse extends BaseResponse {
-  isEligibleForSelfHost: boolean;
-  isManaged: boolean;
   isOnSecretsManagerStandalone: boolean;
-  isSubscriptionUnpaid: boolean;
-  hasSubscription: boolean;
-  hasOpenInvoice: boolean;
-  invoiceDueDate: Date | null;
-  invoiceCreatedDate: Date | null;
-  subPeriodEndDate: Date | null;
-  isSubscriptionCanceled: boolean;
   organizationOccupiedSeats: number;
 
   constructor(response: any) {
     super(response);
-    this.isEligibleForSelfHost = this.getResponseProperty("IsEligibleForSelfHost");
-    this.isManaged = this.getResponseProperty("IsManaged");
     this.isOnSecretsManagerStandalone = this.getResponseProperty("IsOnSecretsManagerStandalone");
-    this.isSubscriptionUnpaid = this.getResponseProperty("IsSubscriptionUnpaid");
-    this.hasSubscription = this.getResponseProperty("HasSubscription");
-    this.hasOpenInvoice = this.getResponseProperty("HasOpenInvoice");
-
-    this.invoiceDueDate = this.parseDate(this.getResponseProperty("InvoiceDueDate"));
-    this.invoiceCreatedDate = this.parseDate(this.getResponseProperty("InvoiceCreatedDate"));
-    this.subPeriodEndDate = this.parseDate(this.getResponseProperty("SubPeriodEndDate"));
-    this.isSubscriptionCanceled = this.getResponseProperty("IsSubscriptionCanceled");
     this.organizationOccupiedSeats = this.getResponseProperty("OrganizationOccupiedSeats");
   }
-
-  private parseDate(dateString: any): Date | null {
-    return dateString ? new Date(dateString) : null;
-  }
 }
diff --git a/libs/common/src/billing/models/response/organization-subscription.response.ts b/libs/common/src/billing/models/response/organization-subscription.response.ts
index 6e56eda68c6..f5fdaaba9b2 100644
--- a/libs/common/src/billing/models/response/organization-subscription.response.ts
+++ b/libs/common/src/billing/models/response/organization-subscription.response.ts
@@ -40,6 +40,7 @@ export class BillingCustomerDiscount extends BaseResponse {
   id: string;
   active: boolean;
   percentOff?: number;
+  amountOff?: number;
   appliesTo: string[];
 
   constructor(response: any) {
@@ -47,6 +48,7 @@ export class BillingCustomerDiscount extends BaseResponse {
     this.id = this.getResponseProperty("Id");
     this.active = this.getResponseProperty("Active");
     this.percentOff = this.getResponseProperty("PercentOff");
-    this.appliesTo = this.getResponseProperty("AppliesTo");
+    this.amountOff = this.getResponseProperty("AmountOff");
+    this.appliesTo = this.getResponseProperty("AppliesTo") || [];
   }
 }
diff --git a/libs/common/src/billing/models/response/payment-method.response.ts b/libs/common/src/billing/models/response/payment-method.response.ts
deleted file mode 100644
index 34e95032aef..00000000000
--- a/libs/common/src/billing/models/response/payment-method.response.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { BaseResponse } from "../../../models/response/base.response";
-
-import { PaymentSourceResponse } from "./payment-source.response";
-import { TaxInfoResponse } from "./tax-info.response";
-
-export class PaymentMethodResponse extends BaseResponse {
-  accountCredit: number;
-  paymentSource?: PaymentSourceResponse;
-  subscriptionStatus?: string;
-  taxInformation?: TaxInfoResponse;
-
-  constructor(response: any) {
-    super(response);
-    this.accountCredit = this.getResponseProperty("AccountCredit");
-
-    const paymentSource = this.getResponseProperty("PaymentSource");
-    if (paymentSource) {
-      this.paymentSource = new PaymentSourceResponse(paymentSource);
-    }
-
-    this.subscriptionStatus = this.getResponseProperty("SubscriptionStatus");
-
-    const taxInformation = this.getResponseProperty("TaxInformation");
-    if (taxInformation) {
-      this.taxInformation = new TaxInfoResponse(taxInformation);
-    }
-  }
-}
diff --git a/libs/common/src/billing/models/response/premium-plan.response.ts b/libs/common/src/billing/models/response/premium-plan.response.ts
new file mode 100644
index 00000000000..f5df560a601
--- /dev/null
+++ b/libs/common/src/billing/models/response/premium-plan.response.ts
@@ -0,0 +1,47 @@
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+
+export class PremiumPlanResponse extends BaseResponse {
+  seat: {
+    stripePriceId: string;
+    price: number;
+  };
+  storage: {
+    stripePriceId: string;
+    price: number;
+  };
+
+  constructor(response: any) {
+    super(response);
+
+    const seat = this.getResponseProperty("Seat");
+    if (!seat || typeof seat !== "object") {
+      throw new Error("PremiumPlanResponse: Missing or invalid 'Seat' property");
+    }
+    this.seat = new PurchasableResponse(seat);
+
+    const storage = this.getResponseProperty("Storage");
+    if (!storage || typeof storage !== "object") {
+      throw new Error("PremiumPlanResponse: Missing or invalid 'Storage' property");
+    }
+    this.storage = new PurchasableResponse(storage);
+  }
+}
+
+class PurchasableResponse extends BaseResponse {
+  stripePriceId: string;
+  price: number;
+
+  constructor(response: any) {
+    super(response);
+
+    this.stripePriceId = this.getResponseProperty("StripePriceId");
+    if (!this.stripePriceId || typeof this.stripePriceId !== "string") {
+      throw new Error("PurchasableResponse: Missing or invalid 'StripePriceId' property");
+    }
+
+    this.price = this.getResponseProperty("Price");
+    if (typeof this.price !== "number" || isNaN(this.price)) {
+      throw new Error("PurchasableResponse: Missing or invalid 'Price' property");
+    }
+  }
+}
diff --git a/libs/common/src/billing/models/response/subscription.response.ts b/libs/common/src/billing/models/response/subscription.response.ts
index 3bc7d42651c..01ace1ef10a 100644
--- a/libs/common/src/billing/models/response/subscription.response.ts
+++ b/libs/common/src/billing/models/response/subscription.response.ts
@@ -2,12 +2,15 @@
 // @ts-strict-ignore
 import { BaseResponse } from "../../../models/response/base.response";
 
+import { BillingCustomerDiscount } from "./organization-subscription.response";
+
 export class SubscriptionResponse extends BaseResponse {
   storageName: string;
   storageGb: number;
   maxStorageGb: number;
   subscription: BillingSubscriptionResponse;
   upcomingInvoice: BillingSubscriptionUpcomingInvoiceResponse;
+  customerDiscount: BillingCustomerDiscount;
   license: any;
   expiration: string;
 
@@ -20,11 +23,14 @@ export class SubscriptionResponse extends BaseResponse {
     this.expiration = this.getResponseProperty("Expiration");
     const subscription = this.getResponseProperty("Subscription");
     const upcomingInvoice = this.getResponseProperty("UpcomingInvoice");
+    const customerDiscount = this.getResponseProperty("CustomerDiscount");
     this.subscription = subscription == null ? null : new BillingSubscriptionResponse(subscription);
     this.upcomingInvoice =
       upcomingInvoice == null
         ? null
         : new BillingSubscriptionUpcomingInvoiceResponse(upcomingInvoice);
+    this.customerDiscount =
+      customerDiscount == null ? null : new BillingCustomerDiscount(customerDiscount);
   }
 }
 
diff --git a/libs/common/src/billing/models/response/tax-id-types.response.ts b/libs/common/src/billing/models/response/tax-id-types.response.ts
deleted file mode 100644
index f31f2133b34..00000000000
--- a/libs/common/src/billing/models/response/tax-id-types.response.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { BaseResponse } from "../../../models/response/base.response";
-
-export class TaxIdTypesResponse extends BaseResponse {
-  taxIdTypes: TaxIdTypeResponse[] = [];
-
-  constructor(response: any) {
-    super(response);
-    const taxIdTypes = this.getResponseProperty("TaxIdTypes");
-    if (taxIdTypes && taxIdTypes.length) {
-      this.taxIdTypes = taxIdTypes.map((t: any) => new TaxIdTypeResponse(t));
-    }
-  }
-}
-
-export class TaxIdTypeResponse extends BaseResponse {
-  code: string;
-  country: string;
-  description: string;
-  example: string;
-
-  constructor(response: any) {
-    super(response);
-    this.code = this.getResponseProperty("Code");
-    this.country = this.getResponseProperty("Country");
-    this.description = this.getResponseProperty("Description");
-    this.example = this.getResponseProperty("Example");
-  }
-}
diff --git a/libs/common/src/billing/models/response/tax/index.ts b/libs/common/src/billing/models/response/tax/index.ts
deleted file mode 100644
index 525d6d7c80a..00000000000
--- a/libs/common/src/billing/models/response/tax/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./preview-tax-amount.response";
diff --git a/libs/common/src/billing/models/response/tax/preview-tax-amount.response.ts b/libs/common/src/billing/models/response/tax/preview-tax-amount.response.ts
deleted file mode 100644
index cf15156551a..00000000000
--- a/libs/common/src/billing/models/response/tax/preview-tax-amount.response.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BaseResponse } from "../../../../models/response/base.response";
-
-export class PreviewTaxAmountResponse extends BaseResponse {
-  taxAmount: number;
-
-  constructor(response: any) {
-    super(response);
-
-    this.taxAmount = this.getResponseProperty("TaxAmount");
-  }
-}
diff --git a/libs/common/src/billing/services/billing-api.service.ts b/libs/common/src/billing/services/billing-api.service.ts
index 2292f26e616..ae6913e545c 100644
--- a/libs/common/src/billing/services/billing-api.service.ts
+++ b/libs/common/src/billing/services/billing-api.service.ts
@@ -1,23 +1,16 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
+import { PremiumPlanResponse } from "@bitwarden/common/billing/models/response/premium-plan.response";
 
 import { ApiService } from "../../abstractions/api.service";
 import { OrganizationCreateRequest } from "../../admin-console/models/request/organization-create.request";
-import { ProviderOrganizationOrganizationDetailsResponse } from "../../admin-console/models/response/provider/provider-organization.response";
 import { ListResponse } from "../../models/response/list.response";
+import { OrganizationId } from "../../types/guid";
 import { BillingApiServiceAbstraction } from "../abstractions";
-import { PaymentMethodType } from "../enums";
-import { CreateClientOrganizationRequest } from "../models/request/create-client-organization.request";
-import { ExpandedTaxInfoUpdateRequest } from "../models/request/expanded-tax-info-update.request";
 import { SubscriptionCancellationRequest } from "../models/request/subscription-cancellation.request";
-import { UpdateClientOrganizationRequest } from "../models/request/update-client-organization.request";
-import { UpdatePaymentMethodRequest } from "../models/request/update-payment-method.request";
-import { VerifyBankAccountRequest } from "../models/request/verify-bank-account.request";
 import { InvoicesResponse } from "../models/response/invoices.response";
 import { OrganizationBillingMetadataResponse } from "../models/response/organization-billing-metadata.response";
-import { PaymentMethodResponse } from "../models/response/payment-method.response";
 import { PlanResponse } from "../models/response/plan.response";
 import { ProviderSubscriptionResponse } from "../models/response/provider-subscription-response";
 
@@ -41,36 +34,8 @@ export class BillingApiService implements BillingApiServiceAbstraction {
     return this.apiService.send("POST", "/accounts/cancel", request, true, false);
   }
 
-  createProviderClientOrganization(
-    providerId: string,
-    request: CreateClientOrganizationRequest,
-  ): Promise<void> {
-    return this.apiService.send(
-      "POST",
-      "/providers/" + providerId + "/clients",
-      request,
-      true,
-      false,
-    );
-  }
-
-  async createSetupIntent(type: PaymentMethodType) {
-    const getPath = () => {
-      switch (type) {
-        case PaymentMethodType.BankAccount: {
-          return "/setup-intent/bank-account";
-        }
-        case PaymentMethodType.Card: {
-          return "/setup-intent/card";
-        }
-      }
-    };
-    const response = await this.apiService.send("POST", getPath(), null, true, true);
-    return response as string;
-  }
-
   async getOrganizationBillingMetadata(
-    organizationId: string,
+    organizationId: OrganizationId,
   ): Promise<OrganizationBillingMetadataResponse> {
     const r = await this.apiService.send(
       "GET",
@@ -83,22 +48,44 @@ export class BillingApiService implements BillingApiServiceAbstraction {
     return new OrganizationBillingMetadataResponse(r);
   }
 
-  async getOrganizationPaymentMethod(organizationId: string): Promise<PaymentMethodResponse> {
-    const response = await this.apiService.send(
+  async getOrganizationBillingMetadataVNext(
+    organizationId: OrganizationId,
+  ): Promise<OrganizationBillingMetadataResponse> {
+    const r = await this.apiService.send(
       "GET",
-      "/organizations/" + organizationId + "/billing/payment-method",
+      "/organizations/" + organizationId + "/billing/vnext/metadata",
       null,
       true,
       true,
     );
-    return new PaymentMethodResponse(response);
+
+    return new OrganizationBillingMetadataResponse(r);
+  }
+
+  async getOrganizationBillingMetadataVNextSelfHost(
+    organizationId: OrganizationId,
+  ): Promise<OrganizationBillingMetadataResponse> {
+    const r = await this.apiService.send(
+      "GET",
+      "/organizations/" + organizationId + "/billing/vnext/self-host/metadata",
+      null,
+      true,
+      true,
+    );
+
+    return new OrganizationBillingMetadataResponse(r);
   }
 
   async getPlans(): Promise<ListResponse<PlanResponse>> {
-    const r = await this.apiService.send("GET", "/plans", null, false, true);
+    const r = await this.apiService.send("GET", "/plans", null, true, true);
     return new ListResponse(r, PlanResponse);
   }
 
+  async getPremiumPlan(): Promise<PremiumPlanResponse> {
+    const response = await this.apiService.send("GET", "/plans/premium", null, true, true);
+    return new PremiumPlanResponse(response);
+  }
+
   async getProviderClientInvoiceReport(providerId: string, invoiceId: string): Promise<string> {
     const response = await this.apiService.send(
       "GET",
@@ -110,19 +97,6 @@ export class BillingApiService implements BillingApiServiceAbstraction {
     return response as string;
   }
 
-  async getProviderClientOrganizations(
-    providerId: string,
-  ): Promise<ListResponse<ProviderOrganizationOrganizationDetailsResponse>> {
-    const response = await this.apiService.send(
-      "GET",
-      "/providers/" + providerId + "/organizations",
-      null,
-      true,
-      true,
-    );
-    return new ListResponse(response, ProviderOrganizationOrganizationDetailsResponse);
-  }
-
   async getProviderInvoices(providerId: string): Promise<InvoicesResponse> {
     const response = await this.apiService.send(
       "GET",
@@ -145,106 +119,6 @@ export class BillingApiService implements BillingApiServiceAbstraction {
     return new ProviderSubscriptionResponse(response);
   }
 
-  async getProviderTaxInformation(providerId: string): Promise<TaxInfoResponse> {
-    const response = await this.apiService.send(
-      "GET",
-      "/providers/" + providerId + "/billing/tax-information",
-      null,
-      true,
-      true,
-    );
-    return new TaxInfoResponse(response);
-  }
-
-  async updateOrganizationPaymentMethod(
-    organizationId: string,
-    request: UpdatePaymentMethodRequest,
-  ): Promise<void> {
-    return await this.apiService.send(
-      "PUT",
-      "/organizations/" + organizationId + "/billing/payment-method",
-      request,
-      true,
-      false,
-    );
-  }
-
-  async updateOrganizationTaxInformation(
-    organizationId: string,
-    request: ExpandedTaxInfoUpdateRequest,
-  ): Promise<void> {
-    return await this.apiService.send(
-      "PUT",
-      "/organizations/" + organizationId + "/billing/tax-information",
-      request,
-      true,
-      false,
-    );
-  }
-
-  async updateProviderClientOrganization(
-    providerId: string,
-    organizationId: string,
-    request: UpdateClientOrganizationRequest,
-  ): Promise<any> {
-    return await this.apiService.send(
-      "PUT",
-      "/providers/" + providerId + "/clients/" + organizationId,
-      request,
-      true,
-      false,
-    );
-  }
-
-  async updateProviderPaymentMethod(
-    providerId: string,
-    request: UpdatePaymentMethodRequest,
-  ): Promise<void> {
-    return await this.apiService.send(
-      "PUT",
-      "/providers/" + providerId + "/billing/payment-method",
-      request,
-      true,
-      false,
-    );
-  }
-
-  async updateProviderTaxInformation(providerId: string, request: ExpandedTaxInfoUpdateRequest) {
-    return await this.apiService.send(
-      "PUT",
-      "/providers/" + providerId + "/billing/tax-information",
-      request,
-      true,
-      false,
-    );
-  }
-
-  async verifyOrganizationBankAccount(
-    organizationId: string,
-    request: VerifyBankAccountRequest,
-  ): Promise<void> {
-    return await this.apiService.send(
-      "POST",
-      "/organizations/" + organizationId + "/billing/payment-method/verify-bank-account",
-      request,
-      true,
-      false,
-    );
-  }
-
-  async verifyProviderBankAccount(
-    providerId: string,
-    request: VerifyBankAccountRequest,
-  ): Promise<void> {
-    return await this.apiService.send(
-      "POST",
-      "/providers/" + providerId + "/billing/payment-method/verify-bank-account",
-      request,
-      true,
-      false,
-    );
-  }
-
   async restartSubscription(
     organizationId: string,
     request: OrganizationCreateRequest,
diff --git a/libs/common/src/billing/services/organization-billing.service.spec.ts b/libs/common/src/billing/services/organization-billing.service.spec.ts
index 42cfb4a5371..a14dd0f0279 100644
--- a/libs/common/src/billing/services/organization-billing.service.spec.ts
+++ b/libs/common/src/billing/services/organization-billing.service.spec.ts
@@ -23,7 +23,6 @@ import { OrganizationResponse } from "../../admin-console/models/response/organi
 import { EncString } from "../../key-management/crypto/models/enc-string";
 import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { OrgKey } from "../../types/key";
-import { PaymentMethodResponse } from "../models/response/payment-method.response";
 
 describe("OrganizationBillingService", () => {
   let apiService: jest.Mocked<ApiService>;
@@ -62,47 +61,6 @@ describe("OrganizationBillingService", () => {
     return jest.resetAllMocks();
   });
 
-  describe("getPaymentSource()", () => {
-    it("given a valid organization id, then it returns a payment source", async () => {
-      //Arrange
-      const orgId = "organization-test";
-      const paymentMethodResponse = {
-        paymentSource: { type: PaymentMethodType.Card },
-      } as PaymentMethodResponse;
-      billingApiService.getOrganizationPaymentMethod.mockResolvedValue(paymentMethodResponse);
-
-      //Act
-      const returnedPaymentSource = await sut.getPaymentSource(orgId);
-
-      //Assert
-      expect(billingApiService.getOrganizationPaymentMethod).toHaveBeenCalledTimes(1);
-      expect(returnedPaymentSource).toEqual(paymentMethodResponse.paymentSource);
-    });
-
-    it("given an invalid organizationId, it should return undefined", async () => {
-      //Arrange
-      const orgId = "invalid-id";
-      billingApiService.getOrganizationPaymentMethod.mockResolvedValue(null);
-
-      //Act
-      const returnedPaymentSource = await sut.getPaymentSource(orgId);
-
-      //Assert
-      expect(billingApiService.getOrganizationPaymentMethod).toHaveBeenCalledTimes(1);
-      expect(returnedPaymentSource).toBeUndefined();
-    });
-
-    it("given an API error occurs, then it throws the error", async () => {
-      // Arrange
-      const orgId = "error-org";
-      billingApiService.getOrganizationPaymentMethod.mockRejectedValue(new Error("API Error"));
-
-      // Act & Assert
-      await expect(sut.getPaymentSource(orgId)).rejects.toThrow("API Error");
-      expect(billingApiService.getOrganizationPaymentMethod).toHaveBeenCalledTimes(1);
-    });
-  });
-
   describe("purchaseSubscription()", () => {
     it("given valid subscription information, then it returns successful response", async () => {
       //Arrange
@@ -118,7 +76,7 @@ describe("OrganizationBillingService", () => {
       const organizationResponse = {
         name: subscriptionInformation.organization.name,
         billingEmail: subscriptionInformation.organization.billingEmail,
-        planType: subscriptionInformation.plan.type,
+        planType: subscriptionInformation.plan!.type,
       } as OrganizationResponse;
 
       organizationApiService.create.mockResolvedValue(organizationResponse);
@@ -201,8 +159,8 @@ describe("OrganizationBillingService", () => {
 
       const organizationResponse = {
         name: subscriptionInformation.organization.name,
-        plan: { type: subscriptionInformation.plan.type },
-        planType: subscriptionInformation.plan.type,
+        plan: { type: subscriptionInformation.plan!.type },
+        planType: subscriptionInformation.plan!.type,
       } as OrganizationResponse;
 
       organizationApiService.createWithoutPayment.mockResolvedValue(organizationResponse);
@@ -262,7 +220,7 @@ describe("OrganizationBillingService", () => {
       const organizationResponse = {
         name: subscriptionInformation.organization.name,
         billingEmail: subscriptionInformation.organization.billingEmail,
-        planType: subscriptionInformation.plan.type,
+        planType: subscriptionInformation.plan!.type,
       } as OrganizationResponse;
 
       organizationApiService.create.mockResolvedValue(organizationResponse);
diff --git a/libs/common/src/billing/services/organization-billing.service.ts b/libs/common/src/billing/services/organization-billing.service.ts
index 53ce727df68..fdc9c6215c9 100644
--- a/libs/common/src/billing/services/organization-billing.service.ts
+++ b/libs/common/src/billing/services/organization-billing.service.ts
@@ -25,7 +25,6 @@ import {
 } from "../abstractions";
 import { PlanType } from "../enums";
 import { OrganizationNoPaymentMethodCreateRequest } from "../models/request/organization-no-payment-method-create-request";
-import { PaymentSourceResponse } from "../models/response/payment-source.response";
 
 interface OrganizationKeys {
   encryptedKey: EncString;
@@ -45,11 +44,6 @@ export class OrganizationBillingService implements OrganizationBillingServiceAbs
     private syncService: SyncService,
   ) {}
 
-  async getPaymentSource(organizationId: string): Promise<PaymentSourceResponse> {
-    const paymentMethod = await this.billingApiService.getOrganizationPaymentMethod(organizationId);
-    return paymentMethod?.paymentSource;
-  }
-
   async purchaseSubscription(
     subscription: SubscriptionInformation,
     activeUserId: UserId,
@@ -141,6 +135,7 @@ export class OrganizationBillingService implements OrganizationBillingServiceAbs
       case PlanType.Free:
       case PlanType.FamiliesAnnually:
       case PlanType.FamiliesAnnually2019:
+      case PlanType.FamiliesAnnually2025:
       case PlanType.TeamsStarter2023:
       case PlanType.TeamsStarter:
         return true;
diff --git a/libs/common/src/billing/services/organization/organization-metadata.service.spec.ts b/libs/common/src/billing/services/organization/organization-metadata.service.spec.ts
new file mode 100644
index 00000000000..a2b012eb161
--- /dev/null
+++ b/libs/common/src/billing/services/organization/organization-metadata.service.spec.ts
@@ -0,0 +1,301 @@
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject, firstValueFrom } from "rxjs";
+
+import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { newGuid } from "@bitwarden/guid";
+
+import { FeatureFlag } from "../../../enums/feature-flag.enum";
+import { OrganizationId } from "../../../types/guid";
+
+import { DefaultOrganizationMetadataService } from "./organization-metadata.service";
+
+describe("DefaultOrganizationMetadataService", () => {
+  let service: DefaultOrganizationMetadataService;
+  let billingApiService: jest.Mocked<BillingApiServiceAbstraction>;
+  let configService: jest.Mocked<ConfigService>;
+  let platformUtilsService: jest.Mocked<PlatformUtilsService>;
+  let featureFlagSubject: BehaviorSubject<boolean>;
+
+  const mockOrganizationId = newGuid() as OrganizationId;
+  const mockOrganizationId2 = newGuid() as OrganizationId;
+
+  const createMockMetadataResponse = (
+    isOnSecretsManagerStandalone = false,
+    organizationOccupiedSeats = 5,
+  ): OrganizationBillingMetadataResponse => {
+    return {
+      isOnSecretsManagerStandalone,
+      organizationOccupiedSeats,
+    } as OrganizationBillingMetadataResponse;
+  };
+
+  beforeEach(() => {
+    billingApiService = mock<BillingApiServiceAbstraction>();
+    configService = mock<ConfigService>();
+    platformUtilsService = mock<PlatformUtilsService>();
+    featureFlagSubject = new BehaviorSubject<boolean>(false);
+
+    configService.getFeatureFlag$.mockReturnValue(featureFlagSubject.asObservable());
+    platformUtilsService.isSelfHost.mockReturnValue(false);
+
+    service = new DefaultOrganizationMetadataService(
+      billingApiService,
+      configService,
+      platformUtilsService,
+    );
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+    featureFlagSubject.complete();
+  });
+
+  describe("getOrganizationMetadata$", () => {
+    describe("feature flag OFF", () => {
+      beforeEach(() => {
+        featureFlagSubject.next(false);
+      });
+
+      it("calls getOrganizationBillingMetadata when feature flag is off", async () => {
+        const mockResponse = createMockMetadataResponse(false, 10);
+        billingApiService.getOrganizationBillingMetadata.mockResolvedValue(mockResponse);
+
+        const result = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+
+        expect(configService.getFeatureFlag$).toHaveBeenCalledWith(
+          FeatureFlag.PM25379_UseNewOrganizationMetadataStructure,
+        );
+        expect(billingApiService.getOrganizationBillingMetadata).toHaveBeenCalledWith(
+          mockOrganizationId,
+        );
+        expect(billingApiService.getOrganizationBillingMetadataVNext).not.toHaveBeenCalled();
+        expect(result).toEqual(mockResponse);
+      });
+
+      it("does not cache metadata when feature flag is off", async () => {
+        const mockResponse1 = createMockMetadataResponse(false, 10);
+        const mockResponse2 = createMockMetadataResponse(false, 15);
+        billingApiService.getOrganizationBillingMetadata
+          .mockResolvedValueOnce(mockResponse1)
+          .mockResolvedValueOnce(mockResponse2);
+
+        const result1 = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+        const result2 = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+
+        expect(billingApiService.getOrganizationBillingMetadata).toHaveBeenCalledTimes(2);
+        expect(result1).toEqual(mockResponse1);
+        expect(result2).toEqual(mockResponse2);
+      });
+    });
+
+    describe("feature flag ON", () => {
+      beforeEach(() => {
+        featureFlagSubject.next(true);
+      });
+
+      it("calls getOrganizationBillingMetadataVNext when feature flag is on", async () => {
+        const mockResponse = createMockMetadataResponse(true, 15);
+        billingApiService.getOrganizationBillingMetadataVNext.mockResolvedValue(mockResponse);
+
+        const result = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+
+        expect(configService.getFeatureFlag$).toHaveBeenCalledWith(
+          FeatureFlag.PM25379_UseNewOrganizationMetadataStructure,
+        );
+        expect(billingApiService.getOrganizationBillingMetadataVNext).toHaveBeenCalledWith(
+          mockOrganizationId,
+        );
+        expect(billingApiService.getOrganizationBillingMetadata).not.toHaveBeenCalled();
+        expect(result).toEqual(mockResponse);
+      });
+
+      it("caches metadata by organization ID when feature flag is on", async () => {
+        const mockResponse = createMockMetadataResponse(true, 10);
+        billingApiService.getOrganizationBillingMetadataVNext.mockResolvedValue(mockResponse);
+
+        const result1 = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+        const result2 = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+
+        expect(billingApiService.getOrganizationBillingMetadataVNext).toHaveBeenCalledTimes(1);
+        expect(result1).toEqual(mockResponse);
+        expect(result2).toEqual(mockResponse);
+      });
+
+      it("maintains separate cache entries for different organization IDs", async () => {
+        const mockResponse1 = createMockMetadataResponse(true, 10);
+        const mockResponse2 = createMockMetadataResponse(false, 20);
+        billingApiService.getOrganizationBillingMetadataVNext
+          .mockResolvedValueOnce(mockResponse1)
+          .mockResolvedValueOnce(mockResponse2);
+
+        const result1 = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+        const result2 = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId2));
+        const result3 = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+        const result4 = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId2));
+
+        expect(billingApiService.getOrganizationBillingMetadataVNext).toHaveBeenCalledTimes(2);
+        expect(billingApiService.getOrganizationBillingMetadataVNext).toHaveBeenNthCalledWith(
+          1,
+          mockOrganizationId,
+        );
+        expect(billingApiService.getOrganizationBillingMetadataVNext).toHaveBeenNthCalledWith(
+          2,
+          mockOrganizationId2,
+        );
+        expect(result1).toEqual(mockResponse1);
+        expect(result2).toEqual(mockResponse2);
+        expect(result3).toEqual(mockResponse1);
+        expect(result4).toEqual(mockResponse2);
+      });
+
+      it("calls getOrganizationBillingMetadataVNextSelfHost when feature flag is on and isSelfHost is true", async () => {
+        platformUtilsService.isSelfHost.mockReturnValue(true);
+        const mockResponse = createMockMetadataResponse(true, 25);
+        billingApiService.getOrganizationBillingMetadataVNextSelfHost.mockResolvedValue(
+          mockResponse,
+        );
+
+        const result = await firstValueFrom(service.getOrganizationMetadata$(mockOrganizationId));
+
+        expect(platformUtilsService.isSelfHost).toHaveBeenCalled();
+        expect(billingApiService.getOrganizationBillingMetadataVNextSelfHost).toHaveBeenCalledWith(
+          mockOrganizationId,
+        );
+        expect(billingApiService.getOrganizationBillingMetadataVNext).not.toHaveBeenCalled();
+        expect(billingApiService.getOrganizationBillingMetadata).not.toHaveBeenCalled();
+        expect(result).toEqual(mockResponse);
+      });
+    });
+
+    describe("shareReplay behavior", () => {
+      beforeEach(() => {
+        featureFlagSubject.next(true);
+      });
+
+      it("does not call API multiple times when the same cached observable is subscribed to multiple times", async () => {
+        const mockResponse = createMockMetadataResponse(true, 10);
+        billingApiService.getOrganizationBillingMetadataVNext.mockResolvedValue(mockResponse);
+
+        const metadata$ = service.getOrganizationMetadata$(mockOrganizationId);
+
+        const subscription1Promise = firstValueFrom(metadata$);
+        const subscription2Promise = firstValueFrom(metadata$);
+        const subscription3Promise = firstValueFrom(metadata$);
+
+        const [result1, result2, result3] = await Promise.all([
+          subscription1Promise,
+          subscription2Promise,
+          subscription3Promise,
+        ]);
+
+        expect(billingApiService.getOrganizationBillingMetadataVNext).toHaveBeenCalledTimes(1);
+        expect(result1).toEqual(mockResponse);
+        expect(result2).toEqual(mockResponse);
+        expect(result3).toEqual(mockResponse);
+      });
+    });
+  });
+
+  describe("refreshMetadataCache", () => {
+    beforeEach(() => {
+      featureFlagSubject.next(true);
+    });
+
+    it("refreshes cached metadata when called with feature flag on", (done) => {
+      const mockResponse1 = createMockMetadataResponse(true, 10);
+      const mockResponse2 = createMockMetadataResponse(true, 20);
+      let invocationCount = 0;
+
+      billingApiService.getOrganizationBillingMetadataVNext
+        .mockResolvedValueOnce(mockResponse1)
+        .mockResolvedValueOnce(mockResponse2);
+
+      const subscription = service.getOrganizationMetadata$(mockOrganizationId).subscribe({
+        next: (result) => {
+          invocationCount++;
+
+          if (invocationCount === 1) {
+            expect(result).toEqual(mockResponse1);
+          } else if (invocationCount === 2) {
+            expect(result).toEqual(mockResponse2);
+            expect(billingApiService.getOrganizationBillingMetadataVNext).toHaveBeenCalledTimes(2);
+            subscription.unsubscribe();
+            done();
+          }
+        },
+        error: done.fail,
+      });
+
+      setTimeout(() => {
+        service.refreshMetadataCache();
+      }, 10);
+    });
+
+    it("does trigger refresh when feature flag is disabled", async () => {
+      featureFlagSubject.next(false);
+
+      const mockResponse1 = createMockMetadataResponse(false, 10);
+      const mockResponse2 = createMockMetadataResponse(false, 20);
+      let invocationCount = 0;
+
+      billingApiService.getOrganizationBillingMetadata
+        .mockResolvedValueOnce(mockResponse1)
+        .mockResolvedValueOnce(mockResponse2);
+
+      const subscription = service.getOrganizationMetadata$(mockOrganizationId).subscribe({
+        next: () => {
+          invocationCount++;
+        },
+      });
+
+      // wait for initial invocation
+      await new Promise((resolve) => setTimeout(resolve, 10));
+
+      expect(invocationCount).toBe(1);
+
+      service.refreshMetadataCache();
+
+      await new Promise((resolve) => setTimeout(resolve, 10));
+
+      expect(invocationCount).toBe(2);
+      expect(billingApiService.getOrganizationBillingMetadata).toHaveBeenCalledTimes(2);
+
+      subscription.unsubscribe();
+    });
+
+    it("bypasses cache when refreshing metadata", (done) => {
+      const mockResponse1 = createMockMetadataResponse(true, 10);
+      const mockResponse2 = createMockMetadataResponse(true, 20);
+      const mockResponse3 = createMockMetadataResponse(true, 30);
+      let invocationCount = 0;
+
+      billingApiService.getOrganizationBillingMetadataVNext
+        .mockResolvedValueOnce(mockResponse1)
+        .mockResolvedValueOnce(mockResponse2)
+        .mockResolvedValueOnce(mockResponse3);
+
+      const subscription = service.getOrganizationMetadata$(mockOrganizationId).subscribe({
+        next: (result) => {
+          invocationCount++;
+
+          if (invocationCount === 1) {
+            expect(result).toEqual(mockResponse1);
+            service.refreshMetadataCache();
+          } else if (invocationCount === 2) {
+            expect(result).toEqual(mockResponse2);
+            service.refreshMetadataCache();
+          } else if (invocationCount === 3) {
+            expect(result).toEqual(mockResponse3);
+            expect(billingApiService.getOrganizationBillingMetadataVNext).toHaveBeenCalledTimes(3);
+            subscription.unsubscribe();
+            done();
+          }
+        },
+        error: done.fail,
+      });
+    });
+  });
+});
diff --git a/libs/common/src/billing/services/organization/organization-metadata.service.ts b/libs/common/src/billing/services/organization/organization-metadata.service.ts
new file mode 100644
index 00000000000..5ce87262c4b
--- /dev/null
+++ b/libs/common/src/billing/services/organization/organization-metadata.service.ts
@@ -0,0 +1,77 @@
+import { BehaviorSubject, combineLatest, from, Observable, shareReplay, switchMap } from "rxjs";
+
+import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+
+import { FeatureFlag } from "../../../enums/feature-flag.enum";
+import { ConfigService } from "../../../platform/abstractions/config/config.service";
+import { OrganizationId } from "../../../types/guid";
+import { OrganizationMetadataServiceAbstraction } from "../../abstractions/organization-metadata.service.abstraction";
+import { OrganizationBillingMetadataResponse } from "../../models/response/organization-billing-metadata.response";
+
+export class DefaultOrganizationMetadataService implements OrganizationMetadataServiceAbstraction {
+  private metadataCache = new Map<
+    OrganizationId,
+    Observable<OrganizationBillingMetadataResponse>
+  >();
+
+  constructor(
+    private billingApiService: BillingApiServiceAbstraction,
+    private configService: ConfigService,
+    private platformUtilsService: PlatformUtilsService,
+  ) {}
+  private refreshMetadataTrigger = new BehaviorSubject<void>(undefined);
+
+  refreshMetadataCache = () => {
+    this.metadataCache.clear();
+    this.refreshMetadataTrigger.next();
+  };
+
+  getOrganizationMetadata$(orgId: OrganizationId): Observable<OrganizationBillingMetadataResponse> {
+    return combineLatest([
+      this.refreshMetadataTrigger,
+      this.configService.getFeatureFlag$(FeatureFlag.PM25379_UseNewOrganizationMetadataStructure),
+    ]).pipe(
+      switchMap(([_, featureFlagEnabled]) =>
+        featureFlagEnabled
+          ? this.vNextGetOrganizationMetadataInternal$(orgId)
+          : this.getOrganizationMetadataInternal$(orgId),
+      ),
+    );
+  }
+
+  private vNextGetOrganizationMetadataInternal$(
+    orgId: OrganizationId,
+  ): Observable<OrganizationBillingMetadataResponse> {
+    const cacheHit = this.metadataCache.get(orgId);
+    if (cacheHit) {
+      return cacheHit;
+    }
+
+    const result = from(this.fetchMetadata(orgId, true)).pipe(
+      shareReplay({ bufferSize: 1, refCount: false }),
+    );
+
+    this.metadataCache.set(orgId, result);
+    return result;
+  }
+
+  private getOrganizationMetadataInternal$(
+    organizationId: OrganizationId,
+  ): Observable<OrganizationBillingMetadataResponse> {
+    return from(this.fetchMetadata(organizationId, false)).pipe(
+      shareReplay({ bufferSize: 1, refCount: false }),
+    );
+  }
+
+  private async fetchMetadata(
+    organizationId: OrganizationId,
+    featureFlagEnabled: boolean,
+  ): Promise<OrganizationBillingMetadataResponse> {
+    return featureFlagEnabled
+      ? this.platformUtilsService.isSelfHost()
+        ? await this.billingApiService.getOrganizationBillingMetadataVNextSelfHost(organizationId)
+        : await this.billingApiService.getOrganizationBillingMetadataVNext(organizationId)
+      : await this.billingApiService.getOrganizationBillingMetadata(organizationId);
+  }
+}
diff --git a/apps/web/src/app/billing/services/subscription-pricing.service.spec.ts b/libs/common/src/billing/services/subscription-pricing.service.spec.ts
similarity index 72%
rename from apps/web/src/app/billing/services/subscription-pricing.service.spec.ts
rename to libs/common/src/billing/services/subscription-pricing.service.spec.ts
index 0fb33020bc3..8f5e9c0a3ab 100644
--- a/apps/web/src/app/billing/services/subscription-pricing.service.spec.ts
+++ b/libs/common/src/billing/services/subscription-pricing.service.spec.ts
@@ -1,11 +1,12 @@
-import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
+import { PremiumPlanResponse } from "@bitwarden/common/billing/models/response/premium-plan.response";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { ToastService } from "@bitwarden/components";
 import { LogService } from "@bitwarden/logging";
 
 import {
@@ -14,17 +15,17 @@ import {
   SubscriptionCadenceIds,
 } from "../types/subscription-pricing-tier";
 
-import { SubscriptionPricingService } from "./subscription-pricing.service";
+import { DefaultSubscriptionPricingService } from "./subscription-pricing.service";
 
-describe("SubscriptionPricingService", () => {
-  let service: SubscriptionPricingService;
-  let apiService: MockProxy<ApiService>;
+describe("DefaultSubscriptionPricingService", () => {
+  let service: DefaultSubscriptionPricingService;
+  let billingApiService: MockProxy<BillingApiServiceAbstraction>;
+  let configService: MockProxy<ConfigService>;
   let i18nService: MockProxy<I18nService>;
   let logService: MockProxy<LogService>;
-  let toastService: MockProxy<ToastService>;
 
   const mockFamiliesPlan = {
-    type: PlanType.FamiliesAnnually,
+    type: PlanType.FamiliesAnnually2025,
     productTier: ProductTierType.Families,
     name: "Families (Annually)",
     isAnnual: true,
@@ -217,10 +218,18 @@ describe("SubscriptionPricingService", () => {
     continuationToken: null,
   };
 
+  const mockPremiumPlanResponse: PremiumPlanResponse = {
+    seat: {
+      price: 10,
+    },
+    storage: {
+      price: 4,
+    },
+  } as PremiumPlanResponse;
+
   beforeAll(() => {
     i18nService = mock<I18nService>();
     logService = mock<LogService>();
-    toastService = mock<ToastService>();
 
     i18nService.t.mockImplementation((key: string, ...args: any[]) => {
       switch (key) {
@@ -311,8 +320,6 @@ describe("SubscriptionPricingService", () => {
           return "Boost productivity";
         case "seamlessIntegration":
           return "Seamless integration";
-        case "unexpectedError":
-          return "An unexpected error has occurred.";
         default:
           return key;
       }
@@ -320,21 +327,19 @@ describe("SubscriptionPricingService", () => {
   });
 
   beforeEach(() => {
-    apiService = mock<ApiService>();
+    billingApiService = mock<BillingApiServiceAbstraction>();
+    configService = mock<ConfigService>();
 
-    apiService.getPlans.mockResolvedValue(mockPlansResponse);
+    billingApiService.getPlans.mockResolvedValue(mockPlansResponse);
+    billingApiService.getPremiumPlan.mockResolvedValue(mockPremiumPlanResponse);
+    configService.getFeatureFlag$.mockReturnValue(of(false)); // Default to false (use hardcoded value)
 
-    TestBed.configureTestingModule({
-      providers: [
-        SubscriptionPricingService,
-        { provide: ApiService, useValue: apiService },
-        { provide: I18nService, useValue: i18nService },
-        { provide: LogService, useValue: logService },
-        { provide: ToastService, useValue: toastService },
-      ],
-    });
-
-    service = TestBed.inject(SubscriptionPricingService);
+    service = new DefaultSubscriptionPricingService(
+      billingApiService,
+      configService,
+      i18nService,
+      logService,
+    );
   });
 
   describe("getPersonalSubscriptionPricingTiers$", () => {
@@ -405,42 +410,37 @@ describe("SubscriptionPricingService", () => {
       });
     });
 
-    it("should handle API errors by logging and showing toast", (done) => {
-      const errorApiService = mock<ApiService>();
+    it("should handle API errors by logging and throwing error", (done) => {
+      const errorBillingApiService = mock<BillingApiServiceAbstraction>();
+      const errorConfigService = mock<ConfigService>();
       const errorI18nService = mock<I18nService>();
       const errorLogService = mock<LogService>();
-      const errorToastService = mock<ToastService>();
 
       const testError = new Error("API error");
-      errorApiService.getPlans.mockRejectedValue(testError);
+      errorBillingApiService.getPlans.mockRejectedValue(testError);
+      errorBillingApiService.getPremiumPlan.mockResolvedValue(mockPremiumPlanResponse);
+      errorConfigService.getFeatureFlag$.mockReturnValue(of(false));
 
-      errorI18nService.t.mockImplementation((key: string) => {
-        if (key === "unexpectedError") {
-          return "An unexpected error has occurred.";
-        }
-        return key;
-      });
+      errorI18nService.t.mockImplementation((key: string) => key);
 
-      const errorService = new SubscriptionPricingService(
-        errorApiService,
+      const errorService = new DefaultSubscriptionPricingService(
+        errorBillingApiService,
+        errorConfigService,
         errorI18nService,
         errorLogService,
-        errorToastService,
       );
 
       errorService.getPersonalSubscriptionPricingTiers$().subscribe({
-        next: (tiers) => {
-          expect(tiers).toEqual([]);
-          expect(errorLogService.error).toHaveBeenCalledWith(testError);
-          expect(errorToastService.showToast).toHaveBeenCalledWith({
-            variant: "error",
-            title: "",
-            message: "An unexpected error has occurred.",
-          });
-          done();
+        next: () => {
+          fail("Observable should error, not return a value");
         },
-        error: () => {
-          fail("Observable should not error, it should return empty array");
+        error: (error: unknown) => {
+          expect(errorLogService.error).toHaveBeenCalledWith(
+            "Failed to load personal subscription pricing tiers",
+            testError,
+          );
+          expect(error).toBe(testError);
+          done();
         },
       });
     });
@@ -590,42 +590,37 @@ describe("SubscriptionPricingService", () => {
       });
     });
 
-    it("should handle API errors by logging and showing toast", (done) => {
-      const errorApiService = mock<ApiService>();
+    it("should handle API errors by logging and throwing error", (done) => {
+      const errorBillingApiService = mock<BillingApiServiceAbstraction>();
+      const errorConfigService = mock<ConfigService>();
       const errorI18nService = mock<I18nService>();
       const errorLogService = mock<LogService>();
-      const errorToastService = mock<ToastService>();
 
       const testError = new Error("API error");
-      errorApiService.getPlans.mockRejectedValue(testError);
+      errorBillingApiService.getPlans.mockRejectedValue(testError);
+      errorBillingApiService.getPremiumPlan.mockResolvedValue(mockPremiumPlanResponse);
+      errorConfigService.getFeatureFlag$.mockReturnValue(of(false));
 
-      errorI18nService.t.mockImplementation((key: string) => {
-        if (key === "unexpectedError") {
-          return "An unexpected error has occurred.";
-        }
-        return key;
-      });
+      errorI18nService.t.mockImplementation((key: string) => key);
 
-      const errorService = new SubscriptionPricingService(
-        errorApiService,
+      const errorService = new DefaultSubscriptionPricingService(
+        errorBillingApiService,
+        errorConfigService,
         errorI18nService,
         errorLogService,
-        errorToastService,
       );
 
       errorService.getBusinessSubscriptionPricingTiers$().subscribe({
-        next: (tiers) => {
-          expect(tiers).toEqual([]);
-          expect(errorLogService.error).toHaveBeenCalledWith(testError);
-          expect(errorToastService.showToast).toHaveBeenCalledWith({
-            variant: "error",
-            title: "",
-            message: "An unexpected error has occurred.",
-          });
-          done();
+        next: () => {
+          fail("Observable should error, not return a value");
         },
-        error: () => {
-          fail("Observable should not error, it should return empty array");
+        error: (error: unknown) => {
+          expect(errorLogService.error).toHaveBeenCalledWith(
+            "Failed to load business subscription pricing tiers",
+            testError,
+          );
+          expect(error).toBe(testError);
+          done();
         },
       });
     });
@@ -830,42 +825,156 @@ describe("SubscriptionPricingService", () => {
       });
     });
 
-    it("should handle API errors by logging and showing toast", (done) => {
-      const errorApiService = mock<ApiService>();
+    it("should handle API errors by logging and throwing error", (done) => {
+      const errorBillingApiService = mock<BillingApiServiceAbstraction>();
+      const errorConfigService = mock<ConfigService>();
       const errorI18nService = mock<I18nService>();
       const errorLogService = mock<LogService>();
-      const errorToastService = mock<ToastService>();
 
       const testError = new Error("API error");
-      errorApiService.getPlans.mockRejectedValue(testError);
+      errorBillingApiService.getPlans.mockRejectedValue(testError);
+      errorBillingApiService.getPremiumPlan.mockResolvedValue(mockPremiumPlanResponse);
+      errorConfigService.getFeatureFlag$.mockReturnValue(of(false));
 
-      errorI18nService.t.mockImplementation((key: string) => {
-        if (key === "unexpectedError") {
-          return "An unexpected error has occurred.";
-        }
-        return key;
-      });
+      errorI18nService.t.mockImplementation((key: string) => key);
 
-      const errorService = new SubscriptionPricingService(
-        errorApiService,
+      const errorService = new DefaultSubscriptionPricingService(
+        errorBillingApiService,
+        errorConfigService,
         errorI18nService,
         errorLogService,
-        errorToastService,
       );
 
       errorService.getDeveloperSubscriptionPricingTiers$().subscribe({
-        next: (tiers) => {
-          expect(tiers).toEqual([]);
-          expect(errorLogService.error).toHaveBeenCalledWith(testError);
-          expect(errorToastService.showToast).toHaveBeenCalledWith({
-            variant: "error",
-            title: "",
-            message: "An unexpected error has occurred.",
-          });
+        next: () => {
+          fail("Observable should error, not return a value");
+        },
+        error: (error: unknown) => {
+          expect(errorLogService.error).toHaveBeenCalledWith(
+            "Failed to load developer subscription pricing tiers",
+            testError,
+          );
+          expect(error).toBe(testError);
           done();
         },
-        error: () => {
-          fail("Observable should not error, it should return empty array");
+      });
+    });
+  });
+
+  describe("Edge case handling", () => {
+    it("should handle getPremiumPlan() error when getPlans() succeeds", (done) => {
+      const errorBillingApiService = mock<BillingApiServiceAbstraction>();
+      const errorConfigService = mock<ConfigService>();
+
+      const testError = new Error("Premium plan API error");
+      errorBillingApiService.getPlans.mockResolvedValue(mockPlansResponse);
+      errorBillingApiService.getPremiumPlan.mockRejectedValue(testError);
+      errorConfigService.getFeatureFlag$.mockReturnValue(of(true)); // Enable feature flag to use premium plan API
+
+      const errorService = new DefaultSubscriptionPricingService(
+        errorBillingApiService,
+        errorConfigService,
+        i18nService,
+        logService,
+      );
+
+      errorService.getPersonalSubscriptionPricingTiers$().subscribe({
+        next: () => {
+          fail("Observable should error, not return a value");
+        },
+        error: (error: unknown) => {
+          expect(logService.error).toHaveBeenCalledWith(
+            "Failed to fetch premium plan from API",
+            testError,
+          );
+          expect(logService.error).toHaveBeenCalledWith(
+            "Failed to load personal subscription pricing tiers",
+            testError,
+          );
+          expect(error).toBe(testError);
+          done();
+        },
+      });
+    });
+
+    it("should handle malformed premium plan API response", (done) => {
+      const errorBillingApiService = mock<BillingApiServiceAbstraction>();
+      const errorConfigService = mock<ConfigService>();
+      const testError = new TypeError("Cannot read properties of undefined (reading 'price')");
+
+      // Malformed response missing the Seat property
+      const malformedResponse = {
+        Storage: {
+          StripePriceId: "price_storage",
+          Price: 4,
+        },
+      };
+
+      errorBillingApiService.getPlans.mockResolvedValue(mockPlansResponse);
+      errorBillingApiService.getPremiumPlan.mockResolvedValue(malformedResponse as any);
+      errorConfigService.getFeatureFlag$.mockReturnValue(of(true)); // Enable feature flag
+
+      const errorService = new DefaultSubscriptionPricingService(
+        errorBillingApiService,
+        errorConfigService,
+        i18nService,
+        logService,
+      );
+
+      errorService.getPersonalSubscriptionPricingTiers$().subscribe({
+        next: () => {
+          fail("Observable should error, not return a value");
+        },
+        error: (error: unknown) => {
+          expect(logService.error).toHaveBeenCalledWith(
+            "Failed to load personal subscription pricing tiers",
+            testError,
+          );
+          expect(error).toEqual(testError);
+          done();
+        },
+      });
+    });
+
+    it("should handle malformed premium plan with invalid price types", (done) => {
+      const errorBillingApiService = mock<BillingApiServiceAbstraction>();
+      const errorConfigService = mock<ConfigService>();
+      const testError = new TypeError("Cannot read properties of undefined (reading 'price')");
+
+      // Malformed response with price as string instead of number
+      const malformedResponse = {
+        Seat: {
+          StripePriceId: "price_seat",
+          Price: "10", // Should be a number
+        },
+        Storage: {
+          StripePriceId: "price_storage",
+          Price: 4,
+        },
+      };
+
+      errorBillingApiService.getPlans.mockResolvedValue(mockPlansResponse);
+      errorBillingApiService.getPremiumPlan.mockResolvedValue(malformedResponse as any);
+      errorConfigService.getFeatureFlag$.mockReturnValue(of(true)); // Enable feature flag
+
+      const errorService = new DefaultSubscriptionPricingService(
+        errorBillingApiService,
+        errorConfigService,
+        i18nService,
+        logService,
+      );
+
+      errorService.getPersonalSubscriptionPricingTiers$().subscribe({
+        next: () => {
+          fail("Observable should error, not return a value");
+        },
+        error: (error: unknown) => {
+          expect(logService.error).toHaveBeenCalledWith(
+            "Failed to load personal subscription pricing tiers",
+            testError,
+          );
+          expect(error).toEqual(testError);
+          done();
         },
       });
     });
@@ -873,7 +982,7 @@ describe("SubscriptionPricingService", () => {
 
   describe("Observable behavior and caching", () => {
     it("should share API response between multiple subscriptions", () => {
-      const getPlansResponse = jest.spyOn(apiService, "getPlans");
+      const getPlansResponse = jest.spyOn(billingApiService, "getPlans");
 
       // Subscribe to multiple observables
       service.getPersonalSubscriptionPricingTiers$().subscribe();
@@ -883,5 +992,65 @@ describe("SubscriptionPricingService", () => {
       // API should only be called once due to shareReplay
       expect(getPlansResponse).toHaveBeenCalledTimes(1);
     });
+
+    it("should share premium plan API response between multiple subscriptions when feature flag is enabled", () => {
+      // Create a new mock to avoid conflicts with beforeEach setup
+      const newBillingApiService = mock<BillingApiServiceAbstraction>();
+      const newConfigService = mock<ConfigService>();
+
+      newBillingApiService.getPlans.mockResolvedValue(mockPlansResponse);
+      newBillingApiService.getPremiumPlan.mockResolvedValue(mockPremiumPlanResponse);
+      newConfigService.getFeatureFlag$.mockReturnValue(of(true));
+
+      const getPremiumPlanSpy = jest.spyOn(newBillingApiService, "getPremiumPlan");
+
+      // Create a new service instance with the feature flag enabled
+      const newService = new DefaultSubscriptionPricingService(
+        newBillingApiService,
+        newConfigService,
+        i18nService,
+        logService,
+      );
+
+      // Subscribe to the premium pricing tier multiple times
+      newService.getPersonalSubscriptionPricingTiers$().subscribe();
+      newService.getPersonalSubscriptionPricingTiers$().subscribe();
+
+      // API should only be called once due to shareReplay on premiumPlanResponse$
+      expect(getPremiumPlanSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it("should use hardcoded premium price when feature flag is disabled", (done) => {
+      // Create a new mock to test from scratch
+      const newBillingApiService = mock<BillingApiServiceAbstraction>();
+      const newConfigService = mock<ConfigService>();
+
+      newBillingApiService.getPlans.mockResolvedValue(mockPlansResponse);
+      newBillingApiService.getPremiumPlan.mockResolvedValue({
+        seat: { price: 999 }, // Different price to verify hardcoded value is used
+        storage: { price: 999 },
+      } as PremiumPlanResponse);
+      newConfigService.getFeatureFlag$.mockReturnValue(of(false));
+
+      // Create a new service instance with the feature flag disabled
+      const newService = new DefaultSubscriptionPricingService(
+        newBillingApiService,
+        newConfigService,
+        i18nService,
+        logService,
+      );
+
+      // Subscribe with feature flag disabled
+      newService.getPersonalSubscriptionPricingTiers$().subscribe((tiers) => {
+        const premiumTier = tiers.find(
+          (tier) => tier.id === PersonalSubscriptionPricingTierIds.Premium,
+        );
+
+        // Should use hardcoded value of 10, not the API response value of 999
+        expect(premiumTier!.passwordManager.annualPrice).toBe(10);
+        expect(premiumTier!.passwordManager.annualPricePerAdditionalStorageGB).toBe(4);
+        done();
+      });
+    });
   });
 });
diff --git a/apps/web/src/app/billing/services/subscription-pricing.service.ts b/libs/common/src/billing/services/subscription-pricing.service.ts
similarity index 66%
rename from apps/web/src/app/billing/services/subscription-pricing.service.ts
rename to libs/common/src/billing/services/subscription-pricing.service.ts
index fad797bed51..f1502eb26e8 100644
--- a/apps/web/src/app/billing/services/subscription-pricing.service.ts
+++ b/libs/common/src/billing/services/subscription-pricing.service.ts
@@ -1,91 +1,154 @@
-import { Injectable } from "@angular/core";
-import { combineLatest, from, map, Observable, of, shareReplay } from "rxjs";
+import {
+  combineLatest,
+  combineLatestWith,
+  from,
+  map,
+  Observable,
+  of,
+  shareReplay,
+  switchMap,
+  take,
+  throwError,
+} from "rxjs";
 import { catchError } from "rxjs/operators";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PlanType } from "@bitwarden/common/billing/enums";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
+import { PremiumPlanResponse } from "@bitwarden/common/billing/models/response/premium-plan.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 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 { ToastService } from "@bitwarden/components";
 import { LogService } from "@bitwarden/logging";
-import { BillingServicesModule } from "@bitwarden/web-vault/app/billing/services/billing-services.module";
+
+import { SubscriptionPricingServiceAbstraction } from "../abstractions/subscription-pricing.service.abstraction";
 import {
   BusinessSubscriptionPricingTier,
   BusinessSubscriptionPricingTierIds,
   PersonalSubscriptionPricingTier,
   PersonalSubscriptionPricingTierIds,
   SubscriptionCadenceIds,
-} from "@bitwarden/web-vault/app/billing/types/subscription-pricing-tier";
+} from "../types/subscription-pricing-tier";
+
+export class DefaultSubscriptionPricingService implements SubscriptionPricingServiceAbstraction {
+  /**
+   * Fallback premium pricing used when the feature flag is disabled.
+   * These values represent the legacy pricing model and will not reflect
+   * server-side price changes. They are retained for backward compatibility
+   * during the feature flag rollout period.
+   */
+  private static readonly FALLBACK_PREMIUM_SEAT_PRICE = 10;
+  private static readonly FALLBACK_PREMIUM_STORAGE_PRICE = 4;
 
-@Injectable({ providedIn: BillingServicesModule })
-export class SubscriptionPricingService {
   constructor(
-    private apiService: ApiService,
+    private billingApiService: BillingApiServiceAbstraction,
+    private configService: ConfigService,
     private i18nService: I18nService,
     private logService: LogService,
-    private toastService: ToastService,
   ) {}
 
+  /**
+   * Gets personal subscription pricing tiers (Premium and Families).
+   * Throws any errors that occur during api request so callers must handle errors.
+   * @returns An observable of an array of personal subscription pricing tiers.
+   * @throws Error if any errors occur during api request.
+   */
   getPersonalSubscriptionPricingTiers$ = (): Observable<PersonalSubscriptionPricingTier[]> =>
     combineLatest([this.premium$, this.families$]).pipe(
       catchError((error: unknown) => {
-        this.logService.error(error);
-        this.showUnexpectedErrorToast();
-        return of([]);
+        this.logService.error("Failed to load personal subscription pricing tiers", error);
+        return throwError(() => error);
       }),
     );
 
+  /**
+   * Gets business subscription pricing tiers (Teams, Enterprise, and Custom).
+   * Throws any errors that occur during api request so callers must handle errors.
+   * @returns An observable of an array of business subscription pricing tiers.
+   * @throws Error if any errors occur during api request.
+   */
   getBusinessSubscriptionPricingTiers$ = (): Observable<BusinessSubscriptionPricingTier[]> =>
     combineLatest([this.teams$, this.enterprise$, this.custom$]).pipe(
       catchError((error: unknown) => {
-        this.logService.error(error);
-        this.showUnexpectedErrorToast();
-        return of([]);
+        this.logService.error("Failed to load business subscription pricing tiers", error);
+        return throwError(() => error);
       }),
     );
 
+  /**
+   * Gets developer subscription pricing tiers (Free, Teams, and Enterprise).
+   * Throws any errors that occur during api request so callers must handle errors.
+   * @returns An observable of an array of business subscription pricing tiers for developers.
+   * @throws Error if any errors occur during api request.
+   */
   getDeveloperSubscriptionPricingTiers$ = (): Observable<BusinessSubscriptionPricingTier[]> =>
     combineLatest([this.free$, this.teams$, this.enterprise$]).pipe(
       catchError((error: unknown) => {
-        this.logService.error(error);
-        this.showUnexpectedErrorToast();
-        return of([]);
+        this.logService.error("Failed to load developer subscription pricing tiers", error);
+        return throwError(() => error);
       }),
     );
 
   private plansResponse$: Observable<ListResponse<PlanResponse>> = from(
-    this.apiService.getPlans(),
+    this.billingApiService.getPlans(),
   ).pipe(shareReplay({ bufferSize: 1, refCount: false }));
 
-  private premium$: Observable<PersonalSubscriptionPricingTier> = of({
-    // premium plan is not configured server-side so for now, hardcode it
-    basePrice: 10,
-    additionalStoragePricePerGb: 4,
-  }).pipe(
-    map((details) => ({
-      id: PersonalSubscriptionPricingTierIds.Premium,
-      name: this.i18nService.t("premium"),
-      description: this.i18nService.t("planDescPremium"),
-      availableCadences: [SubscriptionCadenceIds.Annually],
-      passwordManager: {
-        type: "standalone",
-        annualPrice: details.basePrice,
-        annualPricePerAdditionalStorageGB: details.additionalStoragePricePerGb,
-        features: [
-          this.featureTranslations.builtInAuthenticator(),
-          this.featureTranslations.secureFileStorage(),
-          this.featureTranslations.emergencyAccess(),
-          this.featureTranslations.breachMonitoring(),
-          this.featureTranslations.andMoreFeatures(),
-        ],
-      },
-    })),
+  private premiumPlanResponse$: Observable<PremiumPlanResponse> = from(
+    this.billingApiService.getPremiumPlan(),
+  ).pipe(
+    catchError((error: unknown) => {
+      this.logService.error("Failed to fetch premium plan from API", error);
+      return throwError(() => error); // Re-throw to propagate to higher-level error handler
+    }),
+    shareReplay({ bufferSize: 1, refCount: false }),
   );
 
+  private premium$: Observable<PersonalSubscriptionPricingTier> = this.configService
+    .getFeatureFlag$(FeatureFlag.PM26793_FetchPremiumPriceFromPricingService)
+    .pipe(
+      take(1), // Lock behavior at first subscription to prevent switching data sources mid-stream
+      switchMap((fetchPremiumFromPricingService) =>
+        fetchPremiumFromPricingService
+          ? this.premiumPlanResponse$.pipe(
+              map((premiumPlan) => ({
+                seat: premiumPlan.seat.price,
+                storage: premiumPlan.storage.price,
+              })),
+            )
+          : of({
+              seat: DefaultSubscriptionPricingService.FALLBACK_PREMIUM_SEAT_PRICE,
+              storage: DefaultSubscriptionPricingService.FALLBACK_PREMIUM_STORAGE_PRICE,
+            }),
+      ),
+      map((premiumPrices) => ({
+        id: PersonalSubscriptionPricingTierIds.Premium,
+        name: this.i18nService.t("premium"),
+        description: this.i18nService.t("planDescPremium"),
+        availableCadences: [SubscriptionCadenceIds.Annually],
+        passwordManager: {
+          type: "standalone",
+          annualPrice: premiumPrices.seat,
+          annualPricePerAdditionalStorageGB: premiumPrices.storage,
+          features: [
+            this.featureTranslations.builtInAuthenticator(),
+            this.featureTranslations.secureFileStorage(),
+            this.featureTranslations.emergencyAccess(),
+            this.featureTranslations.breachMonitoring(),
+            this.featureTranslations.andMoreFeatures(),
+          ],
+        },
+      })),
+    );
+
   private families$: Observable<PersonalSubscriptionPricingTier> = this.plansResponse$.pipe(
-    map((plans) => {
-      const familiesPlan = plans.data.find((plan) => plan.type === PlanType.FamiliesAnnually)!;
+    combineLatestWith(this.configService.getFeatureFlag$(FeatureFlag.PM26462_Milestone_3)),
+    map(([plans, milestone3FeatureEnabled]) => {
+      const familiesPlan = plans.data.find(
+        (plan) =>
+          plan.type ===
+          (milestone3FeatureEnabled ? PlanType.FamiliesAnnually : PlanType.FamiliesAnnually2025),
+      )!;
 
       return {
         id: PersonalSubscriptionPricingTierIds.Families,
@@ -110,7 +173,7 @@ export class SubscriptionPricingService {
   );
 
   private free$: Observable<BusinessSubscriptionPricingTier> = this.plansResponse$.pipe(
-    map((plans) => {
+    map((plans): BusinessSubscriptionPricingTier => {
       const freePlan = plans.data.find((plan) => plan.type === PlanType.Free)!;
 
       return {
@@ -215,30 +278,24 @@ export class SubscriptionPricingService {
   );
 
   private custom$: Observable<BusinessSubscriptionPricingTier> = this.plansResponse$.pipe(
-    map(() => ({
-      id: BusinessSubscriptionPricingTierIds.Custom,
-      name: this.i18nService.t("planNameCustom"),
-      description: this.i18nService.t("planDescCustom"),
-      availableCadences: [],
-      passwordManager: {
-        type: "custom",
-        features: [
-          this.featureTranslations.strengthenCybersecurity(),
-          this.featureTranslations.boostProductivity(),
-          this.featureTranslations.seamlessIntegration(),
-        ],
-      },
-    })),
+    map(
+      (): BusinessSubscriptionPricingTier => ({
+        id: BusinessSubscriptionPricingTierIds.Custom,
+        name: this.i18nService.t("planNameCustom"),
+        description: this.i18nService.t("planDescCustom"),
+        availableCadences: [],
+        passwordManager: {
+          type: "custom",
+          features: [
+            this.featureTranslations.strengthenCybersecurity(),
+            this.featureTranslations.boostProductivity(),
+            this.featureTranslations.seamlessIntegration(),
+          ],
+        },
+      }),
+    ),
   );
 
-  private showUnexpectedErrorToast() {
-    this.toastService.showToast({
-      variant: "error",
-      title: "",
-      message: this.i18nService.t("unexpectedError"),
-    });
-  }
-
   private featureTranslations = {
     builtInAuthenticator: () => ({
       key: "builtInAuthenticator",
diff --git a/libs/common/src/billing/services/tax.service.ts b/libs/common/src/billing/services/tax.service.ts
deleted file mode 100644
index 27966016913..00000000000
--- a/libs/common/src/billing/services/tax.service.ts
+++ /dev/null
@@ -1,318 +0,0 @@
-import { PreviewTaxAmountForOrganizationTrialRequest } from "@bitwarden/common/billing/models/request/tax";
-
-import { ApiService } from "../../abstractions/api.service";
-import { TaxServiceAbstraction } from "../abstractions/tax.service.abstraction";
-import { CountryListItem } from "../models/domain";
-import { PreviewIndividualInvoiceRequest } from "../models/request/preview-individual-invoice.request";
-import { PreviewOrganizationInvoiceRequest } from "../models/request/preview-organization-invoice.request";
-import { PreviewInvoiceResponse } from "../models/response/preview-invoice.response";
-
-export class TaxService implements TaxServiceAbstraction {
-  constructor(private apiService: ApiService) {}
-
-  getCountries(): CountryListItem[] {
-    return [
-      { name: "-- Select --", value: "", disabled: false },
-      { name: "United States", value: "US", disabled: false },
-      { name: "China", value: "CN", disabled: false },
-      { name: "France", value: "FR", disabled: false },
-      { name: "Germany", value: "DE", disabled: false },
-      { name: "Canada", value: "CA", disabled: false },
-      { name: "United Kingdom", value: "GB", disabled: false },
-      { name: "Australia", value: "AU", disabled: false },
-      { name: "India", value: "IN", disabled: false },
-      { name: "", value: "-", disabled: true },
-      { name: "Afghanistan", value: "AF", disabled: false },
-      { name: "Åland Islands", value: "AX", disabled: false },
-      { name: "Albania", value: "AL", disabled: false },
-      { name: "Algeria", value: "DZ", disabled: false },
-      { name: "American Samoa", value: "AS", disabled: false },
-      { name: "Andorra", value: "AD", disabled: false },
-      { name: "Angola", value: "AO", disabled: false },
-      { name: "Anguilla", value: "AI", disabled: false },
-      { name: "Antarctica", value: "AQ", disabled: false },
-      { name: "Antigua and Barbuda", value: "AG", disabled: false },
-      { name: "Argentina", value: "AR", disabled: false },
-      { name: "Armenia", value: "AM", disabled: false },
-      { name: "Aruba", value: "AW", disabled: false },
-      { name: "Austria", value: "AT", disabled: false },
-      { name: "Azerbaijan", value: "AZ", disabled: false },
-      { name: "Bahamas", value: "BS", disabled: false },
-      { name: "Bahrain", value: "BH", disabled: false },
-      { name: "Bangladesh", value: "BD", disabled: false },
-      { name: "Barbados", value: "BB", disabled: false },
-      { name: "Belarus", value: "BY", disabled: false },
-      { name: "Belgium", value: "BE", disabled: false },
-      { name: "Belize", value: "BZ", disabled: false },
-      { name: "Benin", value: "BJ", disabled: false },
-      { name: "Bermuda", value: "BM", disabled: false },
-      { name: "Bhutan", value: "BT", disabled: false },
-      { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
-      { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
-      { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
-      { name: "Botswana", value: "BW", disabled: false },
-      { name: "Bouvet Island", value: "BV", disabled: false },
-      { name: "Brazil", value: "BR", disabled: false },
-      { name: "British Indian Ocean Territory", value: "IO", disabled: false },
-      { name: "Brunei Darussalam", value: "BN", disabled: false },
-      { name: "Bulgaria", value: "BG", disabled: false },
-      { name: "Burkina Faso", value: "BF", disabled: false },
-      { name: "Burundi", value: "BI", disabled: false },
-      { name: "Cambodia", value: "KH", disabled: false },
-      { name: "Cameroon", value: "CM", disabled: false },
-      { name: "Cape Verde", value: "CV", disabled: false },
-      { name: "Cayman Islands", value: "KY", disabled: false },
-      { name: "Central African Republic", value: "CF", disabled: false },
-      { name: "Chad", value: "TD", disabled: false },
-      { name: "Chile", value: "CL", disabled: false },
-      { name: "Christmas Island", value: "CX", disabled: false },
-      { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
-      { name: "Colombia", value: "CO", disabled: false },
-      { name: "Comoros", value: "KM", disabled: false },
-      { name: "Congo", value: "CG", disabled: false },
-      { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
-      { name: "Cook Islands", value: "CK", disabled: false },
-      { name: "Costa Rica", value: "CR", disabled: false },
-      { name: "Côte d'Ivoire", value: "CI", disabled: false },
-      { name: "Croatia", value: "HR", disabled: false },
-      { name: "Cuba", value: "CU", disabled: false },
-      { name: "Curaçao", value: "CW", disabled: false },
-      { name: "Cyprus", value: "CY", disabled: false },
-      { name: "Czech Republic", value: "CZ", disabled: false },
-      { name: "Denmark", value: "DK", disabled: false },
-      { name: "Djibouti", value: "DJ", disabled: false },
-      { name: "Dominica", value: "DM", disabled: false },
-      { name: "Dominican Republic", value: "DO", disabled: false },
-      { name: "Ecuador", value: "EC", disabled: false },
-      { name: "Egypt", value: "EG", disabled: false },
-      { name: "El Salvador", value: "SV", disabled: false },
-      { name: "Equatorial Guinea", value: "GQ", disabled: false },
-      { name: "Eritrea", value: "ER", disabled: false },
-      { name: "Estonia", value: "EE", disabled: false },
-      { name: "Ethiopia", value: "ET", disabled: false },
-      { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
-      { name: "Faroe Islands", value: "FO", disabled: false },
-      { name: "Fiji", value: "FJ", disabled: false },
-      { name: "Finland", value: "FI", disabled: false },
-      { name: "French Guiana", value: "GF", disabled: false },
-      { name: "French Polynesia", value: "PF", disabled: false },
-      { name: "French Southern Territories", value: "TF", disabled: false },
-      { name: "Gabon", value: "GA", disabled: false },
-      { name: "Gambia", value: "GM", disabled: false },
-      { name: "Georgia", value: "GE", disabled: false },
-      { name: "Ghana", value: "GH", disabled: false },
-      { name: "Gibraltar", value: "GI", disabled: false },
-      { name: "Greece", value: "GR", disabled: false },
-      { name: "Greenland", value: "GL", disabled: false },
-      { name: "Grenada", value: "GD", disabled: false },
-      { name: "Guadeloupe", value: "GP", disabled: false },
-      { name: "Guam", value: "GU", disabled: false },
-      { name: "Guatemala", value: "GT", disabled: false },
-      { name: "Guernsey", value: "GG", disabled: false },
-      { name: "Guinea", value: "GN", disabled: false },
-      { name: "Guinea-Bissau", value: "GW", disabled: false },
-      { name: "Guyana", value: "GY", disabled: false },
-      { name: "Haiti", value: "HT", disabled: false },
-      { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
-      { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
-      { name: "Honduras", value: "HN", disabled: false },
-      { name: "Hong Kong", value: "HK", disabled: false },
-      { name: "Hungary", value: "HU", disabled: false },
-      { name: "Iceland", value: "IS", disabled: false },
-      { name: "Indonesia", value: "ID", disabled: false },
-      { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
-      { name: "Iraq", value: "IQ", disabled: false },
-      { name: "Ireland", value: "IE", disabled: false },
-      { name: "Isle of Man", value: "IM", disabled: false },
-      { name: "Israel", value: "IL", disabled: false },
-      { name: "Italy", value: "IT", disabled: false },
-      { name: "Jamaica", value: "JM", disabled: false },
-      { name: "Japan", value: "JP", disabled: false },
-      { name: "Jersey", value: "JE", disabled: false },
-      { name: "Jordan", value: "JO", disabled: false },
-      { name: "Kazakhstan", value: "KZ", disabled: false },
-      { name: "Kenya", value: "KE", disabled: false },
-      { name: "Kiribati", value: "KI", disabled: false },
-      { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
-      { name: "Korea, Republic of", value: "KR", disabled: false },
-      { name: "Kuwait", value: "KW", disabled: false },
-      { name: "Kyrgyzstan", value: "KG", disabled: false },
-      { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
-      { name: "Latvia", value: "LV", disabled: false },
-      { name: "Lebanon", value: "LB", disabled: false },
-      { name: "Lesotho", value: "LS", disabled: false },
-      { name: "Liberia", value: "LR", disabled: false },
-      { name: "Libya", value: "LY", disabled: false },
-      { name: "Liechtenstein", value: "LI", disabled: false },
-      { name: "Lithuania", value: "LT", disabled: false },
-      { name: "Luxembourg", value: "LU", disabled: false },
-      { name: "Macao", value: "MO", disabled: false },
-      { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
-      { name: "Madagascar", value: "MG", disabled: false },
-      { name: "Malawi", value: "MW", disabled: false },
-      { name: "Malaysia", value: "MY", disabled: false },
-      { name: "Maldives", value: "MV", disabled: false },
-      { name: "Mali", value: "ML", disabled: false },
-      { name: "Malta", value: "MT", disabled: false },
-      { name: "Marshall Islands", value: "MH", disabled: false },
-      { name: "Martinique", value: "MQ", disabled: false },
-      { name: "Mauritania", value: "MR", disabled: false },
-      { name: "Mauritius", value: "MU", disabled: false },
-      { name: "Mayotte", value: "YT", disabled: false },
-      { name: "Mexico", value: "MX", disabled: false },
-      { name: "Micronesia, Federated States of", value: "FM", disabled: false },
-      { name: "Moldova, Republic of", value: "MD", disabled: false },
-      { name: "Monaco", value: "MC", disabled: false },
-      { name: "Mongolia", value: "MN", disabled: false },
-      { name: "Montenegro", value: "ME", disabled: false },
-      { name: "Montserrat", value: "MS", disabled: false },
-      { name: "Morocco", value: "MA", disabled: false },
-      { name: "Mozambique", value: "MZ", disabled: false },
-      { name: "Myanmar", value: "MM", disabled: false },
-      { name: "Namibia", value: "NA", disabled: false },
-      { name: "Nauru", value: "NR", disabled: false },
-      { name: "Nepal", value: "NP", disabled: false },
-      { name: "Netherlands", value: "NL", disabled: false },
-      { name: "New Caledonia", value: "NC", disabled: false },
-      { name: "New Zealand", value: "NZ", disabled: false },
-      { name: "Nicaragua", value: "NI", disabled: false },
-      { name: "Niger", value: "NE", disabled: false },
-      { name: "Nigeria", value: "NG", disabled: false },
-      { name: "Niue", value: "NU", disabled: false },
-      { name: "Norfolk Island", value: "NF", disabled: false },
-      { name: "Northern Mariana Islands", value: "MP", disabled: false },
-      { name: "Norway", value: "NO", disabled: false },
-      { name: "Oman", value: "OM", disabled: false },
-      { name: "Pakistan", value: "PK", disabled: false },
-      { name: "Palau", value: "PW", disabled: false },
-      { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
-      { name: "Panama", value: "PA", disabled: false },
-      { name: "Papua New Guinea", value: "PG", disabled: false },
-      { name: "Paraguay", value: "PY", disabled: false },
-      { name: "Peru", value: "PE", disabled: false },
-      { name: "Philippines", value: "PH", disabled: false },
-      { name: "Pitcairn", value: "PN", disabled: false },
-      { name: "Poland", value: "PL", disabled: false },
-      { name: "Portugal", value: "PT", disabled: false },
-      { name: "Puerto Rico", value: "PR", disabled: false },
-      { name: "Qatar", value: "QA", disabled: false },
-      { name: "Réunion", value: "RE", disabled: false },
-      { name: "Romania", value: "RO", disabled: false },
-      { name: "Russian Federation", value: "RU", disabled: false },
-      { name: "Rwanda", value: "RW", disabled: false },
-      { name: "Saint Barthélemy", value: "BL", disabled: false },
-      { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
-      { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
-      { name: "Saint Lucia", value: "LC", disabled: false },
-      { name: "Saint Martin (French part)", value: "MF", disabled: false },
-      { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
-      { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
-      { name: "Samoa", value: "WS", disabled: false },
-      { name: "San Marino", value: "SM", disabled: false },
-      { name: "Sao Tome and Principe", value: "ST", disabled: false },
-      { name: "Saudi Arabia", value: "SA", disabled: false },
-      { name: "Senegal", value: "SN", disabled: false },
-      { name: "Serbia", value: "RS", disabled: false },
-      { name: "Seychelles", value: "SC", disabled: false },
-      { name: "Sierra Leone", value: "SL", disabled: false },
-      { name: "Singapore", value: "SG", disabled: false },
-      { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
-      { name: "Slovakia", value: "SK", disabled: false },
-      { name: "Slovenia", value: "SI", disabled: false },
-      { name: "Solomon Islands", value: "SB", disabled: false },
-      { name: "Somalia", value: "SO", disabled: false },
-      { name: "South Africa", value: "ZA", disabled: false },
-      { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
-      { name: "South Sudan", value: "SS", disabled: false },
-      { name: "Spain", value: "ES", disabled: false },
-      { name: "Sri Lanka", value: "LK", disabled: false },
-      { name: "Sudan", value: "SD", disabled: false },
-      { name: "Suriname", value: "SR", disabled: false },
-      { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
-      { name: "Swaziland", value: "SZ", disabled: false },
-      { name: "Sweden", value: "SE", disabled: false },
-      { name: "Switzerland", value: "CH", disabled: false },
-      { name: "Syrian Arab Republic", value: "SY", disabled: false },
-      { name: "Taiwan", value: "TW", disabled: false },
-      { name: "Tajikistan", value: "TJ", disabled: false },
-      { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
-      { name: "Thailand", value: "TH", disabled: false },
-      { name: "Timor-Leste", value: "TL", disabled: false },
-      { name: "Togo", value: "TG", disabled: false },
-      { name: "Tokelau", value: "TK", disabled: false },
-      { name: "Tonga", value: "TO", disabled: false },
-      { name: "Trinidad and Tobago", value: "TT", disabled: false },
-      { name: "Tunisia", value: "TN", disabled: false },
-      { name: "Turkey", value: "TR", disabled: false },
-      { name: "Turkmenistan", value: "TM", disabled: false },
-      { name: "Turks and Caicos Islands", value: "TC", disabled: false },
-      { name: "Tuvalu", value: "TV", disabled: false },
-      { name: "Uganda", value: "UG", disabled: false },
-      { name: "Ukraine", value: "UA", disabled: false },
-      { name: "United Arab Emirates", value: "AE", disabled: false },
-      { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
-      { name: "Uruguay", value: "UY", disabled: false },
-      { name: "Uzbekistan", value: "UZ", disabled: false },
-      { name: "Vanuatu", value: "VU", disabled: false },
-      { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
-      { name: "Viet Nam", value: "VN", disabled: false },
-      { name: "Virgin Islands, British", value: "VG", disabled: false },
-      { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
-      { name: "Wallis and Futuna", value: "WF", disabled: false },
-      { name: "Western Sahara", value: "EH", disabled: false },
-      { name: "Yemen", value: "YE", disabled: false },
-      { name: "Zambia", value: "ZM", disabled: false },
-      { name: "Zimbabwe", value: "ZW", disabled: false },
-    ];
-  }
-
-  async isCountrySupported(country: string): Promise<boolean> {
-    const response = await this.apiService.send(
-      "GET",
-      "/tax/is-country-supported?country=" + country,
-      null,
-      true,
-      true,
-    );
-    return response;
-  }
-
-  async previewIndividualInvoice(
-    request: PreviewIndividualInvoiceRequest,
-  ): Promise<PreviewInvoiceResponse> {
-    const response = await this.apiService.send(
-      "POST",
-      "/accounts/billing/preview-invoice",
-      request,
-      true,
-      true,
-    );
-    return new PreviewInvoiceResponse(response);
-  }
-
-  async previewOrganizationInvoice(
-    request: PreviewOrganizationInvoiceRequest,
-  ): Promise<PreviewInvoiceResponse> {
-    const response = await this.apiService.send(
-      "POST",
-      `/invoices/preview-organization`,
-      request,
-      true,
-      true,
-    );
-    return new PreviewInvoiceResponse(response);
-  }
-
-  async previewTaxAmountForOrganizationTrial(
-    request: PreviewTaxAmountForOrganizationTrialRequest,
-  ): Promise<number> {
-    const response = await this.apiService.send(
-      "POST",
-      "/tax/preview-amount/organization-trial",
-      request,
-      true,
-      true,
-    );
-    return response as number;
-  }
-}
diff --git a/apps/web/src/app/billing/types/subscription-pricing-tier.ts b/libs/common/src/billing/types/subscription-pricing-tier.ts
similarity index 100%
rename from apps/web/src/app/billing/types/subscription-pricing-tier.ts
rename to libs/common/src/billing/types/subscription-pricing-tier.ts
diff --git a/libs/common/src/enums/event-type.enum.ts b/libs/common/src/enums/event-type.enum.ts
index f6a48fe23bb..b3b12118ede 100644
--- a/libs/common/src/enums/event-type.enum.ts
+++ b/libs/common/src/enums/event-type.enum.ts
@@ -108,4 +108,11 @@ export enum EventType {
   Project_Created = 2201,
   Project_Edited = 2202,
   Project_Deleted = 2203,
+
+  ServiceAccount_UserAdded = 2300,
+  ServiceAccount_UserRemoved = 2301,
+  ServiceAccount_GroupAdded = 2302,
+  ServiceAccount_GroupRemoved = 2303,
+  ServiceAccount_Created = 2304,
+  ServiceAccount_Deleted = 2305,
 }
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 18134fee2c3..be2ea75203c 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -12,11 +12,11 @@ import { ServerConfig } from "../platform/abstractions/config/server-config";
 export enum FeatureFlag {
   /* Admin Console Team */
   CreateDefaultLocation = "pm-19467-create-default-location",
-  CollectionVaultRefactor = "pm-25030-resolve-ts-upgrade-errors",
+  AutoConfirm = "pm-19934-auto-confirm-organization-users",
+  BlockClaimedDomainAccountCreation = "pm-28297-block-uninvited-claimed-domain-registration",
 
   /* Auth */
-  PM14938_BrowserExtensionLoginApproval = "pm-14938-browser-extension-login-approvals",
-  PM22110_DisableAlternateLoginMethods = "pm-22110-disable-alternate-login-methods",
+  PM23801_PrefetchPasswordPrelogin = "pm-23801-prefetch-password-prelogin",
 
   /* Autofill */
   MacOsNativeCredentialSync = "macos-native-credential-sync",
@@ -24,23 +24,34 @@ export enum FeatureFlag {
 
   /* Billing */
   TrialPaymentOptional = "PM-8163-trial-payment",
-  PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships",
-  PM21881_ManagePaymentDetailsOutsideCheckout = "pm-21881-manage-payment-details-outside-checkout",
   PM21821_ProviderPortalTakeover = "pm-21821-provider-portal-takeover",
   PM22415_TaxIDWarnings = "pm-22415-tax-id-warnings",
+  PM24032_NewNavigationPremiumUpgradeButton = "pm-24032-new-navigation-premium-upgrade-button",
+  PM25379_UseNewOrganizationMetadataStructure = "pm-25379-use-new-organization-metadata-structure",
+  PM24996_ImplementUpgradeFromFreeDialog = "pm-24996-implement-upgrade-from-free-dialog",
+  PM24033PremiumUpgradeNewDesign = "pm-24033-updat-premium-subscription-page",
+  PM26793_FetchPremiumPriceFromPricingService = "pm-26793-fetch-premium-price-from-pricing-service",
+  PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog = "pm-23713-premium-badge-opens-new-premium-upgrade-dialog",
+  PM26462_Milestone_3 = "pm-26462-milestone-3",
+  PM23341_Milestone_2 = "pm-23341-milestone-2",
 
   /* Key Management */
   PrivateKeyRegeneration = "pm-12241-private-key-regeneration",
   EnrollAeadOnKeyRotation = "enroll-aead-on-key-rotation",
   ForceUpdateKDFSettings = "pm-18021-force-update-kdf-settings",
+  PM25174_DisableType0Decryption = "pm-25174-disable-type-0-decryption",
+  LinuxBiometricsV2 = "pm-26340-linux-biometrics-v2",
+  UnlockWithMasterPasswordUnlockData = "pm-23246-unlock-with-master-password-unlock-data",
+  NoLogoutOnKdfChange = "pm-23995-no-logout-on-kdf-change",
+  ConsolidatedSessionTimeoutComponent = "pm-26056-consolidated-session-timeout-component",
 
   /* Tools */
   DesktopSendUIRefresh = "desktop-send-ui-refresh",
   UseSdkPasswordGenerators = "pm-19976-use-sdk-password-generators",
-  UseChromiumImporter = "pm-23982-chromium-importer",
+  ChromiumImporterWithABE = "pm-25855-chromium-importer-abe",
 
   /* DIRT */
-  EventBasedOrganizationIntegrations = "event-based-organization-integrations",
+  EventManagementForDataDogAndCrowdStrike = "event-management-for-datadog-and-crowdstrike",
   PhishingDetection = "phishing-detection",
   PM22887_RiskInsightsActivityTab = "pm-22887-risk-insights-activity-tab",
 
@@ -49,6 +60,9 @@ export enum FeatureFlag {
   PM22134SdkCipherListView = "pm-22134-sdk-cipher-list-view",
   PM22136_SdkCipherEncryption = "pm-22136-sdk-cipher-encryption",
   CipherKeyEncryption = "cipher-key-encryption",
+  AutofillConfirmation = "pm-25083-autofill-confirm-from-search",
+  RiskInsightsForPremium = "pm-23904-risk-insights-for-premium",
+  VaultLoadingSkeletons = "pm-25081-vault-skeleton-loaders",
 
   /* Platform */
   IpcChannelFramework = "ipc-channel-framework",
@@ -57,6 +71,9 @@ export enum FeatureFlag {
 
   /* Innovation */
   PM19148_InnovationArchive = "pm-19148-innovation-archive",
+
+  /* UIF */
+  RouterFocusManagement = "router-focus-management",
 }
 
 export type AllowedFeatureFlagTypes = boolean | number | string;
@@ -75,7 +92,8 @@ const FALSE = false as boolean;
 export const DefaultFeatureFlagValue = {
   /* Admin Console Team */
   [FeatureFlag.CreateDefaultLocation]: FALSE,
-  [FeatureFlag.CollectionVaultRefactor]: FALSE,
+  [FeatureFlag.AutoConfirm]: FALSE,
+  [FeatureFlag.BlockClaimedDomainAccountCreation]: FALSE,
 
   /* Autofill */
   [FeatureFlag.MacOsNativeCredentialSync]: FALSE,
@@ -84,10 +102,10 @@ export const DefaultFeatureFlagValue = {
   /* Tools */
   [FeatureFlag.DesktopSendUIRefresh]: FALSE,
   [FeatureFlag.UseSdkPasswordGenerators]: FALSE,
-  [FeatureFlag.UseChromiumImporter]: FALSE,
+  [FeatureFlag.ChromiumImporterWithABE]: FALSE,
 
   /* DIRT */
-  [FeatureFlag.EventBasedOrganizationIntegrations]: FALSE,
+  [FeatureFlag.EventManagementForDataDogAndCrowdStrike]: FALSE,
   [FeatureFlag.PhishingDetection]: FALSE,
   [FeatureFlag.PM22887_RiskInsightsActivityTab]: FALSE,
 
@@ -96,22 +114,35 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.PM19941MigrateCipherDomainToSdk]: FALSE,
   [FeatureFlag.PM22134SdkCipherListView]: FALSE,
   [FeatureFlag.PM22136_SdkCipherEncryption]: FALSE,
+  [FeatureFlag.AutofillConfirmation]: FALSE,
+  [FeatureFlag.RiskInsightsForPremium]: FALSE,
+  [FeatureFlag.VaultLoadingSkeletons]: FALSE,
 
   /* Auth */
-  [FeatureFlag.PM14938_BrowserExtensionLoginApproval]: FALSE,
-  [FeatureFlag.PM22110_DisableAlternateLoginMethods]: FALSE,
+  [FeatureFlag.PM23801_PrefetchPasswordPrelogin]: FALSE,
 
   /* Billing */
   [FeatureFlag.TrialPaymentOptional]: FALSE,
-  [FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE,
-  [FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout]: FALSE,
   [FeatureFlag.PM21821_ProviderPortalTakeover]: FALSE,
   [FeatureFlag.PM22415_TaxIDWarnings]: FALSE,
+  [FeatureFlag.PM24032_NewNavigationPremiumUpgradeButton]: FALSE,
+  [FeatureFlag.PM25379_UseNewOrganizationMetadataStructure]: FALSE,
+  [FeatureFlag.PM24996_ImplementUpgradeFromFreeDialog]: FALSE,
+  [FeatureFlag.PM24033PremiumUpgradeNewDesign]: FALSE,
+  [FeatureFlag.PM26793_FetchPremiumPriceFromPricingService]: FALSE,
+  [FeatureFlag.PM23713_PremiumBadgeOpensNewPremiumUpgradeDialog]: FALSE,
+  [FeatureFlag.PM26462_Milestone_3]: FALSE,
+  [FeatureFlag.PM23341_Milestone_2]: FALSE,
 
   /* Key Management */
   [FeatureFlag.PrivateKeyRegeneration]: FALSE,
   [FeatureFlag.EnrollAeadOnKeyRotation]: FALSE,
   [FeatureFlag.ForceUpdateKDFSettings]: FALSE,
+  [FeatureFlag.PM25174_DisableType0Decryption]: FALSE,
+  [FeatureFlag.LinuxBiometricsV2]: FALSE,
+  [FeatureFlag.UnlockWithMasterPasswordUnlockData]: FALSE,
+  [FeatureFlag.NoLogoutOnKdfChange]: FALSE,
+  [FeatureFlag.ConsolidatedSessionTimeoutComponent]: FALSE,
 
   /* Platform */
   [FeatureFlag.IpcChannelFramework]: FALSE,
@@ -120,6 +151,9 @@ export const DefaultFeatureFlagValue = {
 
   /* Innovation */
   [FeatureFlag.PM19148_InnovationArchive]: FALSE,
+
+  /* UIF */
+  [FeatureFlag.RouterFocusManagement]: FALSE,
 } satisfies Record<FeatureFlag, AllowedFeatureFlagTypes>;
 
 export type DefaultFeatureFlagValueType = typeof DefaultFeatureFlagValue;
diff --git a/libs/common/src/enums/index.ts b/libs/common/src/enums/index.ts
index cf9dac80189..000f2a074d8 100644
--- a/libs/common/src/enums/index.ts
+++ b/libs/common/src/enums/index.ts
@@ -6,3 +6,4 @@ export * from "./http-status-code.enum";
 export * from "./integration-type.enum";
 export * from "./native-messaging-version.enum";
 export * from "./notification-type.enum";
+export * from "./push-notification-logout-reason.enum";
diff --git a/libs/common/src/enums/push-notification-logout-reason.enum.ts b/libs/common/src/enums/push-notification-logout-reason.enum.ts
new file mode 100644
index 00000000000..ab269248850
--- /dev/null
+++ b/libs/common/src/enums/push-notification-logout-reason.enum.ts
@@ -0,0 +1,6 @@
+export const PushNotificationLogOutReasonType = Object.freeze({
+  KdfChange: 0,
+} as const);
+
+export type PushNotificationLogOutReasonType =
+  (typeof PushNotificationLogOutReasonType)[keyof typeof PushNotificationLogOutReasonType];
diff --git a/libs/common/src/key-management/abstractions/process-reload.service.ts b/libs/common/src/key-management/abstractions/process-reload.service.ts
index e46c1e23199..4993f2212b9 100644
--- a/libs/common/src/key-management/abstractions/process-reload.service.ts
+++ b/libs/common/src/key-management/abstractions/process-reload.service.ts
@@ -1,6 +1,4 @@
-import { AuthService } from "../../auth/abstractions/auth.service";
-
 export abstract class ProcessReloadServiceAbstraction {
-  abstract startProcessReload(authService: AuthService): Promise<void>;
+  abstract startProcessReload(): Promise<void>;
   abstract cancelProcessReload(): void;
 }
diff --git a/libs/common/src/key-management/crypto/abstractions/encrypt.service.ts b/libs/common/src/key-management/crypto/abstractions/encrypt.service.ts
index 87af3852116..25e5f949b40 100644
--- a/libs/common/src/key-management/crypto/abstractions/encrypt.service.ts
+++ b/libs/common/src/key-management/crypto/abstractions/encrypt.service.ts
@@ -1,8 +1,16 @@
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
 import { EncArrayBuffer } from "../../../platform/models/domain/enc-array-buffer";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { EncString } from "../models/enc-string";
 
 export abstract class EncryptService {
+  /**
+   * A temporary init method to make the encrypt service listen to feature-flag changes.
+   * This will be removed once the feature flag has been rolled out.
+   */
+  abstract init(configService: ConfigService): void;
+
   /**
    * Encrypts a string to an EncString
    * @param plainValue - The value to encrypt
diff --git a/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts b/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
index 6daede6be67..132bbc306cb 100644
--- a/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
+++ b/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
@@ -1,7 +1,9 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { EncryptionType } from "@bitwarden/common/platform/enums";
@@ -13,12 +15,28 @@ import { PureCrypto } from "@bitwarden/sdk-internal";
 import { EncryptService } from "../abstractions/encrypt.service";
 
 export class EncryptServiceImplementation implements EncryptService {
+  private disableType0Decryption = false;
+
   constructor(
     protected cryptoFunctionService: CryptoFunctionService,
     protected logService: LogService,
     protected logMacFailures: boolean,
   ) {}
 
+  init(configService: ConfigService): void {
+    configService.serverConfig$.subscribe((newConfig) => {
+      if (newConfig != null) {
+        this.setDisableType0Decryption(
+          newConfig.featureStates[FeatureFlag.PM25174_DisableType0Decryption] === true,
+        );
+      }
+    });
+  }
+
+  setDisableType0Decryption(disable: boolean): void {
+    this.disableType0Decryption = disable;
+  }
+
   async encryptString(plainValue: string, key: SymmetricCryptoKey): Promise<EncString> {
     if (plainValue == null) {
       this.logService.warning(
@@ -42,16 +60,25 @@ export class EncryptServiceImplementation implements EncryptService {
   }
 
   async decryptString(encString: EncString, key: SymmetricCryptoKey): Promise<string> {
+    if (this.disableType0Decryption && encString.encryptionType === EncryptionType.AesCbc256_B64) {
+      throw new Error("Decryption of AesCbc256_B64 encrypted data is disabled.");
+    }
     await SdkLoadService.Ready;
     return PureCrypto.symmetric_decrypt_string(encString.encryptedString, key.toEncoded());
   }
 
   async decryptBytes(encString: EncString, key: SymmetricCryptoKey): Promise<Uint8Array> {
+    if (this.disableType0Decryption && encString.encryptionType === EncryptionType.AesCbc256_B64) {
+      throw new Error("Decryption of AesCbc256_B64 encrypted data is disabled.");
+    }
     await SdkLoadService.Ready;
     return PureCrypto.symmetric_decrypt_bytes(encString.encryptedString, key.toEncoded());
   }
 
   async decryptFileData(encBuffer: EncArrayBuffer, key: SymmetricCryptoKey): Promise<Uint8Array> {
+    if (this.disableType0Decryption && encBuffer.encryptionType === EncryptionType.AesCbc256_B64) {
+      throw new Error("Decryption of AesCbc256_B64 encrypted data is disabled.");
+    }
     await SdkLoadService.Ready;
     return PureCrypto.symmetric_decrypt_filedata(encBuffer.buffer, key.toEncoded());
   }
@@ -121,6 +148,13 @@ export class EncryptServiceImplementation implements EncryptService {
       throw new Error("No wrappingKey provided for unwrapping.");
     }
 
+    if (
+      this.disableType0Decryption &&
+      wrappedDecapsulationKey.encryptionType === EncryptionType.AesCbc256_B64
+    ) {
+      throw new Error("Decryption of AesCbc256_B64 encrypted data is disabled.");
+    }
+
     await SdkLoadService.Ready;
     return PureCrypto.unwrap_decapsulation_key(
       wrappedDecapsulationKey.encryptedString,
@@ -137,6 +171,12 @@ export class EncryptServiceImplementation implements EncryptService {
     if (wrappingKey == null) {
       throw new Error("No wrappingKey provided for unwrapping.");
     }
+    if (
+      this.disableType0Decryption &&
+      wrappedEncapsulationKey.encryptionType === EncryptionType.AesCbc256_B64
+    ) {
+      throw new Error("Decryption of AesCbc256_B64 encrypted data is disabled.");
+    }
 
     await SdkLoadService.Ready;
     return PureCrypto.unwrap_encapsulation_key(
@@ -154,6 +194,12 @@ export class EncryptServiceImplementation implements EncryptService {
     if (wrappingKey == null) {
       throw new Error("No wrappingKey provided for unwrapping.");
     }
+    if (
+      this.disableType0Decryption &&
+      keyToBeUnwrapped.encryptionType === EncryptionType.AesCbc256_B64
+    ) {
+      throw new Error("Decryption of AesCbc256_B64 encrypted data is disabled.");
+    }
 
     await SdkLoadService.Ready;
     return new SymmetricCryptoKey(
diff --git a/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts b/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
index 0cc7824a918..466f59da7c9 100644
--- a/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
+++ b/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
@@ -171,6 +171,15 @@ describe("EncryptService", () => {
         key.toEncoded(),
       );
     });
+
+    it("throws if disableType0Decryption is enabled and type is AesCbc256_B64", async () => {
+      encryptService.setDisableType0Decryption(true);
+      const key = new SymmetricCryptoKey(makeStaticByteArray(64));
+      const encString = new EncString(EncryptionType.AesCbc256_B64, "encrypted_string");
+      await expect(encryptService.decryptString(encString, key)).rejects.toThrow(
+        "Decryption of AesCbc256_B64 encrypted data is disabled.",
+      );
+    });
   });
 
   describe("decryptBytes", () => {
@@ -184,6 +193,15 @@ describe("EncryptService", () => {
         key.toEncoded(),
       );
     });
+
+    it("throws if disableType0Decryption is enabled and type is AesCbc256_B64", async () => {
+      encryptService.setDisableType0Decryption(true);
+      const key = new SymmetricCryptoKey(makeStaticByteArray(64));
+      const encString = new EncString(EncryptionType.AesCbc256_B64, "encrypted_bytes");
+      await expect(encryptService.decryptBytes(encString, key)).rejects.toThrow(
+        "Decryption of AesCbc256_B64 encrypted data is disabled.",
+      );
+    });
   });
 
   describe("decryptFileData", () => {
@@ -197,6 +215,20 @@ describe("EncryptService", () => {
         key.toEncoded(),
       );
     });
+
+    it("throws if disableType0Decryption is enabled and type is AesCbc256_B64", async () => {
+      encryptService.setDisableType0Decryption(true);
+      const key = new SymmetricCryptoKey(makeStaticByteArray(64));
+      const encBuffer = EncArrayBuffer.fromParts(
+        EncryptionType.AesCbc256_B64,
+        new Uint8Array(16),
+        new Uint8Array(32),
+        null,
+      );
+      await expect(encryptService.decryptFileData(encBuffer, key)).rejects.toThrow(
+        "Decryption of AesCbc256_B64 encrypted data is disabled.",
+      );
+    });
   });
 
   describe("unwrapDecapsulationKey", () => {
@@ -210,6 +242,14 @@ describe("EncryptService", () => {
         key.toEncoded(),
       );
     });
+    it("throws if disableType0Decryption is enabled and type is AesCbc256_B64", async () => {
+      encryptService.setDisableType0Decryption(true);
+      const key = new SymmetricCryptoKey(makeStaticByteArray(64));
+      const encString = new EncString(EncryptionType.AesCbc256_B64, "wrapped_decapsulation_key");
+      await expect(encryptService.unwrapDecapsulationKey(encString, key)).rejects.toThrow(
+        "Decryption of AesCbc256_B64 encrypted data is disabled.",
+      );
+    });
     it("throws if wrappedDecapsulationKey is null", () => {
       const key = new SymmetricCryptoKey(makeStaticByteArray(64));
       return expect(encryptService.unwrapDecapsulationKey(null, key)).rejects.toThrow(
@@ -235,6 +275,14 @@ describe("EncryptService", () => {
         key.toEncoded(),
       );
     });
+    it("throws if disableType0Decryption is enabled and type is AesCbc256_B64", async () => {
+      encryptService.setDisableType0Decryption(true);
+      const key = new SymmetricCryptoKey(makeStaticByteArray(64));
+      const encString = new EncString(EncryptionType.AesCbc256_B64, "wrapped_encapsulation_key");
+      await expect(encryptService.unwrapEncapsulationKey(encString, key)).rejects.toThrow(
+        "Decryption of AesCbc256_B64 encrypted data is disabled.",
+      );
+    });
     it("throws if wrappedEncapsulationKey is null", () => {
       const key = new SymmetricCryptoKey(makeStaticByteArray(64));
       return expect(encryptService.unwrapEncapsulationKey(null, key)).rejects.toThrow(
@@ -260,6 +308,14 @@ describe("EncryptService", () => {
         key.toEncoded(),
       );
     });
+    it("throws if disableType0Decryption is enabled and type is AesCbc256_B64", async () => {
+      encryptService.setDisableType0Decryption(true);
+      const key = new SymmetricCryptoKey(makeStaticByteArray(64));
+      const encString = new EncString(EncryptionType.AesCbc256_B64, "wrapped_symmetric_key");
+      await expect(encryptService.unwrapSymmetricKey(encString, key)).rejects.toThrow(
+        "Decryption of AesCbc256_B64 encrypted data is disabled.",
+      );
+    });
     it("throws if keyToBeUnwrapped is null", () => {
       const key = new SymmetricCryptoKey(makeStaticByteArray(64));
       return expect(encryptService.unwrapSymmetricKey(null, key)).rejects.toThrow(
diff --git a/libs/common/src/key-management/crypto/services/web-crypto-function.service.ts b/libs/common/src/key-management/crypto/services/web-crypto-function.service.ts
index 175da716803..11c186bc393 100644
--- a/libs/common/src/key-management/crypto/services/web-crypto-function.service.ts
+++ b/libs/common/src/key-management/crypto/services/web-crypto-function.service.ts
@@ -8,6 +8,7 @@ import {
 } from "../../../platform/models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { CsprngArray } from "../../../types/csprng";
+import { UnsignedPublicKey } from "../../types";
 import { CryptoFunctionService } from "../abstractions/crypto-function.service";
 
 export class WebCryptoFunctionService implements CryptoFunctionService {
@@ -309,7 +310,7 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
       "encrypt",
     ]);
     const buffer = await this.subtle.exportKey("spki", impPublicKey);
-    return new Uint8Array(buffer);
+    return new Uint8Array(buffer) as UnsignedPublicKey;
   }
 
   async aesGenerateKey(bitLength = 128 | 192 | 256 | 512): Promise<CsprngArray> {
diff --git a/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts b/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts
index 58a2c680afa..59bd7bc11f2 100644
--- a/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts
+++ b/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts
@@ -1,14 +1,15 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { firstValueFrom, map, Observable, Subject } from "rxjs";
+import { firstValueFrom, map, Observable, Subject, switchMap } 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 { RotateableKeySet, UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 // 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";
 
+import { AccountService } from "../../../auth/abstractions/account.service";
 import { DeviceResponse } from "../../../auth/abstractions/devices/responses/device.response";
 import { DevicesApiServiceAbstraction } from "../../../auth/abstractions/devices-api.service.abstraction";
 import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request";
@@ -33,6 +34,7 @@ import { KeyGenerationService } from "../../crypto";
 import { CryptoFunctionService } from "../../crypto/abstractions/crypto-function.service";
 import { EncryptService } from "../../crypto/abstractions/encrypt.service";
 import { EncString } from "../../crypto/models/enc-string";
+import { RotateableKeySet } from "../../keys/models/rotateable-key-set";
 import { DeviceTrustServiceAbstraction } from "../abstractions/device-trust.service.abstraction";
 
 /** Uses disk storage so that the device key can persist after log out and tab removal. */
@@ -86,10 +88,18 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
     private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private logService: LogService,
     private configService: ConfigService,
+    private accountService: AccountService,
   ) {
-    this.supportsDeviceTrust$ = this.userDecryptionOptionsService.userDecryptionOptions$.pipe(
-      map((options) => {
-        return options?.trustedDeviceOption != null;
+    this.supportsDeviceTrust$ = this.accountService.activeAccount$.pipe(
+      switchMap((account) => {
+        if (account == null) {
+          return [false];
+        }
+        return this.userDecryptionOptionsService.userDecryptionOptionsById$(account.id).pipe(
+          map((options) => {
+            return options?.trustedDeviceOption != null;
+          }),
+        );
       }),
     );
   }
@@ -145,7 +155,7 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
     }
 
     // Attempt to get user key
-    const userKey: UserKey = await this.keyService.getUserKey(userId);
+    const userKey = await firstValueFrom(this.keyService.userKey$(userId));
 
     // If user key is not found, throw error
     if (!userKey) {
@@ -240,7 +250,7 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
 
           const request = new OtherDeviceKeysUpdateRequest();
           request.encryptedPublicKey = newRotateableKeySet.encryptedPublicKey.encryptedString;
-          request.encryptedUserKey = newRotateableKeySet.encryptedUserKey.encryptedString;
+          request.encryptedUserKey = newRotateableKeySet.encapsulatedDownstreamKey.encryptedString;
           request.deviceId = device.id;
           return request;
         })
diff --git a/libs/common/src/key-management/device-trust/services/device-trust.service.spec.ts b/libs/common/src/key-management/device-trust/services/device-trust.service.spec.ts
index 7ed28518012..024a21766ee 100644
--- a/libs/common/src/key-management/device-trust/services/device-trust.service.spec.ts
+++ b/libs/common/src/key-management/device-trust/services/device-trust.service.spec.ts
@@ -366,7 +366,6 @@ describe("deviceTrustService", () => {
 
       let makeDeviceKeySpy: jest.SpyInstance;
       let rsaGenerateKeyPairSpy: jest.SpyInstance;
-      let cryptoSvcGetUserKeySpy: jest.SpyInstance;
       let cryptoSvcRsaEncryptSpy: jest.SpyInstance;
       let encryptServiceWrapDecapsulationKeySpy: jest.SpyInstance;
       let encryptServiceWrapEncapsulationKeySpy: jest.SpyInstance;
@@ -402,6 +401,8 @@ describe("deviceTrustService", () => {
           "mockDeviceKeyEncryptedDevicePrivateKey",
         );
 
+        keyService.userKey$.mockReturnValue(of(mockUserKey));
+
         // TypeScript will allow calling private methods if the object is of type 'any'
         makeDeviceKeySpy = jest
           .spyOn(deviceTrustService as any, "makeDeviceKey")
@@ -411,10 +412,6 @@ describe("deviceTrustService", () => {
           .spyOn(cryptoFunctionService, "rsaGenerateKeyPair")
           .mockResolvedValue(mockDeviceRsaKeyPair);
 
-        cryptoSvcGetUserKeySpy = jest
-          .spyOn(keyService, "getUserKey")
-          .mockResolvedValue(mockUserKey);
-
         cryptoSvcRsaEncryptSpy = jest
           .spyOn(encryptService, "encapsulateKeyUnsigned")
           .mockResolvedValue(mockDevicePublicKeyEncryptedUserKey);
@@ -448,7 +445,7 @@ describe("deviceTrustService", () => {
 
         expect(makeDeviceKeySpy).toHaveBeenCalledTimes(1);
         expect(rsaGenerateKeyPairSpy).toHaveBeenCalledTimes(1);
-        expect(cryptoSvcGetUserKeySpy).toHaveBeenCalledTimes(1);
+        expect(keyService.userKey$).toHaveBeenCalledTimes(1);
 
         expect(cryptoSvcRsaEncryptSpy).toHaveBeenCalledTimes(1);
 
@@ -473,18 +470,13 @@ describe("deviceTrustService", () => {
       });
 
       it("throws specific error if user key is not found", async () => {
-        // setup the spy to return null
-        cryptoSvcGetUserKeySpy.mockResolvedValue(null);
+        keyService.userKey$.mockReturnValueOnce(of(null));
         // check if the expected error is thrown
         await expect(deviceTrustService.trustDevice(mockUserId)).rejects.toThrow(
           "User symmetric key not found",
         );
 
-        // reset the spy
-        cryptoSvcGetUserKeySpy.mockReset();
-
-        // setup the spy to return undefined
-        cryptoSvcGetUserKeySpy.mockResolvedValue(undefined);
+        keyService.userKey$.mockReturnValueOnce(of(undefined));
         // check if the expected error is thrown
         await expect(deviceTrustService.trustDevice(mockUserId)).rejects.toThrow(
           "User symmetric key not found",
@@ -502,11 +494,6 @@ describe("deviceTrustService", () => {
           spy: () => rsaGenerateKeyPairSpy,
           errorText: "rsaGenerateKeyPair error",
         },
-        {
-          method: "getUserKey",
-          spy: () => cryptoSvcGetUserKeySpy,
-          errorText: "getUserKey error",
-        },
         {
           method: "rsaEncrypt",
           spy: () => cryptoSvcRsaEncryptSpy,
@@ -927,7 +914,7 @@ describe("deviceTrustService", () => {
     platformUtilsService.supportsSecureStorage.mockReturnValue(supportsSecureStorage);
 
     decryptionOptions.next({} as any);
-    userDecryptionOptionsService.userDecryptionOptions$ = decryptionOptions;
+    userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(decryptionOptions);
 
     return new DeviceTrustService(
       keyGenerationService,
@@ -943,6 +930,7 @@ describe("deviceTrustService", () => {
       userDecryptionOptionsService,
       logService,
       configService,
+      accountService,
     );
   }
 });
diff --git a/libs/common/src/key-management/enums/signing-key-type.enum.ts b/libs/common/src/key-management/enums/signing-key-type.enum.ts
new file mode 100644
index 00000000000..b1370ef0034
--- /dev/null
+++ b/libs/common/src/key-management/enums/signing-key-type.enum.ts
@@ -0,0 +1,13 @@
+export const SigningKeyTypes = {
+  Ed25519: "ed25519",
+} as const;
+
+export type SigningKeyType = (typeof SigningKeyTypes)[keyof typeof SigningKeyTypes];
+export function parseSigningKeyTypeFromString(value: string): SigningKeyType {
+  switch (value) {
+    case SigningKeyTypes.Ed25519:
+      return SigningKeyTypes.Ed25519;
+    default:
+      throw new Error(`Unknown signing key type: ${value}`);
+  }
+}
diff --git a/libs/common/src/key-management/kdf/change-kdf-service.spec.ts b/libs/common/src/key-management/kdf/change-kdf-service.spec.ts
index 07cba1cc7eb..c7df90f4790 100644
--- a/libs/common/src/key-management/kdf/change-kdf-service.spec.ts
+++ b/libs/common/src/key-management/kdf/change-kdf-service.spec.ts
@@ -1,14 +1,14 @@
 import { mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
-import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { UserId } from "@bitwarden/common/types/guid";
-import { UserKey } from "@bitwarden/common/types/key";
 // eslint-disable-next-line no-restricted-imports
-import { KdfConfigService, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
+import { PBKDF2KdfConfig } from "@bitwarden/key-management";
 
-import { MasterPasswordServiceAbstraction } from "../master-password/abstractions/master-password.service.abstraction";
+import { makeEncString } from "../../../spec";
+import { KdfRequest } from "../../models/request/kdf.request";
+import { SdkService } from "../../platform/abstractions/sdk/sdk.service";
+import { UserId } from "../../types/guid";
+import { EncString } from "../crypto/models/enc-string";
 import {
   MasterKeyWrappedUserKey,
   MasterPasswordAuthenticationHash,
@@ -21,35 +21,63 @@ import { DefaultChangeKdfService } from "./change-kdf-service";
 
 describe("ChangeKdfService", () => {
   const changeKdfApiService = mock<ChangeKdfApiService>();
-  const masterPasswordService = mock<MasterPasswordServiceAbstraction>();
-  const keyService = mock<KeyService>();
-  const kdfConfigService = mock<KdfConfigService>();
+  const sdkService = mock<SdkService>();
 
-  let sut: DefaultChangeKdfService = mock<DefaultChangeKdfService>();
+  let sut: DefaultChangeKdfService;
 
-  const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
-  const mockOldKdfConfig = new PBKDF2KdfConfig(100000);
   const mockNewKdfConfig = new PBKDF2KdfConfig(200000);
+  const mockOldKdfConfig = new PBKDF2KdfConfig(100000);
   const mockOldHash = "oldHash" as MasterPasswordAuthenticationHash;
   const mockNewHash = "newHash" as MasterPasswordAuthenticationHash;
   const mockUserId = "00000000-0000-0000-0000-000000000000" as UserId;
   const mockSalt = "test@bitwarden.com" as MasterPasswordSalt;
-  const mockWrappedUserKey = "wrappedUserKey";
+  const mockWrappedUserKey: EncString = makeEncString("wrappedUserKey");
+
+  const mockSdkClient = {
+    crypto: jest.fn().mockReturnValue({
+      make_update_kdf: jest.fn(),
+    }),
+  };
+  const mockRef = {
+    value: mockSdkClient,
+    [Symbol.dispose]: jest.fn(),
+  };
+  const mockSdk = {
+    take: jest.fn().mockReturnValue(mockRef),
+  };
 
   beforeEach(() => {
-    sut = new DefaultChangeKdfService(
-      masterPasswordService,
-      keyService,
-      kdfConfigService,
-      changeKdfApiService,
-    );
+    sdkService.userClient$ = jest.fn((userId: UserId) => of(mockSdk)) as any;
+    sut = new DefaultChangeKdfService(changeKdfApiService, sdkService);
   });
 
   afterEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
   });
 
   describe("updateUserKdfParams", () => {
+    const mockUpdateKdfResult = {
+      masterPasswordAuthenticationData: {
+        kdf: mockNewKdfConfig.toSdkConfig(),
+        salt: mockSalt,
+        masterPasswordAuthenticationHash: mockNewHash,
+      },
+      masterPasswordUnlockData: {
+        kdf: mockNewKdfConfig.toSdkConfig(),
+        salt: mockSalt,
+        masterKeyWrappedUserKey: mockWrappedUserKey.encryptedString,
+      },
+      oldMasterPasswordAuthenticationData: {
+        kdf: mockOldKdfConfig.toSdkConfig(),
+        salt: mockSalt,
+        masterPasswordAuthenticationHash: mockOldHash,
+      },
+    };
+
+    beforeEach(() => {
+      mockSdkClient.crypto().make_update_kdf.mockReturnValue(mockUpdateKdfResult);
+    });
+
     it("should throw an error if masterPassword is null", async () => {
       await expect(
         sut.updateUserKdfParams(null as unknown as string, mockNewKdfConfig, mockUserId),
@@ -90,61 +118,31 @@ describe("ChangeKdfService", () => {
       ).rejects.toThrow("userId");
     });
 
-    it("should throw an error if userKey is null", async () => {
-      keyService.userKey$.mockReturnValueOnce(of(null));
-      masterPasswordService.saltForUser$.mockReturnValueOnce(of(mockSalt));
-      kdfConfigService.getKdfConfig$.mockReturnValueOnce(of(mockOldKdfConfig));
+    it("should throw an error if SDK is not available", async () => {
+      sdkService.userClient$ = jest.fn().mockReturnValue(of(null)) as any;
+
       await expect(
         sut.updateUserKdfParams("masterPassword", mockNewKdfConfig, mockUserId),
-      ).rejects.toThrow();
+      ).rejects.toThrow("SDK not available");
     });
 
-    it("should throw an error if salt is null", async () => {
-      keyService.userKey$.mockReturnValueOnce(of(mockUserKey));
-      masterPasswordService.saltForUser$.mockReturnValueOnce(of(null));
-      kdfConfigService.getKdfConfig$.mockReturnValueOnce(of(mockOldKdfConfig));
-      await expect(
-        sut.updateUserKdfParams("masterPassword", mockNewKdfConfig, mockUserId),
-      ).rejects.toThrow("Failed to get salt");
-    });
+    it("should call SDK update_kdf with correct parameters", async () => {
+      const masterPassword = "masterPassword";
 
-    it("should throw an error if oldKdfConfig is null", async () => {
-      keyService.userKey$.mockReturnValueOnce(of(mockUserKey));
-      masterPasswordService.saltForUser$.mockReturnValueOnce(of(mockSalt));
-      kdfConfigService.getKdfConfig$.mockReturnValueOnce(of(null));
-      await expect(
-        sut.updateUserKdfParams("masterPassword", mockNewKdfConfig, mockUserId),
-      ).rejects.toThrow("Failed to get oldKdfConfig");
-    });
+      await sut.updateUserKdfParams(masterPassword, mockNewKdfConfig, mockUserId);
 
-    it("should call apiService.send with correct parameters", async () => {
-      keyService.userKey$.mockReturnValueOnce(of(mockUserKey));
-      masterPasswordService.saltForUser$.mockReturnValueOnce(of(mockSalt));
-      kdfConfigService.getKdfConfig$.mockReturnValueOnce(of(mockOldKdfConfig));
-
-      masterPasswordService.makeMasterPasswordAuthenticationData
-        .mockResolvedValueOnce({
-          salt: mockSalt,
-          kdf: mockOldKdfConfig,
-          masterPasswordAuthenticationHash: mockOldHash,
-        })
-        .mockResolvedValueOnce({
-          salt: mockSalt,
-          kdf: mockNewKdfConfig,
-          masterPasswordAuthenticationHash: mockNewHash,
-        });
-
-      masterPasswordService.makeMasterPasswordUnlockData.mockResolvedValueOnce(
-        new MasterPasswordUnlockData(
-          mockSalt,
-          mockNewKdfConfig,
-          mockWrappedUserKey as MasterKeyWrappedUserKey,
-        ),
+      expect(mockSdkClient.crypto().make_update_kdf).toHaveBeenCalledWith(
+        masterPassword,
+        mockNewKdfConfig.toSdkConfig(),
       );
+    });
 
-      await sut.updateUserKdfParams("masterPassword", mockNewKdfConfig, mockUserId);
+    it("should call changeKdfApiService.updateUserKdfParams with correct request", async () => {
+      const masterPassword = "masterPassword";
 
-      const expected = new KdfRequest(
+      await sut.updateUserKdfParams(masterPassword, mockNewKdfConfig, mockUserId);
+
+      const expectedRequest = new KdfRequest(
         {
           salt: mockSalt,
           kdf: mockNewKdfConfig,
@@ -153,15 +151,38 @@ describe("ChangeKdfService", () => {
         new MasterPasswordUnlockData(
           mockSalt,
           mockNewKdfConfig,
-          mockWrappedUserKey as MasterKeyWrappedUserKey,
+          mockWrappedUserKey.encryptedString as MasterKeyWrappedUserKey,
         ),
-      ).authenticateWith({
+      );
+      expectedRequest.authenticateWith({
         salt: mockSalt,
         kdf: mockOldKdfConfig,
         masterPasswordAuthenticationHash: mockOldHash,
       });
 
-      expect(changeKdfApiService.updateUserKdfParams).toHaveBeenCalledWith(expected);
+      expect(changeKdfApiService.updateUserKdfParams).toHaveBeenCalledWith(expectedRequest);
+    });
+
+    it("should properly dispose of SDK resources", async () => {
+      const masterPassword = "masterPassword";
+      jest.spyOn(mockNewKdfConfig, "toSdkConfig").mockReturnValue({} as any);
+
+      await sut.updateUserKdfParams(masterPassword, mockNewKdfConfig, mockUserId);
+
+      expect(mockRef[Symbol.dispose]).toHaveBeenCalled();
+    });
+
+    it("should handle SDK errors properly", async () => {
+      const masterPassword = "masterPassword";
+      const sdkError = new Error("SDK update_kdf failed");
+      jest.spyOn(mockNewKdfConfig, "toSdkConfig").mockReturnValue({} as any);
+      mockSdkClient.crypto().make_update_kdf.mockImplementation(() => {
+        throw sdkError;
+      });
+
+      await expect(
+        sut.updateUserKdfParams(masterPassword, mockNewKdfConfig, mockUserId),
+      ).rejects.toThrow("SDK update_kdf failed");
     });
   });
 });
diff --git a/libs/common/src/key-management/kdf/change-kdf-service.ts b/libs/common/src/key-management/kdf/change-kdf-service.ts
index d8bc3e21c1a..64fbd1fce05 100644
--- a/libs/common/src/key-management/kdf/change-kdf-service.ts
+++ b/libs/common/src/key-management/kdf/change-kdf-service.ts
@@ -1,55 +1,56 @@
+import { firstValueFrom, map } from "rxjs";
+
 import { assertNonNullish } from "@bitwarden/common/auth/utils";
-import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
 import { UserId } from "@bitwarden/common/types/guid";
 // eslint-disable-next-line no-restricted-imports
-import { KdfConfig, KdfConfigService, KeyService } from "@bitwarden/key-management";
+import { KdfConfig } from "@bitwarden/key-management";
 
-import { MasterPasswordServiceAbstraction } from "../master-password/abstractions/master-password.service.abstraction";
-import { firstValueFromOrThrow } from "../utils";
+import { KdfRequest } from "../../models/request/kdf.request";
+import { SdkService } from "../../platform/abstractions/sdk/sdk.service";
+import {
+  fromSdkAuthenticationData,
+  MasterPasswordAuthenticationData,
+  MasterPasswordUnlockData,
+} from "../master-password/types/master-password.types";
 
 import { ChangeKdfApiService } from "./change-kdf-api.service.abstraction";
 import { ChangeKdfService } from "./change-kdf-service.abstraction";
 
 export class DefaultChangeKdfService implements ChangeKdfService {
   constructor(
-    private masterPasswordService: MasterPasswordServiceAbstraction,
-    private keyService: KeyService,
-    private kdfConfigService: KdfConfigService,
     private changeKdfApiService: ChangeKdfApiService,
+    private sdkService: SdkService,
   ) {}
 
   async updateUserKdfParams(masterPassword: string, kdf: KdfConfig, userId: UserId): Promise<void> {
     assertNonNullish(masterPassword, "masterPassword");
     assertNonNullish(kdf, "kdf");
     assertNonNullish(userId, "userId");
+    const updateKdfResult = await firstValueFrom(
+      this.sdkService.userClient$(userId).pipe(
+        map((sdk) => {
+          if (!sdk) {
+            throw new Error("SDK not available");
+          }
 
-    const userKey = await firstValueFromOrThrow(this.keyService.userKey$(userId), "userKey");
-    const salt = await firstValueFromOrThrow(
-      this.masterPasswordService.saltForUser$(userId),
-      "salt",
-    );
-    const oldKdfConfig = await firstValueFromOrThrow(
-      this.kdfConfigService.getKdfConfig$(userId),
-      "oldKdfConfig",
+          using ref = sdk.take();
+
+          const updateKdfResponse = ref.value
+            .crypto()
+            .make_update_kdf(masterPassword, kdf.toSdkConfig());
+          return updateKdfResponse;
+        }),
+      ),
     );
 
-    const oldAuthenticationData =
-      await this.masterPasswordService.makeMasterPasswordAuthenticationData(
-        masterPassword,
-        oldKdfConfig,
-        salt,
-      );
-    const authenticationData =
-      await this.masterPasswordService.makeMasterPasswordAuthenticationData(
-        masterPassword,
-        kdf,
-        salt,
-      );
-    const unlockData = await this.masterPasswordService.makeMasterPasswordUnlockData(
-      masterPassword,
-      kdf,
-      salt,
-      userKey,
+    const authenticationData: MasterPasswordAuthenticationData = fromSdkAuthenticationData(
+      updateKdfResult.masterPasswordAuthenticationData,
+    );
+    const unlockData: MasterPasswordUnlockData = MasterPasswordUnlockData.fromSdk(
+      updateKdfResult.masterPasswordUnlockData,
+    );
+    const oldAuthenticationData: MasterPasswordAuthenticationData = fromSdkAuthenticationData(
+      updateKdfResult.oldMasterPasswordAuthenticationData,
     );
 
     const request = new KdfRequest(authenticationData, unlockData);
diff --git a/libs/common/src/key-management/keys/models/rotateable-key-set.ts b/libs/common/src/key-management/keys/models/rotateable-key-set.ts
new file mode 100644
index 00000000000..630fa2eebba
--- /dev/null
+++ b/libs/common/src/key-management/keys/models/rotateable-key-set.ts
@@ -0,0 +1,34 @@
+import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { PrfKey } from "../../../types/key";
+import { EncString } from "../../crypto/models/enc-string";
+
+declare const tag: unique symbol;
+
+/**
+ * A set of keys where a symmetric `DownstreamKey` is protected by an encrypted public/private key-pair.
+ * The `DownstreamKey` is used to encrypt/decrypt data, while the public/private key-pair is
+ * used to rotate the `DownstreamKey`.
+ *
+ * The `PrivateKey` is protected by an `UpstreamKey`, such as a `DeviceKey`, or `PrfKey`,
+ * and the `PublicKey` is protected by the `DownstreamKey`. This setup allows:
+ *
+ *   - Access to `DownstreamKey` by knowing the `UpstreamKey`
+ *   - Rotation to a new `DownstreamKey` by knowing the current `DownstreamKey`,
+ *     without needing access to the `UpstreamKey`
+ */
+export class RotateableKeySet<UpstreamKey extends SymmetricCryptoKey = SymmetricCryptoKey> {
+  private readonly [tag]!: UpstreamKey;
+
+  constructor(
+    /** `DownstreamKey` protected by publicKey */
+    readonly encapsulatedDownstreamKey: EncString,
+
+    /** DownstreamKey encrypted PublicKey */
+    readonly encryptedPublicKey: EncString,
+
+    /** UpstreamKey encrypted PrivateKey */
+    readonly encryptedPrivateKey?: EncString,
+  ) {}
+}
+
+export type PrfKeySet = RotateableKeySet<PrfKey>;
diff --git a/libs/common/src/key-management/keys/response/private-keys.response.ts b/libs/common/src/key-management/keys/response/private-keys.response.ts
new file mode 100644
index 00000000000..2bd723fb455
--- /dev/null
+++ b/libs/common/src/key-management/keys/response/private-keys.response.ts
@@ -0,0 +1,55 @@
+import { SecurityStateResponse } from "../../security-state/response/security-state.response";
+
+import { PublicKeyEncryptionKeyPairResponse } from "./public-key-encryption-key-pair.response";
+import { SignatureKeyPairResponse } from "./signature-key-pair.response";
+
+/**
+ * The privately accessible view of an entity (account / org)'s keys.
+ * This includes the full key-pairs for public-key encryption and signing, as well as the security state if available.
+ */
+export class PrivateKeysResponseModel {
+  readonly publicKeyEncryptionKeyPair: PublicKeyEncryptionKeyPairResponse;
+  readonly signatureKeyPair: SignatureKeyPairResponse | null = null;
+  readonly securityState: SecurityStateResponse | null = null;
+
+  constructor(response: unknown) {
+    if (typeof response !== "object" || response == null) {
+      throw new TypeError("Response must be an object");
+    }
+
+    if (
+      !("publicKeyEncryptionKeyPair" in response) ||
+      typeof response.publicKeyEncryptionKeyPair !== "object"
+    ) {
+      throw new TypeError("Response must contain a valid publicKeyEncryptionKeyPair");
+    }
+    this.publicKeyEncryptionKeyPair = new PublicKeyEncryptionKeyPairResponse(
+      response.publicKeyEncryptionKeyPair,
+    );
+
+    if (
+      "signatureKeyPair" in response &&
+      typeof response.signatureKeyPair === "object" &&
+      response.signatureKeyPair != null
+    ) {
+      this.signatureKeyPair = new SignatureKeyPairResponse(response.signatureKeyPair);
+    }
+
+    if (
+      "securityState" in response &&
+      typeof response.securityState === "object" &&
+      response.securityState != null
+    ) {
+      this.securityState = new SecurityStateResponse(response.securityState);
+    }
+
+    if (
+      (this.signatureKeyPair !== null && this.securityState === null) ||
+      (this.signatureKeyPair === null && this.securityState !== null)
+    ) {
+      throw new TypeError(
+        "Both signatureKeyPair and securityState must be present or absent together",
+      );
+    }
+  }
+}
diff --git a/libs/common/src/key-management/keys/response/public-key-encryption-key-pair.response.ts b/libs/common/src/key-management/keys/response/public-key-encryption-key-pair.response.ts
new file mode 100644
index 00000000000..4b1e3f90e29
--- /dev/null
+++ b/libs/common/src/key-management/keys/response/public-key-encryption-key-pair.response.ts
@@ -0,0 +1,32 @@
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+
+import { SignedPublicKey, UnsignedPublicKey, WrappedPrivateKey } from "../../types";
+
+export class PublicKeyEncryptionKeyPairResponse {
+  readonly wrappedPrivateKey: WrappedPrivateKey;
+  readonly publicKey: UnsignedPublicKey;
+
+  readonly signedPublicKey: SignedPublicKey | null = null;
+
+  constructor(response: unknown) {
+    if (typeof response !== "object" || response == null) {
+      throw new TypeError("Response must be an object");
+    }
+
+    if (!("publicKey" in response) || typeof response.publicKey !== "string") {
+      throw new TypeError("Response must contain a valid publicKey");
+    }
+    this.publicKey = Utils.fromB64ToArray(response.publicKey) as UnsignedPublicKey;
+
+    if (!("wrappedPrivateKey" in response) || typeof response.wrappedPrivateKey !== "string") {
+      throw new TypeError("Response must contain a valid wrappedPrivateKey");
+    }
+    this.wrappedPrivateKey = response.wrappedPrivateKey as WrappedPrivateKey;
+
+    if ("signedPublicKey" in response && typeof response.signedPublicKey === "string") {
+      this.signedPublicKey = response.signedPublicKey as SignedPublicKey;
+    } else {
+      this.signedPublicKey = null;
+    }
+  }
+}
diff --git a/libs/common/src/key-management/keys/response/public-keys.response.ts b/libs/common/src/key-management/keys/response/public-keys.response.ts
new file mode 100644
index 00000000000..cf4b3efc349
--- /dev/null
+++ b/libs/common/src/key-management/keys/response/public-keys.response.ts
@@ -0,0 +1,44 @@
+import { SignedPublicKey } from "@bitwarden/sdk-internal";
+
+import { UnsignedPublicKey, VerifyingKey } from "../../types";
+
+/**
+ * The publicly accessible view of an entity (account / org)'s keys. That includes the encryption public key, and the verifying key if available.
+ */
+export class PublicKeysResponseModel {
+  readonly publicKey: UnsignedPublicKey;
+  readonly verifyingKey: VerifyingKey | null;
+  readonly signedPublicKey?: SignedPublicKey | null;
+
+  constructor(response: unknown) {
+    if (typeof response !== "object" || response == null) {
+      throw new TypeError("Response must be an object");
+    }
+
+    if (!("publicKey" in response) || !(response.publicKey instanceof Uint8Array)) {
+      throw new TypeError("Response must contain a valid publicKey");
+    }
+    this.publicKey = response.publicKey as UnsignedPublicKey;
+
+    if ("verifyingKey" in response && typeof response.verifyingKey === "string") {
+      this.verifyingKey = response.verifyingKey as VerifyingKey;
+    } else {
+      this.verifyingKey = null;
+    }
+
+    if ("signedPublicKey" in response && typeof response.signedPublicKey === "string") {
+      this.signedPublicKey = response.signedPublicKey as SignedPublicKey;
+    } else {
+      this.signedPublicKey = null;
+    }
+
+    if (
+      (this.signedPublicKey !== null && this.verifyingKey === null) ||
+      (this.signedPublicKey === null && this.verifyingKey !== null)
+    ) {
+      throw new TypeError(
+        "Both signedPublicKey and verifyingKey must be present or absent together",
+      );
+    }
+  }
+}
diff --git a/libs/common/src/key-management/keys/response/signature-key-pair.response.ts b/libs/common/src/key-management/keys/response/signature-key-pair.response.ts
new file mode 100644
index 00000000000..2499839b64e
--- /dev/null
+++ b/libs/common/src/key-management/keys/response/signature-key-pair.response.ts
@@ -0,0 +1,22 @@
+import { VerifyingKey, WrappedSigningKey } from "../../types";
+
+export class SignatureKeyPairResponse {
+  readonly wrappedSigningKey: WrappedSigningKey;
+  readonly verifyingKey: VerifyingKey;
+
+  constructor(response: unknown) {
+    if (typeof response !== "object" || response == null) {
+      throw new TypeError("Response must be an object");
+    }
+
+    if (!("wrappedSigningKey" in response) || typeof response.wrappedSigningKey !== "string") {
+      throw new TypeError("Response must contain a valid wrappedSigningKey");
+    }
+    this.wrappedSigningKey = response.wrappedSigningKey as WrappedSigningKey;
+
+    if (!("verifyingKey" in response) || typeof response.verifyingKey !== "string") {
+      throw new TypeError("Response must contain a valid verifyingKey");
+    }
+    this.verifyingKey = response.verifyingKey as VerifyingKey;
+  }
+}
diff --git a/libs/common/src/key-management/keys/services/abstractions/key-api-service.abstraction.ts b/libs/common/src/key-management/keys/services/abstractions/key-api-service.abstraction.ts
new file mode 100644
index 00000000000..93556dbb57a
--- /dev/null
+++ b/libs/common/src/key-management/keys/services/abstractions/key-api-service.abstraction.ts
@@ -0,0 +1,5 @@
+import { PublicKeysResponseModel } from "../../response/public-keys.response";
+
+export abstract class KeyApiService {
+  abstract getUserPublicKeys(id: string): Promise<PublicKeysResponseModel>;
+}
diff --git a/libs/common/src/key-management/keys/services/abstractions/rotateable-key-set.service.ts b/libs/common/src/key-management/keys/services/abstractions/rotateable-key-set.service.ts
new file mode 100644
index 00000000000..bdb3d56259d
--- /dev/null
+++ b/libs/common/src/key-management/keys/services/abstractions/rotateable-key-set.service.ts
@@ -0,0 +1,30 @@
+import { SymmetricCryptoKey } from "../../../../platform/models/domain/symmetric-crypto-key";
+import { RotateableKeySet } from "../../models/rotateable-key-set";
+
+export abstract class RotateableKeySetService {
+  /**
+   * Create a new rotatable key set for the provided downstreamKey, using the provided upstream key.
+   * For more information on rotatable key sets, see {@link RotateableKeySet}
+   * @param upstreamKey The `UpstreamKey` used to encrypt {@link RotateableKeySet.encryptedPrivateKey}
+   * @param downstreamKey The symmetric key to be contained within the `RotateableKeySet`.
+   * @returns RotateableKeySet containing the provided symmetric downstreamKey.
+   */
+  abstract createKeySet<UpstreamKey extends SymmetricCryptoKey>(
+    upstreamKey: UpstreamKey,
+    downstreamKey: SymmetricCryptoKey,
+  ): Promise<RotateableKeySet<UpstreamKey>>;
+
+  /**
+   * Rotates the provided `RotateableKeySet` with the new key.
+   *
+   * @param keySet The current `RotateableKeySet` to be rotated.
+   * @param oldDownstreamKey The current downstreamKey used to decrypt the `PublicKey`.
+   * @param newDownstreamKey The new downstreamKey to encrypt the `PublicKey`.
+   * @returns The updated `RotateableKeySet` that contains the new downstreamKey.
+   */
+  abstract rotateKeySet<UpstreamKey extends SymmetricCryptoKey>(
+    keySet: RotateableKeySet<UpstreamKey>,
+    oldDownstreamKey: SymmetricCryptoKey,
+    newDownstreamKey: SymmetricCryptoKey,
+  ): Promise<RotateableKeySet<UpstreamKey>>;
+}
diff --git a/libs/common/src/key-management/keys/services/default-key-api-service.service.ts b/libs/common/src/key-management/keys/services/default-key-api-service.service.ts
new file mode 100644
index 00000000000..fd8321055be
--- /dev/null
+++ b/libs/common/src/key-management/keys/services/default-key-api-service.service.ts
@@ -0,0 +1,15 @@
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { ApiService } from "../../../abstractions/api.service";
+import { PublicKeysResponseModel } from "../response/public-keys.response";
+
+import { KeyApiService } from "./abstractions/key-api-service.abstraction";
+
+export class DefaultKeyApiService implements KeyApiService {
+  constructor(private apiService: ApiService) {}
+
+  async getUserPublicKeys(id: UserId): Promise<PublicKeysResponseModel> {
+    const response = await this.apiService.send("GET", "/users/" + id + "/keys", null, true, true);
+    return new PublicKeysResponseModel(response);
+  }
+}
diff --git a/libs/common/src/key-management/keys/services/default-rotateable-key-set.service.spec.ts b/libs/common/src/key-management/keys/services/default-rotateable-key-set.service.spec.ts
new file mode 100644
index 00000000000..1880bd18b2a
--- /dev/null
+++ b/libs/common/src/key-management/keys/services/default-rotateable-key-set.service.spec.ts
@@ -0,0 +1,185 @@
+import { mock, MockProxy } from "jest-mock-extended";
+
+// 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";
+
+import { Utils } from "../../../platform/misc/utils";
+import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { EncryptService } from "../../crypto/abstractions/encrypt.service";
+import { EncString } from "../../crypto/models/enc-string";
+import { RotateableKeySet } from "../models/rotateable-key-set";
+
+import { DefaultRotateableKeySetService } from "./default-rotateable-key-set.service";
+
+describe("DefaultRotateableKeySetService", () => {
+  let keyService!: MockProxy<KeyService>;
+  let encryptService!: MockProxy<EncryptService>;
+  let service!: DefaultRotateableKeySetService;
+
+  beforeEach(() => {
+    keyService = mock<KeyService>();
+    encryptService = mock<EncryptService>();
+    service = new DefaultRotateableKeySetService(keyService, encryptService);
+  });
+
+  describe("createKeySet", () => {
+    test.each([null, undefined])(
+      "throws error when downstreamKey parameter is %s",
+      async (downstreamKey) => {
+        const externalKey = createSymmetricKey();
+        await expect(service.createKeySet(externalKey, downstreamKey as any)).rejects.toThrow(
+          "failed to create key set: downstreamKey is required",
+        );
+      },
+    );
+
+    test.each([null, undefined])(
+      "throws error when upstreamKey parameter is %s",
+      async (upstreamKey) => {
+        const userKey = createSymmetricKey();
+        await expect(service.createKeySet(upstreamKey as any, userKey)).rejects.toThrow(
+          "failed to create key set: upstreamKey is required",
+        );
+      },
+    );
+
+    it("should create a new key set", async () => {
+      const externalKey = createSymmetricKey();
+      const userKey = createSymmetricKey();
+      const encryptedUserKey = new EncString("encryptedUserKey");
+      const encryptedPublicKey = new EncString("encryptedPublicKey");
+      const encryptedPrivateKey = new EncString("encryptedPrivateKey");
+      keyService.makeKeyPair.mockResolvedValue(["publicKey", encryptedPrivateKey]);
+      encryptService.encapsulateKeyUnsigned.mockResolvedValue(encryptedUserKey);
+      encryptService.wrapEncapsulationKey.mockResolvedValue(encryptedPublicKey);
+
+      const result = await service.createKeySet(externalKey, userKey);
+
+      expect(result).toEqual(
+        new RotateableKeySet(encryptedUserKey, encryptedPublicKey, encryptedPrivateKey),
+      );
+      expect(keyService.makeKeyPair).toHaveBeenCalledWith(externalKey);
+      expect(encryptService.encapsulateKeyUnsigned).toHaveBeenCalledWith(
+        userKey,
+        Utils.fromB64ToArray("publicKey"),
+      );
+      expect(encryptService.wrapEncapsulationKey).toHaveBeenCalledWith(
+        Utils.fromB64ToArray("publicKey"),
+        userKey,
+      );
+    });
+  });
+
+  describe("rotateKeySet", () => {
+    const keySet = new RotateableKeySet(
+      new EncString("encUserKey"),
+      new EncString("encPublicKey"),
+      new EncString("encPrivateKey"),
+    );
+    const dataValidationTests = [
+      {
+        keySet: null as any as RotateableKeySet,
+        oldDownstreamKey: createSymmetricKey(),
+        newDownstreamKey: createSymmetricKey(),
+        expectedError: "failed to rotate key set: keySet is required",
+      },
+      {
+        keySet: undefined as any as RotateableKeySet,
+        oldDownstreamKey: createSymmetricKey(),
+        newDownstreamKey: createSymmetricKey(),
+        expectedError: "failed to rotate key set: keySet is required",
+      },
+      {
+        keySet: keySet,
+        oldDownstreamKey: null,
+        newDownstreamKey: createSymmetricKey(),
+        expectedError: "failed to rotate key set: oldDownstreamKey is required",
+      },
+      {
+        keySet: keySet,
+        oldDownstreamKey: undefined,
+        newDownstreamKey: createSymmetricKey(),
+        expectedError: "failed to rotate key set: oldDownstreamKey is required",
+      },
+      {
+        keySet: keySet,
+        oldDownstreamKey: createSymmetricKey(),
+        newDownstreamKey: null,
+        expectedError: "failed to rotate key set: newDownstreamKey is required",
+      },
+      {
+        keySet: keySet,
+        oldDownstreamKey: createSymmetricKey(),
+        newDownstreamKey: undefined,
+        expectedError: "failed to rotate key set: newDownstreamKey is required",
+      },
+    ];
+
+    test.each(dataValidationTests)(
+      "should throw error when required parameter is missing",
+      async ({ keySet, oldDownstreamKey, newDownstreamKey, expectedError }) => {
+        await expect(
+          service.rotateKeySet(keySet, oldDownstreamKey as any, newDownstreamKey as any),
+        ).rejects.toThrow(expectedError);
+      },
+    );
+
+    it("throws an error if the public key cannot be decrypted", async () => {
+      const oldDownstreamKey = createSymmetricKey();
+      const newDownstreamKey = createSymmetricKey();
+
+      encryptService.unwrapEncapsulationKey.mockResolvedValue(null as any);
+
+      await expect(
+        service.rotateKeySet(keySet, oldDownstreamKey, newDownstreamKey),
+      ).rejects.toThrow("failed to rotate key set: could not decrypt public key");
+
+      expect(encryptService.unwrapEncapsulationKey).toHaveBeenCalledWith(
+        keySet.encryptedPublicKey,
+        oldDownstreamKey,
+      );
+
+      expect(encryptService.wrapEncapsulationKey).not.toHaveBeenCalled();
+      expect(encryptService.encapsulateKeyUnsigned).not.toHaveBeenCalled();
+    });
+
+    it("rotates the key set", async () => {
+      const oldDownstreamKey = createSymmetricKey();
+      const newDownstreamKey = new SymmetricCryptoKey(new Uint8Array(64));
+      const publicKey = Utils.fromB64ToArray("decryptedPublicKey");
+      const newEncryptedPublicKey = new EncString("newEncPublicKey");
+      const newEncryptedRotateableKey = new EncString("newEncUserKey");
+
+      encryptService.unwrapEncapsulationKey.mockResolvedValue(publicKey);
+      encryptService.wrapEncapsulationKey.mockResolvedValue(newEncryptedPublicKey);
+      encryptService.encapsulateKeyUnsigned.mockResolvedValue(newEncryptedRotateableKey);
+
+      const result = await service.rotateKeySet(keySet, oldDownstreamKey, newDownstreamKey);
+
+      expect(result).toEqual(
+        new RotateableKeySet(
+          newEncryptedRotateableKey,
+          newEncryptedPublicKey,
+          keySet.encryptedPrivateKey,
+        ),
+      );
+      expect(encryptService.unwrapEncapsulationKey).toHaveBeenCalledWith(
+        keySet.encryptedPublicKey,
+        oldDownstreamKey,
+      );
+      expect(encryptService.wrapEncapsulationKey).toHaveBeenCalledWith(publicKey, newDownstreamKey);
+      expect(encryptService.encapsulateKeyUnsigned).toHaveBeenCalledWith(
+        newDownstreamKey,
+        publicKey,
+      );
+    });
+  });
+});
+
+function createSymmetricKey() {
+  const key = Utils.fromB64ToArray(
+    "1h-TuPwSbX5qoX0aVgjmda_Lfq85qAcKssBlXZnPIsQC3HNDGIecunYqXhJnp55QpdXRh-egJiLH3a0wqlVQsQ",
+  );
+  return new SymmetricCryptoKey(key);
+}
diff --git a/libs/common/src/key-management/keys/services/default-rotateable-key-set.service.ts b/libs/common/src/key-management/keys/services/default-rotateable-key-set.service.ts
new file mode 100644
index 00000000000..3e568cb2aee
--- /dev/null
+++ b/libs/common/src/key-management/keys/services/default-rotateable-key-set.service.ts
@@ -0,0 +1,83 @@
+// 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";
+
+import { Utils } from "../../../platform/misc/utils";
+import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { EncryptService } from "../../crypto/abstractions/encrypt.service";
+import { RotateableKeySet } from "../models/rotateable-key-set";
+
+import { RotateableKeySetService } from "./abstractions/rotateable-key-set.service";
+
+export class DefaultRotateableKeySetService implements RotateableKeySetService {
+  constructor(
+    private keyService: KeyService,
+    private encryptService: EncryptService,
+  ) {}
+
+  async createKeySet<UpstreamKey extends SymmetricCryptoKey>(
+    upstreamKey: UpstreamKey,
+    downstreamKey: SymmetricCryptoKey,
+  ): Promise<RotateableKeySet<UpstreamKey>> {
+    if (!upstreamKey) {
+      throw new Error("failed to create key set: upstreamKey is required");
+    }
+    if (!downstreamKey) {
+      throw new Error("failed to create key set: downstreamKey is required");
+    }
+
+    const [publicKey, encryptedPrivateKey] = await this.keyService.makeKeyPair(upstreamKey);
+
+    const rawPublicKey = Utils.fromB64ToArray(publicKey);
+    const encryptedRotateableKey = await this.encryptService.encapsulateKeyUnsigned(
+      downstreamKey,
+      rawPublicKey,
+    );
+    const encryptedPublicKey = await this.encryptService.wrapEncapsulationKey(
+      rawPublicKey,
+      downstreamKey,
+    );
+    return new RotateableKeySet(encryptedRotateableKey, encryptedPublicKey, encryptedPrivateKey);
+  }
+
+  async rotateKeySet<UpstreamKey extends SymmetricCryptoKey>(
+    keySet: RotateableKeySet<UpstreamKey>,
+    oldDownstreamKey: SymmetricCryptoKey,
+    newDownstreamKey: SymmetricCryptoKey,
+  ): Promise<RotateableKeySet<UpstreamKey>> {
+    // validate parameters
+    if (!keySet) {
+      throw new Error("failed to rotate key set: keySet is required");
+    }
+    if (!oldDownstreamKey) {
+      throw new Error("failed to rotate key set: oldDownstreamKey is required");
+    }
+    if (!newDownstreamKey) {
+      throw new Error("failed to rotate key set: newDownstreamKey is required");
+    }
+
+    const publicKey = await this.encryptService.unwrapEncapsulationKey(
+      keySet.encryptedPublicKey,
+      oldDownstreamKey,
+    );
+    if (publicKey == null) {
+      throw new Error("failed to rotate key set: could not decrypt public key");
+    }
+    const newEncryptedPublicKey = await this.encryptService.wrapEncapsulationKey(
+      publicKey,
+      newDownstreamKey,
+    );
+    const newEncryptedRotateableKey = await this.encryptService.encapsulateKeyUnsigned(
+      newDownstreamKey,
+      publicKey,
+    );
+
+    const newRotateableKeySet = new RotateableKeySet<UpstreamKey>(
+      newEncryptedRotateableKey,
+      newEncryptedPublicKey,
+      keySet.encryptedPrivateKey,
+    );
+
+    return newRotateableKeySet;
+  }
+}
diff --git a/libs/common/src/key-management/master-password/abstractions/master-password-unlock.service.ts b/libs/common/src/key-management/master-password/abstractions/master-password-unlock.service.ts
new file mode 100644
index 00000000000..63ee7d69719
--- /dev/null
+++ b/libs/common/src/key-management/master-password/abstractions/master-password-unlock.service.ts
@@ -0,0 +1,27 @@
+import { UserId } from "@bitwarden/user-core";
+
+import { UserKey } from "../../../types/key";
+
+export abstract class MasterPasswordUnlockService {
+  /**
+   * Unlocks the user's account using the master password.
+   * @param masterPassword The master password provided by the user.
+   * @param userId The ID of the active user.
+   * @throws If the master password provided is null/undefined/empty.
+   * @throws If the userId provided is null/undefined.
+   * @throws if the masterPasswordUnlockData for the user is not found.
+   * @throws If unwrapping the user key fails.
+   * @returns the user's decrypted userKey.
+   */
+  abstract unlockWithMasterPassword(masterPassword: string, userId: UserId): Promise<UserKey>;
+
+  /**
+   * For the given master password and user ID, verifies whether the user can decrypt their user key stored in state.
+   * @param masterPassword The master password provided by the user.
+   * @param userId The ID of the active user.
+   * @throws If the master password provided is null/undefined/empty.
+   * @throws If the userId provided is null/undefined.
+   * @returns true if the userKey can be decrypted, false otherwise.
+   */
+  abstract proofOfDecryption(masterPassword: string, userId: UserId): Promise<boolean>;
+}
diff --git a/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts b/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts
index 8ef14904bce..f982c2c5ce8 100644
--- a/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts
+++ b/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts
@@ -171,4 +171,12 @@ export abstract class InternalMasterPasswordServiceAbstraction extends MasterPas
     masterPasswordUnlockData: MasterPasswordUnlockData,
     userId: UserId,
   ): Promise<void>;
+
+  /**
+   * An observable that emits the master password unlock data for the target user.
+   * @param userId The user ID.
+   * @throws If the user ID is null or undefined.
+   * @returns An observable that emits the master password unlock data or null if not found.
+   */
+  abstract masterPasswordUnlockData$(userId: UserId): Observable<MasterPasswordUnlockData | null>;
 }
diff --git a/libs/common/src/key-management/master-password/models/response/master-password-unlock.response.ts b/libs/common/src/key-management/master-password/models/response/master-password-unlock.response.ts
index 41b16d43f56..9f2c39dd1ae 100644
--- a/libs/common/src/key-management/master-password/models/response/master-password-unlock.response.ts
+++ b/libs/common/src/key-management/master-password/models/response/master-password-unlock.response.ts
@@ -22,13 +22,15 @@ export class MasterPasswordUnlockResponse extends BaseResponse {
 
     this.kdf = new KdfConfigResponse(this.getResponseProperty("Kdf"));
 
-    const masterKeyEncryptedUserKey = this.getResponseProperty("MasterKeyEncryptedUserKey");
-    if (masterKeyEncryptedUserKey == null || typeof masterKeyEncryptedUserKey !== "string") {
+    // Note: MasterKeyEncryptedUserKey and masterKeyWrappedUserKey are the same thing, and
+    // used inconsistently in the codebase
+    const masterKeyWrappedUserKey = this.getResponseProperty("MasterKeyEncryptedUserKey");
+    if (masterKeyWrappedUserKey == null || typeof masterKeyWrappedUserKey !== "string") {
       throw new Error(
         "MasterPasswordUnlockResponse does not contain a valid master key encrypted user key",
       );
     }
-    this.masterKeyWrappedUserKey = masterKeyEncryptedUserKey as MasterKeyWrappedUserKey;
+    this.masterKeyWrappedUserKey = masterKeyWrappedUserKey as MasterKeyWrappedUserKey;
   }
 
   toMasterPasswordUnlockData() {
diff --git a/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.spec.ts b/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.spec.ts
new file mode 100644
index 00000000000..1c95090f04b
--- /dev/null
+++ b/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.spec.ts
@@ -0,0 +1,244 @@
+import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { newGuid } from "@bitwarden/guid";
+// eslint-disable-next-line no-restricted-imports
+import { Argon2KdfConfig, KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+import { CryptoError } from "@bitwarden/sdk-internal";
+import { UserId } from "@bitwarden/user-core";
+
+import { HashPurpose } from "../../../platform/enums";
+import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { MasterKey, UserKey } from "../../../types/key";
+import { InternalMasterPasswordServiceAbstraction } from "../abstractions/master-password.service.abstraction";
+import {
+  MasterKeyWrappedUserKey,
+  MasterPasswordSalt,
+  MasterPasswordUnlockData,
+} from "../types/master-password.types";
+
+import { DefaultMasterPasswordUnlockService } from "./default-master-password-unlock.service";
+
+describe("DefaultMasterPasswordUnlockService", () => {
+  let sut: DefaultMasterPasswordUnlockService;
+
+  let masterPasswordService: MockProxy<InternalMasterPasswordServiceAbstraction>;
+  let keyService: MockProxy<KeyService>;
+  let logService: MockProxy<LogService>;
+
+  const mockMasterPassword = "testExample";
+  const mockUserId = newGuid() as UserId;
+
+  const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+  const mockMasterPasswordUnlockData: MasterPasswordUnlockData = new MasterPasswordUnlockData(
+    "user@example.com" as MasterPasswordSalt,
+    new Argon2KdfConfig(100000, 64, 1),
+    "encryptedMasterKeyWrappedUserKey" as MasterKeyWrappedUserKey,
+  );
+
+  //Legacy data for tests
+  const mockMasterKey = new SymmetricCryptoKey(new Uint8Array(32)) as MasterKey;
+  const mockKeyHash = "localKeyHash";
+
+  beforeEach(() => {
+    masterPasswordService = mock<InternalMasterPasswordServiceAbstraction>();
+    keyService = mock<KeyService>();
+    logService = mock<LogService>();
+
+    sut = new DefaultMasterPasswordUnlockService(masterPasswordService, keyService, logService);
+
+    masterPasswordService.masterPasswordUnlockData$.mockReturnValue(
+      of(mockMasterPasswordUnlockData),
+    );
+    masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData.mockResolvedValue(mockUserKey);
+
+    // Legacy state mocking
+    keyService.makeMasterKey.mockResolvedValue(mockMasterKey);
+    keyService.hashMasterKey.mockResolvedValue(mockKeyHash);
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe("unlockWithMasterPassword", () => {
+    test.each([null as unknown as string, undefined as unknown as string, ""])(
+      "throws when the provided master password is %s",
+      async (masterPassword) => {
+        await expect(sut.unlockWithMasterPassword(masterPassword, mockUserId)).rejects.toThrow(
+          "Master password is required",
+        );
+        expect(masterPasswordService.masterPasswordUnlockData$).not.toHaveBeenCalled();
+        expect(
+          masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData,
+        ).not.toHaveBeenCalled();
+      },
+    );
+
+    test.each([null as unknown as UserId, undefined as unknown as UserId])(
+      "throws when the provided userID is %s",
+      async (userId) => {
+        await expect(sut.unlockWithMasterPassword(mockMasterPassword, userId)).rejects.toThrow(
+          "User ID is required",
+        );
+      },
+    );
+
+    it("throws an error when the user doesn't have masterPasswordUnlockData", async () => {
+      masterPasswordService.masterPasswordUnlockData$.mockReturnValue(of(null));
+
+      await expect(sut.unlockWithMasterPassword(mockMasterPassword, mockUserId)).rejects.toThrow(
+        "Master password unlock data was not found for the user " + mockUserId,
+      );
+      expect(masterPasswordService.masterPasswordUnlockData$).toHaveBeenCalledWith(mockUserId);
+      expect(
+        masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData,
+      ).not.toHaveBeenCalled();
+    });
+
+    it("returns userKey successfully", async () => {
+      const result = await sut.unlockWithMasterPassword(mockMasterPassword, mockUserId);
+
+      expect(result).toEqual(mockUserKey);
+      expect(masterPasswordService.masterPasswordUnlockData$).toHaveBeenCalledWith(mockUserId);
+      expect(masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterPasswordUnlockData,
+      );
+    });
+
+    it("sets legacy state on success", async () => {
+      const result = await sut.unlockWithMasterPassword(mockMasterPassword, mockUserId);
+
+      expect(result).toEqual(mockUserKey);
+      expect(masterPasswordService.masterPasswordUnlockData$).toHaveBeenCalledWith(mockUserId);
+      expect(masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterPasswordUnlockData,
+      );
+
+      expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterPasswordUnlockData.salt,
+        mockMasterPasswordUnlockData.kdf,
+      );
+      expect(keyService.hashMasterKey).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterKey,
+        HashPurpose.LocalAuthorization,
+      );
+      expect(masterPasswordService.setMasterKeyHash).toHaveBeenCalledWith(mockKeyHash, mockUserId);
+      expect(masterPasswordService.setMasterKey).toHaveBeenCalledWith(mockMasterKey, mockUserId);
+    });
+
+    it("throws an error if masterKey construction fails", async () => {
+      keyService.makeMasterKey.mockResolvedValue(null as unknown as MasterKey);
+
+      await expect(sut.unlockWithMasterPassword(mockMasterPassword, mockUserId)).rejects.toThrow(
+        "Master key could not be created to set legacy master password state.",
+      );
+
+      expect(masterPasswordService.masterPasswordUnlockData$).toHaveBeenCalledWith(mockUserId);
+      expect(masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterPasswordUnlockData,
+      );
+
+      expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterPasswordUnlockData.salt,
+        mockMasterPasswordUnlockData.kdf,
+      );
+      expect(keyService.hashMasterKey).not.toHaveBeenCalled();
+      expect(masterPasswordService.setMasterKeyHash).not.toHaveBeenCalled();
+      expect(masterPasswordService.setMasterKey).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("proofOfDecryption", () => {
+    test.each([null as unknown as string, undefined as unknown as string, ""])(
+      "throws when the provided master password is %s",
+      async (masterPassword) => {
+        await expect(sut.proofOfDecryption(masterPassword, mockUserId)).rejects.toThrow(
+          "Master password is required",
+        );
+        expect(masterPasswordService.masterPasswordUnlockData$).not.toHaveBeenCalled();
+        expect(
+          masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData,
+        ).not.toHaveBeenCalled();
+      },
+    );
+
+    test.each([null as unknown as UserId, undefined as unknown as UserId])(
+      "throws when the provided userID is %s",
+      async (userId) => {
+        await expect(sut.proofOfDecryption(mockMasterPassword, userId)).rejects.toThrow(
+          "User ID is required",
+        );
+      },
+    );
+
+    it("returns false when the user doesn't have masterPasswordUnlockData", async () => {
+      masterPasswordService.masterPasswordUnlockData$.mockReturnValue(of(null));
+
+      const result = await sut.proofOfDecryption(mockMasterPassword, mockUserId);
+
+      expect(result).toBe(false);
+      expect(masterPasswordService.masterPasswordUnlockData$).toHaveBeenCalledWith(mockUserId);
+      expect(
+        masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData,
+      ).not.toHaveBeenCalled();
+      expect(logService.warning).toHaveBeenCalledWith(
+        `[DefaultMasterPasswordUnlockService] No master password unlock data found for user ${mockUserId} returning false.`,
+      );
+    });
+
+    it("returns true when the master password is correct", async () => {
+      const result = await sut.proofOfDecryption(mockMasterPassword, mockUserId);
+
+      expect(result).toBe(true);
+      expect(masterPasswordService.masterPasswordUnlockData$).toHaveBeenCalledWith(mockUserId);
+      expect(masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterPasswordUnlockData,
+      );
+    });
+
+    it("returns false when the master password is incorrect", async () => {
+      const error = new Error("Incorrect password") as CryptoError;
+      error.name = "CryptoError";
+      error.variant = "InvalidKey";
+      masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData.mockRejectedValue(error);
+
+      const result = await sut.proofOfDecryption(mockMasterPassword, mockUserId);
+
+      expect(result).toBe(false);
+      expect(masterPasswordService.masterPasswordUnlockData$).toHaveBeenCalledWith(mockUserId);
+      expect(masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterPasswordUnlockData,
+      );
+      expect(logService.debug).toHaveBeenCalledWith(
+        `[DefaultMasterPasswordUnlockService] Error during proof of decryption for user ${mockUserId} returning false: ${error}`,
+      );
+    });
+
+    it("returns false when a generic error occurs", async () => {
+      const error = new Error("Generic error");
+      masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData.mockRejectedValue(error);
+
+      const result = await sut.proofOfDecryption(mockMasterPassword, mockUserId);
+
+      expect(result).toBe(false);
+      expect(masterPasswordService.masterPasswordUnlockData$).toHaveBeenCalledWith(mockUserId);
+      expect(masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData).toHaveBeenCalledWith(
+        mockMasterPassword,
+        mockMasterPasswordUnlockData,
+      );
+      expect(logService.error).toHaveBeenCalledWith(
+        `[DefaultMasterPasswordUnlockService] Unexpected error during proof of decryption for user ${mockUserId} returning false: ${error}`,
+      );
+    });
+  });
+});
diff --git a/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.ts b/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.ts
new file mode 100644
index 00000000000..89a87403e49
--- /dev/null
+++ b/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.ts
@@ -0,0 +1,115 @@
+import { firstValueFrom } from "rxjs";
+
+// eslint-disable-next-line no-restricted-imports
+import { KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+import { isCryptoError } from "@bitwarden/sdk-internal";
+import { UserId } from "@bitwarden/user-core";
+
+import { HashPurpose } from "../../../platform/enums";
+import { UserKey } from "../../../types/key";
+import { MasterPasswordUnlockService } from "../abstractions/master-password-unlock.service";
+import { InternalMasterPasswordServiceAbstraction } from "../abstractions/master-password.service.abstraction";
+import { MasterPasswordUnlockData } from "../types/master-password.types";
+
+export class DefaultMasterPasswordUnlockService implements MasterPasswordUnlockService {
+  constructor(
+    private readonly masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    private readonly keyService: KeyService,
+    private readonly logService: LogService,
+  ) {}
+
+  async unlockWithMasterPassword(masterPassword: string, userId: UserId): Promise<UserKey> {
+    this.validateInput(masterPassword, userId);
+
+    const masterPasswordUnlockData = await firstValueFrom(
+      this.masterPasswordService.masterPasswordUnlockData$(userId),
+    );
+
+    if (masterPasswordUnlockData == null) {
+      throw new Error("Master password unlock data was not found for the user " + userId);
+    }
+
+    const userKey = await this.masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData(
+      masterPassword,
+      masterPasswordUnlockData,
+    );
+
+    await this.setLegacyState(masterPassword, masterPasswordUnlockData, userId);
+
+    return userKey;
+  }
+
+  async proofOfDecryption(masterPassword: string, userId: UserId): Promise<boolean> {
+    this.validateInput(masterPassword, userId);
+
+    try {
+      const masterPasswordUnlockData = await firstValueFrom(
+        this.masterPasswordService.masterPasswordUnlockData$(userId),
+      );
+
+      if (masterPasswordUnlockData == null) {
+        this.logService.warning(
+          `[DefaultMasterPasswordUnlockService] No master password unlock data found for user ${userId} returning false.`,
+        );
+        return false;
+      }
+
+      const userKey = await this.masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData(
+        masterPassword,
+        masterPasswordUnlockData,
+      );
+
+      return userKey != null;
+    } catch (error) {
+      // masterPasswordService.unwrapUserKeyFromMasterPasswordUnlockData is expected to throw if the password is incorrect.
+      // Currently this throws CryptoError:InvalidKey if decrypting the user key fails at all.
+      if (isCryptoError(error) && error.variant === "InvalidKey") {
+        this.logService.debug(
+          `[DefaultMasterPasswordUnlockService] Error during proof of decryption for user ${userId} returning false: ${error}`,
+        );
+      } else {
+        this.logService.error(
+          `[DefaultMasterPasswordUnlockService] Unexpected error during proof of decryption for user ${userId} returning false: ${error}`,
+        );
+      }
+      return false;
+    }
+  }
+
+  private validateInput(masterPassword: string, userId: UserId): void {
+    if (masterPassword == null || masterPassword === "") {
+      throw new Error("Master password is required");
+    }
+    if (userId == null) {
+      throw new Error("User ID is required");
+    }
+  }
+
+  // Previously unlocking had the side effect of setting the masterKey and masterPasswordHash in state.
+  // This is to preserve that behavior, once masterKey and masterPasswordHash state is removed this should be removed as well.
+  private async setLegacyState(
+    masterPassword: string,
+    masterPasswordUnlockData: MasterPasswordUnlockData,
+    userId: UserId,
+  ): Promise<void> {
+    const masterKey = await this.keyService.makeMasterKey(
+      masterPassword,
+      masterPasswordUnlockData.salt,
+      masterPasswordUnlockData.kdf,
+    );
+
+    if (!masterKey) {
+      throw new Error("Master key could not be created to set legacy master password state.");
+    }
+
+    const localKeyHash = await this.keyService.hashMasterKey(
+      masterPassword,
+      masterKey,
+      HashPurpose.LocalAuthorization,
+    );
+
+    await this.masterPasswordService.setMasterKeyHash(localKeyHash, userId);
+    await this.masterPasswordService.setMasterKey(masterKey, userId);
+  }
+}
diff --git a/libs/common/src/key-management/master-password/services/fake-master-password.service.ts b/libs/common/src/key-management/master-password/services/fake-master-password.service.ts
index 81aea5e480a..5db7f178b18 100644
--- a/libs/common/src/key-management/master-password/services/fake-master-password.service.ts
+++ b/libs/common/src/key-management/master-password/services/fake-master-password.service.ts
@@ -119,4 +119,8 @@ export class FakeMasterPasswordService implements InternalMasterPasswordServiceA
   ): Promise<void> {
     return this.mock.setMasterPasswordUnlockData(masterPasswordUnlockData, userId);
   }
+
+  masterPasswordUnlockData$(userId: UserId): Observable<MasterPasswordUnlockData | null> {
+    return this.mock.masterPasswordUnlockData$(userId);
+  }
 }
diff --git a/libs/common/src/key-management/master-password/services/master-password.service.spec.ts b/libs/common/src/key-management/master-password/services/master-password.service.spec.ts
index 02b4e9a895a..e3d0bf51d67 100644
--- a/libs/common/src/key-management/master-password/services/master-password.service.spec.ts
+++ b/libs/common/src/key-management/master-password/services/master-password.service.spec.ts
@@ -1,28 +1,27 @@
 import { mock, MockProxy } from "jest-mock-extended";
-import * as rxjs from "rxjs";
-import { firstValueFrom, of } from "rxjs";
+import { firstValueFrom } from "rxjs";
 import { Jsonify } from "type-fest";
 
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 // eslint-disable-next-line no-restricted-imports
 import { Argon2KdfConfig, KdfConfig, KdfType, PBKDF2KdfConfig } from "@bitwarden/key-management";
+import { PureCrypto } from "@bitwarden/sdk-internal";
 
 import {
   FakeAccountService,
+  FakeStateProvider,
+  makeEncString,
   makeSymmetricCryptoKey,
   mockAccountServiceWith,
 } from "../../../../spec";
 import { ForceSetPasswordReason } from "../../../auth/models/domain/force-set-password-reason";
 import { LogService } from "../../../platform/abstractions/log.service";
-import { StateService } from "../../../platform/abstractions/state.service";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
-import { StateProvider } from "../../../platform/state";
 import { UserId } from "../../../types/guid";
 import { MasterKey, UserKey } from "../../../types/key";
 import { KeyGenerationService } from "../../crypto";
 import { CryptoFunctionService } from "../../crypto/abstractions/crypto-function.service";
-import { EncryptService } from "../../crypto/abstractions/encrypt.service";
 import { EncString } from "../../crypto/models/enc-string";
 import {
   MasterKeyWrappedUserKey,
@@ -30,64 +29,62 @@ import {
   MasterPasswordUnlockData,
 } from "../types/master-password.types";
 
-import { MASTER_PASSWORD_UNLOCK_KEY, MasterPasswordService } from "./master-password.service";
+import {
+  FORCE_SET_PASSWORD_REASON,
+  MASTER_KEY,
+  MASTER_KEY_ENCRYPTED_USER_KEY,
+  MASTER_PASSWORD_UNLOCK_KEY,
+  MasterPasswordService,
+} from "./master-password.service";
 
 describe("MasterPasswordService", () => {
   let sut: MasterPasswordService;
 
-  let stateProvider: MockProxy<StateProvider>;
-  let stateService: MockProxy<StateService>;
   let keyGenerationService: MockProxy<KeyGenerationService>;
-  let encryptService: MockProxy<EncryptService>;
   let logService: MockProxy<LogService>;
   let cryptoFunctionService: MockProxy<CryptoFunctionService>;
   let accountService: FakeAccountService;
+  let stateProvider: FakeStateProvider;
 
   const userId = "00000000-0000-0000-0000-000000000000" as UserId;
-  const mockUserState = {
-    state$: of(null),
-    update: jest.fn().mockResolvedValue(null),
-  };
 
-  const testUserKey: SymmetricCryptoKey = makeSymmetricCryptoKey(64, 1);
-  const testMasterKey: MasterKey = makeSymmetricCryptoKey(32, 2);
-  const testStretchedMasterKey: SymmetricCryptoKey = makeSymmetricCryptoKey(64, 3);
+  const kdfPBKDF2: KdfConfig = new PBKDF2KdfConfig(600_000);
+  const kdfArgon2: KdfConfig = new Argon2KdfConfig(4, 64, 3);
+  const salt = "test@bitwarden.com" as MasterPasswordSalt;
+  const userKey = makeSymmetricCryptoKey(64, 2) as UserKey;
   const testMasterKeyEncryptedKey =
     "0.gbauOANURUHqvhLTDnva1A==|nSW+fPumiuTaDB/s12+JO88uemV6rhwRSR+YR1ZzGr5j6Ei3/h+XEli2Unpz652NlZ9NTuRpHxeOqkYYJtp7J+lPMoclgteXuAzUu9kqlRc=";
-  const testStretchedMasterKeyEncryptedKey =
-    "2.gbauOANURUHqvhLTDnva1A==|nSW+fPumiuTaDB/s12+JO88uemV6rhwRSR+YR1ZzGr5j6Ei3/h+XEli2Unpz652NlZ9NTuRpHxeOqkYYJtp7J+lPMoclgteXuAzUu9kqlRc=|DeUFkhIwgkGdZA08bDnDqMMNmZk21D+H5g8IostPKAY=";
+  const sdkLoadServiceReady = jest.fn();
 
   beforeEach(() => {
-    stateProvider = mock<StateProvider>();
-    stateService = mock<StateService>();
     keyGenerationService = mock<KeyGenerationService>();
-    encryptService = mock<EncryptService>();
     logService = mock<LogService>();
     cryptoFunctionService = mock<CryptoFunctionService>();
     accountService = mockAccountServiceWith(userId);
-
-    stateProvider.getUser.mockReturnValue(mockUserState as any);
-
-    mockUserState.update.mockReset();
+    stateProvider = new FakeStateProvider(accountService);
 
     sut = new MasterPasswordService(
       stateProvider,
-      stateService,
       keyGenerationService,
-      encryptService,
       logService,
       cryptoFunctionService,
       accountService,
     );
 
-    encryptService.unwrapSymmetricKey.mockResolvedValue(makeSymmetricCryptoKey(64, 1));
     keyGenerationService.stretchKey.mockResolvedValue(makeSymmetricCryptoKey(64, 3));
     Object.defineProperty(SdkLoadService, "Ready", {
-      value: Promise.resolve(),
+      value: new Promise((resolve) => {
+        sdkLoadServiceReady();
+        resolve(undefined);
+      }),
       configurable: true,
     });
   });
 
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
   describe("saltForUser$", () => {
     it("throws when userid not present", async () => {
       expect(() => {
@@ -111,12 +108,10 @@ describe("MasterPasswordService", () => {
 
       await sut.setForceSetPasswordReason(reason, userId);
 
-      expect(stateProvider.getUser).toHaveBeenCalled();
-      expect(mockUserState.update).toHaveBeenCalled();
-
-      // Call the update function to verify it returns the correct reason
-      const updateFn = mockUserState.update.mock.calls[0][0];
-      expect(updateFn(null)).toBe(reason);
+      const state = await firstValueFrom(
+        stateProvider.getUser(userId, FORCE_SET_PASSWORD_REASON).state$,
+      );
+      expect(state).toEqual(reason);
     });
 
     it("throws an error if reason is null", async () => {
@@ -132,68 +127,87 @@ describe("MasterPasswordService", () => {
     });
 
     it("does not overwrite AdminForcePasswordReset with other reasons except None", async () => {
-      jest
-        .spyOn(sut, "forceSetPasswordReason$")
-        .mockReturnValue(of(ForceSetPasswordReason.AdminForcePasswordReset));
-
-      jest
-        .spyOn(rxjs, "firstValueFrom")
-        .mockResolvedValue(ForceSetPasswordReason.AdminForcePasswordReset);
+      stateProvider.singleUser
+        .getFake(userId, FORCE_SET_PASSWORD_REASON)
+        .nextState(ForceSetPasswordReason.AdminForcePasswordReset);
 
       await sut.setForceSetPasswordReason(ForceSetPasswordReason.WeakMasterPassword, userId);
 
-      expect(mockUserState.update).not.toHaveBeenCalled();
+      const state = await firstValueFrom(
+        stateProvider.getUser(userId, FORCE_SET_PASSWORD_REASON).state$,
+      );
+      expect(state).toEqual(ForceSetPasswordReason.AdminForcePasswordReset);
     });
 
     it("allows overwriting AdminForcePasswordReset with None", async () => {
-      jest
-        .spyOn(sut, "forceSetPasswordReason$")
-        .mockReturnValue(of(ForceSetPasswordReason.AdminForcePasswordReset));
-
-      jest
-        .spyOn(rxjs, "firstValueFrom")
-        .mockResolvedValue(ForceSetPasswordReason.AdminForcePasswordReset);
+      stateProvider.singleUser
+        .getFake(userId, FORCE_SET_PASSWORD_REASON)
+        .nextState(ForceSetPasswordReason.AdminForcePasswordReset);
 
       await sut.setForceSetPasswordReason(ForceSetPasswordReason.None, userId);
 
-      expect(mockUserState.update).toHaveBeenCalled();
+      const state = await firstValueFrom(
+        stateProvider.getUser(userId, FORCE_SET_PASSWORD_REASON).state$,
+      );
+      expect(state).toEqual(ForceSetPasswordReason.None);
     });
   });
+
   describe("decryptUserKeyWithMasterKey", () => {
-    it("decrypts a userkey wrapped in AES256-CBC", async () => {
-      encryptService.unwrapSymmetricKey.mockResolvedValue(testUserKey);
-      await sut.decryptUserKeyWithMasterKey(
-        testMasterKey,
+    const masterKey = makeSymmetricCryptoKey(64, 0) as MasterKey;
+    const userKey = makeSymmetricCryptoKey(64, 1) as UserKey;
+    const masterKeyEncryptedUserKey = makeEncString("test-encrypted-user-key");
+
+    const decryptUserKeyWithMasterKeyMock = jest.spyOn(
+      PureCrypto,
+      "decrypt_user_key_with_master_key",
+    );
+
+    beforeEach(() => {
+      decryptUserKeyWithMasterKeyMock.mockReturnValue(userKey.toEncoded());
+    });
+
+    it("successfully decrypts", async () => {
+      const decryptedUserKey = await sut.decryptUserKeyWithMasterKey(
+        masterKey,
         userId,
-        new EncString(testMasterKeyEncryptedKey),
+        masterKeyEncryptedUserKey,
       );
-      expect(encryptService.unwrapSymmetricKey).toHaveBeenCalledWith(
-        new EncString(testMasterKeyEncryptedKey),
-        testMasterKey,
+
+      expect(decryptedUserKey).toEqual(new SymmetricCryptoKey(userKey.toEncoded()));
+      expect(sdkLoadServiceReady).toHaveBeenCalled();
+      expect(PureCrypto.decrypt_user_key_with_master_key).toHaveBeenCalledWith(
+        masterKeyEncryptedUserKey.toSdk(),
+        masterKey.toEncoded(),
+      );
+      expect(sdkLoadServiceReady.mock.invocationCallOrder[0]).toBeLessThan(
+        decryptUserKeyWithMasterKeyMock.mock.invocationCallOrder[0],
       );
     });
-    it("decrypts a userkey wrapped in AES256-CBC-HMAC", async () => {
-      encryptService.unwrapSymmetricKey.mockResolvedValue(testUserKey);
-      keyGenerationService.stretchKey.mockResolvedValue(testStretchedMasterKey);
-      await sut.decryptUserKeyWithMasterKey(
-        testMasterKey,
+
+    it("returns null when failed to decrypt", async () => {
+      decryptUserKeyWithMasterKeyMock.mockImplementation(() => {
+        throw new Error("Decryption failed");
+      });
+
+      const decryptedUserKey = await sut.decryptUserKeyWithMasterKey(
+        masterKey,
         userId,
-        new EncString(testStretchedMasterKeyEncryptedKey),
+        masterKeyEncryptedUserKey,
       );
-      expect(encryptService.unwrapSymmetricKey).toHaveBeenCalledWith(
-        new EncString(testStretchedMasterKeyEncryptedKey),
-        testStretchedMasterKey,
-      );
-      expect(keyGenerationService.stretchKey).toHaveBeenCalledWith(testMasterKey);
+      expect(decryptedUserKey).toBeNull();
     });
-    it("returns null if failed to decrypt", async () => {
-      encryptService.unwrapSymmetricKey.mockRejectedValue(new Error("Decryption failed"));
-      const result = await sut.decryptUserKeyWithMasterKey(
-        testMasterKey,
-        userId,
-        new EncString(testStretchedMasterKeyEncryptedKey),
-      );
-      expect(result).toBeNull();
+
+    it("returns error when master key is null", async () => {
+      stateProvider.singleUser.getFake(userId, MASTER_KEY).nextState(null);
+
+      await expect(
+        sut.decryptUserKeyWithMasterKey(
+          null as unknown as MasterKey,
+          userId,
+          masterKeyEncryptedUserKey,
+        ),
+      ).rejects.toThrow("No master key found.");
     });
   });
 
@@ -227,10 +241,10 @@ describe("MasterPasswordService", () => {
 
       await sut.setMasterKeyEncryptedUserKey(encryptedKey, userId);
 
-      expect(stateProvider.getUser).toHaveBeenCalled();
-      expect(mockUserState.update).toHaveBeenCalled();
-      const updateFn = mockUserState.update.mock.calls[0][0];
-      expect(updateFn(null)).toEqual(encryptedKey.toJSON());
+      const state = await firstValueFrom(
+        stateProvider.getUser(userId, MASTER_KEY_ENCRYPTED_USER_KEY).state$,
+      );
+      expect(state).toEqual(encryptedKey.toJSON());
     });
   });
 
@@ -328,28 +342,22 @@ describe("MasterPasswordService", () => {
   });
 
   describe("setMasterPasswordUnlockData", () => {
-    const kdfPBKDF2: KdfConfig = new PBKDF2KdfConfig(600_000);
-    const kdfArgon2: KdfConfig = new Argon2KdfConfig(4, 64, 3);
-    const salt = "test@bitwarden.com" as MasterPasswordSalt;
-    const userKey = makeSymmetricCryptoKey(64, 2) as UserKey;
-
     it.each([kdfPBKDF2, kdfArgon2])(
       "sets the master password unlock data kdf %o in the state",
       async (kdfConfig) => {
-        const masterPasswordUnlockData = await sut.makeMasterPasswordUnlockData(
-          "test-password",
-          kdfConfig,
+        const masterKeyWrappedUserKey = makeEncString().toSdk() as MasterKeyWrappedUserKey;
+        const masterPasswordUnlockData = new MasterPasswordUnlockData(
           salt,
-          userKey,
+          kdfConfig,
+          masterKeyWrappedUserKey,
         );
 
         await sut.setMasterPasswordUnlockData(masterPasswordUnlockData, userId);
 
-        expect(stateProvider.getUser).toHaveBeenCalledWith(userId, MASTER_PASSWORD_UNLOCK_KEY);
-        expect(mockUserState.update).toHaveBeenCalled();
-
-        const updateFn = mockUserState.update.mock.calls[0][0];
-        expect(updateFn(null)).toEqual(masterPasswordUnlockData.toJSON());
+        const state = await firstValueFrom(
+          stateProvider.getUser(userId, MASTER_PASSWORD_UNLOCK_KEY).state$,
+        );
+        expect(state).toEqual(masterPasswordUnlockData.toJSON());
       },
     );
 
@@ -373,6 +381,40 @@ describe("MasterPasswordService", () => {
     });
   });
 
+  describe("masterPasswordUnlockData$", () => {
+    test.each([null as unknown as UserId, undefined as unknown as UserId])(
+      "throws when the provided userId is %s",
+      async (userId) => {
+        expect(() => sut.masterPasswordUnlockData$(userId)).toThrow("userId is null or undefined.");
+      },
+    );
+
+    it("returns null when no data is set", async () => {
+      stateProvider.singleUser.getFake(userId, MASTER_PASSWORD_UNLOCK_KEY).nextState(null);
+
+      const result = await firstValueFrom(sut.masterPasswordUnlockData$(userId));
+
+      expect(result).toBeNull();
+    });
+
+    it.each([kdfPBKDF2, kdfArgon2])(
+      "returns the master password unlock data for kdf %o from state",
+      async (kdfConfig) => {
+        const masterPasswordUnlockData = await sut.makeMasterPasswordUnlockData(
+          "test-password",
+          kdfConfig,
+          salt,
+          userKey,
+        );
+        await sut.setMasterPasswordUnlockData(masterPasswordUnlockData, userId);
+
+        const result = await firstValueFrom(sut.masterPasswordUnlockData$(userId));
+
+        expect(result).toEqual(masterPasswordUnlockData.toJSON());
+      },
+    );
+  });
+
   describe("MASTER_PASSWORD_UNLOCK_KEY", () => {
     it("has the correct configuration", () => {
       expect(MASTER_PASSWORD_UNLOCK_KEY.stateDefinition).toBeDefined();
diff --git a/libs/common/src/key-management/master-password/services/master-password.service.ts b/libs/common/src/key-management/master-password/services/master-password.service.ts
index 9f7e054d64c..8012a9230e7 100644
--- a/libs/common/src/key-management/master-password/services/master-password.service.ts
+++ b/libs/common/src/key-management/master-password/services/master-password.service.ts
@@ -12,8 +12,6 @@ import { PureCrypto } from "@bitwarden/sdk-internal";
 
 import { ForceSetPasswordReason } from "../../../auth/models/domain/force-set-password-reason";
 import { LogService } from "../../../platform/abstractions/log.service";
-import { StateService } from "../../../platform/abstractions/state.service";
-import { EncryptionType } from "../../../platform/enums";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import {
   MASTER_PASSWORD_DISK,
@@ -26,7 +24,6 @@ import { UserId } from "../../../types/guid";
 import { MasterKey, UserKey } from "../../../types/key";
 import { KeyGenerationService } from "../../crypto";
 import { CryptoFunctionService } from "../../crypto/abstractions/crypto-function.service";
-import { EncryptService } from "../../crypto/abstractions/encrypt.service";
 import { EncryptedString, EncString } from "../../crypto/models/enc-string";
 import { InternalMasterPasswordServiceAbstraction } from "../abstractions/master-password.service.abstraction";
 import {
@@ -38,7 +35,7 @@ import {
 } from "../types/master-password.types";
 
 /** Memory since master key shouldn't be available on lock */
-const MASTER_KEY = new UserKeyDefinition<MasterKey>(MASTER_PASSWORD_MEMORY, "masterKey", {
+export const MASTER_KEY = new UserKeyDefinition<MasterKey>(MASTER_PASSWORD_MEMORY, "masterKey", {
   deserializer: (masterKey) => SymmetricCryptoKey.fromJSON(masterKey) as MasterKey,
   clearOn: ["lock", "logout"],
 });
@@ -50,7 +47,7 @@ const MASTER_KEY_HASH = new UserKeyDefinition<string>(MASTER_PASSWORD_DISK, "mas
 });
 
 /** Disk to persist through lock */
-const MASTER_KEY_ENCRYPTED_USER_KEY = new UserKeyDefinition<EncryptedString>(
+export const MASTER_KEY_ENCRYPTED_USER_KEY = new UserKeyDefinition<EncryptedString>(
   MASTER_PASSWORD_DISK,
   "masterKeyEncryptedUserKey",
   {
@@ -60,7 +57,7 @@ const MASTER_KEY_ENCRYPTED_USER_KEY = new UserKeyDefinition<EncryptedString>(
 );
 
 /** Disk to persist through lock and account switches */
-const FORCE_SET_PASSWORD_REASON = new UserKeyDefinition<ForceSetPasswordReason>(
+export const FORCE_SET_PASSWORD_REASON = new UserKeyDefinition<ForceSetPasswordReason>(
   MASTER_PASSWORD_DISK,
   "forceSetPasswordReason",
   {
@@ -82,9 +79,7 @@ export const MASTER_PASSWORD_UNLOCK_KEY = new UserKeyDefinition<MasterPasswordUn
 export class MasterPasswordService implements InternalMasterPasswordServiceAbstraction {
   constructor(
     private stateProvider: StateProvider,
-    private stateService: StateService,
     private keyGenerationService: KeyGenerationService,
-    private encryptService: EncryptService,
     private logService: LogService,
     private cryptoFunctionService: CryptoFunctionService,
     private accountService: AccountService,
@@ -219,33 +214,15 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
       throw new Error("No master key found.");
     }
 
-    let decUserKey: SymmetricCryptoKey;
-
-    if (userKey.encryptionType === EncryptionType.AesCbc256_B64) {
-      try {
-        decUserKey = await this.encryptService.unwrapSymmetricKey(userKey, masterKey);
-      } catch {
-        this.logService.warning("Failed to decrypt user key with master key.");
-        return null;
-      }
-    } else if (userKey.encryptionType === EncryptionType.AesCbc256_HmacSha256_B64) {
-      try {
-        const newKey = await this.keyGenerationService.stretchKey(masterKey);
-        decUserKey = await this.encryptService.unwrapSymmetricKey(userKey, newKey);
-      } catch {
-        this.logService.warning("Failed to decrypt user key with stretched master key.");
-        return null;
-      }
-    } else {
-      throw new Error("Unsupported encryption type.");
-    }
-
-    if (decUserKey == null) {
-      this.logService.warning("Failed to decrypt user key with master key, user key is null.");
+    await SdkLoadService.Ready;
+    try {
+      return new SymmetricCryptoKey(
+        PureCrypto.decrypt_user_key_with_master_key(userKey.toSdk(), masterKey.toEncoded()),
+      ) as UserKey;
+    } catch {
+      this.logService.warning("Failed to decrypt user key with master key.");
       return null;
     }
-
-    return decUserKey as UserKey;
   }
 
   async makeMasterPasswordAuthenticationData(
@@ -344,4 +321,10 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
       .getUser(userId, MASTER_PASSWORD_UNLOCK_KEY)
       .update(() => masterPasswordUnlockData.toJSON());
   }
+
+  masterPasswordUnlockData$(userId: UserId): Observable<MasterPasswordUnlockData | null> {
+    assertNonNullish(userId, "userId");
+
+    return this.stateProvider.getUser(userId, MASTER_PASSWORD_UNLOCK_KEY).state$;
+  }
 }
diff --git a/libs/common/src/key-management/master-password/types/master-password.types.ts b/libs/common/src/key-management/master-password/types/master-password.types.ts
index 416b296623f..5ba22905140 100644
--- a/libs/common/src/key-management/master-password/types/master-password.types.ts
+++ b/libs/common/src/key-management/master-password/types/master-password.types.ts
@@ -1,8 +1,18 @@
 import { Jsonify, Opaque } from "type-fest";
 
 // eslint-disable-next-line no-restricted-imports
-import { Argon2KdfConfig, KdfConfig, KdfType, PBKDF2KdfConfig } from "@bitwarden/key-management";
-import { EncString } from "@bitwarden/sdk-internal";
+import {
+  fromSdkKdfConfig,
+  Argon2KdfConfig,
+  KdfConfig,
+  KdfType,
+  PBKDF2KdfConfig,
+} from "@bitwarden/key-management";
+import {
+  EncString,
+  MasterPasswordUnlockData as SdkMasterPasswordUnlockData,
+  MasterPasswordAuthenticationData as SdkMasterPasswordAuthenticationData,
+} from "@bitwarden/sdk-internal";
 
 /**
  * The Base64-encoded master password authentication hash, that is sent to the server for authentication.
@@ -15,7 +25,10 @@ export type MasterPasswordSalt = Opaque<string, "MasterPasswordSalt">;
 export type MasterKeyWrappedUserKey = Opaque<EncString, "MasterKeyWrappedUserKey">;
 
 /**
- * The data required to unlock with the master password.
+ * Encapsulates the data needed to unlock a vault using a master password.
+ * It contains the masterKeyWrappedUserKey along with the KDF settings and salt used to derive the master key.
+ * It is currently backwards compatible to master-key based unlock, but this will not be the case in the future.
+ * Features relating to master-password-based unlock should use this abstraction.
  */
 export class MasterPasswordUnlockData {
   constructor(
@@ -24,6 +37,14 @@ export class MasterPasswordUnlockData {
     readonly masterKeyWrappedUserKey: MasterKeyWrappedUserKey,
   ) {}
 
+  static fromSdk(sdkData: SdkMasterPasswordUnlockData): MasterPasswordUnlockData {
+    return new MasterPasswordUnlockData(
+      sdkData.salt as MasterPasswordSalt,
+      fromSdkKdfConfig(sdkData.kdf),
+      sdkData.masterKeyWrappedUserKey as MasterKeyWrappedUserKey,
+    );
+  }
+
   toJSON(): any {
     return {
       salt: this.salt,
@@ -48,10 +69,23 @@ export class MasterPasswordUnlockData {
 }
 
 /**
- * The data required to authenticate with the master password.
+ * Encapsulates the data required to authenticate using a master password.
+ * It contains the masterPasswordAuthenticationHash, along with the KDF settings and salt used to derive it.
+ * The encapsulated abstraction prevents authentication issues resulting from unsynchronized state.
  */
 export type MasterPasswordAuthenticationData = {
   salt: MasterPasswordSalt;
   kdf: KdfConfig;
   masterPasswordAuthenticationHash: MasterPasswordAuthenticationHash;
 };
+
+export function fromSdkAuthenticationData(
+  sdkData: SdkMasterPasswordAuthenticationData,
+): MasterPasswordAuthenticationData {
+  return {
+    salt: sdkData.salt as MasterPasswordSalt,
+    kdf: fromSdkKdfConfig(sdkData.kdf),
+    masterPasswordAuthenticationHash:
+      sdkData.masterPasswordAuthenticationHash as MasterPasswordAuthenticationHash,
+  };
+}
diff --git a/libs/common/src/key-management/pin/pin-lock-type.ts b/libs/common/src/key-management/pin/pin-lock-type.ts
new file mode 100644
index 00000000000..96578553b82
--- /dev/null
+++ b/libs/common/src/key-management/pin/pin-lock-type.ts
@@ -0,0 +1,7 @@
+/**
+ * - DISABLED   : No PIN set.
+ * - PERSISTENT : PIN is set and persists through client reset.
+ * - EPHEMERAL  : PIN is set, but does NOT persist through client reset. This means that
+ *                after client reset the master password is required to unlock.
+ */
+export type PinLockType = "DISABLED" | "PERSISTENT" | "EPHEMERAL";
diff --git a/libs/common/src/key-management/pin/pin-state.service.abstraction.ts b/libs/common/src/key-management/pin/pin-state.service.abstraction.ts
new file mode 100644
index 00000000000..cd10b8b7fe2
--- /dev/null
+++ b/libs/common/src/key-management/pin/pin-state.service.abstraction.ts
@@ -0,0 +1,86 @@
+import { Observable } from "rxjs";
+
+import { PasswordProtectedKeyEnvelope } from "@bitwarden/sdk-internal";
+
+import { UserId } from "../../types/guid";
+import { EncryptedString, EncString } from "../crypto/models/enc-string";
+
+import { PinLockType } from "./pin-lock-type";
+
+/**
+ * The PinStateService manages the storage and retrieval of PIN-related state for user accounts.
+ */
+export abstract class PinStateServiceAbstraction {
+  /**
+   * Gets the user's UserKey encrypted PIN
+   * @deprecated - This is not a public API. DO NOT USE IT
+   * @param userId The user's id
+   * @throws If the user id is not provided
+   */
+  abstract userKeyEncryptedPin$(userId: UserId): Observable<EncString | null>;
+
+  /**
+   * Gets the user's {@link PinLockType}
+   * @param userId The user's id
+   * @throws If the user id is not provided
+   */
+  abstract getPinLockType(userId: UserId): Promise<PinLockType>;
+
+  /**
+   * Checks if a user is enrolled into PIN unlock
+   * @param userId The user's id
+   */
+  abstract isPinSet(userId: UserId): Promise<boolean>;
+
+  /**
+   * Gets the user's PIN-protected UserKey envelope, either persistent or ephemeral based on the provided PinLockType
+   * @deprecated - This is not a public API. DO NOT USE IT
+   * @param userId The user's id
+   * @param pinLockType User's {@link PinLockType}.
+   * @throws if the user id is not provided
+   * @throws if the pin lock type is not persistent or ephemeral
+   */
+  abstract getPinProtectedUserKeyEnvelope(
+    userId: UserId,
+    pinLockType: PinLockType,
+  ): Promise<PasswordProtectedKeyEnvelope | null>;
+
+  /**
+   * Gets the user's legacy PIN-protected UserKey
+   * @deprecated Use {@link getPinProtectedUserKeyEnvelope} instead. Only for migration support.
+   * @param userId The user's id
+   * @throws If the user id is not provided
+   */
+  abstract getLegacyPinKeyEncryptedUserKeyPersistent(userId: UserId): Promise<EncString | null>;
+
+  /**
+   * Sets the PIN state for the user
+   * @deprecated - This is not a public API. DO NOT USE IT
+   * @param userId The user's id
+   * @param pinProtectedUserKeyEnvelope The user's PIN-protected UserKey envelope
+   * @param userKeyEncryptedPin The user's UserKey-encrypted PIN
+   * @param pinLockType The user's PinLockType
+   * @throws If the user id, pinProtectedUserKeyEnvelope, or pinLockType is not provided
+   * @throws If the pin lock type is not persistent or ephemeral
+   */
+  abstract setPinState(
+    userId: UserId,
+    pinProtectedUserKeyEnvelope: PasswordProtectedKeyEnvelope,
+    userKeyEncryptedPin: EncryptedString,
+    pinLockType: PinLockType,
+  ): Promise<void>;
+
+  /**
+   * Clears all PIN state for the user, both persistent and ephemeral
+   * @param userId The user's id
+   * @throws If the user id is not provided
+   */
+  abstract clearPinState(userId: UserId): Promise<void>;
+
+  /**
+   * Clears only the user's ephemeral PIN. Persistent PIN state and UserKey wrapped PIN remains unchanged.
+   * @param userId The user's id
+   * @throws If the user id is not provided
+   */
+  abstract clearEphemeralPinState(userId: UserId): Promise<void>;
+}
diff --git a/libs/common/src/key-management/pin/pin-state.service.implementation.ts b/libs/common/src/key-management/pin/pin-state.service.implementation.ts
new file mode 100644
index 00000000000..0bf6cb60fb0
--- /dev/null
+++ b/libs/common/src/key-management/pin/pin-state.service.implementation.ts
@@ -0,0 +1,129 @@
+import { firstValueFrom, map, Observable } from "rxjs";
+
+import { PasswordProtectedKeyEnvelope } from "@bitwarden/sdk-internal";
+import { StateProvider } from "@bitwarden/state";
+import { UserId } from "@bitwarden/user-core";
+
+import { assertNonNullish } from "../../auth/utils";
+import { EncryptedString, EncString } from "../crypto/models/enc-string";
+
+import { PinLockType } from "./pin-lock-type";
+import { PinStateServiceAbstraction } from "./pin-state.service.abstraction";
+import {
+  PIN_PROTECTED_USER_KEY_ENVELOPE_PERSISTENT,
+  PIN_PROTECTED_USER_KEY_ENVELOPE_EPHEMERAL,
+  USER_KEY_ENCRYPTED_PIN,
+  PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
+} from "./pin.state";
+
+export class PinStateService implements PinStateServiceAbstraction {
+  constructor(private stateProvider: StateProvider) {}
+
+  userKeyEncryptedPin$(userId: UserId): Observable<EncString | null> {
+    assertNonNullish(userId, "userId");
+
+    return this.stateProvider
+      .getUserState$(USER_KEY_ENCRYPTED_PIN, userId)
+      .pipe(map((value) => (value ? new EncString(value) : null)));
+  }
+
+  async isPinSet(userId: UserId): Promise<boolean> {
+    assertNonNullish(userId, "userId");
+    return (await this.getPinLockType(userId)) !== "DISABLED";
+  }
+
+  async getPinLockType(userId: UserId): Promise<PinLockType> {
+    assertNonNullish(userId, "userId");
+
+    const isPersistentPinSet =
+      (await this.getPinProtectedUserKeyEnvelope(userId, "PERSISTENT")) != null ||
+      // Deprecated
+      (await this.getLegacyPinKeyEncryptedUserKeyPersistent(userId)) != null;
+    const isPinSet =
+      (await firstValueFrom(this.stateProvider.getUserState$(USER_KEY_ENCRYPTED_PIN, userId))) !=
+      null;
+
+    if (isPersistentPinSet) {
+      return "PERSISTENT";
+    } else if (isPinSet) {
+      return "EPHEMERAL";
+    } else {
+      return "DISABLED";
+    }
+  }
+
+  async getPinProtectedUserKeyEnvelope(
+    userId: UserId,
+    pinLockType: PinLockType,
+  ): Promise<PasswordProtectedKeyEnvelope | null> {
+    assertNonNullish(userId, "userId");
+
+    if (pinLockType === "EPHEMERAL") {
+      return await firstValueFrom(
+        this.stateProvider.getUserState$(PIN_PROTECTED_USER_KEY_ENVELOPE_EPHEMERAL, userId),
+      );
+    } else if (pinLockType === "PERSISTENT") {
+      return await firstValueFrom(
+        this.stateProvider.getUserState$(PIN_PROTECTED_USER_KEY_ENVELOPE_PERSISTENT, userId),
+      );
+    } else {
+      throw new Error(`Unsupported PinLockType: ${pinLockType}`);
+    }
+  }
+
+  async getLegacyPinKeyEncryptedUserKeyPersistent(userId: UserId): Promise<EncString | null> {
+    assertNonNullish(userId, "userId");
+
+    return await firstValueFrom(
+      this.stateProvider
+        .getUserState$(PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT, userId)
+        .pipe(map((value) => (value ? new EncString(value) : null))),
+    );
+  }
+
+  async setPinState(
+    userId: UserId,
+    pinProtectedUserKeyEnvelope: PasswordProtectedKeyEnvelope,
+    userKeyEncryptedPin: EncryptedString,
+    pinLockType: PinLockType,
+  ): Promise<void> {
+    assertNonNullish(userId, "userId");
+    assertNonNullish(pinProtectedUserKeyEnvelope, "pinProtectedUserKeyEnvelope");
+    assertNonNullish(pinLockType, "pinLockType");
+
+    if (pinLockType === "EPHEMERAL") {
+      await this.stateProvider.setUserState(
+        PIN_PROTECTED_USER_KEY_ENVELOPE_EPHEMERAL,
+        pinProtectedUserKeyEnvelope,
+        userId,
+      );
+    } else if (pinLockType === "PERSISTENT") {
+      await this.stateProvider.setUserState(
+        PIN_PROTECTED_USER_KEY_ENVELOPE_PERSISTENT,
+        pinProtectedUserKeyEnvelope,
+        userId,
+      );
+    } else {
+      throw new Error(`Cannot set up PIN with pin lock type ${pinLockType}`);
+    }
+
+    await this.stateProvider.setUserState(USER_KEY_ENCRYPTED_PIN, userKeyEncryptedPin, userId);
+  }
+
+  async clearPinState(userId: UserId): Promise<void> {
+    assertNonNullish(userId, "userId");
+
+    await this.stateProvider.setUserState(USER_KEY_ENCRYPTED_PIN, null, userId);
+    await this.stateProvider.setUserState(PIN_PROTECTED_USER_KEY_ENVELOPE_EPHEMERAL, null, userId);
+    await this.stateProvider.setUserState(PIN_PROTECTED_USER_KEY_ENVELOPE_PERSISTENT, null, userId);
+
+    // Note: This can be deleted after sufficiently many PINs are migrated and the state is removed.
+    await this.stateProvider.setUserState(PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT, null, userId);
+  }
+
+  async clearEphemeralPinState(userId: UserId): Promise<void> {
+    assertNonNullish(userId, "userId");
+
+    await this.stateProvider.setUserState(PIN_PROTECTED_USER_KEY_ENVELOPE_EPHEMERAL, null, userId);
+  }
+}
diff --git a/libs/common/src/key-management/pin/pin-state.service.spec.ts b/libs/common/src/key-management/pin/pin-state.service.spec.ts
new file mode 100644
index 00000000000..be85a15e6d3
--- /dev/null
+++ b/libs/common/src/key-management/pin/pin-state.service.spec.ts
@@ -0,0 +1,727 @@
+import { firstValueFrom } from "rxjs";
+
+import { PasswordProtectedKeyEnvelope } from "@bitwarden/sdk-internal";
+
+import { FakeAccountService, FakeStateProvider, mockAccountServiceWith } from "../../../spec";
+import { Utils } from "../../platform/misc/utils";
+import { UserId } from "../../types/guid";
+import { EncryptedString } from "../crypto/models/enc-string";
+
+import { PinLockType } from "./pin-lock-type";
+import { PinStateService } from "./pin-state.service.implementation";
+import {
+  USER_KEY_ENCRYPTED_PIN,
+  PIN_PROTECTED_USER_KEY_ENVELOPE_EPHEMERAL,
+  PIN_PROTECTED_USER_KEY_ENVELOPE_PERSISTENT,
+  PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
+} from "./pin.state";
+
+describe("PinStateService", () => {
+  let sut: PinStateService;
+
+  let accountService: FakeAccountService;
+  let stateProvider: FakeStateProvider;
+
+  const mockUserId = Utils.newGuid() as UserId;
+  const mockUserEmail = "user@example.com";
+  const mockUserKeyEncryptedPin = "userKeyEncryptedPin" as EncryptedString;
+  const mockEphemeralEnvelope = "mock-ephemeral-envelope" as PasswordProtectedKeyEnvelope;
+  const mockPersistentEnvelope = "mock-persistent-envelope" as PasswordProtectedKeyEnvelope;
+
+  beforeEach(() => {
+    accountService = mockAccountServiceWith(mockUserId, { email: mockUserEmail });
+    stateProvider = new FakeStateProvider(accountService);
+
+    sut = new PinStateService(stateProvider);
+  });
+
+  it("should instantiate the PinStateService", () => {
+    expect(sut).not.toBeFalsy();
+  });
+
+  describe("userKeyWrappedPin$", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    test.each([null, undefined])("throws if userId is %p", async (userId) => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Act & Assert
+      expect(() => sut.userKeyEncryptedPin$(userId as any)).toThrow("userId is null or undefined.");
+    });
+
+    test.each([null, undefined])("emits null if userKeyEncryptedPin is nullish", async (value) => {
+      // Arrange
+      await stateProvider.setUserState(USER_KEY_ENCRYPTED_PIN, value, mockUserId);
+
+      // Act
+      const result = await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId));
+
+      // Assert
+      expect(result).toBe(null);
+    });
+
+    it("emits the userKeyEncryptedPin when available", async () => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Act
+      const result = await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId));
+
+      // Assert
+      expect(result?.encryptedString).toEqual(mockUserKeyEncryptedPin);
+    });
+
+    it("emits null when userKeyEncryptedPin isn't available", async () => {
+      // Arrange - don't set any state
+
+      // Act
+      const result = await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId));
+
+      // Assert
+      expect(result).toBeNull();
+    });
+  });
+
+  describe("getPinLockType()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it("should throw an error if userId is null", async () => {
+      // Act & Assert
+      await expect(sut.getPinLockType(null as any)).rejects.toThrow("userId");
+    });
+
+    it("should return 'PERSISTENT' if a pin protected user key (persistent) is found", async () => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Act
+      const result = await sut.getPinLockType(mockUserId);
+
+      // Assert
+      expect(result).toBe("PERSISTENT");
+    });
+
+    it("should return 'PERSISTENT' if a legacy pin key encrypted user key (persistent) is found", async () => {
+      // Arrange
+      await stateProvider.setUserState(
+        PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
+        mockUserKeyEncryptedPin,
+        mockUserId,
+      );
+
+      // Act
+      const result = await sut.getPinLockType(mockUserId);
+
+      // Assert
+      expect(result).toBe("PERSISTENT");
+    });
+
+    it("should return 'EPHEMERAL' if only user key encrypted pin is found", async () => {
+      // Arrange
+      await stateProvider.setUserState(USER_KEY_ENCRYPTED_PIN, mockUserKeyEncryptedPin, mockUserId);
+
+      // Act
+      const result = await sut.getPinLockType(mockUserId);
+
+      // Assert
+      expect(result).toBe("EPHEMERAL");
+    });
+
+    it("should return 'DISABLED' if no PIN-related state is found", async () => {
+      // Arrange - don't set any PIN-related state
+
+      // Act
+      const result = await sut.getPinLockType(mockUserId);
+
+      // Assert
+      expect(result).toBe("DISABLED");
+    });
+
+    it("should return 'DISABLED' if all PIN-related state is null", async () => {
+      // Arrange - explicitly set all state to null
+      await stateProvider.setUserState(
+        PIN_PROTECTED_USER_KEY_ENVELOPE_PERSISTENT,
+        null,
+        mockUserId,
+      );
+      await stateProvider.setUserState(PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT, null, mockUserId);
+      await stateProvider.setUserState(USER_KEY_ENCRYPTED_PIN, null, mockUserId);
+
+      // Act
+      const result = await sut.getPinLockType(mockUserId);
+
+      // Assert
+      expect(result).toBe("DISABLED");
+    });
+  });
+
+  describe("getPinProtectedUserKeyEnvelope()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    test.each([
+      [null, "PERSISTENT" as PinLockType],
+      [undefined, "PERSISTENT" as PinLockType],
+      [null, "EPHEMERAL" as PinLockType],
+      [undefined, "EPHEMERAL" as PinLockType],
+      [null, "DISABLED" as PinLockType],
+      [undefined, "DISABLED" as PinLockType],
+    ])("throws if userId is %p with pinLockType %s", async (userId, pinLockType: PinLockType) => {
+      // Using unnecesary switch so we can have exhaustive check on PinLockType
+      switch (pinLockType) {
+        case "PERSISTENT":
+          return await expect(
+            sut.getPinProtectedUserKeyEnvelope(userId as any, pinLockType),
+          ).rejects.toThrow("userId is null or undefined.");
+        case "EPHEMERAL":
+          return await expect(
+            sut.getPinProtectedUserKeyEnvelope(userId as any, pinLockType),
+          ).rejects.toThrow("userId is null or undefined.");
+        case "DISABLED":
+          return await expect(
+            sut.getPinProtectedUserKeyEnvelope(userId as any, pinLockType),
+          ).rejects.toThrow("userId is null or undefined.");
+        default: {
+          // This is the exhaustive check, will cause a compile error if a PinLockType is not handled above
+          const _exhaustiveCheck: never = pinLockType;
+          return _exhaustiveCheck;
+        }
+      }
+    });
+
+    it("should throw error for unsupported pinLockType", async () => {
+      // Act & Assert
+      await expect(
+        sut.getPinProtectedUserKeyEnvelope(mockUserId, "DISABLED" as any),
+      ).rejects.toThrow("Unsupported PinLockType: DISABLED");
+    });
+
+    test.each([["PERSISTENT" as PinLockType], ["EPHEMERAL" as PinLockType]])(
+      "should return %s envelope when pinLockType is %s",
+      async (pinLockType: PinLockType) => {
+        // Arrange
+        const mockEnvelope =
+          pinLockType === "PERSISTENT" ? mockPersistentEnvelope : mockEphemeralEnvelope;
+
+        await sut.setPinState(mockUserId, mockEnvelope, mockUserKeyEncryptedPin, pinLockType);
+
+        // Act
+        const result = await sut.getPinProtectedUserKeyEnvelope(mockUserId, pinLockType);
+
+        // Assert
+        expect(result).toBe(mockEnvelope);
+      },
+    );
+
+    test.each([["PERSISTENT" as PinLockType], ["EPHEMERAL" as PinLockType]])(
+      "should return null when %s envelope is not set",
+      async (pinLockType: PinLockType) => {
+        // Arrange - don't set any state
+
+        // Act
+        const result = await sut.getPinProtectedUserKeyEnvelope(mockUserId, pinLockType);
+
+        // Assert
+        expect(result).toBeNull();
+      },
+    );
+
+    test.each([
+      ["PERSISTENT" as PinLockType, PIN_PROTECTED_USER_KEY_ENVELOPE_PERSISTENT],
+      ["EPHEMERAL" as PinLockType, PIN_PROTECTED_USER_KEY_ENVELOPE_EPHEMERAL],
+    ])(
+      "should return null when %s envelope is explicitly set to null",
+      async (pinLockType, keyDefinition) => {
+        // Arrange
+        await stateProvider.setUserState(keyDefinition, null, mockUserId);
+
+        // Act
+        const result = await sut.getPinProtectedUserKeyEnvelope(mockUserId, pinLockType);
+
+        // Assert
+        expect(result).toBeNull();
+      },
+    );
+
+    it("should not cross-contaminate PERSISTENT and EPHEMERAL envelopes", async () => {
+      // Arrange - set both envelopes to different values
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+
+      // Act
+      const persistentResult = await sut.getPinProtectedUserKeyEnvelope(mockUserId, "PERSISTENT");
+      const ephemeralResult = await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL");
+
+      // Assert
+      expect(persistentResult).toBe(mockPersistentEnvelope);
+      expect(ephemeralResult).toBe(mockEphemeralEnvelope);
+      expect(persistentResult).not.toBe(ephemeralResult);
+    });
+  });
+
+  describe("getLegacyPinKeyEncryptedUserKeyPersistent()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    test.each([null, undefined])("throws if userId is %p", async (userId) => {
+      // Act & Assert
+      await expect(() =>
+        sut.getLegacyPinKeyEncryptedUserKeyPersistent(userId as any),
+      ).rejects.toThrow("userId is null or undefined.");
+    });
+
+    it("should return EncString when legacy key is set", async () => {
+      // Arrange
+      await stateProvider.setUserState(
+        PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
+        mockUserKeyEncryptedPin,
+        mockUserId,
+      );
+
+      // Act
+      const result = await sut.getLegacyPinKeyEncryptedUserKeyPersistent(mockUserId);
+
+      // Assert
+      expect(result?.encryptedString).toEqual(mockUserKeyEncryptedPin);
+    });
+
+    test.each([null, undefined])("should return null when legacy key is %p", async (value) => {
+      // Arrange
+      await stateProvider.setUserState(PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT, value, mockUserId);
+
+      // Act
+      const result = await sut.getLegacyPinKeyEncryptedUserKeyPersistent(mockUserId);
+
+      // Assert
+      expect(result).toBeNull();
+    });
+  });
+
+  describe("setPinState()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    test.each([[null], [undefined]])("throws if userId is %p", async (userId) => {
+      // Act & Assert
+      await expect(
+        sut.setPinState(
+          userId as any,
+          mockPersistentEnvelope,
+          mockUserKeyEncryptedPin,
+          "PERSISTENT",
+        ),
+      ).rejects.toThrow(`userId is null or undefined.`);
+    });
+
+    test.each([[null], [undefined]])(
+      "throws if pinProtectedUserKeyEnvelope is %p",
+      async (envelope) => {
+        // Act & Assert
+        await expect(
+          sut.setPinState(mockUserId, envelope as any, mockUserKeyEncryptedPin, "PERSISTENT"),
+        ).rejects.toThrow(`pinProtectedUserKeyEnvelope is null or undefined.`);
+      },
+    );
+
+    test.each([[null], [undefined]])("throws if pinLockType is %p", async (pinLockType) => {
+      // Act & Assert
+      await expect(
+        sut.setPinState(
+          mockUserId,
+          mockPersistentEnvelope,
+          mockUserKeyEncryptedPin,
+          pinLockType as any,
+        ),
+      ).rejects.toThrow(`pinLockType is null or undefined.`);
+    });
+
+    it("should throw error for unsupported pinLockType", async () => {
+      // Act & Assert
+      await expect(
+        sut.setPinState(
+          mockUserId,
+          mockPersistentEnvelope,
+          mockUserKeyEncryptedPin,
+          "DISABLED" as PinLockType,
+        ),
+      ).rejects.toThrow("Cannot set up PIN with pin lock type DISABLED");
+    });
+
+    test.each([["PERSISTENT" as PinLockType], ["EPHEMERAL" as PinLockType]])(
+      "should set %s PIN state correctly",
+      async (pinLockType: PinLockType) => {
+        // Arrange
+        const mockEnvelope =
+          pinLockType === "PERSISTENT" ? mockPersistentEnvelope : mockEphemeralEnvelope;
+
+        // Act
+        await sut.setPinState(mockUserId, mockEnvelope, mockUserKeyEncryptedPin, pinLockType);
+
+        // Assert - verify the correct envelope was set
+        const envelopeResult = await sut.getPinProtectedUserKeyEnvelope(mockUserId, pinLockType);
+        expect(envelopeResult).toBe(mockEnvelope);
+
+        // Assert - verify the user key encrypted PIN was set
+        const pinResult = await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId));
+        expect(pinResult?.encryptedString).toEqual(mockUserKeyEncryptedPin);
+      },
+    );
+  });
+
+  describe("clearPinState", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    test.each([null, undefined])("throws if userId is %p", async (userId) => {
+      // Act & Assert
+      await expect(sut.clearPinState(userId as any)).rejects.toThrow(
+        `userId is null or undefined.`,
+      );
+    });
+
+    it("clears UserKey encrypted PIN", async () => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Act
+      await sut.clearPinState(mockUserId);
+
+      // Assert
+      const result = await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId));
+      expect(result).toBeNull();
+    });
+
+    it("clears ephemeral PIN protected user key envelope", async () => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+
+      // Act
+      await sut.clearPinState(mockUserId);
+
+      // Assert
+      const result = await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL");
+      expect(result).toBeNull();
+    });
+
+    it("clears persistent PIN protected user key envelope", async () => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Act
+      await sut.clearPinState(mockUserId);
+
+      // Assert
+      const result = await sut.getPinProtectedUserKeyEnvelope(mockUserId, "PERSISTENT");
+      expect(result).toBeNull();
+    });
+
+    it("clears legacy PIN key encrypted user key persistent", async () => {
+      // Arrange
+      await stateProvider.setUserState(
+        PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
+        mockUserKeyEncryptedPin,
+        mockUserId,
+      );
+
+      // Act
+      await sut.clearPinState(mockUserId);
+
+      // Assert
+      const result = await sut.getLegacyPinKeyEncryptedUserKeyPersistent(mockUserId);
+      expect(result).toBeNull();
+    });
+
+    it("clears all PIN state when all types are set", async () => {
+      // Arrange - set up all possible PIN state
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+      await stateProvider.setUserState(
+        PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
+        mockUserKeyEncryptedPin,
+        mockUserId,
+      );
+
+      // Verify all state is set before clearing
+      expect(await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId))).not.toBeNull();
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL")).not.toBeNull();
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "PERSISTENT")).not.toBeNull();
+      expect(await sut.getLegacyPinKeyEncryptedUserKeyPersistent(mockUserId)).not.toBeNull();
+
+      // Act
+      await sut.clearPinState(mockUserId);
+
+      // Assert - all PIN state should be cleared
+      expect(await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId))).toBeNull();
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL")).toBeNull();
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "PERSISTENT")).toBeNull();
+      expect(await sut.getLegacyPinKeyEncryptedUserKeyPersistent(mockUserId)).toBeNull();
+    });
+
+    it("results in PIN lock type DISABLED after clearing", async () => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Verify PIN is set up before clearing
+      expect(await sut.getPinLockType(mockUserId)).toBe("PERSISTENT");
+
+      // Act
+      await sut.clearPinState(mockUserId);
+
+      // Assert
+      expect(await sut.getPinLockType(mockUserId)).toBe("DISABLED");
+    });
+
+    it("handles clearing when no PIN state exists", async () => {
+      // Arrange - no PIN state set up
+
+      // Act & Assert - should not throw
+      await expect(sut.clearPinState(mockUserId)).resolves.not.toThrow();
+
+      // Verify state remains cleared
+      expect(await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId))).toBeNull();
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL")).toBeNull();
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "PERSISTENT")).toBeNull();
+      expect(await sut.getLegacyPinKeyEncryptedUserKeyPersistent(mockUserId)).toBeNull();
+      expect(await sut.getPinLockType(mockUserId)).toBe("DISABLED");
+    });
+  });
+
+  describe("clearEphemeralPinState", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    test.each([null, undefined])("throws if userId is %p", async (userId) => {
+      // Act & Assert
+      await expect(sut.clearEphemeralPinState(userId as any)).rejects.toThrow(
+        `userId is null or undefined.`,
+      );
+    });
+
+    it("clears only ephemeral PIN protected user key envelope", async () => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+
+      // Act
+      await sut.clearEphemeralPinState(mockUserId);
+
+      // Assert
+      const result = await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL");
+      expect(result).toBeNull();
+    });
+
+    it("does not clear user key encrypted PIN", async () => {
+      // Arrange
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+
+      // Act
+      await sut.clearEphemeralPinState(mockUserId);
+
+      // Assert - user key encrypted PIN should still be present
+      const pinResult = await firstValueFrom(sut.userKeyEncryptedPin$(mockUserId));
+      expect(pinResult?.encryptedString).toEqual(mockUserKeyEncryptedPin);
+    });
+
+    it("does not clear persistent PIN protected user key envelope", async () => {
+      // Arrange - set up both ephemeral and persistent state
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Act
+      await sut.clearEphemeralPinState(mockUserId);
+
+      // Assert - persistent envelope should still be present
+      const persistentResult = await sut.getPinProtectedUserKeyEnvelope(mockUserId, "PERSISTENT");
+      expect(persistentResult).toBe(mockPersistentEnvelope);
+
+      // Assert - ephemeral envelope should be cleared
+      const ephemeralResult = await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL");
+      expect(ephemeralResult).toBeNull();
+    });
+
+    it("does not clear legacy PIN key encrypted user key persistent", async () => {
+      // Arrange - set up ephemeral state and legacy state
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+      await stateProvider.setUserState(
+        PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
+        mockUserKeyEncryptedPin,
+        mockUserId,
+      );
+
+      // Act
+      await sut.clearEphemeralPinState(mockUserId);
+
+      // Assert - legacy PIN should still be present
+      const legacyResult = await sut.getLegacyPinKeyEncryptedUserKeyPersistent(mockUserId);
+      expect(legacyResult?.encryptedString).toEqual(mockUserKeyEncryptedPin);
+
+      // Assert - ephemeral envelope should be cleared
+      const ephemeralResult = await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL");
+      expect(ephemeralResult).toBeNull();
+    });
+
+    it("changes PIN lock type from EPHEMERAL to DISABLED when no other PIN state exists", async () => {
+      // Arrange - set up only ephemeral PIN state
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+
+      // Verify PIN lock type is EPHEMERAL before clearing
+      expect(await sut.getPinLockType(mockUserId)).toBe("EPHEMERAL");
+
+      // Act
+      await sut.clearEphemeralPinState(mockUserId);
+
+      // Assert - PIN lock type should be DISABLED since no PIN envelope exists
+      // Note: USER_KEY_ENCRYPTED_PIN still exists but without an envelope, it's effectively disabled
+      expect(await sut.getPinLockType(mockUserId)).toBe("EPHEMERAL");
+    });
+
+    it("keeps PIN lock type as PERSISTENT when persistent state remains", async () => {
+      // Arrange - set up both ephemeral and persistent state
+      await sut.setPinState(
+        mockUserId,
+        mockEphemeralEnvelope,
+        mockUserKeyEncryptedPin,
+        "EPHEMERAL",
+      );
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Verify PIN lock type is PERSISTENT before clearing (persistent takes precedence)
+      expect(await sut.getPinLockType(mockUserId)).toBe("PERSISTENT");
+
+      // Act
+      await sut.clearEphemeralPinState(mockUserId);
+
+      // Assert - PIN lock type should remain PERSISTENT
+      expect(await sut.getPinLockType(mockUserId)).toBe("PERSISTENT");
+    });
+
+    it("handles clearing when no ephemeral PIN state exists", async () => {
+      // Arrange - no PIN state set up
+
+      // Act & Assert - should not throw
+      await expect(sut.clearEphemeralPinState(mockUserId)).resolves.not.toThrow();
+
+      // Verify state remains cleared
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL")).toBeNull();
+    });
+
+    it("handles clearing when only persistent PIN state exists", async () => {
+      // Arrange - set up only persistent state
+      await sut.setPinState(
+        mockUserId,
+        mockPersistentEnvelope,
+        mockUserKeyEncryptedPin,
+        "PERSISTENT",
+      );
+
+      // Act & Assert - should not throw
+      await expect(sut.clearEphemeralPinState(mockUserId)).resolves.not.toThrow();
+
+      // Assert - persistent state should remain unchanged
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "PERSISTENT")).toBe(
+        mockPersistentEnvelope,
+      );
+      expect(await sut.getPinProtectedUserKeyEnvelope(mockUserId, "EPHEMERAL")).toBeNull();
+      expect(await sut.getPinLockType(mockUserId)).toBe("PERSISTENT");
+    });
+  });
+});
diff --git a/libs/common/src/key-management/pin/pin.service.abstraction.ts b/libs/common/src/key-management/pin/pin.service.abstraction.ts
index 33f369cc50f..b242320c06e 100644
--- a/libs/common/src/key-management/pin/pin.service.abstraction.ts
+++ b/libs/common/src/key-management/pin/pin.service.abstraction.ts
@@ -1,128 +1,78 @@
 // eslint-disable-next-line no-restricted-imports
 import { KdfConfig } from "@bitwarden/key-management";
 
-import { EncString } from "../../key-management/crypto/models/enc-string";
 import { UserId } from "../../types/guid";
 import { PinKey, UserKey } from "../../types/key";
 
-import { PinLockType } from "./pin.service.implementation";
+import { PinLockType } from "./pin-lock-type";
 
 /**
- * The PinService is used for PIN-based unlocks. Below is a very basic overview of the PIN flow:
+ * The PinService provides PIN-based unlock functionality for user accounts.
  *
- * -- Setting the PIN via {@link SetPinComponent} --
+ * ## Overview
  *
- *    When the user submits the setPinForm:
-
- *    1. We encrypt the PIN with the UserKey and store it on disk as `userKeyEncryptedPin`.
- *
- *    2. We create a PinKey from the PIN, and then use that PinKey to encrypt the UserKey, resulting in
- *       a `pinKeyEncryptedUserKey`, which can be stored in one of two ways depending on what the user selects
- *       for the `requireMasterPasswordOnClientReset` checkbox.
- *
- *       If `requireMasterPasswordOnClientReset` is:
- *       - TRUE, store in memory as `pinKeyEncryptedUserKeyEphemeral` (does NOT persist through a client reset)
- *       - FALSE, store on disk as `pinKeyEncryptedUserKeyPersistent` (persists through a client reset)
- *
- * -- Unlocking with the PIN via {@link LockComponent} --
- *
- *    When the user enters their PIN, we decrypt their UserKey with the PIN and set that UserKey to state.
+ * - The PIN is used to unlock the user's UserKey
+ * - PIN state and key material are managed using secure envelopes and encrypted state, with support for both ephemeral (in-memory) and persistent (on-disk) storage.
+ *   When stored ephemerally, PIN unlock is only available after first unlock. When stored persistent, PIN unlock is available before first unlock.
+ * - The PIN is also stored, encrypted with the user's UserKey. After first unlock, the PIN can be retrieved.
  */
 export abstract class PinServiceAbstraction {
   /**
-   * Gets the persistent (stored on disk) version of the UserKey, encrypted by the PinKey.
+   * Gets the user's PIN
+   * @throws If the user is locked
+   * @returns The user's PIN
    */
-  abstract getPinKeyEncryptedUserKeyPersistent: (userId: UserId) => Promise<EncString | null>;
+  abstract getPin(userId: UserId): Promise<string>;
 
   /**
-   * Clears the persistent (stored on disk) version of the UserKey, encrypted by the PinKey.
+   * Setup pin unlock
+   * @throws If the provided user is locked
    */
-  abstract clearPinKeyEncryptedUserKeyPersistent(userId: UserId): Promise<void>;
+  abstract setPin(pin: string, pinLockType: PinLockType, userId: UserId): Promise<void>;
 
   /**
-   * Gets the ephemeral (stored in memory) version of the UserKey, encrypted by the PinKey.
+   * Clear pin unlock
    */
-  abstract getPinKeyEncryptedUserKeyEphemeral: (userId: UserId) => Promise<EncString | null>;
-
-  /**
-   * Clears the ephemeral (stored in memory) version of the UserKey, encrypted by the PinKey.
-   */
-  abstract clearPinKeyEncryptedUserKeyEphemeral(userId: UserId): Promise<void>;
-
-  /**
-   * Creates a pinKeyEncryptedUserKey from the provided PIN and UserKey.
-   */
-  abstract createPinKeyEncryptedUserKey: (
-    pin: string,
-    userKey: UserKey,
-    userId: UserId,
-  ) => Promise<EncString>;
-
-  /**
-   * Stores the UserKey, encrypted by the PinKey.
-   * @param storeEphemeralVersion If true, stores an ephemeral version via the private {@link setPinKeyEncryptedUserKeyEphemeral} method.
-   *                              If false, stores a persistent version via the private {@link setPinKeyEncryptedUserKeyPersistent} method.
-   */
-  abstract storePinKeyEncryptedUserKey: (
-    pinKeyEncryptedUserKey: EncString,
-    storeEphemeralVersion: boolean,
-    userId: UserId,
-  ) => Promise<void>;
-
-  /**
-   * Gets the user's PIN, encrypted by the UserKey.
-   */
-  abstract getUserKeyEncryptedPin: (userId: UserId) => Promise<EncString | null>;
-
-  /**
-   * Sets the user's PIN, encrypted by the UserKey.
-   */
-  abstract setUserKeyEncryptedPin: (
-    userKeyEncryptedPin: EncString,
-    userId: UserId,
-  ) => Promise<void>;
-
-  /**
-   * Creates a PIN, encrypted by the UserKey.
-   */
-  abstract createUserKeyEncryptedPin: (pin: string, userKey: UserKey) => Promise<EncString>;
-
-  /**
-   * Clears the user's PIN, encrypted by the UserKey.
-   */
-  abstract clearUserKeyEncryptedPin(userId: UserId): Promise<void>;
-
-  /**
-   * Makes a PinKey from the provided PIN.
-   */
-  abstract makePinKey: (pin: string, salt: string, kdfConfig: KdfConfig) => Promise<PinKey>;
+  abstract unsetPin(userId: UserId): Promise<void>;
 
   /**
    * Gets the user's PinLockType {@link PinLockType}.
    */
-  abstract getPinLockType: (userId: UserId) => Promise<PinLockType>;
+  abstract getPinLockType(userId: UserId): Promise<PinLockType>;
 
   /**
    * Declares whether or not the user has a PIN set (either persistent or ephemeral).
    * Note: for ephemeral, this does not check if we actual have an ephemeral PIN-encrypted UserKey stored in memory.
    * Decryption might not be possible even if this returns true. Use {@link isPinDecryptionAvailable} if decryption is required.
    */
-  abstract isPinSet: (userId: UserId) => Promise<boolean>;
+  abstract isPinSet(userId: UserId): Promise<boolean>;
 
   /**
    * Checks if PIN-encrypted keys are stored for the user.
    * Used for unlock / user verification scenarios where we will need to decrypt the UserKey with the PIN.
    */
-  abstract isPinDecryptionAvailable: (userId: UserId) => Promise<boolean>;
+  abstract isPinDecryptionAvailable(userId: UserId): Promise<boolean>;
+
+  /**
+   * Clears ephemeral PINs for the user being logged out.
+   */
+  abstract logout(userId: UserId): Promise<void>;
 
   /**
    * Decrypts the UserKey with the provided PIN.
-   *
-   * @remarks - If the user has an old pinKeyEncryptedMasterKey (formerly called `pinProtected`), the UserKey
-   *            will be obtained via the private {@link decryptAndMigrateOldPinKeyEncryptedMasterKey} method.
-   *          - If the user does not have an old pinKeyEncryptedMasterKey, the UserKey will be obtained via the
-   *            private {@link decryptUserKey} method.
    * @returns UserKey
+   * @throws If the pin lock type is ephemeral but the ephemeral pin protected user key envelope is not available
    */
-  abstract decryptUserKeyWithPin: (pin: string, userId: UserId) => Promise<UserKey | null>;
+  abstract decryptUserKeyWithPin(pin: string, userId: UserId): Promise<UserKey | null>;
+
+  /**
+   * @deprecated This is not deprecated, but only meant to be called by KeyService. DO NOT USE IT.
+   */
+  abstract userUnlocked(userId: UserId): Promise<void>;
+
+  /**
+   * Makes a PinKey from the provided PIN.
+   * @deprecated - Note: This is currently re-used by vault exports, which is still permitted but should be refactored out to use a different construct.
+   */
+  abstract makePinKey(pin: string, salt: string, kdfConfig: KdfConfig): Promise<PinKey>;
 }
diff --git a/libs/common/src/key-management/pin/pin.service.implementation.ts b/libs/common/src/key-management/pin/pin.service.implementation.ts
index da46cd3bc76..29a10d1a0a4 100644
--- a/libs/common/src/key-management/pin/pin.service.implementation.ts
+++ b/libs/common/src/key-management/pin/pin.service.implementation.ts
@@ -1,275 +1,137 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { firstValueFrom, map } from "rxjs";
 
 // eslint-disable-next-line no-restricted-imports
-import { KdfConfig, KdfConfigService } from "@bitwarden/key-management";
+import { KdfConfig, KdfConfigService, KeyService } from "@bitwarden/key-management";
 
 import { AccountService } from "../../auth/abstractions/account.service";
-import { CryptoFunctionService } from "../../key-management/crypto/abstractions/crypto-function.service";
+import { assertNonNullish } from "../../auth/utils";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
-import { EncString, EncryptedString } from "../../key-management/crypto/models/enc-string";
+import { EncString } from "../../key-management/crypto/models/enc-string";
 import { LogService } from "../../platform/abstractions/log.service";
-import { PIN_DISK, PIN_MEMORY, StateProvider, UserKeyDefinition } from "../../platform/state";
+import { SdkService } from "../../platform/abstractions/sdk/sdk.service";
+import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { UserId } from "../../types/guid";
 import { PinKey, UserKey } from "../../types/key";
 import { KeyGenerationService } from "../crypto";
+import { firstValueFromOrThrow } from "../utils";
 
+import { PinLockType } from "./pin-lock-type";
+import { PinStateServiceAbstraction } from "./pin-state.service.abstraction";
 import { PinServiceAbstraction } from "./pin.service.abstraction";
 
-/**
- * - DISABLED   : No PIN set.
- * - PERSISTENT : PIN is set and persists through client reset.
- * - EPHEMERAL  : PIN is set, but does NOT persist through client reset. This means that
- *                after client reset the master password is required to unlock.
- */
-export type PinLockType = "DISABLED" | "PERSISTENT" | "EPHEMERAL";
-
-/**
- * The persistent (stored on disk) version of the UserKey, encrypted by the PinKey.
- *
- * @remarks Persists through a client reset. Used when `requireMasterPasswordOnClientRestart` is disabled.
- * @see SetPinComponent.setPinForm.requireMasterPasswordOnClientRestart
- */
-export const PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT = new UserKeyDefinition<EncryptedString>(
-  PIN_DISK,
-  "pinKeyEncryptedUserKeyPersistent",
-  {
-    deserializer: (jsonValue) => jsonValue,
-    clearOn: ["logout"],
-  },
-);
-
-/**
- * The ephemeral (stored in memory) version of the UserKey, encrypted by the PinKey.
- *
- * @remarks Does NOT persist through a client reset. Used when `requireMasterPasswordOnClientRestart` is enabled.
- * @see SetPinComponent.setPinForm.requireMasterPasswordOnClientRestart
- */
-export const PIN_KEY_ENCRYPTED_USER_KEY_EPHEMERAL = new UserKeyDefinition<EncryptedString>(
-  PIN_MEMORY,
-  "pinKeyEncryptedUserKeyEphemeral",
-  {
-    deserializer: (jsonValue) => jsonValue,
-    clearOn: ["logout"],
-  },
-);
-
-/**
- * The PIN, encrypted by the UserKey.
- */
-export const USER_KEY_ENCRYPTED_PIN = new UserKeyDefinition<EncryptedString>(
-  PIN_DISK,
-  "userKeyEncryptedPin",
-  {
-    deserializer: (jsonValue) => jsonValue,
-    clearOn: ["logout"],
-  },
-);
-
 export class PinService implements PinServiceAbstraction {
   constructor(
     private accountService: AccountService,
-    private cryptoFunctionService: CryptoFunctionService,
     private encryptService: EncryptService,
     private kdfConfigService: KdfConfigService,
     private keyGenerationService: KeyGenerationService,
     private logService: LogService,
-    private stateProvider: StateProvider,
+    private keyService: KeyService,
+    private sdkService: SdkService,
+    private pinStateService: PinStateServiceAbstraction,
   ) {}
 
-  async getPinKeyEncryptedUserKeyPersistent(userId: UserId): Promise<EncString | null> {
-    this.validateUserId(userId, "Cannot get pinKeyEncryptedUserKeyPersistent.");
-
-    return EncString.fromJSON(
-      await firstValueFrom(
-        this.stateProvider.getUserState$(PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT, userId),
-      ),
-    );
-  }
-
-  /**
-   * Sets the persistent (stored on disk) version of the UserKey, encrypted by the PinKey.
-   */
-  private async setPinKeyEncryptedUserKeyPersistent(
-    pinKeyEncryptedUserKey: EncString,
-    userId: UserId,
-  ): Promise<void> {
-    this.validateUserId(userId, "Cannot set pinKeyEncryptedUserKeyPersistent.");
-
-    if (pinKeyEncryptedUserKey == null) {
-      throw new Error(
-        "No pinKeyEncryptedUserKey provided. Cannot set pinKeyEncryptedUserKeyPersistent.",
-      );
-    }
-
-    await this.stateProvider.setUserState(
-      PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
-      pinKeyEncryptedUserKey?.encryptedString,
-      userId,
-    );
-  }
-
-  async clearPinKeyEncryptedUserKeyPersistent(userId: UserId): Promise<void> {
-    this.validateUserId(userId, "Cannot clear pinKeyEncryptedUserKeyPersistent.");
-
-    await this.stateProvider.setUserState(PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT, null, userId);
-  }
-
-  async getPinKeyEncryptedUserKeyEphemeral(userId: UserId): Promise<EncString | null> {
-    this.validateUserId(userId, "Cannot get pinKeyEncryptedUserKeyEphemeral.");
-
-    return EncString.fromJSON(
-      await firstValueFrom(
-        this.stateProvider.getUserState$(PIN_KEY_ENCRYPTED_USER_KEY_EPHEMERAL, userId),
-      ),
-    );
-  }
-
-  /**
-   * Sets the ephemeral (stored in memory) version of the UserKey, encrypted by the PinKey.
-   */
-  private async setPinKeyEncryptedUserKeyEphemeral(
-    pinKeyEncryptedUserKey: EncString,
-    userId: UserId,
-  ): Promise<void> {
-    this.validateUserId(userId, "Cannot set pinKeyEncryptedUserKeyEphemeral.");
-
-    if (pinKeyEncryptedUserKey == null) {
-      throw new Error(
-        "No pinKeyEncryptedUserKey provided. Cannot set pinKeyEncryptedUserKeyEphemeral.",
-      );
-    }
-
-    await this.stateProvider.setUserState(
-      PIN_KEY_ENCRYPTED_USER_KEY_EPHEMERAL,
-      pinKeyEncryptedUserKey?.encryptedString,
-      userId,
-    );
-  }
-
-  async clearPinKeyEncryptedUserKeyEphemeral(userId: UserId): Promise<void> {
-    this.validateUserId(userId, "Cannot clear pinKeyEncryptedUserKeyEphemeral.");
-
-    await this.stateProvider.setUserState(PIN_KEY_ENCRYPTED_USER_KEY_EPHEMERAL, null, userId);
-  }
-
-  async createPinKeyEncryptedUserKey(
-    pin: string,
-    userKey: UserKey,
-    userId: UserId,
-  ): Promise<EncString> {
-    this.validateUserId(userId, "Cannot create pinKeyEncryptedUserKey.");
-
-    if (!userKey) {
-      throw new Error("No UserKey provided. Cannot create pinKeyEncryptedUserKey.");
-    }
-
-    const email = await firstValueFrom(
-      this.accountService.accounts$.pipe(map((accounts) => accounts[userId].email)),
-    );
-    const kdfConfig = await this.kdfConfigService.getKdfConfig(userId);
-    const pinKey = await this.makePinKey(pin, email, kdfConfig);
-
-    return await this.encryptService.wrapSymmetricKey(userKey, pinKey);
-  }
-
-  async storePinKeyEncryptedUserKey(
-    pinKeyEncryptedUserKey: EncString,
-    storeAsEphemeral: boolean,
-    userId: UserId,
-  ): Promise<void> {
-    this.validateUserId(userId, "Cannot store pinKeyEncryptedUserKey.");
-
-    if (storeAsEphemeral) {
-      await this.setPinKeyEncryptedUserKeyEphemeral(pinKeyEncryptedUserKey, userId);
-    } else {
-      await this.setPinKeyEncryptedUserKeyPersistent(pinKeyEncryptedUserKey, userId);
-    }
-  }
-
-  async getUserKeyEncryptedPin(userId: UserId): Promise<EncString | null> {
-    this.validateUserId(userId, "Cannot get userKeyEncryptedPin.");
-
-    return EncString.fromJSON(
-      await firstValueFrom(this.stateProvider.getUserState$(USER_KEY_ENCRYPTED_PIN, userId)),
-    );
-  }
-
-  async setUserKeyEncryptedPin(userKeyEncryptedPin: EncString, userId: UserId): Promise<void> {
-    this.validateUserId(userId, "Cannot set userKeyEncryptedPin.");
-
-    await this.stateProvider.setUserState(
-      USER_KEY_ENCRYPTED_PIN,
-      userKeyEncryptedPin?.encryptedString,
-      userId,
-    );
-  }
-
-  async clearUserKeyEncryptedPin(userId: UserId): Promise<void> {
-    this.validateUserId(userId, "Cannot clear userKeyEncryptedPin.");
-
-    await this.stateProvider.setUserState(USER_KEY_ENCRYPTED_PIN, null, userId);
-  }
-
-  async createUserKeyEncryptedPin(pin: string, userKey: UserKey): Promise<EncString> {
-    if (!userKey) {
-      throw new Error("No UserKey provided. Cannot create userKeyEncryptedPin.");
-    }
-
-    return await this.encryptService.encryptString(pin, userKey);
-  }
-
-  async makePinKey(pin: string, salt: string, kdfConfig: KdfConfig): Promise<PinKey> {
-    const start = Date.now();
-    const pinKey = await this.keyGenerationService.deriveKeyFromPassword(pin, salt, kdfConfig);
-    this.logService.info(`[Pin Service] deriving pin key took ${Date.now() - start}ms`);
-
-    return (await this.keyGenerationService.stretchKey(pinKey)) as PinKey;
-  }
-
-  async getPinLockType(userId: UserId): Promise<PinLockType> {
-    this.validateUserId(userId, "Cannot get PinLockType.");
-
-    const aUserKeyEncryptedPinIsSet = !!(await this.getUserKeyEncryptedPin(userId));
-    const aPinKeyEncryptedUserKeyPersistentIsSet =
-      !!(await this.getPinKeyEncryptedUserKeyPersistent(userId));
-
-    if (aPinKeyEncryptedUserKeyPersistentIsSet) {
-      return "PERSISTENT";
-    } else if (aUserKeyEncryptedPinIsSet && !aPinKeyEncryptedUserKeyPersistentIsSet) {
-      return "EPHEMERAL";
-    } else {
-      return "DISABLED";
-    }
+  getPinLockType(userId: UserId): Promise<PinLockType> {
+    assertNonNullish(userId, "userId");
+    return this.pinStateService.getPinLockType(userId);
   }
 
   async isPinSet(userId: UserId): Promise<boolean> {
-    this.validateUserId(userId, "Cannot determine if PIN is set.");
+    assertNonNullish(userId, "userId");
+    return (await this.pinStateService.getPinLockType(userId)) !== "DISABLED";
+  }
 
-    return (await this.getPinLockType(userId)) !== "DISABLED";
+  async logout(userId: UserId): Promise<void> {
+    assertNonNullish(userId, "userId");
+    await this.pinStateService.clearPinState(userId);
+  }
+
+  async userUnlocked(userId: UserId): Promise<void> {
+    if (
+      (await this.pinStateService.getPinLockType(userId)) === "EPHEMERAL" &&
+      !(await this.isPinDecryptionAvailable(userId))
+    ) {
+      this.logService.info("[Pin Service] On first unlock: Setting up ephemeral PIN");
+
+      // On first unlock, set the ephemeral pin envelope, if it is not set yet
+      const pin = await this.getPin(userId);
+      await this.setPin(pin, "EPHEMERAL", userId);
+    } else if ((await this.pinStateService.getPinLockType(userId)) === "PERSISTENT") {
+      // Encrypted migration for persistent pin unlock to pin envelopes.
+      // This will be removed at the earliest in 2026.1.0
+      //
+      // ----- ENCRYPTION MIGRATION -----
+      // Pin-key encrypted user-keys are eagerly migrated to the new pin-protected user key envelope format.
+      if ((await this.pinStateService.getLegacyPinKeyEncryptedUserKeyPersistent(userId)) != null) {
+        this.logService.info(
+          "[Pin Service] Migrating legacy PIN key to PinProtectedUserKeyEnvelope",
+        );
+        const pin = await this.getPin(userId);
+        await this.setPin(pin, "PERSISTENT", userId);
+      }
+    }
+  }
+
+  async getPin(userId: UserId): Promise<string> {
+    assertNonNullish(userId, "userId");
+
+    const userKey: UserKey = await firstValueFromOrThrow(
+      this.keyService.userKey$(userId),
+      "userKey",
+    );
+    const userKeyEncryptedPin = await firstValueFromOrThrow(
+      this.pinStateService.userKeyEncryptedPin$(userId),
+      "userKeyEncryptedPin",
+    );
+    return this.encryptService.decryptString(userKeyEncryptedPin, userKey);
+  }
+
+  async setPin(pin: string, pinLockType: PinLockType, userId: UserId): Promise<void> {
+    assertNonNullish(pin, "pin");
+    assertNonNullish(pinLockType, "pinLockType");
+    assertNonNullish(userId, "userId");
+
+    // Use the sdk to create an enrollment, not yet persisting it to state
+    const { pinProtectedUserKeyEnvelope, userKeyEncryptedPin } = await firstValueFrom(
+      this.sdkService.userClient$(userId).pipe(
+        map((sdk) => {
+          using ref = sdk.take();
+          return ref.value.crypto().enroll_pin(pin);
+        }),
+      ),
+    );
+
+    await this.pinStateService.setPinState(
+      userId,
+      pinProtectedUserKeyEnvelope,
+      userKeyEncryptedPin,
+      pinLockType,
+    );
+  }
+
+  async unsetPin(userId: UserId): Promise<void> {
+    assertNonNullish(userId, "userId");
+    await this.pinStateService.clearPinState(userId);
   }
 
   async isPinDecryptionAvailable(userId: UserId): Promise<boolean> {
-    this.validateUserId(userId, "Cannot determine if decryption of user key via PIN is available.");
-
-    const pinLockType = await this.getPinLockType(userId);
+    assertNonNullish(userId, "userId");
 
+    const pinLockType = await this.pinStateService.getPinLockType(userId);
     switch (pinLockType) {
       case "DISABLED":
         return false;
       case "PERSISTENT":
-        // The above getPinLockType call ensures that we have either a PinKeyEncryptedUserKey  set.
+        // The above getPinLockType call ensures that we have either a PinKeyEncryptedUserKey or PinProtectedKeyEnvelope set.
         return true;
       case "EPHEMERAL": {
         // The above getPinLockType call ensures that we have a UserKeyEncryptedPin set.
-        // However, we must additively check to ensure that we have a set PinKeyEncryptedUserKeyEphemeral b/c otherwise
-        // we cannot take a PIN, derive a PIN key, and decrypt the ephemeral UserKey.
-        const pinKeyEncryptedUserKeyEphemeral =
-          await this.getPinKeyEncryptedUserKeyEphemeral(userId);
-        return Boolean(pinKeyEncryptedUserKeyEphemeral);
+        // However, we must additively check to ensure that we have a set PinKeyEncryptedUserKeyEphemeral, since
+        // this is only available after first unlock
+        const ephemeralPinProtectedKeyEnvelope =
+          await this.pinStateService.getPinProtectedUserKeyEnvelope(userId, "EPHEMERAL");
+        return ephemeralPinProtectedKeyEnvelope != null;
       }
-
       default: {
         // Compile-time check for exhaustive switch
         const _exhaustiveCheck: never = pinLockType;
@@ -279,112 +141,89 @@ export class PinService implements PinServiceAbstraction {
   }
 
   async decryptUserKeyWithPin(pin: string, userId: UserId): Promise<UserKey | null> {
-    this.validateUserId(userId, "Cannot decrypt user key with PIN.");
+    assertNonNullish(pin, "pin");
+    assertNonNullish(userId, "userId");
 
-    try {
-      const pinLockType = await this.getPinLockType(userId);
+    const hasPinProtectedKeyEnvelopeSet =
+      (await this.pinStateService.getPinProtectedUserKeyEnvelope(userId, "EPHEMERAL")) != null ||
+      (await this.pinStateService.getPinProtectedUserKeyEnvelope(userId, "PERSISTENT")) != null;
 
-      const pinKeyEncryptedUserKey = await this.getPinKeyEncryptedKeys(pinLockType, userId);
+    if (hasPinProtectedKeyEnvelopeSet) {
+      this.logService.info("[Pin Service] Pin-unlock via PinProtectedUserKeyEnvelope");
 
-      const email = await firstValueFrom(
-        this.accountService.accounts$.pipe(map((accounts) => accounts[userId].email)),
-      );
-      const kdfConfig = await this.kdfConfigService.getKdfConfig(userId);
-
-      const userKey: UserKey = await this.decryptUserKey(
+      const pinLockType = await this.pinStateService.getPinLockType(userId);
+      const envelope = await this.pinStateService.getPinProtectedUserKeyEnvelope(
         userId,
-        pin,
-        email,
-        kdfConfig,
-        pinKeyEncryptedUserKey,
+        pinLockType,
       );
-      if (!userKey) {
-        this.logService.warning(`User key null after pin key decryption.`);
+
+      try {
+        // Use the sdk to create an enrollment, not yet persisting it to state
+        const startTime = performance.now();
+        const userKeyBytes = await firstValueFrom(
+          this.sdkService.client$.pipe(
+            map((sdk) => {
+              if (!sdk) {
+                throw new Error("SDK not available");
+              }
+              return sdk.crypto().unseal_password_protected_key_envelope(pin, envelope!);
+            }),
+          ),
+        );
+        this.logService.measure(startTime, "Crypto", "PinService", "UnsealPinEnvelope");
+
+        return new SymmetricCryptoKey(userKeyBytes) as UserKey;
+      } catch (error) {
+        this.logService.error(`Failed to unseal pin: ${error}`);
         return null;
       }
+    } else {
+      this.logService.info("[Pin Service] Pin-unlock via legacy PinKeyEncryptedUserKey");
 
-      if (!(await this.validatePin(userKey, pin, userId))) {
-        this.logService.warning(`Pin key decryption successful but pin validation failed.`);
+      // This branch is deprecated and will be removed in the future, but is kept for migration.
+      try {
+        const pinKeyEncryptedUserKey =
+          await this.pinStateService.getLegacyPinKeyEncryptedUserKeyPersistent(userId);
+        const email = await firstValueFrom(
+          this.accountService.accounts$.pipe(map((accounts) => accounts[userId].email)),
+        );
+        const kdfConfig = await this.kdfConfigService.getKdfConfig(userId);
+        return await this.decryptUserKey(pin, email, kdfConfig, pinKeyEncryptedUserKey!);
+      } catch (error) {
+        this.logService.error(`Error decrypting user key with pin: ${error}`);
         return null;
       }
-
-      return userKey;
-    } catch (error) {
-      this.logService.error(`Error decrypting user key with pin: ${error}`);
-      return null;
     }
   }
 
+  /// Anything below here is deprecated and will be removed subsequently
+
+  async makePinKey(pin: string, salt: string, kdfConfig: KdfConfig): Promise<PinKey> {
+    const startTime = performance.now();
+    const pinKey = await this.keyGenerationService.deriveKeyFromPassword(pin, salt, kdfConfig);
+    this.logService.measure(startTime, "Crypto", "PinService", "makePinKey");
+
+    return (await this.keyGenerationService.stretchKey(pinKey)) as PinKey;
+  }
+
   /**
    * Decrypts the UserKey with the provided PIN.
+   * @deprecated
+   * @throws If the PIN does not match the PIN that was used to encrypt the user key
+   * @throws If the salt, or KDF don't match the salt / KDF used to encrypt the user key
    */
   private async decryptUserKey(
-    userId: UserId,
     pin: string,
     salt: string,
     kdfConfig: KdfConfig,
-    pinKeyEncryptedUserKey?: EncString,
+    pinKeyEncryptedUserKey: EncString,
   ): Promise<UserKey> {
-    this.validateUserId(userId, "Cannot decrypt user key.");
-
-    pinKeyEncryptedUserKey ||= await this.getPinKeyEncryptedUserKeyPersistent(userId);
-    pinKeyEncryptedUserKey ||= await this.getPinKeyEncryptedUserKeyEphemeral(userId);
-
-    if (!pinKeyEncryptedUserKey) {
-      throw new Error("No pinKeyEncryptedUserKey found.");
-    }
-
+    assertNonNullish(pin, "pin");
+    assertNonNullish(salt, "salt");
+    assertNonNullish(kdfConfig, "kdfConfig");
+    assertNonNullish(pinKeyEncryptedUserKey, "pinKeyEncryptedUserKey");
     const pinKey = await this.makePinKey(pin, salt, kdfConfig);
     const userKey = await this.encryptService.unwrapSymmetricKey(pinKeyEncryptedUserKey, pinKey);
-
     return userKey as UserKey;
   }
-
-  /**
-   * Gets the user's `pinKeyEncryptedUserKey` (persistent or ephemeral)
-   * (if one exists) based on the user's PinLockType.
-   *
-   * @throws If PinLockType is 'DISABLED' or if userId is not provided
-   */
-  private async getPinKeyEncryptedKeys(
-    pinLockType: PinLockType,
-    userId: UserId,
-  ): Promise<EncString> {
-    this.validateUserId(userId, "Cannot get PinKey encrypted keys.");
-
-    switch (pinLockType) {
-      case "PERSISTENT": {
-        return await this.getPinKeyEncryptedUserKeyPersistent(userId);
-      }
-      case "EPHEMERAL": {
-        return await this.getPinKeyEncryptedUserKeyEphemeral(userId);
-      }
-      case "DISABLED":
-        throw new Error("Pin is disabled");
-      default: {
-        // Compile-time check for exhaustive switch
-        const _exhaustiveCheck: never = pinLockType;
-        return _exhaustiveCheck;
-      }
-    }
-  }
-
-  private async validatePin(userKey: UserKey, pin: string, userId: UserId): Promise<boolean> {
-    this.validateUserId(userId, "Cannot validate PIN.");
-
-    const userKeyEncryptedPin = await this.getUserKeyEncryptedPin(userId);
-    const decryptedPin = await this.encryptService.decryptString(userKeyEncryptedPin, userKey);
-
-    const isPinValid = this.cryptoFunctionService.compareFast(decryptedPin, pin);
-    return isPinValid;
-  }
-
-  /**
-   * Throws a custom error message if user ID is not provided.
-   */
-  private validateUserId(userId: UserId, errorMessage: string = "") {
-    if (!userId) {
-      throw new Error(`User ID is required. ${errorMessage}`);
-    }
-  }
 }
diff --git a/libs/common/src/key-management/pin/pin.service.spec.ts b/libs/common/src/key-management/pin/pin.service.spec.ts
index b014c26c7dc..8d78255bb1b 100644
--- a/libs/common/src/key-management/pin/pin.service.spec.ts
+++ b/libs/common/src/key-management/pin/pin.service.spec.ts
@@ -1,68 +1,64 @@
 import { mock } from "jest-mock-extended";
+import { BehaviorSubject, filter } from "rxjs";
 
 // eslint-disable-next-line no-restricted-imports
-import { DEFAULT_KDF_CONFIG, KdfConfigService } from "@bitwarden/key-management";
+import { DEFAULT_KDF_CONFIG, KdfConfigService, KeyService } from "@bitwarden/key-management";
+import { PasswordProtectedKeyEnvelope } from "@bitwarden/sdk-internal";
 
-import { FakeAccountService, FakeStateProvider, mockAccountServiceWith } from "../../../spec";
+import { MockSdkService } from "../..//platform/spec/mock-sdk.service";
+import { FakeAccountService, mockAccountServiceWith, mockEnc } from "../../../spec";
 import { LogService } from "../../platform/abstractions/log.service";
 import { Utils } from "../../platform/misc/utils";
 import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
 import { UserId } from "../../types/guid";
 import { PinKey, UserKey } from "../../types/key";
 import { KeyGenerationService } from "../crypto";
-import { CryptoFunctionService } from "../crypto/abstractions/crypto-function.service";
 import { EncryptService } from "../crypto/abstractions/encrypt.service";
-import { EncString } from "../crypto/models/enc-string";
+import { EncryptedString, EncString } from "../crypto/models/enc-string";
 
-import {
-  PinService,
-  PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
-  PIN_KEY_ENCRYPTED_USER_KEY_EPHEMERAL,
-  USER_KEY_ENCRYPTED_PIN,
-  PinLockType,
-} from "./pin.service.implementation";
+import { PinStateServiceAbstraction } from "./pin-state.service.abstraction";
+import { PinService } from "./pin.service.implementation";
 
 describe("PinService", () => {
   let sut: PinService;
 
   let accountService: FakeAccountService;
-  let stateProvider: FakeStateProvider;
 
-  const cryptoFunctionService = mock<CryptoFunctionService>();
   const encryptService = mock<EncryptService>();
   const kdfConfigService = mock<KdfConfigService>();
   const keyGenerationService = mock<KeyGenerationService>();
   const logService = mock<LogService>();
-
   const mockUserId = Utils.newGuid() as UserId;
-  const mockUserKey = new SymmetricCryptoKey(randomBytes(64)) as UserKey;
+  const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
   const mockPinKey = new SymmetricCryptoKey(randomBytes(32)) as PinKey;
   const mockUserEmail = "user@example.com";
   const mockPin = "1234";
   const mockUserKeyEncryptedPin = new EncString("userKeyEncryptedPin");
-
-  // Note: both pinKeyEncryptedUserKeys use encryptionType: 2 (AesCbc256_HmacSha256_B64)
-  const pinKeyEncryptedUserKeyEphemeral = new EncString(
-    "2.gbauOANURUHqvhLTDnva1A==|nSW+fPumiuTaDB/s12+JO88uemV6rhwRSR+YR1ZzGr5j6Ei3/h+XEli2Unpz652NlZ9NTuRpHxeOqkYYJtp7J+lPMoclgteXuAzUu9kqlRc=|DeUFkhIwgkGdZA08bDnDqMMNmZk21D+H5g8IostPKAY=",
-  );
-  const pinKeyEncryptedUserKeyPersistant = new EncString(
-    "2.fb5kOEZvh9zPABbP8WRmSQ==|Yi6ZAJY+UtqCKMUSqp1ahY9Kf8QuneKXs6BMkpNsakLVOzTYkHHlilyGABMF7GzUO8QHyZi7V/Ovjjg+Naf3Sm8qNhxtDhibITv4k8rDnM0=|TFkq3h2VNTT1z5BFbebm37WYuxyEHXuRo0DZJI7TQnw=",
-  );
+  const mockEphemeralEnvelope = "mock-ephemeral-envelope" as PasswordProtectedKeyEnvelope;
+  const mockPersistentEnvelope = "mock-persistent-envelope" as PasswordProtectedKeyEnvelope;
+  const keyService = mock<KeyService>();
+  const sdkService = new MockSdkService();
+  const pinStateService = mock<PinStateServiceAbstraction>();
+  const behaviorSubject = new BehaviorSubject<{ userId: UserId; userKey: UserKey }>(null);
 
   beforeEach(() => {
-    jest.clearAllMocks();
-
     accountService = mockAccountServiceWith(mockUserId, { email: mockUserEmail });
-    stateProvider = new FakeStateProvider(accountService);
+    (keyService as any)["unlockedUserKeys$"] = behaviorSubject
+      .asObservable()
+      .pipe(filter((x) => x != null));
+    sdkService.client.crypto
+      .mockDeep()
+      .unseal_password_protected_key_envelope.mockReturnValue(new Uint8Array(64));
 
     sut = new PinService(
       accountService,
-      cryptoFunctionService,
       encryptService,
       kdfConfigService,
       keyGenerationService,
       logService,
-      stateProvider,
+      keyService,
+      sdkService,
+      pinStateService,
     );
   });
 
@@ -70,204 +66,69 @@ describe("PinService", () => {
     expect(sut).not.toBeFalsy();
   });
 
-  describe("userId validation", () => {
-    it("should throw an error if a userId is not provided", async () => {
-      await expect(sut.getPinKeyEncryptedUserKeyPersistent(undefined)).rejects.toThrow(
-        "User ID is required. Cannot get pinKeyEncryptedUserKeyPersistent.",
-      );
-      await expect(sut.getPinKeyEncryptedUserKeyEphemeral(undefined)).rejects.toThrow(
-        "User ID is required. Cannot get pinKeyEncryptedUserKeyEphemeral.",
-      );
-      await expect(sut.clearPinKeyEncryptedUserKeyPersistent(undefined)).rejects.toThrow(
-        "User ID is required. Cannot clear pinKeyEncryptedUserKeyPersistent.",
-      );
-      await expect(sut.clearPinKeyEncryptedUserKeyEphemeral(undefined)).rejects.toThrow(
-        "User ID is required. Cannot clear pinKeyEncryptedUserKeyEphemeral.",
-      );
-      await expect(
-        sut.createPinKeyEncryptedUserKey(mockPin, mockUserKey, undefined),
-      ).rejects.toThrow("User ID is required. Cannot create pinKeyEncryptedUserKey.");
-      await expect(sut.getUserKeyEncryptedPin(undefined)).rejects.toThrow(
-        "User ID is required. Cannot get userKeyEncryptedPin.",
-      );
-      await expect(sut.setUserKeyEncryptedPin(mockUserKeyEncryptedPin, undefined)).rejects.toThrow(
-        "User ID is required. Cannot set userKeyEncryptedPin.",
-      );
-      await expect(sut.clearUserKeyEncryptedPin(undefined)).rejects.toThrow(
-        "User ID is required. Cannot clear userKeyEncryptedPin.",
-      );
-      await expect(
-        sut.createPinKeyEncryptedUserKey(mockPin, mockUserKey, undefined),
-      ).rejects.toThrow("User ID is required. Cannot create pinKeyEncryptedUserKey.");
-      await expect(sut.getPinLockType(undefined)).rejects.toThrow("Cannot get PinLockType.");
-      await expect(sut.isPinSet(undefined)).rejects.toThrow(
-        "User ID is required. Cannot determine if PIN is set.",
+  describe("userUnlocked()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it("should set up ephemeral PIN on first unlock if needed", async () => {
+      // Arrange
+      pinStateService.getPinLockType.mockResolvedValue("EPHEMERAL");
+      jest.spyOn(sut, "isPinDecryptionAvailable").mockResolvedValue(false);
+      const getPinSpy = jest.spyOn(sut, "getPin").mockResolvedValue(mockPin);
+      const setPinSpy = jest.spyOn(sut, "setPin").mockResolvedValue();
+
+      // Act
+      await sut.userUnlocked(mockUserId);
+
+      // Assert
+      expect(getPinSpy).toHaveBeenCalledWith(mockUserId);
+      expect(setPinSpy).toHaveBeenCalledWith(mockPin, "EPHEMERAL", mockUserId);
+      expect(logService.info).toHaveBeenCalledWith(
+        "[Pin Service] On first unlock: Setting up ephemeral PIN",
       );
     });
-  });
 
-  describe("get/clear/create/store pinKeyEncryptedUserKey methods", () => {
-    describe("getPinKeyEncryptedUserKeyPersistent()", () => {
-      it("should get the pinKeyEncryptedUserKey of the specified userId", async () => {
-        await sut.getPinKeyEncryptedUserKeyPersistent(mockUserId);
+    it("should migrate legacy persistent PIN if needed", async () => {
+      // Arrange
+      pinStateService.getPinLockType.mockResolvedValue("PERSISTENT");
+      pinStateService.getLegacyPinKeyEncryptedUserKeyPersistent.mockResolvedValue(
+        mockEnc("legacy-key"),
+      );
+      const getPinSpy = jest.spyOn(sut, "getPin").mockResolvedValue(mockPin);
+      const setPinSpy = jest.spyOn(sut, "setPin").mockResolvedValue();
 
-        expect(stateProvider.mock.getUserState$).toHaveBeenCalledWith(
-          PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
-          mockUserId,
-        );
-      });
+      // Act
+      await sut.userUnlocked(mockUserId);
+
+      // Assert
+      expect(getPinSpy).toHaveBeenCalledWith(mockUserId);
+      expect(setPinSpy).toHaveBeenCalledWith(mockPin, "PERSISTENT", mockUserId);
+      expect(logService.info).toHaveBeenCalledWith(
+        "[Pin Service] Migrating legacy PIN key to PinProtectedUserKeyEnvelope",
+      );
     });
 
-    describe("clearPinKeyEncryptedUserKeyPersistent()", () => {
-      it("should clear the pinKeyEncryptedUserKey of the specified userId", async () => {
-        await sut.clearPinKeyEncryptedUserKeyPersistent(mockUserId);
+    it("should do nothing if no migration or setup is needed", async () => {
+      // Arrange
+      pinStateService.getPinLockType.mockResolvedValue("DISABLED");
+      const getPinSpy = jest.spyOn(sut, "getPin");
+      const setPinSpy = jest.spyOn(sut, "setPin");
 
-        expect(stateProvider.mock.setUserState).toHaveBeenCalledWith(
-          PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
-          null,
-          mockUserId,
-        );
-      });
-    });
+      // Act
+      await sut.userUnlocked(mockUserId);
 
-    describe("getPinKeyEncryptedUserKeyEphemeral()", () => {
-      it("should get the pinKeyEncrypterUserKeyEphemeral of the specified userId", async () => {
-        await sut.getPinKeyEncryptedUserKeyEphemeral(mockUserId);
-
-        expect(stateProvider.mock.getUserState$).toHaveBeenCalledWith(
-          PIN_KEY_ENCRYPTED_USER_KEY_EPHEMERAL,
-          mockUserId,
-        );
-      });
-    });
-
-    describe("clearPinKeyEncryptedUserKeyEphemeral()", () => {
-      it("should clear the pinKeyEncryptedUserKey of the specified userId", async () => {
-        await sut.clearPinKeyEncryptedUserKeyEphemeral(mockUserId);
-
-        expect(stateProvider.mock.setUserState).toHaveBeenCalledWith(
-          PIN_KEY_ENCRYPTED_USER_KEY_EPHEMERAL,
-          null,
-          mockUserId,
-        );
-      });
-    });
-
-    describe("createPinKeyEncryptedUserKey()", () => {
-      it("should throw an error if a userKey is not provided", async () => {
-        await expect(
-          sut.createPinKeyEncryptedUserKey(mockPin, undefined, mockUserId),
-        ).rejects.toThrow("No UserKey provided. Cannot create pinKeyEncryptedUserKey.");
-      });
-
-      it("should create a pinKeyEncryptedUserKey", async () => {
-        // Arrange
-        sut.makePinKey = jest.fn().mockResolvedValue(mockPinKey);
-
-        // Act
-        await sut.createPinKeyEncryptedUserKey(mockPin, mockUserKey, mockUserId);
-
-        // Assert
-        expect(encryptService.wrapSymmetricKey).toHaveBeenCalledWith(mockUserKey, mockPinKey);
-      });
-    });
-
-    describe("storePinKeyEncryptedUserKey", () => {
-      it("should store a pinKeyEncryptedUserKey (persistent version) when 'storeAsEphemeral' is false", async () => {
-        // Arrange
-        const storeAsEphemeral = false;
-
-        // Act
-        await sut.storePinKeyEncryptedUserKey(
-          pinKeyEncryptedUserKeyPersistant,
-          storeAsEphemeral,
-          mockUserId,
-        );
-
-        // Assert
-        expect(stateProvider.mock.setUserState).toHaveBeenCalledWith(
-          PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT,
-          pinKeyEncryptedUserKeyPersistant.encryptedString,
-          mockUserId,
-        );
-      });
-
-      it("should store a pinKeyEncryptedUserKeyEphemeral when 'storeAsEphemeral' is true", async () => {
-        // Arrange
-        const storeAsEphemeral = true;
-
-        // Act
-        await sut.storePinKeyEncryptedUserKey(
-          pinKeyEncryptedUserKeyEphemeral,
-          storeAsEphemeral,
-          mockUserId,
-        );
-
-        // Assert
-        expect(stateProvider.mock.setUserState).toHaveBeenCalledWith(
-          PIN_KEY_ENCRYPTED_USER_KEY_EPHEMERAL,
-          pinKeyEncryptedUserKeyEphemeral.encryptedString,
-          mockUserId,
-        );
-      });
-    });
-  });
-
-  describe("userKeyEncryptedPin methods", () => {
-    describe("getUserKeyEncryptedPin()", () => {
-      it("should get the userKeyEncryptedPin of the specified userId", async () => {
-        await sut.getUserKeyEncryptedPin(mockUserId);
-
-        expect(stateProvider.mock.getUserState$).toHaveBeenCalledWith(
-          USER_KEY_ENCRYPTED_PIN,
-          mockUserId,
-        );
-      });
-    });
-
-    describe("setUserKeyEncryptedPin()", () => {
-      it("should set the userKeyEncryptedPin of the specified userId", async () => {
-        await sut.setUserKeyEncryptedPin(mockUserKeyEncryptedPin, mockUserId);
-
-        expect(stateProvider.mock.setUserState).toHaveBeenCalledWith(
-          USER_KEY_ENCRYPTED_PIN,
-          mockUserKeyEncryptedPin.encryptedString,
-          mockUserId,
-        );
-      });
-    });
-
-    describe("clearUserKeyEncryptedPin()", () => {
-      it("should clear the pinKeyEncryptedUserKey of the specified userId", async () => {
-        await sut.clearUserKeyEncryptedPin(mockUserId);
-
-        expect(stateProvider.mock.setUserState).toHaveBeenCalledWith(
-          USER_KEY_ENCRYPTED_PIN,
-          null,
-          mockUserId,
-        );
-      });
-    });
-
-    describe("createUserKeyEncryptedPin()", () => {
-      it("should throw an error if a userKey is not provided", async () => {
-        await expect(sut.createUserKeyEncryptedPin(mockPin, undefined)).rejects.toThrow(
-          "No UserKey provided. Cannot create userKeyEncryptedPin.",
-        );
-      });
-
-      it("should create a userKeyEncryptedPin from the provided PIN and userKey", async () => {
-        encryptService.encryptString.mockResolvedValue(mockUserKeyEncryptedPin);
-
-        const result = await sut.createUserKeyEncryptedPin(mockPin, mockUserKey);
-
-        expect(encryptService.encryptString).toHaveBeenCalledWith(mockPin, mockUserKey);
-        expect(result).toEqual(mockUserKeyEncryptedPin);
-      });
+      // Assert
+      expect(getPinSpy).not.toHaveBeenCalled();
+      expect(setPinSpy).not.toHaveBeenCalled();
     });
   });
 
   describe("makePinKey()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
     it("should make a PinKey", async () => {
       // Arrange
       keyGenerationService.deriveKeyFromPassword.mockResolvedValue(mockPinKey);
@@ -285,52 +146,202 @@ describe("PinService", () => {
     });
   });
 
-  describe("getPinLockType()", () => {
-    it("should return 'PERSISTENT' if a pinKeyEncryptedUserKey (persistent version) is found", async () => {
-      // Arrange
-      sut.getUserKeyEncryptedPin = jest.fn().mockResolvedValue(null);
-      sut.getPinKeyEncryptedUserKeyPersistent = jest
-        .fn()
-        .mockResolvedValue(pinKeyEncryptedUserKeyPersistant);
-
-      // Act
-      const result = await sut.getPinLockType(mockUserId);
-
-      // Assert
-      expect(result).toBe("PERSISTENT");
+  describe("getPin()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      keyService.userKey$.mockReturnValue(new BehaviorSubject(mockUserKey).asObservable());
     });
 
-    it("should return 'EPHEMERAL' if a pinKeyEncryptedUserKey (persistent version) is not found but a userKeyEncryptedPin is found", async () => {
-      // Arrange
-      sut.getUserKeyEncryptedPin = jest.fn().mockResolvedValue(mockUserKeyEncryptedPin);
-      sut.getPinKeyEncryptedUserKeyPersistent = jest.fn().mockResolvedValue(null);
+    it("should successfully decrypt and return the PIN", async () => {
+      const expectedPin = "1234";
+      pinStateService.userKeyEncryptedPin$.mockReturnValue(
+        new BehaviorSubject(mockUserKeyEncryptedPin).asObservable(),
+      );
+      encryptService.decryptString.mockResolvedValue(expectedPin);
 
-      // Act
+      const result = await sut.getPin(mockUserId);
+
+      expect(result).toBe(expectedPin);
+      expect(encryptService.decryptString).toHaveBeenCalledWith(
+        mockUserKeyEncryptedPin,
+        mockUserKey,
+      );
+    });
+
+    it("should throw an error if userId is null", async () => {
+      await expect(sut.getPin(null as any)).rejects.toThrow("userId");
+    });
+
+    it("should throw an error if userKey is not available", async () => {
+      keyService.userKey$.mockReturnValue(new BehaviorSubject(null).asObservable());
+      await expect(sut.getPin(mockUserId)).rejects.toThrow("userKey");
+    });
+  });
+
+  describe("unsetPin()", () => {
+    beforeEach(async () => {
+      jest.clearAllMocks();
+    });
+
+    it("should throw an error if userId is null", async () => {
+      await expect(sut.unsetPin(null as any)).rejects.toThrow("userId");
+    });
+
+    it("should call pinStateService.clearPinState with the correct userId", async () => {
+      await sut.unsetPin(mockUserId);
+      expect(pinStateService.clearPinState).toHaveBeenCalledWith(mockUserId);
+    });
+  });
+
+  describe("setPin()", () => {
+    const mockPinProtectedUserKeyEnvelope = "mock-envelope" as PasswordProtectedKeyEnvelope;
+    const mockUserKeyEncryptedPinFromSdk = "sdk-encrypted-pin";
+
+    beforeEach(() => {});
+
+    it("should throw an error if pin is null", async () => {
+      // Act & Assert
+      await expect(sut.setPin(null as any, "EPHEMERAL", mockUserId)).rejects.toThrow("pin");
+    });
+
+    it("should throw an error if pinLockType is null", async () => {
+      // Act & Assert
+      await expect(sut.setPin(mockPin, null as any, mockUserId)).rejects.toThrow("pinLockType");
+    });
+
+    it("should throw an error if userId is null", async () => {
+      // Act & Assert
+      await expect(sut.setPin(mockPin, "EPHEMERAL", null as any)).rejects.toThrow("userId");
+    });
+
+    it("should successfully set an EPHEMERAL pin", async () => {
+      sdkService.simulate
+        .userLogin(mockUserId)
+        .crypto.mockDeep()
+        .enroll_pin.mockReturnValue({
+          pinProtectedUserKeyEnvelope: mockPinProtectedUserKeyEnvelope,
+          userKeyEncryptedPin: mockUserKeyEncryptedPinFromSdk as EncryptedString,
+        });
+
+      await sut.setPin(mockPin, "EPHEMERAL", mockUserId);
+
+      expect(pinStateService.setPinState).toHaveBeenCalledWith(
+        mockUserId,
+        mockPinProtectedUserKeyEnvelope,
+        mockUserKeyEncryptedPinFromSdk,
+        "EPHEMERAL",
+      );
+    });
+
+    it("should successfully set a PERSISTENT pin", async () => {
+      sdkService.simulate
+        .userLogin(mockUserId)
+        .crypto.mockDeep()
+        .enroll_pin.mockReturnValue({
+          pinProtectedUserKeyEnvelope: mockPinProtectedUserKeyEnvelope,
+          userKeyEncryptedPin: mockUserKeyEncryptedPinFromSdk as EncryptedString,
+        });
+
+      await sut.setPin(mockPin, "PERSISTENT", mockUserId);
+
+      expect(pinStateService.setPinState).toHaveBeenCalledWith(
+        mockUserId,
+        mockPinProtectedUserKeyEnvelope,
+        mockUserKeyEncryptedPinFromSdk,
+        "PERSISTENT",
+      );
+    });
+  });
+
+  describe("getPinLockType()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it("should call pinStateService.getPinLockType with the correct userId", async () => {
+      pinStateService.getPinLockType.mockResolvedValue("EPHEMERAL");
       const result = await sut.getPinLockType(mockUserId);
-
-      // Assert
+      expect(pinStateService.getPinLockType).toHaveBeenCalledWith(mockUserId);
       expect(result).toBe("EPHEMERAL");
     });
+  });
 
-    it("should return 'DISABLED' if both of these are NOT found: userKeyEncryptedPin, pinKeyEncryptedUserKey (persistent version)", async () => {
-      // Arrange
-      sut.getUserKeyEncryptedPin = jest.fn().mockResolvedValue(null);
-      sut.getPinKeyEncryptedUserKeyPersistent = jest.fn().mockResolvedValue(null);
+  describe("isPinDecryptionAvailable()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it("should throw an error if userId is null", async () => {
+      // Act & Assert
+      await expect(sut.isPinDecryptionAvailable(null as any)).rejects.toThrow("userId");
+    });
+
+    it("should return false if pinLockType is DISABLED", async () => {
+      // Arrange - don't set any PIN-related state (will result in DISABLED)
 
       // Act
-      const result = await sut.getPinLockType(mockUserId);
+      const result = await sut.isPinDecryptionAvailable(mockUserId);
 
       // Assert
-      expect(result).toBe("DISABLED");
+      expect(result).toBe(false);
+    });
+
+    it("should return true if pinLockType is PERSISTENT", async () => {
+      // Arrange - mock lock type
+      pinStateService.getPinLockType.mockResolvedValue("PERSISTENT");
+
+      // Act
+      const result = await sut.isPinDecryptionAvailable(mockUserId);
+
+      // Assert
+      expect(result).toBe(true);
+    });
+
+    it("should return true if pinLockType is EPHEMERAL and ephemeral envelope is available", async () => {
+      // Arrange - mock lock type and set ephemeral envelope
+      pinStateService.getPinLockType.mockResolvedValue("EPHEMERAL");
+      pinStateService.getPinProtectedUserKeyEnvelope.mockResolvedValue(mockEphemeralEnvelope);
+
+      // Act
+      const result = await sut.isPinDecryptionAvailable(mockUserId);
+
+      // Assert
+      expect(result).toBe(true);
+    });
+
+    it("should return false if pinLockType is EPHEMERAL but ephemeral envelope is not available", async () => {
+      // Arrange - set only user key encrypted pin (EPHEMERAL) but no ephemeral envelope
+      pinStateService.getPinLockType.mockResolvedValue("EPHEMERAL");
+      pinStateService.getPinProtectedUserKeyEnvelope.mockResolvedValue(null);
+
+      // Act
+      const result = await sut.isPinDecryptionAvailable(mockUserId);
+
+      // Assert
+      expect(result).toBe(false);
+    });
+
+    it("should handle unexpected pinLockType and throw error", async () => {
+      // Arrange - mock getPinLockType to return an unexpected value
+      pinStateService.getPinLockType.mockResolvedValue("UNKNOWN" as any);
+
+      // Act & Assert
+      await expect(sut.isPinDecryptionAvailable(mockUserId)).rejects.toThrow(
+        "Unexpected pinLockType: UNKNOWN",
+      );
     });
   });
 
   describe("isPinSet()", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
     it.each(["PERSISTENT", "EPHEMERAL"])(
       "should return true if the user PinLockType is '%s'",
       async () => {
         // Arrange
-        sut.getPinLockType = jest.fn().mockResolvedValue("PERSISTENT");
+        pinStateService.getPinLockType.mockResolvedValue("PERSISTENT");
 
         // Act
         const result = await sut.isPinSet(mockUserId);
@@ -342,7 +353,7 @@ describe("PinService", () => {
 
     it("should return false if the user PinLockType is 'DISABLED'", async () => {
       // Arrange
-      sut.getPinLockType = jest.fn().mockResolvedValue("DISABLED");
+      pinStateService.getPinLockType.mockResolvedValue("DISABLED");
 
       // Act
       const result = await sut.isPinSet(mockUserId);
@@ -352,162 +363,87 @@ describe("PinService", () => {
     });
   });
 
-  describe("isPinDecryptionAvailable()", () => {
-    it("should return false if pinLockType is DISABLED", async () => {
-      // Arrange
-      sut.getPinLockType = jest.fn().mockResolvedValue("DISABLED");
-
-      // Act
-      const result = await sut.isPinDecryptionAvailable(mockUserId);
-
-      // Assert
-      expect(result).toBe(false);
+  describe("logout", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
     });
 
-    it("should return true if pinLockType is PERSISTENT", async () => {
-      // Arrange
-      sut.getPinLockType = jest.fn().mockResolvedValue("PERSISTENT");
-
-      // Act
-      const result = await sut.isPinDecryptionAvailable(mockUserId);
-
-      // Assert
-      expect(result).toBe(true);
+    it("should throw when userId is null", async () => {
+      await expect(sut.logout(null as any)).rejects.toThrow("userId");
     });
 
-    it("should return true if pinLockType is EPHEMERAL and we have an ephemeral PIN key encrypted user key", async () => {
-      // Arrange
-      sut.getPinLockType = jest.fn().mockResolvedValue("EPHEMERAL");
-      sut.getPinKeyEncryptedUserKeyEphemeral = jest
-        .fn()
-        .mockResolvedValue(pinKeyEncryptedUserKeyEphemeral);
-
-      // Act
-      const result = await sut.isPinDecryptionAvailable(mockUserId);
-
-      // Assert
-      expect(result).toBe(true);
-    });
-
-    it("should return false if pinLockType is EPHEMERAL and we do not have an ephemeral PIN key encrypted user key", async () => {
-      // Arrange
-      sut.getPinLockType = jest.fn().mockResolvedValue("EPHEMERAL");
-      sut.getPinKeyEncryptedUserKeyEphemeral = jest.fn().mockResolvedValue(null);
-
-      // Act
-      const result = await sut.isPinDecryptionAvailable(mockUserId);
-
-      // Assert
-      expect(result).toBe(false);
-    });
-
-    it("should throw an error if an unexpected pinLockType is returned", async () => {
-      // Arrange
-      sut.getPinLockType = jest.fn().mockResolvedValue("UNKNOWN");
-
-      // Act & Assert
-      await expect(sut.isPinDecryptionAvailable(mockUserId)).rejects.toThrow(
-        "Unexpected pinLockType: UNKNOWN",
-      );
+    it("should call pinStateService.clearPinState", async () => {
+      await sut.logout(mockUserId);
+      expect(pinStateService.clearPinState).toHaveBeenCalledWith(mockUserId);
     });
   });
 
-  describe("decryptUserKeyWithPin()", () => {
-    async function setupDecryptUserKeyWithPinMocks(pinLockType: PinLockType) {
-      sut.getPinLockType = jest.fn().mockResolvedValue(pinLockType);
-
-      mockPinEncryptedKeyDataByPinLockType(pinLockType);
-
-      kdfConfigService.getKdfConfig.mockResolvedValue(DEFAULT_KDF_CONFIG);
-
-      mockDecryptUserKeyFn();
-
-      sut.getUserKeyEncryptedPin = jest.fn().mockResolvedValue(mockUserKeyEncryptedPin);
-      encryptService.decryptString.mockResolvedValue(mockPin);
-      cryptoFunctionService.compareFast.calledWith(mockPin, "1234").mockResolvedValue(true);
-    }
-
-    function mockDecryptUserKeyFn() {
-      sut.getPinKeyEncryptedUserKeyPersistent = jest
-        .fn()
-        .mockResolvedValue(pinKeyEncryptedUserKeyPersistant);
-      sut.makePinKey = jest.fn().mockResolvedValue(mockPinKey);
-      encryptService.unwrapSymmetricKey.mockResolvedValue(mockUserKey);
-    }
-
-    function mockPinEncryptedKeyDataByPinLockType(pinLockType: PinLockType) {
-      switch (pinLockType) {
-        case "PERSISTENT":
-          sut.getPinKeyEncryptedUserKeyPersistent = jest
-            .fn()
-            .mockResolvedValue(pinKeyEncryptedUserKeyPersistant);
-          break;
-        case "EPHEMERAL":
-          sut.getPinKeyEncryptedUserKeyEphemeral = jest
-            .fn()
-            .mockResolvedValue(pinKeyEncryptedUserKeyEphemeral);
-
-          break;
-        case "DISABLED":
-          // no mocking required. Error should be thrown
-          break;
-      }
-    }
-
-    const testCases: { pinLockType: PinLockType }[] = [
-      { pinLockType: "PERSISTENT" },
-      { pinLockType: "EPHEMERAL" },
-    ];
-
-    testCases.forEach(({ pinLockType }) => {
-      describe(`given a ${pinLockType} PIN)`, () => {
-        it(`should successfully decrypt and return user key when using a valid PIN`, async () => {
-          // Arrange
-          await setupDecryptUserKeyWithPinMocks(pinLockType);
-
-          // Act
-          const result = await sut.decryptUserKeyWithPin(mockPin, mockUserId);
-
-          // Assert
-          expect(result).toEqual(mockUserKey);
-        });
-
-        it(`should return null when PIN is incorrect and user key cannot be decrypted`, async () => {
-          // Arrange
-          await setupDecryptUserKeyWithPinMocks(pinLockType);
-          sut.decryptUserKeyWithPin = jest.fn().mockResolvedValue(null);
-
-          // Act
-          const result = await sut.decryptUserKeyWithPin(mockPin, mockUserId);
-
-          // Assert
-          expect(result).toBeNull();
-        });
-
-        // not sure if this is a realistic scenario but going to test it anyway
-        it(`should return null when PIN doesn't match after successful user key decryption`, async () => {
-          // Arrange
-          await setupDecryptUserKeyWithPinMocks(pinLockType);
-          encryptService.decryptString.mockResolvedValue("9999"); // non matching PIN
-
-          // Act
-          const result = await sut.decryptUserKeyWithPin(mockPin, mockUserId);
-
-          // Assert
-          expect(result).toBeNull();
-        });
-      });
+  describe("decryptUserKeyWithPin", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      pinStateService.userKeyEncryptedPin$.mockReset();
+      pinStateService.getPinProtectedUserKeyEnvelope.mockReset();
+      pinStateService.getLegacyPinKeyEncryptedUserKeyPersistent.mockReset();
     });
 
-    it(`should return null when pin is disabled`, async () => {
+    it("should throw an error if userId is null", async () => {
+      await expect(sut.decryptUserKeyWithPin("1234", null as any)).rejects.toThrow("userId");
+    });
+
+    it("should throw an error if pin is null", async () => {
+      await expect(sut.decryptUserKeyWithPin(null as any, mockUserId)).rejects.toThrow("pin");
+    });
+
+    it("should return userkey with new pin EPHEMERAL", async () => {
       // Arrange
-      await setupDecryptUserKeyWithPinMocks("DISABLED");
+      const mockPin = "1234";
+      pinStateService.userKeyEncryptedPin$.mockReturnValueOnce(
+        new BehaviorSubject(mockUserKeyEncryptedPin),
+      );
+      pinStateService.getPinProtectedUserKeyEnvelope.mockResolvedValueOnce(mockEphemeralEnvelope);
 
       // Act
       const result = await sut.decryptUserKeyWithPin(mockPin, mockUserId);
 
       // Assert
-      expect(result).toBeNull();
+      expect(result).toEqual(mockUserKey);
+    });
+
+    it("should return userkey with new pin PERSISTENT", async () => {
+      // Arrange
+      const mockPin = "1234";
+      pinStateService.userKeyEncryptedPin$.mockReturnValueOnce(
+        new BehaviorSubject(mockUserKeyEncryptedPin),
+      );
+      pinStateService.getPinProtectedUserKeyEnvelope.mockResolvedValueOnce(mockPersistentEnvelope);
+
+      // Act
+      const result = await sut.decryptUserKeyWithPin(mockPin, mockUserId);
+
+      // Assert
+      expect(result).toEqual(mockUserKey);
+    });
+
+    it("should return userkey with legacy pin PERSISTENT", async () => {
+      keyGenerationService.deriveKeyFromPassword.mockResolvedValue(mockPinKey);
+      keyGenerationService.stretchKey.mockResolvedValue(mockPinKey);
+      kdfConfigService.getKdfConfig.mockResolvedValue(DEFAULT_KDF_CONFIG);
+      encryptService.unwrapSymmetricKey.mockResolvedValue(mockUserKey);
+
+      // Arrange
+      const mockPin = "1234";
+      pinStateService.userKeyEncryptedPin$.mockReturnValueOnce(
+        new BehaviorSubject(mockUserKeyEncryptedPin),
+      );
+      pinStateService.getLegacyPinKeyEncryptedUserKeyPersistent.mockResolvedValueOnce(
+        mockUserKeyEncryptedPin,
+      );
+
+      // Act
+      const result = await sut.decryptUserKeyWithPin(mockPin, mockUserId);
+
+      // Assert
+      expect(result).toEqual(mockUserKey);
     });
   });
 });
diff --git a/libs/common/src/key-management/pin/pin.state.ts b/libs/common/src/key-management/pin/pin.state.ts
new file mode 100644
index 00000000000..4ad0524035f
--- /dev/null
+++ b/libs/common/src/key-management/pin/pin.state.ts
@@ -0,0 +1,61 @@
+import { PIN_DISK, PIN_MEMORY, UserKeyDefinition } from "@bitwarden/common/platform/state";
+import { PasswordProtectedKeyEnvelope } from "@bitwarden/sdk-internal";
+
+import { EncryptedString } from "../crypto/models/enc-string";
+
+/**
+ * The persistent (stored on disk) version of the UserKey, encrypted by the PinKey.
+ *
+ * @deprecated
+ * @remarks Persists through a client reset. Used when `requireMasterPasswordOnClientRestart` is disabled.
+ * @see SetPinComponent.setPinForm.requireMasterPasswordOnClientRestart
+ */
+export const PIN_KEY_ENCRYPTED_USER_KEY_PERSISTENT = new UserKeyDefinition<EncryptedString>(
+  PIN_DISK,
+  "pinKeyEncryptedUserKeyPersistent",
+  {
+    deserializer: (jsonValue) => jsonValue,
+    clearOn: ["logout"],
+  },
+);
+
+/**
+ * The persistent (stored on disk) version of the UserKey, stored in a `PasswordProtectedKeyEnvelope`.
+ *
+ * @remarks Persists through a client reset. Used when `requireMasterPasswordOnClientRestart` is disabled.
+ * @see SetPinComponent.setPinForm.requireMasterPasswordOnClientRestart
+ */
+export const PIN_PROTECTED_USER_KEY_ENVELOPE_PERSISTENT =
+  new UserKeyDefinition<PasswordProtectedKeyEnvelope>(
+    PIN_DISK,
+    "pinProtectedUserKeyEnvelopePersistent",
+    {
+      deserializer: (jsonValue) => jsonValue,
+      clearOn: ["logout"],
+    },
+  );
+
+/**
+ * The ephemeral (stored in memory) version of the UserKey, stored in a `PasswordProtectedKeyEnvelope`.
+ */
+export const PIN_PROTECTED_USER_KEY_ENVELOPE_EPHEMERAL =
+  new UserKeyDefinition<PasswordProtectedKeyEnvelope>(
+    PIN_MEMORY,
+    "pinProtectedUserKeyEnvelopeEphemeral",
+    {
+      deserializer: (jsonValue) => jsonValue,
+      clearOn: ["logout"],
+    },
+  );
+
+/**
+ * The PIN, encrypted by the UserKey.
+ */
+export const USER_KEY_ENCRYPTED_PIN = new UserKeyDefinition<EncryptedString>(
+  PIN_DISK,
+  "userKeyEncryptedPin",
+  {
+    deserializer: (jsonValue) => jsonValue,
+    clearOn: ["logout"],
+  },
+);
diff --git a/libs/common/src/key-management/security-state/abstractions/security-state.service.ts b/libs/common/src/key-management/security-state/abstractions/security-state.service.ts
new file mode 100644
index 00000000000..466095c2f45
--- /dev/null
+++ b/libs/common/src/key-management/security-state/abstractions/security-state.service.ts
@@ -0,0 +1,21 @@
+import { Observable } from "rxjs";
+
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { SignedSecurityState } from "../../types";
+
+export abstract class SecurityStateService {
+  /**
+   * Retrieves the security state for the provided user.
+   * Note: This state is not yet validated. To get a validated state, the SDK crypto client
+   * must be used. This security state is validated on initialization of the SDK.
+   */
+  abstract accountSecurityState$(userId: UserId): Observable<SignedSecurityState | null>;
+  /**
+   * Sets the security state for the provided user.
+   */
+  abstract setAccountSecurityState(
+    accountSecurityState: SignedSecurityState,
+    userId: UserId,
+  ): Promise<void>;
+}
diff --git a/libs/common/src/key-management/security-state/request/security-state.request.ts b/libs/common/src/key-management/security-state/request/security-state.request.ts
new file mode 100644
index 00000000000..7c825bedf84
--- /dev/null
+++ b/libs/common/src/key-management/security-state/request/security-state.request.ts
@@ -0,0 +1,8 @@
+import { SignedSecurityState } from "../../types";
+
+export class SecurityStateRequest {
+  constructor(
+    readonly securityState: SignedSecurityState,
+    readonly securityVersion: number,
+  ) {}
+}
diff --git a/libs/common/src/key-management/security-state/response/security-state.response.ts b/libs/common/src/key-management/security-state/response/security-state.response.ts
new file mode 100644
index 00000000000..0590da31913
--- /dev/null
+++ b/libs/common/src/key-management/security-state/response/security-state.response.ts
@@ -0,0 +1,16 @@
+import { SignedSecurityState } from "../../types";
+
+export class SecurityStateResponse {
+  readonly securityState: SignedSecurityState | null = null;
+
+  constructor(response: unknown) {
+    if (typeof response !== "object" || response == null) {
+      throw new TypeError("Response must be an object");
+    }
+
+    if (!("securityState" in response) || !(typeof response.securityState === "string")) {
+      throw new TypeError("Response must contain a valid securityState");
+    }
+    this.securityState = response.securityState as SignedSecurityState;
+  }
+}
diff --git a/libs/common/src/key-management/security-state/services/security-state.service.ts b/libs/common/src/key-management/security-state/services/security-state.service.ts
new file mode 100644
index 00000000000..789d5171072
--- /dev/null
+++ b/libs/common/src/key-management/security-state/services/security-state.service.ts
@@ -0,0 +1,26 @@
+import { Observable } from "rxjs";
+
+import { StateProvider } from "@bitwarden/common/platform/state";
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { SignedSecurityState } from "../../types";
+import { SecurityStateService } from "../abstractions/security-state.service";
+import { ACCOUNT_SECURITY_STATE } from "../state/security-state.state";
+
+export class DefaultSecurityStateService implements SecurityStateService {
+  constructor(protected stateProvider: StateProvider) {}
+
+  // Emits the provided user's security state, or null if there is no security state present for the user.
+  accountSecurityState$(userId: UserId): Observable<SignedSecurityState | null> {
+    return this.stateProvider.getUserState$(ACCOUNT_SECURITY_STATE, userId);
+  }
+
+  // Sets the security state for the provided user.
+  // This is not yet validated, and is only validated upon SDK initialization.
+  async setAccountSecurityState(
+    accountSecurityState: SignedSecurityState,
+    userId: UserId,
+  ): Promise<void> {
+    await this.stateProvider.setUserState(ACCOUNT_SECURITY_STATE, accountSecurityState, userId);
+  }
+}
diff --git a/libs/common/src/key-management/security-state/state/security-state.state.ts b/libs/common/src/key-management/security-state/state/security-state.state.ts
new file mode 100644
index 00000000000..e471ef17d76
--- /dev/null
+++ b/libs/common/src/key-management/security-state/state/security-state.state.ts
@@ -0,0 +1,12 @@
+import { CRYPTO_DISK, UserKeyDefinition } from "@bitwarden/common/platform/state";
+
+import { SignedSecurityState } from "../../types";
+
+export const ACCOUNT_SECURITY_STATE = new UserKeyDefinition<SignedSecurityState>(
+  CRYPTO_DISK,
+  "accountSecurityState",
+  {
+    deserializer: (obj) => obj,
+    clearOn: ["logout"],
+  },
+);
diff --git a/libs/common/src/key-management/services/default-process-reload.service.ts b/libs/common/src/key-management/services/default-process-reload.service.ts
index bc5739167ce..ddbcf7e5530 100644
--- a/libs/common/src/key-management/services/default-process-reload.service.ts
+++ b/libs/common/src/key-management/services/default-process-reload.service.ts
@@ -30,16 +30,17 @@ export class DefaultProcessReloadService implements ProcessReloadServiceAbstract
     private biometricStateService: BiometricStateService,
     private accountService: AccountService,
     private logService: LogService,
+    private authService: AuthService,
   ) {}
 
-  async startProcessReload(authService: AuthService): Promise<void> {
+  async startProcessReload(): Promise<void> {
     const accounts = await firstValueFrom(this.accountService.accounts$);
     if (accounts != null) {
       const keys = Object.keys(accounts);
       if (keys.length > 0) {
         for (const userId of keys) {
-          let status = await firstValueFrom(authService.authStatusFor$(userId as UserId));
-          status = await authService.getAuthStatus(userId);
+          let status = await firstValueFrom(this.authService.authStatusFor$(userId as UserId));
+          status = await this.authService.getAuthStatus(userId);
           if (status === AuthenticationStatus.Unlocked) {
             this.logService.info(
               "[Process Reload Service] User unlocked, preventing process reload",
@@ -58,8 +59,7 @@ export class DefaultProcessReloadService implements ProcessReloadServiceAbstract
     // If there is an active user, check if they have a pinKeyEncryptedUserKeyEphemeral. If so, prevent process reload upon lock.
     const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
     if (userId != null) {
-      const ephemeralPin = await this.pinService.getPinKeyEncryptedUserKeyEphemeral(userId);
-      if (ephemeralPin != null) {
+      if ((await this.pinService.getPinLockType(userId)) === "EPHEMERAL") {
         this.logService.info(
           "[Process Reload Service] Ephemeral pin active, preventing process reload",
         );
diff --git a/libs/common/src/key-management/types.ts b/libs/common/src/key-management/types.ts
new file mode 100644
index 00000000000..df64a3ed342
--- /dev/null
+++ b/libs/common/src/key-management/types.ts
@@ -0,0 +1,30 @@
+import { Opaque } from "type-fest";
+
+import { EncString, SignedSecurityState as SdkSignedSecurityState } from "@bitwarden/sdk-internal";
+
+/**
+ * A private key, encrypted with a symmetric key.
+ */
+export type WrappedPrivateKey = Opaque<EncString, "WrappedPrivateKey">;
+
+/**
+ * A public key, signed with the accounts signature key.
+ */
+export type SignedPublicKey = Opaque<string, "SignedPublicKey">;
+/**
+ * A public key in base64 encoded SPKI-DER
+ */
+export type UnsignedPublicKey = Opaque<Uint8Array, "UnsignedPublicKey">;
+
+/**
+ * A signature key encrypted with a symmetric key.
+ */
+export type WrappedSigningKey = Opaque<EncString, "WrappedSigningKey">;
+/**
+ * A signature public key (verifying key) in base64 encoded CoseKey format
+ */
+export type VerifyingKey = Opaque<string, "VerifyingKey">;
+/**
+ * A signed security state, encoded in base64.
+ */
+export type SignedSecurityState = Opaque<SdkSignedSecurityState, "SignedSecurityState">;
diff --git a/libs/common/src/key-management/vault-timeout/abstractions/vault-timeout-settings.service.ts b/libs/common/src/key-management/vault-timeout/abstractions/vault-timeout-settings.service.ts
index bcbf0029199..697b8a1875c 100644
--- a/libs/common/src/key-management/vault-timeout/abstractions/vault-timeout-settings.service.ts
+++ b/libs/common/src/key-management/vault-timeout/abstractions/vault-timeout-settings.service.ts
@@ -56,6 +56,4 @@ export abstract class VaultTimeoutSettingsService {
    * @returns boolean true if biometric lock is set
    */
   abstract isBiometricLockSet(userId?: string): Promise<boolean>;
-
-  abstract clear(userId: UserId): Promise<void>;
 }
diff --git a/libs/common/src/key-management/vault-timeout/abstractions/vault-timeout.service.ts b/libs/common/src/key-management/vault-timeout/abstractions/vault-timeout.service.ts
index 1c88a5c51ea..d8cec9fc039 100644
--- a/libs/common/src/key-management/vault-timeout/abstractions/vault-timeout.service.ts
+++ b/libs/common/src/key-management/vault-timeout/abstractions/vault-timeout.service.ts
@@ -1,5 +1,3 @@
 export abstract class VaultTimeoutService {
   abstract checkVaultTimeout(): Promise<void>;
-  abstract lock(userId?: string): Promise<void>;
-  abstract logOut(userId?: string): Promise<void>;
 }
diff --git a/libs/common/src/key-management/vault-timeout/index.ts b/libs/common/src/key-management/vault-timeout/index.ts
index 7741752a351..02e49dceaab 100644
--- a/libs/common/src/key-management/vault-timeout/index.ts
+++ b/libs/common/src/key-management/vault-timeout/index.ts
@@ -8,3 +8,4 @@ export {
   VaultTimeoutOption,
   VaultTimeoutStringType,
 } from "./types/vault-timeout.type";
+export { MaximumVaultTimeoutPolicyData } from "./types/maximum-vault-timeout-policy.type";
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.spec.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.spec.ts
index 93067111bed..ba58fa80922 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.spec.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.spec.ts
@@ -20,7 +20,7 @@ import { TokenService } from "../../../auth/services/token.service";
 import { LogService } from "../../../platform/abstractions/log.service";
 import { Utils } from "../../../platform/misc/utils";
 import { UserId } from "../../../types/guid";
-import { PinServiceAbstraction } from "../../pin/pin.service.abstraction";
+import { PinStateServiceAbstraction } from "../../pin/pin-state.service.abstraction";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../abstractions/vault-timeout-settings.service";
 import { VaultTimeoutAction } from "../enums/vault-timeout-action.enum";
 import { VaultTimeout, VaultTimeoutStringType } from "../types/vault-timeout.type";
@@ -30,7 +30,7 @@ import { VAULT_TIMEOUT, VAULT_TIMEOUT_ACTION } from "./vault-timeout-settings.st
 
 describe("VaultTimeoutSettingsService", () => {
   let accountService: FakeAccountService;
-  let pinService: MockProxy<PinServiceAbstraction>;
+  let pinStateService: MockProxy<PinStateServiceAbstraction>;
   let userDecryptionOptionsService: MockProxy<UserDecryptionOptionsServiceAbstraction>;
   let keyService: MockProxy<KeyService>;
   let tokenService: MockProxy<TokenService>;
@@ -46,16 +46,18 @@ describe("VaultTimeoutSettingsService", () => {
 
   beforeEach(() => {
     accountService = mockAccountServiceWith(mockUserId);
-    pinService = mock<PinServiceAbstraction>();
+    pinStateService = mock<PinStateServiceAbstraction>();
     userDecryptionOptionsService = mock<UserDecryptionOptionsServiceAbstraction>();
     keyService = mock<KeyService>();
     tokenService = mock<TokenService>();
     policyService = mock<PolicyService>();
 
     userDecryptionOptionsSubject = new BehaviorSubject(null);
-    userDecryptionOptionsService.userDecryptionOptions$ = userDecryptionOptionsSubject;
-    userDecryptionOptionsService.hasMasterPassword$ = userDecryptionOptionsSubject.pipe(
-      map((options) => options?.hasMasterPassword ?? false),
+    userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
+      userDecryptionOptionsSubject,
+    );
+    userDecryptionOptionsService.hasMasterPasswordById$.mockReturnValue(
+      userDecryptionOptionsSubject.pipe(map((options) => options?.hasMasterPassword ?? false)),
     );
     userDecryptionOptionsService.userDecryptionOptionsById$.mockReturnValue(
       userDecryptionOptionsSubject,
@@ -96,7 +98,7 @@ describe("VaultTimeoutSettingsService", () => {
     });
 
     it("contains Lock when the user has either a persistent or ephemeral PIN configured", async () => {
-      pinService.isPinSet.mockResolvedValue(true);
+      pinStateService.isPinSet.mockResolvedValue(true);
 
       const result = await firstValueFrom(
         vaultTimeoutSettingsService.availableVaultTimeoutActions$(),
@@ -118,7 +120,7 @@ describe("VaultTimeoutSettingsService", () => {
 
     it("not contains Lock when the user does not have a master password, PIN, or biometrics", async () => {
       userDecryptionOptionsSubject.next(new UserDecryptionOptions({ hasMasterPassword: false }));
-      pinService.isPinSet.mockResolvedValue(false);
+      pinStateService.isPinSet.mockResolvedValue(false);
       biometricStateService.biometricUnlockEnabled$ = of(false);
 
       const result = await firstValueFrom(
@@ -127,6 +129,23 @@ describe("VaultTimeoutSettingsService", () => {
 
       expect(result).not.toContain(VaultTimeoutAction.Lock);
     });
+
+    it("should return only LogOut when userId is not provided and there is no active account", async () => {
+      // Set up accountService to return null for activeAccount
+      accountService.activeAccount$ = of(null);
+      pinStateService.isPinSet.mockResolvedValue(false);
+      biometricStateService.biometricUnlockEnabled$ = of(false);
+
+      // Call availableVaultTimeoutActions$ which internally calls userHasMasterPassword without a userId
+      const result = await firstValueFrom(
+        vaultTimeoutSettingsService.availableVaultTimeoutActions$(),
+      );
+
+      // Since there's no active account, userHasMasterPassword returns false,
+      // meaning no master password is available, so Lock should not be available
+      expect(result).toEqual([VaultTimeoutAction.LogOut]);
+      expect(result).not.toContain(VaultTimeoutAction.Lock);
+    });
   });
 
   describe("canLock", () => {
@@ -212,7 +231,7 @@ describe("VaultTimeoutSettingsService", () => {
         "returns $expected when policy is $policy, has PIN unlock method: $hasPinUnlock or Biometric unlock method: $hasBiometricUnlock, and user preference is $userPreference",
         async ({ hasPinUnlock, hasBiometricUnlock, policy, userPreference, expected }) => {
           biometricStateService.getBiometricUnlockEnabled.mockResolvedValue(hasBiometricUnlock);
-          pinService.isPinSet.mockResolvedValue(hasPinUnlock);
+          pinStateService.isPinSet.mockResolvedValue(hasPinUnlock);
 
           userDecryptionOptionsSubject.next(
             new UserDecryptionOptions({ hasMasterPassword: false }),
@@ -377,7 +396,7 @@ describe("VaultTimeoutSettingsService", () => {
   ): VaultTimeoutSettingsService {
     return new VaultTimeoutSettingsService(
       accountService,
-      pinService,
+      pinStateService,
       userDecryptionOptionsService,
       keyService,
       tokenService,
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.ts
index e40b896dc8c..00e53596de4 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.ts
@@ -30,7 +30,7 @@ import { TokenService } from "../../../auth/abstractions/token.service";
 import { LogService } from "../../../platform/abstractions/log.service";
 import { StateProvider } from "../../../platform/state";
 import { UserId } from "../../../types/guid";
-import { PinServiceAbstraction } from "../../pin/pin.service.abstraction";
+import { PinStateServiceAbstraction } from "../../pin/pin-state.service.abstraction";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../abstractions/vault-timeout-settings.service";
 import { VaultTimeoutAction } from "../enums/vault-timeout-action.enum";
 import { VaultTimeout, VaultTimeoutStringType } from "../types/vault-timeout.type";
@@ -40,7 +40,7 @@ import { VAULT_TIMEOUT, VAULT_TIMEOUT_ACTION } from "./vault-timeout-settings.st
 export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceAbstraction {
   constructor(
     private accountService: AccountService,
-    private pinService: PinServiceAbstraction,
+    private pinStateService: PinStateServiceAbstraction,
     private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private keyService: KeyService,
     private tokenService: TokenService,
@@ -279,7 +279,7 @@ export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceA
 
     const canLock =
       (await this.userHasMasterPassword(userId)) ||
-      (await this.pinService.isPinSet(userId as UserId)) ||
+      (await this.pinStateService.isPinSet(userId as UserId)) ||
       (await this.isBiometricLockSet(userId));
 
     if (canLock) {
@@ -289,19 +289,20 @@ export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceA
     return availableActions;
   }
 
-  async clear(userId: UserId): Promise<void> {
-    await this.keyService.clearPinKeys(userId);
-  }
-
   private async userHasMasterPassword(userId: string): Promise<boolean> {
+    let resolvedUserId: UserId;
     if (userId) {
-      const decryptionOptions = await firstValueFrom(
-        this.userDecryptionOptionsService.userDecryptionOptionsById$(userId),
-      );
-
-      return !!decryptionOptions?.hasMasterPassword;
+      resolvedUserId = userId as UserId;
     } else {
-      return await firstValueFrom(this.userDecryptionOptionsService.hasMasterPassword$);
+      const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+      if (!activeAccount) {
+        return false; // No account, can't have master password
+      }
+      resolvedUserId = activeAccount.id;
     }
+
+    return await firstValueFrom(
+      this.userDecryptionOptionsService.hasMasterPasswordById$(resolvedUserId),
+    );
   }
 }
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
index da815f76f79..51eec18f173 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
@@ -1,35 +1,21 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { MockProxy, any, mock } from "jest-mock-extended";
+import { MockProxy, mock } from "jest-mock-extended";
 import { BehaviorSubject, from, of } 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 { CollectionService } from "@bitwarden/admin-console/common";
-// 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 { LogoutReason } from "@bitwarden/auth/common";
-// 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 { BiometricsService } from "@bitwarden/key-management";
-import { StateService } from "@bitwarden/state";
+import { LockService, LogoutService } from "@bitwarden/auth/common";
 
 import { FakeAccountService, mockAccountServiceWith } from "../../../../spec";
 import { AccountInfo } from "../../../auth/abstractions/account.service";
 import { AuthService } from "../../../auth/abstractions/auth.service";
-import { TokenService } from "../../../auth/abstractions/token.service";
 import { AuthenticationStatus } from "../../../auth/enums/authentication-status";
 import { LogService } from "../../../platform/abstractions/log.service";
-import { MessagingService } from "../../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
 import { Utils } from "../../../platform/misc/utils";
 import { TaskSchedulerService } from "../../../platform/scheduling";
-import { StateEventRunnerService } from "../../../platform/state";
 import { UserId } from "../../../types/guid";
-import { CipherService } from "../../../vault/abstractions/cipher.service";
-import { FolderService } from "../../../vault/abstractions/folder/folder.service.abstraction";
-import { SearchService } from "../../../vault/abstractions/search.service";
-import { FakeMasterPasswordService } from "../../master-password/services/fake-master-password.service";
 import { VaultTimeoutAction } from "../enums/vault-timeout-action.enum";
 import { VaultTimeout, VaultTimeoutStringType } from "../types/vault-timeout.type";
 
@@ -38,23 +24,13 @@ import { VaultTimeoutService } from "./vault-timeout.service";
 
 describe("VaultTimeoutService", () => {
   let accountService: FakeAccountService;
-  let masterPasswordService: FakeMasterPasswordService;
-  let cipherService: MockProxy<CipherService>;
-  let folderService: MockProxy<FolderService>;
-  let collectionService: MockProxy<CollectionService>;
   let platformUtilsService: MockProxy<PlatformUtilsService>;
-  let messagingService: MockProxy<MessagingService>;
-  let searchService: MockProxy<SearchService>;
-  let stateService: MockProxy<StateService>;
-  let tokenService: MockProxy<TokenService>;
   let authService: MockProxy<AuthService>;
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
-  let stateEventRunnerService: MockProxy<StateEventRunnerService>;
   let taskSchedulerService: MockProxy<TaskSchedulerService>;
   let logService: MockProxy<LogService>;
-  let biometricsService: MockProxy<BiometricsService>;
-  let lockedCallback: jest.Mock<Promise<void>, [userId: string]>;
-  let loggedOutCallback: jest.Mock<Promise<void>, [logoutReason: LogoutReason, userId?: string]>;
+  let lockService: MockProxy<LockService>;
+  let logoutService: MockProxy<LogoutService>;
 
   let vaultTimeoutActionSubject: BehaviorSubject<VaultTimeoutAction>;
   let availableVaultTimeoutActionsSubject: BehaviorSubject<VaultTimeoutAction[]>;
@@ -65,24 +41,13 @@ describe("VaultTimeoutService", () => {
 
   beforeEach(() => {
     accountService = mockAccountServiceWith(userId);
-    masterPasswordService = new FakeMasterPasswordService();
-    cipherService = mock();
-    folderService = mock();
-    collectionService = mock();
     platformUtilsService = mock();
-    messagingService = mock();
-    searchService = mock();
-    stateService = mock();
-    tokenService = mock();
     authService = mock();
     vaultTimeoutSettingsService = mock();
-    stateEventRunnerService = mock();
     taskSchedulerService = mock<TaskSchedulerService>();
+    lockService = mock<LockService>();
     logService = mock<LogService>();
-    biometricsService = mock<BiometricsService>();
-
-    lockedCallback = jest.fn();
-    loggedOutCallback = jest.fn();
+    logoutService = mock<LogoutService>();
 
     vaultTimeoutActionSubject = new BehaviorSubject(VaultTimeoutAction.Lock);
 
@@ -94,23 +59,13 @@ describe("VaultTimeoutService", () => {
 
     vaultTimeoutService = new VaultTimeoutService(
       accountService,
-      masterPasswordService,
-      cipherService,
-      folderService,
-      collectionService,
       platformUtilsService,
-      messagingService,
-      searchService,
-      stateService,
-      tokenService,
       authService,
       vaultTimeoutSettingsService,
-      stateEventRunnerService,
       taskSchedulerService,
       logService,
-      biometricsService,
-      lockedCallback,
-      loggedOutCallback,
+      lockService,
+      logoutService,
     );
   });
 
@@ -145,9 +100,6 @@ describe("VaultTimeoutService", () => {
     authService.getAuthStatus.mockImplementation((userId) => {
       return Promise.resolve(accounts[userId]?.authStatus);
     });
-    tokenService.hasAccessToken$.mockImplementation((userId) => {
-      return of(accounts[userId]?.isAuthenticated ?? false);
-    });
 
     vaultTimeoutSettingsService.getVaultTimeoutByUserId$.mockImplementation((userId) => {
       return new BehaviorSubject<VaultTimeout>(accounts[userId]?.vaultTimeout);
@@ -203,22 +155,16 @@ describe("VaultTimeoutService", () => {
   };
 
   const expectUserToHaveLocked = (userId: string) => {
-    // This does NOT assert all the things that the lock process does
-    expect(tokenService.hasAccessToken$).toHaveBeenCalledWith(userId);
-    expect(vaultTimeoutSettingsService.availableVaultTimeoutActions$).toHaveBeenCalledWith(userId);
-    expect(stateService.setUserKeyAutoUnlock).toHaveBeenCalledWith(null, { userId: userId });
-    expect(masterPasswordService.mock.clearMasterKey).toHaveBeenCalledWith(userId);
-    expect(cipherService.clearCache).toHaveBeenCalledWith(userId);
-    expect(lockedCallback).toHaveBeenCalledWith(userId);
+    expect(lockService.lock).toHaveBeenCalledWith(userId);
   };
 
   const expectUserToHaveLoggedOut = (userId: string) => {
-    expect(loggedOutCallback).toHaveBeenCalledWith("vaultTimeout", userId);
+    expect(logoutService.logout).toHaveBeenCalledWith(userId, "vaultTimeout");
   };
 
   const expectNoAction = (userId: string) => {
-    expect(lockedCallback).not.toHaveBeenCalledWith(userId);
-    expect(loggedOutCallback).not.toHaveBeenCalledWith(any(), userId);
+    expect(lockService.lock).not.toHaveBeenCalledWith(userId);
+    expect(logoutService.logout).not.toHaveBeenCalledWith(userId, "vaultTimeout");
   };
 
   describe("checkVaultTimeout", () => {
@@ -347,12 +293,8 @@ describe("VaultTimeoutService", () => {
       expectNoAction("1");
       expectUserToHaveLocked("2");
 
-      // Active users should have additional steps ran
-      expect(searchService.clearIndex).toHaveBeenCalled();
-      expect(folderService.clearDecryptedFolderState).toHaveBeenCalled();
-
       expectUserToHaveLoggedOut("3"); // They have chosen logout as their action and it's available, log them out
-      expectUserToHaveLoggedOut("4"); // They may have had lock as their chosen action but it's not available to them so logout
+      expectUserToHaveLocked("4"); // They don't have lock available. But this is handled in lock service so we do not check for logout here
     });
 
     it("should lock an account if they haven't been active passed their vault timeout even if a view is open when they are not the active user.", async () => {
@@ -392,70 +334,4 @@ describe("VaultTimeoutService", () => {
       expectNoAction("1");
     });
   });
-
-  describe("lock", () => {
-    const setupLock = () => {
-      setupAccounts(
-        {
-          user1: {
-            authStatus: AuthenticationStatus.Unlocked,
-            isAuthenticated: true,
-          },
-          user2: {
-            authStatus: AuthenticationStatus.Unlocked,
-            isAuthenticated: true,
-          },
-        },
-        {
-          userId: "user1",
-        },
-      );
-    };
-
-    it("should call state event runner with currently active user if no user passed into lock", async () => {
-      setupLock();
-
-      await vaultTimeoutService.lock();
-
-      expect(stateEventRunnerService.handleEvent).toHaveBeenCalledWith("lock", "user1");
-    });
-
-    it("should call locked callback with the locking user if no userID is passed in.", async () => {
-      setupLock();
-
-      await vaultTimeoutService.lock();
-
-      expect(lockedCallback).toHaveBeenCalledWith("user1");
-    });
-
-    it("should call state event runner with user passed into lock", async () => {
-      setupLock();
-
-      const user2 = "user2" as UserId;
-
-      await vaultTimeoutService.lock(user2);
-
-      expect(stateEventRunnerService.handleEvent).toHaveBeenCalledWith("lock", user2);
-    });
-
-    it("should call messaging service locked message with user passed into lock", async () => {
-      setupLock();
-
-      const user2 = "user2" as UserId;
-
-      await vaultTimeoutService.lock(user2);
-
-      expect(messagingService.send).toHaveBeenCalledWith("locked", { userId: user2 });
-    });
-
-    it("should call locked callback with user passed into lock", async () => {
-      setupLock();
-
-      const user2 = "user2" as UserId;
-
-      await vaultTimeoutService.lock(user2);
-
-      expect(lockedCallback).toHaveBeenCalledWith(user2);
-    });
-  });
 });
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
index 9b1350fc3a7..cf9ba05b7d5 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
@@ -1,32 +1,18 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { combineLatest, concatMap, filter, firstValueFrom, map, timeout } from "rxjs";
+import { combineLatest, concatMap, 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 { CollectionService } from "@bitwarden/admin-console/common";
-// 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 { LogoutReason } from "@bitwarden/auth/common";
-// 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 { BiometricsService } from "@bitwarden/key-management";
+import { LockService, LogoutService } from "@bitwarden/auth/common";
 
 import { AccountService } from "../../../auth/abstractions/account.service";
 import { AuthService } from "../../../auth/abstractions/auth.service";
-import { TokenService } from "../../../auth/abstractions/token.service";
 import { AuthenticationStatus } from "../../../auth/enums/authentication-status";
 import { LogService } from "../../../platform/abstractions/log.service";
-import { MessagingService } from "../../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
-import { StateService } from "../../../platform/abstractions/state.service";
 import { TaskSchedulerService, ScheduledTaskNames } from "../../../platform/scheduling";
-import { StateEventRunnerService } from "../../../platform/state";
 import { UserId } from "../../../types/guid";
-import { CipherService } from "../../../vault/abstractions/cipher.service";
-import { FolderService } from "../../../vault/abstractions/folder/folder.service.abstraction";
-import { SearchService } from "../../../vault/abstractions/search.service";
-import { InternalMasterPasswordServiceAbstraction } from "../../master-password/abstractions/master-password.service.abstraction";
 import { VaultTimeoutSettingsService } from "../abstractions/vault-timeout-settings.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "../abstractions/vault-timeout.service";
 import { VaultTimeoutAction } from "../enums/vault-timeout-action.enum";
@@ -36,26 +22,13 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
 
   constructor(
     private accountService: AccountService,
-    private masterPasswordService: InternalMasterPasswordServiceAbstraction,
-    private cipherService: CipherService,
-    private folderService: FolderService,
-    private collectionService: CollectionService,
     protected platformUtilsService: PlatformUtilsService,
-    private messagingService: MessagingService,
-    private searchService: SearchService,
-    private stateService: StateService,
-    private tokenService: TokenService,
     private authService: AuthService,
     private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
-    private stateEventRunnerService: StateEventRunnerService,
     private taskSchedulerService: TaskSchedulerService,
     protected logService: LogService,
-    private biometricService: BiometricsService,
-    private lockedCallback: (userId: UserId) => Promise<void> = null,
-    private loggedOutCallback: (
-      logoutReason: LogoutReason,
-      userId?: string,
-    ) => Promise<void> = null,
+    private lockService: LockService,
+    private logoutService: LogoutService,
   ) {
     this.taskSchedulerService.registerTaskHandler(
       ScheduledTaskNames.vaultTimeoutCheckInterval,
@@ -107,71 +80,6 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
     );
   }
 
-  async lock(userId?: UserId): Promise<void> {
-    await this.biometricService.setShouldAutopromptNow(false);
-
-    const lockingUserId =
-      userId ?? (await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.id))));
-
-    const authed = await firstValueFrom(this.tokenService.hasAccessToken$(lockingUserId));
-    if (!authed) {
-      return;
-    }
-
-    const availableActions = await firstValueFrom(
-      this.vaultTimeoutSettingsService.availableVaultTimeoutActions$(userId),
-    );
-    const supportsLock = availableActions.includes(VaultTimeoutAction.Lock);
-    if (!supportsLock) {
-      await this.logOut(userId);
-    }
-
-    // HACK: Start listening for the transition of the locking user from something to the locked state.
-    // This is very much a hack to ensure that the authentication status to retrievable right after
-    // it does its work. Particularly the `lockedCallback` and `"locked"` message. Instead
-    // lockedCallback should be deprecated and people should subscribe and react to `authStatusFor$` themselves.
-    const lockPromise = firstValueFrom(
-      this.authService.authStatusFor$(lockingUserId).pipe(
-        filter((authStatus) => authStatus === AuthenticationStatus.Locked),
-        timeout({
-          first: 5_000,
-          with: () => {
-            throw new Error("The lock process did not complete in a reasonable amount of time.");
-          },
-        }),
-      ),
-    );
-
-    await this.searchService.clearIndex(lockingUserId);
-
-    // ! DO NOT REMOVE folderService.clearDecryptedFolderState ! For more information see PM-25660
-    await this.folderService.clearDecryptedFolderState(lockingUserId);
-    await this.masterPasswordService.clearMasterKey(lockingUserId);
-
-    await this.stateService.setUserKeyAutoUnlock(null, { userId: lockingUserId });
-
-    await this.cipherService.clearCache(lockingUserId);
-
-    await this.stateEventRunnerService.handleEvent("lock", lockingUserId);
-
-    // HACK: Sit here and wait for the the auth status to transition to `Locked`
-    // to ensure the message and lockedCallback will get the correct status
-    // if/when they call it.
-    await lockPromise;
-
-    this.messagingService.send("locked", { userId: lockingUserId });
-
-    if (this.lockedCallback != null) {
-      await this.lockedCallback(lockingUserId);
-    }
-  }
-
-  async logOut(userId?: string): Promise<void> {
-    if (this.loggedOutCallback != null) {
-      await this.loggedOutCallback("vaultTimeout", userId);
-    }
-  }
-
   private async shouldLock(
     userId: string,
     lastActive: Date,
@@ -215,7 +123,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
       this.vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$(userId),
     );
     timeoutAction === VaultTimeoutAction.LogOut
-      ? await this.logOut(userId)
-      : await this.lock(userId);
+      ? await this.logoutService.logout(userId, "vaultTimeout")
+      : await this.lockService.lock(userId);
   }
 }
diff --git a/libs/common/src/key-management/vault-timeout/types/maximum-vault-timeout-policy.type.ts b/libs/common/src/key-management/vault-timeout/types/maximum-vault-timeout-policy.type.ts
new file mode 100644
index 00000000000..c254e823fee
--- /dev/null
+++ b/libs/common/src/key-management/vault-timeout/types/maximum-vault-timeout-policy.type.ts
@@ -0,0 +1,6 @@
+import { VaultTimeoutAction } from "../enums/vault-timeout-action.enum";
+
+export interface MaximumVaultTimeoutPolicyData {
+  minutes: number;
+  action?: VaultTimeoutAction;
+}
diff --git a/libs/common/src/models/export/cipher.export.spec.ts b/libs/common/src/models/export/cipher.export.spec.ts
index 42c01ccef15..53541aa6758 100644
--- a/libs/common/src/models/export/cipher.export.spec.ts
+++ b/libs/common/src/models/export/cipher.export.spec.ts
@@ -3,6 +3,8 @@ import { SecureNoteExport } from "@bitwarden/common/models/export/secure-note.ex
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
+import { SshKeyExport } from "./ssh-key.export";
+
 describe("Cipher Export", () => {
   describe("toView", () => {
     it.each([[null], [undefined]])(
@@ -41,4 +43,36 @@ describe("Cipher Export", () => {
       expect(resultView.deletedDate).toEqual(request.deletedDate);
     });
   });
+
+  describe("SshKeyExport.toView", () => {
+    const validSshKey = {
+      privateKey: "PRIVATE_KEY",
+      publicKey: "PUBLIC_KEY",
+      keyFingerprint: "FINGERPRINT",
+    };
+
+    it.each([null, undefined, "", "   "])("should throw when privateKey is %p", (value) => {
+      const sshKey = { ...validSshKey, privateKey: value } as any;
+      expect(() => SshKeyExport.toView(sshKey)).toThrow("SSH key private key is required.");
+    });
+
+    it.each([null, undefined, "", "   "])("should throw when publicKey is %p", (value) => {
+      const sshKey = { ...validSshKey, publicKey: value } as any;
+      expect(() => SshKeyExport.toView(sshKey)).toThrow("SSH key public key is required.");
+    });
+
+    it.each([null, undefined, "", "   "])("should throw when keyFingerprint is %p", (value) => {
+      const sshKey = { ...validSshKey, keyFingerprint: value } as any;
+      expect(() => SshKeyExport.toView(sshKey)).toThrow("SSH key fingerprint is required.");
+    });
+
+    it("should succeed with valid inputs", () => {
+      const sshKey = { ...validSshKey };
+      const result = SshKeyExport.toView(sshKey);
+      expect(result).toBeDefined();
+      expect(result?.privateKey).toBe(validSshKey.privateKey);
+      expect(result?.publicKey).toBe(validSshKey.publicKey);
+      expect(result?.keyFingerprint).toBe(validSshKey.keyFingerprint);
+    });
+  });
 });
diff --git a/libs/common/src/models/export/ssh-key.export.ts b/libs/common/src/models/export/ssh-key.export.ts
index 9bae57ee620..fe528ac6ba8 100644
--- a/libs/common/src/models/export/ssh-key.export.ts
+++ b/libs/common/src/models/export/ssh-key.export.ts
@@ -16,7 +16,22 @@ export class SshKeyExport {
     return req;
   }
 
-  static toView(req: SshKeyExport, view = new SshKeyView()) {
+  static toView(req?: SshKeyExport, view = new SshKeyView()): SshKeyView | undefined {
+    if (req == null) {
+      return undefined;
+    }
+
+    // Validate required fields
+    if (!req.privateKey || req.privateKey.trim() === "") {
+      throw new Error("SSH key private key is required.");
+    }
+    if (!req.publicKey || req.publicKey.trim() === "") {
+      throw new Error("SSH key public key is required.");
+    }
+    if (!req.keyFingerprint || req.keyFingerprint.trim() === "") {
+      throw new Error("SSH key fingerprint is required.");
+    }
+
     view.privateKey = req.privateKey;
     view.publicKey = req.publicKey;
     view.keyFingerprint = req.keyFingerprint;
diff --git a/libs/common/src/models/request/verify-bank.request.ts b/libs/common/src/models/request/verify-bank.request.ts
deleted file mode 100644
index b827b875949..00000000000
--- a/libs/common/src/models/request/verify-bank.request.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-export class VerifyBankRequest {
-  amount1: number;
-  amount2: number;
-}
diff --git a/libs/common/src/models/response/event.response.ts b/libs/common/src/models/response/event.response.ts
index 07124b3080c..41376e4086f 100644
--- a/libs/common/src/models/response/event.response.ts
+++ b/libs/common/src/models/response/event.response.ts
@@ -24,6 +24,7 @@ export class EventResponse extends BaseResponse {
   secretId: string;
   projectId: string;
   serviceAccountId: string;
+  grantedServiceAccountId: string;
 
   constructor(response: any) {
     super(response);
@@ -48,5 +49,6 @@ export class EventResponse extends BaseResponse {
     this.secretId = this.getResponseProperty("SecretId");
     this.projectId = this.getResponseProperty("ProjectId");
     this.serviceAccountId = this.getResponseProperty("ServiceAccountId");
+    this.grantedServiceAccountId = this.getResponseProperty("GrantedServiceAccountId");
   }
 }
diff --git a/libs/common/src/models/response/notification.response.ts b/libs/common/src/models/response/notification.response.ts
index 56b22fd3117..167864208ee 100644
--- a/libs/common/src/models/response/notification.response.ts
+++ b/libs/common/src/models/response/notification.response.ts
@@ -1,6 +1,6 @@
 import { NotificationViewResponse as EndUserNotificationResponse } from "@bitwarden/common/vault/notifications/models";
 
-import { NotificationType } from "../../enums";
+import { NotificationType, PushNotificationLogOutReasonType } from "../../enums";
 
 import { BaseResponse } from "./base.response";
 
@@ -41,9 +41,11 @@ export class NotificationResponse extends BaseResponse {
       case NotificationType.SyncOrganizations:
       case NotificationType.SyncOrgKeys:
       case NotificationType.SyncSettings:
-      case NotificationType.LogOut:
         this.payload = new UserNotification(payload);
         break;
+      case NotificationType.LogOut:
+        this.payload = new LogOutNotification(payload);
+        break;
       case NotificationType.SyncSendCreate:
       case NotificationType.SyncSendUpdate:
       case NotificationType.SyncSendDelete:
@@ -184,3 +186,14 @@ export class ProviderBankAccountVerifiedPushNotification extends BaseResponse {
     this.adminId = this.getResponseProperty("AdminId");
   }
 }
+
+export class LogOutNotification extends BaseResponse {
+  userId: string;
+  reason?: PushNotificationLogOutReasonType;
+
+  constructor(response: any) {
+    super(response);
+    this.userId = this.getResponseProperty("UserId");
+    this.reason = this.getResponseProperty("Reason");
+  }
+}
diff --git a/libs/common/src/models/response/profile.response.ts b/libs/common/src/models/response/profile.response.ts
index a6982d7ed43..11aca73d5c9 100644
--- a/libs/common/src/models/response/profile.response.ts
+++ b/libs/common/src/models/response/profile.response.ts
@@ -1,3 +1,5 @@
+import { PrivateKeysResponseModel } from "@bitwarden/common/key-management/keys/response/private-keys.response";
+
 import { ProfileOrganizationResponse } from "../../admin-console/models/response/profile-organization.response";
 import { ProfileProviderOrganizationResponse } from "../../admin-console/models/response/profile-provider-organization.response";
 import { ProfileProviderResponse } from "../../admin-console/models/response/profile-provider.response";
@@ -18,7 +20,10 @@ export class ProfileResponse extends BaseResponse {
   key?: EncString;
   avatarColor: string;
   creationDate: string;
+  // Cleanup: Can be removed after moving to accountKeys
   privateKey: string;
+  // Cleanup: This should be non-optional after the server has been released for a while https://bitwarden.atlassian.net/browse/PM-21768
+  accountKeys: PrivateKeysResponseModel | null = null;
   securityStamp: string;
   forcePasswordReset: boolean;
   usesKeyConnector: boolean;
@@ -37,10 +42,16 @@ export class ProfileResponse extends BaseResponse {
     this.premiumFromOrganization = this.getResponseProperty("PremiumFromOrganization");
     this.culture = this.getResponseProperty("Culture");
     this.twoFactorEnabled = this.getResponseProperty("TwoFactorEnabled");
+
     const key = this.getResponseProperty("Key");
     if (key) {
       this.key = new EncString(key);
     }
+    // Cleanup: This should be non-optional after the server has been released for a while https://bitwarden.atlassian.net/browse/PM-21768
+    if (this.getResponseProperty("AccountKeys") != null) {
+      this.accountKeys = new PrivateKeysResponseModel(this.getResponseProperty("AccountKeys"));
+    }
+
     this.avatarColor = this.getResponseProperty("AvatarColor");
     this.creationDate = this.getResponseProperty("CreationDate");
     this.privateKey = this.getResponseProperty("PrivateKey");
diff --git a/libs/common/src/platform/abstractions/i18n.service.ts b/libs/common/src/platform/abstractions/i18n.service.ts
index a1b44d956a9..a1aab7bd8ee 100644
--- a/libs/common/src/platform/abstractions/i18n.service.ts
+++ b/libs/common/src/platform/abstractions/i18n.service.ts
@@ -5,6 +5,6 @@ import { TranslationService } from "./translation.service";
 export abstract class I18nService extends TranslationService {
   abstract userSetLocale$: Observable<string | undefined>;
   abstract locale$: Observable<string>;
-  abstract setLocale(locale: string): Promise<void>;
+  abstract setLocale(locale: string | null): Promise<void>;
   abstract init(): Promise<void>;
 }
diff --git a/libs/common/src/platform/abstractions/platform-utils.service.ts b/libs/common/src/platform/abstractions/platform-utils.service.ts
index 4d126aeab88..0aabd7aa5a1 100644
--- a/libs/common/src/platform/abstractions/platform-utils.service.ts
+++ b/libs/common/src/platform/abstractions/platform-utils.service.ts
@@ -55,4 +55,5 @@ export abstract class PlatformUtilsService {
   abstract readFromClipboard(): Promise<string>;
   abstract supportsSecureStorage(): boolean;
   abstract getAutofillKeyboardShortcut(): Promise<string>;
+  abstract packageType(): Promise<string | null>;
 }
diff --git a/libs/common/src/platform/abstractions/sdk/register-sdk.service.ts b/libs/common/src/platform/abstractions/sdk/register-sdk.service.ts
new file mode 100644
index 00000000000..b340dd95ebe
--- /dev/null
+++ b/libs/common/src/platform/abstractions/sdk/register-sdk.service.ts
@@ -0,0 +1,56 @@
+import { Observable } from "rxjs";
+
+import { BitwardenClient, Uuid } from "@bitwarden/sdk-internal";
+
+import { UserId } from "../../../types/guid";
+import { Rc } from "../../misc/reference-counting/rc";
+import { Utils } from "../../misc/utils";
+
+export class UserNotLoggedInError extends Error {
+  constructor(userId: UserId) {
+    super(`User (${userId}) is not logged in`);
+  }
+}
+
+export class InvalidUuid extends Error {
+  constructor(uuid: string) {
+    super(`Invalid UUID: ${uuid}`);
+  }
+}
+
+/**
+ * Converts a string to UUID. Will throw an error if the UUID is non valid.
+ */
+export function asUuid<T extends Uuid>(uuid: string): T {
+  if (Utils.isGuid(uuid)) {
+    return uuid as T;
+  }
+
+  throw new InvalidUuid(uuid);
+}
+
+/**
+ * Converts a UUID to the string representation.
+ */
+export function uuidAsString<T extends Uuid>(uuid: T): string {
+  return uuid as unknown as string;
+}
+
+export abstract class RegisterSdkService {
+  /**
+   * Retrieve a client with tokens for a specific user.
+   * This client is meant exclusively for registrations that require tokens, such as TDE and key-connector.
+   *
+   *   - If the user is not logged when the subscription is created, the observable will complete
+   *     immediately with {@link UserNotLoggedInError}.
+   *   - If the user is logged in, the observable will emit the client and complete without an error
+   *     when the user logs out.
+   *
+   * **WARNING:** Do not use `firstValueFrom(userClient$)`! Any operations on the client must be done within the observable.
+   * The client will be destroyed when the observable is no longer subscribed to.
+   * Please let platform know if you need a client that is not destroyed when the observable is no longer subscribed to.
+   *
+   * @param userId The user id for which to retrieve the client
+   */
+  abstract registerClient$(userId: UserId): Observable<Rc<BitwardenClient>>;
+}
diff --git a/libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts b/libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts
index 6a1b7b67b42..35830e42f16 100644
--- a/libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts
+++ b/libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts
@@ -1,14 +1,14 @@
-import type { BitwardenClient } from "@bitwarden/sdk-internal";
+import type { PasswordManagerClient } from "@bitwarden/sdk-internal";
 
 /**
  * Factory for creating SDK clients.
  */
 export abstract class SdkClientFactory {
   /**
-   * Creates a new BitwardenClient. Assumes the SDK is already loaded.
-   * @param args Bitwarden client constructor parameters
+   * Creates a new Password Manager client. Assumes the SDK is already loaded.
+   * @param args Password Manager client constructor parameters
    */
   abstract createSdkClient(
-    ...args: ConstructorParameters<typeof BitwardenClient>
-  ): Promise<BitwardenClient>;
+    ...args: ConstructorParameters<typeof PasswordManagerClient>
+  ): Promise<PasswordManagerClient>;
 }
diff --git a/libs/common/src/platform/abstractions/sdk/sdk.service.ts b/libs/common/src/platform/abstractions/sdk/sdk.service.ts
index 03baec5cc37..f34bb8fb612 100644
--- a/libs/common/src/platform/abstractions/sdk/sdk.service.ts
+++ b/libs/common/src/platform/abstractions/sdk/sdk.service.ts
@@ -1,7 +1,8 @@
 import { Observable } from "rxjs";
 
-import { BitwardenClient, Uuid } from "@bitwarden/sdk-internal";
+import { PasswordManagerClient, Uuid, DeviceType as SdkDeviceType } from "@bitwarden/sdk-internal";
 
+import { DeviceType } from "../../../enums";
 import { UserId } from "../../../types/guid";
 import { Rc } from "../../misc/reference-counting/rc";
 import { Utils } from "../../misc/utils";
@@ -18,6 +19,63 @@ export class InvalidUuid extends Error {
   }
 }
 
+export function toSdkDevice(device: DeviceType): SdkDeviceType {
+  switch (device) {
+    case DeviceType.Android:
+      return "Android";
+    case DeviceType.iOS:
+      return "iOS";
+    case DeviceType.ChromeExtension:
+      return "ChromeExtension";
+    case DeviceType.FirefoxExtension:
+      return "FirefoxExtension";
+    case DeviceType.OperaExtension:
+      return "OperaExtension";
+    case DeviceType.EdgeExtension:
+      return "EdgeExtension";
+    case DeviceType.WindowsDesktop:
+      return "WindowsDesktop";
+    case DeviceType.MacOsDesktop:
+      return "MacOsDesktop";
+    case DeviceType.LinuxDesktop:
+      return "LinuxDesktop";
+    case DeviceType.ChromeBrowser:
+      return "ChromeBrowser";
+    case DeviceType.FirefoxBrowser:
+      return "FirefoxBrowser";
+    case DeviceType.OperaBrowser:
+      return "OperaBrowser";
+    case DeviceType.EdgeBrowser:
+      return "EdgeBrowser";
+    case DeviceType.IEBrowser:
+      return "IEBrowser";
+    case DeviceType.UnknownBrowser:
+      return "UnknownBrowser";
+    case DeviceType.AndroidAmazon:
+      return "AndroidAmazon";
+    case DeviceType.UWP:
+      return "UWP";
+    case DeviceType.SafariBrowser:
+      return "SafariBrowser";
+    case DeviceType.VivaldiBrowser:
+      return "VivaldiBrowser";
+    case DeviceType.VivaldiExtension:
+      return "VivaldiExtension";
+    case DeviceType.SafariExtension:
+      return "SafariExtension";
+    case DeviceType.Server:
+      return "Server";
+    case DeviceType.WindowsCLI:
+      return "WindowsCLI";
+    case DeviceType.MacOsCLI:
+      return "MacOsCLI";
+    case DeviceType.LinuxCLI:
+      return "LinuxCLI";
+    default:
+      return "SDK";
+  }
+}
+
 /**
  * Converts a string to UUID. Will throw an error if the UUID is non valid.
  */
@@ -46,7 +104,7 @@ export abstract class SdkService {
    * Retrieve a client initialized without a user.
    * This client can only be used for operations that don't require a user context.
    */
-  abstract client$: Observable<BitwardenClient>;
+  abstract client$: Observable<PasswordManagerClient>;
 
   /**
    * Retrieve a client initialized for a specific user.
@@ -64,7 +122,7 @@ export abstract class SdkService {
    *
    * @param userId The user id for which to retrieve the client
    */
-  abstract userClient$(userId: UserId): Observable<Rc<BitwardenClient>>;
+  abstract userClient$(userId: UserId): Observable<Rc<PasswordManagerClient>>;
 
   /**
    * This method is used during/after an authentication procedure to set a new client for a specific user.
@@ -75,5 +133,5 @@ export abstract class SdkService {
    * @param userId The user id for which to set the client
    * @param client The client to set for the user. If undefined, the client will be unset.
    */
-  abstract setClient(userId: UserId, client: BitwardenClient | undefined): void;
+  abstract setClient(userId: UserId, client: PasswordManagerClient | undefined): void;
 }
diff --git a/libs/common/src/platform/ipc/index.ts b/libs/common/src/platform/ipc/index.ts
index f1acccdddbf..3fa6aeb627d 100644
--- a/libs/common/src/platform/ipc/index.ts
+++ b/libs/common/src/platform/ipc/index.ts
@@ -1,2 +1,3 @@
 export * from "./ipc-message";
 export * from "./ipc.service";
+export * from "./ipc-session-repository";
diff --git a/libs/common/src/platform/ipc/ipc-message.ts b/libs/common/src/platform/ipc/ipc-message.ts
index abd352da1c0..c3ac6360597 100644
--- a/libs/common/src/platform/ipc/ipc-message.ts
+++ b/libs/common/src/platform/ipc/ipc-message.ts
@@ -5,7 +5,8 @@ export interface IpcMessage {
   message: SerializedOutgoingMessage;
 }
 
-export interface SerializedOutgoingMessage extends Omit<OutgoingMessage, "free" | "payload"> {
+export interface SerializedOutgoingMessage
+  extends Omit<OutgoingMessage, typeof Symbol.dispose | "free" | "payload"> {
   payload: number[];
 }
 
diff --git a/libs/common/src/platform/ipc/ipc-session-repository.spec.ts b/libs/common/src/platform/ipc/ipc-session-repository.spec.ts
new file mode 100644
index 00000000000..62437455b08
--- /dev/null
+++ b/libs/common/src/platform/ipc/ipc-session-repository.spec.ts
@@ -0,0 +1,49 @@
+import { FakeActiveUserAccessor, FakeStateProvider } from "../../../spec";
+import { UserId } from "../../types/guid";
+
+import { IpcSessionRepository } from "./ipc-session-repository";
+
+describe("IpcSessionRepository", () => {
+  const userId = "user-id" as UserId;
+  let stateProvider!: FakeStateProvider;
+  let repository!: IpcSessionRepository;
+
+  beforeEach(() => {
+    stateProvider = new FakeStateProvider(new FakeActiveUserAccessor(userId));
+    repository = new IpcSessionRepository(stateProvider);
+  });
+
+  it("returns undefined when empty", async () => {
+    const result = await repository.get("BrowserBackground");
+
+    expect(result).toBeUndefined();
+  });
+
+  it("saves and retrieves a session", async () => {
+    const session = { some: "data" };
+    await repository.save("BrowserBackground", session);
+
+    const result = await repository.get("BrowserBackground");
+
+    expect(result).toEqual(session);
+  });
+
+  it("saves and retrieves a web session", async () => {
+    const session = { some: "data" };
+    await repository.save({ Web: { id: 9001 } }, session);
+
+    const result = await repository.get({ Web: { id: 9001 } });
+
+    expect(result).toEqual(session);
+  });
+
+  it("removes a session", async () => {
+    const session = { some: "data" };
+    await repository.save("BrowserBackground", session);
+
+    await repository.remove("BrowserBackground");
+    const result = await repository.get("BrowserBackground");
+
+    expect(result).toBeUndefined();
+  });
+});
diff --git a/libs/common/src/platform/ipc/ipc-session-repository.ts b/libs/common/src/platform/ipc/ipc-session-repository.ts
new file mode 100644
index 00000000000..c9f5fe4a355
--- /dev/null
+++ b/libs/common/src/platform/ipc/ipc-session-repository.ts
@@ -0,0 +1,51 @@
+import { firstValueFrom, map } from "rxjs";
+
+import { Endpoint, IpcSessionRepository as SdkIpcSessionRepository } from "@bitwarden/sdk-internal";
+
+import { GlobalState, IPC_MEMORY, KeyDefinition, StateProvider } from "../state";
+
+const IPC_SESSIONS = KeyDefinition.record<object, string>(IPC_MEMORY, "ipcSessions", {
+  deserializer: (value: object) => value,
+});
+
+/**
+ * Implementation of SDK-defined repository interface/trait. Do not use directly.
+ * All error handling is done by the caller (the SDK).
+ * For more information see IPC docs.
+ *
+ * Interface uses `any` type as defined by the SDK until we get a concrete session type.
+ */
+export class IpcSessionRepository implements SdkIpcSessionRepository {
+  private states: GlobalState<Record<string, any>>;
+
+  constructor(private stateProvider: StateProvider) {
+    this.states = this.stateProvider.getGlobal(IPC_SESSIONS);
+  }
+
+  get(endpoint: Endpoint): Promise<any | undefined> {
+    return firstValueFrom(this.states.state$.pipe(map((s) => s?.[endpointToString(endpoint)])));
+  }
+
+  async save(endpoint: Endpoint, session: any): Promise<void> {
+    await this.states.update((s) => ({
+      ...s,
+      [endpointToString(endpoint)]: session,
+    }));
+  }
+
+  async remove(endpoint: Endpoint): Promise<void> {
+    await this.states.update((s) => {
+      const newState = { ...s };
+      delete newState[endpointToString(endpoint)];
+      return newState;
+    });
+  }
+}
+
+function endpointToString(endpoint: Endpoint): string {
+  if (typeof endpoint === "object" && "Web" in endpoint) {
+    return `Web(${endpoint.Web.id})`;
+  }
+
+  return endpoint;
+}
diff --git a/libs/common/src/platform/misc/safe-urls.ts b/libs/common/src/platform/misc/safe-urls.ts
index d7223a344e4..f958f92aa19 100644
--- a/libs/common/src/platform/misc/safe-urls.ts
+++ b/libs/common/src/platform/misc/safe-urls.ts
@@ -17,13 +17,13 @@ const CanLaunchWhitelist = [
 ];
 
 export class SafeUrls {
-  static canLaunch(uri: string): boolean {
+  static canLaunch(uri: string | null | undefined): boolean {
     if (Utils.isNullOrWhitespace(uri)) {
       return false;
     }
 
     for (let i = 0; i < CanLaunchWhitelist.length; i++) {
-      if (uri.indexOf(CanLaunchWhitelist[i]) === 0) {
+      if (uri!.indexOf(CanLaunchWhitelist[i]) === 0) {
         return true;
       }
     }
diff --git a/libs/common/src/platform/misc/utils.spec.ts b/libs/common/src/platform/misc/utils.spec.ts
index 818138863fb..664c6e22b3a 100644
--- a/libs/common/src/platform/misc/utils.spec.ts
+++ b/libs/common/src/platform/misc/utils.spec.ts
@@ -302,7 +302,7 @@ describe("Utils Service", () => {
       expect(b64String).toBe(b64HelloWorldString);
     });
 
-    runInBothEnvironments("should return an empty string for an empty ArrayBuffer", () => {
+    runInBothEnvironments("should return empty string for an empty ArrayBuffer", () => {
       const buffer = new Uint8Array([]).buffer;
       const b64String = Utils.fromBufferToB64(buffer);
       expect(b64String).toBe("");
@@ -312,6 +312,81 @@ describe("Utils Service", () => {
       const b64String = Utils.fromBufferToB64(null);
       expect(b64String).toBeNull();
     });
+
+    runInBothEnvironments("returns null for undefined input", () => {
+      const b64 = Utils.fromBufferToB64(undefined as unknown as ArrayBuffer);
+      expect(b64).toBeNull();
+    });
+
+    runInBothEnvironments("returns empty string for empty input", () => {
+      const b64 = Utils.fromBufferToB64(new ArrayBuffer(0));
+      expect(b64).toBe("");
+    });
+
+    runInBothEnvironments("accepts Uint8Array directly", () => {
+      const u8 = new Uint8Array(asciiHelloWorldArray);
+      const b64 = Utils.fromBufferToB64(u8);
+      expect(b64).toBe(b64HelloWorldString);
+    });
+
+    runInBothEnvironments("respects byteOffset/byteLength (view window)", () => {
+      // [xx, 'hello world', yy] — view should only encode the middle slice
+      const prefix = [1, 2, 3];
+      const suffix = [4, 5];
+      const all = new Uint8Array([...prefix, ...asciiHelloWorldArray, ...suffix]);
+      const view = new Uint8Array(all.buffer, prefix.length, asciiHelloWorldArray.length);
+      const b64 = Utils.fromBufferToB64(view);
+      expect(b64).toBe(b64HelloWorldString);
+    });
+
+    runInBothEnvironments("handles DataView (ArrayBufferView other than Uint8Array)", () => {
+      const u8 = new Uint8Array(asciiHelloWorldArray);
+      const dv = new DataView(u8.buffer, 0, u8.byteLength);
+      const b64 = Utils.fromBufferToB64(dv);
+      expect(b64).toBe(b64HelloWorldString);
+    });
+
+    runInBothEnvironments("handles DataView with offset/length window", () => {
+      // Buffer: [xx, 'hello world', yy]
+      const prefix = [9, 9, 9];
+      const suffix = [8, 8];
+      const all = new Uint8Array([...prefix, ...asciiHelloWorldArray, ...suffix]);
+
+      // DataView over just the "hello world" window
+      const dv = new DataView(all.buffer, prefix.length, asciiHelloWorldArray.length);
+
+      const b64 = Utils.fromBufferToB64(dv);
+      expect(b64).toBe(b64HelloWorldString);
+    });
+
+    runInBothEnvironments(
+      "encodes empty view (offset-length window of zero) as empty string",
+      () => {
+        const backing = new Uint8Array([1, 2, 3, 4]);
+        const emptyView = new Uint8Array(backing.buffer, 2, 0);
+        const b64 = Utils.fromBufferToB64(emptyView);
+        expect(b64).toBe("");
+      },
+    );
+
+    runInBothEnvironments("does not mutate the input", () => {
+      const original = new Uint8Array(asciiHelloWorldArray);
+      const copyBefore = new Uint8Array(original); // snapshot
+      Utils.fromBufferToB64(original);
+      expect(original).toEqual(copyBefore); // unchanged
+    });
+
+    it("produces the same Base64 in Node vs non-Node mode", () => {
+      const bytes = new Uint8Array(asciiHelloWorldArray);
+
+      Utils.isNode = true;
+      const nodeB64 = Utils.fromBufferToB64(bytes);
+
+      Utils.isNode = false;
+      const browserB64 = Utils.fromBufferToB64(bytes);
+
+      expect(browserB64).toBe(nodeB64);
+    });
   });
 
   describe("fromB64ToArray(...)", () => {
@@ -614,6 +689,32 @@ describe("Utils Service", () => {
     });
   });
 
+  describe("invalidUrlPatterns", () => {
+    it("should return false if no invalid patterns are found", () => {
+      const urlString = "https://www.example.com/api/my/account/status";
+
+      const actual = Utils.invalidUrlPatterns(urlString);
+
+      expect(actual).toBe(false);
+    });
+
+    it("should return true if an invalid pattern is found", () => {
+      const urlString = "https://www.example.com/api/%2e%2e/secret";
+
+      const actual = Utils.invalidUrlPatterns(urlString);
+
+      expect(actual).toBe(true);
+    });
+
+    it("should return true if an invalid pattern is found in a param", () => {
+      const urlString = "https://www.example.com/api/history?someToken=../secret";
+
+      const actual = Utils.invalidUrlPatterns(urlString);
+
+      expect(actual).toBe(true);
+    });
+  });
+
   describe("getUrl", () => {
     it("assumes a http protocol if no protocol is specified", () => {
       const urlString = "www.exampleapp.com.au:4000";
diff --git a/libs/common/src/platform/misc/utils.ts b/libs/common/src/platform/misc/utils.ts
index c103e346a85..136b0ac394f 100644
--- a/libs/common/src/platform/misc/utils.ts
+++ b/libs/common/src/platform/misc/utils.ts
@@ -128,15 +128,52 @@ export class Utils {
     return arr;
   }
 
-  static fromBufferToB64(buffer: ArrayBuffer): string {
+  /**
+   * Convert binary data into a Base64 string.
+   *
+   * Overloads are provided for two categories of input:
+   *
+   * 1. ArrayBuffer
+   *    - A raw, fixed-length chunk of memory (no element semantics).
+   *    - Example: `const buf = new ArrayBuffer(16);`
+   *
+   * 2. ArrayBufferView
+   *    - A *view* onto an existing buffer that gives the bytes meaning.
+   *    - Examples: Uint8Array, Int32Array, DataView, etc.
+   *    - Views can expose only a *window* of the underlying buffer via
+   *      `byteOffset` and `byteLength`.
+   *      Example:
+   *      ```ts
+   *      const buf = new ArrayBuffer(8);
+   *      const full = new Uint8Array(buf);       // sees all 8 bytes
+   *      const half = new Uint8Array(buf, 4, 4); // sees only last 4 bytes
+   *      ```
+   *
+   * Returns:
+   * - Base64 string for non-empty inputs,
+   * - null if `buffer` is `null` or `undefined`
+   * - empty string if `buffer` is empty (0 bytes)
+   */
+  static fromBufferToB64(buffer: null | undefined): null;
+  static fromBufferToB64(buffer: ArrayBuffer): string;
+  static fromBufferToB64(buffer: ArrayBufferView): string;
+  static fromBufferToB64(buffer: ArrayBuffer | ArrayBufferView | null | undefined): string | null {
+    // Handle null / undefined input
     if (buffer == null) {
       return null;
     }
+
+    const bytes: Uint8Array = Utils.normalizeToUint8Array(buffer);
+
+    // Handle empty input
+    if (bytes.length === 0) {
+      return "";
+    }
+
     if (Utils.isNode) {
-      return Buffer.from(buffer).toString("base64");
+      return Buffer.from(bytes).toString("base64");
     } else {
       let binary = "";
-      const bytes = new Uint8Array(buffer);
       for (let i = 0; i < bytes.byteLength; i++) {
         binary += String.fromCharCode(bytes[i]);
       }
@@ -144,6 +181,30 @@ export class Utils {
     }
   }
 
+  /**
+   * Normalizes input into a Uint8Array so we always have a uniform,
+   * byte-level view of the data. This avoids dealing with differences
+   * between ArrayBuffer (raw memory with no indexing) and other typed
+   * views (which may have element sizes, offsets, and lengths).
+   * @param buffer ArrayBuffer or ArrayBufferView (e.g. Uint8Array, DataView, etc.)
+   */
+  private static normalizeToUint8Array(buffer: ArrayBuffer | ArrayBufferView): Uint8Array {
+    /**
+     * 1) Uint8Array: already bytes → use directly.
+     * 2) ArrayBuffer: wrap whole buffer.
+     * 3) Other ArrayBufferView (e.g., DataView, Int32Array):
+     *    wrap the view’s window (byteOffset..byteOffset+byteLength).
+     */
+    if (buffer instanceof Uint8Array) {
+      return buffer;
+    } else if (buffer instanceof ArrayBuffer) {
+      return new Uint8Array(buffer);
+    } else {
+      const view = buffer as ArrayBufferView;
+      return new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
+    }
+  }
+
   static fromBufferToUrlB64(buffer: ArrayBuffer): string {
     return Utils.fromB64toUrlB64(Utils.fromBufferToB64(buffer));
   }
@@ -314,7 +375,7 @@ export class Utils {
     }
   }
 
-  static getDomain(uriString: string): string {
+  static getDomain(uriString: string | null | undefined): string {
     if (Utils.isNullOrWhitespace(uriString)) {
       return null;
     }
@@ -392,11 +453,11 @@ export class Utils {
     };
   }
 
-  static isNullOrWhitespace(str: string): boolean {
+  static isNullOrWhitespace(str: string | null | undefined): boolean {
     return str == null || typeof str !== "string" || str.trim() === "";
   }
 
-  static isNullOrEmpty(str: string | null): boolean {
+  static isNullOrEmpty(str: string | null | undefined): boolean {
     return str == null || typeof str !== "string" || str == "";
   }
 
@@ -418,7 +479,7 @@ export class Utils {
     return (Object.keys(obj).filter((k) => Number.isNaN(+k)) as K[]).map((k) => obj[k]);
   }
 
-  static getUrl(uriString: string): URL {
+  static getUrl(uriString: string | undefined | null): URL {
     if (this.isNullOrWhitespace(uriString)) {
       return null;
     }
@@ -551,6 +612,55 @@ export class Utils {
     return path.normalize(decodeURIComponent(denormalizedPath)).replace(/^(\.\.(\/|\\|$))+/, "");
   }
 
+  /**
+   * Validates an url checking against invalid patterns
+   * @param url
+   * @returns true if invalid patterns found, false if safe
+   */
+  static invalidUrlPatterns(url: string): boolean {
+    const invalidUrlPatterns = ["..", "%2e", "\\", "%5c"];
+
+    const decodedUrl = decodeURIComponent(url.toLocaleLowerCase());
+
+    // Check URL for invalidUrl patterns across entire URL
+    if (invalidUrlPatterns.some((p) => decodedUrl.includes(p))) {
+      return true;
+    }
+
+    // Check for additional invalid patterns inside URL params
+    if (decodedUrl.includes("?")) {
+      const hasInvalidParams = this.validateQueryParameters(decodedUrl);
+      if (hasInvalidParams) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Validates query parameters for additional invalid patterns
+   * @param url - The URL containing query parameters
+   * @returns true if invalid patterns found, false if safe
+   */
+  private static validateQueryParameters(url: string): boolean {
+    try {
+      let queryString: string;
+
+      if (url.includes("?")) {
+        queryString = url.split("?")[1];
+      } else {
+        return false;
+      }
+
+      const paramInvalidPatterns = ["/", "%2f", "#", "%23"];
+
+      return paramInvalidPatterns.some((p) => queryString.includes(p));
+    } catch (error) {
+      throw new Error(`Error validating query parameters: ${error}`);
+    }
+  }
+
   private static isMobile(win: Window) {
     let mobile = false;
     ((a) => {
diff --git a/libs/common/src/platform/models/domain/domain-base.ts b/libs/common/src/platform/models/domain/domain-base.ts
index bab9f0f8ac7..a144353f5bc 100644
--- a/libs/common/src/platform/models/domain/domain-base.ts
+++ b/libs/common/src/platform/models/domain/domain-base.ts
@@ -14,15 +14,15 @@ export type DecryptedObject<
 
 // extracts shared keys from the domain and view types
 type EncryptableKeys<D extends Domain, V extends View> = (keyof D &
-  ConditionalKeys<D, EncString | null>) &
-  (keyof V & ConditionalKeys<V, string | null>);
+  ConditionalKeys<D, EncString | null | undefined>) &
+  (keyof V & ConditionalKeys<V, string | null | undefined>);
 
 type DomainEncryptableKeys<D extends Domain> = {
-  [key in ConditionalKeys<D, EncString | null>]: EncString | null;
+  [key in ConditionalKeys<D, EncString | null | undefined>]?: EncString | null | undefined;
 };
 
 type ViewEncryptableKeys<V extends View> = {
-  [key in ConditionalKeys<V, string | null>]: string | null;
+  [key in ConditionalKeys<V, string | null | undefined>]?: string | null | undefined;
 };
 
 // https://contributing.bitwarden.com/architecture/clients/data-model#domain
diff --git a/libs/common/src/platform/server-notifications/internal/default-server-notifications.multiuser.spec.ts b/libs/common/src/platform/server-notifications/internal/default-server-notifications.multiuser.spec.ts
index 9bc47437b39..b4d47698e4d 100644
--- a/libs/common/src/platform/server-notifications/internal/default-server-notifications.multiuser.spec.ts
+++ b/libs/common/src/platform/server-notifications/internal/default-server-notifications.multiuser.spec.ts
@@ -132,7 +132,6 @@ describe("DefaultServerNotificationsService (multi-user)", () => {
       const flagValueByFlag: Partial<Record<FeatureFlag, boolean>> = {
         [FeatureFlag.InactiveUserServerNotification]: true,
         [FeatureFlag.PushNotificationsWhenLocked]: true,
-        [FeatureFlag.PM14938_BrowserExtensionLoginApproval]: true,
       };
       return new BehaviorSubject(flagValueByFlag[flag] ?? false) as any;
     });
diff --git a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.spec.ts b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.spec.ts
index a7b608f5b56..b2aa4fbd315 100644
--- a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.spec.ts
+++ b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.spec.ts
@@ -11,7 +11,7 @@ import { Matrix } from "../../../../spec/matrix";
 import { AccountService } from "../../../auth/abstractions/account.service";
 import { AuthService } from "../../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../../auth/enums/authentication-status";
-import { NotificationType } from "../../../enums";
+import { NotificationType, PushNotificationLogOutReasonType } from "../../../enums";
 import { NotificationResponse } from "../../../models/response/notification.response";
 import { UserId } from "../../../types/guid";
 import { AppIdService } from "../../abstractions/app-id.service";
@@ -340,4 +340,56 @@ describe("NotificationsService", () => {
     expect(webPushNotificationConnectionService.supportStatus$).toHaveBeenCalledTimes(1);
     subscription.unsubscribe();
   });
+
+  describe("processNotification", () => {
+    beforeEach(async () => {
+      appIdService.getAppId.mockResolvedValue("test-app-id");
+      activeAccount.next({ id: mockUser1, email: "email", name: "Test Name", emailVerified: true });
+    });
+
+    describe("NotificationType.LogOut", () => {
+      it.each([
+        { featureFlagEnabled: false, reason: undefined },
+        { featureFlagEnabled: true, reason: undefined },
+        { featureFlagEnabled: false, reason: PushNotificationLogOutReasonType.KdfChange },
+      ])(
+        "should call logout callback when featureFlag=$featureFlagEnabled and reason=$reason",
+        async ({ featureFlagEnabled, reason }) => {
+          configService.getFeatureFlag$.mockReturnValue(of(featureFlagEnabled));
+
+          const payload: { UserId: UserId; Reason?: PushNotificationLogOutReasonType } = {
+            UserId: mockUser1,
+            Reason: undefined,
+          };
+          if (reason != null) {
+            payload.Reason = reason;
+          }
+
+          const notification = new NotificationResponse({
+            type: NotificationType.LogOut,
+            payload,
+            contextId: "different-app-id",
+          });
+
+          await sut["processNotification"](notification, mockUser1);
+
+          expect(logoutCallback).toHaveBeenCalledWith("logoutNotification", mockUser1);
+        },
+      );
+
+      it("should skip logout when receiving KDF change reason with feature flag enabled", async () => {
+        configService.getFeatureFlag$.mockReturnValue(of(true));
+
+        const notification = new NotificationResponse({
+          type: NotificationType.LogOut,
+          payload: { UserId: mockUser1, Reason: PushNotificationLogOutReasonType.KdfChange },
+          contextId: "different-app-id",
+        });
+
+        await sut["processNotification"](notification, mockUser1);
+
+        expect(logoutCallback).not.toHaveBeenCalled();
+      });
+    });
+  });
 });
diff --git a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
index e934dec185d..efe0a8ae408 100644
--- a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
+++ b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
@@ -22,8 +22,9 @@ import { trackedMerge } from "@bitwarden/common/platform/misc";
 import { AccountInfo, AccountService } from "../../../auth/abstractions/account.service";
 import { AuthService } from "../../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../../auth/enums/authentication-status";
-import { NotificationType } from "../../../enums";
+import { NotificationType, PushNotificationLogOutReasonType } from "../../../enums";
 import {
+  LogOutNotification,
   NotificationResponse,
   SyncCipherNotification,
   SyncFolderNotification,
@@ -263,10 +264,25 @@ export class DefaultServerNotificationsService implements ServerNotificationsSer
         this.activitySubject.next("inactive"); // Force a disconnect
         this.activitySubject.next("active"); // Allow a reconnect
         break;
-      case NotificationType.LogOut:
+      case NotificationType.LogOut: {
         this.logService.info("[Notifications Service] Received logout notification");
-        await this.logoutCallback("logoutNotification", userId);
+
+        const logOutNotification = notification.payload as LogOutNotification;
+        const noLogoutOnKdfChange = await firstValueFrom(
+          this.configService.getFeatureFlag$(FeatureFlag.NoLogoutOnKdfChange),
+        );
+        if (
+          noLogoutOnKdfChange &&
+          logOutNotification.reason === PushNotificationLogOutReasonType.KdfChange
+        ) {
+          this.logService.info(
+            "[Notifications Service] Skipping logout due to no logout KDF change",
+          );
+        } else {
+          await this.logoutCallback("logoutNotification", userId);
+        }
         break;
+      }
       case NotificationType.SyncSendCreate:
       case NotificationType.SyncSendUpdate:
         await this.syncService.syncUpsertSend(
@@ -278,16 +294,21 @@ export class DefaultServerNotificationsService implements ServerNotificationsSer
         await this.syncService.syncDeleteSend(notification.payload as SyncSendNotification);
         break;
       case NotificationType.AuthRequest:
-        if (
-          await firstValueFrom(
-            this.configService.getFeatureFlag$(FeatureFlag.PM14938_BrowserExtensionLoginApproval),
-          )
-        ) {
-          await this.authRequestAnsweringService.receivedPendingAuthRequest(
-            notification.payload.userId,
-            notification.payload.id,
-          );
-        }
+        await this.authRequestAnsweringService.receivedPendingAuthRequest(
+          notification.payload.userId,
+          notification.payload.id,
+        );
+
+        /**
+         * This call is necessary for Desktop, which for the time being uses a noop for the
+         * authRequestAnsweringService.receivedPendingAuthRequest() call just above. Desktop
+         * will eventually use the new AuthRequestAnsweringService, at which point we can remove
+         * this second call.
+         *
+         * The Extension AppComponent has logic (see processingPendingAuth) that only allows one
+         * pending auth request to process at a time, so this second call will not cause any
+         * duplicate processing conflicts on Extension.
+         */
         this.messagingService.send("openLoginApproval", {
           notificationId: notification.payload.id,
         });
diff --git a/libs/common/src/platform/server-notifications/internal/signalr-connection.service.ts b/libs/common/src/platform/server-notifications/internal/signalr-connection.service.ts
index 5998668f138..2a9e7fc7141 100644
--- a/libs/common/src/platform/server-notifications/internal/signalr-connection.service.ts
+++ b/libs/common/src/platform/server-notifications/internal/signalr-connection.service.ts
@@ -10,8 +10,10 @@ import { Observable, Subscription } from "rxjs";
 
 import { ApiService } from "../../../abstractions/api.service";
 import { NotificationResponse } from "../../../models/response/notification.response";
+import { InsecureUrlNotAllowedError } from "../../../services/api-errors";
 import { UserId } from "../../../types/guid";
 import { LogService } from "../../abstractions/log.service";
+import { PlatformUtilsService } from "../../abstractions/platform-utils.service";
 
 // 2 Minutes
 const MIN_RECONNECT_TIME = 2 * 60 * 1000;
@@ -69,12 +71,17 @@ export class SignalRConnectionService {
   constructor(
     private readonly apiService: ApiService,
     private readonly logService: LogService,
+    private readonly platformUtilsService: PlatformUtilsService,
     private readonly hubConnectionBuilderFactory: () => HubConnectionBuilder = () =>
       new HubConnectionBuilder(),
     private readonly timeoutManager: TimeoutManager = globalThis,
   ) {}
 
   connect$(userId: UserId, notificationsUrl: string) {
+    if (!notificationsUrl.startsWith("https://") && !this.platformUtilsService.isDev()) {
+      throw new InsecureUrlNotAllowedError();
+    }
+
     return new Observable<SignalRNotification>((subsciber) => {
       const connection = this.hubConnectionBuilderFactory()
         .withUrl(notificationsUrl + "/hub", {
diff --git a/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts b/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
index 31f6ce10e01..a58b2d470e6 100644
--- a/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
+++ b/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
@@ -27,8 +27,8 @@ export async function getCredentialsForAutofill(
         cipherId: cipher.id,
         credentialId: credId,
         rpId: credential.rpId,
-        userHandle: credential.userHandle,
-        userName: credential.userName,
-      };
+        userHandle: credential.userHandle!,
+        userName: credential.userName!,
+      } satisfies Fido2CredentialAutofillView;
     });
 }
diff --git a/libs/common/src/platform/services/i18n.service.ts b/libs/common/src/platform/services/i18n.service.ts
index 87c9e211ed1..e9396b907f2 100644
--- a/libs/common/src/platform/services/i18n.service.ts
+++ b/libs/common/src/platform/services/i18n.service.ts
@@ -29,7 +29,7 @@ export class I18nService extends TranslationService implements I18nServiceAbstra
     this.locale$ = this.userSetLocale$.pipe(map((locale) => locale ?? this.translationLocale));
   }
 
-  async setLocale(locale: string): Promise<void> {
+  async setLocale(locale: string | null): Promise<void> {
     await this.translationLocaleState.update(() => locale);
   }
 
diff --git a/libs/common/src/platform/services/key-state/user-key.state.ts b/libs/common/src/platform/services/key-state/user-key.state.ts
index 1b88554e53b..2416c211d6b 100644
--- a/libs/common/src/platform/services/key-state/user-key.state.ts
+++ b/libs/common/src/platform/services/key-state/user-key.state.ts
@@ -1,4 +1,5 @@
 import { EncryptedString } from "../../../key-management/crypto/models/enc-string";
+import { WrappedSigningKey } from "../../../key-management/types";
 import { UserKey } from "../../../types/key";
 import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { CRYPTO_DISK, CRYPTO_MEMORY, UserKeyDefinition } from "../../state";
@@ -25,3 +26,12 @@ export const USER_KEY = new UserKeyDefinition<UserKey>(CRYPTO_MEMORY, "userKey",
   deserializer: (obj) => SymmetricCryptoKey.fromJSON(obj) as UserKey,
   clearOn: ["logout", "lock"],
 });
+
+export const USER_KEY_ENCRYPTED_SIGNING_KEY = new UserKeyDefinition<WrappedSigningKey>(
+  CRYPTO_DISK,
+  "userSigningKey",
+  {
+    deserializer: (obj) => obj,
+    clearOn: ["logout"],
+  },
+);
diff --git a/libs/common/src/platform/services/sdk/default-sdk-client-factory.ts b/libs/common/src/platform/services/sdk/default-sdk-client-factory.ts
index fc55cc83ac8..d0e4b96ba89 100644
--- a/libs/common/src/platform/services/sdk/default-sdk-client-factory.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk-client-factory.ts
@@ -7,13 +7,13 @@ import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
  */
 export class DefaultSdkClientFactory implements SdkClientFactory {
   /**
-   * Initializes a Bitwarden client. Assumes the SDK is already loaded.
-   * @param args Bitwarden client constructor parameters
-   * @returns A BitwardenClient
+   * Initializes a Password Manager client. Assumes the SDK is already loaded.
+   * @param args Password Manager client constructor parameters
+   * @returns A PasswordManagerClient
    */
   async createSdkClient(
-    ...args: ConstructorParameters<typeof sdk.BitwardenClient>
-  ): Promise<sdk.BitwardenClient> {
-    return Promise.resolve(new sdk.BitwardenClient(...args));
+    ...args: ConstructorParameters<typeof sdk.PasswordManagerClient>
+  ): Promise<sdk.PasswordManagerClient> {
+    return Promise.resolve(new sdk.PasswordManagerClient(...args));
   }
 }
diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
index 2f6c32aa78d..dc945594079 100644
--- a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
@@ -1,22 +1,24 @@
 import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject, firstValueFrom, of } from "rxjs";
 
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
 // 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 { KdfConfigService, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
-import { BitwardenClient } from "@bitwarden/sdk-internal";
+import { PasswordManagerClient } from "@bitwarden/sdk-internal";
 
 import {
+  ObservableTracker,
   FakeAccountService,
   FakeStateProvider,
   mockAccountServiceWith,
-  ObservableTracker,
 } from "../../../../spec";
+import { ApiService } from "../../../abstractions/api.service";
 import { AccountInfo } from "../../../auth/abstractions/account.service";
 import { EncryptedString } from "../../../key-management/crypto/models/enc-string";
 import { UserId } from "../../../types/guid";
 import { UserKey } from "../../../types/key";
+import { ConfigService } from "../../abstractions/config/config.service";
 import { Environment, EnvironmentService } from "../../abstractions/environment.service";
 import { PlatformUtilsService } from "../../abstractions/platform-utils.service";
 import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
@@ -42,10 +44,12 @@ describe("DefaultSdkService", () => {
     let platformUtilsService!: MockProxy<PlatformUtilsService>;
     let kdfConfigService!: MockProxy<KdfConfigService>;
     let keyService!: MockProxy<KeyService>;
+    let securityStateService!: MockProxy<SecurityStateService>;
     let configService!: MockProxy<ConfigService>;
     let service!: DefaultSdkService;
     let accountService!: FakeAccountService;
     let fakeStateProvider!: FakeStateProvider;
+    let apiService!: MockProxy<ApiService>;
 
     beforeEach(async () => {
       await new TestSdkLoadService().loadAndInit();
@@ -55,6 +59,8 @@ describe("DefaultSdkService", () => {
       platformUtilsService = mock<PlatformUtilsService>();
       kdfConfigService = mock<KdfConfigService>();
       keyService = mock<KeyService>();
+      securityStateService = mock<SecurityStateService>();
+      apiService = mock<ApiService>();
       const mockUserId = Utils.newGuid() as UserId;
       accountService = mockAccountServiceWith(mockUserId);
       fakeStateProvider = new FakeStateProvider(accountService);
@@ -72,6 +78,8 @@ describe("DefaultSdkService", () => {
         accountService,
         kdfConfigService,
         keyService,
+        securityStateService,
+        apiService,
         fakeStateProvider,
         configService,
       );
@@ -96,10 +104,12 @@ describe("DefaultSdkService", () => {
           .calledWith(userId)
           .mockReturnValue(of("private-key" as EncryptedString));
         keyService.encryptedOrgKeys$.calledWith(userId).mockReturnValue(of({}));
+        keyService.userSigningKey$.calledWith(userId).mockReturnValue(of(null));
+        securityStateService.accountSecurityState$.calledWith(userId).mockReturnValue(of(null));
       });
 
       describe("given no client override has been set for the user", () => {
-        let mockClient!: MockProxy<BitwardenClient>;
+        let mockClient!: MockProxy<PasswordManagerClient>;
 
         beforeEach(() => {
           mockClient = createMockClient();
@@ -113,8 +123,8 @@ describe("DefaultSdkService", () => {
         });
 
         it("does not create an SDK client when called the second time with same userId", async () => {
-          const subject_1 = new BehaviorSubject<Rc<BitwardenClient> | undefined>(undefined);
-          const subject_2 = new BehaviorSubject<Rc<BitwardenClient> | undefined>(undefined);
+          const subject_1 = new BehaviorSubject<Rc<PasswordManagerClient> | undefined>(undefined);
+          const subject_2 = new BehaviorSubject<Rc<PasswordManagerClient> | undefined>(undefined);
 
           // Use subjects to ensure the subscription is kept alive
           service.userClient$(userId).subscribe(subject_1);
@@ -129,8 +139,8 @@ describe("DefaultSdkService", () => {
         });
 
         it("destroys the internal SDK client when all subscriptions are closed", async () => {
-          const subject_1 = new BehaviorSubject<Rc<BitwardenClient> | undefined>(undefined);
-          const subject_2 = new BehaviorSubject<Rc<BitwardenClient> | undefined>(undefined);
+          const subject_1 = new BehaviorSubject<Rc<PasswordManagerClient> | undefined>(undefined);
+          const subject_2 = new BehaviorSubject<Rc<PasswordManagerClient> | undefined>(undefined);
           const subscription_1 = service.userClient$(userId).subscribe(subject_1);
           const subscription_2 = service.userClient$(userId).subscribe(subject_2);
           await new Promise(process.nextTick);
@@ -160,7 +170,7 @@ describe("DefaultSdkService", () => {
 
       describe("given overrides are used", () => {
         it("does not create a new client and emits the override client when a client override has already been set ", async () => {
-          const mockClient = mock<BitwardenClient>();
+          const mockClient = mock<PasswordManagerClient>();
           service.setClient(userId, mockClient);
           const userClientTracker = new ObservableTracker(service.userClient$(userId), false);
           await userClientTracker.pauseUntilReceived(1);
@@ -232,13 +242,14 @@ describe("DefaultSdkService", () => {
   });
 });
 
-function createMockClient(): MockProxy<BitwardenClient> {
-  const client = mock<BitwardenClient>();
+function createMockClient(): MockProxy<PasswordManagerClient> {
+  const client = mock<PasswordManagerClient>();
   client.crypto.mockReturnValue(mock());
   client.platform.mockReturnValue({
     state: jest.fn().mockReturnValue(mock()),
+    load_flags: jest.fn().mockReturnValue(mock()),
     free: mock(),
-    load_flags: jest.fn(),
+    [Symbol.dispose]: jest.fn(),
   });
   return client;
 }
diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.ts b/libs/common/src/platform/services/sdk/default-sdk.service.ts
index 2713aaf8f4b..6e7bcbb197d 100644
--- a/libs/common/src/platform/services/sdk/default-sdk.service.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk.service.ts
@@ -20,30 +20,36 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 // eslint-disable-next-line no-restricted-imports
 import { KeyService, KdfConfigService, KdfConfig, KdfType } from "@bitwarden/key-management";
 import {
-  BitwardenClient,
+  PasswordManagerClient,
   ClientSettings,
-  DeviceType as SdkDeviceType,
   TokenProvider,
   UnsignedSharedKey,
 } from "@bitwarden/sdk-internal";
 
+import { ApiService } from "../../../abstractions/api.service";
 import { AccountInfo, AccountService } from "../../../auth/abstractions/account.service";
-import { DeviceType } from "../../../enums/device-type.enum";
 import { EncryptedString, EncString } from "../../../key-management/crypto/models/enc-string";
+import { SecurityStateService } from "../../../key-management/security-state/abstractions/security-state.service";
+import { SignedSecurityState, WrappedSigningKey } from "../../../key-management/types";
 import { OrganizationId, UserId } from "../../../types/guid";
 import { UserKey } from "../../../types/key";
 import { Environment, EnvironmentService } from "../../abstractions/environment.service";
 import { PlatformUtilsService } from "../../abstractions/platform-utils.service";
 import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
 import { SdkLoadService } from "../../abstractions/sdk/sdk-load.service";
-import { asUuid, SdkService, UserNotLoggedInError } from "../../abstractions/sdk/sdk.service";
+import {
+  asUuid,
+  SdkService,
+  toSdkDevice,
+  UserNotLoggedInError,
+} from "../../abstractions/sdk/sdk.service";
 import { compareValues } from "../../misc/compare-values";
 import { Rc } from "../../misc/reference-counting/rc";
 import { StateProvider } from "../../state";
 
 import { initializeState } from "./client-managed-state";
 
-// A symbol that represents an overriden client that is explicitly set to undefined,
+// A symbol that represents an overridden client that is explicitly set to undefined,
 // blocking the creation of an internal client for that user.
 const UnsetClient = Symbol("UnsetClient");
 
@@ -51,24 +57,34 @@ const UnsetClient = Symbol("UnsetClient");
  * A token provider that exposes the access token to the SDK.
  */
 class JsTokenProvider implements TokenProvider {
-  constructor() {}
+  constructor(
+    private apiService: ApiService,
+    private userId?: UserId,
+  ) {}
 
   async get_access_token(): Promise<string | undefined> {
-    return undefined;
+    if (this.userId == null) {
+      return undefined;
+    }
+
+    return await this.apiService.getActiveBearerToken(this.userId);
   }
 }
 
 export class DefaultSdkService implements SdkService {
   private sdkClientOverrides = new BehaviorSubject<{
-    [userId: UserId]: Rc<BitwardenClient> | typeof UnsetClient;
+    [userId: UserId]: Rc<PasswordManagerClient> | typeof UnsetClient;
   }>({});
-  private sdkClientCache = new Map<UserId, Observable<Rc<BitwardenClient>>>();
+  private sdkClientCache = new Map<UserId, Observable<Rc<PasswordManagerClient>>>();
 
   client$ = this.environmentService.environment$.pipe(
     concatMap(async (env) => {
       await SdkLoadService.Ready;
       const settings = this.toSettings(env);
-      const client = await this.sdkClientFactory.createSdkClient(new JsTokenProvider(), settings);
+      const client = await this.sdkClientFactory.createSdkClient(
+        new JsTokenProvider(this.apiService),
+        settings,
+      );
       await this.loadFeatureFlags(client);
       return client;
     }),
@@ -87,19 +103,21 @@ export class DefaultSdkService implements SdkService {
     private accountService: AccountService,
     private kdfConfigService: KdfConfigService,
     private keyService: KeyService,
+    private securityStateService: SecurityStateService,
+    private apiService: ApiService,
     private stateProvider: StateProvider,
     private configService: ConfigService,
     private userAgent: string | null = null,
   ) {}
 
-  userClient$(userId: UserId): Observable<Rc<BitwardenClient>> {
+  userClient$(userId: UserId): Observable<Rc<PasswordManagerClient>> {
     return this.sdkClientOverrides.pipe(
       takeWhile((clients) => clients[userId] !== UnsetClient, false),
       map((clients) => {
         if (clients[userId] === UnsetClient) {
           throw new Error("Encountered UnsetClient even though it should have been filtered out");
         }
-        return clients[userId] as Rc<BitwardenClient>;
+        return clients[userId] as Rc<PasswordManagerClient>;
       }),
       distinctUntilChanged(),
       switchMap((clientOverride) => {
@@ -114,7 +132,7 @@ export class DefaultSdkService implements SdkService {
     );
   }
 
-  setClient(userId: UserId, client: BitwardenClient | undefined) {
+  setClient(userId: UserId, client: PasswordManagerClient | undefined) {
     const previousValue = this.sdkClientOverrides.value[userId];
 
     this.sdkClientOverrides.next({
@@ -134,7 +152,7 @@ export class DefaultSdkService implements SdkService {
    * @param userId The user id for which to create the client
    * @returns An observable that emits the client for the user
    */
-  private internalClient$(userId: UserId): Observable<Rc<BitwardenClient>> {
+  private internalClient$(userId: UserId): Observable<Rc<PasswordManagerClient>> {
     const cached = this.sdkClientCache.get(userId);
     if (cached !== undefined) {
       return cached;
@@ -148,10 +166,14 @@ export class DefaultSdkService implements SdkService {
     const privateKey$ = this.keyService
       .userEncryptedPrivateKey$(userId)
       .pipe(distinctUntilChanged());
+    const signingKey$ = this.keyService.userSigningKey$(userId).pipe(distinctUntilChanged());
     const userKey$ = this.keyService.userKey$(userId).pipe(distinctUntilChanged());
     const orgKeys$ = this.keyService.encryptedOrgKeys$(userId).pipe(
       distinctUntilChanged(compareValues), // The upstream observable emits different objects with the same values
     );
+    const securityState$ = this.securityStateService
+      .accountSecurityState$(userId)
+      .pipe(distinctUntilChanged(compareValues));
 
     const client$ = combineLatest([
       this.environmentService.getEnvironment$(userId),
@@ -159,51 +181,57 @@ export class DefaultSdkService implements SdkService {
       kdfParams$,
       privateKey$,
       userKey$,
+      signingKey$,
       orgKeys$,
+      securityState$,
       SdkLoadService.Ready, // Makes sure we wait (once) for the SDK to be loaded
     ]).pipe(
       // switchMap is required to allow the clean-up logic to be executed when `combineLatest` emits a new value.
-      switchMap(([env, account, kdfParams, privateKey, userKey, orgKeys]) => {
-        // Create our own observable to be able to implement clean-up logic
-        return new Observable<Rc<BitwardenClient>>((subscriber) => {
-          const createAndInitializeClient = async () => {
-            if (env == null || kdfParams == null || privateKey == null || userKey == null) {
-              return undefined;
-            }
+      switchMap(
+        ([env, account, kdfParams, privateKey, userKey, signingKey, orgKeys, securityState]) => {
+          // Create our own observable to be able to implement clean-up logic
+          return new Observable<Rc<PasswordManagerClient>>((subscriber) => {
+            const createAndInitializeClient = async () => {
+              if (env == null || kdfParams == null || privateKey == null || userKey == null) {
+                return undefined;
+              }
 
-            const settings = this.toSettings(env);
-            const client = await this.sdkClientFactory.createSdkClient(
-              new JsTokenProvider(),
-              settings,
-            );
+              const settings = this.toSettings(env);
+              const client = await this.sdkClientFactory.createSdkClient(
+                new JsTokenProvider(this.apiService, userId),
+                settings,
+              );
 
-            await this.initializeClient(
-              userId,
-              client,
-              account,
-              kdfParams,
-              privateKey,
-              userKey,
-              orgKeys,
-            );
+              await this.initializeClient(
+                userId,
+                client,
+                account,
+                kdfParams,
+                privateKey,
+                userKey,
+                signingKey,
+                securityState,
+                orgKeys,
+              );
 
-            return client;
-          };
+              return client;
+            };
 
-          let client: Rc<BitwardenClient> | undefined;
-          createAndInitializeClient()
-            .then((c) => {
-              client = c === undefined ? undefined : new Rc(c);
+            let client: Rc<PasswordManagerClient> | undefined;
+            createAndInitializeClient()
+              .then((c) => {
+                client = c === undefined ? undefined : new Rc(c);
 
-              subscriber.next(client);
-            })
-            .catch((e) => {
-              subscriber.error(e);
-            });
+                subscriber.next(client);
+              })
+              .catch((e) => {
+                subscriber.error(e);
+              });
 
-          return () => client?.markForDisposal();
-        });
-      }),
+            return () => client?.markForDisposal();
+          });
+        },
+      ),
       tap({ finalize: () => this.sdkClientCache.delete(userId) }),
       shareReplay({ refCount: true, bufferSize: 1 }),
     );
@@ -214,11 +242,13 @@ export class DefaultSdkService implements SdkService {
 
   private async initializeClient(
     userId: UserId,
-    client: BitwardenClient,
+    client: PasswordManagerClient,
     account: AccountInfo,
     kdfParams: KdfConfig,
     privateKey: EncryptedString,
     userKey: UserKey,
+    signingKey: WrappedSigningKey | null,
+    securityState: SignedSecurityState | null,
     orgKeys: Record<OrganizationId, EncString>,
   ) {
     await client.crypto().initialize_user_crypto({
@@ -236,8 +266,8 @@ export class DefaultSdkService implements SdkService {
               },
             },
       privateKey,
-      signingKey: undefined,
-      securityState: undefined,
+      signingKey: signingKey || undefined,
+      securityState: securityState || undefined,
     });
 
     // We initialize the org crypto even if the org_keys are
@@ -254,7 +284,7 @@ export class DefaultSdkService implements SdkService {
     await this.loadFeatureFlags(client);
   }
 
-  private async loadFeatureFlags(client: BitwardenClient) {
+  private async loadFeatureFlags(client: PasswordManagerClient) {
     const serverConfig = await firstValueFrom(this.configService.serverConfig$);
 
     const featureFlagMap = new Map(
@@ -270,65 +300,8 @@ export class DefaultSdkService implements SdkService {
     return {
       apiUrl: env.getApiUrl(),
       identityUrl: env.getIdentityUrl(),
-      deviceType: this.toDevice(this.platformUtilsService.getDevice()),
+      deviceType: toSdkDevice(this.platformUtilsService.getDevice()),
       userAgent: this.userAgent ?? navigator.userAgent,
     };
   }
-
-  private toDevice(device: DeviceType): SdkDeviceType {
-    switch (device) {
-      case DeviceType.Android:
-        return "Android";
-      case DeviceType.iOS:
-        return "iOS";
-      case DeviceType.ChromeExtension:
-        return "ChromeExtension";
-      case DeviceType.FirefoxExtension:
-        return "FirefoxExtension";
-      case DeviceType.OperaExtension:
-        return "OperaExtension";
-      case DeviceType.EdgeExtension:
-        return "EdgeExtension";
-      case DeviceType.WindowsDesktop:
-        return "WindowsDesktop";
-      case DeviceType.MacOsDesktop:
-        return "MacOsDesktop";
-      case DeviceType.LinuxDesktop:
-        return "LinuxDesktop";
-      case DeviceType.ChromeBrowser:
-        return "ChromeBrowser";
-      case DeviceType.FirefoxBrowser:
-        return "FirefoxBrowser";
-      case DeviceType.OperaBrowser:
-        return "OperaBrowser";
-      case DeviceType.EdgeBrowser:
-        return "EdgeBrowser";
-      case DeviceType.IEBrowser:
-        return "IEBrowser";
-      case DeviceType.UnknownBrowser:
-        return "UnknownBrowser";
-      case DeviceType.AndroidAmazon:
-        return "AndroidAmazon";
-      case DeviceType.UWP:
-        return "UWP";
-      case DeviceType.SafariBrowser:
-        return "SafariBrowser";
-      case DeviceType.VivaldiBrowser:
-        return "VivaldiBrowser";
-      case DeviceType.VivaldiExtension:
-        return "VivaldiExtension";
-      case DeviceType.SafariExtension:
-        return "SafariExtension";
-      case DeviceType.Server:
-        return "Server";
-      case DeviceType.WindowsCLI:
-        return "WindowsCLI";
-      case DeviceType.MacOsCLI:
-        return "MacOsCLI";
-      case DeviceType.LinuxCLI:
-        return "LinuxCLI";
-      default:
-        return "SDK";
-    }
-  }
 }
diff --git a/libs/common/src/platform/services/sdk/noop-sdk-client-factory.ts b/libs/common/src/platform/services/sdk/noop-sdk-client-factory.ts
index d7eab7e8dc9..8ed0bc276cc 100644
--- a/libs/common/src/platform/services/sdk/noop-sdk-client-factory.ts
+++ b/libs/common/src/platform/services/sdk/noop-sdk-client-factory.ts
@@ -1,4 +1,4 @@
-import type { BitwardenClient } from "@bitwarden/sdk-internal";
+import type { PasswordManagerClient } from "@bitwarden/sdk-internal";
 
 import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
 
@@ -9,8 +9,8 @@ import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
  */
 export class NoopSdkClientFactory implements SdkClientFactory {
   createSdkClient(
-    ...args: ConstructorParameters<typeof BitwardenClient>
-  ): Promise<BitwardenClient> {
+    ...args: ConstructorParameters<typeof PasswordManagerClient>
+  ): Promise<PasswordManagerClient> {
     return Promise.reject(new Error("SDK not available"));
   }
 }
diff --git a/libs/common/src/platform/services/sdk/register-sdk.service.spec.ts b/libs/common/src/platform/services/sdk/register-sdk.service.spec.ts
new file mode 100644
index 00000000000..0a05ac8dbf4
--- /dev/null
+++ b/libs/common/src/platform/services/sdk/register-sdk.service.spec.ts
@@ -0,0 +1,170 @@
+import { mock, MockProxy } from "jest-mock-extended";
+import { BehaviorSubject, firstValueFrom, of } from "rxjs";
+
+import { BitwardenClient } from "@bitwarden/sdk-internal";
+
+import {
+  ObservableTracker,
+  FakeAccountService,
+  FakeStateProvider,
+  mockAccountServiceWith,
+} from "../../../../spec";
+import { ApiService } from "../../../abstractions/api.service";
+import { AccountInfo } from "../../../auth/abstractions/account.service";
+import { UserId } from "../../../types/guid";
+import { ConfigService } from "../../abstractions/config/config.service";
+import { Environment, EnvironmentService } from "../../abstractions/environment.service";
+import { PlatformUtilsService } from "../../abstractions/platform-utils.service";
+import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
+import { SdkLoadService } from "../../abstractions/sdk/sdk-load.service";
+import { UserNotLoggedInError } from "../../abstractions/sdk/sdk.service";
+import { Rc } from "../../misc/reference-counting/rc";
+import { Utils } from "../../misc/utils";
+
+import { DefaultRegisterSdkService } from "./register-sdk.service";
+
+class TestSdkLoadService extends SdkLoadService {
+  protected override load(): Promise<void> {
+    // Simulate successful WASM load
+    return Promise.resolve();
+  }
+}
+
+describe("DefaultRegisterSdkService", () => {
+  describe("userClient$", () => {
+    let sdkClientFactory!: MockProxy<SdkClientFactory>;
+    let environmentService!: MockProxy<EnvironmentService>;
+    let platformUtilsService!: MockProxy<PlatformUtilsService>;
+    let configService!: MockProxy<ConfigService>;
+    let service!: DefaultRegisterSdkService;
+    let accountService!: FakeAccountService;
+    let fakeStateProvider!: FakeStateProvider;
+    let apiService!: MockProxy<ApiService>;
+
+    beforeEach(async () => {
+      await new TestSdkLoadService().loadAndInit();
+
+      sdkClientFactory = mock<SdkClientFactory>();
+      environmentService = mock<EnvironmentService>();
+      platformUtilsService = mock<PlatformUtilsService>();
+      apiService = mock<ApiService>();
+      const mockUserId = Utils.newGuid() as UserId;
+      accountService = mockAccountServiceWith(mockUserId);
+      fakeStateProvider = new FakeStateProvider(accountService);
+      configService = mock<ConfigService>();
+
+      configService.serverConfig$ = new BehaviorSubject(null);
+
+      // Can't use `of(mock<Environment>())` for some reason
+      environmentService.environment$ = new BehaviorSubject(mock<Environment>());
+
+      service = new DefaultRegisterSdkService(
+        sdkClientFactory,
+        environmentService,
+        platformUtilsService,
+        accountService,
+        apiService,
+        fakeStateProvider,
+        configService,
+      );
+    });
+
+    describe("given the user is logged in", () => {
+      const userId = "0da62ebd-98bb-4f42-a846-64e8555087d7" as UserId;
+      beforeEach(() => {
+        environmentService.getEnvironment$
+          .calledWith(userId)
+          .mockReturnValue(new BehaviorSubject(mock<Environment>()));
+        accountService.accounts$ = of({
+          [userId]: { email: "email", emailVerified: true, name: "name" } as AccountInfo,
+        });
+      });
+
+      let mockClient!: MockProxy<BitwardenClient>;
+
+      beforeEach(() => {
+        mockClient = createMockClient();
+        sdkClientFactory.createSdkClient.mockResolvedValue(mockClient);
+      });
+
+      it("creates an internal SDK client when called the first time", async () => {
+        await firstValueFrom(service.registerClient$(userId));
+
+        expect(sdkClientFactory.createSdkClient).toHaveBeenCalled();
+      });
+
+      it("does not create an SDK client when called the second time with same userId", async () => {
+        const subject_1 = new BehaviorSubject<Rc<BitwardenClient> | undefined>(undefined);
+        const subject_2 = new BehaviorSubject<Rc<BitwardenClient> | undefined>(undefined);
+
+        // Use subjects to ensure the subscription is kept alive
+        service.registerClient$(userId).subscribe(subject_1);
+        service.registerClient$(userId).subscribe(subject_2);
+
+        // Wait for the next tick to ensure all async operations are done
+        await new Promise(process.nextTick);
+
+        expect(subject_1.value.take().value).toBe(mockClient);
+        expect(subject_2.value.take().value).toBe(mockClient);
+        expect(sdkClientFactory.createSdkClient).toHaveBeenCalledTimes(1);
+      });
+
+      it("destroys the internal SDK client when all subscriptions are closed", async () => {
+        const subject_1 = new BehaviorSubject<Rc<BitwardenClient> | undefined>(undefined);
+        const subject_2 = new BehaviorSubject<Rc<BitwardenClient> | undefined>(undefined);
+        const subscription_1 = service.registerClient$(userId).subscribe(subject_1);
+        const subscription_2 = service.registerClient$(userId).subscribe(subject_2);
+        await new Promise(process.nextTick);
+
+        subscription_1.unsubscribe();
+        subscription_2.unsubscribe();
+
+        await new Promise(process.nextTick);
+        expect(mockClient.free).toHaveBeenCalledTimes(1);
+      });
+
+      it("destroys the internal SDK client when the account is removed (logout)", async () => {
+        const accounts$ = new BehaviorSubject({
+          [userId]: { email: "email", emailVerified: true, name: "name" } as AccountInfo,
+        });
+        accountService.accounts$ = accounts$;
+
+        const userClientTracker = new ObservableTracker(service.registerClient$(userId), false);
+        await userClientTracker.pauseUntilReceived(1);
+
+        accounts$.next({});
+        await userClientTracker.expectCompletion();
+
+        expect(mockClient.free).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe("given the user is not logged in", () => {
+      const userId = "0da62ebd-98bb-4f42-a846-64e8555087d7" as UserId;
+
+      beforeEach(() => {
+        environmentService.getEnvironment$
+          .calledWith(userId)
+          .mockReturnValue(new BehaviorSubject(mock<Environment>()));
+        accountService.accounts$ = of({});
+      });
+
+      it("throws UserNotLoggedInError when user has no account", async () => {
+        const result = () => firstValueFrom(service.registerClient$(userId));
+
+        await expect(result).rejects.toThrow(UserNotLoggedInError);
+      });
+    });
+  });
+});
+
+function createMockClient(): MockProxy<BitwardenClient> {
+  const client = mock<BitwardenClient>();
+  client.platform.mockReturnValue({
+    state: jest.fn().mockReturnValue(mock()),
+    load_flags: jest.fn().mockReturnValue(mock()),
+    free: mock(),
+    [Symbol.dispose]: jest.fn(),
+  });
+  return client;
+}
diff --git a/libs/common/src/platform/services/sdk/register-sdk.service.ts b/libs/common/src/platform/services/sdk/register-sdk.service.ts
new file mode 100644
index 00000000000..a222807640f
--- /dev/null
+++ b/libs/common/src/platform/services/sdk/register-sdk.service.ts
@@ -0,0 +1,196 @@
+import {
+  combineLatest,
+  concatMap,
+  Observable,
+  shareReplay,
+  map,
+  distinctUntilChanged,
+  tap,
+  switchMap,
+  BehaviorSubject,
+  of,
+  takeWhile,
+  throwIfEmpty,
+  firstValueFrom,
+} from "rxjs";
+
+import { PasswordManagerClient, ClientSettings, TokenProvider } from "@bitwarden/sdk-internal";
+
+import { ApiService } from "../../../abstractions/api.service";
+import { AccountService } from "../../../auth/abstractions/account.service";
+import { ConfigService } from "../../../platform/abstractions/config/config.service";
+import { UserId } from "../../../types/guid";
+import { Environment, EnvironmentService } from "../../abstractions/environment.service";
+import { PlatformUtilsService } from "../../abstractions/platform-utils.service";
+import { RegisterSdkService } from "../../abstractions/sdk/register-sdk.service";
+import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
+import { SdkLoadService } from "../../abstractions/sdk/sdk-load.service";
+import { toSdkDevice, UserNotLoggedInError } from "../../abstractions/sdk/sdk.service";
+import { Rc } from "../../misc/reference-counting/rc";
+import { StateProvider } from "../../state";
+
+import { initializeState } from "./client-managed-state";
+
+// A symbol that represents an overridden client that is explicitly set to undefined,
+// blocking the creation of an internal client for that user.
+const UnsetClient = Symbol("UnsetClient");
+
+/**
+ * A token provider that exposes the access token to the SDK.
+ */
+class JsTokenProvider implements TokenProvider {
+  constructor(
+    private apiService: ApiService,
+    private userId?: UserId,
+  ) {}
+
+  async get_access_token(): Promise<string | undefined> {
+    if (this.userId == null) {
+      return undefined;
+    }
+
+    return await this.apiService.getActiveBearerToken(this.userId);
+  }
+}
+
+export class DefaultRegisterSdkService implements RegisterSdkService {
+  private sdkClientOverrides = new BehaviorSubject<{
+    [userId: UserId]: Rc<PasswordManagerClient> | typeof UnsetClient;
+  }>({});
+  private sdkClientCache = new Map<UserId, Observable<Rc<PasswordManagerClient>>>();
+
+  client$ = this.environmentService.environment$.pipe(
+    concatMap(async (env) => {
+      await SdkLoadService.Ready;
+      const settings = this.toSettings(env);
+      const client = await this.sdkClientFactory.createSdkClient(
+        new JsTokenProvider(this.apiService),
+        settings,
+      );
+      await this.loadFeatureFlags(client);
+      return client;
+    }),
+    shareReplay({ refCount: true, bufferSize: 1 }),
+  );
+
+  constructor(
+    private sdkClientFactory: SdkClientFactory,
+    private environmentService: EnvironmentService,
+    private platformUtilsService: PlatformUtilsService,
+    private accountService: AccountService,
+    private apiService: ApiService,
+    private stateProvider: StateProvider,
+    private configService: ConfigService,
+    private userAgent: string | null = null,
+  ) {}
+
+  registerClient$(userId: UserId): Observable<Rc<PasswordManagerClient>> {
+    return this.sdkClientOverrides.pipe(
+      takeWhile((clients) => clients[userId] !== UnsetClient, false),
+      map((clients) => {
+        if (clients[userId] === UnsetClient) {
+          throw new Error("Encountered UnsetClient even though it should have been filtered out");
+        }
+        return clients[userId] as Rc<PasswordManagerClient>;
+      }),
+      distinctUntilChanged(),
+      switchMap((clientOverride) => {
+        if (clientOverride) {
+          return of(clientOverride);
+        }
+
+        return this.internalClient$(userId);
+      }),
+      takeWhile((client) => client !== undefined, false),
+      throwIfEmpty(() => new UserNotLoggedInError(userId)),
+    );
+  }
+
+  /**
+   * This method is used to create a client for a specific user by using the existing state of the application.
+   * This client is token-only and does not initialize any encryption keys.
+   * @param userId The user id for which to create the client
+   * @returns An observable that emits the client for the user
+   */
+  private internalClient$(userId: UserId): Observable<Rc<PasswordManagerClient>> {
+    const cached = this.sdkClientCache.get(userId);
+    if (cached !== undefined) {
+      return cached;
+    }
+
+    const account$ = this.accountService.accounts$.pipe(
+      map((accounts) => accounts[userId]),
+      distinctUntilChanged(),
+    );
+
+    const client$ = combineLatest([
+      this.environmentService.getEnvironment$(userId),
+      account$,
+      SdkLoadService.Ready, // Makes sure we wait (once) for the SDK to be loaded
+    ]).pipe(
+      // switchMap is required to allow the clean-up logic to be executed when `combineLatest` emits a new value.
+      switchMap(([env, account]) => {
+        // Create our own observable to be able to implement clean-up logic
+        return new Observable<Rc<PasswordManagerClient>>((subscriber) => {
+          const createAndInitializeClient = async () => {
+            if (env == null || account == null) {
+              return undefined;
+            }
+
+            const settings = this.toSettings(env);
+            const client = await this.sdkClientFactory.createSdkClient(
+              new JsTokenProvider(this.apiService, userId),
+              settings,
+            );
+
+            // Initialize the SDK managed database and the client managed repositories.
+            await initializeState(userId, client.platform().state(), this.stateProvider);
+
+            await this.loadFeatureFlags(client);
+
+            return client;
+          };
+
+          let client: Rc<PasswordManagerClient> | undefined;
+          createAndInitializeClient()
+            .then((c) => {
+              client = c === undefined ? undefined : new Rc(c);
+
+              subscriber.next(client);
+            })
+            .catch((e) => {
+              subscriber.error(e);
+            });
+
+          return () => client?.markForDisposal();
+        });
+      }),
+      tap({ finalize: () => this.sdkClientCache.delete(userId) }),
+      shareReplay({ refCount: true, bufferSize: 1 }),
+    );
+
+    this.sdkClientCache.set(userId, client$);
+    return client$;
+  }
+
+  private async loadFeatureFlags(client: PasswordManagerClient) {
+    const serverConfig = await firstValueFrom(this.configService.serverConfig$);
+
+    const featureFlagMap = new Map(
+      Object.entries(serverConfig?.featureStates ?? {})
+        .filter(([, value]) => typeof value === "boolean") // The SDK only supports boolean feature flags at this time
+        .map(([key, value]) => [key, value] as [string, boolean]),
+    );
+
+    client.platform().load_flags(featureFlagMap);
+  }
+
+  private toSettings(env: Environment): ClientSettings {
+    return {
+      apiUrl: env.getApiUrl(),
+      identityUrl: env.getIdentityUrl(),
+      deviceType: toSdkDevice(this.platformUtilsService.getDevice()),
+      userAgent: this.userAgent ?? navigator.userAgent,
+    };
+  }
+}
diff --git a/libs/common/src/platform/spec/mock-sdk.service.ts b/libs/common/src/platform/spec/mock-sdk.service.ts
index 66a6ab3ec84..aec2438c853 100644
--- a/libs/common/src/platform/spec/mock-sdk.service.ts
+++ b/libs/common/src/platform/spec/mock-sdk.service.ts
@@ -7,7 +7,7 @@ import {
   throwIfEmpty,
 } from "rxjs";
 
-import { BitwardenClient } from "@bitwarden/sdk-internal";
+import { PasswordManagerClient } from "@bitwarden/sdk-internal";
 
 import { UserId } from "../../types/guid";
 import { SdkService, UserNotLoggedInError } from "../abstractions/sdk/sdk.service";
@@ -17,18 +17,18 @@ import { DeepMockProxy, mockDeep } from "./mock-deep";
 
 export class MockSdkService implements SdkService {
   private userClients$ = new BehaviorSubject<{
-    [userId: UserId]: Rc<BitwardenClient> | undefined;
+    [userId: UserId]: Rc<PasswordManagerClient> | undefined;
   }>({});
 
-  private _client$ = new BehaviorSubject(mockDeep<BitwardenClient>());
+  private _client$ = new BehaviorSubject(mockDeep<PasswordManagerClient>());
   client$ = this._client$.asObservable();
 
   version$ = new BehaviorSubject("0.0.1-test").asObservable();
 
-  userClient$(userId: UserId): Observable<Rc<BitwardenClient>> {
+  userClient$(userId: UserId): Observable<Rc<PasswordManagerClient>> {
     return this.userClients$.pipe(
       takeWhile((clients) => clients[userId] !== undefined, false),
-      map((clients) => clients[userId] as Rc<BitwardenClient>),
+      map((clients) => clients[userId] as Rc<PasswordManagerClient>),
       distinctUntilChanged(),
       throwIfEmpty(() => new UserNotLoggedInError(userId)),
     );
@@ -42,7 +42,7 @@ export class MockSdkService implements SdkService {
    * Returns the non-user scoped client mock.
    * This is what is returned by the `client$` observable.
    */
-  get client(): DeepMockProxy<BitwardenClient> {
+  get client(): DeepMockProxy<PasswordManagerClient> {
     return this._client$.value;
   }
 
@@ -55,7 +55,7 @@ export class MockSdkService implements SdkService {
      * @returns A user-scoped mock for the user.
      */
     userLogin: (userId: UserId) => {
-      const client = mockDeep<BitwardenClient>();
+      const client = mockDeep<PasswordManagerClient>();
       this.userClients$.next({
         ...this.userClients$.getValue(),
         [userId]: new Rc(client),
diff --git a/libs/common/src/platform/sync/default-sync.service.spec.ts b/libs/common/src/platform/sync/default-sync.service.spec.ts
index 3c3e1c3677f..621033ced65 100644
--- a/libs/common/src/platform/sync/default-sync.service.spec.ts
+++ b/libs/common/src/platform/sync/default-sync.service.spec.ts
@@ -11,9 +11,11 @@ import {
   UserDecryptionOptions,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
 // 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, PBKDF2KdfConfig } from "@bitwarden/key-management";
+import { KdfConfigService, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
 
 import { Matrix } from "../../../spec/matrix";
 import { ApiService } from "../../abstractions/api.service";
@@ -72,6 +74,8 @@ describe("DefaultSyncService", () => {
   let tokenService: MockProxy<TokenService>;
   let authService: MockProxy<AuthService>;
   let stateProvider: MockProxy<StateProvider>;
+  let securityStateService: MockProxy<SecurityStateService>;
+  let kdfConfigService: MockProxy<KdfConfigService>;
 
   let sut: DefaultSyncService;
 
@@ -101,6 +105,8 @@ describe("DefaultSyncService", () => {
     tokenService = mock();
     authService = mock();
     stateProvider = mock();
+    securityStateService = mock();
+    kdfConfigService = mock();
 
     sut = new DefaultSyncService(
       masterPasswordAbstraction,
@@ -127,6 +133,8 @@ describe("DefaultSyncService", () => {
       tokenService,
       authService,
       stateProvider,
+      securityStateService,
+      kdfConfigService,
     );
   });
 
@@ -155,6 +163,142 @@ describe("DefaultSyncService", () => {
       stateProvider.getUser.mockReturnValue(mock());
     });
 
+    it("sets the correct keys for a V1 user with old response model", async () => {
+      const v1Profile = {
+        id: user1,
+        key: "encryptedUserKey",
+        privateKey: "privateKey",
+        providers: [] as any[],
+        organizations: [] as any[],
+        providerOrganizations: [] as any[],
+        avatarColor: "#fff",
+        securityStamp: "stamp",
+        emailVerified: true,
+        verifyDevices: false,
+        premiumPersonally: false,
+        premiumFromOrganization: false,
+        usesKeyConnector: false,
+      };
+      apiService.getSync.mockResolvedValue(
+        new SyncResponse({
+          profile: v1Profile,
+          folders: [],
+          collections: [],
+          ciphers: [],
+          sends: [],
+          domains: [],
+          policies: [],
+        }),
+      );
+      await sut.fullSync(true);
+      expect(masterPasswordAbstraction.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+        new EncString("encryptedUserKey"),
+        user1,
+      );
+      expect(keyService.setPrivateKey).toHaveBeenCalledWith("privateKey", user1);
+      expect(keyService.setProviderKeys).toHaveBeenCalledWith([], user1);
+      expect(keyService.setOrgKeys).toHaveBeenCalledWith([], [], user1);
+    });
+
+    it("sets the correct keys for a V1 user", async () => {
+      const v1Profile = {
+        id: user1,
+        key: "encryptedUserKey",
+        privateKey: "privateKey",
+        providers: [] as any[],
+        organizations: [] as any[],
+        providerOrganizations: [] as any[],
+        avatarColor: "#fff",
+        securityStamp: "stamp",
+        emailVerified: true,
+        verifyDevices: false,
+        premiumPersonally: false,
+        premiumFromOrganization: false,
+        usesKeyConnector: false,
+        accountKeys: {
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: "wrappedPrivateKey",
+            publicKey: "publicKey",
+          },
+        },
+      };
+      apiService.getSync.mockResolvedValue(
+        new SyncResponse({
+          profile: v1Profile,
+          folders: [],
+          collections: [],
+          ciphers: [],
+          sends: [],
+          domains: [],
+          policies: [],
+        }),
+      );
+      await sut.fullSync(true);
+      expect(masterPasswordAbstraction.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+        new EncString("encryptedUserKey"),
+        user1,
+      );
+      expect(keyService.setPrivateKey).toHaveBeenCalledWith("wrappedPrivateKey", user1);
+      expect(keyService.setProviderKeys).toHaveBeenCalledWith([], user1);
+      expect(keyService.setOrgKeys).toHaveBeenCalledWith([], [], user1);
+    });
+
+    it("sets the correct keys for a V2 user", async () => {
+      const v2Profile = {
+        id: user1,
+        key: "encryptedUserKey",
+        providers: [] as unknown[],
+        organizations: [] as unknown[],
+        providerOrganizations: [] as unknown[],
+        avatarColor: "#fff",
+        securityStamp: "stamp",
+        emailVerified: true,
+        verifyDevices: false,
+        premiumPersonally: false,
+        premiumFromOrganization: false,
+        usesKeyConnector: false,
+        privateKey: "wrappedPrivateKey",
+        accountKeys: {
+          publicKeyEncryptionKeyPair: {
+            wrappedPrivateKey: "wrappedPrivateKey",
+            publicKey: "publicKey",
+            signedPublicKey: "signedPublicKey",
+          },
+          signatureKeyPair: {
+            wrappedSigningKey: "wrappedSigningKey",
+            verifyingKey: "verifyingKey",
+          },
+          securityState: {
+            securityState: "securityState",
+          },
+        },
+      };
+      apiService.getSync.mockResolvedValue(
+        new SyncResponse({
+          profile: v2Profile,
+          folders: [],
+          collections: [],
+          ciphers: [],
+          sends: [],
+          domains: [],
+          policies: [],
+        }),
+      );
+      await sut.fullSync(true);
+      expect(masterPasswordAbstraction.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+        new EncString("encryptedUserKey"),
+        user1,
+      );
+      expect(keyService.setPrivateKey).toHaveBeenCalledWith("wrappedPrivateKey", user1);
+      expect(keyService.setUserSigningKey).toHaveBeenCalledWith("wrappedSigningKey", user1);
+      expect(securityStateService.setAccountSecurityState).toHaveBeenCalledWith(
+        "securityState",
+        user1,
+      );
+      expect(keyService.setProviderKeys).toHaveBeenCalledWith([], user1);
+      expect(keyService.setOrgKeys).toHaveBeenCalledWith([], [], user1);
+    });
+
     it("does a token refresh when option missing from options", async () => {
       await sut.fullSync(true, { allowThrowOnError: false });
 
@@ -292,5 +436,99 @@ describe("DefaultSyncService", () => {
         expect(masterPasswordAbstraction.setMasterPasswordUnlockData).not.toHaveBeenCalled();
       });
     });
+
+    describe("mutate 'last update time'", () => {
+      let mockUserState: { update: jest.Mock };
+
+      const setupMockUserState = () => {
+        const mockUserState = { update: jest.fn() };
+        jest.spyOn(stateProvider, "getUser").mockReturnValue(mockUserState as any);
+        return mockUserState;
+      };
+
+      const setupSyncScenario = (revisionDate: Date, lastSyncDate: Date) => {
+        jest.spyOn(apiService, "getAccountRevisionDate").mockResolvedValue(revisionDate.getTime());
+        jest.spyOn(sut as any, "getLastSync").mockResolvedValue(lastSyncDate);
+      };
+
+      const expectUpdateCallCount = (
+        mockUserState: { update: jest.Mock },
+        expectedCount: number,
+      ) => {
+        if (expectedCount === 0) {
+          expect(mockUserState.update).not.toHaveBeenCalled();
+        } else {
+          expect(mockUserState.update).toHaveBeenCalledTimes(expectedCount);
+        }
+      };
+
+      const defaultSyncOptions = { allowThrowOnError: true, skipTokenRefresh: true };
+      const errorTolerantSyncOptions = { allowThrowOnError: false, skipTokenRefresh: true };
+
+      beforeEach(() => {
+        mockUserState = setupMockUserState();
+      });
+
+      it("uses the current time when a sync is forced", async () => {
+        // Mock the value of this observable because it's used in `syncProfile`. Without it, the test breaks.
+        keyConnectorService.convertAccountRequired$ = of(false);
+
+        jest.useFakeTimers({ now: Date.now() });
+
+        await sut.fullSync(true, defaultSyncOptions);
+
+        expectUpdateCallCount(mockUserState, 1);
+        // Get the first and only call to update(...)
+        const updateCall = mockUserState.update.mock.calls[0];
+        // Get the first argument to update(...) -- this will be the date callback that returns the date of the last successful sync
+        const dateCallback = updateCall[0];
+        const actualDate = dateCallback() as Date;
+
+        expect(actualDate.getTime()).toEqual(jest.now());
+        jest.useRealTimers();
+      });
+
+      it("updates last sync time when no sync is necessary", async () => {
+        const revisionDate = new Date(1);
+        setupSyncScenario(revisionDate, revisionDate);
+
+        const syncResult = await sut.fullSync(false, defaultSyncOptions);
+
+        // Sync should complete but return false since no sync was needed
+        expect(syncResult).toBe(false);
+        expectUpdateCallCount(mockUserState, 1);
+      });
+
+      it("updates last sync time when sync is successful", async () => {
+        setupSyncScenario(new Date(2), new Date(1));
+
+        const syncResult = await sut.fullSync(false, defaultSyncOptions);
+
+        expect(syncResult).toBe(true);
+        expectUpdateCallCount(mockUserState, 1);
+      });
+
+      describe("error scenarios", () => {
+        it("does not update last sync time when sync fails", async () => {
+          apiService.getSync.mockRejectedValue(new Error("not connected"));
+
+          const syncResult = await sut.fullSync(true, errorTolerantSyncOptions);
+
+          expect(syncResult).toBe(false);
+          expectUpdateCallCount(mockUserState, 0);
+        });
+
+        it("does not update last sync time when account revision check fails", async () => {
+          jest
+            .spyOn(apiService, "getAccountRevisionDate")
+            .mockRejectedValue(new Error("not connected"));
+
+          const syncResult = await sut.fullSync(false, errorTolerantSyncOptions);
+
+          expect(syncResult).toBe(false);
+          expectUpdateCallCount(mockUserState, 0);
+        });
+      });
+    });
   });
 });
diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts
index 582e4b58a64..e599fbc1c48 100644
--- a/libs/common/src/platform/sync/default-sync.service.ts
+++ b/libs/common/src/platform/sync/default-sync.service.ts
@@ -10,8 +10,9 @@ import {
   CollectionService,
 } from "@bitwarden/admin-console/common";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
 // eslint-disable-next-line no-restricted-imports
-import { KeyService } from "@bitwarden/key-management";
+import { KdfConfigService, KeyService } from "@bitwarden/key-management";
 
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
@@ -98,6 +99,8 @@ export class DefaultSyncService extends CoreSyncService {
     tokenService: TokenService,
     authService: AuthService,
     stateProvider: StateProvider,
+    private securityStateService: SecurityStateService,
+    private kdfConfigService: KdfConfigService,
   ) {
     super(
       tokenService,
@@ -134,9 +137,11 @@ export class DefaultSyncService extends CoreSyncService {
 
     const now = new Date();
     let needsSync = false;
+    let needsSyncSucceeded = true;
     try {
       needsSync = await this.needsSyncing(forceSync);
     } catch (e) {
+      needsSyncSucceeded = false;
       if (allowThrowOnError) {
         this.syncCompleted(false, userId);
         throw e;
@@ -144,7 +149,9 @@ export class DefaultSyncService extends CoreSyncService {
     }
 
     if (!needsSync) {
-      await this.setLastSync(now, userId);
+      if (needsSyncSucceeded) {
+        await this.setLastSync(now, userId);
+      }
       return this.syncCompleted(false, userId);
     }
 
@@ -229,13 +236,34 @@ export class DefaultSyncService extends CoreSyncService {
     if (response?.key) {
       await this.masterPasswordService.setMasterKeyEncryptedUserKey(response.key, response.id);
     }
-    await this.keyService.setPrivateKey(response.privateKey, response.id);
+
+    // Cleanup: Only the first branch should be kept after the server always returns accountKeys https://bitwarden.atlassian.net/browse/PM-21768
+    if (response.accountKeys != null) {
+      await this.keyService.setPrivateKey(
+        response.accountKeys.publicKeyEncryptionKeyPair.wrappedPrivateKey,
+        response.id,
+      );
+      if (response.accountKeys.signatureKeyPair !== null) {
+        // User is V2 user
+        await this.keyService.setUserSigningKey(
+          response.accountKeys.signatureKeyPair.wrappedSigningKey,
+          response.id,
+        );
+        await this.securityStateService.setAccountSecurityState(
+          response.accountKeys.securityState.securityState,
+          response.id,
+        );
+      }
+    } else {
+      await this.keyService.setPrivateKey(response.privateKey, response.id);
+    }
     await this.keyService.setProviderKeys(response.providers, response.id);
     await this.keyService.setOrgKeys(
       response.organizations,
       response.providerOrganizations,
       response.id,
     );
+
     await this.avatarService.setSyncAvatarColor(response.id, response.avatarColor);
     await this.tokenService.setSecurityStamp(response.securityStamp, response.id);
     await this.accountService.setAccountEmailVerified(response.id, response.emailVerified);
@@ -407,6 +435,7 @@ export class DefaultSyncService extends CoreSyncService {
         masterPasswordUnlockData,
         userId,
       );
+      await this.kdfConfigService.setKdfConfig(userId, masterPasswordUnlockData.kdf);
     }
   }
 }
diff --git a/libs/common/src/services/api-errors.ts b/libs/common/src/services/api-errors.ts
new file mode 100644
index 00000000000..6dc9c8fce6d
--- /dev/null
+++ b/libs/common/src/services/api-errors.ts
@@ -0,0 +1,9 @@
+export class InsecureUrlNotAllowedError extends Error {
+  constructor(url?: string) {
+    if (url === undefined) {
+      super("Insecure URL not allowed. All URLs must use HTTPS.");
+    } else {
+      super(`Insecure URL not allowed: ${url}. All URLs must use HTTPS.`);
+    }
+  }
+}
diff --git a/libs/common/src/services/api.service.spec.ts b/libs/common/src/services/api.service.spec.ts
index 6d6e96de9e3..1fb8f86697f 100644
--- a/libs/common/src/services/api.service.spec.ts
+++ b/libs/common/src/services/api.service.spec.ts
@@ -20,6 +20,7 @@ import { Environment, EnvironmentService } from "../platform/abstractions/enviro
 import { LogService } from "../platform/abstractions/log.service";
 import { PlatformUtilsService } from "../platform/abstractions/platform-utils.service";
 
+import { InsecureUrlNotAllowedError } from "./api-errors";
 import { ApiService, HttpOperations } from "./api.service";
 
 describe("ApiService", () => {
@@ -411,4 +412,39 @@ describe("ApiService", () => {
       ).rejects.toMatchObject(error);
     },
   );
+
+  it("throws error when trying to fetch an insecure URL", async () => {
+    environmentService.getEnvironment$.calledWith(testActiveUser).mockReturnValue(
+      of({
+        getApiUrl: () => "http://example.com",
+      } satisfies Partial<Environment> as Environment),
+    );
+
+    httpOperations.createRequest.mockImplementation((url, request) => {
+      return {
+        url: url,
+        cache: request.cache,
+        credentials: request.credentials,
+        method: request.method,
+        mode: request.mode,
+        signal: request.signal ?? undefined,
+        headers: new Headers(request.headers),
+      } satisfies Partial<Request> as unknown as Request;
+    });
+
+    const nativeFetch = jest.fn<Promise<Response>, [request: Request]>();
+    nativeFetch.mockImplementation((request) => {
+      return Promise.resolve({
+        ok: true,
+        status: 204,
+        headers: new Headers(),
+      } satisfies Partial<Response> as Response);
+    });
+    sut.nativeFetch = nativeFetch;
+
+    await expect(
+      async () => await sut.send("GET", "/something", null, true, true, null),
+    ).rejects.toThrow(InsecureUrlNotAllowedError);
+    expect(nativeFetch).not.toHaveBeenCalled();
+  });
 });
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 70ba76fe797..5f4d3de11b5 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -48,8 +48,6 @@ import {
 import { SelectionReadOnlyResponse } from "../admin-console/models/response/selection-read-only.response";
 import { AccountService } from "../auth/abstractions/account.service";
 import { TokenService } from "../auth/abstractions/token.service";
-import { DeviceVerificationRequest } from "../auth/models/request/device-verification.request";
-import { DisableTwoFactorAuthenticatorRequest } from "../auth/models/request/disable-two-factor-authenticator.request";
 import { EmailTokenRequest } from "../auth/models/request/email-token.request";
 import { EmailRequest } from "../auth/models/request/email.request";
 import { DeviceRequest } from "../auth/models/request/identity-token/device.request";
@@ -61,43 +59,20 @@ import { WebAuthnLoginTokenRequest } from "../auth/models/request/identity-token
 import { PasswordHintRequest } from "../auth/models/request/password-hint.request";
 import { PasswordlessAuthRequest } from "../auth/models/request/passwordless-auth.request";
 import { SecretVerificationRequest } from "../auth/models/request/secret-verification.request";
-import { TwoFactorEmailRequest } from "../auth/models/request/two-factor-email.request";
-import { TwoFactorProviderRequest } from "../auth/models/request/two-factor-provider.request";
 import { UpdateProfileRequest } from "../auth/models/request/update-profile.request";
-import { UpdateTwoFactorAuthenticatorRequest } from "../auth/models/request/update-two-factor-authenticator.request";
-import { UpdateTwoFactorDuoRequest } from "../auth/models/request/update-two-factor-duo.request";
-import { UpdateTwoFactorEmailRequest } from "../auth/models/request/update-two-factor-email.request";
-import { UpdateTwoFactorWebAuthnDeleteRequest } from "../auth/models/request/update-two-factor-web-authn-delete.request";
-import { UpdateTwoFactorWebAuthnRequest } from "../auth/models/request/update-two-factor-web-authn.request";
-import { UpdateTwoFactorYubikeyOtpRequest } from "../auth/models/request/update-two-factor-yubikey-otp.request";
 import { ApiKeyResponse } from "../auth/models/response/api-key.response";
 import { AuthRequestResponse } from "../auth/models/response/auth-request.response";
-import { DeviceVerificationResponse } from "../auth/models/response/device-verification.response";
 import { IdentityDeviceVerificationResponse } from "../auth/models/response/identity-device-verification.response";
 import { IdentityTokenResponse } from "../auth/models/response/identity-token.response";
 import { IdentityTwoFactorResponse } from "../auth/models/response/identity-two-factor.response";
 import { KeyConnectorUserKeyResponse } from "../auth/models/response/key-connector-user-key.response";
 import { PreloginResponse } from "../auth/models/response/prelogin.response";
 import { SsoPreValidateResponse } from "../auth/models/response/sso-pre-validate.response";
-import { TwoFactorAuthenticatorResponse } from "../auth/models/response/two-factor-authenticator.response";
-import { TwoFactorDuoResponse } from "../auth/models/response/two-factor-duo.response";
-import { TwoFactorEmailResponse } from "../auth/models/response/two-factor-email.response";
-import { TwoFactorProviderResponse } from "../auth/models/response/two-factor-provider.response";
-import { TwoFactorRecoverResponse } from "../auth/models/response/two-factor-recover.response";
-import {
-  ChallengeResponse,
-  TwoFactorWebAuthnResponse,
-} from "../auth/models/response/two-factor-web-authn.response";
-import { TwoFactorYubiKeyResponse } from "../auth/models/response/two-factor-yubi-key.response";
 import { BitPayInvoiceRequest } from "../billing/models/request/bit-pay-invoice.request";
-import { PaymentRequest } from "../billing/models/request/payment.request";
-import { TaxInfoUpdateRequest } from "../billing/models/request/tax-info-update.request";
 import { BillingHistoryResponse } from "../billing/models/response/billing-history.response";
-import { BillingPaymentResponse } from "../billing/models/response/billing-payment.response";
 import { PaymentResponse } from "../billing/models/response/payment.response";
 import { PlanResponse } from "../billing/models/response/plan.response";
 import { SubscriptionResponse } from "../billing/models/response/subscription.response";
-import { TaxInfoResponse } from "../billing/models/response/tax-info.response";
 import { ClientType, DeviceType } from "../enums";
 import { KeyConnectorUserKeyRequest } from "../key-management/key-connector/models/key-connector-user-key.request";
 import { SetKeyConnectorKeyRequest } from "../key-management/key-connector/models/set-key-connector-key.request";
@@ -142,6 +117,8 @@ import { AttachmentResponse } from "../vault/models/response/attachment.response
 import { CipherResponse } from "../vault/models/response/cipher.response";
 import { OptionalCipherResponse } from "../vault/models/response/optional-cipher.response";
 
+import { InsecureUrlNotAllowedError } from "./api-errors";
+
 export type HttpOperations = {
   createRequest: (url: string, request: RequestInit) => Request;
 };
@@ -294,11 +271,6 @@ export class ApiService implements ApiServiceAbstraction {
     return new SubscriptionResponse(r);
   }
 
-  async getTaxInfo(): Promise<TaxInfoResponse> {
-    const r = await this.send("GET", "/accounts/tax", null, true, true);
-    return new TaxInfoResponse(r);
-  }
-
   async putProfile(request: UpdateProfileRequest): Promise<ProfileResponse> {
     const r = await this.send("PUT", "/accounts/profile", request, true, true);
     return new ProfileResponse(r);
@@ -309,10 +281,6 @@ export class ApiService implements ApiServiceAbstraction {
     return new ProfileResponse(r);
   }
 
-  putTaxInfo(request: TaxInfoUpdateRequest): Promise<any> {
-    return this.send("PUT", "/accounts/tax", request, true, false);
-  }
-
   async postPrelogin(request: PreloginRequest): Promise<PreloginResponse> {
     const env = await firstValueFrom(this.environmentService.environment$);
     const r = await this.send(
@@ -365,10 +333,6 @@ export class ApiService implements ApiServiceAbstraction {
     return new PaymentResponse(r);
   }
 
-  postAccountPayment(request: PaymentRequest): Promise<void> {
-    return this.send("POST", "/accounts/payment", request, true, false);
-  }
-
   postAccountLicense(data: FormData): Promise<any> {
     return this.send("POST", "/accounts/license", data, true, false);
   }
@@ -429,11 +393,6 @@ export class ApiService implements ApiServiceAbstraction {
     return new BillingHistoryResponse(r);
   }
 
-  async getUserBillingPayment(): Promise<BillingPaymentResponse> {
-    const r = await this.send("GET", "/accounts/billing/payment-method", null, true, true);
-    return new BillingPaymentResponse(r);
-  }
-
   // Cipher APIs
 
   async getCipher(id: string): Promise<CipherResponse> {
@@ -451,14 +410,15 @@ export class ApiService implements ApiServiceAbstraction {
     return new CipherResponse(r);
   }
 
-  async getCiphersOrganization(organizationId: string): Promise<ListResponse<CipherResponse>> {
-    const r = await this.send(
-      "GET",
-      "/ciphers/organization-details?organizationId=" + organizationId,
-      null,
-      true,
-      true,
-    );
+  async getCiphersOrganization(
+    organizationId: string,
+    includeMemberItems?: boolean,
+  ): Promise<ListResponse<CipherResponse>> {
+    let url = "/ciphers/organization-details?organizationId=" + organizationId;
+    if (includeMemberItems) {
+      url += `&includeMemberItems=${includeMemberItems}`;
+    }
+    const r = await this.send("GET", url, null, true, true);
     return new ListResponse(r, CipherResponse);
   }
 
@@ -831,205 +791,6 @@ export class ApiService implements ApiServiceAbstraction {
     return new SyncResponse(r);
   }
 
-  // Two-factor APIs
-
-  async getTwoFactorProviders(): Promise<ListResponse<TwoFactorProviderResponse>> {
-    const r = await this.send("GET", "/two-factor", null, true, true);
-    return new ListResponse(r, TwoFactorProviderResponse);
-  }
-
-  async getTwoFactorOrganizationProviders(
-    organizationId: string,
-  ): Promise<ListResponse<TwoFactorProviderResponse>> {
-    const r = await this.send(
-      "GET",
-      "/organizations/" + organizationId + "/two-factor",
-      null,
-      true,
-      true,
-    );
-    return new ListResponse(r, TwoFactorProviderResponse);
-  }
-
-  async getTwoFactorAuthenticator(
-    request: SecretVerificationRequest,
-  ): Promise<TwoFactorAuthenticatorResponse> {
-    const r = await this.send("POST", "/two-factor/get-authenticator", request, true, true);
-    return new TwoFactorAuthenticatorResponse(r);
-  }
-
-  async getTwoFactorEmail(request: SecretVerificationRequest): Promise<TwoFactorEmailResponse> {
-    const r = await this.send("POST", "/two-factor/get-email", request, true, true);
-    return new TwoFactorEmailResponse(r);
-  }
-
-  async getTwoFactorDuo(request: SecretVerificationRequest): Promise<TwoFactorDuoResponse> {
-    const r = await this.send("POST", "/two-factor/get-duo", request, true, true);
-    return new TwoFactorDuoResponse(r);
-  }
-
-  async getTwoFactorOrganizationDuo(
-    organizationId: string,
-    request: SecretVerificationRequest,
-  ): Promise<TwoFactorDuoResponse> {
-    const r = await this.send(
-      "POST",
-      "/organizations/" + organizationId + "/two-factor/get-duo",
-      request,
-      true,
-      true,
-    );
-    return new TwoFactorDuoResponse(r);
-  }
-
-  async getTwoFactorYubiKey(request: SecretVerificationRequest): Promise<TwoFactorYubiKeyResponse> {
-    const r = await this.send("POST", "/two-factor/get-yubikey", request, true, true);
-    return new TwoFactorYubiKeyResponse(r);
-  }
-
-  async getTwoFactorWebAuthn(
-    request: SecretVerificationRequest,
-  ): Promise<TwoFactorWebAuthnResponse> {
-    const r = await this.send("POST", "/two-factor/get-webauthn", request, true, true);
-    return new TwoFactorWebAuthnResponse(r);
-  }
-
-  async getTwoFactorWebAuthnChallenge(
-    request: SecretVerificationRequest,
-  ): Promise<ChallengeResponse> {
-    const r = await this.send("POST", "/two-factor/get-webauthn-challenge", request, true, true);
-    return new ChallengeResponse(r);
-  }
-
-  async getTwoFactorRecover(request: SecretVerificationRequest): Promise<TwoFactorRecoverResponse> {
-    const r = await this.send("POST", "/two-factor/get-recover", request, true, true);
-    return new TwoFactorRecoverResponse(r);
-  }
-
-  async putTwoFactorAuthenticator(
-    request: UpdateTwoFactorAuthenticatorRequest,
-  ): Promise<TwoFactorAuthenticatorResponse> {
-    const r = await this.send("PUT", "/two-factor/authenticator", request, true, true);
-    return new TwoFactorAuthenticatorResponse(r);
-  }
-
-  async deleteTwoFactorAuthenticator(
-    request: DisableTwoFactorAuthenticatorRequest,
-  ): Promise<TwoFactorProviderResponse> {
-    const r = await this.send("DELETE", "/two-factor/authenticator", request, true, true);
-    return new TwoFactorProviderResponse(r);
-  }
-
-  async putTwoFactorEmail(request: UpdateTwoFactorEmailRequest): Promise<TwoFactorEmailResponse> {
-    const r = await this.send("PUT", "/two-factor/email", request, true, true);
-    return new TwoFactorEmailResponse(r);
-  }
-
-  async putTwoFactorDuo(request: UpdateTwoFactorDuoRequest): Promise<TwoFactorDuoResponse> {
-    const r = await this.send("PUT", "/two-factor/duo", request, true, true);
-    return new TwoFactorDuoResponse(r);
-  }
-
-  async putTwoFactorOrganizationDuo(
-    organizationId: string,
-    request: UpdateTwoFactorDuoRequest,
-  ): Promise<TwoFactorDuoResponse> {
-    const r = await this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/two-factor/duo",
-      request,
-      true,
-      true,
-    );
-    return new TwoFactorDuoResponse(r);
-  }
-
-  async putTwoFactorYubiKey(
-    request: UpdateTwoFactorYubikeyOtpRequest,
-  ): Promise<TwoFactorYubiKeyResponse> {
-    const r = await this.send("PUT", "/two-factor/yubikey", request, true, true);
-    return new TwoFactorYubiKeyResponse(r);
-  }
-
-  async putTwoFactorWebAuthn(
-    request: UpdateTwoFactorWebAuthnRequest,
-  ): Promise<TwoFactorWebAuthnResponse> {
-    const response = request.deviceResponse.response as AuthenticatorAttestationResponse;
-    const data: any = Object.assign({}, request);
-
-    data.deviceResponse = {
-      id: request.deviceResponse.id,
-      rawId: btoa(request.deviceResponse.id),
-      type: request.deviceResponse.type,
-      extensions: request.deviceResponse.getClientExtensionResults(),
-      response: {
-        AttestationObject: Utils.fromBufferToB64(response.attestationObject),
-        clientDataJson: Utils.fromBufferToB64(response.clientDataJSON),
-      },
-    };
-
-    const r = await this.send("PUT", "/two-factor/webauthn", data, true, true);
-    return new TwoFactorWebAuthnResponse(r);
-  }
-
-  async deleteTwoFactorWebAuthn(
-    request: UpdateTwoFactorWebAuthnDeleteRequest,
-  ): Promise<TwoFactorWebAuthnResponse> {
-    const r = await this.send("DELETE", "/two-factor/webauthn", request, true, true);
-    return new TwoFactorWebAuthnResponse(r);
-  }
-
-  async putTwoFactorDisable(request: TwoFactorProviderRequest): Promise<TwoFactorProviderResponse> {
-    const r = await this.send("PUT", "/two-factor/disable", request, true, true);
-    return new TwoFactorProviderResponse(r);
-  }
-
-  async putTwoFactorOrganizationDisable(
-    organizationId: string,
-    request: TwoFactorProviderRequest,
-  ): Promise<TwoFactorProviderResponse> {
-    const r = await this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/two-factor/disable",
-      request,
-      true,
-      true,
-    );
-    return new TwoFactorProviderResponse(r);
-  }
-
-  postTwoFactorEmailSetup(request: TwoFactorEmailRequest): Promise<any> {
-    return this.send("POST", "/two-factor/send-email", request, true, false);
-  }
-
-  postTwoFactorEmail(request: TwoFactorEmailRequest): Promise<any> {
-    return this.send("POST", "/two-factor/send-email-login", request, false, false);
-  }
-
-  async getDeviceVerificationSettings(): Promise<DeviceVerificationResponse> {
-    const r = await this.send(
-      "GET",
-      "/two-factor/get-device-verification-settings",
-      null,
-      true,
-      true,
-    );
-    return new DeviceVerificationResponse(r);
-  }
-
-  async putDeviceVerificationSettings(
-    request: DeviceVerificationRequest,
-  ): Promise<DeviceVerificationResponse> {
-    const r = await this.send(
-      "PUT",
-      "/two-factor/device-verification-settings",
-      request,
-      true,
-      true,
-    );
-    return new DeviceVerificationResponse(r);
-  }
-
   // Organization APIs
 
   async getCloudCommunicationsEnabled(): Promise<boolean> {
@@ -1294,6 +1055,28 @@ export class ApiService implements ApiServiceAbstraction {
     return new ListResponse(r, EventResponse);
   }
 
+  async getEventsServiceAccount(
+    orgId: string,
+    id: string,
+    start: string,
+    end: string,
+    token: string,
+  ): Promise<ListResponse<EventResponse>> {
+    const r = await this.send(
+      "GET",
+      this.addEventParameters(
+        "/organization/" + orgId + "/service-account/" + id + "/events",
+        start,
+        end,
+        token,
+      ),
+      null,
+      true,
+      true,
+    );
+    return new ListResponse(r, EventResponse);
+  }
+
   async getEventsProject(
     orgId: string,
     id: string,
@@ -1529,6 +1312,10 @@ export class ApiService implements ApiServiceAbstraction {
   }
 
   async fetch(request: Request): Promise<Response> {
+    if (!request.url.startsWith("https://") && !this.platformUtilsService.isDev()) {
+      throw new InsecureUrlNotAllowedError();
+    }
+
     if (request.method === "GET") {
       request.headers.set("Cache-Control", "no-store");
       request.headers.set("Pragma", "no-cache");
@@ -1538,6 +1325,11 @@ export class ApiService implements ApiServiceAbstraction {
       "Bitwarden-Client-Version",
       await this.platformUtilsService.getApplicationVersionNumber(),
     );
+
+    const packageType = await this.platformUtilsService.packageType();
+    if (packageType != null) {
+      request.headers.set("Bitwarden-Package-Type", packageType);
+    }
     return this.nativeFetch(request);
   }
 
@@ -1801,8 +1593,16 @@ export class ApiService implements ApiServiceAbstraction {
     );
     apiUrl = Utils.isNullOrWhitespace(apiUrl) ? env.getApiUrl() : apiUrl;
 
-    // Prevent directory traversal from malicious paths
     const pathParts = path.split("?");
+    // Check for path traversal patterns from any URL.
+    const fullUrlPath = apiUrl + pathParts[0] + (pathParts.length > 1 ? `?${pathParts[1]}` : "");
+
+    const isInvalidUrl = Utils.invalidUrlPatterns(fullUrlPath);
+    if (isInvalidUrl) {
+      throw new Error("The request URL contains dangerous patterns.");
+    }
+
+    // Prevent directory traversal from malicious paths
     const requestUrl =
       apiUrl + Utils.normalizePath(pathParts[0]) + (pathParts.length > 1 ? `?${pathParts[1]}` : "");
 
diff --git a/libs/common/src/services/audit.service.ts b/libs/common/src/services/audit.service.ts
index 8fc9f13476d..0bdf45917de 100644
--- a/libs/common/src/services/audit.service.ts
+++ b/libs/common/src/services/audit.service.ts
@@ -80,9 +80,4 @@ export class AuditService implements AuditServiceAbstraction {
       throw new Error();
     }
   }
-
-  async getKnownPhishingDomains(): Promise<string[]> {
-    const response = await this.apiService.send("GET", "/phishing-domains", null, true, true);
-    return response as string[];
-  }
 }
diff --git a/libs/common/src/tools/send/enums/send-type.ts b/libs/common/src/tools/send/enums/send-type.ts
index 5b03c71d22a..c2c5bdc6f6e 100644
--- a/libs/common/src/tools/send/enums/send-type.ts
+++ b/libs/common/src/tools/send/enums/send-type.ts
@@ -1,6 +1,10 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum SendType {
-  Text = 0,
-  File = 1,
-}
+/** A type of Send. */
+export const SendType = Object.freeze({
+  /** Send contains plain text. */
+  Text: 0,
+  /** Send contains a file. */
+  File: 1,
+} as const);
+
+/** A type of Send. */
+export type SendType = (typeof SendType)[keyof typeof SendType];
diff --git a/libs/common/src/tools/send/models/domain/send.spec.ts b/libs/common/src/tools/send/models/domain/send.spec.ts
index e9b0ae7b3b8..d465aa97924 100644
--- a/libs/common/src/tools/send/models/domain/send.spec.ts
+++ b/libs/common/src/tools/send/models/domain/send.spec.ts
@@ -1,5 +1,7 @@
 import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
 
+import { emptyGuid, 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 { KeyService } from "@bitwarden/key-management";
@@ -97,6 +99,7 @@ describe("Send", () => {
     const text = mock<SendText>();
     text.decrypt.mockResolvedValue("textView" as any);
     const userKey = new SymmetricCryptoKey(new Uint8Array(32)) as UserKey;
+    const userId = emptyGuid as UserId;
 
     const send = new Send();
     send.id = "id";
@@ -120,11 +123,11 @@ describe("Send", () => {
       .calledWith(send.key, userKey)
       .mockResolvedValue(makeStaticByteArray(32));
     keyService.makeSendKey.mockResolvedValue("cryptoKey" as any);
-    keyService.getUserKey.mockResolvedValue(userKey);
+    keyService.userKey$.calledWith(userId).mockReturnValue(of(userKey));
 
     (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
 
-    const view = await send.decrypt();
+    const view = await send.decrypt(userId);
 
     expect(text.decrypt).toHaveBeenNthCalledWith(1, "cryptoKey");
     expect(send.name.decrypt).toHaveBeenNthCalledWith(
diff --git a/libs/common/src/tools/send/models/domain/send.ts b/libs/common/src/tools/send/models/domain/send.ts
index 48057aedd2d..48129d4314a 100644
--- a/libs/common/src/tools/send/models/domain/send.ts
+++ b/libs/common/src/tools/send/models/domain/send.ts
@@ -1,7 +1,10 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { firstValueFrom } from "rxjs";
 import { Jsonify } from "type-fest";
 
+import { UserId } from "@bitwarden/common/types/guid";
+
 import { EncString } from "../../../../key-management/crypto/models/enc-string";
 import { Utils } from "../../../../platform/misc/utils";
 import Domain from "../../../../platform/models/domain/domain-base";
@@ -73,22 +76,18 @@ export class Send extends Domain {
     }
   }
 
-  async decrypt(): Promise<SendView> {
-    const model = new SendView(this);
+  async decrypt(userId: UserId): Promise<SendView> {
+    if (!userId) {
+      throw new Error("User ID must not be null or undefined");
+    }
 
+    const model = new SendView(this);
     const keyService = Utils.getContainerService().getKeyService();
     const encryptService = Utils.getContainerService().getEncryptService();
-
-    try {
-      const sendKeyEncryptionKey = await keyService.getUserKey();
-      // model.key is a seed used to derive a key, not a SymmetricCryptoKey
-      model.key = await encryptService.decryptBytes(this.key, sendKeyEncryptionKey);
-      model.cryptoKey = await keyService.makeSendKey(model.key);
-      // FIXME: Remove when updating file. Eslint update
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    } catch (e) {
-      // TODO: error?
-    }
+    const sendKeyEncryptionKey = await firstValueFrom(keyService.userKey$(userId));
+    // model.key is a seed used to derive a key, not a SymmetricCryptoKey
+    model.key = await encryptService.decryptBytes(this.key, sendKeyEncryptionKey);
+    model.cryptoKey = await keyService.makeSendKey(model.key);
 
     await this.decryptObj<Send, SendView>(this, model, ["name", "notes"], null, model.cryptoKey);
 
diff --git a/libs/common/src/tools/send/services/send.service.spec.ts b/libs/common/src/tools/send/services/send.service.spec.ts
index 8b080089c3c..96fb2f43c88 100644
--- a/libs/common/src/tools/send/services/send.service.spec.ts
+++ b/libs/common/src/tools/send/services/send.service.spec.ts
@@ -86,6 +86,7 @@ describe("SendService", () => {
     decryptedState.nextState([testSendViewData("1", "Test Send")]);
 
     sendService = new SendService(
+      accountService,
       keyService,
       i18nService,
       keyGenerationService,
diff --git a/libs/common/src/tools/send/services/send.service.ts b/libs/common/src/tools/send/services/send.service.ts
index 2664b0d4351..810dbc05a2f 100644
--- a/libs/common/src/tools/send/services/send.service.ts
+++ b/libs/common/src/tools/send/services/send.service.ts
@@ -2,6 +2,7 @@
 // @ts-strict-ignore
 import { Observable, concatMap, distinctUntilChanged, firstValueFrom, map } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 // 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 { PBKDF2KdfConfig, KeyService } from "@bitwarden/key-management";
@@ -35,12 +36,16 @@ export class SendService implements InternalSendServiceAbstraction {
     map(([, record]) => Object.values(record || {}).map((data) => new Send(data))),
   );
   sendViews$ = this.stateProvider.encryptedState$.pipe(
-    concatMap(([, record]) =>
-      this.decryptSends(Object.values(record || {}).map((data) => new Send(data))),
+    concatMap(([userId, record]) =>
+      this.decryptSends(
+        Object.values(record || {}).map((data) => new Send(data)),
+        userId,
+      ),
     ),
   );
 
   constructor(
+    private accountService: AccountService,
     private keyService: KeyService,
     private i18nService: I18nService,
     private keyGenerationService: KeyGenerationService,
@@ -89,8 +94,9 @@ export class SendService implements InternalSendServiceAbstraction {
       );
       send.password = passwordKey.keyB64;
     }
+    const userId = (await firstValueFrom(this.accountService.activeAccount$)).id;
     if (userKey == null) {
-      userKey = await this.keyService.getUserKey();
+      userKey = await firstValueFrom(this.keyService.userKey$(userId));
     }
     // Key is not a SymmetricCryptoKey, but key material used to derive the cryptoKey
     send.key = await this.encryptService.encryptBytes(model.key, userKey);
@@ -111,11 +117,12 @@ export class SendService implements InternalSendServiceAbstraction {
             model.file.fileName,
             file,
             model.cryptoKey,
+            userId,
           );
           send.file.fileName = name;
           fileData = data;
         } else {
-          fileData = await this.parseFile(send, file, model.cryptoKey);
+          fileData = await this.parseFile(send, file, model.cryptoKey, userId);
         }
       }
     }
@@ -208,6 +215,9 @@ export class SendService implements InternalSendServiceAbstraction {
   }
 
   async getAllDecryptedFromState(userId: UserId): Promise<SendView[]> {
+    if (!userId) {
+      throw new Error("User ID must not be null or undefined");
+    }
     let decSends = await this.stateProvider.getDecryptedSends();
     if (decSends != null) {
       return decSends;
@@ -222,7 +232,7 @@ export class SendService implements InternalSendServiceAbstraction {
     const promises: Promise<any>[] = [];
     const sends = await this.getAll();
     sends.forEach((send) => {
-      promises.push(send.decrypt().then((f) => decSends.push(f)));
+      promises.push(send.decrypt(userId).then((f) => decSends.push(f)));
     });
 
     await Promise.all(promises);
@@ -311,7 +321,12 @@ export class SendService implements InternalSendServiceAbstraction {
     return requests;
   }
 
-  private parseFile(send: Send, file: File, key: SymmetricCryptoKey): Promise<EncArrayBuffer> {
+  private parseFile(
+    send: Send,
+    file: File,
+    key: SymmetricCryptoKey,
+    userId: UserId,
+  ): Promise<EncArrayBuffer> {
     return new Promise((resolve, reject) => {
       const reader = new FileReader();
       reader.readAsArrayBuffer(file);
@@ -321,6 +336,7 @@ export class SendService implements InternalSendServiceAbstraction {
             file.name,
             evt.target.result as ArrayBuffer,
             key,
+            userId,
           );
           send.file.fileName = name;
           resolve(data);
@@ -338,17 +354,18 @@ export class SendService implements InternalSendServiceAbstraction {
     fileName: string,
     data: ArrayBuffer,
     key: SymmetricCryptoKey,
+    userId: UserId,
   ): Promise<[EncString, EncArrayBuffer]> {
     if (key == null) {
-      key = await this.keyService.getUserKey();
+      key = await firstValueFrom(this.keyService.userKey$(userId));
     }
     const encFileName = await this.encryptService.encryptString(fileName, key);
     const encFileData = await this.encryptService.encryptFileData(new Uint8Array(data), key);
     return [encFileName, encFileData];
   }
 
-  private async decryptSends(sends: Send[]) {
-    const decryptSendPromises = sends.map((s) => s.decrypt());
+  private async decryptSends(sends: Send[], userId: UserId) {
+    const decryptSendPromises = sends.map((s) => s.decrypt(userId));
     const decryptedSends = await Promise.all(decryptSendPromises);
 
     decryptedSends.sort(Utils.getSortFunction(this.i18nService, "name"));
diff --git a/libs/common/src/types/key.ts b/libs/common/src/types/key.ts
index 8984452e701..46dcc14a8b2 100644
--- a/libs/common/src/types/key.ts
+++ b/libs/common/src/types/key.ts
@@ -1,5 +1,6 @@
 import { Opaque } from "type-fest";
 
+import { UnsignedPublicKey } from "../key-management/types";
 import { SymmetricCryptoKey } from "../platform/models/domain/symmetric-crypto-key";
 
 // symmetric keys
@@ -8,6 +9,7 @@ export type PrfKey = Opaque<SymmetricCryptoKey, "PrfKey">;
 export type UserKey = Opaque<SymmetricCryptoKey, "UserKey">;
 /** @deprecated Interacting with the master key directly is prohibited. Use a high level function from MasterPasswordService instead. */
 export type MasterKey = Opaque<SymmetricCryptoKey, "MasterKey">;
+/** @deprecated */
 export type PinKey = Opaque<SymmetricCryptoKey, "PinKey">;
 export type OrgKey = Opaque<SymmetricCryptoKey, "OrgKey">;
 export type ProviderKey = Opaque<SymmetricCryptoKey, "ProviderKey">;
@@ -15,4 +17,4 @@ export type CipherKey = Opaque<SymmetricCryptoKey, "CipherKey">;
 
 // asymmetric keys
 export type UserPrivateKey = Opaque<Uint8Array, "UserPrivateKey">;
-export type UserPublicKey = Opaque<Uint8Array, "UserPublicKey">;
+export type UserPublicKey = Opaque<UnsignedPublicKey, "UserPublicKey">;
diff --git a/libs/vault/src/abstractions/cipher-archive.service.ts b/libs/common/src/vault/abstractions/cipher-archive.service.ts
similarity index 81%
rename from libs/vault/src/abstractions/cipher-archive.service.ts
rename to libs/common/src/vault/abstractions/cipher-archive.service.ts
index 6240e4001c8..d33fc5e7cc7 100644
--- a/libs/vault/src/abstractions/cipher-archive.service.ts
+++ b/libs/common/src/vault/abstractions/cipher-archive.service.ts
@@ -1,14 +1,13 @@
 import { Observable } from "rxjs";
 
 import { CipherId, UserId } from "@bitwarden/common/types/guid";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 
 export abstract class CipherArchiveService {
+  abstract hasArchiveFlagEnabled$(): Observable<boolean>;
   abstract archivedCiphers$(userId: UserId): Observable<CipherViewLike[]>;
   abstract userCanArchive$(userId: UserId): Observable<boolean>;
   abstract showArchiveVault$(userId: UserId): Observable<boolean>;
   abstract archiveWithServer(ids: CipherId | CipherId[], userId: UserId): Promise<void>;
   abstract unarchiveWithServer(ids: CipherId | CipherId[], userId: UserId): Promise<void>;
-  abstract canInteract(cipher: CipherView): Promise<boolean>;
 }
diff --git a/libs/common/src/vault/abstractions/cipher-risk.service.spec.ts b/libs/common/src/vault/abstractions/cipher-risk.service.spec.ts
new file mode 100644
index 00000000000..2c87191cd96
--- /dev/null
+++ b/libs/common/src/vault/abstractions/cipher-risk.service.spec.ts
@@ -0,0 +1,88 @@
+import type { CipherRiskResult, CipherId } from "@bitwarden/sdk-internal";
+
+import { isPasswordAtRisk } from "./cipher-risk.service";
+
+describe("isPasswordAtRisk", () => {
+  const mockId = "00000000-0000-0000-0000-000000000000" as unknown as CipherId;
+
+  const createRisk = (overrides: Partial<CipherRiskResult> = {}): CipherRiskResult => ({
+    id: mockId,
+    password_strength: 4,
+    exposed_result: { type: "NotChecked" },
+    reuse_count: 1,
+    ...overrides,
+  });
+
+  describe("exposed password risk", () => {
+    it.each([
+      { value: 5, expected: true, desc: "found with value > 0" },
+      { value: 0, expected: false, desc: "found but value is 0" },
+    ])("should return $expected when password is $desc", ({ value, expected }) => {
+      const risk = createRisk({ exposed_result: { type: "Found", value } });
+      expect(isPasswordAtRisk(risk)).toBe(expected);
+    });
+
+    it("should return false when password is not checked", () => {
+      expect(isPasswordAtRisk(createRisk())).toBe(false);
+    });
+  });
+
+  describe("password reuse risk", () => {
+    it.each([
+      { count: 2, expected: true, desc: "reused (reuse_count > 1)" },
+      { count: 1, expected: false, desc: "not reused" },
+      { count: undefined, expected: false, desc: "undefined" },
+    ])("should return $expected when reuse_count is $desc", ({ count, expected }) => {
+      const risk = createRisk({ reuse_count: count });
+      expect(isPasswordAtRisk(risk)).toBe(expected);
+    });
+  });
+
+  describe("password strength risk", () => {
+    it.each([
+      { strength: 0, expected: true },
+      { strength: 1, expected: true },
+      { strength: 2, expected: true },
+      { strength: 3, expected: false },
+      { strength: 4, expected: false },
+    ])("should return $expected when password strength is $strength", ({ strength, expected }) => {
+      const risk = createRisk({ password_strength: strength });
+      expect(isPasswordAtRisk(risk)).toBe(expected);
+    });
+  });
+
+  describe("multiple risk factors", () => {
+    it.each<{ desc: string; overrides: Partial<CipherRiskResult>; expected: boolean }>([
+      {
+        desc: "exposed and reused",
+        overrides: {
+          exposed_result: { type: "Found" as const, value: 3 },
+          reuse_count: 2,
+        },
+        expected: true,
+      },
+      {
+        desc: "reused and weak strength",
+        overrides: { password_strength: 2, reuse_count: 2 },
+        expected: true,
+      },
+      {
+        desc: "all three risk factors",
+        overrides: {
+          password_strength: 1,
+          exposed_result: { type: "Found" as const, value: 10 },
+          reuse_count: 3,
+        },
+        expected: true,
+      },
+      {
+        desc: "no risk factors",
+        overrides: { reuse_count: undefined },
+        expected: false,
+      },
+    ])("should return $expected when $desc present", ({ overrides, expected }) => {
+      const risk = createRisk(overrides);
+      expect(isPasswordAtRisk(risk)).toBe(expected);
+    });
+  });
+});
diff --git a/libs/common/src/vault/abstractions/cipher-risk.service.ts b/libs/common/src/vault/abstractions/cipher-risk.service.ts
new file mode 100644
index 00000000000..78f1c50da19
--- /dev/null
+++ b/libs/common/src/vault/abstractions/cipher-risk.service.ts
@@ -0,0 +1,69 @@
+import type {
+  CipherRiskResult,
+  CipherRiskOptions,
+  PasswordReuseMap,
+} from "@bitwarden/sdk-internal";
+
+import { UserId, CipherId } from "../../types/guid";
+import { CipherView } from "../models/view/cipher.view";
+
+export abstract class CipherRiskService {
+  /**
+   * Compute password risks for multiple ciphers.
+   * Only processes Login ciphers with passwords.
+   *
+   * @param ciphers - The ciphers to evaluate for password risks
+   * @param userId - The user ID for SDK client context
+   * @param options - Optional configuration for risk computation (passwordMap, checkExposed)
+   * @returns Array of CipherRisk results from SDK containing password_strength, exposed_result, and reuse_count
+   */
+  abstract computeRiskForCiphers(
+    ciphers: CipherView[],
+    userId: UserId,
+    options?: CipherRiskOptions,
+  ): Promise<CipherRiskResult[]>;
+
+  /**
+   * Compute password risk for a single cipher by its ID. Will automatically build a password reuse map
+   * from all the user's ciphers via the CipherService.
+   * @param cipherId
+   * @param userId
+   * @param checkExposed - Whether to check if the password has been exposed in data breaches via HIBP
+   * @returns CipherRisk result from SDK containing password_strength, exposed_result, and reuse_count
+   */
+  abstract computeCipherRiskForUser(
+    cipherId: CipherId,
+    userId: UserId,
+    checkExposed?: boolean,
+  ): Promise<CipherRiskResult>;
+
+  /**
+   * Build a password reuse map for the given ciphers.
+   * Maps each password to the number of times it appears across ciphers.
+   * Only processes Login ciphers with passwords.
+   *
+   * @param ciphers - The ciphers to analyze for password reuse
+   * @param userId - The user ID for SDK client context
+   * @returns A map of password to count of occurrences
+   */
+  abstract buildPasswordReuseMap(ciphers: CipherView[], userId: UserId): Promise<PasswordReuseMap>;
+}
+
+/**
+ * Evaluates if a password represented by a CipherRiskResult is considered at risk.
+ *
+ * A password is considered at risk if any of the following conditions are true:
+ * - The password has been exposed in data breaches
+ * - The password is reused across multiple ciphers
+ * - The password has weak strength (password_strength < 3)
+ *
+ * @param risk - The CipherRiskResult to evaluate
+ * @returns true if the password is at risk, false otherwise
+ */
+export function isPasswordAtRisk(risk: CipherRiskResult): boolean {
+  return (
+    (risk.exposed_result.type === "Found" && risk.exposed_result.value > 0) ||
+    (risk.reuse_count ?? 1) > 1 ||
+    risk.password_strength < 3
+  );
+}
diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts
index 7971b6d4658..9aefd960b2f 100644
--- a/libs/common/src/vault/abstractions/cipher.service.ts
+++ b/libs/common/src/vault/abstractions/cipher.service.ts
@@ -76,7 +76,10 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
     /** When true, will override the match strategy for the cipher if it is Never. */
     overrideNeverMatchStrategy?: true,
   ): Promise<C[]>;
-  abstract getAllFromApiForOrganization(organizationId: string): Promise<CipherView[]>;
+  abstract getAllFromApiForOrganization(
+    organizationId: string,
+    includeMemberItems?: boolean,
+  ): Promise<CipherView[]>;
   /**
    * Gets ciphers belonging to the specified organization that the user has explicit collection level access to.
    * Ciphers that are not assigned to any collections are only included for users with admin access.
diff --git a/libs/common/src/vault/abstractions/search.service.ts b/libs/common/src/vault/abstractions/search.service.ts
index 6b01302613c..29575ec3af9 100644
--- a/libs/common/src/vault/abstractions/search.service.ts
+++ b/libs/common/src/vault/abstractions/search.service.ts
@@ -6,6 +6,9 @@ import { CipherView } from "../models/view/cipher.view";
 import { CipherViewLike } from "../utils/cipher-view-like-utils";
 
 export abstract class SearchService {
+  abstract isCipherSearching$: Observable<boolean>;
+  abstract isSendSearching$: Observable<boolean>;
+
   abstract indexedEntityId$(userId: UserId): Observable<IndexedEntityId | null>;
 
   abstract clearIndex(userId: UserId): Promise<void>;
@@ -30,6 +33,7 @@ export abstract class SearchService {
     ciphers: C[],
     query: string,
     deleted?: boolean,
+    archived?: boolean,
   ): C[];
   abstract searchSends(sends: SendView[], query: string): SendView[];
 }
diff --git a/libs/common/src/vault/models/api/cipher-permissions.api.ts b/libs/common/src/vault/models/api/cipher-permissions.api.ts
index f9b62c4fc8d..cca5ffce79e 100644
--- a/libs/common/src/vault/models/api/cipher-permissions.api.ts
+++ b/libs/common/src/vault/models/api/cipher-permissions.api.ts
@@ -24,7 +24,9 @@ export class CipherPermissionsApi extends BaseResponse implements SdkCipherPermi
   /**
    * Converts the SDK CipherPermissionsApi to a CipherPermissionsApi.
    */
-  static fromSdkCipherPermissions(obj: SdkCipherPermissions): CipherPermissionsApi | undefined {
+  static fromSdkCipherPermissions(
+    obj: SdkCipherPermissions | undefined,
+  ): CipherPermissionsApi | undefined {
     if (!obj) {
       return undefined;
     }
diff --git a/libs/common/src/vault/models/data/attachment.data.ts b/libs/common/src/vault/models/data/attachment.data.ts
index dfc9f9d1afa..dde5db24b57 100644
--- a/libs/common/src/vault/models/data/attachment.data.ts
+++ b/libs/common/src/vault/models/data/attachment.data.ts
@@ -1,14 +1,12 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { AttachmentResponse } from "../response/attachment.response";
 
 export class AttachmentData {
-  id: string;
-  url: string;
-  fileName: string;
-  key: string;
-  size: string;
-  sizeName: string;
+  id?: string;
+  url?: string;
+  fileName?: string;
+  key?: string;
+  size?: string;
+  sizeName?: string;
 
   constructor(response?: AttachmentResponse) {
     if (response == null) {
diff --git a/libs/common/src/vault/models/data/card.data.ts b/libs/common/src/vault/models/data/card.data.ts
index 677c33f4886..8345c345fd7 100644
--- a/libs/common/src/vault/models/data/card.data.ts
+++ b/libs/common/src/vault/models/data/card.data.ts
@@ -1,14 +1,12 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CardApi } from "../api/card.api";
 
 export class CardData {
-  cardholderName: string;
-  brand: string;
-  number: string;
-  expMonth: string;
-  expYear: string;
-  code: string;
+  cardholderName?: string;
+  brand?: string;
+  number?: string;
+  expMonth?: string;
+  expYear?: string;
+  code?: string;
 
   constructor(data?: CardApi) {
     if (data == null) {
diff --git a/libs/common/src/vault/models/data/cipher.data.ts b/libs/common/src/vault/models/data/cipher.data.ts
index 4921cce8df2..743ea941b0e 100644
--- a/libs/common/src/vault/models/data/cipher.data.ts
+++ b/libs/common/src/vault/models/data/cipher.data.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
@@ -17,18 +15,18 @@ import { SecureNoteData } from "./secure-note.data";
 import { SshKeyData } from "./ssh-key.data";
 
 export class CipherData {
-  id: string;
-  organizationId: string;
-  folderId: string;
-  edit: boolean;
-  viewPassword: boolean;
-  permissions: CipherPermissionsApi;
-  organizationUseTotp: boolean;
-  favorite: boolean;
+  id: string = "";
+  organizationId?: string;
+  folderId?: string;
+  edit: boolean = false;
+  viewPassword: boolean = true;
+  permissions?: CipherPermissionsApi;
+  organizationUseTotp: boolean = false;
+  favorite: boolean = false;
   revisionDate: string;
-  type: CipherType;
-  name: string;
-  notes: string;
+  type: CipherType = CipherType.Login;
+  name: string = "";
+  notes?: string;
   login?: LoginData;
   secureNote?: SecureNoteData;
   card?: CardData;
@@ -39,13 +37,14 @@ export class CipherData {
   passwordHistory?: PasswordHistoryData[];
   collectionIds?: string[];
   creationDate: string;
-  deletedDate: string | undefined;
-  archivedDate: string | undefined;
-  reprompt: CipherRepromptType;
-  key: string;
+  deletedDate?: string;
+  archivedDate?: string;
+  reprompt: CipherRepromptType = CipherRepromptType.None;
+  key?: string;
 
   constructor(response?: CipherResponse, collectionIds?: string[]) {
     if (response == null) {
+      this.creationDate = this.revisionDate = new Date().toISOString();
       return;
     }
 
@@ -101,7 +100,9 @@ export class CipherData {
 
   static fromJSON(obj: Jsonify<CipherData>) {
     const result = Object.assign(new CipherData(), obj);
-    result.permissions = CipherPermissionsApi.fromJSON(obj.permissions);
+    if (obj.permissions != null) {
+      result.permissions = CipherPermissionsApi.fromJSON(obj.permissions);
+    }
     return result;
   }
 }
diff --git a/libs/common/src/vault/models/data/fido2-credential.data.ts b/libs/common/src/vault/models/data/fido2-credential.data.ts
index 94716e8d86c..602b74f9805 100644
--- a/libs/common/src/vault/models/data/fido2-credential.data.ts
+++ b/libs/common/src/vault/models/data/fido2-credential.data.ts
@@ -1,21 +1,19 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Fido2CredentialApi } from "../api/fido2-credential.api";
 
 export class Fido2CredentialData {
-  credentialId: string;
-  keyType: "public-key";
-  keyAlgorithm: "ECDSA";
-  keyCurve: "P-256";
-  keyValue: string;
-  rpId: string;
-  userHandle: string;
-  userName: string;
-  counter: string;
-  rpName: string;
-  userDisplayName: string;
-  discoverable: string;
-  creationDate: string;
+  credentialId!: string;
+  keyType!: string;
+  keyAlgorithm!: string;
+  keyCurve!: string;
+  keyValue!: string;
+  rpId!: string;
+  userHandle?: string;
+  userName?: string;
+  counter!: string;
+  rpName?: string;
+  userDisplayName?: string;
+  discoverable!: string;
+  creationDate!: string;
 
   constructor(data?: Fido2CredentialApi) {
     if (data == null) {
diff --git a/libs/common/src/vault/models/data/field.data.ts b/libs/common/src/vault/models/data/field.data.ts
index cf9df69a6b0..a63e903e665 100644
--- a/libs/common/src/vault/models/data/field.data.ts
+++ b/libs/common/src/vault/models/data/field.data.ts
@@ -1,13 +1,11 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { FieldType, LinkedIdType } from "../../enums";
 import { FieldApi } from "../api/field.api";
 
 export class FieldData {
-  type: FieldType;
-  name: string;
-  value: string;
-  linkedId: LinkedIdType | null;
+  type: FieldType = FieldType.Text;
+  name?: string;
+  value?: string;
+  linkedId?: LinkedIdType;
 
   constructor(response?: FieldApi) {
     if (response == null) {
diff --git a/libs/common/src/vault/models/data/identity.data.ts b/libs/common/src/vault/models/data/identity.data.ts
index 158daace371..de854df1ec6 100644
--- a/libs/common/src/vault/models/data/identity.data.ts
+++ b/libs/common/src/vault/models/data/identity.data.ts
@@ -1,26 +1,24 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { IdentityApi } from "../api/identity.api";
 
 export class IdentityData {
-  title: string;
-  firstName: string;
-  middleName: string;
-  lastName: string;
-  address1: string;
-  address2: string;
-  address3: string;
-  city: string;
-  state: string;
-  postalCode: string;
-  country: string;
-  company: string;
-  email: string;
-  phone: string;
-  ssn: string;
-  username: string;
-  passportNumber: string;
-  licenseNumber: string;
+  title?: string;
+  firstName?: string;
+  middleName?: string;
+  lastName?: string;
+  address1?: string;
+  address2?: string;
+  address3?: string;
+  city?: string;
+  state?: string;
+  postalCode?: string;
+  country?: string;
+  company?: string;
+  email?: string;
+  phone?: string;
+  ssn?: string;
+  username?: string;
+  passportNumber?: string;
+  licenseNumber?: string;
 
   constructor(data?: IdentityApi) {
     if (data == null) {
diff --git a/libs/common/src/vault/models/data/login-uri.data.ts b/libs/common/src/vault/models/data/login-uri.data.ts
index 852dad4e112..ea3a1d9adce 100644
--- a/libs/common/src/vault/models/data/login-uri.data.ts
+++ b/libs/common/src/vault/models/data/login-uri.data.ts
@@ -1,12 +1,10 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { UriMatchStrategySetting } from "../../../models/domain/domain-service";
 import { LoginUriApi } from "../api/login-uri.api";
 
 export class LoginUriData {
-  uri: string;
-  uriChecksum: string;
-  match: UriMatchStrategySetting = null;
+  uri?: string;
+  uriChecksum?: string;
+  match?: UriMatchStrategySetting;
 
   constructor(data?: LoginUriApi) {
     if (data == null) {
diff --git a/libs/common/src/vault/models/data/login.data.ts b/libs/common/src/vault/models/data/login.data.ts
index 0fe021d923c..8c0aba0fdaa 100644
--- a/libs/common/src/vault/models/data/login.data.ts
+++ b/libs/common/src/vault/models/data/login.data.ts
@@ -1,17 +1,15 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { LoginApi } from "../api/login.api";
 
 import { Fido2CredentialData } from "./fido2-credential.data";
 import { LoginUriData } from "./login-uri.data";
 
 export class LoginData {
-  uris: LoginUriData[];
-  username: string;
-  password: string;
-  passwordRevisionDate: string;
-  totp: string;
-  autofillOnPageLoad: boolean;
+  uris?: LoginUriData[];
+  username?: string;
+  password?: string;
+  passwordRevisionDate?: string;
+  totp?: string;
+  autofillOnPageLoad?: boolean;
   fido2Credentials?: Fido2CredentialData[];
 
   constructor(data?: LoginApi) {
diff --git a/libs/common/src/vault/models/data/password-history.data.ts b/libs/common/src/vault/models/data/password-history.data.ts
index 75a51ed3728..465b5e59b8d 100644
--- a/libs/common/src/vault/models/data/password-history.data.ts
+++ b/libs/common/src/vault/models/data/password-history.data.ts
@@ -1,10 +1,8 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { PasswordHistoryResponse } from "../response/password-history.response";
 
 export class PasswordHistoryData {
-  password: string;
-  lastUsedDate: string;
+  password!: string;
+  lastUsedDate!: string;
 
   constructor(response?: PasswordHistoryResponse) {
     if (response == null) {
diff --git a/libs/common/src/vault/models/data/secure-note.data.ts b/libs/common/src/vault/models/data/secure-note.data.ts
index 7d109398ab7..5556417ef9b 100644
--- a/libs/common/src/vault/models/data/secure-note.data.ts
+++ b/libs/common/src/vault/models/data/secure-note.data.ts
@@ -1,10 +1,8 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { SecureNoteType } from "../../enums";
 import { SecureNoteApi } from "../api/secure-note.api";
 
 export class SecureNoteData {
-  type: SecureNoteType;
+  type: SecureNoteType = SecureNoteType.Generic;
 
   constructor(data?: SecureNoteApi) {
     if (data == null) {
diff --git a/libs/common/src/vault/models/data/ssh-key.data.ts b/libs/common/src/vault/models/data/ssh-key.data.ts
index 2b93c93d931..1e06a1a7df5 100644
--- a/libs/common/src/vault/models/data/ssh-key.data.ts
+++ b/libs/common/src/vault/models/data/ssh-key.data.ts
@@ -1,11 +1,9 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { SshKeyApi } from "../api/ssh-key.api";
 
 export class SshKeyData {
-  privateKey: string;
-  publicKey: string;
-  keyFingerprint: string;
+  privateKey!: string;
+  publicKey!: string;
+  keyFingerprint!: string;
 
   constructor(data?: SshKeyApi) {
     if (data == null) {
diff --git a/libs/common/src/vault/models/domain/attachment.spec.ts b/libs/common/src/vault/models/domain/attachment.spec.ts
index 93f693f14c0..77bb3eda38d 100644
--- a/libs/common/src/vault/models/domain/attachment.spec.ts
+++ b/libs/common/src/vault/models/domain/attachment.spec.ts
@@ -32,13 +32,19 @@ describe("Attachment", () => {
     const attachment = new Attachment(data);
 
     expect(attachment).toEqual({
-      id: null,
-      url: null,
+      id: undefined,
+      url: undefined,
       size: undefined,
-      sizeName: null,
-      key: null,
-      fileName: null,
+      sizeName: undefined,
+      key: undefined,
+      fileName: undefined,
     });
+    expect(data.id).toBeUndefined();
+    expect(data.url).toBeUndefined();
+    expect(data.fileName).toBeUndefined();
+    expect(data.key).toBeUndefined();
+    expect(data.size).toBeUndefined();
+    expect(data.sizeName).toBeUndefined();
   });
 
   it("Convert", () => {
@@ -79,6 +85,8 @@ describe("Attachment", () => {
       attachment.key = mockEnc("key");
       attachment.fileName = mockEnc("fileName");
 
+      const userKey = new SymmetricCryptoKey(makeStaticByteArray(64));
+      keyService.getUserKey.mockResolvedValue(userKey as UserKey);
       encryptService.decryptFileData.mockResolvedValue(makeStaticByteArray(32));
       encryptService.unwrapSymmetricKey.mockResolvedValue(
         new SymmetricCryptoKey(makeStaticByteArray(64)),
@@ -152,8 +160,8 @@ describe("Attachment", () => {
       expect(actual).toBeInstanceOf(Attachment);
     });
 
-    it("returns null if object is null", () => {
-      expect(Attachment.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(Attachment.fromJSON(null)).toBeUndefined();
     });
   });
 
diff --git a/libs/common/src/vault/models/domain/attachment.ts b/libs/common/src/vault/models/domain/attachment.ts
index 5fff6b32aac..7b43af9be55 100644
--- a/libs/common/src/vault/models/domain/attachment.ts
+++ b/libs/common/src/vault/models/domain/attachment.ts
@@ -1,23 +1,23 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
+import { OrgKey, UserKey } from "@bitwarden/common/types/key";
 import { Attachment as SdkAttachment } from "@bitwarden/sdk-internal";
 
 import { EncString } from "../../../key-management/crypto/models/enc-string";
 import { Utils } from "../../../platform/misc/utils";
 import Domain from "../../../platform/models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { conditionalEncString, encStringFrom } from "../../utils/domain-utils";
 import { AttachmentData } from "../data/attachment.data";
 import { AttachmentView } from "../view/attachment.view";
 
 export class Attachment extends Domain {
-  id: string;
-  url: string;
-  size: string;
-  sizeName: string; // Readable size, ex: "4.2 KB" or "1.43 GB"
-  key: EncString;
-  fileName: EncString;
+  id?: string;
+  url?: string;
+  size?: string;
+  sizeName?: string; // Readable size, ex: "4.2 KB" or "1.43 GB"
+  key?: EncString;
+  fileName?: EncString;
 
   constructor(obj?: AttachmentData) {
     super();
@@ -25,23 +25,16 @@ export class Attachment extends Domain {
       return;
     }
 
+    this.id = obj.id;
+    this.url = obj.url;
     this.size = obj.size;
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        id: null,
-        url: null,
-        sizeName: null,
-        fileName: null,
-        key: null,
-      },
-      ["id", "url", "sizeName"],
-    );
+    this.sizeName = obj.sizeName;
+    this.fileName = conditionalEncString(obj.fileName);
+    this.key = conditionalEncString(obj.key);
   }
 
   async decrypt(
-    orgId: string,
+    orgId: string | undefined,
     context = "No Cipher Context",
     encKey?: SymmetricCryptoKey,
   ): Promise<AttachmentView> {
@@ -49,7 +42,7 @@ export class Attachment extends Domain {
       this,
       new AttachmentView(this),
       ["fileName"],
-      orgId,
+      orgId ?? null,
       encKey,
       "DomainType: Attachment; " + context,
     );
@@ -62,30 +55,46 @@ export class Attachment extends Domain {
     return view;
   }
 
-  private async decryptAttachmentKey(orgId: string, encKey?: SymmetricCryptoKey) {
+  private async decryptAttachmentKey(
+    orgId: string | undefined,
+    encKey?: SymmetricCryptoKey,
+  ): Promise<SymmetricCryptoKey | undefined> {
     try {
+      if (this.key == null) {
+        return undefined;
+      }
+
       if (encKey == null) {
-        encKey = await this.getKeyForDecryption(orgId);
+        const key = await this.getKeyForDecryption(orgId);
+
+        // If we don't have a key, we can't decrypt
+        if (key == null) {
+          return undefined;
+        }
+
+        encKey = key;
       }
 
       const encryptService = Utils.getContainerService().getEncryptService();
       const decValue = await encryptService.unwrapSymmetricKey(this.key, encKey);
       return decValue;
-      // FIXME: Remove when updating file. Eslint update
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
-      // TODO: error?
+      // eslint-disable-next-line no-console
+      console.error("[Attachment] Error decrypting attachment", e);
+      return undefined;
     }
   }
 
-  private async getKeyForDecryption(orgId: string) {
+  private async getKeyForDecryption(orgId: string | undefined): Promise<OrgKey | UserKey | null> {
     const keyService = Utils.getContainerService().getKeyService();
     return orgId != null ? await keyService.getOrgKey(orgId) : await keyService.getUserKey();
   }
 
   toAttachmentData(): AttachmentData {
     const a = new AttachmentData();
-    a.size = this.size;
+    if (this.size != null) {
+      a.size = this.size;
+    }
     this.buildDataModel(
       this,
       a,
@@ -101,18 +110,20 @@ export class Attachment extends Domain {
     return a;
   }
 
-  static fromJSON(obj: Partial<Jsonify<Attachment>>): Attachment {
+  static fromJSON(obj: Partial<Jsonify<Attachment>> | undefined): Attachment | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const key = EncString.fromJSON(obj.key);
-    const fileName = EncString.fromJSON(obj.fileName);
+    const attachment = new Attachment();
+    attachment.id = obj.id;
+    attachment.url = obj.url;
+    attachment.size = obj.size;
+    attachment.sizeName = obj.sizeName;
+    attachment.key = encStringFrom(obj.key);
+    attachment.fileName = encStringFrom(obj.fileName);
 
-    return Object.assign(new Attachment(), obj, {
-      key,
-      fileName,
-    });
+    return attachment;
   }
 
   /**
@@ -135,7 +146,7 @@ export class Attachment extends Domain {
    * Maps an SDK Attachment object to an Attachment
    * @param obj - The SDK attachment object
    */
-  static fromSdkAttachment(obj: SdkAttachment): Attachment | undefined {
+  static fromSdkAttachment(obj?: SdkAttachment): Attachment | undefined {
     if (!obj) {
       return undefined;
     }
@@ -145,8 +156,8 @@ export class Attachment extends Domain {
     attachment.url = obj.url;
     attachment.size = obj.size;
     attachment.sizeName = obj.sizeName;
-    attachment.fileName = EncString.fromJSON(obj.fileName);
-    attachment.key = EncString.fromJSON(obj.key);
+    attachment.fileName = encStringFrom(obj.fileName);
+    attachment.key = encStringFrom(obj.key);
 
     return attachment;
   }
diff --git a/libs/common/src/vault/models/domain/card.spec.ts b/libs/common/src/vault/models/domain/card.spec.ts
index 5a134651e32..185c2fa4b8f 100644
--- a/libs/common/src/vault/models/domain/card.spec.ts
+++ b/libs/common/src/vault/models/domain/card.spec.ts
@@ -22,13 +22,20 @@ describe("Card", () => {
     const card = new Card(data);
 
     expect(card).toEqual({
-      cardholderName: null,
-      brand: null,
-      number: null,
-      expMonth: null,
-      expYear: null,
-      code: null,
+      cardholderName: undefined,
+      brand: undefined,
+      number: undefined,
+      expMonth: undefined,
+      expYear: undefined,
+      code: undefined,
     });
+
+    expect(data.cardholderName).toBeUndefined();
+    expect(data.brand).toBeUndefined();
+    expect(data.number).toBeUndefined();
+    expect(data.expMonth).toBeUndefined();
+    expect(data.expYear).toBeUndefined();
+    expect(data.code).toBeUndefined();
   });
 
   it("Convert", () => {
@@ -63,7 +70,6 @@ describe("Card", () => {
     expect(view).toEqual({
       _brand: "brand",
       _number: "number",
-      _subTitle: null,
       cardholderName: "cardHolder",
       code: "code",
       expMonth: "expMonth",
@@ -95,8 +101,8 @@ describe("Card", () => {
       expect(actual).toBeInstanceOf(Card);
     });
 
-    it("returns null if object is null", () => {
-      expect(Card.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(Card.fromJSON(null)).toBeUndefined();
     });
   });
 
diff --git a/libs/common/src/vault/models/domain/card.ts b/libs/common/src/vault/models/domain/card.ts
index 89cc361b454..b3a087d44fb 100644
--- a/libs/common/src/vault/models/domain/card.ts
+++ b/libs/common/src/vault/models/domain/card.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { Card as SdkCard } from "@bitwarden/sdk-internal";
@@ -7,16 +5,17 @@ import { Card as SdkCard } from "@bitwarden/sdk-internal";
 import { EncString } from "../../../key-management/crypto/models/enc-string";
 import Domain from "../../../platform/models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { conditionalEncString, encStringFrom } from "../../utils/domain-utils";
 import { CardData } from "../data/card.data";
 import { CardView } from "../view/card.view";
 
 export class Card extends Domain {
-  cardholderName: EncString;
-  brand: EncString;
-  number: EncString;
-  expMonth: EncString;
-  expYear: EncString;
-  code: EncString;
+  cardholderName?: EncString;
+  brand?: EncString;
+  number?: EncString;
+  expMonth?: EncString;
+  expYear?: EncString;
+  code?: EncString;
 
   constructor(obj?: CardData) {
     super();
@@ -24,23 +23,16 @@ export class Card extends Domain {
       return;
     }
 
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        cardholderName: null,
-        brand: null,
-        number: null,
-        expMonth: null,
-        expYear: null,
-        code: null,
-      },
-      [],
-    );
+    this.cardholderName = conditionalEncString(obj.cardholderName);
+    this.brand = conditionalEncString(obj.brand);
+    this.number = conditionalEncString(obj.number);
+    this.expMonth = conditionalEncString(obj.expMonth);
+    this.expYear = conditionalEncString(obj.expYear);
+    this.code = conditionalEncString(obj.code);
   }
 
   async decrypt(
-    orgId: string,
+    orgId: string | undefined,
     context = "No Cipher Context",
     encKey?: SymmetricCryptoKey,
   ): Promise<CardView> {
@@ -48,7 +40,7 @@ export class Card extends Domain {
       this,
       new CardView(),
       ["cardholderName", "brand", "number", "expMonth", "expYear", "code"],
-      orgId,
+      orgId ?? null,
       encKey,
       "DomainType: Card; " + context,
     );
@@ -67,25 +59,20 @@ export class Card extends Domain {
     return c;
   }
 
-  static fromJSON(obj: Partial<Jsonify<Card>>): Card {
+  static fromJSON(obj: Partial<Jsonify<Card>> | undefined): Card | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const cardholderName = EncString.fromJSON(obj.cardholderName);
-    const brand = EncString.fromJSON(obj.brand);
-    const number = EncString.fromJSON(obj.number);
-    const expMonth = EncString.fromJSON(obj.expMonth);
-    const expYear = EncString.fromJSON(obj.expYear);
-    const code = EncString.fromJSON(obj.code);
-    return Object.assign(new Card(), obj, {
-      cardholderName,
-      brand,
-      number,
-      expMonth,
-      expYear,
-      code,
-    });
+    const card = new Card();
+    card.cardholderName = encStringFrom(obj.cardholderName);
+    card.brand = encStringFrom(obj.brand);
+    card.number = encStringFrom(obj.number);
+    card.expMonth = encStringFrom(obj.expMonth);
+    card.expYear = encStringFrom(obj.expYear);
+    card.code = encStringFrom(obj.code);
+
+    return card;
   }
 
   /**
@@ -108,18 +95,18 @@ export class Card extends Domain {
    * Maps an SDK Card object to a Card
    * @param obj - The SDK Card object
    */
-  static fromSdkCard(obj: SdkCard): Card | undefined {
-    if (obj == null) {
+  static fromSdkCard(obj?: SdkCard): Card | undefined {
+    if (!obj) {
       return undefined;
     }
 
     const card = new Card();
-    card.cardholderName = EncString.fromJSON(obj.cardholderName);
-    card.brand = EncString.fromJSON(obj.brand);
-    card.number = EncString.fromJSON(obj.number);
-    card.expMonth = EncString.fromJSON(obj.expMonth);
-    card.expYear = EncString.fromJSON(obj.expYear);
-    card.code = EncString.fromJSON(obj.code);
+    card.cardholderName = encStringFrom(obj.cardholderName);
+    card.brand = encStringFrom(obj.brand);
+    card.number = encStringFrom(obj.number);
+    card.expMonth = encStringFrom(obj.expMonth);
+    card.expYear = encStringFrom(obj.expYear);
+    card.code = encStringFrom(obj.code);
 
     return card;
   }
diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts
index c2cb99740db..87301928c57 100644
--- a/libs/common/src/vault/models/domain/cipher.spec.ts
+++ b/libs/common/src/vault/models/domain/cipher.spec.ts
@@ -44,31 +44,28 @@ describe("Cipher DTO", () => {
     const data = new CipherData();
     const cipher = new Cipher(data);
 
-    expect(cipher).toEqual({
-      initializerKey: InitializerKey.Cipher,
-      id: null,
-      organizationId: null,
-      folderId: null,
-      name: null,
-      notes: null,
-      type: undefined,
-      favorite: undefined,
-      organizationUseTotp: undefined,
-      edit: undefined,
-      viewPassword: true,
-      revisionDate: null,
-      collectionIds: undefined,
-      localData: null,
-      creationDate: null,
-      deletedDate: undefined,
-      reprompt: undefined,
-      attachments: null,
-      fields: null,
-      passwordHistory: null,
-      key: null,
-      permissions: undefined,
-      archivedDate: undefined,
-    });
+    expect(cipher.id).toEqual("");
+    expect(cipher.organizationId).toBeUndefined();
+    expect(cipher.folderId).toBeUndefined();
+    expect(cipher.name).toBeInstanceOf(EncString);
+    expect(cipher.notes).toBeUndefined();
+    expect(cipher.type).toEqual(CipherType.Login);
+    expect(cipher.favorite).toEqual(false);
+    expect(cipher.organizationUseTotp).toEqual(false);
+    expect(cipher.edit).toEqual(false);
+    expect(cipher.viewPassword).toEqual(true);
+    expect(cipher.revisionDate).toBeInstanceOf(Date);
+    expect(cipher.collectionIds).toEqual([]);
+    expect(cipher.localData).toBeUndefined();
+    expect(cipher.creationDate).toBeInstanceOf(Date);
+    expect(cipher.deletedDate).toBeUndefined();
+    expect(cipher.reprompt).toEqual(CipherRepromptType.None);
+    expect(cipher.attachments).toBeUndefined();
+    expect(cipher.fields).toBeUndefined();
+    expect(cipher.passwordHistory).toBeUndefined();
+    expect(cipher.key).toBeUndefined();
+    expect(cipher.permissions).toBeUndefined();
+    expect(cipher.archivedDate).toBeUndefined();
   });
 
   it("Decrypt should handle cipher key error", async () => {
@@ -121,7 +118,7 @@ describe("Cipher DTO", () => {
       edit: true,
       viewPassword: true,
       decryptionFailure: true,
-      collectionIds: undefined,
+      collectionIds: [],
       revisionDate: new Date("2022-01-31T12:00:00.000Z"),
       creationDate: new Date("2022-01-01T12:00:00.000Z"),
       deletedDate: undefined,
@@ -155,6 +152,7 @@ describe("Cipher DTO", () => {
         reprompt: CipherRepromptType.None,
         key: "EncryptedString",
         archivedDate: undefined,
+        collectionIds: [],
         login: {
           uris: [
             {
@@ -223,8 +221,8 @@ describe("Cipher DTO", () => {
         edit: true,
         viewPassword: true,
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
-        collectionIds: undefined,
-        localData: null,
+        collectionIds: [],
+        localData: undefined,
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         deletedDate: undefined,
         permissions: new CipherPermissionsApi(),
@@ -265,13 +263,13 @@ describe("Cipher DTO", () => {
         ],
         fields: [
           {
-            linkedId: null,
+            linkedId: undefined,
             name: { encryptedString: "EncryptedString", encryptionType: 0 },
             type: 0,
             value: { encryptedString: "EncryptedString", encryptionType: 0 },
           },
           {
-            linkedId: null,
+            linkedId: undefined,
             name: { encryptedString: "EncryptedString", encryptionType: 0 },
             type: 1,
             value: { encryptedString: "EncryptedString", encryptionType: 0 },
@@ -348,7 +346,7 @@ describe("Cipher DTO", () => {
         attachments: [],
         fields: [],
         passwordHistory: [],
-        collectionIds: undefined,
+        collectionIds: [],
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         deletedDate: undefined,
@@ -380,6 +378,7 @@ describe("Cipher DTO", () => {
         deletedDate: undefined,
         reprompt: CipherRepromptType.None,
         key: "EncKey",
+        collectionIds: [],
         secureNote: {
           type: SecureNoteType.Generic,
         },
@@ -404,15 +403,15 @@ describe("Cipher DTO", () => {
         edit: true,
         viewPassword: true,
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
-        collectionIds: undefined,
-        localData: null,
+        collectionIds: [],
+        localData: undefined,
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         deletedDate: undefined,
         reprompt: 0,
         secureNote: { type: SecureNoteType.Generic },
-        attachments: null,
-        fields: null,
-        passwordHistory: null,
+        attachments: undefined,
+        fields: undefined,
+        passwordHistory: undefined,
         key: { encryptedString: "EncKey", encryptionType: 0 },
         permissions: new CipherPermissionsApi(),
         archivedDate: undefined,
@@ -475,7 +474,7 @@ describe("Cipher DTO", () => {
         attachments: [],
         fields: [],
         passwordHistory: [],
-        collectionIds: undefined,
+        collectionIds: [],
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         deletedDate: undefined,
@@ -507,6 +506,7 @@ describe("Cipher DTO", () => {
         deletedDate: undefined,
         permissions: new CipherPermissionsApi(),
         reprompt: CipherRepromptType.None,
+        collectionIds: [],
         card: {
           cardholderName: "EncryptedString",
           brand: "EncryptedString",
@@ -536,8 +536,8 @@ describe("Cipher DTO", () => {
         edit: true,
         viewPassword: true,
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
-        collectionIds: undefined,
-        localData: null,
+        collectionIds: [],
+        localData: undefined,
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         deletedDate: undefined,
         reprompt: 0,
@@ -549,9 +549,9 @@ describe("Cipher DTO", () => {
           expYear: { encryptedString: "EncryptedString", encryptionType: 0 },
           code: { encryptedString: "EncryptedString", encryptionType: 0 },
         },
-        attachments: null,
-        fields: null,
-        passwordHistory: null,
+        attachments: undefined,
+        fields: undefined,
+        passwordHistory: undefined,
         key: { encryptedString: "EncKey", encryptionType: 0 },
         permissions: new CipherPermissionsApi(),
         archivedDate: undefined,
@@ -620,7 +620,7 @@ describe("Cipher DTO", () => {
         attachments: [],
         fields: [],
         passwordHistory: [],
-        collectionIds: undefined,
+        collectionIds: [],
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         deletedDate: undefined,
@@ -654,6 +654,7 @@ describe("Cipher DTO", () => {
         reprompt: CipherRepromptType.None,
         key: "EncKey",
         archivedDate: undefined,
+        collectionIds: [],
         identity: {
           title: "EncryptedString",
           firstName: "EncryptedString",
@@ -693,8 +694,8 @@ describe("Cipher DTO", () => {
         edit: true,
         viewPassword: true,
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
-        collectionIds: undefined,
-        localData: null,
+        collectionIds: [],
+        localData: undefined,
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         deletedDate: undefined,
         reprompt: 0,
@@ -719,9 +720,9 @@ describe("Cipher DTO", () => {
           passportNumber: { encryptedString: "EncryptedString", encryptionType: 0 },
           licenseNumber: { encryptedString: "EncryptedString", encryptionType: 0 },
         },
-        attachments: null,
-        fields: null,
-        passwordHistory: null,
+        attachments: undefined,
+        fields: undefined,
+        passwordHistory: undefined,
         key: { encryptedString: "EncKey", encryptionType: 0 },
         permissions: new CipherPermissionsApi(),
       });
@@ -789,7 +790,7 @@ describe("Cipher DTO", () => {
         attachments: [],
         fields: [],
         passwordHistory: [],
-        collectionIds: undefined,
+        collectionIds: [],
         revisionDate: new Date("2022-01-31T12:00:00.000Z"),
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         deletedDate: undefined,
@@ -835,6 +836,38 @@ describe("Cipher DTO", () => {
       expect(actual).toBeInstanceOf(Cipher);
     });
 
+    it("handles null permissions correctly without calling CipherPermissionsApi constructor", () => {
+      const spy = jest.spyOn(CipherPermissionsApi.prototype, "constructor" as any);
+      const revisionDate = new Date("2022-08-04T01:06:40.441Z");
+      const actual = Cipher.fromJSON({
+        name: "myName",
+        revisionDate: revisionDate.toISOString(),
+        permissions: null,
+      } as Jsonify<Cipher>);
+
+      expect(actual.permissions).toBeUndefined();
+      expect(actual).toBeInstanceOf(Cipher);
+      // Verify that CipherPermissionsApi constructor was not called for null permissions
+      expect(spy).not.toHaveBeenCalledWith(null);
+      spy.mockRestore();
+    });
+
+    it("calls CipherPermissionsApi constructor when permissions are provided", () => {
+      const spy = jest.spyOn(CipherPermissionsApi.prototype, "constructor" as any);
+      const revisionDate = new Date("2022-08-04T01:06:40.441Z");
+      const permissionsObj = { delete: true, restore: false };
+      const actual = Cipher.fromJSON({
+        name: "myName",
+        revisionDate: revisionDate.toISOString(),
+        permissions: permissionsObj,
+      } as Jsonify<Cipher>);
+
+      expect(actual.permissions).toBeInstanceOf(CipherPermissionsApi);
+      expect(actual.permissions.delete).toBe(true);
+      expect(actual.permissions.restore).toBe(false);
+      spy.mockRestore();
+    });
+
     test.each([
       // Test description, CipherType, expected output
       ["LoginView", CipherType.Login, { login: "myLogin_fromJSON" }],
@@ -858,8 +891,8 @@ describe("Cipher DTO", () => {
       expect(actual).toMatchObject(expected);
     });
 
-    it("returns null if object is null", () => {
-      expect(Cipher.fromJSON(null)).toBeNull();
+    it("returns undefined if object is undefined", () => {
+      expect(Cipher.fromJSON(undefined)).toBeUndefined();
     });
   });
 
@@ -1055,6 +1088,7 @@ describe("Cipher DTO", () => {
         card: undefined,
         secureNote: undefined,
         sshKey: undefined,
+        data: undefined,
         favorite: false,
         reprompt: SdkCipherRepromptType.None,
         organizationUseTotp: true,
diff --git a/libs/common/src/vault/models/domain/cipher.ts b/libs/common/src/vault/models/domain/cipher.ts
index b80f38f66af..bbbf6a6a054 100644
--- a/libs/common/src/vault/models/domain/cipher.ts
+++ b/libs/common/src/vault/models/domain/cipher.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { Cipher as SdkCipher } from "@bitwarden/sdk-internal";
@@ -13,6 +11,7 @@ import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-cr
 import { InitializerKey } from "../../../platform/services/cryptography/initializer-key";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
+import { conditionalEncString, encStringFrom } from "../../utils/domain-utils";
 import { CipherPermissionsApi } from "../api/cipher-permissions.api";
 import { CipherData } from "../data/cipher.data";
 import { LocalData, fromSdkLocalData, toSdkLocalData } from "../data/local.data";
@@ -33,71 +32,60 @@ import { SshKey } from "./ssh-key";
 export class Cipher extends Domain implements Decryptable<CipherView> {
   readonly initializerKey = InitializerKey.Cipher;
 
-  id: string;
-  organizationId: string;
-  folderId: string;
-  name: EncString;
-  notes: EncString;
-  type: CipherType;
-  favorite: boolean;
-  organizationUseTotp: boolean;
-  edit: boolean;
-  viewPassword: boolean;
-  permissions: CipherPermissionsApi;
+  id: string = "";
+  organizationId?: string;
+  folderId?: string;
+  name: EncString = new EncString("");
+  notes?: EncString;
+  type: CipherType = CipherType.Login;
+  favorite: boolean = false;
+  organizationUseTotp: boolean = false;
+  edit: boolean = false;
+  viewPassword: boolean = true;
+  permissions?: CipherPermissionsApi;
   revisionDate: Date;
-  localData: LocalData;
-  login: Login;
-  identity: Identity;
-  card: Card;
-  secureNote: SecureNote;
-  sshKey: SshKey;
-  attachments: Attachment[];
-  fields: Field[];
-  passwordHistory: Password[];
-  collectionIds: string[];
+  localData?: LocalData;
+  login?: Login;
+  identity?: Identity;
+  card?: Card;
+  secureNote?: SecureNote;
+  sshKey?: SshKey;
+  attachments?: Attachment[];
+  fields?: Field[];
+  passwordHistory?: Password[];
+  collectionIds: string[] = [];
   creationDate: Date;
-  deletedDate: Date | undefined;
-  archivedDate: Date | undefined;
-  reprompt: CipherRepromptType;
-  key: EncString;
+  deletedDate?: Date;
+  archivedDate?: Date;
+  reprompt: CipherRepromptType = CipherRepromptType.None;
+  key?: EncString;
 
-  constructor(obj?: CipherData, localData: LocalData = null) {
+  constructor(obj?: CipherData, localData?: LocalData) {
     super();
     if (obj == null) {
+      this.creationDate = this.revisionDate = new Date();
       return;
     }
 
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        id: null,
-        organizationId: null,
-        folderId: null,
-        name: null,
-        notes: null,
-        key: null,
-      },
-      ["id", "organizationId", "folderId"],
-    );
-
+    this.id = obj.id;
+    this.organizationId = obj.organizationId;
+    this.folderId = obj.folderId;
+    this.name = new EncString(obj.name);
+    this.notes = conditionalEncString(obj.notes);
     this.type = obj.type;
     this.favorite = obj.favorite;
     this.organizationUseTotp = obj.organizationUseTotp;
     this.edit = obj.edit;
-    if (obj.viewPassword != null) {
-      this.viewPassword = obj.viewPassword;
-    } else {
-      this.viewPassword = true; // Default for already synced Ciphers without viewPassword
-    }
+    this.viewPassword = obj.viewPassword;
     this.permissions = obj.permissions;
-    this.revisionDate = obj.revisionDate != null ? new Date(obj.revisionDate) : null;
-    this.collectionIds = obj.collectionIds;
+    this.revisionDate = new Date(obj.revisionDate);
     this.localData = localData;
-    this.creationDate = obj.creationDate != null ? new Date(obj.creationDate) : null;
+    this.collectionIds = obj.collectionIds ?? [];
+    this.creationDate = new Date(obj.creationDate);
     this.deletedDate = obj.deletedDate != null ? new Date(obj.deletedDate) : undefined;
     this.archivedDate = obj.archivedDate != null ? new Date(obj.archivedDate) : undefined;
     this.reprompt = obj.reprompt;
+    this.key = conditionalEncString(obj.key);
 
     switch (this.type) {
       case CipherType.Login:
@@ -121,20 +109,14 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
 
     if (obj.attachments != null) {
       this.attachments = obj.attachments.map((a) => new Attachment(a));
-    } else {
-      this.attachments = null;
     }
 
     if (obj.fields != null) {
       this.fields = obj.fields.map((f) => new Field(f));
-    } else {
-      this.fields = null;
     }
 
     if (obj.passwordHistory != null) {
       this.passwordHistory = obj.passwordHistory.map((ph) => new Password(ph));
-    } else {
-      this.passwordHistory = null;
     }
   }
 
@@ -163,42 +145,52 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
       this,
       model,
       ["name", "notes"],
-      this.organizationId,
+      this.organizationId ?? null,
       encKey,
     );
 
     switch (this.type) {
       case CipherType.Login:
-        model.login = await this.login.decrypt(
-          this.organizationId,
-          bypassValidation,
-          `Cipher Id: ${this.id}`,
-          encKey,
-        );
+        if (this.login != null) {
+          model.login = await this.login.decrypt(
+            this.organizationId,
+            bypassValidation,
+            `Cipher Id: ${this.id}`,
+            encKey,
+          );
+        }
         break;
       case CipherType.SecureNote:
-        model.secureNote = await this.secureNote.decrypt(
-          this.organizationId,
-          `Cipher Id: ${this.id}`,
-          encKey,
-        );
+        if (this.secureNote != null) {
+          model.secureNote = await this.secureNote.decrypt();
+        }
         break;
       case CipherType.Card:
-        model.card = await this.card.decrypt(this.organizationId, `Cipher Id: ${this.id}`, encKey);
+        if (this.card != null) {
+          model.card = await this.card.decrypt(
+            this.organizationId,
+            `Cipher Id: ${this.id}`,
+            encKey,
+          );
+        }
         break;
       case CipherType.Identity:
-        model.identity = await this.identity.decrypt(
-          this.organizationId,
-          `Cipher Id: ${this.id}`,
-          encKey,
-        );
+        if (this.identity != null) {
+          model.identity = await this.identity.decrypt(
+            this.organizationId,
+            `Cipher Id: ${this.id}`,
+            encKey,
+          );
+        }
         break;
       case CipherType.SshKey:
-        model.sshKey = await this.sshKey.decrypt(
-          this.organizationId,
-          `Cipher Id: ${this.id}`,
-          encKey,
-        );
+        if (this.sshKey != null) {
+          model.sshKey = await this.sshKey.decrypt(
+            this.organizationId,
+            `Cipher Id: ${this.id}`,
+            encKey,
+          );
+        }
         break;
       default:
         break;
@@ -207,9 +199,12 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     if (this.attachments != null && this.attachments.length > 0) {
       const attachments: AttachmentView[] = [];
       for (const attachment of this.attachments) {
-        attachments.push(
-          await attachment.decrypt(this.organizationId, `Cipher Id: ${this.id}`, encKey),
+        const decryptedAttachment = await attachment.decrypt(
+          this.organizationId,
+          `Cipher Id: ${this.id}`,
+          encKey,
         );
+        attachments.push(decryptedAttachment);
       }
       model.attachments = attachments;
     }
@@ -217,7 +212,8 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     if (this.fields != null && this.fields.length > 0) {
       const fields: FieldView[] = [];
       for (const field of this.fields) {
-        fields.push(await field.decrypt(this.organizationId, encKey));
+        const decryptedField = await field.decrypt(this.organizationId, encKey);
+        fields.push(decryptedField);
       }
       model.fields = fields;
     }
@@ -225,7 +221,8 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     if (this.passwordHistory != null && this.passwordHistory.length > 0) {
       const passwordHistory: PasswordHistoryView[] = [];
       for (const ph of this.passwordHistory) {
-        passwordHistory.push(await ph.decrypt(this.organizationId, encKey));
+        const decryptedPh = await ph.decrypt(this.organizationId, encKey);
+        passwordHistory.push(decryptedPh);
       }
       model.passwordHistory = passwordHistory;
     }
@@ -236,20 +233,32 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
   toCipherData(): CipherData {
     const c = new CipherData();
     c.id = this.id;
-    c.organizationId = this.organizationId;
-    c.folderId = this.folderId;
+    if (this.organizationId != null) {
+      c.organizationId = this.organizationId;
+    }
+
+    if (this.folderId != null) {
+      c.folderId = this.folderId;
+    }
     c.edit = this.edit;
     c.viewPassword = this.viewPassword;
     c.organizationUseTotp = this.organizationUseTotp;
     c.favorite = this.favorite;
-    c.revisionDate = this.revisionDate != null ? this.revisionDate.toISOString() : null;
+    c.revisionDate = this.revisionDate.toISOString();
     c.type = this.type;
     c.collectionIds = this.collectionIds;
-    c.creationDate = this.creationDate != null ? this.creationDate.toISOString() : null;
+    c.creationDate = this.creationDate.toISOString();
     c.deletedDate = this.deletedDate != null ? this.deletedDate.toISOString() : undefined;
     c.reprompt = this.reprompt;
-    c.key = this.key?.encryptedString;
-    c.permissions = this.permissions;
+
+    if (this.key != null && this.key.encryptedString != null) {
+      c.key = this.key.encryptedString;
+    }
+
+    if (this.permissions != null) {
+      c.permissions = this.permissions;
+    }
+
     c.archivedDate = this.archivedDate != null ? this.archivedDate.toISOString() : undefined;
 
     this.buildDataModel(this, c, {
@@ -259,19 +268,29 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
 
     switch (c.type) {
       case CipherType.Login:
-        c.login = this.login.toLoginData();
+        if (this.login != null) {
+          c.login = this.login.toLoginData();
+        }
         break;
       case CipherType.SecureNote:
-        c.secureNote = this.secureNote.toSecureNoteData();
+        if (this.secureNote != null) {
+          c.secureNote = this.secureNote.toSecureNoteData();
+        }
         break;
       case CipherType.Card:
-        c.card = this.card.toCardData();
+        if (this.card != null) {
+          c.card = this.card.toCardData();
+        }
         break;
       case CipherType.Identity:
-        c.identity = this.identity.toIdentityData();
+        if (this.identity != null) {
+          c.identity = this.identity.toIdentityData();
+        }
         break;
       case CipherType.SshKey:
-        c.sshKey = this.sshKey.toSshKeyData();
+        if (this.sshKey != null) {
+          c.sshKey = this.sshKey.toSshKeyData();
+        }
         break;
       default:
         break;
@@ -289,51 +308,71 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     return c;
   }
 
-  static fromJSON(obj: Jsonify<Cipher>) {
+  static fromJSON(obj: Jsonify<Cipher> | undefined): Cipher | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
     const domain = new Cipher();
-    const name = EncString.fromJSON(obj.name);
-    const notes = EncString.fromJSON(obj.notes);
-    const creationDate = obj.creationDate == null ? null : new Date(obj.creationDate);
-    const revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
-    const deletedDate = obj.deletedDate == null ? undefined : new Date(obj.deletedDate);
-    const attachments = obj.attachments?.map((a: any) => Attachment.fromJSON(a));
-    const fields = obj.fields?.map((f: any) => Field.fromJSON(f));
-    const passwordHistory = obj.passwordHistory?.map((ph: any) => Password.fromJSON(ph));
-    const key = EncString.fromJSON(obj.key);
-    const archivedDate = obj.archivedDate == null ? undefined : new Date(obj.archivedDate);
 
-    Object.assign(domain, obj, {
-      name,
-      notes,
-      creationDate,
-      revisionDate,
-      deletedDate,
-      attachments,
-      fields,
-      passwordHistory,
-      key,
-      archivedDate,
-    });
+    domain.id = obj.id;
+    domain.organizationId = obj.organizationId;
+    domain.folderId = obj.folderId;
+    domain.type = obj.type;
+    domain.favorite = obj.favorite;
+    domain.organizationUseTotp = obj.organizationUseTotp;
+    domain.edit = obj.edit;
+    domain.viewPassword = obj.viewPassword;
+
+    if (obj.permissions != null) {
+      domain.permissions = new CipherPermissionsApi(obj.permissions);
+    }
+
+    domain.collectionIds = obj.collectionIds;
+    domain.localData = obj.localData;
+    domain.reprompt = obj.reprompt;
+    domain.creationDate = new Date(obj.creationDate);
+    domain.revisionDate = new Date(obj.revisionDate);
+    domain.deletedDate = obj.deletedDate != null ? new Date(obj.deletedDate) : undefined;
+    domain.archivedDate = obj.archivedDate != null ? new Date(obj.archivedDate) : undefined;
+    domain.name = EncString.fromJSON(obj.name);
+    domain.notes = encStringFrom(obj.notes);
+    domain.key = encStringFrom(obj.key);
+    domain.attachments = obj.attachments
+      ?.map((a: any) => Attachment.fromJSON(a))
+      .filter((a): a is Attachment => a != null);
+    domain.fields = obj.fields
+      ?.map((f: any) => Field.fromJSON(f))
+      .filter((f): f is Field => f != null);
+    domain.passwordHistory = obj.passwordHistory
+      ?.map((ph: any) => Password.fromJSON(ph))
+      .filter((ph): ph is Password => ph != null);
 
     switch (obj.type) {
       case CipherType.Card:
-        domain.card = Card.fromJSON(obj.card);
+        if (obj.card != null) {
+          domain.card = Card.fromJSON(obj.card);
+        }
         break;
       case CipherType.Identity:
-        domain.identity = Identity.fromJSON(obj.identity);
+        if (obj.identity != null) {
+          domain.identity = Identity.fromJSON(obj.identity);
+        }
         break;
       case CipherType.Login:
-        domain.login = Login.fromJSON(obj.login);
+        if (obj.login != null) {
+          domain.login = Login.fromJSON(obj.login);
+        }
         break;
       case CipherType.SecureNote:
-        domain.secureNote = SecureNote.fromJSON(obj.secureNote);
+        if (obj.secureNote != null) {
+          domain.secureNote = SecureNote.fromJSON(obj.secureNote);
+        }
         break;
       case CipherType.SshKey:
-        domain.sshKey = SshKey.fromJSON(obj.sshKey);
+        if (obj.sshKey != null) {
+          domain.sshKey = SshKey.fromJSON(obj.sshKey);
+        }
         break;
       default:
         break;
@@ -349,7 +388,7 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
    */
   toSdkCipher(): SdkCipher {
     const sdkCipher: SdkCipher = {
-      id: asUuid(this.id),
+      id: this.id ? asUuid(this.id) : undefined,
       organizationId: this.organizationId ? asUuid(this.organizationId) : undefined,
       folderId: this.folderId ? asUuid(this.folderId) : undefined,
       collectionIds: this.collectionIds ? this.collectionIds.map(asUuid) : ([] as any),
@@ -357,48 +396,62 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
       name: this.name.toSdk(),
       notes: this.notes?.toSdk(),
       type: this.type,
-      favorite: this.favorite ?? false,
-      organizationUseTotp: this.organizationUseTotp ?? false,
-      edit: this.edit ?? true,
+      favorite: this.favorite,
+      organizationUseTotp: this.organizationUseTotp,
+      edit: this.edit,
       permissions: this.permissions
         ? {
             delete: this.permissions.delete,
             restore: this.permissions.restore,
           }
         : undefined,
-      viewPassword: this.viewPassword ?? true,
+      viewPassword: this.viewPassword,
       localData: toSdkLocalData(this.localData),
       attachments: this.attachments?.map((a) => a.toSdkAttachment()),
       fields: this.fields?.map((f) => f.toSdkField()),
       passwordHistory: this.passwordHistory?.map((ph) => ph.toSdkPasswordHistory()),
-      revisionDate: this.revisionDate?.toISOString(),
-      creationDate: this.creationDate?.toISOString(),
+      revisionDate: this.revisionDate.toISOString(),
+      creationDate: this.creationDate.toISOString(),
       deletedDate: this.deletedDate?.toISOString(),
       archivedDate: this.archivedDate?.toISOString(),
-      reprompt: this.reprompt,
+      reprompt:
+        this.reprompt === CipherRepromptType.Password
+          ? CipherRepromptType.Password
+          : CipherRepromptType.None,
       // Initialize all cipher-type-specific properties as undefined
       login: undefined,
       identity: undefined,
       card: undefined,
       secureNote: undefined,
       sshKey: undefined,
+      data: undefined,
     };
 
     switch (this.type) {
       case CipherType.Login:
-        sdkCipher.login = this.login.toSdkLogin();
+        if (this.login != null) {
+          sdkCipher.login = this.login.toSdkLogin();
+        }
         break;
       case CipherType.SecureNote:
-        sdkCipher.secureNote = this.secureNote.toSdkSecureNote();
+        if (this.secureNote != null) {
+          sdkCipher.secureNote = this.secureNote.toSdkSecureNote();
+        }
         break;
       case CipherType.Card:
-        sdkCipher.card = this.card.toSdkCard();
+        if (this.card != null) {
+          sdkCipher.card = this.card.toSdkCard();
+        }
         break;
       case CipherType.Identity:
-        sdkCipher.identity = this.identity.toSdkIdentity();
+        if (this.identity != null) {
+          sdkCipher.identity = this.identity.toSdkIdentity();
+        }
         break;
       case CipherType.SshKey:
-        sdkCipher.sshKey = this.sshKey.toSdkSshKey();
+        if (this.sshKey != null) {
+          sdkCipher.sshKey = this.sshKey.toSdkSshKey();
+        }
         break;
       default:
         break;
@@ -411,22 +464,22 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
    * Maps an SDK Cipher object to a Cipher
    * @param sdkCipher - The SDK Cipher object
    */
-  static fromSdkCipher(sdkCipher: SdkCipher | null): Cipher | undefined {
+  static fromSdkCipher(sdkCipher?: SdkCipher): Cipher | undefined {
     if (sdkCipher == null) {
       return undefined;
     }
 
     const cipher = new Cipher();
 
-    cipher.id = sdkCipher.id ? uuidAsString(sdkCipher.id) : undefined;
+    cipher.id = sdkCipher.id ? uuidAsString(sdkCipher.id) : "";
     cipher.organizationId = sdkCipher.organizationId
       ? uuidAsString(sdkCipher.organizationId)
       : undefined;
     cipher.folderId = sdkCipher.folderId ? uuidAsString(sdkCipher.folderId) : undefined;
     cipher.collectionIds = sdkCipher.collectionIds ? sdkCipher.collectionIds.map(uuidAsString) : [];
-    cipher.key = EncString.fromJSON(sdkCipher.key);
+    cipher.key = encStringFrom(sdkCipher.key);
     cipher.name = EncString.fromJSON(sdkCipher.name);
-    cipher.notes = EncString.fromJSON(sdkCipher.notes);
+    cipher.notes = encStringFrom(sdkCipher.notes);
     cipher.type = sdkCipher.type;
     cipher.favorite = sdkCipher.favorite;
     cipher.organizationUseTotp = sdkCipher.organizationUseTotp;
@@ -434,10 +487,15 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     cipher.permissions = CipherPermissionsApi.fromSdkCipherPermissions(sdkCipher.permissions);
     cipher.viewPassword = sdkCipher.viewPassword;
     cipher.localData = fromSdkLocalData(sdkCipher.localData);
-    cipher.attachments = sdkCipher.attachments?.map((a) => Attachment.fromSdkAttachment(a)) ?? [];
-    cipher.fields = sdkCipher.fields?.map((f) => Field.fromSdkField(f)) ?? [];
-    cipher.passwordHistory =
-      sdkCipher.passwordHistory?.map((ph) => Password.fromSdkPasswordHistory(ph)) ?? [];
+    cipher.attachments = sdkCipher.attachments
+      ?.map((a) => Attachment.fromSdkAttachment(a))
+      .filter((a): a is Attachment => a != null);
+    cipher.fields = sdkCipher.fields
+      ?.map((f) => Field.fromSdkField(f))
+      .filter((f): f is Field => f != null);
+    cipher.passwordHistory = sdkCipher.passwordHistory
+      ?.map((ph) => Password.fromSdkPasswordHistory(ph))
+      .filter((ph): ph is Password => ph != null);
     cipher.creationDate = new Date(sdkCipher.creationDate);
     cipher.revisionDate = new Date(sdkCipher.revisionDate);
     cipher.deletedDate = sdkCipher.deletedDate ? new Date(sdkCipher.deletedDate) : undefined;
diff --git a/libs/common/src/vault/models/domain/fido2-credential.spec.ts b/libs/common/src/vault/models/domain/fido2-credential.spec.ts
index e245e54de7c..3f43775433e 100644
--- a/libs/common/src/vault/models/domain/fido2-credential.spec.ts
+++ b/libs/common/src/vault/models/domain/fido2-credential.spec.ts
@@ -13,25 +13,23 @@ describe("Fido2Credential", () => {
   });
 
   describe("constructor", () => {
-    it("returns all fields null when given empty data parameter", () => {
+    it("returns all fields undefined when given empty data parameter", () => {
       const data = new Fido2CredentialData();
       const credential = new Fido2Credential(data);
 
-      expect(credential).toEqual({
-        credentialId: null,
-        keyType: null,
-        keyAlgorithm: null,
-        keyCurve: null,
-        keyValue: null,
-        rpId: null,
-        userHandle: null,
-        userName: null,
-        rpName: null,
-        userDisplayName: null,
-        counter: null,
-        discoverable: null,
-        creationDate: null,
-      });
+      expect(credential.credentialId).toBeDefined();
+      expect(credential.keyType).toBeDefined();
+      expect(credential.keyAlgorithm).toBeDefined();
+      expect(credential.keyCurve).toBeDefined();
+      expect(credential.keyValue).toBeDefined();
+      expect(credential.rpId).toBeDefined();
+      expect(credential.counter).toBeDefined();
+      expect(credential.discoverable).toBeDefined();
+      expect(credential.userHandle).toBeUndefined();
+      expect(credential.userName).toBeUndefined();
+      expect(credential.rpName).toBeUndefined();
+      expect(credential.userDisplayName).toBeUndefined();
+      expect(credential.creationDate).toBeInstanceOf(Date);
     });
 
     it("returns all fields as EncStrings except creationDate when given full Fido2CredentialData", () => {
@@ -69,12 +67,22 @@ describe("Fido2Credential", () => {
       });
     });
 
-    it("should not populate fields when data parameter is not given", () => {
+    it("should not populate fields when data parameter is not given except creationDate", () => {
       const credential = new Fido2Credential();
 
-      expect(credential).toEqual({
-        credentialId: null,
-      });
+      expect(credential.credentialId).toBeUndefined();
+      expect(credential.keyType).toBeUndefined();
+      expect(credential.keyAlgorithm).toBeUndefined();
+      expect(credential.keyCurve).toBeUndefined();
+      expect(credential.keyValue).toBeUndefined();
+      expect(credential.rpId).toBeUndefined();
+      expect(credential.userHandle).toBeUndefined();
+      expect(credential.userName).toBeUndefined();
+      expect(credential.counter).toBeUndefined();
+      expect(credential.rpName).toBeUndefined();
+      expect(credential.userDisplayName).toBeUndefined();
+      expect(credential.discoverable).toBeUndefined();
+      expect(credential.creationDate).toBeInstanceOf(Date);
     });
   });
 
@@ -163,8 +171,8 @@ describe("Fido2Credential", () => {
       expect(result).toEqual(credential);
     });
 
-    it("returns null if input is null", () => {
-      expect(Fido2Credential.fromJSON(null)).toBeNull();
+    it("returns undefined if input is null", () => {
+      expect(Fido2Credential.fromJSON(null)).toBeUndefined();
     });
   });
 
diff --git a/libs/common/src/vault/models/domain/fido2-credential.ts b/libs/common/src/vault/models/domain/fido2-credential.ts
index a74afc2336d..eff95c4d0bd 100644
--- a/libs/common/src/vault/models/domain/fido2-credential.ts
+++ b/libs/common/src/vault/models/domain/fido2-credential.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { Fido2Credential as SdkFido2Credential } from "@bitwarden/sdk-internal";
@@ -7,53 +5,51 @@ import { Fido2Credential as SdkFido2Credential } from "@bitwarden/sdk-internal";
 import { EncString } from "../../../key-management/crypto/models/enc-string";
 import Domain from "../../../platform/models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { conditionalEncString, encStringFrom } from "../../utils/domain-utils";
 import { Fido2CredentialData } from "../data/fido2-credential.data";
 import { Fido2CredentialView } from "../view/fido2-credential.view";
 
 export class Fido2Credential extends Domain {
-  credentialId: EncString | null = null;
-  keyType: EncString;
-  keyAlgorithm: EncString;
-  keyCurve: EncString;
-  keyValue: EncString;
-  rpId: EncString;
-  userHandle: EncString;
-  userName: EncString;
-  counter: EncString;
-  rpName: EncString;
-  userDisplayName: EncString;
-  discoverable: EncString;
-  creationDate: Date;
+  credentialId!: EncString;
+  keyType!: EncString;
+  keyAlgorithm!: EncString;
+  keyCurve!: EncString;
+  keyValue!: EncString;
+  rpId!: EncString;
+  userHandle?: EncString;
+  userName?: EncString;
+  counter!: EncString;
+  rpName?: EncString;
+  userDisplayName?: EncString;
+  discoverable!: EncString;
+  creationDate!: Date;
 
   constructor(obj?: Fido2CredentialData) {
     super();
     if (obj == null) {
+      this.creationDate = new Date();
       return;
     }
 
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        credentialId: null,
-        keyType: null,
-        keyAlgorithm: null,
-        keyCurve: null,
-        keyValue: null,
-        rpId: null,
-        userHandle: null,
-        userName: null,
-        counter: null,
-        rpName: null,
-        userDisplayName: null,
-        discoverable: null,
-      },
-      [],
-    );
-    this.creationDate = obj.creationDate != null ? new Date(obj.creationDate) : null;
+    this.credentialId = new EncString(obj.credentialId);
+    this.keyType = new EncString(obj.keyType);
+    this.keyAlgorithm = new EncString(obj.keyAlgorithm);
+    this.keyCurve = new EncString(obj.keyCurve);
+    this.keyValue = new EncString(obj.keyValue);
+    this.rpId = new EncString(obj.rpId);
+    this.counter = new EncString(obj.counter);
+    this.discoverable = new EncString(obj.discoverable);
+    this.userHandle = conditionalEncString(obj.userHandle);
+    this.userName = conditionalEncString(obj.userName);
+    this.rpName = conditionalEncString(obj.rpName);
+    this.userDisplayName = conditionalEncString(obj.userDisplayName);
+    this.creationDate = new Date(obj.creationDate);
   }
 
-  async decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<Fido2CredentialView> {
+  async decrypt(
+    orgId: string | undefined,
+    encKey?: SymmetricCryptoKey,
+  ): Promise<Fido2CredentialView> {
     const view = await this.decryptObj<Fido2Credential, Fido2CredentialView>(
       this,
       new Fido2CredentialView(),
@@ -69,7 +65,7 @@ export class Fido2Credential extends Domain {
         "rpName",
         "userDisplayName",
       ],
-      orgId,
+      orgId ?? null,
       encKey,
     );
 
@@ -78,7 +74,7 @@ export class Fido2Credential extends Domain {
       {
         counter: string;
       }
-    >(this, { counter: "" }, ["counter"], orgId, encKey);
+    >(this, { counter: "" }, ["counter"], orgId ?? null, encKey);
     // Counter will end up as NaN if this fails
     view.counter = parseInt(counter);
 
@@ -86,7 +82,7 @@ export class Fido2Credential extends Domain {
       this,
       { discoverable: "" },
       ["discoverable"],
-      orgId,
+      orgId ?? null,
       encKey,
     );
     view.discoverable = discoverable === "true";
@@ -115,40 +111,28 @@ export class Fido2Credential extends Domain {
     return i;
   }
 
-  static fromJSON(obj: Jsonify<Fido2Credential>): Fido2Credential {
+  static fromJSON(obj: Jsonify<Fido2Credential> | undefined): Fido2Credential | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const credentialId = EncString.fromJSON(obj.credentialId);
-    const keyType = EncString.fromJSON(obj.keyType);
-    const keyAlgorithm = EncString.fromJSON(obj.keyAlgorithm);
-    const keyCurve = EncString.fromJSON(obj.keyCurve);
-    const keyValue = EncString.fromJSON(obj.keyValue);
-    const rpId = EncString.fromJSON(obj.rpId);
-    const userHandle = EncString.fromJSON(obj.userHandle);
-    const userName = EncString.fromJSON(obj.userName);
-    const counter = EncString.fromJSON(obj.counter);
-    const rpName = EncString.fromJSON(obj.rpName);
-    const userDisplayName = EncString.fromJSON(obj.userDisplayName);
-    const discoverable = EncString.fromJSON(obj.discoverable);
-    const creationDate = obj.creationDate != null ? new Date(obj.creationDate) : null;
+    const credential = new Fido2Credential();
 
-    return Object.assign(new Fido2Credential(), obj, {
-      credentialId,
-      keyType,
-      keyAlgorithm,
-      keyCurve,
-      keyValue,
-      rpId,
-      userHandle,
-      userName,
-      counter,
-      rpName,
-      userDisplayName,
-      discoverable,
-      creationDate,
-    });
+    credential.credentialId = EncString.fromJSON(obj.credentialId);
+    credential.keyType = EncString.fromJSON(obj.keyType);
+    credential.keyAlgorithm = EncString.fromJSON(obj.keyAlgorithm);
+    credential.keyCurve = EncString.fromJSON(obj.keyCurve);
+    credential.keyValue = EncString.fromJSON(obj.keyValue);
+    credential.rpId = EncString.fromJSON(obj.rpId);
+    credential.userHandle = encStringFrom(obj.userHandle);
+    credential.userName = encStringFrom(obj.userName);
+    credential.counter = EncString.fromJSON(obj.counter);
+    credential.rpName = encStringFrom(obj.rpName);
+    credential.userDisplayName = encStringFrom(obj.userDisplayName);
+    credential.discoverable = EncString.fromJSON(obj.discoverable);
+    credential.creationDate = new Date(obj.creationDate);
+
+    return credential;
   }
 
   /**
@@ -178,8 +162,8 @@ export class Fido2Credential extends Domain {
    * Maps an SDK Fido2Credential object to a Fido2Credential
    * @param obj - The SDK Fido2Credential object
    */
-  static fromSdkFido2Credential(obj: SdkFido2Credential): Fido2Credential | undefined {
-    if (!obj) {
+  static fromSdkFido2Credential(obj?: SdkFido2Credential): Fido2Credential | undefined {
+    if (obj == null) {
       return undefined;
     }
 
@@ -191,11 +175,11 @@ export class Fido2Credential extends Domain {
     credential.keyCurve = EncString.fromJSON(obj.keyCurve);
     credential.keyValue = EncString.fromJSON(obj.keyValue);
     credential.rpId = EncString.fromJSON(obj.rpId);
-    credential.userHandle = EncString.fromJSON(obj.userHandle);
-    credential.userName = EncString.fromJSON(obj.userName);
     credential.counter = EncString.fromJSON(obj.counter);
-    credential.rpName = EncString.fromJSON(obj.rpName);
-    credential.userDisplayName = EncString.fromJSON(obj.userDisplayName);
+    credential.userHandle = encStringFrom(obj.userHandle);
+    credential.userName = encStringFrom(obj.userName);
+    credential.rpName = encStringFrom(obj.rpName);
+    credential.userDisplayName = encStringFrom(obj.userDisplayName);
     credential.discoverable = EncString.fromJSON(obj.discoverable);
     credential.creationDate = new Date(obj.creationDate);
 
diff --git a/libs/common/src/vault/models/domain/field.spec.ts b/libs/common/src/vault/models/domain/field.spec.ts
index b5e26199e7d..0a4bc8e3c29 100644
--- a/libs/common/src/vault/models/domain/field.spec.ts
+++ b/libs/common/src/vault/models/domain/field.spec.ts
@@ -29,9 +29,9 @@ describe("Field", () => {
     const field = new Field(data);
 
     expect(field).toEqual({
-      type: undefined,
-      name: null,
-      value: null,
+      type: FieldType.Text,
+      name: undefined,
+      value: undefined,
       linkedId: undefined,
     });
   });
@@ -41,9 +41,9 @@ describe("Field", () => {
 
     expect(field).toEqual({
       type: FieldType.Text,
-      name: { encryptedString: "encName", encryptionType: 0 },
-      value: { encryptedString: "encValue", encryptionType: 0 },
-      linkedId: null,
+      name: new EncString("encName"),
+      value: new EncString("encValue"),
+      linkedId: undefined,
     });
   });
 
@@ -82,12 +82,14 @@ describe("Field", () => {
       expect(actual).toEqual({
         name: "myName_fromJSON",
         value: "myValue_fromJSON",
+        type: FieldType.Text,
+        linkedId: undefined,
       });
       expect(actual).toBeInstanceOf(Field);
     });
 
-    it("returns null if object is null", () => {
-      expect(Field.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(Field.fromJSON(null)).toBeUndefined();
     });
   });
 
diff --git a/libs/common/src/vault/models/domain/field.ts b/libs/common/src/vault/models/domain/field.ts
index f652a2820d4..2ee3a9af8a5 100644
--- a/libs/common/src/vault/models/domain/field.ts
+++ b/libs/common/src/vault/models/domain/field.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { Field as SdkField, LinkedIdType as SdkLinkedIdType } from "@bitwarden/sdk-internal";
@@ -8,14 +6,15 @@ import { EncString } from "../../../key-management/crypto/models/enc-string";
 import Domain from "../../../platform/models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { FieldType, LinkedIdType } from "../../enums";
+import { conditionalEncString, encStringFrom } from "../../utils/domain-utils";
 import { FieldData } from "../data/field.data";
 import { FieldView } from "../view/field.view";
 
 export class Field extends Domain {
-  name: EncString;
-  value: EncString;
-  type: FieldType;
-  linkedId: LinkedIdType;
+  name?: EncString;
+  value?: EncString;
+  type: FieldType = FieldType.Text;
+  linkedId?: LinkedIdType;
 
   constructor(obj?: FieldData) {
     super();
@@ -24,24 +23,17 @@ export class Field extends Domain {
     }
 
     this.type = obj.type;
-    this.linkedId = obj.linkedId;
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        name: null,
-        value: null,
-      },
-      [],
-    );
+    this.linkedId = obj.linkedId ?? undefined;
+    this.name = conditionalEncString(obj.name);
+    this.value = conditionalEncString(obj.value);
   }
 
-  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<FieldView> {
+  decrypt(orgId: string | undefined, encKey?: SymmetricCryptoKey): Promise<FieldView> {
     return this.decryptObj<Field, FieldView>(
       this,
       new FieldView(this),
       ["name", "value"],
-      orgId,
+      orgId ?? null,
       encKey,
     );
   }
@@ -62,18 +54,18 @@ export class Field extends Domain {
     return f;
   }
 
-  static fromJSON(obj: Partial<Jsonify<Field>>): Field {
+  static fromJSON(obj: Partial<Jsonify<Field>> | undefined): Field | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const name = EncString.fromJSON(obj.name);
-    const value = EncString.fromJSON(obj.value);
+    const field = new Field();
+    field.type = obj.type ?? FieldType.Text;
+    field.linkedId = obj.linkedId ?? undefined;
+    field.name = encStringFrom(obj.name);
+    field.value = encStringFrom(obj.value);
 
-    return Object.assign(new Field(), obj, {
-      name,
-      value,
-    });
+    return field;
   }
 
   /**
@@ -95,14 +87,14 @@ export class Field extends Domain {
    * Maps SDK Field to Field
    * @param obj The SDK Field object to map
    */
-  static fromSdkField(obj: SdkField): Field | undefined {
-    if (!obj) {
+  static fromSdkField(obj?: SdkField): Field | undefined {
+    if (obj == null) {
       return undefined;
     }
 
     const field = new Field();
-    field.name = EncString.fromJSON(obj.name);
-    field.value = EncString.fromJSON(obj.value);
+    field.name = encStringFrom(obj.name);
+    field.value = encStringFrom(obj.value);
     field.type = obj.type;
     field.linkedId = obj.linkedId;
 
diff --git a/libs/common/src/vault/models/domain/identity.spec.ts b/libs/common/src/vault/models/domain/identity.spec.ts
index c122c90371f..411f6d1c9ea 100644
--- a/libs/common/src/vault/models/domain/identity.spec.ts
+++ b/libs/common/src/vault/models/domain/identity.spec.ts
@@ -34,24 +34,45 @@ describe("Identity", () => {
     const identity = new Identity(data);
 
     expect(identity).toEqual({
-      address1: null,
-      address2: null,
-      address3: null,
-      city: null,
-      company: null,
-      country: null,
-      email: null,
-      firstName: null,
-      lastName: null,
-      licenseNumber: null,
-      middleName: null,
-      passportNumber: null,
-      phone: null,
-      postalCode: null,
-      ssn: null,
-      state: null,
-      title: null,
-      username: null,
+      address1: undefined,
+      address2: undefined,
+      address3: undefined,
+      city: undefined,
+      company: undefined,
+      country: undefined,
+      email: undefined,
+      firstName: undefined,
+      lastName: undefined,
+      licenseNumber: undefined,
+      middleName: undefined,
+      passportNumber: undefined,
+      phone: undefined,
+      postalCode: undefined,
+      ssn: undefined,
+      state: undefined,
+      title: undefined,
+      username: undefined,
+    });
+
+    expect(data).toEqual({
+      title: undefined,
+      firstName: undefined,
+      middleName: undefined,
+      lastName: undefined,
+      address1: undefined,
+      address2: undefined,
+      address3: undefined,
+      city: undefined,
+      state: undefined,
+      postalCode: undefined,
+      country: undefined,
+      company: undefined,
+      email: undefined,
+      phone: undefined,
+      ssn: undefined,
+      username: undefined,
+      passportNumber: undefined,
+      licenseNumber: undefined,
     });
   });
 
@@ -112,7 +133,6 @@ describe("Identity", () => {
     expect(view).toEqual({
       _firstName: "mockFirstName",
       _lastName: "mockLastName",
-      _subTitle: null,
       address1: "mockAddress1",
       address2: "mockAddress2",
       address3: "mockAddress3",
@@ -180,8 +200,8 @@ describe("Identity", () => {
       expect(actual).toBeInstanceOf(Identity);
     });
 
-    it("returns null if object is null", () => {
-      expect(Identity.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(Identity.fromJSON(null)).toBeUndefined();
     });
   });
 
diff --git a/libs/common/src/vault/models/domain/identity.ts b/libs/common/src/vault/models/domain/identity.ts
index f0d5b3123ab..e2def3eb386 100644
--- a/libs/common/src/vault/models/domain/identity.ts
+++ b/libs/common/src/vault/models/domain/identity.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { Identity as SdkIdentity } from "@bitwarden/sdk-internal";
@@ -7,28 +5,29 @@ import { Identity as SdkIdentity } from "@bitwarden/sdk-internal";
 import { EncString } from "../../../key-management/crypto/models/enc-string";
 import Domain from "../../../platform/models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { conditionalEncString, encStringFrom } from "../../utils/domain-utils";
 import { IdentityData } from "../data/identity.data";
 import { IdentityView } from "../view/identity.view";
 
 export class Identity extends Domain {
-  title: EncString;
-  firstName: EncString;
-  middleName: EncString;
-  lastName: EncString;
-  address1: EncString;
-  address2: EncString;
-  address3: EncString;
-  city: EncString;
-  state: EncString;
-  postalCode: EncString;
-  country: EncString;
-  company: EncString;
-  email: EncString;
-  phone: EncString;
-  ssn: EncString;
-  username: EncString;
-  passportNumber: EncString;
-  licenseNumber: EncString;
+  title?: EncString;
+  firstName?: EncString;
+  middleName?: EncString;
+  lastName?: EncString;
+  address1?: EncString;
+  address2?: EncString;
+  address3?: EncString;
+  city?: EncString;
+  state?: EncString;
+  postalCode?: EncString;
+  country?: EncString;
+  company?: EncString;
+  email?: EncString;
+  phone?: EncString;
+  ssn?: EncString;
+  username?: EncString;
+  passportNumber?: EncString;
+  licenseNumber?: EncString;
 
   constructor(obj?: IdentityData) {
     super();
@@ -36,35 +35,28 @@ export class Identity extends Domain {
       return;
     }
 
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        title: null,
-        firstName: null,
-        middleName: null,
-        lastName: null,
-        address1: null,
-        address2: null,
-        address3: null,
-        city: null,
-        state: null,
-        postalCode: null,
-        country: null,
-        company: null,
-        email: null,
-        phone: null,
-        ssn: null,
-        username: null,
-        passportNumber: null,
-        licenseNumber: null,
-      },
-      [],
-    );
+    this.title = conditionalEncString(obj.title);
+    this.firstName = conditionalEncString(obj.firstName);
+    this.middleName = conditionalEncString(obj.middleName);
+    this.lastName = conditionalEncString(obj.lastName);
+    this.address1 = conditionalEncString(obj.address1);
+    this.address2 = conditionalEncString(obj.address2);
+    this.address3 = conditionalEncString(obj.address3);
+    this.city = conditionalEncString(obj.city);
+    this.state = conditionalEncString(obj.state);
+    this.postalCode = conditionalEncString(obj.postalCode);
+    this.country = conditionalEncString(obj.country);
+    this.company = conditionalEncString(obj.company);
+    this.email = conditionalEncString(obj.email);
+    this.phone = conditionalEncString(obj.phone);
+    this.ssn = conditionalEncString(obj.ssn);
+    this.username = conditionalEncString(obj.username);
+    this.passportNumber = conditionalEncString(obj.passportNumber);
+    this.licenseNumber = conditionalEncString(obj.licenseNumber);
   }
 
   decrypt(
-    orgId: string,
+    orgId: string | undefined,
     context: string = "No Cipher Context",
     encKey?: SymmetricCryptoKey,
   ): Promise<IdentityView> {
@@ -91,7 +83,7 @@ export class Identity extends Domain {
         "passportNumber",
         "licenseNumber",
       ],
-      orgId,
+      orgId ?? null,
       encKey,
       "DomainType: Identity; " + context,
     );
@@ -122,50 +114,32 @@ export class Identity extends Domain {
     return i;
   }
 
-  static fromJSON(obj: Jsonify<Identity>): Identity {
+  static fromJSON(obj: Jsonify<Identity> | undefined): Identity | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const title = EncString.fromJSON(obj.title);
-    const firstName = EncString.fromJSON(obj.firstName);
-    const middleName = EncString.fromJSON(obj.middleName);
-    const lastName = EncString.fromJSON(obj.lastName);
-    const address1 = EncString.fromJSON(obj.address1);
-    const address2 = EncString.fromJSON(obj.address2);
-    const address3 = EncString.fromJSON(obj.address3);
-    const city = EncString.fromJSON(obj.city);
-    const state = EncString.fromJSON(obj.state);
-    const postalCode = EncString.fromJSON(obj.postalCode);
-    const country = EncString.fromJSON(obj.country);
-    const company = EncString.fromJSON(obj.company);
-    const email = EncString.fromJSON(obj.email);
-    const phone = EncString.fromJSON(obj.phone);
-    const ssn = EncString.fromJSON(obj.ssn);
-    const username = EncString.fromJSON(obj.username);
-    const passportNumber = EncString.fromJSON(obj.passportNumber);
-    const licenseNumber = EncString.fromJSON(obj.licenseNumber);
+    const identity = new Identity();
+    identity.title = encStringFrom(obj.title);
+    identity.firstName = encStringFrom(obj.firstName);
+    identity.middleName = encStringFrom(obj.middleName);
+    identity.lastName = encStringFrom(obj.lastName);
+    identity.address1 = encStringFrom(obj.address1);
+    identity.address2 = encStringFrom(obj.address2);
+    identity.address3 = encStringFrom(obj.address3);
+    identity.city = encStringFrom(obj.city);
+    identity.state = encStringFrom(obj.state);
+    identity.postalCode = encStringFrom(obj.postalCode);
+    identity.country = encStringFrom(obj.country);
+    identity.company = encStringFrom(obj.company);
+    identity.email = encStringFrom(obj.email);
+    identity.phone = encStringFrom(obj.phone);
+    identity.ssn = encStringFrom(obj.ssn);
+    identity.username = encStringFrom(obj.username);
+    identity.passportNumber = encStringFrom(obj.passportNumber);
+    identity.licenseNumber = encStringFrom(obj.licenseNumber);
 
-    return Object.assign(new Identity(), obj, {
-      title,
-      firstName,
-      middleName,
-      lastName,
-      address1,
-      address2,
-      address3,
-      city,
-      state,
-      postalCode,
-      country,
-      company,
-      email,
-      phone,
-      ssn,
-      username,
-      passportNumber,
-      licenseNumber,
-    });
+    return identity;
   }
 
   /**
@@ -200,30 +174,30 @@ export class Identity extends Domain {
    * Maps an SDK Identity object to an Identity
    * @param obj - The SDK Identity object
    */
-  static fromSdkIdentity(obj: SdkIdentity): Identity | undefined {
+  static fromSdkIdentity(obj?: SdkIdentity): Identity | undefined {
     if (obj == null) {
       return undefined;
     }
 
     const identity = new Identity();
-    identity.title = EncString.fromJSON(obj.title);
-    identity.firstName = EncString.fromJSON(obj.firstName);
-    identity.middleName = EncString.fromJSON(obj.middleName);
-    identity.lastName = EncString.fromJSON(obj.lastName);
-    identity.address1 = EncString.fromJSON(obj.address1);
-    identity.address2 = EncString.fromJSON(obj.address2);
-    identity.address3 = EncString.fromJSON(obj.address3);
-    identity.city = EncString.fromJSON(obj.city);
-    identity.state = EncString.fromJSON(obj.state);
-    identity.postalCode = EncString.fromJSON(obj.postalCode);
-    identity.country = EncString.fromJSON(obj.country);
-    identity.company = EncString.fromJSON(obj.company);
-    identity.email = EncString.fromJSON(obj.email);
-    identity.phone = EncString.fromJSON(obj.phone);
-    identity.ssn = EncString.fromJSON(obj.ssn);
-    identity.username = EncString.fromJSON(obj.username);
-    identity.passportNumber = EncString.fromJSON(obj.passportNumber);
-    identity.licenseNumber = EncString.fromJSON(obj.licenseNumber);
+    identity.title = encStringFrom(obj.title);
+    identity.firstName = encStringFrom(obj.firstName);
+    identity.middleName = encStringFrom(obj.middleName);
+    identity.lastName = encStringFrom(obj.lastName);
+    identity.address1 = encStringFrom(obj.address1);
+    identity.address2 = encStringFrom(obj.address2);
+    identity.address3 = encStringFrom(obj.address3);
+    identity.city = encStringFrom(obj.city);
+    identity.state = encStringFrom(obj.state);
+    identity.postalCode = encStringFrom(obj.postalCode);
+    identity.country = encStringFrom(obj.country);
+    identity.company = encStringFrom(obj.company);
+    identity.email = encStringFrom(obj.email);
+    identity.phone = encStringFrom(obj.phone);
+    identity.ssn = encStringFrom(obj.ssn);
+    identity.username = encStringFrom(obj.username);
+    identity.passportNumber = encStringFrom(obj.passportNumber);
+    identity.licenseNumber = encStringFrom(obj.licenseNumber);
 
     return identity;
   }
diff --git a/libs/common/src/vault/models/domain/login-uri.spec.ts b/libs/common/src/vault/models/domain/login-uri.spec.ts
index cbab41f1472..2effd1bb9fe 100644
--- a/libs/common/src/vault/models/domain/login-uri.spec.ts
+++ b/libs/common/src/vault/models/domain/login-uri.spec.ts
@@ -7,6 +7,7 @@ import { mockEnc, mockFromJson } from "../../../../spec";
 import { EncryptService } from "../../../key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "../../../key-management/crypto/models/enc-string";
 import { UriMatchStrategy } from "../../../models/domain/domain-service";
+import { LoginUriApi } from "../api/login-uri.api";
 import { LoginUriData } from "../data/login-uri.data";
 
 import { LoginUri } from "./login-uri";
@@ -27,10 +28,13 @@ describe("LoginUri", () => {
     const loginUri = new LoginUri(data);
 
     expect(loginUri).toEqual({
-      match: null,
-      uri: null,
-      uriChecksum: null,
+      match: undefined,
+      uri: undefined,
+      uriChecksum: undefined,
     });
+    expect(data.uri).toBeUndefined();
+    expect(data.uriChecksum).toBeUndefined();
+    expect(data.match).toBeUndefined();
   });
 
   it("Convert", () => {
@@ -56,15 +60,28 @@ describe("LoginUri", () => {
     const view = await loginUri.decrypt(null);
 
     expect(view).toEqual({
-      _canLaunch: null,
-      _domain: null,
-      _host: null,
-      _hostname: null,
       _uri: "uri",
       match: 3,
     });
   });
 
+  it("handle null match", () => {
+    const apiData = Object.assign(new LoginUriApi(), {
+      uri: "testUri",
+      uriChecksum: "testChecksum",
+      match: null,
+    });
+
+    const loginUriData = new LoginUriData(apiData);
+
+    // The data model stores it as-is (null or undefined)
+    expect(loginUriData.match).toBeNull();
+
+    // But the domain model converts null to undefined
+    const loginUri = new LoginUri(loginUriData);
+    expect(loginUri.match).toBeUndefined();
+  });
+
   describe("validateChecksum", () => {
     let encryptService: MockProxy<EncryptService>;
 
@@ -81,7 +98,7 @@ describe("LoginUri", () => {
       loginUri.uriChecksum = mockEnc("checksum");
       encryptService.hash.mockResolvedValue("checksum");
 
-      const actual = await loginUri.validateChecksum("uri", null, null);
+      const actual = await loginUri.validateChecksum("uri", undefined, undefined);
 
       expect(actual).toBe(true);
       expect(encryptService.hash).toHaveBeenCalledWith("uri", "sha256");
@@ -92,7 +109,7 @@ describe("LoginUri", () => {
       loginUri.uriChecksum = mockEnc("checksum");
       encryptService.hash.mockResolvedValue("incorrect checksum");
 
-      const actual = await loginUri.validateChecksum("uri", null, null);
+      const actual = await loginUri.validateChecksum("uri", undefined, undefined);
 
       expect(actual).toBe(false);
     });
@@ -116,13 +133,13 @@ describe("LoginUri", () => {
       expect(actual).toBeInstanceOf(LoginUri);
     });
 
-    it("returns null if object is null", () => {
-      expect(LoginUri.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(LoginUri.fromJSON(null)).toBeUndefined();
     });
   });
 
   describe("SDK Login Uri Mapping", () => {
-    it("should map to SDK login uri", () => {
+    it("maps to SDK login uri", () => {
       const loginUri = new LoginUri(data);
       const sdkLoginUri = loginUri.toSdkLoginUri();
 
diff --git a/libs/common/src/vault/models/domain/login-uri.ts b/libs/common/src/vault/models/domain/login-uri.ts
index 973e25c8ff1..cac487747f8 100644
--- a/libs/common/src/vault/models/domain/login-uri.ts
+++ b/libs/common/src/vault/models/domain/login-uri.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { LoginUri as SdkLoginUri } from "@bitwarden/sdk-internal";
@@ -9,13 +7,14 @@ import { UriMatchStrategySetting } from "../../../models/domain/domain-service";
 import { Utils } from "../../../platform/misc/utils";
 import Domain from "../../../platform/models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { conditionalEncString, encStringFrom } from "../../utils/domain-utils";
 import { LoginUriData } from "../data/login-uri.data";
 import { LoginUriView } from "../view/login-uri.view";
 
 export class LoginUri extends Domain {
-  uri: EncString;
-  uriChecksum: EncString | undefined;
-  match: UriMatchStrategySetting;
+  uri?: EncString;
+  uriChecksum?: EncString;
+  match?: UriMatchStrategySetting;
 
   constructor(obj?: LoginUriData) {
     super();
@@ -23,20 +22,13 @@ export class LoginUri extends Domain {
       return;
     }
 
-    this.match = obj.match;
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        uri: null,
-        uriChecksum: null,
-      },
-      [],
-    );
+    this.uri = conditionalEncString(obj.uri);
+    this.uriChecksum = conditionalEncString(obj.uriChecksum);
+    this.match = obj.match ?? undefined;
   }
 
   decrypt(
-    orgId: string,
+    orgId: string | undefined,
     context: string = "No Cipher Context",
     encKey?: SymmetricCryptoKey,
   ): Promise<LoginUriView> {
@@ -44,13 +36,13 @@ export class LoginUri extends Domain {
       this,
       new LoginUriView(this),
       ["uri"],
-      orgId,
+      orgId ?? null,
       encKey,
       context,
     );
   }
 
-  async validateChecksum(clearTextUri: string, orgId: string, encKey: SymmetricCryptoKey) {
+  async validateChecksum(clearTextUri: string, orgId?: string, encKey?: SymmetricCryptoKey) {
     if (this.uriChecksum == null) {
       return false;
     }
@@ -58,7 +50,7 @@ export class LoginUri extends Domain {
     const keyService = Utils.getContainerService().getEncryptService();
     const localChecksum = await keyService.hash(clearTextUri, "sha256");
 
-    const remoteChecksum = await this.uriChecksum.decrypt(orgId, encKey);
+    const remoteChecksum = await this.uriChecksum.decrypt(orgId ?? null, encKey);
     return remoteChecksum === localChecksum;
   }
 
@@ -77,17 +69,17 @@ export class LoginUri extends Domain {
     return u;
   }
 
-  static fromJSON(obj: Jsonify<LoginUri>): LoginUri {
+  static fromJSON(obj: Jsonify<LoginUri> | undefined): LoginUri | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const uri = EncString.fromJSON(obj.uri);
-    const uriChecksum = EncString.fromJSON(obj.uriChecksum);
-    return Object.assign(new LoginUri(), obj, {
-      uri,
-      uriChecksum,
-    });
+    const loginUri = new LoginUri();
+    loginUri.uri = encStringFrom(obj.uri);
+    loginUri.match = obj.match ?? undefined;
+    loginUri.uriChecksum = encStringFrom(obj.uriChecksum);
+
+    return loginUri;
   }
 
   /**
@@ -103,16 +95,16 @@ export class LoginUri extends Domain {
     };
   }
 
-  static fromSdkLoginUri(obj: SdkLoginUri): LoginUri | undefined {
+  static fromSdkLoginUri(obj?: SdkLoginUri): LoginUri | undefined {
     if (obj == null) {
       return undefined;
     }
 
-    const view = new LoginUri();
-    view.uri = EncString.fromJSON(obj.uri);
-    view.uriChecksum = obj.uriChecksum ? EncString.fromJSON(obj.uriChecksum) : undefined;
-    view.match = obj.match;
+    const loginUri = new LoginUri();
+    loginUri.uri = encStringFrom(obj.uri);
+    loginUri.uriChecksum = encStringFrom(obj.uriChecksum);
+    loginUri.match = obj.match;
 
-    return view;
+    return loginUri;
   }
 }
diff --git a/libs/common/src/vault/models/domain/login.spec.ts b/libs/common/src/vault/models/domain/login.spec.ts
index dc3cc71fda8..6ebcfea057a 100644
--- a/libs/common/src/vault/models/domain/login.spec.ts
+++ b/libs/common/src/vault/models/domain/login.spec.ts
@@ -2,7 +2,7 @@ import { MockProxy, mock } from "jest-mock-extended";
 
 import { mockEnc, mockFromJson } from "../../../../spec";
 import { EncryptedString, EncString } from "../../../key-management/crypto/models/enc-string";
-import { UriMatchStrategy, UriMatchStrategySetting } from "../../../models/domain/domain-service";
+import { UriMatchStrategy } from "../../../models/domain/domain-service";
 import { LoginData } from "../../models/data/login.data";
 import { Login } from "../../models/domain/login";
 import { LoginUri } from "../../models/domain/login-uri";
@@ -19,12 +19,20 @@ describe("Login DTO", () => {
     const login = new Login(data);
 
     expect(login).toEqual({
-      passwordRevisionDate: null,
+      passwordRevisionDate: undefined,
       autofillOnPageLoad: undefined,
-      username: null,
-      password: null,
-      totp: null,
+      username: undefined,
+      password: undefined,
+      totp: undefined,
     });
+
+    expect(data.username).toBeUndefined();
+    expect(data.password).toBeUndefined();
+    expect(data.passwordRevisionDate).toBeUndefined();
+    expect(data.totp).toBeUndefined();
+    expect(data.autofillOnPageLoad).toBeUndefined();
+    expect(data.uris).toBeUndefined();
+    expect(data.fido2Credentials).toBeUndefined();
   });
 
   it("Convert from full LoginData", () => {
@@ -82,12 +90,7 @@ describe("Login DTO", () => {
       totp: "encrypted totp",
       uris: [
         {
-          match: null as UriMatchStrategySetting,
           _uri: "decrypted uri",
-          _domain: null as string,
-          _hostname: null as string,
-          _host: null as string,
-          _canLaunch: null as boolean,
         },
       ],
       autofillOnPageLoad: true,
@@ -198,8 +201,8 @@ describe("Login DTO", () => {
       expect(actual).toBeInstanceOf(Login);
     });
 
-    it("returns null if object is null", () => {
-      expect(Login.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(Login.fromJSON(null)).toBeUndefined();
     });
   });
 
diff --git a/libs/common/src/vault/models/domain/login.ts b/libs/common/src/vault/models/domain/login.ts
index b34fb011254..a9cec13fc7c 100644
--- a/libs/common/src/vault/models/domain/login.ts
+++ b/libs/common/src/vault/models/domain/login.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { Login as SdkLogin } from "@bitwarden/sdk-internal";
@@ -7,6 +5,7 @@ import { Login as SdkLogin } from "@bitwarden/sdk-internal";
 import { EncString } from "../../../key-management/crypto/models/enc-string";
 import Domain from "../../../platform/models/domain/domain-base";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { conditionalEncString, encStringFrom } from "../../utils/domain-utils";
 import { LoginData } from "../data/login.data";
 import { LoginView } from "../view/login.view";
 
@@ -14,13 +13,13 @@ import { Fido2Credential } from "./fido2-credential";
 import { LoginUri } from "./login-uri";
 
 export class Login extends Domain {
-  uris: LoginUri[];
-  username: EncString;
-  password: EncString;
+  uris?: LoginUri[];
+  username?: EncString;
+  password?: EncString;
   passwordRevisionDate?: Date;
-  totp: EncString;
-  autofillOnPageLoad: boolean;
-  fido2Credentials: Fido2Credential[];
+  totp?: EncString;
+  autofillOnPageLoad?: boolean;
+  fido2Credentials?: Fido2Credential[];
 
   constructor(obj?: LoginData) {
     super();
@@ -29,24 +28,14 @@ export class Login extends Domain {
     }
 
     this.passwordRevisionDate =
-      obj.passwordRevisionDate != null ? new Date(obj.passwordRevisionDate) : null;
+      obj.passwordRevisionDate != null ? new Date(obj.passwordRevisionDate) : undefined;
     this.autofillOnPageLoad = obj.autofillOnPageLoad;
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        username: null,
-        password: null,
-        totp: null,
-      },
-      [],
-    );
+    this.username = conditionalEncString(obj.username);
+    this.password = conditionalEncString(obj.password);
+    this.totp = conditionalEncString(obj.totp);
 
     if (obj.uris) {
-      this.uris = [];
-      obj.uris.forEach((u) => {
-        this.uris.push(new LoginUri(u));
-      });
+      this.uris = obj.uris.map((u) => new LoginUri(u));
     }
 
     if (obj.fido2Credentials) {
@@ -55,7 +44,7 @@ export class Login extends Domain {
   }
 
   async decrypt(
-    orgId: string,
+    orgId: string | undefined,
     bypassValidation: boolean,
     context: string = "No Cipher Context",
     encKey?: SymmetricCryptoKey,
@@ -64,7 +53,7 @@ export class Login extends Domain {
       this,
       new LoginView(this),
       ["username", "password", "totp"],
-      orgId,
+      orgId ?? null,
       encKey,
       `DomainType: Login; ${context}`,
     );
@@ -78,12 +67,21 @@ export class Login extends Domain {
         }
 
         const uri = await this.uris[i].decrypt(orgId, context, encKey);
+        const uriString = uri.uri;
+
+        if (uriString == null) {
+          continue;
+        }
+
         // URIs are shared remotely after decryption
         // we need to validate that the string hasn't been changed by a compromised server
         // This validation is tied to the existence of cypher.key for backwards compatibility
-        // So we bypass the validation if there's no cipher.key or procceed with the validation and
+        // So we bypass the validation if there's no cipher.key or proceed with the validation and
         // Skip the value if it's been tampered with.
-        if (bypassValidation || (await this.uris[i].validateChecksum(uri.uri, orgId, encKey))) {
+        const isValidUri =
+          bypassValidation || (await this.uris[i].validateChecksum(uriString, orgId, encKey));
+
+        if (isValidUri) {
           view.uris.push(uri);
         }
       }
@@ -100,9 +98,12 @@ export class Login extends Domain {
 
   toLoginData(): LoginData {
     const l = new LoginData();
-    l.passwordRevisionDate =
-      this.passwordRevisionDate != null ? this.passwordRevisionDate.toISOString() : null;
-    l.autofillOnPageLoad = this.autofillOnPageLoad;
+    if (this.passwordRevisionDate != null) {
+      l.passwordRevisionDate = this.passwordRevisionDate.toISOString();
+    }
+    if (this.autofillOnPageLoad != null) {
+      l.autofillOnPageLoad = this.autofillOnPageLoad;
+    }
     this.buildDataModel(this, l, {
       username: null,
       password: null,
@@ -110,10 +111,7 @@ export class Login extends Domain {
     });
 
     if (this.uris != null && this.uris.length > 0) {
-      l.uris = [];
-      this.uris.forEach((u) => {
-        l.uris.push(u.toLoginUriData());
-      });
+      l.uris = this.uris.map((u) => u.toLoginUriData());
     }
 
     if (this.fido2Credentials != null && this.fido2Credentials.length > 0) {
@@ -123,28 +121,27 @@ export class Login extends Domain {
     return l;
   }
 
-  static fromJSON(obj: Partial<Jsonify<Login>>): Login {
+  static fromJSON(obj: Partial<Jsonify<Login>> | undefined): Login | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const username = EncString.fromJSON(obj.username);
-    const password = EncString.fromJSON(obj.password);
-    const totp = EncString.fromJSON(obj.totp);
-    const passwordRevisionDate =
-      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
-    const uris = obj.uris?.map((uri: any) => LoginUri.fromJSON(uri));
-    const fido2Credentials =
-      obj.fido2Credentials?.map((key) => Fido2Credential.fromJSON(key)) ?? [];
+    const login = new Login();
+    login.passwordRevisionDate =
+      obj.passwordRevisionDate != null ? new Date(obj.passwordRevisionDate) : undefined;
+    login.autofillOnPageLoad = obj.autofillOnPageLoad;
+    login.username = encStringFrom(obj.username);
+    login.password = encStringFrom(obj.password);
+    login.totp = encStringFrom(obj.totp);
+    login.uris = obj.uris
+      ?.map((uri: any) => LoginUri.fromJSON(uri))
+      .filter((u): u is LoginUri => u != null);
+    login.fido2Credentials =
+      obj.fido2Credentials
+        ?.map((key) => Fido2Credential.fromJSON(key))
+        .filter((c): c is Fido2Credential => c != null) ?? undefined;
 
-    return Object.assign(new Login(), obj, {
-      username,
-      password,
-      totp,
-      passwordRevisionDate,
-      uris,
-      fido2Credentials,
-    });
+    return login;
   }
 
   /**
@@ -168,25 +165,27 @@ export class Login extends Domain {
    * Maps an SDK Login object to a Login
    * @param obj - The SDK Login object
    */
-  static fromSdkLogin(obj: SdkLogin): Login | undefined {
+  static fromSdkLogin(obj?: SdkLogin): Login | undefined {
     if (!obj) {
       return undefined;
     }
 
     const login = new Login();
-
-    login.uris =
-      obj.uris?.filter((u) => u.uri != null).map((uri) => LoginUri.fromSdkLoginUri(uri)) ?? [];
-    login.username = EncString.fromJSON(obj.username);
-    login.password = EncString.fromJSON(obj.password);
-    login.passwordRevisionDate = obj.passwordRevisionDate
-      ? new Date(obj.passwordRevisionDate)
-      : undefined;
-    login.totp = EncString.fromJSON(obj.totp);
+    login.passwordRevisionDate =
+      obj.passwordRevisionDate != null ? new Date(obj.passwordRevisionDate) : undefined;
     login.autofillOnPageLoad = obj.autofillOnPageLoad;
-    login.fido2Credentials = obj.fido2Credentials?.map((f) =>
-      Fido2Credential.fromSdkFido2Credential(f),
-    );
+    login.username = encStringFrom(obj.username);
+    login.password = encStringFrom(obj.password);
+    login.totp = encStringFrom(obj.totp);
+    login.uris =
+      obj.uris
+        ?.filter((u) => u.uri != null)
+        .map((uri) => LoginUri.fromSdkLoginUri(uri))
+        .filter((u): u is LoginUri => u != null) ?? undefined;
+    login.fido2Credentials =
+      obj.fido2Credentials
+        ?.map((f) => Fido2Credential.fromSdkFido2Credential(f))
+        .filter((c): c is Fido2Credential => c != null) ?? undefined;
 
     return login;
   }
diff --git a/libs/common/src/vault/models/domain/password.spec.ts b/libs/common/src/vault/models/domain/password.spec.ts
index a75fca048fe..4b2de34beca 100644
--- a/libs/common/src/vault/models/domain/password.spec.ts
+++ b/libs/common/src/vault/models/domain/password.spec.ts
@@ -17,9 +17,12 @@ describe("Password", () => {
     const data = new PasswordHistoryData();
     const password = new Password(data);
 
-    expect(password).toMatchObject({
-      password: null,
-    });
+    expect(password).toBeInstanceOf(Password);
+    expect(password.password).toBeInstanceOf(EncString);
+    expect(password.lastUsedDate).toBeInstanceOf(Date);
+
+    expect(data.password).toBeUndefined();
+    expect(data.lastUsedDate).toBeUndefined();
   });
 
   it("Convert", () => {
@@ -66,8 +69,8 @@ describe("Password", () => {
       expect(actual).toBeInstanceOf(Password);
     });
 
-    it("returns null if object is null", () => {
-      expect(Password.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(Password.fromJSON(null)).toBeUndefined();
     });
   });
 
@@ -83,4 +86,47 @@ describe("Password", () => {
       });
     });
   });
+
+  describe("fromSdkPasswordHistory", () => {
+    beforeEach(() => {
+      jest.restoreAllMocks();
+    });
+
+    it("creates Password from SDK object", () => {
+      const sdkPasswordHistory = {
+        password: "2.encPassword|encryptedData" as EncryptedString,
+        lastUsedDate: "2022-01-31T12:00:00.000Z",
+      };
+
+      const password = Password.fromSdkPasswordHistory(sdkPasswordHistory);
+
+      expect(password).toBeInstanceOf(Password);
+      expect(password?.password).toBeInstanceOf(EncString);
+      expect(password?.password.encryptedString).toBe("2.encPassword|encryptedData");
+      expect(password?.lastUsedDate).toEqual(new Date("2022-01-31T12:00:00.000Z"));
+    });
+
+    it("returns undefined for null input", () => {
+      const result = Password.fromSdkPasswordHistory(null as any);
+      expect(result).toBeUndefined();
+    });
+
+    it("returns undefined for undefined input", () => {
+      const result = Password.fromSdkPasswordHistory(undefined);
+      expect(result).toBeUndefined();
+    });
+
+    it("handles empty SDK object", () => {
+      const sdkPasswordHistory = {
+        password: "" as EncryptedString,
+        lastUsedDate: "",
+      };
+
+      const password = Password.fromSdkPasswordHistory(sdkPasswordHistory);
+
+      expect(password).toBeInstanceOf(Password);
+      expect(password?.password).toBeInstanceOf(EncString);
+      expect(password?.lastUsedDate).toBeInstanceOf(Date);
+    });
+  });
 });
diff --git a/libs/common/src/vault/models/domain/password.ts b/libs/common/src/vault/models/domain/password.ts
index ca594075e0b..84e8919b905 100644
--- a/libs/common/src/vault/models/domain/password.ts
+++ b/libs/common/src/vault/models/domain/password.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { PasswordHistory } from "@bitwarden/sdk-internal";
@@ -11,8 +9,8 @@ import { PasswordHistoryData } from "../data/password-history.data";
 import { PasswordHistoryView } from "../view/password-history.view";
 
 export class Password extends Domain {
-  password: EncString;
-  lastUsedDate: Date;
+  password!: EncString;
+  lastUsedDate!: Date;
 
   constructor(obj?: PasswordHistoryData) {
     super();
@@ -20,18 +18,16 @@ export class Password extends Domain {
       return;
     }
 
-    this.buildDomainModel(this, obj, {
-      password: null,
-    });
+    this.password = new EncString(obj.password);
     this.lastUsedDate = new Date(obj.lastUsedDate);
   }
 
-  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<PasswordHistoryView> {
+  decrypt(orgId: string | undefined, encKey?: SymmetricCryptoKey): Promise<PasswordHistoryView> {
     return this.decryptObj<Password, PasswordHistoryView>(
       this,
       new PasswordHistoryView(this),
       ["password"],
-      orgId,
+      orgId ?? null,
       encKey,
       "DomainType: PasswordHistory",
     );
@@ -46,18 +42,16 @@ export class Password extends Domain {
     return ph;
   }
 
-  static fromJSON(obj: Partial<Jsonify<Password>>): Password {
+  static fromJSON(obj: Jsonify<Password> | undefined): Password | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const password = EncString.fromJSON(obj.password);
-    const lastUsedDate = obj.lastUsedDate == null ? null : new Date(obj.lastUsedDate);
+    const passwordHistory = new Password();
+    passwordHistory.password = EncString.fromJSON(obj.password);
+    passwordHistory.lastUsedDate = new Date(obj.lastUsedDate);
 
-    return Object.assign(new Password(), obj, {
-      password,
-      lastUsedDate,
-    });
+    return passwordHistory;
   }
 
   /**
@@ -76,7 +70,7 @@ export class Password extends Domain {
    * Maps an SDK PasswordHistory object to a Password
    * @param obj - The SDK PasswordHistory object
    */
-  static fromSdkPasswordHistory(obj: PasswordHistory): Password | undefined {
+  static fromSdkPasswordHistory(obj?: PasswordHistory): Password | undefined {
     if (!obj) {
       return undefined;
     }
diff --git a/libs/common/src/vault/models/domain/secure-note.spec.ts b/libs/common/src/vault/models/domain/secure-note.spec.ts
index ff71e53238d..e445e9ea035 100644
--- a/libs/common/src/vault/models/domain/secure-note.spec.ts
+++ b/libs/common/src/vault/models/domain/secure-note.spec.ts
@@ -16,29 +16,34 @@ describe("SecureNote", () => {
     const data = new SecureNoteData();
     const secureNote = new SecureNote(data);
 
-    expect(secureNote).toEqual({
-      type: undefined,
-    });
+    expect(data).toBeDefined();
+    expect(secureNote).toEqual({ type: SecureNoteType.Generic });
+    expect(data.type).toBe(SecureNoteType.Generic);
+  });
+
+  it("Convert from undefined", () => {
+    const data = new SecureNoteData(undefined);
+    expect(data.type).toBe(SecureNoteType.Generic);
   });
 
   it("Convert", () => {
     const secureNote = new SecureNote(data);
 
-    expect(secureNote).toEqual({
-      type: 0,
-    });
+    expect(secureNote).toEqual({ type: 0 });
+    expect(data.type).toBe(SecureNoteType.Generic);
   });
 
   it("toSecureNoteData", () => {
     const secureNote = new SecureNote(data);
     expect(secureNote.toSecureNoteData()).toEqual(data);
+    expect(secureNote.toSecureNoteData().type).toBe(SecureNoteType.Generic);
   });
 
   it("Decrypt", async () => {
     const secureNote = new SecureNote();
     secureNote.type = SecureNoteType.Generic;
 
-    const view = await secureNote.decrypt(null);
+    const view = await secureNote.decrypt();
 
     expect(view).toEqual({
       type: 0,
@@ -46,8 +51,16 @@ describe("SecureNote", () => {
   });
 
   describe("fromJSON", () => {
-    it("returns null if object is null", () => {
-      expect(SecureNote.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(SecureNote.fromJSON(null)).toBeUndefined();
+    });
+
+    it("creates SecureNote instance from JSON object", () => {
+      const jsonObj = { type: SecureNoteType.Generic };
+      const result = SecureNote.fromJSON(jsonObj);
+
+      expect(result).toBeInstanceOf(SecureNote);
+      expect(result.type).toBe(SecureNoteType.Generic);
     });
   });
 
@@ -63,4 +76,71 @@ describe("SecureNote", () => {
       });
     });
   });
+
+  describe("fromSdkSecureNote", () => {
+    it("returns undefined when null is provided", () => {
+      const result = SecureNote.fromSdkSecureNote(null);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("returns undefined when undefined is provided", () => {
+      const result = SecureNote.fromSdkSecureNote(undefined);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("creates SecureNote with Generic type from SDK object", () => {
+      const sdkSecureNote = {
+        type: SecureNoteType.Generic,
+      };
+
+      const result = SecureNote.fromSdkSecureNote(sdkSecureNote);
+
+      expect(result).toBeInstanceOf(SecureNote);
+      expect(result.type).toBe(SecureNoteType.Generic);
+    });
+
+    it("preserves the type value from SDK object", () => {
+      const sdkSecureNote = {
+        type: SecureNoteType.Generic,
+      };
+
+      const result = SecureNote.fromSdkSecureNote(sdkSecureNote);
+
+      expect(result.type).toBe(0);
+    });
+
+    it("creates a new SecureNote instance", () => {
+      const sdkSecureNote = {
+        type: SecureNoteType.Generic,
+      };
+
+      const result = SecureNote.fromSdkSecureNote(sdkSecureNote);
+
+      expect(result).not.toBe(sdkSecureNote);
+      expect(result).toBeInstanceOf(SecureNote);
+    });
+
+    it("handles SDK object with undefined type", () => {
+      const sdkSecureNote = {
+        type: undefined as SecureNoteType,
+      };
+
+      const result = SecureNote.fromSdkSecureNote(sdkSecureNote);
+
+      expect(result).toBeInstanceOf(SecureNote);
+      expect(result.type).toBeUndefined();
+    });
+
+    it("returns symmetric with toSdkSecureNote", () => {
+      const original = new SecureNote();
+      original.type = SecureNoteType.Generic;
+
+      const sdkFormat = original.toSdkSecureNote();
+      const reconstructed = SecureNote.fromSdkSecureNote(sdkFormat);
+
+      expect(reconstructed.type).toBe(original.type);
+    });
+  });
 });
diff --git a/libs/common/src/vault/models/domain/secure-note.ts b/libs/common/src/vault/models/domain/secure-note.ts
index 1426ff85eab..fb568f482b0 100644
--- a/libs/common/src/vault/models/domain/secure-note.ts
+++ b/libs/common/src/vault/models/domain/secure-note.ts
@@ -1,17 +1,14 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { SecureNote as SdkSecureNote } from "@bitwarden/sdk-internal";
 
 import Domain from "../../../platform/models/domain/domain-base";
-import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { SecureNoteType } from "../../enums";
 import { SecureNoteData } from "../data/secure-note.data";
 import { SecureNoteView } from "../view/secure-note.view";
 
 export class SecureNote extends Domain {
-  type: SecureNoteType;
+  type: SecureNoteType = SecureNoteType.Generic;
 
   constructor(obj?: SecureNoteData) {
     super();
@@ -22,11 +19,7 @@ export class SecureNote extends Domain {
     this.type = obj.type;
   }
 
-  async decrypt(
-    orgId: string,
-    context = "No Cipher Context",
-    encKey?: SymmetricCryptoKey,
-  ): Promise<SecureNoteView> {
+  async decrypt(): Promise<SecureNoteView> {
     return new SecureNoteView(this);
   }
 
@@ -36,12 +29,14 @@ export class SecureNote extends Domain {
     return n;
   }
 
-  static fromJSON(obj: Jsonify<SecureNote>): SecureNote {
+  static fromJSON(obj: Jsonify<SecureNote> | undefined): SecureNote | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    return Object.assign(new SecureNote(), obj);
+    const secureNote = new SecureNote();
+    secureNote.type = obj.type;
+    return secureNote;
   }
 
   /**
@@ -59,7 +54,7 @@ export class SecureNote extends Domain {
    * Maps an SDK SecureNote object to a SecureNote
    * @param obj - The SDK SecureNote object
    */
-  static fromSdkSecureNote(obj: SdkSecureNote): SecureNote | undefined {
+  static fromSdkSecureNote(obj?: SdkSecureNote): SecureNote | undefined {
     if (obj == null) {
       return undefined;
     }
diff --git a/libs/common/src/vault/models/domain/ssh-key.spec.ts b/libs/common/src/vault/models/domain/ssh-key.spec.ts
index 6576d1a41e9..10149ebc82d 100644
--- a/libs/common/src/vault/models/domain/ssh-key.spec.ts
+++ b/libs/common/src/vault/models/domain/ssh-key.spec.ts
@@ -1,3 +1,6 @@
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { EncString as SdkEncString, SshKey as SdkSshKey } from "@bitwarden/sdk-internal";
+
 import { mockEnc } from "../../../../spec";
 import { SshKeyApi } from "../api/ssh-key.api";
 import { SshKeyData } from "../data/ssh-key.data";
@@ -31,11 +34,13 @@ describe("Sshkey", () => {
     const data = new SshKeyData();
     const sshKey = new SshKey(data);
 
-    expect(sshKey).toEqual({
-      privateKey: null,
-      publicKey: null,
-      keyFingerprint: null,
-    });
+    expect(sshKey).toBeInstanceOf(SshKey);
+    expect(sshKey.privateKey).toBeInstanceOf(EncString);
+    expect(sshKey.publicKey).toBeInstanceOf(EncString);
+    expect(sshKey.keyFingerprint).toBeInstanceOf(EncString);
+    expect(data.privateKey).toBeUndefined();
+    expect(data.publicKey).toBeUndefined();
+    expect(data.keyFingerprint).toBeUndefined();
   });
 
   it("toSshKeyData", () => {
@@ -60,8 +65,23 @@ describe("Sshkey", () => {
   });
 
   describe("fromJSON", () => {
-    it("returns null if object is null", () => {
-      expect(SshKey.fromJSON(null)).toBeNull();
+    it("returns undefined if object is null", () => {
+      expect(SshKey.fromJSON(null)).toBeUndefined();
+    });
+
+    it("creates SshKey instance from JSON object", () => {
+      const jsonObj = {
+        privateKey: "2.privateKey|encryptedData",
+        publicKey: "2.publicKey|encryptedData",
+        keyFingerprint: "2.keyFingerprint|encryptedData",
+      };
+
+      const result = SshKey.fromJSON(jsonObj);
+
+      expect(result).toBeInstanceOf(SshKey);
+      expect(result.privateKey).toBeDefined();
+      expect(result.publicKey).toBeDefined();
+      expect(result.keyFingerprint).toBeDefined();
     });
   });
 
@@ -77,4 +97,58 @@ describe("Sshkey", () => {
       });
     });
   });
+
+  describe("fromSdkSshKey", () => {
+    it("returns undefined when null is provided", () => {
+      const result = SshKey.fromSdkSshKey(null);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("returns undefined when undefined is provided", () => {
+      const result = SshKey.fromSdkSshKey(undefined);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("creates SshKey from SDK object", () => {
+      const sdkSshKey: SdkSshKey = {
+        privateKey: "2.privateKey|encryptedData" as SdkEncString,
+        publicKey: "2.publicKey|encryptedData" as SdkEncString,
+        fingerprint: "2.keyFingerprint|encryptedData" as SdkEncString,
+      };
+
+      const result = SshKey.fromSdkSshKey(sdkSshKey);
+
+      expect(result).toBeInstanceOf(SshKey);
+      expect(result.privateKey).toBeDefined();
+      expect(result.publicKey).toBeDefined();
+      expect(result.keyFingerprint).toBeDefined();
+    });
+
+    it("creates a new SshKey instance", () => {
+      const sdkSshKey: SdkSshKey = {
+        privateKey: "2.privateKey|encryptedData" as SdkEncString,
+        publicKey: "2.publicKey|encryptedData" as SdkEncString,
+        fingerprint: "2.keyFingerprint|encryptedData" as SdkEncString,
+      };
+
+      const result = SshKey.fromSdkSshKey(sdkSshKey);
+
+      expect(result).not.toBe(sdkSshKey);
+      expect(result).toBeInstanceOf(SshKey);
+    });
+
+    it("is symmetric with toSdkSshKey", () => {
+      const original = new SshKey(data);
+      const sdkFormat = original.toSdkSshKey();
+      const reconstructed = SshKey.fromSdkSshKey(sdkFormat);
+
+      expect(reconstructed.privateKey.encryptedString).toBe(original.privateKey.encryptedString);
+      expect(reconstructed.publicKey.encryptedString).toBe(original.publicKey.encryptedString);
+      expect(reconstructed.keyFingerprint.encryptedString).toBe(
+        original.keyFingerprint.encryptedString,
+      );
+    });
+  });
 });
diff --git a/libs/common/src/vault/models/domain/ssh-key.ts b/libs/common/src/vault/models/domain/ssh-key.ts
index ab1685955a3..a7028321a44 100644
--- a/libs/common/src/vault/models/domain/ssh-key.ts
+++ b/libs/common/src/vault/models/domain/ssh-key.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { SshKey as SdkSshKey } from "@bitwarden/sdk-internal";
@@ -11,9 +9,9 @@ import { SshKeyData } from "../data/ssh-key.data";
 import { SshKeyView } from "../view/ssh-key.view";
 
 export class SshKey extends Domain {
-  privateKey: EncString;
-  publicKey: EncString;
-  keyFingerprint: EncString;
+  privateKey!: EncString;
+  publicKey!: EncString;
+  keyFingerprint!: EncString;
 
   constructor(obj?: SshKeyData) {
     super();
@@ -21,20 +19,13 @@ export class SshKey extends Domain {
       return;
     }
 
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        privateKey: null,
-        publicKey: null,
-        keyFingerprint: null,
-      },
-      [],
-    );
+    this.privateKey = new EncString(obj.privateKey);
+    this.publicKey = new EncString(obj.publicKey);
+    this.keyFingerprint = new EncString(obj.keyFingerprint);
   }
 
   decrypt(
-    orgId: string,
+    orgId: string | undefined,
     context = "No Cipher Context",
     encKey?: SymmetricCryptoKey,
   ): Promise<SshKeyView> {
@@ -42,7 +33,7 @@ export class SshKey extends Domain {
       this,
       new SshKeyView(),
       ["privateKey", "publicKey", "keyFingerprint"],
-      orgId,
+      orgId ?? null,
       encKey,
       "DomainType: SshKey; " + context,
     );
@@ -58,19 +49,17 @@ export class SshKey extends Domain {
     return c;
   }
 
-  static fromJSON(obj: Partial<Jsonify<SshKey>>): SshKey {
+  static fromJSON(obj: Jsonify<SshKey> | undefined): SshKey | undefined {
     if (obj == null) {
-      return null;
+      return undefined;
     }
 
-    const privateKey = EncString.fromJSON(obj.privateKey);
-    const publicKey = EncString.fromJSON(obj.publicKey);
-    const keyFingerprint = EncString.fromJSON(obj.keyFingerprint);
-    return Object.assign(new SshKey(), obj, {
-      privateKey,
-      publicKey,
-      keyFingerprint,
-    });
+    const sshKey = new SshKey();
+    sshKey.privateKey = EncString.fromJSON(obj.privateKey);
+    sshKey.publicKey = EncString.fromJSON(obj.publicKey);
+    sshKey.keyFingerprint = EncString.fromJSON(obj.keyFingerprint);
+
+    return sshKey;
   }
 
   /**
@@ -90,7 +79,7 @@ export class SshKey extends Domain {
    * Maps an SDK SshKey object to a SshKey
    * @param obj - The SDK SshKey object
    */
-  static fromSdkSshKey(obj: SdkSshKey): SshKey | undefined {
+  static fromSdkSshKey(obj?: SdkSshKey): SshKey | undefined {
     if (obj == null) {
       return undefined;
     }
diff --git a/libs/common/src/vault/models/request/attachment.request.ts b/libs/common/src/vault/models/request/attachment.request.ts
index d058fa69d8b..80205835ab7 100644
--- a/libs/common/src/vault/models/request/attachment.request.ts
+++ b/libs/common/src/vault/models/request/attachment.request.ts
@@ -5,4 +5,5 @@ export class AttachmentRequest {
   key: string;
   fileSize: number;
   adminRequest: boolean;
+  lastKnownRevisionDate: Date;
 }
diff --git a/libs/common/src/vault/models/request/cipher-partial.request.ts b/libs/common/src/vault/models/request/cipher-partial.request.ts
index 6037dff6cb2..a50ea10d0cb 100644
--- a/libs/common/src/vault/models/request/cipher-partial.request.ts
+++ b/libs/common/src/vault/models/request/cipher-partial.request.ts
@@ -1,7 +1,7 @@
 import { Cipher } from "../domain/cipher";
 
 export class CipherPartialRequest {
-  folderId: string;
+  folderId?: string;
   favorite: boolean;
 
   constructor(cipher: Cipher) {
diff --git a/libs/common/src/vault/models/request/cipher.request.ts b/libs/common/src/vault/models/request/cipher.request.ts
index 63776c8aea6..b29d5865d2b 100644
--- a/libs/common/src/vault/models/request/cipher.request.ts
+++ b/libs/common/src/vault/models/request/cipher.request.ts
@@ -201,6 +201,7 @@ export class CipherRequest {
         this.attachments[attachment.id] = fileName;
         const attachmentRequest = new AttachmentRequest();
         attachmentRequest.fileName = fileName;
+        attachmentRequest.lastKnownRevisionDate = cipher.revisionDate;
         if (attachment.key != null) {
           attachmentRequest.key = attachment.key.encryptedString;
         }
diff --git a/libs/common/src/vault/models/response/cipher.response.ts b/libs/common/src/vault/models/response/cipher.response.ts
index bf01e0f08de..28979302eb4 100644
--- a/libs/common/src/vault/models/response/cipher.response.ts
+++ b/libs/common/src/vault/models/response/cipher.response.ts
@@ -14,6 +14,11 @@ import { SshKeyApi } from "../api/ssh-key.api";
 import { AttachmentResponse } from "./attachment.response";
 import { PasswordHistoryResponse } from "./password-history.response";
 
+export type CipherMiniResponse = Omit<
+  CipherResponse,
+  "edit" | "viewPassword" | "folderId" | "favorite" | "permissions"
+>;
+
 export class CipherResponse extends BaseResponse {
   id: string;
   organizationId: string;
diff --git a/libs/common/src/vault/models/view/attachment.view.ts b/libs/common/src/vault/models/view/attachment.view.ts
index 1c796c8f275..ef4a9ed8b27 100644
--- a/libs/common/src/vault/models/view/attachment.view.ts
+++ b/libs/common/src/vault/models/view/attachment.view.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { AttachmentView as SdkAttachmentView } from "@bitwarden/sdk-internal";
@@ -10,12 +8,12 @@ import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-cr
 import { Attachment } from "../domain/attachment";
 
 export class AttachmentView implements View {
-  id: string = null;
-  url: string = null;
-  size: string = null;
-  sizeName: string = null;
-  fileName: string = null;
-  key: SymmetricCryptoKey = null;
+  id?: string;
+  url?: string;
+  size?: string;
+  sizeName?: string;
+  fileName?: string;
+  key?: SymmetricCryptoKey;
   /**
    * The SDK returns an encrypted key for the attachment.
    */
@@ -35,7 +33,7 @@ export class AttachmentView implements View {
   get fileSize(): number {
     try {
       if (this.size != null) {
-        return parseInt(this.size, null);
+        return parseInt(this.size);
       }
     } catch {
       // Invalid file size.
@@ -71,7 +69,7 @@ export class AttachmentView implements View {
       fileName: this.fileName,
       key: this.encryptedKey?.toSdk(),
       // TODO: PM-23005 - Temporary field, should be removed when encrypted migration is complete
-      decryptedKey: this.key ? this.key.toBase64() : null,
+      decryptedKey: this.key ? this.key.toBase64() : undefined,
     };
   }
 
@@ -84,13 +82,13 @@ export class AttachmentView implements View {
     }
 
     const view = new AttachmentView();
-    view.id = obj.id ?? null;
-    view.url = obj.url ?? null;
-    view.size = obj.size ?? null;
-    view.sizeName = obj.sizeName ?? null;
-    view.fileName = obj.fileName ?? null;
+    view.id = obj.id;
+    view.url = obj.url;
+    view.size = obj.size;
+    view.sizeName = obj.sizeName;
+    view.fileName = obj.fileName;
     // TODO: PM-23005 - Temporary field, should be removed when encrypted migration is complete
-    view.key = obj.decryptedKey ? SymmetricCryptoKey.fromString(obj.decryptedKey) : null;
+    view.key = obj.decryptedKey ? SymmetricCryptoKey.fromString(obj.decryptedKey) : undefined;
     view.encryptedKey = obj.key ? new EncString(obj.key) : undefined;
 
     return view;
diff --git a/libs/common/src/vault/models/view/card.view.ts b/libs/common/src/vault/models/view/card.view.ts
index ed02fa68365..9b78ad384c6 100644
--- a/libs/common/src/vault/models/view/card.view.ts
+++ b/libs/common/src/vault/models/view/card.view.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { CardView as SdkCardView } from "@bitwarden/sdk-internal";
@@ -12,45 +10,45 @@ import { ItemView } from "./item.view";
 
 export class CardView extends ItemView implements SdkCardView {
   @linkedFieldOption(LinkedId.CardholderName, { sortPosition: 0 })
-  cardholderName: string = null;
+  cardholderName: string | undefined;
   @linkedFieldOption(LinkedId.ExpMonth, { sortPosition: 3, i18nKey: "expirationMonth" })
-  expMonth: string = null;
+  expMonth: string | undefined;
   @linkedFieldOption(LinkedId.ExpYear, { sortPosition: 4, i18nKey: "expirationYear" })
-  expYear: string = null;
+  expYear: string | undefined;
   @linkedFieldOption(LinkedId.Code, { sortPosition: 5, i18nKey: "securityCode" })
-  code: string = null;
+  code: string | undefined;
 
-  private _brand: string = null;
-  private _number: string = null;
-  private _subTitle: string = null;
+  private _brand?: string;
+  private _number?: string;
+  private _subTitle?: string;
 
-  get maskedCode(): string {
-    return this.code != null ? "•".repeat(this.code.length) : null;
+  get maskedCode(): string | undefined {
+    return this.code != null ? "•".repeat(this.code.length) : undefined;
   }
 
-  get maskedNumber(): string {
-    return this.number != null ? "•".repeat(this.number.length) : null;
+  get maskedNumber(): string | undefined {
+    return this.number != null ? "•".repeat(this.number.length) : undefined;
   }
 
   @linkedFieldOption(LinkedId.Brand, { sortPosition: 2 })
-  get brand(): string {
+  get brand(): string | undefined {
     return this._brand;
   }
-  set brand(value: string) {
+  set brand(value: string | undefined) {
     this._brand = value;
-    this._subTitle = null;
+    this._subTitle = undefined;
   }
 
   @linkedFieldOption(LinkedId.Number, { sortPosition: 1 })
-  get number(): string {
+  get number(): string | undefined {
     return this._number;
   }
-  set number(value: string) {
+  set number(value: string | undefined) {
     this._number = value;
-    this._subTitle = null;
+    this._subTitle = undefined;
   }
 
-  get subTitle(): string {
+  get subTitle(): string | undefined {
     if (this._subTitle == null) {
       this._subTitle = this.brand;
       if (this.number != null && this.number.length >= 4) {
@@ -69,11 +67,11 @@ export class CardView extends ItemView implements SdkCardView {
     return this._subTitle;
   }
 
-  get expiration(): string {
-    const normalizedYear = normalizeExpiryYearFormat(this.expYear);
+  get expiration(): string | undefined {
+    const normalizedYear = this.expYear ? normalizeExpiryYearFormat(this.expYear) : undefined;
 
     if (!this.expMonth && !normalizedYear) {
-      return null;
+      return undefined;
     }
 
     let exp = this.expMonth != null ? ("0" + this.expMonth).slice(-2) : "__";
@@ -82,14 +80,14 @@ export class CardView extends ItemView implements SdkCardView {
     return exp;
   }
 
-  static fromJSON(obj: Partial<Jsonify<CardView>>): CardView {
+  static fromJSON(obj: Partial<Jsonify<CardView>> | undefined): CardView {
     return Object.assign(new CardView(), obj);
   }
 
   // ref https://stackoverflow.com/a/5911300
-  static getCardBrandByPatterns(cardNum: string): string {
+  static getCardBrandByPatterns(cardNum: string | undefined | null): string | undefined {
     if (cardNum == null || typeof cardNum !== "string" || cardNum.trim() === "") {
-      return null;
+      return undefined;
     }
 
     // Visa
@@ -146,25 +144,21 @@ export class CardView extends ItemView implements SdkCardView {
       return "Visa";
     }
 
-    return null;
+    return undefined;
   }
 
   /**
    * Converts an SDK CardView to a CardView.
    */
-  static fromSdkCardView(obj: SdkCardView): CardView | undefined {
-    if (obj == null) {
-      return undefined;
-    }
-
+  static fromSdkCardView(obj: SdkCardView): CardView {
     const cardView = new CardView();
 
-    cardView.cardholderName = obj.cardholderName ?? null;
-    cardView.brand = obj.brand ?? null;
-    cardView.number = obj.number ?? null;
-    cardView.expMonth = obj.expMonth ?? null;
-    cardView.expYear = obj.expYear ?? null;
-    cardView.code = obj.code ?? null;
+    cardView.cardholderName = obj.cardholderName;
+    cardView.brand = obj.brand;
+    cardView.number = obj.number;
+    cardView.expMonth = obj.expMonth;
+    cardView.expYear = obj.expYear;
+    cardView.code = obj.code;
 
     return cardView;
   }
diff --git a/libs/common/src/vault/models/view/cipher.view.spec.ts b/libs/common/src/vault/models/view/cipher.view.spec.ts
index e9614db6858..475fe9e23f3 100644
--- a/libs/common/src/vault/models/view/cipher.view.spec.ts
+++ b/libs/common/src/vault/models/view/cipher.view.spec.ts
@@ -109,6 +109,72 @@ describe("CipherView", () => {
       expect(actual.key).toBeInstanceOf(EncString);
       expect(actual.key?.toJSON()).toBe(cipherKeyObject.toJSON());
     });
+
+    it("fromJSON should always restore top-level CipherView properties", () => {
+      jest.spyOn(LoginView, "fromJSON").mockImplementation(mockFromJson);
+      // Create a fully populated CipherView instance
+      const original = new CipherView();
+      original.id = "test-id";
+      original.organizationId = "org-id";
+      original.folderId = "folder-id";
+      original.name = "test-name";
+      original.notes = "test-notes";
+      original.type = CipherType.Login;
+      original.favorite = true;
+      original.organizationUseTotp = true;
+      original.permissions = new CipherPermissionsApi();
+      original.edit = true;
+      original.viewPassword = false;
+      original.localData = { lastUsedDate: Date.now() };
+      original.login = new LoginView();
+      original.identity = new IdentityView();
+      original.card = new CardView();
+      original.secureNote = new SecureNoteView();
+      original.sshKey = new SshKeyView();
+      original.attachments = [];
+      original.fields = [];
+      original.passwordHistory = [];
+      original.collectionIds = ["collection-1"];
+      original.revisionDate = new Date("2022-01-01");
+      original.creationDate = new Date("2022-01-02");
+      original.deletedDate = new Date("2022-01-03");
+      original.archivedDate = new Date("2022-01-04");
+      original.reprompt = CipherRepromptType.Password;
+      original.key = new EncString("test-key");
+      original.decryptionFailure = true;
+
+      // Serialize and deserialize
+      const json = original.toJSON();
+      const restored = CipherView.fromJSON(json as any);
+
+      // Get all enumerable properties from the original instance
+      const originalProps = Object.keys(original);
+
+      // Check that all properties exist on the restored instance
+      for (const prop of originalProps) {
+        try {
+          expect(restored).toHaveProperty(prop);
+        } catch {
+          throw new Error(`Property '${prop}' is missing from restored instance`);
+        }
+
+        // For non-function, non-getter properties, verify the value is defined
+        const descriptor = Object.getOwnPropertyDescriptor(CipherView.prototype, prop);
+        if (!descriptor?.get && typeof (original as any)[prop] !== "function") {
+          try {
+            expect((restored as any)[prop]).toBeDefined();
+          } catch {
+            throw new Error(`Property '${prop}' is undefined in restored instance`);
+          }
+        }
+      }
+
+      // Verify restored instance has the same properties as original
+      const restoredProps = Object.keys(restored!).sort();
+      const sortedOriginalProps = originalProps.sort();
+
+      expect(restoredProps).toEqual(sortedOriginalProps);
+    });
   });
 
   describe("fromSdkCipherView", () => {
@@ -180,15 +246,12 @@ describe("CipherView", () => {
         folderId: "folderId",
         collectionIds: ["collectionId"],
         name: "name",
-        notes: null,
         type: CipherType.Login,
         favorite: true,
         edit: true,
         reprompt: CipherRepromptType.None,
         organizationUseTotp: false,
         viewPassword: true,
-        localData: undefined,
-        permissions: undefined,
         attachments: [
           {
             id: "attachmentId",
@@ -224,7 +287,6 @@ describe("CipherView", () => {
         passwordHistory: [],
         creationDate: new Date("2022-01-01T12:00:00.000Z"),
         revisionDate: new Date("2022-01-02T12:00:00.000Z"),
-        deletedDate: null,
       });
     });
   });
@@ -283,18 +345,12 @@ describe("CipherView", () => {
           restore: true,
           delete: true,
         },
-        deletedDate: undefined,
         creationDate: "2022-01-02T12:00:00.000Z",
         revisionDate: "2022-01-02T12:00:00.000Z",
         attachments: [],
         passwordHistory: [],
-        login: undefined,
-        identity: undefined,
-        card: undefined,
-        secureNote: undefined,
-        sshKey: undefined,
         fields: [],
-      } as SdkCipherView);
+      });
     });
   });
 });
diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts
index d52e6eb11bd..0d4ab8e5207 100644
--- a/libs/common/src/vault/models/view/cipher.view.ts
+++ b/libs/common/src/vault/models/view/cipher.view.ts
@@ -1,7 +1,6 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { asUuid, uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
+import { ItemView } from "@bitwarden/common/vault/models/view/item.view";
 import { CipherView as SdkCipherView } from "@bitwarden/sdk-internal";
 
 import { View } from "../../../models/view/view";
@@ -26,18 +25,18 @@ import { SshKeyView } from "./ssh-key.view";
 export class CipherView implements View, InitializerMetadata {
   readonly initializerKey = InitializerKey.CipherView;
 
-  id: string = null;
-  organizationId: string | undefined = null;
-  folderId: string = null;
-  name: string = null;
-  notes: string = null;
-  type: CipherType = null;
+  id: string = "";
+  organizationId?: string;
+  folderId?: string;
+  name: string = "";
+  notes?: string;
+  type: CipherType = CipherType.Login;
   favorite = false;
   organizationUseTotp = false;
-  permissions: CipherPermissionsApi = new CipherPermissionsApi();
+  permissions?: CipherPermissionsApi = new CipherPermissionsApi();
   edit = false;
   viewPassword = true;
-  localData: LocalData;
+  localData?: LocalData;
   login = new LoginView();
   identity = new IdentityView();
   card = new CardView();
@@ -46,11 +45,11 @@ export class CipherView implements View, InitializerMetadata {
   attachments: AttachmentView[] = [];
   fields: FieldView[] = [];
   passwordHistory: PasswordHistoryView[] = [];
-  collectionIds: string[] = null;
-  revisionDate: Date = null;
-  creationDate: Date = null;
-  deletedDate: Date | null = null;
-  archivedDate: Date | null = null;
+  collectionIds: string[] = [];
+  revisionDate: Date;
+  creationDate: Date;
+  deletedDate?: Date;
+  archivedDate?: Date;
   reprompt: CipherRepromptType = CipherRepromptType.None;
   // We need a copy of the encrypted key so we can pass it to
   // the SdkCipherView during encryption
@@ -63,6 +62,7 @@ export class CipherView implements View, InitializerMetadata {
 
   constructor(c?: Cipher) {
     if (!c) {
+      this.creationDate = this.revisionDate = new Date();
       return;
     }
 
@@ -86,7 +86,7 @@ export class CipherView implements View, InitializerMetadata {
     this.key = c.key;
   }
 
-  private get item() {
+  private get item(): ItemView | undefined {
     switch (this.type) {
       case CipherType.Login:
         return this.login;
@@ -102,10 +102,10 @@ export class CipherView implements View, InitializerMetadata {
         break;
     }
 
-    return null;
+    return undefined;
   }
 
-  get subTitle(): string {
+  get subTitle(): string | undefined {
     return this.item?.subTitle;
   }
 
@@ -113,8 +113,14 @@ export class CipherView implements View, InitializerMetadata {
     return this.passwordHistory && this.passwordHistory.length > 0;
   }
 
+  get hasLoginPassword(): boolean {
+    return (
+      this.type === CipherType.Login && this.login?.password != null && this.login.password !== ""
+    );
+  }
+
   get hasAttachments(): boolean {
-    return this.attachments && this.attachments.length > 0;
+    return !!this.attachments && this.attachments.length > 0;
   }
 
   get hasOldAttachments(): boolean {
@@ -132,11 +138,11 @@ export class CipherView implements View, InitializerMetadata {
     return this.fields && this.fields.length > 0;
   }
 
-  get passwordRevisionDisplayDate(): Date {
+  get passwordRevisionDisplayDate(): Date | undefined {
     if (this.type !== CipherType.Login || this.login == null) {
-      return null;
+      return undefined;
     } else if (this.login.password == null || this.login.password === "") {
-      return null;
+      return undefined;
     }
     return this.login.passwordRevisionDate;
   }
@@ -160,6 +166,10 @@ export class CipherView implements View, InitializerMetadata {
   }
 
   get canAssignToCollections(): boolean {
+    if (this.isArchived) {
+      return false;
+    }
+
     if (this.organizationId == null) {
       return true;
     }
@@ -170,23 +180,17 @@ export class CipherView implements View, InitializerMetadata {
    * Determines if the cipher can be launched in a new browser tab.
    */
   get canLaunch(): boolean {
-    return this.type === CipherType.Login && this.login.canLaunch;
+    return this.type === CipherType.Login && this.login!.canLaunch;
   }
 
   linkedFieldValue(id: LinkedIdType) {
     const linkedFieldOption = this.linkedFieldOptions?.get(id);
-    if (linkedFieldOption == null) {
-      return null;
+    const item = this.item;
+    if (linkedFieldOption == null || item == null) {
+      return undefined;
     }
 
-    // FIXME: Remove when updating file. Eslint update
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const item = this.item;
-    return this.item[linkedFieldOption.propertyKey as keyof typeof item];
-  }
-
-  linkedFieldI18nKey(id: LinkedIdType): string {
-    return this.linkedFieldOptions.get(id)?.i18nKey;
+    return item[linkedFieldOption.propertyKey as keyof typeof item];
   }
 
   // This is used as a marker to indicate that the cipher view object still has its prototype
@@ -194,23 +198,42 @@ export class CipherView implements View, InitializerMetadata {
     return this;
   }
 
-  static fromJSON(obj: Partial<DeepJsonify<CipherView>>): CipherView {
+  static fromJSON(obj: Partial<DeepJsonify<CipherView>>): CipherView | null {
     if (obj == null) {
       return null;
     }
 
     const view = new CipherView();
-    const creationDate = obj.creationDate == null ? null : new Date(obj.creationDate);
-    const revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
-    const deletedDate = obj.deletedDate == null ? null : new Date(obj.deletedDate);
-    const archivedDate = obj.archivedDate == null ? null : new Date(obj.archivedDate);
-    const attachments = obj.attachments?.map((a: any) => AttachmentView.fromJSON(a));
-    const fields = obj.fields?.map((f: any) => FieldView.fromJSON(f));
-    const passwordHistory = obj.passwordHistory?.map((ph: any) => PasswordHistoryView.fromJSON(ph));
-    const permissions = CipherPermissionsApi.fromJSON(obj.permissions);
-    let key: EncString | undefined;
+    view.type = obj.type ?? CipherType.Login;
+    view.id = obj.id ?? "";
+    view.organizationId = obj.organizationId ?? undefined;
+    view.folderId = obj.folderId ?? undefined;
+    view.collectionIds = obj.collectionIds ?? [];
+    view.name = obj.name ?? "";
+    view.notes = obj.notes;
+    view.edit = obj.edit ?? false;
+    view.viewPassword = obj.viewPassword ?? true;
+    view.favorite = obj.favorite ?? false;
+    view.organizationUseTotp = obj.organizationUseTotp ?? false;
+    view.localData = obj.localData ? obj.localData : undefined;
+    view.permissions = obj.permissions ? CipherPermissionsApi.fromJSON(obj.permissions) : undefined;
+    view.reprompt = obj.reprompt ?? CipherRepromptType.None;
+    view.decryptionFailure = obj.decryptionFailure ?? false;
+    if (obj.creationDate) {
+      view.creationDate = new Date(obj.creationDate);
+    }
+    if (obj.revisionDate) {
+      view.revisionDate = new Date(obj.revisionDate);
+    }
+    view.deletedDate = obj.deletedDate == null ? undefined : new Date(obj.deletedDate);
+    view.archivedDate = obj.archivedDate == null ? undefined : new Date(obj.archivedDate);
+    view.attachments = obj.attachments?.map((a: any) => AttachmentView.fromJSON(a)) ?? [];
+    view.fields = obj.fields?.map((f: any) => FieldView.fromJSON(f)) ?? [];
+    view.passwordHistory =
+      obj.passwordHistory?.map((ph: any) => PasswordHistoryView.fromJSON(ph)) ?? [];
 
     if (obj.key != null) {
+      let key: EncString | undefined;
       if (typeof obj.key === "string") {
         // If the key is a string, we need to parse it as EncString
         key = EncString.fromJSON(obj.key);
@@ -218,20 +241,9 @@ export class CipherView implements View, InitializerMetadata {
         // If the key is already an EncString instance, we can use it directly
         key = obj.key;
       }
+      view.key = key;
     }
 
-    Object.assign(view, obj, {
-      creationDate: creationDate,
-      revisionDate: revisionDate,
-      deletedDate: deletedDate,
-      archivedDate: archivedDate,
-      attachments: attachments,
-      fields: fields,
-      passwordHistory: passwordHistory,
-      permissions: permissions,
-      key: key,
-    });
-
     switch (obj.type) {
       case CipherType.Card:
         view.card = CardView.fromJSON(obj.card);
@@ -264,46 +276,54 @@ export class CipherView implements View, InitializerMetadata {
     }
 
     const cipherView = new CipherView();
-    cipherView.id = uuidAsString(obj.id) ?? null;
-    cipherView.organizationId = uuidAsString(obj.organizationId) ?? null;
-    cipherView.folderId = uuidAsString(obj.folderId) ?? null;
+    cipherView.id = uuidAsString(obj.id);
+    cipherView.organizationId = uuidAsString(obj.organizationId);
+    cipherView.folderId = uuidAsString(obj.folderId);
     cipherView.name = obj.name;
-    cipherView.notes = obj.notes ?? null;
+    cipherView.notes = obj.notes;
     cipherView.type = obj.type;
     cipherView.favorite = obj.favorite;
     cipherView.organizationUseTotp = obj.organizationUseTotp;
-    cipherView.permissions = CipherPermissionsApi.fromSdkCipherPermissions(obj.permissions);
+    cipherView.permissions = obj.permissions
+      ? CipherPermissionsApi.fromSdkCipherPermissions(obj.permissions)
+      : undefined;
     cipherView.edit = obj.edit;
     cipherView.viewPassword = obj.viewPassword;
     cipherView.localData = fromSdkLocalData(obj.localData);
     cipherView.attachments =
-      obj.attachments?.map((a) => AttachmentView.fromSdkAttachmentView(a)) ?? [];
-    cipherView.fields = obj.fields?.map((f) => FieldView.fromSdkFieldView(f)) ?? [];
+      obj.attachments?.map((a) => AttachmentView.fromSdkAttachmentView(a)!) ?? [];
+    cipherView.fields = obj.fields?.map((f) => FieldView.fromSdkFieldView(f)!) ?? [];
     cipherView.passwordHistory =
-      obj.passwordHistory?.map((ph) => PasswordHistoryView.fromSdkPasswordHistoryView(ph)) ?? [];
+      obj.passwordHistory?.map((ph) => PasswordHistoryView.fromSdkPasswordHistoryView(ph)!) ?? [];
     cipherView.collectionIds = obj.collectionIds?.map((i) => uuidAsString(i)) ?? [];
-    cipherView.revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
-    cipherView.creationDate = obj.creationDate == null ? null : new Date(obj.creationDate);
-    cipherView.deletedDate = obj.deletedDate == null ? null : new Date(obj.deletedDate);
-    cipherView.archivedDate = obj.archivedDate == null ? null : new Date(obj.archivedDate);
+    cipherView.revisionDate = new Date(obj.revisionDate);
+    cipherView.creationDate = new Date(obj.creationDate);
+    cipherView.deletedDate = obj.deletedDate == null ? undefined : new Date(obj.deletedDate);
+    cipherView.archivedDate = obj.archivedDate == null ? undefined : new Date(obj.archivedDate);
     cipherView.reprompt = obj.reprompt ?? CipherRepromptType.None;
-    cipherView.key = EncString.fromJSON(obj.key);
+    cipherView.key = obj.key ? EncString.fromJSON(obj.key) : undefined;
 
     switch (obj.type) {
       case CipherType.Card:
-        cipherView.card = CardView.fromSdkCardView(obj.card);
+        cipherView.card = obj.card ? CardView.fromSdkCardView(obj.card) : new CardView();
         break;
       case CipherType.Identity:
-        cipherView.identity = IdentityView.fromSdkIdentityView(obj.identity);
+        cipherView.identity = obj.identity
+          ? IdentityView.fromSdkIdentityView(obj.identity)
+          : new IdentityView();
         break;
       case CipherType.Login:
-        cipherView.login = LoginView.fromSdkLoginView(obj.login);
+        cipherView.login = obj.login ? LoginView.fromSdkLoginView(obj.login) : new LoginView();
         break;
       case CipherType.SecureNote:
-        cipherView.secureNote = SecureNoteView.fromSdkSecureNoteView(obj.secureNote);
+        cipherView.secureNote = obj.secureNote
+          ? SecureNoteView.fromSdkSecureNoteView(obj.secureNote)
+          : new SecureNoteView();
         break;
       case CipherType.SshKey:
-        cipherView.sshKey = SshKeyView.fromSdkSshKeyView(obj.sshKey);
+        cipherView.sshKey = obj.sshKey
+          ? SshKeyView.fromSdkSshKeyView(obj.sshKey)
+          : new SshKeyView();
         break;
       default:
         break;
@@ -325,11 +345,11 @@ export class CipherView implements View, InitializerMetadata {
       name: this.name ?? "",
       notes: this.notes,
       type: this.type ?? CipherType.Login,
-      favorite: this.favorite,
-      organizationUseTotp: this.organizationUseTotp,
+      favorite: this.favorite ?? false,
+      organizationUseTotp: this.organizationUseTotp ?? false,
       permissions: this.permissions?.toSdkCipherPermissions(),
-      edit: this.edit,
-      viewPassword: this.viewPassword,
+      edit: this.edit ?? true,
+      viewPassword: this.viewPassword ?? true,
       localData: toSdkLocalData(this.localData),
       attachments: this.attachments?.map((a) => a.toSdkAttachmentView()),
       fields: this.fields?.map((f) => f.toSdkFieldView()),
@@ -354,19 +374,19 @@ export class CipherView implements View, InitializerMetadata {
 
     switch (this.type) {
       case CipherType.Card:
-        sdkCipherView.card = this.card.toSdkCardView();
+        sdkCipherView.card = this.card?.toSdkCardView();
         break;
       case CipherType.Identity:
-        sdkCipherView.identity = this.identity.toSdkIdentityView();
+        sdkCipherView.identity = this.identity?.toSdkIdentityView();
         break;
       case CipherType.Login:
-        sdkCipherView.login = this.login.toSdkLoginView();
+        sdkCipherView.login = this.login?.toSdkLoginView();
         break;
       case CipherType.SecureNote:
-        sdkCipherView.secureNote = this.secureNote.toSdkSecureNoteView();
+        sdkCipherView.secureNote = this.secureNote?.toSdkSecureNoteView();
         break;
       case CipherType.SshKey:
-        sdkCipherView.sshKey = this.sshKey.toSdkSshKeyView();
+        sdkCipherView.sshKey = this.sshKey?.toSdkSshKeyView();
         break;
       default:
         break;
diff --git a/libs/common/src/vault/models/view/fido2-credential.view.ts b/libs/common/src/vault/models/view/fido2-credential.view.ts
index 410757ebe30..19e7f5d7e3c 100644
--- a/libs/common/src/vault/models/view/fido2-credential.view.ts
+++ b/libs/common/src/vault/models/view/fido2-credential.view.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import {
@@ -10,21 +8,55 @@ import {
 import { ItemView } from "./item.view";
 
 export class Fido2CredentialView extends ItemView {
-  credentialId: string;
-  keyType: "public-key";
-  keyAlgorithm: "ECDSA";
-  keyCurve: "P-256";
-  keyValue: string;
-  rpId: string;
-  userHandle: string;
-  userName: string;
-  counter: number;
-  rpName: string;
-  userDisplayName: string;
-  discoverable: boolean;
-  creationDate: Date = null;
+  credentialId!: string;
+  keyType!: "public-key";
+  keyAlgorithm!: "ECDSA";
+  keyCurve!: "P-256";
+  keyValue!: string;
+  rpId!: string;
+  userHandle?: string;
+  userName?: string;
+  counter!: number;
+  rpName?: string;
+  userDisplayName?: string;
+  discoverable: boolean = false;
+  creationDate!: Date;
 
-  get subTitle(): string {
+  constructor(f?: {
+    credentialId: string;
+    keyType: "public-key";
+    keyAlgorithm: "ECDSA";
+    keyCurve: "P-256";
+    keyValue: string;
+    rpId: string;
+    userHandle?: string;
+    userName?: string;
+    counter: number;
+    rpName?: string;
+    userDisplayName?: string;
+    discoverable?: boolean;
+    creationDate: Date;
+  }) {
+    super();
+    if (f == null) {
+      return;
+    }
+    this.credentialId = f.credentialId;
+    this.keyType = f.keyType;
+    this.keyAlgorithm = f.keyAlgorithm;
+    this.keyCurve = f.keyCurve;
+    this.keyValue = f.keyValue;
+    this.rpId = f.rpId;
+    this.userHandle = f.userHandle;
+    this.userName = f.userName;
+    this.counter = f.counter;
+    this.rpName = f.rpName;
+    this.userDisplayName = f.userDisplayName;
+    this.discoverable = f.discoverable ?? false;
+    this.creationDate = f.creationDate;
+  }
+
+  get subTitle(): string | undefined {
     return this.userDisplayName;
   }
 
@@ -43,21 +75,21 @@ export class Fido2CredentialView extends ItemView {
       return undefined;
     }
 
-    const view = new Fido2CredentialView();
-    view.credentialId = obj.credentialId;
-    view.keyType = obj.keyType as "public-key";
-    view.keyAlgorithm = obj.keyAlgorithm as "ECDSA";
-    view.keyCurve = obj.keyCurve as "P-256";
-    view.rpId = obj.rpId;
-    view.userHandle = obj.userHandle;
-    view.userName = obj.userName;
-    view.counter = parseInt(obj.counter);
-    view.rpName = obj.rpName;
-    view.userDisplayName = obj.userDisplayName;
-    view.discoverable = obj.discoverable?.toLowerCase() === "true" ? true : false;
-    view.creationDate = obj.creationDate ? new Date(obj.creationDate) : null;
-
-    return view;
+    return new Fido2CredentialView({
+      credentialId: obj.credentialId,
+      keyType: obj.keyType as "public-key",
+      keyAlgorithm: obj.keyAlgorithm as "ECDSA",
+      keyCurve: obj.keyCurve as "P-256",
+      keyValue: obj.keyValue,
+      rpId: obj.rpId,
+      userHandle: obj.userHandle,
+      userName: obj.userName,
+      counter: parseInt(obj.counter),
+      rpName: obj.rpName,
+      userDisplayName: obj.userDisplayName,
+      discoverable: obj.discoverable?.toLowerCase() === "true",
+      creationDate: new Date(obj.creationDate),
+    });
   }
 
   toSdkFido2CredentialFullView(): Fido2CredentialFullView {
diff --git a/libs/common/src/vault/models/view/field.view.ts b/libs/common/src/vault/models/view/field.view.ts
index 8c9a923aed2..9f34420a86c 100644
--- a/libs/common/src/vault/models/view/field.view.ts
+++ b/libs/common/src/vault/models/view/field.view.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { FieldView as SdkFieldView, FieldType as SdkFieldType } from "@bitwarden/sdk-internal";
@@ -9,13 +7,13 @@ import { FieldType, LinkedIdType } from "../../enums";
 import { Field } from "../domain/field";
 
 export class FieldView implements View {
-  name: string = null;
-  value: string = null;
-  type: FieldType = null;
+  name?: string;
+  value?: string;
+  type: FieldType = FieldType.Text;
   newField = false; // Marks if the field is new and hasn't been saved
   showValue = false;
   showCount = false;
-  linkedId: LinkedIdType = null;
+  linkedId?: LinkedIdType;
 
   constructor(f?: Field) {
     if (!f) {
@@ -26,8 +24,8 @@ export class FieldView implements View {
     this.linkedId = f.linkedId;
   }
 
-  get maskedValue(): string {
-    return this.value != null ? "••••••••" : null;
+  get maskedValue(): string | undefined {
+    return this.value != null ? "••••••••" : undefined;
   }
 
   static fromJSON(obj: Partial<Jsonify<FieldView>>): FieldView {
diff --git a/libs/common/src/vault/models/view/identity.view.ts b/libs/common/src/vault/models/view/identity.view.ts
index 2b863dc5e5f..fadfafb8777 100644
--- a/libs/common/src/vault/models/view/identity.view.ts
+++ b/libs/common/src/vault/models/view/identity.view.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { IdentityView as SdkIdentityView } from "@bitwarden/sdk-internal";
@@ -12,65 +10,65 @@ import { ItemView } from "./item.view";
 
 export class IdentityView extends ItemView implements SdkIdentityView {
   @linkedFieldOption(LinkedId.Title, { sortPosition: 0 })
-  title: string = null;
+  title: string | undefined;
   @linkedFieldOption(LinkedId.MiddleName, { sortPosition: 2 })
-  middleName: string = null;
+  middleName: string | undefined;
   @linkedFieldOption(LinkedId.Address1, { sortPosition: 12 })
-  address1: string = null;
+  address1: string | undefined;
   @linkedFieldOption(LinkedId.Address2, { sortPosition: 13 })
-  address2: string = null;
+  address2: string | undefined;
   @linkedFieldOption(LinkedId.Address3, { sortPosition: 14 })
-  address3: string = null;
+  address3: string | undefined;
   @linkedFieldOption(LinkedId.City, { sortPosition: 15, i18nKey: "cityTown" })
-  city: string = null;
+  city: string | undefined;
   @linkedFieldOption(LinkedId.State, { sortPosition: 16, i18nKey: "stateProvince" })
-  state: string = null;
-  @linkedFieldOption(LinkedId.PostalCode, { sortPosition: 17, i18nKey: "zipPostalCode" })
-  postalCode: string = null;
+  state: string | undefined;
+  @linkedFieldOption(LinkedId.PostalCode, { sortPosition: 17, i18nKey: "zipPostalCodeLabel" })
+  postalCode: string | undefined;
   @linkedFieldOption(LinkedId.Country, { sortPosition: 18 })
-  country: string = null;
+  country: string | undefined;
   @linkedFieldOption(LinkedId.Company, { sortPosition: 6 })
-  company: string = null;
+  company: string | undefined;
   @linkedFieldOption(LinkedId.Email, { sortPosition: 10 })
-  email: string = null;
+  email: string | undefined;
   @linkedFieldOption(LinkedId.Phone, { sortPosition: 11 })
-  phone: string = null;
+  phone: string | undefined;
   @linkedFieldOption(LinkedId.Ssn, { sortPosition: 7 })
-  ssn: string = null;
+  ssn: string | undefined;
   @linkedFieldOption(LinkedId.Username, { sortPosition: 5 })
-  username: string = null;
+  username: string | undefined;
   @linkedFieldOption(LinkedId.PassportNumber, { sortPosition: 8 })
-  passportNumber: string = null;
+  passportNumber: string | undefined;
   @linkedFieldOption(LinkedId.LicenseNumber, { sortPosition: 9 })
-  licenseNumber: string = null;
+  licenseNumber: string | undefined;
 
-  private _firstName: string = null;
-  private _lastName: string = null;
-  private _subTitle: string = null;
+  private _firstName: string | undefined;
+  private _lastName: string | undefined;
+  private _subTitle: string | undefined;
 
   constructor() {
     super();
   }
 
   @linkedFieldOption(LinkedId.FirstName, { sortPosition: 1 })
-  get firstName(): string {
+  get firstName(): string | undefined {
     return this._firstName;
   }
-  set firstName(value: string) {
+  set firstName(value: string | undefined) {
     this._firstName = value;
-    this._subTitle = null;
+    this._subTitle = undefined;
   }
 
   @linkedFieldOption(LinkedId.LastName, { sortPosition: 4 })
-  get lastName(): string {
+  get lastName(): string | undefined {
     return this._lastName;
   }
-  set lastName(value: string) {
+  set lastName(value: string | undefined) {
     this._lastName = value;
-    this._subTitle = null;
+    this._subTitle = undefined;
   }
 
-  get subTitle(): string {
+  get subTitle(): string | undefined {
     if (this._subTitle == null && (this.firstName != null || this.lastName != null)) {
       this._subTitle = "";
       if (this.firstName != null) {
@@ -88,7 +86,7 @@ export class IdentityView extends ItemView implements SdkIdentityView {
   }
 
   @linkedFieldOption(LinkedId.FullName, { sortPosition: 3 })
-  get fullName(): string {
+  get fullName(): string | undefined {
     if (
       this.title != null ||
       this.firstName != null ||
@@ -96,26 +94,26 @@ export class IdentityView extends ItemView implements SdkIdentityView {
       this.lastName != null
     ) {
       let name = "";
-      if (this.title != null) {
+      if (!Utils.isNullOrWhitespace(this.title)) {
         name += this.title + " ";
       }
-      if (this.firstName != null) {
+      if (!Utils.isNullOrWhitespace(this.firstName)) {
         name += this.firstName + " ";
       }
-      if (this.middleName != null) {
+      if (!Utils.isNullOrWhitespace(this.middleName)) {
         name += this.middleName + " ";
       }
-      if (this.lastName != null) {
+      if (!Utils.isNullOrWhitespace(this.lastName)) {
         name += this.lastName;
       }
       return name.trim();
     }
 
-    return null;
+    return undefined;
   }
 
-  get fullAddress(): string {
-    let address = this.address1;
+  get fullAddress(): string | undefined {
+    let address = this.address1 ?? "";
     if (!Utils.isNullOrWhitespace(this.address2)) {
       if (!Utils.isNullOrWhitespace(address)) {
         address += ", ";
@@ -131,22 +129,28 @@ export class IdentityView extends ItemView implements SdkIdentityView {
     return address;
   }
 
-  get fullAddressPart2(): string {
-    if (this.city == null && this.state == null && this.postalCode == null) {
-      return null;
+  get fullAddressPart2(): string | undefined {
+    const hasCity = !Utils.isNullOrWhitespace(this.city);
+    const hasState = !Utils.isNullOrWhitespace(this.state);
+    const hasPostalCode = !Utils.isNullOrWhitespace(this.postalCode);
+
+    if (!hasCity && !hasState && !hasPostalCode) {
+      return undefined;
     }
-    const city = this.city || "-";
+
+    const city = hasCity ? this.city : "-";
     const state = this.state;
-    const postalCode = this.postalCode || "-";
+    const postalCode = hasPostalCode ? this.postalCode : "-";
+
     let addressPart2 = city;
-    if (!Utils.isNullOrWhitespace(state)) {
+    if (hasState) {
       addressPart2 += ", " + state;
     }
     addressPart2 += ", " + postalCode;
     return addressPart2;
   }
 
-  get fullAddressForCopy(): string {
+  get fullAddressForCopy(): string | undefined {
     let address = this.fullAddress;
     if (this.city != null || this.state != null || this.postalCode != null) {
       address += "\n" + this.fullAddressPart2;
@@ -157,38 +161,34 @@ export class IdentityView extends ItemView implements SdkIdentityView {
     return address;
   }
 
-  static fromJSON(obj: Partial<Jsonify<IdentityView>>): IdentityView {
+  static fromJSON(obj: Partial<Jsonify<IdentityView>> | undefined): IdentityView {
     return Object.assign(new IdentityView(), obj);
   }
 
   /**
    * Converts the SDK IdentityView to an IdentityView.
    */
-  static fromSdkIdentityView(obj: SdkIdentityView): IdentityView | undefined {
-    if (obj == null) {
-      return undefined;
-    }
-
+  static fromSdkIdentityView(obj: SdkIdentityView): IdentityView {
     const identityView = new IdentityView();
 
-    identityView.title = obj.title ?? null;
-    identityView.firstName = obj.firstName ?? null;
-    identityView.middleName = obj.middleName ?? null;
-    identityView.lastName = obj.lastName ?? null;
-    identityView.address1 = obj.address1 ?? null;
-    identityView.address2 = obj.address2 ?? null;
-    identityView.address3 = obj.address3 ?? null;
-    identityView.city = obj.city ?? null;
-    identityView.state = obj.state ?? null;
-    identityView.postalCode = obj.postalCode ?? null;
-    identityView.country = obj.country ?? null;
-    identityView.company = obj.company ?? null;
-    identityView.email = obj.email ?? null;
-    identityView.phone = obj.phone ?? null;
-    identityView.ssn = obj.ssn ?? null;
-    identityView.username = obj.username ?? null;
-    identityView.passportNumber = obj.passportNumber ?? null;
-    identityView.licenseNumber = obj.licenseNumber ?? null;
+    identityView.title = obj.title;
+    identityView.firstName = obj.firstName;
+    identityView.middleName = obj.middleName;
+    identityView.lastName = obj.lastName;
+    identityView.address1 = obj.address1;
+    identityView.address2 = obj.address2;
+    identityView.address3 = obj.address3;
+    identityView.city = obj.city;
+    identityView.state = obj.state;
+    identityView.postalCode = obj.postalCode;
+    identityView.country = obj.country;
+    identityView.company = obj.company;
+    identityView.email = obj.email;
+    identityView.phone = obj.phone;
+    identityView.ssn = obj.ssn;
+    identityView.username = obj.username;
+    identityView.passportNumber = obj.passportNumber;
+    identityView.licenseNumber = obj.licenseNumber;
 
     return identityView;
   }
diff --git a/libs/common/src/vault/models/view/item.view.ts b/libs/common/src/vault/models/view/item.view.ts
index 3954276ca04..d25901f8042 100644
--- a/libs/common/src/vault/models/view/item.view.ts
+++ b/libs/common/src/vault/models/view/item.view.ts
@@ -1,9 +1,7 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { View } from "../../../models/view/view";
 import { LinkedMetadata } from "../../linked-field-option.decorator";
 
 export abstract class ItemView implements View {
-  linkedFieldOptions: Map<number, LinkedMetadata>;
-  abstract get subTitle(): string;
+  linkedFieldOptions?: Map<number, LinkedMetadata>;
+  abstract get subTitle(): string | undefined;
 }
diff --git a/libs/common/src/vault/models/view/login-uri.view.ts b/libs/common/src/vault/models/view/login-uri.view.ts
index 49ac9c6278f..bf8dcc83b33 100644
--- a/libs/common/src/vault/models/view/login-uri.view.ts
+++ b/libs/common/src/vault/models/view/login-uri.view.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { LoginUriView as SdkLoginUriView } from "@bitwarden/sdk-internal";
@@ -11,13 +9,13 @@ import { Utils } from "../../../platform/misc/utils";
 import { LoginUri } from "../domain/login-uri";
 
 export class LoginUriView implements View {
-  match: UriMatchStrategySetting = null;
+  match?: UriMatchStrategySetting;
 
-  private _uri: string = null;
-  private _domain: string = null;
-  private _hostname: string = null;
-  private _host: string = null;
-  private _canLaunch: boolean = null;
+  private _uri?: string;
+  private _domain?: string;
+  private _hostname?: string;
+  private _host?: string;
+  private _canLaunch?: boolean;
 
   constructor(u?: LoginUri) {
     if (!u) {
@@ -27,59 +25,59 @@ export class LoginUriView implements View {
     this.match = u.match;
   }
 
-  get uri(): string {
+  get uri(): string | undefined {
     return this._uri;
   }
-  set uri(value: string) {
+  set uri(value: string | undefined) {
     this._uri = value;
-    this._domain = null;
-    this._canLaunch = null;
+    this._domain = undefined;
+    this._canLaunch = undefined;
   }
 
-  get domain(): string {
+  get domain(): string | undefined {
     if (this._domain == null && this.uri != null) {
       this._domain = Utils.getDomain(this.uri);
       if (this._domain === "") {
-        this._domain = null;
+        this._domain = undefined;
       }
     }
 
     return this._domain;
   }
 
-  get hostname(): string {
+  get hostname(): string | undefined {
     if (this.match === UriMatchStrategy.RegularExpression) {
-      return null;
+      return undefined;
     }
     if (this._hostname == null && this.uri != null) {
       this._hostname = Utils.getHostname(this.uri);
       if (this._hostname === "") {
-        this._hostname = null;
+        this._hostname = undefined;
       }
     }
 
     return this._hostname;
   }
 
-  get host(): string {
+  get host(): string | undefined {
     if (this.match === UriMatchStrategy.RegularExpression) {
-      return null;
+      return undefined;
     }
     if (this._host == null && this.uri != null) {
       this._host = Utils.getHost(this.uri);
       if (this._host === "") {
-        this._host = null;
+        this._host = undefined;
       }
     }
 
     return this._host;
   }
 
-  get hostnameOrUri(): string {
+  get hostnameOrUri(): string | undefined {
     return this.hostname != null ? this.hostname : this.uri;
   }
 
-  get hostOrUri(): string {
+  get hostOrUri(): string | undefined {
     return this.host != null ? this.host : this.uri;
   }
 
@@ -104,7 +102,10 @@ export class LoginUriView implements View {
     return this._canLaunch;
   }
 
-  get launchUri(): string {
+  get launchUri(): string | undefined {
+    if (this.uri == null) {
+      return undefined;
+    }
     return this.uri.indexOf("://") < 0 && !Utils.isNullOrWhitespace(Utils.getDomain(this.uri))
       ? "http://" + this.uri
       : this.uri;
@@ -141,7 +142,7 @@ export class LoginUriView implements View {
   matchesUri(
     targetUri: string,
     equivalentDomains: Set<string>,
-    defaultUriMatch: UriMatchStrategySetting = null,
+    defaultUriMatch?: UriMatchStrategySetting,
     /** When present, will override the match strategy for the cipher if it is `Never` with `Domain` */
     overrideNeverMatchStrategy?: true,
   ): boolean {
@@ -198,7 +199,7 @@ export class LoginUriView implements View {
 
     if (Utils.DomainMatchBlacklist.has(this.domain)) {
       const domainUrlHost = Utils.getHost(targetUri);
-      return !Utils.DomainMatchBlacklist.get(this.domain).has(domainUrlHost);
+      return !Utils.DomainMatchBlacklist.get(this.domain)!.has(domainUrlHost);
     }
 
     return true;
diff --git a/libs/common/src/vault/models/view/login.view.spec.ts b/libs/common/src/vault/models/view/login.view.spec.ts
index 57e82faf7f1..ec011bed433 100644
--- a/libs/common/src/vault/models/view/login.view.spec.ts
+++ b/libs/common/src/vault/models/view/login.view.spec.ts
@@ -29,11 +29,6 @@ describe("LoginView", () => {
   });
 
   describe("fromSdkLoginView", () => {
-    it("should return undefined when the input is null", () => {
-      const result = LoginView.fromSdkLoginView(null as unknown as SdkLoginView);
-      expect(result).toBeUndefined();
-    });
-
     it("should return a LoginView from an SdkLoginView", () => {
       jest.spyOn(LoginUriView, "fromSdkLoginUriView").mockImplementation(mockFromSdk);
 
diff --git a/libs/common/src/vault/models/view/login.view.ts b/libs/common/src/vault/models/view/login.view.ts
index 44c6ee8f2e9..6f9167cd777 100644
--- a/libs/common/src/vault/models/view/login.view.ts
+++ b/libs/common/src/vault/models/view/login.view.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { LoginView as SdkLoginView } from "@bitwarden/sdk-internal";
 
 import { UriMatchStrategySetting } from "../../../models/domain/domain-service";
@@ -15,15 +13,15 @@ import { LoginUriView } from "./login-uri.view";
 
 export class LoginView extends ItemView {
   @linkedFieldOption(LinkedId.Username, { sortPosition: 0 })
-  username: string = null;
+  username: string | undefined;
   @linkedFieldOption(LinkedId.Password, { sortPosition: 1 })
-  password: string = null;
+  password: string | undefined;
 
-  passwordRevisionDate?: Date = null;
-  totp: string = null;
+  passwordRevisionDate?: Date;
+  totp: string | undefined;
   uris: LoginUriView[] = [];
-  autofillOnPageLoad: boolean = null;
-  fido2Credentials: Fido2CredentialView[] = null;
+  autofillOnPageLoad: boolean | undefined;
+  fido2Credentials: Fido2CredentialView[] = [];
 
   constructor(l?: Login) {
     super();
@@ -35,15 +33,15 @@ export class LoginView extends ItemView {
     this.autofillOnPageLoad = l.autofillOnPageLoad;
   }
 
-  get uri(): string {
-    return this.hasUris ? this.uris[0].uri : null;
+  get uri(): string | undefined {
+    return this.hasUris ? this.uris[0].uri : undefined;
   }
 
-  get maskedPassword(): string {
-    return this.password != null ? "••••••••" : null;
+  get maskedPassword(): string | undefined {
+    return this.password != null ? "••••••••" : undefined;
   }
 
-  get subTitle(): string {
+  get subTitle(): string | undefined {
     // if there's a passkey available, use that as a fallback
     if (Utils.isNullOrEmpty(this.username) && this.fido2Credentials?.length > 0) {
       return this.fido2Credentials[0].userName;
@@ -60,14 +58,14 @@ export class LoginView extends ItemView {
     return !Utils.isNullOrWhitespace(this.totp);
   }
 
-  get launchUri(): string {
+  get launchUri(): string | undefined {
     if (this.hasUris) {
       const uri = this.uris.find((u) => u.canLaunch);
       if (uri != null) {
         return uri.launchUri;
       }
     }
-    return null;
+    return undefined;
   }
 
   get hasUris(): boolean {
@@ -81,7 +79,7 @@ export class LoginView extends ItemView {
   matchesUri(
     targetUri: string,
     equivalentDomains: Set<string>,
-    defaultUriMatch: UriMatchStrategySetting = null,
+    defaultUriMatch?: UriMatchStrategySetting,
     /** When present, will override the match strategy for the cipher if it is `Never` with `Domain` */
     overrideNeverMatchStrategy?: true,
   ): boolean {
@@ -94,17 +92,20 @@ export class LoginView extends ItemView {
     );
   }
 
-  static fromJSON(obj: Partial<DeepJsonify<LoginView>>): LoginView {
-    const passwordRevisionDate =
-      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
-    const uris = obj.uris.map((uri) => LoginUriView.fromJSON(uri));
-    const fido2Credentials = obj.fido2Credentials?.map((key) => Fido2CredentialView.fromJSON(key));
+  static fromJSON(obj: Partial<DeepJsonify<LoginView>> | undefined): LoginView {
+    if (obj == undefined) {
+      return new LoginView();
+    }
 
-    return Object.assign(new LoginView(), obj, {
-      passwordRevisionDate,
-      uris,
-      fido2Credentials,
-    });
+    const loginView = Object.assign(new LoginView(), obj) as LoginView;
+
+    loginView.passwordRevisionDate =
+      obj.passwordRevisionDate == null ? undefined : new Date(obj.passwordRevisionDate);
+    loginView.uris = obj.uris?.map((uri) => LoginUriView.fromJSON(uri)) ?? [];
+    loginView.fido2Credentials =
+      obj.fido2Credentials?.map((key) => Fido2CredentialView.fromJSON(key)) ?? [];
+
+    return loginView;
   }
 
   /**
@@ -115,25 +116,21 @@ export class LoginView extends ItemView {
    * the FIDO2 credentials in encrypted form. We can decrypt them later using a separate
    * call to client.vault().ciphers().decrypt_fido2_credentials().
    */
-  static fromSdkLoginView(obj: SdkLoginView): LoginView | undefined {
-    if (obj == null) {
-      return undefined;
-    }
-
+  static fromSdkLoginView(obj: SdkLoginView): LoginView {
     const loginView = new LoginView();
 
-    loginView.username = obj.username ?? null;
-    loginView.password = obj.password ?? null;
+    loginView.username = obj.username;
+    loginView.password = obj.password;
     loginView.passwordRevisionDate =
-      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
-    loginView.totp = obj.totp ?? null;
-    loginView.autofillOnPageLoad = obj.autofillOnPageLoad ?? null;
+      obj.passwordRevisionDate == null ? undefined : new Date(obj.passwordRevisionDate);
+    loginView.totp = obj.totp;
+    loginView.autofillOnPageLoad = obj.autofillOnPageLoad;
     loginView.uris =
       obj.uris
         ?.filter((uri) => uri.uri != null && uri.uri !== "")
-        .map((uri) => LoginUriView.fromSdkLoginUriView(uri)) || [];
+        .map((uri) => LoginUriView.fromSdkLoginUriView(uri)!) || [];
     // FIDO2 credentials are not decrypted here, they remain encrypted
-    loginView.fido2Credentials = null;
+    loginView.fido2Credentials = [];
 
     return loginView;
   }
diff --git a/libs/common/src/vault/models/view/secure-note.view.ts b/libs/common/src/vault/models/view/secure-note.view.ts
index 5e401961869..85c0d3fd61c 100644
--- a/libs/common/src/vault/models/view/secure-note.view.ts
+++ b/libs/common/src/vault/models/view/secure-note.view.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { SecureNoteView as SdkSecureNoteView } from "@bitwarden/sdk-internal";
@@ -10,7 +8,7 @@ import { SecureNote } from "../domain/secure-note";
 import { ItemView } from "./item.view";
 
 export class SecureNoteView extends ItemView implements SdkSecureNoteView {
-  type: SecureNoteType = null;
+  type: SecureNoteType = SecureNoteType.Generic;
 
   constructor(n?: SecureNote) {
     super();
@@ -21,24 +19,20 @@ export class SecureNoteView extends ItemView implements SdkSecureNoteView {
     this.type = n.type;
   }
 
-  get subTitle(): string {
-    return null;
+  get subTitle(): string | undefined {
+    return undefined;
   }
 
-  static fromJSON(obj: Partial<Jsonify<SecureNoteView>>): SecureNoteView {
+  static fromJSON(obj: Partial<Jsonify<SecureNoteView>> | undefined): SecureNoteView {
     return Object.assign(new SecureNoteView(), obj);
   }
 
   /**
    * Converts the SDK SecureNoteView to a SecureNoteView.
    */
-  static fromSdkSecureNoteView(obj: SdkSecureNoteView): SecureNoteView | undefined {
-    if (!obj) {
-      return undefined;
-    }
-
+  static fromSdkSecureNoteView(obj: SdkSecureNoteView): SecureNoteView {
     const secureNoteView = new SecureNoteView();
-    secureNoteView.type = obj.type ?? null;
+    secureNoteView.type = obj.type;
 
     return secureNoteView;
   }
diff --git a/libs/common/src/vault/models/view/ssh-key.view.ts b/libs/common/src/vault/models/view/ssh-key.view.ts
index 0547eeb7f8e..525608ce274 100644
--- a/libs/common/src/vault/models/view/ssh-key.view.ts
+++ b/libs/common/src/vault/models/view/ssh-key.view.ts
@@ -1,24 +1,13 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
 import { SshKeyView as SdkSshKeyView } from "@bitwarden/sdk-internal";
 
-import { SshKey } from "../domain/ssh-key";
-
 import { ItemView } from "./item.view";
 
 export class SshKeyView extends ItemView {
-  privateKey: string = null;
-  publicKey: string = null;
-  keyFingerprint: string = null;
-
-  constructor(n?: SshKey) {
-    super();
-    if (!n) {
-      return;
-    }
-  }
+  privateKey!: string;
+  publicKey!: string;
+  keyFingerprint!: string;
 
   get maskedPrivateKey(): string {
     if (!this.privateKey || this.privateKey.length === 0) {
@@ -43,23 +32,19 @@ export class SshKeyView extends ItemView {
     return this.keyFingerprint;
   }
 
-  static fromJSON(obj: Partial<Jsonify<SshKeyView>>): SshKeyView {
+  static fromJSON(obj: Partial<Jsonify<SshKeyView>> | undefined): SshKeyView {
     return Object.assign(new SshKeyView(), obj);
   }
 
   /**
    * Converts the SDK SshKeyView to a SshKeyView.
    */
-  static fromSdkSshKeyView(obj: SdkSshKeyView): SshKeyView | undefined {
-    if (!obj) {
-      return undefined;
-    }
-
+  static fromSdkSshKeyView(obj: SdkSshKeyView): SshKeyView {
     const sshKeyView = new SshKeyView();
 
-    sshKeyView.privateKey = obj.privateKey ?? null;
-    sshKeyView.publicKey = obj.publicKey ?? null;
-    sshKeyView.keyFingerprint = obj.fingerprint ?? null;
+    sshKeyView.privateKey = obj.privateKey;
+    sshKeyView.publicKey = obj.publicKey;
+    sshKeyView.keyFingerprint = obj.fingerprint;
 
     return sshKeyView;
   }
diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts
index d8e98c75d40..85ce8bd0423 100644
--- a/libs/common/src/vault/services/cipher.service.spec.ts
+++ b/libs/common/src/vault/services/cipher.service.spec.ts
@@ -45,6 +45,7 @@ import { CipherView } from "../models/view/cipher.view";
 import { LoginUriView } from "../models/view/login-uri.view";
 
 import { CipherService } from "./cipher.service";
+import { ENCRYPTED_CIPHERS } from "./key-state/ciphers.state";
 
 const ENCRYPTED_TEXT = "This data has been encrypted";
 function encryptText(clearText: string | Uint8Array) {
@@ -173,6 +174,37 @@ describe("Cipher Service", () => {
 
       expect(spy).toHaveBeenCalled();
     });
+
+    it("should include lastKnownRevisionDate in the upload request", async () => {
+      const fileName = "filename";
+      const fileData = new Uint8Array(10);
+      const testCipher = new Cipher(cipherData);
+      const expectedRevisionDate = "2022-01-31T12:00:00.000Z";
+
+      keyService.getOrgKey.mockReturnValue(
+        Promise.resolve<any>(new SymmetricCryptoKey(new Uint8Array(32)) as OrgKey),
+      );
+      keyService.makeDataEncKey.mockReturnValue(
+        Promise.resolve([
+          new SymmetricCryptoKey(new Uint8Array(32)),
+          new EncString("encrypted-key"),
+        ] as any),
+      );
+
+      configService.checkServerMeetsVersionRequirement$.mockReturnValue(of(false));
+      configService.getFeatureFlag
+        .calledWith(FeatureFlag.CipherKeyEncryption)
+        .mockResolvedValue(false);
+
+      const uploadSpy = jest.spyOn(cipherFileUploadService, "upload").mockResolvedValue({} as any);
+
+      await cipherService.saveAttachmentRawWithServer(testCipher, fileName, fileData, userId);
+
+      // Verify upload was called with cipher that has revisionDate
+      expect(uploadSpy).toHaveBeenCalled();
+      const cipherArg = uploadSpy.mock.calls[0][0];
+      expect(cipherArg.revisionDate).toEqual(new Date(expectedRevisionDate));
+    });
   });
 
   describe("createWithServer()", () => {
@@ -817,4 +849,180 @@ describe("Cipher Service", () => {
       expect(failures).toHaveLength(0);
     });
   });
+
+  describe("softDelete", () => {
+    it("clears archivedDate when soft deleting", async () => {
+      const cipherId = "cipher-id-1" as CipherId;
+      const archivedCipher = {
+        ...cipherData,
+        id: cipherId,
+        archivedDate: "2024-01-01T12:00:00.000Z",
+      } as CipherData;
+
+      const ciphers = { [cipherId]: archivedCipher } as Record<CipherId, CipherData>;
+      stateProvider.singleUser.getFake(mockUserId, ENCRYPTED_CIPHERS).nextState(ciphers);
+
+      await cipherService.softDelete(cipherId, mockUserId);
+
+      const result = await firstValueFrom(
+        stateProvider.singleUser.getFake(mockUserId, ENCRYPTED_CIPHERS).state$,
+      );
+      expect(result[cipherId].archivedDate).toBeNull();
+      expect(result[cipherId].deletedDate).toBeDefined();
+    });
+  });
+
+  describe("replace (no upsert)", () => {
+    // In order to set up initial state we need to manually update the encrypted state
+    // which will result in an emission. All tests will have this baseline emission.
+    const TEST_BASELINE_EMISSIONS = 1;
+
+    const makeCipher = (id: string): CipherData =>
+      ({
+        ...cipherData,
+        id,
+        name: `Enc ${id}`,
+      }) as CipherData;
+
+    const tick = async () => new Promise((r) => setTimeout(r, 0));
+
+    const setEncryptedState = async (data: Record<CipherId, CipherData>, uid = userId) => {
+      // Directly set the encrypted state, this will result in a single emission
+      await stateProvider.getUser(uid, ENCRYPTED_CIPHERS).update(() => data);
+      // match service’s “next tick” behavior so subscribers see it
+      await tick();
+    };
+
+    it("emits and calls updateEncryptedCipherState when current state is empty and replace({}) is called", async () => {
+      // Ensure empty state
+      await setEncryptedState({});
+
+      const emissions: Array<Record<CipherId, CipherData>> = [];
+      const sub = cipherService.ciphers$(userId).subscribe((v) => emissions.push(v));
+      await tick();
+
+      const spy = jest.spyOn<any, any>(cipherService, "updateEncryptedCipherState");
+
+      // Calling replace with empty object MUST still update to trigger init emissions
+      await cipherService.replace({}, userId);
+      await tick();
+
+      expect(spy).toHaveBeenCalledTimes(1);
+      expect(emissions.length).toBeGreaterThanOrEqual(TEST_BASELINE_EMISSIONS + 1);
+
+      sub.unsubscribe();
+    });
+
+    it("does NOT emit or call updateEncryptedCipherState when state is non-empty and identical", async () => {
+      const A = makeCipher("A");
+      await setEncryptedState({ [A.id as CipherId]: A });
+
+      const emissions: Array<Record<CipherId, CipherData>> = [];
+      const sub = cipherService.ciphers$(userId).subscribe((v) => emissions.push(v));
+      await tick();
+
+      const spy = jest.spyOn<any, any>(cipherService, "updateEncryptedCipherState");
+
+      // identical snapshot → short-circuit path
+      await cipherService.replace({ [A.id as CipherId]: A }, userId);
+      await tick();
+
+      expect(spy).not.toHaveBeenCalled();
+      expect(emissions.length).toBe(TEST_BASELINE_EMISSIONS);
+
+      sub.unsubscribe();
+    });
+
+    it("emits and calls updateEncryptedCipherState when the provided state differs from current", async () => {
+      const A = makeCipher("A");
+      await setEncryptedState({ [A.id as CipherId]: A });
+
+      const emissions: Array<Record<CipherId, CipherData>> = [];
+      const sub = cipherService.ciphers$(userId).subscribe((v) => emissions.push(v));
+      await tick();
+
+      const spy = jest.spyOn<any, any>(cipherService, "updateEncryptedCipherState");
+
+      const B = makeCipher("B");
+      await cipherService.replace({ [B.id as CipherId]: B }, userId);
+      await tick();
+
+      expect(spy).toHaveBeenCalledTimes(1);
+
+      expect(emissions.length).toBeGreaterThanOrEqual(TEST_BASELINE_EMISSIONS + 1);
+
+      sub.unsubscribe();
+    });
+  });
+
+  describe("getCipherForUrl localData application", () => {
+    beforeEach(() => {
+      Object.defineProperty(autofillSettingsService, "autofillOnPageLoadDefault$", {
+        value: of(true),
+        writable: true,
+      });
+    });
+
+    it("should apply localData to ciphers when getCipherForUrl is called via getLastLaunchedForUrl", async () => {
+      const testUrl = "https://test-url.com";
+      const cipherId = "test-cipher-id" as CipherId;
+      const testLocalData = {
+        lastLaunched: Date.now().valueOf(),
+        lastUsedDate: Date.now().valueOf() - 1000,
+      };
+
+      jest.spyOn(cipherService, "localData$").mockReturnValue(of({ [cipherId]: testLocalData }));
+
+      const mockCipherView = new CipherView();
+      mockCipherView.id = cipherId;
+      mockCipherView.localData = null;
+
+      jest.spyOn(cipherService, "getAllDecryptedForUrl").mockResolvedValue([mockCipherView]);
+
+      const result = await cipherService.getLastLaunchedForUrl(testUrl, userId, true);
+
+      expect(result.localData).toEqual(testLocalData);
+    });
+
+    it("should apply localData to ciphers when getCipherForUrl is called via getLastUsedForUrl", async () => {
+      const testUrl = "https://test-url.com";
+      const cipherId = "test-cipher-id" as CipherId;
+      const testLocalData = { lastUsedDate: Date.now().valueOf() - 1000 };
+
+      jest.spyOn(cipherService, "localData$").mockReturnValue(of({ [cipherId]: testLocalData }));
+
+      const mockCipherView = new CipherView();
+      mockCipherView.id = cipherId;
+      mockCipherView.localData = null;
+
+      jest.spyOn(cipherService, "getAllDecryptedForUrl").mockResolvedValue([mockCipherView]);
+
+      const result = await cipherService.getLastUsedForUrl(testUrl, userId, true);
+
+      expect(result.localData).toEqual(testLocalData);
+    });
+
+    it("should not modify localData if it already matches in getCipherForUrl", async () => {
+      const testUrl = "https://test-url.com";
+      const cipherId = "test-cipher-id" as CipherId;
+      const existingLocalData = {
+        lastLaunched: Date.now().valueOf(),
+        lastUsedDate: Date.now().valueOf() - 1000,
+      };
+
+      jest
+        .spyOn(cipherService, "localData$")
+        .mockReturnValue(of({ [cipherId]: existingLocalData }));
+
+      const mockCipherView = new CipherView();
+      mockCipherView.id = cipherId;
+      mockCipherView.localData = existingLocalData;
+
+      jest.spyOn(cipherService, "getAllDecryptedForUrl").mockResolvedValue([mockCipherView]);
+
+      const result = await cipherService.getLastLaunchedForUrl(testUrl, userId, true);
+
+      expect(result.localData).toBe(existingLocalData);
+    });
+  });
 });
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 6504fd1a97d..72c1ca40913 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -17,6 +17,7 @@ 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";
+import { CipherListView } from "@bitwarden/sdk-internal";
 
 import { ApiService } from "../../abstractions/api.service";
 import { AccountService } from "../../auth/abstractions/account.service";
@@ -140,6 +141,8 @@ export class CipherService implements CipherServiceAbstraction {
    * Usage of the {@link CipherViewLike} type is recommended to ensure both `CipherView` and `CipherListView` are supported.
    */
   cipherListViews$ = perUserCache$((userId: UserId) => {
+    let decryptStartTime: number;
+
     return this.configService.getFeatureFlag$(FeatureFlag.PM22134SdkCipherListView).pipe(
       switchMap((useSdk) => {
         if (!useSdk) {
@@ -157,10 +160,22 @@ export class CipherService implements CipherServiceAbstraction {
               (cipherData) => new Cipher(cipherData, localData?.[cipherData.id as CipherId]),
             ),
           ),
+          tap(() => {
+            decryptStartTime = performance.now();
+          }),
           switchMap(async (ciphers) => {
-            const [decrypted, failures] = await this.decryptCiphersWithSdk(ciphers, userId);
+            const [decrypted, failures] = await this.decryptCiphersWithSdk(ciphers, userId, false);
             await this.setFailedDecryptedCiphers(failures, userId);
-            return decrypted.sort(this.getLocaleSortingFunction());
+            return decrypted;
+          }),
+          tap((decrypted) => {
+            this.logService.measure(
+              decryptStartTime,
+              "Vault",
+              "CipherService",
+              "listView decrypt complete",
+              [["Items", decrypted.length]],
+            );
           }),
         );
       }),
@@ -489,7 +504,7 @@ export class CipherService implements CipherServiceAbstraction {
     if (await this.configService.getFeatureFlag(FeatureFlag.PM19941MigrateCipherDomainToSdk)) {
       const decryptStartTime = performance.now();
 
-      const result = await this.decryptCiphersWithSdk(ciphers, userId);
+      const result = await this.decryptCiphersWithSdk(ciphers, userId, true);
 
       this.logService.measure(decryptStartTime, "Vault", "CipherService", "decrypt complete", [
         ["Items", ciphers.length],
@@ -633,7 +648,9 @@ export class CipherService implements CipherServiceAbstraction {
     const equivalentDomains = await firstValueFrom(
       this.domainSettingsService.getUrlEquivalentDomains(url),
     );
-    defaultMatch ??= await firstValueFrom(this.domainSettingsService.defaultUriMatchStrategy$);
+    defaultMatch ??= await firstValueFrom(
+      this.domainSettingsService.resolvedDefaultUriMatchStrategy$,
+    );
 
     const archiveFeatureEnabled = await this.configService.getFeatureFlag(
       FeatureFlag.PM19148_InnovationArchive,
@@ -688,8 +705,14 @@ export class CipherService implements CipherServiceAbstraction {
       .sort((a, b) => this.sortCiphersByLastUsedThenName(a, b));
   }
 
-  async getAllFromApiForOrganization(organizationId: string): Promise<CipherView[]> {
-    const response = await this.apiService.getCiphersOrganization(organizationId);
+  async getAllFromApiForOrganization(
+    organizationId: string,
+    includeMemberItems?: boolean,
+  ): Promise<CipherView[]> {
+    const response = await this.apiService.getCiphersOrganization(
+      organizationId,
+      includeMemberItems,
+    );
     return await this.decryptOrganizationCiphersResponse(response, organizationId);
   }
 
@@ -860,13 +883,14 @@ export class CipherService implements CipherServiceAbstraction {
       response = await this.apiService.postCipherAdmin(request);
       const data = new CipherData(response, cipher.collectionIds);
       return new Cipher(data);
-    } else if (cipher.collectionIds != null) {
+    } else if (cipher.collectionIds != null && cipher.collectionIds.length > 0) {
       const request = new CipherCreateRequest({ cipher, encryptedFor });
       response = await this.apiService.postCipherCreate(request);
     } else {
       const request = new CipherRequest({ cipher, encryptedFor });
       response = await this.apiService.postCipher(request);
     }
+
     cipher.id = response.id;
 
     const data = new CipherData(response, cipher.collectionIds);
@@ -934,7 +958,12 @@ export class CipherService implements CipherServiceAbstraction {
         cipher.attachments.forEach((attachment) => {
           if (attachment.key == null) {
             attachmentPromises.push(
-              this.shareAttachmentWithServer(attachment, cipher.id, organizationId),
+              this.shareAttachmentWithServer(
+                attachment,
+                cipher.id,
+                organizationId,
+                cipher.revisionDate,
+              ),
             );
           }
         });
@@ -1102,7 +1131,13 @@ export class CipherService implements CipherServiceAbstraction {
   async saveCollectionsWithServerAdmin(cipher: Cipher): Promise<Cipher> {
     const request = new CipherCollectionsRequest(cipher.collectionIds);
     const response = await this.apiService.putCipherCollectionsAdmin(cipher.id, request);
-    const data = new CipherData(response);
+    // The response will be incomplete with several properties missing values
+    // We will assign those properties values so the SDK decryption can complete
+    const completedResponse = new CipherResponse(response);
+    completedResponse.edit = true;
+    completedResponse.viewPassword = true;
+    completedResponse.favorite = false;
+    const data = new CipherData(completedResponse);
     return new Cipher(data);
   }
 
@@ -1163,6 +1198,18 @@ export class CipherService implements CipherServiceAbstraction {
   }
 
   async replace(ciphers: { [id: string]: CipherData }, userId: UserId): Promise<any> {
+    const current = (await firstValueFrom(this.encryptedCiphersState(userId).state$)) ?? {};
+
+    // The extension relies on chrome.storage.StorageArea.onChanged to detect updates.
+    // If stored and provided data are identical, this event doesn’t fire and the ciphers$
+    // observable won’t emit a new value. In this case we can skip the update to avoid calling
+    // clearCache and causing an empty state.
+    // If the current state is empty (eg. for new users), we still want to perform the update to ensure
+    // we trigger an emission as many subscribers rely on it during initialization.
+    if (Object.keys(current).length > 0 && JSON.stringify(current) === JSON.stringify(ciphers)) {
+      return;
+    }
+
     await this.updateEncryptedCipherState(() => ciphers, userId);
   }
 
@@ -1176,13 +1223,16 @@ export class CipherService implements CipherServiceAbstraction {
     userId: UserId = null,
   ): Promise<Record<CipherId, CipherData>> {
     userId ||= await firstValueFrom(this.stateProvider.activeUserId$);
+
     await this.clearCache(userId);
+
     const updatedCiphers = await this.stateProvider
       .getUser(userId, ENCRYPTED_CIPHERS)
       .update((current) => {
         const result = update(current ?? {});
         return result;
       });
+
     // Some state storage providers (e.g. Electron) don't update the state immediately, wait for next tick
     // Otherwise, subscribers to cipherViews$ can get stale data
     await new Promise((resolve) => setTimeout(resolve, 0));
@@ -1397,6 +1447,7 @@ export class CipherService implements CipherServiceAbstraction {
         return;
       }
       ciphers[cipherId].deletedDate = new Date().toISOString();
+      ciphers[cipherId].archivedDate = null;
     };
 
     if (typeof id === "string") {
@@ -1703,7 +1754,10 @@ export class CipherService implements CipherServiceAbstraction {
     attachmentView: AttachmentView,
     cipherId: string,
     organizationId: string,
+    lastKnownRevisionDate: Date,
   ): Promise<any> {
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$);
+
     const attachmentResponse = await this.apiService.nativeFetch(
       new Request(attachmentView.url, { cache: "no-store" }),
     );
@@ -1712,7 +1766,6 @@ export class CipherService implements CipherServiceAbstraction {
     }
 
     const encBuf = await EncArrayBuffer.fromResponse(attachmentResponse);
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$);
     const userKey = await this.keyService.getUserKey(activeUserId.id);
     const decBuf = await this.encryptService.decryptFileData(encBuf, userKey);
 
@@ -1733,9 +1786,11 @@ export class CipherService implements CipherServiceAbstraction {
       const blob = new Blob([encData.buffer], { type: "application/octet-stream" });
       fd.append("key", dataEncKey[1].encryptedString);
       fd.append("data", blob, encFileName.encryptedString);
+      fd.append("lastKnownRevisionDate", lastKnownRevisionDate.toISOString());
     } catch (e) {
       if (Utils.isNode && !Utils.isBrowser) {
         fd.append("key", dataEncKey[1].encryptedString);
+        fd.append("lastKnownRevisionDate", lastKnownRevisionDate.toISOString());
         fd.append(
           "data",
           Buffer.from(encData.buffer) as any,
@@ -1928,13 +1983,23 @@ export class CipherService implements CipherServiceAbstraction {
     autofillOnPageLoad: boolean,
   ): Promise<CipherView> {
     const cacheKey = autofillOnPageLoad ? "autofillOnPageLoad-" + url : url;
-
     if (!this.sortedCiphersCache.isCached(cacheKey)) {
       let ciphers = await this.getAllDecryptedForUrl(url, userId);
-      if (!ciphers) {
+
+      if (!ciphers?.length) {
         return null;
       }
 
+      const localData = await firstValueFrom(this.localData$(userId));
+      if (localData) {
+        for (const view of ciphers) {
+          const data = localData[view.id as CipherId];
+          if (data) {
+            view.localData = data;
+          }
+        }
+      }
+
       if (autofillOnPageLoad) {
         const autofillOnPageLoadDefault = await this.getAutofillOnPageLoadDefault();
 
@@ -2043,21 +2108,50 @@ export class CipherService implements CipherServiceAbstraction {
   }
 
   /**
-   * Decrypts the provided ciphers using the SDK.
-   * @param ciphers The ciphers to decrypt.
-   * @param userId The user ID to use for decryption.
-   * @returns The decrypted ciphers.
+   * Decrypts the provided ciphers using the SDK with full CipherView decryption.
+   * @param ciphers The encrypted ciphers to decrypt.
+   * @param userId The user ID to use for decryption keys.
+   * @param fullDecryption When true, returns full CipherView objects with all fields decrypted.
+   * @returns A tuple containing:
+   *          - Array of fully decrypted CipherView objects, sorted by locale
+   *          - Array of CipherView objects that failed to decrypt (marked with decryptionFailure flag)
    * @private
    */
   private async decryptCiphersWithSdk(
     ciphers: Cipher[],
     userId: UserId,
-  ): Promise<[CipherView[], CipherView[]]> {
+    fullDecryption: true,
+  ): Promise<[CipherView[], CipherView[]]>;
+  /**
+   * Decrypts the provided ciphers using the SDK with lightweight CipherListView decryption.
+   * @param ciphers The encrypted ciphers to decrypt.
+   * @param userId The user ID to use for decryption keys.
+   * @param fullDecryption When false, returns lightweight CipherListView objects for better performance.
+   * @returns A tuple containing:
+   *          - Array of lightweight CipherListView objects, sorted by locale
+   *          - Array of CipherView objects that failed to decrypt (marked with decryptionFailure flag)
+   * @private
+   */
+  private async decryptCiphersWithSdk(
+    ciphers: Cipher[],
+    userId: UserId,
+    fullDecryption: false,
+  ): Promise<[CipherListView[], CipherView[]]>;
+
+  private async decryptCiphersWithSdk(
+    ciphers: Cipher[],
+    userId: UserId,
+    fullDecryption: boolean = true,
+  ): Promise<[CipherViewLike[], CipherView[]]> {
     const [decrypted, failures] = await this.cipherEncryptionService.decryptManyWithFailures(
       ciphers,
       userId,
     );
-    const decryptedViews = await Promise.all(decrypted.map((c) => this.getFullCipherView(c)));
+
+    const decryptedViews = fullDecryption
+      ? await Promise.all(decrypted.map((c) => this.getFullCipherView(c)))
+      : decrypted;
+
     const failedViews = failures.map((c) => {
       const cipher_view = new CipherView(c);
       cipher_view.name = "[error: cannot decrypt]";
diff --git a/libs/vault/src/services/default-cipher-archive.service.spec.ts b/libs/common/src/vault/services/default-cipher-archive.service.spec.ts
similarity index 78%
rename from libs/vault/src/services/default-cipher-archive.service.spec.ts
rename to libs/common/src/vault/services/default-cipher-archive.service.spec.ts
index ec2943ce7e4..972b04d2c4e 100644
--- a/libs/vault/src/services/default-cipher-archive.service.spec.ts
+++ b/libs/common/src/vault/services/default-cipher-archive.service.spec.ts
@@ -11,21 +11,14 @@ import {
   CipherBulkArchiveRequest,
   CipherBulkUnarchiveRequest,
 } from "@bitwarden/common/vault/models/request/cipher-bulk-archive.request";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { DialogService } from "@bitwarden/components";
 import { CipherListView } from "@bitwarden/sdk-internal";
 
-import { DecryptionFailureDialogComponent } from "../components/decryption-failure-dialog/decryption-failure-dialog.component";
-
 import { DefaultCipherArchiveService } from "./default-cipher-archive.service";
-import { PasswordRepromptService } from "./password-reprompt.service";
 
 describe("DefaultCipherArchiveService", () => {
   let service: DefaultCipherArchiveService;
   let mockCipherService: jest.Mocked<CipherService>;
   let mockApiService: jest.Mocked<ApiService>;
-  let mockDialogService: jest.Mocked<DialogService>;
-  let mockPasswordRepromptService: jest.Mocked<PasswordRepromptService>;
   let mockBillingAccountProfileStateService: jest.Mocked<BillingAccountProfileStateService>;
   let mockConfigService: jest.Mocked<ConfigService>;
 
@@ -35,16 +28,12 @@ describe("DefaultCipherArchiveService", () => {
   beforeEach(() => {
     mockCipherService = mock<CipherService>();
     mockApiService = mock<ApiService>();
-    mockDialogService = mock<DialogService>();
-    mockPasswordRepromptService = mock<PasswordRepromptService>();
     mockBillingAccountProfileStateService = mock<BillingAccountProfileStateService>();
     mockConfigService = mock<ConfigService>();
 
     service = new DefaultCipherArchiveService(
       mockCipherService,
       mockApiService,
-      mockDialogService,
-      mockPasswordRepromptService,
       mockBillingAccountProfileStateService,
       mockConfigService,
     );
@@ -244,46 +233,4 @@ describe("DefaultCipherArchiveService", () => {
       );
     });
   });
-
-  describe("canInteract", () => {
-    let mockCipherView: CipherView;
-
-    beforeEach(() => {
-      mockCipherView = {
-        id: cipherId,
-        decryptionFailure: false,
-      } as unknown as CipherView;
-    });
-
-    it("should return false and open dialog when cipher has decryption failure", async () => {
-      mockCipherView.decryptionFailure = true;
-      const openSpy = jest.spyOn(DecryptionFailureDialogComponent, "open").mockImplementation();
-
-      const result = await service.canInteract(mockCipherView);
-
-      expect(result).toBe(false);
-      expect(openSpy).toHaveBeenCalledWith(mockDialogService, {
-        cipherIds: [cipherId],
-      });
-    });
-
-    it("should return password reprompt result when no decryption failure", async () => {
-      mockPasswordRepromptService.passwordRepromptCheck.mockResolvedValue(true);
-
-      const result = await service.canInteract(mockCipherView);
-
-      expect(result).toBe(true);
-      expect(mockPasswordRepromptService.passwordRepromptCheck).toHaveBeenCalledWith(
-        mockCipherView,
-      );
-    });
-
-    it("should return false when password reprompt fails", async () => {
-      mockPasswordRepromptService.passwordRepromptCheck.mockResolvedValue(false);
-
-      const result = await service.canInteract(mockCipherView);
-
-      expect(result).toBe(false);
-    });
-  });
 });
diff --git a/libs/vault/src/services/default-cipher-archive.service.ts b/libs/common/src/vault/services/default-cipher-archive.service.ts
similarity index 83%
rename from libs/vault/src/services/default-cipher-archive.service.ts
rename to libs/common/src/vault/services/default-cipher-archive.service.ts
index d9a0ec54d73..a56a22474a3 100644
--- a/libs/vault/src/services/default-cipher-archive.service.ts
+++ b/libs/common/src/vault/services/default-cipher-archive.service.ts
@@ -12,27 +12,25 @@ import {
   CipherBulkUnarchiveRequest,
 } from "@bitwarden/common/vault/models/request/cipher-bulk-archive.request";
 import { CipherResponse } from "@bitwarden/common/vault/models/response/cipher.response";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
   CipherViewLike,
   CipherViewLikeUtils,
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
-import { DialogService } from "@bitwarden/components";
 
 import { CipherArchiveService } from "../abstractions/cipher-archive.service";
-import { DecryptionFailureDialogComponent } from "../components/decryption-failure-dialog/decryption-failure-dialog.component";
-
-import { PasswordRepromptService } from "./password-reprompt.service";
 
 export class DefaultCipherArchiveService implements CipherArchiveService {
   constructor(
     private cipherService: CipherService,
     private apiService: ApiService,
-    private dialogService: DialogService,
-    private passwordRepromptService: PasswordRepromptService,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private configService: ConfigService,
   ) {}
+
+  hasArchiveFlagEnabled$(): Observable<boolean> {
+    return this.configService.getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive);
+  }
+
   /**
    * Observable that contains the list of ciphers that have been archived.
    */
@@ -125,21 +123,4 @@ export class DefaultCipherArchiveService implements CipherArchiveService {
 
     await this.cipherService.replace(currentCiphers, userId);
   }
-
-  /**
-   * Check if the user is able to interact with the cipher
-   * (password re-prompt / decryption failure checks).
-   * @param cipher
-   * @private
-   */
-  async canInteract(cipher: CipherView) {
-    if (cipher.decryptionFailure) {
-      DecryptionFailureDialogComponent.open(this.dialogService, {
-        cipherIds: [cipher.id as CipherId],
-      });
-      return false;
-    }
-
-    return await this.passwordRepromptService.passwordRepromptCheck(cipher);
-  }
 }
diff --git a/libs/common/src/vault/services/default-cipher-risk.service.spec.ts b/libs/common/src/vault/services/default-cipher-risk.service.spec.ts
new file mode 100644
index 00000000000..e5231241462
--- /dev/null
+++ b/libs/common/src/vault/services/default-cipher-risk.service.spec.ts
@@ -0,0 +1,589 @@
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject, Observable } from "rxjs";
+
+import type { CipherRiskOptions, CipherRiskResult } from "@bitwarden/sdk-internal";
+
+import { asUuid } from "../../platform/abstractions/sdk/sdk.service";
+import { MockSdkService } from "../../platform/spec/mock-sdk.service";
+import { UserId, CipherId } from "../../types/guid";
+import { CipherService } from "../abstractions/cipher.service";
+import { CipherType } from "../enums/cipher-type";
+import { CipherView } from "../models/view/cipher.view";
+import { LoginView } from "../models/view/login.view";
+
+import { DefaultCipherRiskService } from "./default-cipher-risk.service";
+
+describe("DefaultCipherRiskService", () => {
+  let cipherRiskService: DefaultCipherRiskService;
+  let sdkService: MockSdkService;
+  let mockCipherService: jest.Mocked<CipherService>;
+
+  const mockUserId = "test-user-id" as UserId;
+  const mockCipherId1 = "cbea34a8-bde4-46ad-9d19-b05001228ab2" as CipherId;
+  const mockCipherId2 = "cbea34a8-bde4-46ad-9d19-b05001228ab3" as CipherId;
+  const mockCipherId3 = "cbea34a8-bde4-46ad-9d19-b05001228ab4" as CipherId;
+
+  beforeEach(() => {
+    sdkService = new MockSdkService();
+    mockCipherService = mock<CipherService>();
+    cipherRiskService = new DefaultCipherRiskService(sdkService, mockCipherService);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("computeRiskForCiphers", () => {
+    it("should call SDK cipher_risk().compute_risk() with correct parameters", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const mockRiskResults: CipherRiskResult[] = [
+        {
+          id: mockCipherId1 as any,
+          password_strength: 3,
+          exposed_result: { type: "NotChecked" },
+          reuse_count: undefined,
+        },
+      ];
+
+      mockCipherRiskClient.compute_risk.mockResolvedValue(mockRiskResults);
+
+      const cipher = new CipherView();
+      cipher.id = mockCipherId1;
+      cipher.type = CipherType.Login;
+      cipher.login = new LoginView();
+      cipher.login.password = "test-password";
+      cipher.login.username = "test@example.com";
+
+      const options: CipherRiskOptions = {
+        checkExposed: true,
+        passwordMap: undefined,
+        hibpBaseUrl: undefined,
+      };
+
+      const results = await cipherRiskService.computeRiskForCiphers([cipher], mockUserId, options);
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(
+        [
+          {
+            id: expect.anything(),
+            password: "test-password",
+            username: "test@example.com",
+          },
+        ],
+        options,
+      );
+      expect(results).toEqual(mockRiskResults);
+    });
+
+    it("should filter out non-Login ciphers", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+      mockCipherRiskClient.compute_risk.mockResolvedValue([]);
+
+      const loginCipher = new CipherView();
+      loginCipher.id = mockCipherId1;
+      loginCipher.type = CipherType.Login;
+      loginCipher.login = new LoginView();
+      loginCipher.login.password = "password1";
+
+      const cardCipher = new CipherView();
+      cardCipher.id = mockCipherId2;
+      cardCipher.type = CipherType.Card;
+
+      const identityCipher = new CipherView();
+      identityCipher.id = mockCipherId3;
+      identityCipher.type = CipherType.Identity;
+
+      await cipherRiskService.computeRiskForCiphers(
+        [loginCipher, cardCipher, identityCipher],
+        mockUserId,
+      );
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({
+            id: expect.anything(),
+            password: "password1",
+          }),
+        ],
+        expect.any(Object),
+      );
+    });
+
+    it("should filter out Login ciphers without passwords", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+      mockCipherRiskClient.compute_risk.mockResolvedValue([]);
+
+      const cipherWithPassword = new CipherView();
+      cipherWithPassword.id = mockCipherId1;
+      cipherWithPassword.type = CipherType.Login;
+      cipherWithPassword.login = new LoginView();
+      cipherWithPassword.login.password = "password1";
+
+      const cipherWithoutPassword = new CipherView();
+      cipherWithoutPassword.id = mockCipherId2;
+      cipherWithoutPassword.type = CipherType.Login;
+      cipherWithoutPassword.login = new LoginView();
+      cipherWithoutPassword.login.password = undefined;
+
+      const cipherWithEmptyPassword = new CipherView();
+      cipherWithEmptyPassword.id = mockCipherId3;
+      cipherWithEmptyPassword.type = CipherType.Login;
+      cipherWithEmptyPassword.login = new LoginView();
+      cipherWithEmptyPassword.login.password = "";
+
+      await cipherRiskService.computeRiskForCiphers(
+        [cipherWithPassword, cipherWithoutPassword, cipherWithEmptyPassword],
+        mockUserId,
+      );
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({
+            password: "password1",
+          }),
+        ],
+        expect.any(Object),
+      );
+    });
+
+    it("should return empty array when no valid Login ciphers provided", async () => {
+      const cardCipher = new CipherView();
+      cardCipher.type = CipherType.Card;
+
+      const results = await cipherRiskService.computeRiskForCiphers([cardCipher], mockUserId);
+
+      expect(results).toEqual([]);
+    });
+
+    it("should handle multiple Login ciphers", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const mockRiskResults: CipherRiskResult[] = [
+        {
+          id: mockCipherId1 as any,
+          password_strength: 3,
+          exposed_result: { type: "Found", value: 5 },
+          reuse_count: 2,
+        },
+        {
+          id: mockCipherId2 as any,
+          password_strength: 4,
+          exposed_result: { type: "NotChecked" },
+          reuse_count: 1,
+        },
+      ];
+
+      mockCipherRiskClient.compute_risk.mockResolvedValue(mockRiskResults);
+
+      const cipher1 = new CipherView();
+      cipher1.id = mockCipherId1;
+      cipher1.type = CipherType.Login;
+      cipher1.login = new LoginView();
+      cipher1.login.password = "password1";
+      cipher1.login.username = "user1@example.com";
+
+      const cipher2 = new CipherView();
+      cipher2.id = mockCipherId2;
+      cipher2.type = CipherType.Login;
+      cipher2.login = new LoginView();
+      cipher2.login.password = "password2";
+      cipher2.login.username = "user2@example.com";
+
+      const results = await cipherRiskService.computeRiskForCiphers([cipher1, cipher2], mockUserId);
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({ password: "password1", username: "user1@example.com" }),
+          expect.objectContaining({ password: "password2", username: "user2@example.com" }),
+        ],
+        expect.any(Object),
+      );
+      expect(results).toEqual(mockRiskResults);
+    });
+
+    it("should use default options when options not provided", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+      mockCipherRiskClient.compute_risk.mockResolvedValue([]);
+
+      const cipher = new CipherView();
+      cipher.id = mockCipherId1;
+      cipher.type = CipherType.Login;
+      cipher.login = new LoginView();
+      cipher.login.password = "test-password";
+
+      await cipherRiskService.computeRiskForCiphers([cipher], mockUserId);
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(expect.any(Array), {
+        checkExposed: false,
+        passwordMap: undefined,
+        hibpBaseUrl: undefined,
+      });
+    });
+
+    it("should handle ciphers without username", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+      mockCipherRiskClient.compute_risk.mockResolvedValue([]);
+
+      const cipher = new CipherView();
+      cipher.id = mockCipherId1;
+      cipher.type = CipherType.Login;
+      cipher.login = new LoginView();
+      cipher.login.password = "test-password";
+      cipher.login.username = undefined;
+
+      await cipherRiskService.computeRiskForCiphers([cipher], mockUserId);
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({
+            password: "test-password",
+            username: undefined,
+          }),
+        ],
+        expect.any(Object),
+      );
+    });
+  });
+
+  describe("buildPasswordReuseMap", () => {
+    it("should call SDK cipher_risk().password_reuse_map() with correct parameters", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const mockReuseMap = {
+        password1: 2,
+        password2: 1,
+      };
+
+      mockCipherRiskClient.password_reuse_map.mockReturnValue(mockReuseMap);
+
+      const cipher1 = new CipherView();
+      cipher1.id = mockCipherId1;
+      cipher1.type = CipherType.Login;
+      cipher1.login = new LoginView();
+      cipher1.login.password = "password1";
+
+      const cipher2 = new CipherView();
+      cipher2.id = mockCipherId2;
+      cipher2.type = CipherType.Login;
+      cipher2.login = new LoginView();
+      cipher2.login.password = "password2";
+
+      const result = await cipherRiskService.buildPasswordReuseMap([cipher1, cipher2], mockUserId);
+
+      expect(mockCipherRiskClient.password_reuse_map).toHaveBeenCalledWith([
+        expect.objectContaining({ password: "password1" }),
+        expect.objectContaining({ password: "password2" }),
+      ]);
+      expect(result).toEqual(mockReuseMap);
+    });
+  });
+
+  describe("computeCipherRiskForUser", () => {
+    it("should compute risk for a single cipher with password reuse map", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      // Setup cipher data
+      const cipher1 = new CipherView();
+      cipher1.id = mockCipherId1;
+      cipher1.type = CipherType.Login;
+      cipher1.login = new LoginView();
+      cipher1.login.password = "password1";
+      cipher1.login.username = "user1@example.com";
+
+      const cipher2 = new CipherView();
+      cipher2.id = mockCipherId2;
+      cipher2.type = CipherType.Login;
+      cipher2.login = new LoginView();
+      cipher2.login.password = "password1"; // Same password as cipher1
+      cipher2.login.username = "user2@example.com";
+
+      const allCiphers = [cipher1, cipher2];
+
+      // Mock cipherViews$ observable
+      mockCipherService.cipherViews$.mockReturnValue(new BehaviorSubject(allCiphers));
+
+      // Mock password reuse map
+      const mockReuseMap = { password1: 2 };
+      mockCipherRiskClient.password_reuse_map.mockReturnValue(mockReuseMap);
+
+      // Mock compute_risk result
+      const mockRiskResult: CipherRiskResult = {
+        id: mockCipherId1 as any,
+        password_strength: 3,
+        exposed_result: { type: "NotChecked" },
+        reuse_count: 2,
+      };
+      mockCipherRiskClient.compute_risk.mockResolvedValue([mockRiskResult]);
+
+      const result = await cipherRiskService.computeCipherRiskForUser(
+        asUuid<CipherId>(mockCipherId1),
+        mockUserId,
+        true,
+      );
+
+      // Verify cipherViews$ was called
+      expect(mockCipherService.cipherViews$).toHaveBeenCalledWith(mockUserId);
+
+      // Verify password_reuse_map was called with all ciphers
+      expect(mockCipherRiskClient.password_reuse_map).toHaveBeenCalledWith([
+        expect.objectContaining({ password: "password1", username: "user1@example.com" }),
+        expect.objectContaining({ password: "password1", username: "user2@example.com" }),
+      ]);
+
+      // Verify compute_risk was called with target cipher and password map
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(
+        [expect.objectContaining({ password: "password1", username: "user1@example.com" })],
+        {
+          passwordMap: mockReuseMap,
+          checkExposed: true,
+        },
+      );
+
+      expect(result).toEqual(mockRiskResult);
+    });
+
+    it("should throw error when cipher is not found", async () => {
+      const cipher1 = new CipherView();
+      cipher1.id = mockCipherId1;
+      cipher1.type = CipherType.Login;
+      cipher1.login = new LoginView();
+      cipher1.login.password = "password1";
+
+      mockCipherService.cipherViews$.mockReturnValue(new BehaviorSubject([cipher1]));
+
+      const nonExistentId = "00000000-0000-0000-0000-000000000000";
+      await expect(
+        cipherRiskService.computeCipherRiskForUser(asUuid<CipherId>(nonExistentId), mockUserId),
+      ).rejects.toThrow(`Cipher with id ${asUuid<CipherId>(nonExistentId)} not found`);
+    });
+
+    it("should use checkExposed parameter correctly", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const cipher = new CipherView();
+      cipher.id = mockCipherId1;
+      cipher.type = CipherType.Login;
+      cipher.login = new LoginView();
+      cipher.login.password = "password1";
+
+      mockCipherService.cipherViews$.mockReturnValue(new BehaviorSubject([cipher]));
+      mockCipherRiskClient.password_reuse_map.mockReturnValue({});
+      mockCipherRiskClient.compute_risk.mockResolvedValue([
+        {
+          id: mockCipherId1 as any,
+          password_strength: 4,
+          exposed_result: { type: "NotChecked" },
+          reuse_count: 1,
+        },
+      ]);
+
+      await cipherRiskService.computeCipherRiskForUser(
+        asUuid<CipherId>(mockCipherId1),
+        mockUserId,
+        false,
+      );
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(expect.any(Array), {
+        passwordMap: expect.any(Object),
+        checkExposed: false,
+      });
+    });
+
+    it("should default checkExposed to true when not provided", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const cipher = new CipherView();
+      cipher.id = mockCipherId1;
+      cipher.type = CipherType.Login;
+      cipher.login = new LoginView();
+      cipher.login.password = "password1";
+
+      mockCipherService.cipherViews$.mockReturnValue(new BehaviorSubject([cipher]));
+      mockCipherRiskClient.password_reuse_map.mockReturnValue({});
+      mockCipherRiskClient.compute_risk.mockResolvedValue([
+        {
+          id: mockCipherId1 as any,
+          password_strength: 4,
+          exposed_result: { type: "Found", value: 10 },
+          reuse_count: 1,
+        },
+      ]);
+
+      await cipherRiskService.computeCipherRiskForUser(asUuid<CipherId>(mockCipherId1), mockUserId);
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(expect.any(Array), {
+        passwordMap: expect.any(Object),
+        checkExposed: true,
+      });
+    });
+
+    it("should handle ciphers without passwords when building password map", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const cipherWithPassword = new CipherView();
+      cipherWithPassword.id = mockCipherId1;
+      cipherWithPassword.type = CipherType.Login;
+      cipherWithPassword.login = new LoginView();
+      cipherWithPassword.login.password = "password1";
+
+      const cipherWithoutPassword = new CipherView();
+      cipherWithoutPassword.id = mockCipherId2;
+      cipherWithoutPassword.type = CipherType.Login;
+      cipherWithoutPassword.login = new LoginView();
+      cipherWithoutPassword.login.password = "";
+
+      mockCipherService.cipherViews$.mockReturnValue(
+        new BehaviorSubject([cipherWithPassword, cipherWithoutPassword]),
+      );
+      mockCipherRiskClient.password_reuse_map.mockReturnValue({});
+      mockCipherRiskClient.compute_risk.mockResolvedValue([
+        {
+          id: mockCipherId1 as any,
+          password_strength: 4,
+          exposed_result: { type: "NotChecked" },
+          reuse_count: 1,
+        },
+      ]);
+
+      await cipherRiskService.computeCipherRiskForUser(asUuid<CipherId>(mockCipherId1), mockUserId);
+
+      // Verify password_reuse_map only received cipher with password
+      expect(mockCipherRiskClient.password_reuse_map).toHaveBeenCalledWith([
+        expect.objectContaining({ password: "password1" }),
+      ]);
+    });
+
+    it("should handle non-Login ciphers in vault when building password map", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const loginCipher = new CipherView();
+      loginCipher.id = mockCipherId1;
+      loginCipher.type = CipherType.Login;
+      loginCipher.login = new LoginView();
+      loginCipher.login.password = "password1";
+
+      const cardCipher = new CipherView();
+      cardCipher.id = mockCipherId2;
+      cardCipher.type = CipherType.Card;
+
+      const noteCipher = new CipherView();
+      noteCipher.id = mockCipherId3;
+      noteCipher.type = CipherType.SecureNote;
+
+      mockCipherService.cipherViews$.mockReturnValue(
+        new BehaviorSubject([loginCipher, cardCipher, noteCipher]),
+      );
+      mockCipherRiskClient.password_reuse_map.mockReturnValue({});
+      mockCipherRiskClient.compute_risk.mockResolvedValue([
+        {
+          id: mockCipherId1 as any,
+          password_strength: 4,
+          exposed_result: { type: "NotChecked" },
+          reuse_count: 1,
+        },
+      ]);
+
+      await cipherRiskService.computeCipherRiskForUser(asUuid<CipherId>(mockCipherId1), mockUserId);
+
+      // Verify password_reuse_map only received Login cipher
+      expect(mockCipherRiskClient.password_reuse_map).toHaveBeenCalledWith([
+        expect.objectContaining({ password: "password1" }),
+      ]);
+    });
+
+    it("should compute fresh password map on each call", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const cipher = new CipherView();
+      cipher.id = mockCipherId1;
+      cipher.type = CipherType.Login;
+      cipher.login = new LoginView();
+      cipher.login.password = "password1";
+
+      mockCipherService.cipherViews$.mockReturnValue(new BehaviorSubject([cipher]));
+      mockCipherRiskClient.password_reuse_map.mockReturnValue({ password1: 1 });
+      mockCipherRiskClient.compute_risk.mockResolvedValue([
+        {
+          id: mockCipherId1 as any,
+          password_strength: 4,
+          exposed_result: { type: "NotChecked" },
+          reuse_count: 1,
+        },
+      ]);
+
+      // First call
+      await cipherRiskService.computeCipherRiskForUser(asUuid<CipherId>(mockCipherId1), mockUserId);
+
+      // Second call
+      await cipherRiskService.computeCipherRiskForUser(asUuid<CipherId>(mockCipherId1), mockUserId);
+
+      // Verify password_reuse_map was called twice (fresh computation each time)
+      expect(mockCipherRiskClient.password_reuse_map).toHaveBeenCalledTimes(2);
+    });
+
+    it("should wait for a decrypted vault before computing risk", async () => {
+      const mockClient = sdkService.simulate.userLogin(mockUserId);
+      const mockCipherRiskClient = mockClient.vault.mockDeep().cipher_risk.mockDeep();
+
+      const cipher = new CipherView();
+      cipher.id = mockCipherId1;
+      cipher.type = CipherType.Login;
+      cipher.login = new LoginView();
+      cipher.login.password = "password1";
+
+      // Simulate the observable emitting null (undecrypted vault) first, then the decrypted ciphers
+      const cipherViewsSubject = new BehaviorSubject<CipherView[] | null>(null);
+      mockCipherService.cipherViews$.mockReturnValue(
+        cipherViewsSubject as Observable<CipherView[]>,
+      );
+
+      mockCipherRiskClient.password_reuse_map.mockReturnValue({});
+      mockCipherRiskClient.compute_risk.mockResolvedValue([
+        {
+          id: mockCipherId1 as any,
+          password_strength: 4,
+          exposed_result: { type: "NotChecked" },
+          reuse_count: 1,
+        },
+      ]);
+
+      // Initiate the async call but don't await yet
+      const computePromise = cipherRiskService.computeCipherRiskForUser(
+        asUuid<CipherId>(mockCipherId1),
+        mockUserId,
+        true,
+      );
+
+      // Simulate a tick to allow the service to process the null emission
+      await new Promise((resolve) => setTimeout(resolve, 0));
+
+      // Now emit the actual decrypted ciphers
+      cipherViewsSubject.next([cipher]);
+
+      const result = await computePromise;
+
+      expect(mockCipherRiskClient.compute_risk).toHaveBeenCalledWith(
+        [expect.objectContaining({ password: "password1" })],
+        {
+          passwordMap: expect.any(Object),
+          checkExposed: true,
+        },
+      );
+      expect(result).toEqual(expect.objectContaining({ id: expect.anything() }));
+    });
+  });
+});
diff --git a/libs/common/src/vault/services/default-cipher-risk.service.ts b/libs/common/src/vault/services/default-cipher-risk.service.ts
new file mode 100644
index 00000000000..4b4558e5e7a
--- /dev/null
+++ b/libs/common/src/vault/services/default-cipher-risk.service.ts
@@ -0,0 +1,118 @@
+import { firstValueFrom, switchMap } from "rxjs";
+
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { filterOutNullish } from "@bitwarden/common/vault/utils/observable-utilities";
+import {
+  CipherLoginDetails,
+  CipherRiskOptions,
+  PasswordReuseMap,
+  CipherRiskResult,
+  CipherId as SdkCipherId,
+} from "@bitwarden/sdk-internal";
+
+import { SdkService, asUuid } from "../../platform/abstractions/sdk/sdk.service";
+import { UserId, CipherId } from "../../types/guid";
+import { CipherRiskService as CipherRiskServiceAbstraction } from "../abstractions/cipher-risk.service";
+import { CipherType } from "../enums/cipher-type";
+import { CipherView } from "../models/view/cipher.view";
+
+export class DefaultCipherRiskService implements CipherRiskServiceAbstraction {
+  constructor(
+    private sdkService: SdkService,
+    private cipherService: CipherService,
+  ) {}
+
+  async computeRiskForCiphers(
+    ciphers: CipherView[],
+    userId: UserId,
+    options?: CipherRiskOptions,
+  ): Promise<CipherRiskResult[]> {
+    const loginDetails = this.mapToLoginDetails(ciphers);
+
+    if (loginDetails.length === 0) {
+      return [];
+    }
+
+    return await firstValueFrom(
+      this.sdkService.userClient$(userId).pipe(
+        switchMap(async (sdk) => {
+          using ref = sdk.take();
+          const cipherRiskClient = ref.value.vault().cipher_risk();
+          return await cipherRiskClient.compute_risk(
+            loginDetails,
+            options ?? { checkExposed: false },
+          );
+        }),
+      ),
+    );
+  }
+
+  async computeCipherRiskForUser(
+    cipherId: CipherId,
+    userId: UserId,
+    checkExposed: boolean = true,
+  ): Promise<CipherRiskResult> {
+    // Get all ciphers for the user
+    const allCiphers = await firstValueFrom(
+      this.cipherService.cipherViews$(userId).pipe(filterOutNullish()),
+    );
+
+    // Find the specific cipher
+    const targetCipher = allCiphers?.find((c) => asUuid<CipherId>(c.id) === cipherId);
+    if (!targetCipher) {
+      throw new Error(`Cipher with id ${cipherId} not found`);
+    }
+
+    // Build fresh password reuse map from all ciphers
+    const passwordMap = await this.buildPasswordReuseMap(allCiphers, userId);
+
+    // Call existing computeRiskForCiphers with single cipher and map
+    const results = await this.computeRiskForCiphers([targetCipher], userId, {
+      passwordMap,
+      checkExposed,
+    });
+
+    return results[0];
+  }
+
+  async buildPasswordReuseMap(ciphers: CipherView[], userId: UserId): Promise<PasswordReuseMap> {
+    const loginDetails = this.mapToLoginDetails(ciphers);
+
+    if (loginDetails.length === 0) {
+      return {};
+    }
+
+    return await firstValueFrom(
+      this.sdkService.userClient$(userId).pipe(
+        switchMap(async (sdk) => {
+          using ref = sdk.take();
+          const cipherRiskClient = ref.value.vault().cipher_risk();
+          return cipherRiskClient.password_reuse_map(loginDetails);
+        }),
+      ),
+    );
+  }
+
+  /**
+   * Maps CipherView array to CipherLoginDetails array for SDK consumption.
+   * Only includes Login ciphers with non-empty passwords.
+   */
+  private mapToLoginDetails(ciphers: CipherView[]): CipherLoginDetails[] {
+    return ciphers
+      .filter((cipher) => {
+        return (
+          cipher.type === CipherType.Login &&
+          cipher.login?.password != null &&
+          cipher.login.password !== ""
+        );
+      })
+      .map(
+        (cipher) =>
+          ({
+            id: asUuid<SdkCipherId>(cipher.id),
+            password: cipher.login.password!,
+            username: cipher.login.username,
+          }) satisfies CipherLoginDetails,
+      );
+  }
+}
diff --git a/libs/common/src/vault/services/file-upload/cipher-file-upload.service.spec.ts b/libs/common/src/vault/services/file-upload/cipher-file-upload.service.spec.ts
new file mode 100644
index 00000000000..8837f00df6b
--- /dev/null
+++ b/libs/common/src/vault/services/file-upload/cipher-file-upload.service.spec.ts
@@ -0,0 +1,82 @@
+import { mock } from "jest-mock-extended";
+
+import { ApiService } from "../../../abstractions/api.service";
+import { EncString } from "../../../key-management/crypto/models/enc-string";
+import { FileUploadService } from "../../../platform/abstractions/file-upload/file-upload.service";
+import { Utils } from "../../../platform/misc/utils";
+import { EncArrayBuffer } from "../../../platform/models/domain/enc-array-buffer";
+import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
+import { CipherType } from "../../enums/cipher-type";
+import { Cipher } from "../../models/domain/cipher";
+import { AttachmentUploadDataResponse } from "../../models/response/attachment-upload-data.response";
+import { CipherResponse } from "../../models/response/cipher.response";
+
+import { CipherFileUploadService } from "./cipher-file-upload.service";
+
+describe("CipherFileUploadService", () => {
+  const apiService = mock<ApiService>();
+  const fileUploadService = mock<FileUploadService>();
+
+  let service: CipherFileUploadService;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    service = new CipherFileUploadService(apiService, fileUploadService);
+  });
+
+  describe("upload", () => {
+    it("should include lastKnownRevisionDate in the attachment request", async () => {
+      const cipherId = Utils.newGuid();
+      const mockCipher = new Cipher({
+        id: cipherId,
+        type: CipherType.Login,
+        name: "Test Cipher",
+        revisionDate: "2024-01-15T10:30:00.000Z",
+      } as any);
+
+      const mockEncFileName = new EncString("encrypted-filename");
+      const mockEncData = {
+        buffer: new ArrayBuffer(100),
+      } as unknown as EncArrayBuffer;
+
+      const mockDataEncKey: [SymmetricCryptoKey, EncString] = [
+        new SymmetricCryptoKey(new Uint8Array(32)),
+        new EncString("encrypted-key"),
+      ];
+
+      const mockUploadDataResponse = {
+        attachmentId: "attachment-id",
+        url: "https://upload.example.com",
+        fileUploadType: 0,
+        cipherResponse: {
+          id: cipherId,
+          type: CipherType.Login,
+          revisionDate: "2024-01-15T10:30:00.000Z",
+        } as CipherResponse,
+        cipherMiniResponse: null,
+      } as AttachmentUploadDataResponse;
+
+      apiService.postCipherAttachment.mockResolvedValue(mockUploadDataResponse);
+      fileUploadService.upload.mockResolvedValue(undefined);
+
+      await service.upload(mockCipher, mockEncFileName, mockEncData, false, mockDataEncKey);
+
+      const callArgs = apiService.postCipherAttachment.mock.calls[0][1];
+
+      expect(apiService.postCipherAttachment).toHaveBeenCalledWith(
+        cipherId,
+        expect.objectContaining({
+          key: "encrypted-key",
+          fileName: "encrypted-filename",
+          fileSize: 100,
+          adminRequest: false,
+        }),
+      );
+
+      // Verify lastKnownRevisionDate is set (it's converted to a Date object)
+      expect(callArgs.lastKnownRevisionDate).toBeDefined();
+      expect(callArgs.lastKnownRevisionDate).toEqual(new Date("2024-01-15T10:30:00.000Z"));
+    });
+  });
+});
diff --git a/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts b/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts
index 2fb2746366d..8d97a921748 100644
--- a/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts
+++ b/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts
@@ -33,6 +33,7 @@ export class CipherFileUploadService implements CipherFileUploadServiceAbstracti
       fileName: encFileName.encryptedString,
       fileSize: encData.buffer.byteLength,
       adminRequest: admin,
+      lastKnownRevisionDate: cipher.revisionDate,
     };
 
     let response: CipherResponse;
diff --git a/libs/common/src/vault/services/folder/folder.service.ts b/libs/common/src/vault/services/folder/folder.service.ts
index 2d440adeb29..e95f39aad85 100644
--- a/libs/common/src/vault/services/folder/folder.service.ts
+++ b/libs/common/src/vault/services/folder/folder.service.ts
@@ -272,11 +272,16 @@ export class FolderService implements InternalFolderServiceAbstraction {
       return [];
     }
 
-    const decryptFolderPromises = folders.map((f) =>
-      f.decryptWithKey(userKey, this.encryptService),
-    );
-    const decryptedFolders = await Promise.all(decryptFolderPromises);
-    decryptedFolders.sort(Utils.getSortFunction(this.i18nService, "name"));
+    const decryptFolderPromises = folders.map(async (f) => {
+      try {
+        return await f.decryptWithKey(userKey, this.encryptService);
+      } catch {
+        return null;
+      }
+    });
+    const decryptedFolders = (await Promise.all(decryptFolderPromises))
+      .filter((p) => p !== null)
+      .sort(Utils.getSortFunction(this.i18nService, "name"));
 
     const noneFolder = new FolderView();
     noneFolder.name = this.i18nService.t("noneFolder");
diff --git a/libs/common/src/vault/services/restricted-item-types.service.spec.ts b/libs/common/src/vault/services/restricted-item-types.service.spec.ts
index 3ae68d47c5c..c16a91d0884 100644
--- a/libs/common/src/vault/services/restricted-item-types.service.spec.ts
+++ b/libs/common/src/vault/services/restricted-item-types.service.spec.ts
@@ -12,6 +12,8 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums";
 
+import { CipherLike } from "../types/cipher-like";
+
 import { RestrictedItemTypesService, RestrictedCipherType } from "./restricted-item-types.service";
 
 describe("RestrictedItemTypesService", () => {
@@ -130,4 +132,170 @@ describe("RestrictedItemTypesService", () => {
       { cipherType: CipherType.Identity, allowViewOrgIds: ["org1"] },
     ]);
   });
+
+  describe("isCipherRestricted", () => {
+    it("returns false when cipher type is not in restricted types", () => {
+      const cipher: CipherLike = {
+        type: CipherType.Login,
+        organizationId: "Pete the Cat",
+      } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Card, allowViewOrgIds: [] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(false);
+    });
+
+    it("returns false when restricted types array is empty", () => {
+      const cipher: CipherLike = { type: CipherType.Card, organizationId: "org1" } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(false);
+    });
+
+    it("returns false when cipher type does not match any restricted types", () => {
+      const cipher: CipherLike = {
+        type: CipherType.SecureNote,
+        organizationId: "org1",
+      } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Card, allowViewOrgIds: [] },
+        { cipherType: CipherType.Login, allowViewOrgIds: [] },
+        { cipherType: CipherType.Identity, allowViewOrgIds: [] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(false);
+    });
+
+    it("returns true for personal cipher when type is restricted", () => {
+      const cipher: CipherLike = { type: CipherType.Card, organizationId: null } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Card, allowViewOrgIds: ["org1"] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(true);
+    });
+
+    it("returns true for personal cipher with undefined organizationId when type is restricted", () => {
+      const cipher: CipherLike = {
+        type: CipherType.Login,
+        organizationId: undefined,
+      } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Login, allowViewOrgIds: ["org1", "org2"] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(true);
+    });
+
+    it("returns true for personal cipher regardless of allowViewOrgIds content", () => {
+      const cipher: CipherLike = { type: CipherType.Identity, organizationId: null } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Identity, allowViewOrgIds: [] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(true);
+    });
+
+    it("returns false when organization is in allowViewOrgIds", () => {
+      const cipher: CipherLike = { type: CipherType.Card, organizationId: "org1" } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Card, allowViewOrgIds: ["org1"] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(false);
+    });
+
+    it("returns false when organization is among multiple allowViewOrgIds", () => {
+      const cipher: CipherLike = { type: CipherType.Login, organizationId: "org2" } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Login, allowViewOrgIds: ["org1", "org2", "org3"] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(false);
+    });
+
+    it("returns false when type is restricted globally but cipher org allows it", () => {
+      const cipher: CipherLike = { type: CipherType.Card, organizationId: "org2" } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Card, allowViewOrgIds: ["org2"] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(false);
+    });
+
+    it("returns true when organization is not in allowViewOrgIds", () => {
+      const cipher: CipherLike = { type: CipherType.Card, organizationId: "org3" } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Card, allowViewOrgIds: ["org1", "org2"] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(true);
+    });
+
+    it("returns true when allowViewOrgIds is empty for org cipher", () => {
+      const cipher: CipherLike = { type: CipherType.Login, organizationId: "org1" } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Login, allowViewOrgIds: [] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(true);
+    });
+
+    it("returns true when cipher org differs from all allowViewOrgIds", () => {
+      const cipher: CipherLike = {
+        type: CipherType.Identity,
+        organizationId: "org5",
+      } as CipherLike;
+      const restrictedTypes: RestrictedCipherType[] = [
+        { cipherType: CipherType.Identity, allowViewOrgIds: ["org1", "org2", "org3", "org4"] },
+      ];
+
+      const result = service.isCipherRestricted(cipher, restrictedTypes);
+
+      expect(result).toBe(true);
+    });
+  });
+
+  describe("isCipherRestricted$", () => {
+    it("returns true when cipher is restricted by policy", async () => {
+      policyService.policiesByType$.mockReturnValue(of([policyOrg1]));
+      const cipher: CipherLike = { type: CipherType.Card, organizationId: null } as CipherLike;
+
+      const result = await firstValueFrom(service.isCipherRestricted$(cipher));
+
+      expect(result).toBe(true);
+    });
+
+    it("returns false when cipher is not restricted", async () => {
+      policyService.policiesByType$.mockReturnValue(of([policyOrg1]));
+      const cipher: CipherLike = { type: CipherType.Login, organizationId: "org2" } as CipherLike;
+
+      const result = await firstValueFrom(service.isCipherRestricted$(cipher));
+
+      expect(result).toBe(false);
+    });
+  });
 });
diff --git a/libs/common/src/vault/services/search.service.ts b/libs/common/src/vault/services/search.service.ts
index cbd89cf1ab1..0b34bd3863f 100644
--- a/libs/common/src/vault/services/search.service.ts
+++ b/libs/common/src/vault/services/search.service.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import * as lunr from "lunr";
-import { Observable, firstValueFrom, map } from "rxjs";
+import { BehaviorSubject, Observable, firstValueFrom, map } from "rxjs";
 import { Jsonify } from "type-fest";
 
 import { perUserCache$ } from "@bitwarden/common/vault/utils/observable-utilities";
@@ -81,6 +81,12 @@ export class SearchService implements SearchServiceAbstraction {
   private readonly defaultSearchableMinLength: number = 2;
   private searchableMinLength: number = this.defaultSearchableMinLength;
 
+  private _isCipherSearching$ = new BehaviorSubject<boolean>(false);
+  isCipherSearching$: Observable<boolean> = this._isCipherSearching$.asObservable();
+
+  private _isSendSearching$ = new BehaviorSubject<boolean>(false);
+  isSendSearching$: Observable<boolean> = this._isSendSearching$.asObservable();
+
   constructor(
     private logService: LogService,
     private i18nService: I18nService,
@@ -223,6 +229,7 @@ export class SearchService implements SearchServiceAbstraction {
     filter: ((cipher: C) => boolean) | ((cipher: C) => boolean)[] = null,
     ciphers: C[],
   ): Promise<C[]> {
+    this._isCipherSearching$.next(true);
     const results: C[] = [];
     const searchStartTime = performance.now();
     if (query != null) {
@@ -243,6 +250,7 @@ export class SearchService implements SearchServiceAbstraction {
     }
 
     if (!(await this.isSearchable(userId, query))) {
+      this._isCipherSearching$.next(false);
       return ciphers;
     }
 
@@ -258,6 +266,7 @@ export class SearchService implements SearchServiceAbstraction {
       // Fall back to basic search if index is not available
       const basicResults = this.searchCiphersBasic(ciphers, query);
       this.logService.measure(searchStartTime, "Vault", "SearchService", "basic search complete");
+      this._isCipherSearching$.next(false);
       return basicResults;
     }
 
@@ -293,15 +302,24 @@ export class SearchService implements SearchServiceAbstraction {
       });
     }
     this.logService.measure(searchStartTime, "Vault", "SearchService", "search complete");
+    this._isCipherSearching$.next(false);
     return results;
   }
 
-  searchCiphersBasic<C extends CipherViewLike>(ciphers: C[], query: string, deleted = false) {
+  searchCiphersBasic<C extends CipherViewLike>(
+    ciphers: C[],
+    query: string,
+    deleted = false,
+    archived = false,
+  ) {
     query = SearchService.normalizeSearchQuery(query.trim().toLowerCase());
     return ciphers.filter((c) => {
       if (deleted !== CipherViewLikeUtils.isDeleted(c)) {
         return false;
       }
+      if (archived !== CipherViewLikeUtils.isArchived(c)) {
+        return false;
+      }
       if (c.name != null && c.name.toLowerCase().indexOf(query) > -1) {
         return true;
       }
@@ -327,8 +345,10 @@ export class SearchService implements SearchServiceAbstraction {
   }
 
   searchSends(sends: SendView[], query: string) {
+    this._isSendSearching$.next(true);
     query = SearchService.normalizeSearchQuery(query.trim().toLocaleLowerCase());
     if (query === null) {
+      this._isSendSearching$.next(false);
       return sends;
     }
     const sendsMatched: SendView[] = [];
@@ -351,6 +371,7 @@ export class SearchService implements SearchServiceAbstraction {
         lowPriorityMatched.push(s);
       }
     });
+    this._isSendSearching$.next(false);
     return sendsMatched.concat(lowPriorityMatched);
   }
 
diff --git a/libs/common/src/vault/services/vault-settings/vault-settings.service.ts b/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
index 28671a94cc9..dbdb3a58dcc 100644
--- a/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
+++ b/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
@@ -1,4 +1,4 @@
-import { Observable, combineLatest, map, shareReplay, startWith } from "rxjs";
+import { Observable, combineLatest, map, shareReplay } from "rxjs";
 
 import { ActiveUserState, GlobalState, StateProvider } from "../../../platform/state";
 import { VaultSettingsService as VaultSettingsServiceAbstraction } from "../../abstractions/vault-settings/vault-settings.service";
@@ -31,7 +31,7 @@ export class VaultSettingsService implements VaultSettingsServiceAbstraction {
    */
   readonly showCardsCurrentTab$: Observable<boolean> = combineLatest([
     this.showCardsCurrentTabState.state$.pipe(map((x) => x ?? true)),
-    this.restrictedItemTypesService.restricted$.pipe(startWith([])),
+    this.restrictedItemTypesService.restricted$,
   ]).pipe(
     map(
       ([enabled, restrictions]) =>
diff --git a/libs/common/src/vault/tasks/abstractions/task.service.ts b/libs/common/src/vault/tasks/abstractions/task.service.ts
index 79cefff0b71..816c676413a 100644
--- a/libs/common/src/vault/tasks/abstractions/task.service.ts
+++ b/libs/common/src/vault/tasks/abstractions/task.service.ts
@@ -25,6 +25,12 @@ export abstract class TaskService {
    */
   abstract pendingTasks$(userId: UserId): Observable<SecurityTask[]>;
 
+  /**
+   * Observable of completed tasks for a given user.
+   * @param userId
+   */
+  abstract completedTasks$(userId: UserId): Observable<SecurityTask[]>;
+
   /**
    * Retrieves tasks from the API for a given user and updates the local state.
    * @param userId
diff --git a/libs/common/src/vault/tasks/services/default-task.service.spec.ts b/libs/common/src/vault/tasks/services/default-task.service.spec.ts
index df755dd9f90..8fc2f902ca4 100644
--- a/libs/common/src/vault/tasks/services/default-task.service.spec.ts
+++ b/libs/common/src/vault/tasks/services/default-task.service.spec.ts
@@ -51,10 +51,10 @@ describe("Default task service", () => {
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
-            useRiskInsights: false,
+            useAccessIntelligence: false,
           },
           {
-            useRiskInsights: true,
+            useAccessIntelligence: true,
           },
         ] as Organization[]),
       );
@@ -70,10 +70,10 @@ describe("Default task service", () => {
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
-            useRiskInsights: false,
+            useAccessIntelligence: false,
           },
           {
-            useRiskInsights: false,
+            useAccessIntelligence: false,
           },
         ] as Organization[]),
       );
@@ -91,7 +91,7 @@ describe("Default task service", () => {
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
-            useRiskInsights: true,
+            useAccessIntelligence: true,
           },
         ] as Organization[]),
       );
@@ -101,7 +101,7 @@ describe("Default task service", () => {
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
-            useRiskInsights: false,
+            useAccessIntelligence: false,
           },
         ] as Organization[]),
       );
@@ -163,7 +163,7 @@ describe("Default task service", () => {
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
-            useRiskInsights: true,
+            useAccessIntelligence: true,
           },
         ] as Organization[]),
       );
@@ -173,7 +173,7 @@ describe("Default task service", () => {
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
-            useRiskInsights: false,
+            useAccessIntelligence: false,
           },
         ] as Organization[]),
       );
diff --git a/libs/common/src/vault/tasks/services/default-task.service.ts b/libs/common/src/vault/tasks/services/default-task.service.ts
index 6238076ccf5..5bd23ed8605 100644
--- a/libs/common/src/vault/tasks/services/default-task.service.ts
+++ b/libs/common/src/vault/tasks/services/default-task.service.ts
@@ -48,7 +48,7 @@ export class DefaultTaskService implements TaskService {
 
   tasksEnabled$ = perUserCache$((userId) => {
     return this.organizationService.organizations$(userId).pipe(
-      map((orgs) => orgs.some((o) => o.useRiskInsights)),
+      map((orgs) => orgs.some((o) => o.useAccessIntelligence)),
       distinctUntilChanged(),
     );
   });
@@ -80,6 +80,12 @@ export class DefaultTaskService implements TaskService {
     );
   });
 
+  completedTasks$ = perUserCache$((userId) => {
+    return this.tasks$(userId).pipe(
+      map((tasks) => tasks.filter((t) => t.status === SecurityTaskStatus.Completed)),
+    );
+  });
+
   async refreshTasks(userId: UserId): Promise<void> {
     await this.fetchTasksFromApi(userId);
   }
diff --git a/libs/common/src/vault/utils/cipher-view-like-utils.spec.ts b/libs/common/src/vault/utils/cipher-view-like-utils.spec.ts
index 70122ebd27b..56b94fcf3ce 100644
--- a/libs/common/src/vault/utils/cipher-view-like-utils.spec.ts
+++ b/libs/common/src/vault/utils/cipher-view-like-utils.spec.ts
@@ -298,6 +298,10 @@ describe("CipherViewLikeUtils", () => {
         (cipherView.attachments as any) = null;
 
         expect(CipherViewLikeUtils.hasAttachments(cipherView)).toBe(false);
+
+        cipherView.attachments = [];
+
+        expect(CipherViewLikeUtils.hasAttachments(cipherView)).toBe(false);
       });
     });
 
diff --git a/libs/common/src/vault/utils/domain-utils.ts b/libs/common/src/vault/utils/domain-utils.ts
new file mode 100644
index 00000000000..ee071b29ec3
--- /dev/null
+++ b/libs/common/src/vault/utils/domain-utils.ts
@@ -0,0 +1,27 @@
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { EncString as SdkEncString } from "@bitwarden/sdk-internal";
+
+/**
+ * Converts a string value to an EncString, handling null/undefined gracefully.
+ *
+ * @param value - The string value to convert, or undefined
+ * @returns An EncString instance if value is defined, otherwise undefined
+ *
+ */
+export const conditionalEncString = (value?: string): EncString | undefined => {
+  return value != null ? new EncString(value) : undefined;
+};
+
+/**
+ * Converts an EncString representation (from JSON or SDK) to a domain EncString instance.
+ * Handles both serialized JSON representations and SDK EncString objects.
+ *
+ * @param value - The EncString representation (string, object, or SdkEncString), or undefined
+ * @returns A domain EncString instance if value is defined, otherwise undefined
+ *
+ */
+export const encStringFrom = <T extends string | SdkEncString>(
+  value?: T,
+): EncString | undefined => {
+  return value != null ? EncString.fromJSON(value) : undefined;
+};
diff --git a/libs/common/src/vault/utils/observable-utilities.ts b/libs/common/src/vault/utils/observable-utilities.ts
index cdec51fc953..025da8a36f0 100644
--- a/libs/common/src/vault/utils/observable-utilities.ts
+++ b/libs/common/src/vault/utils/observable-utilities.ts
@@ -30,7 +30,7 @@ export function perUserCache$<TValue>(
         create(userId),
         clearBuffer$.pipe(
           filter((clearId) => clearId === userId || clearId === null),
-          map(() => null),
+          map((): any => null),
         ),
       ).pipe(shareReplay({ bufferSize: 1, refCount: false }));
       cache.set(userId, observable);
diff --git a/libs/common/src/vault/utils/skeleton-loading.operator.spec.ts b/libs/common/src/vault/utils/skeleton-loading.operator.spec.ts
new file mode 100644
index 00000000000..3ba790f64cb
--- /dev/null
+++ b/libs/common/src/vault/utils/skeleton-loading.operator.spec.ts
@@ -0,0 +1,109 @@
+import { BehaviorSubject } from "rxjs";
+
+import { skeletonLoadingDelay } from "./skeleton-loading.operator";
+
+describe("skeletonLoadingDelay", () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.clearAllTimers();
+    jest.useRealTimers();
+  });
+
+  it("returns false immediately when starting with false", () => {
+    const source$ = new BehaviorSubject<boolean>(false);
+    const results: boolean[] = [];
+
+    source$.pipe(skeletonLoadingDelay()).subscribe((value) => results.push(value));
+
+    expect(results).toEqual([false]);
+  });
+
+  it("waits 1 second before returning true when starting with true", () => {
+    const source$ = new BehaviorSubject<boolean>(true);
+    const results: boolean[] = [];
+
+    source$.pipe(skeletonLoadingDelay()).subscribe((value) => results.push(value));
+
+    expect(results).toEqual([]);
+
+    jest.advanceTimersByTime(999);
+    expect(results).toEqual([]);
+
+    jest.advanceTimersByTime(1);
+    expect(results).toEqual([true]);
+  });
+
+  it("cancels if source becomes false before show delay completes", () => {
+    const source$ = new BehaviorSubject<boolean>(true);
+    const results: boolean[] = [];
+
+    source$.pipe(skeletonLoadingDelay()).subscribe((value) => results.push(value));
+
+    jest.advanceTimersByTime(500);
+    source$.next(false);
+
+    expect(results).toEqual([false]);
+
+    jest.advanceTimersByTime(1000);
+    expect(results).toEqual([false]);
+  });
+
+  it("delays hiding if minimum display time has not elapsed", () => {
+    const source$ = new BehaviorSubject<boolean>(true);
+    const results: boolean[] = [];
+
+    source$.pipe(skeletonLoadingDelay()).subscribe((value) => results.push(value));
+
+    jest.advanceTimersByTime(1000);
+    expect(results).toEqual([true]);
+
+    source$.next(false);
+
+    expect(results).toEqual([true]);
+
+    jest.advanceTimersByTime(1000);
+    expect(results).toEqual([true, false]);
+  });
+
+  it("handles rapid true->false->true transitions", () => {
+    const source$ = new BehaviorSubject<boolean>(true);
+    const results: boolean[] = [];
+
+    source$.pipe(skeletonLoadingDelay()).subscribe((value) => results.push(value));
+
+    jest.advanceTimersByTime(500);
+    expect(results).toEqual([]);
+
+    source$.next(false);
+    expect(results).toEqual([false]);
+
+    source$.next(true);
+
+    jest.advanceTimersByTime(999);
+    expect(results).toEqual([false]);
+
+    jest.advanceTimersByTime(1);
+    expect(results).toEqual([false, true]);
+  });
+
+  it("allows for custom timings", () => {
+    const source$ = new BehaviorSubject<boolean>(true);
+    const results: boolean[] = [];
+
+    source$.pipe(skeletonLoadingDelay(1000, 2000)).subscribe((value) => results.push(value));
+
+    jest.advanceTimersByTime(1000);
+    expect(results).toEqual([true]);
+
+    source$.next(false);
+
+    jest.advanceTimersByTime(1999);
+    expect(results).toEqual([true]);
+
+    jest.advanceTimersByTime(1);
+    expect(results).toEqual([true, false]);
+  });
+});
diff --git a/libs/common/src/vault/utils/skeleton-loading.operator.ts b/libs/common/src/vault/utils/skeleton-loading.operator.ts
new file mode 100644
index 00000000000..b9ff28f64b5
--- /dev/null
+++ b/libs/common/src/vault/utils/skeleton-loading.operator.ts
@@ -0,0 +1,59 @@
+import { defer, Observable, of, timer } from "rxjs";
+import { map, switchMap, tap } from "rxjs/operators";
+
+/**
+ * RxJS operator that adds skeleton loading delay behavior.
+ *
+ * - Waits 1 second before showing (prevents flashing for quick loads)
+ * - Ensures skeleton stays visible for at least 1 second once shown regardless of the source observable emissions
+ * - After the minimum display time, if the source is still true, continues to emit true until the source becomes false
+ * - False can only be emitted either:
+ *   - Immediately when the source emits false before the skeleton is shown
+ *   - After the minimum display time has passed once the skeleton is shown
+ */
+export function skeletonLoadingDelay(
+  showDelay = 1000,
+  minDisplayTime = 1000,
+): (source: Observable<boolean>) => Observable<boolean> {
+  return (source: Observable<boolean>) => {
+    return defer(() => {
+      let skeletonShownAt: number | null = null;
+
+      return source.pipe(
+        switchMap((shouldShow): Observable<boolean> => {
+          if (shouldShow) {
+            if (skeletonShownAt !== null) {
+              return of(true); // Already shown, continue showing
+            }
+
+            // Wait for delay, then mark the skeleton as shown and emit true
+            return timer(showDelay).pipe(
+              tap(() => {
+                skeletonShownAt = Date.now();
+              }),
+              map(() => true),
+            );
+          } else {
+            if (skeletonShownAt === null) {
+              // Skeleton not shown yet, can emit false immediately
+              return of(false);
+            }
+
+            // Skeleton shown, ensure minimum display time has passed
+            const elapsedTime = Date.now() - skeletonShownAt;
+            const remainingTime = Math.max(0, minDisplayTime - elapsedTime);
+
+            // Wait for remaining time to ensure minimum display time
+            return timer(remainingTime).pipe(
+              tap(() => {
+                // Reset the shown timestamp
+                skeletonShownAt = null;
+              }),
+              map(() => false),
+            );
+          }
+        }),
+      );
+    });
+  };
+}
diff --git a/libs/components/src/a11y/a11y-title.directive.ts b/libs/components/src/a11y/a11y-title.directive.ts
index 15f725f4285..75c2967805f 100644
--- a/libs/components/src/a11y/a11y-title.directive.ts
+++ b/libs/components/src/a11y/a11y-title.directive.ts
@@ -6,7 +6,7 @@ import { setA11yTitleAndAriaLabel } from "./set-a11y-title-and-aria-label";
   selector: "[appA11yTitle]",
 })
 export class A11yTitleDirective {
-  title = input.required<string>({ alias: "appA11yTitle" });
+  readonly title = input.required<string>({ alias: "appA11yTitle" });
 
   constructor(private el: ElementRef) {
     const originalTitle = this.el.nativeElement.getAttribute("title");
diff --git a/libs/components/src/a11y/index.ts b/libs/components/src/a11y/index.ts
index 2a723f14c93..ff53375ab0c 100644
--- a/libs/components/src/a11y/index.ts
+++ b/libs/components/src/a11y/index.ts
@@ -1,3 +1,4 @@
 export * from "./a11y-title.directive";
 export * from "./aria-disabled-click-capture.service";
 export * from "./aria-disable.directive";
+export * from "./router-focus-manager.service";
diff --git a/libs/components/src/a11y/router-focus-manager.service.ts b/libs/components/src/a11y/router-focus-manager.service.ts
new file mode 100644
index 00000000000..27c4e0f9b1e
--- /dev/null
+++ b/libs/components/src/a11y/router-focus-manager.service.ts
@@ -0,0 +1,65 @@
+import { inject, Injectable } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { NavigationEnd, Router } from "@angular/router";
+import { skip, filter, map, combineLatestWith, tap } from "rxjs";
+
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
+@Injectable({ providedIn: "root" })
+export class RouterFocusManagerService {
+  private router = inject(Router);
+
+  private configService = inject(ConfigService);
+
+  /**
+   * Handles SPA route focus management. SPA apps don't automatically notify screenreader
+   * users that navigation has occured or move the user's focus to the content they are
+   * navigating to, so we need to do it.
+   *
+   * By default, we focus the `main` after an internal route navigation.
+   *
+   * Consumers can opt out of the passing the following to the `info` input:
+   * `<a [routerLink]="route()" [info]="{ focusMainAfterNav: false }"></a>`
+   *
+   * Or, consumers can use the autofocus directive on an applicable interactive element.
+   * The autofocus directive will take precedence over this route focus pipeline.
+   *
+   * Example of where you might want to manually opt out:
+   * - Tab component causes a route navigation, but the tab content should be focused,
+   * not the whole `main`
+   *
+   * Note that router events that cause a fully new page to load (like switching between
+   * products) will not follow this pipeline. Instead, those will automatically bring
+   * focus to the top of the html document as if it were a full page load. So those links
+   * do not need to manually opt out of this pipeline.
+   */
+  start$ = this.router.events.pipe(
+    takeUntilDestroyed(),
+    filter((navEvent) => navEvent instanceof NavigationEnd),
+    /**
+     * On first page load, we do not want to skip the user over the navigation content,
+     * so we opt out of the default focus management behavior.
+     */
+    skip(1),
+    combineLatestWith(this.configService.getFeatureFlag$(FeatureFlag.RouterFocusManagement)),
+    filter(([_navEvent, flagEnabled]) => flagEnabled),
+    map(() => {
+      const currentNavData = this.router.getCurrentNavigation()?.extras;
+
+      const info = currentNavData?.info as { focusMainAfterNav?: boolean } | undefined;
+
+      return info;
+    }),
+    filter((currentNavInfo) => {
+      return currentNavInfo === undefined ? true : currentNavInfo?.focusMainAfterNav !== false;
+    }),
+    tap(() => {
+      const mainEl = document.querySelector<HTMLElement>("main");
+
+      if (mainEl) {
+        mainEl.focus();
+      }
+    }),
+  );
+}
diff --git a/libs/components/src/anon-layout/anon-layout-wrapper-data.service.ts b/libs/components/src/anon-layout/anon-layout-wrapper-data.service.ts
index 4135e6e0fd6..4789ac5c46e 100644
--- a/libs/components/src/anon-layout/anon-layout-wrapper-data.service.ts
+++ b/libs/components/src/anon-layout/anon-layout-wrapper-data.service.ts
@@ -11,10 +11,10 @@ export abstract class AnonLayoutWrapperDataService {
    *
    * @param data - The data to set on the AnonLayoutWrapperComponent to feed into the AnonLayoutComponent.
    */
-  abstract setAnonLayoutWrapperData(data: AnonLayoutWrapperData): void;
+  abstract setAnonLayoutWrapperData(data: Partial<AnonLayoutWrapperData>): void;
 
   /**
    * Reactively gets the current AnonLayoutWrapperData.
    */
-  abstract anonLayoutWrapperData$(): Observable<AnonLayoutWrapperData>;
+  abstract anonLayoutWrapperData$(): Observable<Partial<AnonLayoutWrapperData>>;
 }
diff --git a/libs/components/src/anon-layout/anon-layout-wrapper.component.html b/libs/components/src/anon-layout/anon-layout-wrapper.component.html
index 3509e4dcdb0..73a3d34261b 100644
--- a/libs/components/src/anon-layout/anon-layout-wrapper.component.html
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.component.html
@@ -5,7 +5,7 @@
   [showReadonlyHostname]="showReadonlyHostname"
   [maxWidth]="maxWidth"
   [hideCardWrapper]="hideCardWrapper"
-  [hideIcon]="hideIcon"
+  [hideBackgroundIllustration]="hideBackgroundIllustration"
 >
   <router-outlet></router-outlet>
   <router-outlet slot="secondary" name="secondary"></router-outlet>
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 13c2e727477..553da0c541b 100644
--- a/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
@@ -25,13 +25,9 @@ export interface AnonLayoutWrapperData {
    */
   pageSubtitle?: string | Translation | null;
   /**
-   * The optional icon to display on the page.
+   * The icon to display on the page. Pass null to hide the icon.
    */
-  pageIcon?: Icon | null;
-  /**
-   * Hides the default Bitwarden shield icon.
-   */
-  hideIcon?: boolean;
+  pageIcon: Icon | null;
   /**
    * Optional flag to either show the optional environment selector (false) or just a readonly hostname (true).
    */
@@ -44,8 +40,14 @@ export interface AnonLayoutWrapperData {
    * Hide the card that wraps the default content. Defaults to false.
    */
   hideCardWrapper?: boolean;
+  /**
+   * Hides the background illustration. Defaults to false.
+   */
+  hideBackgroundIllustration?: boolean;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "anon-layout-wrapper.component.html",
   imports: [AnonLayoutComponent, RouterModule],
@@ -55,11 +57,11 @@ export class AnonLayoutWrapperComponent implements OnInit {
 
   protected pageTitle?: string | null;
   protected pageSubtitle?: string | null;
-  protected pageIcon?: Icon | null;
+  protected pageIcon: Icon | null = null;
   protected showReadonlyHostname?: boolean | null;
   protected maxWidth?: AnonLayoutMaxWidth | null;
   protected hideCardWrapper?: boolean | null;
-  protected hideIcon?: boolean | null;
+  protected hideBackgroundIllustration?: boolean | null;
 
   constructor(
     private router: Router,
@@ -110,25 +112,22 @@ export class AnonLayoutWrapperComponent implements OnInit {
       this.pageIcon = firstChildRouteData["pageIcon"];
     }
 
-    if (firstChildRouteData["hideIcon"] !== undefined) {
-      this.hideIcon = firstChildRouteData["hideIcon"];
-    }
-
     this.showReadonlyHostname = Boolean(firstChildRouteData["showReadonlyHostname"]);
     this.maxWidth = firstChildRouteData["maxWidth"];
     this.hideCardWrapper = Boolean(firstChildRouteData["hideCardWrapper"]);
+    this.hideBackgroundIllustration = Boolean(firstChildRouteData["hideBackgroundIllustration"]);
   }
 
   private listenForServiceDataChanges() {
     this.anonLayoutWrapperDataService
       .anonLayoutWrapperData$()
       .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe((data: AnonLayoutWrapperData) => {
+      .subscribe((data: Partial<AnonLayoutWrapperData>) => {
         this.setAnonLayoutWrapperData(data);
       });
   }
 
-  private setAnonLayoutWrapperData(data: AnonLayoutWrapperData) {
+  private setAnonLayoutWrapperData(data: Partial<AnonLayoutWrapperData>) {
     if (!data) {
       return;
     }
@@ -157,10 +156,9 @@ export class AnonLayoutWrapperComponent implements OnInit {
       this.hideCardWrapper = data.hideCardWrapper;
     }
 
-    if (data.hideIcon !== undefined) {
-      this.hideIcon = data.hideIcon;
+    if (data.hideBackgroundIllustration !== undefined) {
+      this.hideBackgroundIllustration = data.hideBackgroundIllustration;
     }
-
     if (data.maxWidth !== undefined) {
       this.maxWidth = data.maxWidth;
     }
@@ -187,6 +185,6 @@ export class AnonLayoutWrapperComponent implements OnInit {
     this.showReadonlyHostname = null;
     this.maxWidth = null;
     this.hideCardWrapper = null;
-    this.hideIcon = null;
+    this.hideBackgroundIllustration = null;
   }
 }
diff --git a/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts b/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
index 08f04eca9ff..76fcc8976c7 100644
--- a/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
@@ -103,6 +103,8 @@ type Story = StoryObj<AnonLayoutWrapperComponent>;
 
 // Default Example
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-default-primary-outlet-example-component",
   template: "<p>Primary Outlet Example: <br> your primary component goes here</p>",
@@ -110,6 +112,8 @@ type Story = StoryObj<AnonLayoutWrapperComponent>;
 })
 export class DefaultPrimaryOutletExampleComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-default-secondary-outlet-example-component",
   template: "<p>Secondary Outlet Example: <br> your secondary component goes here</p>",
@@ -117,6 +121,8 @@ export class DefaultPrimaryOutletExampleComponent {}
 })
 export class DefaultSecondaryOutletExampleComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-default-env-selector-outlet-example-component",
   template: "<p>Env Selector Outlet Example: <br> your env selector component goes here</p>",
@@ -147,7 +153,9 @@ export const DefaultContentExample: Story = {
         children: [
           {
             path: "default-example",
-            data: {},
+            data: {
+              pageIcon: LockIcon,
+            } satisfies AnonLayoutWrapperData,
             children: [
               {
                 path: "",
@@ -190,6 +198,8 @@ const changedData: AnonLayoutWrapperData = {
   pageIcon: RegistrationCheckEmailIcon,
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-dynamic-content-example-component",
   template: `
diff --git a/libs/components/src/anon-layout/anon-layout.component.html b/libs/components/src/anon-layout/anon-layout.component.html
index c66647c482d..15f7d107542 100644
--- a/libs/components/src/anon-layout/anon-layout.component.html
+++ b/libs/components/src/anon-layout/anon-layout.component.html
@@ -14,13 +14,15 @@
   </a>
 
   <div class="tw-text-center tw-mb-4 sm:tw-mb-6 tw-mx-auto" [ngClass]="maxWidthClass">
+    @let iconInput = icon();
+
     <!-- In some scenarios this icon's size is not limited by container width correctly -->
     <!-- Targeting the SVG here to try and ensure it never grows too large in even the media queries are not working as expected -->
     <div
-      *ngIf="!hideIcon()"
+      *ngIf="iconInput !== null"
       class="tw-size-20 sm:tw-size-24 [&_svg]:tw-w-full [&_svg]:tw-max-w-24 tw-mx-auto tw-content-center"
     >
-      <bit-icon [icon]="icon()"></bit-icon>
+      <bit-icon [icon]="iconInput"></bit-icon>
     </div>
 
     <ng-container *ngIf="title()">
@@ -46,11 +48,11 @@
         <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
       </div>
     } @else {
-      <div
-        class="tw-rounded-2xl tw-mb-6 sm:tw-mb-10 tw-mx-auto tw-w-full sm:tw-bg-background sm:tw-border sm:tw-border-solid sm:tw-border-secondary-300 sm:tw-p-8"
+      <bit-base-card
+        class="!tw-rounded-2xl tw-mb-6 sm:tw-mb-10 tw-mx-auto tw-w-full tw-bg-transparent tw-border-none tw-shadow-none sm:tw-bg-background sm:tw-border sm:tw-border-solid sm:tw-border-secondary-100 sm:tw-shadow sm:tw-p-8"
       >
         <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
-      </div>
+      </bit-base-card>
     }
     <ng-content select="[slot=secondary]"></ng-content>
   </div>
@@ -68,16 +70,18 @@
     </ng-container>
   </footer>
 
-  <div
-    class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-start-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
-  >
-    <bit-icon [icon]="leftIllustration"></bit-icon>
-  </div>
-  <div
-    class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-end-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
-  >
-    <bit-icon [icon]="rightIllustration"></bit-icon>
-  </div>
+  @if (!hideBackgroundIllustration()) {
+    <div
+      class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-start-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+    >
+      <bit-icon [icon]="leftIllustration"></bit-icon>
+    </div>
+    <div
+      class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-end-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+    >
+      <bit-icon [icon]="rightIllustration"></bit-icon>
+    </div>
+  }
 </main>
 
 <ng-template #defaultContent>
diff --git a/libs/components/src/anon-layout/anon-layout.component.ts b/libs/components/src/anon-layout/anon-layout.component.ts
index c0beb5bce56..e6572a0c3c1 100644
--- a/libs/components/src/anon-layout/anon-layout.component.ts
+++ b/libs/components/src/anon-layout/anon-layout.component.ts
@@ -12,7 +12,6 @@ import { RouterModule } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
 import {
-  AnonLayoutBitwardenShield,
   BackgroundLeftIllustration,
   BackgroundRightIllustration,
   BitwardenLogo,
@@ -22,16 +21,26 @@ import { ClientType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+import { BaseCardComponent } from "../card";
 import { IconModule } from "../icon";
 import { SharedModule } from "../shared";
 import { TypographyModule } from "../typography";
 
 export type AnonLayoutMaxWidth = "md" | "lg" | "xl" | "2xl" | "3xl" | "4xl";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "auth-anon-layout",
   templateUrl: "./anon-layout.component.html",
-  imports: [IconModule, CommonModule, TypographyModule, SharedModule, RouterModule],
+  imports: [
+    IconModule,
+    CommonModule,
+    TypographyModule,
+    SharedModule,
+    RouterModule,
+    BaseCardComponent,
+  ],
 })
 export class AnonLayoutComponent implements OnInit, OnChanges {
   @HostBinding("class")
@@ -45,12 +54,12 @@ export class AnonLayoutComponent implements OnInit, OnChanges {
 
   readonly title = input<string>();
   readonly subtitle = input<string>();
-  readonly icon = model<Icon>();
+  readonly icon = model.required<Icon | null>();
   readonly showReadonlyHostname = input<boolean>(false);
   readonly hideLogo = input<boolean>(false);
   readonly hideFooter = input<boolean>(false);
-  readonly hideIcon = input<boolean>(false);
   readonly hideCardWrapper = input<boolean>(false);
+  readonly hideBackgroundIllustration = input<boolean>(false);
 
   /**
    * Max width of the anon layout title, subtitle, and content areas.
@@ -98,11 +107,6 @@ export class AnonLayoutComponent implements OnInit, OnChanges {
     this.maxWidth.set(this.maxWidth() ?? "md");
     this.hostname = (await firstValueFrom(this.environmentService.environment$)).getHostname();
     this.version = await this.platformUtilsService.getApplicationVersion();
-
-    // If there is no icon input, then use the default icon
-    if (this.icon() == null) {
-      this.icon.set(AnonLayoutBitwardenShield);
-    }
   }
 
   async ngOnChanges(changes: SimpleChanges) {
diff --git a/libs/components/src/anon-layout/anon-layout.stories.ts b/libs/components/src/anon-layout/anon-layout.stories.ts
index 15cce39d8b7..fb3bacb838f 100644
--- a/libs/components/src/anon-layout/anon-layout.stories.ts
+++ b/libs/components/src/anon-layout/anon-layout.stories.ts
@@ -62,12 +62,8 @@ export default {
     }),
   ],
   render: (args) => {
-    const { useDefaultIcon, icon, ...rest } = args;
     return {
-      props: {
-        ...rest,
-        icon: useDefaultIcon ? null : icon,
-      },
+      props: args,
       template: /*html*/ `
         <auth-anon-layout
           [title]="title"
@@ -76,25 +72,25 @@ export default {
           [showReadonlyHostname]="showReadonlyHostname"
           [maxWidth]="maxWidth"
           [hideCardWrapper]="hideCardWrapper"
-          [hideIcon]="hideIcon"
           [hideLogo]="hideLogo"
           [hideFooter]="hideFooter"
+          [hideBackgroundIllustration]="hideBackgroundIllustration"
         >
           <ng-container [ngSwitch]="contentLength">
-            <div *ngSwitchCase="'thin'" class="tw-text-center">  <div class="tw-font-bold">Thin Content</div></div>
+            <div *ngSwitchCase="'thin'" class="tw-text-center">  <div class="tw-font-medium">Thin Content</div></div>
             <div *ngSwitchCase="'long'">
-              <div class="tw-font-bold">Long Content</div>
+              <div class="tw-font-medium">Long Content</div>
               <div>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</div>
               <div>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</div>
             </div>
             <div *ngSwitchDefault>
-              <div class="tw-font-bold">Normal Content</div>
+              <div class="tw-font-medium">Normal Content</div>
               <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. </div>
             </div>
           </ng-container>
 
           <div *ngIf="showSecondary" slot="secondary" class="tw-text-center">
-            <div class="tw-font-bold tw-mb-2">
+            <div class="tw-font-medium tw-mb-2">
               Secondary Projected Content (optional)
             </div>
             <button type="button" bitButton>Perform Action</button>
@@ -109,11 +105,6 @@ export default {
     subtitle: { control: "text" },
 
     icon: { control: false, table: { disable: true } },
-    useDefaultIcon: {
-      control: false,
-      table: { disable: true },
-      description: "If true, passes null so component falls back to its built-in icon",
-    },
 
     showReadonlyHostname: { control: "boolean" },
     maxWidth: {
@@ -122,9 +113,9 @@ export default {
     },
 
     hideCardWrapper: { control: "boolean" },
-    hideIcon: { control: "boolean" },
     hideLogo: { control: "boolean" },
     hideFooter: { control: "boolean" },
+    hideBackgroundIllustration: { control: "boolean" },
 
     contentLength: {
       control: "radio",
@@ -142,9 +133,9 @@ export default {
     showReadonlyHostname: false,
     maxWidth: "md",
     hideCardWrapper: false,
-    hideIcon: false,
     hideLogo: false,
     hideFooter: false,
+    hideBackgroundIllustration: false,
     contentLength: "normal",
     showSecondary: false,
   },
@@ -205,12 +196,8 @@ export const NoWrapper: Story = {
   args: { hideCardWrapper: true },
 };
 
-export const DefaultIcon: Story = {
-  args: { useDefaultIcon: true },
-};
-
 export const NoIcon: Story = {
-  args: { hideIcon: true },
+  args: { icon: null },
 };
 
 export const NoLogo: Story = {
@@ -221,6 +208,10 @@ export const NoFooter: Story = {
   args: { hideFooter: true },
 };
 
+export const NoBackgroundIllustration: Story = {
+  args: { hideBackgroundIllustration: true },
+};
+
 export const ReadonlyHostname: Story = {
   args: { showReadonlyHostname: true },
 };
@@ -231,8 +222,9 @@ export const MinimalState: Story = {
     subtitle: undefined,
     contentLength: "normal",
     hideCardWrapper: true,
-    hideIcon: true,
+    icon: null,
     hideLogo: true,
     hideFooter: true,
+    hideBackgroundIllustration: true,
   },
 };
diff --git a/libs/components/src/anon-layout/default-anon-layout-wrapper-data.service.ts b/libs/components/src/anon-layout/default-anon-layout-wrapper-data.service.ts
index 1f09d209445..e1499b20377 100644
--- a/libs/components/src/anon-layout/default-anon-layout-wrapper-data.service.ts
+++ b/libs/components/src/anon-layout/default-anon-layout-wrapper-data.service.ts
@@ -4,13 +4,13 @@ import { AnonLayoutWrapperDataService } from "./anon-layout-wrapper-data.service
 import { AnonLayoutWrapperData } from "./anon-layout-wrapper.component";
 
 export class DefaultAnonLayoutWrapperDataService implements AnonLayoutWrapperDataService {
-  protected anonLayoutWrapperDataSubject = new Subject<AnonLayoutWrapperData>();
+  protected anonLayoutWrapperDataSubject = new Subject<Partial<AnonLayoutWrapperData>>();
 
-  setAnonLayoutWrapperData(data: AnonLayoutWrapperData): void {
+  setAnonLayoutWrapperData(data: Partial<AnonLayoutWrapperData>): void {
     this.anonLayoutWrapperDataSubject.next(data);
   }
 
-  anonLayoutWrapperData$(): Observable<AnonLayoutWrapperData> {
+  anonLayoutWrapperData$(): Observable<Partial<AnonLayoutWrapperData>> {
     return this.anonLayoutWrapperDataSubject.asObservable();
   }
 }
diff --git a/libs/components/src/app/app.component.ts b/libs/components/src/app/app.component.ts
index ed8cf595d5e..c2829956219 100644
--- a/libs/components/src/app/app.component.ts
+++ b/libs/components/src/app/app.component.ts
@@ -1,5 +1,7 @@
 import { Component } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-root",
   template: "",
diff --git a/libs/components/src/async-actions/in-forms.stories.ts b/libs/components/src/async-actions/in-forms.stories.ts
index af5034c49d5..7a19908cbbf 100644
--- a/libs/components/src/async-actions/in-forms.stories.ts
+++ b/libs/components/src/async-actions/in-forms.stories.ts
@@ -39,6 +39,8 @@ const template = `
     <button class="tw-me-2" type="button" buttonType="muted" bitIconButton="bwi-star" label="Delete" bitFormButton [bitAction]="delete">Delete</button>
   </form>`;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-promise-example",
   template,
@@ -84,6 +86,8 @@ class PromiseExampleComponent {
   };
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-observable-example",
   template,
diff --git a/libs/components/src/async-actions/standalone.stories.ts b/libs/components/src/async-actions/standalone.stories.ts
index 150bdb8813b..52c1e990c23 100644
--- a/libs/components/src/async-actions/standalone.stories.ts
+++ b/libs/components/src/async-actions/standalone.stories.ts
@@ -20,6 +20,8 @@ const template = /*html*/ `
   </button>
   <button type="button" label="Delete" bitIconButton="bwi-trash" buttonType="danger" [bitAction]="action"></button>`;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template,
   selector: "app-promise-example",
@@ -37,6 +39,8 @@ class PromiseExampleComponent {
   };
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template,
   selector: "app-action-resolves-quickly",
@@ -55,6 +59,8 @@ class ActionResolvesQuicklyComponent {
   };
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template,
   selector: "app-observable-example",
@@ -66,6 +72,8 @@ class ObservableExampleComponent {
   };
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template,
   selector: "app-rejected-promise-example",
diff --git a/libs/components/src/avatar/avatar.component.ts b/libs/components/src/avatar/avatar.component.ts
index 6f83c9ca101..2ba85e32772 100644
--- a/libs/components/src/avatar/avatar.component.ts
+++ b/libs/components/src/avatar/avatar.component.ts
@@ -1,6 +1,5 @@
 import { NgClass } from "@angular/common";
-import { Component, OnChanges, input } from "@angular/core";
-import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
+import { Component, computed, input } from "@angular/core";
 
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
@@ -20,14 +19,38 @@ const SizeClasses: Record<SizeTypes, string[]> = {
   * A variance in color across the avatar component is important as it is used in Account Switching as a
   * visual indicator to recognize which of a personal or work account a user is logged into.
 */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-avatar",
-  template: `@if (src) {
-    <img [src]="src" title="{{ title() || text() }}" [ngClass]="classList" />
-  }`,
+  template: `
+    <span [title]="title() || text()">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        pointer-events="none"
+        [style.backgroundColor]="backgroundColor()"
+        [ngClass]="classList()"
+        attr.viewBox="0 0 {{ svgSize }} {{ svgSize }}"
+      >
+        <text
+          text-anchor="middle"
+          y="50%"
+          x="50%"
+          dy="0.35em"
+          pointer-events="auto"
+          [attr.fill]="textColor()"
+          [style.fontWeight]="svgFontWeight"
+          [style.fontSize.px]="svgFontSize"
+          font-family='Inter,"Helvetica Neue",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"'
+        >
+          {{ displayChars() }}
+        </text>
+      </svg>
+    </span>
+  `,
   imports: [NgClass],
 })
-export class AvatarComponent implements OnChanges {
+export class AvatarComponent {
   readonly border = input(false);
   readonly color = input<string>();
   readonly id = input<string>();
@@ -35,36 +58,40 @@ export class AvatarComponent implements OnChanges {
   readonly title = input<string>();
   readonly size = input<SizeTypes>("default");
 
-  private svgCharCount = 2;
-  private svgFontSize = 20;
-  private svgFontWeight = 300;
-  private svgSize = 48;
-  src?: SafeResourceUrl;
+  protected readonly svgCharCount = 2;
+  protected readonly svgFontSize = 20;
+  protected readonly svgFontWeight = 300;
+  protected readonly svgSize = 48;
 
-  constructor(public sanitizer: DomSanitizer) {}
-
-  ngOnChanges() {
-    this.generate();
-  }
-
-  get classList() {
-    return ["tw-rounded-full", "tw-inline"]
+  protected readonly classList = computed(() => {
+    return ["tw-rounded-full"]
       .concat(SizeClasses[this.size()] ?? [])
       .concat(this.border() ? ["tw-border", "tw-border-solid", "tw-border-secondary-600"] : []);
-  }
+  });
 
-  private generate() {
-    const color = this.color();
-    const text = this.text();
+  protected readonly backgroundColor = computed(() => {
     const id = this.id();
-    if (!text && !color && !id) {
-      throw new Error("Must supply `text`, `color`, or `id` input.");
+    const upperCaseText = this.text()?.toUpperCase() ?? "";
+
+    if (!Utils.isNullOrWhitespace(this.color())) {
+      return this.color()!;
     }
-    let chars: string | null = null;
-    const upperCaseText = text?.toUpperCase() ?? "";
 
-    chars = this.getFirstLetters(upperCaseText, this.svgCharCount);
+    if (!Utils.isNullOrWhitespace(id)) {
+      return Utils.stringToColor(id!.toString());
+    }
 
+    return Utils.stringToColor(upperCaseText);
+  });
+
+  protected readonly textColor = computed(() => {
+    return Utils.pickTextColorBasedOnBgColor(this.backgroundColor(), 135, true);
+  });
+
+  protected readonly displayChars = computed(() => {
+    const upperCaseText = this.text()?.toUpperCase() ?? "";
+
+    let chars = this.getFirstLetters(upperCaseText, this.svgCharCount);
     if (chars == null) {
       chars = this.unicodeSafeSubstring(upperCaseText, this.svgCharCount);
     }
@@ -75,30 +102,10 @@ export class AvatarComponent implements OnChanges {
       chars = emojiMatch[0];
     }
 
-    let svg: HTMLElement;
-    let hexColor = color ?? "";
-    if (!Utils.isNullOrWhitespace(hexColor)) {
-      svg = this.createSvgElement(this.svgSize, hexColor);
-    } else if (!Utils.isNullOrWhitespace(id ?? "")) {
-      hexColor = Utils.stringToColor(id!.toString());
-      svg = this.createSvgElement(this.svgSize, hexColor);
-    } else {
-      hexColor = Utils.stringToColor(upperCaseText);
-      svg = this.createSvgElement(this.svgSize, hexColor);
-    }
+    return chars;
+  });
 
-    const charObj = this.createTextElement(chars, hexColor);
-    svg.appendChild(charObj);
-    const html = window.document.createElement("div").appendChild(svg).outerHTML;
-    const svgHtml = window.btoa(unescape(encodeURIComponent(html)));
-
-    // This is safe because the only user provided value, chars is set using `textContent`
-    this.src = this.sanitizer.bypassSecurityTrustResourceUrl(
-      "data:image/svg+xml;base64," + svgHtml,
-    );
-  }
-
-  private getFirstLetters(data: string, count: number): string | null {
+  private getFirstLetters(data: string, count: number): string | undefined {
     const parts = data.split(" ");
     if (parts.length > 1) {
       let text = "";
@@ -107,39 +114,7 @@ export class AvatarComponent implements OnChanges {
       }
       return text;
     }
-    return null;
-  }
-
-  private createSvgElement(size: number, color: string): HTMLElement {
-    const svgTag = window.document.createElement("svg");
-    svgTag.setAttribute("xmlns", "http://www.w3.org/2000/svg");
-    svgTag.setAttribute("pointer-events", "none");
-    svgTag.setAttribute("width", size.toString());
-    svgTag.setAttribute("height", size.toString());
-    svgTag.style.backgroundColor = color;
-    svgTag.style.width = size + "px";
-    svgTag.style.height = size + "px";
-    return svgTag;
-  }
-
-  private createTextElement(character: string, color: string): HTMLElement {
-    const textTag = window.document.createElement("text");
-    textTag.setAttribute("text-anchor", "middle");
-    textTag.setAttribute("y", "50%");
-    textTag.setAttribute("x", "50%");
-    textTag.setAttribute("dy", "0.35em");
-    textTag.setAttribute("pointer-events", "auto");
-    textTag.setAttribute("fill", Utils.pickTextColorBasedOnBgColor(color, 135, true));
-    textTag.setAttribute(
-      "font-family",
-      'Roboto,"Helvetica Neue",Helvetica,Arial,' +
-        'sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"',
-    );
-    // Warning do not use innerHTML here, characters are user provided
-    textTag.textContent = character;
-    textTag.style.fontWeight = this.svgFontWeight.toString();
-    textTag.style.fontSize = this.svgFontSize + "px";
-    return textTag;
+    return undefined;
   }
 
   private unicodeSafeSubstring(str: string, count: number) {
diff --git a/libs/components/src/badge-list/badge-list.component.html b/libs/components/src/badge-list/badge-list.component.html
index 18365cba268..d976b2d2cc4 100644
--- a/libs/components/src/badge-list/badge-list.component.html
+++ b/libs/components/src/badge-list/badge-list.component.html
@@ -1,15 +1,15 @@
 <div class="tw-inline-flex tw-flex-wrap tw-gap-2">
-  @for (item of filteredItems; track item; let last = $last) {
+  @for (item of filteredItems(); track item; let last = $last) {
     <span bitBadge [variant]="variant()" [truncate]="truncate()">
       {{ item }}
     </span>
-    @if (!last || isFiltered) {
+    @if (!last || isFiltered()) {
       <span class="tw-sr-only">, </span>
     }
   }
-  @if (isFiltered) {
+  @if (isFiltered()) {
     <span bitBadge [variant]="variant()">
-      {{ "plusNMore" | i18n: (items().length - filteredItems.length).toString() }}
+      {{ "plusNMore" | i18n: (items().length - filteredItems().length).toString() }}
     </span>
   }
 </div>
diff --git a/libs/components/src/badge-list/badge-list.component.ts b/libs/components/src/badge-list/badge-list.component.ts
index b9d9a666261..a5b306c12fc 100644
--- a/libs/components/src/badge-list/badge-list.component.ts
+++ b/libs/components/src/badge-list/badge-list.component.ts
@@ -1,36 +1,60 @@
-import { Component, OnChanges, input } from "@angular/core";
+import { ChangeDetectionStrategy, Component, computed, input } from "@angular/core";
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
 import { BadgeModule, BadgeVariant } from "../badge";
 
 function transformMaxItems(value: number | undefined) {
-  return value == undefined ? undefined : Math.max(1, value);
+  return value == null ? undefined : Math.max(1, value);
 }
 
+/**
+ * Displays a collection of badges in a horizontal, wrapping layout.
+ *
+ * The component automatically handles overflow by showing a limited number of badges
+ * followed by a "+N more" badge when `maxItems` is specified and exceeded.
+ *
+ * Each badge inherits the `variant` and `truncate` settings, ensuring visual consistency
+ * across the list. Badges are separated by commas for screen readers to improve accessibility.
+ */
 @Component({
   selector: "bit-badge-list",
   templateUrl: "badge-list.component.html",
   imports: [BadgeModule, I18nPipe],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class BadgeListComponent implements OnChanges {
-  protected filteredItems: string[] = [];
-  protected isFiltered = false;
-
+export class BadgeListComponent {
+  /**
+   * The visual variant to apply to all badges in the list.
+   */
   readonly variant = input<BadgeVariant>("primary");
+
+  /**
+   * Items to display as badges.
+   */
   readonly items = input<string[]>([]);
+
+  /**
+   * Whether to truncate long badge text with ellipsis.
+   */
   readonly truncate = input(true);
 
+  /**
+   * Maximum number of badges to display before showing a "+N more" badge.
+   */
   readonly maxItems = input(undefined, { transform: transformMaxItems });
 
-  ngOnChanges() {
+  protected readonly filteredItems = computed(() => {
     const maxItems = this.maxItems();
+    const items = this.items();
 
-    if (maxItems == undefined || this.items().length <= maxItems) {
-      this.filteredItems = this.items();
-    } else {
-      this.filteredItems = this.items().slice(0, maxItems - 1);
+    if (maxItems == null || items.length <= maxItems) {
+      return items;
     }
-    this.isFiltered = this.items().length > this.filteredItems.length;
-  }
+    return items.slice(0, maxItems - 1);
+  });
+
+  protected readonly isFiltered = computed(() => {
+    return this.items().length > this.filteredItems().length;
+  });
 }
diff --git a/libs/components/src/badge/badge.component.ts b/libs/components/src/badge/badge.component.ts
index 37be13ef15a..55d7b719ccd 100644
--- a/libs/components/src/badge/badge.component.ts
+++ b/libs/components/src/badge/badge.component.ts
@@ -1,5 +1,12 @@
 import { CommonModule } from "@angular/common";
-import { Component, ElementRef, HostBinding, input } from "@angular/core";
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  ElementRef,
+  inject,
+  input,
+} from "@angular/core";
 
 import { FocusableElement } from "../shared/focusable-element";
 
@@ -44,25 +51,56 @@ const hoverStyles: Record<BadgeVariant, string[]> = {
   ],
 };
 /**
-  * Badges are primarily used as labels, counters, and small buttons.
-
-  * Typically Badges are only used with text set to `text-xs`. If additional sizes are needed, the component configurations may be reviewed and adjusted.
-
-  * The Badge directive can be used on a `<span>` (non clickable events), or an `<a>` or `<button>` tag
-
-  * > `NOTE:` The Focus and Hover states only apply to badges used for interactive events.
-  *
-  * > `NOTE:` The `disabled` state only applies to buttons.
-  *
-*/
+ * Badges are primarily used as labels, counters, and small buttons.
+ * Typically Badges are only used with text set to `text-xs`. If additional sizes are needed, the component configurations may be reviewed and adjusted.
+ *
+ * The Badge directive can be used on a `<span>` (non clickable events), or an `<a>` or `<button>` tag
+ *
+ * > `NOTE:` The Focus and Hover states only apply to badges used for interactive events.
+ *
+ * > `NOTE:` The `disabled` state only applies to buttons.
+ */
 @Component({
   selector: "span[bitBadge], a[bitBadge], button[bitBadge]",
   providers: [{ provide: FocusableElement, useExisting: BadgeComponent }],
   imports: [CommonModule],
   templateUrl: "badge.component.html",
+  host: {
+    "[class]": "classList()",
+    "[attr.title]": "titleAttr()",
+  },
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class BadgeComponent implements FocusableElement {
-  @HostBinding("class") get classList() {
+  private readonly el = inject(ElementRef<HTMLElement>);
+
+  private readonly hasHoverEffects = this.el.nativeElement.nodeName !== "SPAN";
+
+  /**
+   * Optional override for the automatic badge title attribute when truncating.
+   * When truncating is enabled and this is not provided, the badge will automatically
+   * use its text content as the title.
+   */
+  readonly title = input<string>();
+
+  /**
+   * Visual variant that determines the badge's color scheme.
+   */
+  readonly variant = input<BadgeVariant>("primary");
+
+  /**
+   * Whether to truncate long text with ellipsis when it exceeds maxWidthClass.
+   * When enabled, a title attribute is automatically added for accessibility.
+   */
+  readonly truncate = input(true);
+
+  /**
+   * Tailwind max-width class to apply when truncating is enabled.
+   * Must be a valid Tailwind max-width utility class (e.g., "tw-max-w-40", "tw-max-w-xs").
+   */
+  readonly maxWidthClass = input<`tw-max-w-${string}`>("tw-max-w-40");
+
+  protected readonly classList = computed(() => {
     return [
       "tw-inline-block",
       "tw-py-1",
@@ -92,39 +130,17 @@ export class BadgeComponent implements FocusableElement {
       .concat(styles[this.variant()])
       .concat(this.hasHoverEffects ? [...hoverStyles[this.variant()], "tw-min-w-10"] : [])
       .concat(this.truncate() ? this.maxWidthClass() : []);
-  }
-  @HostBinding("attr.title") get titleAttr() {
+  });
+
+  protected readonly titleAttr = computed(() => {
     const title = this.title();
     if (title !== undefined) {
       return title;
     }
-    return this.truncate() ? this?.el?.nativeElement?.textContent?.trim() : null;
-  }
-
-  /**
-   * Optional override for the automatic badge title when truncating.
-   */
-  readonly title = input<string>();
-
-  /**
-   * Variant, sets the background color of the badge.
-   */
-  readonly variant = input<BadgeVariant>("primary");
-
-  /**
-   * Truncate long text
-   */
-  readonly truncate = input(true);
-
-  readonly maxWidthClass = input<`tw-max-w-${string}`>("tw-max-w-40");
+    return this.truncate() ? this.el.nativeElement?.textContent?.trim() : null;
+  });
 
   getFocusTarget() {
     return this.el.nativeElement;
   }
-
-  private hasHoverEffects = false;
-
-  constructor(private el: ElementRef<HTMLElement>) {
-    this.hasHoverEffects = el?.nativeElement?.nodeName != "SPAN";
-  }
 }
diff --git a/libs/components/src/banner/banner.component.html b/libs/components/src/banner/banner.component.html
index bfde8135da9..19875d69f37 100644
--- a/libs/components/src/banner/banner.component.html
+++ b/libs/components/src/banner/banner.component.html
@@ -1,11 +1,11 @@
 <div
   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"
+  [class]="bannerClass()"
   [attr.role]="useAlertRole() ? 'status' : null"
   [attr.aria-live]="useAlertRole() ? 'polite' : null"
 >
-  @if (icon(); as icon) {
-    <i class="bwi tw-align-middle tw-text-base" [ngClass]="icon" aria-hidden="true"></i>
+  @if (displayIcon(); as icon) {
+    <i class="bwi tw-align-middle tw-text-base" [class]="icon" aria-hidden="true"></i>
   }
   <!-- Overriding focus-visible color for link buttons for a11y against colored background -->
   <span class="tw-grow tw-text-base [&>button[bitlink]:focus-visible:before]:!tw-ring-text-main">
diff --git a/libs/components/src/banner/banner.component.ts b/libs/components/src/banner/banner.component.ts
index 632bccae953..2f36353cfcd 100644
--- a/libs/components/src/banner/banner.component.ts
+++ b/libs/components/src/banner/banner.component.ts
@@ -1,5 +1,4 @@
-import { CommonModule } from "@angular/common";
-import { Component, OnInit, Output, EventEmitter, input, model } from "@angular/core";
+import { ChangeDetectionStrategy, Component, computed, input, output } from "@angular/core";
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
@@ -13,42 +12,69 @@ const defaultIcon: Record<BannerType, string> = {
   warning: "bwi-exclamation-triangle",
   danger: "bwi-error",
 };
-/**
-  * Banners are used for important communication with the user that needs to be seen right away, but has
-  * little effect on the experience. Banners appear at the top of the user's screen on page load and
-  * persist across all pages a user navigates to.
 
-  * - They should always be dismissible and never use a timeout. If a user dismisses a banner, it should not reappear during that same active session.
-  * - Use banners sparingly, as they can feel intrusive to the user if they appear unexpectedly. Their effectiveness may decrease if too many are used.
-  * - Avoid stacking multiple banners.
-  * - Banners can contain a button or anchor that uses the `bitLink` directive with `linkType="secondary"`.
+/**
+ * Banners are used for important communication with the user that needs to be seen right away, but has
+ * little effect on the experience. Banners appear at the top of the user's screen on page load and
+ * persist across all pages a user navigates to.
+ *
+ * - They should always be dismissible and never use a timeout. If a user dismisses a banner, it should not reappear during that same active session.
+ * - Use banners sparingly, as they can feel intrusive to the user if they appear unexpectedly. Their effectiveness may decrease if too many are used.
+ * - Avoid stacking multiple banners.
+ * - Banners can contain a button or anchor that uses the `bitLink` directive with `linkType="secondary"`.
  */
 @Component({
   selector: "bit-banner",
   templateUrl: "./banner.component.html",
-  imports: [CommonModule, IconButtonModule, I18nPipe],
+  imports: [IconButtonModule, I18nPipe],
   host: {
     // Account for bit-layout's padding
     class:
       "tw-flex tw-flex-col [bit-layout_&]:-tw-mx-8 [bit-layout_&]:-tw-my-6 [bit-layout_&]:tw-pb-6",
   },
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class BannerComponent implements OnInit {
+export class BannerComponent {
+  /**
+   * The type of banner, which determines its color scheme.
+   */
   readonly bannerType = input<BannerType>("info");
 
-  readonly icon = model<string>();
+  /**
+   * The icon to display. If not provided, a default icon based on bannerType will be used. Explicitly passing null will remove the icon.
+   */
+  readonly icon = input<string | null>();
+
+  /**
+   * Whether to use ARIA alert role for screen readers.
+   */
   readonly useAlertRole = input(true);
+
+  /**
+   * Whether to show the close button.
+   */
   readonly showClose = input(true);
 
-  @Output() onClose = new EventEmitter<void>();
+  /**
+   * Emitted when the banner is closed via the close button.
+   */
+  readonly onClose = output();
 
-  ngOnInit(): void {
-    if (!this.icon()) {
-      this.icon.set(defaultIcon[this.bannerType()]);
+  /**
+   * The computed icon to display, falling back to the default icon for the banner type.
+   * Returns null if icon is explicitly set to null (to hide the icon).
+   */
+  protected readonly displayIcon = computed(() => {
+    // If icon is explicitly null, don't show any icon
+    if (this.icon() === null) {
+      return null;
     }
-  }
 
-  get bannerClass() {
+    // If icon is undefined, fall back to default icon
+    return this.icon() ?? defaultIcon[this.bannerType()];
+  });
+
+  protected readonly bannerClass = computed(() => {
     switch (this.bannerType()) {
       case "danger":
         return "tw-bg-danger-100 tw-border-b-danger-700";
@@ -59,5 +85,5 @@ export class BannerComponent implements OnInit {
       case "warning":
         return "tw-bg-warning-100 tw-border-b-warning-700";
     }
-  }
+  });
 }
diff --git a/libs/components/src/breadcrumbs/breadcrumb.component.ts b/libs/components/src/breadcrumbs/breadcrumb.component.ts
index 783cb2655f7..6c79b449a28 100644
--- a/libs/components/src/breadcrumbs/breadcrumb.component.ts
+++ b/libs/components/src/breadcrumbs/breadcrumb.component.ts
@@ -1,6 +1,8 @@
 import { Component, EventEmitter, Output, TemplateRef, input, viewChild } from "@angular/core";
 import { QueryParamsHandling } from "@angular/router";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-breadcrumb",
   templateUrl: "./breadcrumb.component.html",
@@ -14,6 +16,8 @@ export class BreadcrumbComponent {
 
   readonly queryParamsHandling = input<QueryParamsHandling>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   click = new EventEmitter();
 
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.component.ts b/libs/components/src/breadcrumbs/breadcrumbs.component.ts
index 3c24f91be99..f0e4c4557c3 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.component.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.component.ts
@@ -15,6 +15,8 @@ import { BreadcrumbComponent } from "./breadcrumb.component";
  * Bitwarden uses this component to indicate the user's current location in a set of data organized in
  * containers (Collections, Folders, or Projects).
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-breadcrumbs",
   templateUrl: "./breadcrumbs.component.html",
@@ -25,6 +27,8 @@ export class BreadcrumbsComponent {
 
   private breadcrumbs: BreadcrumbComponent[] = [];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ContentChildren(BreadcrumbComponent)
   protected set breadcrumbList(value: QueryList<BreadcrumbComponent>) {
     this.breadcrumbs = value.toArray();
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
index 989b72adbd5..3064ffe3cb4 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
@@ -18,6 +18,8 @@ interface Breadcrumb {
   route: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
 })
diff --git a/libs/components/src/button/button.component.spec.ts b/libs/components/src/button/button.component.spec.ts
index 1651b6cf12a..4eb92227d22 100644
--- a/libs/components/src/button/button.component.spec.ts
+++ b/libs/components/src/button/button.component.spec.ts
@@ -5,19 +5,19 @@ import { By } from "@angular/platform-browser";
 import { ButtonModule } from "./index";
 
 describe("Button", () => {
-  let fixture: ComponentFixture<TestApp>;
-  let testAppComponent: TestApp;
+  let fixture: ComponentFixture<TestAppComponent>;
+  let testAppComponent: TestAppComponent;
   let buttonDebugElement: DebugElement;
   let disabledButtonDebugElement: DebugElement;
   let linkDebugElement: DebugElement;
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [TestApp],
+      imports: [TestAppComponent],
     });
 
     await TestBed.compileComponents();
-    fixture = TestBed.createComponent(TestApp);
+    fixture = TestBed.createComponent(TestAppComponent);
     testAppComponent = fixture.debugElement.componentInstance;
     buttonDebugElement = fixture.debugElement.query(By.css("button"));
     disabledButtonDebugElement = fixture.debugElement.query(By.css("button#disabled"));
@@ -56,6 +56,8 @@ describe("Button", () => {
   });
 });
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "test-app",
   template: `
@@ -84,7 +86,7 @@ describe("Button", () => {
   `,
   imports: [ButtonModule],
 })
-class TestApp {
+class TestAppComponent {
   buttonType?: string;
   block?: boolean;
   disabled?: boolean;
diff --git a/libs/components/src/button/button.component.ts b/libs/components/src/button/button.component.ts
index 47612685c16..7cae8fe974d 100644
--- a/libs/components/src/button/button.component.ts
+++ b/libs/components/src/button/button.component.ts
@@ -54,9 +54,19 @@ const buttonStyles: Record<ButtonType, string[]> = {
     "hover:!tw-text-contrast",
     ...focusRing,
   ],
+  dangerPrimary: [
+    "tw-border-danger-600",
+    "tw-bg-danger-600",
+    "!tw-text-contrast",
+    "hover:tw-bg-danger-700",
+    "hover:tw-border-danger-700",
+    ...focusRing,
+  ],
   unstyled: [],
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "button[bitButton], a[bitButton]",
   templateUrl: "button.component.html",
@@ -67,7 +77,7 @@ const buttonStyles: Record<ButtonType, string[]> = {
 export class ButtonComponent implements ButtonLikeAbstraction {
   @HostBinding("class") get classList() {
     return [
-      "tw-font-semibold",
+      "tw-font-medium",
       "tw-rounded-full",
       "tw-transition",
       "tw-border-2",
@@ -90,14 +100,13 @@ export class ButtonComponent implements ButtonLikeAbstraction {
               "hover:!tw-text-muted",
               "aria-disabled:tw-cursor-not-allowed",
               "hover:tw-no-underline",
-              "aria-disabled:tw-pointer-events-none",
             ]
           : [],
       )
       .concat(buttonSizeStyles[this.size() || "default"]);
   }
 
-  protected disabledAttr = computed(() => {
+  protected readonly disabledAttr = computed(() => {
     const disabled = this.disabled() != null && this.disabled() !== false;
     return disabled || this.loading();
   });
@@ -110,7 +119,7 @@ export class ButtonComponent implements ButtonLikeAbstraction {
    * We can't use `disabledAttr` for this, because it returns `true` when `loading` is `true`.
    * We only want to show disabled styles during loading if `showLoadingStyles` is `true`.
    */
-  protected showDisabledStyles = computed(() => {
+  protected readonly showDisabledStyles = computed(() => {
     return this.showLoadingStyle() || (this.disabledAttr() && this.loading() === false);
   });
 
@@ -134,11 +143,11 @@ export class ButtonComponent implements ButtonLikeAbstraction {
    * This pattern of converting a signal to an observable and back to a signal is not
    * recommended. TODO -- find better way to use debounce with signals (CL-596)
    */
-  protected showLoadingStyle = toSignal(
+  protected readonly showLoadingStyle = toSignal(
     toObservable(this.loading).pipe(debounce((isLoading) => interval(isLoading ? 75 : 0))),
   );
 
-  disabled = model<boolean>(false);
+  readonly disabled = model<boolean>(false);
   private el = inject(ElementRef<HTMLButtonElement>);
 
   constructor() {
diff --git a/libs/components/src/button/button.stories.ts b/libs/components/src/button/button.stories.ts
index 7319b47bce5..29c4dea3088 100644
--- a/libs/components/src/button/button.stories.ts
+++ b/libs/components/src/button/button.stories.ts
@@ -62,6 +62,13 @@ export const Primary: Story = {
   },
 };
 
+export const DangerPrimary: Story = {
+  ...Default,
+  args: {
+    buttonType: "dangerPrimary",
+  },
+};
+
 export const Danger: Story = {
   ...Default,
   args: {
@@ -77,6 +84,7 @@ export const Small: Story = {
       <button type="button" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="'primary'" [size]="size" [block]="block">Primary small</button>
       <button type="button" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="'secondary'" [size]="size" [block]="block">Secondary small</button>
       <button type="button" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="'danger'" [size]="size" [block]="block">Danger small</button>
+      <button type="button" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="'dangerPrimary'" [size]="size" [block]="block">Danger Primary small</button>
     </div>
     `,
   }),
diff --git a/libs/components/src/callout/callout.component.html b/libs/components/src/callout/callout.component.html
index b98679766d5..303d09dfcf3 100644
--- a/libs/components/src/callout/callout.component.html
+++ b/libs/components/src/callout/callout.component.html
@@ -1,24 +1,26 @@
 <aside
-  class="tw-mb-4 tw-box-border tw-rounded-lg tw-bg-background tw-ps-3 tw-pe-3 tw-py-2 tw-leading-5 tw-text-main"
-  [ngClass]="calloutClass()"
+  class="tw-mb-4 tw-box-border tw-border tw-border-solid tw-rounded-lg tw-bg-background tw-ps-4 tw-pe-4 tw-py-3 tw-leading-5 tw-flex tw-gap-2"
+  [ngClass]="[calloutClass()]"
   [attr.aria-labelledby]="titleId"
 >
-  @if (titleComputed(); as title) {
-    <header
-      id="{{ titleId }}"
-      class="tw-mb-1 tw-mt-0 tw-text-base tw-font-semibold tw-flex tw-gap-2 tw-items-start"
-    >
-      @if (iconComputed(); as icon) {
-        <i
-          class="bwi !tw-text-main tw-relative tw-top-[3px]"
-          [ngClass]="[icon]"
-          aria-hidden="true"
-        ></i>
-      }
-      {{ title }}
-    </header>
+  @let title = titleComputed();
+  @let icon = iconComputed();
+
+  @if (icon) {
+    <i
+      class="bwi tw-relative"
+      [ngClass]="[icon, title ? 'tw-top-[3px] tw-self-start' : 'tw-top-[1px]']"
+      aria-hidden="true"
+    ></i>
   }
-  <div class="tw-ps-6" bitTypography="body2">
-    <ng-content></ng-content>
+  <div class="tw-flex tw-flex-col tw-gap-0.5">
+    @if (title) {
+      <header id="{{ titleId }}" class="tw-text-base tw-font-medium">
+        {{ title }}
+      </header>
+    }
+    <div bitTypography="body2">
+      <ng-content></ng-content>
+    </div>
   </div>
 </aside>
diff --git a/libs/components/src/callout/callout.component.spec.ts b/libs/components/src/callout/callout.component.spec.ts
index b7dfe29a643..e052395067d 100644
--- a/libs/components/src/callout/callout.component.spec.ts
+++ b/libs/components/src/callout/callout.component.spec.ts
@@ -56,5 +56,12 @@ describe("Callout", () => {
       expect(component.titleComputed()).toBe("Error");
       expect(component.iconComputed()).toBe("bwi-error");
     });
+
+    it("default", () => {
+      fixture.componentRef.setInput("type", "default");
+      fixture.detectChanges();
+      expect(component.titleComputed()).toBeUndefined();
+      expect(component.iconComputed()).toBe("bwi-star");
+    });
   });
 });
diff --git a/libs/components/src/callout/callout.component.ts b/libs/components/src/callout/callout.component.ts
index 99a6c2aa123..bda5d4585d7 100644
--- a/libs/components/src/callout/callout.component.ts
+++ b/libs/components/src/callout/callout.component.ts
@@ -5,13 +5,14 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { SharedModule } from "../shared";
 import { TypographyModule } from "../typography";
 
-export type CalloutTypes = "success" | "info" | "warning" | "danger";
+export type CalloutTypes = "success" | "info" | "warning" | "danger" | "default";
 
 const defaultIcon: Record<CalloutTypes, string> = {
   success: "bwi-check-circle",
   info: "bwi-info-circle",
   warning: "bwi-exclamation-triangle",
   danger: "bwi-error",
+  default: "bwi-star",
 };
 
 const defaultI18n: Partial<Record<CalloutTypes, string>> = {
@@ -27,6 +28,8 @@ let nextId = 0;
  * sparingly, as they command a large amount of visual attention. Avoid using more than 1 callout in
  * the same location.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-callout",
   templateUrl: "callout.component.html",
@@ -35,11 +38,17 @@ let nextId = 0;
 export class CalloutComponent {
   readonly type = input<CalloutTypes>("info");
   readonly icon = input<string>();
-  readonly title = input<string>();
+  readonly title = input<string | null>();
   readonly useAlertRole = input(false);
-  readonly iconComputed = computed(() => this.icon() ?? defaultIcon[this.type()]);
+  readonly iconComputed = computed(() =>
+    this.icon() === undefined ? defaultIcon[this.type()] : this.icon(),
+  );
   readonly titleComputed = computed(() => {
     const title = this.title();
+    if (title === null) {
+      return undefined;
+    }
+
     const type = this.type();
     if (title == null && defaultI18n[type] != null) {
       return this.i18nService.t(defaultI18n[type]);
@@ -55,13 +64,15 @@ export class CalloutComponent {
   protected readonly calloutClass = computed(() => {
     switch (this.type()) {
       case "danger":
-        return "tw-bg-danger-100";
+        return "tw-bg-danger-100 tw-border-danger-700 tw-text-danger-700";
       case "info":
-        return "tw-bg-info-100";
+        return "tw-bg-info-100 tw-bg-info-100 tw-border-info-700 tw-text-info-700";
       case "success":
-        return "tw-bg-success-100";
+        return "tw-bg-success-100 tw-bg-success-100 tw-border-success-700 tw-text-success-700";
       case "warning":
-        return "tw-bg-warning-100";
+        return "tw-bg-warning-100 tw-bg-warning-100 tw-border-warning-700 tw-text-warning-700";
+      case "default":
+        return "tw-bg-background-alt tw-border-secondary-700 tw-text-secondary-700";
     }
   });
 }
diff --git a/libs/components/src/callout/callout.mdx b/libs/components/src/callout/callout.mdx
index a1254b3f691..297a2ffd0a3 100644
--- a/libs/components/src/callout/callout.mdx
+++ b/libs/components/src/callout/callout.mdx
@@ -41,6 +41,12 @@ automatically be checked.
 
 <Canvas of={stories.Info} />
 
+### Default
+
+Use for similar cases as the info callout but when content does not need to be as prominent.
+
+<Canvas of={stories.Default} />
+
 ### Warning
 
 Use a warning callout if the user is about to perform an action that may have unintended or
@@ -67,4 +73,8 @@ Use the `role=”alert”` only if the callout is appearing on a page after the
 the content is static, do not use the alert role. This will cause a screen reader to announce the
 callout content on page load.
 
-Ensure the title's color contrast remains WCAG compliant with the callout's background.
+Ensure color contrast remains WCAG compliant with the callout's background. This is especially
+important when adding `bit-link` or `bit-button` to the content area since the callout background is
+colored. Currently only the `info` and `default` callouts are WCAG compliant for the `primary`
+styling of these elements. The `secondary` `bit-link` styling may be used with the remaining
+variants.
diff --git a/libs/components/src/callout/callout.stories.ts b/libs/components/src/callout/callout.stories.ts
index 4ac4191ce7e..c2185203034 100644
--- a/libs/components/src/callout/callout.stories.ts
+++ b/libs/components/src/callout/callout.stories.ts
@@ -1,6 +1,7 @@
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LinkModule, IconModule } from "@bitwarden/components";
 
 import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
 import { I18nMockService } from "../utils/i18n-mock.service";
@@ -12,6 +13,7 @@ export default {
   component: CalloutComponent,
   decorators: [
     moduleMetadata({
+      imports: [LinkModule, IconModule],
       providers: [
         {
           provide: I18nService,
@@ -69,6 +71,14 @@ export const Danger: Story = {
   },
 };
 
+export const Default: Story = {
+  ...Info,
+  args: {
+    ...Info.args,
+    type: "default",
+  },
+};
+
 export const CustomIcon: Story = {
   ...Info,
   args: {
@@ -80,6 +90,35 @@ export const CustomIcon: Story = {
 export const NoTitle: Story = {
   ...Info,
   args: {
-    icon: "bwi-star",
+    icon: "",
+  },
+};
+
+export const NoTitleWithIcon: Story = {
+  render: (args) => ({
+    props: args,
+    template: `
+      <bit-callout ${formatArgsForCodeSnippet<CalloutComponent>(args)}>The content of the callout</bit-callout>
+    `,
+  }),
+  args: {
+    type: "default",
+    icon: "bwi-globe",
+  },
+};
+
+export const WithTextButton: Story = {
+  render: (args) => ({
+    props: args,
+    template: `
+      <bit-callout ${formatArgsForCodeSnippet<CalloutComponent>(args)}>
+      <p class="tw-mb-2">The content of the callout</p>
+        <a bitLink> Visit the help center<i aria-hidden="true" class="bwi bwi-fw bwi-sm bwi-angle-right"></i> </a>
+      </bit-callout>
+    `,
+  }),
+  args: {
+    type: "default",
+    icon: "",
   },
 };
diff --git a/libs/components/src/card/base-card/base-card.component.ts b/libs/components/src/card/base-card/base-card.component.ts
new file mode 100644
index 00000000000..8c4dd80f2d1
--- /dev/null
+++ b/libs/components/src/card/base-card/base-card.component.ts
@@ -0,0 +1,16 @@
+import { Component } from "@angular/core";
+
+import { BaseCardDirective } from "./base-card.directive";
+
+/**
+ * The base card component is a container that applies our standard card border and box-shadow.
+ * In most cases using our `<bit-card>` component should suffice.
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-base-card",
+  template: `<ng-content></ng-content>`,
+  hostDirectives: [BaseCardDirective],
+})
+export class BaseCardComponent {}
diff --git a/libs/components/src/card/base-card/base-card.directive.ts b/libs/components/src/card/base-card/base-card.directive.ts
new file mode 100644
index 00000000000..7c6ec2b3b2f
--- /dev/null
+++ b/libs/components/src/card/base-card/base-card.directive.ts
@@ -0,0 +1,9 @@
+import { Directive } from "@angular/core";
+
+@Directive({
+  host: {
+    class:
+      "tw-box-border tw-block tw-bg-background tw-text-main tw-border tw-border-solid tw-border-secondary-100 tw-shadow tw-rounded-xl",
+  },
+})
+export class BaseCardDirective {}
diff --git a/libs/components/src/card/base-card/base-card.mdx b/libs/components/src/card/base-card/base-card.mdx
new file mode 100644
index 00000000000..df326462906
--- /dev/null
+++ b/libs/components/src/card/base-card/base-card.mdx
@@ -0,0 +1,23 @@
+import { Meta, Primary, Controls, Canvas, Title, Description } from "@storybook/addon-docs";
+
+import * as stories from "./base-card.stories";
+
+<Meta of={stories} />
+
+```ts
+import { BaseCardComponent } from "@bitwarden/components";
+```
+
+<Title />
+<Description />
+
+<Canvas of={stories.Default} />
+
+## BaseCardDirective
+
+There is also a `BaseCardDirective` available for use as a hostDirective if need be. But, most
+likely using `<bit-base-card>` in your template will do.
+
+```ts
+import { BaseCardDirective } from "@bitwarden/components";
+```
diff --git a/libs/components/src/card/base-card/base-card.stories.ts b/libs/components/src/card/base-card/base-card.stories.ts
new file mode 100644
index 00000000000..bae07dd1468
--- /dev/null
+++ b/libs/components/src/card/base-card/base-card.stories.ts
@@ -0,0 +1,41 @@
+import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+
+import { AnchorLinkDirective } from "../../link";
+import { TypographyModule } from "../../typography";
+
+import { BaseCardComponent } from "./base-card.component";
+
+export default {
+  title: "Component Library/Cards/BaseCard",
+  component: BaseCardComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [AnchorLinkDirective, TypographyModule],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-28355&t=b5tDKylm5sWm2yKo-4",
+    },
+  },
+} as Meta;
+
+type Story = StoryObj<BaseCardComponent>;
+
+/** Cards are presentational containers. */
+export const Default: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+        <bit-base-card>
+            <p bitTypography="body1" class="!tw-mb-0">
+              The <code>&lt;bit-base-card&gt;</code> component is a container that applies our standard border and box-shadow. In most cases, <code>&lt;bit-card&gt;</code> should be used for consistency
+            </p>
+            <p bitTypography="body1" class="!tw-mb-0">
+              <code>&lt;bit-base-card&gt;</code> is used in the <a bitLink href="/?path=/story/web-reports-card--enabled">ReportCardComponent</a> and <strong>IntegrationsCardComponent</strong> since they have custom padding requirements
+            </p>
+        </bit-base-card>
+    `,
+  }),
+};
diff --git a/libs/components/src/card/base-card/index.ts b/libs/components/src/card/base-card/index.ts
new file mode 100644
index 00000000000..186f2e68f24
--- /dev/null
+++ b/libs/components/src/card/base-card/index.ts
@@ -0,0 +1,2 @@
+export * from "./base-card.component";
+export * from "./base-card.directive";
diff --git a/libs/components/src/card/card-content.component.ts b/libs/components/src/card/card-content.component.ts
new file mode 100644
index 00000000000..650a2665475
--- /dev/null
+++ b/libs/components/src/card/card-content.component.ts
@@ -0,0 +1,9 @@
+import { Component } from "@angular/core";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-card-content",
+  template: `<div class="tw-p-4 [@media(min-width:650px)]:tw-p-6"><ng-content></ng-content></div>`,
+})
+export class CardContentComponent {}
diff --git a/libs/components/src/card/card.component.ts b/libs/components/src/card/card.component.ts
index d7e36d1ea9e..9cca973f003 100644
--- a/libs/components/src/card/card.component.ts
+++ b/libs/components/src/card/card.component.ts
@@ -1,12 +1,14 @@
 import { ChangeDetectionStrategy, Component } from "@angular/core";
 
+import { BaseCardDirective } from "./base-card/base-card.directive";
+
 @Component({
   selector: "bit-card",
   template: `<ng-content></ng-content>`,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
-    class:
-      "tw-box-border tw-block tw-bg-background tw-text-main tw-border-solid tw-border-b tw-border-0 tw-border-b-secondary-300 [&:not(bit-layout_*)]:tw-rounded-lg [&:not(bit-layout_*)]:tw-border-b-shadow tw-py-4 bit-compact:tw-py-3 tw-px-3 bit-compact:tw-px-2",
+    class: "tw-p-4 [@media(min-width:650px)]:tw-p-6",
   },
+  hostDirectives: [BaseCardDirective],
 })
 export class CardComponent {}
diff --git a/libs/components/src/card/card.stories.ts b/libs/components/src/card/card.stories.ts
index 411cc8e83cc..77faceb8eb7 100644
--- a/libs/components/src/card/card.stories.ts
+++ b/libs/components/src/card/card.stories.ts
@@ -11,7 +11,7 @@ import { I18nMockService } from "../utils/i18n-mock.service";
 import { CardComponent } from "./card.component";
 
 export default {
-  title: "Component Library/Card",
+  title: "Component Library/Cards/Card",
   component: CardComponent,
   decorators: [
     moduleMetadata({
@@ -84,16 +84,3 @@ export const WithinSections: Story = {
       `,
   }),
 };
-
-export const WithoutBorderRadius: Story = {
-  render: (args) => ({
-    props: args,
-    template: /*html*/ `
-    <bit-layout>
-      <bit-card>
-        <p bitTypography="body1" class="!tw-mb-0">Cards used in <code class="tw-text-danger-700">bit-layout</code> will not have a border radius</p>
-      </bit-card>
-    </bit-layout>
-    `,
-  }),
-};
diff --git a/libs/components/src/card/index.ts b/libs/components/src/card/index.ts
index 8151bac4c8b..1027f9b1fe2 100644
--- a/libs/components/src/card/index.ts
+++ b/libs/components/src/card/index.ts
@@ -1 +1,3 @@
+export * from "./base-card";
 export * from "./card.component";
+export * from "./card-content.component";
diff --git a/libs/components/src/checkbox/checkbox.component.ts b/libs/components/src/checkbox/checkbox.component.ts
index d8df53943f3..2501b85f617 100644
--- a/libs/components/src/checkbox/checkbox.component.ts
+++ b/libs/components/src/checkbox/checkbox.component.ts
@@ -3,6 +3,8 @@ import { NgControl, Validators } from "@angular/forms";
 
 import { BitFormControlAbstraction } from "../form-control";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "input[type=checkbox][bitCheckbox]",
   template: "",
@@ -20,6 +22,7 @@ export class CheckboxComponent implements BitFormControlAbstraction {
     "tw-relative",
     "tw-transition",
     "tw-cursor-pointer",
+    "disabled:tw-cursor-default",
     "tw-inline-block",
     "tw-align-sub",
     "tw-flex-none", // Flexbox fix for bit-form-control
@@ -60,7 +63,7 @@ export class CheckboxComponent implements BitFormControlAbstraction {
     "[&:not(bit-form-control_*)]:focus-visible:before:tw-ring-offset-2",
     "[&:not(bit-form-control_*)]:focus-visible:before:tw-ring-primary-600",
 
-    "disabled:before:tw-cursor-auto",
+    "disabled:before:tw-cursor-default",
     "disabled:before:tw-border",
     "disabled:before:hover:tw-border",
     "disabled:before:tw-bg-secondary-100",
diff --git a/libs/components/src/checkbox/checkbox.stories.ts b/libs/components/src/checkbox/checkbox.stories.ts
index ee3e4ab402d..6355581b251 100644
--- a/libs/components/src/checkbox/checkbox.stories.ts
+++ b/libs/components/src/checkbox/checkbox.stories.ts
@@ -28,6 +28,8 @@ const template = /*html*/ `
   </form>
 `;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-example",
   template,
@@ -38,10 +40,14 @@ class ExampleComponent {
     checkbox: [false, Validators.requiredTrue],
   });
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() set checked(value: boolean) {
     this.formObj.patchValue({ checkbox: value });
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() set disabled(disable: boolean) {
     if (disable) {
       this.formObj.disable();
diff --git a/libs/components/src/chip-select/chip-select.component.html b/libs/components/src/chip-select/chip-select.component.html
index d43e09e8338..ee252b35fe9 100644
--- a/libs/components/src/chip-select/chip-select.component.html
+++ b/libs/components/src/chip-select/chip-select.component.html
@@ -3,11 +3,11 @@
   class="tw-inline-flex tw-items-center tw-rounded-full tw-w-full tw-border-solid tw-border tw-gap-1.5 tw-group/chip-select"
   [ngClass]="{
     'tw-bg-text-muted hover:tw-bg-secondary-700 tw-text-contrast hover:!tw-border-secondary-700':
-      selectedOption && !disabled,
+      selectedOption && !disabled(),
     'tw-bg-transparent hover:tw-border-secondary-700 !tw-text-muted hover:tw-bg-secondary-100':
-      !selectedOption && !disabled,
-    'tw-bg-secondary-300 tw-text-muted tw-border-transparent': disabled,
-    'tw-border-text-muted': !disabled,
+      !selectedOption && !disabled(),
+    'tw-bg-secondary-300 tw-text-muted tw-border-transparent': disabled(),
+    'tw-border-text-muted': !disabled(),
     'tw-ring-2 tw-ring-primary-600 tw-ring-offset-1': focusVisibleWithin(),
   }"
 >
@@ -17,11 +17,11 @@
     class="tw-inline-flex tw-gap-1.5 tw-items-center tw-justify-between tw-bg-transparent hover:tw-bg-transparent tw-border-none tw-outline-none tw-w-full tw-py-1 tw-ps-3 last:tw-pe-3 [&:not(:last-child)]:tw-pe-0 tw-truncate tw-text-[color:inherit] tw-text-[length:inherit]"
     data-fvw-target
     [ngClass]="{
-      'tw-cursor-not-allowed': disabled,
-      'group-hover/chip-select:tw-text-secondary-700': !selectedOption && !disabled,
+      'tw-cursor-not-allowed': disabled(),
+      'group-hover/chip-select:tw-text-secondary-700': !selectedOption && !disabled(),
     }"
     [bitMenuTriggerFor]="menu"
-    [disabled]="disabled"
+    [disabled]="disabled()"
     [title]="label"
     #menuTrigger="menuTrigger"
     (click)="setMenuWidth()"
@@ -45,10 +45,10 @@
     <button
       type="button"
       [attr.aria-label]="'removeItem' | i18n: label"
-      [disabled]="disabled"
+      [disabled]="disabled()"
       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,
+        'tw-cursor-not-allowed': disabled(),
       }"
       (click)="clear()"
     >
diff --git a/libs/components/src/chip-select/chip-select.component.spec.ts b/libs/components/src/chip-select/chip-select.component.spec.ts
new file mode 100644
index 00000000000..3c2f71ef8d7
--- /dev/null
+++ b/libs/components/src/chip-select/chip-select.component.spec.ts
@@ -0,0 +1,486 @@
+import { ChangeDetectionStrategy, Component, signal } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { FormControl } from "@angular/forms";
+import { By } from "@angular/platform-browser";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { MenuTriggerForDirective } from "../menu";
+
+import { ChipSelectComponent, ChipSelectOption } from "./chip-select.component";
+
+const mockI18nService = {
+  t: (key: string, ...args: string[]) => {
+    if (key === "removeItem") {
+      return `Remove ${args[0]}`;
+    }
+    if (key === "backTo") {
+      return `Back to ${args[0]}`;
+    }
+    if (key === "viewItemsIn") {
+      return `View items in ${args[0]}`;
+    }
+    return key;
+  },
+};
+
+describe("ChipSelectComponent", () => {
+  let component: ChipSelectComponent<string>;
+  let fixture: ComponentFixture<TestAppComponent>;
+
+  const testOptions: ChipSelectOption<string>[] = [
+    { label: "Option 1", value: "opt1", icon: "bwi-folder" },
+    { label: "Option 2", value: "opt2" },
+    {
+      label: "Parent Option",
+      value: "parent",
+      children: [
+        { label: "Child 1", value: "child1" },
+        { label: "Child 2", value: "child2" },
+      ],
+    },
+  ];
+
+  const getMenuTriggerDirective = () => {
+    const buttonDebugElement = fixture.debugElement.query(By.directive(MenuTriggerForDirective));
+    return buttonDebugElement?.injector.get(MenuTriggerForDirective);
+  };
+
+  const getBitMenuPanel = () => document.querySelector(".bit-menu-panel");
+
+  const getChipButton = () =>
+    fixture.debugElement.query(By.css("[data-fvw-target]"))?.nativeElement as HTMLButtonElement;
+
+  const getClearButton = () =>
+    fixture.debugElement.query(By.css('button[aria-label^="Remove"]'))
+      ?.nativeElement as HTMLButtonElement;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TestAppComponent, NoopAnimationsModule],
+      providers: [{ provide: I18nService, useValue: mockI18nService }],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TestAppComponent);
+    fixture.detectChanges();
+
+    component = fixture.debugElement.query(By.directive(ChipSelectComponent)).componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  describe("User-Facing Behavior", () => {
+    it("should display placeholder text when no option is selected", () => {
+      expect(getChipButton().textContent).toContain("Select an option");
+    });
+
+    it("should display placeholder icon when no option is selected", () => {
+      const icon = fixture.debugElement.query(By.css('i[aria-hidden="true"]'));
+      expect(icon).toBeTruthy();
+    });
+
+    it("should disable chip button when disabled", () => {
+      const testApp = fixture.componentInstance;
+      testApp.disabled.set(true);
+      fixture.detectChanges();
+
+      expect(getChipButton().disabled).toBe(true);
+    });
+
+    it("should accept fullWidth input", () => {
+      const testApp = fixture.componentInstance;
+      testApp.fullWidth.set(true);
+      fixture.detectChanges();
+
+      expect(component.fullWidth()).toBe(true);
+    });
+
+    it("should update available options when they change", () => {
+      const newOptions: ChipSelectOption<string>[] = [
+        { label: "New Option 1", value: "new1" },
+        { label: "New Option 2", value: "new2" },
+      ];
+
+      const testApp = fixture.componentInstance;
+      testApp.options.set(newOptions);
+      fixture.detectChanges();
+
+      getChipButton().click();
+      fixture.detectChanges();
+
+      const menuItems = Array.from(document.querySelectorAll<HTMLButtonElement>("[bitMenuItem]"));
+      expect(menuItems.some((el) => el.textContent?.includes("New Option 1"))).toBe(true);
+      expect(menuItems.some((el) => el.textContent?.includes("New Option 2"))).toBe(true);
+    });
+  });
+
+  describe("Form Integration Behavior", () => {
+    it("should display selected option when form control value is set", () => {
+      component.writeValue("opt1");
+      fixture.detectChanges();
+
+      const button = getChipButton();
+      expect(button.textContent?.trim()).toContain("Option 1");
+    });
+
+    it("should find and display nested option when form control value is set", () => {
+      component.writeValue("child1");
+      fixture.detectChanges();
+
+      const button = getChipButton();
+      expect(button.textContent?.trim()).toContain("Child 1");
+    });
+
+    it("should clear selection when form control value is set to null", () => {
+      component.writeValue("opt1");
+      fixture.detectChanges();
+      expect(getChipButton().textContent).toContain("Option 1");
+
+      component.writeValue(null as any);
+      fixture.detectChanges();
+      expect(getChipButton().textContent).toContain("Select an option");
+    });
+
+    it("should disable chip when form control is disabled", () => {
+      expect(getChipButton().disabled).toBe(false);
+
+      component.setDisabledState(true);
+      fixture.detectChanges();
+
+      expect(getChipButton().disabled).toBe(true);
+    });
+
+    it("should respect both template and programmatic disabled states", () => {
+      const testApp = fixture.componentInstance;
+      testApp.disabled.set(true);
+      fixture.detectChanges();
+      expect(getChipButton().disabled).toBe(true);
+
+      testApp.disabled.set(false);
+      component.setDisabledState(true);
+      fixture.detectChanges();
+      expect(getChipButton().disabled).toBe(true);
+
+      component.setDisabledState(false);
+      fixture.detectChanges();
+      expect(getChipButton().disabled).toBe(false);
+    });
+
+    it("should integrate with Angular reactive forms", () => {
+      const formControl = new FormControl<string>("opt1");
+      component.registerOnChange((value) => formControl.setValue(value));
+      component.writeValue(formControl.value);
+      fixture.detectChanges();
+
+      expect(component["selectedOption"]?.value).toBe("opt1");
+    });
+
+    it("should update form value when option is selected", () => {
+      const onChangeSpy = jest.fn();
+      component.registerOnChange(onChangeSpy);
+
+      component.writeValue("opt2");
+      component["onChange"]({ label: "Option 2", value: "opt2" });
+
+      expect(onChangeSpy).toHaveBeenCalledWith("opt2");
+    });
+  });
+
+  describe("Menu Behavior", () => {
+    it("should open menu when chip button is clicked", () => {
+      const chipButton = getChipButton();
+      chipButton.click();
+      fixture.detectChanges();
+
+      expect(getBitMenuPanel()).toBeTruthy();
+    });
+
+    it("should close menu when backdrop is clicked", () => {
+      getChipButton().click();
+      fixture.detectChanges();
+      expect(getBitMenuPanel()).toBeTruthy();
+
+      const backdrop = document.querySelector(".cdk-overlay-backdrop") as HTMLElement;
+      backdrop.click();
+      fixture.detectChanges();
+
+      expect(getBitMenuPanel()).toBeFalsy();
+    });
+
+    it("should not open menu when disabled", () => {
+      const testApp = fixture.componentInstance;
+      testApp.disabled.set(true);
+      fixture.detectChanges();
+
+      getChipButton().click();
+      fixture.detectChanges();
+
+      expect(getBitMenuPanel()).toBeFalsy();
+    });
+
+    it("should focus first menu item when menu opens", async () => {
+      const trigger = getMenuTriggerDirective();
+      trigger.toggleMenu();
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      const menu = component.menu();
+      expect(menu?.keyManager?.activeItemIndex).toBe(0);
+    });
+
+    it("should not focus menu items during initialization (before menu opens)", () => {
+      const menu = component.menu();
+      expect(menu?.keyManager?.activeItemIndex).toBe(-1);
+    });
+
+    it("should calculate and set menu width on open", () => {
+      getChipButton().click();
+      fixture.detectChanges();
+
+      expect(component["menuWidth"]).toBeGreaterThanOrEqual(0);
+    });
+
+    it("should reset menu width when menu closes", () => {
+      getChipButton().click();
+      fixture.detectChanges();
+
+      component["menuWidth"] = 200;
+
+      getMenuTriggerDirective().toggleMenu();
+      fixture.detectChanges();
+
+      expect(component["menuWidth"]).toBeNull();
+    });
+  });
+
+  describe("Option Selection", () => {
+    it("should select option and notify form control", () => {
+      const onChangeSpy = jest.fn();
+      component.registerOnChange(onChangeSpy);
+
+      const option = testOptions[0];
+      component["selectOption"](option, new MouseEvent("click"));
+
+      expect(component["selectedOption"]).toEqual(option);
+      expect(onChangeSpy).toHaveBeenCalledWith("opt1");
+    });
+
+    it("should display selected option label in chip button", () => {
+      component.writeValue("opt1");
+      fixture.detectChanges();
+
+      const button = getChipButton();
+      expect(button.textContent?.trim()).toContain("Option 1");
+    });
+
+    it("should show clear button when option is selected", () => {
+      expect(getClearButton()).toBeFalsy();
+
+      component.writeValue("opt1");
+      fixture.detectChanges();
+
+      expect(getClearButton()).toBeTruthy();
+    });
+
+    it("should clear selection when clear button is clicked", () => {
+      const onChangeSpy = jest.fn();
+      component.registerOnChange(onChangeSpy);
+
+      component.writeValue("opt1");
+      fixture.detectChanges();
+
+      const clearButton = getClearButton();
+      clearButton.click();
+      fixture.detectChanges();
+
+      expect(component["selectedOption"]).toBeNull();
+      expect(onChangeSpy).toHaveBeenCalledWith(null);
+    });
+
+    it("should display placeholder when no option is selected", () => {
+      expect(component["selectedOption"]).toBeFalsy();
+      expect(getChipButton().textContent).toContain("Select an option");
+    });
+
+    it("should display option icon when selected", () => {
+      component.writeValue("opt1");
+      fixture.detectChanges();
+
+      const icon = fixture.debugElement.query(By.css('i[aria-hidden="true"]'));
+      expect(icon).toBeTruthy();
+    });
+  });
+
+  describe("Nested Options Navigation", () => {
+    it("should navigate to child options when parent is clicked", () => {
+      getChipButton().click();
+      fixture.detectChanges();
+
+      const parentMenuItem = Array.from(
+        document.querySelectorAll<HTMLButtonElement>("[bitMenuItem]"),
+      ).find((el) => el.textContent?.includes("Parent Option"));
+
+      expect(parentMenuItem).toBeTruthy();
+
+      parentMenuItem?.click();
+      fixture.detectChanges();
+
+      expect(component["renderedOptions"]?.value).toBe("parent");
+    });
+
+    it("should show back navigation when in submenu", async () => {
+      component.writeValue("child1");
+      component["setOrResetRenderedOptions"]();
+      fixture.detectChanges();
+
+      getChipButton().click();
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      const backButton = Array.from(
+        document.querySelectorAll<HTMLButtonElement>("[bitMenuItem]"),
+      ).find((el) => el.textContent?.includes("Back to"));
+
+      expect(backButton).toBeTruthy();
+    });
+
+    it("should navigate back to parent menu", async () => {
+      component.writeValue("child1");
+      component["setOrResetRenderedOptions"]();
+      fixture.detectChanges();
+
+      getChipButton().click();
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      const backButton = Array.from(
+        document.querySelectorAll<HTMLButtonElement>("[bitMenuItem]"),
+      ).find((el) => el.textContent?.includes("Back to"));
+
+      expect(backButton).toBeTruthy();
+
+      backButton?.dispatchEvent(new MouseEvent("click"));
+      fixture.detectChanges();
+
+      expect(component["renderedOptions"]?.value).toBeNull();
+    });
+
+    it("should update rendered options when selected option has children", () => {
+      component.writeValue("parent");
+      component["setOrResetRenderedOptions"]();
+
+      expect(component["renderedOptions"]?.value).toBe("parent");
+    });
+
+    it("should show parent menu if selected option has no children", () => {
+      component.writeValue("child1");
+      component["setOrResetRenderedOptions"]();
+
+      expect(component["renderedOptions"]?.value).toBe("parent");
+    });
+  });
+
+  describe("Disabled State Behavior", () => {
+    it("should disable clear button when disabled", () => {
+      component.writeValue("opt1");
+      fixture.detectChanges();
+
+      const testApp = fixture.componentInstance;
+      testApp.disabled.set(true);
+      fixture.detectChanges();
+
+      const clearButton = getClearButton();
+      expect(clearButton.disabled).toBe(true);
+    });
+  });
+
+  describe("Focus Management", () => {
+    it("should track focus-visible-within state", () => {
+      const chipButton = getChipButton();
+
+      chipButton.dispatchEvent(new FocusEvent("focusin", { bubbles: true }));
+      fixture.detectChanges();
+
+      expect(component["focusVisibleWithin"]()).toBe(false);
+    });
+
+    it("should clear focus-visible-within on focusout", () => {
+      component["focusVisibleWithin"].set(true);
+
+      const chipButton = getChipButton();
+      chipButton.dispatchEvent(new FocusEvent("focusout", { bubbles: true }));
+      fixture.detectChanges();
+
+      expect(component["focusVisibleWithin"]()).toBe(false);
+    });
+  });
+
+  describe("Edge Cases", () => {
+    it("should handle empty options array", () => {
+      const testApp = fixture.componentInstance;
+      testApp.options.set([]);
+      fixture.detectChanges();
+
+      expect(component.options()).toEqual([]);
+      expect(component["rootTree"]?.children).toEqual([]);
+    });
+
+    it("should handle options without icons", () => {
+      const testApp = fixture.componentInstance;
+      testApp.options.set([{ label: "No Icon Option", value: "no-icon" }]);
+      fixture.detectChanges();
+
+      expect(component.options()).toEqual([{ label: "No Icon Option", value: "no-icon" }]);
+    });
+
+    it("should handle disabled options in menu", () => {
+      const testApp = fixture.componentInstance;
+      testApp.options.set([
+        { label: "Enabled Option", value: "enabled" },
+        { label: "Disabled Option", value: "disabled", disabled: true },
+      ]);
+      fixture.detectChanges();
+
+      getChipButton().click();
+      fixture.detectChanges();
+
+      const disabledMenuItem = Array.from(
+        document.querySelectorAll<HTMLButtonElement>("[bitMenuItem]"),
+      ).find((el) => el.textContent?.includes("Disabled Option"));
+
+      expect(disabledMenuItem?.disabled).toBe(true);
+    });
+  });
+});
+
+@Component({
+  selector: "test-app",
+  template: `
+    <bit-chip-select
+      placeholderText="Select an option"
+      placeholderIcon="bwi-filter"
+      [options]="options()"
+      [disabled]="disabled()"
+      [fullWidth]="fullWidth()"
+    />
+  `,
+  imports: [ChipSelectComponent],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class TestAppComponent {
+  readonly options = signal<ChipSelectOption<string>[]>([
+    { label: "Option 1", value: "opt1", icon: "bwi-folder" },
+    { label: "Option 2", value: "opt2" },
+    {
+      label: "Parent Option",
+      value: "parent",
+      children: [
+        { label: "Child 1", value: "child1" },
+        { label: "Child 2", value: "child2" },
+      ],
+    },
+  ]);
+  readonly disabled = signal(false);
+  readonly fullWidth = signal(false);
+}
diff --git a/libs/components/src/chip-select/chip-select.component.ts b/libs/components/src/chip-select/chip-select.component.ts
index 14f740f3bbe..bf6c6fb2aad 100644
--- a/libs/components/src/chip-select/chip-select.component.ts
+++ b/libs/components/src/chip-select/chip-select.component.ts
@@ -1,27 +1,26 @@
 import {
-  AfterViewInit,
   Component,
-  DestroyRef,
   ElementRef,
   HostBinding,
   HostListener,
-  Input,
-  QueryList,
-  ViewChildren,
   booleanAttribute,
-  inject,
+  computed,
+  effect,
   signal,
   input,
   viewChild,
+  viewChildren,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  inject,
 } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
 
 import { compareValues } from "@bitwarden/common/platform/misc/compare-values";
 
 import { ButtonModule } from "../button";
 import { IconButtonModule } from "../icon-button";
-import { MenuComponent, MenuItemDirective, MenuModule } from "../menu";
+import { MenuComponent, MenuItemComponent, MenuModule, MenuTriggerForDirective } from "../menu";
 import { Option } from "../select/option";
 import { SharedModule } from "../shared";
 import { TypographyModule } from "../typography";
@@ -46,11 +45,15 @@ export type ChipSelectOption<T> = Option<T> & {
       multi: true,
     },
   ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, AfterViewInit {
+export class ChipSelectComponent<T = unknown> implements ControlValueAccessor {
+  private readonly cdr = inject(ChangeDetectorRef);
+
   readonly menu = viewChild(MenuComponent);
-  @ViewChildren(MenuItemDirective) menuItems?: QueryList<MenuItemDirective>;
+  readonly menuItems = viewChildren(MenuItemComponent);
   readonly chipSelectButton = viewChild<ElementRef<HTMLButtonElement>>("chipSelectButton");
+  readonly menuTrigger = viewChild(MenuTriggerForDirective);
 
   /** Text to show when there is no selected option */
   readonly placeholderText = input.required<string>();
@@ -58,24 +61,20 @@ export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, A
   /** Icon to show when there is no selected option or the selected option does not have an icon */
   readonly placeholderIcon = input<string>();
 
-  private _options: ChipSelectOption<T>[] = [];
-
-  // TODO: Skipped for signal migration because:
-  //  Accessor inputs cannot be migrated as they are too complex.
   /** The select options to render */
-  @Input({ required: true })
-  get options(): ChipSelectOption<T>[] {
-    return this._options;
-  }
-  set options(value: ChipSelectOption<T>[]) {
-    this._options = value;
-    this.initializeRootTree(value);
-  }
+  readonly options = input.required<ChipSelectOption<T>[]>();
 
-  /** Disables the entire chip */
-  // TODO: Skipped for signal migration because:
-  //  Your application code writes to the input. This prevents migration.
-  @Input({ transform: booleanAttribute }) disabled = false;
+  /** Disables the entire chip (template input) */
+  protected readonly disabledInput = input<boolean, unknown>(false, {
+    alias: "disabled",
+    transform: booleanAttribute,
+  });
+
+  /** Disables the entire chip (programmatic control from CVA) */
+  private readonly disabledState = signal(false);
+
+  /** Combined disabled state from both input and programmatic control */
+  readonly disabled = computed(() => this.disabledInput() || this.disabledState());
 
   /** Chip will stretch to full width of its container */
   readonly fullWidth = input<boolean, unknown>(undefined, { transform: booleanAttribute });
@@ -83,7 +82,7 @@ export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, A
   /**
    * We have `:focus-within` and `:focus-visible` but no `:focus-visible-within`
    */
-  protected focusVisibleWithin = signal(false);
+  protected readonly focusVisibleWithin = signal(false);
   @HostListener("focusin", ["$event.target"])
   onFocusIn(target: HTMLElement) {
     this.focusVisibleWithin.set(target.matches("[data-fvw-target]:focus-visible"));
@@ -98,11 +97,30 @@ export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, A
     return ["tw-inline-block", this.fullWidth() ? "tw-w-full" : "tw-max-w-52"];
   }
 
-  private destroyRef = inject(DestroyRef);
-
   /** Tree constructed from `this.options` */
   private rootTree?: ChipSelectOption<T> | null;
 
+  constructor() {
+    // Initialize the root tree whenever options change
+    effect(() => {
+      this.initializeRootTree(this.options());
+    });
+
+    // Focus the first menu item when menuItems change (e.g., navigating submenus)
+    effect(() => {
+      // Trigger effect when menuItems changes
+      const items = this.menuItems();
+      const currentMenu = this.menu();
+      const trigger = this.menuTrigger();
+      // Note: `isOpen` is intentionally accessed outside signal tracking (via `trigger?.isOpen`)
+      // to avoid re-focusing when the menu state changes. We only want to focus during
+      // submenu navigation, not on initial open/close.
+      if (items.length > 0 && trigger?.isOpen) {
+        currentMenu?.keyManager?.setFirstItemActive();
+      }
+    });
+  }
+
   /** Options that are currently displayed in the menu */
   protected renderedOptions?: ChipSelectOption<T> | null;
 
@@ -217,16 +235,6 @@ export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, A
     this.renderedOptions = this.rootTree;
   }
 
-  ngAfterViewInit() {
-    /**
-     * menuItems will change when the user navigates into or out of a submenu. when that happens, we want to
-     * direct their focus to the first item in the new menu
-     */
-    this.menuItems?.changes.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {
-      this.menu()?.keyManager?.setFirstItemActive();
-    });
-  }
-
   /**
    * Calculate the width of the menu based on whichever is larger, the chip select width or the width of
    * the initially rendered options
@@ -249,6 +257,9 @@ export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, A
   writeValue(obj: T): void {
     this.selectedOption = this.findOption(this.rootTree, obj);
     this.setOrResetRenderedOptions();
+    // OnPush components require manual change detection when writeValue() is called
+    // externally by Angular forms, as the framework doesn't automatically trigger CD
+    this.cdr.markForCheck();
   }
 
   /** Implemented as part of NG_VALUE_ACCESSOR */
@@ -263,7 +274,7 @@ export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, A
 
   /** Implemented as part of NG_VALUE_ACCESSOR */
   setDisabledState(isDisabled: boolean): void {
-    this.disabled = isDisabled;
+    this.disabledState.set(isDisabled);
   }
 
   /** Implemented as part of NG_VALUE_ACCESSOR */
diff --git a/libs/components/src/color-password/color-password.component.ts b/libs/components/src/color-password/color-password.component.ts
index 3a35eaab333..bd7f3beb403 100644
--- a/libs/components/src/color-password/color-password.component.ts
+++ b/libs/components/src/color-password/color-password.component.ts
@@ -9,6 +9,8 @@ type CharacterType = "letter" | "emoji" | "special" | "number";
  * the logic for displaying letters as `text-main`, numbers as `primary`, and special symbols as
  * `danger`.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-color-password",
   template: `@for (character of passwordCharArray(); track $index; let i = $index) {
@@ -21,11 +23,11 @@ type CharacterType = "letter" | "emoji" | "special" | "number";
   }`,
 })
 export class ColorPasswordComponent {
-  password = input<string>("");
-  showCount = input<boolean>(false);
+  readonly password = input<string>("");
+  readonly showCount = input<boolean>(false);
 
   // Convert to an array to handle cases that strings have special characters, i.e.: emoji.
-  passwordCharArray = computed(() => {
+  readonly passwordCharArray = computed(() => {
     return Array.from(this.password() ?? "");
   });
 
diff --git a/libs/components/src/color-password/color-password.stories.ts b/libs/components/src/color-password/color-password.stories.ts
index 5a544dcb22e..65b6a3c0f18 100644
--- a/libs/components/src/color-password/color-password.stories.ts
+++ b/libs/components/src/color-password/color-password.stories.ts
@@ -4,7 +4,7 @@ import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for
 
 import { ColorPasswordComponent } from "./color-password.component";
 
-const examplePassword = "Wq$Jk😀7j  DX#rS5Sdi!z ";
+const examplePassword = "Wq$Jk😀7jlI  DX#rS5Sdi!z ";
 
 export default {
   title: "Component Library/Color Password",
diff --git a/libs/components/src/container/container.component.ts b/libs/components/src/container/container.component.ts
index 9f6a4cbef94..40b19b16598 100644
--- a/libs/components/src/container/container.component.ts
+++ b/libs/components/src/container/container.component.ts
@@ -3,6 +3,8 @@ import { Component } from "@angular/core";
 /**
  * bit-container is a minimally styled component that limits the max width of its content to the tailwind theme variable '4xl'. '4xl' is equal to the value of 56rem
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-container",
   templateUrl: "container.component.html",
diff --git a/libs/components/src/copy-click/copy-click.directive.spec.ts b/libs/components/src/copy-click/copy-click.directive.spec.ts
index 321a18596e4..ed3640b7d6d 100644
--- a/libs/components/src/copy-click/copy-click.directive.spec.ts
+++ b/libs/components/src/copy-click/copy-click.directive.spec.ts
@@ -9,6 +9,8 @@ import { ToastService, CopyClickListener, COPY_CLICK_LISTENER } from "../";
 
 import { CopyClickDirective } from "./copy-click.directive";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <button type="button" appCopyClick="no toast shown" #noToast></button>
@@ -25,9 +27,17 @@ import { CopyClickDirective } from "./copy-click.directive";
   imports: [CopyClickDirective],
 })
 class TestCopyClickComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("noToast") noToastButton!: ElementRef<HTMLButtonElement>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("infoToast") infoToastButton!: ElementRef<HTMLButtonElement>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("successToast") successToastButton!: ElementRef<HTMLButtonElement>;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("toastWithLabel") toastWithLabelButton!: ElementRef<HTMLButtonElement>;
 }
 
diff --git a/libs/components/src/copy-click/copy-click.directive.ts b/libs/components/src/copy-click/copy-click.directive.ts
index 3eb075a2b5c..f12880f8781 100644
--- a/libs/components/src/copy-click/copy-click.directive.ts
+++ b/libs/components/src/copy-click/copy-click.directive.ts
@@ -26,11 +26,11 @@ export const COPY_CLICK_LISTENER = new InjectionToken<CopyClickListener>("CopyCl
   selector: "[appCopyClick]",
 })
 export class CopyClickDirective {
-  private _showToast = computed(() => {
+  private readonly _showToast = computed(() => {
     return this.showToast() !== undefined;
   });
 
-  private toastVariant = computed(() => {
+  private readonly toastVariant = computed(() => {
     const showToast = this.showToast();
     // When the `showToast` is set without a value, an empty string will be passed
     if (showToast === "" || showToast === undefined) {
@@ -68,7 +68,7 @@ export class CopyClickDirective {
    *  <app-component [appCopyClick]="value to copy" showToast="info"/></app-component>
    * ```
    */
-  showToast = input<ToastVariant | "">();
+  readonly showToast = input<ToastVariant | "">();
 
   @HostListener("click") onClick() {
     const valueToCopy = this.valueToCopy();
diff --git a/libs/components/src/dialog/dialog.service.stories.ts b/libs/components/src/dialog/dialog.service.stories.ts
index caa7a86a2a8..0921e9a9def 100644
--- a/libs/components/src/dialog/dialog.service.stories.ts
+++ b/libs/components/src/dialog/dialog.service.stories.ts
@@ -21,6 +21,8 @@ interface Animal {
   animal: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <bit-layout>
@@ -45,7 +47,7 @@ class StoryDialogComponent {
   }
 
   openDialogNonDismissable() {
-    this.dialogService.open(NonDismissableContent, {
+    this.dialogService.open(NonDismissableContentComponent, {
       data: {
         animal: "panda",
       },
@@ -62,6 +64,8 @@ class StoryDialogComponent {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <bit-dialog title="Dialog Title" dialogSize="large">
@@ -91,6 +95,8 @@ class StoryDialogContentComponent {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <bit-dialog
@@ -111,7 +117,7 @@ class StoryDialogContentComponent {
   `,
   imports: [DialogModule, ButtonModule],
 })
-class NonDismissableContent {
+class NonDismissableContentComponent {
   constructor(
     public dialogRef: DialogRef,
     @Inject(DIALOG_DATA) private data: Animal,
diff --git a/libs/components/src/dialog/dialog.service.ts b/libs/components/src/dialog/dialog.service.ts
index 409bf0a5b55..1fc452418e1 100644
--- a/libs/components/src/dialog/dialog.service.ts
+++ b/libs/components/src/dialog/dialog.service.ts
@@ -5,7 +5,7 @@ import {
   DIALOG_DATA,
   DialogCloseOptions,
 } from "@angular/cdk/dialog";
-import { ComponentType, ScrollStrategy } from "@angular/cdk/overlay";
+import { ComponentType, GlobalPositionStrategy, ScrollStrategy } from "@angular/cdk/overlay";
 import { ComponentPortal, Portal } from "@angular/cdk/portal";
 import { Injectable, Injector, TemplateRef, inject } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
@@ -17,6 +17,7 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authenticatio
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { DrawerService } from "../drawer/drawer.service";
+import { isAtOrLargerThanBreakpoint } from "../utils/responsive-utils";
 
 import { SimpleConfigurableDialogComponent } from "./simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component";
 import { SimpleDialogOptions } from "./simple-dialog/types";
@@ -63,6 +64,68 @@ export type DialogConfig<D = unknown, R = unknown> = Pick<
   "data" | "disableClose" | "ariaModal" | "positionStrategy" | "height" | "width"
 >;
 
+/**
+ * A responsive position strategy that adjusts the dialog position based on the screen size.
+ */
+class ResponsivePositionStrategy extends GlobalPositionStrategy {
+  private abortController: AbortController | null = null;
+
+  /**
+   * The previous breakpoint to avoid unnecessary updates.
+   * `null` means no previous breakpoint has been set.
+   */
+  private prevBreakpoint: "small" | "large" | null = null;
+
+  constructor() {
+    super();
+    if (typeof window !== "undefined") {
+      this.abortController = new AbortController();
+      this.updatePosition(); // Initial position update
+      window.addEventListener("resize", this.updatePosition.bind(this), {
+        signal: this.abortController.signal,
+      });
+    }
+  }
+
+  override dispose() {
+    this.abortController?.abort();
+    this.abortController = null;
+    super.dispose();
+  }
+
+  updatePosition() {
+    const isSmallScreen = !isAtOrLargerThanBreakpoint("md");
+    const currentBreakpoint = isSmallScreen ? "small" : "large";
+    if (this.prevBreakpoint === currentBreakpoint) {
+      return; // No change in breakpoint, no need to update position
+    }
+    this.prevBreakpoint = currentBreakpoint;
+    if (isSmallScreen) {
+      this.bottom().centerHorizontally();
+    } else {
+      this.centerVertically().centerHorizontally();
+    }
+    this.apply();
+  }
+}
+
+/**
+ * Position strategy that centers dialogs regardless of screen size.
+ * Use this for simple dialogs and custom dialogs that should not use
+ * the responsive bottom-sheet behavior on mobile.
+ *
+ * @example
+ * dialogService.open(MyComponent, {
+ *   positionStrategy: new CenterPositionStrategy()
+ * });
+ */
+export class CenterPositionStrategy extends GlobalPositionStrategy {
+  constructor() {
+    super();
+    this.centerHorizontally().centerVertically();
+  }
+}
+
 class DrawerDialogRef<R = unknown, C = unknown> implements DialogRef<R, C> {
   readonly isDrawer = true;
 
@@ -172,6 +235,7 @@ export class DialogService {
     const _config = {
       backdropClass: this.backDropClasses,
       scrollStrategy: this.defaultScrollStrategy,
+      positionStrategy: config?.positionStrategy ?? new ResponsivePositionStrategy(),
       injector,
       ...config,
     };
@@ -226,6 +290,7 @@ export class DialogService {
     return this.open<boolean, SimpleDialogOptions>(SimpleConfigurableDialogComponent, {
       data: simpleDialogOptions,
       disableClose: simpleDialogOptions.disableClose,
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 
diff --git a/libs/components/src/dialog/dialog/dialog.component.html b/libs/components/src/dialog/dialog/dialog.component.html
index 1b701a50584..c077dc2ceb8 100644
--- a/libs/components/src/dialog/dialog/dialog.component.html
+++ b/libs/components/src/dialog/dialog/dialog.component.html
@@ -1,8 +1,10 @@
 @let isDrawer = dialogRef?.isDrawer;
 <section
   class="tw-flex tw-w-full tw-flex-col tw-self-center tw-overflow-hidden tw-border tw-border-solid tw-border-secondary-100 tw-bg-background tw-text-main"
-  [ngClass]="[width, isDrawer ? 'tw-h-screen tw-border-t-0' : 'tw-rounded-xl tw-shadow-lg']"
-  @fadeIn
+  [ngClass]="[
+    width,
+    isDrawer ? 'tw-h-screen tw-border-t-0' : 'tw-rounded-t-xl md:tw-rounded-xl tw-shadow-lg',
+  ]"
   cdkTrapFocus
   cdkTrapFocusAutoCapture
 >
@@ -20,7 +22,9 @@
       bitDialogTitleContainer
       bitTypography="h3"
       noMargin
-      class="tw-text-main tw-mb-0 tw-truncate"
+      class="tw-text-main tw-mb-0 tw-line-clamp-2 tw-text-ellipsis tw-break-words focus-visible:tw-outline-none"
+      cdkFocusInitial
+      tabindex="-1"
     >
       {{ title() }}
       @if (subtitle(); as subtitleText) {
@@ -71,13 +75,19 @@
   @let isScrollable = isScrollable$ | async;
   @let showFooterBorder =
     (!bodyHasScrolledFrom().top && isScrollable) || bodyHasScrolledFrom().bottom;
+  <div
+    class="tw-border-0 tw-border-t tw-border-solid"
+    [ngClass]="{
+      'tw-border-transparent': !showFooterBorder,
+      'tw-border-secondary-100': showFooterBorder,
+    }"
+    data-chromatic="ignore"
+  ></div>
   <footer
-    class="tw-flex tw-flex-row tw-items-center tw-gap-2 tw-border-0 tw-border-t tw-border-solid tw-bg-background tw-py-5 tw-ps-6 tw-pe-4"
+    class="tw-flex tw-flex-row tw-items-center tw-gap-2 tw-bg-background tw-py-5 tw-ps-6 tw-pe-4"
     [ngClass]="{
       'tw-px-6 tw-py-4': isDrawer,
       'tw-p-4 has-[[biticonbutton]]:tw-pe-2': !isDrawer,
-      'tw-border-transparent': !showFooterBorder,
-      'tw-border-secondary-100': showFooterBorder,
     }"
   >
     <ng-content select="[bitDialogFooter]"></ng-content>
diff --git a/libs/components/src/dialog/dialog/dialog.component.ts b/libs/components/src/dialog/dialog/dialog.component.ts
index 2c634ef16e7..954f03aabe2 100644
--- a/libs/components/src/dialog/dialog/dialog.component.ts
+++ b/libs/components/src/dialog/dialog/dialog.component.ts
@@ -3,13 +3,14 @@ import { CdkScrollable } from "@angular/cdk/scrolling";
 import { CommonModule } from "@angular/common";
 import {
   Component,
-  HostBinding,
   inject,
   viewChild,
   input,
   booleanAttribute,
   ElementRef,
   DestroyRef,
+  computed,
+  signal,
 } from "@angular/core";
 import { toObservable } from "@angular/core/rxjs-interop";
 import { combineLatest, switchMap } from "rxjs";
@@ -21,17 +22,19 @@ import { SpinnerComponent } from "../../spinner";
 import { TypographyDirective } from "../../typography/typography.directive";
 import { hasScrollableContent$ } from "../../utils/";
 import { hasScrolledFrom } from "../../utils/has-scrolled-from";
-import { fadeIn } from "../animations";
 import { DialogRef } from "../dialog.service";
 import { DialogCloseDirective } from "../directives/dialog-close.directive";
 import { DialogTitleContainerDirective } from "../directives/dialog-title-container.directive";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-dialog",
   templateUrl: "./dialog.component.html",
-  animations: [fadeIn],
   host: {
+    "[class]": "classes()",
     "(keydown.esc)": "handleEsc($event)",
+    "(animationend)": "onAnimationEnd()",
   },
   imports: [
     CommonModule,
@@ -47,8 +50,8 @@ import { DialogTitleContainerDirective } from "../directives/dialog-title-contai
 })
 export class DialogComponent {
   private readonly destroyRef = inject(DestroyRef);
-  private scrollableBody = viewChild.required(CdkScrollable);
-  private scrollBottom = viewChild.required<ElementRef<HTMLDivElement>>("scrollBottom");
+  private readonly scrollableBody = viewChild.required(CdkScrollable);
+  private readonly scrollBottom = viewChild.required<ElementRef<HTMLDivElement>>("scrollBottom");
 
   protected dialogRef = inject(DialogRef, { optional: true });
   protected bodyHasScrolledFrom = hasScrolledFrom(this.scrollableBody);
@@ -85,22 +88,34 @@ export class DialogComponent {
    */
   readonly disablePadding = input(false, { transform: booleanAttribute });
 
+  /**
+   * Disable animations for the dialog.
+   */
+  readonly disableAnimations = input(false, { transform: booleanAttribute });
+
   /**
    * Mark the dialog as loading which replaces the content with a spinner.
    */
   readonly loading = input(false);
 
-  @HostBinding("class") get classes() {
+  private readonly animationCompleted = signal(false);
+
+  protected readonly classes = computed(() => {
     // `tw-max-h-[90vh]` is needed to prevent dialogs from overlapping the desktop header
-    return ["tw-flex", "tw-flex-col", "tw-w-screen"]
-      .concat(
-        this.width,
-        this.dialogRef?.isDrawer
-          ? ["tw-min-h-screen", "md:tw-w-[23rem]"]
-          : ["tw-p-4", "tw-w-screen", "tw-max-h-[90vh]"],
-      )
-      .flat();
-  }
+    const baseClasses = ["tw-flex", "tw-flex-col", "tw-w-screen"];
+    const sizeClasses = this.dialogRef?.isDrawer
+      ? ["tw-min-h-screen", "md:tw-w-[23rem]"]
+      : ["md:tw-p-4", "tw-w-screen", "tw-max-h-[90vh]"];
+
+    const animationClasses =
+      this.disableAnimations() || this.animationCompleted() || this.dialogRef?.isDrawer
+        ? []
+        : this.dialogSize() === "small"
+          ? ["tw-animate-slide-down"]
+          : ["tw-animate-slide-up", "md:tw-animate-slide-down"];
+
+    return [...baseClasses, this.width, ...sizeClasses, ...animationClasses];
+  });
 
   handleEsc(event: Event) {
     if (!this.dialogRef?.disableClose) {
@@ -122,4 +137,8 @@ export class DialogComponent {
       }
     }
   }
+
+  onAnimationEnd() {
+    this.animationCompleted.set(true);
+  }
 }
diff --git a/libs/components/src/dialog/dialog/dialog.stories.ts b/libs/components/src/dialog/dialog/dialog.stories.ts
index f93ef1a2f25..1f33ab7e877 100644
--- a/libs/components/src/dialog/dialog/dialog.stories.ts
+++ b/libs/components/src/dialog/dialog/dialog.stories.ts
@@ -57,6 +57,7 @@ export default {
   args: {
     loading: false,
     dialogSize: "small",
+    disableAnimations: true,
   },
   argTypes: {
     _disablePadding: {
@@ -71,6 +72,9 @@ export default {
         defaultValue: "default",
       },
     },
+    disableAnimations: {
+      control: { type: "boolean" },
+    },
   },
   parameters: {
     design: {
@@ -86,7 +90,7 @@ export const Default: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <bit-dialog [dialogSize]="dialogSize" [title]="title" [subtitle]="subtitle" [loading]="loading" [disablePadding]="disablePadding">
+      <bit-dialog [dialogSize]="dialogSize" [title]="title" [subtitle]="subtitle" [loading]="loading" [disablePadding]="disablePadding" [disableAnimations]="disableAnimations">
         <ng-container bitDialogTitle>
           <span bitBadge variant="success">Foobar</span>
         </ng-container>
@@ -125,7 +129,15 @@ export const LongTitle: Story = {
   ...Default,
   args: {
     dialogSize: "small",
-    title: "Long_Title_That_Should_Be_Truncated",
+    title: "Incredibly_Super_Long_Title_That_Should_Be_Truncated",
+  },
+};
+
+export const LongTitleSentence: Story = {
+  ...Default,
+  args: {
+    dialogSize: "small",
+    title: "Very Long Sentence That Should Be Truncated After Two Lines",
   },
 };
 
@@ -150,7 +162,7 @@ export const ScrollingContent: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <bit-dialog title="Scrolling Example" [background]="background" [dialogSize]="dialogSize" [loading]="loading" [disablePadding]="disablePadding">
+      <bit-dialog title="Scrolling Example" [background]="background" [dialogSize]="dialogSize" [loading]="loading" [disablePadding]="disablePadding" [disableAnimations]="disableAnimations">
         <span bitDialogContent>
           Dialog body text goes here.<br />
           <ng-container *ngFor="let _ of [].constructor(100)">
@@ -167,6 +179,7 @@ export const ScrollingContent: Story = {
   }),
   args: {
     dialogSize: "small",
+    disableAnimations: true,
   },
 };
 
@@ -174,7 +187,7 @@ export const TabContent: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <bit-dialog title="Tab Content Example" [background]="background" [dialogSize]="dialogSize" [disablePadding]="disablePadding">
+      <bit-dialog title="Tab Content Example" [background]="background" [dialogSize]="dialogSize" [disablePadding]="disablePadding" [disableAnimations]="disableAnimations">
         <span bitDialogContent>
           <bit-tab-group>
               <bit-tab label="First Tab">First Tab Content</bit-tab>
@@ -192,6 +205,7 @@ export const TabContent: Story = {
   args: {
     dialogSize: "large",
     disablePadding: true,
+    disableAnimations: true,
   },
   parameters: {
     docs: {
@@ -211,7 +225,7 @@ export const WithCards: Story = {
     },
     template: /*html*/ `
       <form [formGroup]="formObj">
-      <bit-dialog [dialogSize]="dialogSize" [background]="background" [title]="title" [subtitle]="subtitle" [loading]="loading" [disablePadding]="disablePadding">
+      <bit-dialog [dialogSize]="dialogSize" [background]="background" [title]="title" [subtitle]="subtitle" [loading]="loading" [disablePadding]="disablePadding" [disableAnimations]="disableAnimations">
         <ng-container bitDialogContent>
           <bit-section>
             <bit-section-header>
@@ -275,5 +289,6 @@ export const WithCards: Story = {
     title: "Default",
     subtitle: "Subtitle",
     background: "alt",
+    disableAnimations: true,
   },
 };
diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
index 4c04f0e29c9..eed031d76fb 100644
--- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
@@ -26,6 +26,8 @@ const DEFAULT_COLOR: Record<SimpleDialogType, string> = {
   danger: "tw-text-danger",
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./simple-configurable-dialog.component.html",
   imports: [
diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
index 036ef1177e6..7d1b5974d51 100644
--- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
@@ -10,6 +10,8 @@ import { CalloutModule } from "../../../callout";
 import { I18nMockService } from "../../../utils/i18n-mock.service";
 import { DialogModule } from "../../dialog.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     @for (group of dialogs; track group) {
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
index 85f1bed8cf5..cd44a79c271 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
@@ -9,6 +9,8 @@ import { DialogTitleContainerDirective } from "../directives/dialog-title-contai
 })
 export class IconDirective {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-simple-dialog",
   templateUrl: "./simple-dialog.component.html",
@@ -16,12 +18,14 @@ export class IconDirective {}
   imports: [DialogTitleContainerDirective, TypographyDirective],
 })
 export class SimpleDialogComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ContentChild(IconDirective) icon!: IconDirective;
 
   /**
    * Optional flag to hide the dialog's center icon. Defaults to false.
    */
-  hideIcon = input(false, { transform: booleanAttribute });
+  readonly hideIcon = input(false, { transform: booleanAttribute });
 
   get hasIcon() {
     return this.icon != null;
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
index ce9f7b46fef..7e03ad60ca2 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
@@ -9,12 +9,14 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { ButtonModule } from "../../button";
 import { I18nMockService } from "../../utils/i18n-mock.service";
 import { DialogModule } from "../dialog.module";
-import { DialogService } from "../dialog.service";
+import { CenterPositionStrategy, DialogService } from "../dialog.service";
 
 interface Animal {
   animal: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <button type="button" bitButton (click)="openSimpleDialog()">Open Simple Dialog</button>
@@ -31,32 +33,37 @@ class StoryDialogComponent {
   constructor(public dialogService: DialogService) {}
 
   openSimpleDialog() {
-    this.dialogService.open(SimpleDialogContent, {
+    this.dialogService.open(SimpleDialogContentComponent, {
       data: {
         animal: "panda",
       },
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 
   openNonDismissableWithPrimaryButtonDialog() {
-    this.dialogService.open(NonDismissableWithPrimaryButtonContent, {
+    this.dialogService.open(NonDismissableWithPrimaryButtonContentComponent, {
       data: {
         animal: "panda",
       },
       disableClose: true,
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 
   openNonDismissableWithNoButtonsDialog() {
-    this.dialogService.open(NonDismissableWithNoButtonsContent, {
+    this.dialogService.open(NonDismissableWithNoButtonsContentComponent, {
       data: {
         animal: "panda",
       },
       disableClose: true,
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <bit-simple-dialog>
@@ -76,7 +83,7 @@ class StoryDialogComponent {
   `,
   imports: [ButtonModule, DialogModule],
 })
-class SimpleDialogContent {
+class SimpleDialogContentComponent {
   constructor(
     public dialogRef: DialogRef,
     @Inject(DIALOG_DATA) private data: Animal,
@@ -87,6 +94,8 @@ class SimpleDialogContent {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <bit-simple-dialog>
@@ -105,7 +114,7 @@ class SimpleDialogContent {
   `,
   imports: [ButtonModule, DialogModule],
 })
-class NonDismissableWithPrimaryButtonContent {
+class NonDismissableWithPrimaryButtonContentComponent {
   constructor(
     public dialogRef: DialogRef,
     @Inject(DIALOG_DATA) private data: Animal,
@@ -116,6 +125,8 @@ class NonDismissableWithPrimaryButtonContent {
   }
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <bit-simple-dialog>
@@ -129,7 +140,7 @@ class NonDismissableWithPrimaryButtonContent {
   `,
   imports: [ButtonModule, DialogModule],
 })
-class NonDismissableWithNoButtonsContent {
+class NonDismissableWithNoButtonsContentComponent {
   constructor(
     public dialogRef: DialogRef,
     @Inject(DIALOG_DATA) private data: Animal,
diff --git a/libs/components/src/disclosure/disclosure-trigger-for.directive.ts b/libs/components/src/disclosure/disclosure-trigger-for.directive.ts
index 78bc9f2b038..f5ee4ad27c1 100644
--- a/libs/components/src/disclosure/disclosure-trigger-for.directive.ts
+++ b/libs/components/src/disclosure/disclosure-trigger-for.directive.ts
@@ -1,10 +1,20 @@
-import { Directive, HostBinding, HostListener, input } from "@angular/core";
+import { Directive, computed, input } from "@angular/core";
 
 import { DisclosureComponent } from "./disclosure.component";
 
+/**
+ * Directive that connects a trigger element (like a button) to a disclosure component.
+ * Automatically handles click events to toggle the disclosure open/closed state and
+ * manages ARIA attributes for accessibility.
+ */
 @Directive({
   selector: "[bitDisclosureTriggerFor]",
   exportAs: "disclosureTriggerFor",
+  host: {
+    "[attr.aria-expanded]": "ariaExpanded()",
+    "[attr.aria-controls]": "ariaControls()",
+    "(click)": "toggle()",
+  },
 })
 export class DisclosureTriggerForDirective {
   /**
@@ -12,15 +22,11 @@ export class DisclosureTriggerForDirective {
    */
   readonly disclosure = input.required<DisclosureComponent>({ alias: "bitDisclosureTriggerFor" });
 
-  @HostBinding("attr.aria-expanded") get ariaExpanded() {
-    return this.disclosure().open;
-  }
+  protected readonly ariaExpanded = computed(() => this.disclosure().open());
 
-  @HostBinding("attr.aria-controls") get ariaControls() {
-    return this.disclosure().id;
-  }
+  protected readonly ariaControls = computed(() => this.disclosure().id);
 
-  @HostListener("click") click() {
-    this.disclosure().open = !this.disclosure().open;
+  protected toggle() {
+    this.disclosure().open.update((open) => !open);
   }
 }
diff --git a/libs/components/src/disclosure/disclosure.component.ts b/libs/components/src/disclosure/disclosure.component.ts
index 2d73d7d8ad6..4a9c48b2716 100644
--- a/libs/components/src/disclosure/disclosure.component.ts
+++ b/libs/components/src/disclosure/disclosure.component.ts
@@ -1,64 +1,50 @@
-import {
-  Component,
-  EventEmitter,
-  HostBinding,
-  Input,
-  Output,
-  booleanAttribute,
-} from "@angular/core";
+import { ChangeDetectionStrategy, Component, computed, model } from "@angular/core";
 
 let nextId = 0;
 
 /**
-  * The `bit-disclosure` component is used in tandem with the `bitDisclosureTriggerFor` directive to create an accessible content area whose visibility is controlled by a trigger button.
-
-  * To compose a disclosure and trigger:
-
-  * 1. Create a trigger component (see "Supported Trigger Components" section below)
-  * 2. Create a `bit-disclosure`
-  * 3. Set a template reference on the `bit-disclosure`
-  * 4. Use the `bitDisclosureTriggerFor` directive on the trigger component, and pass it the `bit-disclosure` template reference
-  * 5. Set the `open` property on the `bit-disclosure` to init the disclosure as either currently expanded or currently collapsed. The disclosure will default to `false`, meaning it defaults to being hidden.
-  *
-  * @example
-  *
-  * ```html
-  * <button
-  *   type="button"
-  *   bitIconButton="bwi-sliders"
-  *   [buttonType]="'muted'"
-  *   [bitDisclosureTriggerFor]="disclosureRef"
-  *   [label]="'Settings' | i18n"
-  * ></button>
-  * <bit-disclosure #disclosureRef open>click button to hide this content</bit-disclosure>
-  * ```
-  *
+ * The `bit-disclosure` component is used in tandem with the `bitDisclosureTriggerFor` directive to create an accessible content area whose visibility is controlled by a trigger button.
+ *
+ * To compose a disclosure and trigger:
+ *
+ * 1. Create a trigger component (see "Supported Trigger Components" section below)
+ * 2. Create a `bit-disclosure`
+ * 3. Set a template reference on the `bit-disclosure`
+ * 4. Use the `bitDisclosureTriggerFor` directive on the trigger component, and pass it the `bit-disclosure` template reference
+ * 5. Set the `open` property on the `bit-disclosure` to init the disclosure as either currently expanded or currently collapsed. The disclosure will default to `false`, meaning it defaults to being hidden.
+ *
+ * @example
+ *
+ * ```html
+ * <button
+ *   type="button"
+ *   bitIconButton="bwi-sliders"
+ *   buttonType="muted"
+ *   [bitDisclosureTriggerFor]="disclosureRef"
+ *   [label]="'Settings' | i18n"
+ * ></button>
+ * <bit-disclosure #disclosureRef [(open)]="isOpen">click button to hide this content</bit-disclosure>
+ * ```
  */
 @Component({
   selector: "bit-disclosure",
   template: `<ng-content></ng-content>`,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: {
+    "[class]": "classList()",
+    "[id]": "id",
+  },
 })
 export class DisclosureComponent {
-  /** Emits the visibility of the disclosure content */
-  @Output() openChange = new EventEmitter<boolean>();
-
-  private _open?: boolean;
   /**
-   * Optionally init the disclosure in its opened state
+   * Controls the visibility of the disclosure content.
    */
-  // TODO: Skipped for signal migration because:
-  //  Accessor inputs cannot be migrated as they are too complex.
-  @Input({ transform: booleanAttribute }) set open(isOpen: boolean) {
-    this._open = isOpen;
-    this.openChange.emit(isOpen);
-  }
-  get open(): boolean {
-    return !!this._open;
-  }
+  readonly open = model<boolean>(false);
 
-  @HostBinding("class") get classList() {
-    return this.open ? "" : "tw-hidden";
-  }
+  /**
+   * Autogenerated id.
+   */
+  readonly id = `bit-disclosure-${nextId++}`;
 
-  @HostBinding("id") id = `bit-disclosure-${nextId++}`;
+  protected readonly classList = computed(() => (this.open() ? "" : "tw-hidden"));
 }
diff --git a/libs/components/src/disclosure/disclosure.mdx b/libs/components/src/disclosure/disclosure.mdx
index 50ccf936acc..9f01df8d3d9 100644
--- a/libs/components/src/disclosure/disclosure.mdx
+++ b/libs/components/src/disclosure/disclosure.mdx
@@ -11,7 +11,7 @@ import { DisclosureComponent, DisclosureTriggerForDirective } from "@bitwarden/c
 <Title />
 <Description />
 
-<Canvas of={stories.DisclosureWithIconButton} />
+<Canvas of={stories.DisclosureOpen} />
 
 ## Supported Trigger Components
 
diff --git a/libs/components/src/disclosure/disclosure.stories.ts b/libs/components/src/disclosure/disclosure.stories.ts
index 3ed6903060c..cd9d9e02360 100644
--- a/libs/components/src/disclosure/disclosure.stories.ts
+++ b/libs/components/src/disclosure/disclosure.stories.ts
@@ -36,13 +36,30 @@ export default {
 
 type Story = StoryObj<DisclosureComponent>;
 
-export const DisclosureWithIconButton: Story = {
+export const DisclosureOpen: Story = {
+  args: {
+    open: true,
+  },
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <button type="button" label="Settings" bitIconButton="bwi-sliders" [buttonType]="'muted'" [bitDisclosureTriggerFor]="disclosureRef">
+      <button type="button" label="Settings" bitIconButton="bwi-sliders" buttonType="muted" [bitDisclosureTriggerFor]="disclosureRef">
       </button>
-      <bit-disclosure #disclosureRef class="tw-text-main tw-block" open>click button to hide this content</bit-disclosure>
+      <bit-disclosure #disclosureRef class="tw-text-main tw-block" [(open)]="open">click button to hide this content</bit-disclosure>
+    `,
+  }),
+};
+
+export const DisclosureClosed: Story = {
+  args: {
+    open: false,
+  },
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <button type="button" label="Settings" bitIconButton="bwi-sliders" buttonType="muted" [bitDisclosureTriggerFor]="disclosureRef">
+      </button>
+      <bit-disclosure #disclosureRef class="tw-text-main tw-block" [(open)]="open">click button to hide this content</bit-disclosure>
     `,
   }),
 };
diff --git a/libs/components/src/drawer/drawer-header.component.ts b/libs/components/src/drawer/drawer-header.component.ts
index 36addcd2bea..006c48e091d 100644
--- a/libs/components/src/drawer/drawer-header.component.ts
+++ b/libs/components/src/drawer/drawer-header.component.ts
@@ -24,7 +24,7 @@ export class DrawerHeaderComponent {
   /**
    * The title to display
    */
-  title = input.required<string>();
+  readonly title = input.required<string>();
 
   /** We don't want to set the HTML title attribute with `this.title` */
   @HostBinding("attr.title")
diff --git a/libs/components/src/drawer/drawer-host.directive.ts b/libs/components/src/drawer/drawer-host.directive.ts
index 64eea6a9c06..7804d111ed6 100644
--- a/libs/components/src/drawer/drawer-host.directive.ts
+++ b/libs/components/src/drawer/drawer-host.directive.ts
@@ -10,7 +10,7 @@ import { Directive, signal } from "@angular/core";
   selector: "[bitDrawerHost]",
 })
 export class DrawerHostDirective {
-  private _portal = signal<Portal<unknown> | undefined>(undefined);
+  private readonly _portal = signal<Portal<unknown> | undefined>(undefined);
 
   /** The portal to display */
   portal = this._portal.asReadonly();
diff --git a/libs/components/src/drawer/drawer.component.ts b/libs/components/src/drawer/drawer.component.ts
index 7a3c764b16f..042d1eace79 100644
--- a/libs/components/src/drawer/drawer.component.ts
+++ b/libs/components/src/drawer/drawer.component.ts
@@ -25,7 +25,7 @@ import { DrawerService } from "./drawer.service";
 })
 export class DrawerComponent {
   private drawerHost = inject(DrawerService);
-  private portal = viewChild.required(CdkPortal);
+  private readonly portal = viewChild.required(CdkPortal);
 
   /**
    * Whether or not the drawer is open.
@@ -33,7 +33,7 @@ export class DrawerComponent {
    * Note: Does not support implicit boolean transform due to Angular limitation. Must be bound explicitly `[open]="true"` instead of just `open`.
    * https://github.com/angular/angular/issues/55166#issuecomment-2032150999
    **/
-  open = model<boolean>(false);
+  readonly open = model<boolean>(false);
 
   /**
    * The ARIA role of the drawer.
@@ -43,7 +43,7 @@ export class DrawerComponent {
    * - [navigation](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/navigation_role)
    *    - For drawers that primary contain links to other content.
    */
-  role = input<"complementary" | "navigation">("complementary");
+  readonly role = input<"complementary" | "navigation">("complementary");
 
   constructor() {
     effect(
diff --git a/libs/components/src/drawer/drawer.service.ts b/libs/components/src/drawer/drawer.service.ts
index dd8575efee8..71b3ff967d7 100644
--- a/libs/components/src/drawer/drawer.service.ts
+++ b/libs/components/src/drawer/drawer.service.ts
@@ -3,7 +3,7 @@ import { Injectable, signal } from "@angular/core";
 
 @Injectable({ providedIn: "root" })
 export class DrawerService {
-  private _portal = signal<Portal<unknown> | undefined>(undefined);
+  private readonly _portal = signal<Portal<unknown> | undefined>(undefined);
 
   /** The portal to display */
   portal = this._portal.asReadonly();
diff --git a/libs/components/src/form-control/form-control.component.ts b/libs/components/src/form-control/form-control.component.ts
index be1a071bcab..642d280bdcb 100644
--- a/libs/components/src/form-control/form-control.component.ts
+++ b/libs/components/src/form-control/form-control.component.ts
@@ -8,6 +8,8 @@ import { TypographyDirective } from "../typography/typography.directive";
 
 import { BitFormControlAbstraction } from "./form-control.abstraction";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-form-control",
   templateUrl: "form-control.component.html",
diff --git a/libs/components/src/form-control/form-control.module.ts b/libs/components/src/form-control/form-control.module.ts
index df168d8e98f..d87284adbcd 100644
--- a/libs/components/src/form-control/form-control.module.ts
+++ b/libs/components/src/form-control/form-control.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from "@angular/core";
 
 import { FormControlComponent } from "./form-control.component";
-import { BitHintComponent } from "./hint.component";
-import { BitLabel } from "./label.component";
+import { BitHintDirective } from "./hint.directive";
+import { BitLabelComponent } from "./label.component";
 
 @NgModule({
-  imports: [BitLabel, FormControlComponent, BitHintComponent],
-  exports: [FormControlComponent, BitLabel, BitHintComponent],
+  imports: [BitLabelComponent, FormControlComponent, BitHintDirective],
+  exports: [FormControlComponent, BitLabelComponent, BitHintDirective],
 })
 export class FormControlModule {}
diff --git a/libs/components/src/form-control/hint.component.ts b/libs/components/src/form-control/hint.directive.ts
similarity index 90%
rename from libs/components/src/form-control/hint.component.ts
rename to libs/components/src/form-control/hint.directive.ts
index c1f21bf2545..110aefc30e7 100644
--- a/libs/components/src/form-control/hint.component.ts
+++ b/libs/components/src/form-control/hint.directive.ts
@@ -9,6 +9,6 @@ let nextId = 0;
     class: "tw-text-muted tw-font-normal tw-inline-block tw-mt-1 tw-text-xs",
   },
 })
-export class BitHintComponent {
+export class BitHintDirective {
   @HostBinding() id = `bit-hint-${nextId++}`;
 }
diff --git a/libs/components/src/form-control/label.component.ts b/libs/components/src/form-control/label.component.ts
index 224e00c31da..95133cae99f 100644
--- a/libs/components/src/form-control/label.component.ts
+++ b/libs/components/src/form-control/label.component.ts
@@ -6,6 +6,8 @@ import { FormControlComponent } from "./form-control.component";
 // Increments for each instance of this component
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-label",
   templateUrl: "label.component.html",
@@ -15,7 +17,7 @@ let nextId = 0;
     "[id]": "id()",
   },
 })
-export class BitLabel {
+export class BitLabelComponent {
   constructor(
     private elementRef: ElementRef<HTMLInputElement>,
     @Optional() private parentFormControl: FormControlComponent,
diff --git a/libs/components/src/form-field/error-summary.component.ts b/libs/components/src/form-field/error-summary.component.ts
index 1b0b5bb3cbf..cbcd172399a 100644
--- a/libs/components/src/form-field/error-summary.component.ts
+++ b/libs/components/src/form-field/error-summary.component.ts
@@ -3,6 +3,8 @@ import { AbstractControl, UntypedFormGroup } from "@angular/forms";
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-error-summary",
   template: ` @if (errorCount > 0) {
@@ -14,7 +16,7 @@ import { I18nPipe } from "@bitwarden/ui-common";
   },
   imports: [I18nPipe],
 })
-export class BitErrorSummary {
+export class BitErrorSummaryComponent {
   readonly formGroup = input<UntypedFormGroup>();
 
   get errorCount(): number {
diff --git a/libs/components/src/form-field/error.component.ts b/libs/components/src/form-field/error.component.ts
index ed9d7eafe8d..9d931a64db2 100644
--- a/libs/components/src/form-field/error.component.ts
+++ b/libs/components/src/form-field/error.component.ts
@@ -5,6 +5,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 // Increments for each instance of this component
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-error",
   template: `<i class="bwi bwi-error"></i> {{ displayError }}`,
diff --git a/libs/components/src/form-field/form-field.component.html b/libs/components/src/form-field/form-field.component.html
index ae3bad40698..a4af25a2492 100644
--- a/libs/components/src/form-field/form-field.component.html
+++ b/libs/components/src/form-field/form-field.component.html
@@ -56,7 +56,7 @@
         <ng-container *ngTemplateOutlet="prefixContent"></ng-container>
       </div>
       <div
-        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 has-[textarea]:tw-my-1"
+        class="tw-w-full tw-relative tw-py-1 [&:has(select)_select]:tw-pe-6 has-[select]:after:tw-absolute has-[select]:after:tw-end-4 has-[select]:after:tw-top-[calc(50%_-_2px)] has-[select]:after:tw-rotate-[45deg] has-[select]:after:-tw-translate-y-1/2 has-[select]:after:tw-size-2 has-[select]:after:tw-border-text-main has-[select]:after:tw-border-r-[2px] has-[select]:after:tw-border-b-[2px] 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 has-[textarea]:tw-my-1"
         data-default-content
         [ngClass]="[
           prefixHasChildren() ? '' : 'tw-rounded-s-lg tw-ps-3',
@@ -97,7 +97,7 @@
         <ng-container *ngTemplateOutlet="prefixContent"></ng-container>
       </div>
       <div
-        class="tw-w-full tw-pb-0 tw-relative [&>*]:tw-p-0 [&>*::selection]:tw-bg-primary-700 [&>*::selection]:tw-text-contrast"
+        class="tw-w-full tw-min-w-0 tw-pb-0 tw-relative [&>*]:tw-p-0 [&>*::selection]:tw-bg-primary-700 [&>*::selection]:tw-text-contrast"
         data-default-content
       >
         <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
diff --git a/libs/components/src/form-field/form-field.component.ts b/libs/components/src/form-field/form-field.component.ts
index 26038caa466..10cf33b8257 100644
--- a/libs/components/src/form-field/form-field.component.ts
+++ b/libs/components/src/form-field/form-field.component.ts
@@ -15,13 +15,15 @@ import {
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
-import { BitHintComponent } from "../form-control/hint.component";
-import { BitLabel } from "../form-control/label.component";
+import { BitHintDirective } from "../form-control/hint.directive";
+import { BitLabelComponent } from "../form-control/label.component";
 import { inputBorderClasses } from "../input/input.directive";
 
 import { BitErrorComponent } from "./error.component";
 import { BitFormFieldControl } from "./form-field-control";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-form-field",
   templateUrl: "./form-field.component.html",
@@ -29,8 +31,8 @@ import { BitFormFieldControl } from "./form-field-control";
 })
 export class BitFormFieldComponent implements AfterContentChecked {
   readonly input = contentChild.required(BitFormFieldControl);
-  readonly hint = contentChild(BitHintComponent);
-  readonly label = contentChild(BitLabel);
+  readonly hint = contentChild(BitHintDirective);
+  readonly label = contentChild(BitLabelComponent);
 
   readonly prefixContainer = viewChild<ElementRef<HTMLDivElement>>("prefixContainer");
   readonly suffixContainer = viewChild<ElementRef<HTMLDivElement>>("suffixContainer");
@@ -42,11 +44,13 @@ export class BitFormFieldComponent implements AfterContentChecked {
   /** If `true`, remove the bottom border for `readonly` inputs */
   // TODO: Skipped for signal migration because:
   //  Your application code writes to the input. This prevents migration.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: booleanAttribute })
   disableReadOnlyBorder = false;
 
-  protected prefixHasChildren = signal(false);
-  protected suffixHasChildren = signal(false);
+  protected readonly prefixHasChildren = signal(false);
+  protected readonly suffixHasChildren = signal(false);
 
   get inputBorderClasses(): string {
     const shouldFocusBorderAppear = this.defaultContentIsFocused();
@@ -87,7 +91,7 @@ export class BitFormFieldComponent implements AfterContentChecked {
    * This is necessary because the `tw-group/bit-form-field` wraps the input and any prefix/suffix
    * buttons
    */
-  protected defaultContentIsFocused = signal(false);
+  protected readonly defaultContentIsFocused = signal(false);
   @HostListener("focusin", ["$event.target"])
   onFocusIn(target: HTMLElement) {
     this.defaultContentIsFocused.set(target.matches("[data-default-content] *:focus-visible"));
diff --git a/libs/components/src/form-field/form-field.module.ts b/libs/components/src/form-field/form-field.module.ts
index 88d7ffcc78b..c7529c14fb7 100644
--- a/libs/components/src/form-field/form-field.module.ts
+++ b/libs/components/src/form-field/form-field.module.ts
@@ -4,7 +4,7 @@ import { FormControlModule } from "../form-control";
 import { InputModule } from "../input/input.module";
 import { MultiSelectModule } from "../multi-select/multi-select.module";
 
-import { BitErrorSummary } from "./error-summary.component";
+import { BitErrorSummaryComponent } from "./error-summary.component";
 import { BitErrorComponent } from "./error.component";
 import { BitFormFieldComponent } from "./form-field.component";
 import { BitPasswordInputToggleDirective } from "./password-input-toggle.directive";
@@ -18,7 +18,7 @@ import { BitSuffixDirective } from "./suffix.directive";
     MultiSelectModule,
 
     BitErrorComponent,
-    BitErrorSummary,
+    BitErrorSummaryComponent,
     BitFormFieldComponent,
     BitPasswordInputToggleDirective,
     BitPrefixDirective,
@@ -30,7 +30,7 @@ import { BitSuffixDirective } from "./suffix.directive";
     MultiSelectModule,
 
     BitErrorComponent,
-    BitErrorSummary,
+    BitErrorSummaryComponent,
     BitFormFieldComponent,
     BitPasswordInputToggleDirective,
     BitPrefixDirective,
diff --git a/libs/components/src/form-field/password-input-toggle.directive.ts b/libs/components/src/form-field/password-input-toggle.directive.ts
index 251878f5cef..ba5539250a6 100644
--- a/libs/components/src/form-field/password-input-toggle.directive.ts
+++ b/libs/components/src/form-field/password-input-toggle.directive.ts
@@ -27,6 +27,8 @@ export class BitPasswordInputToggleDirective implements AfterContentInit, OnChan
    * Whether the input is toggled to show the password.
    */
   readonly toggled = model(false);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() toggledChange = new EventEmitter<boolean>();
 
   @HostBinding("attr.title") title = this.i18nService.t("toggleVisibility");
diff --git a/libs/components/src/form-field/password-input-toggle.spec.ts b/libs/components/src/form-field/password-input-toggle.spec.ts
index 2b82fad9876..2a90622513a 100644
--- a/libs/components/src/form-field/password-input-toggle.spec.ts
+++ b/libs/components/src/form-field/password-input-toggle.spec.ts
@@ -13,6 +13,8 @@ import { BitFormFieldComponent } from "./form-field.component";
 import { FormFieldModule } from "./form-field.module";
 import { BitPasswordInputToggleDirective } from "./password-input-toggle.directive";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "test-form-field",
   template: `
diff --git a/libs/components/src/header/header.component.html b/libs/components/src/header/header.component.html
new file mode 100644
index 00000000000..992dcbea4a7
--- /dev/null
+++ b/libs/components/src/header/header.component.html
@@ -0,0 +1,35 @@
+<header
+  class="-tw-mt-6 -tw-mx-8 tw-mb-3 tw-flex tw-flex-col tw-py-6 tw-px-8 has-[[data-tabs]:not(:empty)]:tw-border-0 has-[[data-tabs]:not(:empty)]:tw-border-b has-[[data-tabs]:not(:empty)]:tw-border-solid has-[[data-tabs]:not(:empty)]:tw-border-secondary-100 has-[[data-tabs]:not(:empty)]:tw-bg-background-alt has-[[data-tabs]:not(:empty)]:tw-pb-0"
+>
+  <div class="tw-flex">
+    <div class="tw-flex tw-min-w-0 tw-flex-1 tw-flex-col tw-gap-2">
+      <ng-content select="[slot=breadcrumbs]"></ng-content>
+      <h1
+        bitTypography="h1"
+        noMargin
+        class="tw-m-0 tw-mr-2 tw-leading-10 tw-flex tw-gap-1"
+        [title]="title()"
+      >
+        <div class="tw-truncate">
+          @if (icon()) {
+            <i class="bwi {{ icon() }}" aria-hidden="true"></i>
+          }
+
+          {{ title() }}
+        </div>
+        <div><ng-content select="[slot=title-suffix]"></ng-content></div>
+      </h1>
+    </div>
+    <div class="tw-ml-auto tw-flex tw-flex-col tw-gap-4">
+      <div class="tw-flex tw-min-w-max tw-items-center tw-justify-end tw-gap-2">
+        <ng-content></ng-content>
+      </div>
+      <div class="tw-ml-auto empty:tw-hidden">
+        <ng-content select="[slot=secondary]"></ng-content>
+      </div>
+    </div>
+  </div>
+  <div data-tabs class="-tw-mx-4 -tw-mb-px empty:tw-hidden">
+    <ng-content select="[slot=tabs]"></ng-content>
+  </div>
+</header>
diff --git a/libs/components/src/header/header.component.ts b/libs/components/src/header/header.component.ts
new file mode 100644
index 00000000000..08cd91ea206
--- /dev/null
+++ b/libs/components/src/header/header.component.ts
@@ -0,0 +1,19 @@
+import { ChangeDetectionStrategy, Component, input } from "@angular/core";
+
+@Component({
+  selector: "bit-header",
+  templateUrl: "./header.component.html",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+})
+export class HeaderComponent {
+  /**
+   * The title of the page
+   */
+  readonly title = input.required<string>();
+
+  /**
+   * Icon to show before the title
+   */
+  readonly icon = input<string>();
+}
diff --git a/libs/components/src/header/header.stories.ts b/libs/components/src/header/header.stories.ts
new file mode 100644
index 00000000000..620f39a5dc3
--- /dev/null
+++ b/libs/components/src/header/header.stories.ts
@@ -0,0 +1,189 @@
+import { importProvidersFrom } from "@angular/core";
+import { RouterModule } from "@angular/router";
+import {
+  applicationConfig,
+  componentWrapperDecorator,
+  Meta,
+  moduleMetadata,
+  StoryObj,
+} from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import {
+  AvatarModule,
+  BreadcrumbsModule,
+  ButtonModule,
+  IconButtonModule,
+  IconModule,
+  InputModule,
+  MenuModule,
+  NavigationModule,
+  TabsModule,
+  TypographyModule,
+} from "@bitwarden/components";
+
+import { I18nMockService } from "../utils";
+
+import { HeaderComponent } from "./header.component";
+
+export default {
+  title: "Component Library/Header",
+  component: HeaderComponent,
+  decorators: [
+    componentWrapperDecorator(
+      (story) => `<div class="tw-min-h-screen tw-flex-1 tw-p-6 tw-text-main">${story}</div>`,
+    ),
+    moduleMetadata({
+      imports: [
+        HeaderComponent,
+        AvatarModule,
+        BreadcrumbsModule,
+        ButtonModule,
+        IconButtonModule,
+        IconModule,
+        InputModule,
+        MenuModule,
+        NavigationModule,
+        TabsModule,
+        TypographyModule,
+      ],
+    }),
+    applicationConfig({
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              moreBreadcrumbs: "More breadcrumbs",
+              loading: "Loading",
+            });
+          },
+        },
+        importProvidersFrom(
+          RouterModule.forRoot(
+            [
+              { path: "", redirectTo: "foo", pathMatch: "full" },
+              { path: "foo", component: HeaderComponent },
+              { path: "bar", component: HeaderComponent },
+            ],
+            { useHash: true },
+          ),
+        ),
+      ],
+    }),
+  ],
+} as Meta;
+
+type Story = StoryObj<HeaderComponent>;
+
+export const KitchenSink: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+          <bit-header title="LongTitleeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" icon="bwi-bug">
+            <bit-breadcrumbs slot="breadcrumbs">
+              <bit-breadcrumb>Foo</bit-breadcrumb>
+              <bit-breadcrumb>Bar</bit-breadcrumb>
+            </bit-breadcrumbs>
+            <input
+              bitInput
+              placeholder="Ask Jeeves"
+              type="text"
+            />
+            <button type="button" bitIconButton="bwi-filter" label="Switch products"></button>
+            <bit-avatar text="Will"></bit-avatar>
+            <button bitButton buttonType="primary">New</button>
+            <button bitButton slot="secondary">Click Me 🎉</button>
+            <bit-tab-nav-bar slot="tabs">
+              <bit-tab-link [route]="['foo']">Foo</bit-tab-link>
+              <bit-tab-link [route]="['bar']">Bar</bit-tab-link>
+            </bit-tab-nav-bar>
+          </bit-header>
+        `,
+  }),
+};
+
+export const Basic: Story = {
+  render: (args: any) => ({
+    props: args,
+    template: /*html*/ `
+    <bit-header title="Foobar" icon="bwi-bug" />
+  `,
+  }),
+};
+
+export const WithLongTitle: Story = {
+  render: (arg: any) => ({
+    props: arg,
+    template: /*html*/ `
+    <bit-header title="LongTitleeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" icon="bwi-bug">
+        <ng-container slot="title-suffix"><i class="bwi bwi-key"></i></ng-container>
+    </bit-header>
+  `,
+  }),
+};
+
+export const WithBreadcrumbs: Story = {
+  render: (args: any) => ({
+    props: args,
+    template: /*html*/ `
+    <bit-header title="Foobar" icon="bwi-bug" class="tw-text-main">
+      <bit-breadcrumbs slot="breadcrumbs">
+        <bit-breadcrumb>Foo</bit-breadcrumb>
+        <bit-breadcrumb>Bar</bit-breadcrumb>
+      </bit-breadcrumbs>
+    </bit-header>
+  `,
+  }),
+};
+
+export const WithSearch: Story = {
+  render: (args: any) => ({
+    props: args,
+    template: /*html*/ `
+    <bit-header title="Foobar" icon="bwi-bug" class="tw-text-main">
+      <input
+        bitInput
+        placeholder="Ask Jeeves"
+        type="text"
+      />
+    </bit-header>
+  `,
+  }),
+};
+
+export const WithSecondaryContent: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+    <bit-header title="Foobar" icon="bwi-bug" class="tw-text-main">
+      <button bitButton slot="secondary">Click Me 🎉</button>
+    </bit-header>
+  `,
+  }),
+};
+
+export const WithTabs: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+    <bit-header title="Foobar" icon="bwi-bug" class="tw-text-main">
+      <bit-tab-nav-bar slot="tabs">
+        <bit-tab-link [route]="['foo']">Foo</bit-tab-link>
+        <bit-tab-link [route]="['bar']">Bar</bit-tab-link>
+      </bit-tab-nav-bar>
+    </bit-header>
+  `,
+  }),
+};
+
+export const WithTitleSuffixComponent: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+    <bit-header title="Foobar" icon="bwi-bug" class="tw-text-main">
+      <ng-container slot="title-suffix"><i class="bwi bwi-spinner bwi-spin"></i></ng-container>
+    </bit-header>
+  `,
+  }),
+};
diff --git a/libs/components/src/header/index.ts b/libs/components/src/header/index.ts
new file mode 100644
index 00000000000..c2d38d375ed
--- /dev/null
+++ b/libs/components/src/header/index.ts
@@ -0,0 +1 @@
+export * from "./header.component";
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index 6bb6ccf10bd..ca0e3fb1de5 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -17,6 +17,7 @@ import { setA11yTitleAndAriaLabel } from "../a11y/set-a11y-title-and-aria-label"
 import { ButtonLikeAbstraction } from "../shared/button-like.abstraction";
 import { FocusableElement } from "../shared/focusable-element";
 import { SpinnerComponent } from "../spinner";
+import { TooltipDirective } from "../tooltip";
 import { ariaDisableElement } from "../utils";
 
 export type IconButtonType = "primary" | "danger" | "contrast" | "main" | "muted" | "nav-contrast";
@@ -81,6 +82,8 @@ const sizes: Record<IconButtonSize, string[]> = {
 
   * Similar to the main button components, spacing between multiple icon buttons should be .5rem.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "button[bitIconButton]:not(button[bitButton])",
   templateUrl: "icon-button.component.html",
@@ -98,7 +101,10 @@ const sizes: Record<IconButtonSize, string[]> = {
      */
     "[attr.bitIconButton]": "icon()",
   },
-  hostDirectives: [AriaDisableDirective],
+  hostDirectives: [
+    AriaDisableDirective,
+    { directive: TooltipDirective, inputs: ["tooltipPosition"] },
+  ],
 })
 export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableElement {
   readonly icon = model.required<string>({ alias: "bitIconButton" });
@@ -107,6 +113,9 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
 
   readonly size = model<IconButtonSize>("default");
 
+  private elementRef = inject(ElementRef);
+  private tooltip = inject(TooltipDirective, { host: true, optional: true });
+
   /**
    * label input will be used to set the `aria-label` attributes on the button.
    * This is for accessibility purposes, as it provides a text alternative for the icon button.
@@ -117,7 +126,7 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
 
   @HostBinding("class") get classList() {
     return [
-      "tw-font-semibold",
+      "tw-font-medium",
       "tw-leading-[0px]",
       "tw-border-none",
       "tw-transition",
@@ -130,7 +139,11 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
       .concat(sizes[this.size()])
       .concat(
         this.showDisabledStyles() || this.disabled()
-          ? ["aria-disabled:tw-opacity-60", "aria-disabled:hover:!tw-bg-transparent"]
+          ? [
+              "aria-disabled:tw-opacity-60",
+              "aria-disabled:hover:!tw-bg-transparent",
+              "tw-cursor-default",
+            ]
           : [],
       );
   }
@@ -139,7 +152,7 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
     return [this.icon(), "!tw-m-0"];
   }
 
-  protected disabledAttr = computed(() => {
+  protected readonly disabledAttr = computed(() => {
     const disabled = this.disabled() != null && this.disabled() !== false;
     return disabled || this.loading();
   });
@@ -152,7 +165,7 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
    * We can't use `disabledAttr` for this, because it returns `true` when `loading` is `true`.
    * We only want to show disabled styles during loading if `showLoadingStyles` is `true`.
    */
-  protected showDisabledStyles = computed(() => {
+  protected readonly showDisabledStyles = computed(() => {
     return this.showLoadingStyle() || (this.disabledAttr() && this.loading() === false);
   });
 
@@ -170,7 +183,7 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
    * This pattern of converting a signal to an observable and back to a signal is not
    * recommended. TODO -- find better way to use debounce with signals (CL-596)
    */
-  protected showLoadingStyle = toSignal(
+  protected readonly showLoadingStyle = toSignal(
     toObservable(this.loading).pipe(debounce((isLoading) => interval(isLoading ? 75 : 0))),
   );
 
@@ -180,8 +193,6 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
     return this.elementRef.nativeElement;
   }
 
-  private elementRef = inject(ElementRef);
-
   constructor() {
     const element = this.elementRef.nativeElement;
 
@@ -192,9 +203,15 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
     effect(() => {
       setA11yTitleAndAriaLabel({
         element: this.elementRef.nativeElement,
-        title: originalTitle ?? this.label(),
+        title: undefined,
         label: this.label(),
       });
+
+      const tooltipContent: string = originalTitle || this.label();
+
+      if (tooltipContent) {
+        this.tooltip?.tooltipContent.set(tooltipContent);
+      }
     });
   }
 }
diff --git a/libs/components/src/icon-tile/icon-tile.component.html b/libs/components/src/icon-tile/icon-tile.component.html
new file mode 100644
index 00000000000..2dff588243e
--- /dev/null
+++ b/libs/components/src/icon-tile/icon-tile.component.html
@@ -0,0 +1,7 @@
+<div
+  [ngClass]="containerClasses()"
+  [attr.aria-label]="ariaLabel()"
+  [attr.role]="ariaLabel() ? 'img' : null"
+>
+  <i [ngClass]="iconClasses()" aria-hidden="true"></i>
+</div>
diff --git a/libs/components/src/icon-tile/icon-tile.component.ts b/libs/components/src/icon-tile/icon-tile.component.ts
new file mode 100644
index 00000000000..68eed007df0
--- /dev/null
+++ b/libs/components/src/icon-tile/icon-tile.component.ts
@@ -0,0 +1,113 @@
+import { NgClass } from "@angular/common";
+import { Component, computed, input } from "@angular/core";
+
+import { BitwardenIcon } from "../shared/icon";
+
+export type IconTileVariant = "primary" | "success" | "warning" | "danger" | "muted";
+
+export type IconTileSize = "small" | "default" | "large";
+
+export type IconTileShape = "square" | "circle";
+
+const variantStyles: Record<IconTileVariant, string[]> = {
+  primary: ["tw-bg-primary-100", "tw-text-primary-700"],
+  success: ["tw-bg-success-100", "tw-text-success-700"],
+  warning: ["tw-bg-warning-100", "tw-text-warning-700"],
+  danger: ["tw-bg-danger-100", "tw-text-danger-700"],
+  muted: ["tw-bg-secondary-100", "tw-text-secondary-700"],
+};
+
+const sizeStyles: Record<IconTileSize, { container: string[]; icon: string[] }> = {
+  small: {
+    container: ["tw-w-6", "tw-h-6"],
+    icon: ["tw-text-sm"],
+  },
+  default: {
+    container: ["tw-w-8", "tw-h-8"],
+    icon: ["tw-text-base"],
+  },
+  large: {
+    container: ["tw-w-10", "tw-h-10"],
+    icon: ["tw-text-lg"],
+  },
+};
+
+const shapeStyles: Record<IconTileShape, Record<IconTileSize, string[]>> = {
+  square: {
+    small: ["tw-rounded"],
+    default: ["tw-rounded-md"],
+    large: ["tw-rounded-lg"],
+  },
+  circle: {
+    small: ["tw-rounded-full"],
+    default: ["tw-rounded-full"],
+    large: ["tw-rounded-full"],
+  },
+};
+
+/**
+ * Icon tiles are static containers that display an icon with a colored background.
+ * They are similar to icon buttons but are not interactive and are used for visual
+ * indicators, status representations, or decorative elements.
+ *
+ * Use icon tiles to:
+ * - Display status or category indicators
+ * - Represent different types of content
+ * - Create visual hierarchy in lists or cards
+ * - Show app or service icons in a consistent format
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-icon-tile",
+  templateUrl: "icon-tile.component.html",
+  imports: [NgClass],
+})
+export class IconTileComponent {
+  /**
+   * The BWI icon name
+   */
+  readonly icon = input.required<BitwardenIcon>();
+
+  /**
+   * The visual theme of the icon tile
+   */
+  readonly variant = input<IconTileVariant>("primary");
+
+  /**
+   * The size of the icon tile
+   */
+  readonly size = input<IconTileSize>("default");
+
+  /**
+   * The shape of the icon tile
+   */
+  readonly shape = input<IconTileShape>("square");
+
+  /**
+   * Optional aria-label for accessibility when the icon has semantic meaning
+   */
+  readonly ariaLabel = input<string>();
+
+  protected readonly containerClasses = computed(() => {
+    const variant = this.variant();
+    const size = this.size();
+    const shape = this.shape();
+
+    return [
+      "tw-inline-flex",
+      "tw-items-center",
+      "tw-justify-center",
+      "tw-flex-shrink-0",
+      ...variantStyles[variant],
+      ...sizeStyles[size].container,
+      ...shapeStyles[shape][size],
+    ];
+  });
+
+  protected readonly iconClasses = computed(() => {
+    const size = this.size();
+
+    return ["bwi", this.icon(), ...sizeStyles[size].icon];
+  });
+}
diff --git a/libs/components/src/icon-tile/icon-tile.stories.ts b/libs/components/src/icon-tile/icon-tile.stories.ts
new file mode 100644
index 00000000000..2daa0d4289a
--- /dev/null
+++ b/libs/components/src/icon-tile/icon-tile.stories.ts
@@ -0,0 +1,114 @@
+import { Meta, StoryObj } from "@storybook/angular";
+
+import { BITWARDEN_ICONS } from "../shared/icon";
+
+import { IconTileComponent } from "./icon-tile.component";
+
+export default {
+  title: "Component Library/Icon Tile",
+  component: IconTileComponent,
+  args: {
+    icon: "bwi-star",
+    variant: "primary",
+    size: "default",
+    shape: "square",
+  },
+  argTypes: {
+    variant: {
+      options: ["primary", "success", "warning", "danger", "muted"],
+      control: { type: "select" },
+    },
+    size: {
+      options: ["small", "default", "large"],
+      control: { type: "select" },
+    },
+    shape: {
+      options: ["square", "circle"],
+      control: { type: "select" },
+    },
+    icon: {
+      options: BITWARDEN_ICONS,
+      control: { type: "select" },
+    },
+    ariaLabel: {
+      control: { type: "text" },
+    },
+  },
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://atlassian.design/components/icon/icon-tile/examples",
+    },
+  },
+} as Meta<IconTileComponent>;
+
+type Story = StoryObj<IconTileComponent>;
+
+export const Default: Story = {};
+
+export const AllVariants: Story = {
+  render: () => ({
+    template: `
+      <div class="tw-flex tw-gap-4 tw-items-center tw-flex-wrap">
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-collection" variant="primary"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Primary</span>
+        </div>
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-check-circle" variant="success"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Success</span>
+        </div>
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-exclamation-triangle" variant="warning"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Warning</span>
+        </div>
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-error" variant="danger"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Danger</span>
+        </div>
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-question-circle" variant="muted"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Muted</span>
+        </div>
+      </div>
+    `,
+  }),
+};
+
+export const AllSizes: Story = {
+  render: () => ({
+    template: `
+      <div class="tw-flex tw-gap-4 tw-items-center">
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-star" variant="primary" size="small"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Small</span>
+        </div>
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-star" variant="primary" size="default"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Default</span>
+        </div>
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-star" variant="primary" size="large"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Large</span>
+        </div>
+      </div>
+    `,
+  }),
+};
+
+export const AllShapes: Story = {
+  render: () => ({
+    template: `
+      <div class="tw-flex tw-gap-4 tw-items-center">
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-user" variant="primary" shape="square"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Square</span>
+        </div>
+        <div class="tw-flex tw-flex-col tw-items-center tw-gap-2">
+          <bit-icon-tile icon="bwi-user" variant="primary" shape="circle"></bit-icon-tile>
+          <span class="tw-text-sm tw-text-muted">Circle</span>
+        </div>
+      </div>
+    `,
+  }),
+};
diff --git a/libs/components/src/icon-tile/index.ts b/libs/components/src/icon-tile/index.ts
new file mode 100644
index 00000000000..415c9e478cc
--- /dev/null
+++ b/libs/components/src/icon-tile/index.ts
@@ -0,0 +1 @@
+export * from "./icon-tile.component";
diff --git a/libs/components/src/icon/icon.component.ts b/libs/components/src/icon/icon.component.ts
index 1ef7185c88b..f57a3627383 100644
--- a/libs/components/src/icon/icon.component.ts
+++ b/libs/components/src/icon/icon.component.ts
@@ -3,6 +3,8 @@ import { DomSanitizer, SafeHtml } from "@angular/platform-browser";
 
 import { Icon, isIcon } from "@bitwarden/assets/svg";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-icon",
   host: {
diff --git a/libs/components/src/index.ts b/libs/components/src/index.ts
index d231048563c..410a96f1cb3 100644
--- a/libs/components/src/index.ts
+++ b/libs/components/src/index.ts
@@ -19,8 +19,10 @@ export * from "./dialog";
 export * from "./disclosure";
 export * from "./drawer";
 export * from "./form-field";
+export * from "./header";
 export * from "./icon-button";
 export * from "./icon";
+export * from "./icon-tile";
 export * from "./input";
 export * from "./item";
 export * from "./layout";
@@ -36,10 +38,13 @@ export * from "./search";
 export * from "./section";
 export * from "./select";
 export * from "./shared/compact-mode.service";
+export * from "./skeleton";
 export * from "./table";
 export * from "./tabs";
 export * from "./toast";
 export * from "./toggle-group";
+export * from "./tooltip";
 export * from "./typography";
 export * from "./utils";
 export * from "./stepper";
+export * from "./switch";
diff --git a/libs/components/src/input/input.directive.ts b/libs/components/src/input/input.directive.ts
index 465736f7baa..ce34b70e88b 100644
--- a/libs/components/src/input/input.directive.ts
+++ b/libs/components/src/input/input.directive.ts
@@ -74,6 +74,8 @@ export class BitInputDirective implements BitFormFieldControl {
   // TODO: Skipped for signal migration because:
   //  Accessor inputs cannot be migrated as they are too complex.
   @HostBinding()
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get required() {
     return this._required ?? this.ngControl?.control?.hasValidator(Validators.required) ?? false;
diff --git a/libs/components/src/item/item-action.component.ts b/libs/components/src/item/item-action.component.ts
index acbc805cf90..b7ce1705f7c 100644
--- a/libs/components/src/item/item-action.component.ts
+++ b/libs/components/src/item/item-action.component.ts
@@ -1,5 +1,7 @@
 import { Component } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-item-action",
   imports: [],
diff --git a/libs/components/src/item/item-content.component.ts b/libs/components/src/item/item-content.component.ts
index 1f4ac73c77e..9c24d010946 100644
--- a/libs/components/src/item/item-content.component.ts
+++ b/libs/components/src/item/item-content.component.ts
@@ -29,7 +29,7 @@ import { TypographyModule } from "../typography";
 export class ItemContentComponent implements AfterContentChecked {
   readonly endSlot = viewChild<ElementRef<HTMLDivElement>>("endSlot");
 
-  protected endSlotHasChildren = signal(false);
+  protected readonly endSlotHasChildren = signal(false);
 
   /**
    * Determines whether text will truncate or wrap.
diff --git a/libs/components/src/item/item.component.ts b/libs/components/src/item/item.component.ts
index f6f2c3d7e35..a3fa8386325 100644
--- a/libs/components/src/item/item.component.ts
+++ b/libs/components/src/item/item.component.ts
@@ -22,7 +22,7 @@ export class ItemComponent {
   /**
    * We have `:focus-within` and `:focus-visible` but no `:focus-visible-within`
    */
-  protected focusVisibleWithin = signal(false);
+  protected readonly focusVisibleWithin = signal(false);
   @HostListener("focusin", ["$event.target"])
   onFocusIn(target: HTMLElement) {
     this.focusVisibleWithin.set(target.matches("[data-fvw-target]:focus-visible"));
diff --git a/libs/components/src/layout/layout.component.html b/libs/components/src/layout/layout.component.html
index 35c6f04911c..8ae26e7771b 100644
--- a/libs/components/src/layout/layout.component.html
+++ b/libs/components/src/layout/layout.component.html
@@ -23,7 +23,7 @@
       [id]="mainContentId"
       tabindex="-1"
       bitScrollLayoutHost
-      class="tw-overflow-auto tw-max-h-screen tw-min-w-0 tw-flex-1 tw-bg-background tw-p-8 tw-pt-6"
+      class="tw-overflow-auto tw-max-h-screen tw-min-w-0 tw-flex-1 tw-bg-background tw-p-8 tw-pt-6 tw-@container"
     >
       <!-- ^ If updating this padding, also update the padding correction in bit-banner! ^ -->
       <ng-content></ng-content>
diff --git a/libs/components/src/layout/layout.component.ts b/libs/components/src/layout/layout.component.ts
index 54b0341603c..1b357424205 100644
--- a/libs/components/src/layout/layout.component.ts
+++ b/libs/components/src/layout/layout.component.ts
@@ -12,6 +12,8 @@ import { SharedModule } from "../shared";
 
 import { ScrollLayoutHostDirective } from "./scroll-layout.directive";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-layout",
   templateUrl: "layout.component.html",
@@ -34,7 +36,7 @@ export class LayoutComponent {
   protected sideNavService = inject(SideNavService);
   protected drawerPortal = inject(DrawerService).portal;
 
-  private mainContent = viewChild.required<ElementRef<HTMLElement>>("main");
+  private readonly mainContent = viewChild.required<ElementRef<HTMLElement>>("main");
   protected focusMainContent() {
     this.mainContent().nativeElement.focus();
   }
@@ -45,7 +47,7 @@ export class LayoutComponent {
    *
    * @see https://github.com/angular/components/issues/10247#issuecomment-384060265
    **/
-  private skipLink = viewChild.required<ElementRef<HTMLElement>>("skipLink");
+  private readonly skipLink = viewChild.required<ElementRef<HTMLElement>>("skipLink");
   handleKeydown(ev: KeyboardEvent) {
     if (isNothingFocused()) {
       ev.preventDefault();
diff --git a/libs/components/src/layout/scroll-layout.directive.ts b/libs/components/src/layout/scroll-layout.directive.ts
index cb2c2a4e431..35a4c5b63d8 100644
--- a/libs/components/src/layout/scroll-layout.directive.ts
+++ b/libs/components/src/layout/scroll-layout.directive.ts
@@ -17,7 +17,7 @@ import { filter, fromEvent, Observable, switchMap } from "rxjs";
  **/
 @Injectable({ providedIn: "root" })
 export class ScrollLayoutService {
-  scrollableRef = signal<ElementRef<HTMLElement> | null>(null);
+  readonly scrollableRef = signal<ElementRef<HTMLElement> | null>(null);
   scrollableRef$ = toObservable(this.scrollableRef);
 }
 
diff --git a/libs/components/src/link/link.directive.ts b/libs/components/src/link/link.directive.ts
index 7c93b185a79..e6de8ac8402 100644
--- a/libs/components/src/link/link.directive.ts
+++ b/libs/components/src/link/link.directive.ts
@@ -99,7 +99,7 @@ export class AnchorLinkDirective extends LinkDirective {
 export class ButtonLinkDirective extends LinkDirective {
   private el = inject(ElementRef<HTMLButtonElement>);
 
-  disabled = input(false, { transform: booleanAttribute });
+  readonly disabled = input(false, { transform: booleanAttribute });
 
   @HostBinding("class") get classList() {
     return ["before:-tw-inset-y-[0.25rem]"]
diff --git a/libs/components/src/menu/index.ts b/libs/components/src/menu/index.ts
index 52c48d2fb8e..69b71b8ee24 100644
--- a/libs/components/src/menu/index.ts
+++ b/libs/components/src/menu/index.ts
@@ -1,5 +1,5 @@
 export * from "./menu.module";
 export * from "./menu.component";
 export * from "./menu-trigger-for.directive";
-export * from "./menu-item.directive";
+export * from "./menu-item.component";
 export * from "./menu-divider.component";
diff --git a/libs/components/src/menu/menu-divider.component.ts b/libs/components/src/menu/menu-divider.component.ts
index 194506ee50f..3bf992d3688 100644
--- a/libs/components/src/menu/menu-divider.component.ts
+++ b/libs/components/src/menu/menu-divider.component.ts
@@ -1,5 +1,7 @@
 import { Component } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-menu-divider",
   templateUrl: "./menu-divider.component.html",
diff --git a/libs/components/src/menu/menu-item.directive.ts b/libs/components/src/menu/menu-item.component.ts
similarity index 81%
rename from libs/components/src/menu/menu-item.directive.ts
rename to libs/components/src/menu/menu-item.component.ts
index 088e2a4293f..149fc3ca297 100644
--- a/libs/components/src/menu/menu-item.directive.ts
+++ b/libs/components/src/menu/menu-item.component.ts
@@ -3,12 +3,14 @@ import { coerceBooleanProperty } from "@angular/cdk/coercion";
 import { NgClass } from "@angular/common";
 import { Component, ElementRef, HostBinding, Input } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "[bitMenuItem]",
   templateUrl: "menu-item.component.html",
   imports: [NgClass],
 })
-export class MenuItemDirective implements FocusableOption {
+export class MenuItemComponent implements FocusableOption {
   @HostBinding("class") classList = [
     "tw-block",
     "tw-w-full",
@@ -42,6 +44,8 @@ export class MenuItemDirective implements FocusableOption {
   // TODO: Skipped for signal migration because:
   //  This input overrides a field from a superclass, while the superclass field
   //  is not migrated.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: coerceBooleanProperty }) disabled?: boolean = false;
 
   constructor(public elementRef: ElementRef<HTMLButtonElement>) {}
diff --git a/libs/components/src/menu/menu-trigger-for.directive.ts b/libs/components/src/menu/menu-trigger-for.directive.ts
index 2eab12995ea..1d79fbc9768 100644
--- a/libs/components/src/menu/menu-trigger-for.directive.ts
+++ b/libs/components/src/menu/menu-trigger-for.directive.ts
@@ -1,5 +1,5 @@
 import { hasModifierKey } from "@angular/cdk/keycodes";
-import { Overlay, OverlayConfig, OverlayRef } from "@angular/cdk/overlay";
+import { ConnectedPosition, Overlay, OverlayConfig, OverlayRef } from "@angular/cdk/overlay";
 import { TemplatePortal } from "@angular/cdk/portal";
 import {
   Directive,
@@ -10,11 +10,46 @@ import {
   ViewContainerRef,
   input,
 } from "@angular/core";
-import { Observable, Subscription } from "rxjs";
-import { filter, mergeWith } from "rxjs/operators";
+import { merge, Subscription } from "rxjs";
+import { filter, skip, takeUntil } from "rxjs/operators";
 
 import { MenuComponent } from "./menu.component";
 
+/**
+ * Position strategies for context menus.
+ * Tries positions in order: below-right, above-right, below-left, above-left
+ */
+const CONTEXT_MENU_POSITIONS: ConnectedPosition[] = [
+  // below-right
+  {
+    originX: "start",
+    originY: "top",
+    overlayX: "start",
+    overlayY: "top",
+  },
+  // above-right
+  {
+    originX: "start",
+    originY: "bottom",
+    overlayX: "start",
+    overlayY: "bottom",
+  },
+  // below-left
+  {
+    originX: "end",
+    originY: "top",
+    overlayX: "end",
+    overlayY: "top",
+  },
+  // above-left
+  {
+    originX: "end",
+    originY: "bottom",
+    overlayX: "end",
+    overlayY: "bottom",
+  },
+];
+
 @Directive({
   selector: "[bitMenuTriggerFor]",
   exportAs: "menuTrigger",
@@ -52,6 +87,7 @@ export class MenuTriggerForDirective implements OnDestroy {
   };
   private closedEventsSub: Subscription | null = null;
   private keyDownEventsSub: Subscription | null = null;
+  private menuCloseListenerSub: Subscription | null = null;
 
   constructor(
     private elementRef: ElementRef<HTMLElement>,
@@ -63,37 +99,49 @@ export class MenuTriggerForDirective implements OnDestroy {
     this.isOpen ? this.destroyMenu() : this.openMenu();
   }
 
+  /**
+   * Toggles the menu on right click event.
+   * If the menu is already open, it updates the menu position.
+   * @param event The MouseEvent from the right-click interaction
+   */
+  toggleMenuOnRightClick(event: MouseEvent) {
+    event.preventDefault(); // Prevent default context menu
+    this.isOpen ? this.updateMenuPosition(event) : this.openMenu(event);
+  }
+
   ngOnDestroy() {
     this.disposeAll();
   }
 
-  private openMenu() {
+  private openMenu(event?: MouseEvent) {
     const menu = this.menu();
     if (menu == null) {
       throw new Error("Cannot find bit-menu element");
     }
 
     this.isOpen = true;
-    this.overlayRef = this.overlay.create(this.defaultMenuConfig);
+
+    const positionStrategy = event
+      ? this.overlay
+          .position()
+          .flexibleConnectedTo({ x: event.clientX, y: event.clientY })
+          .withPositions(CONTEXT_MENU_POSITIONS)
+          .withLockedPosition(false)
+          .withFlexibleDimensions(false)
+          .withPush(true)
+      : this.defaultMenuConfig.positionStrategy;
+
+    const config = { ...this.defaultMenuConfig, positionStrategy, hasBackdrop: !event };
+
+    this.overlayRef = this.overlay.create(config);
 
     const templatePortal = new TemplatePortal(menu.templateRef(), this.viewContainerRef);
     this.overlayRef.attach(templatePortal);
 
-    this.closedEventsSub =
-      this.getClosedEvents()?.subscribe((event: KeyboardEvent | undefined) => {
-        // Closing the menu is handled in this.destroyMenu, so we want to prevent the escape key
-        // from doing its normal default action, which would otherwise cause a parent component
-        // (like a dialog) or extension window to close
-        if (event?.key === "Escape" && !hasModifierKey(event)) {
-          event.preventDefault();
-        }
-
-        if (event?.key && ["Tab", "Escape"].includes(event.key)) {
-          // Required to ensure tab order resumes correctly
-          this.elementRef.nativeElement.focus();
-        }
-        this.destroyMenu();
-      }) ?? null;
+    // Context menus are opened with a MouseEvent
+    const isContextMenu = !!event;
+    this.setupClosingActions(isContextMenu);
+    this.setupMenuCloseListener();
 
     if (menu.keyManager) {
       menu.keyManager.setFirstItemActive();
@@ -103,6 +151,32 @@ export class MenuTriggerForDirective implements OnDestroy {
     }
   }
 
+  /**
+   * Updates the position of the menu overlay based on the mouse event coordinates.
+   * This is typically called when the menu is already open and the user right-clicks again,
+   * allowing the menu to reposition itself to the new cursor location.
+   * @param event The MouseEvent containing the new clientX and clientY coordinates
+   */
+  private updateMenuPosition(event: MouseEvent) {
+    if (this.overlayRef == null) {
+      return;
+    }
+
+    const positionStrategy = this.overlay
+      .position()
+      .flexibleConnectedTo({ x: event.clientX, y: event.clientY })
+      .withPositions([
+        {
+          originX: "start",
+          originY: "top",
+          overlayX: "start",
+          overlayY: "top",
+        },
+      ]);
+
+    this.overlayRef.updatePositionStrategy(positionStrategy);
+  }
+
   private destroyMenu() {
     if (this.overlayRef == null || !this.isOpen) {
       return;
@@ -113,26 +187,63 @@ export class MenuTriggerForDirective implements OnDestroy {
     this.menu().closed.emit();
   }
 
-  private getClosedEvents(): Observable<any> | null {
+  private setupClosingActions(isContextMenu: boolean) {
     if (!this.overlayRef) {
-      return null;
+      return;
     }
-    const detachments = this.overlayRef.detachments();
+
     const escKey = this.overlayRef.keydownEvents().pipe(
       filter((event: KeyboardEvent) => {
         const keys = this.menu().ariaRole() === "menu" ? ["Escape", "Tab"] : ["Escape"];
         return keys.includes(event.key);
       }),
     );
-    const backdrop = this.overlayRef.backdropClick();
     const menuClosed = this.menu().closed;
+    const detachments = this.overlayRef.detachments();
 
-    return detachments.pipe(mergeWith(escKey, backdrop, menuClosed));
+    const closeEvents = isContextMenu
+      ? merge(detachments, escKey, menuClosed)
+      : merge(detachments, escKey, this.overlayRef.backdropClick(), menuClosed);
+
+    this.closedEventsSub = closeEvents
+      .pipe(takeUntil(this.overlayRef.detachments()))
+      .subscribe((event) => {
+        // Closing the menu is handled in this.destroyMenu, so we want to prevent the escape key
+        // from doing its normal default action, which would otherwise cause a parent component
+        // (like a dialog) or extension window to close
+        if (event instanceof KeyboardEvent && event.key === "Escape" && !hasModifierKey(event)) {
+          event.preventDefault();
+        }
+
+        if (event instanceof KeyboardEvent && (event.key === "Tab" || event.key === "Escape")) {
+          this.elementRef.nativeElement.focus();
+        }
+        this.destroyMenu();
+      });
+  }
+
+  /**
+   * Sets up a listener for clicks outside the menu overlay.
+   * We skip(1) because the initial right-click event that opens the menu is also
+   * considered an outside click event, which would immediately close the menu
+   */
+  private setupMenuCloseListener() {
+    if (!this.overlayRef) {
+      return;
+    }
+
+    this.menuCloseListenerSub = this.overlayRef
+      .outsidePointerEvents()
+      .pipe(skip(1), takeUntil(this.overlayRef.detachments()))
+      .subscribe((_) => {
+        this.destroyMenu();
+      });
   }
 
   private disposeAll() {
     this.closedEventsSub?.unsubscribe();
-    this.overlayRef?.dispose();
     this.keyDownEventsSub?.unsubscribe();
+    this.menuCloseListenerSub?.unsubscribe();
+    this.overlayRef?.dispose();
   }
 }
diff --git a/libs/components/src/menu/menu.component.spec.ts b/libs/components/src/menu/menu.component.spec.ts
index 3153fd4eb37..5ec614afade 100644
--- a/libs/components/src/menu/menu.component.spec.ts
+++ b/libs/components/src/menu/menu.component.spec.ts
@@ -7,7 +7,7 @@ import { MenuTriggerForDirective } from "./menu-trigger-for.directive";
 import { MenuModule } from "./index";
 
 describe("Menu", () => {
-  let fixture: ComponentFixture<TestApp>;
+  let fixture: ComponentFixture<TestAppComponent>;
   const getMenuTriggerDirective = () => {
     const buttonDebugElement = fixture.debugElement.query(By.directive(MenuTriggerForDirective));
     return buttonDebugElement.injector.get(MenuTriggerForDirective);
@@ -18,12 +18,12 @@ describe("Menu", () => {
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [TestApp],
+      imports: [TestAppComponent],
     });
 
     await TestBed.compileComponents();
 
-    fixture = TestBed.createComponent(TestApp);
+    fixture = TestBed.createComponent(TestAppComponent);
     fixture.detectChanges();
   });
 
@@ -68,6 +68,8 @@ describe("Menu", () => {
   });
 });
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "test-app",
   template: `
@@ -80,4 +82,4 @@ describe("Menu", () => {
   `,
   imports: [MenuModule],
 })
-class TestApp {}
+class TestAppComponent {}
diff --git a/libs/components/src/menu/menu.component.ts b/libs/components/src/menu/menu.component.ts
index 3cc4de9f90f..fc7a4673fea 100644
--- a/libs/components/src/menu/menu.component.ts
+++ b/libs/components/src/menu/menu.component.ts
@@ -10,8 +10,10 @@ import {
   contentChildren,
 } from "@angular/core";
 
-import { MenuItemDirective } from "./menu-item.directive";
+import { MenuItemComponent } from "./menu-item.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-menu",
   templateUrl: "./menu.component.html",
@@ -20,9 +22,11 @@ import { MenuItemDirective } from "./menu-item.directive";
 })
 export class MenuComponent implements AfterContentInit {
   readonly templateRef = viewChild.required(TemplateRef);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() closed = new EventEmitter<void>();
-  readonly menuItems = contentChildren(MenuItemDirective, { descendants: true });
-  keyManager?: FocusKeyManager<MenuItemDirective>;
+  readonly menuItems = contentChildren(MenuItemComponent, { descendants: true });
+  keyManager?: FocusKeyManager<MenuItemComponent>;
 
   readonly ariaRole = input<"menu" | "dialog">("menu");
 
diff --git a/libs/components/src/menu/menu.module.ts b/libs/components/src/menu/menu.module.ts
index 117460df559..a9a5e64dd9f 100644
--- a/libs/components/src/menu/menu.module.ts
+++ b/libs/components/src/menu/menu.module.ts
@@ -1,12 +1,12 @@
 import { NgModule } from "@angular/core";
 
 import { MenuDividerComponent } from "./menu-divider.component";
-import { MenuItemDirective } from "./menu-item.directive";
+import { MenuItemComponent } from "./menu-item.component";
 import { MenuTriggerForDirective } from "./menu-trigger-for.directive";
 import { MenuComponent } from "./menu.component";
 
 @NgModule({
-  imports: [MenuComponent, MenuTriggerForDirective, MenuItemDirective, MenuDividerComponent],
-  exports: [MenuComponent, MenuTriggerForDirective, MenuItemDirective, MenuDividerComponent],
+  imports: [MenuComponent, MenuTriggerForDirective, MenuItemComponent, MenuDividerComponent],
+  exports: [MenuComponent, MenuTriggerForDirective, MenuItemComponent, MenuDividerComponent],
 })
 export class MenuModule {}
diff --git a/libs/components/src/multi-select/multi-select.component.ts b/libs/components/src/multi-select/multi-select.component.ts
index 917bb7a9e3d..4e755d1deda 100644
--- a/libs/components/src/multi-select/multi-select.component.ts
+++ b/libs/components/src/multi-select/multi-select.component.ts
@@ -34,6 +34,8 @@ import { SelectItemView } from "./models/select-item-view";
 // Increments for each instance of this component
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-multi-select",
   templateUrl: "./multi-select.component.html",
@@ -64,6 +66,8 @@ export class MultiSelectComponent implements OnInit, BitFormFieldControl, Contro
   readonly loading = input(false);
   // TODO: Skipped for signal migration because:
   //  Your application code writes to the input. This prevents migration.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: booleanAttribute }) disabled?: boolean;
 
   // Internal tracking of selected items
@@ -79,6 +83,8 @@ export class MultiSelectComponent implements OnInit, BitFormFieldControl, Contro
   /**Implemented as part of NG_VALUE_ACCESSOR */
   private notifyOnTouched?: () => void;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onItemsConfirmed = new EventEmitter<any[]>();
 
   constructor(
@@ -208,6 +214,8 @@ export class MultiSelectComponent implements OnInit, BitFormFieldControl, Contro
   // TODO: Skipped for signal migration because:
   //  Accessor inputs cannot be migrated as they are too complex.
   @HostBinding("attr.required")
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get required() {
     return this._required ?? this.ngControl?.control?.hasValidator(Validators.required) ?? false;
diff --git a/libs/components/src/multi-select/scss/bw.theme.scss b/libs/components/src/multi-select/scss/bw.theme.scss
index b375c2f739c..dc3f3f32934 100644
--- a/libs/components/src/multi-select/scss/bw.theme.scss
+++ b/libs/components/src/multi-select/scss/bw.theme.scss
@@ -342,7 +342,7 @@ $ng-dropdown-shadow: rgb(var(--color-secondary-100)) !default;
       &.ng-option-selected.ng-option-marked {
         color: $ng-select-dropdown-optgroup-marked;
         background-color: $ng-select-selected;
-        font-weight: 600;
+        font-weight: 500;
       }
     }
     .ng-option {
@@ -356,7 +356,7 @@ $ng-dropdown-shadow: rgb(var(--color-secondary-100)) !default;
       &.ng-option-selected.ng-option-marked {
         color: $ng-select-selected-text;
         .ng-option-label {
-          font-weight: 600;
+          font-weight: 500;
         }
       }
       &.ng-option-marked {
diff --git a/libs/components/src/navigation/nav-base.component.ts b/libs/components/src/navigation/nav-base.component.ts
index 1ca40545cbb..706df2b25ad 100644
--- a/libs/components/src/navigation/nav-base.component.ts
+++ b/libs/components/src/navigation/nav-base.component.ts
@@ -1,4 +1,4 @@
-import { Directive, EventEmitter, Output, input } from "@angular/core";
+import { Directive, EventEmitter, Output, input, model } from "@angular/core";
 import { RouterLink, RouterLinkActive } from "@angular/router";
 
 /**
@@ -21,6 +21,16 @@ export abstract class NavBaseComponent {
    */
   readonly icon = input<string>();
 
+  /**
+   * If this item is used within a tree, set `variant` to `"tree"`
+   */
+  readonly variant = input<"default" | "tree">("default");
+
+  /**
+   * Depth level when nested inside of a `'tree'` variant
+   */
+  readonly treeDepth = model(0);
+
   /**
    * Optional route to be passed to internal `routerLink`. If not provided, the nav component will render as a button.
    *
@@ -61,5 +71,7 @@ export abstract class NavBaseComponent {
   /**
    * Fires when main content is clicked
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() mainContentClicked: EventEmitter<MouseEvent> = new EventEmitter();
 }
diff --git a/libs/components/src/navigation/nav-divider.component.ts b/libs/components/src/navigation/nav-divider.component.ts
index 52fb433c54d..2f33883fd58 100644
--- a/libs/components/src/navigation/nav-divider.component.ts
+++ b/libs/components/src/navigation/nav-divider.component.ts
@@ -3,6 +3,8 @@ import { Component } from "@angular/core";
 
 import { SideNavService } from "./side-nav.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-nav-divider",
   templateUrl: "./nav-divider.component.html",
diff --git a/libs/components/src/navigation/nav-group.component.html b/libs/components/src/navigation/nav-group.component.html
index 195569292f6..5a66eeafbf7 100644
--- a/libs/components/src/navigation/nav-group.component.html
+++ b/libs/components/src/navigation/nav-group.component.html
@@ -1,36 +1,50 @@
 <!-- This a higher order component that composes `NavItemComponent`  -->
+@let variantValue = variant();
+
 @if (!hideIfEmpty() || nestedNavComponents().length > 0) {
   <bit-nav-item
     [text]="text()"
     [icon]="icon()"
     [route]="route()"
+    [variant]="variantValue"
+    [treeDepth]="treeDepth()"
     [relativeTo]="relativeTo()"
     [routerLinkActiveOptions]="routerLinkActiveOptions()"
     (mainContentClicked)="handleMainContentClicked()"
     [ariaLabel]="ariaLabel()"
-    [hideActiveStyles]="parentHideActiveStyles"
+    [hideActiveStyles]="parentHideActiveStyles()"
+    [ariaCurrentWhenActive]="ariaCurrent()"
   >
     <ng-template #button>
       <button
         type="button"
         class="tw-ms-auto"
-        [bitIconButton]="open() ? 'bwi-angle-up' : 'bwi-angle-down'"
+        [ngClass]="{
+          'tw-transform tw-rotate-[90deg]': variantValue === 'tree' && !open(),
+        }"
+        [bitIconButton]="toggleButtonIcon()"
         [buttonType]="'nav-contrast'"
         (click)="toggle($event)"
         size="small"
-        aria-haspopup="true"
         [attr.aria-expanded]="open().toString()"
         [attr.aria-controls]="contentId"
         [label]="['toggleCollapse' | i18n, text()].join(' ')"
       ></button>
     </ng-template>
+    @if (variantValue === "tree") {
+      <ng-container slot="start">
+        <ng-container *ngTemplateOutlet="button"></ng-container>
+      </ng-container>
+    }
     <ng-container slot="end">
       <ng-content select="[slot=end]"></ng-content>
-      <ng-container *ngTemplateOutlet="button"></ng-container>
+      @if (variantValue !== "tree") {
+        <ng-container *ngTemplateOutlet="button"></ng-container>
+      }
     </ng-container>
   </bit-nav-item>
   <!-- [attr.aria-controls] of the above button expects a unique ID on the controlled element -->
-  @if (sideNavService.open$ | async) {
+  @if (sideNavOpen()) {
     @if (open()) {
       <div
         [attr.id]="contentId"
diff --git a/libs/components/src/navigation/nav-group.component.ts b/libs/components/src/navigation/nav-group.component.ts
index 1fa03ef52be..5797d34da5d 100644
--- a/libs/components/src/navigation/nav-group.component.ts
+++ b/libs/components/src/navigation/nav-group.component.ts
@@ -9,7 +9,10 @@ import {
   input,
   model,
   contentChildren,
+  computed,
 } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { RouterLinkActive } from "@angular/router";
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
@@ -19,6 +22,8 @@ import { NavBaseComponent } from "./nav-base.component";
 import { NavGroupAbstraction, NavItemComponent } from "./nav-item.component";
 import { SideNavService } from "./side-nav.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-nav-group",
   templateUrl: "./nav-group.component.html",
@@ -29,12 +34,48 @@ import { SideNavService } from "./side-nav.service";
   imports: [CommonModule, NavItemComponent, IconButtonModule, I18nPipe],
 })
 export class NavGroupComponent extends NavBaseComponent {
-  readonly nestedNavComponents = contentChildren(NavBaseComponent, { descendants: true });
+  // Query direct children for hideIfEmpty functionality
+  readonly nestedNavComponents = contentChildren(NavBaseComponent, { descendants: false });
+
+  readonly sideNavOpen = toSignal(this.sideNavService.open$);
+
+  readonly sideNavAndGroupOpen = computed(() => {
+    return this.open() && this.sideNavOpen();
+  });
 
   /** When the side nav is open, the parent nav item should not show active styles when open. */
-  protected get parentHideActiveStyles(): boolean {
-    return this.hideActiveStyles() || (this.open() && this.sideNavService.open);
-  }
+  readonly parentHideActiveStyles = computed(() => {
+    return this.hideActiveStyles() || this.sideNavAndGroupOpen();
+  });
+
+  /**
+   * Determines the appropriate icon for the toggle button based on variant and open state.
+   * - Tree variant: Always uses 'bwi-up-solid'
+   * - Default variant: Uses 'bwi-angle-up' when open, 'bwi-angle-down' when closed
+   */
+  readonly toggleButtonIcon = computed(() => {
+    if (this.variant() === "tree") {
+      return "bwi-up-solid";
+    }
+    return this.open() ? "bwi-angle-up" : "bwi-angle-down";
+  });
+
+  /**
+   * Allow overriding of the RouterLink['ariaCurrentWhenActive'] property.
+   *
+   * By default, assuming that the nav group navigates to its first child page instead of its
+   * own page, the nav group will be `current` when the side nav is collapsed or the nav group
+   * is collapsed (since child pages don't show in either collapsed view) and not `current`
+   * when the side nav and nav group are open (since the child page will show as `current`).
+   *
+   * If the nav group navigates to its own page, use this property to always set it to announce
+   * as `current` by passing in `"page"`.
+   */
+  readonly ariaCurrentWhenActive = input<RouterLinkActive["ariaCurrentWhenActive"]>();
+
+  readonly ariaCurrent = computed(() => {
+    return this.ariaCurrentWhenActive() ?? (this.sideNavAndGroupOpen() ? undefined : "page");
+  });
 
   /**
    * UID for `[attr.aria-controls]`
@@ -51,6 +92,8 @@ export class NavGroupComponent extends NavBaseComponent {
    */
   readonly hideIfEmpty = input(false, { transform: booleanAttribute });
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   openChange = new EventEmitter<boolean>();
 
@@ -59,14 +102,20 @@ export class NavGroupComponent extends NavBaseComponent {
     @Optional() @SkipSelf() private parentNavGroup: NavGroupComponent,
   ) {
     super();
+
+    // Set tree depth based on parent's depth
+    // Both NavGroups and NavItems use constructor-based depth initialization
+    if (this.parentNavGroup) {
+      this.treeDepth.set(this.parentNavGroup.treeDepth() + 1);
+    }
   }
 
   setOpen(isOpen: boolean) {
     this.open.set(isOpen);
     this.openChange.emit(this.open());
-    // FIXME: Remove when updating file. Eslint update
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-    this.open() && this.parentNavGroup?.setOpen(this.open());
+    if (this.open()) {
+      this.parentNavGroup?.setOpen(this.open());
+    }
   }
 
   protected toggle(event?: MouseEvent) {
diff --git a/libs/components/src/navigation/nav-group.stories.ts b/libs/components/src/navigation/nav-group.stories.ts
index 7aa9279e0e2..d5c381ac3e3 100644
--- a/libs/components/src/navigation/nav-group.stories.ts
+++ b/libs/components/src/navigation/nav-group.stories.ts
@@ -12,6 +12,8 @@ import { I18nMockService } from "../utils/i18n-mock.service";
 import { NavGroupComponent } from "./nav-group.component";
 import { NavigationModule } from "./navigation.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: "",
 })
@@ -64,7 +66,6 @@ export default {
       type: "figma",
       url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-40145&t=b5tDKylm5sWm2yKo-4",
     },
-    chromatic: { viewports: [640, 1280] },
   },
 } as Meta;
 
@@ -131,3 +132,27 @@ export const Secondary: StoryObj<NavGroupComponent> = {
     `,
   }),
 };
+
+export const Tree: StoryObj<NavGroupComponent> = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-side-nav>
+        <bit-nav-group text="Tree example" icon="bwi-collection-shared" [open]="true">
+          <bit-nav-item text="Level 1 - no children" route="t2" icon="bwi-collection-shared" [variant]="'tree'"></bit-nav-item>
+          <bit-nav-group text="Level 1 - with children" route="t3" icon="bwi-collection-shared" [variant]="'tree'" [open]="true">
+            <bit-nav-group text="Level 2 - with children" route="t4" icon="bwi-collection-shared" variant="tree" [open]="true">
+              <bit-nav-item text="Level 3 - no children, no icon" route="t5" variant="tree"></bit-nav-item>
+              <bit-nav-group text="Level 3 - with children" route="t6" icon="bwi-collection-shared" variant="tree" [open]="true">
+                <bit-nav-item text="Level 4 - no children, no icon" route="t7" variant="tree"></bit-nav-item>
+                <bit-nav-group text="Level 4 - with children" route="t6" icon="bwi-collection-shared" variant="tree" [open]="true">
+                  <bit-nav-item text="Level 5 - no children, no icon" route="t7" variant="tree"></bit-nav-item>
+                </bit-nav-group>
+              </bit-nav-group>
+            </bit-nav-group>
+          </bit-nav-group>
+        </bit-nav-group>
+      </bit-side-nav>
+    `,
+  }),
+};
diff --git a/libs/components/src/navigation/nav-item.component.html b/libs/components/src/navigation/nav-item.component.html
index f7d55a33362..1de8a9bd167 100644
--- a/libs/components/src/navigation/nav-item.component.html
+++ b/libs/components/src/navigation/nav-item.component.html
@@ -2,6 +2,9 @@
   @let open = sideNavService.open$ | async;
   @if (open || icon()) {
     <div
+      [ngStyle]="{
+        'padding-inline-start': navItemIndentationPadding(),
+      }"
       class="tw-relative tw-rounded-md tw-h-10"
       [ngClass]="[
         showActiveStyles
@@ -11,39 +14,53 @@
       ]"
     >
       <div class="tw-relative tw-flex tw-items-center tw-h-full">
-        <ng-container *ngIf="route; then isAnchor; else isButton"></ng-container>
+        @if (open) {
+          <div
+            class="tw-absolute tw-left-[0px] tw-transform tw--translate-x-[calc(100%_+_4px)] [&>*:focus-visible::before]:!tw-ring-text-alt2 [&>*:hover]:!tw-border-text-alt2 [&>*]:tw-text-alt2"
+          >
+            <ng-content select="[slot=start]"></ng-content>
+          </div>
+        }
+        <ng-container *ngIf="route(); then isAnchor; else isButton"></ng-container>
 
         <!-- Main content of `NavItem` -->
         <ng-template #anchorAndButtonContent>
           <div
+            [ngClass]="[
+              variant() === 'tree' || treeDepth() > 0 ? 'tw-py-0' : 'tw-py-2',
+              open ? 'tw-pe-4' : 'tw-text-center',
+            ]"
             [title]="text()"
-            class="tw-gap-2 tw-flex tw-items-center tw-font-bold tw-h-full"
+            class="tw-gap-2 tw-flex tw-items-center tw-font-medium 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() }}"
-              [attr.aria-hidden]="open"
-              [attr.aria-label]="text()"
-            ></i>
+            @if (icon()) {
+              <i
+                class="!tw-m-0 tw-w-4 tw-shrink-0 bwi bwi-fw tw-text-alt2 {{ icon() }}"
+                [attr.aria-hidden]="open"
+                [attr.aria-label]="text()"
+              ></i>
+            }
             @if (open) {
               <span class="tw-truncate">{{ text() }}</span>
             }
           </div>
         </ng-template>
 
-        <!-- Show if a value was passed to `this.to` -->
+        <!-- Show if a value was passed to `this.route` -->
         <ng-template #isAnchor>
           <!-- 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-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]"
+            [ngClass]="{ 'tw-ps-0': variant() === 'tree' || treeDepth() > 0 }"
             data-fvw
             [routerLink]="route()"
             [relativeTo]="relativeTo()"
             [attr.aria-label]="ariaLabel() || text()"
             routerLinkActive
             [routerLinkActiveOptions]="routerLinkActiveOptions()"
-            [ariaCurrentWhenActive]="'page'"
+            [ariaCurrentWhenActive]="ariaCurrentWhenActive()"
             (isActiveChange)="setIsActive($event)"
             (click)="mainContentClicked.emit()"
           >
@@ -51,12 +68,13 @@
           </a>
         </ng-template>
 
-        <!-- Show if `this.to` is falsy -->
+        <!-- Show if `this.route` is falsy -->
         <ng-template #isButton>
           <!-- Class field should match `#isAnchor` class field above -->
           <button
             type="button"
-            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]"
+            class="tw-size-full tw-px-4 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]"
+            [ngClass]="open ? 'tw-pe-3' : 'tw-pe-4'"
             data-fvw
             (click)="mainContentClicked.emit()"
           >
diff --git a/libs/components/src/navigation/nav-item.component.ts b/libs/components/src/navigation/nav-item.component.ts
index 8d57a752702..b32ca0e3fde 100644
--- a/libs/components/src/navigation/nav-item.component.ts
+++ b/libs/components/src/navigation/nav-item.component.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from "@angular/common";
-import { Component, HostListener, Optional, input } from "@angular/core";
-import { RouterModule } from "@angular/router";
+import { Component, HostListener, Optional, computed, input, model } from "@angular/core";
+import { RouterLinkActive, RouterModule } from "@angular/router";
 import { BehaviorSubject, map } from "rxjs";
 
 import { IconButtonModule } from "../icon-button";
@@ -11,8 +11,11 @@ import { SideNavService } from "./side-nav.service";
 // Resolves a circular dependency between `NavItemComponent` and `NavItemGroup` when using standalone components.
 export abstract class NavGroupAbstraction {
   abstract setOpen(open: boolean): void;
+  abstract treeDepth: ReturnType<typeof model<number>>;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-nav-item",
   templateUrl: "./nav-item.component.html",
@@ -20,6 +23,18 @@ export abstract class NavGroupAbstraction {
   imports: [CommonModule, IconButtonModule, RouterModule],
 })
 export class NavItemComponent extends NavBaseComponent {
+  /**
+   * Base padding for tree variant items (in rem)
+   * This provides the initial indentation for tree items before depth-based padding
+   */
+  protected readonly TREE_BASE_PADDING = 2.5;
+
+  /**
+   * Padding increment per tree depth level (in rem)
+   * Each nested level adds this amount of padding to visually indicate hierarchy
+   */
+  protected readonly TREE_DEPTH_PADDING = 1.75;
+
   /** Forces active styles to be shown, regardless of the `routerLinkActiveOptions` */
   readonly forceActiveStyles = input<boolean>(false);
 
@@ -37,6 +52,30 @@ export class NavItemComponent extends NavBaseComponent {
     return this.forceActiveStyles() || (this._isActive && !this.hideActiveStyles());
   }
 
+  /**
+   * adding calculation for tree variant due to needing visual alignment on different indentation levels needed between the first level and subsequent levels
+   */
+  protected readonly navItemIndentationPadding = computed(() => {
+    const open = this.sideNavService.open;
+    const depth = this.treeDepth() ?? 0;
+
+    if (open && this.variant() === "tree") {
+      return depth === 1
+        ? `${this.TREE_BASE_PADDING}rem`
+        : `${this.TREE_BASE_PADDING + (depth - 1) * this.TREE_DEPTH_PADDING}rem`;
+    }
+
+    return `${this.TREE_BASE_PADDING * depth}rem`;
+  });
+
+  /**
+   * Allow overriding of the RouterLink['ariaCurrentWhenActive'] property.
+   *
+   * Useful for situations like nav-groups that navigate to their first child page and should
+   * not be marked `current` while the child page is marked as `current`
+   */
+  readonly ariaCurrentWhenActive = input<RouterLinkActive["ariaCurrentWhenActive"]>("page");
+
   /**
    * The design spec calls for the an outline to wrap the entire element when the template's
    * anchor/button has :focus-visible. Usually, we would use :focus-within for this. However, that
@@ -68,5 +107,10 @@ export class NavItemComponent extends NavBaseComponent {
     @Optional() private parentNavGroup: NavGroupAbstraction,
   ) {
     super();
+
+    // Set tree depth based on parent's depth
+    if (this.parentNavGroup) {
+      this.treeDepth.set(this.parentNavGroup.treeDepth() + 1);
+    }
   }
 }
diff --git a/libs/components/src/navigation/nav-item.stories.ts b/libs/components/src/navigation/nav-item.stories.ts
index 7e88e16ccac..91fc0b02e89 100644
--- a/libs/components/src/navigation/nav-item.stories.ts
+++ b/libs/components/src/navigation/nav-item.stories.ts
@@ -42,7 +42,7 @@ export default {
       type: "figma",
       url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-40145&t=b5tDKylm5sWm2yKo-4",
     },
-    chromatic: { viewports: [640, 1280] },
+    chromatic: { delay: 1000 },
   },
 } as Meta;
 
@@ -135,3 +135,28 @@ export const ForceActiveStyles: Story = {
     `,
   }),
 };
+
+export const CollapsedNavItems: Story = {
+  render: (args) => ({
+    props: args,
+    template: `
+      <bit-nav-item text="First Nav" icon="bwi-collection-shared"></bit-nav-item>
+      <bit-nav-item text="Active Nav" icon="bwi-collection-shared" [forceActiveStyles]="true"></bit-nav-item>
+      <bit-nav-item text="Third Nav" icon="bwi-collection-shared"></bit-nav-item>
+    `,
+  }),
+  play: async () => {
+    const toggleButton = document.querySelector(
+      "[aria-label='Toggle side navigation']",
+    ) as HTMLButtonElement;
+
+    if (toggleButton) {
+      toggleButton.click();
+    }
+  },
+  parameters: {
+    chromatic: {
+      delay: 1000,
+    },
+  },
+};
diff --git a/libs/components/src/navigation/nav-logo.component.ts b/libs/components/src/navigation/nav-logo.component.ts
index 96258740d74..0602e8b753c 100644
--- a/libs/components/src/navigation/nav-logo.component.ts
+++ b/libs/components/src/navigation/nav-logo.component.ts
@@ -8,6 +8,8 @@ import { BitIconComponent } from "../icon/icon.component";
 
 import { SideNavService } from "./side-nav.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-nav-logo",
   templateUrl: "./nav-logo.component.html",
diff --git a/libs/components/src/navigation/side-nav.component.ts b/libs/components/src/navigation/side-nav.component.ts
index fe428c7011f..d64db635bbd 100644
--- a/libs/components/src/navigation/side-nav.component.ts
+++ b/libs/components/src/navigation/side-nav.component.ts
@@ -1,6 +1,6 @@
 import { CdkTrapFocus } from "@angular/cdk/a11y";
 import { CommonModule } from "@angular/common";
-import { Component, ElementRef, input, viewChild } from "@angular/core";
+import { Component, ElementRef, inject, input, viewChild } from "@angular/core";
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
@@ -11,6 +11,8 @@ import { SideNavService } from "./side-nav.service";
 
 export type SideNavVariant = "primary" | "secondary";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-side-nav",
   templateUrl: "side-nav.component.html",
@@ -20,8 +22,7 @@ export class SideNavComponent {
   readonly variant = input<SideNavVariant>("primary");
 
   private readonly toggleButton = viewChild("toggleButton", { read: ElementRef });
-
-  constructor(protected sideNavService: SideNavService) {}
+  protected sideNavService = inject(SideNavService);
 
   protected handleKeyDown = (event: KeyboardEvent) => {
     if (event.key === "Escape") {
diff --git a/libs/components/src/navigation/side-nav.service.ts b/libs/components/src/navigation/side-nav.service.ts
index 5a67f2c965b..ce44811c7e0 100644
--- a/libs/components/src/navigation/side-nav.service.ts
+++ b/libs/components/src/navigation/side-nav.service.ts
@@ -2,25 +2,36 @@ import { Injectable } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { BehaviorSubject, Observable, combineLatest, fromEvent, map, startWith } from "rxjs";
 
+import { BREAKPOINTS, isAtOrLargerThanBreakpoint } from "../utils/responsive-utils";
+
+type CollapsePreference = "open" | "closed" | null;
+
 @Injectable({
   providedIn: "root",
 })
 export class SideNavService {
-  private _open$ = new BehaviorSubject<boolean>(!window.matchMedia("(max-width: 768px)").matches);
+  private _open$ = new BehaviorSubject<boolean>(isAtOrLargerThanBreakpoint("md"));
   open$ = this._open$.asObservable();
 
-  private isSmallScreen$ = media("(max-width: 768px)");
+  private isLargeScreen$ = media(`(min-width: ${BREAKPOINTS.md}px)`);
+  private _userCollapsePreference$ = new BehaviorSubject<CollapsePreference>(null);
+  userCollapsePreference$ = this._userCollapsePreference$.asObservable();
 
-  isOverlay$ = combineLatest([this.open$, this.isSmallScreen$]).pipe(
-    map(([open, isSmallScreen]) => open && isSmallScreen),
+  isOverlay$ = combineLatest([this.open$, this.isLargeScreen$]).pipe(
+    map(([open, isLargeScreen]) => open && !isLargeScreen),
   );
 
   constructor() {
-    this.isSmallScreen$.pipe(takeUntilDestroyed()).subscribe((isSmallScreen) => {
-      if (isSmallScreen) {
-        this.setClose();
-      }
-    });
+    combineLatest([this.isLargeScreen$, this.userCollapsePreference$])
+      .pipe(takeUntilDestroyed())
+      .subscribe(([isLargeScreen, userCollapsePreference]) => {
+        if (!isLargeScreen) {
+          this.setClose();
+        } else if (userCollapsePreference !== "closed") {
+          // Auto-open when user hasn't set preference (null) or prefers open
+          this.setOpen();
+        }
+      });
   }
 
   get open() {
@@ -37,6 +48,9 @@ export class SideNavService {
 
   toggle() {
     const curr = this._open$.getValue();
+    // Store user's preference based on what state they're toggling TO
+    this._userCollapsePreference$.next(curr ? "closed" : "open");
+
     if (curr) {
       this.setClose();
     } else {
diff --git a/libs/components/src/no-items/no-items.component.html b/libs/components/src/no-items/no-items.component.html
index 8caaea3b8ed..e728584a41a 100644
--- a/libs/components/src/no-items/no-items.component.html
+++ b/libs/components/src/no-items/no-items.component.html
@@ -3,7 +3,7 @@
     <div class="tw-size-24 tw-content-center">
       <bit-icon [icon]="icon()" aria-hidden="true"></bit-icon>
     </div>
-    <h3 class="tw-font-semibold tw-text-center tw-mt-4">
+    <h3 class="tw-font-medium tw-text-center tw-mt-4">
       <ng-content select="[slot=title]"></ng-content>
     </h3>
     <p class="tw-text-center">
diff --git a/libs/components/src/no-items/no-items.component.ts b/libs/components/src/no-items/no-items.component.ts
index 517abfc9533..c6e52a1f83d 100644
--- a/libs/components/src/no-items/no-items.component.ts
+++ b/libs/components/src/no-items/no-items.component.ts
@@ -7,6 +7,8 @@ import { BitIconComponent } from "../icon/icon.component";
 /**
  * Component for displaying a message when there are no items to display. Expects title, description and button slots.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-no-items",
   templateUrl: "./no-items.component.html",
diff --git a/libs/components/src/popover/popover.component.html b/libs/components/src/popover/popover.component.html
index 756ac27b749..7fd210fcb00 100644
--- a/libs/components/src/popover/popover.component.html
+++ b/libs/components/src/popover/popover.component.html
@@ -12,7 +12,7 @@
         class="tw-relative tw-z-20 tw-w-72 tw-break-words tw-bg-primary-100 tw-pb-4 tw-pt-2 tw-text-main"
       >
         <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">
+          <h2 bitTypography="h5" class="tw-font-medium tw-mt-1">
             {{ title() }}
           </h2>
           <button
diff --git a/libs/components/src/popover/popover.component.ts b/libs/components/src/popover/popover.component.ts
index 78bc2abe369..024a293ada3 100644
--- a/libs/components/src/popover/popover.component.ts
+++ b/libs/components/src/popover/popover.component.ts
@@ -5,6 +5,8 @@ import { IconButtonModule } from "../icon-button/icon-button.module";
 import { SharedModule } from "../shared/shared.module";
 import { TypographyModule } from "../typography";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-popover",
   imports: [A11yModule, IconButtonModule, SharedModule, TypographyModule],
@@ -14,5 +16,7 @@ import { TypographyModule } from "../typography";
 export class PopoverComponent {
   readonly templateRef = viewChild.required(TemplateRef);
   readonly title = input("");
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() closed = new EventEmitter();
 }
diff --git a/libs/components/src/popover/popover.stories.ts b/libs/components/src/popover/popover.stories.ts
index 6d2cf77e47d..596381d0777 100644
--- a/libs/components/src/popover/popover.stories.ts
+++ b/libs/components/src/popover/popover.stories.ts
@@ -23,6 +23,7 @@ export default {
           useFactory: () => {
             return new I18nMockService({
               close: "Close",
+              loading: "Loading",
             });
           },
         },
diff --git a/libs/components/src/progress/progress.component.ts b/libs/components/src/progress/progress.component.ts
index cd1d55ac9eb..bee6057dbdc 100644
--- a/libs/components/src/progress/progress.component.ts
+++ b/libs/components/src/progress/progress.component.ts
@@ -20,6 +20,8 @@ const BackgroundClasses: Record<BackgroundType, string[]> = {
 /**
  * Progress indicators may be used to visually indicate progress or to visually measure some other value, such as a password strength indicator.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-progress",
   templateUrl: "./progress.component.html",
@@ -49,7 +51,7 @@ export class ProgressComponent {
       "tw-items-center",
       "tw-whitespace-nowrap",
       "tw-text-xs",
-      "tw-font-semibold",
+      "tw-font-medium",
       "tw-text-contrast",
       "tw-transition-all",
     ]
diff --git a/libs/components/src/radio-button/radio-button.component.spec.ts b/libs/components/src/radio-button/radio-button.component.spec.ts
index b47c1823160..3ce5ebae65e 100644
--- a/libs/components/src/radio-button/radio-button.component.spec.ts
+++ b/libs/components/src/radio-button/radio-button.component.spec.ts
@@ -53,6 +53,8 @@ describe("RadioButton", () => {
   });
 });
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "test-component",
   template: `
diff --git a/libs/components/src/radio-button/radio-button.component.ts b/libs/components/src/radio-button/radio-button.component.ts
index 84ed240b3f8..a004e7e07e2 100644
--- a/libs/components/src/radio-button/radio-button.component.ts
+++ b/libs/components/src/radio-button/radio-button.component.ts
@@ -7,6 +7,8 @@ import { RadioInputComponent } from "./radio-input.component";
 
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-radio-button",
   templateUrl: "radio-button.component.html",
diff --git a/libs/components/src/radio-button/radio-group.component.html b/libs/components/src/radio-button/radio-group.component.html
index e16c532620a..f39b93680d5 100644
--- a/libs/components/src/radio-button/radio-group.component.html
+++ b/libs/components/src/radio-button/radio-group.component.html
@@ -1,6 +1,6 @@
 @if (label()) {
   <fieldset>
-    <legend class="tw-mb-1 tw-block tw-text-sm tw-font-semibold tw-text-main">
+    <legend class="tw-mb-1 tw-block tw-text-sm tw-font-medium tw-text-main">
       <ng-content select="bit-label"></ng-content>
       @if (required) {
         <span class="tw-text-xs tw-font-normal"> ({{ "required" | i18n }})</span>
diff --git a/libs/components/src/radio-button/radio-group.component.spec.ts b/libs/components/src/radio-button/radio-group.component.spec.ts
index ff01b9323f7..8d70dde9a56 100644
--- a/libs/components/src/radio-button/radio-group.component.spec.ts
+++ b/libs/components/src/radio-button/radio-group.component.spec.ts
@@ -11,19 +11,19 @@ import { RadioButtonComponent } from "./radio-button.component";
 import { RadioButtonModule } from "./radio-button.module";
 
 describe("RadioGroupComponent", () => {
-  let fixture: ComponentFixture<TestApp>;
-  let testAppComponent: TestApp;
+  let fixture: ComponentFixture<TestAppComponent>;
+  let testAppComponent: TestAppComponent;
   let buttonElements: RadioButtonComponent[];
   let radioButtons: HTMLInputElement[];
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [TestApp],
+      imports: [TestAppComponent],
       providers: [{ provide: I18nService, useValue: new I18nMockService({}) }],
     });
 
     await TestBed.compileComponents();
-    fixture = TestBed.createComponent(TestApp);
+    fixture = TestBed.createComponent(TestAppComponent);
     fixture.detectChanges();
     testAppComponent = fixture.debugElement.componentInstance;
     buttonElements = fixture.debugElement
@@ -63,6 +63,8 @@ describe("RadioGroupComponent", () => {
   });
 });
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "test-app",
   template: `
@@ -74,6 +76,6 @@ describe("RadioGroupComponent", () => {
   `,
   imports: [FormsModule, RadioButtonModule],
 })
-class TestApp {
+class TestAppComponent {
   selected?: string;
 }
diff --git a/libs/components/src/radio-button/radio-group.component.ts b/libs/components/src/radio-button/radio-group.component.ts
index baa2cd58d80..7a1288b71e5 100644
--- a/libs/components/src/radio-button/radio-group.component.ts
+++ b/libs/components/src/radio-button/radio-group.component.ts
@@ -4,10 +4,12 @@ import { ControlValueAccessor, NgControl, Validators } from "@angular/forms";
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
-import { BitLabel } from "../form-control/label.component";
+import { BitLabelComponent } from "../form-control/label.component";
 
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-radio-group",
   templateUrl: "radio-group.component.html",
@@ -30,7 +32,7 @@ export class RadioGroupComponent implements ControlValueAccessor {
   readonly id = input(`bit-radio-group-${nextId++}`);
   @HostBinding("class") classList = ["tw-block", "tw-mb-4"];
 
-  protected readonly label = contentChild(BitLabel);
+  protected readonly label = contentChild(BitLabelComponent);
 
   constructor(@Optional() @Self() private ngControl?: NgControl) {
     if (ngControl != null) {
diff --git a/libs/components/src/radio-button/radio-input.component.ts b/libs/components/src/radio-button/radio-input.component.ts
index e32dc5c572d..47bb799d88e 100644
--- a/libs/components/src/radio-button/radio-input.component.ts
+++ b/libs/components/src/radio-button/radio-input.component.ts
@@ -5,6 +5,8 @@ import { BitFormControlAbstraction } from "../form-control";
 
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "input[type=radio][bitRadio]",
   template: "",
diff --git a/libs/components/src/resize-observer/resize-observer.directive.ts b/libs/components/src/resize-observer/resize-observer.directive.ts
index 5943636f450..68b859c3191 100644
--- a/libs/components/src/resize-observer/resize-observer.directive.ts
+++ b/libs/components/src/resize-observer/resize-observer.directive.ts
@@ -13,6 +13,8 @@ export class ResizeObserverDirective implements OnDestroy {
     }
   });
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   resize = new EventEmitter();
 
diff --git a/libs/components/src/search/search.component.ts b/libs/components/src/search/search.component.ts
index 65568b241fb..576031d50a7 100644
--- a/libs/components/src/search/search.component.ts
+++ b/libs/components/src/search/search.component.ts
@@ -18,6 +18,8 @@ let nextId = 0;
 /**
  * Do not nest Search components inside another `<form>`, as they already contain their own standalone `<form>` element for searching.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-search",
   templateUrl: "./search.component.html",
@@ -45,10 +47,12 @@ export class SearchComponent implements ControlValueAccessor, FocusableElement {
   // Use `type="text"` for Safari to improve rendering performance
   protected inputType = isBrowserSafariApi() ? ("text" as const) : ("search" as const);
 
-  protected isInputFocused = signal(false);
-  protected isFormHovered = signal(false);
+  protected readonly isInputFocused = signal(false);
+  protected readonly isFormHovered = signal(false);
 
-  protected showResetButton = computed(() => this.isInputFocused() || this.isFormHovered());
+  protected readonly showResetButton = computed(
+    () => this.isInputFocused() || this.isFormHovered(),
+  );
 
   readonly disabled = model<boolean>();
   readonly placeholder = input<string>();
diff --git a/libs/components/src/section/section-header.component.ts b/libs/components/src/section/section-header.component.ts
index c96f9486b52..27577590f41 100644
--- a/libs/components/src/section/section-header.component.ts
+++ b/libs/components/src/section/section-header.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { TypographyModule } from "../typography";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-section-header",
   templateUrl: "./section-header.component.html",
diff --git a/libs/components/src/section/section.component.ts b/libs/components/src/section/section.component.ts
index f65c492a0c1..1ad80610637 100644
--- a/libs/components/src/section/section.component.ts
+++ b/libs/components/src/section/section.component.ts
@@ -2,6 +2,8 @@ import { coerceBooleanProperty } from "@angular/cdk/coercion";
 import { CommonModule } from "@angular/common";
 import { Component, input } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-section",
   imports: [CommonModule],
diff --git a/libs/components/src/select/option.component.ts b/libs/components/src/select/option.component.ts
index ae75fe6514d..b981d0e0bdc 100644
--- a/libs/components/src/select/option.component.ts
+++ b/libs/components/src/select/option.component.ts
@@ -2,6 +2,8 @@ import { Component, booleanAttribute, input } from "@angular/core";
 
 import { MappedOptionComponent } from "./option";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-option",
   template: `<ng-template><ng-content></ng-content></ng-template>`,
diff --git a/libs/components/src/select/select.component.html b/libs/components/src/select/select.component.html
index 2a5483b15c1..224ee6b8b78 100644
--- a/libs/components/src/select/select.component.html
+++ b/libs/components/src/select/select.component.html
@@ -10,6 +10,7 @@
   (close)="onClose()"
   appendTo="body"
   [keyDownFn]="onKeyDown"
+  [attr.aria-label]="selectedOption()?.label ?? placeholder()"
 >
   <ng-template ng-option-tmp let-item="item">
     <div class="tw-flex" [title]="item.label">
diff --git a/libs/components/src/select/select.component.spec.ts b/libs/components/src/select/select.component.spec.ts
index cfc69636224..21ae50611a7 100644
--- a/libs/components/src/select/select.component.spec.ts
+++ b/libs/components/src/select/select.component.spec.ts
@@ -9,6 +9,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { SelectComponent } from "./select.component";
 import { SelectModule } from "./select.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [SelectModule, ReactiveFormsModule],
   template: `
diff --git a/libs/components/src/select/select.component.ts b/libs/components/src/select/select.component.ts
index 90b39e9c13a..f6358ccf6c6 100644
--- a/libs/components/src/select/select.component.ts
+++ b/libs/components/src/select/select.component.ts
@@ -34,6 +34,8 @@ import { OptionComponent } from "./option.component";
 
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-select",
   templateUrl: "select.component.html",
@@ -50,10 +52,12 @@ export class SelectComponent<T> implements BitFormFieldControl, ControlValueAcce
   readonly items = model<Option<T>[] | undefined>();
 
   readonly placeholder = input(this.i18nService.t("selectPlaceholder"));
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() closed = new EventEmitter();
 
-  protected selectedValue = signal<T | undefined | null>(undefined);
-  selectedOption: Signal<Option<T> | null | undefined> = computed(() =>
+  protected readonly selectedValue = signal<T | undefined | null>(undefined);
+  readonly selectedOption: Signal<Option<T> | null | undefined> = computed(() =>
     this.findSelectedOption(this.items(), this.selectedValue()),
   );
   protected searchInputId = `bit-select-search-input-${nextId++}`;
@@ -70,6 +74,8 @@ export class SelectComponent<T> implements BitFormFieldControl, ControlValueAcce
     }
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ContentChildren(OptionComponent)
   protected set options(value: QueryList<OptionComponent<T>>) {
     if (value == null || value.length == 0) {
@@ -94,6 +100,8 @@ export class SelectComponent<T> implements BitFormFieldControl, ControlValueAcce
   }
   // TODO: Skipped for signal migration because:
   //  Accessor inputs cannot be migrated as they are too complex.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get disabled() {
     return this._disabled ?? this.ngControl?.disabled ?? false;
@@ -166,6 +174,8 @@ export class SelectComponent<T> implements BitFormFieldControl, ControlValueAcce
   // TODO: Skipped for signal migration because:
   //  Accessor inputs cannot be migrated as they are too complex.
   @HostBinding("attr.required")
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get required() {
     return this._required ?? this.ngControl?.control?.hasValidator(Validators.required) ?? false;
diff --git a/libs/components/src/shared/button-like.abstraction.ts b/libs/components/src/shared/button-like.abstraction.ts
index 63391743837..45a661b6ecb 100644
--- a/libs/components/src/shared/button-like.abstraction.ts
+++ b/libs/components/src/shared/button-like.abstraction.ts
@@ -1,6 +1,6 @@
 import { ModelSignal } from "@angular/core";
 
-export type ButtonType = "primary" | "secondary" | "danger" | "unstyled";
+export type ButtonType = "primary" | "secondary" | "danger" | "dangerPrimary" | "unstyled";
 
 export type ButtonSize = "default" | "small";
 
diff --git a/libs/components/src/shared/icon.ts b/libs/components/src/shared/icon.ts
new file mode 100644
index 00000000000..6830ce49d7c
--- /dev/null
+++ b/libs/components/src/shared/icon.ts
@@ -0,0 +1,110 @@
+/**
+ * Array of available Bitwarden Web Icons (bwi) font names.
+ * These correspond to the actual icon names defined in the bwi-font.
+ * This array serves as the single source of truth for all available icons.
+ */
+export const BITWARDEN_ICONS = [
+  "bwi-angle-down",
+  "bwi-angle-left",
+  "bwi-angle-right",
+  "bwi-angle-up",
+  "bwi-archive",
+  "bwi-bell",
+  "bwi-billing",
+  "bwi-bitcoin",
+  "bwi-browser",
+  "bwi-browser-alt",
+  "bwi-brush",
+  "bwi-bug",
+  "bwi-business",
+  "bwi-camera",
+  "bwi-check",
+  "bwi-check-circle",
+  "bwi-cli",
+  "bwi-clock",
+  "bwi-clone",
+  "bwi-close",
+  "bwi-cog",
+  "bwi-cog-f",
+  "bwi-collection",
+  "bwi-collection-shared",
+  "bwi-credit-card",
+  "bwi-dashboard",
+  "bwi-desktop",
+  "bwi-dollar",
+  "bwi-down-solid",
+  "bwi-download",
+  "bwi-drag-and-drop",
+  "bwi-ellipsis-h",
+  "bwi-ellipsis-v",
+  "bwi-envelope",
+  "bwi-error",
+  "bwi-exclamation-triangle",
+  "bwi-external-link",
+  "bwi-eye",
+  "bwi-eye-slash",
+  "bwi-family",
+  "bwi-file",
+  "bwi-file-text",
+  "bwi-files",
+  "bwi-filter",
+  "bwi-folder",
+  "bwi-generate",
+  "bwi-globe",
+  "bwi-hashtag",
+  "bwi-id-card",
+  "bwi-import",
+  "bwi-info-circle",
+  "bwi-key",
+  "bwi-list",
+  "bwi-list-alt",
+  "bwi-lock",
+  "bwi-lock-encrypted",
+  "bwi-lock-f",
+  "bwi-minus-circle",
+  "bwi-mobile",
+  "bwi-msp",
+  "bwi-numbered-list",
+  "bwi-paperclip",
+  "bwi-passkey",
+  "bwi-paypal",
+  "bwi-pencil",
+  "bwi-pencil-square",
+  "bwi-plus",
+  "bwi-plus-circle",
+  "bwi-popout",
+  "bwi-provider",
+  "bwi-puzzle",
+  "bwi-question-circle",
+  "bwi-refresh",
+  "bwi-search",
+  "bwi-send",
+  "bwi-share",
+  "bwi-shield",
+  "bwi-sign-in",
+  "bwi-sign-out",
+  "bwi-sliders",
+  "bwi-spinner",
+  "bwi-star",
+  "bwi-star-f",
+  "bwi-sticky-note",
+  "bwi-tag",
+  "bwi-trash",
+  "bwi-undo",
+  "bwi-universal-access",
+  "bwi-unlock",
+  "bwi-up-down-btn",
+  "bwi-up-solid",
+  "bwi-user",
+  "bwi-user-monitor",
+  "bwi-users",
+  "bwi-vault",
+  "bwi-wireless",
+  "bwi-wrench",
+] as const;
+
+/**
+ * Type-safe icon names derived from the BITWARDEN_ICONS array.
+ * This ensures type safety while allowing runtime iteration and validation.
+ */
+export type BitwardenIcon = (typeof BITWARDEN_ICONS)[number];
diff --git a/libs/components/src/skeleton/index.ts b/libs/components/src/skeleton/index.ts
new file mode 100644
index 00000000000..3872cc2a32f
--- /dev/null
+++ b/libs/components/src/skeleton/index.ts
@@ -0,0 +1,3 @@
+export * from "./skeleton.component";
+export * from "./skeleton-text.component";
+export * from "./skeleton-group.component";
diff --git a/libs/components/src/skeleton/skeleton-group.component.html b/libs/components/src/skeleton/skeleton-group.component.html
new file mode 100644
index 00000000000..d6c88dc7323
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton-group.component.html
@@ -0,0 +1,7 @@
+<div class="tw-flex tw-flex-row tw-justify-between tw-gap-2">
+  <div class="tw-flex tw-gap-2 tw-w-full">
+    <ng-content select="[slot=start]"></ng-content>
+    <ng-content></ng-content>
+  </div>
+  <ng-content select="[slot=end]"></ng-content>
+</div>
diff --git a/libs/components/src/skeleton/skeleton-group.component.ts b/libs/components/src/skeleton/skeleton-group.component.ts
new file mode 100644
index 00000000000..c1d236eafb9
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton-group.component.ts
@@ -0,0 +1,20 @@
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+
+/**
+ * Arranges skeleton loaders into a pre-arranged group that mimics the table and item components.
+ *
+ * Pass skeleton loaders into the start, default, and end content slots. The content within each slot
+ * is fully customizable.
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-skeleton-group",
+  templateUrl: "./skeleton-group.component.html",
+  imports: [CommonModule],
+  host: {
+    class: "tw-block",
+  },
+})
+export class SkeletonGroupComponent {}
diff --git a/libs/components/src/skeleton/skeleton-group.stories.ts b/libs/components/src/skeleton/skeleton-group.stories.ts
new file mode 100644
index 00000000000..ae13dad1274
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton-group.stories.ts
@@ -0,0 +1,73 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { SharedModule } from "../shared/shared.module";
+
+import { SkeletonGroupComponent } from "./skeleton-group.component";
+import { SkeletonTextComponent } from "./skeleton-text.component";
+import { SkeletonComponent } from "./skeleton.component";
+
+export default {
+  title: "Component Library/Skeleton/Skeleton Group",
+  component: SkeletonGroupComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [SharedModule, SkeletonTextComponent, SkeletonComponent],
+    }),
+  ],
+} as Meta<SkeletonGroupComponent>;
+
+type Story = StoryObj<SkeletonGroupComponent>;
+
+export const Default: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-skeleton-group>
+        <bit-skeleton class="tw-size-8" slot="start"></bit-skeleton>
+        <bit-skeleton-text [lines]="2" class="tw-w-1/2"></bit-skeleton-text>
+        <bit-skeleton-text [lines]="1" slot="end" class="tw-w-1/4"></bit-skeleton-text>
+      </bit-skeleton-group>
+    `,
+  }),
+};
+
+export const NoEndSlot: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-skeleton-group>
+        <bit-skeleton class="tw-size-8" slot="start"></bit-skeleton>
+        <bit-skeleton-text [lines]="2" class="tw-w-1/2"></bit-skeleton-text>
+      </bit-skeleton-group>
+    `,
+  }),
+};
+
+export const NoStartSlot: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-skeleton-group>
+        <bit-skeleton-text [lines]="2" class="tw-w-1/2"></bit-skeleton-text>
+        <bit-skeleton-text [lines]="1" slot="end" class="tw-w-1/4"></bit-skeleton-text>
+      </bit-skeleton-group>
+    `,
+  }),
+};
+
+export const CustomContent: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-skeleton-group>
+        <bit-skeleton class="tw-size-12" slot="start" edgeShape="circle"></bit-skeleton>
+        <bit-skeleton-text [lines]="3" class="tw-w-full"></bit-skeleton-text>
+        <div slot="end" class="tw-flex tw-flex-row tw-gap-1">
+          <bit-skeleton class="tw-size-4" slot="start"></bit-skeleton>
+          <bit-skeleton class="tw-size-4" slot="start"></bit-skeleton>
+          <bit-skeleton class="tw-size-4" slot="start"></bit-skeleton>
+        </div>
+      </bit-skeleton-group>
+    `,
+  }),
+};
diff --git a/libs/components/src/skeleton/skeleton-text.component.html b/libs/components/src/skeleton/skeleton-text.component.html
new file mode 100644
index 00000000000..716184d0e9f
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton-text.component.html
@@ -0,0 +1,11 @@
+<div class="tw-w-full tw-flex tw-flex-col tw-gap-2">
+  @for (line of this.linesArray(); track $index; let last = $last, first = $first) {
+    <bit-skeleton
+      class="tw-h-3"
+      [ngClass]="{
+        'tw-w-full': first || !last,
+        'tw-w-1/3': !first && last,
+      }"
+    ></bit-skeleton>
+  }
+</div>
diff --git a/libs/components/src/skeleton/skeleton-text.component.ts b/libs/components/src/skeleton/skeleton-text.component.ts
new file mode 100644
index 00000000000..a3d2c4a8451
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton-text.component.ts
@@ -0,0 +1,33 @@
+import { CommonModule } from "@angular/common";
+import { Component, computed, input } from "@angular/core";
+
+import { SkeletonComponent } from "./skeleton.component";
+
+/**
+ * Specific skeleton component used to represent lines of text. It uses the `bit-skeleton`
+ * under the hood.
+ *
+ * Customize the number of lines represented with the `lines` input. Customize the width
+ * by applying a class to the `bit-skeleton-text` element (i.e. `tw-w-1/2`).
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-skeleton-text",
+  templateUrl: "./skeleton-text.component.html",
+  imports: [CommonModule, SkeletonComponent],
+  host: {
+    class: "tw-block",
+  },
+})
+export class SkeletonTextComponent {
+  /**
+   * The number of text lines to display
+   */
+  readonly lines = input<number>(1);
+
+  /**
+   * Array-transformed version of the `lines` to loop over
+   */
+  protected readonly linesArray = computed(() => [...Array(this.lines()).keys()]);
+}
diff --git a/libs/components/src/skeleton/skeleton-text.stories.ts b/libs/components/src/skeleton/skeleton-text.stories.ts
new file mode 100644
index 00000000000..36446328b1d
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton-text.stories.ts
@@ -0,0 +1,48 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { SharedModule } from "../shared/shared.module";
+
+import { SkeletonTextComponent } from "./skeleton-text.component";
+
+import { formatArgsForCodeSnippet } from ".storybook/format-args-for-code-snippet";
+
+export default {
+  title: "Component Library/Skeleton/Skeleton Text",
+  component: SkeletonTextComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [SharedModule],
+    }),
+  ],
+  args: {
+    lines: 1,
+  },
+  argTypes: {
+    lines: {
+      control: { type: "number", min: 1 },
+    },
+  },
+} as Meta<SkeletonTextComponent>;
+
+type Story = StoryObj<SkeletonTextComponent>;
+
+export const Text: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-skeleton-text ${formatArgsForCodeSnippet<SkeletonTextComponent>(args)}></bit-skeleton-text>
+    `,
+  }),
+};
+
+export const TextMultiline: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-skeleton-text ${formatArgsForCodeSnippet<SkeletonTextComponent>(args)}></bit-skeleton-text>
+    `,
+  }),
+  args: {
+    lines: 5,
+  },
+};
diff --git a/libs/components/src/skeleton/skeleton.component.html b/libs/components/src/skeleton/skeleton.component.html
new file mode 100644
index 00000000000..2b0a1f7aba1
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton.component.html
@@ -0,0 +1,8 @@
+<div
+  class="tw-size-full tw-bg-secondary-100 tw-animate-pulse"
+  [ngClass]="{
+    'tw-rounded': edgeShape() === 'box',
+    'tw-rounded-full': edgeShape() === 'circle',
+  }"
+  aria-hidden="true"
+></div>
diff --git a/libs/components/src/skeleton/skeleton.component.ts b/libs/components/src/skeleton/skeleton.component.ts
new file mode 100644
index 00000000000..56de186c2e4
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton.component.ts
@@ -0,0 +1,28 @@
+import { CommonModule } from "@angular/common";
+import { Component, input } from "@angular/core";
+
+/**
+ * Basic skeleton loading component that can be used to represent content that is loading.
+ * Use for layout-level elements and text, not for interactive elements.
+ *
+ * Customize the shape's edges with the `edgeShape` input. Customize the shape's size by
+ * applying classes to the `bit-skeleton` element (i.e. `tw-w-40 tw-h-8`).
+ *
+ * If you're looking to represent lines of text, use the `bit-skeleton-text` helper component.
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-skeleton",
+  templateUrl: "./skeleton.component.html",
+  imports: [CommonModule],
+  host: {
+    class: "tw-block",
+  },
+})
+export class SkeletonComponent {
+  /**
+   * The shape of the corners of the skeleton element
+   */
+  readonly edgeShape = input<"box" | "circle">("box");
+}
diff --git a/libs/components/src/skeleton/skeleton.mdx b/libs/components/src/skeleton/skeleton.mdx
new file mode 100644
index 00000000000..ab0ba22f43e
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton.mdx
@@ -0,0 +1,112 @@
+import { Meta, Canvas, Source } from "@storybook/addon-docs";
+
+import * as skeletonStories from "./skeleton.stories";
+import * as skeletonTextStories from "./skeleton-text.stories";
+import * as skeletonGroupStories from "./skeleton-group.stories";
+
+<Meta title="Component Library/Skeleton" />
+
+# Skeleton Loading
+
+The skeleton component can be used as an alternative loading indicator to the spinner by mimicking
+the content that will be loaded such as text, images, or video. It can be used to represent layout
+components as well, but should not be used for interactive elements like form controls or buttons.
+
+## Skeleton Loading Components
+
+There are three components that can be used to create a skeleton loading page.
+
+### Skeleton
+
+Basic skeleton loading component that can be used to represent content that is loading. Use for
+non-text shapes.
+
+#### Customizing
+
+The basic skeleton component is fully customizable in shape and edge appearance to allow consumers
+to more accurately represent the content.
+
+**Inputs**
+
+| Input       | Description                                         | Accepted options | Default |
+| ----------- | --------------------------------------------------- | ---------------- | ------- |
+| `edgeShape` | configure whether corners are fully rounded or boxy | `box`, `circle`  | `box`   |
+
+**Classes**
+
+Customize the shape's size by applying tailwind size classes to the `bit-skeleton` element (example
+`tw-h-3 tw-w-12`). Please refer to the tailwind docs for all height/width options, and note that
+custom values are possible with tailwind as well.
+
+<Canvas of={skeletonStories.BoxEdgeShape} />
+<Canvas of={skeletonStories.CircleEdgeShape} />
+
+### Skeleton Text
+
+Specific skeleton component used to represent lines of text.
+
+#### Customizing
+
+The number of lines of text in the skeleton is configurable.
+
+**Inputs**
+
+| Input   | Description                                   | Accepted options | Default |
+| ------- | --------------------------------------------- | ---------------- | ------- |
+| `lines` | configure how many lines of text are rendered | any `number`     | `1`     |
+
+<Canvas of={skeletonTextStories.Text} />
+<Canvas of={skeletonTextStories.TextMultiline} />
+
+### Skeleton Group
+
+Arranges skeleton loaders into a pre-arranged group that mimics the table and item components.
+
+#### Customizing
+
+**Slots**
+
+Use the following slots to render `<bit-skeleton>` and/or `bit-skeleton-text` elements.
+
+| Slot           | Description                                                                                     |
+| -------------- | ----------------------------------------------------------------------------------------------- |
+| `slot="start"` | content that should appear horizontally before the default content; will not grow to fill space |
+| default        | main content area; grows to fill the horizontal space                                           |
+| `slot="end"`   | content that should appear horizontally after the default content; will not grow to fill space  |
+
+<Canvas of={skeletonGroupStories.Default} />
+
+## Display Considerations
+
+For pages that load quickly, we want to avoid the skeleton flashing in and out. To avoid this, we
+recommend the following display guidelines:
+
+- After the loading is initiated (by page load or by user action), wait 1 second to display the
+  skeleton loader.
+- After waiting 1s, render the loading skeleton.
+- Ideally the skeleton disappears after 10 seconds, but we do not enforce a max duration. Add a max
+  duration at your discretion.
+
+## Accessibility
+
+Because there are typically multiple skeleton loaders present on a page that is using skeleton
+loading, the individual skeleton loaders should not announce themselves or be present to
+screenreaders, as this would overwhelm the user with multiple identical announcements. Thus, the
+skeleton components are hidden from screenreaders.
+
+Instead, the recommended strategy is to use a page-level announcement for screenreaders:
+
+- We recommend using the
+  [Angular CDK LiveAnnouncer](https://material.angular.dev/cdk/a11y/overview#liveannouncer) to first
+  announce that content is loading when the skeleton loader is displayed, and then to announce that
+  content has loaded. The announcements should be localized, and the politeness level should be set
+  to `polite`.
+
+- Alternatively, you may wish to render your own `role="status"` element or a custom `aria-live`
+  region in the template to accomplish the announcements detailed above.
+
+## Example with Browser Extension
+
+To see a full-page example of what skeleton loading might look like using all three skeleton
+components, check the
+[Popup Layout Skeleton Loading story](?path=/docs/browser-popup-layout--skeleton-loading).
diff --git a/libs/components/src/skeleton/skeleton.stories.ts b/libs/components/src/skeleton/skeleton.stories.ts
new file mode 100644
index 00000000000..56a89c6e076
--- /dev/null
+++ b/libs/components/src/skeleton/skeleton.stories.ts
@@ -0,0 +1,50 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+import { SharedModule } from "../shared/shared.module";
+
+import { SkeletonComponent } from "./skeleton.component";
+
+export default {
+  title: "Component Library/Skeleton/Skeleton",
+  component: SkeletonComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [SharedModule],
+    }),
+  ],
+  args: {
+    edgeShape: "box",
+  },
+  argTypes: {
+    edgeShape: {
+      control: { type: "radio" },
+      options: ["box", "circle"],
+    },
+  },
+} as Meta<SkeletonComponent>;
+
+type Story = StoryObj<SkeletonComponent>;
+
+export const BoxEdgeShape: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+    <div class="tw-mb-4">Examples of different size shapes with edgeShape={{ edgeShape }}</div>
+    <div class="tw-flex tw-flex-row tw-gap-8 tw-items-center">
+      <bit-skeleton ${formatArgsForCodeSnippet<SkeletonComponent>(args)} class="tw-size-32"></bit-skeleton>
+      <bit-skeleton ${formatArgsForCodeSnippet<SkeletonComponent>(args)} class="tw-w-40 tw-h-5"></bit-skeleton>
+    </div>
+    `,
+  }),
+  args: {
+    edgeShape: "box",
+  },
+};
+
+export const CircleEdgeShape: Story = {
+  ...BoxEdgeShape,
+  args: {
+    edgeShape: "circle",
+  },
+};
diff --git a/libs/components/src/spinner/spinner.component.ts b/libs/components/src/spinner/spinner.component.ts
index c18e95d70fa..d0c2b90a165 100644
--- a/libs/components/src/spinner/spinner.component.ts
+++ b/libs/components/src/spinner/spinner.component.ts
@@ -3,6 +3,8 @@ import { Component, HostBinding, Input, booleanAttribute } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-spinner",
   templateUrl: "spinner.component.html",
@@ -13,21 +15,29 @@ export class SpinnerComponent {
   /**
    * The size of the spinner. Defaults to `large`.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() size: "fill" | "small" | "large" = "large";
 
   /**
    * Disable the default color of the spinner, inherits the text color.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: booleanAttribute }) noColor = false;
 
   /**
    * Accessibility title. Defaults to `Loading`.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title = this.i18nService.t("loading");
 
   /**
    * Display text for screen readers.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: booleanAttribute }) sr = true;
 
   @HostBinding("class") get classList() {
diff --git a/libs/components/src/stepper/step.component.ts b/libs/components/src/stepper/step.component.ts
index 6d558964d89..2d42dcb23cb 100644
--- a/libs/components/src/stepper/step.component.ts
+++ b/libs/components/src/stepper/step.component.ts
@@ -1,6 +1,8 @@
 import { CdkStep, CdkStepper } from "@angular/cdk/stepper";
 import { Component, input } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-step",
   templateUrl: "step.component.html",
@@ -8,7 +10,7 @@ import { Component, input } from "@angular/core";
   standalone: true,
 })
 export class StepComponent extends CdkStep {
-  subLabel = input();
+  readonly subLabel = input();
 
   constructor(stepper: CdkStepper) {
     super(stepper);
diff --git a/libs/components/src/stepper/stepper.component.html b/libs/components/src/stepper/stepper.component.html
index 298d0829cfe..cc652d999a7 100644
--- a/libs/components/src/stepper/stepper.component.html
+++ b/libs/components/src/stepper/stepper.component.html
@@ -18,13 +18,13 @@
           >
             @if (step.completed) {
               <span
-                class="tw-me-3.5 tw-size-9 tw-rounded-full tw-bg-primary-600 tw-font-bold tw-leading-9 tw-text-contrast"
+                class="tw-me-3.5 tw-size-9 tw-rounded-full tw-bg-primary-600 tw-font-medium tw-leading-9 tw-text-contrast"
               >
                 <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
               </span>
             } @else {
               <span
-                class="tw-me-3.5 tw-size-9 tw-rounded-full tw-font-bold tw-leading-9"
+                class="tw-me-3.5 tw-size-9 tw-rounded-full tw-font-medium tw-leading-9"
                 [ngClass]="{
                   'tw-bg-primary-600 tw-text-contrast': selectedIndex === $index,
                   'tw-bg-secondary-300 tw-text-main':
@@ -83,13 +83,13 @@
       >
         @if (step.completed) {
           <span
-            class="tw-me-3.5 tw-size-9 tw-rounded-full tw-bg-primary-600 tw-font-bold tw-leading-9 tw-text-contrast"
+            class="tw-me-3.5 tw-size-9 tw-rounded-full tw-bg-primary-600 tw-font-medium tw-leading-9 tw-text-contrast"
           >
             <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
           </span>
         } @else {
           <span
-            class="tw-me-3.5 tw-size-9 tw-rounded-full tw-font-bold tw-leading-9"
+            class="tw-me-3.5 tw-size-9 tw-rounded-full tw-font-medium tw-leading-9"
             [ngClass]="{
               'tw-bg-primary-600 tw-text-contrast': selectedIndex === $index,
               'tw-bg-secondary-300 tw-text-main':
diff --git a/libs/components/src/stepper/stepper.component.ts b/libs/components/src/stepper/stepper.component.ts
index befd4b40cf3..abef0dc3f9a 100644
--- a/libs/components/src/stepper/stepper.component.ts
+++ b/libs/components/src/stepper/stepper.component.ts
@@ -12,6 +12,8 @@ import { StepComponent } from "./step.component";
  * The `<bit-stepper>` component extends the
  * [Angular CdkStepper](https://material.angular.io/cdk/stepper/api#CdkStepper) component
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-stepper",
   templateUrl: "stepper.component.html",
@@ -44,6 +46,8 @@ export class StepperComponent extends CdkStepper {
   // overriding CdkStepper orientation input so we can default to vertical
   // TODO: Skipped for signal migration because:
   //  Accessor inputs cannot be migrated as they are too complex.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   override get orientation() {
     return this.internalOrientation || "vertical";
diff --git a/libs/components/src/stories/icons/icon-data.ts b/libs/components/src/stories/icons/icon-data.ts
index fc211ed4f82..802e23fa3d6 100644
--- a/libs/components/src/stories/icons/icon-data.ts
+++ b/libs/components/src/stories/icons/icon-data.ts
@@ -65,6 +65,10 @@ const bitwardenObjects = [
     id: "bwi-id-card",
     usage: "identity item type",
   },
+  {
+    id: "bwi-premium",
+    usage: "upgrade to premium",
+  },
   {
     id: "bwi-send",
     usage: "send action or feature",
@@ -204,6 +208,10 @@ const actions = [
     id: "bwi-trash",
     usage: "delete action or trash area",
   },
+  {
+    id: "bwi-unarchive",
+    usage: "remove item from archive",
+  },
   {
     id: "bwi-undo",
     usage: "restore action",
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 7f6a6c42f32..60353a28fb6 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
@@ -7,6 +7,8 @@ import { ScrollLayoutDirective } from "../../../layout";
 import { SectionComponent } from "../../../section";
 import { TableDataSource, TableModule } from "../../../table";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "dialog-virtual-scroll-block",
   standalone: true,
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
index eb9f2fccac9..0a9581fb375 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
@@ -7,6 +7,8 @@ import { DialogService } from "../../../dialog";
 import { I18nMockService } from "../../../utils/i18n-mock.service";
 import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-kitchen-sink-form",
   imports: [KitchenSinkSharedModule],
@@ -132,7 +134,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
     </form>
   `,
 })
-export class KitchenSinkForm {
+export class KitchenSinkFormComponent {
   constructor(
     public dialogService: DialogService,
     public formBuilder: FormBuilder,
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
index a96964db8d5..0819ae3f06b 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
@@ -4,10 +4,12 @@ import { Component, signal } from "@angular/core";
 import { DialogService } from "../../../dialog";
 import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
 
-import { KitchenSinkForm } from "./kitchen-sink-form.component";
-import { KitchenSinkTable } from "./kitchen-sink-table.component";
-import { KitchenSinkToggleList } from "./kitchen-sink-toggle-list.component";
+import { KitchenSinkFormComponent } from "./kitchen-sink-form.component";
+import { KitchenSinkTableComponent } from "./kitchen-sink-table.component";
+import { KitchenSinkToggleListComponent } from "./kitchen-sink-toggle-list.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [KitchenSinkSharedModule],
   template: `
@@ -81,13 +83,20 @@ import { KitchenSinkToggleList } from "./kitchen-sink-toggle-list.component";
     </bit-dialog>
   `,
 })
-class KitchenSinkDialog {
+class KitchenSinkDialogComponent {
   constructor(public dialogRef: DialogRef) {}
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-main",
-  imports: [KitchenSinkSharedModule, KitchenSinkTable, KitchenSinkToggleList, KitchenSinkForm],
+  imports: [
+    KitchenSinkSharedModule,
+    KitchenSinkTableComponent,
+    KitchenSinkToggleListComponent,
+    KitchenSinkFormComponent,
+  ],
   template: `
     <bit-banner bannerType="info"> Kitchen Sink test zone </bit-banner>
 
@@ -175,14 +184,14 @@ class KitchenSinkDialog {
 export class KitchenSinkMainComponent {
   constructor(public dialogService: DialogService) {}
 
-  protected drawerOpen = signal(false);
+  protected readonly drawerOpen = signal(false);
 
   openDialog() {
-    this.dialogService.open(KitchenSinkDialog);
+    this.dialogService.open(KitchenSinkDialogComponent);
   }
 
   openDrawer() {
-    this.dialogService.openDrawer(KitchenSinkDialog);
+    this.dialogService.openDrawer(KitchenSinkDialogComponent);
   }
 
   navItems = [
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
index 302d9f6c0a8..69602100eae 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-kitchen-sink-table",
   imports: [KitchenSinkSharedModule],
@@ -55,4 +57,4 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
     </bit-table>
   `,
 })
-export class KitchenSinkTable {}
+export class KitchenSinkTableComponent {}
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
index ec8787af1bd..f914c49cca5 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-kitchen-sink-toggle-list",
   imports: [KitchenSinkSharedModule],
@@ -26,7 +28,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
     }
   `,
 })
-export class KitchenSinkToggleList {
+export class KitchenSinkToggleListComponent {
   selectedToggle: "all" | "large" | "small" = "all";
 
   companyList = [
diff --git a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
index 945eb5a9765..c25eb778d11 100644
--- a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
+++ b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
@@ -19,10 +19,10 @@ import { I18nMockService } from "../../utils/i18n-mock.service";
 import { positionFixedWrapperDecorator } from "../storybook-decorators";
 
 import { DialogVirtualScrollBlockComponent } from "./components/dialog-virtual-scroll-block.component";
-import { KitchenSinkForm } from "./components/kitchen-sink-form.component";
+import { KitchenSinkFormComponent } from "./components/kitchen-sink-form.component";
 import { KitchenSinkMainComponent } from "./components/kitchen-sink-main.component";
-import { KitchenSinkTable } from "./components/kitchen-sink-table.component";
-import { KitchenSinkToggleList } from "./components/kitchen-sink-toggle-list.component";
+import { KitchenSinkTableComponent } from "./components/kitchen-sink-table.component";
+import { KitchenSinkToggleListComponent } from "./components/kitchen-sink-toggle-list.component";
 import { KitchenSinkSharedModule } from "./kitchen-sink-shared.module";
 
 export default {
@@ -33,10 +33,10 @@ export default {
     moduleMetadata({
       imports: [
         KitchenSinkSharedModule,
-        KitchenSinkForm,
+        KitchenSinkFormComponent,
         KitchenSinkMainComponent,
-        KitchenSinkTable,
-        KitchenSinkToggleList,
+        KitchenSinkTableComponent,
+        KitchenSinkToggleListComponent,
       ],
     }),
     applicationConfig({
@@ -200,3 +200,12 @@ export const VirtualScrollBlockingDialog: Story = {
     await userEvent.click(dialogButton);
   },
 };
+
+export const ResponsiveSidebar: Story = {
+  render: Default.render,
+  parameters: {
+    chromatic: {
+      viewports: [640, 1280],
+    },
+  },
+};
diff --git a/libs/components/src/stories/migration.mdx b/libs/components/src/stories/migration.mdx
index 08d3999b207..1160c602894 100644
--- a/libs/components/src/stories/migration.mdx
+++ b/libs/components/src/stories/migration.mdx
@@ -61,14 +61,14 @@ This is easy to verify. Bitwarden prefixes all Tailwind classes with `tw-`. If y
 without this prefix, it probably shouldn't be there.
 
 <div class="tw-bg-danger-600/10 tw-p-4">
-  <span class="tw-font-bold tw-text-danger">Bad (Bootstrap)</span>
+  <span class="tw-font-medium tw-text-danger">Bad (Bootstrap)</span>
   ```html
   <div class="mb-2"></div>
   ```
 </div>
 
 <div class="tw-bg-success-600/10 tw-p-4">
-  <span class="tw-font-bold tw-text-success">Good (Tailwind)</span>
+  <span class="tw-font-medium tw-text-success">Good (Tailwind)</span>
   ```html
   <div class="tw-mb-2"></div>
   ```
@@ -77,7 +77,7 @@ without this prefix, it probably shouldn't be there.
 **Exception:** Icon font classes, prefixed with `bwi`, are allowed.
 
 <div class="tw-bg-success-600/10 tw-p-4">
-  <span class="tw-font-bold tw-text-success">Good (Icons)</span>
+  <span class="tw-font-medium tw-text-success">Good (Icons)</span>
   ```html
   <i class="bwi bwi-spinner bwi-lg bwi-spin" aria-hidden="true"></i>
   ```
@@ -91,7 +91,7 @@ reactive forms to make use of these components. Review the
 [form component docs](?path=/docs/component-library-form--docs).
 
 <div class="tw-bg-danger-600/10 tw-p-4">
-    <span class="tw-text-danger tw-font-bold">Bad</span>
+    <span class="tw-text-danger tw-font-medium">Bad</span>
     ```html
     <form #form (ngSubmit)="submit()">
         ...
@@ -100,7 +100,7 @@ reactive forms to make use of these components. Review the
 </div>
 
 <div class="tw-bg-success-600/10 tw-p-4">
-    <span class="tw-text-success tw-font-bold">Good</span>
+    <span class="tw-text-success tw-font-medium">Good</span>
     ```html
     <form [formGroup]="formGroup" [bitSubmit]="submit">
         ...
diff --git a/libs/components/src/switch/index.ts b/libs/components/src/switch/index.ts
new file mode 100644
index 00000000000..5ee7275dce5
--- /dev/null
+++ b/libs/components/src/switch/index.ts
@@ -0,0 +1 @@
+export * from "./switch.component";
diff --git a/libs/components/src/switch/switch.component.spec.ts b/libs/components/src/switch/switch.component.spec.ts
index 4d24dbcd150..6a53316a1b4 100644
--- a/libs/components/src/switch/switch.component.spec.ts
+++ b/libs/components/src/switch/switch.component.spec.ts
@@ -3,19 +3,20 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { By } from "@angular/platform-browser";
 
-import { BitLabel } from "../form-control/label.component";
+import { BitLabelComponent } from "../form-control/label.component";
 
 import { SwitchComponent } from "./switch.component";
-import { SwitchModule } from "./switch.module";
 
 describe("SwitchComponent", () => {
   let fixture: ComponentFixture<TestHostComponent>;
   let switchComponent: SwitchComponent;
   let inputEl: HTMLInputElement;
 
+  // TODO: Fix this the next time the file is edited.
+  // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
   @Component({
     selector: "test-host",
-    imports: [FormsModule, BitLabel, ReactiveFormsModule, SwitchModule],
+    imports: [FormsModule, BitLabelComponent, ReactiveFormsModule, SwitchComponent],
     template: `
       <form [formGroup]="formObj">
         <bit-switch formControlName="switch">
@@ -70,11 +71,13 @@ describe("SwitchComponent", () => {
   });
 
   it("should update checked when selected input changes outside of a form", async () => {
+    // TODO: Fix this the next time the file is edited.
+    // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
     @Component({
       selector: "test-selected-host",
       template: `<bit-switch [selected]="checked"><bit-label>Element</bit-label></bit-switch>`,
       standalone: true,
-      imports: [SwitchComponent, BitLabel],
+      imports: [SwitchComponent, BitLabelComponent],
     })
     class TestSelectedHostComponent {
       checked = false;
diff --git a/libs/components/src/switch/switch.component.ts b/libs/components/src/switch/switch.component.ts
index f08ed9f46ef..a93e274e8bb 100644
--- a/libs/components/src/switch/switch.component.ts
+++ b/libs/components/src/switch/switch.component.ts
@@ -13,14 +13,16 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
 
 import { AriaDisableDirective } from "../a11y";
 import { FormControlModule } from "../form-control/form-control.module";
-import { BitHintComponent } from "../form-control/hint.component";
-import { BitLabel } from "../form-control/label.component";
+import { BitHintDirective } from "../form-control/hint.directive";
+import { BitLabelComponent } from "../form-control/label.component";
 
 let nextId = 0;
 
 /**
  * Switch component for toggling between two states. Switch actions are meant to take place immediately and are not to be used in a form where saving/submiting actions are required.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-switch",
   providers: [
@@ -41,24 +43,24 @@ let nextId = 0;
 })
 export class SwitchComponent implements ControlValueAccessor, AfterViewInit {
   private el = inject(ElementRef<HTMLButtonElement>);
-  private readonly label = contentChild.required(BitLabel);
+  private readonly label = contentChild.required(BitLabelComponent);
 
   /**
    * Model signal for selected state binding when used outside of a form
    */
-  protected selected = model(false);
+  protected readonly selected = model(false);
 
   /**
    * Model signal for disabled binding when used outside of a form
    */
-  protected disabled = model(false);
-  protected disabledReasonText = input<string | null>(null);
+  protected readonly disabled = model(false);
+  protected readonly disabledReasonText = input<string | null>(null);
 
-  private hintComponent = contentChild<BitHintComponent>(BitHintComponent);
+  private readonly hintComponent = contentChild<BitHintDirective>(BitHintDirective);
 
-  private disabledReasonTextId = `bit-switch-disabled-text-${nextId++}`;
+  protected readonly disabledReasonTextId = `bit-switch-disabled-text-${nextId++}`;
 
-  private describedByIds = computed(() => {
+  protected readonly describedByIds = computed(() => {
     const ids: string[] = [];
 
     if (this.disabledReasonText() && this.disabled()) {
diff --git a/libs/components/src/switch/switch.module.ts b/libs/components/src/switch/switch.module.ts
deleted file mode 100644
index 714d451e6ee..00000000000
--- a/libs/components/src/switch/switch.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { SwitchComponent } from "./switch.component";
-
-@NgModule({
-  imports: [SwitchComponent],
-  exports: [SwitchComponent],
-})
-export class SwitchModule {}
diff --git a/libs/components/src/table/sortable.component.ts b/libs/components/src/table/sortable.component.ts
index 6d5f72dd379..dfbaa0b00c3 100644
--- a/libs/components/src/table/sortable.component.ts
+++ b/libs/components/src/table/sortable.component.ts
@@ -5,6 +5,8 @@ import { Component, HostBinding, OnInit, input } from "@angular/core";
 import type { SortDirection, SortFn } from "./table-data-source";
 import { TableComponent } from "./table.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "th[bitSortable]",
   template: `
@@ -104,7 +106,7 @@ export class SortableComponent implements OnInit {
   get classList() {
     return [
       "tw-min-w-max",
-      "tw-font-bold",
+      "tw-font-medium",
 
       // Below is copied from BitIconButtonComponent
       "tw-border",
diff --git a/libs/components/src/table/table-scroll.component.html b/libs/components/src/table/table-scroll.component.html
index 99a5d200aca..2f9c0dcc533 100644
--- a/libs/components/src/table/table-scroll.component.html
+++ b/libs/components/src/table/table-scroll.component.html
@@ -5,7 +5,7 @@
 >
   <table [ngClass]="tableClass">
     <thead
-      class="tw-border-0 tw-border-b-2 tw-border-solid tw-border-secondary-300 tw-font-bold tw-text-muted"
+      class="tw-border-0 tw-border-b-2 tw-border-solid tw-border-secondary-300 tw-font-medium tw-text-muted"
     >
       <tr>
         <ng-content select="[header]"></ng-content>
diff --git a/libs/components/src/table/table-scroll.component.ts b/libs/components/src/table/table-scroll.component.ts
index 2f9436baa0b..1ccb49a85e5 100644
--- a/libs/components/src/table/table-scroll.component.ts
+++ b/libs/components/src/table/table-scroll.component.ts
@@ -35,7 +35,7 @@ import { TableComponent } from "./table.component";
 @Directive({
   selector: "[bitRowDef]",
 })
-export class BitRowDef {
+export class BitRowDefDirective {
   constructor(public template: TemplateRef<any>) {}
 }
 
@@ -44,6 +44,8 @@ export class BitRowDef {
  *
  * Utilizes virtual scrolling to render large datasets.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-table-scroll",
   templateUrl: "./table-scroll.component.html",
@@ -67,7 +69,7 @@ export class TableScrollComponent
   /** Optional trackBy function. */
   readonly trackBy = input<TrackByFunction<any> | undefined>();
 
-  protected readonly rowDef = contentChild(BitRowDef);
+  protected readonly rowDef = contentChild(BitRowDefDirective);
 
   /**
    * Height of the thead element (in pixels).
diff --git a/libs/components/src/table/table.component.html b/libs/components/src/table/table.component.html
index 75d283e7bf3..e1a9d3311ab 100644
--- a/libs/components/src/table/table.component.html
+++ b/libs/components/src/table/table.component.html
@@ -1,6 +1,6 @@
 <table [ngClass]="tableClass">
   <thead
-    class="tw-border-0 tw-border-b-2 tw-border-solid tw-border-secondary-300 tw-font-bold tw-text-muted"
+    class="tw-border-0 tw-border-b-2 tw-border-solid tw-border-secondary-300 tw-font-medium tw-text-muted"
   >
     <ng-content select="[header]"></ng-content>
   </thead>
diff --git a/libs/components/src/table/table.component.ts b/libs/components/src/table/table.component.ts
index 7fdd0c40e91..fff36472a14 100644
--- a/libs/components/src/table/table.component.ts
+++ b/libs/components/src/table/table.component.ts
@@ -21,6 +21,8 @@ export class TableBodyDirective {
   constructor(public readonly template: TemplateRef<any>) {}
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-table",
   templateUrl: "./table.component.html",
diff --git a/libs/components/src/table/table.module.ts b/libs/components/src/table/table.module.ts
index 68993612772..5e44f604481 100644
--- a/libs/components/src/table/table.module.ts
+++ b/libs/components/src/table/table.module.ts
@@ -5,14 +5,14 @@ import { NgModule } from "@angular/core";
 import { CellDirective } from "./cell.directive";
 import { RowDirective } from "./row.directive";
 import { SortableComponent } from "./sortable.component";
-import { BitRowDef, TableScrollComponent } from "./table-scroll.component";
+import { BitRowDefDirective, TableScrollComponent } from "./table-scroll.component";
 import { TableBodyDirective, TableComponent } from "./table.component";
 
 @NgModule({
   imports: [
     CommonModule,
     ScrollingModule,
-    BitRowDef,
+    BitRowDefDirective,
     CellDirective,
     RowDirective,
     SortableComponent,
@@ -21,7 +21,7 @@ import { TableBodyDirective, TableComponent } from "./table.component";
     TableScrollComponent,
   ],
   exports: [
-    BitRowDef,
+    BitRowDefDirective,
     CellDirective,
     RowDirective,
     SortableComponent,
diff --git a/libs/components/src/tabs/shared/tab-header.component.ts b/libs/components/src/tabs/shared/tab-header.component.ts
index 9a35e5a846f..aa0272aa917 100644
--- a/libs/components/src/tabs/shared/tab-header.component.ts
+++ b/libs/components/src/tabs/shared/tab-header.component.ts
@@ -3,6 +3,8 @@ import { Component } from "@angular/core";
 /**
  * Component used for styling the tab header/background for both content and navigation tabs
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-header",
   host: {
diff --git a/libs/components/src/tabs/shared/tab-list-item.directive.ts b/libs/components/src/tabs/shared/tab-list-item.directive.ts
index c8b96141ecd..3a82c4083d9 100644
--- a/libs/components/src/tabs/shared/tab-list-item.directive.ts
+++ b/libs/components/src/tabs/shared/tab-list-item.directive.ts
@@ -13,6 +13,8 @@ export class TabListItemDirective implements FocusableOption {
   // TODO: Skipped for signal migration because:
   //  This input overrides a field from a superclass, while the superclass field
   //  is not migrated.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled = false;
 
   @HostBinding("attr.disabled")
@@ -58,7 +60,7 @@ export class TabListItemDirective implements FocusableOption {
       "tw-relative",
       "tw-py-2",
       "tw-px-4",
-      "tw-font-semibold",
+      "tw-font-medium",
       "tw-transition",
       "tw-rounded-t-lg",
       "tw-border-0",
diff --git a/libs/components/src/tabs/tab-group/tab-body.component.ts b/libs/components/src/tabs/tab-group/tab-body.component.ts
index 2dec4ca180d..7382c8576c3 100644
--- a/libs/components/src/tabs/tab-group/tab-body.component.ts
+++ b/libs/components/src/tabs/tab-group/tab-body.component.ts
@@ -1,6 +1,8 @@
 import { TemplatePortal, CdkPortalOutlet } from "@angular/cdk/portal";
 import { Component, effect, HostBinding, input } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-body",
   templateUrl: "tab-body.component.html",
diff --git a/libs/components/src/tabs/tab-group/tab-group.component.ts b/libs/components/src/tabs/tab-group/tab-group.component.ts
index aad60d876ec..cd9d876945c 100644
--- a/libs/components/src/tabs/tab-group/tab-group.component.ts
+++ b/libs/components/src/tabs/tab-group/tab-group.component.ts
@@ -27,6 +27,8 @@ import { TabComponent } from "./tab.component";
 /** Used to generate unique ID's for each tab component */
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-group",
   templateUrl: "./tab-group.component.html",
@@ -57,14 +59,16 @@ export class TabGroupComponent implements AfterContentChecked, AfterViewInit {
   readonly preserveContent = input(false);
 
   /** Error if no `TabComponent` is supplied. (`contentChildren`, used to query for all the tabs, doesn't support `required`) */
-  private _tab = contentChild.required(TabComponent);
+  private readonly _tab = contentChild.required(TabComponent);
 
-  protected tabs = contentChildren(TabComponent);
+  protected readonly tabs = contentChildren(TabComponent);
   readonly tabLabels = viewChildren(TabListItemDirective);
 
   /** The index of the active tab. */
   // TODO: Skipped for signal migration because:
   //  Accessor inputs cannot be migrated as they are too complex.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   get selectedIndex(): number | null {
     return this._selectedIndex;
@@ -75,9 +79,13 @@ export class TabGroupComponent implements AfterContentChecked, AfterViewInit {
   private _selectedIndex: number | null = null;
 
   /** Output to enable support for two-way binding on `[(selectedIndex)]` */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() readonly selectedIndexChange: EventEmitter<number> = new EventEmitter<number>();
 
   /** Event emitted when the tab selection has changed. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() readonly selectedTabChange: EventEmitter<BitTabChangeEvent> =
     new EventEmitter<BitTabChangeEvent>();
 
diff --git a/libs/components/src/tabs/tab-group/tab.component.ts b/libs/components/src/tabs/tab-group/tab.component.ts
index 2eb63cce29d..c021f1aff20 100644
--- a/libs/components/src/tabs/tab-group/tab.component.ts
+++ b/libs/components/src/tabs/tab-group/tab.component.ts
@@ -11,6 +11,8 @@ import {
 
 import { TabLabelDirective } from "./tab-label.directive";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab",
   templateUrl: "./tab.component.html",
@@ -33,6 +35,8 @@ export class TabComponent implements OnInit {
   readonly contentTabIndex = input<number | undefined>();
 
   readonly implicitContent = viewChild.required(TemplateRef);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ContentChild(TabLabelDirective) templateLabel?: TabLabelDirective;
 
   private _contentPortal: TemplatePortal | null = null;
diff --git a/libs/components/src/tabs/tab-nav-bar/tab-link.component.html b/libs/components/src/tabs/tab-nav-bar/tab-link.component.html
index 7a8c0619987..f05ed31547b 100644
--- a/libs/components/src/tabs/tab-nav-bar/tab-link.component.html
+++ b/libs/components/src/tabs/tab-nav-bar/tab-link.component.html
@@ -5,6 +5,7 @@
   [routerLinkActiveOptions]="routerLinkMatchOptions"
   #rla="routerLinkActive"
   [active]="rla.isActive"
+  [info]="{ focusMainAfterNav: false }"
   [disabled]="disabled"
   [attr.aria-disabled]="disabled"
   ariaCurrentWhenActive="page"
diff --git a/libs/components/src/tabs/tab-nav-bar/tab-link.component.ts b/libs/components/src/tabs/tab-nav-bar/tab-link.component.ts
index 402c05bfef7..e94118f5f4b 100644
--- a/libs/components/src/tabs/tab-nav-bar/tab-link.component.ts
+++ b/libs/components/src/tabs/tab-nav-bar/tab-link.component.ts
@@ -16,6 +16,8 @@ import { TabListItemDirective } from "../shared/tab-list-item.directive";
 
 import { TabNavBarComponent } from "./tab-nav-bar.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-link",
   templateUrl: "tab-link.component.html",
@@ -38,6 +40,8 @@ export class TabLinkComponent implements FocusableOption, AfterViewInit {
   // TODO: Skipped for signal migration because:
   //  This input overrides a field from a superclass, while the superclass field
   //  is not migrated.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled = false;
 
   @HostListener("keydown", ["$event"]) onKeyDown(event: KeyboardEvent) {
diff --git a/libs/components/src/tabs/tab-nav-bar/tab-nav-bar.component.ts b/libs/components/src/tabs/tab-nav-bar/tab-nav-bar.component.ts
index 26082b1f17e..c7eec302125 100644
--- a/libs/components/src/tabs/tab-nav-bar/tab-nav-bar.component.ts
+++ b/libs/components/src/tabs/tab-nav-bar/tab-nav-bar.component.ts
@@ -6,6 +6,8 @@ import { TabListContainerDirective } from "../shared/tab-list-container.directiv
 
 import { TabLinkComponent } from "./tab-link.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-nav-bar",
   templateUrl: "tab-nav-bar.component.html",
diff --git a/libs/components/src/tabs/tabs.stories.ts b/libs/components/src/tabs/tabs.stories.ts
index 1f3f5e353b9..e822e4c72eb 100644
--- a/libs/components/src/tabs/tabs.stories.ts
+++ b/libs/components/src/tabs/tabs.stories.ts
@@ -12,30 +12,40 @@ import { I18nMockService } from "../utils";
 import { TabGroupComponent } from "./tab-group/tab-group.component";
 import { TabsModule } from "./tabs.module";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-active-dummy",
   template: "Router - Active selected",
 })
 class ActiveDummyComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-item-2-dummy",
   template: "Router - Item 2 selected",
 })
 class ItemTwoDummyComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-item-3-dummy",
   template: "Router - Item 3 selected",
 })
 class ItemThreeDummyComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-disabled-dummy",
   template: "Router - Disabled selected",
 })
 class DisabledDummyComponent {}
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-tab-item-with-child-counter-dummy",
   template: "Router - Item With Child Counter selected",
diff --git a/libs/components/src/theme.css b/libs/components/src/theme.css
index f9ccc774d43..2aefe37c020 100644
--- a/libs/components/src/theme.css
+++ b/libs/components/src/theme.css
@@ -7,10 +7,10 @@
  * Font faces
  */
 @font-face {
-  font-family: Roboto;
+  font-family: Inter;
   src:
-    url("~@bitwarden/components/src/webfonts/roboto.woff2") format("woff2 supports variations"),
-    url("~@bitwarden/components/src/webfonts/roboto.woff2") format("woff2-variations");
+    url("~@bitwarden/components/src/webfonts/inter.woff2") format("woff2 supports variations"),
+    url("~@bitwarden/components/src/webfonts/inter.woff2") format("woff2-variations");
   font-display: swap;
   font-weight: 100 900;
 }
@@ -20,7 +20,7 @@
  */
 :root {
   --font-sans:
-    Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
+    Inter, "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
     "Segoe UI Symbol", "Noto Color Emoji";
   --font-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
   --font-mono: Menlo, SFMono-Regular, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
diff --git a/libs/components/src/toast/toast-container.component.ts b/libs/components/src/toast/toast-container.component.ts
index 128cf82d355..e455428db9f 100644
--- a/libs/components/src/toast/toast-container.component.ts
+++ b/libs/components/src/toast/toast-container.component.ts
@@ -1,6 +1,8 @@
 import { Component, OnInit, viewChild } from "@angular/core";
 import { ToastContainerDirective, ToastrService } from "ngx-toastr";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-toast-container",
   templateUrl: "toast-container.component.html",
diff --git a/libs/components/src/toast/toast.component.html b/libs/components/src/toast/toast.component.html
index 36d58dcdda7..ec9ace01108 100644
--- a/libs/components/src/toast/toast.component.html
+++ b/libs/components/src/toast/toast.component.html
@@ -9,7 +9,7 @@
     <div>
       <span class="tw-sr-only">{{ variant() | i18n }}</span>
       @if (title(); as title) {
-        <p data-testid="toast-title" class="tw-font-semibold tw-mb-0">{{ title }}</p>
+        <p data-testid="toast-title" class="tw-font-medium tw-mb-0">{{ title }}</p>
       }
       @for (m of messageArray; track m) {
         <p bitTypography="body2" data-testid="toast-message" class="tw-mb-2 last:tw-mb-0">
diff --git a/libs/components/src/toast/toast.component.ts b/libs/components/src/toast/toast.component.ts
index 1aeca24d0e2..2bc0feebb72 100644
--- a/libs/components/src/toast/toast.component.ts
+++ b/libs/components/src/toast/toast.component.ts
@@ -25,6 +25,8 @@ const variants: Record<ToastVariant, { icon: string; bgColor: string }> = {
   },
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-toast",
   templateUrl: "toast.component.html",
@@ -49,6 +51,8 @@ export class ToastComponent {
   readonly progressWidth = input(0);
 
   /** Emits when the user presses the close button */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onClose = new EventEmitter<void>();
 
   protected get iconClass(): string {
diff --git a/libs/components/src/toast/toast.stories.ts b/libs/components/src/toast/toast.stories.ts
index 89c8bffad5c..f7eeadce971 100644
--- a/libs/components/src/toast/toast.stories.ts
+++ b/libs/components/src/toast/toast.stories.ts
@@ -17,12 +17,16 @@ import { ToastOptions, ToastService } from "./toast.service";
 const toastServiceExampleTemplate = `
   <button bitButton type="button" (click)="toastService.showToast(toastOptions)">Show Toast</button>
 `;
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "toast-service-example",
   template: toastServiceExampleTemplate,
   imports: [ButtonModule],
 })
 export class ToastServiceExampleComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   toastOptions?: ToastOptions;
 
diff --git a/libs/components/src/toast/toastr.component.ts b/libs/components/src/toast/toastr.component.ts
index 3b7665f1d64..5f96cb9128d 100644
--- a/libs/components/src/toast/toastr.component.ts
+++ b/libs/components/src/toast/toastr.component.ts
@@ -7,6 +7,8 @@ import { ToastComponent } from "./toast.component";
 /**
  * Toasts are ephemeral notifications. They most often communicate the result of a user action. Due to their ephemeral nature, long messages and critical alerts should not utilize toasts.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <bit-toast
diff --git a/libs/components/src/toggle-group/toggle-group.component.spec.ts b/libs/components/src/toggle-group/toggle-group.component.spec.ts
index b00161d9064..3a9d35b862b 100644
--- a/libs/components/src/toggle-group/toggle-group.component.spec.ts
+++ b/libs/components/src/toggle-group/toggle-group.component.spec.ts
@@ -6,18 +6,18 @@ import { ToggleGroupModule } from "./toggle-group.module";
 import { ToggleComponent } from "./toggle.component";
 
 describe("Button", () => {
-  let fixture: ComponentFixture<TestApp>;
-  let testAppComponent: TestApp;
+  let fixture: ComponentFixture<TestAppComponent>;
+  let testAppComponent: TestAppComponent;
   let buttonElements: ToggleComponent<unknown>[];
   let radioButtons: HTMLInputElement[];
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [TestApp],
+      imports: [TestAppComponent],
     });
 
     await TestBed.compileComponents();
-    fixture = TestBed.createComponent(TestApp);
+    fixture = TestBed.createComponent(TestAppComponent);
     testAppComponent = fixture.debugElement.componentInstance;
     buttonElements = fixture.debugElement
       .queryAll(By.css("bit-toggle"))
@@ -53,6 +53,8 @@ describe("Button", () => {
   });
 });
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "test-app",
   template: `
@@ -64,6 +66,6 @@ describe("Button", () => {
   `,
   imports: [ToggleGroupModule],
 })
-class TestApp {
+class TestAppComponent {
   selected?: string;
 }
diff --git a/libs/components/src/toggle-group/toggle-group.component.ts b/libs/components/src/toggle-group/toggle-group.component.ts
index 16c4063f9e2..bde8f0ea9b6 100644
--- a/libs/components/src/toggle-group/toggle-group.component.ts
+++ b/libs/components/src/toggle-group/toggle-group.component.ts
@@ -10,6 +10,8 @@ import {
 
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-toggle-group",
   templateUrl: "./toggle-group.component.html",
@@ -20,6 +22,8 @@ export class ToggleGroupComponent<TValue = unknown> {
 
   readonly fullWidth = input<boolean, unknown>(undefined, { transform: booleanAttribute });
   readonly selected = model<TValue>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() selectedChange = new EventEmitter<TValue>();
 
   @HostBinding("attr.role") role = "radiogroup";
diff --git a/libs/components/src/toggle-group/toggle.component.spec.ts b/libs/components/src/toggle-group/toggle.component.spec.ts
index 1eec7e54e38..d3bc2e0eeed 100644
--- a/libs/components/src/toggle-group/toggle.component.spec.ts
+++ b/libs/components/src/toggle-group/toggle.component.spec.ts
@@ -45,6 +45,8 @@ describe("Toggle", () => {
   });
 });
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "test-component",
   template: `
diff --git a/libs/components/src/toggle-group/toggle.component.ts b/libs/components/src/toggle-group/toggle.component.ts
index 0301fe17979..538b31f6a32 100644
--- a/libs/components/src/toggle-group/toggle.component.ts
+++ b/libs/components/src/toggle-group/toggle.component.ts
@@ -14,6 +14,8 @@ import { ToggleGroupComponent } from "./toggle-group.component";
 
 let nextId = 0;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-toggle",
   templateUrl: "./toggle.component.html",
@@ -31,8 +33,8 @@ export class ToggleComponent<TValue> implements AfterContentChecked, AfterViewIn
   @HostBinding("tabIndex") tabIndex = "-1";
   @HostBinding("class") classList = ["tw-group/toggle", "tw-flex", "tw-min-w-16"];
 
-  protected bitBadgeContainerHasChidlren = signal(false);
-  protected labelTitle = signal<string | null>(null);
+  protected readonly bitBadgeContainerHasChidlren = signal(false);
+  protected readonly labelTitle = signal<string | null>(null);
 
   get name() {
     return this.groupComponent.name;
@@ -54,7 +56,7 @@ export class ToggleComponent<TValue> implements AfterContentChecked, AfterViewIn
       "tw-items-center",
       "tw-justify-center",
       "tw-gap-1.5",
-      "!tw-font-semibold",
+      "!tw-font-medium",
       "tw-leading-5",
       "tw-transition",
       "tw-text-center",
diff --git a/libs/components/src/tooltip/index.ts b/libs/components/src/tooltip/index.ts
new file mode 100644
index 00000000000..28c35fd6ee6
--- /dev/null
+++ b/libs/components/src/tooltip/index.ts
@@ -0,0 +1 @@
+export * from "./tooltip.directive";
diff --git a/libs/components/src/tooltip/tooltip-positions.ts b/libs/components/src/tooltip/tooltip-positions.ts
new file mode 100644
index 00000000000..6396bb6632e
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip-positions.ts
@@ -0,0 +1,61 @@
+import { ConnectedPosition } from "@angular/cdk/overlay";
+
+const ORIGIN_OFFSET_PX = 10;
+
+export type TooltipPositionIdentifier =
+  | "right-center"
+  | "left-center"
+  | "below-center"
+  | "above-center";
+
+export interface TooltipPosition extends ConnectedPosition {
+  id: TooltipPositionIdentifier;
+}
+
+export const tooltipPositions: TooltipPosition[] = [
+  /**
+   * The order of these positions matters. The Tooltip component will use
+   * the first position that fits within the viewport.
+   */
+
+  // Tooltip opens to right of trigger
+  {
+    id: "right-center",
+    offsetX: ORIGIN_OFFSET_PX,
+    originX: "end",
+    originY: "center",
+    overlayX: "start",
+    overlayY: "center",
+    panelClass: ["bit-tooltip-right-center"],
+  },
+  // ... to left of trigger
+  {
+    id: "left-center",
+    offsetX: -ORIGIN_OFFSET_PX,
+    originX: "start",
+    originY: "center",
+    overlayX: "end",
+    overlayY: "center",
+    panelClass: ["bit-tooltip-left-center"],
+  },
+  // ... below trigger
+  {
+    id: "below-center",
+    offsetY: ORIGIN_OFFSET_PX,
+    originX: "center",
+    originY: "bottom",
+    overlayX: "center",
+    overlayY: "top",
+    panelClass: ["bit-tooltip-below-center"],
+  },
+  // ... above trigger
+  {
+    id: "above-center",
+    offsetY: -ORIGIN_OFFSET_PX,
+    originX: "center",
+    originY: "top",
+    overlayX: "center",
+    overlayY: "bottom",
+    panelClass: ["bit-tooltip-above-center"],
+  },
+];
diff --git a/libs/components/src/tooltip/tooltip.component.css b/libs/components/src/tooltip/tooltip.component.css
new file mode 100644
index 00000000000..4abb9908f25
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.component.css
@@ -0,0 +1,132 @@
+:root {
+  --tooltip-shadow: rgb(0 0 0 / 0.1);
+}
+
+.cdk-overlay-pane:has(.bit-tooltip[data-visible="false"]) {
+  pointer-events: none;
+}
+
+.bit-tooltip-container {
+  position: relative;
+  max-width: 12rem;
+  opacity: 0;
+  width: max-content;
+  box-shadow:
+    0 4px 6px -1px var(--tooltip-shadow),
+    0 2px 4px -2px var(--tooltip-shadow);
+  border-radius: 0.75rem;
+  transition:
+    transform 100ms ease-in-out,
+    opacity 100ms ease-in-out;
+  transform: scale(0.95);
+  z-index: 1;
+
+  &::before,
+  &::after {
+    content: "";
+    position: absolute;
+    width: 1rem;
+    height: 1rem;
+    z-index: 1;
+    rotate: 45deg;
+    border-radius: 3px;
+  }
+
+  &::before {
+    background: linear-gradient(135deg, transparent 50%, rgb(var(--color-text-main)) 50%);
+    z-index: -1;
+  }
+
+  &::after {
+    background: rgb(var(--color-text-main));
+    z-index: -1;
+  }
+
+  &[data-visible="true"] {
+    opacity: 1;
+    transform: scale(1);
+    z-index: 1000;
+  }
+
+  .bit-tooltip-above-center &,
+  .bit-tooltip-below-center & {
+    &::before,
+    &::after {
+      inset-inline-start: 50%;
+      transform: translateX(-50%);
+      transform-origin: left;
+    }
+  }
+
+  .bit-tooltip-above-center & {
+    &::after {
+      filter: drop-shadow(0 3px 5px var(--tooltip-shadow))
+        drop-shadow(0 1px 3px var(--tooltip-shadow));
+    }
+
+    &::before,
+    &::after {
+      inset-block-end: -0.25rem;
+    }
+  }
+
+  .bit-tooltip-below-center & {
+    &::after {
+      display: none;
+    }
+
+    &::after,
+    &::before {
+      inset-block-start: -0.25rem;
+      rotate: -135deg;
+    }
+  }
+
+  .bit-tooltip-left-center &,
+  .bit-tooltip-right-center & {
+    &::after,
+    &::before {
+      inset-block-start: 50%;
+      transform: translateY(-50%);
+      transform-origin: top;
+    }
+  }
+
+  .bit-tooltip-left-center & {
+    &::after {
+      filter: drop-shadow(-3px 1px 3px var(--tooltip-shadow))
+        drop-shadow(-1px 2px 3px var(--tooltip-shadow));
+    }
+
+    &::after,
+    &::before {
+      inset-inline-end: -0.25rem;
+      rotate: -45deg;
+    }
+  }
+
+  .bit-tooltip-right-center & {
+    &::after {
+      filter: drop-shadow(2px -4px 2px var(--tooltip-shadow))
+        drop-shadow(0 -1px 3px var(--tooltip-shadow));
+    }
+
+    &::after,
+    &::before {
+      inset-inline-start: -0.25rem;
+      rotate: 135deg;
+    }
+  }
+}
+
+.bit-tooltip {
+  width: max-content;
+  max-width: 12rem;
+  background-color: rgb(var(--color-text-main));
+  color: rgb(var(--color-text-contrast));
+  padding: 0.5rem 0.75rem;
+  border-radius: 0.75rem;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  z-index: 2;
+}
diff --git a/libs/components/src/tooltip/tooltip.component.html b/libs/components/src/tooltip/tooltip.component.html
new file mode 100644
index 00000000000..ce9f1ceeffe
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.component.html
@@ -0,0 +1,11 @@
+@if (tooltipData.content()) {
+  <div
+    class="bit-tooltip-container"
+    [attr.data-position]="tooltipData.tooltipPosition()"
+    [attr.data-visible]="tooltipData.isVisible()"
+  >
+    <div role="tooltip" class="bit-tooltip" [id]="tooltipData.id()">
+      <ng-content>{{ tooltipData.content() }}</ng-content>
+    </div>
+  </div>
+}
diff --git a/libs/components/src/tooltip/tooltip.component.ts b/libs/components/src/tooltip/tooltip.component.ts
new file mode 100644
index 00000000000..79e2dfd7973
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.component.ts
@@ -0,0 +1,39 @@
+import { CommonModule } from "@angular/common";
+import {
+  Component,
+  ElementRef,
+  inject,
+  InjectionToken,
+  Signal,
+  TemplateRef,
+  viewChild,
+} from "@angular/core";
+
+import { TooltipPosition } from "./tooltip-positions";
+
+type TooltipData = {
+  content: Signal<string>;
+  isVisible: Signal<boolean>;
+  tooltipPosition: Signal<TooltipPosition>;
+  id: Signal<string>;
+};
+
+export const TOOLTIP_DATA = new InjectionToken<TooltipData>("TOOLTIP_DATA");
+
+/**
+ * tooltip component used internally by the tooltip.directive. Not meant to be used explicitly
+ */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-tooltip",
+  templateUrl: "./tooltip.component.html",
+  imports: [CommonModule],
+})
+export class TooltipComponent {
+  readonly templateRef = viewChild.required(TemplateRef);
+
+  private elementRef = inject(ElementRef<HTMLDivElement>);
+
+  readonly tooltipData = inject<TooltipData>(TOOLTIP_DATA);
+}
diff --git a/libs/components/src/tooltip/tooltip.directive.ts b/libs/components/src/tooltip/tooltip.directive.ts
new file mode 100644
index 00000000000..bcf9fc5e174
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.directive.ts
@@ -0,0 +1,132 @@
+import { Overlay, OverlayConfig, OverlayRef } from "@angular/cdk/overlay";
+import { ComponentPortal } from "@angular/cdk/portal";
+import {
+  Directive,
+  ViewContainerRef,
+  inject,
+  OnInit,
+  ElementRef,
+  Injector,
+  input,
+  signal,
+  model,
+  computed,
+} from "@angular/core";
+
+import { TooltipPositionIdentifier, tooltipPositions } from "./tooltip-positions";
+import { TooltipComponent, TOOLTIP_DATA } from "./tooltip.component";
+
+/**
+ * Directive to add a tooltip to any element. The tooltip content is provided via the `bitTooltip` input.
+ * The position of the tooltip can be set via the `tooltipPosition` input. Default position is "above-center".
+ */
+@Directive({
+  selector: "[bitTooltip]",
+  host: {
+    "(mouseenter)": "showTooltip()",
+    "(mouseleave)": "hideTooltip()",
+    "(focus)": "showTooltip()",
+    "(blur)": "hideTooltip()",
+    "[attr.aria-describedby]": "resolvedDescribedByIds()",
+  },
+})
+export class TooltipDirective implements OnInit {
+  private static nextId = 0;
+  /**
+   * The value of this input is forwarded to the tooltip.component to render
+   */
+  readonly tooltipContent = model("", { alias: "bitTooltip" });
+  /**
+   * The value of this input is forwarded to the tooltip.component to set its position explicitly.
+   * @default "above-center"
+   */
+  readonly tooltipPosition = input<TooltipPositionIdentifier>("above-center");
+
+  /**
+   * Input so the consumer can choose to add the tooltip id to the aria-describedby attribute of the host element.
+   */
+  readonly addTooltipToDescribedby = input<boolean>(false);
+
+  private readonly isVisible = signal(false);
+  private overlayRef: OverlayRef | undefined;
+  private elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  private overlay = inject(Overlay);
+  private viewContainerRef = inject(ViewContainerRef);
+  private positionStrategy = this.overlay
+    .position()
+    .flexibleConnectedTo(this.elementRef)
+    .withFlexibleDimensions(false)
+    .withPush(true);
+  private tooltipId = `bit-tooltip-${TooltipDirective.nextId++}`;
+  private currentDescribedByIds =
+    this.elementRef.nativeElement.getAttribute("aria-describedby") || null;
+
+  private tooltipPortal = new ComponentPortal(
+    TooltipComponent,
+    this.viewContainerRef,
+    Injector.create({
+      providers: [
+        {
+          provide: TOOLTIP_DATA,
+          useValue: {
+            content: this.tooltipContent,
+            isVisible: this.isVisible,
+            tooltipPosition: this.tooltipPosition,
+            id: signal(this.tooltipId),
+          },
+        },
+      ],
+    }),
+  );
+
+  private destroyTooltip = () => {
+    this.overlayRef?.dispose();
+    this.overlayRef = undefined;
+    this.isVisible.set(false);
+  };
+
+  private showTooltip = () => {
+    if (!this.overlayRef) {
+      this.overlayRef = this.overlay.create({
+        ...this.defaultPopoverConfig,
+        positionStrategy: this.positionStrategy,
+      });
+
+      this.overlayRef.attach(this.tooltipPortal);
+    }
+    this.isVisible.set(true);
+  };
+
+  private hideTooltip = () => {
+    this.destroyTooltip();
+  };
+
+  private readonly resolvedDescribedByIds = computed(() => {
+    if (this.addTooltipToDescribedby()) {
+      if (this.currentDescribedByIds) {
+        return `${this.currentDescribedByIds || ""} ${this.tooltipId}`;
+      } else {
+        return this.tooltipId;
+      }
+    } else {
+      return this.currentDescribedByIds;
+    }
+  });
+
+  private computePositions(tooltipPosition: TooltipPositionIdentifier) {
+    const chosenPosition = tooltipPositions.find((position) => position.id === tooltipPosition);
+
+    return chosenPosition ? [chosenPosition, ...tooltipPositions] : tooltipPositions;
+  }
+
+  get defaultPopoverConfig(): OverlayConfig {
+    return {
+      hasBackdrop: false,
+      scrollStrategy: this.overlay.scrollStrategies.reposition(),
+    };
+  }
+
+  ngOnInit() {
+    this.positionStrategy.withPositions(this.computePositions(this.tooltipPosition()));
+  }
+}
diff --git a/libs/components/src/tooltip/tooltip.mdx b/libs/components/src/tooltip/tooltip.mdx
new file mode 100644
index 00000000000..13e159c98eb
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.mdx
@@ -0,0 +1,48 @@
+import { Meta, Canvas, Source, Primary, Controls, Title, Description } from "@storybook/addon-docs";
+
+import * as stories from "./tooltip.stories";
+
+<Meta of={stories} />
+
+```ts
+import { TooltipDirective } from "@bitwarden/components";
+```
+
+<Title />
+<Description />
+
+### Tooltip usage
+
+The `TooltipComponent` can't be used on its own. It must be applied via the `TooltipDirective`.
+
+The `IconButtonComponent` will automatically apply a tooltip based on the component's `label` input.
+
+#### Adding the tooltip to the host element's `aria-describedby` list
+
+The `addTooltipToDescribedby="true"` model input can be used to add the tooltip id to the list of
+the host element's `aria-describedby` element IDs.
+
+NOTE: This behavior is not always necessary and could be redundant if the host element's aria
+attributes already convey the same message as the tooltip. Use only when the tooltip is extra,
+non-essential contextual information.
+
+<Primary />
+<Controls />
+
+## Stories
+
+### All available positions
+
+<Canvas of={stories.AllPositions} />
+
+### Used with a long content
+
+<Canvas of={stories.LongContent} />
+
+### On disabled element
+
+<Canvas of={stories.OnDisabledButton} />
+
+### On a Button
+
+<Canvas of={stories.OnNonIconButton} />
diff --git a/libs/components/src/tooltip/tooltip.spec.ts b/libs/components/src/tooltip/tooltip.spec.ts
new file mode 100644
index 00000000000..a88424de3bb
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.spec.ts
@@ -0,0 +1,112 @@
+import {
+  ConnectedOverlayPositionChange,
+  ConnectionPositionPair,
+  OverlayConfig,
+  Overlay,
+} from "@angular/cdk/overlay";
+import { ComponentPortal } from "@angular/cdk/portal";
+import { Component } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+import { Observable, Subject } from "rxjs";
+
+import { TooltipDirective } from "./tooltip.directive";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  standalone: true,
+  imports: [TooltipDirective],
+  template: ` <button [bitTooltip]="tooltipText" type="button">Hover or focus me</button> `,
+})
+class TooltipHostComponent {
+  tooltipText = "Hello Tooltip";
+}
+
+/** Minimal strategy shape the directive expects */
+interface StrategyLike {
+  withFlexibleDimensions: (flex: boolean) => StrategyLike;
+  withPush: (push: boolean) => StrategyLike;
+  withPositions: (positions: ReadonlyArray<ConnectionPositionPair>) => StrategyLike;
+  readonly positionChanges: Observable<ConnectedOverlayPositionChange>;
+}
+
+/** Minimal Overlay service shape */
+interface OverlayLike {
+  position: () => { flexibleConnectedTo: (_: unknown) => StrategyLike };
+  create: (_: OverlayConfig) => OverlayRefStub;
+  scrollStrategies: { reposition: () => unknown };
+}
+
+interface OverlayRefStub {
+  attach: (portal: ComponentPortal<unknown>) => unknown;
+  updatePosition: () => void;
+}
+
+describe("TooltipDirective (visibility only)", () => {
+  let fixture: ComponentFixture<TooltipHostComponent>;
+
+  beforeEach(() => {
+    const positionChanges$ = new Subject<ConnectedOverlayPositionChange>();
+
+    const strategy: StrategyLike = {
+      withFlexibleDimensions: jest.fn(() => strategy),
+      withPush: jest.fn(() => strategy),
+      withPositions: jest.fn(() => strategy),
+      get positionChanges() {
+        return positionChanges$.asObservable();
+      },
+    };
+
+    const overlayRefStub: OverlayRefStub = {
+      attach: jest.fn(() => ({
+        changeDetectorRef: { detectChanges: jest.fn() },
+        location: {
+          nativeElement: {
+            querySelector: jest.fn().mockReturnValue({ id: "tip-123" }),
+          },
+        },
+      })),
+      updatePosition: jest.fn(),
+    };
+
+    const overlayMock: OverlayLike = {
+      position: () => ({ flexibleConnectedTo: () => strategy }),
+      create: (_: OverlayConfig) => overlayRefStub,
+      scrollStrategies: { reposition: () => ({}) },
+    };
+
+    TestBed.configureTestingModule({
+      imports: [TooltipHostComponent],
+      providers: [{ provide: Overlay, useValue: overlayMock as unknown as Overlay }],
+    });
+
+    fixture = TestBed.createComponent(TooltipHostComponent);
+    fixture.detectChanges();
+  });
+
+  function getDirective(): TooltipDirective {
+    const hostDE = fixture.debugElement.query(By.directive(TooltipDirective));
+    return hostDE.injector.get(TooltipDirective);
+  }
+
+  it("sets isVisible to true on mouseenter", () => {
+    const button: HTMLButtonElement = fixture.debugElement.query(By.css("button")).nativeElement;
+    const directive = getDirective();
+
+    const isVisible = (directive as unknown as { isVisible: () => boolean }).isVisible;
+
+    button.dispatchEvent(new Event("mouseenter"));
+    expect(isVisible()).toBe(true);
+  });
+
+  it("sets isVisible to true on focus", () => {
+    const button: HTMLButtonElement = fixture.debugElement.query(By.css("button")).nativeElement;
+    const directive = getDirective();
+
+    const isVisible = (directive as unknown as { isVisible: () => boolean }).isVisible;
+
+    button.dispatchEvent(new Event("focus"));
+    expect(isVisible()).toBe(true);
+  });
+});
diff --git a/libs/components/src/tooltip/tooltip.stories.ts b/libs/components/src/tooltip/tooltip.stories.ts
new file mode 100644
index 00000000000..73df08e25fa
--- /dev/null
+++ b/libs/components/src/tooltip/tooltip.stories.ts
@@ -0,0 +1,186 @@
+import { signal } from "@angular/core";
+import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+import { getByRole, userEvent } from "@storybook/test";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { ButtonComponent } from "../button";
+import { BitIconButtonComponent } from "../icon-button";
+import { I18nMockService } from "../utils";
+
+import { TooltipPosition, TooltipPositionIdentifier, tooltipPositions } from "./tooltip-positions";
+import { TOOLTIP_DATA, TooltipComponent } from "./tooltip.component";
+import { TooltipDirective } from "./tooltip.directive";
+
+import { formatArgsForCodeSnippet } from ".storybook/format-args-for-code-snippet";
+
+export default {
+  title: "Component Library/Tooltip",
+  component: TooltipDirective,
+  decorators: [
+    moduleMetadata({
+      imports: [TooltipDirective, TooltipComponent, BitIconButtonComponent, ButtonComponent],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              loading: "Loading",
+            });
+          },
+        },
+        {
+          provide: TOOLTIP_DATA,
+          useFactory: () => {
+            // simple fixed demo values for the Default story
+            return {
+              content: signal("This is a tooltip"),
+              isVisible: signal(true),
+              tooltipPosition: signal<TooltipPositionIdentifier>("above-center"),
+            };
+          },
+        },
+      ],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?m=auto&node-id=30558-13730&t=4k23PtzCwqDekAZW-1",
+    },
+    chromatic: {
+      // Allows 30% difference for the tooltip stories since they are rendered in a portal and may be affected by the environment.
+      diffThreshold: 0.3,
+    },
+  },
+  argTypes: {
+    bitTooltip: {
+      control: "text",
+      description: "Text content of the tooltip",
+    },
+    tooltipPosition: {
+      control: "select",
+      options: tooltipPositions.map((position: TooltipPosition) => position.id),
+      description: "Position of the tooltip relative to the element",
+      table: {
+        type: {
+          summary: tooltipPositions.map((position: TooltipPosition) => position.id).join(" | "),
+        },
+        defaultValue: { summary: "above-center" },
+      },
+    },
+  },
+} as Meta<TooltipDirective>;
+
+type Story = StoryObj<TooltipDirective>;
+
+export const Default: Story = {
+  args: {
+    tooltipPosition: "above-center",
+  },
+  parameters: {
+    chromatic: { disableSnapshot: true },
+  },
+  render: (args) => ({
+    props: args,
+    template: `
+      <div class="tw-p-4">
+        <button
+          bitIconButton="bwi-ellipsis-v"
+          label="Your tooltip content here"
+          ${formatArgsForCodeSnippet<TooltipDirective>(args)}
+        >
+          Button label here
+        </button>
+      </div>
+    `,
+  }),
+  play: async (context) => {
+    const canvasEl = context.canvasElement;
+    const button = getByRole(canvasEl, "button");
+
+    await userEvent.hover(button);
+  },
+};
+
+export const AllPositions: Story = {
+  parameters: {
+    chromatic: { disableSnapshot: true },
+  },
+  render: () => ({
+    template: `
+      <div class="tw-p-16 tw-grid tw-grid-cols-2 tw-gap-8 tw-place-items-center">
+        <button
+          bitIconButton="bwi-angle-up"
+          label="Top tooltip"
+          tooltipPosition="above-center"
+        ></button>
+        <button
+          bitIconButton="bwi-angle-right"
+          label="Right tooltip"
+          tooltipPosition="right-center"
+        ></button>
+        <button
+          bitIconButton="bwi-angle-left"
+          label="Left tooltip"
+          tooltipPosition="left-center"
+        ></button>
+        <button
+          bitIconButton="bwi-angle-down"
+          label="Bottom tooltip"
+          tooltipPosition="below-center"
+        ></button>
+      </div>
+    `,
+  }),
+};
+
+export const LongContent: Story = {
+  parameters: {
+    chromatic: { disableSnapshot: true },
+  },
+  render: () => ({
+    template: `
+      <div class="tw-p-16 tw-flex tw-items-center tw-justify-center">
+        <button
+          bitIconButton="bwi-ellipsis-v"
+          label="This is a very long tooltip that will wrap to multiple lines to demonstrate how the tooltip handles long content. This is not recommended for usability."
+        ></button>
+      </div>
+    `,
+  }),
+};
+
+export const OnDisabledButton: Story = {
+  parameters: {
+    chromatic: { disableSnapshot: true },
+  },
+  render: () => ({
+    template: `
+      <div class="tw-p-16 tw-flex tw-items-center tw-justify-center">
+        <button
+          bitIconButton="bwi-ellipsis-v"
+          label="Tooltip on disabled button"
+          [disabled]="true"
+        ></button>
+      </div>
+    `,
+  }),
+};
+
+export const OnNonIconButton: Story = {
+  parameters: {
+    chromatic: { disableSnapshot: true },
+  },
+  render: () => ({
+    template: `
+      <div class="tw-p-16 tw-flex tw-items-center tw-justify-center">
+        <button
+          bitButton
+          addTooltipToDescribedby="true"
+          bitTooltip="Some additional tooltip text to describe the button"
+        >Button label</button>
+      </div>
+    `,
+  }),
+};
diff --git a/libs/components/src/tw-theme-preflight.css b/libs/components/src/tw-theme-preflight.css
index e5f35885993..fedc2d1d232 100644
--- a/libs/components/src/tw-theme-preflight.css
+++ b/libs/components/src/tw-theme-preflight.css
@@ -14,22 +14,22 @@
   }
 
   h1 {
-    @apply tw-text-3xl tw-font-semibold tw-text-main tw-mb-2;
+    @apply tw-text-3xl tw-text-main tw-mb-2 tw-font-medium;
   }
   h2 {
-    @apply tw-text-2xl tw-font-semibold tw-text-main tw-mb-2;
+    @apply tw-text-2xl tw-text-main tw-mb-2 tw-font-medium;
   }
   h3 {
-    @apply tw-text-xl tw-font-semibold tw-text-main tw-mb-2;
+    @apply tw-text-xl tw-text-main tw-mb-2 tw-font-medium;
   }
   h4 {
-    @apply tw-text-lg tw-font-semibold tw-text-main tw-mb-2;
+    @apply tw-text-lg tw-text-main tw-mb-2 tw-font-medium;
   }
   h5 {
-    @apply tw-text-base tw-font-bold tw-text-main tw-mb-1.5;
+    @apply tw-text-base tw-text-main tw-mb-1.5 tw-font-medium;
   }
   h6 {
-    @apply tw-text-sm tw-font-bold tw-text-main tw-mb-1.5;
+    @apply tw-text-sm tw-text-main tw-mb-1.5 tw-font-medium;
   }
 
   code {
@@ -54,6 +54,14 @@
     display: none !important;
   }
 
+  dl {
+    @apply tw-mb-4;
+  }
+
+  dt {
+    @apply tw-font-medium;
+  }
+
   hr {
     border-color: rgba(0, 0, 0, 0.1);
   }
@@ -70,4 +78,16 @@
   svg {
     display: inline;
   }
+
+  th {
+    @apply tw-font-medium;
+  }
+
+  b {
+    @apply tw-font-medium;
+  }
+
+  strong {
+    @apply tw-font-medium;
+  }
 }
diff --git a/libs/components/src/tw-theme.css b/libs/components/src/tw-theme.css
index ec29bc522eb..f8e02a7e668 100644
--- a/libs/components/src/tw-theme.css
+++ b/libs/components/src/tw-theme.css
@@ -5,6 +5,7 @@
 @import "./popover/popover.component.css";
 @import "./toast/toast.tokens.css";
 @import "./toast/toastr.css";
+@import "./tooltip/tooltip.component.css";
 @import "./search/search.component.css";
 
 @tailwind base;
@@ -61,6 +62,7 @@
   --color-hover-contrast: rgb(255 255 255 / 0.15);
 
   --color-marketing-logo: 23 93 220;
+  --color-bw-blue: 23 93 220;
 
   --tw-ring-offset-color: #ffffff;
 
@@ -128,6 +130,7 @@
   --color-hover-contrast: rgb(0 0 0 / 0.15);
 
   --color-marketing-logo: 255 255 255;
+  --color-bw-blue: 23 93 220;
 
   --tw-ring-offset-color: #1f242e;
 
diff --git a/libs/components/src/typography/typography.directive.ts b/libs/components/src/typography/typography.directive.ts
index 3a507d3fc4b..229f38d8b11 100644
--- a/libs/components/src/typography/typography.directive.ts
+++ b/libs/components/src/typography/typography.directive.ts
@@ -3,12 +3,12 @@ import { booleanAttribute, Directive, HostBinding, input } from "@angular/core";
 type TypographyType = "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "body1" | "body2" | "helper";
 
 const styles: Record<TypographyType, string[]> = {
-  h1: ["!tw-text-3xl", "tw-font-semibold", "tw-text-main"],
-  h2: ["!tw-text-2xl", "tw-font-semibold", "tw-text-main"],
-  h3: ["!tw-text-xl", "tw-font-semibold", "tw-text-main"],
-  h4: ["!tw-text-lg", "tw-font-semibold", "tw-text-main"],
-  h5: ["!tw-text-base", "tw-font-bold", "tw-text-main"],
-  h6: ["!tw-text-sm", "tw-font-bold", "tw-text-main"],
+  h1: ["!tw-text-3xl", "tw-text-main", "tw-font-medium"],
+  h2: ["!tw-text-2xl", "tw-text-main", "tw-font-medium"],
+  h3: ["!tw-text-xl", "tw-text-main", "tw-font-medium"],
+  h4: ["!tw-text-lg", "tw-text-main", "tw-font-medium"],
+  h5: ["!tw-text-base", "tw-text-main", "tw-font-medium"],
+  h6: ["!tw-text-sm", "tw-text-main", "tw-font-medium"],
   body1: ["!tw-text-base"],
   body2: ["!tw-text-sm"],
   helper: ["!tw-text-xs"],
diff --git a/libs/components/src/typography/typography.stories.ts b/libs/components/src/typography/typography.stories.ts
index 10fef6bbe72..f9c57ae2637 100644
--- a/libs/components/src/typography/typography.stories.ts
+++ b/libs/components/src/typography/typography.stories.ts
@@ -1,28 +1,226 @@
-import { Meta, StoryObj } from "@storybook/angular";
+import { Meta, moduleMetadata } from "@storybook/angular";
+
+import { TableModule, TableDataSource } from "../table";
 
 import { TypographyDirective } from "./typography.directive";
 
 export default {
   title: "Component Library/Typography",
   component: TypographyDirective,
+  decorators: [
+    moduleMetadata({
+      imports: [TableModule],
+    }),
+  ],
 } as Meta;
 
-export const Default: StoryObj<TypographyDirective & { text: string }> = {
-  render: (args) => ({
+type TypographyData = {
+  id: string;
+  typography: string;
+  classes?: string;
+  weight: string;
+  size: number;
+  lineHeight: string;
+};
+
+const typographyProps: TypographyData[] = [
+  {
+    id: "h1",
+    typography: "h1",
+    weight: "Medium",
+    size: 30,
+    lineHeight: "150%",
+  },
+  {
+    id: "h2",
+    typography: "h2",
+    weight: "Medium",
+    size: 24,
+    lineHeight: "150%",
+  },
+  {
+    id: "h3",
+    typography: "h3",
+    weight: "Medium",
+    size: 20,
+    lineHeight: "150%",
+  },
+  {
+    id: "h4",
+    typography: "h4",
+    weight: "Medium",
+    size: 18,
+    lineHeight: "150%",
+  },
+  {
+    id: "h5",
+    typography: "h5",
+    weight: "Medium",
+    size: 16,
+    lineHeight: "150%",
+  },
+  {
+    id: "h6",
+    typography: "h6",
+    weight: "Medium",
+    size: 14,
+    lineHeight: "150%",
+  },
+  {
+    id: "body",
+    typography: "body1",
+    weight: "Regular",
+    size: 16,
+    lineHeight: "150%",
+  },
+  {
+    id: "body-med",
+    typography: "body1",
+    classes: "tw-font-medium",
+    weight: "Medium",
+    size: 16,
+    lineHeight: "150%",
+  },
+  {
+    id: "body-semi",
+    typography: "body1",
+    classes: "tw-font-semibold",
+    weight: "Semibold",
+    size: 16,
+    lineHeight: "150%",
+  },
+  {
+    id: "body-underline",
+    typography: "body1",
+    classes: "tw-underline",
+    weight: "Regular",
+    size: 16,
+    lineHeight: "150%",
+  },
+  {
+    id: "body-sm",
+    typography: "body2",
+    weight: "Regular",
+    size: 14,
+    lineHeight: "150%",
+  },
+  {
+    id: "body-sm-med",
+    typography: "body2",
+    classes: "tw-font-medium",
+    weight: "Medium",
+    size: 14,
+    lineHeight: "150%",
+  },
+  {
+    id: "body-sm-semi",
+    typography: "body2",
+    classes: "tw-font-semibold",
+    weight: "Semibold",
+    size: 14,
+    lineHeight: "150%",
+  },
+  {
+    id: "body-sm-underline",
+    typography: "body2",
+    classes: "tw-underline",
+    weight: "Regular",
+    size: 14,
+    lineHeight: "150%",
+  },
+  {
+    id: "helper",
+    typography: "helper",
+    weight: "Regular",
+    size: 12,
+    lineHeight: "150%",
+  },
+  {
+    id: "helper-med",
+    typography: "helper",
+    classes: "tw-font-medium",
+    weight: "Medium",
+    size: 12,
+    lineHeight: "150%",
+  },
+  {
+    id: "helper-semi",
+    typography: "helper",
+    classes: "tw-font-semibold",
+    weight: "Semibold",
+    size: 12,
+    lineHeight: "150%",
+  },
+  {
+    id: "helper-underline",
+    typography: "helper",
+    classes: "tw-underline",
+    weight: "Regular",
+    size: 12,
+    lineHeight: "150%",
+  },
+  {
+    id: "code",
+    typography: "body1",
+    classes: "tw-font-mono tw-text-code",
+    weight: "Regular",
+    size: 16,
+    lineHeight: "150%",
+  },
+  {
+    id: "code-sm",
+    typography: "body2",
+    classes: "tw-font-mono tw-text-code",
+    weight: "Regular",
+    size: 14,
+    lineHeight: "150%",
+  },
+
+  {
+    id: "code-helper",
+    typography: "helper",
+    classes: "tw-font-mono tw-text-code",
+    weight: "Regular",
+    size: 12,
+    lineHeight: "150%",
+  },
+];
+
+const typographyData = new TableDataSource<TypographyData>();
+typographyData.data = typographyProps;
+
+export const Default = {
+  render: (args: { text: string; dataSource: typeof typographyProps }) => ({
     props: args,
     template: /*html*/ `
-      <div bitTypography="h1">h1 - {{ text }}</div>
-      <div bitTypography="h2">h2 - {{ text }}</div>
-      <div bitTypography="h3">h3 - {{ text }}</div>
-      <div bitTypography="h4">h4 - {{ text }}</div>
-      <div bitTypography="h5">h5 - {{ text }}</div>
-      <div bitTypography="h6">h6 - {{ text }}</div>
-      <div bitTypography="body1" class="tw-text-main">body1 - {{ text }}</div>
-      <div bitTypography="body2" class="tw-text-main">body2 - {{ text }}</div>
-      <div bitTypography="helper" class="tw-text-main">helper - {{ text }}</div>
+      <bit-table [dataSource]="dataSource">
+        <ng-container header>
+          <tr>
+            <th bitCell>Rendered Text</th>
+            <th bitCell>bitTypography Variant</th>
+            <th bitCell>Additional Classes</th>
+            <th bitCell>Weight</th>
+            <th bitCell>Size</th>
+            <th bitCell>Line Height</th>
+          </tr>
+        </ng-container>
+        <ng-template body let-rows$>
+          @for (row of rows$ | async; track row.id) {
+            <tr bitRow alignContent="middle">
+              <td bitCell><div [bitTypography]="row.typography" [ngClass]="row.classes">{{text}}</div></td>
+              <td bitCell bitTypography="body2">{{row.typography}}</td>
+              <td bitCell bitTypography="body2">{{row.classes}}</td>
+              <td bitCell bitTypography="body2">{{row.weight}}</td>
+              <td bitCell bitTypography="body2">{{row.size}}</td>
+              <td bitCell bitTypography="body2">{{row.lineHeight}}</td>
+            </tr>
+          }
+        </ng-template>
+      </bit-table>
     `,
   }),
   args: {
     text: `Sphinx of black quartz, judge my vow.`,
+    dataSource: typographyData,
   },
 };
diff --git a/libs/components/src/utils/responsive-utils.ts b/libs/components/src/utils/responsive-utils.ts
new file mode 100644
index 00000000000..a9c2499c275
--- /dev/null
+++ b/libs/components/src/utils/responsive-utils.ts
@@ -0,0 +1,27 @@
+/**
+ * Breakpoint definitions in pixels matching Tailwind CSS default breakpoints.
+ * These values must stay in sync with tailwind.config.base.js theme.extend configuration.
+ *
+ * @see {@link https://tailwindcss.com/docs/responsive-design} for tailwind default breakpoints
+ * @see {@link /libs/components/src/stories/responsive-design.mdx} for design system usage
+ */
+export const BREAKPOINTS = {
+  sm: 640,
+  md: 768,
+  lg: 1024,
+  xl: 1280,
+  "2xl": 1536,
+};
+
+/**
+ * Checks if the current viewport is at or larger than the specified breakpoint.
+ * @param size The breakpoint to check.
+ * @returns True if the viewport is at or larger than the breakpoint, false otherwise.
+ */
+export const isAtOrLargerThanBreakpoint = (size: keyof typeof BREAKPOINTS): boolean => {
+  if (typeof window === "undefined" || !window.matchMedia) {
+    return false;
+  }
+  const query = `(min-width: ${BREAKPOINTS[size]}px)`;
+  return window.matchMedia(query).matches;
+};
diff --git a/libs/components/src/webfonts/inter.woff2 b/libs/components/src/webfonts/inter.woff2
new file mode 100644
index 00000000000..5a8d3e72ad7
Binary files /dev/null and b/libs/components/src/webfonts/inter.woff2 differ
diff --git a/libs/components/src/webfonts/roboto.woff2 b/libs/components/src/webfonts/roboto.woff2
deleted file mode 100644
index af8d2343d9c..00000000000
Binary files a/libs/components/src/webfonts/roboto.woff2 and /dev/null differ
diff --git a/libs/components/tailwind.config.base.js b/libs/components/tailwind.config.base.js
index 40362bfa8da..e41cff16e48 100644
--- a/libs/components/tailwind.config.base.js
+++ b/libs/components/tailwind.config.base.js
@@ -83,6 +83,7 @@ module.exports = {
         contrast: "var(--color-hover-contrast)",
       },
       "marketing-logo": rgba("--color-marketing-logo"),
+      "bw-blue": rgba("--color-bw-blue"),
       illustration: {
         outline: rgba("--color-illustration-outline"),
         "bg-primary": rgba("--color-illustration-bg-primary"),
@@ -154,8 +155,31 @@ module.exports = {
         "90vw": "90vw",
       }),
       fontSize: {
-        xs: [".8125rem", "1rem"],
-        "3xl": ["1.75rem", "2rem"],
+        "3xl": ["1.875rem", "150%"],
+        "2xl": ["1.5rem", "150%"],
+        xl: ["1.25rem", "150%"],
+        lg: ["1.125rem", "150%"],
+        md: ["1rem", "150%"],
+        base: ["1rem", "150%"],
+        sm: ["0.875rem", "150%"],
+        xs: [".75rem", "150%"],
+      },
+      container: {
+        "@5xl": "1100px",
+      },
+      keyframes: {
+        slideUp: {
+          "0%": { opacity: "0", transform: "translateY(50px)" },
+          "100%": { opacity: "1", transform: "translateY(0)" },
+        },
+        slideDown: {
+          "0%": { opacity: "0", transform: "translateY(-50px)" },
+          "100%": { opacity: "1", transform: "translateY(0)" },
+        },
+      },
+      animation: {
+        "slide-up": "slideUp 0.3s ease-out",
+        "slide-down": "slideDown 0.3s ease-out",
       },
     },
   },
@@ -196,5 +220,6 @@ module.exports = {
     plugin(function ({ addVariant }) {
       addVariant("bit-compact", ".bit-compact &");
     }),
+    require("@tailwindcss/container-queries"),
   ],
 };
diff --git a/libs/dirt/card/src/card.component.html b/libs/dirt/card/src/card.component.html
index 3fd9372087c..8688cd8fd2c 100644
--- a/libs/dirt/card/src/card.component.html
+++ b/libs/dirt/card/src/card.component.html
@@ -1,7 +1,9 @@
-<div class="tw-flex-col">
-  <span bitTypography="body2" class="tw-flex tw-text-muted">{{ title }}</span>
-  <div class="tw-flex tw-items-baseline tw-gap-2">
-    <span bitTypography="h1">{{ value }}</span>
-    <span bitTypography="body2">{{ "cardMetrics" | i18n: maxValue }}</span>
+<bit-card>
+  <div class="tw-flex tw-flex-col tw-gap-1.5">
+    <span bitTypography="body2" class="tw-flex tw-text-muted">{{ title }}</span>
+    <div class="tw-flex tw-items-baseline tw-gap-2">
+      <span bitTypography="h1" class="!tw-mb-0">{{ value }}</span>
+      <span bitTypography="body2">{{ "cardMetrics" | i18n: maxValue }}</span>
+    </div>
   </div>
-</div>
+</bit-card>
diff --git a/libs/dirt/card/src/card.component.ts b/libs/dirt/card/src/card.component.ts
index f9899125dbd..089115fc2bf 100644
--- a/libs/dirt/card/src/card.component.ts
+++ b/libs/dirt/card/src/card.component.ts
@@ -4,28 +4,32 @@ import { CommonModule } from "@angular/common";
 import { Component, Input } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { TypographyModule } from "@bitwarden/components";
+import { TypographyModule, CardComponent as BitCardComponent } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "dirt-card",
   templateUrl: "./card.component.html",
-  imports: [CommonModule, TypographyModule, JslibModule],
-  host: {
-    class:
-      "tw-box-border tw-bg-background tw-block tw-text-main tw-border-solid tw-border tw-border-secondary-300 tw-border [&:not(bit-layout_*)]:tw-rounded-lg tw-rounded-lg tw-p-6",
-  },
+  imports: [CommonModule, TypographyModule, JslibModule, BitCardComponent],
 })
 export class CardComponent {
   /**
    * The title of the card
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() title: string;
   /**
    * The current value of the card as emphasized text
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() value: number;
   /**
    * The maximum value of the card
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() maxValue: number;
 }
diff --git a/libs/eslint/platform/index.mjs b/libs/eslint/platform/index.mjs
index c7ea3f1dd89..be78df43e3f 100644
--- a/libs/eslint/platform/index.mjs
+++ b/libs/eslint/platform/index.mjs
@@ -1,4 +1,11 @@
 import requiredUsing from "./required-using.mjs";
 import noEnums from "./no-enums.mjs";
+import noPageScriptUrlLeakage from "./no-page-script-url-leakage.mjs";
 
-export default { rules: { "required-using": requiredUsing, "no-enums": noEnums } };
+export default {
+  rules: {
+    "required-using": requiredUsing,
+    "no-enums": noEnums,
+    "no-page-script-url-leakage": noPageScriptUrlLeakage,
+  },
+};
diff --git a/libs/eslint/platform/no-page-script-url-leakage.mjs b/libs/eslint/platform/no-page-script-url-leakage.mjs
new file mode 100644
index 00000000000..fe13c496a62
--- /dev/null
+++ b/libs/eslint/platform/no-page-script-url-leakage.mjs
@@ -0,0 +1,115 @@
+/**
+ * @fileoverview ESLint rule to prevent page script URL leakage vulnerabilities
+ * @description This rule detects the specific security vulnerability where DOM script elements
+ * receive extension URLs through chrome.runtime.getURL() or browser.runtime.getURL() calls.
+ * This pattern exposes predictable extension URLs to web pages, enabling fingerprinting attacks.
+ */
+
+export const errorMessage =
+  "Script injection with extension URL exposes asset urls. Use secure page script registration instead.";
+
+/**
+ * Checks if a node is a call to chrome.runtime.getURL() or browser.runtime.getURL()
+ * @param {Object} node - The AST node to check
+ * @returns {boolean} True if the node is an extension URL call
+ */
+function isExtensionURLCall(node) {
+  return (
+    node &&
+    node.type === "CallExpression" &&
+    node.callee &&
+    node.callee.type === "MemberExpression" &&
+    node.callee.object &&
+    node.callee.object.type === "MemberExpression" &&
+    node.callee.object.object &&
+    ["chrome", "browser"].includes(node.callee.object.object.name) &&
+    node.callee.object.property &&
+    node.callee.object.property.name === "runtime" &&
+    node.callee.property &&
+    node.callee.property.name === "getURL"
+  );
+}
+
+/**
+ * Checks if a node is a call to createElement("script")
+ * @param {Object} node - The AST node to check
+ * @returns {boolean} True if the node creates a script element
+ */
+function isScriptCreation(node) {
+  return (
+    node &&
+    node.type === "CallExpression" &&
+    node.callee &&
+    node.callee.type === "MemberExpression" &&
+    node.callee.property &&
+    node.callee.property.name === "createElement" &&
+    node.arguments &&
+    node.arguments.length === 1 &&
+    node.arguments[0] &&
+    node.arguments[0].type === "Literal" &&
+    node.arguments[0].value === "script"
+  );
+}
+
+export default {
+  meta: {
+    type: "problem",
+    docs: {
+      description: "Prevent page script URL leakage through extension runtime.getURL calls",
+      category: "Security",
+      recommended: true,
+    },
+    schema: [],
+    messages: {
+      pageScriptUrlLeakage: errorMessage,
+    },
+  },
+
+  create(context) {
+    const scriptVariables = new Set();
+
+    return {
+      // Track createElement("script") calls to identify script variables
+      VariableDeclarator(node) {
+        if (node.init && isScriptCreation(node.init) && node.id && node.id.name) {
+          scriptVariables.add(node.id.name);
+        }
+      },
+
+      // Track assignments where script elements are created
+      AssignmentExpression(node) {
+        // Track script element creation: variable = document.createElement("script")
+        if (
+          node.operator === "=" &&
+          node.left &&
+          node.left.type === "Identifier" &&
+          isScriptCreation(node.right)
+        ) {
+          scriptVariables.add(node.left.name);
+        }
+
+        // Check for script.src = extension URL pattern
+        if (
+          node.operator === "=" &&
+          node.left &&
+          node.left.type === "MemberExpression" &&
+          node.left.property &&
+          node.left.property.name === "src" &&
+          isExtensionURLCall(node.right)
+        ) {
+          // Only flag if this is a script element assignment
+          if (
+            node.left.object &&
+            node.left.object.type === "Identifier" &&
+            scriptVariables.has(node.left.object.name)
+          ) {
+            context.report({
+              node: node.right,
+              messageId: "pageScriptUrlLeakage",
+            });
+          }
+        }
+      },
+    };
+  },
+};
diff --git a/libs/eslint/platform/no-page-script-url-leakage.spec.mjs b/libs/eslint/platform/no-page-script-url-leakage.spec.mjs
new file mode 100644
index 00000000000..77e1c4d1697
--- /dev/null
+++ b/libs/eslint/platform/no-page-script-url-leakage.spec.mjs
@@ -0,0 +1,151 @@
+import { RuleTester } from "@typescript-eslint/rule-tester";
+
+import rule, { errorMessage } from "./no-page-script-url-leakage.mjs";
+
+const ruleTester = new RuleTester({
+  languageOptions: {
+    parserOptions: {
+      project: [__dirname + "/../tsconfig.spec.json"],
+      projectService: {
+        allowDefaultProject: ["*.ts*"],
+      },
+      tsconfigRootDir: __dirname + "/..",
+    },
+  },
+});
+
+ruleTester.run("no-page-script-url-leakage", rule.default, {
+  valid: [
+    {
+      name: "Non-script element with extension URL (iframe)",
+      code: `
+        const iframe = document.createElement("iframe");
+        iframe.src = chrome.runtime.getURL("popup.html");
+      `,
+    },
+    {
+      name: "Non-script element with extension URL (img)",
+      code: `
+        const img = document.createElement("img");
+        img.src = chrome.runtime.getURL("icon.png");
+      `,
+    },
+    {
+      name: "Script element with non-extension URL",
+      code: `
+        const script = document.createElement("script");
+        script.src = "https://example.com/script.js";
+      `,
+    },
+    {
+      name: "Extension URL call without DOM assignment",
+      code: `
+        const url = chrome.runtime.getURL("assets/icon.png");
+        console.log(url);
+      `,
+    },
+    {
+      name: "Browser runtime call without DOM assignment",
+      code: `
+        const url = browser.runtime.getURL("content/style.css");
+        fetch(url);
+      `,
+    },
+    {
+      name: "Script assignment with variable not from createElement",
+      code: `
+        const script = getSomeScriptElement();
+        script.src = chrome.runtime.getURL("script.js");
+      `,
+    },
+    {
+      name: "Assignment to different property",
+      code: `
+        const script = document.createElement("script");
+        script.type = "text/javascript";
+      `,
+    },
+  ],
+  invalid: [
+    {
+      name: "Script element with chrome.runtime.getURL - variable declaration",
+      code: `
+        const script = document.createElement("script");
+        script.src = chrome.runtime.getURL("content/script.js");
+      `,
+      errors: [
+        {
+          message: errorMessage,
+        },
+      ],
+    },
+    {
+      name: "Script element with browser.runtime.getURL - variable declaration",
+      code: `
+        const script = document.createElement("script");
+        script.src = browser.runtime.getURL("content/script.js");
+      `,
+      errors: [
+        {
+          message: errorMessage,
+        },
+      ],
+    },
+    {
+      name: "Script element with chrome.runtime.getURL - assignment expression",
+      code: `
+        let script;
+        script = document.createElement("script");
+        script.src = chrome.runtime.getURL("page-script.js");
+      `,
+      errors: [
+        {
+          message: errorMessage,
+        },
+      ],
+    },
+    {
+      name: "Script element with browser.runtime.getURL - assignment expression",
+      code: `
+        let element;
+        element = document.createElement("script");
+        element.src = browser.runtime.getURL("fido2-page-script.js");
+      `,
+      errors: [
+        {
+          message: errorMessage,
+        },
+      ],
+    },
+    {
+      name: "Multiple script elements with different variable names",
+      code: `
+        const scriptA = document.createElement("script");
+        const scriptB = document.createElement("script");
+        scriptA.src = chrome.runtime.getURL("script-a.js");
+        scriptB.src = browser.runtime.getURL("script-b.js");
+      `,
+      errors: [
+        {
+          message: errorMessage,
+        },
+        {
+          message: errorMessage,
+        },
+      ],
+    },
+    {
+      name: "Real-world pattern that prompted creation of this lint rule",
+      code: `
+        const script = globalThis.document.createElement("script");
+        script.src = chrome.runtime.getURL("content/fido2-page-script.js");
+        script.async = false;
+      `,
+      errors: [
+        {
+          message: errorMessage,
+        },
+      ],
+    },
+  ],
+});
diff --git a/libs/importer/src/components/chrome/import-chrome.component.ts b/libs/importer/src/components/chrome/import-chrome.component.ts
index 9e9f985c5a5..5467b08ee61 100644
--- a/libs/importer/src/components/chrome/import-chrome.component.ts
+++ b/libs/importer/src/components/chrome/import-chrome.component.ts
@@ -38,6 +38,25 @@ import { ImportType } from "../../models";
 
 type ProfileOption = { id: string; name: string };
 
+type Login = {
+  url: string;
+  username: string;
+  password: string;
+  note: string;
+};
+type LoginImportFailure = {
+  url: string;
+  username: string;
+  error: string;
+};
+
+type LoginImportResult = {
+  login?: Login;
+  failure?: LoginImportFailure;
+};
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "import-chrome",
   templateUrl: "import-chrome.component.html",
@@ -70,14 +89,20 @@ export class ImportChromeComponent implements OnInit, OnDestroy {
 
   profileList: ProfileOption[] = [];
 
-  format = input.required<ImportType>();
+  readonly format = input.required<ImportType>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   onLoadProfilesFromBrowser: (browser: string) => Promise<ProfileOption[]>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
-  onImportFromBrowser: (browser: string, profile: string) => Promise<any[]>;
+  onImportFromBrowser: (browser: string, profile: string) => Promise<LoginImportResult[]>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() csvDataLoaded = new EventEmitter<string>();
 
   constructor(
@@ -113,8 +138,25 @@ export class ImportChromeComponent implements OnInit, OnDestroy {
           this.getBrowserName(this.format()),
           this.formGroup.controls.profile.value,
         );
+
+        // If any of the login items has a failure return a generic error message
+        // Introduced because we ran into a new type of V3 encryption added on Chrome that we don't yet support
+        if (logins.some((l) => l.failure != null)) {
+          const error = logins.find((l) => l.failure != null);
+          this.logService.error("Chromium importer failure:", error.failure.error);
+          return {
+            errors: {
+              message: this.i18nService.t("errorOccurred"),
+            },
+          };
+        }
+
         if (logins.length === 0) {
-          throw "nothing to import";
+          return {
+            errors: {
+              message: this.i18nService.t("importNothingError"),
+            },
+          };
         }
         const chromeLogins: ChromeLogin[] = [];
         for (const l of logins) {
diff --git a/libs/importer/src/components/dialog/file-password-prompt.component.ts b/libs/importer/src/components/dialog/file-password-prompt.component.ts
index 9ad62b7e8f5..e4eca94e7a8 100644
--- a/libs/importer/src/components/dialog/file-password-prompt.component.ts
+++ b/libs/importer/src/components/dialog/file-password-prompt.component.ts
@@ -12,6 +12,8 @@ import {
   IconButtonModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "file-password-prompt.component.html",
   imports: [
diff --git a/libs/importer/src/components/dialog/import-error-dialog.component.ts b/libs/importer/src/components/dialog/import-error-dialog.component.ts
index cb998c2dfe9..af8d8a0966e 100644
--- a/libs/importer/src/components/dialog/import-error-dialog.component.ts
+++ b/libs/importer/src/components/dialog/import-error-dialog.component.ts
@@ -16,6 +16,8 @@ export interface ErrorListItem {
   message: string;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./import-error-dialog.component.html",
   imports: [CommonModule, JslibModule, DialogModule, TableModule, ButtonModule],
diff --git a/libs/importer/src/components/dialog/import-success-dialog.component.ts b/libs/importer/src/components/dialog/import-success-dialog.component.ts
index ff9a5d7b014..34b9728ef44 100644
--- a/libs/importer/src/components/dialog/import-success-dialog.component.ts
+++ b/libs/importer/src/components/dialog/import-success-dialog.component.ts
@@ -20,6 +20,8 @@ export interface ResultList {
   count: number;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "./import-success-dialog.component.html",
   imports: [CommonModule, JslibModule, DialogModule, TableModule, ButtonModule],
diff --git a/libs/importer/src/components/dialog/sshkey-password-prompt.component.ts b/libs/importer/src/components/dialog/sshkey-password-prompt.component.ts
index 8c199ee5577..a60569c5f4c 100644
--- a/libs/importer/src/components/dialog/sshkey-password-prompt.component.ts
+++ b/libs/importer/src/components/dialog/sshkey-password-prompt.component.ts
@@ -12,6 +12,8 @@ import {
   IconButtonModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "sshkey-password-prompt.component.html",
   imports: [
diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html
index 9f1247b52da..dfee02acf5a 100644
--- a/libs/importer/src/components/import.component.html
+++ b/libs/importer/src/components/import.component.html
@@ -1,6 +1,3 @@
-<bit-callout type="info" *ngIf="importBlockedByPolicy">
-  {{ "personalOwnershipPolicyInEffectImports" | i18n }}
-</bit-callout>
 <bit-callout
   [title]="'restrictCardTypeImport' | i18n"
   type="info"
@@ -11,7 +8,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit" id="import_form_importForm">
   <bit-section>
     <bit-section-header>
-      <h2 class="tw-font-bold" bitTypography="h6">{{ "destination" | i18n }}</h2>
+      <h2 class="tw-font-medium" bitTypography="h6">{{ "destination" | i18n }}</h2>
     </bit-section-header>
     <bit-card>
       <bit-form-field [hidden]="isFromAC">
@@ -49,7 +46,7 @@
               *ngFor="let c of collections$ | async"
               [value]="c"
               [label]="c.name"
-              icon="bwi-collection-shared"
+              [icon]="c.type === DefaultCollectionType ? 'bwi-user' : 'bwi-collection-shared'"
             />
           </ng-container>
         </bit-select>
@@ -62,15 +59,15 @@
 
   <bit-section>
     <bit-section-header>
-      <h2 class="tw-font-bold" bitTypography="h6">{{ "data" | i18n }}</h2>
+      <h2 class="tw-font-medium" bitTypography="h6">{{ "data" | i18n }}</h2>
     </bit-section-header>
     <bit-card>
-      <bit-form-field class="tw-w-1/2">
+      <bit-form-field class="@2xl:tw-w-1/2">
         <bit-label>{{ "fileFormat" | i18n }}</bit-label>
         <bit-select formControlName="format">
           <bit-option value="" label="-- {{ 'select' | i18n }} --" />
           <bit-option
-            class="tw-font-bold tw-text-muted tw-text-xs"
+            class="tw-font-medium tw-text-muted tw-text-xs"
             value="-"
             label="{{ 'commonImportFormats' | i18n }}"
             disabled
diff --git a/libs/importer/src/components/import.component.ts b/libs/importer/src/components/import.component.ts
index 54c3fc1d408..0ff62b00e78 100644
--- a/libs/importer/src/components/import.component.ts
+++ b/libs/importer/src/components/import.component.ts
@@ -29,12 +29,13 @@ import { combineLatestWith, filter, map, switchMap, takeUntil } from "rxjs/opera
 
 // 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 { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
-import { JslibModule } from "@bitwarden/angular/jslib.module";
 import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+  CollectionService,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -44,7 +45,9 @@ import { ClientType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { getById } from "@bitwarden/common/platform/misc";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { isId, OrganizationId } from "@bitwarden/common/types/guid";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
@@ -68,7 +71,11 @@ import {
 
 import { ImporterMetadata, DataLoader, Loader, Instructions } from "../metadata";
 import { ImportOption, ImportResult, ImportType } from "../models";
-import { ImportCollectionServiceAbstraction, ImportServiceAbstraction } from "../services";
+import {
+  ImportCollectionServiceAbstraction,
+  ImportMetadataServiceAbstraction,
+  ImportServiceAbstraction,
+} from "../services";
 
 import { ImportChromeComponent } from "./chrome";
 import {
@@ -79,6 +86,8 @@ import {
 import { ImporterProviders } from "./importer-providers";
 import { ImportLastPassComponent } from "./lastpass";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-import",
   templateUrl: "import.component.html",
@@ -103,6 +112,8 @@ import { ImportLastPassComponent } from "./lastpass";
   providers: ImporterProviders,
 })
 export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
+  DefaultCollectionType = CollectionTypes.DefaultUserCollection;
+
   featuredImportOptions: ImportOption[];
   importOptions: ImportOption[];
   format: ImportType = null;
@@ -112,21 +123,36 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
   collections$: Observable<CollectionView[]>;
   organizations$: Observable<Organization[]>;
 
-  private _organizationId: string;
+  private _organizationId: OrganizationId | undefined;
 
-  get organizationId(): string {
+  get organizationId(): OrganizationId | undefined {
     return this._organizationId;
   }
 
-  @Input() set organizationId(value: string) {
+  /**
+   * Enables the hosting control to pass in an organizationId
+   * If a organizationId is provided, the organization selection is disabled.
+   */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() set organizationId(value: OrganizationId | string | undefined) {
+    if (Utils.isNullOrEmpty(value)) {
+      this._organizationId = undefined;
+      this.organization = undefined;
+      return;
+    }
+
+    if (!isId<OrganizationId>(value)) {
+      this._organizationId = undefined;
+      this.organization = undefined;
+      return;
+    }
+
     this._organizationId = value;
+
     getUserId(this.accountService.activeAccount$)
       .pipe(
-        switchMap((userId) =>
-          this.organizationService
-            .organizations$(userId)
-            .pipe(getOrganizationById(this._organizationId)),
-        ),
+        switchMap((userId) => this.organizationService.organizations$(userId).pipe(getById(value))),
       )
       .pipe(takeUntil(this.destroy$))
       .subscribe((organization) => {
@@ -135,13 +161,17 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
       });
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   onLoadProfilesFromBrowser: (browser: string) => Promise<any[]>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   onImportFromBrowser: (browser: string, profile: string) => Promise<any[]>;
 
-  protected organization: Organization;
+  protected organization: Organization | undefined = undefined;
   protected destroy$ = new Subject<void>();
 
   protected readonly isCardTypeRestricted$: Observable<boolean> =
@@ -169,15 +199,23 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
     chromiumLoader: [Loader.file as DataLoader],
   });
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(BitSubmitDirective)
   private bitSubmit: BitSubmitDirective;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   formLoading = new EventEmitter<boolean>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   formDisabled = new EventEmitter<boolean>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   onSuccessfulImport = new EventEmitter<string>();
 
@@ -230,6 +268,7 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
     protected accountService: AccountService,
     private restrictedItemTypesService: RestrictedItemTypesService,
     private destroyRef: DestroyRef,
+    protected importMetadataService: ImportMetadataServiceAbstraction,
   ) {}
 
   protected get importBlockedByPolicy(): boolean {
@@ -248,9 +287,11 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   async ngOnInit() {
+    await this.importMetadataService.init();
+
     this.setImportOptions();
 
-    this.importService
+    this.importMetadataService
       .metadata$(this.formGroup.controls.format.valueChanges)
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe({
@@ -438,7 +479,7 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
         importContents,
         this.organizationId,
         this.formGroup.controls.targetSelector.value,
-        (await this.canAccessImport(this.organizationId)) && this.isFromAC,
+        this.organization?.canAccessImport && this.isFromAC,
       );
 
       //No errors, display success message
@@ -458,20 +499,6 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
     }
   }
 
-  private async canAccessImport(organizationId?: string): Promise<boolean> {
-    if (!organizationId) {
-      return false;
-    }
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-    return (
-      await firstValueFrom(
-        this.organizationService
-          .organizations$(userId)
-          .pipe(getOrganizationById(this.organizationId)),
-      )
-    )?.canAccessImport;
-  }
-
   getFormatInstructionTitle() {
     if (this.format == null) {
       return null;
diff --git a/libs/importer/src/components/importer-providers.ts b/libs/importer/src/components/importer-providers.ts
index b00bd65211e..c48f7c1b096 100644
--- a/libs/importer/src/components/importer-providers.ts
+++ b/libs/importer/src/components/importer-providers.ts
@@ -37,7 +37,9 @@ import {
 
 // FIXME: unify with `SYSTEM_SERVICE_PROVIDER` when migrating it from the generator component module
 //        to a general module.
-const SYSTEM_SERVICE_PROVIDER = new SafeInjectionToken<SystemServiceProvider>("SystemServices");
+export const SYSTEM_SERVICE_PROVIDER = new SafeInjectionToken<SystemServiceProvider>(
+  "SystemServices",
+);
 
 /** Import service factories */
 export const ImporterProviders: SafeProvider[] = [
@@ -85,7 +87,6 @@ export const ImporterProviders: SafeProvider[] = [
       PinServiceAbstraction,
       AccountService,
       RestrictedItemTypesService,
-      SYSTEM_SERVICE_PROVIDER,
     ],
   }),
 ];
diff --git a/libs/importer/src/components/index.ts b/libs/importer/src/components/index.ts
index a2e59f1714f..366b7c36212 100644
--- a/libs/importer/src/components/index.ts
+++ b/libs/importer/src/components/index.ts
@@ -1,3 +1,4 @@
 export * from "./dialog";
+export * from "./importer-providers";
 
 export { ImportComponent } from "./import.component";
diff --git a/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts b/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts
index f497a3bf32c..b9cddc95f8e 100644
--- a/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts
+++ b/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts
@@ -21,6 +21,8 @@ type LastPassMultifactorPromptData = {
   variant: LastPassMultifactorPromptVariant;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "lastpass-multifactor-prompt.component.html",
   imports: [
diff --git a/libs/importer/src/components/lastpass/dialog/lastpass-password-prompt.component.ts b/libs/importer/src/components/lastpass/dialog/lastpass-password-prompt.component.ts
index 861f184f94d..995fc2362c9 100644
--- a/libs/importer/src/components/lastpass/dialog/lastpass-password-prompt.component.ts
+++ b/libs/importer/src/components/lastpass/dialog/lastpass-password-prompt.component.ts
@@ -15,6 +15,8 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "lastpass-password-prompt.component.html",
   imports: [
diff --git a/libs/importer/src/components/lastpass/import-lastpass.component.ts b/libs/importer/src/components/lastpass/import-lastpass.component.ts
index 7fbf7dd8a7a..62fc5325d26 100644
--- a/libs/importer/src/components/lastpass/import-lastpass.component.ts
+++ b/libs/importer/src/components/lastpass/import-lastpass.component.ts
@@ -25,6 +25,8 @@ import {
 
 import { LastPassDirectImportService } from "./lastpass-direct-import.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "import-lastpass",
   templateUrl: "import-lastpass.component.html",
@@ -60,6 +62,8 @@ export class ImportLastPassComponent implements OnInit, OnDestroy {
     }),
   );
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() csvDataLoaded = new EventEmitter<string>();
 
   constructor(
diff --git a/libs/importer/src/importers/base-importer.ts b/libs/importer/src/importers/base-importer.ts
index 19a8a4828e1..f8acb5e0643 100644
--- a/libs/importer/src/importers/base-importer.ts
+++ b/libs/importer/src/importers/base-importer.ts
@@ -193,7 +193,6 @@ export abstract class BaseImporter {
       if (this.isNullOrWhitespace(loginUri.uri)) {
         return null;
       }
-      loginUri.match = null;
       return [loginUri];
     }
 
@@ -205,7 +204,6 @@ export abstract class BaseImporter {
         if (this.isNullOrWhitespace(loginUri.uri)) {
           return;
         }
-        loginUri.match = null;
         returnArr.push(loginUri);
       });
       return returnArr.length === 0 ? null : returnArr;
@@ -236,7 +234,7 @@ export abstract class BaseImporter {
     return hostname.startsWith("www.") ? hostname.replace("www.", "") : hostname;
   }
 
-  protected isNullOrWhitespace(str: string): boolean {
+  protected isNullOrWhitespace(str: string | undefined | null): boolean {
     return Utils.isNullOrWhitespace(str);
   }
 
diff --git a/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
index 70c783df52a..bf74bcd69fa 100644
--- a/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
+++ b/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
@@ -1,11 +1,12 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { concatMap, firstValueFrom, map } from "rxjs";
+import { filter, 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 { Collection, CollectionView } from "@bitwarden/admin-console/common";
 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 { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import {
@@ -15,7 +16,7 @@ import {
 } from "@bitwarden/common/models/export";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { OrganizationId } from "@bitwarden/common/types/guid";
+import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { KeyService } from "@bitwarden/key-management";
@@ -64,12 +65,13 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
   private async parseEncrypted(
     results: BitwardenEncryptedIndividualJsonExport | BitwardenEncryptedOrgJsonExport,
   ) {
+    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+
     if (results.encKeyValidation_DO_NOT_EDIT != null) {
-      let keyForDecryption: SymmetricCryptoKey = await this.keyService.getOrgKey(
-        this.organizationId,
-      );
+      const orgKeys = await firstValueFrom(this.keyService.orgKeys$(userId));
+      let keyForDecryption: SymmetricCryptoKey = orgKeys?.[this.organizationId];
       if (keyForDecryption == null) {
-        keyForDecryption = await this.keyService.getUserKey();
+        keyForDecryption = await firstValueFrom(this.keyService.userKey$(userId));
       }
       const encKeyValidation = new EncString(results.encKeyValidation_DO_NOT_EDIT);
       try {
@@ -82,12 +84,12 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
     }
 
     const groupingsMap = this.organization
-      ? await this.parseCollections(results as BitwardenEncryptedOrgJsonExport)
+      ? await this.parseCollections(userId, results as BitwardenEncryptedOrgJsonExport)
       : await this.parseFolders(results as BitwardenEncryptedIndividualJsonExport);
 
     for (const c of results.items) {
       const cipher = CipherWithIdExport.toDomain(c);
-      // reset ids incase they were set for some reason
+      // reset ids in case they were set for some reason
       cipher.id = null;
       cipher.organizationId = this.organizationId;
       cipher.collectionIds = null;
@@ -113,10 +115,7 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
         });
       }
 
-      const activeUserId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-      );
-      const view = await this.cipherService.decrypt(cipher, activeUserId);
+      const view = await this.cipherService.decrypt(cipher, userId);
       this.cleanupCipher(view);
       this.result.ciphers.push(view);
     }
@@ -127,13 +126,15 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
   private async parseDecrypted(
     results: BitwardenUnEncryptedIndividualJsonExport | BitwardenUnEncryptedOrgJsonExport,
   ) {
+    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+
     const groupingsMap = this.organization
-      ? await this.parseCollections(results as BitwardenUnEncryptedOrgJsonExport)
+      ? await this.parseCollections(userId, results as BitwardenUnEncryptedOrgJsonExport)
       : await this.parseFolders(results as BitwardenUnEncryptedIndividualJsonExport);
 
     results.items.forEach((c) => {
       const cipher = CipherWithIdExport.toView(c);
-      // reset ids incase they were set for some reason
+      // reset ids in case they were set for some reason
       cipher.id = null;
       cipher.organizationId = null;
       cipher.collectionIds = null;
@@ -195,12 +196,17 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
   }
 
   private async parseCollections(
+    userId: UserId,
     data: BitwardenUnEncryptedOrgJsonExport | BitwardenEncryptedOrgJsonExport,
   ): Promise<Map<string, number>> | null {
     if (data.collections == null) {
       return null;
     }
 
+    const orgKeys = await firstValueFrom(
+      this.keyService.orgKeys$(userId).pipe(filter((orgKeys) => orgKeys != null)),
+    );
+
     const groupingsMap = new Map<string, number>();
 
     for (const c of data.collections) {
@@ -214,12 +220,9 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
             organizationId: this.organizationId,
           }),
         );
-        const collection$ = this.keyService.activeUserOrgKeys$.pipe(
-          // FIXME: replace type assertion with narrowing
-          map((keys) => keys[c.organizationId as OrganizationId]),
-          concatMap((key) => collection.decrypt(key, this.encryptService)),
-        );
-        collectionView = await firstValueFrom(collection$);
+
+        const orgKey = orgKeys[c.organizationId];
+        collectionView = await collection.decrypt(orgKey, this.encryptService);
       } else {
         collectionView = CollectionWithIdExport.toView(c);
         collectionView.organizationId = null;
diff --git a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.spec.ts b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.spec.ts
index 7812cce2c05..44a55af8f62 100644
--- a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.spec.ts
+++ b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.spec.ts
@@ -1,12 +1,16 @@
 import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { emptyGuid, OrganizationId } from "@bitwarden/common/types/guid";
+import { OrgKey, UserKey } from "@bitwarden/common/types/key";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { KdfType, KeyService } from "@bitwarden/key-management";
+import { UserId } from "@bitwarden/user-core";
 
 import { emptyAccountEncrypted } from "../spec-data/bitwarden-json/account-encrypted.json";
 import { emptyUnencryptedExport } from "../spec-data/bitwarden-json/unencrypted.json";
@@ -35,6 +39,33 @@ describe("BitwardenPasswordProtectedImporter", () => {
     pinService = mock<PinServiceAbstraction>();
     accountService = mock<AccountService>();
 
+    accountService.activeAccount$ = of({
+      id: emptyGuid as UserId,
+      email: "test@example.com",
+      emailVerified: true,
+      name: "Test User",
+    });
+
+    const mockOrgId = emptyGuid as OrganizationId;
+    /*
+      The key values below are never read, empty objects are cast as types for compilation type checking only.
+      Tests specific to key contents are in key-service.spec.ts
+    */
+    const mockOrgKey = {} as OrgKey;
+    const mockUserKey = {} as UserKey;
+
+    keyService.orgKeys$.mockImplementation(() =>
+      of({ [mockOrgId]: mockOrgKey } as Record<OrganizationId, OrgKey>),
+    );
+    keyService.userKey$.mockImplementation(() => of(mockUserKey));
+
+    /*
+      Crypto isn’t under test here; keys are just placeholders.
+      Decryption methods are stubbed to always return empty CipherView or string allowing OK import flow.
+    */
+    cipherService.decrypt.mockResolvedValue({} as any);
+    encryptService.decryptString.mockResolvedValue("ok");
+
     importer = new BitwardenPasswordProtectedImporter(
       keyService,
       encryptService,
@@ -62,6 +93,24 @@ describe("BitwardenPasswordProtectedImporter", () => {
       jest.spyOn(BitwardenJsonImporter.prototype, "parse");
     });
 
+    beforeEach(() => {
+      accountService.activeAccount$ = of({
+        id: emptyGuid as UserId,
+        email: "test@example.com",
+        emailVerified: true,
+        name: "Test User",
+      });
+      importer = new BitwardenPasswordProtectedImporter(
+        keyService,
+        encryptService,
+        i18nService,
+        cipherService,
+        pinService,
+        accountService,
+        promptForPassword_callback,
+      );
+    });
+
     it("Should call BitwardenJsonImporter", async () => {
       expect((await importer.parse(emptyAccountEncrypted)).success).toEqual(true);
       expect(BitwardenJsonImporter.prototype.parse).toHaveBeenCalledWith(emptyAccountEncrypted);
diff --git a/libs/importer/src/importers/chrome-csv-importer.spec.ts b/libs/importer/src/importers/chrome-csv-importer.spec.ts
index a7a29094707..df60a6f2647 100644
--- a/libs/importer/src/importers/chrome-csv-importer.spec.ts
+++ b/libs/importer/src/importers/chrome-csv-importer.spec.ts
@@ -11,9 +11,6 @@ const CipherData = [
     title: "should parse app name",
     csv: androidData,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "com.xyz.example.app.android",
       login: Object.assign(new LoginView(), {
         username: "username@example.com",
@@ -24,7 +21,6 @@ const CipherData = [
           }),
         ],
       }),
-      notes: null,
       type: 1,
     }),
   },
@@ -32,9 +28,6 @@ const CipherData = [
     title: "should parse password",
     csv: simplePasswordData,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "www.example.com",
       login: Object.assign(new LoginView(), {
         username: "username@example.com",
@@ -45,7 +38,6 @@ const CipherData = [
           }),
         ],
       }),
-      notes: null,
       type: 1,
     }),
   },
@@ -54,6 +46,7 @@ const CipherData = [
 describe("Chrome CSV Importer", () => {
   CipherData.forEach((data) => {
     it(data.title, async () => {
+      jest.useFakeTimers().setSystemTime(data.expected.creationDate);
       const importer = new ChromeCsvImporter();
       const result = await importer.parse(data.csv);
       expect(result != null).toBe(true);
diff --git a/libs/importer/src/importers/dashlane/dashlane-csv-importer.spec.ts b/libs/importer/src/importers/dashlane/dashlane-csv-importer.spec.ts
index b8d84a9378a..2dedcec6b2a 100644
--- a/libs/importer/src/importers/dashlane/dashlane-csv-importer.spec.ts
+++ b/libs/importer/src/importers/dashlane/dashlane-csv-importer.spec.ts
@@ -59,12 +59,12 @@ describe("Dashlane CSV Importer", () => {
     const cipher = result.ciphers.shift();
     expect(cipher.type).toBe(CipherType.Card);
     expect(cipher.name).toBe("John's savings account");
-    expect(cipher.card.brand).toBeNull();
+    expect(cipher.card.brand).toBeUndefined();
     expect(cipher.card.cardholderName).toBe("John Doe");
     expect(cipher.card.number).toBe("accountNumber");
-    expect(cipher.card.code).toBeNull();
-    expect(cipher.card.expMonth).toBeNull();
-    expect(cipher.card.expYear).toBeNull();
+    expect(cipher.card.code).toBeUndefined();
+    expect(cipher.card.expMonth).toBeUndefined();
+    expect(cipher.card.expYear).toBeUndefined();
 
     expect(cipher.fields.length).toBe(4);
 
@@ -112,7 +112,7 @@ describe("Dashlane CSV Importer", () => {
     expect(cipher.name).toBe("John Doe card");
     expect(cipher.identity.fullName).toBe("John Doe");
     expect(cipher.identity.firstName).toBe("John");
-    expect(cipher.identity.middleName).toBeNull();
+    expect(cipher.identity.middleName).toBeUndefined();
     expect(cipher.identity.lastName).toBe("Doe");
     expect(cipher.identity.licenseNumber).toBe("123123123");
 
@@ -133,7 +133,7 @@ describe("Dashlane CSV Importer", () => {
     expect(cipher2.name).toBe("John Doe passport");
     expect(cipher2.identity.fullName).toBe("John Doe");
     expect(cipher2.identity.firstName).toBe("John");
-    expect(cipher2.identity.middleName).toBeNull();
+    expect(cipher2.identity.middleName).toBeUndefined();
     expect(cipher2.identity.lastName).toBe("Doe");
     expect(cipher2.identity.passportNumber).toBe("123123123");
 
@@ -154,7 +154,7 @@ describe("Dashlane CSV Importer", () => {
     expect(cipher3.name).toBe("John Doe license");
     expect(cipher3.identity.fullName).toBe("John Doe");
     expect(cipher3.identity.firstName).toBe("John");
-    expect(cipher3.identity.middleName).toBeNull();
+    expect(cipher3.identity.middleName).toBeUndefined();
     expect(cipher3.identity.lastName).toBe("Doe");
     expect(cipher3.identity.licenseNumber).toBe("1234556");
     expect(cipher3.identity.state).toBe("DC");
@@ -173,7 +173,7 @@ describe("Dashlane CSV Importer", () => {
     expect(cipher4.name).toBe("John Doe social_security");
     expect(cipher4.identity.fullName).toBe("John Doe");
     expect(cipher4.identity.firstName).toBe("John");
-    expect(cipher4.identity.middleName).toBeNull();
+    expect(cipher4.identity.middleName).toBeUndefined();
     expect(cipher4.identity.lastName).toBe("Doe");
     expect(cipher4.identity.ssn).toBe("123123123");
 
diff --git a/libs/importer/src/importers/firefox-csv-importer.spec.ts b/libs/importer/src/importers/firefox-csv-importer.spec.ts
index 78bca0599b5..59d2aa9e7a4 100644
--- a/libs/importer/src/importers/firefox-csv-importer.spec.ts
+++ b/libs/importer/src/importers/firefox-csv-importer.spec.ts
@@ -11,9 +11,6 @@ const CipherData = [
     title: "should parse password",
     csv: simplePasswordData,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "example.com",
       login: Object.assign(new LoginView(), {
         username: "foo",
@@ -24,7 +21,6 @@ const CipherData = [
           }),
         ],
       }),
-      notes: null,
       type: 1,
     }),
   },
@@ -32,9 +28,6 @@ const CipherData = [
     title: 'should skip "chrome://FirefoxAccounts"',
     csv: firefoxAccountsData,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "example.com",
       login: Object.assign(new LoginView(), {
         username: "foo",
@@ -45,7 +38,6 @@ const CipherData = [
           }),
         ],
       }),
-      notes: null,
       type: 1,
     }),
   },
@@ -54,6 +46,7 @@ const CipherData = [
 describe("Firefox CSV Importer", () => {
   CipherData.forEach((data) => {
     it(data.title, async () => {
+      jest.useFakeTimers().setSystemTime(data.expected.creationDate);
       const importer = new FirefoxCsvImporter();
       const result = await importer.parse(data.csv);
       expect(result != null).toBe(true);
diff --git a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts
index f572997cfe7..092a80c3cf0 100644
--- a/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts
+++ b/libs/importer/src/importers/fsecure/fsecure-fsk-importer.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -8,7 +6,7 @@ import { ImportResult } from "../../models/import-result";
 import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 
-import { FskEntry, FskEntryTypesEnum, FskFile } from "./fsecure-fsk-types";
+import { FskEntry, FskEntryType, FskFile } from "./fsecure-fsk-types";
 
 export class FSecureFskImporter extends BaseImporter implements Importer {
   parse(data: string): Promise<ImportResult> {
@@ -19,37 +17,32 @@ export class FSecureFskImporter extends BaseImporter implements Importer {
       return Promise.resolve(result);
     }
 
-    for (const key in results.data) {
-      // eslint-disable-next-line
-      if (!results.data.hasOwnProperty(key)) {
-        continue;
-      }
-
-      const value = results.data[key];
+    for (const [, value] of Object.entries(results.data)) {
       const cipher = this.parseEntry(value);
-      result.ciphers.push(cipher);
+      if (cipher != undefined) {
+        result.ciphers.push(cipher);
+      }
     }
 
     result.success = true;
     return Promise.resolve(result);
   }
 
-  private parseEntry(entry: FskEntry): CipherView {
+  private parseEntry(entry: FskEntry): CipherView | undefined {
     const cipher = this.initLoginCipher();
     cipher.name = this.getValueOrDefault(entry.service);
     cipher.notes = this.getValueOrDefault(entry.notes);
     cipher.favorite = entry.favorite > 0;
 
     switch (entry.type) {
-      case FskEntryTypesEnum.Login:
+      case FskEntryType.Login:
         this.handleLoginEntry(entry, cipher);
         break;
-      case FskEntryTypesEnum.CreditCard:
+      case FskEntryType.CreditCard:
         this.handleCreditCardEntry(entry, cipher);
         break;
       default:
-        return;
-        break;
+        return undefined;
     }
 
     this.convertToNoteIfNeeded(cipher);
diff --git a/libs/importer/src/importers/fsecure/fsecure-fsk-types.ts b/libs/importer/src/importers/fsecure/fsecure-fsk-types.ts
index 1235426d683..919ae4e8c82 100644
--- a/libs/importer/src/importers/fsecure/fsecure-fsk-types.ts
+++ b/libs/importer/src/importers/fsecure/fsecure-fsk-types.ts
@@ -6,12 +6,18 @@ export interface Data {
   [key: string]: FskEntry;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum FskEntryTypesEnum {
-  Login = 1,
-  CreditCard = 2,
-}
+/**
+ * Represents the different types of FSK entries.
+ */
+export const FskEntryType = Object.freeze({
+  Login: 1,
+  CreditCard: 2,
+});
+
+/**
+ * Type representing valid FSK entry type values.
+ */
+export type FskEntryType = (typeof FskEntryType)[keyof typeof FskEntryType];
 
 export interface FskEntry {
   color: string;
@@ -26,7 +32,7 @@ export interface FskEntry {
   rev: string | number;
   service: string;
   style: string;
-  type: FskEntryTypesEnum;
+  type: FskEntryType;
   url: string;
   username: string;
   createdDate: number; // UNIX timestamp
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 b326bc5d351..dcaacffc05e 100644
--- a/libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts
+++ b/libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts
@@ -51,10 +51,10 @@ describe("Keeper CSV Importer", () => {
     expect(result != null).toBe(true);
 
     const cipher = result.ciphers.shift();
-    expect(cipher.login.totp).toBeNull();
+    expect(cipher.login.totp).toBeUndefined();
 
     const cipher2 = result.ciphers.shift();
-    expect(cipher2.login.totp).toBeNull();
+    expect(cipher2.login.totp).toBeUndefined();
 
     const cipher3 = result.ciphers.shift();
     expect(cipher3.login.totp).toEqual(
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 1141897a044..a9d42369b1e 100644
--- a/libs/importer/src/importers/keeper/keeper-json-importer.spec.ts
+++ b/libs/importer/src/importers/keeper/keeper-json-importer.spec.ts
@@ -51,7 +51,7 @@ describe("Keeper Json Importer", () => {
     expect(result != null).toBe(true);
 
     const cipher = result.ciphers.shift();
-    expect(cipher.login.totp).toBeNull();
+    expect(cipher.login.totp).toBeUndefined();
 
     // 2nd Cipher
     const cipher2 = result.ciphers.shift();
diff --git a/libs/importer/src/importers/lastpass/access/enums/idp-provider.ts b/libs/importer/src/importers/lastpass/access/enums/idp-provider.ts
index 01c4572fcf9..ace0cda71a1 100644
--- a/libs/importer/src/importers/lastpass/access/enums/idp-provider.ts
+++ b/libs/importer/src/importers/lastpass/access/enums/idp-provider.ts
@@ -1,10 +1,16 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum IdpProvider {
-  Azure = 0,
-  OktaAuthServer = 1,
-  OktaNoAuthServer = 2,
-  Google = 3,
-  PingOne = 4,
-  OneLogin = 5,
-}
+/**
+ * Represents the different identity providers supported for authentication.
+ */
+export const IdpProvider = Object.freeze({
+  Azure: 0,
+  OktaAuthServer: 1,
+  OktaNoAuthServer: 2,
+  Google: 3,
+  PingOne: 4,
+  OneLogin: 5,
+} as const);
+
+/**
+ * Type representing valid identity provider values.
+ */
+export type IdpProvider = (typeof IdpProvider)[keyof typeof IdpProvider];
diff --git a/libs/importer/src/importers/lastpass/access/enums/lastpass-login-type.ts b/libs/importer/src/importers/lastpass/access/enums/lastpass-login-type.ts
index a3be36c790e..8f45852c759 100644
--- a/libs/importer/src/importers/lastpass/access/enums/lastpass-login-type.ts
+++ b/libs/importer/src/importers/lastpass/access/enums/lastpass-login-type.ts
@@ -1,7 +1,13 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum LastpassLoginType {
-  MasterPassword = 0,
+/**
+ * Represents LastPass login types.
+ */
+export const LastpassLoginType = Object.freeze({
+  MasterPassword: 0,
   // Not sure what Types 1 and 2 are?
-  Federated = 3,
-}
+  Federated: 3,
+} as const);
+
+/**
+ * Type representing valid LastPass login type values.
+ */
+export type LastpassLoginType = (typeof LastpassLoginType)[keyof typeof LastpassLoginType];
diff --git a/libs/importer/src/importers/lastpass/access/enums/otp-method.ts b/libs/importer/src/importers/lastpass/access/enums/otp-method.ts
index f1237160179..9d7e88798d4 100644
--- a/libs/importer/src/importers/lastpass/access/enums/otp-method.ts
+++ b/libs/importer/src/importers/lastpass/access/enums/otp-method.ts
@@ -1,7 +1,13 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum OtpMethod {
-  GoogleAuth,
-  MicrosoftAuth,
-  Yubikey,
-}
+/**
+ * Represents OTP authentication methods.
+ */
+export const OtpMethod = Object.freeze({
+  GoogleAuth: 0,
+  MicrosoftAuth: 1,
+  Yubikey: 2,
+} as const);
+
+/**
+ * Type representing valid OTP method values.
+ */
+export type OtpMethod = (typeof OtpMethod)[keyof typeof OtpMethod];
diff --git a/libs/importer/src/importers/lastpass/access/enums/platform.ts b/libs/importer/src/importers/lastpass/access/enums/platform.ts
index 6870fc28c24..a58ba37958a 100644
--- a/libs/importer/src/importers/lastpass/access/enums/platform.ts
+++ b/libs/importer/src/importers/lastpass/access/enums/platform.ts
@@ -1,6 +1,12 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum Platform {
-  Desktop,
-  Mobile,
-}
+/**
+ * Platform types representing different device categories.
+ */
+export const Platform = Object.freeze({
+  Desktop: 0,
+  Mobile: 1,
+} as const);
+
+/**
+ * Type representing valid platform values.
+ */
+export type Platform = (typeof Platform)[keyof typeof Platform];
diff --git a/libs/importer/src/importers/lastpass/lastpass-csv-importer.spec.ts b/libs/importer/src/importers/lastpass/lastpass-csv-importer.spec.ts
index cabd246fa7e..6515e3959b0 100644
--- a/libs/importer/src/importers/lastpass/lastpass-csv-importer.spec.ts
+++ b/libs/importer/src/importers/lastpass/lastpass-csv-importer.spec.ts
@@ -37,9 +37,6 @@ Expiration Date:June,2020
 Notes:some text
 ",Credit-card,,0`,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "Credit-card",
       notes: "some text\n",
       type: 3,
@@ -71,11 +68,7 @@ Start Date:,
 Expiration Date:,
 Notes:",empty,,0`,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "empty",
-      notes: null,
       type: 3,
       card: {
         expMonth: undefined,
@@ -101,11 +94,7 @@ Start Date:,
 Expiration Date:January,
 Notes:",noyear,,0`,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "noyear",
-      notes: null,
       type: 3,
       card: {
         cardholderName: "John Doe",
@@ -139,11 +128,7 @@ Start Date:,
 Expiration Date:,2020
 Notes:",nomonth,,0`,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "nomonth",
-      notes: null,
       type: 3,
       card: {
         cardholderName: "John Doe",
@@ -171,6 +156,7 @@ Notes:",nomonth,,0`,
 describe("Lastpass CSV Importer", () => {
   CipherData.forEach((data) => {
     it(data.title, async () => {
+      jest.useFakeTimers().setSystemTime(data.expected.creationDate);
       const importer = new LastPassCsvImporter();
       const result = await importer.parse(data.csv);
       expect(result != null).toBe(true);
diff --git a/libs/importer/src/importers/myki-csv-importer.spec.ts b/libs/importer/src/importers/myki-csv-importer.spec.ts
index 6f804523ef0..a77e85d134a 100644
--- a/libs/importer/src/importers/myki-csv-importer.spec.ts
+++ b/libs/importer/src/importers/myki-csv-importer.spec.ts
@@ -468,8 +468,8 @@ describe("Myki CSV Importer", () => {
     const cipher = result.ciphers.shift();
 
     expect(cipher.name).toEqual("2FA nickname");
-    expect(cipher.login.username).toBeNull();
-    expect(cipher.login.password).toBeNull();
+    expect(cipher.login.username).toBeUndefined();
+    expect(cipher.login.password).toBeUndefined();
     expect(cipher.login.totp).toBe("someTOTPSeed");
     expect(cipher.notes).toEqual("Additional information field content.");
 
diff --git a/libs/importer/src/importers/nordpass-csv-importer.spec.ts b/libs/importer/src/importers/nordpass-csv-importer.spec.ts
index e633310e6ee..f04272de012 100644
--- a/libs/importer/src/importers/nordpass-csv-importer.spec.ts
+++ b/libs/importer/src/importers/nordpass-csv-importer.spec.ts
@@ -17,8 +17,8 @@ const namesTestData = [
     fullName: "MyFirstName",
     expected: Object.assign(new IdentityView(), {
       firstName: "MyFirstName",
-      middleName: null,
-      lastName: null,
+      middleName: undefined,
+      lastName: undefined,
     }),
   },
   {
@@ -26,7 +26,7 @@ const namesTestData = [
     fullName: "MyFirstName MyLastName",
     expected: Object.assign(new IdentityView(), {
       firstName: "MyFirstName",
-      middleName: null,
+      middleName: undefined,
       lastName: "MyLastName",
     }),
   },
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 1ca12a9ce69..4ec20ba2a87 100644
--- a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts
@@ -393,7 +393,7 @@ describe("1Password 1Pux Importer", () => {
 
     const identity = cipher.identity;
     expect(identity.firstName).toEqual("Michael");
-    expect(identity.middleName).toBeNull();
+    expect(identity.middleName).toBeUndefined();
     expect(identity.lastName).toEqual("Scarn");
     expect(identity.address1).toEqual("2120 Mifflin Rd.");
     expect(identity.state).toEqual("Pennsylvania");
@@ -423,7 +423,7 @@ describe("1Password 1Pux Importer", () => {
 
     const identity = cipher.identity;
     expect(identity.firstName).toEqual("Cash");
-    expect(identity.middleName).toBeNull();
+    expect(identity.middleName).toBeUndefined();
     expect(identity.lastName).toEqual("Bandit");
     expect(identity.state).toEqual("Washington");
     expect(identity.country).toEqual("United States of America");
@@ -447,7 +447,7 @@ describe("1Password 1Pux Importer", () => {
 
     const identity = cipher.identity;
     expect(identity.firstName).toEqual("George");
-    expect(identity.middleName).toBeNull();
+    expect(identity.middleName).toBeUndefined();
     expect(identity.lastName).toEqual("Engels");
     expect(identity.company).toEqual("National Public Library");
     expect(identity.phone).toEqual("9995555555");
@@ -472,7 +472,7 @@ describe("1Password 1Pux Importer", () => {
 
     const identity = cipher.identity;
     expect(identity.firstName).toEqual("David");
-    expect(identity.middleName).toBeNull();
+    expect(identity.middleName).toBeUndefined();
     expect(identity.lastName).toEqual("Global");
     expect(identity.passportNumber).toEqual("76436847");
 
@@ -499,7 +499,7 @@ describe("1Password 1Pux Importer", () => {
 
     const identity = cipher.identity;
     expect(identity.firstName).toEqual("Chef");
-    expect(identity.middleName).toBeNull();
+    expect(identity.middleName).toBeUndefined();
     expect(identity.lastName).toEqual("Coldroom");
     expect(identity.company).toEqual("Super Cool Store Co.");
 
@@ -523,7 +523,7 @@ describe("1Password 1Pux Importer", () => {
 
     const identity = cipher.identity;
     expect(identity.firstName).toEqual("Jack");
-    expect(identity.middleName).toBeNull();
+    expect(identity.middleName).toBeUndefined();
     expect(identity.lastName).toEqual("Judd");
     expect(identity.ssn).toEqual("131-216-1900");
   });
@@ -682,12 +682,12 @@ describe("1Password 1Pux Importer", () => {
     expect(folders[3].name).toBe("Education");
     expect(folders[4].name).toBe("Starter Kit");
 
-    // Check that ciphers have a folder assigned to them
-    expect(result.ciphers.filter((c) => c.folderId === folders[0].id).length).toBeGreaterThan(0);
-    expect(result.ciphers.filter((c) => c.folderId === folders[1].id).length).toBeGreaterThan(0);
-    expect(result.ciphers.filter((c) => c.folderId === folders[2].id).length).toBeGreaterThan(0);
-    expect(result.ciphers.filter((c) => c.folderId === folders[3].id).length).toBeGreaterThan(0);
-    expect(result.ciphers.filter((c) => c.folderId === folders[4].id).length).toBeGreaterThan(0);
+    // Check that folder/cipher relationships
+    expect(result.folderRelationships.filter(([_, f]) => f == 0).length).toBeGreaterThan(0);
+    expect(result.folderRelationships.filter(([_, f]) => f == 1).length).toBeGreaterThan(0);
+    expect(result.folderRelationships.filter(([_, f]) => f == 2).length).toBeGreaterThan(0);
+    expect(result.folderRelationships.filter(([_, f]) => f == 3).length).toBeGreaterThan(0);
+    expect(result.folderRelationships.filter(([_, f]) => f == 4).length).toBeGreaterThan(0);
   });
 
   it("should create collections if part of an organization", async () => {
diff --git a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
index 053c83f2347..d19b5e7d0f3 100644
--- a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
@@ -14,12 +14,12 @@ import { BaseImporter } from "../base-importer";
 import { Importer } from "../importer";
 
 import {
-  CategoryEnum,
+  Category,
   Details,
   ExportData,
   FieldsEntity,
   Item,
-  LoginFieldTypeEnum,
+  LoginFieldType,
   Overview,
   PasswordHistoryEntity,
   SectionsEntity,
@@ -45,38 +45,38 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
 
         const cipher = this.initLoginCipher();
 
-        const category = item.categoryUuid as CategoryEnum;
+        const category = item.categoryUuid as Category;
         switch (category) {
-          case CategoryEnum.Login:
-          case CategoryEnum.Database:
-          case CategoryEnum.Password:
-          case CategoryEnum.WirelessRouter:
-          case CategoryEnum.Server:
-          case CategoryEnum.API_Credential:
+          case Category.Login:
+          case Category.Database:
+          case Category.Password:
+          case Category.WirelessRouter:
+          case Category.Server:
+          case Category.API_Credential:
             cipher.type = CipherType.Login;
             cipher.login = new LoginView();
             break;
-          case CategoryEnum.CreditCard:
-          case CategoryEnum.BankAccount:
+          case Category.CreditCard:
+          case Category.BankAccount:
             cipher.type = CipherType.Card;
             cipher.card = new CardView();
             break;
-          case CategoryEnum.SecureNote:
-          case CategoryEnum.SoftwareLicense:
-          case CategoryEnum.EmailAccount:
-          case CategoryEnum.MedicalRecord:
+          case Category.SecureNote:
+          case Category.SoftwareLicense:
+          case Category.EmailAccount:
+          case Category.MedicalRecord:
             // case CategoryEnum.Document:
             cipher.type = CipherType.SecureNote;
             cipher.secureNote = new SecureNoteView();
             cipher.secureNote.type = SecureNoteType.Generic;
             break;
-          case CategoryEnum.Identity:
-          case CategoryEnum.DriversLicense:
-          case CategoryEnum.OutdoorLicense:
-          case CategoryEnum.Membership:
-          case CategoryEnum.Passport:
-          case CategoryEnum.RewardsProgram:
-          case CategoryEnum.SocialSecurityNumber:
+          case Category.Identity:
+          case Category.DriversLicense:
+          case Category.OutdoorLicense:
+          case Category.Membership:
+          case Category.Passport:
+          case Category.RewardsProgram:
+          case Category.SocialSecurityNumber:
             cipher.type = CipherType.Identity;
             cipher.identity = new IdentityView();
             break;
@@ -166,10 +166,10 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
       let fieldValue = loginField.value;
       let fieldType: FieldType = FieldType.Text;
       switch (loginField.fieldType) {
-        case LoginFieldTypeEnum.Password:
+        case LoginFieldType.Password:
           fieldType = FieldType.Hidden;
           break;
-        case LoginFieldTypeEnum.CheckBox:
+        case LoginFieldType.CheckBox:
           fieldValue = loginField.value !== "" ? "true" : "false";
           fieldType = FieldType.Boolean;
           break;
@@ -180,8 +180,8 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
     });
   }
 
-  private processDetails(category: CategoryEnum, details: Details, cipher: CipherView) {
-    if (category !== CategoryEnum.Password) {
+  private processDetails(category: Category, details: Details, cipher: CipherView) {
+    if (category !== Category.Password) {
       return;
     }
 
@@ -191,7 +191,7 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
     cipher.login.password = details.password;
   }
 
-  private processSections(category: CategoryEnum, sections: SectionsEntity[], cipher: CipherView) {
+  private processSections(category: Category, sections: SectionsEntity[], cipher: CipherView) {
     if (sections == null || sections.length === 0) {
       return;
     }
@@ -206,7 +206,7 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
   }
 
   private parseSectionFields(
-    category: CategoryEnum,
+    category: Category,
     fields: FieldsEntity[],
     cipher: CipherView,
     sectionTitle: string,
@@ -232,20 +232,20 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
         }
 
         switch (category) {
-          case CategoryEnum.Login:
-          case CategoryEnum.Database:
-          case CategoryEnum.EmailAccount:
-          case CategoryEnum.WirelessRouter:
+          case Category.Login:
+          case Category.Database:
+          case Category.EmailAccount:
+          case Category.WirelessRouter:
             break;
 
-          case CategoryEnum.Server:
+          case Category.Server:
             if (this.isNullOrWhitespace(cipher.login.uri) && field.id === "url") {
               cipher.login.uris = this.makeUriArray(fieldValue);
               return;
             }
             break;
 
-          case CategoryEnum.API_Credential:
+          case Category.API_Credential:
             if (this.fillApiCredentials(field, fieldValue, cipher)) {
               return;
             }
@@ -258,7 +258,7 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
           return;
         }
 
-        if (category === CategoryEnum.BankAccount) {
+        if (category === Category.BankAccount) {
           if (this.fillBankAccount(field, fieldValue, cipher)) {
             return;
           }
@@ -281,34 +281,34 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
         }
 
         switch (category) {
-          case CategoryEnum.Identity:
+          case Category.Identity:
             break;
-          case CategoryEnum.DriversLicense:
+          case Category.DriversLicense:
             if (this.fillDriversLicense(field, fieldValue, cipher)) {
               return;
             }
             break;
-          case CategoryEnum.OutdoorLicense:
+          case Category.OutdoorLicense:
             if (this.fillOutdoorLicense(field, fieldValue, cipher)) {
               return;
             }
             break;
-          case CategoryEnum.Membership:
+          case Category.Membership:
             if (this.fillMembership(field, fieldValue, cipher)) {
               return;
             }
             break;
-          case CategoryEnum.Passport:
+          case Category.Passport:
             if (this.fillPassport(field, fieldValue, cipher)) {
               return;
             }
             break;
-          case CategoryEnum.RewardsProgram:
+          case Category.RewardsProgram:
             if (this.fillRewardsProgram(field, fieldValue, cipher)) {
               return;
             }
             break;
-          case CategoryEnum.SocialSecurityNumber:
+          case Category.SocialSecurityNumber:
             if (this.fillSSN(field, fieldValue, cipher)) {
               return;
             }
diff --git a/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts
index d7f4dec8f95..43f3bc4f7d6 100644
--- a/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts
+++ b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts
@@ -25,30 +25,36 @@ export interface VaultAttributes {
   type: string;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum CategoryEnum {
-  Login = "001",
-  CreditCard = "002",
-  SecureNote = "003",
-  Identity = "004",
-  Password = "005",
-  Document = "006",
-  SoftwareLicense = "100",
-  BankAccount = "101",
-  Database = "102",
-  DriversLicense = "103",
-  OutdoorLicense = "104",
-  Membership = "105",
-  Passport = "106",
-  RewardsProgram = "107",
-  SocialSecurityNumber = "108",
-  WirelessRouter = "109",
-  Server = "110",
-  EmailAccount = "111",
-  API_Credential = "112",
-  MedicalRecord = "113",
-}
+/**
+ * Represents the different types of items that can be stored in 1Password.
+ */
+export const Category = Object.freeze({
+  Login: "001",
+  CreditCard: "002",
+  SecureNote: "003",
+  Identity: "004",
+  Password: "005",
+  Document: "006",
+  SoftwareLicense: "100",
+  BankAccount: "101",
+  Database: "102",
+  DriversLicense: "103",
+  OutdoorLicense: "104",
+  Membership: "105",
+  Passport: "106",
+  RewardsProgram: "107",
+  SocialSecurityNumber: "108",
+  WirelessRouter: "109",
+  Server: "110",
+  EmailAccount: "111",
+  API_Credential: "112",
+  MedicalRecord: "113",
+} as const);
+
+/**
+ * Represents valid 1Password category values.
+ */
+export type Category = (typeof Category)[keyof typeof Category];
 
 export interface Item {
   uuid: string;
@@ -69,23 +75,30 @@ export interface Details {
   password?: string | null;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum LoginFieldTypeEnum {
-  TextOrHtml = "T",
-  EmailAddress = "E",
-  URL = "U",
-  Number = "N",
-  Password = "P",
-  TextArea = "A",
-  PhoneNumber = "TEL",
-  CheckBox = "C",
-}
+/**
+ * Represents 1Password login field types that can be stored in login items.
+ */
+export const LoginFieldType = Object.freeze({
+  TextOrHtml: "T",
+  EmailAddress: "E",
+  URL: "U",
+  Number: "N",
+  Password: "P",
+  TextArea: "A",
+  PhoneNumber: "TEL",
+  CheckBox: "C",
+} as const);
+
+/**
+ * Type representing valid 1Password login field type values.
+ */
+export type LoginFieldType = (typeof LoginFieldType)[keyof typeof LoginFieldType];
+
 export interface LoginFieldsEntity {
   value: string;
   id: string;
   name: string;
-  fieldType: LoginFieldTypeEnum | string;
+  fieldType: LoginFieldType | string;
   designation?: string | null;
 }
 export interface SectionsEntity {
diff --git a/libs/importer/src/importers/protonpass/types/protonpass-json-type.ts b/libs/importer/src/importers/protonpass/types/protonpass-json-type.ts
index af2eb15a740..124c95a3d69 100644
--- a/libs/importer/src/importers/protonpass/types/protonpass-json-type.ts
+++ b/libs/importer/src/importers/protonpass/types/protonpass-json-type.ts
@@ -27,12 +27,19 @@ export type ProtonPassItem = {
   pinned: boolean;
 };
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum ProtonPassItemState {
-  ACTIVE = 1,
-  TRASHED = 2,
-}
+/**
+ * Proton Pass item states as a const object.
+ * Represents the different states an item can be in (active or trashed).
+ */
+export const ProtonPassItemState = Object.freeze({
+  ACTIVE: 1,
+  TRASHED: 2,
+} as const);
+
+/**
+ * Type representing valid Proton Pass item state values.
+ */
+export type ProtonPassItemState = (typeof ProtonPassItemState)[keyof typeof ProtonPassItemState];
 
 export type ProtonPassItemData = {
   metadata: ProtonPassItemMetadata;
diff --git a/libs/importer/src/importers/safari-csv-importer.spec.ts b/libs/importer/src/importers/safari-csv-importer.spec.ts
index 4ca8df23f34..c55117226f9 100644
--- a/libs/importer/src/importers/safari-csv-importer.spec.ts
+++ b/libs/importer/src/importers/safari-csv-importer.spec.ts
@@ -11,9 +11,6 @@ const CipherData = [
     title: "should parse URLs in new CSV format",
     csv: simplePasswordData,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "example.com (example_user)",
       login: Object.assign(new LoginView(), {
         username: "example_user",
@@ -33,9 +30,6 @@ const CipherData = [
     title: "should parse URLs in old CSV format",
     csv: oldSimplePasswordData,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "example.com (example_user)",
       login: Object.assign(new LoginView(), {
         username: "example_user",
@@ -45,6 +39,7 @@ const CipherData = [
             uri: "https://example.com",
           }),
         ],
+        totp: null,
       }),
       type: 1,
     }),
@@ -54,6 +49,7 @@ const CipherData = [
 describe("Safari CSV Importer", () => {
   CipherData.forEach((data) => {
     it(data.title, async () => {
+      jest.useFakeTimers().setSystemTime(data.expected.creationDate);
       const importer = new SafariCsvImporter();
       const result = await importer.parse(data.csv);
       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 d3904fb521a..c82e3e5dcf1 100644
--- a/libs/importer/src/importers/zohovault-csv-importer.spec.ts
+++ b/libs/importer/src/importers/zohovault-csv-importer.spec.ts
@@ -11,9 +11,6 @@ const CipherData = [
     title: "should parse Zoho Vault CSV format",
     csv: samplezohovaultcsvdata,
     expected: Object.assign(new CipherView(), {
-      id: null,
-      organizationId: null,
-      folderId: null,
       name: "XYZ Test",
       login: Object.assign(new LoginView(), {
         username: "email@domain.de",
@@ -41,6 +38,7 @@ describe("Zoho Vault CSV Importer", () => {
 
   CipherData.forEach((data) => {
     it(data.title, async () => {
+      jest.useFakeTimers().setSystemTime(data.expected.creationDate);
       const importer = new ZohoVaultCsvImporter();
       const result = await importer.parse(data.csv);
       expect(result != null).toBe(true);
diff --git a/libs/importer/src/index.ts b/libs/importer/src/index.ts
index 1d7a88d3162..a24d22e12ba 100644
--- a/libs/importer/src/index.ts
+++ b/libs/importer/src/index.ts
@@ -1,4 +1,5 @@
 export * from "./models";
+export * from "./metadata";
 export * from "./services";
 
 export { Importer } from "./importers/importer";
diff --git a/libs/importer/src/metadata/importers.ts b/libs/importer/src/metadata/importers.ts
index efd5eafe7d5..b2c13a84049 100644
--- a/libs/importer/src/metadata/importers.ts
+++ b/libs/importer/src/metadata/importers.ts
@@ -2,26 +2,32 @@ import { deepFreeze } from "@bitwarden/common/tools/util";
 
 import { ImportType } from "../models";
 
-import { Loader, Instructions } from "./data";
+import { Instructions, Loader } from "./data";
 import { ImporterMetadata } from "./types";
 
-// FIXME: load this data from rust code
+export type ImportersMetadata = Partial<Record<ImportType, ImporterMetadata>>;
+
+/** List of all supported importers and their default capabilities
+ * Note: the loaders listed here are the ones that are supported in all clients.
+ * Specific clients may have additional loaders available based on platform capabilities.
+ */
 const importers = [
+  { id: "bitwardenjson", loaders: [Loader.file], instructions: Instructions.unique },
   // chromecsv import depends upon operating system, so ironically it doesn't support chromium
   { id: "chromecsv", loaders: [Loader.file], instructions: Instructions.chromium },
-  { id: "operacsv", loaders: [Loader.file, Loader.chromium], instructions: Instructions.chromium },
+  { id: "operacsv", loaders: [Loader.file], instructions: Instructions.chromium },
   {
     id: "vivaldicsv",
-    loaders: [Loader.file, Loader.chromium],
+    loaders: [Loader.file],
     instructions: Instructions.chromium,
   },
-  { id: "bravecsv", loaders: [Loader.file, Loader.chromium], instructions: Instructions.chromium },
-  { id: "edgecsv", loaders: [Loader.file, Loader.chromium], instructions: Instructions.chromium },
+  { id: "bravecsv", loaders: [Loader.file], instructions: Instructions.chromium },
+  { id: "edgecsv", loaders: [Loader.file], instructions: Instructions.chromium },
 
   // FIXME: add other formats and remove `Partial` from export
 ] as const;
 
 /** Describes which loaders are available for each import type */
-export const Importers: Partial<Record<ImportType, ImporterMetadata>> = deepFreeze(
+export const Importers: ImportersMetadata = deepFreeze(
   Object.fromEntries(importers.map((i) => [i.id, i])),
 );
diff --git a/libs/importer/src/models/import-result.ts b/libs/importer/src/models/import-result.ts
index 9d94b410e7b..b99068ff83f 100644
--- a/libs/importer/src/models/import-result.ts
+++ b/libs/importer/src/models/import-result.ts
@@ -6,12 +6,15 @@ import { CollectionView } from "@bitwarden/admin-console/common";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
+export type FolderRelationship = [cipherIndex: number, folderIndex: number];
+export type CollectionRelationship = [cipherIndex: number, collectionIndex: number];
+
 export class ImportResult {
   success = false;
   errorMessage: string;
   ciphers: CipherView[] = [];
   folders: FolderView[] = [];
-  folderRelationships: [number, number][] = [];
+  folderRelationships: FolderRelationship[] = [];
   collections: CollectionView[] = [];
-  collectionRelationships: [number, number][] = [];
+  collectionRelationships: CollectionRelationship[] = [];
 }
diff --git a/libs/importer/src/services/default-import-metadata.service.ts b/libs/importer/src/services/default-import-metadata.service.ts
new file mode 100644
index 00000000000..393c498e118
--- /dev/null
+++ b/libs/importer/src/services/default-import-metadata.service.ts
@@ -0,0 +1,88 @@
+import { combineLatest, map, Observable } from "rxjs";
+
+import { ClientType, DeviceType } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { SemanticLogger } from "@bitwarden/common/tools/log";
+import { SystemServiceProvider } from "@bitwarden/common/tools/providers";
+
+import { DataLoader, ImporterMetadata, Importers, ImportersMetadata, Loader } from "../metadata";
+import { ImportType } from "../models/import-options";
+import { availableLoaders } from "../util";
+
+import { ImportMetadataServiceAbstraction } from "./import-metadata.service.abstraction";
+
+export class DefaultImportMetadataService implements ImportMetadataServiceAbstraction {
+  protected importers: ImportersMetadata = Importers;
+  private logger: SemanticLogger;
+
+  private chromiumWithABE$: Observable<boolean>;
+
+  constructor(protected system: SystemServiceProvider) {
+    this.logger = system.log({ type: "ImportMetadataService" });
+    this.chromiumWithABE$ = this.system.configService.getFeatureFlag$(
+      FeatureFlag.ChromiumImporterWithABE,
+    );
+  }
+
+  async init(): Promise<void> {
+    // no-op for default implementation
+  }
+
+  metadata$(type$: Observable<ImportType>): Observable<ImporterMetadata> {
+    const client = this.system.environment.getClientType();
+    const capabilities$ = combineLatest([type$, this.chromiumWithABE$]).pipe(
+      map(([type, enabled]) => {
+        if (!this.importers) {
+          return { type, loaders: [] };
+        }
+
+        const loaders = this.availableLoaders(this.importers, type, client, enabled);
+
+        if (!loaders || loaders.length === 0) {
+          return { type, loaders: [] };
+        }
+
+        const capabilities: ImporterMetadata = { type, loaders };
+        if (type in this.importers) {
+          capabilities.instructions = this.importers[type]?.instructions;
+        }
+
+        this.logger.debug({ importType: type, capabilities }, "capabilities updated");
+
+        return capabilities;
+      }),
+    );
+
+    return capabilities$;
+  }
+
+  /** Determine the available loaders for the given import type and client, considering feature flags and environments */
+  private availableLoaders(
+    importers: ImportersMetadata,
+    type: ImportType,
+    client: ClientType,
+    withABESupport: boolean,
+  ): DataLoader[] | undefined {
+    let loaders = availableLoaders(importers, type, client);
+
+    if (withABESupport) {
+      return loaders;
+    }
+
+    // Special handling for Brave and Chrome CSV imports on Windows Desktop
+    if (type === "bravecsv" || type === "chromecsv") {
+      try {
+        const device = this.system.environment.getDevice();
+        const isWindowsDesktop = device === DeviceType.WindowsDesktop;
+        if (isWindowsDesktop) {
+          // Exclude the Chromium loader if on Windows Desktop without ABE support
+          loaders = loaders?.filter((loader) => loader !== Loader.chromium);
+        }
+      } catch {
+        loaders = loaders?.filter((loader) => loader !== Loader.chromium);
+      }
+    }
+
+    return loaders;
+  }
+}
diff --git a/libs/importer/src/services/import-metadata.service.abstraction.ts b/libs/importer/src/services/import-metadata.service.abstraction.ts
new file mode 100644
index 00000000000..500dcfcef10
--- /dev/null
+++ b/libs/importer/src/services/import-metadata.service.abstraction.ts
@@ -0,0 +1,11 @@
+import { Observable } from "rxjs";
+
+import { ImporterMetadata } from "../metadata";
+import { ImportType } from "../models/import-options";
+
+export abstract class ImportMetadataServiceAbstraction {
+  abstract init(): Promise<void>;
+
+  /** describes the features supported by a format */
+  abstract metadata$: (type$: Observable<ImportType>) => Observable<ImporterMetadata>;
+}
diff --git a/libs/importer/src/services/import-metadata.service.spec.ts b/libs/importer/src/services/import-metadata.service.spec.ts
new file mode 100644
index 00000000000..e16965a69f8
--- /dev/null
+++ b/libs/importer/src/services/import-metadata.service.spec.ts
@@ -0,0 +1,214 @@
+import { mock, MockProxy } from "jest-mock-extended";
+import { BehaviorSubject, Subject, firstValueFrom } from "rxjs";
+
+import { ClientType } from "@bitwarden/client-type";
+import { DeviceType } from "@bitwarden/common/enums";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SystemServiceProvider } from "@bitwarden/common/tools/providers";
+
+import { ImporterMetadata, ImportersMetadata, Instructions, Loader } from "../metadata";
+import { ImportType } from "../models";
+
+import { DefaultImportMetadataService } from "./default-import-metadata.service";
+
+describe("ImportMetadataService", () => {
+  let sut: DefaultImportMetadataService;
+  let systemServiceProvider: MockProxy<SystemServiceProvider>;
+
+  beforeEach(() => {
+    const configService = mock<ConfigService>();
+
+    const environment = mock<PlatformUtilsService>();
+    environment.getClientType.mockReturnValue(ClientType.Desktop);
+
+    systemServiceProvider = mock<SystemServiceProvider>({
+      configService,
+      environment,
+      log: jest.fn().mockReturnValue({ debug: jest.fn() }),
+    });
+
+    sut = new DefaultImportMetadataService(systemServiceProvider);
+  });
+
+  describe("metadata$", () => {
+    let typeSubject: Subject<ImportType>;
+    let mockLogger: { debug: jest.Mock };
+    let featureFlagSubject: BehaviorSubject<boolean>;
+
+    const environment = mock<PlatformUtilsService>();
+    environment.getClientType.mockReturnValue(ClientType.Desktop);
+
+    beforeEach(() => {
+      typeSubject = new Subject<ImportType>();
+      mockLogger = { debug: jest.fn() };
+      featureFlagSubject = new BehaviorSubject<boolean>(false);
+
+      const configService = mock<ConfigService>();
+      configService.getFeatureFlag$.mockReturnValue(featureFlagSubject);
+
+      systemServiceProvider = mock<SystemServiceProvider>({
+        configService,
+        environment,
+        log: jest.fn().mockReturnValue(mockLogger),
+      });
+
+      // Recreate the service with the updated mocks for logging tests
+      sut = new DefaultImportMetadataService(systemServiceProvider);
+
+      // Set up importers to include bravecsv and chromecsv with chromium loader
+      sut["importers"] = {
+        chromecsv: {
+          type: "chromecsv",
+          loaders: [Loader.file, Loader.chromium],
+          instructions: Instructions.chromium,
+        },
+        bravecsv: {
+          type: "bravecsv",
+          loaders: [Loader.file, Loader.chromium],
+          instructions: Instructions.chromium,
+        },
+        edgecsv: {
+          type: "edgecsv",
+          loaders: [Loader.file, Loader.chromium],
+          instructions: Instructions.chromium,
+        },
+      } as ImportersMetadata;
+    });
+
+    afterEach(() => {
+      typeSubject.complete();
+      featureFlagSubject.complete();
+    });
+
+    it("should emit metadata when type$ emits", async () => {
+      const testType: ImportType = "chromecsv";
+
+      const metadataPromise = firstValueFrom(sut.metadata$(typeSubject));
+      typeSubject.next(testType);
+
+      const result = await metadataPromise;
+
+      expect(result).toEqual({
+        type: testType,
+        loaders: expect.any(Array),
+        instructions: Instructions.chromium,
+      });
+      expect(result.type).toBe(testType);
+    });
+
+    it("should update when type$ changes", async () => {
+      const emissions: ImporterMetadata[] = [];
+      const subscription = sut.metadata$(typeSubject).subscribe((metadata) => {
+        emissions.push(metadata);
+      });
+
+      typeSubject.next("chromecsv");
+      typeSubject.next("bravecsv");
+
+      // Wait for emissions
+      await new Promise((resolve) => setTimeout(resolve, 0));
+
+      expect(emissions).toHaveLength(2);
+      expect(emissions[0].type).toBe("chromecsv");
+      expect(emissions[1].type).toBe("bravecsv");
+
+      subscription.unsubscribe();
+    });
+
+    it("should log debug information with correct data", async () => {
+      const testType: ImportType = "chromecsv";
+
+      const metadataPromise = firstValueFrom(sut.metadata$(typeSubject));
+      typeSubject.next(testType);
+
+      await metadataPromise;
+
+      expect(mockLogger.debug).toHaveBeenCalledWith(
+        { importType: testType, capabilities: expect.any(Object) },
+        "capabilities updated",
+      );
+    });
+
+    it("should update when feature flag changes", async () => {
+      environment.getDevice.mockReturnValue(DeviceType.WindowsDesktop);
+      const testType: ImportType = "bravecsv"; // Use bravecsv which supports chromium loader
+      const emissions: ImporterMetadata[] = [];
+
+      const subscription = sut.metadata$(typeSubject).subscribe((metadata) => {
+        emissions.push(metadata);
+      });
+
+      typeSubject.next(testType);
+      featureFlagSubject.next(true);
+
+      // Wait for emissions
+      await new Promise((resolve) => setTimeout(resolve, 0));
+
+      expect(emissions).toHaveLength(2);
+      // Disable ABE - chromium loader should be excluded
+      expect(emissions[0].loaders).not.toContain(Loader.chromium);
+      // Enabled ABE - chromium loader should be included
+      expect(emissions[1].loaders).toContain(Loader.chromium);
+
+      subscription.unsubscribe();
+    });
+
+    it("should exclude chromium loader when ABE is disabled and on Windows Desktop", async () => {
+      environment.getDevice.mockReturnValue(DeviceType.WindowsDesktop);
+      const testType: ImportType = "bravecsv"; // bravecsv supports both file and chromium loaders
+      featureFlagSubject.next(false);
+
+      const metadataPromise = firstValueFrom(sut.metadata$(typeSubject));
+      typeSubject.next(testType);
+
+      const result = await metadataPromise;
+
+      expect(result.loaders).not.toContain(Loader.chromium);
+      expect(result.loaders).toContain(Loader.file);
+    });
+
+    it("should exclude chromium loader when ABE is disabled and getDevice throws error", async () => {
+      environment.getDevice.mockImplementation(() => {
+        throw new Error("Device detection failed");
+      });
+      const testType: ImportType = "bravecsv";
+      featureFlagSubject.next(false);
+
+      const metadataPromise = firstValueFrom(sut.metadata$(typeSubject));
+      typeSubject.next(testType);
+
+      const result = await metadataPromise;
+
+      expect(result.loaders).not.toContain(Loader.chromium);
+      expect(result.loaders).toContain(Loader.file);
+    });
+
+    it("should include chromium loader when ABE is disabled and not on Windows Desktop", async () => {
+      environment.getDevice.mockReturnValue(DeviceType.MacOsDesktop);
+      const testType: ImportType = "bravecsv"; // bravecsv supports both file and chromium loaders
+      featureFlagSubject.next(false);
+
+      const metadataPromise = firstValueFrom(sut.metadata$(typeSubject));
+      typeSubject.next(testType);
+
+      const result = await metadataPromise;
+
+      expect(result.loaders).toContain(Loader.chromium);
+      expect(result.loaders).toContain(Loader.file);
+    });
+
+    it("should include chromium loader when ABE is enabled regardless of device", async () => {
+      environment.getDevice.mockReturnValue(DeviceType.MacOsDesktop);
+      const testType: ImportType = "bravecsv"; // bravecsv supports both file and chromium loaders
+      featureFlagSubject.next(true);
+
+      const metadataPromise = firstValueFrom(sut.metadata$(typeSubject));
+      typeSubject.next(testType);
+
+      const result = await metadataPromise;
+
+      expect(result.loaders).toContain(Loader.chromium);
+    });
+  });
+});
diff --git a/libs/importer/src/services/import.service.abstraction.ts b/libs/importer/src/services/import.service.abstraction.ts
index ee0d1ed33ab..d8f1f6ccd5c 100644
--- a/libs/importer/src/services/import.service.abstraction.ts
+++ b/libs/importer/src/services/import.service.abstraction.ts
@@ -1,6 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Observable } 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
@@ -8,7 +7,6 @@ import { CollectionView } from "@bitwarden/admin-console/common";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { Importer } from "../importers/importer";
-import { ImporterMetadata } from "../metadata";
 import { ImportOption, ImportType } from "../models/import-options";
 import { ImportResult } from "../models/import-result";
 
@@ -17,9 +15,6 @@ export abstract class ImportServiceAbstraction {
   regularImportOptions: readonly ImportOption[];
   getImportOptions: () => ImportOption[];
 
-  /** describes the features supported by a format */
-  metadata$: (type$: Observable<ImportType>) => Observable<ImporterMetadata>;
-
   import: (
     importer: Importer,
     fileContents: string,
diff --git a/libs/importer/src/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts
index c3d555af936..b1c028ff063 100644
--- a/libs/importer/src/services/import.service.spec.ts
+++ b/libs/importer/src/services/import.service.spec.ts
@@ -1,20 +1,17 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject, Subject, 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 { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
-import { ClientType } from "@bitwarden/client-type";
+import {
+  CollectionService,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { SystemServiceProvider } from "@bitwarden/common/tools/providers";
 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";
@@ -25,8 +22,6 @@ import { KeyService } from "@bitwarden/key-management";
 
 import { BitwardenPasswordProtectedImporter } from "../importers/bitwarden/bitwarden-password-protected-importer";
 import { Importer } from "../importers/importer";
-import { ImporterMetadata, Instructions, Loader } from "../metadata";
-import { ImportType } from "../models";
 import { ImportResult } from "../models/import-result";
 
 import { ImportApiServiceAbstraction } from "./import-api.service.abstraction";
@@ -44,7 +39,6 @@ describe("ImportService", () => {
   let pinService: MockProxy<PinServiceAbstraction>;
   let accountService: MockProxy<AccountService>;
   let restrictedItemTypesService: MockProxy<RestrictedItemTypesService>;
-  let systemServiceProvider: MockProxy<SystemServiceProvider>;
 
   beforeEach(() => {
     cipherService = mock<CipherService>();
@@ -57,18 +51,6 @@ describe("ImportService", () => {
     pinService = mock<PinServiceAbstraction>();
     restrictedItemTypesService = mock<RestrictedItemTypesService>();
 
-    const configService = mock<ConfigService>();
-    configService.getFeatureFlag$.mockReturnValue(new BehaviorSubject(false));
-
-    const environment = mock<PlatformUtilsService>();
-    environment.getClientType.mockReturnValue(ClientType.Desktop);
-
-    systemServiceProvider = mock<SystemServiceProvider>({
-      configService,
-      environment,
-      log: jest.fn().mockReturnValue({ debug: jest.fn() }),
-    });
-
     importService = new ImportService(
       cipherService,
       folderService,
@@ -80,7 +62,6 @@ describe("ImportService", () => {
       pinService,
       accountService,
       restrictedItemTypesService,
-      systemServiceProvider,
     );
   });
 
@@ -217,7 +198,7 @@ describe("ImportService", () => {
       );
     });
 
-    it("passing importTarget as null on setImportTarget with organizationId throws error", async () => {
+    it("passing importTarget as undefined on setImportTarget with organizationId throws error", async () => {
       const setImportTargetMethod = importService["setImportTarget"](
         null,
         organizationId,
@@ -227,10 +208,10 @@ describe("ImportService", () => {
       await expect(setImportTargetMethod).rejects.toThrow();
     });
 
-    it("passing importTarget as null on setImportTarget throws error", async () => {
+    it("passing importTarget as undefined on setImportTarget throws error", async () => {
       const setImportTargetMethod = importService["setImportTarget"](
         null,
-        "",
+        undefined,
         new Object() as CollectionView,
       );
 
@@ -262,174 +243,39 @@ describe("ImportService", () => {
       importResult.ciphers.push(createCipher({ name: "cipher2" }));
       importResult.folderRelationships.push([0, 0]);
 
-      await importService["setImportTarget"](importResult, "", mockImportTargetFolder);
+      await importService["setImportTarget"](importResult, undefined, mockImportTargetFolder);
       expect(importResult.folderRelationships.length).toEqual(2);
       expect(importResult.folderRelationships[0]).toEqual([1, 0]);
       expect(importResult.folderRelationships[1]).toEqual([0, 1]);
     });
-  });
 
-  describe("metadata$", () => {
-    let featureFlagSubject: BehaviorSubject<boolean>;
-    let typeSubject: Subject<ImportType>;
-    let mockLogger: { debug: jest.Mock };
+    it("If importTarget is of type DefaultUserCollection sets it as new root for all ciphers as nesting is not supported", async () => {
+      importResult.collections.push(mockCollection1);
+      importResult.collections.push(mockCollection2);
+      importResult.ciphers.push(createCipher({ name: "cipher1" }));
+      importResult.ciphers.push(createCipher({ name: "cipher2" }));
+      importResult.ciphers.push(createCipher({ name: "cipher3" }));
 
-    beforeEach(() => {
-      featureFlagSubject = new BehaviorSubject(false);
-      typeSubject = new Subject<ImportType>();
-      mockLogger = { debug: jest.fn() };
+      importResult.collectionRelationships.push([0, 0]);
+      importResult.collectionRelationships.push([1, 1]);
+      importResult.collectionRelationships.push([2, 0]);
 
-      const configService = mock<ConfigService>();
-      configService.getFeatureFlag$.mockReturnValue(featureFlagSubject);
-
-      const environment = mock<PlatformUtilsService>();
-      environment.getClientType.mockReturnValue(ClientType.Desktop);
-
-      systemServiceProvider = mock<SystemServiceProvider>({
-        configService,
-        environment,
-        log: jest.fn().mockReturnValue(mockLogger),
-      });
-
-      // Recreate the service with the updated mocks for logging tests
-      importService = new ImportService(
-        cipherService,
-        folderService,
-        importApiService,
-        i18nService,
-        collectionService,
-        keyService,
-        encryptService,
-        pinService,
-        accountService,
-        restrictedItemTypesService,
-        systemServiceProvider,
+      mockImportTargetCollection.type = CollectionTypes.DefaultUserCollection;
+      await importService["setImportTarget"](
+        importResult,
+        organizationId,
+        mockImportTargetCollection,
       );
-    });
+      expect(importResult.collections.length).toBe(1);
+      expect(importResult.collections[0]).toBe(mockImportTargetCollection);
 
-    afterEach(() => {
-      featureFlagSubject.complete();
-      typeSubject.complete();
-    });
+      expect(importResult.collectionRelationships.length).toEqual(3);
+      expect(importResult.collectionRelationships[0]).toEqual([0, 0]);
+      expect(importResult.collectionRelationships[1]).toEqual([1, 0]);
+      expect(importResult.collectionRelationships[2]).toEqual([2, 0]);
 
-    it("should emit metadata when type$ emits", async () => {
-      const testType: ImportType = "chromecsv";
-
-      const metadataPromise = firstValueFrom(importService.metadata$(typeSubject));
-      typeSubject.next(testType);
-
-      const result = await metadataPromise;
-
-      expect(result).toEqual({
-        type: testType,
-        loaders: expect.any(Array),
-        instructions: Instructions.chromium,
-      });
-      expect(result.type).toBe(testType);
-    });
-
-    it("should include all loaders when chromium feature flag is enabled", async () => {
-      const testType: ImportType = "bravecsv"; // bravecsv supports both file and chromium loaders
-      featureFlagSubject.next(true);
-
-      const metadataPromise = firstValueFrom(importService.metadata$(typeSubject));
-      typeSubject.next(testType);
-
-      const result = await metadataPromise;
-
-      expect(result.loaders).toContain(Loader.chromium);
-      expect(result.loaders).toContain(Loader.file);
-    });
-
-    it("should exclude chromium loader when feature flag is disabled", async () => {
-      const testType: ImportType = "bravecsv"; // bravecsv supports both file and chromium loaders
-      featureFlagSubject.next(false);
-
-      const metadataPromise = firstValueFrom(importService.metadata$(typeSubject));
-      typeSubject.next(testType);
-
-      const result = await metadataPromise;
-
-      expect(result.loaders).not.toContain(Loader.chromium);
-      expect(result.loaders).toContain(Loader.file);
-    });
-
-    it("should update when type$ changes", async () => {
-      const emissions: ImporterMetadata[] = [];
-      const subscription = importService.metadata$(typeSubject).subscribe((metadata) => {
-        emissions.push(metadata);
-      });
-
-      typeSubject.next("chromecsv");
-      typeSubject.next("bravecsv");
-
-      // Wait for emissions
-      await new Promise((resolve) => setTimeout(resolve, 0));
-
-      expect(emissions).toHaveLength(2);
-      expect(emissions[0].type).toBe("chromecsv");
-      expect(emissions[1].type).toBe("bravecsv");
-
-      subscription.unsubscribe();
-    });
-
-    it("should update when feature flag changes", async () => {
-      const testType: ImportType = "bravecsv"; // Use bravecsv which supports chromium loader
-      const emissions: ImporterMetadata[] = [];
-
-      const subscription = importService.metadata$(typeSubject).subscribe((metadata) => {
-        emissions.push(metadata);
-      });
-
-      typeSubject.next(testType);
-      featureFlagSubject.next(true);
-
-      // Wait for emissions
-      await new Promise((resolve) => setTimeout(resolve, 0));
-
-      expect(emissions).toHaveLength(2);
-      expect(emissions[0].loaders).not.toContain(Loader.chromium);
-      expect(emissions[1].loaders).toContain(Loader.chromium);
-
-      subscription.unsubscribe();
-    });
-
-    it("should update when both type$ and feature flag change", async () => {
-      const emissions: ImporterMetadata[] = [];
-
-      const subscription = importService.metadata$(typeSubject).subscribe((metadata) => {
-        emissions.push(metadata);
-      });
-
-      // Initial emission
-      typeSubject.next("chromecsv");
-
-      // Change both at the same time
-      featureFlagSubject.next(true);
-      typeSubject.next("bravecsv");
-
-      // Wait for emissions
-      await new Promise((resolve) => setTimeout(resolve, 0));
-
-      expect(emissions.length).toBeGreaterThanOrEqual(2);
-      const lastEmission = emissions[emissions.length - 1];
-      expect(lastEmission.type).toBe("bravecsv");
-
-      subscription.unsubscribe();
-    });
-
-    it("should log debug information with correct data", async () => {
-      const testType: ImportType = "chromecsv";
-
-      const metadataPromise = firstValueFrom(importService.metadata$(typeSubject));
-      typeSubject.next(testType);
-
-      await metadataPromise;
-
-      expect(mockLogger.debug).toHaveBeenCalledWith(
-        { importType: testType, capabilities: expect.any(Object) },
-        "capabilities updated",
-      );
+      expect(importResult.collectionRelationships.map((r) => r[0])).toEqual([0, 1, 2]);
+      expect(importResult.collectionRelationships.every((r) => r[1] === 0)).toBe(true);
     });
   });
 });
diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts
index da080bacaad..f62054f9414 100644
--- a/libs/importer/src/services/import.service.ts
+++ b/libs/importer/src/services/import.service.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { combineLatest, firstValueFrom, map, Observable } from "rxjs";
+import { firstValueFrom, map } 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
@@ -8,10 +8,10 @@ import {
   CollectionService,
   CollectionWithIdRequest,
   CollectionView,
+  CollectionTypes,
 } from "@bitwarden/admin-console/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { DeviceType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { ImportCiphersRequest } from "@bitwarden/common/models/request/import-ciphers.request";
@@ -20,9 +20,7 @@ import { KvpRequest } from "@bitwarden/common/models/request/kvp.request";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { SemanticLogger } from "@bitwarden/common/tools/log";
-import { SystemServiceProvider } from "@bitwarden/common/tools/providers";
-import { OrganizationId } 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, toCipherTypeName } from "@bitwarden/common/vault/enums";
@@ -98,25 +96,21 @@ import {
   PasswordDepot17XmlImporter,
 } from "../importers";
 import { Importer } from "../importers/importer";
-import { ImporterMetadata, Importers, Loader } from "../metadata";
 import {
   featuredImportOptions,
   ImportOption,
   ImportType,
   regularImportOptions,
 } from "../models/import-options";
-import { ImportResult } from "../models/import-result";
+import { CollectionRelationship, FolderRelationship, ImportResult } from "../models/import-result";
 import { ImportApiServiceAbstraction } from "../services/import-api.service.abstraction";
 import { ImportServiceAbstraction } from "../services/import.service.abstraction";
-import { availableLoaders as availableLoaders } from "../util";
 
 export class ImportService implements ImportServiceAbstraction {
   featuredImportOptions = featuredImportOptions as readonly ImportOption[];
 
   regularImportOptions = regularImportOptions as readonly ImportOption[];
 
-  private logger: SemanticLogger;
-
   constructor(
     private cipherService: CipherService,
     private folderService: FolderService,
@@ -128,56 +122,12 @@ export class ImportService implements ImportServiceAbstraction {
     private pinService: PinServiceAbstraction,
     private accountService: AccountService,
     private restrictedItemTypesService: RestrictedItemTypesService,
-    private system: SystemServiceProvider,
-  ) {
-    this.logger = system.log({ type: "ImportService" });
-  }
+  ) {}
 
   getImportOptions(): ImportOption[] {
     return this.featuredImportOptions.concat(this.regularImportOptions);
   }
 
-  metadata$(type$: Observable<ImportType>): Observable<ImporterMetadata> {
-    const browserEnabled$ = this.system.configService.getFeatureFlag$(
-      FeatureFlag.UseChromiumImporter,
-    );
-    const client = this.system.environment.getClientType();
-    const capabilities$ = combineLatest([type$, browserEnabled$]).pipe(
-      map(([type, enabled]) => {
-        let loaders = availableLoaders(type, client);
-
-        let isUnsupported = false;
-
-        if (enabled && type === "bravecsv") {
-          try {
-            const device = this.system.environment.getDevice();
-            const isWindowsDesktop = device === DeviceType.WindowsDesktop;
-            if (isWindowsDesktop) {
-              isUnsupported = true;
-            }
-          } catch {
-            isUnsupported = true;
-          }
-        }
-        // If the feature flag is disabled, or if the browser is unsupported, remove the chromium loader
-        if (!enabled || isUnsupported) {
-          loaders = loaders?.filter((loader) => loader !== Loader.chromium);
-        }
-
-        const capabilities: ImporterMetadata = { type, loaders };
-        if (type in Importers) {
-          capabilities.instructions = Importers[type].instructions;
-        }
-
-        this.logger.debug({ importType: type, capabilities }, "capabilities updated");
-
-        return capabilities;
-      }),
-    );
-
-    return capabilities$;
-  }
-
   async import(
     importer: Importer,
     fileContents: string,
@@ -240,10 +190,11 @@ export class ImportService implements ImportServiceAbstraction {
 
     try {
       await this.setImportTarget(importResult, organizationId, selectedImportTarget);
+      const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
       if (organizationId != null) {
-        await this.handleOrganizationalImport(importResult, organizationId);
+        await this.handleOrganizationalImport(importResult, organizationId, userId);
       } else {
-        await this.handleIndividualImport(importResult);
+        await this.handleIndividualImport(importResult, userId);
       }
     } catch (error) {
       const errorResponse = new ErrorResponse(error, 400);
@@ -421,16 +372,14 @@ export class ImportService implements ImportServiceAbstraction {
     }
   }
 
-  private async handleIndividualImport(importResult: ImportResult) {
+  private async handleIndividualImport(importResult: ImportResult, userId: UserId) {
     const request = new ImportCiphersRequest();
-    const activeUserId = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-    );
     for (let i = 0; i < importResult.ciphers.length; i++) {
-      const c = await this.cipherService.encrypt(importResult.ciphers[i], activeUserId);
+      const c = await this.cipherService.encrypt(importResult.ciphers[i], userId);
       request.ciphers.push(new CipherRequest(c));
     }
-    const userKey = await this.keyService.getUserKey(activeUserId);
+    const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+
     if (importResult.folders != null) {
       for (let i = 0; i < importResult.folders.length; i++) {
         const f = await this.folderService.encrypt(importResult.folders[i], userKey);
@@ -448,20 +397,18 @@ export class ImportService implements ImportServiceAbstraction {
   private async handleOrganizationalImport(
     importResult: ImportResult,
     organizationId: OrganizationId,
+    userId: UserId,
   ) {
     const request = new ImportOrganizationCiphersRequest();
-    const activeUserId = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-    );
     for (let i = 0; i < importResult.ciphers.length; i++) {
       importResult.ciphers[i].organizationId = organizationId;
-      const c = await this.cipherService.encrypt(importResult.ciphers[i], activeUserId);
+      const c = await this.cipherService.encrypt(importResult.ciphers[i], userId);
       request.ciphers.push(new CipherRequest(c));
     }
     if (importResult.collections != null) {
       for (let i = 0; i < importResult.collections.length; i++) {
         importResult.collections[i].organizationId = organizationId;
-        const c = await this.collectionService.encrypt(importResult.collections[i], activeUserId);
+        const c = await this.collectionService.encrypt(importResult.collections[i], userId);
         request.collections.push(new CollectionWithIdRequest(c));
       }
     }
@@ -527,19 +474,20 @@ export class ImportService implements ImportServiceAbstraction {
 
   private async setImportTarget(
     importResult: ImportResult,
-    organizationId: string,
+    organizationId: OrganizationId | undefined,
     importTarget: FolderView | CollectionView,
   ) {
     if (!importTarget) {
       return;
     }
 
+    // Importing into an organization
     if (organizationId) {
       if (!(importTarget instanceof CollectionView)) {
         throw new Error(this.i18nService.t("errorAssigningTargetCollection"));
       }
 
-      const noCollectionRelationShips: [number, number][] = [];
+      const noCollectionRelationShips: CollectionRelationship[] = [];
       importResult.ciphers.forEach((c, index) => {
         if (
           !Array.isArray(importResult.collectionRelationships) ||
@@ -549,15 +497,28 @@ export class ImportService implements ImportServiceAbstraction {
         }
       });
 
-      const collections: CollectionView[] = [...importResult.collections];
-      importResult.collections = [importTarget as CollectionView];
+      // My Items collections do not support collection nesting.
+      // Flatten all ciphers from nested collections into the import target.
+      if (importTarget.type === CollectionTypes.DefaultUserCollection) {
+        importResult.collections = [importTarget];
+
+        const flattenRelationships: CollectionRelationship[] = [];
+        importResult.ciphers.forEach((c, index) => {
+          flattenRelationships.push([index, 0]);
+        });
+        importResult.collectionRelationships = flattenRelationships;
+        return;
+      }
+
+      const collections = [...importResult.collections];
+      importResult.collections = [importTarget];
       collections.map((x) => {
         const f = new CollectionView(x);
         f.name = `${importTarget.name}/${x.name}`;
         importResult.collections.push(f);
       });
 
-      const relationships: [number, number][] = [...importResult.collectionRelationships];
+      const relationships = [...importResult.collectionRelationships];
       importResult.collectionRelationships = [...noCollectionRelationShips];
       relationships.map((x) => {
         importResult.collectionRelationships.push([x[0], x[1] + 1]);
@@ -566,11 +527,12 @@ export class ImportService implements ImportServiceAbstraction {
       return;
     }
 
+    // Importing into personal vault
     if (!(importTarget instanceof FolderView)) {
       throw new Error(this.i18nService.t("errorAssigningTargetFolder"));
     }
 
-    const noFolderRelationShips: [number, number][] = [];
+    const noFolderRelationShips: FolderRelationship[] = [];
     importResult.ciphers.forEach((c, index) => {
       if (Utils.isNullOrEmpty(c.folderId)) {
         c.folderId = importTarget.id;
@@ -578,8 +540,8 @@ export class ImportService implements ImportServiceAbstraction {
       }
     });
 
-    const folders: FolderView[] = [...importResult.folders];
-    importResult.folders = [importTarget as FolderView];
+    const folders = [...importResult.folders];
+    importResult.folders = [importTarget];
     folders.map((x) => {
       const newFolderName = `${importTarget.name}/${x.name}`;
       const f = new FolderView();
@@ -587,7 +549,7 @@ export class ImportService implements ImportServiceAbstraction {
       importResult.folders.push(f);
     });
 
-    const relationships: [number, number][] = [...importResult.folderRelationships];
+    const relationships = [...importResult.folderRelationships];
     importResult.folderRelationships = [...noFolderRelationShips];
     relationships.map((x) => {
       importResult.folderRelationships.push([x[0], x[1] + 1]);
diff --git a/libs/importer/src/services/index.ts b/libs/importer/src/services/index.ts
index 13568f886c4..ec53826addc 100644
--- a/libs/importer/src/services/index.ts
+++ b/libs/importer/src/services/index.ts
@@ -4,4 +4,7 @@ export { ImportApiService } from "./import-api.service";
 export { ImportServiceAbstraction } from "./import.service.abstraction";
 export { ImportService } from "./import.service";
 
+export { ImportMetadataServiceAbstraction } from "./import-metadata.service.abstraction";
+export { DefaultImportMetadataService } from "./default-import-metadata.service";
+
 export { ImportCollectionServiceAbstraction } from "./import-collection.service.abstraction";
diff --git a/libs/importer/src/util.spec.ts b/libs/importer/src/util.spec.ts
deleted file mode 100644
index 5a68e3cea12..00000000000
--- a/libs/importer/src/util.spec.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { ClientType } from "@bitwarden/client-type";
-
-import { Loader } from "./metadata";
-import { availableLoaders } from "./util";
-
-describe("availableLoaders", () => {
-  describe("given valid import types", () => {
-    it("returns available loaders when client supports all loaders", () => {
-      const result = availableLoaders("operacsv", ClientType.Desktop);
-
-      expect(result).toEqual([Loader.file, Loader.chromium]);
-    });
-
-    it("returns filtered loaders when client supports some loaders", () => {
-      const result = availableLoaders("operacsv", ClientType.Browser);
-
-      expect(result).toEqual([Loader.file]);
-    });
-
-    it("returns single loader for import types with one loader", () => {
-      const result = availableLoaders("chromecsv", ClientType.Desktop);
-
-      expect(result).toEqual([Loader.file]);
-    });
-
-    it("returns all supported loaders for multi-loader import types", () => {
-      const result = availableLoaders("bravecsv", ClientType.Desktop);
-
-      expect(result).toEqual([Loader.file, Loader.chromium]);
-    });
-  });
-
-  describe("given unknown import types", () => {
-    it("returns undefined when import type is not found in metadata", () => {
-      const result = availableLoaders("nonexistent" as any, ClientType.Desktop);
-
-      expect(result).toBeUndefined();
-    });
-  });
-
-  describe("given different client types", () => {
-    it("returns appropriate loaders for Browser client", () => {
-      const result = availableLoaders("operacsv", ClientType.Browser);
-
-      expect(result).toEqual([Loader.file]);
-    });
-
-    it("returns appropriate loaders for Web client", () => {
-      const result = availableLoaders("chromecsv", ClientType.Web);
-
-      expect(result).toEqual([Loader.file]);
-    });
-
-    it("returns appropriate loaders for CLI client", () => {
-      const result = availableLoaders("vivaldicsv", ClientType.Cli);
-
-      expect(result).toEqual([Loader.file]);
-    });
-  });
-});
diff --git a/libs/importer/src/util.ts b/libs/importer/src/util.ts
index 0a76b7e753b..7a5f4cbf1e8 100644
--- a/libs/importer/src/util.ts
+++ b/libs/importer/src/util.ts
@@ -1,6 +1,6 @@
 import { ClientType } from "@bitwarden/client-type";
 
-import { LoaderAvailability, Importers } from "./metadata";
+import { LoaderAvailability, ImportersMetadata } from "./metadata";
 import { ImportType } from "./models";
 
 /** Lookup the loaders supported by a specific client.
@@ -8,12 +8,20 @@ import { ImportType } from "./models";
  *  @returns `undefined` when metadata is not defined for the type, or
  *   an array identifying the supported clients.
  */
-export function availableLoaders(type: ImportType, client: ClientType) {
-  if (!(type in Importers)) {
+export function availableLoaders(
+  importersMetadata: ImportersMetadata,
+  type: ImportType,
+  client: ClientType,
+) {
+  if (!importersMetadata) {
     return undefined;
   }
 
-  const capabilities = Importers[type]?.loaders ?? [];
+  if (!(type in importersMetadata)) {
+    return undefined;
+  }
+
+  const capabilities = importersMetadata[type]?.loaders ?? [];
   const available = capabilities.filter((loader) => LoaderAvailability[loader].includes(client));
   return available;
 }
diff --git a/libs/key-management-ui/src/index.ts b/libs/key-management-ui/src/index.ts
index 6754722440a..d681d469123 100644
--- a/libs/key-management-ui/src/index.ts
+++ b/libs/key-management-ui/src/index.ts
@@ -9,3 +9,6 @@ export { AccountRecoveryTrustComponent } from "./trust/account-recovery-trust.co
 export { EmergencyAccessTrustComponent } from "./trust/emergency-access-trust.component";
 export { RemovePasswordComponent } from "./key-connector/remove-password.component";
 export { ConfirmKeyConnectorDomainComponent } from "./key-connector/confirm-key-connector-domain.component";
+export { SessionTimeoutSettingsComponent } from "./session-timeout/components/session-timeout-settings.component";
+export { SessionTimeoutSettingsComponentService } from "./session-timeout/services/session-timeout-settings-component.service";
+export { SessionTimeoutInputComponent } from "./session-timeout/components/session-timeout-input.component";
diff --git a/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.html b/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.html
index 6cf151d4604..11b34a8409f 100644
--- a/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.html
+++ b/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.html
@@ -9,7 +9,7 @@
   </div>
 } @else {
   <div class="tw-mb-4">
-    <p class="tw-mb-1 tw-text-sm tw-font-semibold">{{ "keyConnectorDomain" | i18n }}:</p>
+    <p class="tw-mb-1 tw-text-sm tw-font-medium">{{ "keyConnectorDomain" | i18n }}:</p>
     <p class="tw-text-muted tw-break-all">{{ keyConnectorUrl }}</p>
   </div>
 
diff --git a/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts b/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts
index 586c1cc113a..fe96e4620ad 100644
--- a/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts
+++ b/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts
@@ -13,6 +13,8 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { BitActionDirective, ButtonModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "confirm-key-connector-domain",
   templateUrl: "confirm-key-connector-domain.component.html",
@@ -24,6 +26,8 @@ export class ConfirmKeyConnectorDomainComponent implements OnInit {
   keyConnectorUrl!: string;
   userId!: UserId;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() onBeforeNavigation: () => Promise<void> = async () => {};
 
   constructor(
diff --git a/libs/key-management-ui/src/key-rotation/key-rotation-trust-info.component.ts b/libs/key-management-ui/src/key-rotation/key-rotation-trust-info.component.ts
index a2d3de3b30f..762b1f573df 100644
--- a/libs/key-management-ui/src/key-rotation/key-rotation-trust-info.component.ts
+++ b/libs/key-management-ui/src/key-rotation/key-rotation-trust-info.component.ts
@@ -17,6 +17,8 @@ type KeyRotationTrustDialogData = {
   numberOfEmergencyAccessUsers: number;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "key-rotation-trust-info",
   templateUrl: "key-rotation-trust-info.component.html",
diff --git a/libs/key-management-ui/src/lock/components/lock.component.html b/libs/key-management-ui/src/lock/components/lock.component.html
index 9a8e8c9f768..77f603204b3 100644
--- a/libs/key-management-ui/src/lock/components/lock.component.html
+++ b/libs/key-management-ui/src/lock/components/lock.component.html
@@ -120,73 +120,87 @@
   </ng-container>
 
   <!-- MP Unlock -->
-  <ng-container
-    *ngIf="
-      unlockOptions.masterPassword.enabled && activeUnlockOption === UnlockOption.MasterPassword
-    "
-  >
-    <form [bitSubmit]="submit" [formGroup]="formGroup">
-      <bit-form-field>
-        <bit-label>{{ "masterPass" | i18n }}</bit-label>
-        <input
-          type="password"
-          formControlName="masterPassword"
-          bitInput
-          appAutofocus
-          name="masterPassword"
-          class="tw-font-mono"
-          required
-          appInputVerbatim
-        />
-        <button
-          type="button"
-          bitIconButton
-          bitSuffix
-          bitPasswordInputToggle
-          [(toggled)]="showPassword"
-        ></button>
-
-        <!-- [attr.aria-pressed]="showPassword" -->
-      </bit-form-field>
-
-      <div class="tw-flex tw-flex-col tw-space-y-3">
-        <button type="submit" bitButton bitFormButton buttonType="primary" block>
-          {{ "unlock" | i18n }}
-        </button>
-
-        <p class="tw-text-center">{{ "or" | i18n }}</p>
-
-        <ng-container *ngIf="showBiometrics">
+  @if (
+    (unlockWithMasterPasswordUnlockDataFlag$ | async) &&
+    unlockOptions.masterPassword.enabled &&
+    activeUnlockOption === UnlockOption.MasterPassword
+  ) {
+    <bit-master-password-lock
+      [(activeUnlockOption)]="activeUnlockOption"
+      [unlockOptions]="unlockOptions"
+      [biometricUnlockBtnText]="biometricUnlockBtnText"
+      (successfulUnlock)="successfulMasterPasswordUnlock($event)"
+      (logOut)="logOut()"
+    ></bit-master-password-lock>
+  } @else {
+    <ng-container
+      *ngIf="
+        unlockOptions.masterPassword.enabled && activeUnlockOption === UnlockOption.MasterPassword
+      "
+    >
+      <form [bitSubmit]="submit" [formGroup]="formGroup">
+        <bit-form-field>
+          <bit-label>{{ "masterPass" | i18n }}</bit-label>
+          <input
+            type="password"
+            formControlName="masterPassword"
+            bitInput
+            appAutofocus
+            name="masterPassword"
+            class="tw-font-mono"
+            required
+            appInputVerbatim
+          />
           <button
             type="button"
-            bitButton
-            bitFormButton
-            buttonType="secondary"
-            [disabled]="!biometricsAvailable"
-            block
-            (click)="activeUnlockOption = UnlockOption.Biometrics"
-          >
-            <span> {{ biometricUnlockBtnText | i18n }}</span>
-          </button>
-        </ng-container>
+            bitIconButton
+            bitSuffix
+            bitPasswordInputToggle
+            [(toggled)]="showPassword"
+          ></button>
 
-        <ng-container *ngIf="unlockOptions.pin.enabled">
-          <button
-            type="button"
-            bitButton
-            bitFormButton
-            buttonType="secondary"
-            block
-            (click)="activeUnlockOption = UnlockOption.Pin"
-          >
-            {{ "unlockWithPin" | i18n }}
-          </button>
-        </ng-container>
+          <!-- [attr.aria-pressed]="showPassword" -->
+        </bit-form-field>
 
-        <button type="button" bitButton bitFormButton block (click)="logOut()">
-          {{ "logOut" | i18n }}
-        </button>
-      </div>
-    </form>
-  </ng-container>
+        <div class="tw-flex tw-flex-col tw-space-y-3">
+          <button type="submit" bitButton bitFormButton buttonType="primary" block>
+            {{ "unlock" | i18n }}
+          </button>
+
+          <p class="tw-text-center">{{ "or" | i18n }}</p>
+
+          <ng-container *ngIf="showBiometrics">
+            <button
+              type="button"
+              bitButton
+              bitFormButton
+              buttonType="secondary"
+              [disabled]="!biometricsAvailable"
+              block
+              (click)="activeUnlockOption = UnlockOption.Biometrics"
+            >
+              <span> {{ biometricUnlockBtnText | i18n }}</span>
+            </button>
+          </ng-container>
+
+          <ng-container *ngIf="unlockOptions.pin.enabled">
+            <button
+              type="button"
+              bitButton
+              bitFormButton
+              buttonType="secondary"
+              block
+              (click)="activeUnlockOption = UnlockOption.Pin"
+            >
+              {{ "unlockWithPin" | i18n }}
+            </button>
+          </ng-container>
+
+          <button type="button" bitButton bitFormButton block (click)="logOut()">
+            {{ "logOut" | i18n }}
+          </button>
+        </div>
+      </form>
+    </ng-container>
+  }
 </ng-container>
diff --git a/libs/key-management-ui/src/lock/components/lock.component.spec.ts b/libs/key-management-ui/src/lock/components/lock.component.spec.ts
index 8c8429d3788..b51d4c13490 100644
--- a/libs/key-management-ui/src/lock/components/lock.component.spec.ts
+++ b/libs/key-management-ui/src/lock/components/lock.component.spec.ts
@@ -25,6 +25,7 @@ import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -49,7 +50,6 @@ import {
   BiometricsStatus,
   BiometricStateService,
   KeyService,
-  PBKDF2KdfConfig,
   UserAsymmetricKeysRegenerationService,
 } from "@bitwarden/key-management";
 
@@ -91,9 +91,10 @@ describe("LockComponent", () => {
   const mockLockComponentService = mock<LockComponentService>();
   const mockAnonLayoutWrapperDataService = mock<AnonLayoutWrapperDataService>();
   const mockBroadcasterService = mock<BroadcasterService>();
+  const mockConfigService = mock<ConfigService>();
 
   beforeEach(async () => {
-    jest.clearAllMocks();
+    jest.resetAllMocks();
 
     // Setup default mock returns
     mockPlatformUtilsService.getClientType.mockReturnValue(ClientType.Web);
@@ -148,6 +149,7 @@ describe("LockComponent", () => {
         { provide: LockComponentService, useValue: mockLockComponentService },
         { provide: AnonLayoutWrapperDataService, useValue: mockAnonLayoutWrapperDataService },
         { provide: BroadcasterService, useValue: mockBroadcasterService },
+        { provide: ConfigService, useValue: mockConfigService },
       ],
     })
       .overrideProvider(DialogService, { useValue: mockDialogService })
@@ -358,11 +360,139 @@ describe("LockComponent", () => {
     });
   });
 
+  describe("successfulMasterPasswordUnlock", () => {
+    const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+    const masterPassword = "test-password";
+
+    beforeEach(async () => {
+      component.activeAccount = await firstValueFrom(mockAccountService.activeAccount$);
+    });
+
+    it.each([
+      [undefined as unknown as UserKey, undefined as unknown as string],
+      [null as unknown as UserKey, null as unknown as string],
+      [mockUserKey, undefined as unknown as string],
+      [mockUserKey, null as unknown as string],
+      [mockUserKey, ""],
+      [undefined as unknown as UserKey, masterPassword],
+      [null as unknown as UserKey, masterPassword],
+    ])(
+      "logs an error and doesn't unlock when called with invalid data",
+      async (userKey, masterPassword) => {
+        await component.successfulMasterPasswordUnlock({ userKey, masterPassword });
+
+        expect(mockLogService.error).toHaveBeenCalledWith(
+          "[LockComponent] successfulMasterPasswordUnlock called with invalid data.",
+        );
+        expect(mockKeyService.setUserKey).not.toHaveBeenCalled();
+      },
+    );
+
+    it.each([
+      [false, undefined, false],
+      [false, { enforceOnLogin: false } as MasterPasswordPolicyOptions, false],
+      [false, { enforceOnLogin: false } as MasterPasswordPolicyOptions, true],
+      [true, { enforceOnLogin: true } as MasterPasswordPolicyOptions, false],
+      [false, { enforceOnLogin: true } as MasterPasswordPolicyOptions, true],
+    ])(
+      "unlocks and force set password change = %o when master password on login = %o and evaluated password against policy = %o and policy loaded from policy service",
+      async (forceSetPassword, masterPasswordPolicyOptions, evaluatedMasterPassword) => {
+        mockPolicyService.masterPasswordPolicyOptions$.mockReturnValue(
+          of(masterPasswordPolicyOptions),
+        );
+        const passwordStrengthResult = { score: 1 } as ZXCVBNResult;
+        mockPasswordStrengthService.getPasswordStrength.mockReturnValue(passwordStrengthResult);
+        mockPolicyService.evaluateMasterPassword.mockReturnValue(evaluatedMasterPassword);
+
+        await component.successfulMasterPasswordUnlock({ userKey: mockUserKey, masterPassword });
+
+        assertUnlocked();
+        expect(mockPolicyService.masterPasswordPolicyOptions$).toHaveBeenCalledWith(userId);
+        if (masterPasswordPolicyOptions?.enforceOnLogin) {
+          expect(mockPasswordStrengthService.getPasswordStrength).toHaveBeenCalledWith(
+            masterPassword,
+            component.activeAccount!.email,
+          );
+          expect(mockPolicyService.evaluateMasterPassword).toHaveBeenCalledWith(
+            passwordStrengthResult.score,
+            masterPassword,
+            masterPasswordPolicyOptions,
+          );
+        }
+        if (forceSetPassword) {
+          expect(mockMasterPasswordService.setForceSetPasswordReason).toHaveBeenCalledWith(
+            ForceSetPasswordReason.WeakMasterPassword,
+            userId,
+          );
+        } else {
+          expect(mockMasterPasswordService.setForceSetPasswordReason).not.toHaveBeenCalled();
+        }
+      },
+    );
+
+    it.each([
+      [true, ClientType.Browser],
+      [false, ClientType.Cli],
+      [false, ClientType.Desktop],
+      [false, ClientType.Web],
+    ])(
+      "unlocks and navigate by url to previous url = %o when client type = %o and previous url was set",
+      async (shouldNavigate, clientType) => {
+        const previousUrl = "/test-url";
+        component.clientType = clientType;
+        mockLockComponentService.getPreviousUrl.mockReturnValue(previousUrl);
+
+        await component.successfulMasterPasswordUnlock({ userKey: mockUserKey, masterPassword });
+
+        assertUnlocked();
+        if (shouldNavigate) {
+          expect(mockRouter.navigateByUrl).toHaveBeenCalledWith(previousUrl);
+        } else {
+          expect(mockRouter.navigateByUrl).not.toHaveBeenCalled();
+        }
+      },
+    );
+
+    it.each([
+      ["/tabs/current", ClientType.Browser],
+      [undefined, ClientType.Cli],
+      ["vault", ClientType.Desktop],
+      ["vault", ClientType.Web],
+    ])(
+      "unlocks and navigate to success url = %o when client type = %o",
+      async (navigateUrl, clientType) => {
+        component.clientType = clientType;
+        mockLockComponentService.getPreviousUrl.mockReturnValue(null);
+
+        await component.successfulMasterPasswordUnlock({ userKey: mockUserKey, masterPassword });
+
+        assertUnlocked();
+        expect(mockRouter.navigate).toHaveBeenCalledWith([navigateUrl]);
+      },
+    );
+
+    it("unlocks and close browser extension popout on firefox extension", async () => {
+      component.shouldClosePopout = true;
+      mockPlatformUtilsService.getDevice.mockReturnValue(DeviceType.FirefoxExtension);
+
+      await component.successfulMasterPasswordUnlock({ userKey: mockUserKey, masterPassword });
+
+      assertUnlocked();
+      expect(mockLockComponentService.closeBrowserExtensionPopout).toHaveBeenCalled();
+    });
+
+    function assertUnlocked(): void {
+      expect(mockKeyService.setUserKey).toHaveBeenCalledWith(
+        mockUserKey,
+        component.activeAccount!.id,
+      );
+    }
+  });
+
   describe("unlockViaMasterPassword", () => {
     const mockMasterKey = new SymmetricCryptoKey(new Uint8Array(64)) as MasterKey;
     const masterPasswordVerificationResponse: MasterPasswordVerificationResponse = {
       masterKey: mockMasterKey,
-      kdfConfig: new PBKDF2KdfConfig(600_001),
       email: "test-email@example.com",
       policyOptions: null,
     };
diff --git a/libs/key-management-ui/src/lock/components/lock.component.ts b/libs/key-management-ui/src/lock/components/lock.component.ts
index c7aa8969660..801a9d191f5 100644
--- a/libs/key-management-ui/src/lock/components/lock.component.ts
+++ b/libs/key-management-ui/src/lock/components/lock.component.ts
@@ -29,10 +29,12 @@ import {
   MasterPasswordVerificationResponse,
 } from "@bitwarden/common/auth/types/verification";
 import { ClientType, DeviceType } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -64,6 +66,8 @@ import {
   UnlockOptionValue,
 } from "../services/lock-component.service";
 
+import { MasterPasswordLockComponent } from "./master-password-lock/master-password-lock.component";
+
 const BroadcasterSubscriptionId = "LockComponent";
 
 const clientTypeToSuccessRouteRecord: Partial<Record<ClientType, string>> = {
@@ -72,10 +76,18 @@ const clientTypeToSuccessRouteRecord: Partial<Record<ClientType, string>> = {
   [ClientType.Browser]: "/tabs/current",
 };
 
+type AfterUnlockActions = {
+  passwordEvaluation?: {
+    masterPassword: string;
+  };
+};
+
 /// The minimum amount of time to wait after a process reload for a biometrics auto prompt to be possible
 /// Fixes safari autoprompt behavior
 const AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY = 5000;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-lock",
   templateUrl: "lock.component.html",
@@ -87,12 +99,17 @@ const AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY = 5000;
     FormFieldModule,
     AsyncActionsModule,
     IconButtonModule,
+    MasterPasswordLockComponent,
   ],
 })
 export class LockComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
   protected loading = true;
 
+  protected unlockWithMasterPasswordUnlockDataFlag$ = this.configService.getFeatureFlag$(
+    FeatureFlag.UnlockWithMasterPasswordUnlockData,
+  );
+
   activeAccount: Account | null = null;
 
   clientType?: ClientType;
@@ -160,6 +177,7 @@ export class LockComponent implements OnInit, OnDestroy {
     private logoutService: LogoutService,
     private lockComponentService: LockComponentService,
     private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
+    private configService: ConfigService,
     // desktop deps
     private broadcasterService: BroadcasterService,
   ) {}
@@ -379,7 +397,7 @@ export class LockComponent implements OnInit, OnDestroy {
 
       // If user cancels biometric prompt, userKey is undefined.
       if (userKey) {
-        await this.setUserKeyAndContinue(userKey, false);
+        await this.setUserKeyAndContinue(userKey);
       }
 
       this.unlockingViaBiometrics = false;
@@ -423,6 +441,7 @@ export class LockComponent implements OnInit, OnDestroy {
     }
   }
 
+  //TODO PM-25385 This code isn't used and should be removed when removing the UnlockWithMasterPasswordUnlockData feature flag.
   togglePassword() {
     this.showPassword = !this.showPassword;
     const input = document.getElementById(
@@ -498,6 +517,7 @@ export class LockComponent implements OnInit, OnDestroy {
     }
   }
 
+  // TODO PM-25385 remove when removing the UnlockWithMasterPasswordUnlockData feature flag.
   private validateMasterPassword(): boolean {
     if (this.formGroup?.invalid) {
       this.toastService.showToast({
@@ -511,6 +531,7 @@ export class LockComponent implements OnInit, OnDestroy {
     return true;
   }
 
+  // TODO PM-25385 remove when removing the UnlockWithMasterPasswordUnlockData feature flag.
   async unlockViaMasterPassword() {
     if (!this.validateMasterPassword() || this.formGroup == null || this.activeAccount == null) {
       return;
@@ -568,10 +589,33 @@ export class LockComponent implements OnInit, OnDestroy {
       return;
     }
 
-    await this.setUserKeyAndContinue(userKey, true);
+    await this.setUserKeyAndContinue(userKey, {
+      passwordEvaluation: { masterPassword },
+    });
   }
 
-  private async setUserKeyAndContinue(key: UserKey, evaluatePasswordAfterUnlock = false) {
+  async successfulMasterPasswordUnlock(event: {
+    userKey: UserKey;
+    masterPassword: string;
+  }): Promise<void> {
+    if (event.userKey == null || !event.masterPassword) {
+      this.logService.error(
+        "[LockComponent] successfulMasterPasswordUnlock called with invalid data.",
+      );
+      return;
+    }
+
+    await this.setUserKeyAndContinue(event.userKey, {
+      passwordEvaluation: {
+        masterPassword: event.masterPassword,
+      },
+    });
+  }
+
+  protected async setUserKeyAndContinue(
+    key: UserKey,
+    afterUnlockActions: AfterUnlockActions = {},
+  ): Promise<void> {
     if (this.activeAccount == null) {
       throw new Error("No active user.");
     }
@@ -580,15 +624,16 @@ export class LockComponent implements OnInit, OnDestroy {
     this.logService.mark("Vault unlocked");
 
     await this.keyService.setUserKey(key, this.activeAccount.id);
+    await this.pinService.userUnlocked(this.activeAccount.id);
 
     // Now that we have a decrypted user key in memory, we can check if we
     // need to establish trust on the current device
     await this.deviceTrustService.trustDeviceIfRequired(this.activeAccount.id);
 
-    await this.doContinue(evaluatePasswordAfterUnlock);
+    await this.doContinue(afterUnlockActions);
   }
 
-  private async doContinue(evaluatePasswordAfterUnlock: boolean) {
+  private async doContinue(afterUnlockActions: AfterUnlockActions) {
     if (this.activeAccount == null) {
       throw new Error("No active user.");
     }
@@ -596,7 +641,7 @@ export class LockComponent implements OnInit, OnDestroy {
     await this.biometricStateService.resetUserPromptCancelled();
     this.messagingService.send("unlocked");
 
-    if (evaluatePasswordAfterUnlock) {
+    if (afterUnlockActions.passwordEvaluation) {
       const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
       if (userId == null) {
         throw new Error("No active user.");
@@ -613,7 +658,7 @@ export class LockComponent implements OnInit, OnDestroy {
           );
         }
 
-        if (this.requirePasswordChange()) {
+        if (this.requirePasswordChange(afterUnlockActions.passwordEvaluation.masterPassword)) {
           await this.masterPasswordService.setForceSetPasswordReason(
             ForceSetPasswordReason.WeakMasterPassword,
             userId,
@@ -669,18 +714,15 @@ export class LockComponent implements OnInit, OnDestroy {
    * Checks if the master password meets the enforced policy requirements
    * If not, returns false
    */
-  private requirePasswordChange(): boolean {
+  private requirePasswordChange(masterPassword: string): boolean {
     if (
       this.enforcedMasterPasswordOptions == undefined ||
       !this.enforcedMasterPasswordOptions.enforceOnLogin ||
-      this.formGroup == null ||
       this.activeAccount == null
     ) {
       return false;
     }
 
-    const masterPassword = this.formGroup.controls.masterPassword.value;
-
     const passwordStrength = this.passwordStrengthService.getPasswordStrength(
       masterPassword,
       this.activeAccount.email,
diff --git a/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.html b/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.html
new file mode 100644
index 00000000000..185fb0666c4
--- /dev/null
+++ b/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.html
@@ -0,0 +1,55 @@
+<form [formGroup]="formGroup" [bitSubmit]="submit">
+  <bit-form-field>
+    <bit-label>{{ "masterPass" | i18n }}</bit-label>
+    <input
+      type="password"
+      formControlName="masterPassword"
+      bitInput
+      appAutofocus
+      name="masterPassword"
+      class="tw-font-mono"
+      required
+      appInputVerbatim
+    />
+    <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
+  </bit-form-field>
+
+  <div class="tw-flex tw-flex-col tw-space-y-3">
+    <button type="submit" bitButton bitFormButton buttonType="primary" block>
+      {{ "unlock" | i18n }}
+    </button>
+
+    <p class="tw-text-center">{{ "or" | i18n }}</p>
+
+    @if (showBiometricsSwap()) {
+      <button
+        type="button"
+        bitButton
+        bitFormButton
+        buttonType="secondary"
+        [disabled]="!biometricsAvailable()"
+        block
+        (click)="activeUnlockOption.set(UnlockOption.Biometrics)"
+      >
+        <span> {{ biometricUnlockBtnText() | i18n }}</span>
+      </button>
+    }
+
+    @if (showPinSwap()) {
+      <button
+        type="button"
+        bitButton
+        bitFormButton
+        buttonType="secondary"
+        block
+        (click)="activeUnlockOption.set(UnlockOption.Pin)"
+      >
+        {{ "unlockWithPin" | i18n }}
+      </button>
+    }
+
+    <button type="button" bitButton bitFormButton block (click)="logOut.emit()">
+      {{ "logOut" | i18n }}
+    </button>
+  </div>
+</form>
diff --git a/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.spec.ts b/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.spec.ts
new file mode 100644
index 00000000000..d40cc98df11
--- /dev/null
+++ b/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.spec.ts
@@ -0,0 +1,472 @@
+import { DebugElement } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { FormBuilder, ReactiveFormsModule } from "@angular/forms";
+import { By } from "@angular/platform-browser";
+import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { MasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/abstractions/master-password-unlock.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserKey } from "@bitwarden/common/types/key";
+import {
+  AsyncActionsModule,
+  ButtonModule,
+  FormFieldModule,
+  IconButtonModule,
+  ToastService,
+} from "@bitwarden/components";
+import { BiometricsStatus } from "@bitwarden/key-management";
+import { UserId } from "@bitwarden/user-core";
+
+import { UnlockOption, UnlockOptions } from "../../services/lock-component.service";
+
+import { MasterPasswordLockComponent } from "./master-password-lock.component";
+
+describe("MasterPasswordLockComponent", () => {
+  let component: MasterPasswordLockComponent;
+  let fixture: ComponentFixture<MasterPasswordLockComponent>;
+
+  const accountService = mock<AccountService>();
+  const masterPasswordUnlockService = mock<MasterPasswordUnlockService>();
+  const i18nService = mock<I18nService>();
+  const toastService = mock<ToastService>();
+  const logService = mock<LogService>();
+
+  const mockMasterPassword = "testExample";
+  const activeAccount: Account = {
+    id: "user-id" as UserId,
+    email: "user@example.com",
+    emailVerified: true,
+    name: "User",
+  };
+  const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+
+  const setupComponent = (
+    unlockOptions: Partial<UnlockOptions> = {},
+    biometricUnlockBtnText: string = "default",
+    account: Account | null = activeAccount,
+  ) => {
+    const defaultOptions: UnlockOptions = {
+      masterPassword: { enabled: true },
+      pin: { enabled: false },
+      biometrics: {
+        enabled: false,
+        biometricsStatus: BiometricsStatus.NotEnabledLocally,
+      },
+    };
+
+    accountService.activeAccount$ = of(account);
+    fixture.componentRef.setInput("unlockOptions", { ...defaultOptions, ...unlockOptions });
+    fixture.componentRef.setInput("biometricUnlockBtnText", biometricUnlockBtnText);
+    fixture.detectChanges();
+
+    return {
+      form: fixture.debugElement.query(By.css("form")),
+      component,
+      ...getFormElements(fixture.debugElement.query(By.css("form"))),
+    };
+  };
+
+  const getFormElements = (form: DebugElement) => ({
+    masterPasswordInput: form.query(By.css('input[formControlName="masterPassword"]')),
+    toggleButton: form.query(By.css("button[bitPasswordInputToggle]")),
+    submitButton: form.query(By.css('button[type="submit"]')),
+    logoutButton: form.query(By.css('button[type="button"]:not([bitPasswordInputToggle])')),
+    secondaryButton: form.query(By.css('button[buttonType="secondary"]')),
+  });
+
+  beforeEach(async () => {
+    jest.clearAllMocks();
+
+    i18nService.t.mockImplementation((key: string) => key);
+
+    await TestBed.configureTestingModule({
+      imports: [
+        MasterPasswordLockComponent,
+        JslibModule,
+        ReactiveFormsModule,
+        ButtonModule,
+        FormFieldModule,
+        AsyncActionsModule,
+        IconButtonModule,
+      ],
+      providers: [
+        FormBuilder,
+        { provide: AccountService, useValue: accountService },
+        { provide: MasterPasswordUnlockService, useValue: masterPasswordUnlockService },
+        { provide: I18nService, useValue: i18nService },
+        { provide: ToastService, useValue: toastService },
+        { provide: LogService, useValue: logService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(MasterPasswordLockComponent);
+    component = fixture.componentInstance;
+  });
+
+  describe("form rendering", () => {
+    let elements: ReturnType<typeof setupComponent>;
+
+    beforeEach(() => {
+      elements = setupComponent();
+    });
+
+    it("creates form with proper structure", () => {
+      expect(component.formGroup).toBeDefined();
+      expect(component.formGroup.controls.masterPassword).toBeDefined();
+    });
+
+    const formElementTests = [
+      {
+        name: "master password input",
+        selector: "masterPasswordInput",
+        expectations: (el: HTMLInputElement) => {
+          expect(el).toMatchObject({
+            type: "password",
+            name: "masterPassword",
+            required: true,
+          });
+          expect(el.attributes).toHaveProperty("bitInput");
+        },
+      },
+      {
+        name: "password toggle button",
+        selector: "toggleButton",
+        expectations: (el: HTMLButtonElement) => {
+          expect(el.type).toBe("button");
+          expect(el.attributes).toHaveProperty("bitIconButton");
+        },
+      },
+      {
+        name: "unlock submit button",
+        selector: "submitButton",
+        expectations: (el: HTMLButtonElement) => {
+          expect(el).toMatchObject({
+            type: "submit",
+            textContent: expect.stringContaining("unlock"),
+          });
+          expect(el.attributes).toHaveProperty("bitButton");
+        },
+      },
+      {
+        name: "logout button",
+        selector: "logoutButton",
+        expectations: (el: HTMLButtonElement) => {
+          expect(el).toMatchObject({
+            type: "button",
+            textContent: expect.stringContaining("logOut"),
+          });
+          expect(el.attributes).toHaveProperty("bitButton");
+        },
+      },
+    ];
+
+    test.each(formElementTests)("renders $name correctly", ({ selector, expectations }) => {
+      const element = elements[selector as keyof typeof elements] as DebugElement;
+      expect(element).toBeTruthy();
+      expectations(element.nativeElement);
+    });
+
+    const hiddenButtonTests = [
+      {
+        case: "biometrics swap button when biometrics is undefined",
+        setup: () =>
+          setupComponent(
+            {
+              pin: { enabled: false },
+              biometrics: {
+                enabled: undefined as unknown as boolean,
+                biometricsStatus: BiometricsStatus.PlatformUnsupported,
+              },
+            },
+            "swapBiometrics",
+          ),
+        expectHidden: true,
+      },
+      {
+        case: "biometrics swap button when biometrics is disabled",
+        setup: () => setupComponent({}, "swapBiometrics"),
+        expectHidden: true,
+      },
+      {
+        case: "PIN swap button when PIN is disabled",
+        setup: () => setupComponent({}),
+        expectHidden: true,
+      },
+      {
+        case: "PIN swap button when PIN is undefined",
+        setup: () =>
+          setupComponent({
+            pin: { enabled: undefined as unknown as boolean },
+            biometrics: {
+              enabled: undefined as unknown as boolean,
+              biometricsStatus: BiometricsStatus.PlatformUnsupported,
+            },
+          }),
+        expectHidden: true,
+      },
+    ];
+
+    test.each(hiddenButtonTests)("doesn't render $case", ({ setup, expectHidden }) => {
+      const { secondaryButton } = setup();
+      expect(!!secondaryButton).toBe(!expectHidden);
+    });
+  });
+
+  describe("password input", () => {
+    let setup: ReturnType<typeof setupComponent>;
+    beforeEach(() => {
+      setup = setupComponent();
+    });
+
+    it("should bind form input to masterPassword form control", async () => {
+      const input = setup.masterPasswordInput;
+      expect(input).toBeTruthy();
+      expect(input.nativeElement).toBeInstanceOf(HTMLInputElement);
+      expect(component.formGroup).toBeTruthy();
+      const masterPasswordControl = component.formGroup!.get("masterPassword");
+      expect(masterPasswordControl).toBeTruthy();
+
+      masterPasswordControl!.setValue("test-password");
+      fixture.detectChanges();
+
+      const inputElement = input.nativeElement as HTMLInputElement;
+      expect(inputElement.value).toEqual("test-password");
+    });
+
+    it("should validate required master password field", async () => {
+      const formGroup = component.formGroup;
+
+      // Initially form should be invalid (empty required field)
+      expect(formGroup?.invalid).toEqual(true);
+      expect(formGroup?.get("masterPassword")?.hasError("required")).toBe(true);
+
+      // Set a value
+      formGroup?.get("masterPassword")?.setValue("test-password");
+
+      expect(formGroup?.invalid).toEqual(false);
+      expect(formGroup?.get("masterPassword")?.hasError("required")).toBe(false);
+    });
+
+    it("should toggle password visibility when toggle button is clicked", async () => {
+      const toggleButton = setup.toggleButton;
+      expect(toggleButton).toBeTruthy();
+      expect(toggleButton.nativeElement).toBeInstanceOf(HTMLButtonElement);
+      const toggleButtonElement = toggleButton.nativeElement as HTMLButtonElement;
+      const input = setup.masterPasswordInput;
+      expect(input).toBeTruthy();
+      expect(input.nativeElement).toBeInstanceOf(HTMLInputElement);
+      const inputElement = input.nativeElement as HTMLInputElement;
+
+      // Initially password should be hidden
+      expect(inputElement.type).toEqual("password");
+
+      // Click toggle button
+      toggleButtonElement.click();
+      fixture.detectChanges();
+
+      expect(inputElement.type).toEqual("text");
+
+      // Click toggle button again
+      toggleButtonElement.click();
+      fixture.detectChanges();
+
+      expect(inputElement.type).toEqual("password");
+    });
+  });
+
+  describe("logout", () => {
+    it("emits logOut event when logout button is clicked", () => {
+      const setup = setupComponent();
+      let logoutEmitted = false;
+      component.logOut.subscribe(() => {
+        logoutEmitted = true;
+      });
+
+      expect(setup.logoutButton).toBeTruthy();
+      expect(setup.logoutButton.nativeElement).toBeInstanceOf(HTMLButtonElement);
+      const logoutButtonElement = setup.logoutButton.nativeElement as HTMLButtonElement;
+
+      // Click logout button
+      logoutButtonElement.click();
+
+      expect(logoutEmitted).toBe(true);
+    });
+  });
+
+  describe("swap buttons", () => {
+    const swapButtonScenarios = [
+      {
+        name: "PIN swap button when PIN is enabled",
+        unlockOptions: {
+          pin: { enabled: true },
+          biometrics: {
+            enabled: false,
+            biometricsStatus: BiometricsStatus.PlatformUnsupported,
+          },
+        },
+        expectedText: "unlockWithPin",
+        expectedUnlockOption: UnlockOption.Pin,
+        shouldShow: true,
+        shouldEnable: true,
+      },
+      {
+        name: "PIN swap button when PIN is disabled",
+        unlockOptions: {
+          pin: { enabled: false },
+          biometrics: {
+            enabled: false,
+            biometricsStatus: BiometricsStatus.PlatformUnsupported,
+          },
+        },
+        expectedText: "unlockWithPin",
+        expectedUnlockOption: UnlockOption.Pin,
+        shouldShow: false,
+        shouldEnable: false,
+      },
+      {
+        name: "biometrics swap button when biometrics status is available and enabled",
+        unlockOptions: {
+          pin: { enabled: false },
+          biometrics: { enabled: true, biometricsStatus: BiometricsStatus.Available },
+        },
+        expectedText: "swapBiometrics",
+        expectedUnlockOption: UnlockOption.Biometrics,
+        shouldShow: true,
+        shouldEnable: true,
+      },
+      {
+        name: "biometrics swap button when biometrics status is available and disabled",
+        unlockOptions: {
+          pin: { enabled: false },
+          biometrics: { enabled: false, biometricsStatus: BiometricsStatus.Available },
+        },
+        expectedText: "swapBiometrics",
+        expectedUnlockOption: UnlockOption.Biometrics,
+        shouldShow: true,
+        shouldEnable: false,
+      },
+      {
+        name: "biometrics swap button when biometrics biometrics status is unsupported and enabled",
+        unlockOptions: {
+          pin: { enabled: false },
+          biometrics: { enabled: true, biometricsStatus: BiometricsStatus.PlatformUnsupported },
+        },
+        expectedText: "swapBiometrics",
+        expectedUnlockOption: UnlockOption.Biometrics,
+        shouldShow: false,
+        shouldEnable: false,
+      },
+      {
+        name: "biometrics swap button when biometrics status is unsupported and disabled",
+        unlockOptions: {
+          pin: { enabled: false },
+          biometrics: { enabled: false, biometricsStatus: BiometricsStatus.PlatformUnsupported },
+        },
+        expectedText: "swapBiometrics",
+        expectedUnlockOption: UnlockOption.Biometrics,
+        shouldShow: false,
+        shouldEnable: false,
+      },
+    ];
+
+    test.each(swapButtonScenarios)(
+      "renders and handles $name",
+      ({ unlockOptions, expectedText, expectedUnlockOption, shouldShow, shouldEnable }) => {
+        const { secondaryButton, component } = setupComponent(unlockOptions, expectedText);
+
+        if (shouldShow) {
+          expect(secondaryButton).toBeTruthy();
+          expect(secondaryButton.nativeElement.textContent?.trim()).toBe(expectedText);
+
+          if (shouldEnable) {
+            secondaryButton.nativeElement.click();
+            expect(component.activeUnlockOption()).toBe(expectedUnlockOption);
+          } else {
+            expect(secondaryButton.nativeElement.getAttribute("aria-disabled")).toBe("true");
+          }
+        } else {
+          expect(secondaryButton).toBeFalsy();
+        }
+      },
+    );
+  });
+
+  describe("submit", () => {
+    test.each([null, undefined as unknown as string, ""])(
+      "won't unlock and show password invalid toast when master password is %s",
+      async (value) => {
+        component.formGroup.controls.masterPassword.setValue(value);
+
+        await component.submit();
+
+        expect(toastService.showToast).toHaveBeenCalledWith({
+          variant: "error",
+          title: i18nService.t("errorOccurred"),
+          message: i18nService.t("masterPasswordRequired"),
+        });
+        expect(masterPasswordUnlockService.unlockWithMasterPassword).not.toHaveBeenCalled();
+      },
+    );
+
+    test.each([null as unknown as Account, undefined as unknown as Account])(
+      "throws error when active account is %s",
+      async (value) => {
+        accountService.activeAccount$ = of(value);
+        component.formGroup.controls.masterPassword.setValue(mockMasterPassword);
+
+        await expect(component.submit()).rejects.toThrow("Null or undefined account");
+
+        expect(masterPasswordUnlockService.unlockWithMasterPassword).not.toHaveBeenCalled();
+      },
+    );
+
+    it("shows an error toast and logs the error when unlock with master password fails", async () => {
+      const customError = new Error("Specialized error message");
+      masterPasswordUnlockService.unlockWithMasterPassword.mockRejectedValue(customError);
+      accountService.activeAccount$ = of(activeAccount);
+      component.formGroup.controls.masterPassword.setValue(mockMasterPassword);
+
+      await component.submit();
+
+      expect(masterPasswordUnlockService.unlockWithMasterPassword).toHaveBeenCalledWith(
+        mockMasterPassword,
+        activeAccount.id,
+      );
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        title: i18nService.t("errorOccurred"),
+        message: i18nService.t("invalidMasterPassword"),
+      });
+      expect(logService.error).toHaveBeenCalledWith(
+        "[MasterPasswordLockComponent] Failed to unlock via master password",
+        customError,
+      );
+    });
+
+    it("emits userKey when unlock is successful", async () => {
+      masterPasswordUnlockService.unlockWithMasterPassword.mockResolvedValue(mockUserKey);
+      accountService.activeAccount$ = of(activeAccount);
+      component.formGroup.controls.masterPassword.setValue(mockMasterPassword);
+      let emittedEvent: { userKey: UserKey; masterPassword: string } | undefined;
+      component.successfulUnlock.subscribe(
+        (event: { userKey: UserKey; masterPassword: string }) => {
+          emittedEvent = event;
+        },
+      );
+
+      await component.submit();
+
+      expect(emittedEvent?.userKey).toEqual(mockUserKey);
+      expect(emittedEvent?.masterPassword).toEqual(mockMasterPassword);
+      expect(masterPasswordUnlockService.unlockWithMasterPassword).toHaveBeenCalledWith(
+        mockMasterPassword,
+        activeAccount.id,
+      );
+    });
+  });
+});
diff --git a/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.ts b/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.ts
new file mode 100644
index 00000000000..ff1e7f53e5f
--- /dev/null
+++ b/libs/key-management-ui/src/lock/components/master-password-lock/master-password-lock.component.ts
@@ -0,0 +1,113 @@
+import { Component, computed, inject, input, model, output } from "@angular/core";
+import { FormControl, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";
+import { firstValueFrom } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { MasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/abstractions/master-password-unlock.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UserKey } from "@bitwarden/common/types/key";
+import {
+  AsyncActionsModule,
+  ButtonModule,
+  FormFieldModule,
+  IconButtonModule,
+  ToastService,
+} from "@bitwarden/components";
+import { BiometricsStatus } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
+import { UserId } from "@bitwarden/user-core";
+
+import {
+  UnlockOption,
+  UnlockOptions,
+  UnlockOptionValue,
+} from "../../services/lock-component.service";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-master-password-lock",
+  templateUrl: "master-password-lock.component.html",
+  imports: [
+    JslibModule,
+    ReactiveFormsModule,
+    ButtonModule,
+    FormFieldModule,
+    AsyncActionsModule,
+    IconButtonModule,
+  ],
+})
+export class MasterPasswordLockComponent {
+  private readonly accountService = inject(AccountService);
+  private readonly masterPasswordUnlockService = inject(MasterPasswordUnlockService);
+  private readonly i18nService = inject(I18nService);
+  private readonly toastService = inject(ToastService);
+  private readonly logService = inject(LogService);
+  UnlockOption = UnlockOption;
+
+  readonly activeUnlockOption = model.required<UnlockOptionValue>();
+
+  readonly unlockOptions = input.required<UnlockOptions>();
+  readonly biometricUnlockBtnText = input.required<string>();
+  readonly showPinSwap = computed(() => this.unlockOptions().pin.enabled ?? false);
+  readonly biometricsAvailable = computed(() => this.unlockOptions().biometrics.enabled ?? false);
+  readonly showBiometricsSwap = computed(() => {
+    const status = this.unlockOptions().biometrics.biometricsStatus;
+    return (
+      status !== BiometricsStatus.PlatformUnsupported &&
+      status !== BiometricsStatus.NotEnabledLocally
+    );
+  });
+
+  successfulUnlock = output<{ userKey: UserKey; masterPassword: string }>();
+  logOut = output<void>();
+
+  formGroup = new FormGroup({
+    masterPassword: new FormControl("", {
+      validators: [Validators.required],
+      updateOn: "submit",
+    }),
+  });
+
+  submit = async () => {
+    this.formGroup.markAllAsTouched();
+    const masterPassword = this.formGroup.controls.masterPassword.value;
+    if (this.formGroup.invalid || !masterPassword) {
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccurred"),
+        message: this.i18nService.t("masterPasswordRequired"),
+      });
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+
+    await this.unlockViaMasterPassword(masterPassword, activeUserId);
+  };
+
+  private async unlockViaMasterPassword(
+    masterPassword: string,
+    activeUserId: UserId,
+  ): Promise<void> {
+    try {
+      const userKey = await this.masterPasswordUnlockService.unlockWithMasterPassword(
+        masterPassword,
+        activeUserId,
+      );
+      this.successfulUnlock.emit({ userKey, masterPassword });
+    } catch (error) {
+      this.logService.error(
+        "[MasterPasswordLockComponent] Failed to unlock via master password",
+        error,
+      );
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccurred"),
+        message: this.i18nService.t("invalidMasterPassword"),
+      });
+    }
+  }
+}
diff --git a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.html b/libs/key-management-ui/src/session-timeout/components/session-timeout-input.component.html
similarity index 100%
rename from libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.html
rename to libs/key-management-ui/src/session-timeout/components/session-timeout-input.component.html
diff --git a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.spec.ts b/libs/key-management-ui/src/session-timeout/components/session-timeout-input.component.spec.ts
similarity index 89%
rename from libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.spec.ts
rename to libs/key-management-ui/src/session-timeout/components/session-timeout-input.component.spec.ts
index 05bb97dde26..ca9b1230beb 100644
--- a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.spec.ts
+++ b/libs/key-management-ui/src/session-timeout/components/session-timeout-input.component.spec.ts
@@ -12,11 +12,11 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { mockAccountServiceWith } from "@bitwarden/common/spec";
 import { UserId } from "@bitwarden/common/types/guid";
 
-import { VaultTimeoutInputComponent } from "./vault-timeout-input.component";
+import { SessionTimeoutInputComponent } from "./session-timeout-input.component";
 
-describe("VaultTimeoutInputComponent", () => {
-  let component: VaultTimeoutInputComponent;
-  let fixture: ComponentFixture<VaultTimeoutInputComponent>;
+describe("SessionTimeoutInputComponent", () => {
+  let component: SessionTimeoutInputComponent;
+  let fixture: ComponentFixture<SessionTimeoutInputComponent>;
   const policiesByType$ = jest.fn().mockReturnValue(new BehaviorSubject({}));
   const availableVaultTimeoutActions$ = jest.fn().mockReturnValue(new BehaviorSubject([]));
   const mockUserId = Utils.newGuid() as UserId;
@@ -24,7 +24,7 @@ describe("VaultTimeoutInputComponent", () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [VaultTimeoutInputComponent],
+      imports: [SessionTimeoutInputComponent],
       providers: [
         { provide: PolicyService, useValue: { policiesByType$ } },
         { provide: AccountService, useValue: accountService },
@@ -33,7 +33,7 @@ describe("VaultTimeoutInputComponent", () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(VaultTimeoutInputComponent);
+    fixture = TestBed.createComponent(SessionTimeoutInputComponent);
     component = fixture.componentInstance;
     component.vaultTimeoutOptions = [
       { name: "oneMinute", value: 1 },
diff --git a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts b/libs/key-management-ui/src/session-timeout/components/session-timeout-input.component.ts
similarity index 86%
rename from libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts
rename to libs/key-management-ui/src/session-timeout/components/session-timeout-input.component.ts
index b5d87c60882..e9a5722ff4e 100644
--- a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts
+++ b/libs/key-management-ui/src/session-timeout/components/session-timeout-input.component.ts
@@ -30,8 +30,6 @@ import {
   VaultTimeoutSettingsService,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-// 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 { FormFieldModule, SelectModule } from "@bitwarden/components";
 
 type VaultTimeoutForm = FormGroup<{
@@ -44,35 +42,69 @@ type VaultTimeoutForm = FormGroup<{
 
 type VaultTimeoutFormValue = VaultTimeoutForm["value"];
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
-  selector: "auth-vault-timeout-input",
-  templateUrl: "vault-timeout-input.component.html",
+  selector: "bit-session-timeout-input",
+  templateUrl: "session-timeout-input.component.html",
   imports: [CommonModule, JslibModule, ReactiveFormsModule, FormFieldModule, SelectModule],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
       multi: true,
-      useExisting: VaultTimeoutInputComponent,
+      useExisting: SessionTimeoutInputComponent,
     },
     {
       provide: NG_VALIDATORS,
       multi: true,
-      useExisting: VaultTimeoutInputComponent,
+      useExisting: SessionTimeoutInputComponent,
     },
   ],
 })
-export class VaultTimeoutInputComponent
+export class SessionTimeoutInputComponent
   implements ControlValueAccessor, Validator, OnInit, OnDestroy, OnChanges
 {
+  static CUSTOM_VALUE = -100;
+  static MIN_CUSTOM_MINUTES = 0;
+  form: VaultTimeoutForm = this.formBuilder.group({
+    vaultTimeout: [null],
+    custom: this.formBuilder.group({
+      hours: [null],
+      minutes: [null],
+    }),
+  });
+
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() vaultTimeoutOptions: VaultTimeoutOption[];
+
+  vaultTimeoutPolicy: Policy;
+  vaultTimeoutPolicyHours: number;
+  vaultTimeoutPolicyMinutes: number;
+
   protected readonly VaultTimeoutAction = VaultTimeoutAction;
 
+  protected canLockVault$: Observable<boolean>;
+  private onChange: (vaultTimeout: VaultTimeout) => void;
+  private validatorChange: () => void;
+  private destroy$ = new Subject<void>();
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private policyService: PolicyService,
+    private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
+    private i18nService: I18nService,
+    private accountService: AccountService,
+  ) {}
+
   get showCustom() {
-    return this.form.get("vaultTimeout").value === VaultTimeoutInputComponent.CUSTOM_VALUE;
+    return this.form.get("vaultTimeout").value === SessionTimeoutInputComponent.CUSTOM_VALUE;
   }
 
   get exceedsMinimumTimeout(): boolean {
     return (
-      !this.showCustom || this.customTimeInMinutes() > VaultTimeoutInputComponent.MIN_CUSTOM_MINUTES
+      !this.showCustom ||
+      this.customTimeInMinutes() > SessionTimeoutInputComponent.MIN_CUSTOM_MINUTES
     );
   }
 
@@ -99,37 +131,6 @@ export class VaultTimeoutInputComponent
     });
   }
 
-  static CUSTOM_VALUE = -100;
-  static MIN_CUSTOM_MINUTES = 0;
-
-  form: VaultTimeoutForm = this.formBuilder.group({
-    vaultTimeout: [null],
-    custom: this.formBuilder.group({
-      hours: [null],
-      minutes: [null],
-    }),
-  });
-
-  @Input() vaultTimeoutOptions: VaultTimeoutOption[];
-
-  vaultTimeoutPolicy: Policy;
-  vaultTimeoutPolicyHours: number;
-  vaultTimeoutPolicyMinutes: number;
-
-  protected canLockVault$: Observable<boolean>;
-
-  private onChange: (vaultTimeout: VaultTimeout) => void;
-  private validatorChange: () => void;
-  private destroy$ = new Subject<void>();
-
-  constructor(
-    private formBuilder: FormBuilder,
-    private policyService: PolicyService,
-    private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
-    private i18nService: I18nService,
-    private accountService: AccountService,
-  ) {}
-
   async ngOnInit() {
     this.accountService.activeAccount$
       .pipe(
@@ -159,7 +160,7 @@ export class VaultTimeoutInputComponent
     // ex: user picks 5 min, goes to custom, we want to show 0 hr, 5 min in the custom fields
     this.form.controls.vaultTimeout.valueChanges
       .pipe(
-        filter((value) => value !== VaultTimeoutInputComponent.CUSTOM_VALUE),
+        filter((value) => value !== SessionTimeoutInputComponent.CUSTOM_VALUE),
         takeUntil(this.destroy$),
       )
       .subscribe((value) => {
@@ -191,17 +192,17 @@ export class VaultTimeoutInputComponent
 
   ngOnChanges() {
     if (
-      !this.vaultTimeoutOptions.find((p) => p.value === VaultTimeoutInputComponent.CUSTOM_VALUE)
+      !this.vaultTimeoutOptions.find((p) => p.value === SessionTimeoutInputComponent.CUSTOM_VALUE)
     ) {
       this.vaultTimeoutOptions.push({
         name: this.i18nService.t("custom"),
-        value: VaultTimeoutInputComponent.CUSTOM_VALUE,
+        value: SessionTimeoutInputComponent.CUSTOM_VALUE,
       });
     }
   }
 
   getVaultTimeout(value: VaultTimeoutFormValue) {
-    if (value.vaultTimeout !== VaultTimeoutInputComponent.CUSTOM_VALUE) {
+    if (value.vaultTimeout !== SessionTimeoutInputComponent.CUSTOM_VALUE) {
       return value.vaultTimeout;
     }
 
@@ -215,7 +216,7 @@ export class VaultTimeoutInputComponent
 
     if (this.vaultTimeoutOptions.every((p) => p.value !== value)) {
       this.form.setValue({
-        vaultTimeout: VaultTimeoutInputComponent.CUSTOM_VALUE,
+        vaultTimeout: SessionTimeoutInputComponent.CUSTOM_VALUE,
         custom: {
           hours: Math.floor(value / 60),
           minutes: value % 60,
@@ -267,7 +268,7 @@ export class VaultTimeoutInputComponent
 
     this.vaultTimeoutOptions = this.vaultTimeoutOptions.filter((vaultTimeoutOption) => {
       // Always include the custom option
-      if (vaultTimeoutOption.value === VaultTimeoutInputComponent.CUSTOM_VALUE) {
+      if (vaultTimeoutOption.value === SessionTimeoutInputComponent.CUSTOM_VALUE) {
         return true;
       }
 
diff --git a/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.html b/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.html
new file mode 100644
index 00000000000..4d607ce5d7b
--- /dev/null
+++ b/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.html
@@ -0,0 +1,31 @@
+<div [formGroup]="formGroup">
+  <bit-session-timeout-input
+    [vaultTimeoutOptions]="availableTimeoutOptions$ | async"
+    [formControl]="formGroup.controls.timeout"
+    ngDefaultControl
+  >
+  </bit-session-timeout-input>
+
+  <bit-form-field [disableMargin]="true">
+    <bit-label>{{ "sessionTimeoutSettingsAction" | i18n }}</bit-label>
+    <bit-select
+      id="timeoutAction"
+      [formControl]="formGroup.controls.timeoutAction"
+      [required]="false"
+    >
+      @for (action of availableTimeoutActions(); track action) {
+        <bit-option [value]="action" [label]="action | i18n"></bit-option>
+      }
+    </bit-select>
+
+    @if (!canLock) {
+      <bit-hint>{{ "unlockMethodNeededToChangeTimeoutActionDesc" | i18n }}<br /></bit-hint>
+    }
+  </bit-form-field>
+
+  @if (hasVaultTimeoutPolicy$ | async) {
+    <bit-hint class="tw-mt-4">
+      {{ "vaultTimeoutPolicyAffectingOptions" | i18n }}
+    </bit-hint>
+  }
+</div>
diff --git a/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.spec.ts b/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.spec.ts
new file mode 100644
index 00000000000..4c3f41d738c
--- /dev/null
+++ b/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.spec.ts
@@ -0,0 +1,522 @@
+import { ComponentFixture, fakeAsync, flush, TestBed, waitForAsync } from "@angular/core/testing";
+import { ReactiveFormsModule } from "@angular/forms";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { mock, MockProxy } from "jest-mock-extended";
+import { BehaviorSubject, filter, firstValueFrom, of } from "rxjs";
+
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import {
+  MaximumVaultTimeoutPolicyData,
+  VaultTimeout,
+  VaultTimeoutAction,
+  VaultTimeoutOption,
+  VaultTimeoutSettingsService,
+  VaultTimeoutStringType,
+} from "@bitwarden/common/key-management/vault-timeout";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
+import { DialogService, ToastService } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+
+import { SessionTimeoutInputComponent } from "../components/session-timeout-input.component";
+import { SessionTimeoutSettingsComponentService } from "../services/session-timeout-settings-component.service";
+
+import { SessionTimeoutSettingsComponent } from "./session-timeout-settings.component";
+
+describe("SessionTimeoutSettingsComponent", () => {
+  let component: SessionTimeoutSettingsComponent;
+  let fixture: ComponentFixture<SessionTimeoutSettingsComponent>;
+
+  // Mock services
+  let mockVaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
+  let mockSessionTimeoutSettingsComponentService: MockProxy<SessionTimeoutSettingsComponentService>;
+  let mockI18nService: MockProxy<I18nService>;
+  let mockToastService: MockProxy<ToastService>;
+  let mockPolicyService: MockProxy<PolicyService>;
+  let accountService: FakeAccountService;
+  let mockDialogService: MockProxy<DialogService>;
+  let mockLogService: MockProxy<LogService>;
+
+  const mockUserId = "user-id" as UserId;
+  const mockEmail = "test@example.com";
+  const mockInitialTimeout = 5;
+  const mockInitialTimeoutAction = VaultTimeoutAction.Lock;
+  let refreshTimeoutActionSettings$: BehaviorSubject<void>;
+  let availableTimeoutOptions$: BehaviorSubject<VaultTimeoutOption[]>;
+
+  beforeEach(async () => {
+    refreshTimeoutActionSettings$ = new BehaviorSubject<void>(undefined);
+    availableTimeoutOptions$ = new BehaviorSubject<VaultTimeoutOption[]>([
+      { name: "oneMinute-used-i18n", value: 1 },
+      { name: "fiveMinutes-used-i18n", value: 5 },
+      { name: "onRestart-used-i18n", value: VaultTimeoutStringType.OnRestart },
+      { name: "onLocked-used-i18n", value: VaultTimeoutStringType.OnLocked },
+      { name: "onSleep-used-i18n", value: VaultTimeoutStringType.OnSleep },
+      { name: "onIdle-used-i18n", value: VaultTimeoutStringType.OnIdle },
+      { name: "never-used-i18n", value: VaultTimeoutStringType.Never },
+    ]);
+
+    mockVaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
+    mockSessionTimeoutSettingsComponentService = mock<SessionTimeoutSettingsComponentService>();
+    mockI18nService = mock<I18nService>();
+    mockToastService = mock<ToastService>();
+    mockPolicyService = mock<PolicyService>();
+    accountService = mockAccountServiceWith(mockUserId, { email: mockEmail });
+    mockDialogService = mock<DialogService>();
+    mockLogService = mock<LogService>();
+
+    mockI18nService.t.mockImplementation((key) => `${key}-used-i18n`);
+
+    mockVaultTimeoutSettingsService.getVaultTimeoutByUserId$.mockImplementation(() =>
+      of(mockInitialTimeout),
+    );
+    mockVaultTimeoutSettingsService.getVaultTimeoutActionByUserId$.mockImplementation(() =>
+      of(mockInitialTimeoutAction),
+    );
+    mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+      of([VaultTimeoutAction.Lock, VaultTimeoutAction.LogOut]),
+    );
+    mockSessionTimeoutSettingsComponentService.availableTimeoutOptions$ =
+      availableTimeoutOptions$.asObservable();
+    mockPolicyService.policiesByType$.mockImplementation(() => of([]));
+
+    await TestBed.configureTestingModule({
+      imports: [
+        SessionTimeoutSettingsComponent,
+        ReactiveFormsModule,
+        SessionTimeoutInputComponent,
+        NoopAnimationsModule,
+      ],
+      providers: [
+        { provide: VaultTimeoutSettingsService, useValue: mockVaultTimeoutSettingsService },
+        {
+          provide: SessionTimeoutSettingsComponentService,
+          useValue: mockSessionTimeoutSettingsComponentService,
+        },
+        { provide: I18nService, useValue: mockI18nService },
+        { provide: ToastService, useValue: mockToastService },
+        { provide: PolicyService, useValue: mockPolicyService },
+        { provide: AccountService, useValue: accountService },
+        { provide: LogService, useValue: mockLogService },
+        { provide: DialogService, useValue: mockDialogService },
+      ],
+    })
+      .overrideComponent(SessionTimeoutSettingsComponent, {
+        set: {
+          providers: [{ provide: DialogService, useValue: mockDialogService }],
+        },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(SessionTimeoutSettingsComponent);
+    component = fixture.componentInstance;
+
+    fixture.componentRef.setInput("refreshTimeoutActionSettings", refreshTimeoutActionSettings$);
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe("canLock", () => {
+    it("should return true when Lock action is available", fakeAsync(() => {
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+        of([VaultTimeoutAction.Lock, VaultTimeoutAction.LogOut]),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.canLock).toBe(true);
+    }));
+
+    it("should return false when Lock action is not available", fakeAsync(() => {
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+        of([VaultTimeoutAction.LogOut]),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.canLock).toBe(false);
+    }));
+  });
+
+  describe("ngOnInit", () => {
+    it("should initialize available timeout options", fakeAsync(async () => {
+      fixture.detectChanges();
+      flush();
+
+      const options = await firstValueFrom(
+        component["availableTimeoutOptions$"].pipe(filter((options) => options.length > 0)),
+      );
+
+      expect(options).toContainEqual({ name: "oneMinute-used-i18n", value: 1 });
+      expect(options).toContainEqual({ name: "fiveMinutes-used-i18n", value: 5 });
+      expect(options).toContainEqual({
+        name: "onIdle-used-i18n",
+        value: VaultTimeoutStringType.OnIdle,
+      });
+      expect(options).toContainEqual({
+        name: "onSleep-used-i18n",
+        value: VaultTimeoutStringType.OnSleep,
+      });
+      expect(options).toContainEqual({
+        name: "onLocked-used-i18n",
+        value: VaultTimeoutStringType.OnLocked,
+      });
+      expect(options).toContainEqual({
+        name: "onRestart-used-i18n",
+        value: VaultTimeoutStringType.OnRestart,
+      });
+      expect(options).toContainEqual({
+        name: "never-used-i18n",
+        value: VaultTimeoutStringType.Never,
+      });
+    }));
+
+    it("should initialize available timeout actions", fakeAsync(() => {
+      const expectedActions = [VaultTimeoutAction.Lock, VaultTimeoutAction.LogOut];
+
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+        of(expectedActions),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component["availableTimeoutActions"]()).toEqual(expectedActions);
+    }));
+
+    it("should initialize timeout and action", fakeAsync(() => {
+      const expectedTimeout = 15;
+      const expectedAction = VaultTimeoutAction.Lock;
+
+      mockVaultTimeoutSettingsService.getVaultTimeoutByUserId$.mockImplementation(() =>
+        of(expectedTimeout),
+      );
+      mockVaultTimeoutSettingsService.getVaultTimeoutActionByUserId$.mockImplementation(() =>
+        of(expectedAction),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.formGroup.value.timeout).toBe(expectedTimeout);
+      expect(component.formGroup.value.timeoutAction).toBe(expectedAction);
+    }));
+
+    it("should fall back to OnRestart when current option is not available", fakeAsync(() => {
+      availableTimeoutOptions$.next([
+        { name: "oneMinute-used-i18n", value: 1 },
+        { name: "fiveMinutes-used-i18n", value: 5 },
+        { name: "onRestart-used-i18n", value: VaultTimeoutStringType.OnRestart },
+      ]);
+
+      const unavailableTimeout = VaultTimeoutStringType.Never;
+
+      mockVaultTimeoutSettingsService.getVaultTimeoutByUserId$.mockImplementation(() =>
+        of(unavailableTimeout),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.formGroup.value.timeout).toBe(VaultTimeoutStringType.OnRestart);
+    }));
+
+    it("should disable timeout action control when policy enforces action", fakeAsync(() => {
+      const policyData: MaximumVaultTimeoutPolicyData = {
+        minutes: 15,
+        action: VaultTimeoutAction.LogOut,
+      };
+      mockPolicyService.policiesByType$.mockImplementation(() =>
+        of([{ id: "1", data: policyData }] as Policy[]),
+      );
+
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+        of([VaultTimeoutAction.Lock, VaultTimeoutAction.LogOut]),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.formGroup.controls.timeoutAction.disabled).toBe(true);
+    }));
+
+    it("should disable timeout action control when only one action is available", fakeAsync(() => {
+      mockPolicyService.policiesByType$.mockImplementation(() => of([]));
+
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+        of([VaultTimeoutAction.Lock]),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.formGroup.controls.timeoutAction.disabled).toBe(true);
+    }));
+
+    it("should disable timeout action control when policy enforces action and refreshed", fakeAsync(() => {
+      const policies$ = new BehaviorSubject<Policy[]>([]);
+      mockPolicyService.policiesByType$.mockReturnValue(policies$);
+
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+        of([VaultTimeoutAction.Lock, VaultTimeoutAction.LogOut]),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.formGroup.controls.timeoutAction.enabled).toBe(true);
+
+      const policyData: MaximumVaultTimeoutPolicyData = {
+        minutes: 15,
+        action: VaultTimeoutAction.LogOut,
+      };
+      policies$.next([{ id: "1", data: policyData }] as Policy[]);
+
+      refreshTimeoutActionSettings$.next(undefined);
+      flush();
+
+      expect(component.formGroup.controls.timeoutAction.disabled).toBe(true);
+    }));
+
+    it("should disable timeout action control when only one action is available and refreshed", fakeAsync(() => {
+      mockPolicyService.policiesByType$.mockImplementation(() => of([]));
+
+      const availableActions$ = new BehaviorSubject<VaultTimeoutAction[]>([
+        VaultTimeoutAction.Lock,
+        VaultTimeoutAction.LogOut,
+      ]);
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockReturnValue(
+        availableActions$,
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.formGroup.controls.timeoutAction.enabled).toBe(true);
+
+      availableActions$.next([VaultTimeoutAction.Lock]);
+
+      refreshTimeoutActionSettings$.next(undefined);
+      flush();
+
+      expect(component.formGroup.controls.timeoutAction.disabled).toBe(true);
+    }));
+
+    it("should enable timeout action control when multiple actions available and no policy and refreshed", fakeAsync(() => {
+      mockPolicyService.policiesByType$.mockImplementation(() => of([]));
+
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+        of([VaultTimeoutAction.Lock]),
+      );
+
+      fixture.detectChanges();
+      flush();
+
+      expect(component.formGroup.controls.timeoutAction.disabled).toBe(true);
+
+      mockVaultTimeoutSettingsService.availableVaultTimeoutActions$.mockImplementation(() =>
+        of([VaultTimeoutAction.Lock, VaultTimeoutAction.LogOut]),
+      );
+
+      refreshTimeoutActionSettings$.next(undefined);
+      flush();
+
+      expect(component.formGroup.controls.timeoutAction.enabled).toBe(true);
+    }));
+
+    it("should subscribe to timeout value changes", fakeAsync(() => {
+      const saveSpy = jest.spyOn(component, "saveTimeout").mockResolvedValue(undefined);
+
+      fixture.detectChanges();
+      flush();
+
+      const newTimeout = 30;
+      component.formGroup.controls.timeout.setValue(newTimeout);
+      flush();
+
+      expect(saveSpy).toHaveBeenCalledWith(mockInitialTimeout, newTimeout);
+    }));
+
+    it("should subscribe to timeout action value changes", fakeAsync(() => {
+      const saveSpy = jest.spyOn(component, "saveTimeoutAction").mockResolvedValue(undefined);
+
+      fixture.detectChanges();
+      flush();
+
+      component.formGroup.controls.timeoutAction.setValue(VaultTimeoutAction.LogOut);
+      flush();
+
+      expect(saveSpy).toHaveBeenCalledWith(VaultTimeoutAction.LogOut);
+    }));
+  });
+
+  describe("saveTimeout", () => {
+    it("should not save when form control timeout is invalid", fakeAsync(async () => {
+      fixture.detectChanges();
+      flush();
+
+      component.formGroup.controls.timeout.setValue(null);
+
+      await component.saveTimeout(mockInitialTimeout, 30);
+      flush();
+
+      expect(mockVaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalled();
+    }));
+
+    it("should set new value and show confirmation dialog when setting timeout to Never and dialog confirmed", waitForAsync(async () => {
+      mockDialogService.openSimpleDialog.mockResolvedValue(true);
+
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      const previousTimeout = component.formGroup.controls.timeout.value!;
+      const newTimeout = VaultTimeoutStringType.Never;
+
+      await component.saveTimeout(previousTimeout, newTimeout);
+
+      expect(mockDialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: { key: "warning" },
+        content: { key: "neverLockWarning" },
+        type: "warning",
+      });
+      expect(mockVaultTimeoutSettingsService.setVaultTimeoutOptions).toHaveBeenCalledWith(
+        mockUserId,
+        newTimeout,
+        mockInitialTimeoutAction,
+      );
+      expect(mockSessionTimeoutSettingsComponentService.onTimeoutSave).toHaveBeenCalledWith(
+        newTimeout,
+      );
+    }));
+
+    it("should revert to previous value when Never confirmation is declined", waitForAsync(async () => {
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      mockDialogService.openSimpleDialog.mockResolvedValue(false);
+
+      const previousTimeout = component.formGroup.controls.timeout.value!;
+      const newTimeout = VaultTimeoutStringType.Never;
+
+      await component.saveTimeout(previousTimeout, newTimeout);
+
+      expect(mockDialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: { key: "warning" },
+        content: { key: "neverLockWarning" },
+        type: "warning",
+      });
+      expect(component.formGroup.controls.timeout.value).toBe(previousTimeout);
+      expect(mockVaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalled();
+      expect(mockSessionTimeoutSettingsComponentService.onTimeoutSave).not.toHaveBeenCalled();
+    }));
+
+    it.each([
+      30,
+      VaultTimeoutStringType.OnRestart,
+      VaultTimeoutStringType.OnLocked,
+      VaultTimeoutStringType.OnSleep,
+      VaultTimeoutStringType.OnIdle,
+    ])(
+      "should set new value when setting timeout to %s",
+      fakeAsync(async (timeout: VaultTimeout) => {
+        fixture.detectChanges();
+        flush();
+
+        const previousTimeout = component.formGroup.controls.timeout.value!;
+        await component.saveTimeout(previousTimeout, timeout);
+        flush();
+
+        expect(mockDialogService.openSimpleDialog).not.toHaveBeenCalled();
+        expect(mockVaultTimeoutSettingsService.setVaultTimeoutOptions).toHaveBeenCalledWith(
+          mockUserId,
+          timeout,
+          mockInitialTimeoutAction,
+        );
+        expect(mockSessionTimeoutSettingsComponentService.onTimeoutSave).toHaveBeenCalledWith(
+          timeout,
+        );
+      }),
+    );
+  });
+
+  describe("saveTimeoutAction", () => {
+    it("should set new value and show confirmation dialog when setting action to LogOut and dialog confirmed", waitForAsync(async () => {
+      mockDialogService.openSimpleDialog.mockResolvedValue(true);
+
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      await component.saveTimeoutAction(VaultTimeoutAction.LogOut);
+
+      expect(mockDialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: { key: "vaultTimeoutLogOutConfirmationTitle" },
+        content: { key: "vaultTimeoutLogOutConfirmation" },
+        type: "warning",
+      });
+      expect(mockVaultTimeoutSettingsService.setVaultTimeoutOptions).toHaveBeenCalledWith(
+        mockUserId,
+        mockInitialTimeout,
+        VaultTimeoutAction.LogOut,
+      );
+    }));
+
+    it("should revert to Lock when LogOut confirmation is declined", waitForAsync(async () => {
+      mockDialogService.openSimpleDialog.mockResolvedValue(false);
+
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      await component.saveTimeoutAction(VaultTimeoutAction.LogOut);
+
+      expect(mockDialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: { key: "vaultTimeoutLogOutConfirmationTitle" },
+        content: { key: "vaultTimeoutLogOutConfirmation" },
+        type: "warning",
+      });
+      expect(component.formGroup.controls.timeoutAction.value).toBe(VaultTimeoutAction.Lock);
+      expect(mockVaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalled();
+    }));
+
+    it("should set timeout action to Lock value when setting timeout action to Lock", fakeAsync(async () => {
+      fixture.detectChanges();
+      flush();
+
+      component.formGroup.controls.timeoutAction.setValue(VaultTimeoutAction.LogOut, {
+        emitEvent: false,
+      });
+
+      await component.saveTimeoutAction(VaultTimeoutAction.Lock);
+      flush();
+
+      expect(mockDialogService.openSimpleDialog).not.toHaveBeenCalled();
+      expect(mockVaultTimeoutSettingsService.setVaultTimeoutOptions).toHaveBeenCalledWith(
+        mockUserId,
+        mockInitialTimeout,
+        VaultTimeoutAction.Lock,
+      );
+    }));
+
+    it("should not save and show error toast when timeout has policy error", fakeAsync(async () => {
+      fixture.detectChanges();
+      flush();
+
+      component.formGroup.controls.timeout.setErrors({ policyError: true });
+
+      await component.saveTimeoutAction(VaultTimeoutAction.Lock);
+      flush();
+
+      expect(mockToastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        message: "vaultTimeoutTooLarge-used-i18n",
+      });
+      expect(mockVaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalled();
+    }));
+  });
+});
diff --git a/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.ts b/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.ts
new file mode 100644
index 00000000000..ecdd0ee89ad
--- /dev/null
+++ b/libs/key-management-ui/src/session-timeout/components/session-timeout-settings.component.ts
@@ -0,0 +1,279 @@
+import { CommonModule } from "@angular/common";
+import { Component, DestroyRef, input, OnInit, signal } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import {
+  FormControl,
+  FormGroup,
+  FormsModule,
+  ReactiveFormsModule,
+  Validators,
+} from "@angular/forms";
+import { RouterModule } from "@angular/router";
+import {
+  BehaviorSubject,
+  combineLatest,
+  concatMap,
+  distinctUntilChanged,
+  filter,
+  firstValueFrom,
+  map,
+  Observable,
+  of,
+  pairwise,
+  startWith,
+  switchMap,
+} from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/default-policy.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import {
+  MaximumVaultTimeoutPolicyData,
+  VaultTimeout,
+  VaultTimeoutAction,
+  VaultTimeoutOption,
+  VaultTimeoutSettingsService,
+  VaultTimeoutStringType,
+} from "@bitwarden/common/key-management/vault-timeout";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import {
+  CheckboxModule,
+  DialogService,
+  FormFieldModule,
+  IconButtonModule,
+  ItemModule,
+  LinkModule,
+  SelectModule,
+  ToastService,
+  TypographyModule,
+} from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+
+import { SessionTimeoutSettingsComponentService } from "../services/session-timeout-settings-component.service";
+
+import { SessionTimeoutInputComponent } from "./session-timeout-input.component";
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
+@Component({
+  selector: "bit-session-timeout-settings",
+  templateUrl: "session-timeout-settings.component.html",
+  imports: [
+    CheckboxModule,
+    CommonModule,
+    FormFieldModule,
+    FormsModule,
+    ReactiveFormsModule,
+    IconButtonModule,
+    ItemModule,
+    JslibModule,
+    LinkModule,
+    RouterModule,
+    SelectModule,
+    TypographyModule,
+    SessionTimeoutInputComponent,
+  ],
+})
+export class SessionTimeoutSettingsComponent implements OnInit {
+  // TODO remove once https://bitwarden.atlassian.net/browse/PM-27283 is completed
+  //  This is because vaultTimeoutSettingsService.availableVaultTimeoutActions$ is not reactive, hence the change detection
+  //  needs to be manually triggered to refresh available timeout actions
+  readonly refreshTimeoutActionSettings = input<Observable<void>>(
+    new BehaviorSubject<void>(undefined),
+  );
+
+  formGroup = new FormGroup({
+    timeout: new FormControl<VaultTimeout | null>(null, [Validators.required]),
+    timeoutAction: new FormControl<VaultTimeoutAction>(VaultTimeoutAction.Lock, [
+      Validators.required,
+    ]),
+  });
+  protected readonly availableTimeoutActions = signal<VaultTimeoutAction[]>([]);
+  protected readonly availableTimeoutOptions$ =
+    this.sessionTimeoutSettingsComponentService.availableTimeoutOptions$.pipe(
+      startWith([] as VaultTimeoutOption[]),
+    );
+  protected hasVaultTimeoutPolicy$: Observable<boolean> = of(false);
+
+  private userId!: UserId;
+
+  constructor(
+    private readonly vaultTimeoutSettingsService: VaultTimeoutSettingsService,
+    private readonly sessionTimeoutSettingsComponentService: SessionTimeoutSettingsComponentService,
+    private readonly i18nService: I18nService,
+    private readonly toastService: ToastService,
+    private readonly policyService: PolicyService,
+    private readonly accountService: AccountService,
+    private readonly dialogService: DialogService,
+    private readonly logService: LogService,
+    private readonly destroyRef: DestroyRef,
+  ) {}
+
+  get canLock() {
+    return this.availableTimeoutActions().includes(VaultTimeoutAction.Lock);
+  }
+
+  async ngOnInit(): Promise<void> {
+    const availableTimeoutOptions = await firstValueFrom(
+      this.sessionTimeoutSettingsComponentService.availableTimeoutOptions$,
+    );
+
+    this.logService.debug(
+      "[SessionTimeoutSettings] Available timeout options",
+      availableTimeoutOptions,
+    );
+
+    this.userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+
+    const maximumVaultTimeoutPolicy$ = this.policyService
+      .policiesByType$(PolicyType.MaximumVaultTimeout, this.userId)
+      .pipe(getFirstPolicy);
+
+    this.hasVaultTimeoutPolicy$ = maximumVaultTimeoutPolicy$.pipe(map((policy) => policy != null));
+
+    let timeout = await firstValueFrom(
+      this.vaultTimeoutSettingsService.getVaultTimeoutByUserId$(this.userId),
+    );
+
+    // Fallback if current timeout option is not available on this platform
+    // Only applies to string-based timeout types, not numeric values
+    const hasCurrentOption = availableTimeoutOptions.some((opt) => opt.value === timeout);
+    if (!hasCurrentOption && typeof timeout !== "number") {
+      this.logService.debug(
+        "[SessionTimeoutSettings] Current timeout option not available, falling back from",
+        { timeout },
+      );
+      timeout = VaultTimeoutStringType.OnRestart;
+    }
+
+    this.formGroup.patchValue(
+      {
+        timeout: timeout,
+        timeoutAction: await firstValueFrom(
+          this.vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$(this.userId),
+        ),
+      },
+      { emitEvent: false },
+    );
+
+    this.refreshTimeoutActionSettings()
+      .pipe(
+        startWith(undefined),
+        switchMap(() =>
+          combineLatest([
+            this.vaultTimeoutSettingsService.availableVaultTimeoutActions$(this.userId),
+            this.vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$(this.userId),
+            maximumVaultTimeoutPolicy$,
+          ]),
+        ),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe(([availableActions, action, policy]) => {
+        this.availableTimeoutActions.set(availableActions);
+        this.formGroup.controls.timeoutAction.setValue(action, { emitEvent: false });
+
+        const policyData = policy?.data as MaximumVaultTimeoutPolicyData | undefined;
+
+        // Enable/disable the action control based on policy or available actions
+        if (policyData?.action != null || availableActions.length <= 1) {
+          this.formGroup.controls.timeoutAction.disable({ emitEvent: false });
+        } else {
+          this.formGroup.controls.timeoutAction.enable({ emitEvent: false });
+        }
+      });
+
+    this.formGroup.controls.timeout.valueChanges
+      .pipe(
+        startWith(timeout), // emit to init pairwise
+        filter((value) => value != null),
+        distinctUntilChanged(),
+        pairwise(),
+        concatMap(async ([previousValue, newValue]) => {
+          await this.saveTimeout(previousValue, newValue);
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe();
+
+    this.formGroup.controls.timeoutAction.valueChanges
+      .pipe(
+        filter((value) => value != null),
+        map(async (value) => {
+          await this.saveTimeoutAction(value);
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe();
+  }
+
+  async saveTimeout(previousValue: VaultTimeout, newValue: VaultTimeout) {
+    this.formGroup.controls.timeout.markAllAsTouched();
+    if (this.formGroup.controls.timeout.invalid) {
+      return;
+    }
+
+    this.logService.debug("[SessionTimeoutSettings] Saving timeout", { previousValue, newValue });
+
+    if (newValue === VaultTimeoutStringType.Never) {
+      const confirmed = await this.dialogService.openSimpleDialog({
+        title: { key: "warning" },
+        content: { key: "neverLockWarning" },
+        type: "warning",
+      });
+
+      if (!confirmed) {
+        this.formGroup.controls.timeout.setValue(previousValue, { emitEvent: false });
+        return;
+      }
+    }
+
+    const vaultTimeoutAction = await firstValueFrom(
+      this.vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$(this.userId),
+    );
+
+    await this.vaultTimeoutSettingsService.setVaultTimeoutOptions(
+      this.userId,
+      newValue,
+      vaultTimeoutAction,
+    );
+
+    this.sessionTimeoutSettingsComponentService.onTimeoutSave(newValue);
+  }
+
+  async saveTimeoutAction(value: VaultTimeoutAction) {
+    this.logService.debug("[SessionTimeoutSettings] Saving timeout action", value);
+
+    if (value === VaultTimeoutAction.LogOut) {
+      const confirmed = await this.dialogService.openSimpleDialog({
+        title: { key: "vaultTimeoutLogOutConfirmationTitle" },
+        content: { key: "vaultTimeoutLogOutConfirmation" },
+        type: "warning",
+      });
+
+      if (!confirmed) {
+        this.formGroup.controls.timeoutAction.setValue(VaultTimeoutAction.Lock, {
+          emitEvent: false,
+        });
+        return;
+      }
+    }
+
+    if (this.formGroup.controls.timeout.hasError("policyError")) {
+      this.toastService.showToast({
+        variant: "error",
+        message: this.i18nService.t("vaultTimeoutTooLarge"),
+      });
+      return;
+    }
+
+    await this.vaultTimeoutSettingsService.setVaultTimeoutOptions(
+      this.userId,
+      this.formGroup.controls.timeout.value!,
+      value,
+    );
+  }
+}
diff --git a/libs/key-management-ui/src/session-timeout/services/session-timeout-settings-component.service.ts b/libs/key-management-ui/src/session-timeout/services/session-timeout-settings-component.service.ts
new file mode 100644
index 00000000000..7b9efeac9cb
--- /dev/null
+++ b/libs/key-management-ui/src/session-timeout/services/session-timeout-settings-component.service.ts
@@ -0,0 +1,9 @@
+import { Observable } from "rxjs";
+
+import { VaultTimeout, VaultTimeoutOption } from "@bitwarden/common/key-management/vault-timeout";
+
+export abstract class SessionTimeoutSettingsComponentService {
+  abstract availableTimeoutOptions$: Observable<VaultTimeoutOption[]>;
+
+  abstract onTimeoutSave(timeout: VaultTimeout): void;
+}
diff --git a/libs/key-management-ui/src/trust/account-recovery-trust.component.ts b/libs/key-management-ui/src/trust/account-recovery-trust.component.ts
index 8eec776bbb6..a4cfe4a41c1 100644
--- a/libs/key-management-ui/src/trust/account-recovery-trust.component.ts
+++ b/libs/key-management-ui/src/trust/account-recovery-trust.component.ts
@@ -25,6 +25,8 @@ type AccountRecoveryTrustDialogData = {
   /** org public key */
   publicKey: Uint8Array;
 };
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "account-recovery-trust",
   templateUrl: "account-recovery-trust.component.html",
diff --git a/libs/key-management-ui/src/trust/emergency-access-trust.component.ts b/libs/key-management-ui/src/trust/emergency-access-trust.component.ts
index 35c6b16c873..da55475af1d 100644
--- a/libs/key-management-ui/src/trust/emergency-access-trust.component.ts
+++ b/libs/key-management-ui/src/trust/emergency-access-trust.component.ts
@@ -25,6 +25,8 @@ type EmergencyAccessTrustDialogData = {
   /** user public key */
   publicKey: Uint8Array;
 };
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "emergency-access-trust",
   templateUrl: "emergency-access-trust.component.html",
diff --git a/libs/key-management/src/abstractions/key.service.ts b/libs/key-management/src/abstractions/key.service.ts
index c6c751bf25c..f86ca922c9e 100644
--- a/libs/key-management/src/abstractions/key.service.ts
+++ b/libs/key-management/src/abstractions/key.service.ts
@@ -7,9 +7,10 @@ import {
   EncryptedString,
   EncString,
 } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { WrappedSigningKey } from "@bitwarden/common/key-management/types";
 import { KeySuffixOptions, HashPurpose } from "@bitwarden/common/platform/enums";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { OrganizationId, ProviderId, UserId } from "@bitwarden/common/types/guid";
 import {
   UserKey,
   MasterKey,
@@ -141,11 +142,10 @@ export abstract class KeyService {
   abstract makeUserKeyV1(): Promise<UserKey>;
   /**
    * Clears the user's stored version of the user key
-   * @param keySuffix The desired version of the key to clear
    * @param userId The desired user
    * @throws Error when userId is null or undefined.
    */
-  abstract clearStoredUserKey(keySuffix: KeySuffixOptions, userId: string): Promise<void>;
+  abstract clearStoredUserKey(userId: string): Promise<void>;
   /**
    * Retrieves the user's master key if it is in state, or derives it from the provided password
    * @param password The user's master password that will be used to derive a master key if one isn't found
@@ -166,16 +166,16 @@ export abstract class KeyService {
    */
   abstract makeMasterKey(password: string, email: string, kdfConfig: KdfConfig): Promise<MasterKey>;
   /**
-   * Encrypts the existing (or provided) user key with the
-   * provided master key
+   * Encrypts the provided user key with the provided master key.
    * @deprecated Interacting with the master key directly is prohibited. Use a high level function from MasterPasswordService instead.
    * @param masterKey The user's master key
    * @param userKey The user key
+   * @throws Error when userKey or masterKey is null/undefined.
    * @returns The user key and the master key protected version of it
    */
   abstract encryptUserKeyWithMasterKey(
     masterKey: MasterKey,
-    userKey?: UserKey,
+    userKey: UserKey,
   ): Promise<[UserKey, EncString]>;
   /**
    * Creates a master password hash from the user's master password. Can
@@ -220,13 +220,7 @@ export abstract class KeyService {
     providerOrgs: ProfileProviderOrganizationResponse[],
     userId: UserId,
   ): Promise<void>;
-  /**
-   * Retrieves a stream of the active users organization keys,
-   * will NOT emit any value if there is no active user.
-   *
-   * @deprecated Use {@link orgKeys$} with a required {@link UserId} instead.
-   */
-  abstract activeUserOrgKeys$: Observable<Record<OrganizationId, OrgKey>>;
+
   /**
    * Returns the organization's symmetric key
    * @deprecated Use the observable userOrgKeys$ and `map` to the desired {@link OrgKey} instead
@@ -236,8 +230,10 @@ export abstract class KeyService {
    */
   abstract getOrgKey(orgId: string): Promise<OrgKey | null>;
   /**
-   * Uses the org key to derive a new symmetric key for encrypting data
-   * @param key The organization's symmetric key
+   * Makes a fresh attachment content encryption key and returns it along with a wrapped (encrypted) version of it.
+   * @deprecated Do not use this for new code / new cryptographic designs.
+   * @param key The organization's symmetric key or the user's user key to wrap the attachment key with
+   * @returns The new attachment content encryption key and the wrapped version of it
    */
   abstract makeDataEncKey<T extends UserKey | OrgKey>(
     key: T,
@@ -245,17 +241,19 @@ export abstract class KeyService {
 
   /**
    * Stores the provider keys for a given user.
-   * @param orgs The provider orgs for which to save the keys from.
+   * @param providers The provider orgs for which to save the keys from.
    * @param userId The user id of the user for which to store the keys for.
    */
-  abstract setProviderKeys(orgs: ProfileProviderResponse[], userId: UserId): Promise<void>;
+  abstract setProviderKeys(providers: ProfileProviderResponse[], userId: UserId): Promise<void>;
+
   /**
-   *
-   * @throws Error when providerId is null or no active user
-   * @param providerId The desired provider
-   * @returns The provider's symmetric key
+   * Gets an observable of provider keys for the given user.
+   * @param userId The user to get provider keys for.
+   * @return An observable stream of the users providers keys if they are unlocked, or null if the user is not unlocked.
+   * @throws If an invalid user id is passed in.
    */
-  abstract getProviderKey(providerId: string): Promise<ProviderKey | null>;
+  abstract providerKeys$(userId: UserId): Observable<Record<ProviderId, ProviderKey> | null>;
+
   /**
    * Creates a new organization key and encrypts it with the user's public key.
    * This method can also return Provider keys for creating new Provider users.
@@ -272,6 +270,14 @@ export abstract class KeyService {
    * @param encPrivateKey An encrypted private key
    */
   abstract setPrivateKey(encPrivateKey: string, userId: UserId): Promise<void>;
+  /**
+   * Sets the user's encrypted signing key in storage
+   * In contrast to the private key, the decrypted signing key
+   * is not stored in memory outside of the SDK.
+   * @param encryptedSigningKey An encrypted signing key
+   * @param userId The user id of the user to set the signing key for
+   */
+  abstract setUserSigningKey(encryptedSigningKey: WrappedSigningKey, userId: UserId): Promise<void>;
 
   /**
    * Gets an observable stream of the given users decrypted private key, will emit null if the user
@@ -334,14 +340,6 @@ export abstract class KeyService {
    * @throws If the provided key is a null-ish value.
    */
   abstract makeKeyPair(key: SymmetricCryptoKey): Promise<[string, EncString]>;
-  /**
-   * Clears the user's pin keys from storage
-   * Note: This will remove the stored pin and as a result,
-   * disable pin protection for the user
-   * @param userId The desired user
-   * @throws Error when provided userId is null or undefined
-   */
-  abstract clearPinKeys(userId: UserId): Promise<void>;
   /**
    * @param keyMaterial The key material to derive the send key from
    * @returns A new send key
@@ -416,7 +414,13 @@ export abstract class KeyService {
    *
    * @throws If an invalid user id is passed in.
    */
-  abstract userPublicKey$(userId: UserId): Observable<UserPublicKey | null>;
+  abstract userPublicKey$(userId: UserId): Observable<Uint8Array | null>;
+
+  /**
+   * Gets a users signing keys from local state.
+   * The observable will emit null, exactly if the local state returns null.
+   */
+  abstract userSigningKey$(userId: UserId): Observable<WrappedSigningKey | null>;
 
   /**
    * Validates that a userkey is correct for a given user
diff --git a/libs/key-management/src/index.ts b/libs/key-management/src/index.ts
index d21b79540e0..fb551b92cd6 100644
--- a/libs/key-management/src/index.ts
+++ b/libs/key-management/src/index.ts
@@ -16,6 +16,7 @@ export {
   Argon2KdfConfig,
   KdfConfig,
   DEFAULT_KDF_CONFIG,
+  fromSdkKdfConfig,
 } from "./models/kdf-config";
 export { KdfConfigService } from "./abstractions/kdf-config.service";
 export { DefaultKdfConfigService } from "./kdf-config.service";
diff --git a/libs/key-management/src/key.service.spec.ts b/libs/key-management/src/key.service.spec.ts
index 52fecf26c71..a5b4eb01c7c 100644
--- a/libs/key-management/src/key.service.spec.ts
+++ b/libs/key-management/src/key.service.spec.ts
@@ -10,7 +10,7 @@ import {
   EncryptedString,
 } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
-import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
+import { UnsignedPublicKey, WrappedSigningKey } from "@bitwarden/common/key-management/types";
 import { VaultTimeoutStringType } from "@bitwarden/common/key-management/vault-timeout";
 import { VAULT_TIMEOUT } from "@bitwarden/common/key-management/vault-timeout/services/vault-timeout-settings.state";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -25,6 +25,7 @@ import {
   USER_ENCRYPTED_PRIVATE_KEY,
   USER_EVER_HAD_USER_KEY,
   USER_KEY,
+  USER_KEY_ENCRYPTED_SIGNING_KEY,
 } from "@bitwarden/common/platform/services/key-state/user-key.state";
 import { UserKeyDefinition } from "@bitwarden/common/platform/state";
 import {
@@ -38,7 +39,7 @@ import {
   FakeSingleUserState,
 } from "@bitwarden/common/spec";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { OrganizationId, ProviderId, UserId } from "@bitwarden/common/types/guid";
 import {
   UserKey,
   MasterKey,
@@ -55,7 +56,6 @@ import { KdfConfig } from "./models/kdf-config";
 describe("keyService", () => {
   let keyService: DefaultKeyService;
 
-  const pinService = mock<PinServiceAbstraction>();
   const keyGenerationService = mock<KeyGenerationService>();
   const cryptoFunctionService = mock<CryptoFunctionService>();
   const encryptService = mock<EncryptService>();
@@ -75,7 +75,6 @@ describe("keyService", () => {
     stateProvider = new FakeStateProvider(accountService);
 
     keyService = new DefaultKeyService(
-      pinService,
       masterPasswordService,
       keyGenerationService,
       cryptoFunctionService,
@@ -254,54 +253,6 @@ describe("keyService", () => {
         "No userId provided.",
       );
     });
-
-    describe("Pin Key refresh", () => {
-      const mockPinKeyEncryptedUserKey = new EncString(
-        "2.AAAw2vTUePO+CCyokcIfVw==|DTBNlJ5yVsV2Bsk3UU3H6Q==|YvFBff5gxWqM+UsFB6BKimKxhC32AtjF3IStpU1Ijwg=",
-      );
-      const mockUserKeyEncryptedPin = new EncString(
-        "2.BBBw2vTUePO+CCyokcIfVw==|DTBNlJ5yVsV2Bsk3UU3H6Q==|YvFBff5gxWqM+UsFB6BKimKxhC32AtjF3IStpU1Ijwg=",
-      );
-
-      it("sets a pinKeyEncryptedUserKeyPersistent if a userKeyEncryptedPin and pinKeyEncryptedUserKey is set", async () => {
-        pinService.createPinKeyEncryptedUserKey.mockResolvedValue(mockPinKeyEncryptedUserKey);
-        pinService.getUserKeyEncryptedPin.mockResolvedValue(mockUserKeyEncryptedPin);
-        pinService.getPinKeyEncryptedUserKeyPersistent.mockResolvedValue(
-          mockPinKeyEncryptedUserKey,
-        );
-
-        await keyService.setUserKey(mockUserKey, mockUserId);
-
-        expect(pinService.storePinKeyEncryptedUserKey).toHaveBeenCalledWith(
-          mockPinKeyEncryptedUserKey,
-          false,
-          mockUserId,
-        );
-      });
-
-      it("sets a pinKeyEncryptedUserKeyEphemeral if a userKeyEncryptedPin is set, but a pinKeyEncryptedUserKey is not set", async () => {
-        pinService.createPinKeyEncryptedUserKey.mockResolvedValue(mockPinKeyEncryptedUserKey);
-        pinService.getUserKeyEncryptedPin.mockResolvedValue(mockUserKeyEncryptedPin);
-        pinService.getPinKeyEncryptedUserKeyPersistent.mockResolvedValue(null);
-
-        await keyService.setUserKey(mockUserKey, mockUserId);
-
-        expect(pinService.storePinKeyEncryptedUserKey).toHaveBeenCalledWith(
-          mockPinKeyEncryptedUserKey,
-          true,
-          mockUserId,
-        );
-      });
-
-      it("clears the pinKeyEncryptedUserKeyPersistent and pinKeyEncryptedUserKeyEphemeral if the UserKeyEncryptedPin is not set", async () => {
-        pinService.getUserKeyEncryptedPin.mockResolvedValue(null);
-
-        await keyService.setUserKey(mockUserKey, mockUserId);
-
-        expect(pinService.clearPinKeyEncryptedUserKeyPersistent).toHaveBeenCalledWith(mockUserId);
-        expect(pinService.clearPinKeyEncryptedUserKeyEphemeral).toHaveBeenCalledWith(mockUserId);
-      });
-    });
   });
 
   describe("setUserKeys", () => {
@@ -386,36 +337,22 @@ describe("keyService", () => {
       const invalidUserIdTestCases = [
         { keySuffix: KeySuffixOptions.Auto, userId: null as unknown as UserId },
         { keySuffix: KeySuffixOptions.Auto, userId: undefined as unknown as UserId },
-        { keySuffix: KeySuffixOptions.Pin, userId: null as unknown as UserId },
-        { keySuffix: KeySuffixOptions.Pin, userId: undefined as unknown as UserId },
       ];
       test.each(invalidUserIdTestCases)(
         "throws when keySuffix is $keySuffix and userId is $userId",
         async ({ keySuffix, userId }) => {
-          await expect(keyService.clearStoredUserKey(keySuffix, userId)).rejects.toThrow(
-            "UserId is required",
-          );
+          await expect(keyService.clearStoredUserKey(userId)).rejects.toThrow("UserId is required");
         },
       );
     });
 
     describe("with Auto key suffix", () => {
       it("UserKeyAutoUnlock is cleared and pin keys are not cleared", async () => {
-        await keyService.clearStoredUserKey(KeySuffixOptions.Auto, mockUserId);
+        await keyService.clearStoredUserKey(mockUserId);
 
         expect(stateService.setUserKeyAutoUnlock).toHaveBeenCalledWith(null, {
           userId: mockUserId,
         });
-        expect(pinService.clearPinKeyEncryptedUserKeyEphemeral).not.toHaveBeenCalled();
-      });
-    });
-
-    describe("with PIN key suffix", () => {
-      it("pin keys are cleared and user key auto unlock not", async () => {
-        await keyService.clearStoredUserKey(KeySuffixOptions.Pin, mockUserId);
-
-        expect(stateService.setUserKeyAutoUnlock).not.toHaveBeenCalled();
-        expect(pinService.clearPinKeyEncryptedUserKeyEphemeral).toHaveBeenCalledWith(mockUserId);
       });
     });
   });
@@ -432,6 +369,7 @@ describe("keyService", () => {
       USER_ENCRYPTED_ORGANIZATION_KEYS,
       USER_ENCRYPTED_PROVIDER_KEYS,
       USER_ENCRYPTED_PRIVATE_KEY,
+      USER_KEY_ENCRYPTED_SIGNING_KEY,
       USER_KEY,
     ])("key removal", (key: UserKeyDefinition<unknown>) => {
       it(`clears ${key.key} for the specified user when specified`, async () => {
@@ -445,24 +383,6 @@ describe("keyService", () => {
     });
   });
 
-  describe("clearPinKeys", () => {
-    test.each([null as unknown as UserId, undefined as unknown as UserId])(
-      "throws when the provided userId is %s",
-      async (userId) => {
-        await expect(keyService.clearPinKeys(userId)).rejects.toThrow("UserId is required");
-      },
-    );
-    it("calls pin service to clear", async () => {
-      const userId = "someOtherUser" as UserId;
-
-      await keyService.clearPinKeys(userId);
-
-      expect(pinService.clearPinKeyEncryptedUserKeyPersistent).toHaveBeenCalledWith(userId);
-      expect(pinService.clearPinKeyEncryptedUserKeyEphemeral).toHaveBeenCalledWith(userId);
-      expect(pinService.clearUserKeyEncryptedPin).toHaveBeenCalledWith(userId);
-    });
-  });
-
   describe("userPrivateKey$", () => {
     let mockUserKey: UserKey;
     let mockUserPrivateKey: Uint8Array;
@@ -540,6 +460,51 @@ describe("keyService", () => {
     });
   });
 
+  describe("userSigningKey$", () => {
+    it("returns the signing key when the user has a signing key set", async () => {
+      const fakeSigningKey = "" as WrappedSigningKey;
+      const fakeSigningKeyState = stateProvider.singleUser.getFake(
+        mockUserId,
+        USER_KEY_ENCRYPTED_SIGNING_KEY,
+      );
+      fakeSigningKeyState.nextState(fakeSigningKey);
+
+      const signingKey = await firstValueFrom(keyService.userSigningKey$(mockUserId));
+
+      expect(signingKey).toEqual(fakeSigningKey);
+    });
+
+    it("returns null when the user does not have a signing key set", async () => {
+      const signingKey = await firstValueFrom(keyService.userSigningKey$(mockUserId));
+
+      expect(signingKey).toBeFalsy();
+    });
+  });
+
+  describe("setUserSigningKey", () => {
+    it("throws if the signing key is null", async () => {
+      await expect(keyService.setUserSigningKey(null as any, mockUserId)).rejects.toThrow(
+        "No user signing key provided.",
+      );
+    });
+    it("throws if the userId is null", async () => {
+      await expect(
+        keyService.setUserSigningKey("" as WrappedSigningKey, null as unknown as UserId),
+      ).rejects.toThrow("No userId provided.");
+    });
+    it("sets the signing key for the user", async () => {
+      const fakeSigningKey = "" as WrappedSigningKey;
+      const fakeSigningKeyState = stateProvider.singleUser.getFake(
+        mockUserId,
+        USER_KEY_ENCRYPTED_SIGNING_KEY,
+      );
+      fakeSigningKeyState.nextState(null);
+      await keyService.setUserSigningKey(fakeSigningKey, mockUserId);
+      expect(fakeSigningKeyState.nextMock).toHaveBeenCalledTimes(1);
+      expect(fakeSigningKeyState.nextMock).toHaveBeenCalledWith(fakeSigningKey);
+    });
+  });
+
   describe("cipherDecryptionKeys$", () => {
     function fakePrivateKeyDecryption(encryptedPrivateKey: EncString, key: SymmetricCryptoKey) {
       const output = new Uint8Array(64);
@@ -1132,12 +1097,12 @@ describe("keyService", () => {
 
       keyService.userPrivateKey$ = jest.fn().mockReturnValue(new BehaviorSubject("private key"));
       cryptoFunctionService.rsaExtractPublicKey.mockResolvedValue(
-        Utils.fromUtf8ToArray("public key"),
+        Utils.fromUtf8ToArray("public key") as UnsignedPublicKey,
       );
       const key = await firstValueFrom(keyService.userEncryptionKeyPair$(mockUserId));
       expect(key).toEqual({
         privateKey: "private key",
-        publicKey: Utils.fromUtf8ToArray("public key"),
+        publicKey: Utils.fromUtf8ToArray("public key") as UnsignedPublicKey,
       });
     });
   });
@@ -1214,7 +1179,6 @@ describe("keyService", () => {
         expect(result).toEqual(mockUserKey);
         expect(validateUserKeySpy).toHaveBeenCalledWith(mockUserKey, mockUserId);
         expect(logService.warning).toHaveBeenCalledWith("Invalid key, throwing away stored keys");
-        expect(pinService.clearPinKeyEncryptedUserKeyEphemeral).toHaveBeenCalledWith(mockUserId);
         expect(stateService.setUserKeyAutoUnlock).toHaveBeenCalledWith(null, {
           userId: mockUserId,
         });
@@ -1350,6 +1314,94 @@ describe("keyService", () => {
     });
   });
 
+  describe("providerKeys$", () => {
+    let mockUserPrivateKey: Uint8Array;
+    let mockProviderKeys: Record<ProviderId, ProviderKey>;
+
+    beforeEach(() => {
+      mockUserPrivateKey = makeStaticByteArray(64, 1);
+      mockProviderKeys = {
+        ["provider1" as ProviderId]: makeSymmetricCryptoKey<ProviderKey>(64),
+        ["provider2" as ProviderId]: makeSymmetricCryptoKey<ProviderKey>(64),
+      };
+    });
+
+    it("returns null when userPrivateKey is null", async () => {
+      jest.spyOn(keyService, "userPrivateKey$").mockReturnValue(of(null));
+
+      const result = await firstValueFrom(keyService.providerKeys$(mockUserId));
+
+      expect(result).toBeNull();
+    });
+
+    it("returns provider keys when userPrivateKey is available", async () => {
+      jest.spyOn(keyService, "userPrivateKey$").mockReturnValue(of(mockUserPrivateKey as any));
+      jest.spyOn(keyService as any, "providerKeysHelper$").mockReturnValue(of(mockProviderKeys));
+
+      const result = await firstValueFrom(keyService.providerKeys$(mockUserId));
+
+      expect(result).toEqual(mockProviderKeys);
+      expect((keyService as any).providerKeysHelper$).toHaveBeenCalledWith(
+        mockUserId,
+        mockUserPrivateKey,
+      );
+    });
+
+    it("returns null when providerKeysHelper$ returns null", async () => {
+      jest.spyOn(keyService, "userPrivateKey$").mockReturnValue(of(mockUserPrivateKey as any));
+      jest.spyOn(keyService as any, "providerKeysHelper$").mockReturnValue(of(null));
+
+      const result = await firstValueFrom(keyService.providerKeys$(mockUserId));
+
+      expect(result).toBeNull();
+    });
+  });
+
+  describe("encryptUserKeyWithMasterKey", () => {
+    const mockMasterKey = makeSymmetricCryptoKey<MasterKey>(32);
+    const mockUserKey = makeSymmetricCryptoKey<UserKey>(64);
+
+    test.each([null as unknown as MasterKey, undefined as unknown as MasterKey])(
+      "throws when the provided master key is %s",
+      async (key) => {
+        await expect(keyService.encryptUserKeyWithMasterKey(key, mockUserKey)).rejects.toThrow(
+          "masterKey is required.",
+        );
+      },
+    );
+
+    test.each([null as unknown as UserKey, undefined as unknown as UserKey])(
+      "throws when the provided userKey key is %s",
+      async (key) => {
+        await expect(keyService.encryptUserKeyWithMasterKey(mockMasterKey, key)).rejects.toThrow(
+          "userKey is required.",
+        );
+      },
+    );
+
+    it("throws with invalid master key size", async () => {
+      const invalidMasterKey = new SymmetricCryptoKey(new Uint8Array(78)) as MasterKey;
+
+      await expect(
+        keyService.encryptUserKeyWithMasterKey(invalidMasterKey, mockUserKey),
+      ).rejects.toThrow("Invalid key size.");
+    });
+
+    it("encrypts the user key with the master key", async () => {
+      const mockEncryptedUserKey = makeEncString("encryptedUserKey");
+
+      encryptService.wrapSymmetricKey.mockResolvedValue(mockEncryptedUserKey);
+      const stretchedMasterKey = new SymmetricCryptoKey(new Uint8Array(64));
+      keyGenerationService.stretchKey.mockResolvedValue(stretchedMasterKey);
+
+      const result = await keyService.encryptUserKeyWithMasterKey(mockMasterKey, mockUserKey);
+
+      expect(encryptService.wrapSymmetricKey).toHaveBeenCalledWith(mockUserKey, stretchedMasterKey);
+      expect(result[0]).toBe(mockUserKey);
+      expect(result[1]).toBe(mockEncryptedUserKey);
+    });
+  });
+
   describe("makeKeyPair", () => {
     test.each([null as unknown as SymmetricCryptoKey, undefined as unknown as SymmetricCryptoKey])(
       "throws when the provided key is %s",
diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index cdf7d594f28..f2c3c0eff7a 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -2,6 +2,7 @@ import * as bigInt from "big-integer";
 import {
   NEVER,
   Observable,
+  catchError,
   combineLatest,
   distinctUntilChanged,
   filter,
@@ -27,7 +28,7 @@ import {
   EncryptedString,
 } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
-import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
+import { WrappedSigningKey } from "@bitwarden/common/key-management/types";
 import { VaultTimeoutStringType } from "@bitwarden/common/key-management/vault-timeout";
 import { VAULT_TIMEOUT } from "@bitwarden/common/key-management/vault-timeout/services/vault-timeout-settings.state";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -44,6 +45,7 @@ import {
   USER_ENCRYPTED_PRIVATE_KEY,
   USER_EVER_HAD_USER_KEY,
   USER_KEY,
+  USER_KEY_ENCRYPTED_SIGNING_KEY,
 } from "@bitwarden/common/platform/services/key-state/user-key.state";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
@@ -67,10 +69,16 @@ import {
 import { KdfConfig } from "./models/kdf-config";
 
 export class DefaultKeyService implements KeyServiceAbstraction {
-  readonly activeUserOrgKeys$: Observable<Record<OrganizationId, OrgKey>>;
+  /**
+   * Retrieves a stream of the active users organization keys,
+   * will NOT emit any value if there is no active user.
+   *
+   * @deprecated Use {@link orgKeys$} with a required {@link UserId} instead.
+   * TODO to be removed with https://bitwarden.atlassian.net/browse/PM-23623
+   */
+  private readonly activeUserOrgKeys$: Observable<Record<OrganizationId, OrgKey>>;
 
   constructor(
-    protected pinService: PinServiceAbstraction,
     protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
     protected keyGenerationService: KeyGenerationService,
     protected cryptoFunctionService: CryptoFunctionService,
@@ -103,6 +111,13 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     await this.stateProvider.setUserState(USER_EVER_HAD_USER_KEY, true, userId);
 
     await this.storeAdditionalKeys(key, userId);
+
+    // Await the key actually being set. This ensures that any subsequent callers know the key is already in state.
+    // There were bugs related to the stateprovider observables in the past that caused issues around this.
+    const userKey = await firstValueFrom(this.userKey$(userId).pipe(filter((k) => k != null)));
+    if (userKey == null) {
+      throw new Error("Failed to set user key");
+    }
   }
 
   async setUserKeys(
@@ -152,6 +167,9 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     return this.stateProvider.getUserState$(USER_KEY, userId);
   }
 
+  /**
+   * @deprecated Use {@link userKey$} with a required {@link UserId} instead.
+   */
   async getUserKey(userId?: UserId): Promise<UserKey> {
     const userKey = await firstValueFrom(this.stateProvider.getUserState$(USER_KEY, userId));
     return userKey;
@@ -221,17 +239,12 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     await this.clearAllStoredUserKeys(userId);
   }
 
-  async clearStoredUserKey(keySuffix: KeySuffixOptions, userId: UserId): Promise<void> {
+  async clearStoredUserKey(userId: UserId): Promise<void> {
     if (userId == null) {
       throw new Error("UserId is required");
     }
 
-    if (keySuffix === KeySuffixOptions.Auto) {
-      await this.stateService.setUserKeyAutoUnlock(null, { userId: userId });
-    }
-    if (keySuffix === KeySuffixOptions.Pin) {
-      await this.pinService.clearPinKeyEncryptedUserKeyEphemeral(userId);
-    }
+    await this.stateService.setUserKeyAutoUnlock(null, { userId: userId });
   }
 
   /**
@@ -289,9 +302,15 @@ export class DefaultKeyService implements KeyServiceAbstraction {
    */
   async encryptUserKeyWithMasterKey(
     masterKey: MasterKey,
-    userKey?: UserKey,
+    userKey: UserKey,
   ): Promise<[UserKey, EncString]> {
-    userKey ||= await this.getUserKey();
+    if (masterKey == null) {
+      throw new Error("masterKey is required.");
+    }
+    if (userKey == null) {
+      throw new Error("userKey is required.");
+    }
+
     return await this.buildProtectedSymmetricKey(masterKey, userKey);
   }
 
@@ -398,8 +417,10 @@ export class DefaultKeyService implements KeyServiceAbstraction {
       throw new Error("No key provided");
     }
 
-    const newSymKey = await this.keyGenerationService.createKey(512);
-    return this.buildProtectedSymmetricKey(key, newSymKey);
+    // Content encryption key is AES256_CBC_HMAC
+    const cek = await this.keyGenerationService.createKey(512);
+    const wrappedCek = await this.encryptService.wrapSymmetricKey(cek, key);
+    return [cek, wrappedCek];
   }
 
   private async clearOrgKeys(userId: UserId): Promise<void> {
@@ -422,20 +443,16 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     });
   }
 
-  // TODO: Deprecate in favor of observable
-  async getProviderKey(providerId: ProviderId): Promise<ProviderKey | null> {
-    if (providerId == null) {
-      return null;
-    }
+  providerKeys$(userId: UserId): Observable<Record<ProviderId, ProviderKey> | null> {
+    return this.userPrivateKey$(userId).pipe(
+      switchMap((userPrivateKey) => {
+        if (userPrivateKey == null) {
+          return of(null);
+        }
 
-    const activeUserId = await firstValueFrom(this.stateProvider.activeUserId$);
-    if (activeUserId == null) {
-      throw new Error("No active user found.");
-    }
-
-    const providerKeys = await firstValueFrom(this.providerKeys$(activeUserId));
-
-    return providerKeys?.[providerId] ?? null;
+        return this.providerKeysHelper$(userId, userPrivateKey);
+      }),
+    );
   }
 
   private async clearProviderKeys(userId: UserId): Promise<void> {
@@ -505,14 +522,8 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     await this.stateProvider.setUserState(USER_ENCRYPTED_PRIVATE_KEY, null, userId);
   }
 
-  async clearPinKeys(userId: UserId): Promise<void> {
-    if (userId == null) {
-      throw new Error("UserId is required");
-    }
-
-    await this.pinService.clearPinKeyEncryptedUserKeyPersistent(userId);
-    await this.pinService.clearPinKeyEncryptedUserKeyEphemeral(userId);
-    await this.pinService.clearUserKeyEncryptedPin(userId);
+  private async clearSigningKey(userId: UserId): Promise<void> {
+    await this.stateProvider.setUserState(USER_KEY_ENCRYPTED_SIGNING_KEY, null, userId);
   }
 
   async makeSendKey(keyMaterial: CsprngArray): Promise<SymmetricCryptoKey> {
@@ -537,7 +548,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     await this.clearOrgKeys(userId);
     await this.clearProviderKeys(userId);
     await this.clearKeyPair(userId);
-    await this.clearPinKeys(userId);
+    await this.clearSigningKey(userId);
     await this.stateProvider.setUserState(USER_EVER_HAD_USER_KEY, null, userId);
   }
 
@@ -629,7 +640,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     }
 
     // Verify user key doesn't exist
-    const existingUserKey = await this.getUserKey(userId);
+    const existingUserKey = await firstValueFrom(this.userKey$(userId));
 
     if (existingUserKey != null) {
       this.logService.error("Tried to initialize account with existing user key.");
@@ -669,32 +680,6 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     } else {
       await this.stateService.setUserKeyAutoUnlock(null, { userId: userId });
     }
-
-    const storePin = await this.shouldStoreKey(KeySuffixOptions.Pin, userId);
-    if (storePin) {
-      // Decrypt userKeyEncryptedPin with user key
-      const pin = await this.encryptService.decryptString(
-        (await this.pinService.getUserKeyEncryptedPin(userId))!,
-        key,
-      );
-
-      const pinKeyEncryptedUserKey = await this.pinService.createPinKeyEncryptedUserKey(
-        pin,
-        key,
-        userId,
-      );
-      const noPreExistingPersistentKey =
-        (await this.pinService.getPinKeyEncryptedUserKeyPersistent(userId)) == null;
-
-      await this.pinService.storePinKeyEncryptedUserKey(
-        pinKeyEncryptedUserKey,
-        noPreExistingPersistentKey,
-        userId,
-      );
-    } else {
-      await this.pinService.clearPinKeyEncryptedUserKeyPersistent(userId);
-      await this.pinService.clearPinKeyEncryptedUserKeyEphemeral(userId);
-    }
   }
 
   protected async shouldStoreKey(keySuffix: KeySuffixOptions, userId: UserId) {
@@ -711,11 +696,6 @@ export class DefaultKeyService implements KeyServiceAbstraction {
         shouldStoreKey = vaultTimeout == VaultTimeoutStringType.Never;
         break;
       }
-      case KeySuffixOptions.Pin: {
-        const userKeyEncryptedPin = await this.pinService.getUserKeyEncryptedPin(userId);
-        shouldStoreKey = !!userKeyEncryptedPin;
-        break;
-      }
     }
     return shouldStoreKey;
   }
@@ -735,7 +715,6 @@ export class DefaultKeyService implements KeyServiceAbstraction {
 
   protected async clearAllStoredUserKeys(userId: UserId): Promise<void> {
     await this.stateService.setUserKeyAutoUnlock(null, { userId: userId });
-    await this.pinService.clearPinKeyEncryptedUserKeyEphemeral(userId);
   }
 
   private async hashPhrase(hash: Uint8Array, minimumEntropy = 64) {
@@ -758,6 +737,10 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     return phrase;
   }
 
+  /**
+   * @deprecated
+   * This should only be used for wrapping the user key with a master key or stretched master key.
+   */
   private async buildProtectedSymmetricKey<T extends SymmetricCryptoKey>(
     encryptionKey: SymmetricCryptoKey,
     newSymKey: SymmetricCryptoKey,
@@ -792,7 +775,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
       return null;
     }
 
-    return (await this.cryptoFunctionService.rsaExtractPublicKey(privateKey)) as UserPublicKey;
+    return await this.cryptoFunctionService.rsaExtractPublicKey(privateKey);
   }
 
   userPrivateKey$(userId: UserId): Observable<UserPrivateKey | null> {
@@ -808,7 +791,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
           return null;
         }
 
-        const publicKey = (await this.derivePublicKey(privateKey))!;
+        const publicKey = (await this.derivePublicKey(privateKey))! as UserPublicKey;
         return { privateKey, publicKey };
       }),
     );
@@ -859,18 +842,6 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     )) as UserPrivateKey;
   }
 
-  providerKeys$(userId: UserId) {
-    return this.userPrivateKey$(userId).pipe(
-      switchMap((userPrivateKey) => {
-        if (userPrivateKey == null) {
-          return of(null);
-        }
-
-        return this.providerKeysHelper$(userId, userPrivateKey);
-      }),
-    );
-  }
-
   /**
    * A helper for decrypting provider keys that requires a user id and that users decrypted private key
    * this is helpful for when you may have already grabbed the user private key and don't want to redo
@@ -905,6 +876,27 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     );
   }
 
+  async setUserSigningKey(userSigningKey: WrappedSigningKey, userId: UserId): Promise<void> {
+    if (userSigningKey == null) {
+      throw new Error("No user signing key provided.");
+    }
+    if (userId == null) {
+      throw new Error("No userId provided.");
+    }
+    await this.stateProvider.setUserState(USER_KEY_ENCRYPTED_SIGNING_KEY, userSigningKey, userId);
+  }
+
+  userSigningKey$(userId: UserId): Observable<WrappedSigningKey | null> {
+    return this.stateProvider.getUser(userId, USER_KEY_ENCRYPTED_SIGNING_KEY).state$.pipe(
+      map((encryptedSigningKey) => {
+        if (encryptedSigningKey == null) {
+          return null;
+        }
+        return encryptedSigningKey as WrappedSigningKey;
+      }),
+    );
+  }
+
   orgKeys$(userId: UserId): Observable<Record<OrganizationId, OrgKey> | null> {
     return this.cipherDecryptionKeys$(userId).pipe(map((keys) => keys?.orgKeys ?? null));
   }
@@ -957,6 +949,13 @@ export class DefaultKeyService implements KeyServiceAbstraction {
 
             return result;
           }),
+          catchError((err: unknown) => {
+            this.logService.error(
+              `Failed to get encrypted organization keys for user ${userId}`,
+              err,
+            );
+            return of({});
+          }),
         );
       }),
     );
diff --git a/libs/key-management/src/models/kdf-config.ts b/libs/key-management/src/models/kdf-config.ts
index a2ed8a22505..3296247710e 100644
--- a/libs/key-management/src/models/kdf-config.ts
+++ b/libs/key-management/src/models/kdf-config.ts
@@ -145,4 +145,18 @@ export class Argon2KdfConfig {
   }
 }
 
+export function fromSdkKdfConfig(sdkKdf: Kdf): KdfConfig {
+  if ("pBKDF2" in sdkKdf) {
+    return new PBKDF2KdfConfig(sdkKdf.pBKDF2.iterations);
+  } else if ("argon2id" in sdkKdf) {
+    return new Argon2KdfConfig(
+      sdkKdf.argon2id.iterations,
+      sdkKdf.argon2id.memory,
+      sdkKdf.argon2id.parallelism,
+    );
+  } else {
+    throw new Error("Unsupported KDF type");
+  }
+}
+
 export const DEFAULT_KDF_CONFIG = new PBKDF2KdfConfig(PBKDF2KdfConfig.ITERATIONS.defaultValue);
diff --git a/libs/node/package.json b/libs/node/package.json
index 823913c997d..6a375a2a5ad 100644
--- a/libs/node/package.json
+++ b/libs/node/package.json
@@ -13,6 +13,7 @@
   },
   "license": "GPL-3.0",
   "scripts": {
+    "test": "jest",
     "clean": "rimraf dist",
     "build": "npm run clean && tsc",
     "build:watch": "npm run clean && tsc -watch"
diff --git a/libs/node/project.json b/libs/node/project.json
new file mode 100644
index 00000000000..d7757cda2ad
--- /dev/null
+++ b/libs/node/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "@bitwarden/node",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/node/src",
+  "projectType": "library",
+  "tags": ["scope:node", "type:lib"],
+  "targets": {
+    "build": {
+      "executor": "nx:run-script",
+      "dependsOn": [],
+      "options": {
+        "script": "build"
+      }
+    },
+    "build:watch": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "build:watch"
+      }
+    },
+    "clean": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "clean"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/node/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "test"
+      }
+    }
+  }
+}
diff --git a/libs/node/src/services/node-crypto-function.service.ts b/libs/node/src/services/node-crypto-function.service.ts
index f3ac71b13e7..22cc5756f30 100644
--- a/libs/node/src/services/node-crypto-function.service.ts
+++ b/libs/node/src/services/node-crypto-function.service.ts
@@ -3,6 +3,7 @@ import * as crypto from "crypto";
 import * as forge from "node-forge";
 
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { UnsignedPublicKey } from "@bitwarden/common/key-management/types";
 import { EncryptionType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
@@ -232,7 +233,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
     return Promise.resolve(this.toUint8Buffer(decipher));
   }
 
-  rsaExtractPublicKey(privateKey: Uint8Array): Promise<Uint8Array> {
+  async rsaExtractPublicKey(privateKey: Uint8Array): Promise<UnsignedPublicKey> {
     const privateKeyByteString = Utils.fromBufferToByteString(privateKey);
     const privateKeyAsn1 = forge.asn1.fromDer(privateKeyByteString);
     const forgePrivateKey: any = forge.pki.privateKeyFromAsn1(privateKeyAsn1);
@@ -240,11 +241,11 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
     const publicKeyAsn1 = forge.pki.publicKeyToAsn1(forgePublicKey);
     const publicKeyByteString = forge.asn1.toDer(publicKeyAsn1).data;
     const publicKeyArray = Utils.fromByteStringToArray(publicKeyByteString);
-    return Promise.resolve(publicKeyArray);
+    return publicKeyArray as UnsignedPublicKey;
   }
 
-  async rsaGenerateKeyPair(length: 1024 | 2048 | 4096): Promise<[Uint8Array, Uint8Array]> {
-    return new Promise<[Uint8Array, Uint8Array]>((resolve, reject) => {
+  async rsaGenerateKeyPair(length: 1024 | 2048 | 4096): Promise<[UnsignedPublicKey, Uint8Array]> {
+    return new Promise<[UnsignedPublicKey, Uint8Array]>((resolve, reject) => {
       forge.pki.rsa.generateKeyPair(
         {
           bits: length,
@@ -266,7 +267,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
           const privateKeyByteString = forge.asn1.toDer(privateKeyPkcs8).getBytes();
           const privateKey = Utils.fromByteStringToArray(privateKeyByteString);
 
-          resolve([publicKey, privateKey]);
+          resolve([publicKey as UnsignedPublicKey, privateKey]);
         },
       );
     });
diff --git a/libs/pricing/project.json b/libs/pricing/project.json
index 7e6e154bceb..c47114f32ea 100644
--- a/libs/pricing/project.json
+++ b/libs/pricing/project.json
@@ -1,18 +1,15 @@
 {
-  "name": "pricing",
+  "name": "@bitwarden/pricing",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/pricing/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:pricing", "type:lib"],
   "targets": {
     "build": {
-      "executor": "@nx/js:tsc",
-      "outputs": ["{options.outputPath}"],
+      "executor": "nx:run-script",
+      "dependsOn": [],
       "options": {
-        "outputPath": "dist/libs/pricing",
-        "main": "libs/pricing/src/index.ts",
-        "tsConfig": "libs/pricing/tsconfig.lib.json",
-        "assets": ["libs/pricing/*.md"]
+        "script": "build"
       }
     },
     "lint": {
diff --git a/libs/pricing/src/components/cart-summary/cart-summary.component.html b/libs/pricing/src/components/cart-summary/cart-summary.component.html
index dfa3a797eb3..85695ea1395 100644
--- a/libs/pricing/src/components/cart-summary/cart-summary.component.html
+++ b/libs/pricing/src/components/cart-summary/cart-summary.component.html
@@ -4,7 +4,7 @@
 @let additionalServiceAccounts = this.secretsManager()?.additionalServiceAccounts;
 
 <div class="tw-size-full">
-  <div class="tw-flex tw-items-center tw-pb-4">
+  <div class="tw-flex tw-items-center tw-pb-2">
     <div class="tw-flex tw-items-center">
       <h2
         bitTypography="h4"
@@ -34,13 +34,13 @@
   @if (isExpanded()) {
     <div id="purchase-summary-details" class="tw-pb-2">
       <!-- Password Manager Section -->
-      <div class="tw-border-b tw-border-secondary-100 tw-pb-2">
+      <div id="password-manager" class="tw-border-b tw-border-secondary-100 tw-pb-2">
         <div class="tw-flex tw-justify-between tw-mb-1">
           <h3 bitTypography="h5" class="tw-text-muted">{{ "passwordManager" | i18n }}</h3>
         </div>
 
         <!-- Password Manager Members -->
-        <div class="tw-flex tw-justify-between">
+        <div id="password-manager-members" class="tw-flex tw-justify-between">
           <div class="tw-flex-1">
             <div bitTypography="body1" class="tw-text-muted">
               {{ passwordManager.quantity }} {{ passwordManager.name | i18n }} x
@@ -56,7 +56,7 @@
 
         <!-- Additional Storage -->
         @if (additionalStorage) {
-          <div class="tw-flex tw-justify-between">
+          <div id="additional-storage" class="tw-flex tw-justify-between">
             <div class="tw-flex-1">
               <div bitTypography="body1" class="tw-text-muted">
                 {{ additionalStorage.quantity }} {{ additionalStorage.name | i18n }} x
@@ -73,13 +73,13 @@
 
       <!-- Secrets Manager Section -->
       @if (secretsManager) {
-        <div class="tw-border-b tw-border-secondary-100 tw-py-2">
+        <div id="secrets-manager" class="tw-border-b tw-border-secondary-100 tw-py-2">
           <div class="tw-flex tw-justify-between">
             <h3 bitTypography="h5" class="tw-text-muted">{{ "secretsManager" | i18n }}</h3>
           </div>
 
           <!-- Secrets Manager Members -->
-          <div class="tw-flex tw-justify-between">
+          <div id="secrets-manager-members" class="tw-flex tw-justify-between">
             <div bitTypography="body1" class="tw-text-muted">
               {{ secretsManager.seats.quantity }} {{ secretsManager.seats.name | i18n }} x
               {{ secretsManager.seats.cost | currency: "USD" : "symbol" }}
@@ -96,7 +96,7 @@
 
           <!-- Additional Service Accounts -->
           @if (additionalServiceAccounts) {
-            <div class="tw-flex tw-justify-between">
+            <div id="additional-service-accounts" class="tw-flex tw-justify-between">
               <div bitTypography="body1" class="tw-text-muted">
                 {{ additionalServiceAccounts.quantity }}
                 {{ additionalServiceAccounts.name | i18n }} x
@@ -117,7 +117,10 @@
       }
 
       <!-- Estimated Tax -->
-      <div class="tw-flex tw-justify-between tw-border-b tw-border-secondary-100 tw-pt-2 tw-pb-0.5">
+      <div
+        id="estimated-tax-section"
+        class="tw-flex tw-justify-between tw-border-b tw-border-secondary-100 tw-pt-2 tw-pb-0.5"
+      >
         <h3 bitTypography="h5" class="tw-text-muted">{{ "estimatedTax" | i18n }}</h3>
         <div bitTypography="body1" class="tw-text-muted" data-testid="estimated-tax">
           {{ estimatedTax() | currency: "USD" : "symbol" }}
@@ -125,7 +128,7 @@
       </div>
 
       <!-- Total -->
-      <div class="tw-flex tw-justify-between tw-items-center tw-pt-2">
+      <div id="total-section" class="tw-flex tw-justify-between tw-items-center tw-pt-2">
         <h3 bitTypography="h5" class="tw-text-muted">{{ "total" | i18n }}</h3>
         <div bitTypography="body1" class="tw-text-muted" data-testid="final-total">
           {{ total() | currency: "USD" : "symbol" }} / {{ passwordManager.cadence | i18n }}
diff --git a/libs/pricing/src/components/cart-summary/cart-summary.component.spec.ts b/libs/pricing/src/components/cart-summary/cart-summary.component.spec.ts
index 9e48e7f5c20..4ec6ca1b113 100644
--- a/libs/pricing/src/components/cart-summary/cart-summary.component.spec.ts
+++ b/libs/pricing/src/components/cart-summary/cart-summary.component.spec.ts
@@ -1,6 +1,8 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { CartSummaryComponent, LineItem } from "./cart-summary.component";
 
 describe("CartSummaryComponent", () => {
@@ -9,14 +11,14 @@ describe("CartSummaryComponent", () => {
 
   const mockPasswordManager: LineItem = {
     quantity: 5,
-    name: "Password Manager",
+    name: "members",
     cost: 50,
     cadence: "month",
   };
 
   const mockAdditionalStorage: LineItem = {
     quantity: 2,
-    name: "Additional Storage",
+    name: "additionalStorageGB",
     cost: 10,
     cadence: "month",
   };
@@ -24,46 +26,26 @@ describe("CartSummaryComponent", () => {
   const mockSecretsManager = {
     seats: {
       quantity: 3,
-      name: "Secrets Manager Seats",
+      name: "secretsManagerSeats",
       cost: 30,
-      cadence: "month" as "month" | "year",
+      cadence: "month",
     },
     additionalServiceAccounts: {
       quantity: 2,
-      name: "Additional Service Accounts",
+      name: "additionalServiceAccountsV2",
       cost: 6,
-      cadence: "month" as "month" | "year",
+      cadence: "month",
     },
   };
 
   const mockEstimatedTax = 9.6;
 
-  function setupComponent(
-    options: {
-      passwordManager?: LineItem;
-      additionalStorage?: LineItem | null;
-      secretsManager?: { seats: LineItem; additionalServiceAccounts?: LineItem } | null;
-      estimatedTax?: number;
-    } = {},
-  ) {
-    const pm = options.passwordManager ?? mockPasswordManager;
-    const storage =
-      options.additionalStorage !== null
-        ? (options.additionalStorage ?? mockAdditionalStorage)
-        : undefined;
-    const sm =
-      options.secretsManager !== null ? (options.secretsManager ?? mockSecretsManager) : undefined;
-    const tax = options.estimatedTax ?? mockEstimatedTax;
-
+  function setupComponent() {
     // Set input values
-    fixture.componentRef.setInput("passwordManager", pm);
-    if (storage !== undefined) {
-      fixture.componentRef.setInput("additionalStorage", storage);
-    }
-    if (sm !== undefined) {
-      fixture.componentRef.setInput("secretsManager", sm);
-    }
-    fixture.componentRef.setInput("estimatedTax", tax);
+    fixture.componentRef.setInput("passwordManager", mockPasswordManager);
+    fixture.componentRef.setInput("additionalStorage", mockAdditionalStorage);
+    fixture.componentRef.setInput("secretsManager", mockSecretsManager);
+    fixture.componentRef.setInput("estimatedTax", mockEstimatedTax);
 
     fixture.detectChanges();
   }
@@ -71,6 +53,49 @@ describe("CartSummaryComponent", () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [CartSummaryComponent],
+      providers: [
+        {
+          provide: I18nService,
+          useValue: {
+            t: (key: string) => {
+              switch (key) {
+                case "month":
+                  return "month";
+                case "year":
+                  return "year";
+                case "members":
+                  return "Members";
+                case "additionalStorageGB":
+                  return "Additional storage GB";
+                case "additionalServiceAccountsV2":
+                  return "Additional machine accounts";
+                case "secretsManagerSeats":
+                  return "Secrets Manager seats";
+                case "passwordManager":
+                  return "Password Manager";
+                case "secretsManager":
+                  return "Secrets Manager";
+                case "additionalStorage":
+                  return "Additional Storage";
+                case "estimatedTax":
+                  return "Estimated tax";
+                case "total":
+                  return "Total";
+                case "expandPurchaseDetails":
+                  return "Expand purchase details";
+                case "collapsePurchaseDetails":
+                  return "Collapse purchase details";
+                case "familiesMembership":
+                  return "Families membership";
+                case "premiumMembership":
+                  return "Premium membership";
+                default:
+                  return key;
+              }
+            },
+          },
+        },
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(CartSummaryComponent);
@@ -116,7 +141,7 @@ describe("CartSummaryComponent", () => {
       fixture.detectChanges();
 
       // Act / Assert
-      const detailsSection = fixture.debugElement.query(By.css(".tw-mb-4.tw-pb-4.tw-text-muted"));
+      const detailsSection = fixture.debugElement.query(By.css('[id="purchase-summary-details"]'));
       expect(detailsSection).toBeFalsy();
     });
 
@@ -126,7 +151,7 @@ describe("CartSummaryComponent", () => {
       fixture.detectChanges();
 
       // Act / Assert
-      const detailsSection = fixture.debugElement.query(By.css(".tw-mb-4.tw-pb-4.tw-text-muted"));
+      const detailsSection = fixture.debugElement.query(By.css('[id="purchase-summary-details"]'));
       expect(detailsSection).toBeTruthy();
     });
   });
@@ -134,10 +159,10 @@ describe("CartSummaryComponent", () => {
   describe("Content Rendering", () => {
     it("should display correct password manager information", () => {
       // Arrange
-      const pmSection = fixture.debugElement.query(By.css(".tw-mb-3.tw-border-b"));
-      const pmHeading = pmSection.query(By.css(".tw-font-semibold"));
-      const pmLineItem = pmSection.query(By.css(".tw-flex-1 .tw-text-sm"));
-      const pmTotal = pmSection.query(By.css(".tw-text-sm:not(.tw-flex-1 *)"));
+      const pmSection = fixture.debugElement.query(By.css('[id="password-manager"]'));
+      const pmHeading = pmSection.query(By.css("h3"));
+      const pmLineItem = pmSection.query(By.css(".tw-flex-1 .tw-text-muted"));
+      const pmTotal = pmSection.query(By.css("[data-testid='password-manager-total']"));
 
       // Act/ Assert
       expect(pmSection).toBeTruthy();
@@ -150,55 +175,49 @@ describe("CartSummaryComponent", () => {
 
     it("should display correct additional storage information", () => {
       // Arrange
-      const storageItem = fixture.debugElement.query(
-        By.css(".tw-mb-3.tw-border-b .tw-flex-justify-between:nth-of-type(3)"),
-      );
-      const storageText = fixture.debugElement.query(By.css(".tw-mb-3.tw-border-b")).nativeElement
-        .textContent;
+      const storageItem = fixture.debugElement.query(By.css("[id='additional-storage']"));
+      const storageText = storageItem.nativeElement.textContent;
       // Act/Assert
 
       expect(storageItem).toBeTruthy();
-      expect(storageText).toContain("2 Additional GB");
+      expect(storageText).toContain("2 Additional storage GB");
       expect(storageText).toContain("$10.00");
       expect(storageText).toContain("$20.00");
     });
 
     it("should display correct secrets manager information", () => {
       // Arrange
-      const smSection = fixture.debugElement.queryAll(By.css(".tw-mb-3.tw-border-b"))[1];
-      const smHeading = smSection.query(By.css(".tw-font-semibold"));
-      const sectionText = smSection.nativeElement.textContent;
+      const smSection = fixture.debugElement.query(By.css('[id="secrets-manager"]'));
+      const smHeading = smSection.query(By.css("h3"));
+      const sectionText = fixture.debugElement.query(By.css('[id="secrets-manager-members"]'))
+        .nativeElement.textContent;
+      const additionalSA = fixture.debugElement.query(By.css('[id="additional-service-accounts"]'))
+        .nativeElement.textContent;
 
       // Act/ Assert
       expect(smSection).toBeTruthy();
       expect(smHeading.nativeElement.textContent.trim()).toBe("Secrets Manager");
 
       // Check seats line item
-      expect(sectionText).toContain("3 Members");
+      expect(sectionText).toContain("3 Secrets Manager seats");
       expect(sectionText).toContain("$30.00");
       expect(sectionText).toContain("$90.00"); // 3 * $30
 
       // Check additional service accounts
-      expect(sectionText).toContain("2 Additional machine accounts");
-      expect(sectionText).toContain("$6.00");
-      expect(sectionText).toContain("$12.00"); // 2 * $6
+      expect(additionalSA).toContain("2 Additional machine accounts");
+      expect(additionalSA).toContain("$6.00");
+      expect(additionalSA).toContain("$12.00"); // 2 * $6
     });
 
     it("should display correct tax and total", () => {
       // Arrange
-      const taxSection = fixture.debugElement.query(
-        By.css(".tw-flex.tw-justify-between.tw-mb-3.tw-border-b:last-of-type"),
-      );
+      const taxSection = fixture.debugElement.query(By.css('[id="estimated-tax-section"]'));
       const expectedTotal = "$381.60"; // 250 + 20 + 90 + 12 + 9.6
       const topTotal = fixture.debugElement.query(By.css("h2"));
-      const bottomTotal = fixture.debugElement.query(
-        By.css(
-          ".tw-flex.tw-justify-between.tw-items-center:last-child .tw-font-semibold:last-child",
-        ),
-      );
+      const bottomTotal = fixture.debugElement.query(By.css("[data-testid='final-total']"));
 
       // Act / Assert
-      expect(taxSection.nativeElement.textContent).toContain("Estimated Tax");
+      expect(taxSection.nativeElement.textContent).toContain("Estimated tax");
       expect(taxSection.nativeElement.textContent).toContain("$9.60");
 
       expect(topTotal.nativeElement.textContent).toContain(expectedTotal);
diff --git a/libs/pricing/src/components/cart-summary/cart-summary.component.ts b/libs/pricing/src/components/cart-summary/cart-summary.component.ts
index b21276b5038..5f1da4a1cd8 100644
--- a/libs/pricing/src/components/cart-summary/cart-summary.component.ts
+++ b/libs/pricing/src/components/cart-summary/cart-summary.component.ts
@@ -1,5 +1,6 @@
 import { CurrencyPipe } from "@angular/common";
 import { Component, computed, input, signal } from "@angular/core";
+import { toObservable } from "@angular/core/rxjs-interop";
 
 import { TypographyModule, IconButtonModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
@@ -16,6 +17,8 @@ export type LineItem = {
  * This component has no external dependencies and performs minimal logic -
  * it only displays data and allows expanding/collapsing of line items.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "billing-cart-summary",
   templateUrl: "./cart-summary.component.html",
@@ -23,13 +26,13 @@ export type LineItem = {
 })
 export class CartSummaryComponent {
   // Required inputs
-  passwordManager = input.required<LineItem>();
-  additionalStorage = input<LineItem>();
-  secretsManager = input<{ seats: LineItem; additionalServiceAccounts?: LineItem }>();
-  estimatedTax = input.required<number>();
+  readonly passwordManager = input.required<LineItem>();
+  readonly additionalStorage = input<LineItem>();
+  readonly secretsManager = input<{ seats: LineItem; additionalServiceAccounts?: LineItem }>();
+  readonly estimatedTax = input.required<number>();
 
   // UI state
-  isExpanded = signal(true);
+  readonly isExpanded = signal(true);
 
   /**
    * Calculates total for password manager line item
@@ -69,6 +72,11 @@ export class CartSummaryComponent {
    */
   readonly total = computed<number>(() => this.getTotalCost());
 
+  /**
+   * Observable of computed total value
+   */
+  readonly total$ = toObservable(this.total);
+
   /**
    * Toggles the expanded/collapsed state of the cart items
    */
diff --git a/libs/pricing/src/components/discount-badge/discount-badge.component.html b/libs/pricing/src/components/discount-badge/discount-badge.component.html
new file mode 100644
index 00000000000..e79fbabf355
--- /dev/null
+++ b/libs/pricing/src/components/discount-badge/discount-badge.component.html
@@ -0,0 +1,10 @@
+<span
+  *ngIf="hasDiscount()"
+  bitBadge
+  variant="success"
+  class="tw-w-fit"
+  role="status"
+  [attr.aria-label]="getDiscountText()"
+>
+  {{ getDiscountText() }}
+</span>
diff --git a/libs/pricing/src/components/discount-badge/discount-badge.component.mdx b/libs/pricing/src/components/discount-badge/discount-badge.component.mdx
new file mode 100644
index 00000000000..d3df2dcf0f6
--- /dev/null
+++ b/libs/pricing/src/components/discount-badge/discount-badge.component.mdx
@@ -0,0 +1,67 @@
+import { Meta, Story, Canvas } from "@storybook/addon-docs";
+import * as DiscountBadgeStories from "./discount-badge.component.stories";
+
+<Meta of={DiscountBadgeStories} />
+
+# Discount Badge
+
+A reusable UI component for displaying discount information (percentage or fixed amount) in a badge
+format.
+
+<Canvas of={DiscountBadgeStories.PercentDiscount} />
+
+## Usage
+
+The discount badge component is designed to be used in billing and subscription interfaces to
+display discount information.
+
+```ts
+import { DiscountBadgeComponent, DiscountInfo } from "@bitwarden/pricing";
+```
+
+```html
+<billing-discount-badge [discount]="discountInfo"></billing-discount-badge>
+```
+
+## API
+
+### Inputs
+
+| Input      | Type                   | Description                                                                      |
+| ---------- | ---------------------- | -------------------------------------------------------------------------------- |
+| `discount` | `DiscountInfo \| null` | **Optional.** Discount information object. If null or inactive, badge is hidden. |
+
+### DiscountInfo Interface
+
+```ts
+interface DiscountInfo {
+  /** Whether the discount is currently active */
+  active: boolean;
+  /** Percentage discount (0-100 or 0-1 scale) */
+  percentOff?: number;
+  /** Fixed amount discount in the base currency */
+  amountOff?: number;
+}
+```
+
+## Behavior
+
+- The badge is only displayed when `discount` is provided, `active` is `true`, and either
+  `percentOff` or `amountOff` is greater than 0.
+- If both `percentOff` and `amountOff` are provided, `percentOff` takes precedence.
+- Percentage values can be provided as 0-100 (e.g., `20` for 20%) or 0-1 (e.g., `0.2` for 20%).
+- Amount values are formatted as currency (USD) with 2 decimal places.
+
+## Examples
+
+### Percentage Discount
+
+<Canvas of={DiscountBadgeStories.PercentDiscount} />
+
+### Amount Discount
+
+<Canvas of={DiscountBadgeStories.AmountDiscount} />
+
+### Inactive Discount
+
+<Canvas of={DiscountBadgeStories.InactiveDiscount} />
diff --git a/libs/pricing/src/components/discount-badge/discount-badge.component.spec.ts b/libs/pricing/src/components/discount-badge/discount-badge.component.spec.ts
new file mode 100644
index 00000000000..8ccfc5e5d8b
--- /dev/null
+++ b/libs/pricing/src/components/discount-badge/discount-badge.component.spec.ts
@@ -0,0 +1,108 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { DiscountBadgeComponent } from "./discount-badge.component";
+
+describe("DiscountBadgeComponent", () => {
+  let component: DiscountBadgeComponent;
+  let fixture: ComponentFixture<DiscountBadgeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [DiscountBadgeComponent],
+      providers: [
+        {
+          provide: I18nService,
+          useValue: {
+            t: (key: string) => key,
+          },
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DiscountBadgeComponent);
+    component = fixture.componentInstance;
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe("hasDiscount", () => {
+    it("should return false when discount is null", () => {
+      fixture.componentRef.setInput("discount", null);
+      fixture.detectChanges();
+      expect(component.hasDiscount()).toBe(false);
+    });
+
+    it("should return false when discount is inactive", () => {
+      fixture.componentRef.setInput("discount", { active: false, percentOff: 20 });
+      fixture.detectChanges();
+      expect(component.hasDiscount()).toBe(false);
+    });
+
+    it("should return true when discount is active with percentOff", () => {
+      fixture.componentRef.setInput("discount", { active: true, percentOff: 20 });
+      fixture.detectChanges();
+      expect(component.hasDiscount()).toBe(true);
+    });
+
+    it("should return true when discount is active with amountOff", () => {
+      fixture.componentRef.setInput("discount", { active: true, amountOff: 10.99 });
+      fixture.detectChanges();
+      expect(component.hasDiscount()).toBe(true);
+    });
+
+    it("should return false when percentOff is 0", () => {
+      fixture.componentRef.setInput("discount", { active: true, percentOff: 0 });
+      fixture.detectChanges();
+      expect(component.hasDiscount()).toBe(false);
+    });
+
+    it("should return false when amountOff is 0", () => {
+      fixture.componentRef.setInput("discount", { active: true, amountOff: 0 });
+      fixture.detectChanges();
+      expect(component.hasDiscount()).toBe(false);
+    });
+  });
+
+  describe("getDiscountText", () => {
+    it("should return null when discount is null", () => {
+      fixture.componentRef.setInput("discount", null);
+      fixture.detectChanges();
+      expect(component.getDiscountText()).toBeNull();
+    });
+
+    it("should return percentage text when percentOff is provided", () => {
+      fixture.componentRef.setInput("discount", { active: true, percentOff: 20 });
+      fixture.detectChanges();
+      const text = component.getDiscountText();
+      expect(text).toContain("20%");
+      expect(text).toContain("discount");
+    });
+
+    it("should convert decimal percentOff to percentage", () => {
+      fixture.componentRef.setInput("discount", { active: true, percentOff: 0.15 });
+      fixture.detectChanges();
+      const text = component.getDiscountText();
+      expect(text).toContain("15%");
+    });
+
+    it("should return amount text when amountOff is provided", () => {
+      fixture.componentRef.setInput("discount", { active: true, amountOff: 10.99 });
+      fixture.detectChanges();
+      const text = component.getDiscountText();
+      expect(text).toContain("$10.99");
+      expect(text).toContain("discount");
+    });
+
+    it("should prefer percentOff over amountOff", () => {
+      fixture.componentRef.setInput("discount", { active: true, percentOff: 25, amountOff: 10.99 });
+      fixture.detectChanges();
+      const text = component.getDiscountText();
+      expect(text).toContain("25%");
+      expect(text).not.toContain("$10.99");
+    });
+  });
+});
diff --git a/libs/pricing/src/components/discount-badge/discount-badge.component.stories.ts b/libs/pricing/src/components/discount-badge/discount-badge.component.stories.ts
new file mode 100644
index 00000000000..02631a6b940
--- /dev/null
+++ b/libs/pricing/src/components/discount-badge/discount-badge.component.stories.ts
@@ -0,0 +1,123 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { BadgeModule } from "@bitwarden/components";
+
+import { DiscountBadgeComponent, DiscountInfo } from "./discount-badge.component";
+
+export default {
+  title: "Billing/Discount Badge",
+  component: DiscountBadgeComponent,
+  description: "A badge component that displays discount information (percentage or fixed amount).",
+  decorators: [
+    moduleMetadata({
+      imports: [BadgeModule],
+      providers: [
+        {
+          provide: I18nService,
+          useValue: {
+            t: (key: string) => {
+              switch (key) {
+                case "discount":
+                  return "discount";
+                default:
+                  return key;
+              }
+            },
+          },
+        },
+      ],
+    }),
+  ],
+} as Meta<DiscountBadgeComponent>;
+
+type Story = StoryObj<DiscountBadgeComponent>;
+
+export const PercentDiscount: Story = {
+  render: (args) => ({
+    props: args,
+    template: `<billing-discount-badge [discount]="discount"></billing-discount-badge>`,
+  }),
+  args: {
+    discount: {
+      active: true,
+      percentOff: 20,
+    } as DiscountInfo,
+  },
+};
+
+export const PercentDiscountDecimal: Story = {
+  render: (args) => ({
+    props: args,
+    template: `<billing-discount-badge [discount]="discount"></billing-discount-badge>`,
+  }),
+  args: {
+    discount: {
+      active: true,
+      percentOff: 0.15, // 15% in decimal format
+    } as DiscountInfo,
+  },
+};
+
+export const AmountDiscount: Story = {
+  render: (args) => ({
+    props: args,
+    template: `<billing-discount-badge [discount]="discount"></billing-discount-badge>`,
+  }),
+  args: {
+    discount: {
+      active: true,
+      amountOff: 10.99,
+    } as DiscountInfo,
+  },
+};
+
+export const LargeAmountDiscount: Story = {
+  render: (args) => ({
+    props: args,
+    template: `<billing-discount-badge [discount]="discount"></billing-discount-badge>`,
+  }),
+  args: {
+    discount: {
+      active: true,
+      amountOff: 99.99,
+    } as DiscountInfo,
+  },
+};
+
+export const InactiveDiscount: Story = {
+  render: (args) => ({
+    props: args,
+    template: `<billing-discount-badge [discount]="discount"></billing-discount-badge>`,
+  }),
+  args: {
+    discount: {
+      active: false,
+      percentOff: 20,
+    } as DiscountInfo,
+  },
+};
+
+export const NoDiscount: Story = {
+  render: (args) => ({
+    props: args,
+    template: `<billing-discount-badge [discount]="discount"></billing-discount-badge>`,
+  }),
+  args: {
+    discount: null,
+  },
+};
+
+export const PercentAndAmountPreferPercent: Story = {
+  render: (args) => ({
+    props: args,
+    template: `<billing-discount-badge [discount]="discount"></billing-discount-badge>`,
+  }),
+  args: {
+    discount: {
+      active: true,
+      percentOff: 25,
+      amountOff: 10.99,
+    } as DiscountInfo,
+  },
+};
diff --git a/libs/pricing/src/components/discount-badge/discount-badge.component.ts b/libs/pricing/src/components/discount-badge/discount-badge.component.ts
new file mode 100644
index 00000000000..6057a4573e9
--- /dev/null
+++ b/libs/pricing/src/components/discount-badge/discount-badge.component.ts
@@ -0,0 +1,70 @@
+import { CommonModule } from "@angular/common";
+import { ChangeDetectionStrategy, Component, inject, input } from "@angular/core";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { BadgeModule } from "@bitwarden/components";
+
+/**
+ * Interface for discount information that can be displayed in the discount badge.
+ * This is abstracted from the response class to avoid tight coupling.
+ */
+export interface DiscountInfo {
+  /** Whether the discount is currently active */
+  active: boolean;
+  /** Percentage discount (0-100 or 0-1 scale) */
+  percentOff?: number;
+  /** Fixed amount discount in the base currency */
+  amountOff?: number;
+}
+
+@Component({
+  selector: "billing-discount-badge",
+  templateUrl: "./discount-badge.component.html",
+  standalone: true,
+  imports: [CommonModule, BadgeModule],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class DiscountBadgeComponent {
+  readonly discount = input<DiscountInfo | null>(null);
+
+  private i18nService = inject(I18nService);
+
+  getDiscountText(): string | null {
+    const discount = this.discount();
+    if (!discount) {
+      return null;
+    }
+
+    if (discount.percentOff != null && discount.percentOff > 0) {
+      const percentValue =
+        discount.percentOff < 1 ? discount.percentOff * 100 : discount.percentOff;
+      return `${Math.round(percentValue)}% ${this.i18nService.t("discount")}`;
+    }
+
+    if (discount.amountOff != null && discount.amountOff > 0) {
+      const formattedAmount = new Intl.NumberFormat("en-US", {
+        style: "currency",
+        currency: "USD",
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      }).format(discount.amountOff);
+      return `${formattedAmount} ${this.i18nService.t("discount")}`;
+    }
+
+    return null;
+  }
+
+  hasDiscount(): boolean {
+    const discount = this.discount();
+    if (!discount) {
+      return false;
+    }
+    if (!discount.active) {
+      return false;
+    }
+    return (
+      (discount.percentOff != null && discount.percentOff > 0) ||
+      (discount.amountOff != null && discount.amountOff > 0)
+    );
+  }
+}
diff --git a/libs/pricing/src/components/pricing-card/pricing-card.component.html b/libs/pricing/src/components/pricing-card/pricing-card.component.html
index d0ac4fc519f..7d25bca5368 100644
--- a/libs/pricing/src/components/pricing-card/pricing-card.component.html
+++ b/libs/pricing/src/components/pricing-card/pricing-card.component.html
@@ -1,6 +1,4 @@
-<div
-  class="tw-box-border tw-bg-background tw-text-main tw-border tw-border-secondary-100 tw-rounded-3xl tw-p-8 tw-shadow-sm tw-size-full tw-flex tw-flex-col"
->
+<bit-card class="tw-size-full tw-flex tw-flex-col">
   <!-- Title Section with Active Badge -->
   <div class="tw-flex tw-items-center tw-justify-between tw-mb-2">
     <ng-content select="[slot=title]"></ng-content>
@@ -14,7 +12,7 @@
   </div>
 
   <!-- Tagline with consistent height (exactly 2 lines) -->
-  <div class="tw-mb-6 tw-h-12">
+  <div class="tw-mb-6 tw-h-6">
     <p bitTypography="helper" class="tw-text-muted tw-m-0 tw-leading-relaxed tw-line-clamp-2">
       {{ tagline() }}
     </p>
@@ -24,9 +22,9 @@
   @if (price(); as priceValue) {
     <div class="tw-mb-6">
       <div class="tw-flex tw-items-baseline tw-gap-1 tw-flex-wrap">
-        <span class="tw-text-3xl tw-font-bold tw-leading-none tw-m-0"
-          >${{ priceValue.amount }}</span
-        >
+        <span class="tw-text-3xl tw-font-medium tw-leading-none tw-m-0">{{
+          priceValue.amount | currency: "$"
+        }}</span>
         <span bitTypography="helper" class="tw-text-muted">
           / {{ priceValue.cadence }}
           @if (priceValue.showPerUser) {
@@ -82,4 +80,4 @@
       }
     }
   </div>
-</div>
+</bit-card>
diff --git a/libs/pricing/src/components/pricing-card/pricing-card.component.spec.ts b/libs/pricing/src/components/pricing-card/pricing-card.component.spec.ts
index ed2c28d8cb3..df60d7647f7 100644
--- a/libs/pricing/src/components/pricing-card/pricing-card.component.spec.ts
+++ b/libs/pricing/src/components/pricing-card/pricing-card.component.spec.ts
@@ -6,6 +6,8 @@ import { ButtonType, IconModule, TypographyModule } from "@bitwarden/components"
 
 import { PricingCardComponent } from "./pricing-card.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   template: `
     <billing-pricing-card
diff --git a/libs/pricing/src/components/pricing-card/pricing-card.component.ts b/libs/pricing/src/components/pricing-card/pricing-card.component.ts
index b727fb10673..f268c654331 100644
--- a/libs/pricing/src/components/pricing-card/pricing-card.component.ts
+++ b/libs/pricing/src/components/pricing-card/pricing-card.component.ts
@@ -1,3 +1,4 @@
+import { CurrencyPipe } from "@angular/common";
 import { Component, EventEmitter, input, Output } from "@angular/core";
 
 import {
@@ -5,6 +6,7 @@ import {
   BadgeVariant,
   ButtonModule,
   ButtonType,
+  CardComponent,
   IconModule,
   TypographyModule,
 } from "@bitwarden/components";
@@ -14,23 +16,31 @@ import {
  * This component has no external dependencies and performs no logic - it only displays data
  * and emits events when the button is clicked.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "billing-pricing-card",
   templateUrl: "./pricing-card.component.html",
-  imports: [BadgeModule, ButtonModule, IconModule, TypographyModule],
+  imports: [BadgeModule, ButtonModule, IconModule, TypographyModule, CurrencyPipe, CardComponent],
 })
 export class PricingCardComponent {
-  tagline = input.required<string>();
-  price = input<{ amount: number; cadence: "monthly" | "annually"; showPerUser?: boolean }>();
-  button = input<{
+  readonly tagline = input.required<string>();
+  readonly price = input<{
+    amount: number;
+    cadence: "monthly" | "annually";
+    showPerUser?: boolean;
+  }>();
+  readonly button = input<{
     type: ButtonType;
     text: string;
     disabled?: boolean;
     icon?: { type: string; position: "before" | "after" };
   }>();
-  features = input<string[]>();
-  activeBadge = input<{ text: string; variant?: BadgeVariant }>();
+  readonly features = input<string[]>();
+  readonly activeBadge = input<{ text: string; variant?: BadgeVariant }>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() buttonClick = new EventEmitter<void>();
 
   /**
diff --git a/libs/pricing/src/index.ts b/libs/pricing/src/index.ts
index d7c7772bfcb..3405044529e 100644
--- a/libs/pricing/src/index.ts
+++ b/libs/pricing/src/index.ts
@@ -1,3 +1,4 @@
 // Components
 export * from "./components/pricing-card/pricing-card.component";
 export * from "./components/cart-summary/cart-summary.component";
+export * from "./components/discount-badge/discount-badge.component";
diff --git a/libs/pricing/tsconfig.json b/libs/pricing/tsconfig.json
index 62ebbd94647..919c7bf77bf 100644
--- a/libs/pricing/tsconfig.json
+++ b/libs/pricing/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
+  "extends": "../../tsconfig.base",
+  "include": ["src"],
+  "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/shared/jest.config.js b/libs/shared/jest.config.js
index aef5598a3b4..a11a1ac3f20 100644
--- a/libs/shared/jest.config.js
+++ b/libs/shared/jest.config.js
@@ -15,6 +15,8 @@ module.exports = {
   // Also anecdotally improves performance when run locally
   maxWorkers: 3,
 
+  setupFiles: ["<rootDir>/../../libs/shared/polyfill-node-globals.ts"],
+
   transform: {
     "^.+\\.tsx?$": [
       "ts-jest",
diff --git a/libs/shared/polyfill-node-globals.ts b/libs/shared/polyfill-node-globals.ts
new file mode 100644
index 00000000000..5f021875638
--- /dev/null
+++ b/libs/shared/polyfill-node-globals.ts
@@ -0,0 +1,11 @@
+import { TextEncoder, TextDecoder } from "util";
+
+// SDK/WASM code relies on TextEncoder/TextDecoder being available globally
+// We can't use `test.environment.ts` because that breaks other tests that rely on
+// the default jest jsdom environment
+if (!(globalThis as any).TextEncoder) {
+  (globalThis as any).TextEncoder = TextEncoder;
+}
+if (!(globalThis as any).TextDecoder) {
+  (globalThis as any).TextDecoder = TextDecoder as unknown as typeof globalThis.TextDecoder;
+}
diff --git a/libs/state-internal/src/default-single-user-state.ts b/libs/state-internal/src/default-single-user-state.ts
index 1496a710537..9155a221d56 100644
--- a/libs/state-internal/src/default-single-user-state.ts
+++ b/libs/state-internal/src/default-single-user-state.ts
@@ -31,8 +31,6 @@ export class DefaultSingleUserState<T>
 
   protected override async doStorageSave(newState: T, oldState: T): Promise<void> {
     await super.doStorageSave(newState, oldState);
-    if (newState != null && oldState == null) {
-      await this.stateEventRegistrarService.registerEvents(this.keyDefinition);
-    }
+    await this.stateEventRegistrarService.registerEvents(this.keyDefinition);
   }
 }
diff --git a/libs/state/src/core/state-definitions.ts b/libs/state/src/core/state-definitions.ts
index 9968908a06f..9d404f14dd7 100644
--- a/libs/state/src/core/state-definitions.ts
+++ b/libs/state/src/core/state-definitions.ts
@@ -36,9 +36,11 @@ export const DELETE_MANAGED_USER_WARNING = new StateDefinition(
     web: "disk-local",
   },
 );
+export const AUTO_CONFIRM = new StateDefinition("autoConfirm", "disk", { web: "disk-local" });
 
 // Billing
 export const BILLING_DISK = new StateDefinition("billing", "disk");
+export const BILLING_MEMORY = new StateDefinition("billing", "memory");
 
 // Auth
 
@@ -72,6 +74,7 @@ export const TOKEN_DISK_LOCAL = new StateDefinition("tokenDiskLocal", "disk", {
   web: "disk-local",
 });
 export const TOKEN_MEMORY = new StateDefinition("token", "memory");
+export const SEND_ACCESS_DISK = new StateDefinition("sendAccess", "disk");
 export const TWO_FACTOR_MEMORY = new StateDefinition("twoFactor", "memory");
 export const USER_DECRYPTION_OPTIONS_DISK = new StateDefinition("userDecryptionOptions", "disk");
 export const ORGANIZATION_INVITE_DISK = new StateDefinition("organizationInvite", "disk");
@@ -105,14 +108,15 @@ export const NEW_WEB_LAYOUT_BANNER_DISK = new StateDefinition("newWebLayoutBanne
   web: "disk-local",
 });
 
+// DIRT
+
+export const PHISHING_DETECTION_DISK = new StateDefinition("phishingDetection", "disk");
+
 // Platform
 
 export const APPLICATION_ID_DISK = new StateDefinition("applicationId", "disk", {
   web: "disk-local",
 });
-export const BADGE_MEMORY = new StateDefinition("badge", "memory", {
-  browser: "memory-large-object",
-});
 export const BIOMETRIC_SETTINGS_DISK = new StateDefinition("biometricSettings", "disk");
 export const CLEAR_EVENT_DISK = new StateDefinition("clearEvent", "disk");
 export const CONFIG_DISK = new StateDefinition("config", "disk", {
@@ -123,6 +127,7 @@ export const CRYPTO_MEMORY = new StateDefinition("crypto", "memory");
 export const DESKTOP_SETTINGS_DISK = new StateDefinition("desktopSettings", "disk");
 export const ENVIRONMENT_DISK = new StateDefinition("environment", "disk");
 export const ENVIRONMENT_MEMORY = new StateDefinition("environment", "memory");
+export const IPC_MEMORY = new StateDefinition("interProcessCommunication", "memory");
 export const POPUP_VIEW_MEMORY = new StateDefinition("popupView", "memory", {
   browser: "memory-large-object",
 });
@@ -219,3 +224,4 @@ export const VAULT_BROWSER_INTRO_CAROUSEL = new StateDefinition(
   "vaultBrowserIntroCarousel",
   "disk",
 );
+export const VAULT_AT_RISK_PASSWORDS_MEMORY = new StateDefinition("vaultAtRiskPasswords", "memory");
diff --git a/libs/state/src/state-migrations/migrate.ts b/libs/state/src/state-migrations/migrate.ts
index 620c2d3bb19..bf4cd17adba 100644
--- a/libs/state/src/state-migrations/migrate.ts
+++ b/libs/state/src/state-migrations/migrate.ts
@@ -69,12 +69,13 @@ import { MoveBiometricAutoPromptToAccount } from "./migrations/7-move-biometric-
 import { RemoveAcBannersDismissed } from "./migrations/70-remove-ac-banner-dismissed";
 import { RemoveNewCustomizationOptionsCalloutDismissed } from "./migrations/71-remove-new-customization-options-callout-dismissed";
 import { RemoveAccountDeprovisioningBannerDismissed } from "./migrations/72-remove-account-deprovisioning-banner-dismissed";
+import { AddMasterPasswordUnlockData } from "./migrations/73-add-master-password-unlock-data";
 import { MoveStateVersionMigrator } from "./migrations/8-move-state-version";
 import { MoveBrowserSettingsToGlobal } from "./migrations/9-move-browser-settings-to-global";
 import { MinVersionMigrator } from "./migrations/min-version";
 
 export const MIN_VERSION = 3;
-export const CURRENT_VERSION = 72;
+export const CURRENT_VERSION = 73;
 export type MinVersion = typeof MIN_VERSION;
 
 export function createMigrationBuilder() {
@@ -148,7 +149,8 @@ export function createMigrationBuilder() {
     .with(MigrateIncorrectFolderKey, 68, 69)
     .with(RemoveAcBannersDismissed, 69, 70)
     .with(RemoveNewCustomizationOptionsCalloutDismissed, 70, 71)
-    .with(RemoveAccountDeprovisioningBannerDismissed, 71, CURRENT_VERSION);
+    .with(RemoveAccountDeprovisioningBannerDismissed, 71, 72)
+    .with(AddMasterPasswordUnlockData, 72, CURRENT_VERSION);
 }
 
 export async function currentVersion(
diff --git a/libs/state/src/state-migrations/migrations/73-add-master-password-unlock-data.spec.ts b/libs/state/src/state-migrations/migrations/73-add-master-password-unlock-data.spec.ts
new file mode 100644
index 00000000000..2956b1cbcd2
--- /dev/null
+++ b/libs/state/src/state-migrations/migrations/73-add-master-password-unlock-data.spec.ts
@@ -0,0 +1,167 @@
+import { runMigrator } from "../migration-helper.spec";
+
+import { AddMasterPasswordUnlockData } from "./73-add-master-password-unlock-data";
+
+describe("AddMasterPasswordUnlockData", () => {
+  const sut = new AddMasterPasswordUnlockData(72, 73);
+
+  describe("migrate", () => {
+    it("updates users that don't have master password unlock data", async () => {
+      const output = await runMigrator(sut, {
+        global_account_accounts: {
+          user1: {
+            email: "user1@email.Com",
+            name: "User 1",
+          },
+          user2: {
+            email: "user2@email.com",
+            name: "User 2",
+          },
+        },
+        user_user1_masterPassword_masterKeyEncryptedUserKey: "user1MasterKeyEncryptedUser",
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+        user_user2_masterPassword_masterKeyEncryptedUserKey: "user2MasterKeyEncryptedUser",
+        user_user2_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600001 },
+      });
+
+      expect(output).toEqual({
+        global_account_accounts: {
+          user1: {
+            email: "user1@email.Com",
+            name: "User 1",
+          },
+          user2: {
+            email: "user2@email.com",
+            name: "User 2",
+          },
+        },
+        user_user1_masterPassword_masterKeyEncryptedUserKey: "user1MasterKeyEncryptedUser",
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+        user_user1_masterPasswordUnlock_masterPasswordUnlockKey: {
+          salt: "user1@email.com",
+          kdf: { kdfType: 0, iterations: 600000 },
+          masterKeyWrappedUserKey: "user1MasterKeyEncryptedUser",
+        },
+        user_user2_masterPassword_masterKeyEncryptedUserKey: "user2MasterKeyEncryptedUser",
+        user_user2_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600001 },
+        user_user2_masterPasswordUnlock_masterPasswordUnlockKey: {
+          salt: "user2@email.com",
+          kdf: { kdfType: 0, iterations: 600001 },
+          masterKeyWrappedUserKey: "user2MasterKeyEncryptedUser",
+        },
+      });
+    });
+
+    it("does not update users that already have master password unlock data", async () => {
+      const output = await runMigrator(sut, {
+        global_account_accounts: {
+          user1: {
+            email: "user1@email.Com",
+            name: "User 1",
+          },
+        },
+        user_user1_masterPassword_masterKeyEncryptedUserKey: "user1MasterKeyEncryptedUser",
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+        user_user1_masterPasswordUnlock_masterPasswordUnlockKey: { someData: "data" },
+      });
+
+      expect(output).toEqual({
+        global_account_accounts: {
+          user1: {
+            email: "user1@email.Com",
+            name: "User 1",
+          },
+        },
+        user_user1_masterPassword_masterKeyEncryptedUserKey: "user1MasterKeyEncryptedUser",
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+        user_user1_masterPasswordUnlock_masterPasswordUnlockKey: { someData: "data" },
+      });
+    });
+
+    it("does not update users that have missing data required to construct master password unlock data", async () => {
+      const output = await runMigrator(sut, {
+        global_account_accounts: {
+          user1: {
+            name: "User 1",
+          },
+        },
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+      });
+
+      expect(output).toEqual({
+        global_account_accounts: {
+          user1: {
+            name: "User 1",
+          },
+        },
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+      });
+    });
+
+    it("handles users with missing global accounts", async () => {
+      const output = await runMigrator(sut, {
+        global_account_accounts: { user_user1: null },
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+      });
+
+      expect(output).toEqual({
+        global_account_accounts: { user_user1: null },
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+      });
+    });
+  });
+
+  describe("rollback", () => {
+    it("rolls back data", async () => {
+      const output = await runMigrator(
+        sut,
+        {
+          global_account_accounts: {
+            user1: {
+              email: "user1@email.Com",
+              name: "User 1",
+            },
+            user2: {
+              email: "user2@email.com",
+              name: "User 2",
+            },
+            user3: {
+              email: "user3@email.com",
+              name: "User 3",
+            },
+          },
+          user_user1_masterPassword_masterKeyEncryptedUserKey: "user1MasterKeyEncryptedUser",
+          user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+          user_user2_masterPassword_masterKeyEncryptedUserKey: "user2MasterKeyEncryptedUser",
+          user_user2_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600001 },
+          user_user1_masterPasswordUnlock_masterPasswordUnlockKey: "fakeData",
+          user_user2_masterPasswordUnlock_masterPasswordUnlockKey: "fakeData",
+          user_user3_masterPasswordUnlock_masterPasswordUnlockKey: null,
+        },
+        "rollback",
+      );
+
+      expect(output).toEqual({
+        global_account_accounts: {
+          user1: {
+            email: "user1@email.Com",
+            name: "User 1",
+          },
+          user2: {
+            email: "user2@email.com",
+            name: "User 2",
+          },
+          user3: {
+            email: "user3@email.com",
+            name: "User 3",
+          },
+        },
+        user_user1_masterPassword_masterKeyEncryptedUserKey: "user1MasterKeyEncryptedUser",
+        user_user1_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600000 },
+        user_user2_masterPassword_masterKeyEncryptedUserKey: "user2MasterKeyEncryptedUser",
+        user_user2_kdfConfig_kdfConfig: { kdfType: 0, iterations: 600001 },
+        user_user3_masterPasswordUnlock_masterPasswordUnlockKey: null,
+      });
+    });
+  });
+});
diff --git a/libs/state/src/state-migrations/migrations/73-add-master-password-unlock-data.ts b/libs/state/src/state-migrations/migrations/73-add-master-password-unlock-data.ts
new file mode 100644
index 00000000000..321df7d5cfc
--- /dev/null
+++ b/libs/state/src/state-migrations/migrations/73-add-master-password-unlock-data.ts
@@ -0,0 +1,72 @@
+import { KeyDefinitionLike, MigrationHelper } from "../migration-helper";
+import { Migrator } from "../migrator";
+
+export const ACCOUNT_ACCOUNTS: KeyDefinitionLike = {
+  stateDefinition: {
+    name: "account",
+  },
+  key: "accounts",
+};
+
+export const MASTER_PASSWORD_UNLOCK_KEY: KeyDefinitionLike = {
+  key: "masterPasswordUnlockKey",
+  stateDefinition: { name: "masterPasswordUnlock" },
+};
+
+export const MASTER_KEY_ENCRYPTED_USER_KEY: KeyDefinitionLike = {
+  key: "masterKeyEncryptedUserKey",
+  stateDefinition: { name: "masterPassword" },
+};
+
+export const KDF_CONFIG_DISK: KeyDefinitionLike = {
+  key: "kdfConfig",
+  stateDefinition: { name: "kdfConfig" },
+};
+
+type AccountsMap = Record<string, Account>;
+type Account = {
+  email: string;
+  name: string;
+};
+
+export class AddMasterPasswordUnlockData extends Migrator<72, 73> {
+  async migrate(helper: MigrationHelper): Promise<void> {
+    async function migrateAccount(userId: string, account: Account) {
+      const email = account?.email;
+      const kdfConfig = await helper.getFromUser(userId, KDF_CONFIG_DISK);
+      const masterKeyEncryptedUserKey = await helper.getFromUser(
+        userId,
+        MASTER_KEY_ENCRYPTED_USER_KEY,
+      );
+      if (
+        (await helper.getFromUser(userId, MASTER_PASSWORD_UNLOCK_KEY)) == null &&
+        email != null &&
+        kdfConfig != null &&
+        masterKeyEncryptedUserKey != null
+      ) {
+        await helper.setToUser(userId, MASTER_PASSWORD_UNLOCK_KEY, {
+          salt: email.trim().toLowerCase(),
+          kdf: kdfConfig,
+          masterKeyWrappedUserKey: masterKeyEncryptedUserKey,
+        });
+      }
+    }
+
+    const accountDictionary = await helper.getFromGlobal<AccountsMap>(ACCOUNT_ACCOUNTS);
+    const accounts = await helper.getAccounts();
+    await Promise.all(
+      accounts.map(({ userId }) => migrateAccount(userId, accountDictionary[userId])),
+    );
+  }
+
+  async rollback(helper: MigrationHelper): Promise<void> {
+    async function rollbackAccount(userId: string) {
+      if ((await helper.getFromUser(userId, MASTER_PASSWORD_UNLOCK_KEY)) != null) {
+        await helper.removeFromUser(userId, MASTER_PASSWORD_UNLOCK_KEY);
+      }
+    }
+
+    const accounts = await helper.getAccounts();
+    await Promise.all(accounts.map(({ userId }) => rollbackAccount(userId)));
+  }
+}
diff --git a/libs/tools/export/vault-export/vault-export-core/jest.config.js b/libs/tools/export/vault-export/vault-export-core/jest.config.js
index d28c110d2ad..1cd8df2a0e4 100644
--- a/libs/tools/export/vault-export/vault-export-core/jest.config.js
+++ b/libs/tools/export/vault-export/vault-export-core/jest.config.js
@@ -8,6 +8,7 @@ module.exports = {
   ...sharedConfig,
   preset: "ts-jest",
   testEnvironment: "jsdom",
+  setupFiles: ["<rootDir>/../../../../../libs/shared/polyfill-node-globals.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.spec.ts b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.spec.ts
index a2df4ec27dc..4214873feed 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.spec.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.spec.ts
@@ -12,7 +12,7 @@ import {
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { CipherWithIdExport } from "@bitwarden/common/models/export/cipher-with-ids.export";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherId, UserId } from "@bitwarden/common/types/guid";
+import { CipherId, emptyGuid, 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";
@@ -179,7 +179,7 @@ describe("VaultExportService", () => {
   let restrictedItemTypesService: Partial<RestrictedItemTypesService>;
   let fetchMock: jest.Mock;
 
-  const userId = "" as UserId;
+  const userId = emptyGuid as UserId;
 
   beforeEach(() => {
     cryptoFunctionService = mock<CryptoFunctionService>();
@@ -343,7 +343,7 @@ describe("VaultExportService", () => {
       const exportData: BitwardenJsonExport = JSON.parse(data);
       expect(exportData.items.length).toBe(1);
       expect(exportData.items[0].id).toBe("mock-id");
-      expect(exportData.items[0].organizationId).toBe(null);
+      expect(exportData.items[0].organizationId).toBeUndefined();
     });
 
     it.each([[400], [401], [404], [500]])(
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts
index e51c9543bba..e7a97801e09 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts
@@ -201,6 +201,10 @@ export class IndividualVaultExportService
   }
 
   private async getEncryptedExport(activeUserId: UserId): Promise<ExportedVaultAsString> {
+    if (!activeUserId) {
+      throw new Error("User ID must not be null or undefined");
+    }
+
     let folders: Folder[] = [];
     let ciphers: Cipher[] = [];
     const promises = [];
@@ -225,7 +229,7 @@ export class IndividualVaultExportService
 
     await Promise.all(promises);
 
-    const userKey = await this.keyService.getUserKey(activeUserId);
+    const userKey = await firstValueFrom(this.keyService.userKey$(activeUserId));
     const encKeyValidation = await this.encryptService.encryptString(Utils.newGuid(), userKey);
 
     const jsonDoc: BitwardenEncryptedIndividualJsonExport = {
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts b/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts
index 3884dde4b18..678dd600f94 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import * as papa from "papaparse";
-import { firstValueFrom, map } from "rxjs";
+import { filter, firstValueFrom, map } from "rxjs";
 
 import {
   CollectionService,
@@ -15,6 +15,7 @@ import { EncryptService } from "@bitwarden/common/key-management/crypto/abstract
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { CipherWithIdExport, CollectionWithIdExport } from "@bitwarden/common/models/export";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -22,6 +23,7 @@ import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { newGuid } from "@bitwarden/guid";
 import { KdfConfigService, KeyService } from "@bitwarden/key-management";
 
 import {
@@ -112,7 +114,7 @@ export class OrganizationVaultExportService
         type: "text/plain",
         data: onlyManagedCollections
           ? await this.getEncryptedManagedExport(userId, organizationId)
-          : await this.getOrganizationEncryptedExport(organizationId),
+          : await this.getOrganizationEncryptedExport(userId, organizationId),
         fileName: ExportHelper.getFileName("org", "encrypted_json"),
       } as ExportedVaultAsString;
     }
@@ -135,6 +137,10 @@ export class OrganizationVaultExportService
     const decCiphers: CipherView[] = [];
     const promises = [];
 
+    const orgKeys = await firstValueFrom(
+      this.keyService.orgKeys$(activeUserId).pipe(filter((orgKeys) => orgKeys != null)),
+    );
+
     const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
 
     promises.push(
@@ -146,12 +152,11 @@ export class OrganizationVaultExportService
               const collection = Collection.fromCollectionData(
                 new CollectionData(c as CollectionDetailsResponse),
               );
+              const orgKey = orgKeys[organizationId];
               exportPromises.push(
-                firstValueFrom(this.keyService.activeUserOrgKeys$)
-                  .then((keys) => collection.decrypt(keys[organizationId], this.encryptService))
-                  .then((decCol) => {
-                    decCollections.push(decCol);
-                  }),
+                collection.decrypt(orgKey, this.encryptService).then((decCol) => {
+                  decCollections.push(decCol);
+                }),
               );
             });
           }
@@ -184,7 +189,10 @@ export class OrganizationVaultExportService
     return this.buildJsonExport(decCollections, decCiphers);
   }
 
-  private async getOrganizationEncryptedExport(organizationId: OrganizationId): Promise<string> {
+  private async getOrganizationEncryptedExport(
+    userId: UserId,
+    organizationId: OrganizationId,
+  ): Promise<string> {
     const collections: Collection[] = [];
     const ciphers: Cipher[] = [];
 
@@ -215,7 +223,7 @@ export class OrganizationVaultExportService
           }
         });
     }
-    return this.BuildEncryptedExport(organizationId, collections, ciphers);
+    return this.BuildEncryptedExport(userId, organizationId, collections, ciphers);
   }
 
   private async getDecryptedManagedExport(
@@ -295,16 +303,21 @@ export class OrganizationVaultExportService
         !this.restrictedItemTypesService.isCipherRestricted(f, restrictions),
     );
 
-    return this.BuildEncryptedExport(organizationId, encCollections, encCiphers);
+    return this.BuildEncryptedExport(activeUserId, organizationId, encCollections, encCiphers);
   }
 
   private async BuildEncryptedExport(
+    activeUserId: UserId,
     organizationId: OrganizationId,
     collections: Collection[],
     ciphers: Cipher[],
   ): Promise<string> {
-    const orgKey = await this.keyService.getOrgKey(organizationId);
-    const encKeyValidation = await this.encryptService.encryptString(Utils.newGuid(), orgKey);
+    const orgKeys = await firstValueFrom(this.keyService.orgKeys$(activeUserId));
+    const keyForEncryption: SymmetricCryptoKey = orgKeys?.[organizationId];
+    if (keyForEncryption == null) {
+      throw new Error("No encryption key found for organization");
+    }
+    const encKeyValidation = await this.encryptService.encryptString(newGuid(), keyForEncryption);
 
     const jsonDoc: BitwardenEncryptedOrgJsonExport = {
       encrypted: true,
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.abstraction.ts b/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.abstraction.ts
index e25fec6eb82..0d58f168671 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.abstraction.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.abstraction.ts
@@ -1,3 +1,5 @@
+import { Observable } from "rxjs";
+
 import { UserId, OrganizationId } from "@bitwarden/common/types/guid";
 
 import { ExportedVault } from "../types";
@@ -5,6 +7,24 @@ import { ExportedVault } from "../types";
 export const EXPORT_FORMATS = ["csv", "json", "encrypted_json", "zip"] as const;
 export type ExportFormat = (typeof EXPORT_FORMATS)[number];
 
+/**
+ * Options that determine which export formats are available
+ */
+export type FormatOptions = {
+  /** Whether the export is for the user's personal vault */
+  isMyVault: boolean;
+};
+
+/**
+ * Metadata describing an available export format
+ */
+export type ExportFormatMetadata = {
+  /** Display name for the format (e.g., ".json", ".csv") */
+  name: string;
+  /** The export format identifier */
+  format: ExportFormat;
+};
+
 export abstract class VaultExportServiceAbstraction {
   abstract getExport: (
     userId: UserId,
@@ -18,4 +38,11 @@ export abstract class VaultExportServiceAbstraction {
     password: string,
     onlyManagedCollections?: boolean,
   ) => Promise<ExportedVault>;
+
+  /**
+   * Get available export formats based on vault context
+   * @param options Options determining which formats are available
+   * @returns Observable stream of available export formats
+   */
+  abstract formats$(options: FormatOptions): Observable<ExportFormatMetadata[]>;
 }
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.ts b/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.ts
index b601478d06d..38d71136006 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.ts
@@ -1,4 +1,4 @@
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, Observable, of } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
@@ -9,7 +9,12 @@ import { ExportedVault } from "../types";
 
 import { IndividualVaultExportServiceAbstraction } from "./individual-vault-export.service.abstraction";
 import { OrganizationVaultExportServiceAbstraction } from "./org-vault-export.service.abstraction";
-import { ExportFormat, VaultExportServiceAbstraction } from "./vault-export.service.abstraction";
+import {
+  ExportFormat,
+  ExportFormatMetadata,
+  FormatOptions,
+  VaultExportServiceAbstraction,
+} from "./vault-export.service.abstraction";
 
 export class VaultExportService implements VaultExportServiceAbstraction {
   constructor(
@@ -85,6 +90,26 @@ export class VaultExportService implements VaultExportServiceAbstraction {
     );
   }
 
+  /**
+   * Get available export formats based on vault context
+   * @param options Options determining which formats are available
+   * @returns Observable stream of available export formats
+   */
+  formats$(options: FormatOptions): Observable<ExportFormatMetadata[]> {
+    const baseFormats: ExportFormatMetadata[] = [
+      { name: ".json", format: "json" },
+      { name: ".csv", format: "csv" },
+      { name: ".json (Encrypted)", format: "encrypted_json" },
+    ];
+
+    // ZIP format with attachments is only available for individual vault exports
+    if (options.isMyVault) {
+      return of([...baseFormats, { name: ".zip (with attachments)", format: "zip" }]);
+    }
+
+    return of(baseFormats);
+  }
+
   /** Checks if the provided userId matches the currently authenticated user
    * @param userId The userId to check
    * @throws Error if the userId does not match the currently authenticated user
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts
index 2b03234c5e2..213d15d61a8 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts
@@ -5,14 +5,16 @@ import { Component, effect, input } from "@angular/core";
 import { firstValueFrom, map } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { getById } from "@bitwarden/common/platform/misc/rxjs-operators";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { CalloutModule } from "@bitwarden/components";
+import { ExportFormat } from "@bitwarden/vault-export-core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-export-scope-callout",
   templateUrl: "export-scope-callout.component.html",
@@ -27,9 +29,11 @@ export class ExportScopeCalloutComponent {
   };
 
   /* Optional OrganizationId, if not provided, it will display individual vault export message */
-  readonly organizationId = input<string>();
+  readonly organizationId = input<OrganizationId>();
   /* Optional export format, determines which individual export description to display */
-  readonly exportFormat = input<string>();
+  readonly exportFormat = input<ExportFormat>();
+  /* The description key to use for organizational exports */
+  readonly orgExportDescription = input<string>();
 
   constructor(
     protected organizationService: OrganizationService,
@@ -37,35 +41,46 @@ export class ExportScopeCalloutComponent {
   ) {
     effect(async () => {
       this.show = false;
-      await this.getScopeMessage(this.organizationId(), this.exportFormat());
+      await this.getScopeMessage(
+        this.organizationId(),
+        this.exportFormat(),
+        this.orgExportDescription(),
+      );
       this.show = true;
     });
   }
 
-  private async getScopeMessage(organizationId: string, exportFormat: string): Promise<void> {
+  private async getScopeMessage(
+    organizationId: OrganizationId | undefined,
+    exportFormat: ExportFormat | undefined,
+    orgExportDescription: string,
+  ): Promise<void> {
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-    this.scopeConfig =
-      organizationId != null
-        ? {
-            title: "exportingOrganizationVaultTitle",
-            description: "exportingOrganizationVaultDesc",
-            scopeIdentifier: (
-              await firstValueFrom(
-                this.organizationService
-                  .organizations$(userId)
-                  .pipe(getOrganizationById(organizationId)),
-              )
-            ).name,
-          }
-        : {
-            title: "exportingPersonalVaultTitle",
-            description:
-              exportFormat == "zip"
-                ? "exportingIndividualVaultWithAttachmentsDescription"
-                : "exportingIndividualVaultDescription",
-            scopeIdentifier: await firstValueFrom(
-              this.accountService.activeAccount$.pipe(map((a) => a?.email)),
-            ),
-          };
+
+    if (organizationId) {
+      // exporting from organizational vault
+      const org = await firstValueFrom(
+        this.organizationService.organizations$(userId).pipe(getById(organizationId)),
+      );
+
+      this.scopeConfig = {
+        title: "exportingOrganizationVaultTitle",
+        description: orgExportDescription,
+        scopeIdentifier: org?.name ?? "",
+      };
+
+      return;
+    }
+
+    // exporting from individual vault
+    this.scopeConfig = {
+      title: "exportingPersonalVaultTitle",
+      description:
+        exportFormat === "zip"
+          ? "exportingIndividualVaultWithAttachmentsDescription"
+          : "exportingIndividualVaultDescription",
+      scopeIdentifier:
+        (await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.email)))) ?? "",
+    };
   }
 }
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
index b33b01d3b13..f41375edd5a 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
@@ -8,6 +8,7 @@
 <tools-export-scope-callout
   [organizationId]="organizationId"
   [exportFormat]="format"
+  [orgExportDescription]="orgExportDescription"
 ></tools-export-scope-callout>
 
 <form [formGroup]="exportForm" [bitSubmit]="submit" id="export_form_exportForm">
@@ -19,10 +20,10 @@
           [label]="'myVault' | i18n"
           value="myVault"
           icon="bwi-user"
-          *ngIf="!(organizationDataOwnershipPolicy$ | async)"
+          *ngIf="!(organizationDataOwnershipPolicyAppliesToUser$ | async)"
         />
         <bit-option
-          *ngFor="let o of organizations$ | async"
+          *ngFor="let o of organizations"
           [value]="o.id"
           [label]="o.name"
           icon="bwi-business"
@@ -34,7 +35,7 @@
   <bit-form-field>
     <bit-label>{{ "fileFormat" | i18n }}</bit-label>
     <bit-select formControlName="format">
-      <bit-option *ngFor="let f of formatOptions" [value]="f.value" [label]="f.name" />
+      <bit-option *ngFor="let f of formatOptions$ | async" [value]="f.format" [label]="f.name" />
     </bit-select>
   </bit-form-field>
 
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
index f2caf4fe3f4..e81217e54c2 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
@@ -10,14 +10,20 @@ import {
   OnInit,
   Output,
   ViewChild,
+  Optional,
 } from "@angular/core";
 import { ReactiveFormsModule, UntypedFormBuilder, Validators } from "@angular/forms";
+import { Router } from "@angular/router";
 import {
+  BehaviorSubject,
   combineLatest,
   firstValueFrom,
+  from,
   map,
   merge,
   Observable,
+  of,
+  shareReplay,
   startWith,
   Subject,
   switchMap,
@@ -36,10 +42,13 @@ 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 { EventType } from "@bitwarden/common/enums";
+import { ClientType, EventType } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { getById } from "@bitwarden/common/platform/misc";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { pin } from "@bitwarden/common/tools/rx";
@@ -58,12 +67,18 @@ import {
 } from "@bitwarden/components";
 import { GeneratorServicesModule } from "@bitwarden/generator-components";
 import { CredentialGeneratorService, GenerateRequest, Type } from "@bitwarden/generator-core";
-import { ExportedVault, VaultExportServiceAbstraction } from "@bitwarden/vault-export-core";
+import {
+  ExportedVault,
+  ExportFormatMetadata,
+  VaultExportServiceAbstraction,
+} from "@bitwarden/vault-export-core";
 
 import { EncryptedExportType } from "../enums/encrypted-export-type.enum";
 
 import { ExportScopeCalloutComponent } from "./export-scope-callout.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-export",
   templateUrl: "export.component.html",
@@ -84,45 +99,75 @@ import { ExportScopeCalloutComponent } from "./export-scope-callout.component";
   ],
 })
 export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
-  private _organizationId: OrganizationId | undefined;
-
-  get organizationId(): OrganizationId | undefined {
-    return this._organizationId;
-  }
+  private _organizationId$ = new BehaviorSubject<OrganizationId | undefined>(undefined);
+  private createDefaultLocationFlagEnabled$: Observable<boolean>;
+  private _showExcludeMyItems = false;
 
   /**
    * Enables the hosting control to pass in an organizationId
    * If a organizationId is provided, the organization selection is disabled.
    */
+  // TODO: Fix this the next time the file is edited.
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() set organizationId(value: OrganizationId | string | undefined) {
     if (Utils.isNullOrEmpty(value)) {
-      this._organizationId = undefined;
+      this._organizationId$.next(undefined);
       return;
     }
 
     if (!isId<OrganizationId>(value)) {
-      this._organizationId = undefined;
+      this._organizationId$.next(undefined);
       return;
     }
 
-    this._organizationId = value;
+    this._organizationId$.next(value);
 
     getUserId(this.accountService.activeAccount$)
       .pipe(
-        switchMap((userId) =>
-          this.organizationService.organizations$(userId).pipe(getById(this._organizationId)),
-        ),
+        switchMap((userId) => this.organizationService.organizations$(userId).pipe(getById(value))),
       )
       .pipe(takeUntil(this.destroy$))
       .subscribe((organization) => {
-        this._organizationId = organization?.id;
+        this._organizationId$.next(organization?.id);
       });
   }
 
+  get organizationId(): OrganizationId | undefined {
+    return this._organizationId$.value;
+  }
+
+  get showExcludeMyItems(): boolean {
+    return this._showExcludeMyItems;
+  }
+
+  get orgExportDescription(): string {
+    if (!this._showExcludeMyItems) {
+      return "exportingOrganizationVaultDesc";
+    }
+    return this.isAdminConsoleContext
+      ? "exportingOrganizationVaultFromAdminConsoleWithDataOwnershipDesc"
+      : "exportingOrganizationVaultFromPasswordManagerWithDataOwnershipDesc";
+  }
+
+  private get isAdminConsoleContext(): boolean {
+    const isWeb = this.platformUtilsService.getClientType?.() === ClientType.Web;
+    if (!isWeb || !this.router) {
+      return false;
+    }
+    try {
+      const url = this.router.url ?? "";
+      return url.includes("/organizations/");
+    } catch {
+      return false;
+    }
+  }
+
   /**
    * The hosting control also needs a bitSubmitDirective (on the Submit button) which calls this components {@link submit}-method.
    * This components formState (loading/disabled) is emitted back up to the hosting component so for example the Submit button can be enabled/disabled and show loading state.
    */
+  // TODO: Fix this the next time the file is edited.
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(BitSubmitDirective)
   private bitSubmit: BitSubmitDirective;
 
@@ -130,6 +175,8 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
    * Emits true when the BitSubmitDirective({@link bitSubmit} is executing {@link submit} and false when execution has completed.
    * Example: Used to show the loading state of the submit button present on the hosting component
    * */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   formLoading = new EventEmitter<boolean>();
 
@@ -137,17 +184,23 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
    * Emits true when this form gets disabled and false when enabled.
    * Example: Used to disable the submit button, which is present on the hosting component
    * */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   formDisabled = new EventEmitter<boolean>();
 
   /**
    * Emits when the creation and download of the export-file have succeeded
    * - Emits an undefined when exporting from an individual vault
-   * - Emits the organizationId when exporting from an organizationl vault
+   * - Emits the organizationId when exporting from an organizational vault
    * */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   onSuccessfulExport = new EventEmitter<OrganizationId | undefined>();
 
+  // TODO: Fix this the next time the file is edited.
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(PasswordStrengthV2Component) passwordStrengthComponent: PasswordStrengthV2Component;
 
   encryptedExportType = EncryptedExportType;
@@ -162,7 +215,10 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   disablePersonalVaultExportPolicy$: Observable<boolean>;
-  organizationDataOwnershipPolicy$: Observable<boolean>;
+  // detects if policy is enabled and applies to the user, admins are exempted
+  organizationDataOwnershipPolicyAppliesToUser$: Observable<boolean>;
+  // detects if policy is enabled regardless of admin exemption
+  organizationDataOwnershipPolicyEnabledForOrg$: Observable<boolean>;
 
   exportForm = this.formBuilder.group({
     vaultSelector: [
@@ -179,11 +235,11 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
     fileEncryptionType: [EncryptedExportType.AccountEncrypted],
   });
 
-  formatOptions = [
-    { name: ".json", value: "json" },
-    { name: ".csv", value: "csv" },
-    { name: ".json (Encrypted)", value: "encrypted_json" },
-  ];
+  /**
+   * Observable stream of available export format options
+   * Dynamically updates based on vault selection (My Vault vs Organization)
+   */
+  formatOptions$: Observable<ExportFormatMetadata[]>;
 
   private destroy$ = new Subject<void>();
   private onlyManagedCollections = true;
@@ -203,14 +259,46 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
     protected organizationService: OrganizationService,
     private accountService: AccountService,
     private collectionService: CollectionService,
+    private configService: ConfigService,
+    private platformUtilsService: PlatformUtilsService,
+    @Optional() private router?: Router,
   ) {}
 
   async ngOnInit() {
-    // Setup subscription to emit when this form is enabled/disabled
+    this.observeFeatureFlags();
+    this.observeFormState();
+    this.observePolicyStatus();
+    this.observeFormSelections();
+
+    // order is important below this line
+    this.observeMyItemsExclusionCriteria();
+    this.observeValidatorAdjustments();
+    this.setupPasswordGeneration();
+
+    if (this.organizationId) {
+      // organization vault export
+      this.initOrganizationOnly();
+      return;
+    }
+
+    // individual vault export
+    this.initIndividual();
+    this.setupPolicyBasedFormState();
+  }
+
+  private observeFeatureFlags(): void {
+    this.createDefaultLocationFlagEnabled$ = from(
+      this.configService.getFeatureFlag(FeatureFlag.CreateDefaultLocation),
+    ).pipe(shareReplay({ bufferSize: 1, refCount: true }));
+  }
+
+  private observeFormState(): void {
     this.exportForm.statusChanges.pipe(takeUntil(this.destroy$)).subscribe((c) => {
       this.formDisabled.emit(c === "DISABLED");
     });
+  }
 
+  private observePolicyStatus(): void {
     this.disablePersonalVaultExportPolicy$ = this.accountService.activeAccount$.pipe(
       getUserId,
       switchMap((userId) =>
@@ -218,33 +306,120 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
       ),
     );
 
-    this.organizationDataOwnershipPolicy$ = this.accountService.activeAccount$.pipe(
+    // when true, html template will hide "My Vault" option in vault selector drop down
+    this.organizationDataOwnershipPolicyAppliesToUser$ = this.accountService.activeAccount$.pipe(
       getUserId,
       switchMap((userId) =>
         this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
       ),
     );
 
+    /*
+      Determines how organization exports are described in the callout.
+      Admins are exempted from organization data ownership policy,
+      and so this needs to determine if the policy is enabled for the org, not if it applies to the user.
+    */
+    this.organizationDataOwnershipPolicyEnabledForOrg$ = combineLatest([
+      this.accountService.activeAccount$.pipe(getUserId),
+      this._organizationId$,
+    ]).pipe(
+      switchMap(([userId, organizationId]) => {
+        if (!organizationId || !userId) {
+          return of(false);
+        }
+        return this.policyService.policies$(userId).pipe(
+          map((policies) => {
+            const policy = policies?.find(
+              (p) =>
+                p.type === PolicyType.OrganizationDataOwnership &&
+                p.organizationId === organizationId,
+            );
+            return policy?.enabled ?? false;
+          }),
+        );
+      }),
+    );
+  }
+
+  private observeFormSelections(): void {
+    // Update organizationId when vault selection changes
+    // In Admin Console context, organizationId is already set via @Input
+    // In Password Manager context, user changes vaultSelector which updates _organizationId$
     this.exportForm.controls.vaultSelector.valueChanges
       .pipe(takeUntil(this.destroy$))
-      .subscribe((value) => {
-        this.organizationId = value !== "myVault" ? value : undefined;
-
-        this.formatOptions = this.formatOptions.filter((option) => option.value !== "zip");
-        this.exportForm.get("format").setValue("json");
-        if (value === "myVault") {
-          this.formatOptions.push({ name: ".zip (with attachments)", value: "zip" });
+      .subscribe((vaultSelection) => {
+        if (!this.isAdminConsoleContext) {
+          // Password Manager: Update organizationId based on vaultSelector
+          const isMyVault = vaultSelection === "myVault";
+          this.organizationId = isMyVault ? undefined : vaultSelection;
         }
+        // Admin Console: organizationId is already set via @Input, no update needed
       });
 
+    // Set up dynamic format options based on the organizationId observable
+    // This is the single source of truth for both export contexts
+    this.formatOptions$ = this._organizationId$.pipe(
+      map((organizationId) => {
+        const isMyVault = !organizationId;
+        return { isMyVault };
+      }),
+      switchMap((options) => this.exportService.formats$(options)),
+      tap((formats) => {
+        // Preserve the current format selection if it's still available in the new format list
+        const currentFormat = this.exportForm.get("format").value;
+        const isFormatAvailable = formats.some((f) => f.format === currentFormat);
+
+        // Only reset to json if the current format is no longer available
+        if (!isFormatAvailable) {
+          this.exportForm.get("format").setValue("json");
+        }
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+  }
+
+  /**
+   * Determine value of showExcludeMyItems. Returns true when:
+   * CreateDefaultLocation feature flag is on
+   * AND organizationDataOwnershipPolicy is enabled for the selected organization
+   * AND a valid OrganizationId is present (not exporting from individual vault)
+   */
+  private observeMyItemsExclusionCriteria(): void {
+    combineLatest({
+      createDefaultLocationFlagEnabled: this.createDefaultLocationFlagEnabled$,
+      organizationDataOwnershipPolicyEnabledForOrg:
+        this.organizationDataOwnershipPolicyEnabledForOrg$,
+      organizationId: this._organizationId$,
+    })
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(
+        ({
+          createDefaultLocationFlagEnabled,
+          organizationDataOwnershipPolicyEnabledForOrg,
+          organizationId,
+        }) => {
+          if (!createDefaultLocationFlagEnabled || !organizationId) {
+            this._showExcludeMyItems = false;
+            return;
+          }
+
+          this._showExcludeMyItems = organizationDataOwnershipPolicyEnabledForOrg;
+        },
+      );
+  }
+
+  // Setup validator adjustments based on format and encryption type changes
+  private observeValidatorAdjustments(): void {
     merge(
       this.exportForm.get("format").valueChanges,
       this.exportForm.get("fileEncryptionType").valueChanges,
     )
       .pipe(startWith(0), takeUntil(this.destroy$))
       .subscribe(() => this.adjustValidators());
+  }
 
-    // Wire up the password generation for the password-protected export
+  // Wire up the password generation for password-protected exports
+  private setupPasswordGeneration(): void {
     const account$ = this.accountService.activeAccount$.pipe(
       pin({
         name() {
@@ -255,6 +430,7 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
         },
       }),
     );
+
     this.generatorService
       .generate$({ on$: this.onGenerate$, account$ })
       .pipe(takeUntil(this.destroy$))
@@ -264,23 +440,29 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
           confirmFilePassword: generated.credential,
         });
       });
+  }
 
-    if (this.organizationId) {
-      this.organizations$ = this.accountService.activeAccount$.pipe(
-        getUserId,
-        switchMap((userId) =>
-          this.organizationService
-            .memberOrganizations$(userId)
-            .pipe(map((orgs) => orgs.filter((org) => org.id == this.organizationId))),
-        ),
-      );
-      this.exportForm.controls.vaultSelector.patchValue(this.organizationId);
-      this.exportForm.controls.vaultSelector.disable();
+  /*
+  Initialize component for organization only export
+  Hides "My Vault" option by returning immediately
+  */
+  private initOrganizationOnly(): void {
+    this.organizations$ = this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) =>
+        this.organizationService
+          .memberOrganizations$(userId)
+          .pipe(map((orgs) => orgs.filter((org) => org.id == this.organizationId))),
+      ),
+    );
+    this.exportForm.controls.vaultSelector.patchValue(this.organizationId);
+    this.exportForm.controls.vaultSelector.disable();
 
-      this.onlyManagedCollections = false;
-      return;
-    }
+    this.onlyManagedCollections = false;
+  }
 
+  // Initialize component to support individual and organizational exports
+  private initIndividual(): void {
     this.organizations$ = this.accountService.activeAccount$
       .pipe(
         getUserId,
@@ -296,18 +478,18 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
           const managedCollectionsOrgIds = new Set(
             collections.filter((c) => c.manage).map((c) => c.organizationId),
           );
-          // Filter organizations that exist in managedCollectionsOrgIds
           const filteredOrgs = memberOrganizations.filter((org) =>
             managedCollectionsOrgIds.has(org.id),
           );
-          // Sort the filtered organizations based on the name
           return filteredOrgs.sort(Utils.getSortFunction(this.i18nService, "name"));
         }),
       );
+  }
 
+  private setupPolicyBasedFormState(): void {
     combineLatest([
       this.disablePersonalVaultExportPolicy$,
-      this.organizationDataOwnershipPolicy$,
+      this.organizationDataOwnershipPolicyAppliesToUser$,
       this.organizations$,
     ])
       .pipe(
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/enums/encrypted-export-type.enum.ts b/libs/tools/export/vault-export/vault-export-ui/src/enums/encrypted-export-type.enum.ts
index 2f416e4a49a..c321a487515 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/enums/encrypted-export-type.enum.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/enums/encrypted-export-type.enum.ts
@@ -1,6 +1,10 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum EncryptedExportType {
-  AccountEncrypted = 0,
-  FileEncrypted = 1,
-}
+/** A type of encrypted export. */
+export const EncryptedExportType = Object.freeze({
+  /** Export is encrypted using the Bitwarden account key. */
+  AccountEncrypted: 0,
+  /** Export is encrypted using a separate file password/key. */
+  FileEncrypted: 1,
+} as const);
+
+/** A type of encrypted export. */
+export type EncryptedExportType = (typeof EncryptedExportType)[keyof typeof EncryptedExportType];
diff --git a/libs/tools/generator/components/src/catchall-settings.component.ts b/libs/tools/generator/components/src/catchall-settings.component.ts
index a836b26f98b..0fb953b86dc 100644
--- a/libs/tools/generator/components/src/catchall-settings.component.ts
+++ b/libs/tools/generator/components/src/catchall-settings.component.ts
@@ -19,6 +19,8 @@ import {
 } from "@bitwarden/generator-core";
 
 /** Options group for catchall emails */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-catchall-settings",
   templateUrl: "catchall-settings.component.html",
@@ -38,6 +40,8 @@ export class CatchallSettingsComponent implements OnInit, OnDestroy, OnChanges {
    *  @remarks this is initialized to null but since it's a required input it'll
    *     never have that value in practice.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   account!: Account;
 
@@ -48,6 +52,8 @@ export class CatchallSettingsComponent implements OnInit, OnDestroy, OnChanges {
    *   to receive live settings updates including the initial update,
    *   use `CredentialGeneratorService.settings(...)` instead.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onUpdated = new EventEmitter<CatchallGenerationOptions>();
 
diff --git a/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts b/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
index 9ec0e636f9a..31419cefe1d 100644
--- a/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
+++ b/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
@@ -27,6 +27,8 @@ import { GeneratorHistoryService } from "@bitwarden/generator-history";
 import { CredentialGeneratorHistoryComponent as CredentialGeneratorHistoryToolsComponent } from "./credential-generator-history.component";
 import { EmptyCredentialHistoryComponent } from "./empty-credential-history.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "credential-generator-history-dialog.component.html",
   imports: [
@@ -49,6 +51,8 @@ export class CredentialGeneratorHistoryDialogComponent implements OnChanges, OnI
     private logService: LogService,
   ) {}
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   account: Account | null;
 
@@ -59,6 +63,8 @@ export class CredentialGeneratorHistoryDialogComponent implements OnChanges, OnI
    *
    *  @warning this may reveal sensitive information in plaintext.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   debug: boolean = false;
 
diff --git a/libs/tools/generator/components/src/credential-generator-history.component.ts b/libs/tools/generator/components/src/credential-generator-history.component.ts
index 3965b2be83e..a09a82c74b8 100644
--- a/libs/tools/generator/components/src/credential-generator-history.component.ts
+++ b/libs/tools/generator/components/src/credential-generator-history.component.ts
@@ -26,6 +26,8 @@ import { GeneratedCredential, GeneratorHistoryService } from "@bitwarden/generat
 import { GeneratorModule } from "./generator.module";
 import { translate } from "./util";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-credential-generator-history",
   templateUrl: "credential-generator-history.component.html",
@@ -50,6 +52,8 @@ export class CredentialGeneratorHistoryComponent implements OnChanges, OnInit, O
     private logService: LogService,
   ) {}
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   account: Account;
 
@@ -60,6 +64,8 @@ export class CredentialGeneratorHistoryComponent implements OnChanges, OnInit, O
    *
    *  @warning this may reveal sensitive information in plaintext.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   debug: boolean = false;
 
diff --git a/libs/tools/generator/components/src/credential-generator.component.ts b/libs/tools/generator/components/src/credential-generator.component.ts
index 78b803392df..f48180d93bd 100644
--- a/libs/tools/generator/components/src/credential-generator.component.ts
+++ b/libs/tools/generator/components/src/credential-generator.component.ts
@@ -64,6 +64,8 @@ const IDENTIFIER = "identifier";
 const FORWARDER = "forwarder";
 const NONE_SELECTED = "none";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-credential-generator",
   templateUrl: "credential-generator.component.html",
@@ -90,6 +92,8 @@ export class CredentialGeneratorComponent implements OnInit, OnChanges, OnDestro
   /** Binds the component to a specific user's settings. When this input is not provided,
    * the form binds to the active user
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   account: Account | null = null;
 
@@ -98,6 +102,8 @@ export class CredentialGeneratorComponent implements OnInit, OnChanges, OnDestro
    *
    *  @warning this may reveal sensitive information in plaintext.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   debug: boolean = false;
 
@@ -123,10 +129,14 @@ export class CredentialGeneratorComponent implements OnInit, OnChanges, OnDestro
   /**
    * The website associated with the credential generation request.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   website: string | null = null;
 
   /** Emits credentials created from a generation request. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onGenerated = new EventEmitter<GeneratedCredential>();
 
diff --git a/libs/tools/generator/components/src/empty-credential-history.component.ts b/libs/tools/generator/components/src/empty-credential-history.component.ts
index 4b9bc24b33b..593d7ac45f1 100644
--- a/libs/tools/generator/components/src/empty-credential-history.component.ts
+++ b/libs/tools/generator/components/src/empty-credential-history.component.ts
@@ -4,6 +4,8 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NoCredentialsIcon } from "@bitwarden/assets/svg";
 import { NoItemsModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-empty-credential-history",
   templateUrl: "empty-credential-history.component.html",
diff --git a/libs/tools/generator/components/src/forwarder-settings.component.ts b/libs/tools/generator/components/src/forwarder-settings.component.ts
index c961cd5bb7a..32fa3effdf6 100644
--- a/libs/tools/generator/components/src/forwarder-settings.component.ts
+++ b/libs/tools/generator/components/src/forwarder-settings.component.ts
@@ -26,6 +26,8 @@ const Controls = Object.freeze({
 });
 
 /** Options group for forwarder integrations */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-forwarder-settings",
   templateUrl: "forwarder-settings.component.html",
@@ -45,11 +47,15 @@ export class ForwarderSettingsComponent implements OnInit, OnChanges, OnDestroy
    *  @remarks this is initialized to null but since it's a required input it'll
    *     never have that value in practice.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   account: Account = null!;
 
   protected account$ = new ReplaySubject<Account>(1);
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   forwarder: VendorId = null!;
 
@@ -58,6 +64,8 @@ export class ForwarderSettingsComponent implements OnInit, OnChanges, OnDestroy
    *   to receive live settings updates including the initial update,
    *   use `CredentialGeneratorService.settings$(...)` instead.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onUpdated = new EventEmitter<unknown>();
 
diff --git a/libs/tools/generator/components/src/nudge-generator-spotlight.component.ts b/libs/tools/generator/components/src/nudge-generator-spotlight.component.ts
index 6807a987a85..f22bf1b12cc 100644
--- a/libs/tools/generator/components/src/nudge-generator-spotlight.component.ts
+++ b/libs/tools/generator/components/src/nudge-generator-spotlight.component.ts
@@ -10,6 +10,8 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { TypographyModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "nudge-generator-spotlight",
   templateUrl: "nudge-generator-spotlight.component.html",
diff --git a/libs/tools/generator/components/src/passphrase-settings.component.ts b/libs/tools/generator/components/src/passphrase-settings.component.ts
index b3525251392..7e4ae8b5af9 100644
--- a/libs/tools/generator/components/src/passphrase-settings.component.ts
+++ b/libs/tools/generator/components/src/passphrase-settings.component.ts
@@ -34,6 +34,8 @@ const Controls = Object.freeze({
 });
 
 /** Options group for passphrases */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-passphrase-settings",
   templateUrl: "passphrase-settings.component.html",
@@ -57,6 +59,8 @@ export class PassphraseSettingsComponent implements OnInit, OnChanges, OnDestroy
    *
    *  @warning this may reveal sensitive information in plaintext.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   debug: boolean = false;
 
@@ -67,6 +71,8 @@ export class PassphraseSettingsComponent implements OnInit, OnChanges, OnDestroy
    *  @remarks this is initialized to null but since it's a required input it'll
    *     never have that value in practice.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   account: Account = null!;
 
@@ -79,10 +85,14 @@ export class PassphraseSettingsComponent implements OnInit, OnChanges, OnDestroy
   }
 
   /** When `true`, an options header is displayed by the component. Otherwise, the header is hidden. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   showHeader: boolean = true;
 
   /** Removes bottom margin from `bit-section` */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: coerceBooleanProperty }) disableMargin = false;
 
   /** Emits settings updates and completes if the settings become unavailable.
@@ -90,6 +100,8 @@ export class PassphraseSettingsComponent implements OnInit, OnChanges, OnDestroy
    *   to receive live settings updates including the initial update,
    *   use {@link CredentialGeneratorService.settings} instead.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onUpdated = new EventEmitter<PassphraseGenerationOptions>();
 
diff --git a/libs/tools/generator/components/src/password-generator.component.ts b/libs/tools/generator/components/src/password-generator.component.ts
index b293aeb7e2d..2b1d5044651 100644
--- a/libs/tools/generator/components/src/password-generator.component.ts
+++ b/libs/tools/generator/components/src/password-generator.component.ts
@@ -53,6 +53,8 @@ import { GeneratorHistoryService } from "@bitwarden/generator-history";
 import { toAlgorithmInfo, translate } from "./util";
 
 /** Options group for passwords */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-password-generator",
   templateUrl: "password-generator.component.html",
@@ -76,6 +78,8 @@ export class PasswordGeneratorComponent implements OnInit, OnChanges, OnDestroy
   /** Binds the component to a specific user's settings. When this input is not provided,
    * the form binds to the active user
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   account: Account | null = null;
 
@@ -86,6 +90,8 @@ export class PasswordGeneratorComponent implements OnInit, OnChanges, OnDestroy
    *
    *  @warning this may reveal sensitive information in plaintext.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   debug: boolean = false;
 
@@ -110,10 +116,14 @@ export class PasswordGeneratorComponent implements OnInit, OnChanges, OnDestroy
     }
   }
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   profile: GeneratorProfile = Profile.account;
 
   /** Removes bottom margin, passed to downstream components */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: coerceBooleanProperty })
   disableMargin = false;
 
@@ -154,10 +164,14 @@ export class PasswordGeneratorComponent implements OnInit, OnChanges, OnDestroy
   }
 
   /** Emits credentials created from a generation request. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onGenerated = new EventEmitter<GeneratedCredential>();
 
   /** emits algorithm info when the selected algorithm changes */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onAlgorithm = new EventEmitter<AlgorithmInfo>();
 
diff --git a/libs/tools/generator/components/src/password-settings.component.html b/libs/tools/generator/components/src/password-settings.component.html
index 2145782df57..13bf6822462 100644
--- a/libs/tools/generator/components/src/password-settings.component.html
+++ b/libs/tools/generator/components/src/password-settings.component.html
@@ -15,9 +15,9 @@
     <div>
       <bit-card>
         <div class="tw-mb-4">{{ "include" | i18n }}</div>
-        <div class="tw-flex tw-justify-between">
+        <div class="tw-mb-4 tw-flex tw-flex-wrap tw-gap-4 sm:tw-gap-8">
           <bit-form-control
-            class="tw-w-1/5"
+            class="!tw-mb-0"
             attr.aria-description="{{ 'uppercaseDescription' | i18n }}"
             title="{{ 'uppercaseDescription' | i18n }}"
           >
@@ -30,7 +30,7 @@
             <bit-label>{{ "uppercaseLabel" | i18n }}</bit-label>
           </bit-form-control>
           <bit-form-control
-            class="tw-w-1/5"
+            class="!tw-mb-0"
             attr.aria-description="{{ 'lowercaseDescription' | i18n }}"
             title="{{ 'lowercaseDescription' | i18n }}"
           >
@@ -43,7 +43,7 @@
             <bit-label>{{ "lowercaseLabel" | i18n }}</bit-label>
           </bit-form-control>
           <bit-form-control
-            class="tw-w-1/5"
+            class="!tw-mb-0"
             attr.aria-description="{{ 'numbersDescription' | i18n }}"
             title="{{ 'numbersDescription' | i18n }}"
           >
@@ -51,7 +51,7 @@
             <bit-label>{{ "numbersLabel" | i18n }}</bit-label>
           </bit-form-control>
           <bit-form-control
-            class="tw-w-2/5"
+            class="!tw-mb-0"
             attr.aria-description="{{ 'specialCharactersDescription' | i18n }}"
             title="{{ 'specialCharactersDescription' | i18n }}"
           >
diff --git a/libs/tools/generator/components/src/password-settings.component.ts b/libs/tools/generator/components/src/password-settings.component.ts
index 965ada38146..5d5980edf1b 100644
--- a/libs/tools/generator/components/src/password-settings.component.ts
+++ b/libs/tools/generator/components/src/password-settings.component.ts
@@ -34,6 +34,8 @@ const Controls = Object.freeze({
 });
 
 /** Options group for passwords */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-password-settings",
   templateUrl: "password-settings.component.html",
@@ -55,6 +57,8 @@ export class PasswordSettingsComponent implements OnInit, OnChanges, OnDestroy {
    *  @remarks this is initialized to null but since it's a required input it'll
    *     never have that value in practice.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   account: Account = null!;
 
@@ -67,14 +71,20 @@ export class PasswordSettingsComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   /** When `true`, an options header is displayed by the component. Otherwise, the header is hidden. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   showHeader: boolean = true;
 
   /** Number of milliseconds to wait before accepting user input. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   waitMs: number = 100;
 
   /** Removes bottom margin from `bit-section` */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: coerceBooleanProperty }) disableMargin = false;
 
   /** Emits settings updates and completes if the settings become unavailable.
@@ -82,6 +92,8 @@ export class PasswordSettingsComponent implements OnInit, OnChanges, OnDestroy {
    *   to receive live settings updates including the initial update,
    *   use `CredentialGeneratorService.settings(...)` instead.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onUpdated = new EventEmitter<PasswordGenerationOptions>();
 
diff --git a/libs/tools/generator/components/src/subaddress-settings.component.ts b/libs/tools/generator/components/src/subaddress-settings.component.ts
index 27ed6d5f9f3..f9cef2341ba 100644
--- a/libs/tools/generator/components/src/subaddress-settings.component.ts
+++ b/libs/tools/generator/components/src/subaddress-settings.component.ts
@@ -19,6 +19,8 @@ import {
 } from "@bitwarden/generator-core";
 
 /** Options group for plus-addressed emails */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-subaddress-settings",
   templateUrl: "subaddress-settings.component.html",
@@ -38,6 +40,8 @@ export class SubaddressSettingsComponent implements OnInit, OnChanges, OnDestroy
    *  @remarks this is initialized to null but since it's a required input it'll
    *     never have that value in practice.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   account: Account = null!;
 
@@ -54,6 +58,8 @@ export class SubaddressSettingsComponent implements OnInit, OnChanges, OnDestroy
    *   to receive live settings updates including the initial update,
    *   use `CredentialGeneratorService.settings(...)` instead.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onUpdated = new EventEmitter<SubaddressGenerationOptions>();
 
diff --git a/libs/tools/generator/components/src/username-generator.component.ts b/libs/tools/generator/components/src/username-generator.component.ts
index 6227bcd3f7c..dc4b8d26e7e 100644
--- a/libs/tools/generator/components/src/username-generator.component.ts
+++ b/libs/tools/generator/components/src/username-generator.component.ts
@@ -64,6 +64,8 @@ const FORWARDER = "forwarder";
 const NONE_SELECTED = "none";
 
 /** Component that generates usernames and emails */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-username-generator",
   templateUrl: "username-generator.component.html",
@@ -95,6 +97,8 @@ export class UsernameGeneratorComponent implements OnInit, OnChanges, OnDestroy
   /** Binds the component to a specific user's settings. When this input is not provided,
    * the form binds to the active user
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   account: Account | null = null;
 
@@ -105,6 +109,8 @@ export class UsernameGeneratorComponent implements OnInit, OnChanges, OnDestroy
    *
    *  @warning this may reveal sensitive information in plaintext.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   debug: boolean = false;
 
@@ -132,18 +138,26 @@ export class UsernameGeneratorComponent implements OnInit, OnChanges, OnDestroy
   /**
    * The website associated with the credential generation request.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   website: string | null = null;
 
   /** Emits credentials created from a generation request. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onGenerated = new EventEmitter<GeneratedCredential>();
 
   /** emits algorithm info when the selected algorithm changes */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onAlgorithm = new EventEmitter<AlgorithmInfo | null>();
 
   /** Removes bottom margin from internal elements */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: coerceBooleanProperty }) disableMargin = false;
 
   /** Tracks the selected generation algorithm */
diff --git a/libs/tools/generator/components/src/username-settings.component.ts b/libs/tools/generator/components/src/username-settings.component.ts
index 7a12957f906..fae1a3aca04 100644
--- a/libs/tools/generator/components/src/username-settings.component.ts
+++ b/libs/tools/generator/components/src/username-settings.component.ts
@@ -19,6 +19,8 @@ import {
 } from "@bitwarden/generator-core";
 
 /** Options group for usernames */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-username-settings",
   templateUrl: "username-settings.component.html",
@@ -38,6 +40,8 @@ export class UsernameSettingsComponent implements OnInit, OnChanges, OnDestroy {
    *  @remarks this is initialized to null but since it's a required input it'll
    *     never have that value in practice.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   account: Account = null!;
 
@@ -54,6 +58,8 @@ export class UsernameSettingsComponent implements OnInit, OnChanges, OnDestroy {
    *   to receive live settings updates including the initial update,
    *   use `CredentialGeneratorService.settings(...)` instead.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   readonly onUpdated = new EventEmitter<EffUsernameGenerationOptions>();
 
diff --git a/libs/tools/generator/extensions/history/src/legacy-password-history-decryptor.ts b/libs/tools/generator/extensions/history/src/legacy-password-history-decryptor.ts
index 91998589bdd..c0c32824cea 100644
--- a/libs/tools/generator/extensions/history/src/legacy-password-history-decryptor.ts
+++ b/libs/tools/generator/extensions/history/src/legacy-password-history-decryptor.ts
@@ -1,3 +1,5 @@
+import { firstValueFrom } from "rxjs";
+
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -15,7 +17,11 @@ export class LegacyPasswordHistoryDecryptor {
 
   /** Decrypts a password history. */
   async decrypt(history: GeneratedPasswordHistory[]): Promise<GeneratedPasswordHistory[]> {
-    const key = await this.keyService.getUserKey(this.userId);
+    const key = await firstValueFrom(this.keyService.userKey$(this.userId));
+
+    if (key == undefined) {
+      throw new Error("No user key found for decryption");
+    }
 
     const promises = (history ?? []).map(async (item) => {
       const encrypted = new EncString(item.password);
diff --git a/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts b/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts
index 383bf4be7ec..6f49c0ecce5 100644
--- a/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts
+++ b/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts
@@ -35,23 +35,22 @@ export interface SendItemDialogParams {
   disableForm?: boolean;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum SendItemDialogResult {
-  /**
-   * A Send was saved (created or updated).
-   */
-  Saved = "saved",
+/** A result of the Send add/edit dialog. */
+export const SendItemDialogResult = Object.freeze({
+  /** The send item was created or updated. */
+  Saved: "saved",
+  /** The send item was deleted. */
+  Deleted: "deleted",
+} as const);
 
-  /**
-   * A Send was deleted.
-   */
-  Deleted = "deleted",
-}
+/** A result of the Send add/edit dialog. */
+export type SendItemDialogResult = (typeof SendItemDialogResult)[keyof typeof SendItemDialogResult];
 
 /**
  * Component for adding or editing a send item.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "send-add-edit-dialog.component.html",
   imports: [
diff --git a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
index 1d5629cfd48..bcced7e012b 100644
--- a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
+++ b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
@@ -3,19 +3,11 @@
   {{ (hideIcon ? "createSend" : "new") | i18n }}
 </button>
 <bit-menu #itemOptions>
-  <a
-    bitMenuItem
-    [routerLink]="buildRouterLink(sendType.Text)"
-    [queryParams]="buildQueryParams(sendType.Text)"
-  >
+  <a bitMenuItem [routerLink]="buildRouterLink()" [queryParams]="buildQueryParams(sendType.Text)">
     <i class="bwi bwi-file-text" slot="start" aria-hidden="true"></i>
     {{ "sendTypeText" | i18n }}
   </a>
-  <a
-    bitMenuItem
-    [routerLink]="buildRouterLink(sendType.File)"
-    [queryParams]="buildQueryParams(sendType.File)"
-  >
+  <a bitMenuItem (click)="sendFileClick()">
     <div class="tw-flex tw-items-center tw-gap-2">
       <i class="bwi bwi-file" slot="start" aria-hidden="true"></i>
       {{ "sendTypeFile" | i18n }}
diff --git a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
index b553a343cdd..e1474175267 100644
--- a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
+++ b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from "@angular/common";
 import { Component, Input, OnInit } from "@angular/core";
-import { RouterLink } from "@angular/router";
+import { Router, RouterLink } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
 import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
@@ -8,15 +8,22 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
+import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { ButtonModule, ButtonType, MenuModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-new-send-dropdown",
   templateUrl: "new-send-dropdown.component.html",
   imports: [JslibModule, CommonModule, ButtonModule, RouterLink, MenuModule, PremiumBadgeComponent],
 })
 export class NewSendDropdownComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() hideIcon: boolean = false;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() buttonType: ButtonType = "primary";
 
   sendType = SendType;
@@ -26,6 +33,8 @@ export class NewSendDropdownComponent implements OnInit {
   constructor(
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private accountService: AccountService,
+    private router: Router,
+    private premiumUpgradePromptService: PremiumUpgradePromptService,
   ) {}
 
   async ngOnInit() {
@@ -40,18 +49,21 @@ export class NewSendDropdownComponent implements OnInit {
     ));
   }
 
-  buildRouterLink(type: SendType) {
-    if (this.hasNoPremium && type === SendType.File) {
-      return "/premium";
-    } else {
-      return "/add-send";
-    }
+  buildRouterLink() {
+    return "/add-send";
   }
 
   buildQueryParams(type: SendType) {
-    if (this.hasNoPremium && type === SendType.File) {
-      return null;
-    }
     return { type: type, isNew: true };
   }
+
+  async sendFileClick() {
+    if (this.hasNoPremium) {
+      await this.premiumUpgradePromptService.promptForPremium();
+    } else {
+      await this.router.navigate([this.buildRouterLink()], {
+        queryParams: this.buildQueryParams(SendType.File),
+      });
+    }
+  }
 }
diff --git a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
index b2ab149f2f2..2ddb10dc80b 100644
--- a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
@@ -33,6 +33,8 @@ import { CredentialGeneratorService, GenerateRequest, Type } from "@bitwarden/ge
 import { SendFormConfig } from "../../abstractions/send-form-config.service";
 import { SendFormContainer } from "../../send-form-container";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-send-options",
   templateUrl: "./send-options.component.html",
@@ -52,8 +54,12 @@ import { SendFormContainer } from "../../send-form-container";
   ],
 })
 export class SendOptionsComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   config: SendFormConfig;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   originalSendView: SendView;
   disableHideEmail = false;
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.spec.ts b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.spec.ts
new file mode 100644
index 00000000000..576842cd877
--- /dev/null
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.spec.ts
@@ -0,0 +1,27 @@
+import { DatePreset, isDatePreset, asDatePreset } from "./send-details.component";
+
+describe("SendDetails DatePreset utilities", () => {
+  it("accepts all defined numeric presets", () => {
+    const presets: Array<any> = [
+      DatePreset.OneHour,
+      DatePreset.OneDay,
+      DatePreset.TwoDays,
+      DatePreset.ThreeDays,
+      DatePreset.SevenDays,
+      DatePreset.FourteenDays,
+      DatePreset.ThirtyDays,
+    ];
+    presets.forEach((p) => {
+      expect(isDatePreset(p)).toBe(true);
+      expect(asDatePreset(p)).toBe(p);
+    });
+  });
+
+  it("rejects invalid numbers and non-numeric values", () => {
+    const invalid: Array<any> = [5, -1, 0.5, 0, 9999, "never", "foo", null, undefined, {}, []];
+    invalid.forEach((v) => {
+      expect(isDatePreset(v)).toBe(false);
+      expect(asDatePreset(v)).toBeUndefined();
+    });
+  });
+});
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts
index e1fbf5dbc50..ec351bee923 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts
@@ -29,24 +29,52 @@ import { SendOptionsComponent } from "../options/send-options.component";
 import { SendFileDetailsComponent } from "./send-file-details.component";
 import { SendTextDetailsComponent } from "./send-text-details.component";
 
-// Value = hours
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum DatePreset {
-  OneHour = 1,
-  OneDay = 24,
-  TwoDays = 48,
-  ThreeDays = 72,
-  SevenDays = 168,
-  FourteenDays = 336,
-  ThirtyDays = 720,
-}
+/** A preset duration (in hours) for deletion. */
+export const DatePreset = Object.freeze({
+  /** One-hour duration. */
+  OneHour: 1,
+  /** One-day duration (24 hours). */
+  OneDay: 24,
+  /** Two-day duration (48 hours). */
+  TwoDays: 48,
+  /** Three-day duration (72 hours). */
+  ThreeDays: 72,
+  /** Seven-day duration (168 hours). */
+  SevenDays: 168,
+  /** Fourteen-day duration (336 hours). */
+  FourteenDays: 336,
+  /** Thirty-day duration (720 hours). */
+  ThirtyDays: 720,
+} as const);
+
+/** A preset duration (in hours) for deletion. */
+export type DatePreset = (typeof DatePreset)[keyof typeof DatePreset];
 
 export interface DatePresetSelectOption {
   name: string;
   value: DatePreset | string;
 }
 
+const namesByDatePreset = new Map<DatePreset, keyof typeof DatePreset>(
+  Object.entries(DatePreset).map(([k, v]) => [v as DatePreset, k as keyof typeof DatePreset]),
+);
+
+/**
+ * Runtime type guard to verify a value is a valid DatePreset.
+ */
+export function isDatePreset(value: unknown): value is DatePreset {
+  return namesByDatePreset.has(value as DatePreset);
+}
+
+/**
+ * Safe converter to DatePreset (numeric preset), returns undefined for invalid inputs.
+ */
+export function asDatePreset(value: unknown): DatePreset | undefined {
+  return isDatePreset(value) ? (value as DatePreset) : undefined;
+}
+
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-send-details",
   templateUrl: "./send-details.component.html",
@@ -68,7 +96,11 @@ export interface DatePresetSelectOption {
   ],
 })
 export class SendDetailsComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() config: SendFormConfig;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() originalSendView?: SendView;
 
   FileSendType = SendType.File;
@@ -147,11 +179,18 @@ export class SendDetailsComponent implements OnInit {
     const now = new Date();
     const selectedValue = this.sendDetailsForm.controls.selectedDeletionDatePreset.value;
 
+    // The form allows for custom date strings, if such is used, return it without worrying about DatePreset validation
     if (typeof selectedValue === "string") {
       return selectedValue;
     }
 
-    const milliseconds = now.setTime(now.getTime() + (selectedValue as number) * 60 * 60 * 1000);
+    // Otherwise, treat it as a preset and validate at runtime
+    const preset = asDatePreset(selectedValue);
+    if (!isDatePreset(preset)) {
+      return new Date(now).toString();
+    }
+
+    const milliseconds = now.setTime(now.getTime() + preset * 60 * 60 * 1000);
     return new Date(milliseconds).toString();
   }
 }
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html
index 724ebda0df8..60c78c7dece 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html
@@ -1,10 +1,10 @@
 <bit-section [formGroup]="sendFileDetailsForm">
-  <div *ngIf="config.mode === 'edit'">
+  <div *ngIf="config().mode === 'edit'">
     <div bitTypography="body2" class="tw-text-muted">{{ "file" | i18n }}</div>
-    <div data-testid="file-name">{{ originalSendView.file.fileName }}</div>
-    <div data-testid="file-size" class="tw-text-muted">{{ originalSendView.file.sizeName }}</div>
+    <div data-testid="file-name">{{ originalSendView().file.fileName }}</div>
+    <div data-testid="file-size" class="tw-text-muted">{{ originalSendView().file.sizeName }}</div>
   </div>
-  <bit-form-field *ngIf="config.mode !== 'edit'">
+  <bit-form-field *ngIf="config().mode !== 'edit'">
     <bit-label for="file">{{ "fileToShare" | i18n }}</bit-label>
     <div class="tw-flex tw-mt-2 tw-mb-1">
       <button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
index 9d967e15ba8..4e4900039c7 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
@@ -1,7 +1,5 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import { Component, Input, OnInit } from "@angular/core";
+import { Component, input, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, Validators, ReactiveFormsModule, FormsModule } from "@angular/forms";
 
@@ -19,6 +17,8 @@ import {
 import { SendFormConfig } from "../../abstractions/send-form-config.service";
 import { SendFormContainer } from "../../send-form-container";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-send-file-details",
   templateUrl: "./send-file-details.component.html",
@@ -34,8 +34,8 @@ import { SendFormContainer } from "../../send-form-container";
   ],
 })
 export class SendFileDetailsComponent implements OnInit {
-  @Input() config: SendFormConfig;
-  @Input() originalSendView?: SendView;
+  readonly config = input.required<SendFormConfig>();
+  readonly originalSendView = input<SendView>();
 
   sendFileDetailsForm = this.formBuilder.group({
     file: this.formBuilder.control<SendFileView | null>(null, Validators.required),
@@ -69,13 +69,13 @@ export class SendFileDetailsComponent implements OnInit {
   };
 
   ngOnInit() {
-    if (this.originalSendView) {
+    if (this.originalSendView()) {
       this.sendFileDetailsForm.patchValue({
-        file: this.originalSendView.file,
+        file: this.originalSendView()?.file,
       });
     }
 
-    if (!this.config.areSendsAllowed) {
+    if (!this.config().areSendsAllowed) {
       this.sendFileDetailsForm.disable();
     }
   }
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-text-details.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-details/send-text-details.component.ts
index ac8ee0c8d71..70a20ab63d8 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-text-details.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-text-details.component.ts
@@ -1,7 +1,5 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import { Component, Input, OnInit } from "@angular/core";
+import { Component, input, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, FormControl, Validators, ReactiveFormsModule } from "@angular/forms";
 
@@ -12,6 +10,8 @@ import { CheckboxModule, FormFieldModule, SectionComponent } from "@bitwarden/co
 import { SendFormConfig } from "../../abstractions/send-form-config.service";
 import { SendFormContainer } from "../../send-form-container";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-send-text-details",
   templateUrl: "./send-text-details.component.html",
@@ -25,8 +25,8 @@ import { SendFormContainer } from "../../send-form-container";
   ],
 })
 export class SendTextDetailsComponent implements OnInit {
-  @Input() config: SendFormConfig;
-  @Input() originalSendView?: SendView;
+  readonly config = input.required<SendFormConfig>();
+  readonly originalSendView = input<SendView>();
 
   sendTextDetailsForm = this.formBuilder.group({
     text: new FormControl("", Validators.required),
@@ -51,15 +51,13 @@ export class SendTextDetailsComponent implements OnInit {
     });
   }
 
-  ngOnInit() {
-    if (this.originalSendView) {
-      this.sendTextDetailsForm.patchValue({
-        text: this.originalSendView.text?.text || "",
-        hidden: this.originalSendView.text?.hidden || false,
-      });
-    }
+  async ngOnInit(): Promise<void> {
+    this.sendTextDetailsForm.patchValue({
+      text: this.originalSendView()?.text?.text || "",
+      hidden: this.originalSendView()?.text?.hidden || false,
+    });
 
-    if (!this.config.areSendsAllowed) {
+    if (!this.config().areSendsAllowed) {
       this.sendTextDetailsForm.disable();
     }
   }
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-form.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-form.component.ts
index b8593c735b7..fcd3b0cb7ea 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-form.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-form.component.ts
@@ -38,6 +38,8 @@ import { SendForm, SendFormContainer } from "../send-form-container";
 
 import { SendDetailsComponent } from "./send-details/send-details.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-send-form",
   templateUrl: "./send-form.component.html",
@@ -59,6 +61,8 @@ import { SendDetailsComponent } from "./send-details/send-details.component";
   ],
 })
 export class SendFormComponent implements AfterViewInit, OnInit, OnChanges, SendFormContainer {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(BitSubmitDirective)
   private bitSubmit: BitSubmitDirective;
   private destroyRef = inject(DestroyRef);
@@ -68,27 +72,37 @@ export class SendFormComponent implements AfterViewInit, OnInit, OnChanges, Send
   /**
    * The form ID to use for the form. Used to connect it to a submit button.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) formId: string;
 
   /**
    * The configuration for the add/edit form. Used to determine which controls are shown and what values are available.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) config: SendFormConfig;
 
   /**
    * Optional submit button that will be disabled or marked as loading when the form is submitting.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   submitBtn?: ButtonComponent;
 
   /**
    * Event emitted when the send is created successfully.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSendCreated = new EventEmitter<SendView>();
 
   /**
    * Event emitted when the send is updated successfully.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onSendUpdated = new EventEmitter<SendView>();
 
   /**
diff --git a/libs/tools/send/send-ui/src/send-form/services/default-send-form.service.ts b/libs/tools/send/send-ui/src/send-form/services/default-send-form.service.ts
index ab8d7bae9fe..1eb9e864fb7 100644
--- a/libs/tools/send/send-ui/src/send-form/services/default-send-form.service.ts
+++ b/libs/tools/send/send-ui/src/send-form/services/default-send-form.service.ts
@@ -1,7 +1,10 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { inject, Injectable } from "@angular/core";
+import { firstValueFrom } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { Send } from "@bitwarden/common/tools/send/models/domain/send";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
@@ -12,11 +15,13 @@ import { SendFormService } from "../abstractions/send-form.service";
 
 @Injectable()
 export class DefaultSendFormService implements SendFormService {
+  private accountService = inject(AccountService);
   private sendApiService: SendApiService = inject(SendApiService);
   private sendService = inject(SendService);
 
   async decryptSend(send: Send): Promise<SendView> {
-    return await send.decrypt();
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    return await send.decrypt(userId);
   }
 
   async saveSend(send: SendView, file: File | ArrayBuffer, config: SendFormConfig) {
diff --git a/libs/tools/send/send-ui/src/send-list-filters/send-list-filters.component.ts b/libs/tools/send/send-ui/src/send-list-filters/send-list-filters.component.ts
index b7c60145bbf..8de88282b7c 100644
--- a/libs/tools/send/send-ui/src/send-list-filters/send-list-filters.component.ts
+++ b/libs/tools/send/send-ui/src/send-list-filters/send-list-filters.component.ts
@@ -10,6 +10,8 @@ import { ChipSelectComponent } from "@bitwarden/components";
 
 import { SendListFiltersService } from "../services/send-list-filters.service";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-send-list-filters",
   templateUrl: "./send-list-filters.component.html",
diff --git a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
index 3442375315a..2ece050e8c3 100644
--- a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
+++ b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
@@ -1,6 +1,6 @@
 <bit-section *ngIf="sends?.length > 0" disableMargin>
   <bit-section-header>
-    <h2 class="tw-font-bold" bitTypography="h6">
+    <h2 class="tw-font-medium" bitTypography="h6">
       {{ headerText }}
     </h2>
     <span bitTypography="body1" slot="end">{{ sends.length }}</span>
diff --git a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts
index f67880eb73f..d885f279bc6 100644
--- a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts
+++ b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts
@@ -25,6 +25,8 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [
     CommonModule,
@@ -46,9 +48,13 @@ export class SendListItemsContainerComponent {
   /**
    * The list of sends to display.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   sends: SendView[] = [];
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   headerText: string;
 
diff --git a/libs/tools/send/send-ui/src/send-search/send-search.component.ts b/libs/tools/send/send-ui/src/send-search/send-search.component.ts
index 90b31a206fc..02cb5ef2eda 100644
--- a/libs/tools/send/send-ui/src/send-search/send-search.component.ts
+++ b/libs/tools/send/send-ui/src/send-search/send-search.component.ts
@@ -11,6 +11,8 @@ import { SendItemsService } from "../services/send-items.service";
 
 const SearchTextDebounceInterval = 200;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   imports: [CommonModule, SearchModule, JslibModule, FormsModule],
   selector: "tools-send-search",
diff --git a/libs/vault/src/cipher-form/cipher-form.stories.ts b/libs/vault/src/cipher-form/cipher-form.stories.ts
index 25494350dc3..cf52dbc557f 100644
--- a/libs/vault/src/cipher-form/cipher-form.stories.ts
+++ b/libs/vault/src/cipher-form/cipher-form.stories.ts
@@ -10,7 +10,7 @@ import {
   moduleMetadata,
   StoryObj,
 } from "@storybook/angular";
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, of } 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
@@ -28,6 +28,7 @@ import { ClientType } from "@bitwarden/common/enums";
 import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { SshKeyData } from "@bitwarden/common/vault/models/data/ssh-key.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
@@ -154,6 +155,20 @@ export default {
             } as NudgeStatus),
           },
         },
+        {
+          provide: CipherArchiveService,
+          useValue: {
+            userCanArchive$: of(false),
+          },
+        },
+        {
+          provide: AccountService,
+          useValue: {
+            activeAccount$: of({
+              name: "User 1",
+            }),
+          } as Partial<AccountService>,
+        },
         {
           provide: CipherFormService,
           useClass: TestAddEditFormService,
@@ -200,7 +215,9 @@ export default {
         {
           provide: DomainSettingsService,
           useValue: {
-            defaultUriMatchStrategy$: new BehaviorSubject(UriMatchStrategy.StartsWith),
+            resolvedDefaultUriMatchStrategy$: new BehaviorSubject(UriMatchStrategy.StartsWith),
+            defaultUriMatchStrategy$: new BehaviorSubject(UriMatchStrategy.Domain),
+            defaultUriMatchStrategyPolicy$: new BehaviorSubject(null),
           },
         },
         {
@@ -261,6 +278,12 @@ export default {
             policiesByType$: new BehaviorSubject([]),
           },
         },
+        {
+          provide: CipherArchiveService,
+          useValue: {
+            archiveWithServer: () => Promise.resolve(),
+          },
+        },
       ],
     }),
     componentWrapperDecorator(
diff --git a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
index 8f84a0d97ac..e026877a7dc 100644
--- a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
+++ b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
@@ -27,7 +27,7 @@
       *ngIf="!hasCustomFields && !isPartialEdit && allowNewField"
       (click)="addCustomField()"
     >
-      <i class="bwi bwi-plus tw-font-bold" aria-hidden="true"></i>
+      <i class="bwi bwi-plus tw-font-medium" aria-hidden="true"></i>
       {{ "addField" | i18n }}
     </button>
   </bit-card>
diff --git a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.spec.ts b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.spec.ts
index 16588f92807..6a574053367 100644
--- a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.spec.ts
@@ -13,11 +13,15 @@ import { CustomFieldsComponent } from "../custom-fields/custom-fields.component"
 
 import { AdditionalOptionsSectionComponent } from "./additional-options-section.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-custom-fields",
   template: "",
 })
 class MockCustomFieldsComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disableSectionMargin: boolean;
 }
 
@@ -28,7 +32,7 @@ describe("AdditionalOptionsSectionComponent", () => {
   let passwordRepromptService: MockProxy<PasswordRepromptService>;
   let passwordRepromptEnabled$: BehaviorSubject<boolean>;
 
-  const getInitialCipherView = jest.fn(() => null);
+  const getInitialCipherView = jest.fn((): any => null);
   const formStatusChange$ = new BehaviorSubject<"enabled" | "disabled">("enabled");
 
   beforeEach(async () => {
@@ -86,7 +90,10 @@ describe("AdditionalOptionsSectionComponent", () => {
     expect(cipherFormProvider.patchCipher).toHaveBeenCalled();
     const patchFn = cipherFormProvider.patchCipher.mock.lastCall[0];
 
-    const updated = patchFn(new CipherView());
+    const newCipher = new CipherView();
+    newCipher.creationDate = newCipher.revisionDate = expectedCipher.creationDate;
+
+    const updated = patchFn(newCipher);
 
     expect(updated).toEqual(expectedCipher);
   });
diff --git a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.ts b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.ts
index 3a7152bfe24..f37d4f71f63 100644
--- a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.ts
+++ b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.ts
@@ -21,6 +21,8 @@ import { PasswordRepromptService } from "../../../services/password-reprompt.ser
 import { CipherFormContainer } from "../../cipher-form-container";
 import { CustomFieldsComponent } from "../custom-fields/custom-fields.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-additional-options-section",
   templateUrl: "./additional-options-section.component.html",
@@ -39,6 +41,8 @@ import { CustomFieldsComponent } from "../custom-fields/custom-fields.component"
   ],
 })
 export class AdditionalOptionsSectionComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(CustomFieldsComponent) customFieldsComponent: CustomFieldsComponent;
 
   additionalOptionsForm = this.formBuilder.group({
@@ -56,6 +60,8 @@ export class AdditionalOptionsSectionComponent implements OnInit {
   /** True when the form is in `partial-edit` mode */
   isPartialEdit = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disableSectionMargin: boolean;
 
   /** True when the form allows new fields to be added */
diff --git a/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.spec.ts b/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.spec.ts
index 439c651e5ad..06f62976548 100644
--- a/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.spec.ts
@@ -26,13 +26,21 @@ import { FakeAccountService, mockAccountServiceWith } from "../../../../../commo
 import { CipherAttachmentsComponent } from "./cipher-attachments.component";
 import { DeleteAttachmentComponent } from "./delete-attachment/delete-attachment.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-download-attachment",
   template: "",
 })
 class MockDownloadAttachmentComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() attachment: AttachmentView;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cipher: CipherView;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() admin: boolean = false;
 }
 
@@ -240,6 +248,49 @@ describe("CipherAttachmentsComponent", () => {
           message: "maxFileSize",
         });
       });
+
+      it("shows error toast with server message when saveAttachmentWithServer fails", async () => {
+        const file = { size: 100 } as File;
+        component.attachmentForm.controls.file.setValue(file);
+
+        const serverError = new Error("Cipher has been modified by another client");
+        saveAttachmentWithServer.mockRejectedValue(serverError);
+
+        await component.submit();
+
+        expect(showToast).toHaveBeenCalledWith({
+          variant: "error",
+          message: "Cipher has been modified by another client",
+        });
+      });
+
+      it("shows error toast with fallback message when error has no message property", async () => {
+        const file = { size: 100 } as File;
+        component.attachmentForm.controls.file.setValue(file);
+
+        saveAttachmentWithServer.mockRejectedValue({ code: "UNKNOWN_ERROR" });
+
+        await component.submit();
+
+        expect(showToast).toHaveBeenCalledWith({
+          variant: "error",
+          message: "unexpectedError",
+        });
+      });
+
+      it("shows error toast with string error message", async () => {
+        const file = { size: 100 } as File;
+        component.attachmentForm.controls.file.setValue(file);
+
+        saveAttachmentWithServer.mockRejectedValue("Network connection failed");
+
+        await component.submit();
+
+        expect(showToast).toHaveBeenCalledWith({
+          variant: "error",
+          message: "Network connection failed",
+        });
+      });
     });
 
     describe("success", () => {
diff --git a/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.ts b/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.ts
index 0bcb31c7af9..56c3414a12e 100644
--- a/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.ts
+++ b/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.ts
@@ -56,6 +56,8 @@ type CipherAttachmentForm = FormGroup<{
   file: FormControl<File | null>;
 }>;
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-cipher-attachments",
   templateUrl: "./cipher-attachments.component.html",
@@ -77,27 +79,43 @@ export class CipherAttachmentsComponent implements OnInit, AfterViewInit {
   static attachmentFormID = "attachmentForm";
 
   /** Reference to the file HTMLInputElement */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("fileInput", { read: ElementRef }) private fileInput: ElementRef<HTMLInputElement>;
 
   /** Reference to the BitSubmitDirective */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(BitSubmitDirective) bitSubmit: BitSubmitDirective;
 
   /** The `id` of the cipher in context */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipherId: CipherId;
 
   /** The organization ID if this cipher belongs to an organization */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() organizationId?: OrganizationId;
 
   /** Denotes if the action is occurring from within the admin console */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() admin: boolean = false;
 
   /** An optional submit button, whose loading/disabled state will be tied to the form state. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() submitBtn?: ButtonComponent;
 
   /** Emits after a file has been successfully uploaded */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onUploadSuccess = new EventEmitter<void>();
 
   /** Emits after a file has been successfully removed */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onRemoveSuccess = new EventEmitter<void>();
 
   organization: Organization;
@@ -222,6 +240,19 @@ export class CipherAttachmentsComponent implements OnInit, AfterViewInit {
       this.onUploadSuccess.emit();
     } catch (e) {
       this.logService.error(e);
+
+      // Extract error message from server response, fallback to generic message
+      let errorMessage = this.i18nService.t("unexpectedError");
+      if (typeof e === "string") {
+        errorMessage = e;
+      } else if (e?.message) {
+        errorMessage = e.message;
+      }
+
+      this.toastService.showToast({
+        variant: "error",
+        message: errorMessage,
+      });
     }
   };
 
diff --git a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.spec.ts b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.spec.ts
index 941b3740952..4e3899407d2 100644
--- a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.spec.ts
@@ -68,7 +68,7 @@ describe("DeleteAttachmentComponent", () => {
   it("renders delete button", () => {
     const deleteButton = fixture.debugElement.query(By.css("button"));
 
-    expect(deleteButton.attributes["title"]).toBe("deleteAttachmentName");
+    expect(deleteButton.attributes["aria-label"]).toBe("deleteAttachmentName");
   });
 
   it("does not delete when the user cancels the dialog", async () => {
diff --git a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
index 1552ef9f30e..1bb3e071a0c 100644
--- a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
+++ b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
@@ -17,6 +17,8 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-delete-attachment",
   templateUrl: "./delete-attachment.component.html",
@@ -24,15 +26,23 @@ import {
 })
 export class DeleteAttachmentComponent {
   /** Id of the cipher associated with the attachment */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipherId!: string;
 
   /** The attachment that is can be deleted */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) attachment!: AttachmentView;
 
   /** Whether the attachment is being accessed from the admin console */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() admin: boolean = false;
 
   /** Emits when the attachment is successfully deleted */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onDeletionSuccess = new EventEmitter<void>();
 
   constructor(
@@ -66,7 +76,7 @@ export class DeleteAttachmentComponent {
 
       await this.cipherService.deleteAttachmentWithServer(
         this.cipherId,
-        this.attachment.id,
+        this.attachment.id!,
         activeUserId,
         this.admin,
       );
diff --git a/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.ts b/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.ts
index e63aa224149..3580b1fada8 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.ts
+++ b/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.ts
@@ -9,6 +9,7 @@ import {
   DialogService,
   DIALOG_DATA,
   DialogRef,
+  CenterPositionStrategy,
 } from "@bitwarden/components";
 
 export type AdvancedUriOptionDialogParams = {
@@ -17,6 +18,8 @@ export type AdvancedUriOptionDialogParams = {
   onContinue: () => void;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   templateUrl: "advanced-uri-option-dialog.component.html",
   imports: [ButtonLinkDirective, ButtonModule, DialogModule, JslibModule],
@@ -53,6 +56,7 @@ export class AdvancedUriOptionDialogComponent {
     return dialogService.open<boolean>(AdvancedUriOptionDialogComponent, {
       data: params,
       disableClose: true,
+      positionStrategy: new CenterPositionStrategy(),
     });
   }
 }
diff --git a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.html b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.html
index b83685aac94..f71ed1c53d3 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.html
+++ b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.html
@@ -29,7 +29,7 @@
       (click)="addUri({ uri: null, matchDetection: null }, true)"
       *ngIf="autofillOptionsForm.enabled"
     >
-      <i class="bwi bwi-plus tw-font-bold" aria-hidden="true"></i>
+      <i class="bwi bwi-plus tw-font-medium" aria-hidden="true"></i>
       {{ "addWebsite" | i18n }}
     </button>
 
diff --git a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.spec.ts b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.spec.ts
index 3654dc4fe18..6cc9d704831 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.spec.ts
@@ -34,16 +34,17 @@ describe("AutofillOptionsComponent", () => {
   let domainSettingsService: MockProxy<DomainSettingsService>;
   let autofillSettingsService: MockProxy<AutofillSettingsServiceAbstraction>;
   let platformUtilsService: MockProxy<PlatformUtilsService>;
-  const getInitialCipherView = jest.fn(() => null);
+  const getInitialCipherView = jest.fn((): any => null);
   const formStatusChange$ = new BehaviorSubject<"enabled" | "disabled">("enabled");
 
   beforeEach(async () => {
     getInitialCipherView.mockClear();
-    cipherFormContainer = mock<CipherFormContainer>({ getInitialCipherView, formStatusChange$ });
+    cipherFormContainer = mock<CipherFormContainer>({ getInitialCipherView });
+    cipherFormContainer.formStatusChange$ = formStatusChange$.asObservable();
     liveAnnouncer = mock<LiveAnnouncer>();
     platformUtilsService = mock<PlatformUtilsService>();
     domainSettingsService = mock<DomainSettingsService>();
-    domainSettingsService.defaultUriMatchStrategy$ = new BehaviorSubject(null);
+    domainSettingsService.resolvedDefaultUriMatchStrategy$ = new BehaviorSubject(null);
 
     autofillSettingsService = mock<AutofillSettingsServiceAbstraction>();
     autofillSettingsService.autofillOnPageLoadDefault$ = new BehaviorSubject(false);
@@ -201,12 +202,12 @@ describe("AutofillOptionsComponent", () => {
 
   it("updates the default autofill on page load label", () => {
     fixture.detectChanges();
-    expect(component["autofillOptions"][0].label).toEqual("defaultLabel no");
+    expect(component["autofillOptions"][0].label).toEqual("defaultLabelWithValue no");
 
     (autofillSettingsService.autofillOnPageLoadDefault$ as BehaviorSubject<boolean>).next(true);
     fixture.detectChanges();
 
-    expect(component["autofillOptions"][0].label).toEqual("defaultLabel yes");
+    expect(component["autofillOptions"][0].label).toEqual("defaultLabelWithValue yes");
   });
 
   it("hides the autofill on page load field when the setting is disabled", () => {
@@ -266,6 +267,23 @@ describe("AutofillOptionsComponent", () => {
     expect(component.autofillOptionsForm.value.uris.length).toEqual(1);
   });
 
+  it("does not emit events when status changes to prevent a `valueChanges` call", () => {
+    fixture.detectChanges();
+
+    const enable = jest.spyOn(component.autofillOptionsForm, "enable");
+    const disable = jest.spyOn(component.autofillOptionsForm, "disable");
+
+    formStatusChange$.next("disabled");
+    fixture.detectChanges();
+
+    expect(disable).toHaveBeenCalledWith({ emitEvent: false });
+
+    formStatusChange$.next("enabled");
+    fixture.detectChanges();
+
+    expect(enable).toHaveBeenCalledWith({ emitEvent: false });
+  });
+
   describe("Drag & Drop Functionality", () => {
     beforeEach(() => {
       // Prevent auto‑adding an empty URI by setting a non‑null initial value.
diff --git a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.ts b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.ts
index 213fe227cdf..64e3d44a18c 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.ts
+++ b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.ts
@@ -36,6 +36,8 @@ interface UriField {
   matchDetection: UriMatchStrategySetting;
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-autofill-options",
   templateUrl: "./autofill-options.component.html",
@@ -60,6 +62,8 @@ export class AutofillOptionsComponent implements OnInit {
   /**
    * List of rendered UriOptionComponents. Used for focusing newly added Uri inputs.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChildren(UriOptionComponent)
   protected uriOptions: QueryList<UriOptionComponent>;
 
@@ -76,10 +80,12 @@ export class AutofillOptionsComponent implements OnInit {
     return this.cipherFormContainer.config.mode === "partial-edit";
   }
 
-  protected defaultMatchDetection$ = this.domainSettingsService.defaultUriMatchStrategy$.pipe(
-    // The default match detection should only be shown when used on the browser
-    filter(() => this.platformUtilsService.getClientType() == ClientType.Browser),
-  );
+  protected defaultMatchDetection$ =
+    this.domainSettingsService.resolvedDefaultUriMatchStrategy$.pipe(
+      // The default match detection should only be shown when used on the browser
+      filter(() => this.platformUtilsService.getClientType() == ClientType.Browser),
+    );
+
   protected autofillOnPageLoadEnabled$ = this.autofillSettingsService.autofillOnPageLoad$;
 
   protected autofillOptions: { label: string; value: boolean | null }[] = [
@@ -134,9 +140,9 @@ export class AutofillOptionsComponent implements OnInit {
     this.cipherFormContainer.formStatusChange$.pipe(takeUntilDestroyed()).subscribe((status) => {
       // Disable adding new URIs when the cipher form is disabled
       if (status === "disabled") {
-        this.autofillOptionsForm.disable();
+        this.autofillOptionsForm.disable({ emitEvent: false });
       } else if (!this.isPartialEdit) {
-        this.autofillOptionsForm.enable();
+        this.autofillOptionsForm.enable({ emitEvent: false });
       }
     });
   }
@@ -212,7 +218,10 @@ export class AutofillOptionsComponent implements OnInit {
           return;
         }
 
-        this.autofillOptions[0].label = this.i18nService.t("defaultLabel", defaultOption.label);
+        this.autofillOptions[0].label = this.i18nService.t(
+          "defaultLabelWithValue",
+          defaultOption.label,
+        );
         // Trigger change detection to update the label in the template
         this.autofillOptions = [...this.autofillOptions];
       });
diff --git a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts
index 0d7f3663967..ed70b4381d2 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts
@@ -77,19 +77,19 @@ describe("UriOptionComponent", () => {
     component.defaultMatchDetection = UriMatchStrategy.Domain;
     fixture.detectChanges();
 
-    expect(component["uriMatchOptions"][0].label).toBe("defaultLabel baseDomain");
+    expect(component["uriMatchOptions"][0].label).toBe("defaultLabelWithValue baseDomain");
   });
 
   it("should update the default uri match strategy label", () => {
     component.defaultMatchDetection = UriMatchStrategy.Exact;
     fixture.detectChanges();
 
-    expect(component["uriMatchOptions"][0].label).toBe("defaultLabel exact");
+    expect(component["uriMatchOptions"][0].label).toBe("defaultLabelWithValue exact");
 
     component.defaultMatchDetection = UriMatchStrategy.StartsWith;
     fixture.detectChanges();
 
-    expect(component["uriMatchOptions"][0].label).toBe("defaultLabel startsWith");
+    expect(component["uriMatchOptions"][0].label).toBe("defaultLabelWithValue startsWith");
   });
 
   it("should focus the uri input when focusInput is called", () => {
@@ -149,13 +149,17 @@ describe("UriOptionComponent", () => {
       expect(getMatchDetectionSelect()).not.toBeNull();
     });
 
-    it("should update the match detection button title when the toggle is clicked", () => {
+    it("should update the match detection button aria-label when the toggle is clicked", () => {
       component.writeValue({ uri: "https://example.com", matchDetection: UriMatchStrategy.Exact });
       fixture.detectChanges();
-      expect(getToggleMatchDetectionBtn().title).toBe("showMatchDetection https://example.com");
+      expect(getToggleMatchDetectionBtn().getAttribute("aria-label")).toBe(
+        "showMatchDetection https://example.com",
+      );
       getToggleMatchDetectionBtn().click();
       fixture.detectChanges();
-      expect(getToggleMatchDetectionBtn().title).toBe("hideMatchDetection https://example.com");
+      expect(getToggleMatchDetectionBtn().getAttribute("aria-label")).toBe(
+        "hideMatchDetection https://example.com",
+      );
     });
   });
 
diff --git a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts
index 8b6b6a6490b..34ac284c3f3 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts
+++ b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts
@@ -36,6 +36,8 @@ import {
 
 import { AdvancedUriOptionDialogComponent } from "./advanced-uri-option-dialog.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-autofill-uri-option",
   templateUrl: "./uri-option.component.html",
@@ -58,9 +60,13 @@ import { AdvancedUriOptionDialogComponent } from "./advanced-uri-option-dialog.c
   ],
 })
 export class UriOptionComponent implements ControlValueAccessor {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("uriInput")
   private inputElement: ElementRef<HTMLInputElement>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("matchDetectionSelect")
   private matchDetectionSelect: SelectComponent<UriMatchStrategySetting>;
 
@@ -92,18 +98,24 @@ export class UriOptionComponent implements ControlValueAccessor {
   /**
    * Whether the option can be reordered. If false, the reorder button will be hidden.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   canReorder: boolean;
 
   /**
    * Whether the URI can be removed from the form. If false, the remove button will be hidden.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   canRemove: boolean;
 
   /**
    * The user's current default match detection strategy. Will be displayed in () after "Default"
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   set defaultMatchDetection(value: UriMatchStrategySetting) {
     // The default selection has a value of `null` avoid showing "Default (Default)"
@@ -112,7 +124,7 @@ export class UriOptionComponent implements ControlValueAccessor {
     }
 
     this.uriMatchOptions[0].label = this.i18nService.t(
-      "defaultLabel",
+      "defaultLabelWithValue",
       this.uriMatchOptions.find((o) => o.value === value)?.label,
     );
   }
@@ -120,14 +132,20 @@ export class UriOptionComponent implements ControlValueAccessor {
   /**
    * The index of the URI in the form. Used to render the correct label.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) index: number;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   onKeydown = new EventEmitter<KeyboardEvent>();
 
   /**
    * Emits when the remove button is clicked and URI should be removed from the form.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   remove = new EventEmitter<void>();
 
diff --git a/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.spec.ts b/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.spec.ts
index 32baad189cf..4b0cd0f5f90 100644
--- a/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.spec.ts
@@ -20,7 +20,7 @@ describe("CardDetailsSectionComponent", () => {
   let registerChildFormSpy: jest.SpyInstance;
   let patchCipherSpy: jest.SpyInstance;
 
-  const getInitialCipherView = jest.fn(() => null);
+  const getInitialCipherView = jest.fn((): any => null);
 
   beforeEach(async () => {
     cipherFormProvider = mock<CipherFormContainer>({ getInitialCipherView });
@@ -67,6 +67,7 @@ describe("CardDetailsSectionComponent", () => {
     cardView.brand = "Visa";
     cardView.expMonth = "";
     cardView.code = "";
+    cardView.expYear = "";
 
     expect(patchCipherSpy).toHaveBeenCalled();
     const patchFn = patchCipherSpy.mock.lastCall[0];
@@ -85,6 +86,7 @@ describe("CardDetailsSectionComponent", () => {
     cardView.number = "";
     cardView.expMonth = "";
     cardView.code = "";
+    cardView.brand = "";
     cardView.expYear = "2022";
 
     expect(patchCipherSpy).toHaveBeenCalled();
@@ -122,8 +124,6 @@ describe("CardDetailsSectionComponent", () => {
       number,
       code,
       brand: cardView.brand,
-      expMonth: null,
-      expYear: null,
     });
   });
 
diff --git a/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.ts b/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.ts
index a71f57481ff..5fa8d0af131 100644
--- a/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.ts
@@ -23,6 +23,8 @@ import {
 
 import { CipherFormContainer } from "../../cipher-form-container";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-card-details-section",
   templateUrl: "./card-details-section.component.html",
@@ -40,9 +42,13 @@ import { CipherFormContainer } from "../../cipher-form-container";
 })
 export class CardDetailsSectionComponent implements OnInit {
   /** The original cipher */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() originalCipherView: CipherView;
 
   /** True when all fields should be disabled */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled: boolean;
 
   /**
@@ -52,12 +58,12 @@ export class CardDetailsSectionComponent implements OnInit {
    * leaving as just null gets inferred as `unknown`
    */
   cardDetailsForm = this.formBuilder.group({
-    cardholderName: null as string | null,
-    number: null as string | null,
-    brand: null as string | null,
-    expMonth: null as string | null,
-    expYear: null as string | number | null,
-    code: null as string | null,
+    cardholderName: "",
+    number: "",
+    brand: "",
+    expMonth: "",
+    expYear: "" as string | number,
+    code: "",
   });
 
   /** Available Card Brands */
@@ -110,16 +116,14 @@ export class CardDetailsSectionComponent implements OnInit {
       .pipe(takeUntilDestroyed())
       .subscribe(({ cardholderName, number, brand, expMonth, expYear, code }) => {
         this.cipherFormContainer.patchCipher((cipher) => {
-          const expirationYear = normalizeExpiryYearFormat(expYear);
+          const expirationYear = normalizeExpiryYearFormat(expYear) ?? "";
 
-          Object.assign(cipher.card, {
-            cardholderName,
-            number,
-            brand,
-            expMonth,
-            expYear: expirationYear,
-            code,
-          });
+          cipher.card.cardholderName = cardholderName;
+          cipher.card.number = number;
+          cipher.card.brand = brand;
+          cipher.card.expMonth = expMonth;
+          cipher.card.expYear = expirationYear;
+          cipher.card.code = code;
 
           return cipher;
         });
@@ -167,6 +171,7 @@ export class CardDetailsSectionComponent implements OnInit {
       expMonth: this.initialValues?.expMonth || "",
       expYear: this.initialValues?.expYear || "",
       code: this.initialValues?.code || "",
+      brand: CardView.getCardBrandByPatterns(this.initialValues?.number) || "",
     });
   }
 
@@ -195,18 +200,4 @@ export class CardDetailsSectionComponent implements OnInit {
       );
     }
   }
-
-  /** Set form initial form values from the current cipher */
-  private setInitialValues(cipherView: CipherView) {
-    const { cardholderName, number, brand, expMonth, expYear, code } = cipherView.card;
-
-    this.cardDetailsForm.setValue({
-      cardholderName: cardholderName,
-      number: number,
-      brand: brand,
-      expMonth: expMonth,
-      expYear: expYear,
-      code: code,
-    });
-  }
 }
diff --git a/libs/vault/src/cipher-form/components/cipher-form.component.spec.ts b/libs/vault/src/cipher-form/components/cipher-form.component.spec.ts
index 970e6b1fb9a..1e60ad91fb1 100644
--- a/libs/vault/src/cipher-form/components/cipher-form.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/cipher-form.component.spec.ts
@@ -2,10 +2,13 @@ import { ChangeDetectorRef } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { ReactiveFormsModule } from "@angular/forms";
 import { mock } from "jest-mock-extended";
+import { Observable, of } from "rxjs";
 
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
+import { Account, 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 { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { Fido2CredentialView } from "@bitwarden/common/vault/models/view/fido2-credential.view";
@@ -23,6 +26,10 @@ describe("CipherFormComponent", () => {
 
   const decryptCipher = jest.fn().mockResolvedValue(new CipherView());
 
+  const mockAccountService = mock<AccountService>();
+  const mockCipherArchiveService = mock<CipherArchiveService>();
+  const mockAddEditFormService = { saveCipher: jest.fn(), decryptCipher };
+
   beforeEach(async () => {
     decryptCipher.mockClear();
 
@@ -32,13 +39,15 @@ describe("CipherFormComponent", () => {
         { provide: ChangeDetectorRef, useValue: {} },
         { provide: I18nService, useValue: { t: (key: string) => key } },
         { provide: ToastService, useValue: { showToast: jest.fn() } },
-        { provide: CipherFormService, useValue: { saveCipher: jest.fn(), decryptCipher } },
+        { provide: CipherFormService, useValue: mockAddEditFormService },
         {
           provide: CipherFormCacheService,
           useValue: { init: jest.fn(), getCachedCipherView: jest.fn() },
         },
-        { provide: ViewCacheService, useValue: { signal: jest.fn(() => () => null) } },
+        { provide: ViewCacheService, useValue: { signal: jest.fn(() => (): any => null) } },
         { provide: ConfigService, useValue: mock<ConfigService>() },
+        { provide: AccountService, useValue: mockAccountService },
+        { provide: CipherArchiveService, useValue: mockCipherArchiveService },
       ],
     }).compileComponents();
   });
@@ -53,6 +62,29 @@ describe("CipherFormComponent", () => {
     expect(component).toBeTruthy();
   });
 
+  describe("submit", () => {
+    beforeEach(() => {
+      component.config = { mode: "edit" } as CipherFormConfig;
+
+      component["updatedCipherView"] = new CipherView();
+      component["updatedCipherView"].archivedDate = new Date();
+    });
+
+    it("should remove archivedDate when user cannot archive and cipher is archived", async () => {
+      mockAccountService.activeAccount$ = of({ id: "user-id" }) as Observable<Account | null>;
+      mockCipherArchiveService.userCanArchive$.mockReturnValue(of(false));
+      mockAddEditFormService.saveCipher = jest.fn().mockResolvedValue(new CipherView());
+
+      const originalArchivedDate = component["updatedCipherView"]?.archivedDate;
+      expect(originalArchivedDate).not.toBeNull();
+
+      await component.submit();
+
+      expect(component["updatedCipherView"]?.archivedDate).toBeNull();
+      expect(mockCipherArchiveService.userCanArchive$).toHaveBeenCalledWith("user-id");
+    });
+  });
+
   describe("website", () => {
     it("should return null if updatedCipherView is null", () => {
       component["updatedCipherView"] = null as any;
@@ -121,6 +153,15 @@ describe("CipherFormComponent", () => {
 
       expect(component["updatedCipherView"]?.login.fido2Credentials).toBeNull();
     });
+
+    it("does not clear archiveDate on updatedCipherView", async () => {
+      cipherView.archivedDate = new Date();
+      decryptCipher.mockResolvedValue(cipherView);
+
+      await component.ngOnInit();
+
+      expect(component["updatedCipherView"]?.archivedDate).toBe(cipherView.archivedDate);
+    });
   });
 
   describe("enableFormFields", () => {
diff --git a/libs/vault/src/cipher-form/components/cipher-form.component.ts b/libs/vault/src/cipher-form/components/cipher-form.component.ts
index 19e7f9d2d90..f94af25e90a 100644
--- a/libs/vault/src/cipher-form/components/cipher-form.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-form.component.ts
@@ -17,9 +17,12 @@ import {
 } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms";
-import { BehaviorSubject, Subject } from "rxjs";
+import { BehaviorSubject, firstValueFrom, Subject, switchMap } from "rxjs";
 
+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 { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherType, SecureNoteType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
@@ -46,6 +49,8 @@ import { LoginDetailsSectionComponent } from "./login-details-section/login-deta
 import { NewItemNudgeComponent } from "./new-item-nudge/new-item-nudge.component";
 import { SshKeySectionComponent } from "./sshkey-section/sshkey-section.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-cipher-form",
   templateUrl: "./cipher-form.component.html",
@@ -76,6 +81,8 @@ import { SshKeySectionComponent } from "./sshkey-section/sshkey-section.componen
   ],
 })
 export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, CipherFormContainer {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(BitSubmitDirective)
   private bitSubmit: BitSubmitDirective;
   private destroyRef = inject(DestroyRef);
@@ -84,38 +91,52 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
   /**
    * The form ID to use for the form. Used to connect it to a submit button.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) formId: string;
 
   /**
    * The configuration for the add/edit form. Used to determine which controls are shown and what values are available.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) config: CipherFormConfig;
 
   /**
    * Optional submit button that will be disabled or marked as loading when the form is submitting.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   submitBtn?: ButtonComponent;
 
   /**
    * Optional function to call before submitting the form. If the function returns false, the form will not be submitted.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   beforeSubmit: () => Promise<boolean>;
 
   /**
    * Event emitted when the cipher is saved successfully.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() cipherSaved = new EventEmitter<CipherView>();
 
   private formReadySubject = new Subject<void>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() formReady = this.formReadySubject.asObservable();
 
   /**
    * Emitted when the form is enabled
    */
   private formStatusChangeSubject = new BehaviorSubject<"enabled" | "disabled" | null>(null);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() formStatusChange$ = this.formStatusChangeSubject.asObservable();
 
   /**
@@ -301,6 +322,8 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
     private i18nService: I18nService,
     private changeDetectorRef: ChangeDetectorRef,
     private cipherFormCacheService: CipherFormCacheService,
+    private cipherArchiveService: CipherArchiveService,
+    private accountService: AccountService,
   ) {}
 
   /**
@@ -342,6 +365,18 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
       }
     }
 
+    const userCanArchive = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(
+        getUserId,
+        switchMap((userId) => this.cipherArchiveService.userCanArchive$(userId)),
+      ),
+    );
+
+    // If the item is archived but user has lost archive permissions, unarchive the item.
+    if (!userCanArchive && this.updatedCipherView.archivedDate) {
+      this.updatedCipherView.archivedDate = null;
+    }
+
     const savedCipher = await this.addEditFormService.saveCipher(
       this.updatedCipherView,
       this.config,
diff --git a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.spec.ts b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.spec.ts
index e98e4805d19..bc2b86f01ff 100644
--- a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.spec.ts
@@ -6,19 +6,27 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { GeneratorModule } from "@bitwarden/generator-components";
 import { CipherFormGeneratorComponent } from "@bitwarden/vault";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-password-generator",
   template: `<ng-content></ng-content>`,
 })
 class MockPasswordGeneratorComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onGenerated = new EventEmitter();
 }
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "tools-username-generator",
   template: `<ng-content></ng-content>`,
 })
 class MockUsernameGeneratorComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onGenerated = new EventEmitter();
 }
 
diff --git a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
index f1e4c5c177c..e053dd96973 100644
--- a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
@@ -9,30 +9,42 @@ import { AlgorithmInfo, GeneratedCredential } from "@bitwarden/generator-core";
  * Renders a password or username generator UI and emits the most recently generated value.
  * Used by the cipher form to be shown in a dialog/modal when generating cipher passwords/usernames.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-cipher-form-generator",
   templateUrl: "./cipher-form-generator.component.html",
   imports: [CommonModule, GeneratorModule],
 })
 export class CipherFormGeneratorComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   uri: string = "";
 
   /**
    * The type of generator form to show.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   type: "password" | "username" = "password";
 
   /** Removes bottom margin of internal sections */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: coerceBooleanProperty }) disableMargin = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   algorithmSelected = new EventEmitter<AlgorithmInfo>();
 
   /**
    * Emits an event when a new value is generated.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   valueGenerated = new EventEmitter<string>();
 
diff --git a/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.ts b/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.ts
index 7d56db4366b..81720f8e612 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.ts
@@ -28,6 +28,8 @@ export type AddEditCustomFieldDialogData = {
   disallowHiddenField?: boolean;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-add-edit-custom-field-dialog",
   templateUrl: "./add-edit-custom-field-dialog.component.html",
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
index c5c1b752aef..2ba8b0c76d3 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
@@ -119,7 +119,7 @@
         data-testid="add-field-button"
         *ngIf="!isPartialEdit && !parentFormDisabled"
       >
-        <i class="bwi bwi-plus tw-font-bold" aria-hidden="true"></i>
+        <i class="bwi bwi-plus tw-font-medium" aria-hidden="true"></i>
         {{ "addField" | i18n }}
       </button>
     </bit-card>
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index 12e83b052bd..b07d17af7d0 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -68,6 +68,8 @@ export type CustomField = {
   newField: boolean;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-custom-fields",
   templateUrl: "./custom-fields.component.html",
@@ -88,10 +90,16 @@ export type CustomField = {
   ],
 })
 export class CustomFieldsComponent implements OnInit, AfterViewInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() numberOfFieldsChange = new EventEmitter<number>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChildren("customFieldRow") customFieldRows: QueryList<ElementRef<HTMLDivElement>>;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disableSectionMargin: boolean;
 
   customFieldsForm = this.formBuilder.group({
@@ -386,7 +394,7 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
       fieldView.type = field.type;
       fieldView.name = field.name;
       fieldView.value = value;
-      fieldView.linkedId = field.linkedId;
+      fieldView.linkedId = field.linkedId ?? undefined;
       return fieldView;
     });
 
diff --git a/libs/vault/src/cipher-form/components/identity/identity.component.html b/libs/vault/src/cipher-form/components/identity/identity.component.html
index 7f49bc21a10..2489977f63f 100644
--- a/libs/vault/src/cipher-form/components/identity/identity.component.html
+++ b/libs/vault/src/cipher-form/components/identity/identity.component.html
@@ -144,7 +144,7 @@
       </bit-form-field>
       <bit-form-field>
         <bit-label>
-          {{ "zipPostalCode" | i18n }}
+          {{ "zipPostalCodeLabel" | i18n }}
         </bit-label>
         <input bitInput formControlName="postalCode" />
       </bit-form-field>
diff --git a/libs/vault/src/cipher-form/components/identity/identity.component.ts b/libs/vault/src/cipher-form/components/identity/identity.component.ts
index 119ce1caf6e..642a0cc4aff 100644
--- a/libs/vault/src/cipher-form/components/identity/identity.component.ts
+++ b/libs/vault/src/cipher-form/components/identity/identity.component.ts
@@ -21,6 +21,8 @@ import {
 
 import { CipherFormContainer } from "../../cipher-form-container";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-identity-section",
   templateUrl: "./identity.component.html",
@@ -38,7 +40,11 @@ import { CipherFormContainer } from "../../cipher-form-container";
   ],
 })
 export class IdentitySectionComponent implements OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() originalCipherView: CipherView;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled: boolean;
   identityTitleOptions = [
     { name: "-- " + this.i18nService.t("select") + " --", value: null },
@@ -172,7 +178,7 @@ export class IdentitySectionComponent implements OnInit {
   populateFormData(cipherView: CipherView) {
     const { identity } = cipherView;
 
-    this.identityForm.setValue({
+    this.identityForm.patchValue({
       title: identity.title,
       firstName: identity.firstName,
       middleName: identity.middleName,
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 c41e58f679e..e40231ce801 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
@@ -7,7 +7,7 @@ import { BehaviorSubject, of } 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 { CollectionTypes, CollectionView } from "@bitwarden/admin-console/common";
+import { CollectionType, CollectionTypes, CollectionView } from "@bitwarden/admin-console/common";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
@@ -33,6 +33,7 @@ const createMockCollection = (
   organizationId: string,
   readOnly = false,
   canEdit = true,
+  type: CollectionType = CollectionTypes.DefaultUserCollection,
 ): CollectionView => {
   const cv = new CollectionView({
     name,
@@ -41,7 +42,7 @@ const createMockCollection = (
   });
   cv.readOnly = readOnly;
   cv.manage = true;
-  cv.type = CollectionTypes.DefaultUserCollection;
+  cv.type = type;
   cv.externalId = "";
   cv.hidePasswords = false;
   cv.assigned = true;
@@ -134,7 +135,7 @@ describe("ItemDetailsSectionComponent", () => {
       tick();
 
       expect(cipherFormProvider.patchCipher).toHaveBeenCalled();
-      const patchFn = cipherFormProvider.patchCipher.mock.lastCall[0];
+      const patchFn = cipherFormProvider.patchCipher.mock.lastCall![0];
 
       const updatedCipher = patchFn(new CipherView());
 
@@ -164,7 +165,7 @@ describe("ItemDetailsSectionComponent", () => {
       tick();
 
       expect(cipherFormProvider.patchCipher).toHaveBeenCalled();
-      const patchFn = cipherFormProvider.patchCipher.mock.lastCall[0];
+      const patchFn = cipherFormProvider.patchCipher.mock.lastCall![0];
 
       const updatedCipher = patchFn(new CipherView());
 
@@ -439,7 +440,7 @@ describe("ItemDetailsSectionComponent", () => {
       await fixture.whenStable();
 
       expect(cipherFormProvider.patchCipher).toHaveBeenCalled();
-      const patchFn = cipherFormProvider.patchCipher.mock.lastCall[0];
+      const patchFn = cipherFormProvider.patchCipher.mock.lastCall![0];
 
       const updatedCipher = patchFn(new CipherView());
 
@@ -519,6 +520,42 @@ describe("ItemDetailsSectionComponent", () => {
 
       expect(component["collectionOptions"].map((c) => c.id)).toEqual(["col1", "col2", "col3"]);
     });
+
+    it("should exclude default collections when the cipher is only assigned to shared collections", async () => {
+      component.config.admin = false;
+      component.config.organizationDataOwnershipDisabled = true;
+      component.config.organizations = [{ id: "org1" } as Organization];
+      component.config.collections = new Array(4)
+        .fill(null)
+        .map((_, i) => i + 1)
+        .map(
+          (i) =>
+            createMockCollection(
+              `col${i}`,
+              `Collection ${i}`,
+              "org1",
+              false,
+              false,
+              i < 4 ? CollectionTypes.SharedCollection : CollectionTypes.DefaultUserCollection,
+            ) as CollectionView,
+        );
+      component.originalCipherView = {
+        name: "cipher1",
+        organizationId: "org1",
+        folderId: "folder1",
+        collectionIds: ["col2", "col3"],
+        favorite: true,
+      } as CipherView;
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      component.itemDetailsForm.controls.organizationId.setValue("org1");
+
+      fixture.detectChanges();
+      await fixture.whenStable();
+
+      expect(component["collectionOptions"].map((c) => c.id)).toEqual(["col1", "col2", "col3"]);
+    });
   });
 
   describe("readonlyCollections", () => {
@@ -603,6 +640,46 @@ describe("ItemDetailsSectionComponent", () => {
     });
   });
 
+  describe("initFromExistingCipher", () => {
+    it("should set organizationId to null when prefillCipher.organizationId is undefined", async () => {
+      component.config.organizationDataOwnershipDisabled = true;
+      component.config.organizations = [{ id: "org1" } as Organization];
+
+      const prefillCipher = {
+        name: "Test Cipher",
+        organizationId: undefined,
+        folderId: null,
+        collectionIds: [],
+        favorite: false,
+      } as unknown as CipherView;
+
+      getInitialCipherView.mockReturnValueOnce(prefillCipher);
+
+      await component.ngOnInit();
+
+      expect(component.itemDetailsForm.controls.organizationId.value).toBeNull();
+    });
+
+    it("should preserve organizationId when prefillCipher.organizationId has a value", async () => {
+      component.config.organizationDataOwnershipDisabled = true;
+      component.config.organizations = [{ id: "org1", name: "Organization 1" } as Organization];
+
+      const prefillCipher = {
+        name: "Test Cipher",
+        organizationId: "org1",
+        folderId: null,
+        collectionIds: [],
+        favorite: false,
+      } as unknown as CipherView;
+
+      getInitialCipherView.mockReturnValueOnce(prefillCipher);
+
+      await component.ngOnInit();
+
+      expect(component.itemDetailsForm.controls.organizationId.value).toBe("org1");
+    });
+  });
+
   describe("form status when editing a cipher", () => {
     beforeEach(() => {
       component.config.mode = "edit";
@@ -654,6 +731,35 @@ describe("ItemDetailsSectionComponent", () => {
           expect(enableFormFields).toHaveBeenCalled();
         });
       });
+
+      describe("setFormState behavior with null/undefined", () => {
+        it("calls disableFormFields when organizationId value is null", async () => {
+          component.originalCipherView.organizationId = null as any;
+          getInitialCipherView.mockReturnValue(component.originalCipherView);
+
+          await component.ngOnInit();
+
+          expect(disableFormFields).toHaveBeenCalled();
+        });
+
+        it("calls disableFormFields when organizationId value is undefined", async () => {
+          component.originalCipherView.organizationId = undefined;
+          getInitialCipherView.mockReturnValue(component.originalCipherView);
+
+          await component.ngOnInit();
+
+          expect(disableFormFields).toHaveBeenCalled();
+        });
+
+        it("calls enableFormFields when organizationId has a string value", async () => {
+          component.originalCipherView.organizationId = "org-id" as any;
+          getInitialCipherView.mockReturnValue(component.originalCipherView);
+
+          await component.ngOnInit();
+
+          expect(enableFormFields).toHaveBeenCalled();
+        });
+      });
     });
 
     describe("when an ownership change is not allowed", () => {
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
index 6af2fa19e26..6fd74d86525 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
@@ -4,7 +4,7 @@ import { CommonModule } from "@angular/common";
 import { Component, DestroyRef, Input, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms";
-import { concatMap, firstValueFrom, map } from "rxjs";
+import { concatMap, distinctUntilChanged, firstValueFrom, map } 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
@@ -37,6 +37,8 @@ import {
 } from "../../abstractions/cipher-form-config.service";
 import { CipherFormContainer } from "../../cipher-form-container";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-item-details-section",
   templateUrl: "./item-details-section.component.html",
@@ -84,9 +86,13 @@ export class ItemDetailsSectionComponent implements OnInit {
 
   protected favoriteButtonDisabled = false;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true })
   config: CipherFormConfig;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input()
   originalCipherView: CipherView;
 
@@ -125,7 +131,7 @@ export class ItemDetailsSectionComponent implements OnInit {
       this.itemDetailsForm.controls.organizationId.disabled ||
       (!this.allowPersonalOwnership &&
         this.config.originalCipher &&
-        this.itemDetailsForm.controls.organizationId.value === null)
+        this.itemDetailsForm.controls.organizationId.value == null)
     );
   }
 
@@ -236,6 +242,7 @@ export class ItemDetailsSectionComponent implements OnInit {
     this.itemDetailsForm.controls.organizationId.valueChanges
       .pipe(
         takeUntilDestroyed(this.destroyRef),
+        distinctUntilChanged(),
         concatMap(async () => {
           await this.updateCollectionOptions();
           this.setFormState();
@@ -252,7 +259,7 @@ export class ItemDetailsSectionComponent implements OnInit {
       // When editing a cipher and the user cannot have personal ownership
       // and the cipher is is not within the organization - force the user to
       // move the cipher within the organization first before editing any other field
-      if (this.itemDetailsForm.controls.organizationId.value === null) {
+      if (this.itemDetailsForm.controls.organizationId.value == null) {
         this.cipherFormContainer.disableFormFields();
         this.itemDetailsForm.controls.organizationId.enable();
         this.favoriteButtonDisabled = true;
@@ -312,9 +319,12 @@ export class ItemDetailsSectionComponent implements OnInit {
   private async initFromExistingCipher(prefillCipher: CipherView) {
     const { name, folderId, collectionIds } = prefillCipher;
 
-    this.itemDetailsForm.setValue({
+    this.itemDetailsForm.patchValue({
       name: name ? name : (this.initialValues?.name ?? ""),
-      organizationId: prefillCipher.organizationId, // We do not allow changing ownership of an existing cipher.
+      // We do not allow changing ownership of an existing cipher.
+      // Angular forms do not support `undefined` as a value for a form control,
+      // force `null` if `organizationId` is undefined.
+      organizationId: prefillCipher.organizationId ?? null,
       folderId: folderId ? folderId : (this.initialValues?.folderId ?? null),
       collectionIds: [],
       favorite: prefillCipher.favorite,
@@ -406,6 +416,17 @@ export class ItemDetailsSectionComponent implements OnInit {
       this.showCollectionsControl = true;
     }
 
+    /**
+     * Determine if the the cipher is only assigned to shared collections.
+     * i.e. The cipher is not assigned to a default collections.
+     * Note: `.every` will return true for an empty array
+     */
+    const cipherIsOnlyInOrgCollections =
+      (this.originalCipherView?.collectionIds ?? []).length > 0 &&
+      this.originalCipherView.collectionIds.every(
+        (cId) =>
+          this.collections.find((c) => c.id === cId)?.type === CollectionTypes.SharedCollection,
+      );
     this.collectionOptions = this.collections
       .filter((c) => {
         // The collection belongs to the organization
@@ -423,10 +444,17 @@ export class ItemDetailsSectionComponent implements OnInit {
           return true;
         }
 
+        // When the cipher is only assigned to shared collections, do not allow a user to
+        // move it back to a default collection. Exclude the default collection from the list.
+        if (cipherIsOnlyInOrgCollections && c.type === CollectionTypes.DefaultUserCollection) {
+          return false;
+        }
+
         // Non-admins can only select assigned collections that are not read only. (Non-AC)
         return c.assigned && !c.readOnly;
       })
       .sort((a, b) => {
+        // Show default collection first
         const aIsDefaultCollection = a.type === CollectionTypes.DefaultUserCollection ? -1 : 0;
         const bIsDefaultCollection = b.type === CollectionTypes.DefaultUserCollection ? -1 : 0;
         return aIsDefaultCollection - bIsDefaultCollection;
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
index b07a50fd383..8e60b9f32e0 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
@@ -23,6 +23,8 @@ import { AutofillOptionsComponent } from "../autofill-options/autofill-options.c
 
 import { LoginDetailsSectionComponent } from "./login-details-section.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-autofill-options",
   template: "",
@@ -42,7 +44,7 @@ describe("LoginDetailsSectionComponent", () => {
   let configService: MockProxy<ConfigService>;
 
   const collect = jest.fn().mockResolvedValue(null);
-  const getInitialCipherView = jest.fn(() => null);
+  const getInitialCipherView = jest.fn((): any => null);
 
   beforeEach(async () => {
     getInitialCipherView.mockClear();
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
index 061a8c4abf4..8b9c4ddeea1 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
@@ -30,6 +30,8 @@ import { TotpCaptureService } from "../../abstractions/totp-capture.service";
 import { CipherFormContainer } from "../../cipher-form-container";
 import { AutofillOptionsComponent } from "../autofill-options/autofill-options.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-login-details-section",
   templateUrl: "./login-details-section.component.html",
diff --git a/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.ts b/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.ts
index 70b94505731..0c85cad5cfb 100644
--- a/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.ts
+++ b/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.ts
@@ -11,13 +11,15 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/sdk-internal";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-new-item-nudge",
   templateUrl: "./new-item-nudge.component.html",
   imports: [SpotlightComponent, AsyncPipe],
 })
 export class NewItemNudgeComponent {
-  configType = input.required<CipherType | null>();
+  readonly configType = input.required<CipherType | null>();
   activeUserId$ = this.accountService.activeAccount$.pipe(getUserId);
   showNewItemSpotlight$ = combineLatest([
     this.activeUserId$,
@@ -70,7 +72,7 @@ export class NewItemNudgeComponent {
 
         this.dismissalNudgeType = NudgeType.NewSshItemStatus;
         this.nudgeTitle = this.i18nService.t("newSshNudgeTitle");
-        this.nudgeBody = `${sshPartOne} <a href="https://bitwarden.com/help/ssh-agent" class="tw-text-primary-600 tw-font-bold" target="_blank">${sshPartTwo}</a>`;
+        this.nudgeBody = `${sshPartOne} <a href="https://bitwarden.com/help/ssh-agent" class="tw-text-primary-600 tw-font-medium" target="_blank">${sshPartTwo}</a>`;
         return NudgeType.NewSshItemStatus;
       }
       default:
diff --git a/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.ts b/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.ts
index f92c4420d03..990de9574ab 100644
--- a/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.ts
+++ b/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.ts
@@ -25,6 +25,8 @@ import { generate_ssh_key } from "@bitwarden/sdk-internal";
 import { SshImportPromptService } from "../../../services/ssh-import-prompt.service";
 import { CipherFormContainer } from "../../cipher-form-container";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-sshkey-section",
   templateUrl: "./sshkey-section.component.html",
@@ -42,9 +44,13 @@ import { CipherFormContainer } from "../../cipher-form-container";
 })
 export class SshKeySectionComponent implements OnInit {
   /** The original cipher */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() originalCipherView: CipherView;
 
   /** True when all fields should be disabled */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() disabled: boolean;
 
   /**
@@ -83,8 +89,11 @@ export class SshKeySectionComponent implements OnInit {
   }
 
   async ngOnInit() {
-    if (this.originalCipherView?.sshKey) {
-      this.setInitialValues();
+    const prefillCipher = this.cipherFormContainer.getInitialCipherView();
+    const sshKeyView = prefillCipher?.sshKey ?? this.originalCipherView?.sshKey;
+
+    if (sshKeyView) {
+      this.setInitialValues(sshKeyView);
     } else {
       await this.generateSshKey();
     }
@@ -108,8 +117,8 @@ export class SshKeySectionComponent implements OnInit {
   }
 
   /** Set form initial form values from the current cipher */
-  private setInitialValues() {
-    const { privateKey, publicKey, keyFingerprint } = this.originalCipherView.sshKey;
+  private setInitialValues(sshKeyView: SshKeyView) {
+    const { privateKey, publicKey, keyFingerprint } = sshKeyView;
 
     this.sshKeyForm.setValue({
       privateKey,
diff --git a/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts b/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts
index 04a2bb957ec..558235f2c7f 100644
--- a/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts
+++ b/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts
@@ -59,9 +59,12 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
           this.organizationDataOwnershipDisabled$,
           this.folderService.folders$(activeUserId).pipe(
             switchMap((f) =>
-              this.folderService.folderViews$(activeUserId).pipe(
-                filter((d) => d.length - 1 === f.length), // -1 for "No Folder" in folderViews$
-              ),
+              this.folderService
+                .folderViews$(activeUserId)
+                // Ensure the folders have decrypted. f.length === 0 indicates we don't have any
+                // folders to wait for, and d.length > 0 indicates that `folderViews` has emitted the
+                // array, which includes the "No Folder" default folder.
+                .pipe(filter((d) => d.length > 0 || f.length === 0)),
             ),
           ),
           this.getCipher(activeUserId, cipherId),
diff --git a/libs/vault/src/cipher-form/services/default-cipher-form.service.ts b/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
index d195ff8b00b..59c583f980b 100644
--- a/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
+++ b/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
@@ -36,7 +36,7 @@ export class DefaultCipherFormService implements CipherFormService {
     let savedCipher: Cipher;
 
     // Creating a new cipher
-    if (cipher.id == null) {
+    if (cipher.id == null || cipher.id === "") {
       const encrypted = await this.cipherService.encrypt(cipher, activeUserId);
       savedCipher = await this.cipherService.createWithServer(encrypted, config.admin);
       return await this.cipherService.decrypt(savedCipher, activeUserId);
diff --git a/libs/vault/src/cipher-view/additional-options/additional-options.component.ts b/libs/vault/src/cipher-view/additional-options/additional-options.component.ts
index 3e632983d49..4933c137e51 100644
--- a/libs/vault/src/cipher-view/additional-options/additional-options.component.ts
+++ b/libs/vault/src/cipher-view/additional-options/additional-options.component.ts
@@ -11,6 +11,8 @@ import {
   FormFieldModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-additional-options",
   templateUrl: "additional-options.component.html",
@@ -26,5 +28,7 @@ import {
   ],
 })
 export class AdditionalOptionsComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() notes: string = "";
 }
diff --git a/libs/vault/src/cipher-view/attachments/attachments-v2-view.component.ts b/libs/vault/src/cipher-view/attachments/attachments-v2-view.component.ts
index 711c63878e3..4e324d8002e 100644
--- a/libs/vault/src/cipher-view/attachments/attachments-v2-view.component.ts
+++ b/libs/vault/src/cipher-view/attachments/attachments-v2-view.component.ts
@@ -22,6 +22,8 @@ import { KeyService } from "@bitwarden/key-management";
 
 import { DownloadAttachmentComponent } from "../../components/download-attachment/download-attachment.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-attachments-v2-view",
   templateUrl: "attachments-v2-view.component.html",
@@ -36,11 +38,17 @@ import { DownloadAttachmentComponent } from "../../components/download-attachmen
   ],
 })
 export class AttachmentsV2ViewComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cipher: CipherView;
 
   // Required for fetching attachment data when viewed from cipher via emergency access
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() emergencyAccessId?: EmergencyAccessId;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() admin: boolean = false;
 
   canAccessPremium: boolean;
diff --git a/libs/vault/src/cipher-view/attachments/attachments-v2.component.ts b/libs/vault/src/cipher-view/attachments/attachments-v2.component.ts
index 11c15f63505..2796cae08d0 100644
--- a/libs/vault/src/cipher-view/attachments/attachments-v2.component.ts
+++ b/libs/vault/src/cipher-view/attachments/attachments-v2.component.ts
@@ -40,6 +40,8 @@ export interface AttachmentDialogCloseResult {
 /**
  * Component for the attachments dialog.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-attachments-v2",
   templateUrl: "attachments-v2.component.html",
diff --git a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
index 0643737d846..8bc55fb3760 100644
--- a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
+++ b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
@@ -18,6 +18,8 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-autofill-options-view",
   templateUrl: "autofill-options-view.component.html",
@@ -32,7 +34,11 @@ import {
   ],
 })
 export class AutofillOptionsViewComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() loginUris: LoginUriView[];
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cipherId: string;
 
   constructor(
diff --git a/libs/vault/src/cipher-view/card-details/card-details-view.component.ts b/libs/vault/src/cipher-view/card-details/card-details-view.component.ts
index 502214848f3..d80aafde46b 100644
--- a/libs/vault/src/cipher-view/card-details/card-details-view.component.ts
+++ b/libs/vault/src/cipher-view/card-details/card-details-view.component.ts
@@ -17,6 +17,8 @@ import {
 
 import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-cipher-card.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-card-details-view",
   templateUrl: "card-details-view.component.html",
@@ -31,6 +33,8 @@ import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-
   ],
 })
 export class CardDetailsComponent implements OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cipher: CipherView;
   EventType = EventType;
 
diff --git a/libs/vault/src/cipher-view/cipher-view.component.html b/libs/vault/src/cipher-view/cipher-view.component.html
index 62425bba7b3..3d0cc4c4414 100644
--- a/libs/vault/src/cipher-view/cipher-view.component.html
+++ b/libs/vault/src/cipher-view/cipher-view.component.html
@@ -1,90 +1,85 @@
-<ng-container *ngIf="!!cipher">
-  <bit-callout *ngIf="cardIsExpired" type="info" [title]="'cardExpiredTitle' | i18n">
+<ng-container *ngIf="!!cipher()">
+  <bit-callout *ngIf="cardIsExpired()" type="info" [title]="'cardExpiredTitle' | i18n">
     {{ "cardExpiredMessage" | i18n }}
   </bit-callout>
 
   <bit-callout
-    *ngIf="!hasLoginUri && hadPendingChangePasswordTask"
+    *ngIf="!hasLoginUri() && hadPendingChangePasswordTask()"
     type="warning"
     [title]="'missingWebsite' | i18n"
   >
     {{ "changeAtRiskPasswordAndAddWebsite" | i18n }}
   </bit-callout>
 
-  <bit-callout *ngIf="hasLoginUri && hadPendingChangePasswordTask" type="warning" [title]="''">
-    <i class="bwi bwi-exclamation-triangle tw-text-warning" aria-hidden="true"></i>
-    <a bitLink href="#" appStopClick (click)="launchChangePassword()">
+  <bit-callout *ngIf="showChangePasswordLink()" type="warning" [title]="''">
+    <a bitLink href="#" appStopClick (click)="launchChangePassword()" linkType="secondary">
       {{ "changeAtRiskPassword" | i18n }}
       <i class="bwi bwi-external-link tw-ml-1" aria-hidden="true"></i>
     </a>
   </bit-callout>
 
   <!-- HELPER TEXT -->
-  <p
-    class="tw-text-sm tw-text-muted"
-    bitTypography="helper"
-    *ngIf="cipher?.isDeleted && !cipher?.edit"
-  >
+  <p class="tw-text-muted" bitTypography="helper" *ngIf="cipher()?.isDeleted && !cipher()?.edit">
     {{ "noEditPermissions" | i18n }}
   </p>
 
   <!-- ITEM DETAILS -->
   <app-item-details-v2
-    [cipher]="cipher"
-    [organization]="organization$ | async"
-    [collections]="collections"
-    [folder]="folder$ | async"
-    [hideOwner]="isAdminConsole"
+    [cipher]="cipher()"
+    [organization]="organization()"
+    [collections]="resolvedCollections()"
+    [folder]="folder()"
+    [hideOwner]="isAdminConsole()"
   >
   </app-item-details-v2>
 
   <!-- LOGIN CREDENTIALS -->
   <app-login-credentials-view
-    *ngIf="hasLogin"
-    [cipher]="cipher"
+    *ngIf="hasLogin()"
+    [cipher]="cipher()"
     [activeUserId]="activeUserId$ | async"
-    [hadPendingChangePasswordTask]="hadPendingChangePasswordTask && cipher?.login.uris.length > 0"
+    [showChangePasswordLink]="showChangePasswordLink()"
     (handleChangePassword)="launchChangePassword()"
   ></app-login-credentials-view>
 
   <!-- AUTOFILL OPTIONS -->
   <app-autofill-options-view
-    *ngIf="hasAutofill"
-    [loginUris]="cipher.login.uris"
-    [cipherId]="cipher.id"
+    *ngIf="hasAutofill()"
+    [loginUris]="cipher()!.login.uris"
+    [cipherId]="cipher()!.id"
   >
   </app-autofill-options-view>
 
   <!-- CARD DETAILS -->
-  <app-card-details-view *ngIf="hasCard" [cipher]="cipher"></app-card-details-view>
+  <app-card-details-view *ngIf="hasCard()" [cipher]="cipher()"></app-card-details-view>
 
   <!-- IDENTITY SECTIONS -->
-  <app-view-identity-sections *ngIf="cipher.identity" [cipher]="cipher">
+  <app-view-identity-sections *ngIf="cipher()?.identity" [cipher]="cipher()">
   </app-view-identity-sections>
 
   <!-- SshKEY SECTIONS -->
-  <app-sshkey-view *ngIf="hasSshKey" [sshKey]="cipher.sshKey"></app-sshkey-view>
+  <app-sshkey-view *ngIf="hasSshKey()" [sshKey]="cipher()!.sshKey"></app-sshkey-view>
 
   <!-- ADDITIONAL OPTIONS -->
-  <ng-container *ngIf="cipher.notes">
-    <app-additional-options [notes]="cipher.notes"> </app-additional-options>
+  <ng-container *ngIf="cipher()?.notes">
+    <app-additional-options [notes]="cipher()!.notes"> </app-additional-options>
   </ng-container>
 
   <!-- CUSTOM FIELDS -->
-  <ng-container *ngIf="cipher.hasFields">
-    <app-custom-fields-v2 [cipher]="cipher"> </app-custom-fields-v2>
+  <ng-container *ngIf="cipher()?.hasFields">
+    <app-custom-fields-v2 [cipher]="cipher()"> </app-custom-fields-v2>
   </ng-container>
 
   <!-- ATTACHMENTS SECTION -->
-  <ng-container *ngIf="cipher.hasAttachments">
+  <ng-container *ngIf="cipher()?.hasAttachments">
     <app-attachments-v2-view
-      [emergencyAccessId]="emergencyAccessId"
-      [cipher]="cipher"
-      [admin]="isAdminConsole"
+      [emergencyAccessId]="emergencyAccessId()"
+      [cipher]="cipher()"
+      [admin]="isAdminConsole()"
     >
     </app-attachments-v2-view>
   </ng-container>
 
   <!-- ITEM HISTORY SECTION -->
-  <app-item-history-v2 [cipher]="cipher"> </app-item-history-v2>
+  <app-item-history-v2 [cipher]="cipher()"> </app-item-history-v2>
 </ng-container>
diff --git a/libs/vault/src/cipher-view/cipher-view.component.spec.ts b/libs/vault/src/cipher-view/cipher-view.component.spec.ts
new file mode 100644
index 00000000000..18a5132781b
--- /dev/null
+++ b/libs/vault/src/cipher-view/cipher-view.component.spec.ts
@@ -0,0 +1,287 @@
+import { NO_ERRORS_SCHEMA } from "@angular/core";
+import { ComponentFixture, TestBed, fakeAsync, tick } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject } 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 { AccountService, Account } from "@bitwarden/common/auth/abstractions/account.service";
+import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherRiskService } from "@bitwarden/common/vault/abstractions/cipher-risk.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { ViewPasswordHistoryService } from "@bitwarden/common/vault/abstractions/view-password-history.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { TaskService } from "@bitwarden/common/vault/tasks";
+
+import { ChangeLoginPasswordService } from "../abstractions/change-login-password.service";
+
+import { CipherViewComponent } from "./cipher-view.component";
+
+describe("CipherViewComponent", () => {
+  let component: CipherViewComponent;
+  let fixture: ComponentFixture<CipherViewComponent>;
+
+  // Mock services
+  let mockAccountService: AccountService;
+  let mockOrganizationService: OrganizationService;
+  let mockCollectionService: CollectionService;
+  let mockFolderService: FolderService;
+  let mockTaskService: TaskService;
+  let mockPlatformUtilsService: PlatformUtilsService;
+  let mockChangeLoginPasswordService: ChangeLoginPasswordService;
+  let mockCipherService: CipherService;
+  let mockViewPasswordHistoryService: ViewPasswordHistoryService;
+  let mockI18nService: I18nService;
+  let mockLogService: LogService;
+  let mockCipherRiskService: CipherRiskService;
+  let mockBillingAccountProfileStateService: BillingAccountProfileStateService;
+  let mockConfigService: ConfigService;
+
+  // Mock data
+  let mockCipherView: CipherView;
+  let featureFlagEnabled$: BehaviorSubject<boolean>;
+  let hasPremiumFromAnySource$: BehaviorSubject<boolean>;
+  let activeAccount$: BehaviorSubject<Account>;
+
+  beforeEach(async () => {
+    // Setup mock observables
+    activeAccount$ = new BehaviorSubject({
+      id: "test-user-id",
+      email: "test@example.com",
+    } as Account);
+
+    featureFlagEnabled$ = new BehaviorSubject(false);
+    hasPremiumFromAnySource$ = new BehaviorSubject(true);
+
+    // Create service mocks
+    mockAccountService = mock<AccountService>();
+    mockAccountService.activeAccount$ = activeAccount$;
+
+    mockOrganizationService = mock<OrganizationService>();
+    mockCollectionService = mock<CollectionService>();
+    mockFolderService = mock<FolderService>();
+    mockTaskService = mock<TaskService>();
+    mockPlatformUtilsService = mock<PlatformUtilsService>();
+    mockChangeLoginPasswordService = mock<ChangeLoginPasswordService>();
+    mockCipherService = mock<CipherService>();
+    mockViewPasswordHistoryService = mock<ViewPasswordHistoryService>();
+    mockI18nService = mock<I18nService>({
+      t: (key: string) => key,
+    });
+    mockLogService = mock<LogService>();
+    mockCipherRiskService = mock<CipherRiskService>();
+
+    mockBillingAccountProfileStateService = mock<BillingAccountProfileStateService>();
+    mockBillingAccountProfileStateService.hasPremiumFromAnySource$ = jest
+      .fn()
+      .mockReturnValue(hasPremiumFromAnySource$);
+
+    mockConfigService = mock<ConfigService>();
+    mockConfigService.getFeatureFlag$ = jest.fn().mockReturnValue(featureFlagEnabled$);
+
+    // Setup mock cipher view
+    mockCipherView = new CipherView();
+    mockCipherView.id = "cipher-id";
+    mockCipherView.name = "Test Cipher";
+
+    await TestBed.configureTestingModule({
+      imports: [CipherViewComponent],
+      providers: [
+        { provide: AccountService, useValue: mockAccountService },
+        { provide: OrganizationService, useValue: mockOrganizationService },
+        { provide: CollectionService, useValue: mockCollectionService },
+        { provide: FolderService, useValue: mockFolderService },
+        { provide: TaskService, useValue: mockTaskService },
+        { provide: PlatformUtilsService, useValue: mockPlatformUtilsService },
+        { provide: ChangeLoginPasswordService, useValue: mockChangeLoginPasswordService },
+        { provide: CipherService, useValue: mockCipherService },
+        { provide: ViewPasswordHistoryService, useValue: mockViewPasswordHistoryService },
+        { provide: I18nService, useValue: mockI18nService },
+        { provide: LogService, useValue: mockLogService },
+        { provide: CipherRiskService, useValue: mockCipherRiskService },
+        {
+          provide: BillingAccountProfileStateService,
+          useValue: mockBillingAccountProfileStateService,
+        },
+        { provide: ConfigService, useValue: mockConfigService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      // Override the component template to avoid rendering child components
+      // Allows testing component logic without
+      // needing to provide dependencies for all child components.
+      .overrideComponent(CipherViewComponent, {
+        set: {
+          template: "<div>{{ passwordIsAtRisk() }}</div>",
+          imports: [],
+        },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(CipherViewComponent);
+    component = fixture.componentInstance;
+  });
+
+  describe("passwordIsAtRisk signal", () => {
+    // Helper to create a cipher view with login credentials
+    const createLoginCipherView = (): CipherView => {
+      const cipher = new CipherView();
+      cipher.id = "cipher-id";
+      cipher.name = "Test Login";
+      cipher.type = CipherType.Login;
+      cipher.edit = true;
+      cipher.organizationId = undefined;
+      // Set up login with password so hasLoginPassword returns true
+      cipher.login = { password: "test-password" } as any;
+      return cipher;
+    };
+
+    beforeEach(() => {
+      // Reset observables to default values for this test suite
+      featureFlagEnabled$.next(true);
+      hasPremiumFromAnySource$.next(true);
+
+      // Setup default mock for computeCipherRiskForUser (individual tests can override)
+      mockCipherRiskService.computeCipherRiskForUser = jest.fn().mockResolvedValue({
+        password_strength: 4,
+        exposed_result: { type: "NotFound" },
+        reuse_count: 1,
+      });
+
+      // Recreate the fixture for each test in this suite.
+      // This ensures that the signal's observable subscribes with the correct
+      // initial state
+      fixture = TestBed.createComponent(CipherViewComponent);
+      component = fixture.componentInstance;
+    });
+
+    it("returns false when feature flag is disabled", fakeAsync(() => {
+      featureFlagEnabled$.next(false);
+
+      const cipher = createLoginCipherView();
+      fixture.componentRef.setInput("cipher", cipher);
+      fixture.detectChanges();
+      tick();
+
+      expect(mockCipherRiskService.computeCipherRiskForUser).not.toHaveBeenCalled();
+      expect(component.passwordIsAtRisk()).toBe(false);
+    }));
+
+    it("returns false when cipher has no login password", fakeAsync(() => {
+      const cipher = createLoginCipherView();
+      cipher.login = {} as any; // No password
+
+      fixture.componentRef.setInput("cipher", cipher);
+      fixture.detectChanges();
+      tick();
+
+      expect(mockCipherRiskService.computeCipherRiskForUser).not.toHaveBeenCalled();
+      expect(component.passwordIsAtRisk()).toBe(false);
+    }));
+
+    it("returns false when user does not have edit access", fakeAsync(() => {
+      const cipher = createLoginCipherView();
+      cipher.edit = false;
+
+      fixture.componentRef.setInput("cipher", cipher);
+      fixture.detectChanges();
+      tick();
+
+      expect(mockCipherRiskService.computeCipherRiskForUser).not.toHaveBeenCalled();
+      expect(component.passwordIsAtRisk()).toBe(false);
+    }));
+
+    it("returns false when cipher is deleted", fakeAsync(() => {
+      const cipher = createLoginCipherView();
+      cipher.deletedDate = new Date();
+
+      fixture.componentRef.setInput("cipher", cipher);
+      fixture.detectChanges();
+      tick();
+
+      expect(mockCipherRiskService.computeCipherRiskForUser).not.toHaveBeenCalled();
+      expect(component.passwordIsAtRisk()).toBe(false);
+    }));
+
+    it("returns false for organization-owned ciphers", fakeAsync(() => {
+      const cipher = createLoginCipherView();
+      cipher.organizationId = "org-id";
+
+      fixture.componentRef.setInput("cipher", cipher);
+      fixture.detectChanges();
+      tick();
+
+      expect(mockCipherRiskService.computeCipherRiskForUser).not.toHaveBeenCalled();
+      expect(component.passwordIsAtRisk()).toBe(false);
+    }));
+
+    it("returns false when user is not premium", fakeAsync(() => {
+      hasPremiumFromAnySource$.next(false);
+
+      const cipher = createLoginCipherView();
+      fixture.componentRef.setInput("cipher", cipher);
+      fixture.detectChanges();
+      tick();
+
+      expect(mockCipherRiskService.computeCipherRiskForUser).not.toHaveBeenCalled();
+      expect(component.passwordIsAtRisk()).toBe(false);
+    }));
+
+    it("returns true when password is weak", fakeAsync(() => {
+      // Setup mock to return weak password
+      const mockRiskyResult = {
+        password_strength: 2, // Weak password (< 3)
+        exposed_result: { type: "NotFound" },
+        reuse_count: 1,
+      };
+      mockCipherRiskService.computeCipherRiskForUser = jest.fn().mockResolvedValue(mockRiskyResult);
+
+      const cipher = createLoginCipherView();
+      fixture.componentRef.setInput("cipher", cipher);
+      fixture.detectChanges();
+
+      // Initial value should be false (from startWith(false))
+      expect(component.passwordIsAtRisk()).toBe(false);
+
+      // Wait for async operations to complete
+      tick();
+      fixture.detectChanges();
+
+      // After async completes, should reflect the weak password
+      expect(mockCipherRiskService.computeCipherRiskForUser).toHaveBeenCalled();
+      expect(component.passwordIsAtRisk()).toBe(true);
+    }));
+
+    it("returns false when password is strong and not exposed", fakeAsync(() => {
+      // Setup mock to return safe password
+      const mockSafeResult = {
+        password_strength: 4, // Strong password
+        exposed_result: { type: "NotFound" }, // Not exposed
+        reuse_count: 1, // Not reused
+      };
+      mockCipherRiskService.computeCipherRiskForUser = jest.fn().mockResolvedValue(mockSafeResult);
+
+      const cipher = createLoginCipherView();
+      fixture.componentRef.setInput("cipher", cipher);
+      fixture.detectChanges();
+
+      // Initial value should be false
+      expect(component.passwordIsAtRisk()).toBe(false);
+
+      // Wait for async operations to complete
+      tick();
+      fixture.detectChanges();
+
+      // Should remain false for safe password
+      expect(mockCipherRiskService.computeCipherRiskForUser).toHaveBeenCalled();
+      expect(component.passwordIsAtRisk()).toBe(false);
+    }));
+  });
+});
diff --git a/libs/vault/src/cipher-view/cipher-view.component.ts b/libs/vault/src/cipher-view/cipher-view.component.ts
index 1a294be46aa..d5adb0b71a0 100644
--- a/libs/vault/src/cipher-view/cipher-view.component.ts
+++ b/libs/vault/src/cipher-view/cipher-view.component.ts
@@ -1,30 +1,38 @@
 import { CommonModule } from "@angular/common";
-import { Component, Input, OnChanges, OnDestroy } from "@angular/core";
-import { firstValueFrom, Observable, Subject, takeUntil } from "rxjs";
+import { Component, computed, input } from "@angular/core";
+import { toObservable, toSignal } from "@angular/core/rxjs-interop";
+import { combineLatest, of, switchMap, map, catchError, from, Observable, startWith } 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 { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { isCardExpired } from "@bitwarden/common/autofill/utils";
+import { BillingAccountProfileStateService } 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 { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { getByIds } from "@bitwarden/common/platform/misc";
 import { CipherId, EmergencyAccessId, UserId } from "@bitwarden/common/types/guid";
+import {
+  CipherRiskService,
+  isPasswordAtRisk,
+} from "@bitwarden/common/vault/abstractions/cipher-risk.service";
 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";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
-import { AnchorLinkDirective, CalloutModule, SearchModule } from "@bitwarden/components";
+import {
+  CalloutModule,
+  SearchModule,
+  TypographyModule,
+  AnchorLinkDirective,
+} from "@bitwarden/components";
 
 import { ChangeLoginPasswordService } from "../abstractions/change-login-password.service";
 
@@ -39,6 +47,8 @@ import { LoginCredentialsViewComponent } from "./login-credentials/login-credent
 import { SshKeyViewComponent } from "./sshkey-sections/sshkey-view.component";
 import { ViewIdentitySectionsComponent } from "./view-identity-sections/view-identity-sections.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-cipher-view",
   templateUrl: "cipher-view.component.html",
@@ -58,30 +68,37 @@ import { ViewIdentitySectionsComponent } from "./view-identity-sections/view-ide
     LoginCredentialsViewComponent,
     AutofillOptionsViewComponent,
     AnchorLinkDirective,
+    TypographyModule,
   ],
 })
-export class CipherViewComponent implements OnChanges, OnDestroy {
-  @Input({ required: true }) cipher: CipherView | null = null;
+export class CipherViewComponent {
+  /**
+   * The cipher to display details for
+   */
+  readonly cipher = input.required<CipherView>();
 
-  // Required for fetching attachment data when viewed from cipher via emergency access
-  @Input() emergencyAccessId?: EmergencyAccessId;
+  /**
+   * Observable version of the cipher input
+   */
+  private readonly cipher$ = toObservable(this.cipher);
 
-  activeUserId$ = getUserId(this.accountService.activeAccount$);
+  /**
+   * Required for fetching attachment data when viewed from cipher via emergency access
+   */
+  readonly emergencyAccessId = input<EmergencyAccessId | undefined>();
 
   /**
    * Optional list of collections the cipher is assigned to. If none are provided, they will be fetched using the
    * `CipherService` and the `collectionIds` property of the cipher.
    */
-  @Input() collections?: CollectionView[];
+  readonly collections = input<CollectionView[] | undefined>(undefined);
 
-  /** Should be set to true when the component is used within the Admin Console */
-  @Input() isAdminConsole?: boolean = false;
+  /**
+   * Should be set to true when the component is used within the Admin Console
+   */
+  readonly isAdminConsole = input<boolean>(false);
 
-  organization$: Observable<Organization | undefined> | undefined;
-  folder$: Observable<FolderView | undefined> | undefined;
-  private destroyed$: Subject<void> = new Subject();
-  cardIsExpired: boolean = false;
-  hadPendingChangePasswordTask: boolean = false;
+  readonly activeUserId$ = getUserId(this.accountService.activeAccount$);
 
   constructor(
     private organizationService: OrganizationService,
@@ -93,126 +110,206 @@ export class CipherViewComponent implements OnChanges, OnDestroy {
     private changeLoginPasswordService: ChangeLoginPasswordService,
     private cipherService: CipherService,
     private logService: LogService,
+    private cipherRiskService: CipherRiskService,
+    private billingAccountService: BillingAccountProfileStateService,
+    private configService: ConfigService,
   ) {}
 
-  async ngOnChanges() {
-    if (this.cipher == null) {
-      return;
-    }
+  readonly resolvedCollections = toSignal<CollectionView[] | undefined>(
+    combineLatest([this.activeUserId$, this.cipher$, toObservable(this.collections)]).pipe(
+      switchMap(([userId, cipher, providedCollections]) => {
+        // Use provided collections if available
+        if (providedCollections && providedCollections.length > 0) {
+          return of(providedCollections);
+        }
+        // Otherwise, load collections based on cipher's collectionIds
+        if (cipher.collectionIds && cipher.collectionIds.length > 0) {
+          return this.collectionService
+            .decryptedCollections$(userId)
+            .pipe(getByIds(cipher.collectionIds));
+        }
+        return of(undefined);
+      }),
+    ),
+  );
 
-    await this.loadCipherData();
+  readonly organization = toSignal(
+    combineLatest([this.activeUserId$, this.cipher$]).pipe(
+      switchMap(([userId, cipher]) => {
+        if (!userId || !cipher?.organizationId) {
+          return of(undefined);
+        }
+        return this.organizationService.organizations$(userId).pipe(
+          map((organizations) => {
+            return organizations.find((org) => org.id === cipher.organizationId);
+          }),
+        );
+      }),
+    ),
+  );
+  readonly folder = toSignal(
+    combineLatest([this.activeUserId$, this.cipher$]).pipe(
+      switchMap(([userId, cipher]) => {
+        if (!userId || !cipher?.folderId) {
+          return of(undefined);
+        }
+        return this.folderService.getDecrypted$(cipher.folderId, userId);
+      }),
+    ),
+  );
 
-    this.cardIsExpired = isCardExpired(this.cipher.card);
-  }
+  readonly hadPendingChangePasswordTask = toSignal(
+    combineLatest([this.activeUserId$, this.cipher$]).pipe(
+      switchMap(([userId, cipher]) => {
+        // Early exit if not a Login cipher owned by an organization
+        if (cipher?.type !== CipherType.Login || !cipher?.organizationId) {
+          return of(false);
+        }
 
-  ngOnDestroy(): void {
-    this.destroyed$.next();
-    this.destroyed$.complete();
-  }
+        return combineLatest([
+          this.cipherService.ciphers$(userId),
+          this.defaultTaskService.pendingTasks$(userId),
+        ]).pipe(
+          map(([allCiphers, tasks]) => {
+            const cipherServiceCipher = allCiphers[cipher?.id as CipherId];
 
-  get hasCard() {
-    if (!this.cipher) {
+            // Show tasks only for Manage and Edit permissions
+            if (!cipherServiceCipher?.edit || !cipherServiceCipher?.viewPassword) {
+              return false;
+            }
+
+            return (
+              tasks?.some(
+                (task) =>
+                  task.cipherId === cipher?.id &&
+                  task.type === SecurityTaskType.UpdateAtRiskCredential,
+              ) ?? false
+            );
+          }),
+          catchError((error: unknown) => {
+            this.logService.error("Failed to retrieve change password tasks for cipher", error);
+            return of(false);
+          }),
+        );
+      }),
+    ),
+    { initialValue: false },
+  );
+
+  readonly hasCard = computed(() => {
+    const cipher = this.cipher();
+    if (!cipher) {
       return false;
     }
 
-    const { cardholderName, code, expMonth, expYear, number } = this.cipher.card;
+    const { cardholderName, code, expMonth, expYear, number } = cipher.card;
     return cardholderName || code || expMonth || expYear || number;
-  }
+  });
 
-  get hasLogin() {
-    if (!this.cipher) {
+  readonly cardIsExpired = computed(() => {
+    const cipher = this.cipher();
+    if (cipher == null) {
+      return false;
+    }
+    return isCardExpired(cipher.card);
+  });
+
+  readonly hasLogin = computed(() => {
+    const cipher = this.cipher();
+    if (!cipher) {
       return false;
     }
 
-    const { username, password, totp, fido2Credentials } = this.cipher.login;
+    const { username, password, totp, fido2Credentials } = cipher.login;
 
     return username || password || totp || fido2Credentials?.length > 0;
-  }
+  });
 
-  get hasAutofill() {
-    const uris = this.cipher?.login?.uris.length ?? 0;
+  readonly hasAutofill = computed(() => {
+    const cipher = this.cipher();
+    const uris = cipher?.login?.uris.length ?? 0;
 
     return uris > 0;
-  }
+  });
 
-  get hasSshKey() {
-    return !!this.cipher?.sshKey?.privateKey;
-  }
+  readonly hasSshKey = computed(() => {
+    const cipher = this.cipher();
+    return !!cipher?.sshKey?.privateKey;
+  });
 
-  get hasLoginUri() {
-    return this.cipher?.login?.hasUris;
-  }
+  readonly hasLoginUri = computed(() => {
+    const cipher = this.cipher();
+    return cipher?.login?.hasUris;
+  });
 
-  async loadCipherData() {
-    if (!this.cipher) {
-      return;
-    }
-
-    const userId = await firstValueFrom(this.activeUserId$);
-
-    // Load collections if not provided and the cipher has collectionIds
-    if (
-      this.cipher.collectionIds &&
-      this.cipher.collectionIds.length > 0 &&
-      (!this.collections || this.collections.length === 0)
-    ) {
-      this.collections = await firstValueFrom(
-        this.collectionService
-          .decryptedCollections$(userId)
-          .pipe(getByIds(this.cipher.collectionIds)),
-      );
-    }
-
-    if (this.cipher.organizationId) {
-      this.organization$ = this.organizationService
-        .organizations$(userId)
-        .pipe(getOrganizationById(this.cipher.organizationId))
-        .pipe(takeUntil(this.destroyed$));
-
-      if (this.cipher.type === CipherType.Login) {
-        await this.checkPendingChangePasswordTasks(userId);
-      }
-    }
-
-    if (this.cipher.folderId) {
-      this.folder$ = this.folderService
-        .getDecrypted$(this.cipher.folderId, userId)
-        .pipe(takeUntil(this.destroyed$));
-    }
-  }
-
-  async checkPendingChangePasswordTasks(userId: UserId): Promise<void> {
-    try {
-      // Show Tasks for Manage and Edit permissions
-      // Using cipherService to see if user has access to cipher in a non-AC context to address with Edit Except Password permissions
-      const allCiphers = await firstValueFrom(this.cipherService.ciphers$(userId));
-      const cipherServiceCipher = allCiphers[this.cipher?.id as CipherId];
-
-      if (!cipherServiceCipher?.edit || !cipherServiceCipher?.viewPassword) {
-        this.hadPendingChangePasswordTask = false;
-        return;
-      }
-
-      const tasks = await firstValueFrom(this.defaultTaskService.pendingTasks$(userId));
-
-      this.hadPendingChangePasswordTask = tasks?.some((task) => {
-        return (
-          task.cipherId === this.cipher?.id && task.type === SecurityTaskType.UpdateAtRiskCredential
+  /**
+   * Whether the login password for the cipher is considered at risk.
+   * The password is only evaluated when the user is premium and has edit access to the cipher.
+   */
+  readonly passwordIsAtRisk = toSignal(
+    combineLatest([
+      this.activeUserId$,
+      this.cipher$,
+      this.configService.getFeatureFlag$(FeatureFlag.RiskInsightsForPremium),
+    ]).pipe(
+      switchMap(([userId, cipher, featureEnabled]) => {
+        if (
+          !featureEnabled ||
+          !cipher.hasLoginPassword ||
+          !cipher.edit ||
+          cipher.organizationId ||
+          cipher.isDeleted
+        ) {
+          return of(false);
+        }
+        return this.switchPremium$(
+          userId,
+          () =>
+            from(this.checkIfPasswordIsAtRisk(cipher.id as CipherId, userId as UserId)).pipe(
+              startWith(false),
+            ),
+          () => of(false),
         );
-      });
-    } catch (error) {
-      this.hadPendingChangePasswordTask = false;
-      this.logService.error("Failed to retrieve change password tasks for cipher", error);
-    }
-  }
+      }),
+    ),
+    { initialValue: false },
+  );
+
+  readonly showChangePasswordLink = computed(() => {
+    return this.hasLoginUri() && (this.hadPendingChangePasswordTask() || this.passwordIsAtRisk());
+  });
 
   launchChangePassword = async () => {
-    if (this.cipher != null) {
-      const url = await this.changeLoginPasswordService.getChangePasswordUrl(this.cipher);
+    const cipher = this.cipher();
+    if (cipher != null) {
+      const url = await this.changeLoginPasswordService.getChangePasswordUrl(cipher);
       if (url == null) {
         return;
       }
       this.platformUtilsService.launchUri(url);
     }
   };
+
+  /**
+   * Switches between two observables based on whether the user has a premium from any source.
+   */
+  private switchPremium$<T>(
+    userId: UserId,
+    ifPremium$: () => Observable<T>,
+    ifNonPremium$: () => Observable<T>,
+  ): Observable<T> {
+    return this.billingAccountService
+      .hasPremiumFromAnySource$(userId)
+      .pipe(switchMap((isPremium) => (isPremium ? ifPremium$() : ifNonPremium$())));
+  }
+
+  private async checkIfPasswordIsAtRisk(cipherId: CipherId, userId: UserId): Promise<boolean> {
+    try {
+      const risk = await this.cipherRiskService.computeCipherRiskForUser(cipherId, userId, true);
+      return isPasswordAtRisk(risk);
+    } catch (error: unknown) {
+      this.logService.error("Failed to check if password is at risk", error);
+      return false;
+    }
+  }
 }
diff --git a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.ts b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.ts
index 2fc35574ba5..8b1eaab74bb 100644
--- a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.ts
+++ b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.ts
@@ -24,6 +24,8 @@ import {
 
 import { VaultAutosizeReadOnlyTextArea } from "../../directives/readonly-textarea.directive";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-custom-fields-v2",
   templateUrl: "custom-fields-v2.component.html",
@@ -42,9 +44,11 @@ import { VaultAutosizeReadOnlyTextArea } from "../../directives/readonly-textare
   ],
 })
 export class CustomFieldV2Component implements OnInit, OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipher!: CipherView;
   fieldType = FieldType;
-  fieldOptions: Map<number, LinkedMetadata> | null = null;
+  fieldOptions: Map<number, LinkedMetadata> | undefined;
 
   /** Indexes of hidden fields that are revealed */
   revealedHiddenFields: number[] = [];
@@ -124,7 +128,7 @@ export class CustomFieldV2Component implements OnInit, OnChanges {
       case CipherType.Identity:
         return IdentityView.prototype.linkedFieldOptions;
       default:
-        return null;
+        return undefined;
     }
   }
 }
diff --git a/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts b/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
index 6ccd0b7ee61..2c310daad76 100644
--- a/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
+++ b/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
@@ -7,7 +7,7 @@ import { toSignal } from "@angular/core/rxjs-interop";
 import { fromEvent, map, startWith } from "rxjs";
 
 // eslint-disable-next-line no-restricted-imports
-import { CollectionView } from "@bitwarden/admin-console/common";
+import { CollectionTypes, CollectionView } from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -22,6 +22,8 @@ import {
 
 import { OrgIconDirective } from "../../components/org-icon.directive";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-item-details-v2",
   templateUrl: "item-details-v2.component.html",
@@ -36,18 +38,18 @@ import { OrgIconDirective } from "../../components/org-icon.directive";
   ],
 })
 export class ItemDetailsV2Component {
-  hideOwner = input<boolean>(false);
-  cipher = input.required<CipherView>();
-  organization = input<Organization | undefined>();
-  folder = input<FolderView | undefined>();
-  collections = input<CollectionView[] | undefined>();
-  showAllDetails = signal(false);
+  readonly hideOwner = input<boolean>(false);
+  readonly cipher = input.required<CipherView>();
+  readonly organization = input<Organization | undefined>();
+  readonly folder = input<FolderView | undefined>();
+  readonly collections = input<CollectionView[] | undefined>();
+  readonly showAllDetails = signal(false);
 
-  showOwnership = computed(() => {
+  readonly showOwnership = computed(() => {
     return this.cipher().organizationId && this.organization() && !this.hideOwner();
   });
 
-  hasSmallScreen = toSignal(
+  readonly hasSmallScreen = toSignal(
     fromEvent(window, "resize").pipe(
       map(() => window.innerWidth),
       startWith(window.innerWidth),
@@ -56,7 +58,7 @@ export class ItemDetailsV2Component {
   );
 
   // Array to hold all details of item. Organization, Collections, and Folder
-  allItems = computed(() => {
+  readonly allItems = computed(() => {
     let items: any[] = [];
     if (this.showOwnership() && this.organization()) {
       items.push(this.organization());
@@ -70,7 +72,7 @@ export class ItemDetailsV2Component {
     return items;
   });
 
-  showItems = computed(() => {
+  readonly showItems = computed(() => {
     if (
       this.hasSmallScreen() &&
       this.allItems().length > 2 &&
@@ -102,7 +104,9 @@ export class ItemDetailsV2Component {
 
   getIconClass(item: Organization | CollectionView | FolderView): string {
     if (item instanceof CollectionView) {
-      return "bwi-collection-shared";
+      return item.type === CollectionTypes.DefaultUserCollection
+        ? "bwi-user"
+        : "bwi-collection-shared";
     } else if (item instanceof FolderView) {
       return "bwi-folder";
     }
diff --git a/libs/vault/src/cipher-view/item-history/item-history-v2.component.html b/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
index 9395fb34fc7..c5963638b80 100644
--- a/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
+++ b/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
@@ -4,7 +4,7 @@
   </bit-section-header>
   <bit-card>
     <p class="tw-mb-1 tw-text-xs tw-text-muted tw-select-all">
-      <span class="tw-font-bold">{{ "lastEdited" | i18n }}:</span>
+      <span class="tw-font-medium">{{ "lastEdited" | i18n }}:</span>
       {{ cipher.revisionDate | date: "medium" }}
     </p>
     <p
@@ -14,7 +14,7 @@
         'tw-mb-0': !cipher.hasPasswordHistory,
       }"
     >
-      <span class="tw-font-bold">{{ "dateCreated" | i18n }}:</span>
+      <span class="tw-font-medium">{{ "dateCreated" | i18n }}:</span>
       {{ cipher.creationDate | date: "medium" }}
     </p>
     <p
@@ -22,7 +22,7 @@
       class="tw-text-xs tw-text-muted tw-select-all"
       [ngClass]="{ 'tw-mb-3': cipher.hasPasswordHistory }"
     >
-      <span class="tw-font-bold">{{ "datePasswordUpdated" | i18n }}:</span>
+      <span class="tw-font-medium">{{ "datePasswordUpdated" | i18n }}:</span>
       {{ cipher.passwordRevisionDisplayDate | date: "medium" }}
     </p>
     <button
diff --git a/libs/vault/src/cipher-view/item-history/item-history-v2.component.ts b/libs/vault/src/cipher-view/item-history/item-history-v2.component.ts
index 2bbb6418934..1295836d3d9 100644
--- a/libs/vault/src/cipher-view/item-history/item-history-v2.component.ts
+++ b/libs/vault/src/cipher-view/item-history/item-history-v2.component.ts
@@ -16,6 +16,8 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-item-history-v2",
   templateUrl: "item-history-v2.component.html",
@@ -31,6 +33,8 @@ import {
   ],
 })
 export class ItemHistoryV2Component {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cipher: CipherView;
 
   constructor(private viewPasswordHistoryService: ViewPasswordHistoryService) {}
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
index 02b8be552bd..be33f7a5562 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
@@ -90,13 +90,13 @@
         data-testid="copy-password"
         (click)="logCopyEvent()"
       ></button>
+      <bit-hint *ngIf="showChangePasswordLink">
+        <a bitLink href="#" appStopClick (click)="launchChangePasswordEvent()">
+          {{ "changeAtRiskPassword" | i18n }}
+          <i class="bwi bwi-external-link tw-ml-1" aria-hidden="true"></i>
+        </a>
+      </bit-hint>
     </bit-form-field>
-    <bit-hint *ngIf="hadPendingChangePasswordTask">
-      <a bitLink href="#" appStopClick (click)="launchChangePasswordEvent()">
-        {{ "changeAtRiskPassword" | i18n }}
-        <i class="bwi bwi-external-link tw-ml-1" aria-hidden="true"></i>
-      </a>
-    </bit-hint>
     <div
       *ngIf="showPasswordCount && passwordRevealed"
       [ngClass]="{ 'tw-mt-3': !cipher.login.totp, 'tw-mb-2': true }"
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
index 5987d055e6b..60cf2179a85 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
@@ -42,6 +42,8 @@ type TotpCodeValues = {
   totpCodeFormatted?: string;
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-login-credentials-view",
   templateUrl: "login-credentials-view.component.html",
@@ -61,10 +63,20 @@ type TotpCodeValues = {
   ],
 })
 export class LoginCredentialsViewComponent implements OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() cipher: CipherView;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() activeUserId: UserId;
-  @Input() hadPendingChangePasswordTask: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input() showChangePasswordLink: boolean;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() handleChangePassword = new EventEmitter<void>();
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("passwordInput")
   private passwordInput!: ElementRef<HTMLInputElement>;
 
diff --git a/libs/vault/src/cipher-view/read-only-cipher-card/read-only-cipher-card.component.ts b/libs/vault/src/cipher-view/read-only-cipher-card/read-only-cipher-card.component.ts
index 8f6b9954a9f..7a17376472d 100644
--- a/libs/vault/src/cipher-view/read-only-cipher-card/read-only-cipher-card.component.ts
+++ b/libs/vault/src/cipher-view/read-only-cipher-card/read-only-cipher-card.component.ts
@@ -2,6 +2,8 @@ import { AfterViewInit, Component, ContentChildren, QueryList } from "@angular/c
 
 import { CardComponent, BitFormFieldComponent } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "read-only-cipher-card",
   templateUrl: "./read-only-cipher-card.component.html",
@@ -11,6 +13,8 @@ import { CardComponent, BitFormFieldComponent } from "@bitwarden/components";
  * A thin wrapper around the `bit-card` component that disables the bottom border for the last form field.
  */
 export class ReadOnlyCipherCardComponent implements AfterViewInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ContentChildren(BitFormFieldComponent) formFields?: QueryList<BitFormFieldComponent>;
 
   ngAfterViewInit(): void {
diff --git a/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.ts b/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.ts
index 535c41b9aea..5d076d81cc7 100644
--- a/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.ts
+++ b/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.ts
@@ -14,6 +14,8 @@ import {
 
 import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-cipher-card.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-sshkey-view",
   templateUrl: "sshkey-view.component.html",
@@ -28,6 +30,8 @@ import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-
   ],
 })
 export class SshKeyViewComponent implements OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() sshKey: SshKeyView;
 
   revealSshKey = false;
diff --git a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
index f9cb9d2b549..14fb7e2925c 100644
--- a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
+++ b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
@@ -12,6 +12,8 @@ import {
 
 import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-cipher-card.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-view-identity-sections",
   templateUrl: "./view-identity-sections.component.html",
@@ -26,6 +28,8 @@ import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-
   ],
 })
 export class ViewIdentitySectionsComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipher: CipherView | null = null;
 
   /** Returns all populated address fields */
diff --git a/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts b/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts
index 0442bcd1f76..adc4c67b2f4 100644
--- a/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts
+++ b/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts
@@ -47,6 +47,8 @@ export type AddEditFolderDialogData = {
   editFolderConfig?: { folder: FolderView };
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-add-edit-folder-dialog",
   templateUrl: "./add-edit-folder-dialog.component.html",
@@ -62,7 +64,11 @@ export type AddEditFolderDialogData = {
   ],
 })
 export class AddEditFolderDialogComponent implements AfterViewInit, OnInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(BitSubmitDirective) private bitSubmit?: BitSubmitDirective;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("submitBtn") private submitBtn?: ButtonComponent;
 
   folder: FolderView = new FolderView();
diff --git a/libs/vault/src/components/assign-collections.component.spec.ts b/libs/vault/src/components/assign-collections.component.spec.ts
index e54bada30ba..414613e67d8 100644
--- a/libs/vault/src/components/assign-collections.component.spec.ts
+++ b/libs/vault/src/components/assign-collections.component.spec.ts
@@ -5,7 +5,11 @@ import { of } 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 { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
+import {
+  CollectionService,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -34,7 +38,6 @@ describe("AssignCollectionsComponent", () => {
     organizationId: "org-id" as OrganizationId,
     name: "Editable Collection",
   });
-
   editCollection.readOnly = false;
   editCollection.manage = true;
 
@@ -52,6 +55,24 @@ describe("AssignCollectionsComponent", () => {
   });
   readOnlyCollection2.readOnly = true;
 
+  const sharedCollection = new CollectionView({
+    id: "shared-collection-id" as CollectionId,
+    organizationId: "org-id" as OrganizationId,
+    name: "Shared Collection",
+  });
+  sharedCollection.readOnly = false;
+  sharedCollection.assigned = true;
+  sharedCollection.type = CollectionTypes.SharedCollection;
+
+  const defaultCollection = new CollectionView({
+    id: "default-collection-id" as CollectionId,
+    organizationId: "org-id" as OrganizationId,
+    name: "Default Collection",
+  });
+  defaultCollection.readOnly = false;
+  defaultCollection.manage = true;
+  defaultCollection.type = CollectionTypes.DefaultUserCollection;
+
   const params = {
     organizationId: "org-id" as OrganizationId,
     ciphers: [
@@ -116,4 +137,75 @@ describe("AssignCollectionsComponent", () => {
       ]);
     });
   });
+
+  describe("default collections", () => {
+    const cipher1 = new CipherView();
+    cipher1.id = "cipher-id-1";
+    cipher1.collectionIds = [editCollection.id, sharedCollection.id];
+    cipher1.edit = true;
+
+    const cipher2 = new CipherView();
+    cipher2.id = "cipher-id-2";
+    cipher2.collectionIds = [defaultCollection.id];
+    cipher2.edit = true;
+
+    const cipher3 = new CipherView();
+    cipher3.id = "cipher-id-3";
+    cipher3.collectionIds = [defaultCollection.id];
+    cipher3.edit = true;
+
+    const cipher4 = new CipherView();
+    cipher4.id = "cipher-id-4";
+    cipher4.collectionIds = [];
+    cipher4.edit = true;
+
+    it('does not show the "Default Collection" if any cipher is in a shared collection', async () => {
+      component.params = {
+        ...component.params,
+        ciphers: [cipher1, cipher2],
+        availableCollections: [editCollection, sharedCollection, defaultCollection],
+      };
+
+      await component.ngOnInit();
+      fixture.detectChanges();
+
+      expect(component["availableCollections"].map((c) => c.id)).toEqual([
+        editCollection.id,
+        sharedCollection.id,
+      ]);
+    });
+
+    it('shows the "Default Collection" if no ciphers are in a shared collection', async () => {
+      component.params = {
+        ...component.params,
+        ciphers: [cipher2, cipher3],
+        availableCollections: [editCollection, sharedCollection, defaultCollection],
+      };
+
+      await component.ngOnInit();
+      fixture.detectChanges();
+
+      expect(component["availableCollections"].map((c) => c.id)).toEqual([
+        editCollection.id,
+        sharedCollection.id,
+        defaultCollection.id,
+      ]);
+    });
+
+    it('shows the "Default Collection" for singular cipher', async () => {
+      component.params = {
+        ...component.params,
+        ciphers: [cipher4],
+        availableCollections: [readOnlyCollection1, sharedCollection, defaultCollection],
+      };
+
+      await component.ngOnInit();
+      fixture.detectChanges();
+
+      expect(component["availableCollections"].map((c) => c.id)).toEqual([
+        sharedCollection.id,
+        defaultCollection.id,
+      ]);
+    });
+  });
 });
diff --git a/libs/vault/src/components/assign-collections.component.ts b/libs/vault/src/components/assign-collections.component.ts
index b2bd6e31ee5..f0ce59b0c3c 100644
--- a/libs/vault/src/components/assign-collections.component.ts
+++ b/libs/vault/src/components/assign-collections.component.ts
@@ -26,7 +26,11 @@ 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 { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
+import {
+  CollectionService,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import {
   getOrganizationById,
@@ -92,6 +96,8 @@ export type CollectionAssignmentResult = UnionOfValues<typeof CollectionAssignme
 
 const MY_VAULT_ID = "MyVault";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "assign-collections",
   templateUrl: "assign-collections.component.html",
@@ -108,19 +114,29 @@ const MY_VAULT_ID = "MyVault";
   ],
 })
 export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewInit {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(BitSubmitDirective)
   private bitSubmit: BitSubmitDirective;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() params: CollectionAssignmentParams;
 
   /**
    * Submit button instance that will be disabled or marked as loading when the form is submitting.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() submitBtn?: ButtonComponent;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output()
   editableItemCountChange = new EventEmitter<number>();
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onCollectionAssign = new EventEmitter<CollectionAssignmentResult>();
 
   formGroup = this.formBuilder.group({
@@ -311,12 +327,23 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
 
     await this.setReadOnlyCollectionNames();
 
+    const canAccessDefaultCollection = this.canAccessDefaultCollection(
+      this.params.availableCollections,
+    );
+
     this.availableCollections = this.params.availableCollections
       .filter((collection) => {
-        return collection.canEditItems(org);
+        if (canAccessDefaultCollection) {
+          return collection.canEditItems(org);
+        }
+
+        return (
+          collection.canEditItems(org) && collection.type !== CollectionTypes.DefaultUserCollection
+        );
       })
       .map((c) => ({
-        icon: "bwi-collection-shared",
+        icon:
+          c.type === CollectionTypes.DefaultUserCollection ? "bwi-user" : "bwi-collection-shared",
         id: c.id,
         labelName: c.name,
         listName: c.name,
@@ -357,7 +384,7 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
           collection.id !== this.params.activeCollection?.id,
       )
       .map((collection) => ({
-        icon: "bwi-collection-shared",
+        icon: collection.icon,
         id: collection.id,
         labelName: collection.labelName,
         listName: collection.listName,
@@ -421,7 +448,8 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
       )
       .subscribe((collections) => {
         this.availableCollections = collections.map((c) => ({
-          icon: "bwi-collection-shared",
+          icon:
+            c.type === CollectionTypes.DefaultUserCollection ? "bwi-user" : "bwi-collection-shared",
           id: c.id,
           labelName: c.name,
           listName: c.name,
@@ -447,8 +475,16 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
         const org = organizations.find((o) => o.id === orgId);
         this.orgName = org.name;
 
-        return collections.filter((c) => {
-          return c.organizationId === orgId && !c.readOnly;
+        const orgCollections = collections.filter((c) => c.organizationId === orgId);
+
+        const canAccessDefaultCollection = this.canAccessDefaultCollection(collections);
+
+        return orgCollections.filter((c) => {
+          if (canAccessDefaultCollection) {
+            return !c.readOnly;
+          }
+
+          return !c.readOnly && c.type !== CollectionTypes.DefaultUserCollection;
         });
       }),
       shareReplay({ refCount: true, bufferSize: 1 }),
@@ -536,4 +572,26 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
       })
       .map((c) => c.name);
   }
+
+  /**
+   * Determines if the ciphers to be assigned can be assigned to the Default Collection.
+   * When false, the Default Collections should be excluded from the list of available collections.
+   */
+  private canAccessDefaultCollection(collections: CollectionView[]): boolean {
+    const collectionsObject = Object.fromEntries(collections.map((c) => [c.id, c]));
+
+    const allCiphersUnassignedOrInDefault = this.params.ciphers.every(
+      (cipher) =>
+        !cipher.collectionIds.length ||
+        cipher.collectionIds.some(
+          (cId) => collectionsObject[cId]?.type === CollectionTypes.DefaultUserCollection,
+        ),
+    );
+
+    // When all ciphers are either:
+    // - unassigned
+    // - already in a Default Collection
+    // then the Default Collection can be shown.
+    return allCiphersUnassignedOrInDefault;
+  }
 }
diff --git a/libs/vault/src/components/can-delete-cipher.directive.ts b/libs/vault/src/components/can-delete-cipher.directive.ts
index 7eadedc7ada..f88e38049da 100644
--- a/libs/vault/src/components/can-delete-cipher.directive.ts
+++ b/libs/vault/src/components/can-delete-cipher.directive.ts
@@ -1,8 +1,8 @@
 import { Directive, Input, OnDestroy, TemplateRef, ViewContainerRef } from "@angular/core";
 import { Subject, takeUntil } from "rxjs";
 
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 
 /**
  * Only shows the element if the user can delete the cipher.
@@ -13,7 +13,9 @@ import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cip
 export class CanDeleteCipherDirective implements OnDestroy {
   private destroy$ = new Subject<void>();
 
-  @Input("appCanDeleteCipher") set cipher(cipher: CipherView) {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input("appCanDeleteCipher") set cipher(cipher: CipherViewLike) {
     this.viewContainer.clear();
 
     this.cipherAuthorizationService
diff --git a/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts b/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
index ae2ce12cba8..bef7f5b12d6 100644
--- a/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
+++ b/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
@@ -7,6 +7,8 @@ import { IconModule } from "@bitwarden/components";
 
 import { VaultCarouselSlideComponent } from "../carousel-slide/carousel-slide.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-carousel-button",
   templateUrl: "carousel-button.component.html",
@@ -14,15 +16,23 @@ import { VaultCarouselSlideComponent } from "../carousel-slide/carousel-slide.co
 })
 export class VaultCarouselButtonComponent implements FocusableOption {
   /** Slide component that is associated with the individual button */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) slide!: VaultCarouselSlideComponent;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("btn", { static: true }) button!: ElementRef<HTMLButtonElement>;
   protected CarouselIcon = CarouselIcon;
 
   /** When set to true the button is shown in an active state. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) isActive!: boolean;
 
   /** Emits when the button is clicked. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() onClick = new EventEmitter<void>();
 
   /** Focuses the underlying button element. */
diff --git a/libs/vault/src/components/carousel/carousel-content/carousel-content.component.spec.ts b/libs/vault/src/components/carousel/carousel-content/carousel-content.component.spec.ts
index bc1c9250c2c..5d396984f17 100644
--- a/libs/vault/src/components/carousel/carousel-content/carousel-content.component.spec.ts
+++ b/libs/vault/src/components/carousel/carousel-content/carousel-content.component.spec.ts
@@ -5,6 +5,8 @@ import { By } from "@angular/platform-browser";
 
 import { VaultCarouselContentComponent } from "./carousel-content.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-test-template-ref",
   imports: [VaultCarouselContentComponent],
@@ -17,6 +19,8 @@ import { VaultCarouselContentComponent } from "./carousel-content.component";
 })
 class TestTemplateRefComponent implements OnInit {
   // Test template content by creating a wrapping component and then pass a portal to the carousel content component.
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("template", { static: true }) template!: TemplateRef<any>;
   portal!: TemplatePortal;
 
diff --git a/libs/vault/src/components/carousel/carousel-content/carousel-content.component.ts b/libs/vault/src/components/carousel/carousel-content/carousel-content.component.ts
index 47027a77ae9..a3c3a9f1caf 100644
--- a/libs/vault/src/components/carousel/carousel-content/carousel-content.component.ts
+++ b/libs/vault/src/components/carousel/carousel-content/carousel-content.component.ts
@@ -1,6 +1,8 @@
 import { TemplatePortal, CdkPortalOutlet } from "@angular/cdk/portal";
 import { Component, Input } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-carousel-content",
   templateUrl: "carousel-content.component.html",
@@ -8,5 +10,7 @@ import { Component, Input } from "@angular/core";
 })
 export class VaultCarouselContentComponent {
   /** Content to be displayed for the carousel. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) content!: TemplatePortal;
 }
diff --git a/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.spec.ts b/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.spec.ts
index 46f06f6dcb4..116403362f4 100644
--- a/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.spec.ts
+++ b/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.spec.ts
@@ -5,6 +5,8 @@ import { By } from "@angular/platform-browser";
 
 import { VaultCarouselSlideComponent } from "./carousel-slide.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-test-carousel-slide",
   imports: [VaultCarouselSlideComponent],
diff --git a/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.ts b/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.ts
index 811572881da..973a615d6f9 100644
--- a/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.ts
+++ b/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.ts
@@ -11,6 +11,8 @@ import {
   ViewContainerRef,
 } from "@angular/core";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-carousel-slide",
   templateUrl: "./carousel-slide.component.html",
@@ -18,7 +20,11 @@ import {
 })
 export class VaultCarouselSlideComponent implements OnInit {
   /** `aria-label` that is assigned to the carousel toggle. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) label!: string;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: booleanAttribute }) disablePadding = false;
 
   /**
@@ -29,8 +35,12 @@ export class VaultCarouselSlideComponent implements OnInit {
    *
    * @remarks See note 4 of https://www.w3.org/WAI/ARIA/apg/patterns/tabpanel/
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ transform: coerceBooleanProperty }) noFocusableChildren?: true;
 
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(TemplateRef, { static: true }) implicitContent!: TemplateRef<unknown>;
 
   private _contentPortal: TemplatePortal | null = null;
diff --git a/libs/vault/src/components/carousel/carousel.component.spec.ts b/libs/vault/src/components/carousel/carousel.component.spec.ts
index ebb38576813..abbfe963ddf 100644
--- a/libs/vault/src/components/carousel/carousel.component.spec.ts
+++ b/libs/vault/src/components/carousel/carousel.component.spec.ts
@@ -7,6 +7,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { VaultCarouselSlideComponent } from "./carousel-slide/carousel-slide.component";
 import { VaultCarouselComponent } from "./carousel.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-test-carousel-slide",
   imports: [VaultCarouselComponent, VaultCarouselSlideComponent],
diff --git a/libs/vault/src/components/carousel/carousel.component.ts b/libs/vault/src/components/carousel/carousel.component.ts
index fdebbebc33b..4e180f09f9b 100644
--- a/libs/vault/src/components/carousel/carousel.component.ts
+++ b/libs/vault/src/components/carousel/carousel.component.ts
@@ -28,6 +28,8 @@ import { VaultCarouselButtonComponent } from "./carousel-button/carousel-button.
 import { VaultCarouselContentComponent } from "./carousel-content/carousel-content.component";
 import { VaultCarouselSlideComponent } from "./carousel-slide/carousel-slide.component";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-carousel",
   templateUrl: "./carousel.component.html",
@@ -50,30 +52,46 @@ export class VaultCarouselComponent implements AfterViewInit {
    * @remarks
    * The label should not include the word "carousel", `aria-roledescription="carousel"` is already included.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) label = "";
 
   /**
    * Emits the index of the newly selected slide.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() slideChange = new EventEmitter<number>();
 
   /** All slides within the carousel. */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ContentChildren(VaultCarouselSlideComponent) slides!: QueryList<VaultCarouselSlideComponent>;
 
   /** All buttons that control the carousel */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChildren(VaultCarouselButtonComponent)
   carouselButtons!: QueryList<VaultCarouselButtonComponent>;
 
   /** Wrapping container for the carousel content and buttons */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("container") carouselContainer!: ElementRef<HTMLElement>;
 
   /** Container for the carousel buttons */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("carouselButtonWrapper") carouselButtonWrapper!: ElementRef<HTMLDivElement>;
 
   /** Temporary container containing `tempSlideOutlet` */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild("tempSlideContainer") tempSlideContainer!: ElementRef<HTMLDivElement>;
 
   /** Outlet to temporary render each slide within */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @ViewChild(CdkPortalOutlet) tempSlideOutlet!: CdkPortalOutlet;
 
   /** The currently selected index of the carousel. */
diff --git a/libs/vault/src/components/copy-cipher-field.directive.spec.ts b/libs/vault/src/components/copy-cipher-field.directive.spec.ts
index a3650c68c9b..e20fccd053f 100644
--- a/libs/vault/src/components/copy-cipher-field.directive.spec.ts
+++ b/libs/vault/src/components/copy-cipher-field.directive.spec.ts
@@ -5,7 +5,7 @@ import { Account, AccountService } from "@bitwarden/common/auth/abstractions/acc
 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";
-import { BitIconButtonComponent, MenuItemDirective } from "@bitwarden/components";
+import { BitIconButtonComponent, MenuItemComponent } from "@bitwarden/components";
 import { CopyCipherFieldService } from "@bitwarden/vault";
 
 import { CopyCipherFieldDirective } from "./copy-cipher-field.directive";
@@ -83,7 +83,7 @@ describe("CopyCipherFieldDirective", () => {
     });
 
     it("updates menuItemDirective disabled state", async () => {
-      const menuItemDirective = {
+      const menuItemComponent = {
         disabled: false,
       };
 
@@ -91,14 +91,14 @@ describe("CopyCipherFieldDirective", () => {
         copyFieldService as unknown as CopyCipherFieldService,
         mockAccountService,
         mockCipherService,
-        menuItemDirective as unknown as MenuItemDirective,
+        menuItemComponent as unknown as MenuItemComponent,
       );
 
       copyCipherFieldDirective.action = "totp";
 
       await copyCipherFieldDirective.ngOnChanges();
 
-      expect(menuItemDirective.disabled).toBe(true);
+      expect(menuItemComponent.disabled).toBe(true);
     });
   });
 
diff --git a/libs/vault/src/components/copy-cipher-field.directive.ts b/libs/vault/src/components/copy-cipher-field.directive.ts
index 9725adae5e2..52a4f59e7a2 100644
--- a/libs/vault/src/components/copy-cipher-field.directive.ts
+++ b/libs/vault/src/components/copy-cipher-field.directive.ts
@@ -10,7 +10,7 @@ import {
   CipherViewLike,
   CipherViewLikeUtils,
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
-import { MenuItemDirective, BitIconButtonComponent } from "@bitwarden/components";
+import { MenuItemComponent, BitIconButtonComponent } from "@bitwarden/components";
 import { CopyAction, CopyCipherFieldService } from "@bitwarden/vault";
 
 /**
@@ -30,19 +30,24 @@ import { CopyAction, CopyCipherFieldService } from "@bitwarden/vault";
   selector: "[appCopyField]",
 })
 export class CopyCipherFieldDirective implements OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({
     alias: "appCopyField",
     required: true,
   })
-  action!: Exclude<CopyAction, "hiddenField">;
+  action!: CopyAction;
 
-  @Input({ required: true }) cipher!: CipherViewLike;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
+  @Input({ required: true })
+  cipher!: CipherViewLike;
 
   constructor(
     private copyCipherFieldService: CopyCipherFieldService,
     private accountService: AccountService,
     private cipherService: CipherService,
-    @Optional() private menuItemDirective?: MenuItemDirective,
+    @Optional() private menuItemComponent?: MenuItemComponent,
     @Optional() private iconButtonComponent?: BitIconButtonComponent,
   ) {}
 
@@ -55,7 +60,7 @@ export class CopyCipherFieldDirective implements OnChanges {
    */
   @HostBinding("class.tw-hidden")
   private get hidden() {
-    return this.disabled && this.menuItemDirective;
+    return this.disabled && this.menuItemComponent;
   }
 
   @HostListener("click")
@@ -82,8 +87,8 @@ export class CopyCipherFieldDirective implements OnChanges {
     }
 
     // If the directive is used on a menu item, update the menu item to prevent keyboard navigation
-    if (this.menuItemDirective) {
-      this.menuItemDirective.disabled = this.disabled ?? false;
+    if (this.menuItemComponent) {
+      this.menuItemComponent.disabled = this.disabled ?? false;
     }
   }
 
diff --git a/libs/vault/src/components/dark-image-source.directive.ts b/libs/vault/src/components/dark-image-source.directive.ts
index ee54f61209a..b899ad472d4 100644
--- a/libs/vault/src/components/dark-image-source.directive.ts
+++ b/libs/vault/src/components/dark-image-source.directive.ts
@@ -40,7 +40,7 @@ export class DarkImageSourceDirective implements OnInit {
   /**
    * The image source to use when the dark theme is applied.
    */
-  darkImgSrc = input.required<string>({ alias: "appDarkImgSrc" });
+  readonly darkImgSrc = input.required<string>({ alias: "appDarkImgSrc" });
 
   @HostBinding("attr.src") src: string | undefined;
 
diff --git a/libs/vault/src/components/decryption-failure-dialog/decryption-failure-dialog.component.ts b/libs/vault/src/components/decryption-failure-dialog/decryption-failure-dialog.component.ts
index 91b1cef364c..6b1a0e0d8aa 100644
--- a/libs/vault/src/components/decryption-failure-dialog/decryption-failure-dialog.component.ts
+++ b/libs/vault/src/components/decryption-failure-dialog/decryption-failure-dialog.component.ts
@@ -13,12 +13,15 @@ import {
   DialogModule,
   DialogService,
   TypographyModule,
+  CenterPositionStrategy,
 } from "@bitwarden/components";
 
 export type DecryptionFailureDialogParams = {
   cipherIds: CipherId[];
 };
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-decryption-failure-dialog",
   templateUrl: "./decryption-failure-dialog.component.html",
@@ -54,6 +57,9 @@ export class DecryptionFailureDialogComponent {
   }
 
   static open(dialogService: DialogService, params: DecryptionFailureDialogParams) {
-    return dialogService.open(DecryptionFailureDialogComponent, { data: params });
+    return dialogService.open(DecryptionFailureDialogComponent, {
+      data: params,
+      positionStrategy: new CenterPositionStrategy(),
+    });
   }
 }
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts b/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
index 8ba7b29a526..ec5a9ce96fd 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
@@ -108,7 +108,7 @@ describe("DownloadAttachmentComponent", () => {
   it("renders delete button", () => {
     const deleteButton = fixture.debugElement.query(By.css("button"));
 
-    expect(deleteButton.attributes["title"]).toBe("downloadAttachmentName");
+    expect(deleteButton.attributes["aria-label"]).toBe("downloadAttachmentName");
   });
 
   describe("download attachment", () => {
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.ts b/libs/vault/src/components/download-attachment/download-attachment.component.ts
index 8208887b888..2f9cd528990 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.ts
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.ts
@@ -17,6 +17,8 @@ import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.v
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { AsyncActionsModule, IconButtonModule, ToastService } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-download-attachment",
   templateUrl: "./download-attachment.component.html",
@@ -24,18 +26,28 @@ import { AsyncActionsModule, IconButtonModule, ToastService } from "@bitwarden/c
 })
 export class DownloadAttachmentComponent {
   /** Attachment to download */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) attachment: AttachmentView;
 
   /** The cipher associated with the attachment */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipher: CipherView;
 
   // When in view mode, we will want to check for the master password reprompt
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() checkPwReprompt?: boolean = false;
 
   // Required for fetching attachment data when viewed from cipher via emergency access
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() emergencyAccessId?: EmergencyAccessId;
 
   /** When owners/admins can mange all items and when accessing from the admin console, use the admin endpoint */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() admin?: boolean = false;
 
   constructor(
diff --git a/libs/vault/src/components/new-cipher-menu/new-cipher-menu.component.ts b/libs/vault/src/components/new-cipher-menu/new-cipher-menu.component.ts
index 82bbc9a0749..0a755a9cdb4 100644
--- a/libs/vault/src/components/new-cipher-menu/new-cipher-menu.component.ts
+++ b/libs/vault/src/components/new-cipher-menu/new-cipher-menu.component.ts
@@ -9,15 +9,25 @@ import { CIPHER_MENU_ITEMS } from "@bitwarden/common/vault/types/cipher-menu-ite
 import { ButtonModule, MenuModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-new-cipher-menu",
   templateUrl: "new-cipher-menu.component.html",
   imports: [ButtonModule, CommonModule, MenuModule, I18nPipe, JslibModule],
 })
 export class NewCipherMenuComponent {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   canCreateCipher = input(false);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   canCreateFolder = input(false);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   canCreateCollection = input(false);
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   canCreateSshKey = input(false);
   folderAdded = output();
   collectionAdded = output();
diff --git a/libs/vault/src/components/org-icon.directive.ts b/libs/vault/src/components/org-icon.directive.ts
index d9c8f240474..e9f28cb246a 100644
--- a/libs/vault/src/components/org-icon.directive.ts
+++ b/libs/vault/src/components/org-icon.directive.ts
@@ -8,7 +8,11 @@ export type OrgIconSize = "default" | "small" | "large";
   selector: "[appOrgIcon]",
 })
 export class OrgIconDirective {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) tierType!: ProductTierType;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input() size?: OrgIconSize = "default";
 
   constructor(
diff --git a/libs/vault/src/components/password-history-view/password-history-view.component.ts b/libs/vault/src/components/password-history-view/password-history-view.component.ts
index 427644f3e77..e7d64cfdfdc 100644
--- a/libs/vault/src/components/password-history-view/password-history-view.component.ts
+++ b/libs/vault/src/components/password-history-view/password-history-view.component.ts
@@ -8,6 +8,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { PasswordHistoryView } from "@bitwarden/common/vault/models/view/password-history.view";
 import { ItemModule, ColorPasswordModule, IconButtonModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-password-history-view",
   templateUrl: "./password-history-view.component.html",
@@ -17,6 +19,8 @@ export class PasswordHistoryViewComponent implements OnInit {
   /**
    * Optional cipher view. When included `cipherId` is ignored.
    */
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipher: CipherView;
 
   /** The password history for the cipher. */
diff --git a/libs/vault/src/components/password-history/password-history.component.ts b/libs/vault/src/components/password-history/password-history.component.ts
index 7845edb2369..dd2865fa2ce 100644
--- a/libs/vault/src/components/password-history/password-history.component.ts
+++ b/libs/vault/src/components/password-history/password-history.component.ts
@@ -26,6 +26,8 @@ export interface ViewPasswordHistoryDialogParams {
 /**
  * A dialog component that displays the password history for a cipher.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "app-vault-password-history",
   templateUrl: "password-history.component.html",
diff --git a/libs/vault/src/components/password-reprompt.component.ts b/libs/vault/src/components/password-reprompt.component.ts
index 7665b22be49..f5245f5cad6 100644
--- a/libs/vault/src/components/password-reprompt.component.ts
+++ b/libs/vault/src/components/password-reprompt.component.ts
@@ -22,6 +22,8 @@ import { KeyService } from "@bitwarden/key-management";
  * Used to verify the user's Master Password for the "Master Password Re-prompt" feature only.
  * See UserVerificationComponent for any other situation where you need to verify the user's identity.
  */
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-password-reprompt",
   imports: [
diff --git a/libs/vault/src/components/permit-cipher-details-popover/permit-cipher-details-popover.component.ts b/libs/vault/src/components/permit-cipher-details-popover/permit-cipher-details-popover.component.ts
index 8e80ddf7810..3649c8a21e1 100644
--- a/libs/vault/src/components/permit-cipher-details-popover/permit-cipher-details-popover.component.ts
+++ b/libs/vault/src/components/permit-cipher-details-popover/permit-cipher-details-popover.component.ts
@@ -4,6 +4,8 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { LinkModule, PopoverModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "vault-permit-cipher-details-popover",
   templateUrl: "./permit-cipher-details-popover.component.html",
diff --git a/libs/vault/src/components/totp-countdown/totp-countdown.component.ts b/libs/vault/src/components/totp-countdown/totp-countdown.component.ts
index 5274ce621f0..32f9a64bb87 100644
--- a/libs/vault/src/components/totp-countdown/totp-countdown.component.ts
+++ b/libs/vault/src/components/totp-countdown/totp-countdown.component.ts
@@ -15,13 +15,19 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { TotpInfo } from "@bitwarden/common/vault/services/totp.service";
 import { TypographyModule } from "@bitwarden/components";
 
+// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "[bitTotpCountdown]",
   templateUrl: "totp-countdown.component.html",
   imports: [CommonModule, TypographyModule],
 })
 export class BitTotpCountdownComponent implements OnInit, OnChanges {
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-signals
   @Input({ required: true }) cipher!: CipherView;
+  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
+  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
   @Output() sendCopyCode = new EventEmitter();
 
   /**
diff --git a/libs/vault/src/directives/readonly-textarea.directive.ts b/libs/vault/src/directives/readonly-textarea.directive.ts
index 65bd9d6e353..17c5f865fb3 100644
--- a/libs/vault/src/directives/readonly-textarea.directive.ts
+++ b/libs/vault/src/directives/readonly-textarea.directive.ts
@@ -8,6 +8,8 @@ import { firstValueFrom } from "rxjs";
   providers: [TextFieldModule],
   hostDirectives: [CdkTextareaAutosize],
 })
+// FIXME(https://bitwarden.atlassian.net/browse/PM-28232): Use Directive suffix
+// eslint-disable-next-line @angular-eslint/directive-class-suffix
 export class VaultAutosizeReadOnlyTextArea implements AfterViewInit {
   constructor(
     @Host() private autosize: CdkTextareaAutosize,
diff --git a/libs/vault/src/index.ts b/libs/vault/src/index.ts
index 5acac9ec009..93a72ba14e0 100644
--- a/libs/vault/src/index.ts
+++ b/libs/vault/src/index.ts
@@ -1,5 +1,13 @@
+export {
+  AtRiskPasswordCalloutService,
+  AtRiskPasswordCalloutData,
+} from "./services/at-risk-password-callout.service";
 export { PasswordRepromptService } from "./services/password-reprompt.service";
-export { CopyCipherFieldService, CopyAction } from "./services/copy-cipher-field.service";
+export {
+  CopyCipherFieldService,
+  CopyAction,
+  CopyFieldAction,
+} from "./services/copy-cipher-field.service";
 export { CopyCipherFieldDirective } from "./components/copy-cipher-field.directive";
 export { OrgIconDirective } from "./components/org-icon.directive";
 export { CanDeleteCipherDirective } from "./components/can-delete-cipher.directive";
@@ -27,5 +35,4 @@ export { SshImportPromptService } from "./services/ssh-import-prompt.service";
 
 export * from "./abstractions/change-login-password.service";
 export * from "./services/default-change-login-password.service";
-export * from "./abstractions/cipher-archive.service";
-export * from "./services/default-cipher-archive.service";
+export * from "./services/archive-cipher-utilities.service";
diff --git a/libs/vault/src/services/archive-cipher-utilities.service.spec.ts b/libs/vault/src/services/archive-cipher-utilities.service.spec.ts
new file mode 100644
index 00000000000..76a4073325e
--- /dev/null
+++ b/libs/vault/src/services/archive-cipher-utilities.service.spec.ts
@@ -0,0 +1,122 @@
+import { MockProxy, mock } from "jest-mock-extended";
+import { BehaviorSubject } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { DialogService, ToastService } from "@bitwarden/components";
+
+import { ArchiveCipherUtilitiesService } from "./archive-cipher-utilities.service";
+import { PasswordRepromptService } from "./password-reprompt.service";
+
+describe("ArchiveCipherUtilitiesService", () => {
+  let service: ArchiveCipherUtilitiesService;
+
+  let cipherArchiveService: MockProxy<CipherArchiveService>;
+  let dialogService: MockProxy<DialogService>;
+  let passwordRepromptService: MockProxy<PasswordRepromptService>;
+  let toastService: MockProxy<ToastService>;
+  let i18nService: MockProxy<I18nService>;
+  let accountService: MockProxy<AccountService>;
+
+  const mockCipher = new CipherView();
+  mockCipher.id = "cipher-id" as CipherId;
+  const mockUserId = "user-id";
+
+  beforeEach(() => {
+    cipherArchiveService = mock<CipherArchiveService>();
+    dialogService = mock<DialogService>();
+    passwordRepromptService = mock<PasswordRepromptService>();
+    toastService = mock<ToastService>();
+    i18nService = mock<I18nService>();
+    accountService = mock<AccountService>();
+
+    accountService.activeAccount$ = new BehaviorSubject({ id: mockUserId } as any).asObservable();
+
+    dialogService.openSimpleDialog.mockResolvedValue(true);
+    passwordRepromptService.passwordRepromptCheck.mockResolvedValue(true);
+    cipherArchiveService.archiveWithServer.mockResolvedValue(undefined);
+    cipherArchiveService.unarchiveWithServer.mockResolvedValue(undefined);
+    i18nService.t.mockImplementation((key) => key);
+
+    service = new ArchiveCipherUtilitiesService(
+      cipherArchiveService,
+      dialogService,
+      passwordRepromptService,
+      toastService,
+      i18nService,
+      accountService,
+    );
+  });
+
+  describe("archiveCipher()", () => {
+    it("returns early when confirmation dialog is cancelled", async () => {
+      dialogService.openSimpleDialog.mockResolvedValue(false);
+
+      await service.archiveCipher(mockCipher);
+
+      expect(passwordRepromptService.passwordRepromptCheck).toHaveBeenCalled();
+      expect(cipherArchiveService.archiveWithServer).not.toHaveBeenCalled();
+    });
+
+    it("returns early when password reprompt fails", async () => {
+      passwordRepromptService.passwordRepromptCheck.mockResolvedValue(false);
+
+      await service.archiveCipher(mockCipher);
+
+      expect(cipherArchiveService.archiveWithServer).not.toHaveBeenCalled();
+    });
+
+    it("archives cipher and shows success toast when successful", async () => {
+      await service.archiveCipher(mockCipher);
+
+      expect(cipherArchiveService.archiveWithServer).toHaveBeenCalledWith(
+        mockCipher.id,
+        mockUserId,
+      );
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "success",
+        message: "itemWasSentToArchive",
+      });
+    });
+
+    it("shows error toast when archiving fails", async () => {
+      cipherArchiveService.archiveWithServer.mockRejectedValue(new Error("test error"));
+
+      await service.archiveCipher(mockCipher);
+
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        message: "errorOccurred",
+      });
+    });
+  });
+
+  describe("unarchiveCipher()", () => {
+    it("unarchives cipher and shows success toast when successful", async () => {
+      await service.unarchiveCipher(mockCipher);
+
+      expect(cipherArchiveService.unarchiveWithServer).toHaveBeenCalledWith(
+        mockCipher.id,
+        mockUserId,
+      );
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "success",
+        message: "itemWasUnarchived",
+      });
+    });
+
+    it("shows error toast when unarchiving fails", async () => {
+      cipherArchiveService.unarchiveWithServer.mockRejectedValue(new Error("test error"));
+
+      await service.unarchiveCipher(mockCipher);
+
+      expect(toastService.showToast).toHaveBeenCalledWith({
+        variant: "error",
+        message: "errorOccurred",
+      });
+    });
+  });
+});
diff --git a/libs/vault/src/services/archive-cipher-utilities.service.ts b/libs/vault/src/services/archive-cipher-utilities.service.ts
new file mode 100644
index 00000000000..bbe7dba6715
--- /dev/null
+++ b/libs/vault/src/services/archive-cipher-utilities.service.ts
@@ -0,0 +1,80 @@
+import { Injectable } from "@angular/core";
+import { firstValueFrom } from "rxjs";
+
+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 { CipherId } from "@bitwarden/common/types/guid";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { DialogService, ToastService } from "@bitwarden/components";
+
+import { PasswordRepromptService } from "./password-reprompt.service";
+
+/**
+ * Wrapper around {@link CipherArchiveService} to provide UI enhancements for archiving/unarchiving ciphers.
+ */
+@Injectable({ providedIn: "root" })
+export class ArchiveCipherUtilitiesService {
+  constructor(
+    private cipherArchiveService: CipherArchiveService,
+    private dialogService: DialogService,
+    private passwordRepromptService: PasswordRepromptService,
+    private toastService: ToastService,
+    private i18nService: I18nService,
+    private accountService: AccountService,
+  ) {}
+
+  /** Archive a cipher, with confirmation dialog and password reprompt checks. */
+  async archiveCipher(cipher: CipherView) {
+    const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
+    if (!repromptPassed) {
+      return;
+    }
+
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "archiveItem" },
+      content: { key: "archiveItemConfirmDesc" },
+      type: "info",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    await this.cipherArchiveService
+      .archiveWithServer(cipher.id as CipherId, userId)
+      .then(() => {
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("itemWasSentToArchive"),
+        });
+      })
+      .catch(() => {
+        this.toastService.showToast({
+          variant: "error",
+          message: this.i18nService.t("errorOccurred"),
+        });
+      });
+  }
+
+  /** Unarchives a cipher  */
+  async unarchiveCipher(cipher: CipherView) {
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    await this.cipherArchiveService
+      .unarchiveWithServer(cipher.id as CipherId, userId)
+      .then(() => {
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("itemWasUnarchived"),
+        });
+      })
+      .catch(() => {
+        this.toastService.showToast({
+          variant: "error",
+          message: this.i18nService.t("errorOccurred"),
+        });
+      });
+  }
+}
diff --git a/libs/vault/src/services/at-risk-password-callout.service.spec.ts b/libs/vault/src/services/at-risk-password-callout.service.spec.ts
new file mode 100644
index 00000000000..5b687970c4b
--- /dev/null
+++ b/libs/vault/src/services/at-risk-password-callout.service.spec.ts
@@ -0,0 +1,392 @@
+import { TestBed } from "@angular/core/testing";
+import { firstValueFrom, of } from "rxjs";
+
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import {
+  SecurityTask,
+  SecurityTaskStatus,
+  SecurityTaskType,
+  TaskService,
+} from "@bitwarden/common/vault/tasks";
+import { StateProvider } from "@bitwarden/state";
+import { UserId } from "@bitwarden/user-core";
+
+import { FakeSingleUserState } from "../../../common/spec/fake-state";
+
+import {
+  AtRiskPasswordCalloutData,
+  AtRiskPasswordCalloutService,
+} from "./at-risk-password-callout.service";
+
+const fakeUserState = () =>
+  ({
+    update: jest.fn().mockResolvedValue(undefined),
+    state$: of(null),
+  }) as unknown as FakeSingleUserState<AtRiskPasswordCalloutData>;
+
+class MockCipherView {
+  constructor(
+    public id: string,
+    private deleted: boolean,
+    public edit: boolean = true,
+    public viewPassword: boolean = true,
+  ) {}
+  get isDeleted() {
+    return this.deleted;
+  }
+}
+
+describe("AtRiskPasswordCalloutService", () => {
+  let service: AtRiskPasswordCalloutService;
+  const mockTaskService = {
+    pendingTasks$: jest.fn(),
+    completedTasks$: jest.fn(),
+  };
+  const mockCipherService = { cipherViews$: jest.fn() };
+  const mockStateProvider = { getUser: jest.fn().mockReturnValue(fakeUserState()) };
+  const userId: UserId = "user1" as UserId;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        AtRiskPasswordCalloutService,
+        {
+          provide: TaskService,
+          useValue: mockTaskService,
+        },
+        {
+          provide: CipherService,
+          useValue: mockCipherService,
+        },
+        {
+          provide: StateProvider,
+          useValue: mockStateProvider,
+        },
+      ],
+    });
+
+    service = TestBed.inject(AtRiskPasswordCalloutService);
+  });
+
+  describe("pendingTasks$", () => {
+    it.each([
+      {
+        description:
+          "returns tasks filtered by UpdateAtRiskCredential type with valid cipher permissions",
+        tasks: [
+          {
+            id: "t1",
+            cipherId: "c1",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+          {
+            id: "t2",
+            cipherId: "c2",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+        ],
+        ciphers: [
+          new MockCipherView("c1", false, true, true),
+          new MockCipherView("c2", false, true, true),
+        ],
+        expectedLength: 2,
+        expectedFirstId: "t1",
+      },
+      {
+        description: "filters out tasks with wrong task type",
+        tasks: [
+          {
+            id: "t1",
+            cipherId: "c1",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+          {
+            id: "t2",
+            cipherId: "c2",
+            type: 999 as SecurityTaskType,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+        ],
+        ciphers: [
+          new MockCipherView("c1", false, true, true),
+          new MockCipherView("c2", false, true, true),
+        ],
+        expectedLength: 1,
+        expectedFirstId: "t1",
+      },
+      {
+        description: "filters out tasks with missing associated cipher",
+        tasks: [
+          {
+            id: "t1",
+            cipherId: "c1",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+          {
+            id: "t2",
+            cipherId: "c-nonexistent",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+        ],
+        ciphers: [new MockCipherView("c1", false, true, true)],
+        expectedLength: 1,
+        expectedFirstId: "t1",
+      },
+      {
+        description: "filters out tasks when cipher edit permission is false",
+        tasks: [
+          {
+            id: "t1",
+            cipherId: "c1",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+          {
+            id: "t2",
+            cipherId: "c2",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+        ],
+        ciphers: [
+          new MockCipherView("c1", false, true, true),
+          new MockCipherView("c2", false, false, true),
+        ],
+        expectedLength: 1,
+        expectedFirstId: "t1",
+      },
+      {
+        description: "filters out tasks when cipher viewPassword permission is false",
+        tasks: [
+          {
+            id: "t1",
+            cipherId: "c1",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+          {
+            id: "t2",
+            cipherId: "c2",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+        ],
+        ciphers: [
+          new MockCipherView("c1", false, true, true),
+          new MockCipherView("c2", false, true, false),
+        ],
+        expectedLength: 1,
+        expectedFirstId: "t1",
+      },
+      {
+        description: "filters out tasks when cipher is deleted",
+        tasks: [
+          {
+            id: "t1",
+            cipherId: "c1",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+          {
+            id: "t2",
+            cipherId: "c2",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+        ],
+        ciphers: [
+          new MockCipherView("c1", false, true, true),
+          new MockCipherView("c2", true, true, true),
+        ],
+        expectedLength: 1,
+        expectedFirstId: "t1",
+      },
+    ])("$description", async ({ tasks, ciphers, expectedLength, expectedFirstId }) => {
+      jest.spyOn(mockTaskService, "pendingTasks$").mockReturnValue(of(tasks));
+      jest.spyOn(mockCipherService, "cipherViews$").mockReturnValue(of(ciphers));
+
+      const result = await firstValueFrom(service.pendingTasks$(userId));
+
+      expect(result).toHaveLength(expectedLength);
+      if (expectedFirstId) {
+        expect(result[0].id).toBe(expectedFirstId);
+      }
+    });
+
+    it("correctly filters mixed valid and invalid tasks", async () => {
+      const tasks: SecurityTask[] = [
+        {
+          id: "t1",
+          cipherId: "c1",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Pending,
+        } as SecurityTask,
+        {
+          id: "t2",
+          cipherId: "c2",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Pending,
+        } as SecurityTask,
+        {
+          id: "t3",
+          cipherId: "c3",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Pending,
+        } as SecurityTask,
+        {
+          id: "t4",
+          cipherId: "c4",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Pending,
+        } as SecurityTask,
+        {
+          id: "t5",
+          cipherId: "c5",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Pending,
+        } as SecurityTask,
+      ];
+      const ciphers = [
+        new MockCipherView("c1", false, true, true), // valid
+        new MockCipherView("c2", false, false, true), // no edit
+        new MockCipherView("c3", true, true, true), // deleted
+        new MockCipherView("c4", false, true, false), // no viewPassword
+        // c5 missing
+      ];
+
+      jest.spyOn(mockTaskService, "pendingTasks$").mockReturnValue(of(tasks));
+      jest.spyOn(mockCipherService, "cipherViews$").mockReturnValue(of(ciphers));
+
+      const result = await firstValueFrom(service.pendingTasks$(userId));
+
+      expect(result).toHaveLength(1);
+      expect(result[0].id).toBe("t1");
+    });
+
+    it.each([
+      {
+        description: "returns empty array when no tasks match filter criteria",
+        tasks: [
+          {
+            id: "t1",
+            cipherId: "c1",
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            status: SecurityTaskStatus.Pending,
+          } as SecurityTask,
+        ],
+        ciphers: [new MockCipherView("c1", true, true, true)], // deleted
+      },
+      {
+        description: "returns empty array when no pending tasks exist",
+        tasks: [],
+        ciphers: [new MockCipherView("c1", false, true, true)],
+      },
+    ])("$description", async ({ tasks, ciphers }) => {
+      jest.spyOn(mockTaskService, "pendingTasks$").mockReturnValue(of(tasks));
+      jest.spyOn(mockCipherService, "cipherViews$").mockReturnValue(of(ciphers));
+
+      const result = await firstValueFrom(service.pendingTasks$(userId));
+
+      expect(result).toHaveLength(0);
+    });
+  });
+
+  describe("completedTasks$", () => {
+    it("returns true if completed tasks exist", async () => {
+      const tasks: SecurityTask[] = [
+        {
+          id: "t1",
+          cipherId: "c1",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Completed,
+        } as SecurityTask,
+        {
+          id: "t2",
+          cipherId: "c2",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Pending,
+        } as SecurityTask,
+        {
+          id: "t3",
+          cipherId: "nope",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Completed,
+        } as SecurityTask,
+        {
+          id: "t4",
+          cipherId: "c3",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Completed,
+        } as SecurityTask,
+      ];
+
+      jest.spyOn(mockTaskService, "completedTasks$").mockReturnValue(of(tasks));
+
+      const result = await firstValueFrom(service.completedTasks$(userId));
+
+      expect(result).toEqual(tasks[0]);
+      expect(result?.id).toBe("t1");
+    });
+  });
+
+  describe("showCompletedTasksBanner$", () => {
+    beforeEach(() => {
+      jest.spyOn(mockTaskService, "pendingTasks$").mockReturnValue(of([]));
+      jest.spyOn(mockTaskService, "completedTasks$").mockReturnValue(of([]));
+      jest.spyOn(mockCipherService, "cipherViews$").mockReturnValue(of([]));
+    });
+
+    it("returns false if banner has been dismissed", async () => {
+      const state: AtRiskPasswordCalloutData = {
+        hasInteractedWithTasks: true,
+        tasksBannerDismissed: true,
+      };
+      const mockState = { ...fakeUserState(), state$: of(state) };
+      mockStateProvider.getUser.mockReturnValue(mockState);
+
+      const result = await firstValueFrom(service.showCompletedTasksBanner$(userId));
+
+      expect(result).toBe(false);
+    });
+
+    it("returns true when has completed tasks, no pending tasks, and banner not dismissed", async () => {
+      const completedTasks = [
+        {
+          id: "t1",
+          cipherId: "c1",
+          type: SecurityTaskType.UpdateAtRiskCredential,
+          status: SecurityTaskStatus.Completed,
+        },
+      ];
+      const ciphers = [new MockCipherView("c1", false)];
+      const state: AtRiskPasswordCalloutData = {
+        hasInteractedWithTasks: true,
+        tasksBannerDismissed: false,
+      };
+
+      jest.spyOn(mockTaskService, "completedTasks$").mockReturnValue(of(completedTasks));
+      jest.spyOn(mockCipherService, "cipherViews$").mockReturnValue(of(ciphers));
+      mockStateProvider.getUser.mockReturnValue({ state$: of(state) });
+
+      const result = await firstValueFrom(service.showCompletedTasksBanner$(userId));
+
+      expect(result).toBe(true);
+    });
+
+    it("returns false when no completed tasks", async () => {
+      const state: AtRiskPasswordCalloutData = {
+        hasInteractedWithTasks: true,
+        tasksBannerDismissed: false,
+      };
+      mockStateProvider.getUser.mockReturnValue({ state$: of(state) });
+
+      const result = await firstValueFrom(service.showCompletedTasksBanner$(userId));
+
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/libs/vault/src/services/at-risk-password-callout.service.ts b/libs/vault/src/services/at-risk-password-callout.service.ts
new file mode 100644
index 00000000000..214a061399e
--- /dev/null
+++ b/libs/vault/src/services/at-risk-password-callout.service.ts
@@ -0,0 +1,95 @@
+import { Injectable } from "@angular/core";
+import { combineLatest, map, Observable } from "rxjs";
+
+import {
+  SingleUserState,
+  StateProvider,
+  UserKeyDefinition,
+  VAULT_AT_RISK_PASSWORDS_MEMORY,
+} from "@bitwarden/common/platform/state";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SecurityTask, SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
+import { UserId } from "@bitwarden/user-core";
+
+export type AtRiskPasswordCalloutData = {
+  hasInteractedWithTasks: boolean;
+  tasksBannerDismissed: boolean;
+};
+
+export const AT_RISK_PASSWORD_CALLOUT_KEY = new UserKeyDefinition<AtRiskPasswordCalloutData>(
+  VAULT_AT_RISK_PASSWORDS_MEMORY,
+  "atRiskPasswords",
+  {
+    deserializer: (jsonData) => jsonData,
+    clearOn: ["lock", "logout"],
+  },
+);
+
+@Injectable()
+export class AtRiskPasswordCalloutService {
+  constructor(
+    private taskService: TaskService,
+    private cipherService: CipherService,
+    private stateProvider: StateProvider,
+  ) {}
+
+  pendingTasks$(userId: UserId): Observable<SecurityTask[]> {
+    return combineLatest([
+      this.taskService.pendingTasks$(userId),
+      this.cipherService.cipherViews$(userId),
+    ]).pipe(
+      map(([tasks, ciphers]) => {
+        return tasks.filter((t: SecurityTask) => {
+          const associatedCipher = ciphers.find((c) => c.id === t.cipherId);
+
+          return (
+            t.type === SecurityTaskType.UpdateAtRiskCredential &&
+            associatedCipher &&
+            associatedCipher.edit &&
+            associatedCipher.viewPassword &&
+            !associatedCipher.isDeleted
+          );
+        });
+      }),
+    );
+  }
+
+  completedTasks$(userId: UserId): Observable<SecurityTask | undefined> {
+    return this.taskService.completedTasks$(userId).pipe(
+      map((tasks) => {
+        return tasks.find((t: SecurityTask) => t.type === SecurityTaskType.UpdateAtRiskCredential);
+      }),
+    );
+  }
+
+  showCompletedTasksBanner$(userId: UserId): Observable<boolean> {
+    return combineLatest([
+      this.pendingTasks$(userId),
+      this.completedTasks$(userId),
+      this.atRiskPasswordState(userId).state$,
+    ]).pipe(
+      map(([pendingTasks, completedTasks, state]) => {
+        const hasPendingTasks = pendingTasks.length > 0;
+        const bannerDismissed = state?.tasksBannerDismissed ?? false;
+        const hasInteracted = state?.hasInteractedWithTasks ?? false;
+
+        // This will ensure the banner remains visible only in the client the user resolved their tasks in
+        // e.g. if the user did not see tasks in the browser, and resolves them in the web, the browser will not show the banner
+        if (!hasPendingTasks && (!hasInteracted || bannerDismissed)) {
+          return false;
+        }
+
+        // Show banner if there are completed tasks and no pending tasks, and banner hasn't been dismissed
+        return !!completedTasks && !hasPendingTasks && !(state?.tasksBannerDismissed ?? false);
+      }),
+    );
+  }
+
+  atRiskPasswordState(userId: UserId): SingleUserState<AtRiskPasswordCalloutData> {
+    return this.stateProvider.getUser(userId, AT_RISK_PASSWORD_CALLOUT_KEY);
+  }
+
+  updateAtRiskPasswordState(userId: UserId, updatedState: AtRiskPasswordCalloutData): void {
+    void this.atRiskPasswordState(userId).update(() => updatedState);
+  }
+}
diff --git a/libs/vault/src/services/copy-cipher-field.service.ts b/libs/vault/src/services/copy-cipher-field.service.ts
index 0a7d9e1f68d..539c81b7be3 100644
--- a/libs/vault/src/services/copy-cipher-field.service.ts
+++ b/libs/vault/src/services/copy-cipher-field.service.ts
@@ -35,6 +35,12 @@ export type CopyAction =
   | "publicKey"
   | "keyFingerprint";
 
+/**
+ * Copy actions that can be used with the appCopyField directive.
+ * Excludes "hiddenField" which requires special handling.
+ */
+export type CopyFieldAction = Exclude<CopyAction, "hiddenField">;
+
 type CopyActionInfo = {
   /**
    * The i18n key for the type of field being copied. Will be used to display a toast message.
diff --git a/package-lock.json b/package-lock.json
index d1f536351aa..f72fba33344 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,8 @@
         "@angular/platform-browser": "19.2.14",
         "@angular/platform-browser-dynamic": "19.2.14",
         "@angular/router": "19.2.14",
-        "@bitwarden/sdk-internal": "0.2.0-main.296",
+        "@bitwarden/commercial-sdk-internal": "0.2.0-main.395",
+        "@bitwarden/sdk-internal": "0.2.0-main.395",
         "@electron/fuses": "1.8.0",
         "@emotion/css": "11.13.5",
         "@koa/multer": "4.0.0",
@@ -31,12 +32,13 @@
         "@microsoft/signalr": "8.0.7",
         "@microsoft/signalr-protocol-msgpack": "8.0.7",
         "@ng-select/ng-select": "14.9.0",
-        "@nx/devkit": "21.3.11",
-        "@nx/eslint": "21.3.11",
-        "@nx/jest": "21.3.11",
-        "@nx/js": "21.3.11",
+        "@nx/devkit": "21.6.9",
+        "@nx/eslint": "21.6.9",
+        "@nx/jest": "21.6.9",
+        "@nx/js": "21.6.9",
+        "@nx/webpack": "21.6.9",
         "big-integer": "1.6.52",
-        "braintree-web-drop-in": "1.44.0",
+        "braintree-web-drop-in": "1.46.0",
         "buffer": "6.0.3",
         "bufferutil": "4.0.9",
         "chalk": "4.1.2",
@@ -47,16 +49,16 @@
         "inquirer": "8.2.6",
         "jsdom": "26.1.0",
         "jszip": "3.10.1",
-        "koa": "2.16.1",
+        "koa": "2.16.3",
         "koa-bodyparser": "4.4.1",
         "koa-json": "2.0.2",
         "lit": "3.3.0",
         "lowdb": "1.0.0",
         "lunr": "2.3.9",
         "multer": "2.0.2",
-        "ngx-toastr": "19.0.0",
+        "ngx-toastr": "19.1.0",
         "node-fetch": "2.6.12",
-        "node-forge": "1.3.1",
+        "node-forge": "1.3.2",
         "oidc-client-ts": "2.4.1",
         "open": "10.1.2",
         "papaparse": "5.5.3",
@@ -65,9 +67,9 @@
         "qrcode-parser": "2.1.3",
         "qrious": "4.0.2",
         "rxjs": "7.8.1",
-        "semver": "7.7.2",
-        "tabbable": "6.2.0",
-        "tldts": "7.0.1",
+        "semver": "7.7.3",
+        "tabbable": "6.3.0",
+        "tldts": "7.0.18",
         "ts-node": "10.9.2",
         "utf-8-validate": "6.0.5",
         "zone.js": "0.15.1",
@@ -78,12 +80,12 @@
         "@angular-eslint/schematics": "19.6.0",
         "@angular/cli": "19.2.14",
         "@angular/compiler-cli": "19.2.14",
-        "@babel/core": "7.24.9",
-        "@babel/preset-env": "7.24.8",
+        "@babel/core": "7.28.5",
+        "@babel/preset-env": "7.28.5",
         "@compodoc/compodoc": "1.1.26",
         "@electron/notarize": "3.0.1",
-        "@electron/rebuild": "3.7.2",
-        "@eslint/compat": "1.2.9",
+        "@electron/rebuild": "4.0.1",
+        "@eslint/compat": "2.0.0",
         "@lit-labs/signals": "0.1.2",
         "@ngtools/webpack": "19.2.14",
         "@playwright/test": "1.56.0",
@@ -99,8 +101,9 @@
         "@storybook/test-runner": "0.22.0",
         "@storybook/theming": "8.6.12",
         "@storybook/web-components-webpack5": "8.6.12",
-        "@types/chrome": "0.1.12",
-        "@types/firefox-webext-browser": "120.0.4",
+        "@tailwindcss/container-queries": "0.1.1",
+        "@types/chrome": "0.1.28",
+        "@types/firefox-webext-browser": "143.0.0",
         "@types/inquirer": "8.2.10",
         "@types/jest": "29.5.14",
         "@types/jsdom": "21.1.7",
@@ -111,10 +114,10 @@
         "@types/koa-json": "2.0.23",
         "@types/lowdb": "1.0.15",
         "@types/lunr": "2.3.7",
-        "@types/node": "22.15.3",
+        "@types/node": "22.19.1",
         "@types/node-fetch": "2.6.4",
-        "@types/node-forge": "1.3.11",
-        "@types/papaparse": "5.3.16",
+        "@types/node-forge": "1.3.14",
+        "@types/papaparse": "5.5.0",
         "@types/proper-lockfile": "4.1.4",
         "@types/retry": "0.12.5",
         "@types/zxcvbn": "4.4.5",
@@ -124,18 +127,18 @@
         "@yao-pkg/pkg": "6.5.1",
         "angular-eslint": "19.6.0",
         "autoprefixer": "10.4.21",
-        "axe-playwright": "2.1.0",
+        "axe-playwright": "2.2.2",
         "babel-loader": "9.2.1",
         "base64-loader": "1.0.0",
-        "browserslist": "4.23.2",
-        "chromatic": "13.1.2",
+        "browserslist": "4.28.0",
+        "chromatic": "13.3.1",
         "concurrently": "9.2.0",
-        "copy-webpack-plugin": "13.0.0",
-        "cross-env": "10.0.0",
+        "copy-webpack-plugin": "13.0.1",
+        "cross-env": "10.1.0",
         "css-loader": "7.1.2",
-        "electron": "36.8.1",
+        "electron": "37.7.0",
         "electron-builder": "26.0.12",
-        "electron-log": "5.4.0",
+        "electron-log": "5.4.3",
         "electron-reload": "2.0.0-alpha.1",
         "electron-store": "8.2.0",
         "electron-updater": "6.6.4",
@@ -149,41 +152,41 @@
         "eslint-plugin-tailwindcss": "3.18.0",
         "html-loader": "5.1.0",
         "html-webpack-injector": "1.1.4",
-        "html-webpack-plugin": "5.6.3",
+        "html-webpack-plugin": "5.6.5",
         "husky": "9.1.7",
-        "jest-diff": "29.7.0",
+        "jest-diff": "30.2.0",
         "jest-junit": "16.0.0",
         "jest-mock-extended": "3.0.7",
-        "jest-preset-angular": "14.6.0",
+        "jest-preset-angular": "14.6.1",
         "json5": "2.2.3",
         "lint-staged": "16.0.0",
-        "mini-css-extract-plugin": "2.9.2",
-        "nx": "21.3.11",
-        "postcss": "8.5.3",
-        "postcss-loader": "8.1.1",
+        "mini-css-extract-plugin": "2.9.4",
+        "nx": "21.6.9",
+        "postcss": "8.5.6",
+        "postcss-loader": "8.2.0",
         "prettier": "3.6.2",
         "prettier-plugin-tailwindcss": "0.6.11",
         "process": "0.11.10",
         "remark-gfm": "4.0.1",
         "rimraf": "6.0.1",
-        "sass": "1.88.0",
-        "sass-loader": "16.0.4",
+        "sass": "1.94.2",
+        "sass-loader": "16.0.6",
         "storybook": "8.6.12",
         "style-loader": "4.0.0",
         "tailwindcss": "3.4.17",
-        "ts-jest": "29.3.4",
-        "ts-loader": "9.5.2",
+        "ts-jest": "29.4.5",
+        "ts-loader": "9.5.4",
         "tsconfig-paths-webpack-plugin": "4.2.0",
         "type-fest": "2.19.0",
-        "typescript": "5.5.4",
+        "typescript": "5.8.3",
         "typescript-eslint": "8.31.0",
         "typescript-strict-plugin": "2.4.4",
         "url": "0.11.4",
         "util": "0.12.5",
-        "wait-on": "8.0.3",
-        "webpack": "5.99.7",
+        "wait-on": "9.0.3",
+        "webpack": "5.103.0",
         "webpack-cli": "6.0.1",
-        "webpack-dev-server": "5.2.1",
+        "webpack-dev-server": "5.2.2",
         "webpack-node-externals": "3.0.0"
       },
       "engines": {
@@ -193,11 +196,11 @@
     },
     "apps/browser": {
       "name": "@bitwarden/browser",
-      "version": "2025.9.0"
+      "version": "2025.12.0"
     },
     "apps/cli": {
       "name": "@bitwarden/cli",
-      "version": "2025.9.0",
+      "version": "2025.12.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@koa/multer": "4.0.0",
@@ -212,20 +215,20 @@
         "inquirer": "8.2.6",
         "jsdom": "26.1.0",
         "jszip": "3.10.1",
-        "koa": "2.16.1",
+        "koa": "2.16.3",
         "koa-bodyparser": "4.4.1",
         "koa-json": "2.0.2",
         "lowdb": "1.0.0",
         "lunr": "2.3.9",
         "multer": "2.0.2",
         "node-fetch": "2.6.12",
-        "node-forge": "1.3.1",
+        "node-forge": "1.3.2",
         "open": "10.1.2",
         "papaparse": "5.5.3",
         "proper-lockfile": "4.1.2",
         "rxjs": "7.8.1",
-        "semver": "7.7.2",
-        "tldts": "7.0.1",
+        "semver": "7.7.3",
+        "tldts": "7.0.18",
         "zxcvbn": "4.4.2"
       },
       "bin": {
@@ -279,7 +282,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.9.1",
+      "version": "2025.12.0",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },
@@ -293,7 +296,7 @@
     },
     "apps/web": {
       "name": "@bitwarden/web-vault",
-      "version": "2025.9.1"
+      "version": "2025.12.0"
     },
     "libs/admin-console": {
       "name": "@bitwarden/admin-console",
@@ -521,6 +524,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -971,39 +975,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/browserslist": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
-      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001718",
-        "electron-to-chromium": "^1.5.160",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -1299,6 +1270,27 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/mini-css-extract-plugin": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "schema-utils": "^4.0.0",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -1364,6 +1356,38 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/postcss-loader": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
+      "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^9.0.0",
+        "jiti": "^1.20.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/qs": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
@@ -1940,6 +1964,19 @@
         "strip-json-comments": "3.1.1"
       }
     },
+    "node_modules/@angular-eslint/schematics/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@angular-eslint/template-parser": {
       "version": "19.6.0",
       "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.6.0.tgz",
@@ -2626,30 +2663,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.5.tgz",
-      "integrity": "sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
+      "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
-      "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
+      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
       "license": "MIT",
       "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.9",
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-module-transforms": "^7.24.9",
-        "@babel/helpers": "^7.24.8",
-        "@babel/parser": "^7.24.8",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.8",
-        "@babel/types": "^7.24.9",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.5",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.28.3",
+        "@babel/helpers": "^7.28.4",
+        "@babel/parser": "^7.28.5",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.5",
+        "@babel/types": "^7.28.5",
+        "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -2664,6 +2701,22 @@
         "url": "https://opencollective.com/babel"
       }
     },
+    "node_modules/@babel/core/node_modules/@babel/generator": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.5",
+        "@babel/types": "^7.28.5",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/core/node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -2683,6 +2736,7 @@
       "version": "7.26.10",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.10.tgz",
       "integrity": "sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.26.10",
@@ -2724,38 +2778,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets/node_modules/browserslist": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
-      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001718",
-        "electron-to-chromium": "^1.5.160",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -2766,17 +2788,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz",
-      "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz",
+      "integrity": "sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
         "@babel/helper-optimise-call-expression": "^7.27.1",
         "@babel/helper-replace-supers": "^7.27.1",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/traverse": "^7.27.1",
+        "@babel/traverse": "^7.28.5",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -2846,16 +2868,16 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.4.tgz",
-      "integrity": "sha512-jljfR1rGnXXNWnmQg2K3+bvhkxB51Rl32QRaOTuwwjviGrHzIbSc8+x9CpraDtbT7mfyjXObULP4w/adunNwAw==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz",
+      "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "debug": "^4.4.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
+        "resolve": "^1.22.10"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -2871,13 +2893,13 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
-      "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz",
+      "integrity": "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.28.5",
+        "@babel/types": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2897,14 +2919,14 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
-      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.27.1",
         "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.27.3"
+        "@babel/traverse": "^7.28.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3016,9 +3038,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -3048,25 +3070,25 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
-      "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.27.2",
-        "@babel/types": "^7.27.6"
+        "@babel/types": "^7.28.4"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
-      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.0"
+        "@babel/types": "^7.28.5"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -3076,13 +3098,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
-      "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz",
+      "integrity": "sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3095,7 +3117,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
       "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -3140,13 +3161,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz",
-      "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz",
+      "integrity": "sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/traverse": "^7.28.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3250,30 +3271,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-assertions": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
@@ -3495,6 +3492,7 @@
       "version": "7.26.8",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
       "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.26.5",
@@ -3512,6 +3510,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
       "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.25.9",
@@ -3541,9 +3540,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.5.tgz",
-      "integrity": "sha512-JF6uE2s67f0y2RZcm2kpAUEbD50vH62TyWVebxwHAlbSdM49VqPz8t4a1uIjp4NIOIZ4xzLfjY5emt/RCyC7TQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.5.tgz",
+      "integrity": "sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -3572,12 +3571,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz",
-      "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz",
+      "integrity": "sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-create-class-features-plugin": "^7.28.3",
         "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
@@ -3588,17 +3587,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.27.1.tgz",
-      "integrity": "sha512-7iLhfFAubmpeJe/Wo2TVuDrykh/zlWXLzPNdL0Jqn/Xu8R3QQ8h9ff8FQoISZOsw74/HFqFI7NX63HN7QFIHKA==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz",
+      "integrity": "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-globals": "^7.28.0",
         "@babel/helper-plugin-utils": "^7.27.1",
         "@babel/helper-replace-supers": "^7.27.1",
-        "@babel/traverse": "^7.27.1",
-        "globals": "^11.1.0"
+        "@babel/traverse": "^7.28.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3636,12 +3635,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.27.3.tgz",
-      "integrity": "sha512-s4Jrok82JpiaIprtY2nHsYmrThKvvwgHwjgd7UMiYhZaN0asdXNLr0y+NjTfkA7SyQE5i2Fb7eawUOZmLvyqOA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz",
+      "integrity": "sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3685,7 +3685,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz",
       "integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -3713,10 +3712,26 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-explicit-resource-management": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.0.tgz",
+      "integrity": "sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
-      "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.5.tgz",
+      "integrity": "sha512-D4WIMaFtwa2NizOp+dnoFjRez/ClKiC2BqqImwKd1X28nqBtZEyCYJ2ozQrrzlxAFrcrjxo39S6khe9RNDlGzw==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -3807,9 +3822,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
-      "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.5.tgz",
+      "integrity": "sha512-axUuqnUTBuXyHGcJEVVh9pORaN6wC5bYfE7FGzPiaWa3syib9m7g+/IT/4VgCOe2Upef43PHzeAvcrVek6QuuA==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -3869,15 +3884,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
-      "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.28.5.tgz",
+      "integrity": "sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-module-transforms": "^7.28.3",
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3964,15 +3979,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.27.3.tgz",
-      "integrity": "sha512-7ZZtznF9g4l2JCImCo5LNKFHB5eXnN39lLtLY5Tg+VkR0jwOt7TBciMckuiQIOIW7L5tkQOCh3bVGYeXgMx52Q==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz",
+      "integrity": "sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.27.2",
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-transform-destructuring": "^7.27.3",
-        "@babel/plugin-transform-parameters": "^7.27.1"
+        "@babel/plugin-transform-destructuring": "^7.28.0",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/traverse": "^7.28.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -4013,9 +4029,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
-      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.5.tgz",
+      "integrity": "sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -4029,9 +4045,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.1.tgz",
-      "integrity": "sha512-018KRk76HWKeZ5l4oTj2zPpSh+NbGdt0st5S6x0pga6HgrjBOJb24mMDHorFopOOd6YHkLgOZ+zaCjZGPO4aKg==",
+      "version": "7.27.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
+      "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4104,9 +4120,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.5.tgz",
-      "integrity": "sha512-uhB8yHerfe3MWnuLAhEbeQ4afVoqv8BQsPqrTv7e/jZ9y00kJL6l9a/f4OWaKxotmjzewfEyXE1vgDJenkQ2/Q==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz",
+      "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4122,7 +4138,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz",
       "integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -4350,91 +4365,80 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.8.tgz",
-      "integrity": "sha512-vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.5.tgz",
+      "integrity": "sha512-S36mOoi1Sb6Fz98fBfE+UZSpYw5mJm0NUHtIKrOuNcqeFauy1J6dIvXm2KRVKobOSaGq4t/hBXdN4HGU3wL9Wg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.24.8",
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-validator-option": "^7.24.8",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7",
+        "@babel/compat-data": "^7.28.5",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.3",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.24.7",
-        "@babel/plugin-syntax-import-attributes": "^7.24.7",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-import-assertions": "^7.27.1",
+        "@babel/plugin-syntax-import-attributes": "^7.27.1",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.24.7",
-        "@babel/plugin-transform-async-generator-functions": "^7.24.7",
-        "@babel/plugin-transform-async-to-generator": "^7.24.7",
-        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
-        "@babel/plugin-transform-block-scoping": "^7.24.7",
-        "@babel/plugin-transform-class-properties": "^7.24.7",
-        "@babel/plugin-transform-class-static-block": "^7.24.7",
-        "@babel/plugin-transform-classes": "^7.24.8",
-        "@babel/plugin-transform-computed-properties": "^7.24.7",
-        "@babel/plugin-transform-destructuring": "^7.24.8",
-        "@babel/plugin-transform-dotall-regex": "^7.24.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
-        "@babel/plugin-transform-dynamic-import": "^7.24.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
-        "@babel/plugin-transform-for-of": "^7.24.7",
-        "@babel/plugin-transform-function-name": "^7.24.7",
-        "@babel/plugin-transform-json-strings": "^7.24.7",
-        "@babel/plugin-transform-literals": "^7.24.7",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
-        "@babel/plugin-transform-modules-amd": "^7.24.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.24.7",
-        "@babel/plugin-transform-modules-umd": "^7.24.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
-        "@babel/plugin-transform-new-target": "^7.24.7",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
-        "@babel/plugin-transform-numeric-separator": "^7.24.7",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
-        "@babel/plugin-transform-object-super": "^7.24.7",
-        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.8",
-        "@babel/plugin-transform-parameters": "^7.24.7",
-        "@babel/plugin-transform-private-methods": "^7.24.7",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
-        "@babel/plugin-transform-property-literals": "^7.24.7",
-        "@babel/plugin-transform-regenerator": "^7.24.7",
-        "@babel/plugin-transform-reserved-words": "^7.24.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
-        "@babel/plugin-transform-spread": "^7.24.7",
-        "@babel/plugin-transform-sticky-regex": "^7.24.7",
-        "@babel/plugin-transform-template-literals": "^7.24.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.8",
-        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
-        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
-        "@babel/plugin-transform-unicode-regex": "^7.24.7",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
+        "@babel/plugin-transform-arrow-functions": "^7.27.1",
+        "@babel/plugin-transform-async-generator-functions": "^7.28.0",
+        "@babel/plugin-transform-async-to-generator": "^7.27.1",
+        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
+        "@babel/plugin-transform-block-scoping": "^7.28.5",
+        "@babel/plugin-transform-class-properties": "^7.27.1",
+        "@babel/plugin-transform-class-static-block": "^7.28.3",
+        "@babel/plugin-transform-classes": "^7.28.4",
+        "@babel/plugin-transform-computed-properties": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.5",
+        "@babel/plugin-transform-dotall-regex": "^7.27.1",
+        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.27.1",
+        "@babel/plugin-transform-dynamic-import": "^7.27.1",
+        "@babel/plugin-transform-explicit-resource-management": "^7.28.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.28.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+        "@babel/plugin-transform-for-of": "^7.27.1",
+        "@babel/plugin-transform-function-name": "^7.27.1",
+        "@babel/plugin-transform-json-strings": "^7.27.1",
+        "@babel/plugin-transform-literals": "^7.27.1",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.28.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
+        "@babel/plugin-transform-modules-amd": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-modules-systemjs": "^7.28.5",
+        "@babel/plugin-transform-modules-umd": "^7.27.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1",
+        "@babel/plugin-transform-new-target": "^7.27.1",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
+        "@babel/plugin-transform-numeric-separator": "^7.27.1",
+        "@babel/plugin-transform-object-rest-spread": "^7.28.4",
+        "@babel/plugin-transform-object-super": "^7.27.1",
+        "@babel/plugin-transform-optional-catch-binding": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.28.5",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/plugin-transform-private-methods": "^7.27.1",
+        "@babel/plugin-transform-private-property-in-object": "^7.27.1",
+        "@babel/plugin-transform-property-literals": "^7.27.1",
+        "@babel/plugin-transform-regenerator": "^7.28.4",
+        "@babel/plugin-transform-regexp-modifiers": "^7.27.1",
+        "@babel/plugin-transform-reserved-words": "^7.27.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
+        "@babel/plugin-transform-spread": "^7.27.1",
+        "@babel/plugin-transform-sticky-regex": "^7.27.1",
+        "@babel/plugin-transform-template-literals": "^7.27.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
+        "@babel/plugin-transform-unicode-property-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.27.1",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.4",
-        "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "core-js-compat": "^3.37.1",
+        "babel-plugin-polyfill-corejs2": "^0.4.14",
+        "babel-plugin-polyfill-corejs3": "^0.13.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.5",
+        "core-js-compat": "^3.43.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -4444,14 +4448,63 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.10.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
-      "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+    "node_modules/@babel/preset-env/node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.2",
-        "core-js-compat": "^3.38.0"
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz",
+      "integrity": "sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-remap-async-to-generator": "^7.27.1",
+        "@babel/traverse": "^7.28.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-remap-async-to-generator": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz",
+      "integrity": "sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.5",
+        "core-js-compat": "^3.43.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -4526,17 +4579,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
-      "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.0",
+        "@babel/generator": "^7.28.5",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.0",
+        "@babel/parser": "^7.28.5",
         "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.0",
+        "@babel/types": "^7.28.5",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -4544,13 +4597,13 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
-      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.0",
-        "@babel/types": "^7.28.0",
+        "@babel/parser": "^7.28.5",
+        "@babel/types": "^7.28.5",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -4560,13 +4613,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
-      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -4610,6 +4663,27 @@
       "resolved": "libs/client-type",
       "link": true
     },
+    "node_modules/@bitwarden/commercial-sdk-internal": {
+      "version": "0.2.0-main.395",
+      "resolved": "https://registry.npmjs.org/@bitwarden/commercial-sdk-internal/-/commercial-sdk-internal-0.2.0-main.395.tgz",
+      "integrity": "sha512-DrxL3iA29hzWpyxPyZjiXx0m+EHOgk4CVb+BAi2SoxsacmyHYuTgXuASFMieRz2rv85wS3UR0N64Ok9lC+xNYA==",
+      "license": "BITWARDEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT",
+      "dependencies": {
+        "type-fest": "^4.41.0"
+      }
+    },
+    "node_modules/@bitwarden/commercial-sdk-internal/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@bitwarden/common": {
       "resolved": "libs/common",
       "link": true
@@ -4699,9 +4773,9 @@
       "link": true
     },
     "node_modules/@bitwarden/sdk-internal": {
-      "version": "0.2.0-main.296",
-      "resolved": "https://registry.npmjs.org/@bitwarden/sdk-internal/-/sdk-internal-0.2.0-main.296.tgz",
-      "integrity": "sha512-SDTWRwnR+KritfgJVBgWKd27TJxl4IlUdTldVJ/tA0qM5OqGWrY6s4ubtl5eaGIl2X4WYRAvpe+VR93FLakk6A==",
+      "version": "0.2.0-main.395",
+      "resolved": "https://registry.npmjs.org/@bitwarden/sdk-internal/-/sdk-internal-0.2.0-main.395.tgz",
+      "integrity": "sha512-biExeL2Grp11VQjjK6QM16+WOYk87mTgUhYKFm+Bu/A0zZBzhL/6AocpA9h2T5M8rLCGVVJVUMaXUW3YrSTqEA==",
       "license": "GPL-3.0",
       "dependencies": {
         "type-fest": "^4.41.0"
@@ -4772,15 +4846,15 @@
       "link": true
     },
     "node_modules/@braintree/asset-loader": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@braintree/asset-loader/-/asset-loader-2.0.1.tgz",
-      "integrity": "sha512-OGAoBA5MRVsr5qg0sXM6NMJbqHnYZhBudtM6WGgpQnoX42fjUYbE6Y6qFuuerD5z3lsOAjnu80DooBs1VBuh5Q==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@braintree/asset-loader/-/asset-loader-2.0.3.tgz",
+      "integrity": "sha512-uREap1j30wKRlC0mK99nNPMpEp77NtB6XixpDfFJPZHmkrmw7IB4skKe+26LZBK1H6oSainFhAyKoP7x3eyOKA==",
       "license": "MIT"
     },
     "node_modules/@braintree/browser-detection": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@braintree/browser-detection/-/browser-detection-2.0.1.tgz",
-      "integrity": "sha512-wpRI7AXEUh6o3ILrJbpNOYE7ItfjX/S8JZP7Z5FF66ULngBGYOqE8SeLlLKXG69Nc07HtlL/6nk/h539iz9hcQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@braintree/browser-detection/-/browser-detection-2.0.2.tgz",
+      "integrity": "sha512-Zrv/pyodvwv/hsjsBKXKVcwHZOkx4A/5Cy2hViXtqghAhLd3483bYUIfHZJE5JKTrd018ny1FI5pN1PHFtW7vw==",
       "license": "MIT"
     },
     "node_modules/@braintree/event-emitter": {
@@ -4796,9 +4870,9 @@
       "license": "MIT"
     },
     "node_modules/@braintree/iframer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@braintree/iframer/-/iframer-2.0.0.tgz",
-      "integrity": "sha512-x1kHOyIJNDvi4P1s6pVBZhqhBa1hqDG9+yzcsCR1oNVC0LxH9CAP8bKxioT8/auY1sUyy+D8T4Vp/jv7QqSqLQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@braintree/iframer/-/iframer-2.0.1.tgz",
+      "integrity": "sha512-t1zJX5+f1yxHAzBJPaQT/XVMocKodUqjTE+hYvuxxWjqEZIbH8/eT5b5n767jY16mYw3+XiDkKHqcp4Pclq1wg==",
       "license": "MIT"
     },
     "node_modules/@braintree/sanitize-url": {
@@ -4808,9 +4882,9 @@
       "license": "MIT"
     },
     "node_modules/@braintree/uuid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@braintree/uuid/-/uuid-1.0.0.tgz",
-      "integrity": "sha512-AtI5hfttWSuWAgcwLUZdcZ7Fp/8jCCUf9JTs7+Xow9ditU28zuoBovqq083yph2m3SxPYb84lGjOq+cXlXBvJg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@braintree/uuid/-/uuid-1.0.1.tgz",
+      "integrity": "sha512-Tgu5GoODkf4oj4aLlVIapEPEfjitIHrg5ftqY6pa5Ghr4ZUA9XtZIIZ6ZPdP9x8/X0lt/FB8tRq83QuCQCwOrA==",
       "license": "ISC"
     },
     "node_modules/@braintree/wrap-promise": {
@@ -4819,6 +4893,12 @@
       "integrity": "sha512-UIrJB+AfKU0CCfbMoWrsGpd2D/hBpY/SGgFI6WRHPOwhaZ3g9rz1weiJ6eb6L9KgVyunT7s2tckcPkbHw+NzeA==",
       "license": "MIT"
     },
+    "node_modules/@bufbuild/protobuf": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.9.0.tgz",
+      "integrity": "sha512-rnJenoStJ8nvmt9Gzye8nkYd6V22xUAnu4086ER7h1zJ508vStko4pMvDeQ446ilDTFpV5wnoc5YS7XvMwwMqA==",
+      "license": "(Apache-2.0 AND BSD-3-Clause)"
+    },
     "node_modules/@compodoc/compodoc": {
       "version": "1.1.26",
       "resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.26.tgz",
@@ -5854,21 +5934,21 @@
       }
     },
     "node_modules/@electron/rebuild": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.2.tgz",
-      "integrity": "sha512-19/KbIR/DAxbsCkiaGMXIdPnMCJLkcf8AvGnduJtWBs/CBwiAjY1apCqOLVxrXg+rtXFCngbXhBanWjxLUt1Mg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-4.0.1.tgz",
+      "integrity": "sha512-iMGXb6Ib7H/Q3v+BKZJoETgF9g6KMNZVbsO4b7Dmpgb5qTFqyFTzqW9F3TOSHdybv2vKYKzSS9OiZL+dcJb+1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2",
         "@malept/cross-spawn-promise": "^2.0.0",
         "chalk": "^4.0.0",
         "debug": "^4.1.1",
         "detect-libc": "^2.0.1",
-        "fs-extra": "^10.0.0",
         "got": "^11.7.0",
-        "node-abi": "^3.45.0",
-        "node-api-version": "^0.2.0",
+        "graceful-fs": "^4.2.11",
+        "node-abi": "^4.2.0",
+        "node-api-version": "^0.2.1",
+        "node-gyp": "^11.2.0",
         "ora": "^5.1.0",
         "read-binary-file-arch": "^1.0.6",
         "semver": "^7.3.5",
@@ -5879,22 +5959,20 @@
         "electron-rebuild": "lib/cli.js"
       },
       "engines": {
-        "node": ">=12.13.0"
+        "node": ">=22.12.0"
       }
     },
-    "node_modules/@electron/rebuild/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+    "node_modules/@electron/rebuild/node_modules/node-abi": {
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.14.0.tgz",
+      "integrity": "sha512-E4n91K4Nk1Rch2KzD+edU2bfZTP4W42GypAUDXU4vu1A+4u9PvUNDkGI0dXbsy8ZeF3WGj0SD/uHxnXD/sW+3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "semver": "^7.6.3"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=22.12.0"
       }
     },
     "node_modules/@electron/universal": {
@@ -6529,16 +6607,19 @@
       }
     },
     "node_modules/@eslint/compat": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.2.9.tgz",
-      "integrity": "sha512-gCdSY54n7k+driCadyMNv8JSPzYLeDVM/ikZRtvtROBpRdFSkS8W9A82MqsaY7lZuwL0wiapgD0NT1xT0hyJsA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-2.0.0.tgz",
+      "integrity": "sha512-T9AfE1G1uv4wwq94ozgTGio5EUQBqAVe1X9qsQtSNVEYW6j3hvtZVm8Smr4qL1qDPFg+lOB2cL5RxTRMzq4CTA==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^1.0.0"
+      },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "peerDependencies": {
-        "eslint": "^9.10.0"
+        "eslint": "^8.40 || 9"
       },
       "peerDependenciesMeta": {
         "eslint": {
@@ -6546,6 +6627,19 @@
         }
       }
     },
+    "node_modules/@eslint/compat/node_modules/@eslint/core": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.0.0.tgz",
+      "integrity": "sha512-PRfWP+8FOldvbApr6xL7mNCw4cJcSTq4GA7tYbgq15mRb0kWKO/wEB2jr+uwjFH3sZvEZneZyCUGTxsv4Sahyw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
     "node_modules/@eslint/config-array": {
       "version": "0.20.1",
       "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
@@ -6809,12 +6903,39 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@hapi/address": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-5.1.1.tgz",
+      "integrity": "sha512-A+po2d/dVoY7cYajycYI43ZbYMXukuopIsqCjh5QzsBCipDtdofHntljDlpccMjIfTy6UOkg+5KPriwYch2bXA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^11.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@hapi/address/node_modules/@hapi/hoek": {
+      "version": "11.0.7",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-11.0.7.tgz",
+      "integrity": "sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@hapi/bourne": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-3.0.0.tgz",
       "integrity": "sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==",
       "license": "BSD-3-Clause"
     },
+    "node_modules/@hapi/formula": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-3.0.2.tgz",
+      "integrity": "sha512-hY5YPNXzw1He7s0iqkRQi+uMGh383CGdyyIGYtB+W5N3KHPXoqychklvHhKCC9M3Xtv0OCs/IHw+r4dcHtBYWw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
@@ -6822,6 +6943,23 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
+    "node_modules/@hapi/pinpoint": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.1.tgz",
+      "integrity": "sha512-EKQmr16tM8s16vTT3cA5L0kZZcTMU5DUOZTuvpnY738m+jyP3JIUj+Mm1xc1rsLkGBQ/gVnfKYPwOmPg1tUR4Q==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@hapi/tlds": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@hapi/tlds/-/tlds-1.1.3.tgz",
+      "integrity": "sha512-QIvUMB5VZ8HMLZF9A2oWr3AFM430QC8oGd0L35y2jHpuW6bIIca6x/xL7zUf4J7L9WJ3qjz+iJII8ncaeMbpSg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/@hapi/topo": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
@@ -7605,9 +7743,9 @@
       }
     },
     "node_modules/@jest/get-type": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.0.1.tgz",
-      "integrity": "sha512-AyYdemXCptSRFirI5EPazNxyPwAL0jXt3zceFjaj8NFiKP9pOi0bfXonf6qkf82z2t3QWPeLCWWw4stPBzctLw==",
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
+      "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
       "license": "MIT",
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -7745,7 +7883,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
       "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
@@ -7755,12 +7892,12 @@
       }
     },
     "node_modules/@jest/snapshot-utils": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.0.5.tgz",
-      "integrity": "sha512-XcCQ5qWHLvi29UUrowgDFvV4t7ETxX91CbDczMnoqXPOIcZOxyNdSjm6kV5XMc8+HkxfRegU/MUmnTbJRzGrUQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz",
+      "integrity": "sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.2.0",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
         "natural-compare": "^1.4.0"
@@ -7782,9 +7919,9 @@
       }
     },
     "node_modules/@jest/snapshot-utils/node_modules/@jest/types": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-      "integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.2.0.tgz",
+      "integrity": "sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==",
       "license": "MIT",
       "dependencies": {
         "@jest/pattern": "30.0.1",
@@ -7800,9 +7937,9 @@
       }
     },
     "node_modules/@jest/snapshot-utils/node_modules/@sinclair/typebox": {
-      "version": "0.34.38",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.38.tgz",
-      "integrity": "sha512-HpkxMmc2XmZKhvaKIZZThlHmx1L0I/V1hWK1NubtlFnr6ZqdiOpV72TKudZUNQjZNsyDBay72qFEhEvb+bcwcA==",
+      "version": "0.34.41",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz",
+      "integrity": "sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==",
       "license": "MIT"
     },
     "node_modules/@jest/source-map": {
@@ -7890,7 +8027,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
       "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -7914,6 +8050,16 @@
         "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -7927,7 +8073,6 @@
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -7954,7 +8099,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
       "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
@@ -7971,7 +8115,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.2.0.tgz",
       "integrity": "sha512-io1zEbbYcElht3tdlqEOFxZ0dMTYrHz9iMf0gqn1pPjZFTCgM5R4R5IMA20Chb2UPYYsxjzs8CgZ7Nb5n2K2rA==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jsonjoy.com/base64": "^1.1.1",
@@ -7994,7 +8137,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.6.0.tgz",
       "integrity": "sha512-sw/RMbehRhN68WRtcKCpQOPfnH6lLP4GJfqzi3iYej8tnzpZUDr6UkZYJjcjjC0FWEJOJbyM3PTIwxucUmDG2A==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
@@ -8039,7 +8181,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@listr2/prompt-adapter-inquirer": {
@@ -8851,7 +8992,6 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
@@ -8865,7 +9005,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 8"
@@ -8875,7 +9014,6 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -9329,9 +9467,9 @@
       }
     },
     "node_modules/@nx/devkit": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-21.3.11.tgz",
-      "integrity": "sha512-JOV8TAa9K5+ZwTA/EUi0g5qcKEg5vmi0AyOUsrNUHlv3BgQnwZtPLDDTPPZ+ezq24o6YzgwueZWj3CLEdMHEDg==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-21.6.9.tgz",
+      "integrity": "sha512-Si7Lo5OgiHz/xU/NL1v5LnynE5oGrQmYE3KXxZoSRWij/nxZKi0wEB0W6dT3MtQW8RY1y5mg45Ti0Ym+Clhi8Q==",
       "license": "MIT",
       "dependencies": {
         "ejs": "^3.1.7",
@@ -9339,12 +9477,11 @@
         "ignore": "^5.0.4",
         "minimatch": "9.0.3",
         "semver": "^7.5.3",
-        "tmp": "~0.2.1",
         "tslib": "^2.3.0",
         "yargs-parser": "21.1.1"
       },
       "peerDependencies": {
-        "nx": "21.3.11"
+        "nx": ">= 20 <= 22"
       }
     },
     "node_modules/@nx/devkit/node_modules/ignore": {
@@ -9357,16 +9494,16 @@
       }
     },
     "node_modules/@nx/eslint": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-21.3.11.tgz",
-      "integrity": "sha512-9jeD8QuU3OMcItjtw0QHl5cwohLeA9R+lajNJoOjS2tUGXTHWb8NOcEZBXWMcML+eV1iloIDW8/P4jV4BYqP2w==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-21.6.9.tgz",
+      "integrity": "sha512-psd6GtWII5i1M15TTmdh8UZ/pBWlh6JtaVwlE5tk/GHlnCGXHEY+g3gKTsetjbuHjaocdwrfEy4TIB5J5Zh3HQ==",
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "21.3.11",
-        "@nx/js": "21.3.11",
+        "@nx/devkit": "21.6.9",
+        "@nx/js": "21.6.9",
         "semver": "^7.5.3",
         "tslib": "^2.3.0",
-        "typescript": "~5.8.2"
+        "typescript": "~5.9.2"
       },
       "peerDependencies": {
         "@zkochan/js-yaml": "0.0.7",
@@ -9379,9 +9516,9 @@
       }
     },
     "node_modules/@nx/eslint/node_modules/typescript": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -9392,15 +9529,15 @@
       }
     },
     "node_modules/@nx/jest": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/jest/-/jest-21.3.11.tgz",
-      "integrity": "sha512-PkdNWeoUY81zr+jtUapBdvvh26lWYIhDNyUwTjIBFajX8EAlhJpvShKHs7QObmrwOMLMXwLHKINiSCw9rueOBQ==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/jest/-/jest-21.6.9.tgz",
+      "integrity": "sha512-8x/B3f616ti2BUXHhOQqewMyCxMMmy++Wh1YiKr5S922m7jog1oYsCzue+fmHsNijw9xMNAgsDjgy91I/iZZ0Q==",
       "license": "MIT",
       "dependencies": {
         "@jest/reporters": "^30.0.2",
         "@jest/test-result": "^30.0.2",
-        "@nx/devkit": "21.3.11",
-        "@nx/js": "21.3.11",
+        "@nx/devkit": "21.6.9",
+        "@nx/js": "21.6.9",
         "@phenomnomnominal/tsquery": "~5.0.1",
         "identity-obj-proxy": "3.0.0",
         "jest-config": "^30.0.2",
@@ -9414,53 +9551,14 @@
         "yargs-parser": "21.1.1"
       }
     },
-    "node_modules/@nx/jest/node_modules/@babel/core": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
-      "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.0",
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-module-transforms": "^7.27.3",
-        "@babel/helpers": "^7.27.6",
-        "@babel/parser": "^7.28.0",
-        "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.28.0",
-        "@babel/types": "^7.28.0",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@nx/jest/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@nx/jest/node_modules/@babel/generator": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
-      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.0",
-        "@babel/types": "^7.28.0",
+        "@babel/parser": "^7.28.5",
+        "@babel/types": "^7.28.5",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -9470,16 +9568,16 @@
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/console": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.0.5.tgz",
-      "integrity": "sha512-xY6b0XiL0Nav3ReresUarwl2oIz1gTnxGbGpho9/rbUWsLH0f1OD/VT84xs8c7VmH7MChnLb0pag6PhZhAdDiA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.2.0.tgz",
+      "integrity": "sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
         "chalk": "^4.1.2",
-        "jest-message-util": "30.0.5",
-        "jest-util": "30.0.5",
+        "jest-message-util": "30.2.0",
+        "jest-util": "30.2.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -9487,88 +9585,88 @@
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/environment": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.0.5.tgz",
-      "integrity": "sha512-aRX7WoaWx1oaOkDQvCWImVQ8XNtdv5sEWgk4gxR6NXb7WBUnL5sRak4WRzIQRZ1VTWPvV4VI4mgGjNL9TeKMYA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.2.0.tgz",
+      "integrity": "sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==",
       "license": "MIT",
       "dependencies": {
-        "@jest/fake-timers": "30.0.5",
-        "@jest/types": "30.0.5",
+        "@jest/fake-timers": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "jest-mock": "30.0.5"
+        "jest-mock": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/expect": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.0.5.tgz",
-      "integrity": "sha512-6udac8KKrtTtC+AXZ2iUN/R7dp7Ydry+Fo6FPFnDG54wjVMnb6vW/XNlf7Xj8UDjAE3aAVAsR4KFyKk3TCXmTA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.2.0.tgz",
+      "integrity": "sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==",
       "license": "MIT",
       "dependencies": {
-        "expect": "30.0.5",
-        "jest-snapshot": "30.0.5"
+        "expect": "30.2.0",
+        "jest-snapshot": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/expect-utils": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.0.5.tgz",
-      "integrity": "sha512-F3lmTT7CXWYywoVUGTCmom0vXq3HTTkaZyTAzIy+bXSBizB7o5qzlC9VCtq0arOa8GqmNsbg/cE9C6HLn7Szew==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.2.0.tgz",
+      "integrity": "sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==",
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.0.1"
+        "@jest/get-type": "30.1.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/fake-timers": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.0.5.tgz",
-      "integrity": "sha512-ZO5DHfNV+kgEAeP3gK3XlpJLL4U3Sz6ebl/n68Uwt64qFFs5bv4bfEEjyRGK5uM0C90ewooNgFuKMdkbEoMEXw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.2.0.tgz",
+      "integrity": "sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.2.0",
         "@sinonjs/fake-timers": "^13.0.0",
         "@types/node": "*",
-        "jest-message-util": "30.0.5",
-        "jest-mock": "30.0.5",
-        "jest-util": "30.0.5"
+        "jest-message-util": "30.2.0",
+        "jest-mock": "30.2.0",
+        "jest-util": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/globals": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.0.5.tgz",
-      "integrity": "sha512-7oEJT19WW4oe6HR7oLRvHxwlJk2gev0U9px3ufs8sX9PoD1Eza68KF0/tlN7X0dq/WVsBScXQGgCldA1V9Y/jA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.2.0.tgz",
+      "integrity": "sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==",
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.0.5",
-        "@jest/expect": "30.0.5",
-        "@jest/types": "30.0.5",
-        "jest-mock": "30.0.5"
+        "@jest/environment": "30.2.0",
+        "@jest/expect": "30.2.0",
+        "@jest/types": "30.2.0",
+        "jest-mock": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/reporters": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.0.5.tgz",
-      "integrity": "sha512-mafft7VBX4jzED1FwGC1o/9QUM2xebzavImZMeqnsklgcyxBto8mV4HzNSzUrryJ+8R9MFOM3HgYuDradWR+4g==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.2.0.tgz",
+      "integrity": "sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==",
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "30.0.5",
-        "@jest/test-result": "30.0.5",
-        "@jest/transform": "30.0.5",
-        "@jest/types": "30.0.5",
+        "@jest/console": "30.2.0",
+        "@jest/test-result": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
         "@jridgewell/trace-mapping": "^0.3.25",
         "@types/node": "*",
         "chalk": "^4.1.2",
@@ -9581,9 +9679,9 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^5.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "30.0.5",
-        "jest-util": "30.0.5",
-        "jest-worker": "30.0.5",
+        "jest-message-util": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-worker": "30.2.0",
         "slash": "^3.0.0",
         "string-length": "^4.0.2",
         "v8-to-istanbul": "^9.0.1"
@@ -9627,13 +9725,13 @@
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/test-result": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.0.5.tgz",
-      "integrity": "sha512-wPyztnK0gbDMQAJZ43tdMro+qblDHH1Ru/ylzUo21TBKqt88ZqnKKK2m30LKmLLoKtR2lxdpCC/P3g1vfKcawQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.2.0.tgz",
+      "integrity": "sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==",
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "30.0.5",
-        "@jest/types": "30.0.5",
+        "@jest/console": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/istanbul-lib-coverage": "^2.0.6",
         "collect-v8-coverage": "^1.0.2"
       },
@@ -9642,14 +9740,14 @@
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/test-sequencer": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.0.5.tgz",
-      "integrity": "sha512-Aea/G1egWoIIozmDD7PBXUOxkekXl7ueGzrsGGi1SbeKgQqCYCIf+wfbflEbf2LiPxL8j2JZGLyrzZagjvW4YQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.2.0.tgz",
+      "integrity": "sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==",
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "30.0.5",
+        "@jest/test-result": "30.2.0",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.0.5",
+        "jest-haste-map": "30.2.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -9657,22 +9755,22 @@
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/transform": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.0.5.tgz",
-      "integrity": "sha512-Vk8amLQCmuZyy6GbBht1Jfo9RSdBtg7Lks+B0PecnjI8J+PCLQPGh7uI8Q/2wwpW2gLdiAfiHNsmekKlywULqg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.2.0.tgz",
+      "integrity": "sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.27.4",
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.2.0",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "babel-plugin-istanbul": "^7.0.0",
+        "babel-plugin-istanbul": "^7.0.1",
         "chalk": "^4.1.2",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.0.5",
+        "jest-haste-map": "30.2.0",
         "jest-regex-util": "30.0.1",
-        "jest-util": "30.0.5",
+        "jest-util": "30.2.0",
         "micromatch": "^4.0.8",
         "pirates": "^4.0.7",
         "slash": "^3.0.0",
@@ -9683,9 +9781,9 @@
       }
     },
     "node_modules/@nx/jest/node_modules/@jest/types": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-      "integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.2.0.tgz",
+      "integrity": "sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==",
       "license": "MIT",
       "dependencies": {
         "@jest/pattern": "30.0.1",
@@ -9701,9 +9799,9 @@
       }
     },
     "node_modules/@nx/jest/node_modules/@sinclair/typebox": {
-      "version": "0.34.38",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.38.tgz",
-      "integrity": "sha512-HpkxMmc2XmZKhvaKIZZThlHmx1L0I/V1hWK1NubtlFnr6ZqdiOpV72TKudZUNQjZNsyDBay72qFEhEvb+bcwcA==",
+      "version": "0.34.41",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz",
+      "integrity": "sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==",
       "license": "MIT"
     },
     "node_modules/@nx/jest/node_modules/@sinonjs/fake-timers": {
@@ -9728,15 +9826,15 @@
       }
     },
     "node_modules/@nx/jest/node_modules/babel-jest": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.0.5.tgz",
-      "integrity": "sha512-mRijnKimhGDMsizTvBTWotwNpzrkHr+VvZUQBof2AufXKB8NXrL1W69TG20EvOz7aevx6FTJIaBuBkYxS8zolg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.2.0.tgz",
+      "integrity": "sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==",
       "license": "MIT",
       "dependencies": {
-        "@jest/transform": "30.0.5",
+        "@jest/transform": "30.2.0",
         "@types/babel__core": "^7.20.5",
-        "babel-plugin-istanbul": "^7.0.0",
-        "babel-preset-jest": "30.0.1",
+        "babel-plugin-istanbul": "^7.0.1",
+        "babel-preset-jest": "30.2.0",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
         "slash": "^3.0.0"
@@ -9745,14 +9843,17 @@
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.11.0"
+        "@babel/core": "^7.11.0 || ^8.0.0-0"
       }
     },
     "node_modules/@nx/jest/node_modules/babel-plugin-istanbul": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
-      "integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz",
+      "integrity": "sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==",
       "license": "BSD-3-Clause",
+      "workspaces": [
+        "test/babel-8"
+      ],
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -9765,13 +9866,11 @@
       }
     },
     "node_modules/@nx/jest/node_modules/babel-plugin-jest-hoist": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz",
-      "integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz",
+      "integrity": "sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.27.3",
         "@types/babel__core": "^7.20.5"
       },
       "engines": {
@@ -9779,19 +9878,19 @@
       }
     },
     "node_modules/@nx/jest/node_modules/babel-preset-jest": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz",
-      "integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz",
+      "integrity": "sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==",
       "license": "MIT",
       "dependencies": {
-        "babel-plugin-jest-hoist": "30.0.1",
-        "babel-preset-current-node-syntax": "^1.1.0"
+        "babel-plugin-jest-hoist": "30.2.0",
+        "babel-preset-current-node-syntax": "^1.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.11.0"
+        "@babel/core": "^7.11.0 || ^8.0.0-beta.1"
       }
     },
     "node_modules/@nx/jest/node_modules/camelcase": {
@@ -9807,9 +9906,9 @@
       }
     },
     "node_modules/@nx/jest/node_modules/ci-info": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
+      "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
       "funding": [
         {
           "type": "github",
@@ -9822,9 +9921,9 @@
       }
     },
     "node_modules/@nx/jest/node_modules/cjs-module-lexer": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz",
-      "integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.1.tgz",
+      "integrity": "sha512-+CmxIZ/L2vNcEfvNtLdU0ZQ6mbq3FZnwAP2PPTiKP+1QOoKwlKlPgb8UKV0Dds7QVaMnHm+FwSft2VB0s/SLjQ==",
       "license": "MIT"
     },
     "node_modules/@nx/jest/node_modules/convert-source-map": {
@@ -9834,26 +9933,26 @@
       "license": "MIT"
     },
     "node_modules/@nx/jest/node_modules/expect": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-30.0.5.tgz",
-      "integrity": "sha512-P0te2pt+hHI5qLJkIR+iMvS+lYUZml8rKKsohVHAGY+uClp9XVbdyYNJOIjSRpHVp8s8YqxJCiHUkSYZGr8rtQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-30.2.0.tgz",
+      "integrity": "sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==",
       "license": "MIT",
       "dependencies": {
-        "@jest/expect-utils": "30.0.5",
-        "@jest/get-type": "30.0.1",
-        "jest-matcher-utils": "30.0.5",
-        "jest-message-util": "30.0.5",
-        "jest-mock": "30.0.5",
-        "jest-util": "30.0.5"
+        "@jest/expect-utils": "30.2.0",
+        "@jest/get-type": "30.1.0",
+        "jest-matcher-utils": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-mock": "30.2.0",
+        "jest-util": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -9915,28 +10014,28 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-circus": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.0.5.tgz",
-      "integrity": "sha512-h/sjXEs4GS+NFFfqBDYT7y5Msfxh04EwWLhQi0F8kuWpe+J/7tICSlswU8qvBqumR3kFgHbfu7vU6qruWWBPug==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.2.0.tgz",
+      "integrity": "sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==",
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.0.5",
-        "@jest/expect": "30.0.5",
-        "@jest/test-result": "30.0.5",
-        "@jest/types": "30.0.5",
+        "@jest/environment": "30.2.0",
+        "@jest/expect": "30.2.0",
+        "@jest/test-result": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "co": "^4.6.0",
         "dedent": "^1.6.0",
         "is-generator-fn": "^2.1.0",
-        "jest-each": "30.0.5",
-        "jest-matcher-utils": "30.0.5",
-        "jest-message-util": "30.0.5",
-        "jest-runtime": "30.0.5",
-        "jest-snapshot": "30.0.5",
-        "jest-util": "30.0.5",
+        "jest-each": "30.2.0",
+        "jest-matcher-utils": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-runtime": "30.2.0",
+        "jest-snapshot": "30.2.0",
+        "jest-util": "30.2.0",
         "p-limit": "^3.1.0",
-        "pretty-format": "30.0.5",
+        "pretty-format": "30.2.0",
         "pure-rand": "^7.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.6"
@@ -9946,33 +10045,33 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-config": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.0.5.tgz",
-      "integrity": "sha512-aIVh+JNOOpzUgzUnPn5FLtyVnqc3TQHVMupYtyeURSb//iLColiMIR8TxCIDKyx9ZgjKnXGucuW68hCxgbrwmA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.2.0.tgz",
+      "integrity": "sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.27.4",
-        "@jest/get-type": "30.0.1",
+        "@jest/get-type": "30.1.0",
         "@jest/pattern": "30.0.1",
-        "@jest/test-sequencer": "30.0.5",
-        "@jest/types": "30.0.5",
-        "babel-jest": "30.0.5",
+        "@jest/test-sequencer": "30.2.0",
+        "@jest/types": "30.2.0",
+        "babel-jest": "30.2.0",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
         "deepmerge": "^4.3.1",
         "glob": "^10.3.10",
         "graceful-fs": "^4.2.11",
-        "jest-circus": "30.0.5",
-        "jest-docblock": "30.0.1",
-        "jest-environment-node": "30.0.5",
+        "jest-circus": "30.2.0",
+        "jest-docblock": "30.2.0",
+        "jest-environment-node": "30.2.0",
         "jest-regex-util": "30.0.1",
-        "jest-resolve": "30.0.5",
-        "jest-runner": "30.0.5",
-        "jest-util": "30.0.5",
-        "jest-validate": "30.0.5",
+        "jest-resolve": "30.2.0",
+        "jest-runner": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-validate": "30.2.0",
         "micromatch": "^4.0.8",
         "parse-json": "^5.2.0",
-        "pretty-format": "30.0.5",
+        "pretty-format": "30.2.0",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -9996,25 +10095,10 @@
         }
       }
     },
-    "node_modules/@nx/jest/node_modules/jest-diff": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.0.5.tgz",
-      "integrity": "sha512-1UIqE9PoEKaHcIKvq2vbibrCog4Y8G0zmOxgQUVEiTqwR5hJVMCoDsN1vFvI5JvwD37hjueZ1C4l2FyGnfpE0A==",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/diff-sequences": "30.0.1",
-        "@jest/get-type": "30.0.1",
-        "chalk": "^4.1.2",
-        "pretty-format": "30.0.5"
-      },
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
     "node_modules/@nx/jest/node_modules/jest-docblock": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.0.1.tgz",
-      "integrity": "sha512-/vF78qn3DYphAaIc3jy4gA7XSAz167n9Bm/wn/1XhTLW7tTBIzXtCJpb/vcmc73NIIeeohCbdL94JasyXUZsGA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.2.0.tgz",
+      "integrity": "sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==",
       "license": "MIT",
       "dependencies": {
         "detect-newline": "^3.1.0"
@@ -10024,53 +10108,53 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-each": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.0.5.tgz",
-      "integrity": "sha512-dKjRsx1uZ96TVyejD3/aAWcNKy6ajMaN531CwWIsrazIqIoXI9TnnpPlkrEYku/8rkS3dh2rbH+kMOyiEIv0xQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.2.0.tgz",
+      "integrity": "sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==",
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.0.1",
-        "@jest/types": "30.0.5",
+        "@jest/get-type": "30.1.0",
+        "@jest/types": "30.2.0",
         "chalk": "^4.1.2",
-        "jest-util": "30.0.5",
-        "pretty-format": "30.0.5"
+        "jest-util": "30.2.0",
+        "pretty-format": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/jest-environment-node": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.0.5.tgz",
-      "integrity": "sha512-ppYizXdLMSvciGsRsMEnv/5EFpvOdXBaXRBzFUDPWrsfmog4kYrOGWXarLllz6AXan6ZAA/kYokgDWuos1IKDA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.2.0.tgz",
+      "integrity": "sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==",
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.0.5",
-        "@jest/fake-timers": "30.0.5",
-        "@jest/types": "30.0.5",
+        "@jest/environment": "30.2.0",
+        "@jest/fake-timers": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "jest-mock": "30.0.5",
-        "jest-util": "30.0.5",
-        "jest-validate": "30.0.5"
+        "jest-mock": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-validate": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/jest-haste-map": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.0.5.tgz",
-      "integrity": "sha512-dkmlWNlsTSR0nH3nRfW5BKbqHefLZv0/6LCccG0xFCTWcJu8TuEwG+5Cm75iBfjVoockmO6J35o5gxtFSn5xeg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.2.0.tgz",
+      "integrity": "sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
         "anymatch": "^3.1.3",
         "fb-watchman": "^2.0.2",
         "graceful-fs": "^4.2.11",
         "jest-regex-util": "30.0.1",
-        "jest-util": "30.0.5",
-        "jest-worker": "30.0.5",
+        "jest-util": "30.2.0",
+        "jest-worker": "30.2.0",
         "micromatch": "^4.0.8",
         "walker": "^1.0.8"
       },
@@ -10082,46 +10166,46 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-leak-detector": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.0.5.tgz",
-      "integrity": "sha512-3Uxr5uP8jmHMcsOtYMRB/zf1gXN3yUIc+iPorhNETG54gErFIiUhLvyY/OggYpSMOEYqsmRxmuU4ZOoX5jpRFg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz",
+      "integrity": "sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==",
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.0.1",
-        "pretty-format": "30.0.5"
+        "@jest/get-type": "30.1.0",
+        "pretty-format": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/jest-matcher-utils": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.0.5.tgz",
-      "integrity": "sha512-uQgGWt7GOrRLP1P7IwNWwK1WAQbq+m//ZY0yXygyfWp0rJlksMSLQAA4wYQC3b6wl3zfnchyTx+k3HZ5aPtCbQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz",
+      "integrity": "sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==",
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.0.1",
+        "@jest/get-type": "30.1.0",
         "chalk": "^4.1.2",
-        "jest-diff": "30.0.5",
-        "pretty-format": "30.0.5"
+        "jest-diff": "30.2.0",
+        "pretty-format": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/jest-message-util": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.0.5.tgz",
-      "integrity": "sha512-NAiDOhsK3V7RU0Aa/HnrQo+E4JlbarbmI3q6Pi4KcxicdtjV82gcIUrejOtczChtVQR4kddu1E1EJlW6EN9IyA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.2.0.tgz",
+      "integrity": "sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.2.0",
         "@types/stack-utils": "^2.0.3",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
         "micromatch": "^4.0.8",
-        "pretty-format": "30.0.5",
+        "pretty-format": "30.2.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.6"
       },
@@ -10130,14 +10214,14 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-mock": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.0.5.tgz",
-      "integrity": "sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.2.0.tgz",
+      "integrity": "sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "jest-util": "30.0.5"
+        "jest-util": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -10153,17 +10237,17 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-resolve": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.0.5.tgz",
-      "integrity": "sha512-d+DjBQ1tIhdz91B79mywH5yYu76bZuE96sSbxj8MkjWVx5WNdt1deEFRONVL4UkKLSrAbMkdhb24XN691yDRHg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.2.0.tgz",
+      "integrity": "sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==",
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.0.5",
+        "jest-haste-map": "30.2.0",
         "jest-pnp-resolver": "^1.2.3",
-        "jest-util": "30.0.5",
-        "jest-validate": "30.0.5",
+        "jest-util": "30.2.0",
+        "jest-validate": "30.2.0",
         "slash": "^3.0.0",
         "unrs-resolver": "^1.7.11"
       },
@@ -10172,31 +10256,31 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-runner": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.0.5.tgz",
-      "integrity": "sha512-JcCOucZmgp+YuGgLAXHNy7ualBx4wYSgJVWrYMRBnb79j9PD0Jxh0EHvR5Cx/r0Ce+ZBC4hCdz2AzFFLl9hCiw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.2.0.tgz",
+      "integrity": "sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==",
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "30.0.5",
-        "@jest/environment": "30.0.5",
-        "@jest/test-result": "30.0.5",
-        "@jest/transform": "30.0.5",
-        "@jest/types": "30.0.5",
+        "@jest/console": "30.2.0",
+        "@jest/environment": "30.2.0",
+        "@jest/test-result": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "emittery": "^0.13.1",
         "exit-x": "^0.2.2",
         "graceful-fs": "^4.2.11",
-        "jest-docblock": "30.0.1",
-        "jest-environment-node": "30.0.5",
-        "jest-haste-map": "30.0.5",
-        "jest-leak-detector": "30.0.5",
-        "jest-message-util": "30.0.5",
-        "jest-resolve": "30.0.5",
-        "jest-runtime": "30.0.5",
-        "jest-util": "30.0.5",
-        "jest-watcher": "30.0.5",
-        "jest-worker": "30.0.5",
+        "jest-docblock": "30.2.0",
+        "jest-environment-node": "30.2.0",
+        "jest-haste-map": "30.2.0",
+        "jest-leak-detector": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-resolve": "30.2.0",
+        "jest-runtime": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-watcher": "30.2.0",
+        "jest-worker": "30.2.0",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
@@ -10205,31 +10289,31 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-runtime": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.0.5.tgz",
-      "integrity": "sha512-7oySNDkqpe4xpX5PPiJTe5vEa+Ak/NnNz2bGYZrA1ftG3RL3EFlHaUkA1Cjx+R8IhK0Vg43RML5mJedGTPNz3A==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.2.0.tgz",
+      "integrity": "sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==",
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.0.5",
-        "@jest/fake-timers": "30.0.5",
-        "@jest/globals": "30.0.5",
+        "@jest/environment": "30.2.0",
+        "@jest/fake-timers": "30.2.0",
+        "@jest/globals": "30.2.0",
         "@jest/source-map": "30.0.1",
-        "@jest/test-result": "30.0.5",
-        "@jest/transform": "30.0.5",
-        "@jest/types": "30.0.5",
+        "@jest/test-result": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "cjs-module-lexer": "^2.1.0",
         "collect-v8-coverage": "^1.0.2",
         "glob": "^10.3.10",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.0.5",
-        "jest-message-util": "30.0.5",
-        "jest-mock": "30.0.5",
+        "jest-haste-map": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-mock": "30.2.0",
         "jest-regex-util": "30.0.1",
-        "jest-resolve": "30.0.5",
-        "jest-snapshot": "30.0.5",
-        "jest-util": "30.0.5",
+        "jest-resolve": "30.2.0",
+        "jest-snapshot": "30.2.0",
+        "jest-util": "30.2.0",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -10238,9 +10322,9 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-snapshot": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.0.5.tgz",
-      "integrity": "sha512-T00dWU/Ek3LqTp4+DcW6PraVxjk28WY5Ua/s+3zUKSERZSNyxTqhDXCWKG5p2HAJ+crVQ3WJ2P9YVHpj1tkW+g==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.2.0.tgz",
+      "integrity": "sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.27.4",
@@ -10248,20 +10332,20 @@
         "@babel/plugin-syntax-jsx": "^7.27.1",
         "@babel/plugin-syntax-typescript": "^7.27.1",
         "@babel/types": "^7.27.3",
-        "@jest/expect-utils": "30.0.5",
-        "@jest/get-type": "30.0.1",
-        "@jest/snapshot-utils": "30.0.5",
-        "@jest/transform": "30.0.5",
-        "@jest/types": "30.0.5",
-        "babel-preset-current-node-syntax": "^1.1.0",
+        "@jest/expect-utils": "30.2.0",
+        "@jest/get-type": "30.1.0",
+        "@jest/snapshot-utils": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
+        "babel-preset-current-node-syntax": "^1.2.0",
         "chalk": "^4.1.2",
-        "expect": "30.0.5",
+        "expect": "30.2.0",
         "graceful-fs": "^4.2.11",
-        "jest-diff": "30.0.5",
-        "jest-matcher-utils": "30.0.5",
-        "jest-message-util": "30.0.5",
-        "jest-util": "30.0.5",
-        "pretty-format": "30.0.5",
+        "jest-diff": "30.2.0",
+        "jest-matcher-utils": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-util": "30.2.0",
+        "pretty-format": "30.2.0",
         "semver": "^7.7.2",
         "synckit": "^0.11.8"
       },
@@ -10270,12 +10354,12 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-util": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-      "integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.2.0.tgz",
+      "integrity": "sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
@@ -10287,35 +10371,35 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-validate": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.0.5.tgz",
-      "integrity": "sha512-ouTm6VFHaS2boyl+k4u+Qip4TSH7Uld5tyD8psQ8abGgt2uYYB8VwVfAHWHjHc0NWmGGbwO5h0sCPOGHHevefw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.2.0.tgz",
+      "integrity": "sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==",
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.0.1",
-        "@jest/types": "30.0.5",
+        "@jest/get-type": "30.1.0",
+        "@jest/types": "30.2.0",
         "camelcase": "^6.3.0",
         "chalk": "^4.1.2",
         "leven": "^3.1.0",
-        "pretty-format": "30.0.5"
+        "pretty-format": "30.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@nx/jest/node_modules/jest-watcher": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.0.5.tgz",
-      "integrity": "sha512-z9slj/0vOwBDBjN3L4z4ZYaA+pG56d6p3kTUhFRYGvXbXMWhXmb/FIxREZCD06DYUwDKKnj2T80+Pb71CQ0KEg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.2.0.tgz",
+      "integrity": "sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==",
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "30.0.5",
-        "@jest/types": "30.0.5",
+        "@jest/test-result": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
         "ansi-escapes": "^4.3.2",
         "chalk": "^4.1.2",
         "emittery": "^0.13.1",
-        "jest-util": "30.0.5",
+        "jest-util": "30.2.0",
         "string-length": "^4.0.2"
       },
       "engines": {
@@ -10323,14 +10407,14 @@
       }
     },
     "node_modules/@nx/jest/node_modules/jest-worker": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.0.5.tgz",
-      "integrity": "sha512-ojRXsWzEP16NdUuBw/4H/zkZdHOa7MMYCk4E430l+8fELeLg/mqmMlRhjL7UNZvQrDmnovWZV4DxX03fZF48fQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.2.0.tgz",
+      "integrity": "sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@ungap/structured-clone": "^1.3.0",
-        "jest-util": "30.0.5",
+        "jest-util": "30.2.0",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.1.1"
       },
@@ -10361,9 +10445,9 @@
       }
     },
     "node_modules/@nx/jest/node_modules/pretty-format": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz",
-      "integrity": "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz",
+      "integrity": "sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==",
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "30.0.5",
@@ -10444,9 +10528,9 @@
       }
     },
     "node_modules/@nx/js": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/js/-/js-21.3.11.tgz",
-      "integrity": "sha512-aN8g1TP3FMN6MFLvMrZNaoqSwAkBFH1PunKQV17w4nlPkimWICaCP2DhY5W3VoOpjQBbhQoqrRt4mVfgnEpyvA==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/js/-/js-21.6.9.tgz",
+      "integrity": "sha512-KJnqe6W0Ly5AgpBOhygcVs5RssVKnKrISVp42CSirKx3nei6cus9VItwKBvBBAqmYw4AlrCe+/A2twTQCkeq1A==",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.23.2",
@@ -10456,8 +10540,8 @@
         "@babel/preset-env": "^7.23.2",
         "@babel/preset-typescript": "^7.22.5",
         "@babel/runtime": "^7.22.6",
-        "@nx/devkit": "21.3.11",
-        "@nx/workspace": "21.3.11",
+        "@nx/devkit": "21.6.9",
+        "@nx/workspace": "21.6.9",
         "@zkochan/js-yaml": "0.0.7",
         "babel-plugin-const-enum": "^1.0.1",
         "babel-plugin-macros": "^3.1.0",
@@ -10596,9 +10680,9 @@
       }
     },
     "node_modules/@nx/nx-darwin-arm64": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-21.3.11.tgz",
-      "integrity": "sha512-qXZrW6kfsfGG9n4cWugR2v8ys7P1SsbQuFahlbNSTd7g+ZxozaOnc7tyxW9XuY84KQ35HwP/QSu1E13fK5CXwQ==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-21.6.9.tgz",
+      "integrity": "sha512-rN5cJAjKvyXfi+Zep7wvSNtGr35X1/qrm96K/Sf4sybvowyHmDdEMYxkR6BPNT8ct5JGMm35xPfx1yF/rJek3w==",
       "cpu": [
         "arm64"
       ],
@@ -10609,9 +10693,9 @@
       ]
     },
     "node_modules/@nx/nx-darwin-x64": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-21.3.11.tgz",
-      "integrity": "sha512-6NJEIGRITpFZYptJtr/wdnVuidAS/wONMMSwX5rgAqh5A9teI0vxZVOgG6n5f6NQyqEDvZ9ytcIvLsQWA4kJFg==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-21.6.9.tgz",
+      "integrity": "sha512-rb/Dtum094nfJL8lYohne1duZr8uNQ4gvWTq/Cw/xowJwXGq3xzsSS2WTpDpRBMF45K+42fipGHNeHbCyYSF7g==",
       "cpu": [
         "x64"
       ],
@@ -10622,9 +10706,9 @@
       ]
     },
     "node_modules/@nx/nx-freebsd-x64": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-21.3.11.tgz",
-      "integrity": "sha512-9VZOM9mutzuZCUgijHXrIl3NgKt2CWuH/awLqDS8ijhLs6WfI5TYTa+mFwx90dfZZ4y/jy6XWXa2Ee3OShf7Hg==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-21.6.9.tgz",
+      "integrity": "sha512-Cd7QHeivvLBiQ6iRTsvprGk1YS+CaUCMw4A+3TOvHz608a/U3mEye8oRy2fyFTTL/lsH6dlihT3xi+HNyXKAyA==",
       "cpu": [
         "x64"
       ],
@@ -10635,9 +10719,9 @@
       ]
     },
     "node_modules/@nx/nx-linux-arm-gnueabihf": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-21.3.11.tgz",
-      "integrity": "sha512-a05tAySKDEWt0TGoSnWp/l5+HL/CDJQkHfI9pXho85oDSkVRzhOInAn1EeZB/F+Q3PnJFsMHMhbuu2/nm3uYJA==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-21.6.9.tgz",
+      "integrity": "sha512-ASXay2jKhSU4tfY9Z2ByysqDQxYgTHCtoJ+XR5xRv9aoIos6oYeKAqQV/RLXpTklugu08nBtL/4IRw58x4oU4A==",
       "cpu": [
         "arm"
       ],
@@ -10648,9 +10732,9 @@
       ]
     },
     "node_modules/@nx/nx-linux-arm64-gnu": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-21.3.11.tgz",
-      "integrity": "sha512-MPeivf0ptNpzQYvww6zHIqVbE5dTT2isl/WqzGyy7NgSeYDpFXmouDCQaeKxo5WytMVRCvCw/NnWTQuCK6TjnA==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-21.6.9.tgz",
+      "integrity": "sha512-1VS38xnAC8iH05A0nnbNn1hi9ypRnEPUfgLL3tPhAwQTWX2DQz4xR/j0NYNcCzL6yBe/JhdKlYoN/LI38lj2UA==",
       "cpu": [
         "arm64"
       ],
@@ -10661,9 +10745,9 @@
       ]
     },
     "node_modules/@nx/nx-linux-arm64-musl": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-21.3.11.tgz",
-      "integrity": "sha512-/hJpc4VJsbxDEreXt5Ka9HJ3TBEHgIa9y/i+H9MmWOeapCdH1Edhx58Heuv9OaX7kK8Y8q0cSicv0dJCghiTjA==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-21.6.9.tgz",
+      "integrity": "sha512-PScHPs0dp+Cc17RvY4Y5wlDXT6xdDlsyhna2JLawodVCyUVArtnbF7whn/VEZKesDD/vAf1avCt4oAjuYS8VXg==",
       "cpu": [
         "arm64"
       ],
@@ -10674,9 +10758,9 @@
       ]
     },
     "node_modules/@nx/nx-linux-x64-gnu": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-21.3.11.tgz",
-      "integrity": "sha512-pTBHuloqTxpTHa/fdKjHkFFsfW16mEcTp37HDtoQpjPfcd9nO8CYO8OClaewr9khNqCnSbCLfSoIg/alnb7BWw==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-21.6.9.tgz",
+      "integrity": "sha512-s8oX6/pLolHH3EyFJPcKITv+rzN/IZuidMCNkGfcr0jYVqrTZcJo8xUEwAQzf6u6J6urOm0bUK3BDuwJLEKESg==",
       "cpu": [
         "x64"
       ],
@@ -10687,9 +10771,9 @@
       ]
     },
     "node_modules/@nx/nx-linux-x64-musl": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-21.3.11.tgz",
-      "integrity": "sha512-OhFjURB68rd6xld8t8fiNpopF2E7v+8/jfbpsku9c0gdV2UhzoxCeZwooe7qhQjCcjVO8JNOs4dAf7qs1VtpMw==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-21.6.9.tgz",
+      "integrity": "sha512-bojpGcscRrnet5N3waeHYnBHW0y6r5tSQ1phnwMjgoBFmWXw+0M+z/f2dfZcTtBmWc7Y/TnzaGb8EenC3a63cQ==",
       "cpu": [
         "x64"
       ],
@@ -10700,9 +10784,9 @@
       ]
     },
     "node_modules/@nx/nx-win32-arm64-msvc": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-21.3.11.tgz",
-      "integrity": "sha512-pGE2Td13oEj7aeogwCL+2fjmpabQVSduKfGOTlt4YoMlM0w0bXYSWqwiGBMKbMA50qkhnVapwwkuWF38PgCIxg==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-21.6.9.tgz",
+      "integrity": "sha512-cS1bdMiJBs4AcykJ3+vtAdw4RkZLLfXT20o+k07dEskRFADIa5yXdOs2j0qKoe7iCiORKCH+gI/YsPHCyHfV9Q==",
       "cpu": [
         "arm64"
       ],
@@ -10713,9 +10797,9 @@
       ]
     },
     "node_modules/@nx/nx-win32-x64-msvc": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-21.3.11.tgz",
-      "integrity": "sha512-KJqLL/Zyx96hs+7pKbo/fsU7ZTFSLeZLnYQu05o6fvJJ5I1+p85t212/7vkbKKWJncyMospQdzLr3zLG3A/u8A==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-21.6.9.tgz",
+      "integrity": "sha512-EX0ja8gWnmomiSbK9K58oATpTn/+KU6RKcrfzqA3yL5x/a+kEPSf66QOXGQjDpCGKWMoxN+6ex7zhpmqbqKxgg==",
       "cpu": [
         "x64"
       ],
@@ -10725,18 +10809,493 @@
         "win32"
       ]
     },
-    "node_modules/@nx/workspace": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-21.3.11.tgz",
-      "integrity": "sha512-DD2iu9Ip/faNQ5MXZk+UbbBxGofYKjzHsXKRvMNQ/OAVzP/u9z2CPXEmRKlRAEQoy1lInmyopwfEUWwK1v4x0g==",
+    "node_modules/@nx/webpack": {
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/webpack/-/webpack-21.6.9.tgz",
+      "integrity": "sha512-2RWiZ4G/1VhEUTJtSH6zo9bvMxpRlV9AQGV3/NnP/dyH/owbZXrDuzd/hGW7s5CNE0RB3oN2dZG/ZEFJcGw55Q==",
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "21.3.11",
+        "@babel/core": "^7.23.2",
+        "@nx/devkit": "21.6.9",
+        "@nx/js": "21.6.9",
+        "@phenomnomnominal/tsquery": "~5.0.1",
+        "ajv": "^8.12.0",
+        "autoprefixer": "^10.4.9",
+        "babel-loader": "^9.1.2",
+        "browserslist": "^4.21.4",
+        "copy-webpack-plugin": "^10.2.4",
+        "css-loader": "^6.4.0",
+        "css-minimizer-webpack-plugin": "^5.0.0",
+        "fork-ts-checker-webpack-plugin": "7.2.13",
+        "less": "^4.1.3",
+        "less-loader": "^11.1.0",
+        "license-webpack-plugin": "^4.0.2",
+        "loader-utils": "^2.0.3",
+        "mini-css-extract-plugin": "~2.4.7",
+        "parse5": "4.0.0",
+        "picocolors": "^1.1.0",
+        "postcss": "^8.4.38",
+        "postcss-import": "~14.1.0",
+        "postcss-loader": "^6.1.1",
+        "rxjs": "^7.8.0",
+        "sass": "^1.85.0",
+        "sass-embedded": "^1.83.4",
+        "sass-loader": "^16.0.4",
+        "source-map-loader": "^5.0.0",
+        "style-loader": "^3.3.0",
+        "terser-webpack-plugin": "^5.3.3",
+        "ts-loader": "^9.3.1",
+        "tsconfig-paths-webpack-plugin": "4.2.0",
+        "tslib": "^2.3.0",
+        "webpack": "^5.101.3",
+        "webpack-dev-server": "^5.2.1",
+        "webpack-node-externals": "^3.0.0",
+        "webpack-subresource-integrity": "^5.1.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/array-union": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
+      "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/copy-webpack-plugin": {
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz",
+      "integrity": "sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-glob": "^3.2.7",
+        "glob-parent": "^6.0.1",
+        "globby": "^12.0.2",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 12.20.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/css-loader": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/fork-ts-checker-webpack-plugin": {
+      "version": "7.2.13",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.13.tgz",
+      "integrity": "sha512-fR3WRkOb4bQdWB/y7ssDUlVdrclvwtyCUIHCfivAoYxq9dF7XfrDKbMdZIfwJ7hxIAqkYSGeU7lLJE6xrxIBdg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.5.3",
+        "cosmiconfig": "^7.0.1",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^10.0.0",
+        "memfs": "^3.4.1",
+        "minimatch": "^3.0.4",
+        "node-abort-controller": "^3.0.1",
+        "schema-utils": "^3.1.1",
+        "semver": "^7.3.5",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=12.13.0",
+        "yarn": ">=1.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">3.6.0",
+        "vue-template-compiler": "*",
+        "webpack": "^5.11.0"
+      },
+      "peerDependenciesMeta": {
+        "vue-template-compiler": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/globby": {
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
+      "integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
+      "license": "MIT",
+      "dependencies": {
+        "array-union": "^3.0.1",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.7",
+        "ignore": "^5.1.9",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "license": "MIT"
+    },
+    "node_modules/@nx/webpack/node_modules/less-loader": {
+      "version": "11.1.4",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.4.tgz",
+      "integrity": "sha512-6/GrYaB6QcW6Vj+/9ZPgKKs6G10YZai/l/eJ4SLwbzqNTBsAqt5hSLVF47TgsiBxV1P6eAU0GYRH3YRuQU9V3A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "less": "^3.5.0 || ^4.0.0",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/mini-css-extract-plugin": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.7.tgz",
+      "integrity": "sha512-euWmddf0sk9Nv1O0gfeeUAvAkoSlWncNLF77C0TP2+WoPvy8mAHKOzMajcCz2dzvyt3CNgxb1obIEVFIRxaipg==",
+      "license": "MIT",
+      "dependencies": {
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/postcss-import": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
+      "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/postcss-loader": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.5",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/style-loader": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@nx/webpack/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@nx/workspace": {
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-21.6.9.tgz",
+      "integrity": "sha512-tUucr8hrpdhFITMjEEF8vm1j0GSW0ecFTySViWnnVvYyyv7tbidK/76MV/iyV/SjSamOHm2zIXS9fCfXV4LpAQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@nx/devkit": "21.6.9",
         "@zkochan/js-yaml": "0.0.7",
         "chalk": "^4.1.0",
         "enquirer": "~2.3.6",
-        "nx": "21.3.11",
+        "nx": "21.6.9",
         "picomatch": "4.0.2",
+        "semver": "^7.6.3",
         "tslib": "^2.3.0",
         "yargs-parser": "21.1.1"
       }
@@ -10745,7 +11304,6 @@
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
       "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
-      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -10785,7 +11343,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10806,7 +11363,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10827,7 +11383,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10848,7 +11403,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10869,7 +11423,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10890,7 +11443,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10911,7 +11463,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10932,7 +11483,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10953,7 +11503,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10974,7 +11523,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -10995,7 +11543,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -11016,7 +11563,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -11037,7 +11583,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -11055,7 +11600,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "bin": {
@@ -11069,7 +11613,6 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "dev": true,
       "license": "MIT",
       "optional": true
     },
@@ -11923,7 +12466,6 @@
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
       "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/@sindresorhus/is": {
@@ -11971,6 +12513,13 @@
         "@sinonjs/commons": "^3.0.0"
       }
     },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
+      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@storybook/addon-a11y": {
       "version": "8.6.12",
       "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-8.6.12.tgz",
@@ -13078,6 +13627,16 @@
         "node": ">=10"
       }
     },
+    "node_modules/@tailwindcss/container-queries": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/container-queries/-/container-queries-0.1.1.tgz",
+      "integrity": "sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "tailwindcss": ">=3.2.0"
+      }
+    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -13210,6 +13769,15 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/@ts-morph/common": {
       "version": "0.25.0",
       "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.25.0.tgz",
@@ -13373,7 +13941,6 @@
       "version": "1.19.6",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
       "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
@@ -13384,7 +13951,6 @@
       "version": "3.5.13",
       "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
       "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -13404,9 +13970,9 @@
       }
     },
     "node_modules/@types/chrome": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.1.12.tgz",
-      "integrity": "sha512-jEkxs9GPQHx7g49WjkA8QDNcqODbMGDuBbWQOtjiS/Wf9AiEcDmQMIAgJvC/Xi36WoCVNx584g0Dd9ThJQCAiw==",
+      "version": "0.1.28",
+      "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.1.28.tgz",
+      "integrity": "sha512-wANMmVt9H8UJeRsk4vlk5IVTTUIdk0J6CJC2ER60fGHTJOFVMuXpGhCqs6fUGw3m9pF1eXEvi+6ejlQZrtGA4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13418,7 +13984,6 @@
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -13428,7 +13993,6 @@
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
       "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/express-serve-static-core": "*",
@@ -13469,7 +14033,6 @@
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
       "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "*",
@@ -13480,7 +14043,6 @@
       "version": "3.7.7",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/eslint": "*",
@@ -13497,7 +14059,6 @@
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.3.tgz",
       "integrity": "sha512-wGA0NX93b19/dZC1J18tKWVIYWyyF2ZjT9vin/NRu0qzzvfVzWjs04iq2rQ3H65vCTQYlRqs3YHfY7zjdV+9Kw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
@@ -13509,7 +14070,6 @@
       "version": "5.0.6",
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz",
       "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -13536,9 +14096,9 @@
       "license": "MIT"
     },
     "node_modules/@types/firefox-webext-browser": {
-      "version": "120.0.4",
-      "resolved": "https://registry.npmjs.org/@types/firefox-webext-browser/-/firefox-webext-browser-120.0.4.tgz",
-      "integrity": "sha512-lBrpf08xhiZBigrtdQfUaqX1UauwZ+skbFiL8u2Tdra/rklkKadYmIzTwkNZSWtuZ7OKpFqbE2HHfDoFqvZf6w==",
+      "version": "143.0.0",
+      "resolved": "https://registry.npmjs.org/@types/firefox-webext-browser/-/firefox-webext-browser-143.0.0.tgz",
+      "integrity": "sha512-865dYKMOP0CllFyHmgXV4IQgVL51OSQQCwSoihQ17EwugePKFSAZRc0EI+y7Ly4q7j5KyURlA7LgRpFieO4JOw==",
       "dev": true,
       "license": "MIT"
     },
@@ -13573,7 +14133,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
       "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/@types/http-assert": {
@@ -13594,14 +14154,12 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
       "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/http-proxy": {
       "version": "1.17.16",
       "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
       "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -13849,7 +14407,6 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/ms": {
@@ -13860,9 +14417,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.15.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
-      "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
+      "version": "22.19.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.1.tgz",
+      "integrity": "sha512-LCCV0HdSZZZb34qifBsyWlUmok6W7ouER+oQIGBScS8EsZsQbrtFTUrDX4hOl+CS6p7cnNC4td+qrSVGSCTUfQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -13919,19 +14476,18 @@
       }
     },
     "node_modules/@types/node-forge": {
-      "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
-      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
-      "dev": true,
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz",
+      "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/papaparse": {
-      "version": "5.3.16",
-      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.16.tgz",
-      "integrity": "sha512-T3VuKMC2H0lgsjI9buTB3uuKj3EMD2eap1MOuEQuBQ44EnDx/IkGhU6EwiTf9zG3za4SKlmwKAImdDKdNnCsXg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.5.0.tgz",
+      "integrity": "sha512-GVs5iMQmUr54BAZYYkByv8zPofFxmyxUpISPb2oh8sayR3+1zbxasrOvoKiHJ/nnoq/uULuPsu1Lze1EkagVFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13977,14 +14533,12 @@
       "version": "6.14.0",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
       "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
       "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/react": {
@@ -14036,7 +14590,6 @@
       "version": "0.17.5",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
       "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
@@ -14047,7 +14600,6 @@
       "version": "1.9.4",
       "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
       "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/express": "*"
@@ -14057,7 +14609,6 @@
       "version": "1.15.8",
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
       "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
@@ -14069,7 +14620,6 @@
       "version": "0.3.36",
       "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
       "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -14147,7 +14697,6 @@
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
       "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -15076,7 +15625,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
       "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.13.2",
@@ -15087,28 +15635,24 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
       "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
       "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
       "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
       "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.13.2",
@@ -15120,14 +15664,12 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
       "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
       "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
@@ -15140,7 +15682,6 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
       "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
@@ -15150,7 +15691,6 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
       "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@xtuc/long": "4.2.2"
@@ -15160,14 +15700,12 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
       "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
       "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
@@ -15184,7 +15722,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
       "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
@@ -15198,7 +15735,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
       "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
@@ -15211,7 +15747,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
       "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
@@ -15226,7 +15761,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
       "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
@@ -15301,14 +15835,12 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/@yao-pkg/pkg": {
@@ -15614,6 +16146,18 @@
         "acorn-walk": "^8.0.2"
       }
     },
+    "node_modules/acorn-import-phases": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
+      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "acorn": "^8.14.0"
+      }
+    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -15713,7 +16257,6 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -15748,7 +16291,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
@@ -15820,7 +16362,6 @@
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
       "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true,
       "engines": [
         "node >= 0.8.0"
       ],
@@ -16138,7 +16679,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/array-includes": {
@@ -16356,7 +16896,6 @@
       "version": "10.4.21",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
       "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -16390,39 +16929,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/autoprefixer/node_modules/browserslist": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
-      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001718",
-        "electron-to-chromium": "^1.5.160",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
@@ -16466,9 +16972,9 @@
       }
     },
     "node_modules/axe-playwright": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/axe-playwright/-/axe-playwright-2.1.0.tgz",
-      "integrity": "sha512-tY48SX56XaAp16oHPyD4DXpybz8Jxdz9P7exTjF/4AV70EGUavk+1fUPWirM0OYBR+YyDx6hUeDvuHVA6fB9YA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/axe-playwright/-/axe-playwright-2.2.2.tgz",
+      "integrity": "sha512-h350/grzDCPgpuWV7eEOqr/f61Xn07Gi9f9B3Ew4rW6/nFtpdEJYW6jgRATorgAGXjEAYFTnaY3sEys39wDw4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16483,13 +16989,13 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.10.0.tgz",
-      "integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
+      "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
+        "form-data": "^4.0.4",
         "proxy-from-env": "^1.1.0"
       }
     },
@@ -16529,7 +17035,6 @@
       "version": "9.2.1",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
       "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "find-cache-dir": "^4.0.0",
@@ -16667,13 +17172,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz",
-      "integrity": "sha512-3sX/eOms8kd3q2KZ6DAhKPc0dgm525Gqq5NtWKZ7QYYZEv57OQ54KtblzJzH1lQF/eQxO8KjWGIK9IPUJNus5g==",
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz",
+      "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.4",
+        "@babel/compat-data": "^7.27.7",
+        "@babel/helper-define-polyfill-provider": "^0.6.5",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -16703,12 +17208,12 @@
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.4.tgz",
-      "integrity": "sha512-7gD3pRadPrbjhjLyxebmx/WrFYcuSjZ0XbdUujQMZ/fcE9oeewk2U/7PCvez84UeuK3oSjmPZ0Ch0dlupQvGzw==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz",
+      "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.4"
+        "@babel/helper-define-polyfill-provider": "^0.6.5"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -16724,9 +17229,9 @@
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
-      "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz",
+      "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==",
       "license": "MIT",
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -16746,7 +17251,7 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0 || ^8.0.0-0"
       }
     },
     "node_modules/babel-preset-jest": {
@@ -16810,6 +17315,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.8.30",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.30.tgz",
+      "integrity": "sha512-aTUKW4ptQhS64+v2d6IkPzymEzzhw+G0bA1g3uBRV3+ntkH+svttKseW5IOR4Ed6NUVKqnY7qT3dKvzQ7io4AA==",
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.js"
+      }
+    },
     "node_modules/basic-auth": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
@@ -16834,7 +17348,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/bcryptjs": {
@@ -16959,7 +17472,6 @@
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -16969,7 +17481,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -17058,7 +17569,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
       "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -17069,7 +17579,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/boolean": {
@@ -17119,40 +17628,40 @@
       }
     },
     "node_modules/braintree-web": {
-      "version": "3.113.0",
-      "resolved": "https://registry.npmjs.org/braintree-web/-/braintree-web-3.113.0.tgz",
-      "integrity": "sha512-qykYxZyld4X1tRNgXZQ3ZGzmhDGTBTRQ6Q24KaG9PuYqo+P2TVDEDOVC6tRbkx2RUIdXLv2M6WpkG7oLqEia9Q==",
+      "version": "3.123.2",
+      "resolved": "https://registry.npmjs.org/braintree-web/-/braintree-web-3.123.2.tgz",
+      "integrity": "sha512-N4IH75vKY67eONc0Ao4e7F+XagFW+3ok+Nfs/eOjw5D/TUt03diMAQ8woOwJghi2ql6/yjqNzZi2zE/sTWXmJg==",
       "license": "MIT",
       "dependencies": {
-        "@braintree/asset-loader": "2.0.1",
-        "@braintree/browser-detection": "2.0.1",
+        "@braintree/asset-loader": "2.0.3",
+        "@braintree/browser-detection": "2.0.2",
         "@braintree/event-emitter": "0.4.1",
         "@braintree/extended-promise": "1.0.0",
-        "@braintree/iframer": "2.0.0",
+        "@braintree/iframer": "2.0.1",
         "@braintree/sanitize-url": "7.0.4",
-        "@braintree/uuid": "1.0.0",
+        "@braintree/uuid": "1.0.1",
         "@braintree/wrap-promise": "2.1.0",
         "@paypal/accelerated-checkout-loader": "1.1.0",
-        "card-validator": "10.0.0",
-        "credit-card-type": "10.0.1",
-        "framebus": "6.0.0",
-        "inject-stylesheet": "6.0.1",
+        "card-validator": "10.0.3",
+        "credit-card-type": "10.0.2",
+        "framebus": "6.0.3",
+        "inject-stylesheet": "6.0.2",
         "promise-polyfill": "8.2.3",
-        "restricted-input": "3.0.5"
+        "restricted-input": "4.0.3"
       }
     },
     "node_modules/braintree-web-drop-in": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/braintree-web-drop-in/-/braintree-web-drop-in-1.44.0.tgz",
-      "integrity": "sha512-maOq9SwiXztIzixJhOras7K44x4UIqqnkyQMYAJqxQ8WkADv9AkflCu2j3IeVYCus/Th9gWWFHcBugn3C4sZGw==",
+      "version": "1.46.0",
+      "resolved": "https://registry.npmjs.org/braintree-web-drop-in/-/braintree-web-drop-in-1.46.0.tgz",
+      "integrity": "sha512-KxCjJpaigoMajYD/iIA+ohXaI6Olt2Bj/Yu45WpJOjolKO9n1UmXl9bsq9UIiGOFIGqi/JWva1wI4cIHHvcI1A==",
       "license": "MIT",
       "dependencies": {
-        "@braintree/asset-loader": "2.0.1",
-        "@braintree/browser-detection": "2.0.1",
+        "@braintree/asset-loader": "2.0.3",
+        "@braintree/browser-detection": "2.0.2",
         "@braintree/event-emitter": "0.4.1",
-        "@braintree/uuid": "1.0.0",
+        "@braintree/uuid": "1.0.1",
         "@braintree/wrap-promise": "2.1.0",
-        "braintree-web": "3.113.0"
+        "braintree-web": "3.123.2"
       }
     },
     "node_modules/browser-assert": {
@@ -17168,9 +17677,9 @@
       "license": "MIT"
     },
     "node_modules/browserslist": {
-      "version": "4.23.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
-      "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
+      "version": "4.28.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.0.tgz",
+      "integrity": "sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -17187,10 +17696,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001640",
-        "electron-to-chromium": "^1.4.820",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.1.0"
+        "baseline-browser-mapping": "^2.8.25",
+        "caniuse-lite": "^1.0.30001754",
+        "electron-to-chromium": "^1.5.249",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.1.4"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -17245,6 +17755,12 @@
         "ieee754": "^1.2.1"
       }
     },
+    "node_modules/buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
+      "license": "MIT/X11"
+    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -17736,7 +18252,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
       "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "pascal-case": "^3.1.2",
@@ -17762,10 +18278,22 @@
         "node": ">= 6"
       }
     },
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001724",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001724.tgz",
-      "integrity": "sha512-WqJo7p0TbHDOythNTqYujmaJTvtYRZrjpP8TCvH6Vb9CYJerJNKamKzIWOM4BkQatWj9H2lYulpdAQNBe7QhNA==",
+      "version": "1.0.30001756",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001756.tgz",
+      "integrity": "sha512-4HnCNKbMLkLdhJz3TToeVWHSnfJvPaq6vu/eRP0Ahub/07n484XHhBF5AJoSGHdVrS8tKFauUQz8Bp9P7LVx7A==",
       "funding": [
         {
           "type": "opencollective",
@@ -17783,20 +18311,14 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/card-validator": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/card-validator/-/card-validator-10.0.0.tgz",
-      "integrity": "sha512-2fLyCBOxO7/b56sxoYav8FeJqv9bWpZSyKq8sXKxnpxTGXHnM/0c8WEKG+ZJ+OXFcabnl98pD0EKBtTn+Tql0g==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/card-validator/-/card-validator-10.0.3.tgz",
+      "integrity": "sha512-xOEDsK3hojV0OIpmrR64eZGpngnOqRDEP20O+WSRtvjLSW6nyekW4i2N9SzYg679uFO3RyHcFHxb+mml5tXc4A==",
       "license": "MIT",
       "dependencies": {
-        "credit-card-type": "^9.1.0"
+        "credit-card-type": "^10.0.2"
       }
     },
-    "node_modules/card-validator/node_modules/credit-card-type": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/credit-card-type/-/credit-card-type-9.1.0.tgz",
-      "integrity": "sha512-CpNFuLxiPFxuZqhSKml3M+t0K/484pMAnfYWH14JoD7OZMnmC0Lmo+P7JX9SobqFpRoo7ifA18kOHdxJywYPEA==",
-      "license": "MIT"
-    },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
@@ -17958,7 +18480,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
       "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "readdirp": "^4.0.1"
@@ -17981,9 +18502,9 @@
       }
     },
     "node_modules/chromatic": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-13.1.2.tgz",
-      "integrity": "sha512-jgVptQabJHOnzmmvLjbtfutREkWGhDDk2gVqMH6N+V7z56oIy4Sd2/U7ZxNvnVFPinZQMSjSdUce4b6JIP64Dg==",
+      "version": "13.3.1",
+      "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-13.3.1.tgz",
+      "integrity": "sha512-qJ/el70Wo7jFgiXPpuukqxCEc7IKiH/e8MjTzIF9uKw+3XZ6GghOTTLC7lGfeZtosiQBMkRlYet77tC4KKHUng==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -18008,7 +18529,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
       "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0"
@@ -18025,7 +18545,6 @@
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
       "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -18048,7 +18567,7 @@
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
       "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "source-map": "~0.6.0"
@@ -18061,7 +18580,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
+      "devOptional": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -18347,11 +18866,22 @@
         "color-support": "bin.js"
       }
     },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "license": "MIT"
+    },
     "node_modules/colorette": {
       "version": "2.0.20",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorjs.io": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
+      "integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==",
       "license": "MIT"
     },
     "node_modules/colors": {
@@ -18402,7 +18932,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
       "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/common-tags": {
@@ -18436,7 +18965,6 @@
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
@@ -18449,7 +18977,6 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
       "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
@@ -18468,7 +18995,6 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
@@ -18478,14 +19004,12 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/compression/node_modules/negotiator": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
       "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -18719,7 +19243,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
       "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.8"
@@ -18811,7 +19334,6 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
       "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-what": "^3.14.1"
@@ -18827,9 +19349,9 @@
       "license": "MIT"
     },
     "node_modules/copy-webpack-plugin": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.0.tgz",
-      "integrity": "sha512-FgR/h5a6hzJqATDGd9YG41SeDViH+0bkHn6WNXCi5zKAZkeESeSxLySSsFLHqLEVCh0E+rITmCf0dusXWYukeQ==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz",
+      "integrity": "sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18874,38 +19396,6 @@
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/core-js-compat/node_modules/browserslist": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
-      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001718",
-        "electron-to-chromium": "^1.5.160",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -19031,9 +19521,9 @@
       "license": "MIT"
     },
     "node_modules/credit-card-type": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/credit-card-type/-/credit-card-type-10.0.1.tgz",
-      "integrity": "sha512-vQOuWmBgsgG1ovGeDi8m6Zeu1JaqH/JncrxKmaqMbv/LunyOQdLiQhPHtOsNlbUI05TocR5nod/Mbs3HYtr6sQ==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/credit-card-type/-/credit-card-type-10.0.2.tgz",
+      "integrity": "sha512-vt/iQokU0mtrT7ceRU75FSmWnIh5JFpLsUUUWYRmztYekOGm0ZbCuzwFTbNkq41k92y+0B8ChscFhRN9DhVZEA==",
       "license": "MIT"
     },
     "node_modules/cross-dirname": {
@@ -19046,9 +19536,9 @@
       "peer": true
     },
     "node_modules/cross-env": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz",
-      "integrity": "sha512-aU8qlEK/nHYtVuN4p7UQgAwVljzMg8hB4YK5ThRqD2l/ziSnryncPNn7bMLt5cFYsKVKBh8HqLqyCoTupEUu7Q==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz",
+      "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19083,6 +19573,18 @@
       "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
       "license": "MIT"
     },
+    "node_modules/css-declaration-sorter": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.3.0.tgz",
+      "integrity": "sha512-LQF6N/3vkAMYF4xoHLJfG718HRJh34Z8BnNhd6bosOMIVjMlhuZK5++oZa3uYAgrI5+7x2o27gUqTR2U/KjUOQ==",
+      "license": "ISC",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.9"
+      }
+    },
     "node_modules/css-loader": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
@@ -19119,11 +19621,54 @@
         }
       }
     },
+    "node_modules/css-minimizer-webpack-plugin": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.1.tgz",
+      "integrity": "sha512-3caImjKFQkS+ws1TGcFn0V1HyDJFq1Euy589JlD6/3rV2kj+w7r5G9WDMgSHvpvXHNZ2calVypZWuEDQd9wfLg==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "cssnano": "^6.0.1",
+        "jest-worker": "^29.4.3",
+        "postcss": "^8.4.24",
+        "schema-utils": "^4.0.1",
+        "serialize-javascript": "^6.0.1"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@parcel/css": {
+          "optional": true
+        },
+        "@swc/css": {
+          "optional": true
+        },
+        "clean-css": {
+          "optional": true
+        },
+        "csso": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/css-select": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
       "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
@@ -19136,11 +19681,23 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
+    "node_modules/css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
     "node_modules/css-what": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
       "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
@@ -19160,7 +19717,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
@@ -19169,6 +19725,115 @@
         "node": ">=4"
       }
     },
+    "node_modules/cssnano": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz",
+      "integrity": "sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA==",
+      "license": "MIT",
+      "dependencies": {
+        "cssnano-preset-default": "^6.1.2",
+        "lilconfig": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/cssnano"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-preset-default": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz",
+      "integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "css-declaration-sorter": "^7.2.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-calc": "^9.0.1",
+        "postcss-colormin": "^6.1.0",
+        "postcss-convert-values": "^6.1.0",
+        "postcss-discard-comments": "^6.0.2",
+        "postcss-discard-duplicates": "^6.0.3",
+        "postcss-discard-empty": "^6.0.3",
+        "postcss-discard-overridden": "^6.0.2",
+        "postcss-merge-longhand": "^6.0.5",
+        "postcss-merge-rules": "^6.1.1",
+        "postcss-minify-font-values": "^6.1.0",
+        "postcss-minify-gradients": "^6.0.3",
+        "postcss-minify-params": "^6.1.0",
+        "postcss-minify-selectors": "^6.0.4",
+        "postcss-normalize-charset": "^6.0.2",
+        "postcss-normalize-display-values": "^6.0.2",
+        "postcss-normalize-positions": "^6.0.2",
+        "postcss-normalize-repeat-style": "^6.0.2",
+        "postcss-normalize-string": "^6.0.2",
+        "postcss-normalize-timing-functions": "^6.0.2",
+        "postcss-normalize-unicode": "^6.1.0",
+        "postcss-normalize-url": "^6.0.2",
+        "postcss-normalize-whitespace": "^6.0.2",
+        "postcss-ordered-values": "^6.0.2",
+        "postcss-reduce-initial": "^6.1.0",
+        "postcss-reduce-transforms": "^6.0.2",
+        "postcss-svgo": "^6.0.3",
+        "postcss-unique-selectors": "^6.0.4"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-utils": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz",
+      "integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/csso": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+      "license": "MIT",
+      "dependencies": {
+        "css-tree": "~2.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "license": "CC0-1.0"
+    },
     "node_modules/cssom": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
@@ -19617,7 +20282,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/detect-port": {
@@ -19825,7 +20489,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
@@ -19838,7 +20501,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -19954,7 +20616,6 @@
       "version": "5.6.1",
       "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
       "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
@@ -19987,7 +20648,7 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
       "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "utila": "~0.4"
@@ -19997,7 +20658,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
       "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.3.0",
@@ -20012,7 +20672,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
       "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -20039,7 +20698,6 @@
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
       "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.3.0"
@@ -20055,7 +20713,6 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
       "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^2.0.0",
@@ -20077,7 +20734,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
       "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "no-case": "^3.0.4",
@@ -20186,9 +20843,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "36.8.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-36.8.1.tgz",
-      "integrity": "sha512-honaH58/cyCb9QAzIvD+WXWuNIZ0tW9zfBqMz5wZld/rXB+LCTEDb2B3TAv8+pDmlzPlkPio95RkUe86l6MNjg==",
+      "version": "37.7.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-37.7.0.tgz",
+      "integrity": "sha512-LBzvfrS0aalynOsnC11AD7zeoU8eOois090mzLpQM3K8yZ2N04i2ZW9qmHOTFLrXlKvrwRc7EbyQf1u8XHMl6Q==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -20259,9 +20916,9 @@
       }
     },
     "node_modules/electron-log": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.0.tgz",
-      "integrity": "sha512-AXI5OVppskrWxEAmCxuv8ovX+s2Br39CpCAgkGMNHQtjYT3IiVbSQTncEjFVGPgoH35ZygRm/mvUMBDWwhRxgg==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.3.tgz",
+      "integrity": "sha512-sOUsM3LjZdugatazSQ/XTyNcw8dfvH1SYhXWiJyfYodAAKOZdHs0txPiLDXFzOZbhXgAgshQkshH2ccq0feyLQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -20389,9 +21046,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.172",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.172.tgz",
-      "integrity": "sha512-fnKW9dGgmBfsebbYognQSv0CGGLFH1a5iV9EDYTBwmAQn+whbzHbLFlC+3XbHc8xaNtpO0etm8LOcRXs1qMRkQ==",
+      "version": "1.5.259",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.259.tgz",
+      "integrity": "sha512-I+oLXgpEJzD6Cwuwt1gYjxsDmu/S/Kd41mmLA3O+/uH2pFRO/DvOjUyGozL8j3KeLV6WyZ7ssPwELMsXCcsJAQ==",
       "license": "ISC"
     },
     "node_modules/electron-updater": {
@@ -20544,7 +21201,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -20582,7 +21238,6 @@
       "version": "5.18.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
       "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -20676,7 +21331,6 @@
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -20786,7 +21440,6 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
       "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
@@ -21541,14 +22194,12 @@
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
@@ -21862,7 +22513,6 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
       "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -21879,7 +22529,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
@@ -21904,7 +22553,6 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
       "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -21931,7 +22579,6 @@
       "version": "1.19.1",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
       "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
@@ -21941,7 +22588,6 @@
       "version": "0.11.4",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "websocket-driver": ">=0.5.1"
@@ -22145,7 +22791,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
       "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "common-path-prefix": "^3.0.0",
@@ -22584,7 +23229,6 @@
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
       "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -22595,20 +23239,14 @@
       }
     },
     "node_modules/framebus": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/framebus/-/framebus-6.0.0.tgz",
-      "integrity": "sha512-bL9V68hVaVBCY9rveoWbPFFI9hAXIJtESs51B+9XmzvMt38+wP8b4VdiJsavjMS6NfPZ/afQ/jc2qaHmSGI1kQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/framebus/-/framebus-6.0.3.tgz",
+      "integrity": "sha512-G/N2p+kFZ1xPBge7tbtTq2KcTR1kSKs1rVbTqH//WdtvJSexS33fsTTOq3yfUWvUczqhujyaFc+omawC9YyRBg==",
       "license": "MIT",
       "dependencies": {
-        "@braintree/uuid": "^0.1.0"
+        "@braintree/uuid": "^1.0.0"
       }
     },
-    "node_modules/framebus/node_modules/@braintree/uuid": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@braintree/uuid/-/uuid-0.1.0.tgz",
-      "integrity": "sha512-YvZJdlNcK5EnR+7M8AjgEAf4Qx696+FOSYlPfy5ePn80vODtVAUU0FxHnzKZC0og1VbDNQDDiwhthR65D4Na0g==",
-      "license": "ISC"
-    },
     "node_modules/fresh": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
@@ -22734,7 +23372,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
       "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
-      "dev": true,
       "license": "Unlicense"
     },
     "node_modules/fs.realpath": {
@@ -22968,7 +23605,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/glob/node_modules/minimatch": {
@@ -23056,15 +23692,6 @@
         "which": "bin/which"
       }
     },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/globalthis": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
@@ -23181,7 +23808,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/handlebars": {
@@ -23343,7 +23969,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "he": "bin/he"
@@ -23399,7 +24025,6 @@
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
       "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
@@ -23504,10 +24129,10 @@
       "license": "ISC"
     },
     "node_modules/html-webpack-plugin": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
-      "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
-      "dev": true,
+      "version": "5.6.5",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.5.tgz",
+      "integrity": "sha512-4xynFbKNNk+WlzXeQQ+6YYsH2g7mpfPszQZUi3ovKlj+pDmngQ7vRXjrrmGROabmKwyQkcgcX5hqfOwHbFmK5g==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@types/html-minifier-terser": "^6.0.0",
@@ -23540,7 +24165,7 @@
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
       "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">= 12"
@@ -23550,7 +24175,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
       "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "camel-case": "^4.1.2",
@@ -23695,7 +24320,6 @@
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
       "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/http-errors": {
@@ -23727,14 +24351,12 @@
       "version": "0.5.10",
       "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
       "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
       "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "eventemitter3": "^4.0.0",
@@ -23843,7 +24465,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
       "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10.18"
@@ -23915,7 +24536,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -23983,7 +24603,6 @@
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "bin": {
@@ -24003,7 +24622,6 @@
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
       "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/import-fresh": {
@@ -24183,9 +24801,9 @@
       }
     },
     "node_modules/inject-stylesheet": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/inject-stylesheet/-/inject-stylesheet-6.0.1.tgz",
-      "integrity": "sha512-2fvune1D4+8mvJoLVo95ncY4HrDkIaYIReRzXv8tkWFgdG9iuc5QuX57gtSDPWTWQI/f5BGwwtH85wxHouzucg==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/inject-stylesheet/-/inject-stylesheet-6.0.2.tgz",
+      "integrity": "sha512-sswMueya1LXEfwcy7KXPuq3zAW6HvgAeViApEhIaCviCkP4XYoKrQj8ftEmxPmIHn88X4R3xOAsnN/QCPvVKWw==",
       "license": "MIT"
     },
     "node_modules/inquirer": {
@@ -24375,7 +24993,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
@@ -24639,7 +25256,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
       "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=16"
@@ -24899,7 +25515,6 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
       "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/is-windows": {
@@ -25484,26 +26099,42 @@
       "license": "MIT"
     },
     "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dev": true,
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.2.0.tgz",
+      "integrity": "sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==",
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/diff-sequences": "30.0.1",
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/jest-diff/node_modules/@jest/schemas": {
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/@sinclair/typebox": {
+      "version": "0.34.41",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz",
+      "integrity": "sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==",
+      "license": "MIT"
+    },
     "node_modules/jest-diff/node_modules/ansi-styles": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -25513,25 +26144,23 @@
       }
     },
     "node_modules/jest-diff/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz",
+      "integrity": "sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==",
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-diff/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-docblock": {
@@ -26006,6 +26635,22 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/jest-matcher-utils/node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
     "node_modules/jest-matcher-utils/node_modules/pretty-format": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -26225,9 +26870,9 @@
       }
     },
     "node_modules/jest-preset-angular": {
-      "version": "14.6.0",
-      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-14.6.0.tgz",
-      "integrity": "sha512-LGSKLCsUhtrs2dw6f7ega/HOS8/Ni/1gV+oXmxPHmJDLHFpM6cI78Monmz8Z1P87a/A4OwnKilxgPRr+6Pzmgg==",
+      "version": "14.6.1",
+      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-14.6.1.tgz",
+      "integrity": "sha512-7q5x42wKrsF2ykOwGVzcXpr9p1X4FQJMU/DnH1tpvCmeOm5XqENdwD/xDZug+nP6G8SJPdioauwdsK/PMY/MpQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -26573,6 +27218,22 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/jest-snapshot/node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
     "node_modules/jest-snapshot/node_modules/pretty-format": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -26599,7 +27260,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
       "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -26617,7 +27277,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -26833,7 +27492,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -26849,7 +27507,6 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -27037,7 +27694,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/json-schema-typed": {
@@ -27222,10 +27878,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/klona": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/koa": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/koa/-/koa-2.16.1.tgz",
-      "integrity": "sha512-umfX9d3iuSxTQP4pnzLOz0HKnPg0FaUUIKcye2lOiz3KPu1Y3M3xlz76dISdFPQs37P9eJz1wUpcTS6KDPn9fA==",
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/koa/-/koa-2.16.3.tgz",
+      "integrity": "sha512-zPPuIt+ku1iCpFBRwseMcPYQ1cJL8l60rSmKeOuGfOXyE6YnTBmf2aEFNL2HQGrD0cPcLO/t+v9RTgC+fwEh/g==",
       "license": "MIT",
       "dependencies": {
         "accepts": "^1.3.5",
@@ -27481,7 +28146,6 @@
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz",
       "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "picocolors": "^1.0.0",
@@ -27499,7 +28163,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/less/-/less-4.2.2.tgz",
       "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "copy-anything": "^2.0.1",
@@ -27553,7 +28216,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -27568,7 +28230,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "bin": {
@@ -27582,7 +28243,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
       "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -27593,7 +28253,6 @@
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
       "license": "ISC",
       "optional": true,
       "bin": {
@@ -27604,7 +28263,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
@@ -27637,7 +28295,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
       "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "webpack-sources": "^3.0.0"
@@ -27664,7 +28321,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
       "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=14"
@@ -28114,13 +28770,16 @@
       "optional": true
     },
     "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true,
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
+      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
       "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/loader-utils": {
@@ -28186,7 +28845,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.merge": {
@@ -28195,6 +28853,12 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "license": "MIT"
     },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "license": "MIT"
+    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -28486,7 +29150,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
       "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.3"
@@ -28964,6 +29628,12 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+      "license": "CC0-1.0"
+    },
     "node_modules/media-typer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
@@ -28977,7 +29647,6 @@
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
       "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
-      "dev": true,
       "license": "Unlicense",
       "dependencies": {
         "fs-monkey": "^1.0.4"
@@ -29018,7 +29687,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 8"
@@ -29028,7 +29696,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -29728,9 +30395,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
-      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.4.tgz",
+      "integrity": "sha512-ZWYT7ln73Hptxqxk2DxPU9MmapXRhxkJD6tkSR04dnQxm8BGu2hzgKLugK5yySD97u/8yy7Ma7E76k9ZdvtjkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -29752,7 +30419,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/minimatch": {
@@ -30196,7 +30862,6 @@
       "version": "7.2.5",
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
       "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "dns-packet": "^5.2.2",
@@ -30295,7 +30960,6 @@
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
       "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -30342,7 +31006,6 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
       "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -30369,7 +31032,6 @@
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/neotraverse": {
@@ -30383,9 +31045,9 @@
       }
     },
     "node_modules/ngx-toastr": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-19.0.0.tgz",
-      "integrity": "sha512-6pTnktwwWD+kx342wuMOWB4+bkyX9221pAgGz3SHOJH0/MI9erLucS8PeeJDFwbUYyh75nQ6AzVtolgHxi52dQ==",
+      "version": "19.1.0",
+      "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-19.1.0.tgz",
+      "integrity": "sha512-Qa7Kg7QzGKNtp1v04hu3poPKKx8BGBD/Onkhm6CdH5F0vSMdq+BdR/f8DTpZnGFksW891tAFufpiWb9UZX+3vg==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -30400,7 +31062,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
       "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "lower-case": "^2.0.2",
@@ -30424,7 +31086,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
       "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/node-api-version": {
@@ -30480,9 +31141,9 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.2.tgz",
+      "integrity": "sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==",
       "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
@@ -30928,9 +31589,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "version": "2.0.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
       "license": "MIT"
     },
     "node_modules/nopt": {
@@ -30962,7 +31623,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -31438,7 +32098,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
       "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
@@ -31454,9 +32113,9 @@
       "license": "MIT"
     },
     "node_modules/nx": {
-      "version": "21.3.11",
-      "resolved": "https://registry.npmjs.org/nx/-/nx-21.3.11.tgz",
-      "integrity": "sha512-nj2snZ3mHZnbHcoB3NUdxbch9L1sQKV1XccLs1B79fmI/N5oOgWgctm/bWoZH2UH5b4A8ZLAMTsC6YnSJGbcaw==",
+      "version": "21.6.9",
+      "resolved": "https://registry.npmjs.org/nx/-/nx-21.6.9.tgz",
+      "integrity": "sha512-RPuIb04QIOE2WLDcvKDjrAQlkI9+EnP8/9KyG/I296JA1lJhlIk7BH3F6Py7uLHD7B1adSBsCDf/tT6540Ng7A==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -31464,7 +32123,7 @@
         "@yarnpkg/lockfile": "^1.1.0",
         "@yarnpkg/parsers": "3.0.2",
         "@zkochan/js-yaml": "0.0.7",
-        "axios": "^1.8.3",
+        "axios": "^1.12.0",
         "chalk": "^4.1.0",
         "cli-cursor": "3.1.0",
         "cli-spinners": "2.6.1",
@@ -31501,16 +32160,16 @@
         "nx-cloud": "bin/nx-cloud.js"
       },
       "optionalDependencies": {
-        "@nx/nx-darwin-arm64": "21.3.11",
-        "@nx/nx-darwin-x64": "21.3.11",
-        "@nx/nx-freebsd-x64": "21.3.11",
-        "@nx/nx-linux-arm-gnueabihf": "21.3.11",
-        "@nx/nx-linux-arm64-gnu": "21.3.11",
-        "@nx/nx-linux-arm64-musl": "21.3.11",
-        "@nx/nx-linux-x64-gnu": "21.3.11",
-        "@nx/nx-linux-x64-musl": "21.3.11",
-        "@nx/nx-win32-arm64-msvc": "21.3.11",
-        "@nx/nx-win32-x64-msvc": "21.3.11"
+        "@nx/nx-darwin-arm64": "21.6.9",
+        "@nx/nx-darwin-x64": "21.6.9",
+        "@nx/nx-freebsd-x64": "21.6.9",
+        "@nx/nx-linux-arm-gnueabihf": "21.6.9",
+        "@nx/nx-linux-arm64-gnu": "21.6.9",
+        "@nx/nx-linux-arm64-musl": "21.6.9",
+        "@nx/nx-linux-x64-gnu": "21.6.9",
+        "@nx/nx-linux-x64-musl": "21.6.9",
+        "@nx/nx-win32-arm64-msvc": "21.6.9",
+        "@nx/nx-win32-x64-msvc": "21.6.9"
       },
       "peerDependencies": {
         "@swc-node/register": "^1.8.0",
@@ -31525,36 +32184,6 @@
         }
       }
     },
-    "node_modules/nx/node_modules/@jest/schemas": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-      "license": "MIT",
-      "dependencies": {
-        "@sinclair/typebox": "^0.34.0"
-      },
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
-    "node_modules/nx/node_modules/@sinclair/typebox": {
-      "version": "0.34.38",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.38.tgz",
-      "integrity": "sha512-HpkxMmc2XmZKhvaKIZZThlHmx1L0I/V1hWK1NubtlFnr6ZqdiOpV72TKudZUNQjZNsyDBay72qFEhEvb+bcwcA==",
-      "license": "MIT"
-    },
-    "node_modules/nx/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/nx/node_modules/define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -31612,21 +32241,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/nx/node_modules/jest-diff": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.0.5.tgz",
-      "integrity": "sha512-1UIqE9PoEKaHcIKvq2vbibrCog4Y8G0zmOxgQUVEiTqwR5hJVMCoDsN1vFvI5JvwD37hjueZ1C4l2FyGnfpE0A==",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/diff-sequences": "30.0.1",
-        "@jest/get-type": "30.0.1",
-        "chalk": "^4.1.2",
-        "pretty-format": "30.0.5"
-      },
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
     "node_modules/nx/node_modules/jsonc-parser": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
@@ -31672,26 +32286,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/nx/node_modules/pretty-format": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz",
-      "integrity": "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "30.0.5",
-        "ansi-styles": "^5.2.0",
-        "react-is": "^18.3.1"
-      },
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
-    "node_modules/nx/node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "license": "MIT"
-    },
     "node_modules/nx/node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -32168,7 +32762,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/oidc-client-ts": {
@@ -32200,7 +32793,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -32444,7 +33036,6 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
       "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/retry": "0.12.2",
@@ -32462,14 +33053,12 @@
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
       "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/p-retry/node_modules/retry": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
       "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -32823,7 +33412,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
       "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "dot-case": "^3.0.4",
@@ -32876,7 +33465,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
       "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"
@@ -32959,7 +33547,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
       "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "no-case": "^3.0.4",
@@ -33172,7 +33760,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
       "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "find-up": "^6.3.0"
@@ -33188,7 +33775,6 @@
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
       "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "locate-path": "^7.1.0",
@@ -33205,7 +33791,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
       "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-locate": "^6.0.0"
@@ -33221,7 +33806,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
       "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "yocto-queue": "^1.0.0"
@@ -33237,7 +33821,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
       "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-limit": "^4.0.0"
@@ -33253,7 +33836,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
       "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -33263,7 +33845,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.1.tgz",
       "integrity": "sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12.20"
@@ -33434,10 +34015,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
-      "dev": true,
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -33454,7 +34034,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -33462,6 +34042,117 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/postcss-calc": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.2"
+      }
+    },
+    "node_modules/postcss-calc/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-colormin": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz",
+      "integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0",
+        "colord": "^2.9.3",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-convert-values": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz",
+      "integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-comments": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz",
+      "integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-duplicates": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz",
+      "integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-empty": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz",
+      "integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-overridden": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz",
+      "integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
     "node_modules/postcss-import": {
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
@@ -33537,15 +34228,15 @@
       }
     },
     "node_modules/postcss-loader": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
-      "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.2.0.tgz",
+      "integrity": "sha512-tHX+RkpsXVcc7st4dSdDGliI+r4aAQDuv+v3vFYHixb6YgjreG5AG4SEB0kDK8u2s6htqEEpKlkhSBUTvWKYnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cosmiconfig": "^9.0.0",
-        "jiti": "^1.20.0",
-        "semver": "^7.5.4"
+        "jiti": "^2.5.1",
+        "semver": "^7.6.2"
       },
       "engines": {
         "node": ">= 18.12.0"
@@ -33568,6 +34259,16 @@
         }
       }
     },
+    "node_modules/postcss-loader/node_modules/jiti": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
+      "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jiti": "lib/jiti-cli.mjs"
+      }
+    },
     "node_modules/postcss-media-query-parser": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
@@ -33575,11 +34276,134 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/postcss-merge-longhand": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz",
+      "integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^6.1.1"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-merge-rules": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz",
+      "integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-minify-font-values": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz",
+      "integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-gradients": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz",
+      "integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==",
+      "license": "MIT",
+      "dependencies": {
+        "colord": "^2.9.3",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-params": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz",
+      "integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-selectors": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz",
+      "integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-modules-extract-imports": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
       "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -33592,7 +34416,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
       "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.0.0",
@@ -33610,7 +34433,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
       "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "postcss-selector-parser": "^7.0.0"
@@ -33626,7 +34448,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "icss-utils": "^5.0.0"
@@ -33678,11 +34499,234 @@
         "node": ">=4"
       }
     },
+    "node_modules/postcss-normalize-charset": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz",
+      "integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-display-values": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz",
+      "integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-positions": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz",
+      "integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-repeat-style": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz",
+      "integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-string": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz",
+      "integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-timing-functions": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz",
+      "integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-unicode": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz",
+      "integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-url": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz",
+      "integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-whitespace": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz",
+      "integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-ordered-values": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz",
+      "integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==",
+      "license": "MIT",
+      "dependencies": {
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-reduce-initial": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz",
+      "integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-reduce-transforms": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz",
+      "integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
     "node_modules/postcss-selector-parser": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-svgo": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz",
+      "integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "svgo": "^3.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >= 18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-unique-selectors": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz",
+      "integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-unique-selectors/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -33696,7 +34740,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/postject": {
@@ -33864,7 +34907,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
       "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.20",
@@ -34059,7 +35102,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
-      "dev": true,
       "license": "MIT",
       "optional": true
     },
@@ -34152,7 +35194,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -34186,7 +35227,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
@@ -34300,7 +35340,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "pify": "^2.3.0"
@@ -34310,7 +35349,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -34347,7 +35385,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
       "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 14.18.0"
@@ -34544,7 +35581,7 @@
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
       "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"
@@ -34619,7 +35656,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
       "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "css-select": "^4.1.3",
@@ -34633,7 +35670,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
       "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
@@ -34650,7 +35687,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
       "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
@@ -34665,7 +35702,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
       "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.2.0"
@@ -34681,7 +35718,7 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
       "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
+      "devOptional": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^1.0.1",
@@ -34696,7 +35733,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
+      "devOptional": true,
       "license": "BSD-2-Clause",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
@@ -34706,7 +35743,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
       "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
+      "devOptional": true,
       "funding": [
         "https://github.com/fb55/htmlparser2?sponsor=1",
         {
@@ -34735,7 +35772,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -34939,12 +35975,12 @@
       "license": "ISC"
     },
     "node_modules/restricted-input": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/restricted-input/-/restricted-input-3.0.5.tgz",
-      "integrity": "sha512-lUuXZ3wUnHURRarj5/0C8vomWIfWJO+p7T6RYwB46v7Oyuyr3yyupU+i7SjqUv4S6RAeAAZt1C/QCLJ9xhQBow==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/restricted-input/-/restricted-input-4.0.3.tgz",
+      "integrity": "sha512-VpkwT5Fr3DhvoRZfPnmHDhnYAYETjjNzDlvA4NlW0iknFS47C5X4OCHEpOOxaPjvmka5V8d1ty1jVVoorZKvHg==",
       "license": "MIT",
       "dependencies": {
-        "@braintree/browser-detection": "^1.12.1"
+        "@braintree/browser-detection": "^1.17.2"
       }
     },
     "node_modules/restricted-input/node_modules/@braintree/browser-detection": {
@@ -34966,7 +36002,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
       "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
@@ -35118,7 +36153,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -35303,10 +36337,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.88.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.88.0.tgz",
-      "integrity": "sha512-sF6TWQqjFvr4JILXzG4ucGOLELkESHL+I5QJhh7CNaE+Yge0SI+ehCatsXhJ7ymU1hAFcIS3/PBpjdIbXoyVbg==",
-      "dev": true,
+      "version": "1.94.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.94.2.tgz",
+      "integrity": "sha512-N+7WK20/wOr7CzA2snJcUSSNTCzeCGUTFY3OgeQP3mZ1aj9NMQ0mSTXwlrnd89j33zzQJGqIN52GIOmYrfq46A==",
       "license": "MIT",
       "dependencies": {
         "chokidar": "^4.0.0",
@@ -35323,11 +36356,397 @@
         "@parcel/watcher": "^2.4.1"
       }
     },
+    "node_modules/sass-embedded": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.93.2.tgz",
+      "integrity": "sha512-FvQdkn2dZ8DGiLgi0Uf4zsj7r/BsiLImNa5QJ10eZalY6NfZyjrmWGFcuCN5jNwlDlXFJnftauv+UtvBKLvepQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@bufbuild/protobuf": "^2.5.0",
+        "buffer-builder": "^0.2.0",
+        "colorjs.io": "^0.5.0",
+        "immutable": "^5.0.2",
+        "rxjs": "^7.4.0",
+        "supports-color": "^8.1.1",
+        "sync-child-process": "^1.0.2",
+        "varint": "^6.0.0"
+      },
+      "bin": {
+        "sass": "dist/bin/sass.js"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "optionalDependencies": {
+        "sass-embedded-all-unknown": "1.93.2",
+        "sass-embedded-android-arm": "1.93.2",
+        "sass-embedded-android-arm64": "1.93.2",
+        "sass-embedded-android-riscv64": "1.93.2",
+        "sass-embedded-android-x64": "1.93.2",
+        "sass-embedded-darwin-arm64": "1.93.2",
+        "sass-embedded-darwin-x64": "1.93.2",
+        "sass-embedded-linux-arm": "1.93.2",
+        "sass-embedded-linux-arm64": "1.93.2",
+        "sass-embedded-linux-musl-arm": "1.93.2",
+        "sass-embedded-linux-musl-arm64": "1.93.2",
+        "sass-embedded-linux-musl-riscv64": "1.93.2",
+        "sass-embedded-linux-musl-x64": "1.93.2",
+        "sass-embedded-linux-riscv64": "1.93.2",
+        "sass-embedded-linux-x64": "1.93.2",
+        "sass-embedded-unknown-all": "1.93.2",
+        "sass-embedded-win32-arm64": "1.93.2",
+        "sass-embedded-win32-x64": "1.93.2"
+      }
+    },
+    "node_modules/sass-embedded-all-unknown": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-all-unknown/-/sass-embedded-all-unknown-1.93.2.tgz",
+      "integrity": "sha512-GdEuPXIzmhRS5J7UKAwEvtk8YyHQuFZRcpnEnkA3rwRUI27kwjyXkNeIj38XjUQ3DzrfMe8HcKFaqWGHvblS7Q==",
+      "cpu": [
+        "!arm",
+        "!arm64",
+        "!riscv64",
+        "!x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "sass": "1.93.2"
+      }
+    },
+    "node_modules/sass-embedded-all-unknown/node_modules/sass": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz",
+      "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
+      }
+    },
+    "node_modules/sass-embedded-android-arm": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.93.2.tgz",
+      "integrity": "sha512-I8bpO8meZNo5FvFx5FIiE7DGPVOYft0WjuwcCCdeJ6duwfkl6tZdatex1GrSigvTsuz9L0m4ngDcX/Tj/8yMow==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-android-arm64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.93.2.tgz",
+      "integrity": "sha512-346f4iVGAPGcNP6V6IOOFkN5qnArAoXNTPr5eA/rmNpeGwomdb7kJyQ717r9rbJXxOG8OAAUado6J0qLsjnjXQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-android-riscv64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.93.2.tgz",
+      "integrity": "sha512-hSMW1s4yJf5guT9mrdkumluqrwh7BjbZ4MbBW9tmi1DRDdlw1Wh9Oy1HnnmOG8x9XcI1qkojtPL6LUuEJmsiDg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-android-x64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.93.2.tgz",
+      "integrity": "sha512-JqktiHZduvn+ldGBosE40ALgQ//tGCVNAObgcQ6UIZznEJbsHegqStqhRo8UW3x2cgOO2XYJcrInH6cc7wdKbw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-arm64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.93.2.tgz",
+      "integrity": "sha512-qI1X16qKNeBJp+M/5BNW7v/JHCDYWr1/mdoJ7+UMHmP0b5AVudIZtimtK0hnjrLnBECURifd6IkulybR+h+4UA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-x64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.93.2.tgz",
+      "integrity": "sha512-4KeAvlkQ0m0enKUnDGQJZwpovYw99iiMb8CTZRSsQm8Eh7halbJZVmx67f4heFY/zISgVOCcxNg19GrM5NTwtA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.93.2.tgz",
+      "integrity": "sha512-N3+D/ToHtzwLDO+lSH05Wo6/KRxFBPnbjVHASOlHzqJnK+g5cqex7IFAp6ozzlRStySk61Rp6d+YGrqZ6/P0PA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.93.2.tgz",
+      "integrity": "sha512-9ftX6nd5CsShJqJ2WRg+ptaYvUW+spqZfJ88FbcKQBNFQm6L87luj3UI1rB6cP5EWrLwHA754OKxRJyzWiaN6g==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-musl-arm": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.93.2.tgz",
+      "integrity": "sha512-XBTvx66yRenvEsp3VaJCb3HQSyqCsUh7R+pbxcN5TuzueybZi0LXvn9zneksdXcmjACMlMpIVXi6LyHPQkYc8A==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-musl-arm64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.93.2.tgz",
+      "integrity": "sha512-+3EHuDPkMiAX5kytsjEC1bKZCawB9J6pm2eBIzzLMPWbf5xdx++vO1DpT7hD4bm4ZGn0eVHgSOKIfP6CVz6tVg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-musl-riscv64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.93.2.tgz",
+      "integrity": "sha512-0sB5kmVZDKTYzmCSlTUnjh6mzOhzmQiW/NNI5g8JS4JiHw2sDNTvt1dsFTuqFkUHyEOY3ESTsfHHBQV8Ip4bEA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-musl-x64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.93.2.tgz",
+      "integrity": "sha512-t3ejQ+1LEVuHy7JHBI2tWHhoMfhedUNDjGJR2FKaLgrtJntGnyD1RyX0xb3nuqL/UXiEAtmTmZY+Uh3SLUe1Hg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-riscv64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.93.2.tgz",
+      "integrity": "sha512-e7AndEwAbFtXaLy6on4BfNGTr3wtGZQmypUgYpSNVcYDO+CWxatKVY4cxbehMPhxG9g5ru+eaMfynvhZt7fLaA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-x64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.93.2.tgz",
+      "integrity": "sha512-U3EIUZQL11DU0xDDHXexd4PYPHQaSQa2hzc4EzmhHqrAj+TyfYO94htjWOd+DdTPtSwmLp+9cTWwPZBODzC96w==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-unknown-all": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-unknown-all/-/sass-embedded-unknown-all-1.93.2.tgz",
+      "integrity": "sha512-7VnaOmyewcXohiuoFagJ3SK5ddP9yXpU0rzz+pZQmS1/+5O6vzyFCUoEt3HDRaLctH4GT3nUGoK1jg0ae62IfQ==",
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "!android",
+        "!darwin",
+        "!linux",
+        "!win32"
+      ],
+      "dependencies": {
+        "sass": "1.93.2"
+      }
+    },
+    "node_modules/sass-embedded-unknown-all/node_modules/sass": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz",
+      "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
+      }
+    },
+    "node_modules/sass-embedded-win32-arm64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.93.2.tgz",
+      "integrity": "sha512-Y90DZDbQvtv4Bt0GTXKlcT9pn4pz8AObEjFF8eyul+/boXwyptPZ/A1EyziAeNaIEIfxyy87z78PUgCeGHsx3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-x64": {
+      "version": "1.93.2",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.93.2.tgz",
+      "integrity": "sha512-BbSucRP6PVRZGIwlEBkp+6VQl2GWdkWFMN+9EuOTPrLxCJZoq+yhzmbjspd3PeM8+7WJ7AdFu/uRYdO8tor1iQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
     "node_modules/sass-loader": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.4.tgz",
-      "integrity": "sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==",
-      "dev": true,
+      "version": "16.0.6",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.6.tgz",
+      "integrity": "sha512-sglGzId5gmlfxNs4gK2U3h7HlVRfx278YK6Ono5lwzuvi1jxig80YiuHkaDBVsYIKFhx8wN7XSCI0M2IDS/3qA==",
       "license": "MIT",
       "dependencies": {
         "neo-async": "^2.6.2"
@@ -35368,7 +36787,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
       "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/saxes": {
@@ -35394,10 +36813,9 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
-      "dev": true,
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
       "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
@@ -35417,7 +36835,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
@@ -35435,14 +36852,12 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
       "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/selfsigned": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
       "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node-forge": "^1.3.0",
@@ -35453,9 +36868,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -35529,7 +36944,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
@@ -35539,7 +36953,6 @@
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.4",
@@ -35558,7 +36971,6 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-types": "~2.1.34",
@@ -35572,7 +36984,6 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
@@ -35582,7 +36993,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -35592,7 +37002,6 @@
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "depd": "~1.1.2",
@@ -35608,14 +37017,12 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/serve-index/node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -35625,7 +37032,6 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
@@ -35638,14 +37044,12 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/serve-index/node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -35655,14 +37059,12 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/serve-index/node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -35795,7 +37197,6 @@
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
       "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -36020,7 +37421,6 @@
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
       "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "faye-websocket": "^0.11.3",
@@ -36032,7 +37432,6 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
@@ -36085,7 +37484,6 @@
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
       "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
@@ -36095,7 +37493,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -36105,7 +37502,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-5.0.0.tgz",
       "integrity": "sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "iconv-lite": "^0.6.3",
@@ -36126,7 +37522,6 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
@@ -36137,7 +37532,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -36341,7 +37735,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
       "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
@@ -36358,7 +37751,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
@@ -36373,7 +37765,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
@@ -36785,6 +38176,35 @@
         "webpack": "^5.27.0"
       }
     },
+    "node_modules/stylehacks": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
+      "integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==",
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/stylis": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
@@ -36952,6 +38372,40 @@
       "dev": true,
       "license": "BSD-2-Clause"
     },
+    "node_modules/svgo": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
+      "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
+      "license": "MIT",
+      "dependencies": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^5.1.0",
+        "css-tree": "^2.3.1",
+        "css-what": "^6.1.0",
+        "csso": "^5.0.5",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/svgo"
+      }
+    },
+    "node_modules/svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/symbol-observable": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
@@ -36968,6 +38422,27 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "license": "MIT"
     },
+    "node_modules/sync-child-process": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz",
+      "integrity": "sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==",
+      "license": "MIT",
+      "dependencies": {
+        "sync-message-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/sync-message-port": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.1.3.tgz",
+      "integrity": "sha512-GTt8rSKje5FilG+wEdfCkOcLL7LWqpMlr2c3LRuKt/YXxcJ52aGSbGBAdI4L3aaqfrBt6y711El53ItyH1NWzg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/synckit": {
       "version": "0.11.11",
       "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
@@ -36984,9 +38459,9 @@
       }
     },
     "node_modules/tabbable": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
-      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz",
+      "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
       "license": "MIT"
     },
     "node_modules/tablesort": {
@@ -37117,13 +38592,16 @@
       }
     },
     "node_modules/tapable": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
-      "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
-      "dev": true,
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/tar": {
@@ -37344,7 +38822,6 @@
       "version": "5.39.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
       "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -37363,7 +38840,6 @@
       "version": "5.3.14",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
       "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
@@ -37398,7 +38874,6 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -37413,7 +38888,6 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -37429,7 +38903,6 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/test-exclude": {
@@ -37516,7 +38989,6 @@
       "version": "1.21.0",
       "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
       "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==",
-      "dev": true,
       "license": "Unlicense",
       "engines": {
         "node": ">=10.18"
@@ -37535,7 +39007,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/tiny-async-pool": {
@@ -37609,21 +39080,21 @@
       }
     },
     "node_modules/tldts": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.1.tgz",
-      "integrity": "sha512-C3TdHZKykiDkxPIKUYCDWyYpcLQ8bDYvF/RGfH66UikQX3Kro7ij2/WGNYgp5EfxXB4+Tu5H728uAgYGNE1eaQ==",
+      "version": "7.0.18",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.18.tgz",
+      "integrity": "sha512-lCcgTAgMxQ1JKOWrVGo6E69Ukbnx4Gc1wiYLRf6J5NN4HRYJtCby1rPF8rkQ4a6qqoFBK5dvjJ1zJ0F7VfDSvw==",
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^7.0.1"
+        "tldts-core": "^7.0.18"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.9.tgz",
-      "integrity": "sha512-/FGY1+CryHsxF9SFiPZlMOcwQsfABkAvOJO5VEKE8TNifVEqgMF7+UVXHGhm1z4gPUfvVS/EYcwhiRU3vUa1ag==",
+      "version": "7.0.19",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.19.tgz",
+      "integrity": "sha512-lJX2dEWx0SGH4O6p+7FPwYmJ/bu1JbcGJ8RLaG9b7liIgZ85itUVEPbMtWRVrde/0fnDPEPHW10ZsKW3kVsE9A==",
       "license": "MIT"
     },
     "node_modules/tmp": {
@@ -37712,7 +39183,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.3.tgz",
       "integrity": "sha512-il+Cv80yVHFBwokQSfd4bldvr1Md951DpgAGfmhydt04L+YzHgubm2tQ7zueWDcGENKHq0ZvGFR/hjvNXilHEg==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=10.0"
@@ -37801,20 +39271,19 @@
       "license": "Apache-2.0"
     },
     "node_modules/ts-jest": {
-      "version": "29.3.4",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.4.tgz",
-      "integrity": "sha512-Iqbrm8IXOmV+ggWHOTEbjwyCf2xZlUMv5npExksXohL+tk8va4Fjhb+X2+Rt9NBmgO7bJ8WpnMLOwih/DnMlFA==",
+      "version": "29.4.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.5.tgz",
+      "integrity": "sha512-HO3GyiWn2qvTQA4kTgjDcXiMwYQt68a1Y8+JuLRVpdIzm+UOLSHgl/XqR4c6nzJkq5rOkjc02O2I7P7l/Yof0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bs-logger": "^0.2.6",
-        "ejs": "^3.1.10",
         "fast-json-stable-stringify": "^2.1.0",
-        "jest-util": "^29.0.0",
+        "handlebars": "^4.7.8",
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
-        "semver": "^7.7.2",
+        "semver": "^7.7.3",
         "type-fest": "^4.41.0",
         "yargs-parser": "^21.1.1"
       },
@@ -37826,10 +39295,11 @@
       },
       "peerDependencies": {
         "@babel/core": ">=7.0.0-beta.0 <8",
-        "@jest/transform": "^29.0.0",
-        "@jest/types": "^29.0.0",
-        "babel-jest": "^29.0.0",
-        "jest": "^29.0.0",
+        "@jest/transform": "^29.0.0 || ^30.0.0",
+        "@jest/types": "^29.0.0 || ^30.0.0",
+        "babel-jest": "^29.0.0 || ^30.0.0",
+        "jest": "^29.0.0 || ^30.0.0",
+        "jest-util": "^29.0.0 || ^30.0.0",
         "typescript": ">=4.3 <6"
       },
       "peerDependenciesMeta": {
@@ -37847,6 +39317,9 @@
         },
         "esbuild": {
           "optional": true
+        },
+        "jest-util": {
+          "optional": true
         }
       }
     },
@@ -37864,10 +39337,9 @@
       }
     },
     "node_modules/ts-loader": {
-      "version": "9.5.2",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
-      "integrity": "sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==",
-      "dev": true,
+      "version": "9.5.4",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.4.tgz",
+      "integrity": "sha512-nCz0rEwunlTZiy6rXFByQU1kVVpCIgUpc/psFiKVrUwrizdnIbRFu8w7bxhUF0X613DYwT4XzrZHpVyMe758hQ==",
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
@@ -37961,7 +39433,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.2.0.tgz",
       "integrity": "sha512-zbem3rfRS8BgeNK50Zz5SIQgXzLafiHjOwUAvk/38/o1jHn/V5QAgVUcz884or7WYcPaH3N2CIfUc2u0ul7UcA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
@@ -37977,7 +39448,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -37987,7 +39457,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
       "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "json5": "^2.2.2",
@@ -38546,7 +40015,6 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
       "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/typedarray": {
@@ -38566,9 +40034,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -39018,9 +40486,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
+      "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
       "funding": [
         {
           "type": "opencollective",
@@ -39131,14 +40599,13 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
       "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
@@ -39205,6 +40672,12 @@
         "node": "^18.17.0 || >=20.5.0"
       }
     },
+    "node_modules/varint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+      "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
+      "license": "MIT"
+    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -39698,14 +41171,14 @@
       }
     },
     "node_modules/wait-on": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-8.0.3.tgz",
-      "integrity": "sha512-nQFqAFzZDeRxsu7S3C7LbuxslHhk+gnJZHyethuGKAn2IVleIbTB9I3vJSQiSR+DifUqmdzfPMoMPJfLqMF2vw==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-9.0.3.tgz",
+      "integrity": "sha512-13zBnyYvFDW1rBvWiJ6Av3ymAaq8EDQuvxZnPIw3g04UqGi4TyoIJABmfJ6zrvKo9yeFQExNkOk7idQbDJcuKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "axios": "^1.8.2",
-        "joi": "^17.13.3",
+        "axios": "^1.13.2",
+        "joi": "^18.0.1",
         "lodash": "^4.17.21",
         "minimist": "^1.2.8",
         "rxjs": "^7.8.2"
@@ -39714,7 +41187,43 @@
         "wait-on": "bin/wait-on"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/wait-on/node_modules/@hapi/hoek": {
+      "version": "11.0.7",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-11.0.7.tgz",
+      "integrity": "sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/wait-on/node_modules/@hapi/topo": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-6.0.2.tgz",
+      "integrity": "sha512-KR3rD5inZbGMrHmgPxsJ9dbi6zEK+C3ZwUwTa+eMwWLz7oijWUTWD2pMSNNYJAU6Qq+65NkxXjqHr/7LM2Xkqg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^11.0.2"
+      }
+    },
+    "node_modules/wait-on/node_modules/joi": {
+      "version": "18.0.2",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-18.0.2.tgz",
+      "integrity": "sha512-RuCOQMIt78LWnktPoeBL0GErkNaJPTBGcYuyaBvUOQSpcpcLfWrHPPihYdOGbV5pam9VTWbeoF7TsGiHugcjGA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/address": "^5.1.1",
+        "@hapi/formula": "^3.0.2",
+        "@hapi/hoek": "^11.0.7",
+        "@hapi/pinpoint": "^2.0.1",
+        "@hapi/tlds": "^1.1.1",
+        "@hapi/topo": "^6.0.2",
+        "@standard-schema/spec": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
       }
     },
     "node_modules/wait-on/node_modules/rxjs": {
@@ -39864,7 +41373,6 @@
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "minimalistic-assert": "^1.0.0"
@@ -39897,36 +41405,36 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.99.7",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.7.tgz",
-      "integrity": "sha512-CNqKBRMQjwcmKR0idID5va1qlhrqVUKpovi+Ec79ksW8ux7iS1+A6VqzfZXgVYCFRKl7XL5ap3ZoMpwBJxcg0w==",
-      "dev": true,
+      "version": "5.103.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.103.0.tgz",
+      "integrity": "sha512-HU1JOuV1OavsZ+mfigY0j8d1TgQgbZ6M+J75zDkpEAwYeXjWSqrGJtgnPblJjd/mAyTNQ7ygw0MiKOn6etz8yw==",
       "license": "MIT",
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.6",
+        "@types/estree": "^1.0.8",
         "@types/json-schema": "^7.0.15",
         "@webassemblyjs/ast": "^1.14.1",
         "@webassemblyjs/wasm-edit": "^1.14.1",
         "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.14.0",
-        "browserslist": "^4.24.0",
+        "acorn": "^8.15.0",
+        "acorn-import-phases": "^1.0.3",
+        "browserslist": "^4.26.3",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.1",
+        "enhanced-resolve": "^5.17.3",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.2.11",
         "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
+        "loader-runner": "^4.3.1",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.2",
-        "tapable": "^2.1.1",
+        "schema-utils": "^4.3.3",
+        "tapable": "^2.3.0",
         "terser-webpack-plugin": "^5.3.11",
-        "watchpack": "^2.4.1",
-        "webpack-sources": "^3.2.3"
+        "watchpack": "^2.4.4",
+        "webpack-sources": "^3.3.3"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -40001,7 +41509,6 @@
       "version": "7.4.2",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz",
       "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
@@ -40031,7 +41538,6 @@
       "version": "4.17.2",
       "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.17.2.tgz",
       "integrity": "sha512-NgYhCOWgovOXSzvYgUW0LQ7Qy72rWQMGGFJDoWg4G30RHd3z77VbYdtJ4fembJXBy8pMIUA31XNAupobOQlwdg==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jsonjoy.com/json-pack": "^1.0.3",
@@ -40051,7 +41557,6 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -40061,7 +41566,6 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
@@ -40071,10 +41575,9 @@
       }
     },
     "node_modules/webpack-dev-server": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.1.tgz",
-      "integrity": "sha512-ml/0HIj9NLpVKOMq+SuBPLHcmbG+TGIjXRHsYfZwocUBIqEvws8NnS/V9AFQ5FKP+tgn5adwVwRrTEpGL33QFQ==",
-      "dev": true,
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.2.tgz",
+      "integrity": "sha512-QcQ72gh8a+7JO63TAx/6XZf/CWhgMzu5m0QirvPfGvptOusAxG12w2+aua1Jkjr7hzaWDnJ2n6JFeexMHI+Zjg==",
       "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.13",
@@ -40093,7 +41596,7 @@
         "connect-history-api-fallback": "^2.0.0",
         "express": "^4.21.2",
         "graceful-fs": "^4.2.6",
-        "http-proxy-middleware": "^2.0.7",
+        "http-proxy-middleware": "^2.0.9",
         "ipaddr.js": "^2.1.0",
         "launch-editor": "^2.6.1",
         "open": "^10.0.3",
@@ -40129,23 +41632,21 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/@types/express": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
-      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
-      "dev": true,
+      "version": "4.17.25",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.25.tgz",
+      "integrity": "sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==",
       "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
         "@types/qs": "*",
-        "@types/serve-static": "*"
+        "@types/serve-static": "^1"
       }
     },
     "node_modules/webpack-dev-server/node_modules/@types/express-serve-static-core": {
-      "version": "4.19.6",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
-      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
-      "dev": true,
+      "version": "4.19.7",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.7.tgz",
+      "integrity": "sha512-FvPtiIf1LfhzsaIXhv/PHan/2FeQBbtBDtfX2QfvPxdUelMDEckK08SM6nqo1MIZY3RUlfA+HV8+hFUSio78qg==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -40158,7 +41659,6 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-types": "~2.1.34",
@@ -40172,7 +41672,6 @@
       "version": "1.20.3",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
       "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
@@ -40197,7 +41696,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
@@ -40222,7 +41720,6 @@
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
@@ -40235,7 +41732,6 @@
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
       "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -40245,14 +41741,12 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/webpack-dev-server/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
@@ -40262,14 +41756,12 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/webpack-dev-server/node_modules/express": {
       "version": "4.21.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
       "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
@@ -40316,7 +41808,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
       "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
@@ -40335,7 +41826,6 @@
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -40345,7 +41835,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
@@ -40358,7 +41847,6 @@
       "version": "2.0.9",
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
       "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
@@ -40383,7 +41871,6 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
@@ -40396,7 +41883,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
       "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 10"
@@ -40406,7 +41892,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -40419,7 +41904,6 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -40429,7 +41913,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
       "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
-      "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -40439,7 +41922,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "mime": "cli.js"
@@ -40452,7 +41934,6 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -40462,7 +41943,6 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
@@ -40475,7 +41955,6 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -40485,14 +41964,12 @@
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
       "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/webpack-dev-server/node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -40505,7 +41982,6 @@
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
       "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.6"
@@ -40521,7 +41997,6 @@
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
       "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
@@ -40537,7 +42012,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
@@ -40550,7 +42024,6 @@
       "version": "0.19.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
       "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
@@ -40575,7 +42048,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -40585,7 +42057,6 @@
       "version": "1.16.2",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
       "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "encodeurl": "~2.0.0",
@@ -40601,7 +42072,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -40611,7 +42081,6 @@
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
       "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
@@ -40652,7 +42121,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz",
       "integrity": "sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -40662,7 +42130,6 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
       "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
@@ -40672,7 +42139,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz",
       "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "typed-assert": "^1.0.8"
@@ -40697,44 +42163,10 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/webpack/node_modules/browserslist": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
-      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001718",
-        "electron-to-chromium": "^1.5.160",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
     "node_modules/webpack/node_modules/eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -40748,7 +42180,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
@@ -40758,14 +42189,12 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/webpack/node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -40775,7 +42204,6 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
@@ -40784,11 +42212,23 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/webpack/node_modules/watchpack": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
+      "license": "MIT",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/websocket-driver": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "http-parser-js": ">=0.5.1",
@@ -40803,7 +42243,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=0.8.0"
diff --git a/package.json b/package.json
index 9fd29d53743..97cd653b6d2 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "test:types": "node ./scripts/test-types.js",
     "test:locales": "tsc --project ./scripts/tsconfig.json && node ./scripts/dist/test-locales.js",
     "lint:dep-ownership": "tsc --project ./scripts/tsconfig.json && node ./scripts/dist/dep-ownership.js",
+    "lint:sdk-internal-versions": "tsc --project ./scripts/tsconfig.json && node ./scripts/dist/sdk-internal-versions.js",
     "docs:json": "compodoc -p ./tsconfig.json -e json -d . --disableRoutesGraph",
     "storybook": "ng run components:storybook",
     "build-storybook": "ng run components:build-storybook",
@@ -41,12 +42,12 @@
     "@angular-eslint/schematics": "19.6.0",
     "@angular/cli": "19.2.14",
     "@angular/compiler-cli": "19.2.14",
-    "@babel/core": "7.24.9",
-    "@babel/preset-env": "7.24.8",
+    "@babel/core": "7.28.5",
+    "@babel/preset-env": "7.28.5",
     "@compodoc/compodoc": "1.1.26",
     "@electron/notarize": "3.0.1",
-    "@electron/rebuild": "3.7.2",
-    "@eslint/compat": "1.2.9",
+    "@electron/rebuild": "4.0.1",
+    "@eslint/compat": "2.0.0",
     "@lit-labs/signals": "0.1.2",
     "@ngtools/webpack": "19.2.14",
     "@playwright/test": "1.56.0",
@@ -62,8 +63,9 @@
     "@storybook/test-runner": "0.22.0",
     "@storybook/theming": "8.6.12",
     "@storybook/web-components-webpack5": "8.6.12",
-    "@types/chrome": "0.1.12",
-    "@types/firefox-webext-browser": "120.0.4",
+    "@tailwindcss/container-queries": "0.1.1",
+    "@types/chrome": "0.1.28",
+    "@types/firefox-webext-browser": "143.0.0",
     "@types/inquirer": "8.2.10",
     "@types/jest": "29.5.14",
     "@types/jsdom": "21.1.7",
@@ -74,10 +76,10 @@
     "@types/koa-json": "2.0.23",
     "@types/lowdb": "1.0.15",
     "@types/lunr": "2.3.7",
-    "@types/node": "22.15.3",
+    "@types/node": "22.19.1",
     "@types/node-fetch": "2.6.4",
-    "@types/node-forge": "1.3.11",
-    "@types/papaparse": "5.3.16",
+    "@types/node-forge": "1.3.14",
+    "@types/papaparse": "5.5.0",
     "@types/proper-lockfile": "4.1.4",
     "@types/retry": "0.12.5",
     "@types/zxcvbn": "4.4.5",
@@ -87,18 +89,18 @@
     "@yao-pkg/pkg": "6.5.1",
     "angular-eslint": "19.6.0",
     "autoprefixer": "10.4.21",
-    "axe-playwright": "2.1.0",
+    "axe-playwright": "2.2.2",
     "babel-loader": "9.2.1",
     "base64-loader": "1.0.0",
-    "browserslist": "4.23.2",
-    "chromatic": "13.1.2",
+    "browserslist": "4.28.0",
+    "chromatic": "13.3.1",
     "concurrently": "9.2.0",
-    "copy-webpack-plugin": "13.0.0",
-    "cross-env": "10.0.0",
+    "copy-webpack-plugin": "13.0.1",
+    "cross-env": "10.1.0",
     "css-loader": "7.1.2",
-    "electron": "36.8.1",
+    "electron": "37.7.0",
     "electron-builder": "26.0.12",
-    "electron-log": "5.4.0",
+    "electron-log": "5.4.3",
     "electron-reload": "2.0.0-alpha.1",
     "electron-store": "8.2.0",
     "electron-updater": "6.6.4",
@@ -112,41 +114,41 @@
     "eslint-plugin-tailwindcss": "3.18.0",
     "html-loader": "5.1.0",
     "html-webpack-injector": "1.1.4",
-    "html-webpack-plugin": "5.6.3",
+    "html-webpack-plugin": "5.6.5",
     "husky": "9.1.7",
-    "jest-diff": "29.7.0",
+    "jest-diff": "30.2.0",
     "jest-junit": "16.0.0",
     "jest-mock-extended": "3.0.7",
-    "jest-preset-angular": "14.6.0",
+    "jest-preset-angular": "14.6.1",
     "json5": "2.2.3",
     "lint-staged": "16.0.0",
-    "mini-css-extract-plugin": "2.9.2",
-    "nx": "21.3.11",
-    "postcss": "8.5.3",
-    "postcss-loader": "8.1.1",
+    "mini-css-extract-plugin": "2.9.4",
+    "nx": "21.6.9",
+    "postcss": "8.5.6",
+    "postcss-loader": "8.2.0",
     "prettier": "3.6.2",
     "prettier-plugin-tailwindcss": "0.6.11",
     "process": "0.11.10",
     "remark-gfm": "4.0.1",
     "rimraf": "6.0.1",
-    "sass": "1.88.0",
-    "sass-loader": "16.0.4",
+    "sass": "1.94.2",
+    "sass-loader": "16.0.6",
     "storybook": "8.6.12",
     "style-loader": "4.0.0",
     "tailwindcss": "3.4.17",
-    "ts-jest": "29.3.4",
-    "ts-loader": "9.5.2",
+    "ts-jest": "29.4.5",
+    "ts-loader": "9.5.4",
     "tsconfig-paths-webpack-plugin": "4.2.0",
     "type-fest": "2.19.0",
-    "typescript": "5.5.4",
+    "typescript": "5.8.3",
     "typescript-eslint": "8.31.0",
     "typescript-strict-plugin": "2.4.4",
     "url": "0.11.4",
     "util": "0.12.5",
-    "wait-on": "8.0.3",
-    "webpack": "5.99.7",
+    "wait-on": "9.0.3",
+    "webpack": "5.103.0",
     "webpack-cli": "6.0.1",
-    "webpack-dev-server": "5.2.1",
+    "webpack-dev-server": "5.2.2",
     "webpack-node-externals": "3.0.0"
   },
   "dependencies": {
@@ -159,7 +161,8 @@
     "@angular/platform-browser": "19.2.14",
     "@angular/platform-browser-dynamic": "19.2.14",
     "@angular/router": "19.2.14",
-    "@bitwarden/sdk-internal": "0.2.0-main.296",
+    "@bitwarden/sdk-internal": "0.2.0-main.395",
+    "@bitwarden/commercial-sdk-internal": "0.2.0-main.395",
     "@electron/fuses": "1.8.0",
     "@emotion/css": "11.13.5",
     "@koa/multer": "4.0.0",
@@ -167,12 +170,13 @@
     "@microsoft/signalr": "8.0.7",
     "@microsoft/signalr-protocol-msgpack": "8.0.7",
     "@ng-select/ng-select": "14.9.0",
-    "@nx/devkit": "21.3.11",
-    "@nx/eslint": "21.3.11",
-    "@nx/jest": "21.3.11",
-    "@nx/js": "21.3.11",
+    "@nx/devkit": "21.6.9",
+    "@nx/eslint": "21.6.9",
+    "@nx/jest": "21.6.9",
+    "@nx/js": "21.6.9",
+    "@nx/webpack": "21.6.9",
     "big-integer": "1.6.52",
-    "braintree-web-drop-in": "1.44.0",
+    "braintree-web-drop-in": "1.46.0",
     "buffer": "6.0.3",
     "bufferutil": "4.0.9",
     "chalk": "4.1.2",
@@ -183,16 +187,16 @@
     "inquirer": "8.2.6",
     "jsdom": "26.1.0",
     "jszip": "3.10.1",
-    "koa": "2.16.1",
+    "koa": "2.16.3",
     "koa-bodyparser": "4.4.1",
     "koa-json": "2.0.2",
     "lit": "3.3.0",
     "lowdb": "1.0.0",
     "lunr": "2.3.9",
     "multer": "2.0.2",
-    "ngx-toastr": "19.0.0",
+    "ngx-toastr": "19.1.0",
     "node-fetch": "2.6.12",
-    "node-forge": "1.3.1",
+    "node-forge": "1.3.2",
     "oidc-client-ts": "2.4.1",
     "open": "10.1.2",
     "papaparse": "5.5.3",
@@ -201,9 +205,9 @@
     "qrcode-parser": "2.1.3",
     "qrious": "4.0.2",
     "rxjs": "7.8.1",
-    "semver": "7.7.2",
-    "tabbable": "6.2.0",
-    "tldts": "7.0.1",
+    "semver": "7.7.3",
+    "tabbable": "6.3.0",
+    "tldts": "7.0.18",
     "ts-node": "10.9.2",
     "utf-8-validate": "6.0.5",
     "zone.js": "0.15.1",
diff --git a/scripts/sdk-internal-versions.ts b/scripts/sdk-internal-versions.ts
new file mode 100644
index 00000000000..c442772e553
--- /dev/null
+++ b/scripts/sdk-internal-versions.ts
@@ -0,0 +1,22 @@
+/* eslint-disable no-console */
+
+/// Ensure that `sdk-internal` and `commercial-sdk-internal` dependencies have matching versions.
+
+import fs from "fs";
+import path from "path";
+
+const packageJson = JSON.parse(
+  fs.readFileSync(path.join(__dirname, "..", "..", "package.json"), "utf8"),
+);
+
+const sdkInternal = packageJson.dependencies["@bitwarden/sdk-internal"];
+const commercialSdkInternal = packageJson.dependencies["@bitwarden/commercial-sdk-internal"];
+
+if (sdkInternal !== commercialSdkInternal) {
+  console.error(
+    `Version mismatch between @bitwarden/sdk-internal (${sdkInternal}) and @bitwarden/commercial-sdk-internal (${commercialSdkInternal}), must be an exact match.`,
+  );
+  process.exit(1);
+}
+
+console.log(`All dependencies have matching versions: ${sdkInternal}`);